diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/audio/beets/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/backup/s3ql/default.nix | 2 | ||||
-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 | ||||
-rw-r--r-- | pkgs/tools/networking/dd-agent/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/httpie/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/linkchecker/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/mitmproxy/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/urlwatch/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/package-management/nox/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/vulnix/default.nix | 2 |
14 files changed, 17 insertions, 17 deletions
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 69f0d89e7f85..c1418d152dd2 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -100,7 +100,7 @@ in pythonPackages.buildPythonApplication rec { ++ optional (enableFetchart || enableEmbyupdate || enableAcousticbrainz) - pythonPackages.requests2 + pythonPackages.requests ++ optional enableConvert ffmpeg ++ optional enableDiscogs pythonPackages.discogs_client ++ optional enableKeyfinder keyfinder-cli diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix index a90738d39a4c..05bf38613efd 100644 --- a/pkgs/tools/backup/s3ql/default.nix +++ b/pkgs/tools/backup/s3ql/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ which ]; # tests will fail without which propagatedBuildInputs = with python3Packages; [ - sqlite apsw pycrypto requests2 defusedxml dugong llfuse + sqlite apsw pycrypto requests defusedxml dugong llfuse cython pytest pytest-catchlog ]; 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 ]; diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index e9a70b17130c..d1171a3c8355 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -15,7 +15,7 @@ let propagatedBuildInputs = with pythonPackages; [ six - requests2 + requests websocket_client ipaddress backports_ssl_match_hostname @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { python unzip makeWrapper - pythonPackages.requests2 + pythonPackages.requests pythonPackages.psycopg2 pythonPackages.psutil pythonPackages.ntplib diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index 09200f40c934..84420aa3efb0 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "1jsgfkyzzizgfy1b0aicb4cp34d5pwskz9c4a8kf4rq3lrpjw87i"; }; - propagatedBuildInputs = with pythonPackages; [ pygments requests2 ]; + propagatedBuildInputs = with pythonPackages; [ pygments requests ]; doCheck = false; diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index d6906fdc554f..78bdea475c4b 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -5,7 +5,7 @@ python2Packages.buildPythonApplication rec { version = "9.3"; buildInputs = with python2Packages ; [ pytest ]; - propagatedBuildInputs = with python2Packages ; [ requests2 ] ++ [ gettext ]; + propagatedBuildInputs = with python2Packages ; [ requests ] ++ [ gettext ]; src = fetchurl { url = "mirror://pypi/L/LinkChecker/${name}.tar.gz"; @@ -13,7 +13,7 @@ python2Packages.buildPythonApplication rec { }; # 1. upstream refuses to support ignoring robots.txt - # 2. work around requests2 version detection - can be dropped >v9.3 + # 2. work around requests version detection - can be dropped >v9.3 patches = [ ./add-no-robots-flag.patch ./no-version-check.patch diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix index dcdcf9b734c0..83a526a5535c 100644 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ b/pkgs/tools/networking/mitmproxy/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonPackage rec { blinker click certifi construct cryptography cssutils editorconfig h2 html2text hyperframe jsbeautifier kaitaistruct passlib pyasn1 pyopenssl - pyparsing pyperclip requests2 ruamel_yaml tornado + pyparsing pyperclip requests ruamel_yaml tornado urwid watchdog brotlipy sortedcontainers ]; diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index c1b19f745a3f..8161f700ce18 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { keyring minidb pyyaml - requests2 + requests ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix index 1184c0194bc7..bba7c3d7fa69 100644 --- a/pkgs/tools/package-management/nox/default.nix +++ b/pkgs/tools/package-management/nox/default.nix @@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ dogpile_cache click - requests2 + requests characteristic ]; diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index 55defd680909..a058c2ee1a87 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -27,7 +27,7 @@ in pythonPackages.buildPythonApplication rec{ colorama lxml pyyaml - requests2 + requests external.zodb ]); |