public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merging with upstream

Browse Source
This commit is contained in:
Parnell Springmeyer
2017-01-29 05:54:01 -06:00
parent c5f1f9a3b5 82bcfef109
commit 6777e6f812
155 changed files with 4670 additions and 2571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/security/tor/torbrowser.nix
+12 -7
View File
@@ -3,16 +3,19 @@
, atk, pango, freetype, fontconfig, gdk_pixbuf, cairo, zlib
, gstreamer, gst_plugins_base, gst_plugins_good, gst_ffmpeg, gmp, ffmpeg
, libpulseaudio
, mediaSupport ? false
}:
let
libPath = stdenv.lib.makeLibraryPath [
libPath = stdenv.lib.makeLibraryPath ([
stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk2 atk pango freetype
fontconfig gdk_pixbuf cairo libXrender libX11 libXext libXt
] ++ stdenv.lib.optionals mediaSupport [
gstreamer gst_plugins_base gmp ffmpeg
libpulseaudio
] ;
]);
# Ignored if !mediaSupport
gstPlugins = [ gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg ];
gstPluginsPath = stdenv.lib.concatMapStringsSep ":" (x:
@@ -21,13 +24,13 @@ in
stdenv.mkDerivation rec {
name = "tor-browser-${version}";
version = "6.0.8";
version = "6.5";
src = fetchurl {
url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz";
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz";
sha256 = if stdenv.is64bit then
"1s2yv72kj4zxba0850fi1jv41c69vcw3inhj9kqhy1d45ql7iw0w" else
"0zvqf444h35ikv1f3nwkh2jx51zj5k9w4zdxx32zcrnxpk5nhn97";
"0q0rdwjiqjjh9awiyp0a55nkhyri5y6zhkyq3n3x6w4afihl0wf4" else
"1y1sx2gp7c66l7a4smfibl8mv54byvawhhkikpa5l2vic75vyhk9";
};
preferLocalBuild = true;
@@ -77,7 +80,9 @@ stdenv.mkDerivation rec {
fi
export FONTCONFIG_PATH=\$HOME/Data/fontconfig
export LD_LIBRARY_PATH=${libPath}:$out/share/tor-browser/Browser/TorBrowser/Tor
export GST_PLUGIN_SYSTEM_PATH=${gstPluginsPath}
${stdenv.lib.optionalString mediaSupport ''
export GST_PLUGIN_SYSTEM_PATH=${gstPluginsPath}
''}
exec $out/share/tor-browser/Browser/firefox --class "Tor Browser" -no-remote -profile ~/Data/Browser/profile.default "\$@"
EOF
chmod +x $out/bin/tor-browser
pkgs/tools/security/vault/default.nix
+6 -6
View File
@@ -4,12 +4,12 @@ let
vaultBashCompletions = fetchFromGitHub {
owner = "iljaweis";
repo = "vault-bash-completion";
rev = "62c142e20929f930c893ebe3366350d735e81fbd";
sha256 = "0nfv10ykjq9751ijdyq728gjlgldm1lxvrar8kf6nz6rdfnnl2n5";
rev = "e2f59b64be1fa5430fa05c91b6274284de4ea77c";
sha256 = "10m75rp3hy71wlmnd88grmpjhqy0pwb9m8wm19l0f463xla54frd";
};
in buildGoPackage rec {
name = "vault-${version}";
version = "0.6.3";
version = "0.6.4";
goPackagePath = "github.com/hashicorp/vault";
@@ -17,7 +17,7 @@ in buildGoPackage rec {
owner = "hashicorp";
repo = "vault";
rev = "v${version}";
sha256 = "0cbaws106v5dxqjii1s9rmk55pm6y34jls35iggpx0pp1dd433xy";
sha256 = "0rrrzkza12zbbfc24q4q7ygfczq1j8ljsjagsa8vpp3375dflzdy";
};
buildFlagsArray = ''
@@ -26,7 +26,7 @@ in buildGoPackage rec {
'';
postInstall = ''
mkdir -p $bin/share/bash-completion/completions/
mkdir -p $bin/share/bash-completion/completions/
cp ${vaultBashCompletions}/vault-bash-completion.sh $bin/share/bash-completion/completions/vault
'';
@@ -34,6 +34,6 @@ in buildGoPackage rec {
homepage = https://www.vaultproject.io;
description = "A tool for managing secrets";
license = licenses.mpl20;
maintainers = with maintainers; [ rushmorem offline ];
maintainers = with maintainers; [ rushmorem offline pradeepchhetri ];
};
}