summary refs log tree commit diff
diff options
context:
space:
mode:
authorFabian Affolter <fabian@affolter-engineering.ch>2021-06-02 11:14:15 +0200
committerGitHub <noreply@github.com>2021-06-02 11:14:15 +0200
commit33592e151366f9eac034172f0c0c19e6da2550f2 (patch)
treeec898985eb9379be2d098999caa0f2bca748dc77
parenta2cbc26883a70a85d0b274ac65502506dbf2c1d8 (diff)
parent021e7611a234d4d31066373d03606ad88e4b4d94 (diff)
downloadnixpkgs-33592e151366f9eac034172f0c0c19e6da2550f2.tar
nixpkgs-33592e151366f9eac034172f0c0c19e6da2550f2.tar.gz
nixpkgs-33592e151366f9eac034172f0c0c19e6da2550f2.tar.bz2
nixpkgs-33592e151366f9eac034172f0c0c19e6da2550f2.tar.lz
nixpkgs-33592e151366f9eac034172f0c0c19e6da2550f2.tar.xz
nixpkgs-33592e151366f9eac034172f0c0c19e6da2550f2.tar.zst
nixpkgs-33592e151366f9eac034172f0c0c19e6da2550f2.zip
Merge pull request #125204 from fabaff/bump-aenum
python3Packages.aenum: 3.0.0 -> 3.1.0
-rw-r--r--pkgs/development/python-modules/aenum/default.nix28
1 files changed, 18 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix
index b5fb2999c96..35ccf68808c 100644
--- a/pkgs/development/python-modules/aenum/default.nix
+++ b/pkgs/development/python-modules/aenum/default.nix
@@ -1,27 +1,35 @@
-{ lib, fetchPypi, buildPythonPackage, python, isPy3k, glibcLocales }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, pyparsing
+, python
+}:
 
 buildPythonPackage rec {
   pname = "aenum";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "17cd8cfed1ee4b617198c9fabbabd70ebd8f01e54ac29cd6c3a92df14bd86656";
+    sha256 = "sha256-h/Dp70+ChXirBq8w5NeUQEO/Ts0/S3vRy+N+IXPN6Uo=";
   };
 
-  # For Python 3, locale has to be set to en_US.UTF-8 for
-  # tests to pass
-  checkInputs = if isPy3k then [ glibcLocales ] else [];
+  checkInputs = [
+    pyparsing
+  ] ;
 
   # py2 likes to reorder tests
   doCheck = isPy3k;
+
   checkPhase = ''
-  runHook preCheck
-  ${if isPy3k then "export LC_ALL=en_US.UTF-8" else ""}
-  PYTHONPATH=`pwd` ${python.interpreter} aenum/test.py
-  runHook postCheck
+    runHook preCheck
+    ${python.interpreter} aenum/test.py
+    runHook postCheck
   '';
 
+  pythonImportsCheck = [ "aenum" ];
+
   meta = with lib; {
     description = "Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants";
     maintainers = with maintainers; [ vrthra ];