nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-25 17:55:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #116535 from SuperSandro2000/fix-collection27

Browse Source
This commit is contained in:
Sandro
2021-03-18 13:43:53 +01:00
committed by GitHub
parent 5564ef775d 748c446969
commit 779428586c
22 changed files with 64 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/python-modules/backports_ssl_match_hostname/default.nix
View File

@@ -1,8 +1,9 @@
{ lib, buildPythonPackage, fetchPypi }:
{ lib, buildPythonPackage, fetchPypi, pythonAtLeast }:
buildPythonPackage rec {
pname = "backports.ssl_match_hostname";
version = "3.7.0.1";
disabled = pythonAtLeast "3.7";
src = fetchPypi {
inherit pname version;

4
pkgs/development/python-modules/geventhttpclient/default.nix
View File

@@ -6,6 +6,7 @@
, certifi
, six
, backports_ssl_match_hostname
, pythonOlder
}:
buildPythonPackage rec {
@@ -18,7 +19,8 @@ buildPythonPackage rec {
};
buildInputs = [ pytest ];
propagatedBuildInputs = [ gevent certifi six backports_ssl_match_hostname ];
propagatedBuildInputs = [ gevent certifi six ]
++ lib.optionals (pythonOlder "3.7") [ backports_ssl_match_hostname ];
# Several tests fail that require network
doCheck = false;

2
pkgs/development/python-modules/gradient-utils/default.nix
View File

@@ -26,7 +26,7 @@ buildPythonPackage rec {
substituteInPlace pyproject.toml \
--replace 'numpy = "1.18.5"' 'numpy = "^1.18.5"' \
--replace 'hyperopt = "0.1.2"' 'hyperopt = ">=0.1.2"' \
--replace 'wheel = "^0.35.1"' 'wheel = "^0.36"'
--replace 'wheel = "^0.35.1"' 'wheel = "*"'
'';
nativeBuildInputs = [ poetry-core ];

10
pkgs/development/python-modules/soco/default.nix
View File

@@ -30,10 +30,12 @@ buildPythonPackage rec {
sha256 = "sha256-CCgkzUkt9YqTJt9tPBLmYXW6ZuRoMDd7xahYmNXgfM0=";
};
patches = [(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/SoCo/SoCo/pull/811.patch";
sha256 = "sha256-GBd74c8zc25ROO411SZ9TTa+bi8yXJaaOQqY9FM1qj4=";
})];
patches = [
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/SoCo/SoCo/pull/811.patch";
sha256 = "sha256-GBd74c8zc25ROO411SZ9TTa+bi8yXJaaOQqY9FM1qj4=";
})
];
# N.B. These exist because:
# 1. Upstream's pinning isn't well maintained, leaving dependency versions no