flake.nix: Patch nix-eval-jobs for NIX_PATH

This commit is contained in:
Zhaofeng Li 2024-10-05 19:46:56 -06:00
parent 141fe82f44
commit 43be9effab

View file

@ -83,11 +83,21 @@
in if pkgs.stdenv.isLinux then import ./integration-tests { in if pkgs.stdenv.isLinux then import ./integration-tests {
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
overlays = [ self.overlays.default inputsOverlay ]; overlays = [
self.overlays.default
inputsOverlay
self._evalJobsOverlay
];
}; };
pkgsStable = import stable { pkgsStable = import stable {
inherit system; inherit system;
overlays = [ self.overlays.default inputsOverlay ]; overlays = [
self.overlays.default
inputsOverlay
self._evalJobsOverlay
];
}; };
} else {}; } else {};
}) // { }) // {
@ -104,6 +114,23 @@
inherit rawHive colmenaOptions colmenaModules; inherit rawHive colmenaOptions colmenaModules;
hermetic = true; hermetic = true;
}; };
# Temporary fork of nix-eval-jobs with changes to be upstreamed
# Mostly for the integration test setup and not needed in most use cases
_evalJobsOverlay = final: prev: let
patched = prev.nix-eval-jobs.overrideAttrs (old: {
version = old.version + "-colmena";
patches = (old.patches or []) ++ [
# Allows NIX_PATH to be honored
(final.fetchpatch {
url = "https://github.com/zhaofengli/nix-eval-jobs/commit/6ff5972724230ac2b96eb1ec355cd25ca512ef57.patch";
hash = "sha256-2NiMYpw27N+X7Ixh2HkP3fcWvopDJWQDVjgRdhOL2QQ";
})
];
});
in {
nix-eval-jobs = patched;
};
}; };
nixConfig = { nixConfig = {