From aa7fc6786d5195babca6aaefbd0509a87e474add Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 12 May 2017 17:52:37 +0200 Subject: m: requests2 -> requests --- makefu/5pkgs/acdcli/default.nix | 2 +- makefu/5pkgs/bintray-upload/default.nix | 2 +- makefu/5pkgs/devpi/default.nix | 2 +- makefu/5pkgs/elchhub/default.nix | 2 +- makefu/5pkgs/shackie/default.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'makefu') 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"; -- cgit v1.2.3 From 1aa20d39d7361a7f1555191997496011a307ef3f Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 15 May 2017 22:52:48 +0200 Subject: m 2 urlwatch: follow msf --- makefu/2configs/urlwatch.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'makefu') 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 ]; }; } -- cgit v1.2.3 From 56116a4dfa7369787c4f09ed2bb8a2cfd3ed976f Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 15 May 2017 22:53:13 +0200 Subject: m 2 default: fix nixpkgs requests2 fuckup --- makefu/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'makefu') 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 ; 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 { -- cgit v1.2.3