fix(npins): Update the version used

This commit is contained in:
Tom Hubrecht 2024-07-11 10:33:01 +02:00
parent 680682f520
commit a43e10d77d
Signed by: thubrecht
SSH key fingerprint: SHA256:r+nK/SIcWlJ0zFZJGHtlAoRwq1Rm+WcKAm5ADYMoQPc
2 changed files with 18 additions and 21 deletions

View file

@ -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;
[
npins
(nixos-generators.overrideAttrs (_: {
version = "1.8.0-unstable"; version = "1.8.0-unstable";
src = builtins.storePath sources.nixos-generators; src = builtins.storePath sources.nixos-generators;
})) }))
attic-client pkgs.attic-client
] nix-pkgs.npins
++ [
(callPackage (sources.disko + "/package.nix") { }) (pkgs.callPackage (sources.disko + "/package.nix") { })
(callPackage ./lib/colmena { inherit (import sources.nix-pkgs { inherit pkgs; }) colmena; }) (pkgs.callPackage ./lib/colmena { inherit (nix-pkgs) colmena; })
] ] ++ (import ./scripts { inherit pkgs; });
)
++ (import ./scripts { inherit pkgs; });
shellHook = '' shellHook = ''
${pre-commit-check.shellHook} ${pre-commit-check.shellHook}

View file

@ -1 +1 @@
(import ./.).shells.default (import ./. { }).shells.default