diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-02-08 15:15:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-05 20:43:46 +0000 |
| commit | c9eb48d42c225411383ebc7929264499c65dcf90 (patch) | |
| tree | 6bc8760704c385bffec8e6d973b3e3f0b04497fa /overlays | |
| parent | 81cc97283b61d9397e3b5f7e00547ff1d5430a97 (diff) | |
| download | nixlib-c9eb48d42c225411383ebc7929264499c65dcf90.tar nixlib-c9eb48d42c225411383ebc7929264499c65dcf90.tar.gz nixlib-c9eb48d42c225411383ebc7929264499c65dcf90.tar.bz2 nixlib-c9eb48d42c225411383ebc7929264499c65dcf90.tar.lz nixlib-c9eb48d42c225411383ebc7929264499c65dcf90.tar.xz nixlib-c9eb48d42c225411383ebc7929264499c65dcf90.tar.zst nixlib-c9eb48d42c225411383ebc7929264499c65dcf90.zip | |
overlays/patches: fix mailman-web override
Package is no longer under python3.pkgs.
Diffstat (limited to 'overlays')
| -rw-r--r-- | overlays/patches/default.nix | 4 | ||||
| -rw-r--r-- | overlays/patches/mailman/web.nix | 7 | ||||
| -rw-r--r-- | overlays/patches/python/default.nix | 4 | ||||
| -rw-r--r-- | overlays/patches/python/packages/mailman-web/default.nix | 7 |
4 files changed, 11 insertions, 11 deletions
diff --git a/overlays/patches/default.nix b/overlays/patches/default.nix index f452516291cb..306607600b79 100644 --- a/overlays/patches/default.nix +++ b/overlays/patches/default.nix @@ -14,6 +14,10 @@ self: super: { gnupg = self.callPackage ./gnupg { inherit (super) gnupg; }; + mailmanPackages = super.mailmanPackages.extend (self: super: { + web = self.callPackage mailman/web.nix { inherit (super) web; }; + }); + public-inbox = self.callPackage ./public-inbox { inherit (super) public-inbox; }; diff --git a/overlays/patches/mailman/web.nix b/overlays/patches/mailman/web.nix new file mode 100644 index 000000000000..8f08c0e6b345 --- /dev/null +++ b/overlays/patches/mailman/web.nix @@ -0,0 +1,7 @@ +{ web, ... } @ args: + +(web.overrideAttrs ({ postPatch ? "", ... }: { + postPatch = postPatch + '' + substituteInPlace mailman_web/urls.py --replace ^archives/ ^hyperkitty/ + ''; +})).override (builtins.removeAttrs args [ "web" ]) diff --git a/overlays/patches/python/default.nix b/overlays/patches/python/default.nix index 61c9ed83d089..7018ccb8f01d 100644 --- a/overlays/patches/python/default.nix +++ b/overlays/patches/python/default.nix @@ -12,10 +12,6 @@ python.override ((removeAttrs args [ "lib" "python" ]) // { hyperkitty = callPackage ./packages/hyperkitty { inherit (super) hyperkitty; }; - - mailman-web = callPackage ./packages/mailman-web { - inherit (super) mailman-web; - }; }) packageOverrides ]; diff --git a/overlays/patches/python/packages/mailman-web/default.nix b/overlays/patches/python/packages/mailman-web/default.nix deleted file mode 100644 index 1d5b15e39154..000000000000 --- a/overlays/patches/python/packages/mailman-web/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ mailman-web, ... } @ args: - -(mailman-web.overrideAttrs ({ postPatch ? "", ... }: { - postPatch = postPatch + '' - substituteInPlace mailman_web/urls.py --replace ^archives/ ^hyperkitty/ - ''; -})).override (builtins.removeAttrs args [ "mailman-web" ]) |