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

Merge older staging 

There's a security fix for curl.
This commit is contained in:
Vladimír Čunát 2017-08-12 09:48:17 +02:00
parent 66ce84b619 3be89a6758
commit e207d1f04a
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
12 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/audio/audio-recorder/default.nix
View File

@ -34,9 +34,9 @@ stdenv.mkDerivation rec {
'';
preFixup = ''
gappsWrapperArgs+=('--prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"'
'--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"'
'--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"')
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : $out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : $GST_PLUGIN_SYSTEM_PATH_1_0
--prefix GIO_EXTRA_MODULES : ${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules)
'';
meta = with stdenv.lib; {

6
pkgs/applications/audio/clerk/default.nix
View File

@ -13,13 +13,11 @@ stdenv.mkDerivation {
buildInputs = [ makeWrapper pythonPackages.mpd2 ];
buildPhase = ''
echo skipping build phase...
'';
dontBuild = true;
installPhase = ''
DESTDIR=$out PREFIX=/ make install
wrapProgram $out/bin/clerk $out/bin/clerk \
wrapProgram $out/bin/clerk \
--prefix PATH : "${stdenv.lib.makeBinPath [ rofi mpc_cli perl utillinux libnotify ]}"
'';

2
pkgs/applications/misc/gnuradio/default.nix
View File

@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
postInstall = ''
printf "backend : Qt4Agg\n" > "$out/share/gnuradio/matplotlibrc"
for file in "$out"/bin/* "$out"/share/gnuradio/examples/*/*.py; do
for file in $(find $out/bin $out/share/gnuradio/examples -type f -executable); do
wrapProgram "$file" \
--prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \
--set MATPLOTLIBRC "$out/share/gnuradio"

4
pkgs/applications/misc/gnuradio/wrapper.nix
View File

@ -11,10 +11,10 @@ stdenv.mkDerivation {
mkdir -p $out/bin
ln -s "${gnuradio}"/bin/* $out/bin/
for file in "$out"/bin/*; do
for file in $(find $out/bin -type f -executable); do
wrapProgram "$file" \
--prefix PYTHONPATH : ${stdenv.lib.concatStringsSep ":"
(map (path: "$(toPythonPath ${path})") extraPackages)} \
(map (path: "$(toPythonPath ${path})") extraPackages)} \
--prefix GRC_BLOCKS_PATH : ${makeSearchPath "share/gnuradio/grc/blocks" extraPackages}
done

2
pkgs/applications/office/libreoffice/still.nix
View File

@ -163,7 +163,7 @@ in stdenv.mkDerivation rec {
mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/"
for a in sbase scalc sdraw smath swriter spadmin simpress soffice; do
for a in sbase scalc sdraw smath swriter simpress soffice; do
ln -s $out/lib/libreoffice/program/$a $out/bin/$a
wrapProgram "$out/bin/$a" \
--prefix XDG_DATA_DIRS : \

4
pkgs/applications/window-managers/sawfish/default.nix
View File

@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
postInstall = ''
for i in $out/lib/sawfish/sawfish-menu $out/bin/sawfish-about $out/bin/sawfish-client $out/bin/sawfish-config $out/bin/sawfish; do
wrapProgram $i \
--prefix REP_DL_LOAD_PATH "$out/lib/rep" \
--set REP_LOAD_PATH "$out/share/sawfish/lisp"
--prefix REP_DL_LOAD_PATH : "$out/lib/rep" \
--set REP_LOAD_PATH "$out/share/sawfish/lisp"
done
'';

2
pkgs/build-support/cc-wrapper/default.nix
View File

@ -150,7 +150,7 @@ stdenv.mkDerivation {
echo $dynamicLinker > $out/nix-support/dynamic-linker
'' + (if targetPlatform.isDarwin then ''
printf "export LD_DYLD_PATH+=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook
printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook
'' else ''
if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then
echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32

3
pkgs/development/tools/misc/csmith/default.nix
View File

@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
--replace '../compiler_test.pl' $out/bin/compiler_test.pl \
--replace '../$CONFIG_FILE' '$CONFIG_FILE'
wrapProgram $out/bin/launchn.pl --prefix PERL5LIB : "$PERL5LIB" $out/bin/launchn.pl
wrapProgram $out/bin/launchn.pl \
--prefix PERL5LIB : "$PERL5LIB"
mkdir -p $out/share/csmith
mv $out/bin/compiler_test.in $out/share/csmith/

4
pkgs/os-specific/linux/edac-utils/default.nix
View File

@ -25,9 +25,7 @@ stdenv.mkDerivation {
postInstall = ''
wrapProgram "$out/sbin/edac-ctl" \
--set PATH : "" \
--prefix PATH : "${dmidecode}/bin" \
--prefix PATH : "${kmod}/bin"
--set PATH ${stdenv.lib.makeBinPath [ dmidecode kmod ]}
'';
meta = with stdenv.lib; {

2
pkgs/stdenv/generic/setup.sh
View File

@ -750,7 +750,7 @@ configurePhase() {
buildPhase() {
runHook preBuild
if [[ -z "$makeFlags" && ! ( -n "$makefile" || -e Makefile || -e makefile || -e GNUmakefile[[ ) ]]; then
if [[ -z "$makeFlags" && ! ( -n "$makefile" || -e Makefile || -e makefile || -e GNUmakefile ) ]]; then
echo "no Makefile, doing nothing"
else
# See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409

2
pkgs/tools/misc/system-config-printer/default.nix
View File

@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
''
buildPythonPath "$out $pythonPath"
gappsWrapperArgs+=(
--prefix PATH "$program_PATH"
--prefix PATH : "$program_PATH"
--set CUPS_DATADIR "${cups-filters}/share/cups"
)

8
pkgs/tools/networking/curl/default.nix
View File

@ -21,11 +21,11 @@ assert scpSupport -> libssh2 != null;
assert c-aresSupport -> c-ares != null;
stdenv.mkDerivation rec {
name = "curl-7.54.1";
name = "curl-7.55.0";
src = fetchurl {
url = "http://curl.haxx.se/download/${name}.tar.bz2";
sha256 = "1815iz5a7qghipjcl7s97hk4jqh4f3kqc487xi20rvh1s3r4vz7x";
sha256 = "1cg5h0klsx887qd4wpkk5bpkbw1bfc4q7adsrai71zhmdzn6j7dg";
};
outputs = [ "bin" "dev" "out" "man" "devdoc" ];
@ -72,6 +72,10 @@ stdenv.mkDerivation rec {
CXXCPP = "g++ -E";
postInstall = ''
pushd docs/libcurl
make install
popd
moveToOutput bin/curl-config "$dev"
sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la
'' + stdenv.lib.optionalString gnutlsSupport ''