From 436a7e33b6b07a3208c199eebc5a344b266d9137 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Jun 2022 08:33:35 +0000 Subject: [PATCH 1/2] python310Packages.pysmb: 1.2.7 -> 1.2.8 --- pkgs/development/python-modules/pysmb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysmb/default.nix b/pkgs/development/python-modules/pysmb/default.nix index ba4d7df48a07..fa02b6322eff 100644 --- a/pkgs/development/python-modules/pysmb/default.nix +++ b/pkgs/development/python-modules/pysmb/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pysmb"; - version = "1.2.7"; + version = "1.2.8"; src = fetchPypi { inherit pname version; format = "setuptools"; extension = "zip"; - sha256 = "298605b8f467ce15b412caaf9af331c135e88fa2172333af14b1b2916361cb6b"; + sha256 = "sha256-OwfbFiF0ZQOdDCVpTAcFuDZjyoIlniCfNWbVd1Nqc5U="; }; propagatedBuildInputs = [ From ccad0503ba519acda6647e439ab8555cd44e5c4e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 Jun 2022 11:25:06 +0200 Subject: [PATCH 2/2] python310Packages.pysmb: add format - disable on older Python releases --- .../python-modules/pysmb/default.nix | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/pysmb/default.nix b/pkgs/development/python-modules/pysmb/default.nix index fa02b6322eff..01f30bf2d5f1 100644 --- a/pkgs/development/python-modules/pysmb/default.nix +++ b/pkgs/development/python-modules/pysmb/default.nix @@ -1,20 +1,22 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi -, lib - -# pythonPackages , pyasn1 +, pythonOlder }: buildPythonPackage rec { pname = "pysmb"; version = "1.2.8"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; format = "setuptools"; extension = "zip"; - sha256 = "sha256-OwfbFiF0ZQOdDCVpTAcFuDZjyoIlniCfNWbVd1Nqc5U="; + hash = "sha256-OwfbFiF0ZQOdDCVpTAcFuDZjyoIlniCfNWbVd1Nqc5U="; }; propagatedBuildInputs = [ @@ -22,17 +24,18 @@ buildPythonPackage rec { ]; # Tests require Network Connectivity and a server up and running - # https://github.com/miketeo/pysmb/blob/master/python3/tests/README_1st.txt + # https://github.com/miketeo/pysmb/blob/master/python3/tests/README_1st.txt doCheck = false; - pythonImportsCheck = [ "nmb" "smb" ]; + pythonImportsCheck = [ + "nmb" + "smb" + ]; - meta = { + meta = with lib; { description = "Experimental SMB/CIFS library written in Python to support file sharing between Windows and Linux machines"; homepage = "https://miketeo.net/wp/index.php/projects/pysmb"; - license = lib.licenses.zlib; - maintainers = with lib.maintainers; [ - kamadorueda - ]; + license = licenses.zlib; + maintainers = with maintainers; [ kamadorueda ]; }; }