DGNum/colmena
10
0
Fork 1
Code Issues 6 Pull requests 2 Projects Releases Packages Wiki Activity

flake.lock: Update

Browse source 
All downstream patches to nix-eval-jobs have been merged and released
as part of nix-eval-jobs 0.0.4.
This commit is contained in:
Zhaofeng Li 2022-03-19 20:30:21 -07:00
parent f81170c8ee
commit 017ccf142c
3 changed files with 3 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock generated
View file

@ -18,11 +18,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1646497237, "lastModified": 1647297614,
"narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", "narHash": "sha256-ulGq3W5XsrBMU/u5k9d4oPy65pQTkunR4HKKtTq0RwY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", "rev": "73ad5f9e147c0d2a2061f1d4bd91e05078dc0b58",
"type": "github" "type": "github"
}, },
"original": { "original": {

22
flake.nix
View file

@ -21,7 +21,6 @@
in utils.lib.eachSystem supportedSystems (system: let in utils.lib.eachSystem supportedSystems (system: let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
overlays = [ self._evalJobsOverlay ];
}; };
in rec { in rec {
# We still maintain the expression in a Nixpkgs-acceptable form # We still maintain the expression in a Nixpkgs-acceptable form
@ -66,27 +65,6 @@
''; '';
}; };
}) // { }) // {
# For use in integration tests
_evalJobsOverlay =
(final: prev: {
nix-eval-jobs = prev.nix-eval-jobs.overrideAttrs (old: {
version = old.version + "-colmena";
patches = (old.patches or []) ++ [
# Add --show-trace
(final.fetchpatch {
url = "https://github.com/nix-community/nix-eval-jobs/commit/1e0f309fefc9b2d597f8475a74c82ce29c189152.patch";
sha256 = "sha256-246t3SGRA/9JsV2XPcI4Exp+TxmyYBoldQ43Wr5CcsM=";
})
# Fix buffering when piped
(final.fetchpatch {
url = "https://github.com/zhaofengli/nix-eval-jobs/commit/6d61193286aedd4e514fd8f375b2000b95fff4fb.patch";
sha256 = "sha256-yOuUwKHSS7Bt3q3nClirVk7DzJhxNFFZ8JnYjrPRJVc=";
})
];
});
});
overlay = final: prev: { overlay = final: prev: {
colmena = final.callPackage ./package.nix { }; colmena = final.callPackage ./package.nix { };
}; };

1
integration-tests/nixpkgs.nix
View file

@ -2,7 +2,6 @@ let
flake = (import ../flake-compat.nix).defaultNix; flake = (import ../flake-compat.nix).defaultNix;
in import flake.inputs.nixpkgs.outPath { in import flake.inputs.nixpkgs.outPath {
overlays = [ overlays = [
flake._evalJobsOverlay
flake.overlay flake.overlay
]; ];
} }