From d8590aefb252087111364aa718b59e33d79a60db Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 12 Apr 2019 19:30:02 +0200
Subject: ma krops: use upstream krebs nixpkgs.json

---
 makefu/krops.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'makefu/krops.nix')

diff --git a/makefu/krops.nix b/makefu/krops.nix
index 7c3fbcf4a..c180dcf3e 100644
--- a/makefu/krops.nix
+++ b/makefu/krops.nix
@@ -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}";
-- 
cgit v1.2.3


From 1c3ac6e6cf4eb673f8ba8ccb3be3fd8d03d78202 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 12 Apr 2019 20:42:32 +0200
Subject: ma krops: use krebs upstream json

---
 makefu/krops.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/krops.nix')

diff --git a/makefu/krops.nix b/makefu/krops.nix
index c180dcf3e..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" {};
-- 
cgit v1.2.3


From 807546f87b6cbc7e704036057b8115fc570afbba Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 17 Apr 2019 20:47:30 +0200
Subject: ma krops: bump to latest ref

---
 makefu/krops.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/krops.nix')

diff --git a/makefu/krops.nix b/makefu/krops.nix
index 219e00d72..36c882d7e 100644
--- a/makefu/krops.nix
+++ b/makefu/krops.nix
@@ -71,7 +71,7 @@
     (lib.mkIf ( host-src.home-manager ) {
       home-manager.git = {
         url = https://github.com/rycee/home-manager;
-        ref = "4aa07c3";
+        ref = "ff602cb906e3dd5d5f89c7c1d0fae65bc67119a0";
       };
     })
   ];
-- 
cgit v1.2.3