nix fails to build

[benneti]

if I am not on the exact commit of nixos-21.05 as this repo and fail to hit the cache, it tries to rebuild nix and fails (I think one of the patches does not apply then anymore)

warning: Git tree '/etc/nixos' is dirty
building the system configuration...
warning: Git tree '/etc/nixos' is dirty
error: builder for '/nix/store/d0inkd88ganryd0aykzsv4bhndzz4br4-nix-2.4pre20210802_47e96bb.drv' failed with exit code 1;
       last 10 log lines:
       > Hunk #6 succeeded at 496 (offset 8 lines).
       > Hunk #7 succeeded at 512 (offset 8 lines).
       > Hunk #8 succeeded at 531 (offset 8 lines).
       > 1 out of 8 hunks FAILED -- saving rejects to file src/libexpr/flake/flake.cc.rej
       > patching file src/libexpr/flake/flake.hh
       > Hunk #2 succeeded at 124 (offset 4 lines).
       > patching file src/libfetchers/fetchers.hh
       > patching file src/libfetchers/path.cc
       > patching file tests/flakes.sh
       > Hunk #2 succeeded at 686 (offset -56 lines).
       For full logs, run 'nix log /nix/store/d0inkd88ganryd0aykzsv4bhndzz4br4-nix-2.4pre20210802_47e96bb.drv'.
error (ignored): error: cannot unlink '/tmp/nix-build-freerdp-2.3.2.drv-1/source': Directory not empty
error: 1 dependencies of derivation '/nix/store/jssn5zfjwh18889cn6bdz765xv5qr3xd-nix.conf.drv' failed to build
error (ignored): error: cannot unlink '/tmp/nix-build-pika-backup-0.3.2.drv-0/pika-backup-0.3.2-vendor.tar.gz': Directory not empty
error (ignored): error: cannot unlink '/tmp/nix-build-papirus-icon-theme-20210501.drv-1/source/Papirus/24x24/apps': Directory not empty
error (ignored): error: cannot unlink '/tmp/nix-build-amdvlk-2021.Q2.2.drv-3/amdvlk-src': Directory not empty
error (ignored): error: cannot unlink '/tmp/nix-build-opencv-4.5.2.drv-3/source': Directory not empty
error: 1 dependencies of derivation '/nix/store/08l8jlbl3cbg5vk9mv5xbipppicl97yi-system-path.drv' failed to build
error: 1 dependencies of derivation '/nix/store/gnij48sdia7pqrgvp5hnsrvdkn8c6m3p-systemd-boot-builder.py.drv' failed to build
error: 1 dependencies of derivation '/nix/store/n7y81b3d824pa00mgjnkn0rwhq00167a-nixos-system-pulse-21.05.20210901.3e09410.drv' failed to build

and

$ nix log /nix/store/d0inkd88ganryd0aykzsv4bhndzz4br4-nix-2.4pre20210802_47e96bb.drv
@nix { "action": "setPhase", "phase": "unpackPhase" }
unpacking sources
unpacking source archive /nix/store/s316ggzxykw9b8w801jdjx1nsb1i2rv3-source
source root is source
@nix { "action": "setPhase", "phase": "patchPhase" }
patching sources
applying patch /nix/store/ycbpzxnm1ajx43lmxrcsw59c7rdag9rd-fix-follows.diff
patching file src/libexpr/flake/flake.cc
Hunk #1 succeeded at 329 (offset 8 lines).
Hunk #2 succeeded at 380 (offset 8 lines).
Hunk #3 succeeded at 442 (offset 8 lines).
Hunk #4 succeeded at 459 (offset 8 lines).
Hunk #5 FAILED at 467.
Hunk #6 succeeded at 496 (offset 8 lines).
Hunk #7 succeeded at 512 (offset 8 lines).
Hunk #8 succeeded at 531 (offset 8 lines).
1 out of 8 hunks FAILED -- saving rejects to file src/libexpr/flake/flake.cc.rej
patching file src/libexpr/flake/flake.hh
Hunk #2 succeeded at 124 (offset 4 lines).
patching file src/libfetchers/fetchers.hh
patching file src/libfetchers/path.cc
patching file tests/flakes.sh
Hunk #2 succeeded at 686 (offset -56 lines).

I am not sure whether there are any patches applied, but as I do not get nix from the offcial cache I guess they are?

[nrdxp]

The only patch should be the follows fix, which is now merged upstream. We should be able to remove the patch entirely, although nixpkgs nixUnstable hasn't been updated yet

[benneti]

Thanks, and thats good to hear, I'll simply postpone my update then!
But on another note, as the digga overlay seems to override the nix package, should it not automatically use the locked initial version from digga? Or is the overlay applied for some reason ontop of my local locked nixpkgs?

[benneti]

fixed in latest digga