forked from DGNum/infrastructure
fix(npins): Update the version used
This commit is contained in:
parent
680682f520
commit
a43e10d77d
2 changed files with 18 additions and 21 deletions
37
default.nix
37
default.nix
|
@ -34,10 +34,13 @@
|
||||||
termes.
|
termes.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
let
|
{
|
||||||
sources = import ./npins;
|
sources ? import ./npins,
|
||||||
pkgs = import sources.nixpkgs { };
|
pkgs ? import sources.nixpkgs { },
|
||||||
|
nix-pkgs ? import sources.nix-pkgs { inherit pkgs; },
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
pre-commit-check = (import sources.pre-commit-hooks).run {
|
pre-commit-check = (import sources.pre-commit-hooks).run {
|
||||||
src = ./.;
|
src = ./.;
|
||||||
|
|
||||||
|
@ -70,23 +73,17 @@ in
|
||||||
default = pkgs.mkShell {
|
default = pkgs.mkShell {
|
||||||
name = "dgnum-infra";
|
name = "dgnum-infra";
|
||||||
|
|
||||||
packages =
|
packages = [
|
||||||
(
|
(pkgs.nixos-generators.overrideAttrs (_: {
|
||||||
with pkgs;
|
version = "1.8.0-unstable";
|
||||||
[
|
src = builtins.storePath sources.nixos-generators;
|
||||||
npins
|
}))
|
||||||
(nixos-generators.overrideAttrs (_: {
|
pkgs.attic-client
|
||||||
version = "1.8.0-unstable";
|
nix-pkgs.npins
|
||||||
src = builtins.storePath sources.nixos-generators;
|
|
||||||
}))
|
(pkgs.callPackage (sources.disko + "/package.nix") { })
|
||||||
attic-client
|
(pkgs.callPackage ./lib/colmena { inherit (nix-pkgs) colmena; })
|
||||||
]
|
] ++ (import ./scripts { inherit pkgs; });
|
||||||
++ [
|
|
||||||
(callPackage (sources.disko + "/package.nix") { })
|
|
||||||
(callPackage ./lib/colmena { inherit (import sources.nix-pkgs { inherit pkgs; }) colmena; })
|
|
||||||
]
|
|
||||||
)
|
|
||||||
++ (import ./scripts { inherit pkgs; });
|
|
||||||
|
|
||||||
shellHook = ''
|
shellHook = ''
|
||||||
${pre-commit-check.shellHook}
|
${pre-commit-check.shellHook}
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
(import ./.).shells.default
|
(import ./. { }).shells.default
|
||||||
|
|
Loading…
Reference in a new issue