From 52ea2961d51c095eae60d075b22e78ebcfb1dce1 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Fri, 26 Oct 2018 10:10:22 -0400 Subject: [PATCH] pythonPackages.pyptlib: refactor move to python-modules --- .../python-modules/pyptlib/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +----------- 2 files changed, 27 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/pyptlib/default.nix diff --git a/pkgs/development/python-modules/pyptlib/default.nix b/pkgs/development/python-modules/pyptlib/default.nix new file mode 100644 index 00000000000..6349b56b474 --- /dev/null +++ b/pkgs/development/python-modules/pyptlib/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPyPy +, isPy3k +}: + +buildPythonPackage rec { + pname = "pyptlib"; + version = "0.0.6"; + disabled = isPyPy || isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "01y6vbwncqb0hxlnin6whd9wrrm5my4qzjhk76fnix78v7ip515r"; + }; + + doCheck = false; # No such file or directory errors on 32bit + + meta = with stdenv.lib; { + homepage = https://pypi.org/project/pyptlib/; + description = "A python implementation of the Pluggable Transports for Circumvention specification for Tor"; + license = licenses.bsd2; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f9b264a65f5..9d97654c704 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3388,22 +3388,7 @@ in { pyparted = callPackage ../development/python-modules/pyparted { }; - pyptlib = buildPythonPackage (rec { - name = "pyptlib-${version}"; - disabled = isPyPy || isPy3k; - version = "0.0.6"; - - doCheck = false; # No such file or directory errors on 32bit - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyptlib/pyptlib-${version}.tar.gz"; - sha256 = "01y6vbwncqb0hxlnin6whd9wrrm5my4qzjhk76fnix78v7ip515r"; - }; - meta = { - description = "A python implementation of the Pluggable Transports for Circumvention specification for Tor"; - license = licenses.bsd2; - }; - }); + pyptlib = callPackage ../development/python-modules/pyptlib { }; pyqtgraph = buildPythonPackage rec { name = "pyqtgraph-${version}";