ecoppens/colmena
1
0
Fork 0
forked from DGNum/colmena
Code Pull requests Activity

flake.nix: Update nixpkgs, remove nix-eval-jobs

Browse source
This commit is contained in:
Zhaofeng Li 2023-01-27 23:44:41 -07:00
parent bf6b88867d
commit b7262f6781
4 changed files with 5 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
flake.lock
View file

@ -31,37 +31,13 @@
"type": "github" "type": "github"
} }
}, },
"nix-eval-jobs": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1660713017,
"narHash": "sha256-w6KLNkT/2fI7UvPg3NoKj7gve4CgUHpyWOFq0BUwW7o=",
"owner": "zhaofengli",
"repo": "nix-eval-jobs",
"rev": "b4c078a4870c5b1a5b74420ca1dca41f4d75b7cc",
"type": "github"
},
"original": {
"owner": "zhaofengli",
"ref": "colmena",
"repo": "nix-eval-jobs",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1669542132, "lastModified": 1674641431,
"narHash": "sha256-DRlg++NJAwPh8io3ExBJdNW7Djs3plVI5jgYQ+iXAZQ=", "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a115bb9bd56831941be3776c8a94005867f316a7", "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -75,7 +51,6 @@
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nix-eval-jobs": "nix-eval-jobs",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"stable": "stable" "stable": "stable"
} }

20
flake.nix
View file

@ -7,27 +7,20 @@
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
nix-eval-jobs = {
# Temporary fork of nix-eval-job with changes to be upstreamed
url = "github:zhaofengli/nix-eval-jobs/colmena";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
flake-compat = { flake-compat = {
url = "github:edolstra/flake-compat"; url = "github:edolstra/flake-compat";
flake = false; flake = false;
}; };
}; };
outputs = { self, nixpkgs, flake-utils, nix-eval-jobs, ... }: let outputs = { self, nixpkgs, flake-utils, ... }: let
supportedSystems = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; supportedSystems = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
colmenaOptions = import ./src/nix/hive/options.nix; colmenaOptions = import ./src/nix/hive/options.nix;
colmenaModules = import ./src/nix/hive/modules.nix; colmenaModules = import ./src/nix/hive/modules.nix;
in flake-utils.lib.eachSystem supportedSystems (system: let in flake-utils.lib.eachSystem supportedSystems (system: let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
overlays = [ self._evalJobsOverlay ]; overlays = [];
}; };
in rec { in rec {
# We still maintain the expression in a Nixpkgs-acceptable form # We still maintain the expression in a Nixpkgs-acceptable form
@ -87,15 +80,6 @@
]; ];
}; };
}) // { }) // {
# Temporary fork of nix-eval-job with changes to be upstreamed
_evalJobsOverlay = final: prev: let
patched = nix-eval-jobs.packages.${final.system}.nix-eval-jobs.overrideAttrs (old: {
version = "2.9.0-colmena";
});
in {
nix-eval-jobs = patched;
};
overlay = final: prev: { overlay = final: prev: {
colmena = final.callPackage ./package.nix { }; colmena = final.callPackage ./package.nix { };
}; };

1
integration-tests/nixpkgs-stable.nix
View file

@ -2,7 +2,6 @@ let
flake = (import ../flake-compat.nix).defaultNix; flake = (import ../flake-compat.nix).defaultNix;
in import flake.inputs.stable.outPath { in import flake.inputs.stable.outPath {
overlays = [ overlays = [
flake._evalJobsOverlay
flake.overlay flake.overlay
# Pass through original flake inputs # Pass through original flake inputs

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
# Pass through original flake inputs # Pass through original flake inputs