From 05be27f7dc8c0e28c3af61f07feb04c9c0079635 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Dec 2017 20:21:57 +0100 Subject: [PATCH] python.pkgs.pathlib2: fix tests --- .../python-modules/pathlib2/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +----------- 2 files changed, 32 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/pathlib2/default.nix diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix new file mode 100644 index 00000000000..62d5c43a4b3 --- /dev/null +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, six +, pythonOlder +, scandir +, glibcLocales +}: + +if !(pythonOlder "3.4") then null else buildPythonPackage rec { + pname = "pathlib2"; + version = "2.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "ce9007df617ef6b7bd8a31cd2089ed0c1fed1f7c23cf2bf1ba140b3dd563175d"; + }; + + propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") scandir; + checkInputs = [ glibcLocales ]; + + preCheck = '' + export LC_ALL="en_US.UTF-8" + ''; + + meta = { + description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems."; + homepage = https://pypi.python.org/pypi/pathlib2/; + license = with lib.licenses; [ mit ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2aa7e339f5e..b508beba014 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14266,24 +14266,7 @@ in { }; }; - pathlib2 = if !(pythonOlder "3.4") then null else buildPythonPackage rec { - name = "pathlib2-${version}"; - version = "2.2.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pathlib2/${name}.tar.gz"; - sha256 = "ce9007df617ef6b7bd8a31cd2089ed0c1fed1f7c23cf2bf1ba140b3dd563175d"; - }; - - propagatedBuildInputs = with self; [ six ] ++ optional (pythonOlder "3.5") scandir; - - meta = { - description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems."; - homepage = https://pypi.python.org/pypi/pathlib2/; - license = with licenses; [ mit ]; - }; - - }; + pathlib2 = callPackage ../development/python-modules/pathlib2 { }; pathpy = callPackage ../development/python-modules/path.py { };