From fc086f122c34e8937bc127bcea948a75983d8a82 Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Tue, 20 Aug 2024 08:29:18 +1200 Subject: [PATCH] mailctl: remove --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 694dd8bd6f88..3b94e7031a2f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -921,6 +921,7 @@ mapAliases ({ ma1sd = throw "ma1sd was dropped as it is unmaintained"; # Added 2024-07-10 MACS2 = macs2; # Added 2023-06-12 + mailctl = throw "mailctl has been renamed to oama"; # Added 2024-08-19 mailman-rss = throw "The mailman-rss package was dropped since it was unmaintained."; # Added 2024-06-21 mariadb_104 = throw "mariadb_104 has been removed from nixpkgs, please switch to another version like mariadb_106"; # Added 2023-09-11 mariadb_1010 = throw "mariadb_1010 has been removed from nixpkgs, please switch to another version like mariadb_1011"; # Added 2023-11-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 879a3f82cd38..b5498795f377 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2644,13 +2644,6 @@ with pkgs; mainsail = callPackage ../applications/misc/mainsail { }; - mailctl = (haskellPackages.callPackage ../tools/networking/mailctl {}).overrideScope (final: prev: { - # Dependency twain requires an older version of http2, and we cannot mix - # versions of transitive dependencies. - http2 = final.http2_3_0_3; - warp = final.warp_3_3_30; - }); - mame = libsForQt5.callPackage ../applications/emulators/mame { }; mame-tools = lib.addMetaAttrs {