diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2017-05-07 12:55:45 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-05-07 12:56:09 +0200 |
commit | ef4442e827af928a3fd394cb0731b554a31e8d5b (patch) | |
tree | 4aa8f846f6a3074b4dc99fb16dd14bdc78ac3dd6 /pkgs/tools/misc | |
parent | 024ddb32a7137c81c0e86ba59876c0cf4d5425e7 (diff) | |
download | nixlib-ef4442e827af928a3fd394cb0731b554a31e8d5b.tar nixlib-ef4442e827af928a3fd394cb0731b554a31e8d5b.tar.gz nixlib-ef4442e827af928a3fd394cb0731b554a31e8d5b.tar.bz2 nixlib-ef4442e827af928a3fd394cb0731b554a31e8d5b.tar.lz nixlib-ef4442e827af928a3fd394cb0731b554a31e8d5b.tar.xz nixlib-ef4442e827af928a3fd394cb0731b554a31e8d5b.tar.zst nixlib-ef4442e827af928a3fd394cb0731b554a31e8d5b.zip |
Python: replace requests2 with requests tree-wide
See f63eb5857352705665411130d4f1638d55dd8c58 The `requests2` attribute now throws an error informing that `requests` should be used instead.
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/asciinema/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/kargo/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/svtplay-dl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/system-config-printer/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/vdirsyncer/default.nix | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix index 4b228efee9e1..4d6e90a347e7 100644 --- a/pkgs/tools/misc/asciinema/default.nix +++ b/pkgs/tools/misc/asciinema/default.nix @@ -7,7 +7,7 @@ in pythonPackages.buildPythonApplication rec { version = "1.4.0"; buildInputs = with pythonPackages; [ nose ]; - propagatedBuildInputs = with pythonPackages; [ requests2 ]; + propagatedBuildInputs = with pythonPackages; [ requests ]; src = fetchFromGitHub { owner = "asciinema"; diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix index 734d8fb78e23..4c390f1e80e2 100644 --- a/pkgs/tools/misc/kargo/default.nix +++ b/pkgs/tools/misc/kargo/default.nix @@ -20,7 +20,7 @@ python2Packages.buildPythonApplication rec { markupsafe netaddr pyasn1 - requests2 + requests setuptools ]; diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index a2d6caa15352..8d65f253c9b4 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -2,7 +2,7 @@ , rtmpdump, substituteAll }: let - inherit (pythonPackages) python nose pycrypto requests2 mock; + inherit (pythonPackages) python nose pycrypto requests mock; in stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; version = "1.9.3"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { sha256 = "14qksi1svi89niffykxg47kay013byls6bnhkrkzkanq04075lmw"; }; - pythonPaths = [ pycrypto requests2 ]; + pythonPaths = [ pycrypto requests ]; buildInputs = [ python perl nose mock rtmpdump makeWrapper ] ++ pythonPaths; nativeBuildInputs = [ zip ]; diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 0d66ef66b485..04aa838270cd 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook ]; pythonPath = with pythonPackages; - [ pycups pycurl dbus-python pygobject3 requests2 pycairo pythonPackages.pycurl ]; + [ pycups pycurl dbus-python pygobject3 requests pycairo pythonPackages.pycurl ]; configureFlags = [ "--with-udev-rules" diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index d1fa9d5bea6d..731a194cc6a2 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ click click-log click-threading requests_toolbelt - requests2 + requests atomicwrites ]; |