From e186e5a5edd5d3d6ae1249e1e4ac5332e229a0ae Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 17:36:55 -0400 Subject: [PATCH] pythonPackages.Pweave: refactor move to python-modules --- .../python-modules/pweave/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +-------------- 2 files changed, 31 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/pweave/default.nix diff --git a/pkgs/development/python-modules/pweave/default.nix b/pkgs/development/python-modules/pweave/default.nix new file mode 100644 index 00000000000..980a1df6d05 --- /dev/null +++ b/pkgs/development/python-modules/pweave/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, mock +, matplotlib +, pkgs +}: + +buildPythonPackage rec { + pname = "Pweave"; + version = "0.25"; + + src = fetchPypi { + inherit pname version; + sha256 = "1isqjz66c7vxdaqfwpkspki9p4054dsfx7pznwz28ik634hnj3qw"; + }; + + buildInputs = [ mock pkgs.glibcLocales ]; + propagatedBuildInputs = [ matplotlib ]; + + # fails due to trying to run CSS as test + doCheck = false; + + meta = with stdenv.lib; { + description = "Scientific reports with embedded python computations with reST, LaTeX or markdown"; + homepage = http://mpastell.com/pweave/ ; + license = licenses.bsd3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 024290d0434..d5de9b31551 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3900,29 +3900,7 @@ in { spotipy = callPackage ../development/python-modules/spotipy { }; - Pweave = buildPythonPackage (rec { - name = "Pweave-0.25"; - - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/f6/2f/e9735b04747ae5ef29d64e0b215fb0e11f1c89826097ac17342efebbbb84/Pweave-0.25.tar.gz"; - sha256 = "1isqjz66c7vxdaqfwpkspki9p4054dsfx7pznwz28ik634hnj3qw"; - }; - - buildInputs = with self; [ mock pkgs.glibcLocales ]; - - propagatedBuildInputs = with self; [ - matplotlib - ]; - - # fails due to trying to run CSS as test - doCheck = false; - - meta = { - description = "Scientific reports with embedded python computations with reST, LaTeX or markdown"; - homepage = http://mpastell.com/pweave/ ; - license = licenses.bsd3; - }; - }); + Pweave = callPackage ../development/python-modules/pweave { }; sqlalchemy = callPackage ../development/python-modules/sqlalchemy { };