about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2017-09-21 11:56:16 +0100
committerGitHub <noreply@github.com>2017-09-21 11:56:16 +0100
commit8da89ab658a0cd148dafc81729fb16246000836b (patch)
treee1babab234f6c505c3f124e03887bb929bbc9647
parent116c34a748599334555896c32ace86056607d6c4 (diff)
parent559d8d4c3af098f9faa4653fe7a249eb3327b368 (diff)
downloadnixlib-8da89ab658a0cd148dafc81729fb16246000836b.tar
nixlib-8da89ab658a0cd148dafc81729fb16246000836b.tar.gz
nixlib-8da89ab658a0cd148dafc81729fb16246000836b.tar.bz2
nixlib-8da89ab658a0cd148dafc81729fb16246000836b.tar.lz
nixlib-8da89ab658a0cd148dafc81729fb16246000836b.tar.xz
nixlib-8da89ab658a0cd148dafc81729fb16246000836b.tar.zst
nixlib-8da89ab658a0cd148dafc81729fb16246000836b.zip
Merge pull request #29635 from andir/update-afew-to-1.2.0
afew: git-2017-02-8 -> 1.2.0
-rw-r--r--pkgs/development/python-modules/afew/default.nix15
1 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/development/python-modules/afew/default.nix b/pkgs/development/python-modules/afew/default.nix
index 39c921eb7bcd..05280738e5ba 100644
--- a/pkgs/development/python-modules/afew/default.nix
+++ b/pkgs/development/python-modules/afew/default.nix
@@ -1,19 +1,20 @@
 { stdenv, buildPythonPackage, fetchFromGitHub
-, isPy3k , dbacl, notmuch, chardet, subprocess32 }:
+, isPy3k , setuptools_scm, notmuch, chardet, subprocess32 }:
 
 buildPythonPackage rec {
   pname = "afew";
-  version = "git-2017-02-08";
+  version = "1.2.0";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "afewmail";
     repo = "afew";
-    rev = "889a3b966835c4d16aa1f24bb89f12945b9b2a67";
-    sha256 = "01gwrx1m3ka13ps3vj04a3y8llli2j2vkd3gcggcvxdphhpysckm";
+    rev = "3405475276a2433e1238be330e538ebf2a976e5e";
+    sha256 = "1h974avnfc6636az130yjqwm28z3aaqm49bjhpy3razx6zvyhzlf";
   };
 
-  buildInputs = [ dbacl ];
+  buildInputs = [ setuptools_scm ];
+  SETUPTOOLS_SCM_PRETEND_VERSION = "${version}";
 
   propagatedBuildInputs = [
     notmuch
@@ -22,10 +23,6 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  preConfigure = ''
-    substituteInPlace afew/DBACL.py --replace "'dbacl'" "'${dbacl}/bin/dbacl'"
-  '';
-
   postInstall = ''
     wrapProgram $out/bin/afew \
       --prefix LD_LIBRARY_PATH : ${notmuch}/lib