about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-04-14 12:52:39 +0000
committerAlyssa Ross <hi@alyssa.is>2021-04-14 17:15:54 +0000
commit2a4975aa9a6f1da84d6f3bb4f5848a32a22ed2be (patch)
treed1d06cae59f55bac2e1212798f0393f2c7154edb
parentfd2e737e0678ee7d8081baef05b305146a2c0034 (diff)
downloadnixlib-2a4975aa9a6f1da84d6f3bb4f5848a32a22ed2be.tar
nixlib-2a4975aa9a6f1da84d6f3bb4f5848a32a22ed2be.tar.gz
nixlib-2a4975aa9a6f1da84d6f3bb4f5848a32a22ed2be.tar.bz2
nixlib-2a4975aa9a6f1da84d6f3bb4f5848a32a22ed2be.tar.lz
nixlib-2a4975aa9a6f1da84d6f3bb4f5848a32a22ed2be.tar.xz
nixlib-2a4975aa9a6f1da84d6f3bb4f5848a32a22ed2be.tar.zst
nixlib-2a4975aa9a6f1da84d6f3bb4f5848a32a22ed2be.zip
mailman-web: fix build
(cherry picked from commit 55ac7d4580c9ab67848c98cb9519317a1cc399c8)
-rw-r--r--nixpkgs/pkgs/servers/mail/mailman/web.nix11
1 files changed, 2 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/servers/mail/mailman/web.nix b/nixpkgs/pkgs/servers/mail/mailman/web.nix
index 7030f934a807..f8019907f283 100644
--- a/nixpkgs/pkgs/servers/mail/mailman/web.nix
+++ b/nixpkgs/pkgs/servers/mail/mailman/web.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage, lib, fetchgit, fetchpatch, isPy3k
-, git, makeWrapper, sassc, hyperkitty, postorius, whoosh
+, git, makeWrapper, sassc, hyperkitty, postorius, whoosh, setuptools-scm
 }:
 
 buildPythonPackage rec {
@@ -14,13 +14,6 @@ buildPythonPackage rec {
     leaveDotGit = true;
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://gitlab.com/qyliss/mailman-web/commit/fab30e23a1622bfa653c61b96a7ad9810926280c.patch";
-      sha256 = "1qn88nlvf9n1amql9d7v91fzdasxa78bvzi9adwqbhciw1azf84a";
-    })
-  ];
-
   # This is just so people installing from pip also get uwsgi
   # installed, AFAICT.
 
@@ -32,7 +25,7 @@ buildPythonPackage rec {
     sed -i '/^  Django/d' setup.cfg
   '';
 
-  nativeBuildInputs = [ git makeWrapper ];
+  nativeBuildInputs = [ git makeWrapper setuptools-scm ];
   propagatedBuildInputs = [ hyperkitty postorius whoosh ];
 
   # Tries to check runtime configuration.