Get rid of flake dependency on flake-parts - grab it from npins
Some checks failed
/ check-data-model (pull_request) Successful in 31s
/ check-peertube (pull_request) Successful in 21s
/ check-panel (pull_request) Successful in 1m28s
/ check-deployment-basic (pull_request) Successful in 11m37s
/ check-deployment-cli (pull_request) Successful in 40m29s
/ check-pre-commit (pull_request) Successful in 13s
/ check-deployment-panel (pull_request) Has been cancelled
Some checks failed
/ check-data-model (pull_request) Successful in 31s
/ check-peertube (pull_request) Successful in 21s
/ check-panel (pull_request) Successful in 1m28s
/ check-deployment-basic (pull_request) Successful in 11m37s
/ check-deployment-cli (pull_request) Successful in 40m29s
/ check-pre-commit (pull_request) Successful in 13s
/ check-deployment-panel (pull_request) Has been cancelled
This commit is contained in:
parent
9090e0b952
commit
e9f7409ed0
5 changed files with 9 additions and 41 deletions
|
@ -54,11 +54,11 @@ in
|
||||||
|
|
||||||
system.extraDependencies =
|
system.extraDependencies =
|
||||||
[
|
[
|
||||||
inputs.flake-parts
|
|
||||||
inputs.flake-parts.inputs.nixpkgs-lib
|
|
||||||
inputs.nixops4
|
inputs.nixops4
|
||||||
inputs.nixops4-nixos
|
inputs.nixops4-nixos
|
||||||
inputs.nixpkgs
|
inputs.nixpkgs
|
||||||
|
|
||||||
|
sources.flake-parts
|
||||||
sources.flake-inputs
|
sources.flake-inputs
|
||||||
|
|
||||||
pkgs.stdenv
|
pkgs.stdenv
|
||||||
|
|
|
@ -138,7 +138,6 @@ in
|
||||||
deployer.succeed("""
|
deployer.succeed("""
|
||||||
nix flake lock --extra-experimental-features 'flakes nix-command' \
|
nix flake lock --extra-experimental-features 'flakes nix-command' \
|
||||||
--offline -v \
|
--offline -v \
|
||||||
--override-input flake-parts ${inputs.flake-parts} \
|
|
||||||
--override-input nixops4 ${inputs.nixops4.packages.${system}.flake-in-a-bottle} \
|
--override-input nixops4 ${inputs.nixops4.packages.${system}.flake-in-a-bottle} \
|
||||||
\
|
\
|
||||||
--override-input nixops4-nixos ${inputs.nixops4-nixos} \
|
--override-input nixops4-nixos ${inputs.nixops4-nixos} \
|
||||||
|
@ -151,7 +150,6 @@ in
|
||||||
} \
|
} \
|
||||||
--override-input nixops4-nixos/git-hooks-nix ${emptyFlake} \
|
--override-input nixops4-nixos/git-hooks-nix ${emptyFlake} \
|
||||||
\
|
\
|
||||||
--override-input nixpkgs ${inputs.nixpkgs} \
|
|
||||||
--override-input git-hooks ${inputs.git-hooks} \
|
--override-input git-hooks ${inputs.git-hooks} \
|
||||||
;
|
;
|
||||||
""")
|
""")
|
||||||
|
|
37
flake.lock
generated
37
flake.lock
generated
|
@ -143,24 +143,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-parts_3": {
|
"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": {
|
"inputs": {
|
||||||
"nixpkgs-lib": [
|
"nixpkgs-lib": [
|
||||||
"nixops4-nixos",
|
"nixops4-nixos",
|
||||||
|
@ -342,7 +324,7 @@
|
||||||
"nix": {
|
"nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat_3",
|
"flake-compat": "flake-compat_3",
|
||||||
"flake-parts": "flake-parts_4",
|
"flake-parts": "flake-parts_3",
|
||||||
"git-hooks-nix": "git-hooks-nix_2",
|
"git-hooks-nix": "git-hooks-nix_2",
|
||||||
"nixfmt": "nixfmt",
|
"nixfmt": "nixfmt",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
@ -416,7 +398,7 @@
|
||||||
},
|
},
|
||||||
"nixops4": {
|
"nixops4": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-parts": "flake-parts_3",
|
"flake-parts": "flake-parts_2",
|
||||||
"nix": "nix",
|
"nix": "nix",
|
||||||
"nix-cargo-integration": "nix-cargo-integration",
|
"nix-cargo-integration": "nix-cargo-integration",
|
||||||
"nixpkgs": "nixpkgs_3",
|
"nixpkgs": "nixpkgs_3",
|
||||||
|
@ -438,7 +420,7 @@
|
||||||
},
|
},
|
||||||
"nixops4-nixos": {
|
"nixops4-nixos": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-parts": "flake-parts_2",
|
"flake-parts": "flake-parts",
|
||||||
"git-hooks-nix": "git-hooks-nix",
|
"git-hooks-nix": "git-hooks-nix",
|
||||||
"nixops4": "nixops4",
|
"nixops4": "nixops4",
|
||||||
"nixops4-nixos": [
|
"nixops4-nixos": [
|
||||||
|
@ -520,18 +502,6 @@
|
||||||
"url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
|
"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": {
|
"nixpkgs-old": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1735563628,
|
"lastModified": 1735563628,
|
||||||
|
@ -664,7 +634,6 @@
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-parts": "flake-parts",
|
|
||||||
"git-hooks": "git-hooks",
|
"git-hooks": "git-hooks",
|
||||||
"nixops4": [
|
"nixops4": [
|
||||||
"nixops4-nixos",
|
"nixops4-nixos",
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
|
||||||
git-hooks.url = "github:cachix/git-hooks.nix";
|
git-hooks.url = "github:cachix/git-hooks.nix";
|
||||||
nixops4.follows = "nixops4-nixos/nixops4";
|
nixops4.follows = "nixops4-nixos/nixops4";
|
||||||
nixops4-nixos.url = "github:nixops4/nixops4-nixos";
|
nixops4-nixos.url = "github:nixops4/nixops4-nixos";
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
## This file contains a tweak of flake-parts's `mkFlake` function to splice in
|
## This file contains a tweak of flake-parts's `mkFlake` function to splice in
|
||||||
## sources taken from npins.
|
## sources taken from npins.
|
||||||
|
|
||||||
inputs@{ self, flake-parts, ... }:
|
inputs@{ self, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
sources = import ./npins;
|
sources = import ./npins;
|
||||||
|
@ -18,11 +18,13 @@ let
|
||||||
self' = self // {
|
self' = self // {
|
||||||
inputs = inputs';
|
inputs = inputs';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
flake-parts-lib = import "${sources.flake-parts}/lib.nix" { inherit (nixpkgs) lib; };
|
||||||
in
|
in
|
||||||
|
|
||||||
# XXX - finally we override the overall set of `inputs` -- we need both:
|
# 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 obtains `nixpkgs` from `self.inputs` and not from `inputs`.
|
||||||
flake-parts.lib.mkFlake {
|
flake-parts-lib.mkFlake {
|
||||||
inputs = inputs // {
|
inputs = inputs // {
|
||||||
inherit nixpkgs;
|
inherit nixpkgs;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Reference in a new issue