Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

l blue: use file nixpkgs deployment when not testing

Browse Source
This commit is contained in:
lassulus 2019-03-26 14:39:52 +01:00
parent 6654f03b09
commit bd53953378
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lass/1systems/blue/source.nix
View File

@ -1,20 +1,11 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
{ {
nixpkgs = lib.mkForce { nixpkgs = lib.mkForce {
derivation = let file = toString (pkgs.fetchFromGitHub {
rev = (lib.importJSON ../../../krebs/nixpkgs.json).rev;
sha256 = (lib.importJSON ../../../krebs/nixpkgs.json).sha256;
in ''
with import (builtins.fetchTarball {
url = "https://github.com/nixos/nixpkgs/archive/${rev}.tar.gz";
sha256 = "${sha256}";
}) {};
pkgs.fetchFromGitHub {
owner = "nixos"; owner = "nixos";
repo = "nixpkgs"; repo = "nixpkgs";
rev = "${rev}"; rev = (lib.importJSON ../../../krebs/nixpkgs.json).rev;
sha256 = "${sha256}"; sha256 = (lib.importJSON ../../../krebs/nixpkgs.json).sha256;
} });
'';
}; };
} }

5
lass/krops.nix
View File

@ -11,7 +11,7 @@
{} {}
; ;
source = { test }: lib.evalSource [ source = { test }: lib.evalSource ([
(krebs-source { test = test; }) (krebs-source { test = test; })
{ {
nixos-config.symlink = "stockholm/lass/1systems/${name}/physical.nix"; nixos-config.symlink = "stockholm/lass/1systems/${name}/physical.nix";
@ -24,8 +24,7 @@
}; };
}; };
} }
host-source ] ++ (lib.optional (! test) host-source));
];
in { in {