diff --git a/pkgs/applications/networking/mailreaders/betterbird/default.nix b/pkgs/applications/networking/mailreaders/betterbird/default.nix deleted file mode 100644 index 38ff368ad5fde..0000000000000 --- a/pkgs/applications/networking/mailreaders/betterbird/default.nix +++ /dev/null @@ -1,130 +0,0 @@ -{ lib -, buildMozillaMach -, cacert -, fetchFromGitHub -, fetchurl -, git -, libdbusmenu-gtk3 -, runtimeShell -, thunderbirdPackages -}: - -let - thunderbird-unwrapped = thunderbirdPackages.thunderbird-115; - - version = "115.14.0"; - majVer = lib.versions.major version; - - betterbird-patches = fetchFromGitHub { - owner = "Betterbird"; - repo = "thunderbird-patches"; - rev = "${version}-bb31"; - postFetch = '' - echo "Retrieving external patches" - - echo "#!${runtimeShell}" > external.sh - # if no external patches need to be downloaded, don't fail - { grep " # " $out/${majVer}/series-M-C || true ; } >> external.sh - { grep " # " $out/${majVer}/series || true ; } >> external.sh - sed -i -e '/^#/d' external.sh - sed -i -e 's/\/rev\//\/raw-rev\//' external.sh - sed -i -e 's|\(.*\) # \(.*\)|curl \2 -o $out/${majVer}/external/\1|' external.sh - chmod 700 external.sh - - mkdir $out/${majVer}/external - SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt - . ./external.sh - rm external.sh - ''; - hash = "sha256-dXfpu+ufBfAWl1OlpQ1i8CC7N8f0NbxfaMH6BdKr28c="; - }; -in ((buildMozillaMach { - pname = "betterbird"; - inherit version; - - applicationName = "Betterbird"; - binaryName = "betterbird"; - branding = "comm/mail/branding/betterbird"; - inherit (thunderbird-unwrapped) application extraPatches; - - src = fetchurl { - # https://download.cdn.mozilla.net/pub/thunderbird/releases/ - url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - hash = "sha256-A3/D8D9e5PI9SUetKFUE0oDpJsThprIk1zUfZoxu1/A="; - }; - - extraPostPatch = thunderbird-unwrapped.extraPostPatch or "" + /* bash */ '' - PATH=$PATH:${lib.makeBinPath [ git ]} - patches=$(mktemp -d) - for dir in branding bugs external features misc; do - cp -r ${betterbird-patches}/${majVer}/$dir/*.patch $patches/ - done - cp ${betterbird-patches}/${majVer}/series* $patches/ - chmod -R +w $patches - - cd $patches - # fix FHS paths to libdbusmenu - substituteInPlace 12-feature-linux-systray.patch \ - --replace-fail "/usr/include/libdbusmenu-glib-0.4/" "${lib.getDev libdbusmenu-gtk3}/include/libdbusmenu-glib-0.4/" \ - --replace-fail "/usr/include/libdbusmenu-gtk3-0.4/" "${lib.getDev libdbusmenu-gtk3}/include/libdbusmenu-gtk3-0.4/" - cd - - - chmod -R +w dom/base/test/gtest/ - - while read patch; do - patch="''${patch%%#*}" - patch="''${patch% }" - if [[ $patch == "" ]]; then - continue - fi - - # requires vendored icu, fails to link with our icu - # feature-506064 depends on those icu patches - if [[ $patch == 14-feature-regexp-searchterm.patch || $patch == 14-feature-regexp-searchterm-m-c.patch || $patch == feature-506064-match-diacritics.patch || $patch == feature-506064-match-diacritics-m-c.patch ]]; then - continue - fi - - echo Applying patch $patch. - if [[ $patch == *-m-c.patch ]]; then - git apply -p1 -v < $patches/$patch - else - cd comm - git apply -p1 -v < $patches/$patch - cd .. - fi - done < <(cat $patches/series $patches/series-M-C) - ''; - - extraBuildInputs = [ - libdbusmenu-gtk3 - ]; - - meta = with lib; { - description = "Betterbird is a fine-tuned version of Mozilla Thunderbird, Thunderbird on steroids, if you will"; - homepage = "https://www.betterbird.eu/"; - mainProgram = "betterbird"; - maintainers = with maintainers; [ SuperSandro2000 ]; - inherit (thunderbird-unwrapped.meta) platforms badPlatforms broken license; - }; -}).override { - crashreporterSupport = false; # not supported - geolocationSupport = false; - webrtcSupport = false; - - pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable" - - inherit (thunderbird-unwrapped.passthru) icu73; -}).overrideAttrs (oldAttrs: { - postInstall = oldAttrs.postInstall or "" + '' - mv $out/lib/thunderbird/* $out/lib/betterbird - rmdir $out/lib/thunderbird/ - rm $out/bin/thunderbird - ln -srf $out/lib/betterbird/betterbird $out/bin/betterbird - ''; - - doInstallCheck = false; - - passthru = oldAttrs.passthru // { - inherit betterbird-patches; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 57039b5d7f8c5..ac1e02b3ce729 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -132,6 +132,8 @@ mapAliases { bashInteractive_5 = throw "'bashInteractive_5' has been renamed to/replaced by 'bashInteractive'"; # Converted to throw 2024-10-17 bash_5 = throw "'bash_5' has been renamed to/replaced by 'bash'"; # Converted to throw 2024-10-17 BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12 + betterbird = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25 + betterbird-unwrapped = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25 bibata-extra-cursors = throw "bibata-cursors has been removed as it was broken"; # Added 2024-07-15 bitcoin-unlimited = throw "bitcoin-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15 bitcoind-unlimited = throw "bitcoind-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 766fadbf06197..b43905d8f6276 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32662,12 +32662,6 @@ with pkgs; thokr = callPackage ../applications/misc/thokr { }; - betterbird-unwrapped = callPackage ../applications/networking/mailreaders/betterbird { }; - betterbird = wrapThunderbird betterbird-unwrapped { - desktopName = "Betterbird"; - pname = "betterbird"; - }; - thunderbirdPackages = recurseIntoAttrs (callPackage ../applications/networking/mailreaders/thunderbird/packages.nix { callPackage = newScope { inherit (rustPackages) cargo rustc;