Merge remote-tracking branch 'prism/master'

2 files changed, 19 insertions, 6 deletions

diff --git a/makefu/5pkgs/nixpkgs-pytools/default.nix b/makefu/5pkgs/nixpkgs-pytools/default.nix
new file mode 100644
index 000000000..35146d155
--- /dev/null
+++ b/makefu/5pkgs/nixpkgs-pytools/default.nix
@@ -0,0 +1,17 @@
+{pkgs, fetchFromGitHub}:
+with pkgs.python3.pkgs;
+
+buildPythonPackage rec {
+  pname = "nixpkgs-pytools";
+  version = "1.0.0-dev";
+  src = fetchFromGitHub {
+    owner = "nix-community";
+    repo = pname;
+    rev = "593443b5689333cad3b6fa5b42e96587df68b0f8";
+    sha256 = "1cjpngr1rn5q59a1krgmpq2qm96wbiirc8yf1xmm21p3mskb2db4";
+  };
+  propagatedBuildInputs = [
+    jinja2 setuptools
+  ];
+  checkInputs = [ black ];
+}
diff --git a/makefu/krops.nix b/makefu/krops.nix
index 7c3fbcf4a..219e00d72 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}";