From 49719ae6e435e3af889a9bb9d010d5d968a02068 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 14:27:51 -0400 Subject: [PATCH] pythonPackages.Fabric: 1.13.2 -> 2.4.0 refactor move to python-modules --- .../python-modules/Fabric/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +--------- 2 files changed, 37 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/Fabric/default.nix diff --git a/pkgs/development/python-modules/Fabric/default.nix b/pkgs/development/python-modules/Fabric/default.nix new file mode 100644 index 00000000000..ed89c26943f --- /dev/null +++ b/pkgs/development/python-modules/Fabric/default.nix @@ -0,0 +1,36 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, invoke +, paramiko +, cryptography +, pytest +, mock +, pytest-relaxed +}: + +buildPythonPackage rec { + pname = "fabric"; + version = "2.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "93684ceaac92e0b78faae551297e29c48370cede12ff0f853cdebf67d4b87068"; + }; + + propagatedBuildInputs = [ invoke paramiko cryptography ]; + checkInputs = [ pytest mock pytest-relaxed ]; + + # ignore subprocess main errors (1) due to hardcoded /bin/bash + checkPhase = '' + rm tests/main.py + pytest tests + ''; + + meta = with pkgs.lib; { + description = "Pythonic remote execution"; + homepage = https://www.fabfile.org/; + license = licenses.bsd2; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6c3161b3f9f..607b4b61018 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2385,23 +2385,7 @@ in { }; }; - Fabric = buildPythonPackage rec { - name = "Fabric-${version}"; - version = "1.13.2"; - src = pkgs.fetchurl { - url = "mirror://pypi/F/Fabric/${name}.tar.gz"; - sha256 = "0k944dxr41whw7ib6380q9x15wyskx7fqni656icdn8rzshn9bwq"; - }; - disabled = isPy3k; - doCheck = (!isPyPy); # https://github.com/fabric/fabric/issues/11891 - propagatedBuildInputs = with self; [ paramiko pycrypto ]; - buildInputs = with self; [ fudge_9 nose ]; - meta = { - description = "Pythonic remote execution"; - homepage = https://www.fabfile.org/; - license = licenses.bsd2; - }; - }; + Fabric = callPackage ../development/python-modules/Fabric { }; faulthandler = if ! isPy3k then callPackage ../development/python-modules/faulthandler {}