Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 05133d55b5aa
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5e4fc1cc5f90
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 14, 2021

  1. Revert "mailman-web-unstable: 2019-09-29 -> 2021-04-10 (#119135)" 

    This reverts commit 8dbd553.

The update has changed where mailman-web looks for its database and
broken the Mailman module in NixOS.
    @alyssais
    alyssais committed Apr 14, 2021
    1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d0ead90 View commit details

  2. mailman-web: mark broken

    @alyssais
    alyssais committed Apr 14, 2021
    Copy the full SHA
    5e4fc1c View commit details
Showing with 10 additions and 10 deletions.
  1. +1 −2 nixos/modules/services/mail/mailman.nix
  2. +9 −8 pkgs/servers/mail/mailman/web.nix
3 changes: 1 addition & 2 deletions nixos/modules/services/mail/mailman.nix
View file
Original file line number Diff line number Diff line change
@@ -263,8 +263,7 @@ in {
# settings_local.json is loaded.
os.environ["SECRET_KEY"] = ""
from mailman_web.settings.base import *
from mailman_web.settings.mailman import *
from mailman_web.settings import *
import json
17 changes: 9 additions & 8 deletions pkgs/servers/mail/mailman/web.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{ buildPythonPackage, lib, fetchgit, isPy3k
, git, makeWrapper, sassc, hyperkitty, postorius, whoosh, setuptools-scm
, git, makeWrapper, sassc, hyperkitty, postorius, whoosh
}:

buildPythonPackage rec {
pname = "mailman-web";
version = "unstable-2021-04-10";
pname = "mailman-web-unstable";
version = "2019-09-29";
disabled = !isPy3k;

src = fetchgit {
url = "https://gitlab.com/mailman/mailman-web";
rev = "19a7abe27dd3bc39c0250440de073f0adecd4da1";
sha256 = "0h25140n2jaisl0ri5x7gdmbypiys8vlq8dql1zmaxvq459ybxkn";
rev = "d17203b4d6bdc71c2b40891757f57a32f3de53d5";
sha256 = "124cxr4vfi1ibgxygk4l74q4fysx0a6pga1kk9p5wq2yvzwg9z3n";
leaveDotGit = true;
};

@@ -25,7 +25,7 @@ buildPythonPackage rec {
sed -i '/^ Django/d' setup.cfg
'';

nativeBuildInputs = [ git setuptools-scm makeWrapper ];
nativeBuildInputs = [ git makeWrapper ];
propagatedBuildInputs = [ hyperkitty postorius whoosh ];

# Tries to check runtime configuration.
@@ -38,7 +38,8 @@ buildPythonPackage rec {

meta = with lib; {
description = "Django project for Mailman 3 web interface";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ peti qyliss m1cr0man ];
license = licenses.gpl3;
maintainers = with maintainers; [ peti qyliss ];
broken = true;
};
}