summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lass/krops.nix29
1 files changed, 23 insertions, 6 deletions
diff --git a/lass/krops.nix b/lass/krops.nix
index c8a5b94b7..77164310c 100644
--- a/lass/krops.nix
+++ b/lass/krops.nix
@@ -5,16 +5,33 @@
pkgs
;
-
source = { test }: lib.evalSource ([
(krebs-source { test = test; })
{
nixos-config.symlink = "stockholm/lass/1systems/${name}/physical.nix";
- nixpkgs-unstable.git = {
- url = "https://github.com/nixos/nixpkgs";
- ref = (lib.importJSON ../krebs/nixpkgs-unstable.json).rev;
- shallow = true;
- };
+ nixpkgs = lib.mkForce (if test then {
+ derivation = let
+ rev = (lib.importJSON ../krebs/nixpkgs-unstable.json).rev;
+ sha256 = (lib.importJSON ../krebs/nixpkgs-unstable.json).sha256;
+ in ''
+ with import (builtins.fetchTarball {
+ url = "https://github.com/nixos/nixpkgs/archive/${rev}.tar.gz";
+ sha256 = "${sha256}";
+ }) {};
+ pkgs.fetchFromGitHub {
+ owner = "nixos";
+ repo = "nixpkgs";
+ rev = "${rev}";
+ sha256 = "${sha256}";
+ }
+ '';
+ } else {
+ git = {
+ ref = (lib.importJSON ./nixpkgs.json).rev;
+ url = https://github.com/NixOS/nixpkgs;
+ shallow = true;
+ };
+ });
secrets = if test then {
file = toString ./2configs/tests/dummy-secrets;
} else {