diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-02-03 10:56:07 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-02-03 10:56:07 +0100 |
commit | dd57c6379333b3e841b947786b14d5cd586f8c4a (patch) | |
tree | 6f43087d0bc2ffa45a98d64ce0d653d14265f981 /pkgs/top-level/python-packages.nix | |
parent | 84fb5c6a0d08530631b60d6a70c9df987c7cd933 (diff) | |
parent | 55e0f12761f024582b26254ba3ad91ee2e5ee12a (diff) | |
download | nixlib-dd57c6379333b3e841b947786b14d5cd586f8c4a.tar nixlib-dd57c6379333b3e841b947786b14d5cd586f8c4a.tar.gz nixlib-dd57c6379333b3e841b947786b14d5cd586f8c4a.tar.bz2 nixlib-dd57c6379333b3e841b947786b14d5cd586f8c4a.tar.lz nixlib-dd57c6379333b3e841b947786b14d5cd586f8c4a.tar.xz nixlib-dd57c6379333b3e841b947786b14d5cd586f8c4a.tar.zst nixlib-dd57c6379333b3e841b947786b14d5cd586f8c4a.zip |
Merge branch 'staging'
There are some Darwin regressions and a mysterious Lisp issue, but also a security update of curl...
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
-rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c5f6ac1fb2c1..38e7f3e87c43 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1019,7 +1019,7 @@ in { backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { }; - backports_ssl_match_hostname_3_4_0_2 = self.buildPythonPackage rec { + backports_ssl_match_hostname_3_4_0_2 = if !(pythonOlder "3.5") then null else self.buildPythonPackage rec { name = "backports.ssl_match_hostname-3.4.0.2"; src = pkgs.fetchurl { @@ -1033,7 +1033,7 @@ in { }; }; - backports_ssl_match_hostname = self.buildPythonPackage rec { + backports_ssl_match_hostname = if !(pythonOlder "3.5") then null else self.buildPythonPackage rec { name = "backports.ssl_match_hostname-${version}"; version = "3.5.0.1"; |