From 8bda4a282de9b20b5b72aeaf1f987677936f53b7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 1 Jun 2021 17:15:34 +0200 Subject: [PATCH 1/4] python3Packages.oscrypto: 1.1.1 -> 1.2.1 --- .../python-modules/oscrypto/default.nix | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/oscrypto/default.nix b/pkgs/development/python-modules/oscrypto/default.nix index 6012398db982..cc89f3124806 100644 --- a/pkgs/development/python-modules/oscrypto/default.nix +++ b/pkgs/development/python-modules/oscrypto/default.nix @@ -1,25 +1,30 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , asn1crypto , fetchPypi -, lib , openssl }: buildPythonPackage rec { pname = "oscrypto"; - version = "1.1.1"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1vlryamwr442w2av8f54ldhls8fqs6678fg60pqbrf5pjy74kg23"; + sha256 = "1546si2bdgkqnbvv4mw1hr4mhh6bq39d9z4wxgv1m7fq6miclb3x"; }; testSources = fetchPypi { inherit version; pname = "oscrypto_tests"; - sha256 = "1crndz647pqdd8148yn3n5l63xwr6qkwa1qarsz59nk3ip0dsyq5"; + sha256 = "1ha68dsrbx6mlra44x0n81vscn17pajbl4yg7cqkk7mq1zfmjwks"; }; + propagatedBuildInputs = [ + asn1crypto + openssl + ]; + preCheck = '' tar -xf ${testSources} mv oscrypto_tests-${version} tests @@ -28,14 +33,11 @@ buildPythonPackage rec { sed -e '/TLSTests/d' -e '/TrustListTests/d' -i tests/__init__.py ''; - propagatedBuildInputs = [ - asn1crypto - openssl - ]; + pythonImportsCheck = [ "oscrypto" ]; meta = with lib; { - description = "A compilation-free, always up-to-date encryption library for Python that works on Windows, OS X, Linux and BSD."; - homepage = "https://www.snowflake.com/"; + description = "Encryption library for Python"; + homepage = "https://github.com/wbond/oscrypto"; license = licenses.mit; }; } From bcc835feedbeb42909c82e661f4cacba404fb002 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 1 Jun 2021 17:17:06 +0200 Subject: [PATCH 2/4] python3Packages.minikerberos: 0.2.11 -> 0.2.14 --- pkgs/development/python-modules/minikerberos/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/minikerberos/default.nix b/pkgs/development/python-modules/minikerberos/default.nix index ee0812eacecc..d1e0616cfb68 100644 --- a/pkgs/development/python-modules/minikerberos/default.nix +++ b/pkgs/development/python-modules/minikerberos/default.nix @@ -3,24 +3,27 @@ , asysocks , buildPythonPackage , fetchPypi +, oscrypto }: buildPythonPackage rec { pname = "minikerberos"; - version = "0.2.11"; + version = "0.2.14"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OC+Cnk47GFzK1QaDEDxntRVrakpFiBuNelM/R5t/AUY="; + sha256 = "sha256-MND7r4Gkx9RnEMgEl62QXFYr1NEloihQ2HeU9hyhsx8="; }; propagatedBuildInputs = [ asn1crypto asysocks + oscrypto ]; # no tests are published: https://github.com/skelsec/minikerberos/pull/5 doCheck = false; + pythonImportsCheck = [ "minikerberos" ]; meta = with lib; { From 4215f9c9ec1fe9fe1bc41cfbded25f2c6607bcbf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 1 Jun 2021 17:19:39 +0200 Subject: [PATCH 3/4] python3Packages.aiosmb: 0.2.41 -> 0.2.44 --- pkgs/development/python-modules/aiosmb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiosmb/default.nix b/pkgs/development/python-modules/aiosmb/default.nix index ce20341eae1d..b9c968d63f5b 100644 --- a/pkgs/development/python-modules/aiosmb/default.nix +++ b/pkgs/development/python-modules/aiosmb/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "aiosmb"; - version = "0.2.41"; + version = "0.2.44"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hiLLoFswh0rm5f5TsaX+zyRDkOIyzGXVO0M5J5d/gtQ="; + sha256 = "sha256-xNdrOO0BqV4sD6U39G2RXihDBBf516x8RLiqNLnZyWk="; }; propagatedBuildInputs = [ From 552be16fbfd5050063ae2d9db9b9d28ffa5d9bc6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 1 Jun 2021 17:56:34 +0200 Subject: [PATCH 4/4] python3Packages.msldap: 0.3.29 -> 0.3.30 --- pkgs/development/python-modules/msldap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msldap/default.nix b/pkgs/development/python-modules/msldap/default.nix index 12bfb7d7603e..649276ef252f 100644 --- a/pkgs/development/python-modules/msldap/default.nix +++ b/pkgs/development/python-modules/msldap/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "msldap"; - version = "0.3.29"; + version = "0.3.30"; src = fetchPypi { inherit pname version; - sha256 = "0khwyhylh28qvz35pdckr5fdd82zsybv0xmzlzjbgcv99cyy1a94"; + sha256 = "sha256-fX+W1Bq4F0/6DyxWeA6zvoswFQCdDpSk29g7nq1cYYE="; }; propagatedBuildInputs = [