Merge remote-tracking branch 'gum/master'

8 files changed, 8 insertions, 7 deletions

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 7d0faae94..0d61e8dee 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -22,7 +22,7 @@ with import <stockholm/lib>;
       user = config.krebs.users.makefu;
       source = let
           inherit (config.krebs.build) host user;
-          ref = "0afb6d7"; # unstable @ 2017-05-09
+          ref = "a772c3a"; # unstable @ 2017-05-09 + graceful requests2
       in {
         nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
           {
diff --git a/makefu/2configs/urlwatch.nix b/makefu/2configs/urlwatch.nix
index d1dcec657..9493b2b7b 100644
--- a/makefu/2configs/urlwatch.nix
+++ b/makefu/2configs/urlwatch.nix
@@ -20,6 +20,7 @@
       https://api.github.com/repos/dorimanx/exfat-nofuse/commits
       https://api.github.com/repos/dorimanx/exfat-nofuse/tags
       https://api.github.com/repos/radare/radare2/tags
+      https://api.github.com/repos/rapid7/metasploit-framework/tags
     ];
   };
 }
diff --git a/makefu/5pkgs/acdcli/default.nix b/makefu/5pkgs/acdcli/default.nix
index 6442fecbf..13b19e482 100644
--- a/makefu/5pkgs/acdcli/default.nix
+++ b/makefu/5pkgs/acdcli/default.nix
@@ -4,7 +4,7 @@ with python3Packages; buildPythonPackage rec {
   name = "acdcli-${version}";
   version = "0.3.2";
   propagatedBuildInputs = [
-    dateutil colorama fusepy appdirs requests2 requests_toolbelt six
+    dateutil colorama fusepy appdirs requests requests_toolbelt six
   ];
   src = fetchurl {
     url = "mirror://pypi/a/acdcli/${name}.tar.gz";
diff --git a/makefu/5pkgs/bintray-upload/default.nix b/makefu/5pkgs/bintray-upload/default.nix
index 1e9582cca..099b8ca88 100644
--- a/makefu/5pkgs/bintray-upload/default.nix
+++ b/makefu/5pkgs/bintray-upload/default.nix
@@ -10,7 +10,7 @@ pkgs.python3Packages.buildPythonPackage rec {
     sha256 = "1401saisk98n5wgw73nwh8hb484vayw5c6dlypxc1fp4ybym4zi9";
   };
 
-  propagatedBuildInputs = with pkgs.python3Packages; [ requests2 ];
+  propagatedBuildInputs = with pkgs.python3Packages; [ requests ];
 
   meta = {
     description = "Simple BinTray utility for uploading packages";
diff --git a/makefu/5pkgs/devpi/default.nix b/makefu/5pkgs/devpi/default.nix
index 020b2fdc2..e7c26da55 100644
--- a/makefu/5pkgs/devpi/default.nix
+++ b/makefu/5pkgs/devpi/default.nix
@@ -56,7 +56,7 @@ let
       sha256 = "0l3a7iyk596x6pvzg7604lzzi012qszr804fqn6f517zcy1xz23j";
     };
 
-    propagatedBuildInputs = with pkgs.python3Packages; [ requests2 py ];
+    propagatedBuildInputs = with pkgs.python3Packages; [ requests py ];
 
     meta = {
       homepage = https://bitbucket.org/hpk42/devpi;
diff --git a/makefu/5pkgs/elchhub/default.nix b/makefu/5pkgs/elchhub/default.nix
index a28267cb1..76ba834ab 100644
--- a/makefu/5pkgs/elchhub/default.nix
+++ b/makefu/5pkgs/elchhub/default.nix
@@ -16,7 +16,7 @@ in buildPythonPackage rec {
   version = "1.0.5";
   propagatedBuildInputs = [
     flask
-    requests2
+    requests
     ftputil
     redis
   ];
diff --git a/makefu/5pkgs/shackie/default.nix b/makefu/5pkgs/shackie/default.nix
index ce926fcd6..b6cf8afe6 100644
--- a/makefu/5pkgs/shackie/default.nix
+++ b/makefu/5pkgs/shackie/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
       lxml
       pytz
       redis
-      requests2
+      requests
     ];
     src = fetchFromGitHub {
       owner = "shackspace";
diff --git a/shared/2configs/default.nix b/shared/2configs/default.nix
index 49c0d3d95..e7f600cd0 100644
--- a/shared/2configs/default.nix
+++ b/shared/2configs/default.nix
@@ -11,7 +11,7 @@ with import <stockholm/lib>;
     nixos-config.symlink = "stockholm/${user.name}/1systems/${host.name}.nix";
     nixpkgs.git = {
       url = https://github.com/NixOS/nixpkgs;
-      ref = "5b0c9d4f92f15f171afa65caf13a29ac1c068a10"; # nixos-17.03 @ 2017-03-03
+      ref = "22da5d02466ffe465735986d705675982f3646a0"; # nixos-17.03 @ 2017-05-13
     };
     secrets.file =
       if getEnv "dummy_secrets" == "true"