Unverified Commit 4684d61e authored by Arne Keller's avatar Arne Keller Committed by GitHub
Browse files

{tor,mullvad}-browser: 14.0.9 -> 14.5 (#399326)

parents 64fecabb e30afce6

pkgs/by-name/mu/mullvad-browser/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ let 
    ++ lib.optionals mediaSupport [ ffmpeg ]

  );



  version = "14.0.9";

  version = "14.5";



  sources = {

    x86_64-linux = fetchurl {
@@ -109,7 +109,7 @@ let 
        "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"

        "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"

      ];

      hash = "sha256-5mVplSTqXVTL+QSJg0hthKUL/JiwX3A3DC869HRzQ7M=";

      hash = "sha256-uqwsDXbS8tfG/bgTQKvdiaPzchVhssoQccQStncNWOk=";

    };

  };
@@ -249,7 +249,7 @@ stdenv.mkDerivation rec { 
    # FONTCONFIG_FILE is required to make fontconfig read the MB

    # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024

    # indicates the system fonts.conf being used instead.

    FONTCONFIG_FILE=$MB_IN_STORE/fontconfig/fonts.conf

    FONTCONFIG_FILE=$MB_IN_STORE/fonts/fonts.conf

    substituteInPlace "$FONTCONFIG_FILE" \

      --replace-fail '<dir prefix="cwd">fonts</dir>' "<dir>$MB_IN_STORE/fonts</dir>"

pkgs/by-name/to/tor-browser/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ lib.warnIf (useHardenedMalloc != null) 
        ++ lib.optionals mediaSupport [ ffmpeg ]

      );



      version = "14.0.9";

      version = "14.5";



      sources = {

        x86_64-linux = fetchurl {
@@ -119,7 +119,7 @@ lib.warnIf (useHardenedMalloc != null) 
            "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"

            "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"

          ];

          hash = "sha256-oTOTTB5tuAhzaQY3nlSUD4lZNHAGmURIf5XCzFB2xeg=";

          hash = "sha256-wSxmNPPJsLRjDVimc2Rp1rBcIgYp/CtPKuU6+gZfVmw=";

        };



        i686-linux = fetchurl {
@@ -129,7 +129,7 @@ lib.warnIf (useHardenedMalloc != null) 
            "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"

            "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"

          ];

          hash = "sha256-Z/CDaO5eEPVwBnm3SJxBYvInyB7Oy6Ve8hNJunTJET0=";

          hash = "sha256-upqpWUl5qmDj7Oc/wIGdNlgIJSaTbhxlq4X+zjCPHfA=";

        };

      };
@@ -291,7 +291,7 @@ lib.warnIf (useHardenedMalloc != null) 
        # FONTCONFIG_FILE is required to make fontconfig read the TBB

        # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024

        # indicates the system fonts.conf being used instead.

        FONTCONFIG_FILE=$TBB_IN_STORE/fontconfig/fonts.conf

        FONTCONFIG_FILE=$TBB_IN_STORE/fonts/fonts.conf

        substituteInPlace "$FONTCONFIG_FILE" \

          --replace-fail '<dir prefix="cwd">fonts</dir>' "<dir>$TBB_IN_STORE/fonts</dir>"