Unverified Commit 366e5866 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #253635 from SuperSandro2000/betterbird 

betterbird: 102.14.0-bb39 -> 102.15.0-bb40
parents ac4f5079 7a54eafe

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

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

  thunderbird-unwrapped = thunderbirdPackages.thunderbird-102;



  version = "102.14.0";

  version = "102.15.0";

  majVer = lib.versions.major version;



  betterbird-patches = fetchFromGitHub {

    owner = "Betterbird";

    repo = "thunderbird-patches";

    rev = "${version}-bb39";

    rev = "${version}-bb40";

    postFetch = ''

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

      rm external.sh

    '';

    hash = "sha256-O9nGlJs3OziQLbdbdt3eFRHvk1A9cdEsbKDtsZrnY5Q=";

    hash = "sha256-7/JEcP76rp0hSSxzlIlHqkcxTSEJQswFhCoOLYntQ5I=";

  };

in ((buildMozillaMach {

  pname = "betterbird";
@@ -49,7 +49,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";

    sha512 = "4ae3f216833aec55421f827d55bc1b5fc2f0ad4fefecb27724a5be3318c351df24d30a4897b924e733ed2e3995be284b6d135049d46001143fb1c961fefc1830";

    sha512 = "11d4c77049c532753c9b693d69ab9a0bcd0eb13d49f87a511ad8ba680b70041ac6f64c5f9cd5dd44246d46e7695d9bd51146b1fe62b0b7c9fbc862eb53d5cfda";

  };



  extraPostPatch = thunderbird-unwrapped.extraPostPatch or "" + /* bash */ ''