about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLancelot SIX <lsix+github@lancelotsix.com>2019-09-10 10:03:15 +0200
committerGitHub <noreply@github.com>2019-09-10 10:03:15 +0200
commit9c171d29117f8b93f9f990938c3a18c42e13579c (patch)
tree0c9caac312816c16fd1fb8b4b3a199919a8fa0c1
parent300464ec67f3b00110675a563581de33af988ccc (diff)
parent6468d465ed67e09fa4da92c579a2e1c32fd4af44 (diff)
downloadnixlib-9c171d29117f8b93f9f990938c3a18c42e13579c.tar
nixlib-9c171d29117f8b93f9f990938c3a18c42e13579c.tar.gz
nixlib-9c171d29117f8b93f9f990938c3a18c42e13579c.tar.bz2
nixlib-9c171d29117f8b93f9f990938c3a18c42e13579c.tar.lz
nixlib-9c171d29117f8b93f9f990938c3a18c42e13579c.tar.xz
nixlib-9c171d29117f8b93f9f990938c3a18c42e13579c.tar.zst
nixlib-9c171d29117f8b93f9f990938c3a18c42e13579c.zip
Merge pull request #67571 from leenaars/fire
pythonPackages.fire: 0.1.3 -> 0.2.1
-rw-r--r--pkgs/development/python-modules/fire/default.nix16
1 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/development/python-modules/fire/default.nix b/pkgs/development/python-modules/fire/default.nix
index c44083e4c29a..7af8d29fce73 100644
--- a/pkgs/development/python-modules/fire/default.nix
+++ b/pkgs/development/python-modules/fire/default.nix
@@ -1,18 +1,18 @@
 { stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, six, hypothesis, mock
-, python-Levenshtein, pytest }:
+, python-Levenshtein, pytest, termcolor, isPy27, enum34 }:
 
 buildPythonPackage rec {
   pname = "fire";
-  version = "0.1.3";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "python-fire";
     rev = "v${version}";
-    sha256 = "0kdcmzr3sgzjsw5fmvdylgrn8akqjbs433jbgqzp498njl9cc6qx";
+    sha256 = "1r6cmihafd7mb6j3mvgk251my6ckb0sqqj1l2ny2azklv175b38a";
   };
 
-  propagatedBuildInputs = [ six ];
+  propagatedBuildInputs = [ six termcolor ] ++ stdenv.lib.optional isPy27 enum34;
 
   checkInputs = [ hypothesis mock python-Levenshtein pytest ];
 
@@ -20,14 +20,6 @@ buildPythonPackage rec {
     py.test
   '';
 
-  patches = [
-    # Add Python 3.7 support. Remove with the next release
-    (fetchpatch {
-      url = "https://github.com/google/python-fire/commit/668007ae41391f5964870b4597e41493a936a11e.patch";
-      sha256 = "0rf7yzv9qx66zfmdggfz478z37fi4rwx4hlh3dk1065sx5rfksi0";
-    })
-  ];
-
   meta = with stdenv.lib; {
     description = "A library for automatically generating command line interfaces";
     longDescription = ''