MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #37158 from oxij/pkgs/tor-browsers

Browse source 
update tor browsers
This commit is contained in:
Michael Raskin 2018-03-16 18:06:50 +00:00 committed by GitHub
commit c940d2e1ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/applications/networking/browsers/firefox/packages.nix
View file

@ -149,9 +149,26 @@ in rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SLNOS"; owner = "SLNOS";
repo = "tor-browser"; repo = "tor-browser";
# branch "tor-browser-52.6.2esr-7.5-2-slnos"; # branch "tor-browser-52.7.0esr-7.5-1-slnos";
rev = "cf1a504aaa26af962ae909a3811c0038db2d2eec"; rev = "211b2be3fea45a450915b0addcd7783aa939e24a";
sha256 = "0llbk7skh1n7yj137gv7rnxfasxsnvfjp4ss7h1fbdnw19yba115"; sha256 = "18gv4r8cjf89mamjh93a856a5yfp7dm3jrk8g05w89vxb3lrl74v";
};
patches = nixpkgsPatches;
} // commonAttrs) {};
tor-browser-8-0 = common (rec {
pname = "tor-browser";
version = "8.0.1";
isTorBrowserLike = true;
# FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
src = fetchFromGitHub {
owner = "SLNOS";
repo = "tor-browser";
# branch "tor-browser-52.7.0esr-8.0-1-slnos";
rev = "58314ccb043882e830ee9a21c37a92d6e0d34e94";
sha256 = "09gb7chw2kly53b599xwpi75azj00957rnxly9fqv8zi3n5k2pdb";
}; };
patches = nixpkgsPatches; patches = nixpkgsPatches;

4
pkgs/data/misc/cacert/default.nix
View file

@ -9,8 +9,8 @@ let
certdata2pem = fetchurl { certdata2pem = fetchurl {
name = "certdata2pem.py"; name = "certdata2pem.py";
url = "https://anonscm.debian.org/cgit/collab-maint/ca-certificates.git/plain/mozilla/certdata2pem.py?h=debian/20160104"; url = "https://anonscm.debian.org/cgit/collab-maint/ca-certificates.git/plain/mozilla/certdata2pem.py?h=debian/20170717";
sha256 = "0bw11mgfrf19qziyvdnq22kirp0nn54lfsanrg5h6djs6ig1c2im"; sha256 = "1d4q27j1gss0186a5m8bs5dk786w07ccyq0qi6xmd2zr1a8q16wy";
}; };
in in

8
pkgs/development/libraries/nss/85_security_load.patch
View file

@ -13,10 +13,10 @@ diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/cmd/shlibsign/shlibsign.c nss/cmd/sh
diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/coreconf/config.mk nss/coreconf/config.mk diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/coreconf/config.mk nss/coreconf/config.mk
--- nss/coreconf/config.mk 2017-01-04 15:24:24.000000000 +0100 --- nss/coreconf/config.mk 2017-01-04 15:24:24.000000000 +0100
+++ nss/coreconf/config.mk 2017-01-24 14:43:47.989432372 +0100 +++ nss/coreconf/config.mk 2017-01-24 14:43:47.989432372 +0100
@@ -208,3 +208,6 @@ @@ -202,3 +202,6 @@
# exported symbols, which causes problem when NSS is built as part of Mozilla.
# So we add a NSS_SSL_ENABLE_ZLIB variable to allow Mozilla to turn this off. # Hide old, deprecated, TLS cipher suite names when building NSS
NSS_SSL_ENABLE_ZLIB = 1 DEFINES += -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES
+ +
+# Nix specific stuff. +# Nix specific stuff.
+DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\" +DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\"

6
pkgs/development/libraries/nss/default.nix
View file

@ -9,11 +9,11 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "nss-${version}"; name = "nss-${version}";
version = "3.34.1"; version = "3.35";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_3_34_1_RTM/src/${name}.tar.gz"; url = "mirror://mozilla/security/nss/releases/NSS_3_35_RTM/src/${name}.tar.gz";
sha256 = "186x33wsk4mzjz7dzbn8p0py9a0nzkgzpfkdv4rlyy5gghv5vhd3"; sha256 = "1ypn68z9ncbbshi3184ywrhx5i846lyd72gps1grzqzdkgh7s4pl";
}; };
buildInputs = [ perl zlib sqlite ] buildInputs = [ perl zlib sqlite ]