about summary refs log tree commit diff
path: root/nixpkgs
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-12-16 19:06:10 +0100
committerAlyssa Ross <hi@alyssa.is>2020-01-17 03:02:32 +0000
commit5dc386ecaafb5f826a6205e41fb2568f0e715fec (patch)
treeb71f616751e5c949975e48e74c0a120f3a1eb37c /nixpkgs
parenta06916516d4761c3c2f38083657d923a1e099012 (diff)
downloadnixlib-5dc386ecaafb5f826a6205e41fb2568f0e715fec.tar
nixlib-5dc386ecaafb5f826a6205e41fb2568f0e715fec.tar.gz
nixlib-5dc386ecaafb5f826a6205e41fb2568f0e715fec.tar.bz2
nixlib-5dc386ecaafb5f826a6205e41fb2568f0e715fec.tar.lz
nixlib-5dc386ecaafb5f826a6205e41fb2568f0e715fec.tar.xz
nixlib-5dc386ecaafb5f826a6205e41fb2568f0e715fec.tar.zst
nixlib-5dc386ecaafb5f826a6205e41fb2568f0e715fec.zip
python3.pkgs.hyperkitty: 1.3.0 -> 1.3.2
Diffstat (limited to 'nixpkgs')
-rw-r--r--nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix19
1 files changed, 6 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix b/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix
index 49cc017c7cbe..79a96e24e66e 100644
--- a/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix
+++ b/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix
@@ -1,17 +1,17 @@
-{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, isort, coverage, mock
+{ stdenv, buildPythonPackage, fetchPypi, isort, coverage, mock
 , robot-detection, django_extensions, rjsmin, cssmin, django-mailman3
 , django-haystack, flufl_lock, networkx, dateutil, defusedxml
 , django-paintstore, djangorestframework, django, django-q
-, django_compressor, beautifulsoup4, six, psycopg2, whoosh
+, django_compressor, beautifulsoup4, six, psycopg2, whoosh, elasticsearch
 }:
 
 buildPythonPackage rec {
   pname = "HyperKitty";
-  version = "1.3.0";
+  version = "1.3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1h39l5r3ml0687nwc9qpajvis5dqpdbrcklxwrshvk1d1y8dlc5b";
+    sha256 = "092fkv0xyf5vgj33xwq0mh9h5c5d56ifwimaqbfpx5cwc6yivb88";
   };
 
   nativeBuildInputs = [ isort ];
@@ -19,15 +19,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     robot-detection django_extensions rjsmin cssmin django-mailman3
     django-haystack flufl_lock networkx dateutil defusedxml
-    django-paintstore djangorestframework django django-q
-    django_compressor beautifulsoup4 six psycopg2 whoosh
-  ];
-
-  patches = [
-    (fetchpatch {
-      url = "https://gitlab.com/mailman/hyperkitty/commit/59547a2c1a0a04e7b0e69a385e2e574faa902223.patch";
-      sha256 = "0wjsp4bbnzj5mqlaw6nar14rc9c5jzaz7262bn2z8b9hyxvwsfq9";
-    })
+    django-paintstore djangorestframework django django-q flufl_lock
+    django_compressor beautifulsoup4 six psycopg2 whoosh isort elasticsearch
   ];
 
   checkPhase = ''