diff --git a/deployment/check/common/deployerNode.nix b/deployment/check/common/deployerNode.nix index f8caba87..5802793c 100644 --- a/deployment/check/common/deployerNode.nix +++ b/deployment/check/common/deployerNode.nix @@ -54,11 +54,11 @@ in system.extraDependencies = [ - inputs.flake-parts - inputs.flake-parts.inputs.nixpkgs-lib inputs.nixops4 inputs.nixops4-nixos inputs.nixpkgs + + sources.flake-parts sources.flake-inputs pkgs.stdenv diff --git a/deployment/check/common/nixosTest.nix b/deployment/check/common/nixosTest.nix index 3b43719a..d15203cb 100644 --- a/deployment/check/common/nixosTest.nix +++ b/deployment/check/common/nixosTest.nix @@ -138,7 +138,6 @@ in deployer.succeed(""" nix flake lock --extra-experimental-features 'flakes nix-command' \ --offline -v \ - --override-input flake-parts ${inputs.flake-parts} \ --override-input nixops4 ${inputs.nixops4.packages.${system}.flake-in-a-bottle} \ \ --override-input nixops4-nixos ${inputs.nixops4-nixos} \ @@ -151,7 +150,6 @@ in } \ --override-input nixops4-nixos/git-hooks-nix ${emptyFlake} \ \ - --override-input nixpkgs ${inputs.nixpkgs} \ --override-input git-hooks ${inputs.git-hooks} \ ; """) diff --git a/flake.lock b/flake.lock index baf0a2bc..c98744f9 100644 --- a/flake.lock +++ b/flake.lock @@ -143,24 +143,6 @@ } }, "flake-parts_3": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" - }, - "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "nixops4-nixos", @@ -342,7 +324,7 @@ "nix": { "inputs": { "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_3", "git-hooks-nix": "git-hooks-nix_2", "nixfmt": "nixfmt", "nixpkgs": [ @@ -416,7 +398,7 @@ }, "nixops4": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "nix": "nix", "nix-cargo-integration": "nix-cargo-integration", "nixpkgs": "nixpkgs_3", @@ -438,7 +420,7 @@ }, "nixops4-nixos": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "git-hooks-nix": "git-hooks-nix", "nixops4": "nixops4", "nixops4-nixos": [ @@ -520,18 +502,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" } }, - "nixpkgs-lib_3": { - "locked": { - "lastModified": 1738452942, - "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" - } - }, "nixpkgs-old": { "locked": { "lastModified": 1735563628, @@ -664,7 +634,6 @@ }, "root": { "inputs": { - "flake-parts": "flake-parts", "git-hooks": "git-hooks", "nixops4": [ "nixops4-nixos", diff --git a/flake.nix b/flake.nix index 5af7d4f5..5c816a0f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,5 @@ { inputs = { - flake-parts.url = "github:hercules-ci/flake-parts"; git-hooks.url = "github:cachix/git-hooks.nix"; nixops4.follows = "nixops4-nixos/nixops4"; nixops4-nixos.url = "github:nixops4/nixops4-nixos"; diff --git a/mkFlake.nix b/mkFlake.nix index 4695253e..59d2d93a 100644 --- a/mkFlake.nix +++ b/mkFlake.nix @@ -1,7 +1,7 @@ ## This file contains a tweak of flake-parts's `mkFlake` function to splice in ## sources taken from npins. -inputs@{ self, flake-parts, ... }: +inputs@{ self, ... }: let sources = import ./npins; @@ -18,11 +18,13 @@ let self' = self // { inputs = inputs'; }; + + flake-parts-lib = import "${sources.flake-parts}/lib.nix" { inherit (nixpkgs) lib; }; in # XXX - finally we override the overall set of `inputs` -- we need both: # `flake-parts obtains `nixpkgs` from `self.inputs` and not from `inputs`. -flake-parts.lib.mkFlake { +flake-parts-lib.mkFlake { inputs = inputs // { inherit nixpkgs; };