gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #138268 from NixOS/staging-next

Browse Source 
Staging next 2021-09-17
This commit is contained in:
Luke Granger-Brown
2021-09-24 12:07:12 +01:00
committed by GitHub
parent 22e82f4850 0459b65930
commit a78925d568
241 changed files with 3447 additions and 2675 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/python-modules/black/default.nix
+2 -2
View File
@@ -20,13 +20,13 @@
buildPythonPackage rec {
pname = "black";
version = "21.8b0";
version = "21.9b0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-VwYI0oqjrxeSuYxKM326xjZ4d7R7EriKtCCVz8GmJ8I=";
sha256 = "sha256-feTPx+trcQ3jJXEtQBJWiRAdIdJSg+7X6ZmHIs8Q65E=";
};
nativeBuildInputs = [ setuptools-scm ];
pkgs/development/python-modules/cryptography/default.nix
+3 -3
View File
@@ -23,18 +23,18 @@
buildPythonPackage rec {
pname = "cryptography";
version = "3.4.7"; # Also update the hash in vectors.nix
version = "3.4.8"; # Also update the hash in vectors.nix
src = fetchPypi {
inherit pname version;
sha256 = "04x7bhjkglxpllad10821vxddlmxdkd3gjvp35iljmnj2s0xw41x";
sha256 = "072awar70cwfd2hnx0pvp1dkc7gw45mbm3wcyddvxz5frva5xk4l";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
sourceRoot = "${pname}-${version}/${cargoRoot}";
name = "${pname}-${version}";
sha256 = "1m6smky4nahwlp4hn6yzibrcxlbsw4nx162dsq48vlw8h1lgjl62";
sha256 = "01h511h6l4qvjxbaw662m1l84pb4wrhwxmnb3qj6ik13mx2m477m";
};
cargoRoot = "src/rust";
pkgs/development/python-modules/cryptography/vectors.nix
+1 -1
View File
@@ -7,7 +7,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "1hh4j88ywil3jf62ppj1blygmdirbqz86pynd9lqfijiaym3mb57";
sha256 = "1wl0ynh3lzhc6q59g8mybvijmnp195x7fjxlb3h3sgcraw14312c";
};
# No tests included
pkgs/development/python-modules/fpyutils/default.nix
+1 -1
View File
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "frnmst";
repo = pname;
rev = version;
sha256 = "sha256-VYknHuBoU7XWkm6mt8ckBzFLMcYTPW5CXMGdOn3perY=";
sha256 = "1dksx5ykm7f1bi16wg8kqqqlnc874k3vg9kfjbbbalv8w0g2g2am";
};
propagatedBuildInputs = [
pkgs/development/python-modules/libarcus/default.nix
+11 -1
View File
@@ -1,4 +1,5 @@
{ lib, buildPythonPackage, python, fetchFromGitHub
, fetchpatch
, cmake, sip_4, protobuf, pythonOlder }:
buildPythonPackage rec {
@@ -13,7 +14,16 @@ buildPythonPackage rec {
sha256 = "1ahka8s8fjwymyr7pca7i7h51ikfr35zy4nkzfcjn946x7p0dprf";
};
disabled = pythonOlder "3.4.0";
patches = [
# Fix build against protobuf 3.18+
# https://github.com/Ultimaker/libArcus/issues/121
(fetchpatch {
url = "https://raw.githubusercontent.com/coryan/vcpkg/f69b85aa403b04e7d442c90db3418d484e44024f/ports/arcus/0001-fix-protobuf-deprecated.patch";
sha256 = "0bqj7pxzpwsamknd6gadj419x6mwx8wnlfzg4zqn6cax3cmasjb2";
})
];
disabled = pythonOlder "3.4";
propagatedBuildInputs = [ sip_4 ];
nativeBuildInputs = [ cmake ];
pkgs/development/python-modules/motor/default.nix
+11 -5
View File
@@ -1,23 +1,29 @@
{ lib, buildPythonPackage, fetchFromGitHub
, pymongo, mockupdb
{ lib
, buildPythonPackage
, fetchFromGitHub
, mockupdb
, pymongo
, pythonOlder
}:
buildPythonPackage rec {
pname = "motor";
version = "2.4.0";
version = "2.5.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "mongodb";
repo = pname;
rev = version;
sha256 = "1sgaqg98h35lazzdi015q1i60ig7krid8b10a5rm6lf755y8yj2c";
sha256 = "sha256-r+HyIEC+Jafn7eMqkAldsZ5hbem+n+P76RJGAymmBks=";
};
propagatedBuildInputs = [ pymongo ];
checkInputs = [ mockupdb ];
# network connections
doCheck = false;
checkInputs = [ mockupdb ];
pythonImportsCheck = [ "motor" ];
pkgs/development/python-modules/pandas/default.nix
+2
View File
@@ -105,6 +105,8 @@ buildPythonPackage rec {
"test_missing_required_dependency"
# AssertionError with 1.2.3
"test_from_coo"
# AssertionError: No common DType exists for the given inputs
"test_comparison_invalid"
] ++ lib.optionals stdenv.isDarwin [
"test_locale"
"test_clipboard"
pkgs/development/python-modules/pathspec/default.nix
+1 -1
View File
@@ -9,7 +9,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-5WRJlDWiZz1Yb2shMLtblfBKO6Bvgbj4lbZRo8dqq7E=";
sha256 = "e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1";
};
meta = {
pkgs/development/python-modules/pillow/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
import ./generic.nix (rec {
pname = "Pillow";
version = "8.3.1";
version = "8.3.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "2cac53839bfc5cece8fdbe7f084d5e3ee61e1303cccc86511d351adcb9e2c792";
sha256 = "1361y215ydmdh4il1vay5831aqivmpwgzjqrphqjdiq0ipnz7qyx";
};
meta = with lib; {
pkgs/development/python-modules/poetry-core/default.nix
+3
View File
@@ -53,6 +53,9 @@ buildPythonPackage rec {
pythonImportsCheck = [ "poetry.core" ];
# allow for package to use pep420's native namespaces
pythonNamespaces = [ "poetry" ];
meta = with lib; {
description = "Core utilities for Poetry";
homepage = "https://github.com/python-poetry/poetry-core/";
pkgs/development/python-modules/poetry/default.nix
+3
View File
@@ -99,6 +99,9 @@ buildPythonPackage rec {
})
];
# allow for package to use pep420's native namespaces
pythonNamespaces = [ "poetry" ];
meta = with lib; {
homepage = "https://python-poetry.org/";
description = "Python dependency management and packaging made easy";
pkgs/development/python-modules/pymongo/default.nix
+12 -4
View File
@@ -1,20 +1,28 @@
{ lib, buildPythonPackage, fetchPypi }:
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
}:
buildPythonPackage rec {
pname = "pymongo";
version = "3.11.4";
version = "3.12.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "539d4cb1b16b57026999c53e5aab857fe706e70ae5310cc8c232479923f932e6";
sha256 = "sha256-uI0XQhWbyToHhzP5eJ9WPO8m9eNw66gQR2pxqpjl+8I=";
};
# Tests call a running mongodb instance
doCheck = false;
pythonImportsCheck = [ "pymongo" ];
meta = with lib; {
description = "Python driver for MongoDB";
homepage = "https://github.com/mongodb/mongo-python-driver";
license = licenses.asl20;
description = "Python driver for MongoDB";
maintainers = with maintainers; [ ];
};
}
pkgs/development/python-modules/scikit-learn/0.20.nix
+2 -1
View File
@@ -16,7 +16,8 @@ buildPythonPackage rec {
sha256 = "1z3w2c50dwwa297j88pr16pyrjysagsvdj7vrlq40q8777rs7a6z";
};
buildInputs = [ pillow gfortran glibcLocales ];
nativeBuildInputs = [ gfortran ];
buildInputs = [ pillow glibcLocales ];
propagatedBuildInputs = [ numpy scipy numpy.blas ];
checkInputs = [ pytest ];
pkgs/development/python-modules/scikit-learn/default.nix
+1 -1
View File
@@ -38,7 +38,6 @@ buildPythonPackage rec {
buildInputs = [
pillow
gfortran
glibcLocales
] ++ lib.optionals stdenv.cc.isClang [
llvmPackages.openmp
@@ -46,6 +45,7 @@ buildPythonPackage rec {
nativeBuildInputs = [
cython
gfortran
];
propagatedBuildInputs = [
pkgs/development/python-modules/service_identity/default.nix
+23 -13
View File
@@ -1,37 +1,47 @@
{ lib
, attrs
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, cryptography
, fetchFromGitHub
, idna
, ipaddress
, pyasn1
, pyasn1-modules
, idna
, attrs
, pytest
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "service_identity";
version = "18.1.0";
pname = "service-identity";
version = "21.1.0";
src = fetchFromGitHub {
owner = "pyca";
repo = pname;
rev = version;
sha256 = "1aw475ksmd4vpl8cwfdcsw2v063nbhnnxpy633sb75iqp9aazhlx";
sha256 = "sha256-pWc2rU3ULqEukMhd1ySY58lTm3s8f/ayQ7CY4nG24AQ=";
};
propagatedBuildInputs = [
pyasn1 pyasn1-modules idna attrs cryptography
] ++ lib.optionals (pythonOlder "3.3") [ ipaddress ];
attrs
cryptography
idna
pyasn1
pyasn1-modules
] ++ lib.optionals (pythonOlder "3.3") [
ipaddress
];
checkInputs = [ pytest ];
checkPhase = "py.test";
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "service_identity" ];
meta = with lib; {
description = "Service identity verification for pyOpenSSL";
license = licenses.mit;
homepage = "https://service-identity.readthedocs.io";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}
pkgs/development/python-modules/setuptools-scm/default.nix
+21 -14
View File
@@ -1,29 +1,36 @@
{ lib, buildPythonPackage, fetchPypi, toml, tomli }:
{ buildPythonPackage
, callPackage
, fetchPypi
, packaging
, tomli
, lib
}:
buildPythonPackage rec {
pname = "setuptools-scm";
# don't update to 6.1.0 or 6.2.0, releases were pulled because of regression
# https://github.com/pypa/setuptools_scm/issues/615
version = "6.0.1";
version = "6.3.1";
src = fetchPypi {
pname = "setuptools_scm";
inherit version;
sha256 = "sha256-0ZJaacsH6bKUFqJ1ufrbAJojwUis6QWy+yIGSabBjpI=";
sha256 = "sha256-D2omORKxN5jAKLmicdka873g5CeECRx5fezMOtOn9ZY=";
};
postPatch = ''
substituteInPlace setup.cfg \
--replace "tomli~=1.0.0" "tomli>=1.0.0"
'';
propagatedBuildInputs = [
packaging
tomli
];
# TODO: figure out why both toml and tomli are needed when only tomli is listed in setuptools-scm
# if not both are listed some packages like zipp silently fallback to a 0.0.0 version number and break version pins in other packages
propagatedBuildInputs = [ toml tomli ];
pythonImportsCheck = [
"setuptools_scm"
];
# Requires pytest, circular dependency
# check in passhtru.tests.pytest to escape infinite recursion on pytest
doCheck = false;
pythonImportsCheck = [ "setuptools_scm" ];
passthru.tests = {
pytest = callPackage ./tests.nix { };
};
meta = with lib; {
homepage = "https://github.com/pypa/setuptools_scm/";
pkgs/development/python-modules/setuptools-scm/tests.nix
+33
View File
@@ -0,0 +1,33 @@
{ lib
, buildPythonPackage
, setuptools-scm
, pytestCheckHook
, git
, mercurial
, pip
, virtualenv
}:
buildPythonPackage rec {
pname = "setuptools-scm-tests";
inherit (setuptools-scm) version;
src = setuptools-scm.src;
dontBuild = true;
dontInstall = true;
checkInputs = [
pytestCheckHook
setuptools-scm
pip
virtualenv
git
mercurial
];
disabledTests = [
# network access
"test_pip_download"
];
}
pkgs/development/python-modules/sphinx/default.nix
+4 -2
View File
@@ -23,7 +23,6 @@
, sphinxcontrib-websupport
# check phase
, html5lib
, imagemagick
, pytestCheckHook
, typed-ast
}:
@@ -70,7 +69,6 @@ buildPythonPackage rec {
];
checkInputs = [
imagemagick
html5lib
pytestCheckHook
] ++ lib.optionals (pythonOlder "3.8") [
@@ -83,6 +81,10 @@ buildPythonPackage rec {
"test_defaults"
"test_defaults_json"
"test_latex_images"
# requires imagemagick (increases build closure size), doesn't
# test anything substantial
"test_ext_imgconverter"
];
meta = with lib; {
pkgs/development/python-modules/sqlalchemy/default.nix
+2 -2
View File
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "SQLAlchemy";
version = "1.4.22";
version = "1.4.23";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-7BvibNzNYNGANZpSfVmA2VmiYmmix7GzJ6HuoMqzftg=";
sha256 = "sha256-dv8kaIH1KAib8ZOFExuWYZe7SUZTmQOW0s4TjipEdYM=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/trustme/default.nix
+7 -5
View File
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "trustme";
version = "0.8.0";
version = "0.9.0";
src = fetchPypi {
inherit pname version;
sha256 = "3dcfbe186bf33d146347c6180b67564257f2708960027ab6d24fea2865daabca";
sha256 = "sha256-XgeyPXDO7WTzuzauS5q8UjVMFsmNRasDe+4rX7/+WGw=";
};
checkInputs = [
@@ -42,10 +42,12 @@ buildPythonPackage rec {
# Some of the tests use localhost networking.
__darwinAllowLocalNetworking = true;
meta = {
pythonImportsCheck = [ "trustme" ];
meta = with lib; {
description = "High quality TLS certs while you wait, for the discerning tester";
homepage = "https://github.com/python-trio/trustme";
license = with lib.licenses; [ mit asl20 ];
maintainers = with lib.maintainers; [ catern ];
license = with licenses; [ mit asl20 ];
maintainers = with maintainers; [ catern ];
};
}