From c07c0412418e3979e609fd5200a34dd1830e9334 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 9 May 2019 08:42:23 +0200
Subject: prison-break: finish move from makefu to krebs namespace

---
 makefu/2configs/hw/network-manager.nix | 5 ++++-
 makefu/2configs/nur.nix                | 6 +++---
 makefu/5pkgs/default.nix               | 1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'makefu')

diff --git a/makefu/2configs/hw/network-manager.nix b/makefu/2configs/hw/network-manager.nix
index d7b262b91..e781c7ed1 100644
--- a/makefu/2configs/hw/network-manager.nix
+++ b/makefu/2configs/hw/network-manager.nix
@@ -1,4 +1,7 @@
 { pkgs, lib, ... }:
+let
+  prison-break = pkgs.callPackage ../../../krebs/5pkgs/simple/prison-break {};
+in
 {
   users.users.makefu = {
     extraGroups = [ "networkmanager" ];
@@ -31,6 +34,6 @@
     "/etc/NetworkManager/system-connections"  #NM stateful config files
   ];
   networking.networkmanager.dispatcherScripts = [
-    { source = "${pkgs.prison-break}/bin/prison-break"; }
+    { source = "${prison-break}/bin/prison-break"; }
   ];
 }
diff --git a/makefu/2configs/nur.nix b/makefu/2configs/nur.nix
index dda00063a..3cb4981e0 100644
--- a/makefu/2configs/nur.nix
+++ b/makefu/2configs/nur.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:{
   nixpkgs.config.packageOverrides = pkgs: {
-    nur = pkgs.callPackage (import (builtins.fetchGit {
-      url = "https://github.com/nix-community/NUR";
-    })) {};
+    nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") {
+      inherit pkgs;
+    };
   };
 }
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 1ae10459f..a3c489ccc 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -40,6 +40,7 @@ in {
     qcma = super.pkgs.libsForQt5.callPackage ./custom/qcma { };
     inherit (callPackage ./devpi {}) devpi-web ;
     nodemcu-uploader = super.pkgs.callPackage ./nodemcu-uploader {};
+    prison-break = abort "`prison-break` moved from this namespace to `nur.repos.krebs.prison-break`";
 }
 
 // (mapAttrs (_: flip callPackage {})
-- 
cgit v1.2.3