Unverified Commit cc6c69d9 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

betterbird: 115.9.0-bb26-build2 -> 115.14.0-bb31 (#339019)

parents a193d72c fdc712da

pkgs/applications/networking/mailreaders/betterbird/default.nix

+6 −5
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@ 
let

  thunderbird-unwrapped = thunderbirdPackages.thunderbird-115;



  version = "115.9.0";

  version = "115.14.0";

  majVer = lib.versions.major version;



  betterbird-patches = fetchFromGitHub {

    owner = "Betterbird";

    repo = "thunderbird-patches";

    rev = "${version}-bb26-build2";

    rev = "${version}-bb31";

    postFetch = ''

      echo "Retrieving external patches"
@@ -36,7 +36,7 @@ let 
      . ./external.sh

      rm external.sh

    '';

    hash = "sha256-0RlI30zxiueeXdLEXPZevc8QyKr667juHk0bTcqBB1w=";

    hash = "sha256-dXfpu+ufBfAWl1OlpQ1i8CC7N8f0NbxfaMH6BdKr28c=";

  };

in ((buildMozillaMach {

  pname = "betterbird";
@@ -50,7 +50,7 @@ in ((buildMozillaMach { 
  src = fetchurl {

    # https://download.cdn.mozilla.net/pub/thunderbird/releases/

    url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";

    hash = "sha256-Kut3ynA43289MG+cPSpOphWvDtzw9ykCFcpfMMEpDlc=";

    hash = "sha256-A3/D8D9e5PI9SUetKFUE0oDpJsThprIk1zUfZoxu1/A=";

  };



  extraPostPatch = thunderbird-unwrapped.extraPostPatch or "" + /* bash */ ''
@@ -79,7 +79,8 @@ in ((buildMozillaMach { 
      fi



      # requires vendored icu, fails to link with our icu

      if [[ $patch == 14-feature-regexp-searchterm.patch || $patch == 14-feature-regexp-searchterm-m-c.patch ]]; then

      # 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