diff options
| author | jeschli <jeschli@gmail.com> | 2019-04-23 20:15:10 +0200 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2019-04-23 20:15:10 +0200 |
| commit | 35fdfbe5ccb3b5844b62ac2486352107484e75d4 (patch) | |
| tree | 561ff21ae90ce6826ab3d74ebd9f27dee7054a0d /makefu/krops.nix | |
| parent | a4be985644762dcc2750a366db5780687690ef7d (diff) | |
| parent | cd825d99342050bae35d5373e927ca999bae82cf (diff) | |
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'makefu/krops.nix')
| -rw-r--r-- | makefu/krops.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/makefu/krops.nix b/makefu/krops.nix index 7c3fbcf4a..36c882d7e 100644 --- a/makefu/krops.nix +++ b/makefu/krops.nix @@ -1,6 +1,6 @@ { config ? config, name, target ? name }: let krops = ../submodules/krops; - nixpkgs-src = lib.importJSON ./nixpkgs.json; + nixpkgs-src = lib.importJSON ../krebs/nixpkgs.json; lib = import "${krops}/lib"; pkgs = import "${krops}/pkgs" {}; @@ -20,10 +20,6 @@ } // import (./. + "/1systems/${name}/source.nix"); source = { test }: lib.evalSource [ { - # nixos-18.09 @ 2018-09-18 - # + uhub/sqlite: 5dd7610401747 - # + hovercraft: 7134801b17d72 - # + PR#53934: eac6797380af1 nixpkgs = if host-src.arm6 then { # TODO: we want to track the unstable channel symlink = "/nix/var/nix/profiles/per-user/root/channels/nixos/"; @@ -31,7 +27,7 @@ derivation = '' with import <nixpkgs> {}; pkgs.fetchFromGitHub { - owner = "makefu"; + owner = "nixos"; repo = "nixpkgs"; rev = "${nixpkgs-src.rev}"; sha256 = "${nixpkgs-src.sha256}"; @@ -75,7 +71,7 @@ (lib.mkIf ( host-src.home-manager ) { home-manager.git = { url = https://github.com/rycee/home-manager; - ref = "4aa07c3"; + ref = "ff602cb906e3dd5d5f89c7c1d0fae65bc67119a0"; }; }) ]; |