diff options
author | jeschli <jeschli@gmail.com> | 2018-12-16 20:28:28 +0100 |
---|---|---|
committer | jeschli <jeschli@gmail.com> | 2018-12-16 20:28:28 +0100 |
commit | 8605ac91ae3a3859ab906a5fa2e9b0e3dfcd6e1e (patch) | |
tree | 77618847347d2526897e94da744ab57588947567 /makefu/krops.nix | |
parent | 5030b74cc5c578bb82619a24592504a6008f1a10 (diff) | |
parent | 8705b4dbc8e8cf0c4e09c114daad3f96026520ab (diff) |
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'makefu/krops.nix')
-rw-r--r-- | makefu/krops.nix | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/makefu/krops.nix b/makefu/krops.nix index 6c510eba3..2a2f70a05 100644 --- a/makefu/krops.nix +++ b/makefu/krops.nix @@ -7,7 +7,6 @@ host-src = { secure = false; - full = false; torrent = false; hw = false; musnix = false; @@ -23,7 +22,11 @@ { # nixos-18.09 @ 2018-09-18 # + uhub/sqlite: 5dd7610401747 - nixpkgs = if test then { + # + hovercraft: 7134801b17d72 + nixpkgs = if host-src.arm6 then { + # TODO: we want to track the unstable channel + symlink = "/nix/var/nix/profiles/per-user/root/channels/nixos/"; + } else { file = { path = toString (pkgs.fetchFromGitHub { owner = "makefu"; @@ -33,14 +36,6 @@ }); useChecksum = true; }; - } else if host-src.full then { - git.ref = nixpkgs-src.rev; - git.url = nixpkgs-src.url; - } else if host-src.arm6 then { - # TODO: we want to track the unstable channel - symlink = "/nix/var/nix/profiles/per-user/root/channels/nixos/"; - } else { - file = "/home/makefu/store/${nixpkgs-src.rev}"; }; nixos-config.symlink = "stockholm/makefu/1systems/${name}/config.nix"; |