From 2589f81f9a9f53ccfc40d946ca693a83f2c81900 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 26 Dec 2017 23:20:56 +0100
Subject: x: use nixos-hardware

---
 makefu/source.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'makefu/source.nix')

diff --git a/makefu/source.nix b/makefu/source.nix
index ce585543..2456dc76 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -4,7 +4,9 @@ host@{ name,
   secure ? false,
   full ? false,
   torrent ? false,
-  musnix ? false
+  hw ? false,
+  musnix ? false,
+  python ? false
 }:
 let
   builder = if getEnv "dummy_secrets" == "true"
@@ -45,6 +47,20 @@ in
         ref = "d8b989f";
       };
     })
+
+    (mkIf ( hw ) {
+      nixos-hardware.git = {
+        url = https://github.com/makefu/nixos-hardware.git;
+        ref = "1fef1c1";
+      };
+    })
+
+    (mkIf ( python ) {
+      python.git = {
+        url = https://github.com/garbas/nixpkgs-python;
+        ref = "cac319b";
+      };
+    })
     (mkIf ( torrent ) {
       torrent-secrets.file = getAttr builder {
         buildbot = toString <stockholm/makefu/6tests/data/secrets>;
-- 
cgit v1.2.3


From 9d4436644115c2cc5c130d9c210c201bb506c789 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 28 Dec 2017 15:10:22 +0100
Subject: ma source: use official nixos-hardware

---
 makefu/source.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'makefu/source.nix')

diff --git a/makefu/source.nix b/makefu/source.nix
index 2456dc76..fde1d968 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -50,8 +50,8 @@ in
 
     (mkIf ( hw ) {
       nixos-hardware.git = {
-        url = https://github.com/makefu/nixos-hardware.git;
-        ref = "1fef1c1";
+        url = https://github.com/nixos/nixos-hardware.git;
+        ref = "8a05dc9";
       };
     })
 
-- 
cgit v1.2.3


From 6ad170e7621668fdcf03aab37d1f9843e446d2da Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 4 Jan 2018 00:20:47 +0100
Subject: ma source: fix FUCKWIT

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

(limited to 'makefu/source.nix')

diff --git a/makefu/source.nix b/makefu/source.nix
index fde1d968..ccdc7b9f 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -13,7 +13,7 @@ let
               then "buildbot"
               else "makefu";
   _file = <stockholm> + "/makefu/1systems/${name}/source.nix";
-  ref = "3874de4"; # unstable @ 2017-12-08
+  ref = "475bec2"; # unstable @ 2017-08-04
                    # + do_sqlite3 ruby: 55a952be5b5
 
 in
-- 
cgit v1.2.3


From e02e7053aaabc883ae4a6aa23886b6ee92cebb79 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 4 Jan 2018 18:36:47 +0100
Subject: ma source: cherry-pick latest kernel bump

---
 makefu/source.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'makefu/source.nix')

diff --git a/makefu/source.nix b/makefu/source.nix
index ccdc7b9f..822b1e7c 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -13,8 +13,9 @@ let
               then "buildbot"
               else "makefu";
   _file = <stockholm> + "/makefu/1systems/${name}/source.nix";
-  ref = "475bec2"; # unstable @ 2017-08-04
+  ref = "d37e53e"; # unstable @ 2017-12-08
                    # + do_sqlite3 ruby: 55a952be5b5
+                   # + kernel bump: 1e129a3f993
 
 in
   evalSource (toString _file) [
-- 
cgit v1.2.3


From 77d53e841b7eaed58925571c2bdeb51cdc5e82a3 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 4 Jan 2018 23:18:32 +0100
Subject: ma source: retry to bump nixpkgs

---
 makefu/source.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'makefu/source.nix')

diff --git a/makefu/source.nix b/makefu/source.nix
index 822b1e7c..6b305b64 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -13,9 +13,8 @@ let
               then "buildbot"
               else "makefu";
   _file = <stockholm> + "/makefu/1systems/${name}/source.nix";
-  ref = "d37e53e"; # unstable @ 2017-12-08
+  ref = "26ed774"; # nixpkgs-unstable @ 2018-01-04
                    # + do_sqlite3 ruby: 55a952be5b5
-                   # + kernel bump: 1e129a3f993
 
 in
   evalSource (toString _file) [
-- 
cgit v1.2.3


From 801f2f0926d665fb2a3c2fd9184706a2235fe960 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 5 Jan 2018 11:52:07 +0100
Subject: ma source: back to stable

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

(limited to 'makefu/source.nix')

diff --git a/makefu/source.nix b/makefu/source.nix
index 6b305b64..647803fd 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -13,7 +13,7 @@ let
               then "buildbot"
               else "makefu";
   _file = <stockholm> + "/makefu/1systems/${name}/source.nix";
-  ref = "26ed774"; # nixpkgs-unstable @ 2018-01-04
+  ref = "3e8d708"; # nixos-17.09 @ 2018-01-05
                    # + do_sqlite3 ruby: 55a952be5b5
 
 in
-- 
cgit v1.2.3