38 papercuts

.github/workflows/build.yml

@@ -40,7 +40,7 @@ jobs:
           skipAddingSubstituter: ${{ runner.environment == 'self-hosted' }}
       - name: nix run .#add-subflakes-to-store
         run: nix-shell --pure -I nixpkgs=flake:nixpkgs -p '(import ./shell.nix { }).packages.${builtins.currentSystem}.add-subflakes-to-store' --command add-subflakes-to-store
-      - run: nix run .#check
+      - run: nix run --print-build-logs .#check -- --print-build-logs
 
   build:
     timeout-minutes: 7200

CHANGELOG.md

@@ -1,3 +1,6 @@
+- Fixed `packages'.check` failing to build on Linux
+- Refactored `packages'.check` to not modify the local directory
+- Fixed `packages'.check` not consistently operating on same directory
 - Removed workaround for `users.users.builder.shell` being defined twice even when it's set to the same derivation
 - Fixed `shell` not getting updated for users on macOS
 - Removed `vscode-colorize` as it crashes the Extension Host on some repos

flake.nix

@@ -423,10 +423,15 @@
               text = ''
                 set -x
 
-                patch < ${./files/no-ifd.diff}
-                PATCHED=$(nix flake metadata "''${1:-$PWD}" --json | jq -r '.path')
-                patch -R < ${./files/no-ifd.diff}
-                nix flake check --print-build-logs "$PATCHED"
+                nix flake check ${
+                  pkgs.stdenvNoCC.mkDerivation {
+                    name = "patched-self";
+                    # WORKAROUND: `toString ./.` works on macOS but not Linux
+                    src = toString self;
+                    patches = [ ./files/no-ifd.diff ];
+                    installPhase = "cp -r . $out";
+                  }
+                } "$@"
               '';
             };