From b1c1892e2d5b2d47d1b89f22331f479c7d947096 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 25 Aug 2017 10:40:49 +0200 Subject: [PATCH] python.pkgs.odfpy: 0.9.6 -> 1.3.5 --- .../python-modules/odfpy/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------ 2 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/odfpy/default.nix diff --git a/pkgs/development/python-modules/odfpy/default.nix b/pkgs/development/python-modules/odfpy/default.nix new file mode 100644 index 000000000000..a80cd827c6d1 --- /dev/null +++ b/pkgs/development/python-modules/odfpy/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "odfpy"; + version = "1.3.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "6f8163f8464868cff9421a058f25566e41d73c8f7e849c021b86630941b44366"; + }; + + checkPhase = '' + pushd tests + rm runtests + for file in test*.py; do + python $file + done + ''; + + meta = { + description = "Python API and tools to manipulate OpenDocument files"; + homepage = "https://joinup.ec.europa.eu/software/odfpy/home"; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9442ccd90afa..c8aa5048f5e8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7365,25 +7365,7 @@ in { }; }; - odfpy = buildPythonPackage rec { - version = "0.9.6"; - name = "odfpy-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/odfpy/${name}.tar.gz"; - sha256 = "e458f969f1ccd7ed77d70a45fe69ad656ac61b39e36e4d32c42d4e3216030891"; - }; - - buildInputs = with self; with pkgs; [ ]; - - propagatedBuildInputs = with self; [ ]; - - meta = { - description = "Python API and tools to manipulate OpenDocument files"; - homepage = "https://joinup.ec.europa.eu/software/odfpy/home"; - license = licenses.asl20; - }; - }; + odfpy = callPackage ../development/python-modules/odfpy { }; oger = buildPythonPackage rec { name = "oger-${version}";