Commit 78b9406b authored by Alyssa Ross's avatar Alyssa Ross
Browse files

mailmanPackages.hyperkitty: 1.3.7 -> 1.3.8

parent c3b2d5e5

pkgs/servers/mail/mailman/hyperkitty.nix

+4 −10
Original line number Diff line number Diff line 
{ lib

, python3

, fetchPypi

, fetchpatch

, nixosTests

}:
@@ -9,21 +8,14 @@ with python3.pkgs; 


buildPythonPackage rec {

  pname = "HyperKitty";

  version = "1.3.7";

  version = "1.3.8";

  disabled = pythonOlder "3.10";



  src = fetchPypi {

    inherit pname version;

    sha256 = "sha256-TXSso+wwVGdBymIzns5yOS4pj1EdConmm87b/NyBAss=";

    hash = "sha256-j//Mrbos/g1BGenHRmOe5GvAza5nu/mchAgdLQu9h7g=";

  };



  patches = [

    (fetchpatch {

      url = "https://gitlab.com/mailman/hyperkitty/-/commit/5bb394662882bfc73c3e877458da44343aa06922.patch";

      hash = "sha256-9vcY6nu3txDftH6aYpdh9qSrLzZceGjVFxuD1Ux18gw=";

    })

  ];



  postPatch = ''

    # isort is a development dependency

    sed -i '/isort/d' setup.py
@@ -52,6 +44,7 @@ buildPythonPackage rec { 
  # HyperKitty so they're not included for people who don't need them.

  nativeCheckInputs = [

    beautifulsoup4

    elastic-transport

    elasticsearch

    mock

    whoosh
@@ -66,6 +59,7 @@ buildPythonPackage rec { 
  passthru.tests = { inherit (nixosTests) mailman; };



  meta = {

    changelog = "https://docs.mailman3.org/projects/hyperkitty/en/latest/news.html";

    homepage = "https://www.gnu.org/software/mailman/";

    description = "Archiver for GNU Mailman v3";

    license = lib.licenses.gpl3;

pkgs/servers/mail/mailman/python.nix

+0 −8
Original line number Diff line number Diff line
@@ -18,14 +18,6 @@ python3.override { 
        [1] 72a14ea563a3f5bf85db659349a533fe75a8b0ce

        [2] f931bc81d63f5cfda55ac73d754c87b3fd63b291

      */

      elasticsearch = super.elasticsearch.overridePythonAttrs ({ pname, ... }: rec {

        version = "7.17.9";

        src = fetchPypi {

          inherit pname version;

          hash = "sha256-ZsTs4q3+fMEg4rameYof1cd3rs+C7sObuVzvfPx+orM=";

        };

      });



      # https://gitlab.com/mailman/hyperkitty/-/merge_requests/541

      mistune = super.mistune.overridePythonAttrs (old: rec {

        version = "2.0.5";