Unverified Commit ecc86467 authored by Emily's avatar Emily Committed by GitHub
Browse files

Merge pull request #239329 from felschr/tor-browser-12.5 

tor-browser-bundle-bin: 12.0.7 -> 12.5
parents 53008f6a 7d7547e3

pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ let 
  fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ];



  # Upstream source

  version = "12.0.7";

  version = "12.5";



  lang = "ALL";
@@ -101,7 +101,7 @@ let 
        "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"

        "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"

      ];

      hash = "sha256-lo+Iy6I7S1NV1E9CBPqJjRFzuEXGC80NRUUlpZfG5wU=";

      hash = "sha256-ois/0ghnQVX6A4OsGybOX2Ph0eKHOHX0+qfR9rnA3v8=";

    };



    i686-linux = fetchurl {
@@ -111,7 +111,7 @@ let 
        "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"

        "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"

      ];

      hash = "sha256-aLHZUFDZZ4i7BXoM5YxPrznYw812/OGmhG97t9okOvs=";

      hash = "sha256-Wee3wCVT+Ius9qOJOLTdAEysMh6Z2+swoS9obF28bYo=";

    };

  };
@@ -248,7 +248,7 @@ stdenv.mkDerivation rec { 


    # Hard-code path to TBB fonts; see also FONTCONFIG_FILE in

    # the wrapper below.

    FONTCONFIG_FILE=$TBB_IN_STORE/TorBrowser/Data/fontconfig/fonts.conf

    FONTCONFIG_FILE=$TBB_IN_STORE/fontconfig/fonts.conf

    sed -i "$FONTCONFIG_FILE" \

        -e "s,<dir>fonts</dir>,<dir>$TBB_IN_STORE/fonts</dir>,"