Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history 
Fixes a security problem in curl's FTP.
  • Loading branch information
@vcunat
vcunat committed Oct 7, 2017
2 parents 23ad2b2 + 2c9c04f commit a982b20
Show file tree
Hide file tree
Showing 1,198 changed files with 3,058 additions and 1,631 deletions.
13 changes: 7 additions & 6 deletions doc/stdenv.xml
View file
@@ -1,4 +1,3 @@

<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="chap-stdenv">
Expand Down Expand Up @@ -188,11 +187,13 @@ genericBuild

<varlistentry>
<term><varname>NIX_DEBUG</varname></term>
<listitem><para>If set, <literal>stdenv</literal> will print some
debug information during the build. In particular, the
<command>gcc</command> and <command>ld</command> wrapper scripts
will print out the complete command line passed to the wrapped
tools.</para></listitem>
<listitem><para>
A natural number indicating how much information to log.
If set to 1 or higher, <literal>stdenv</literal> will print moderate debug information during the build.
In particular, the <command>gcc</command> and <command>ld</command> wrapper scripts will print out the complete command line passed to the wrapped tools.
If set to 6 or higher, the <literal>stdenv</literal> setup script will be run with <literal>set -x</literal> tracing.
If set to 7 or higher, the <command>gcc</command> and <command>ld</command> wrapper scripts will also be run with <literal>set -x</literal> tracing.
</para></listitem>
</varlistentry>

</variablelist>
Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/altcoins/memorycoin.nix
View file
Expand Up @@ -13,7 +13,8 @@ stdenv.mkDerivation rec{
sha256 = "1iyh6dqrg0mirwci5br5n5qw3ghp2cs23wd8ygr56bh9ml4dr1m8";
};

buildInputs = [ pkgconfig openssl db48 boost zlib utillinux protobuf ]
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl db48 boost zlib utillinux protobuf ]
++ optionals withGui [ qt4 qmake4Hook qrencode ];

qmakeFlags = ["USE_UPNP=-"];
Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/altcoins/primecoin.nix
View file
Expand Up @@ -16,7 +16,8 @@ stdenv.mkDerivation rec{
qmakeFlags = ["USE_UPNP=-"];
makeFlags = ["USE_UPNP=-"];

buildInputs = [ pkgconfig openssl db48 boost zlib utillinux protobuf ]
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl db48 boost zlib utillinux protobuf ]
++ optionals withGui [ qt4 qmake4Hook qrencode ];

configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/altcoins/stellar-core.nix
View file
Expand Up @@ -16,7 +16,8 @@ in stdenv.mkDerivation {
leaveDotGit = true;
};

buildInputs = [ autoconf automake libtool pkgconfig git ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ autoconf automake libtool git ];

propagatedBuildInputs = [ bison flex postgresql ];

Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/altcoins/zcash/default.nix
View file
Expand Up @@ -20,7 +20,8 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

buildInputs = [ pkgconfig gtest gmock gmp libsnark autoreconfHook openssl wget db62 boost zlib
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ gtest gmock gmp libsnark openssl wget db62 boost zlib
protobuf libevent libsodium librustzcash ]
++ optionals stdenv.isLinux [ utillinux ]
++ optionals withGui [ qt4 qrencode ];
Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/a2jmidid/default.nix
View file
Expand Up @@ -12,7 +12,8 @@ in stdenv.mkDerivation rec {
sha256 = "06dgf5655znbvrd7fhrv8msv6zw8vk0hjqglcqkh90960mnnmwz7";
};

buildInputs = [ makeWrapper pkgconfig alsaLib dbus libjack2 python dbus-python ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ makeWrapper alsaLib dbus libjack2 python dbus-python ];

configurePhase = "${python.interpreter} waf configure --prefix=$out";

Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/aj-snapshot/default.nix
View file
Expand Up @@ -12,7 +12,8 @@ stdenv.mkDerivation rec {

doCheck = false;

buildInputs = [ alsaLib minixml jack2Full pkgconfig ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ alsaLib minixml jack2Full ];

meta = with stdenv.lib; {
description = "Tool for storing/restoring JACK and/or ALSA connections to/from cml files";
Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/ams-lv2/default.nix
View file
Expand Up @@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1n1dnqnj24xhiy9323lj52nswr5120cj56fpckg802miss05sr6x";
};

buildInputs = [ cairo fftw gtkmm2 lv2 lvtk pkgconfig python ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cairo fftw gtkmm2 lv2 lvtk python ];

configurePhase = "python waf configure --prefix=$out";

Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/ario/default.nix
View file
Expand Up @@ -14,8 +14,9 @@ stdenv.mkDerivation rec {

patches = [ ./glib-single-include.patch ];

nativeBuildInputs = [ pkgconfig ];
buildInputs = [
pkgconfig gettext gtk2 expat intltool libgcrypt libunique gnutls
gettext gtk2 expat intltool libgcrypt libunique gnutls
libxml2 curl mpd_clientlib dbus_glib libnotify libsoup avahi taglib
];

Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/artyFX/default.nix
View file
Expand Up @@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "012hcy1mxl7gs2lipfcqp5x0xv1azb9hjrwf0h59yyxnzx96h7c9";
};

buildInputs = [ cairomm cmake libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk pkgconfig ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cairomm cmake libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk ];

meta = with stdenv.lib; {
homepage = http://openavproductions.com/artyfx/;
Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/asunder/default.nix
View file
Expand Up @@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
sha256 = "1nq9kd4rd4k2kibf57gdbm0zw2gxa234vvvdhxkm8g5bhx5h3iyq";
};

buildInputs = [ gtk2 libcddb intltool pkgconfig makeWrapper ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 libcddb intltool makeWrapper ];

runtimeDeps =
optional mp3Support lame ++
Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/audacity/default.nix
View file
Expand Up @@ -51,8 +51,9 @@ stdenv.mkDerivation rec {
"-lswscale"
];

nativeBuildInputs = [ pkgconfig ];
buildInputs = [
pkgconfig file gettext wxGTK30 expat alsaLib
file gettext wxGTK30 expat alsaLib
libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil gtk2
ffmpeg libmad lame libvorbis flac soundtouch
autoconf automake libtool # for the preConfigure phase
Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/bitmeter/default.nix
View file
Expand Up @@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7";
};

buildInputs = [ libjack2 gtk2 pkgconfig ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libjack2 gtk2 ];

meta = with stdenv.lib; {
homepage = http://devel.tlrmx.org/audio/bitmeter/;
Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/bristol/default.nix
View file
Expand Up @@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "1fi2m4gmvxdi260821y09lxsimq82yv4k5bbgk3kyc3x1nyhn7vx";
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [
alsaLib libjack2 pkgconfig libpulseaudio xorg.libX11 xorg.libXext
alsaLib libjack2 libpulseaudio xorg.libX11 xorg.libXext
xorg.xproto
];

Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/cmus/default.nix
View file
Expand Up @@ -116,7 +116,8 @@ stdenv.mkDerivation rec {
"CONFIG_WAV=y"
] ++ concatMap (a: a.flags) opts);

buildInputs = [ ncurses pkgconfig ]
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ncurses ]
++ stdenv.lib.optional stdenv.cc.isClang clangGCC
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreAudio ]
++ concatMap (a: a.deps) opts;
Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/distrho/default.nix
View file
Expand Up @@ -14,8 +14,9 @@ stdenv.mkDerivation rec {
sed -e "s#@./scripts#sh scripts#" -i Makefile
'';

nativeBuildInputs = [ pkgconfig ];
buildInputs = [
alsaLib fftwSinglePrec freetype libjack2 pkgconfig premake3
alsaLib fftwSinglePrec freetype libjack2 premake3
xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext
xorg.libXinerama xorg.libXrender ladspa-sdk
];
Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/eq10q/default.nix
View file
Expand Up @@ -7,7 +7,8 @@ stdenv.mkDerivation rec {
sha256 = "16mhcav8gwkp29k9ki4dlkajlcgh1i2wvldabxb046d37dq4qzrk";
};

buildInputs = [ cmake fftw gtkmm2 libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake fftw gtkmm2 libxcb lv2 xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ];

installFlags = ''
DESTDIR=$(out)
Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/espeak/edit.nix
View file
Expand Up @@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0x8s7vpb7rw5x37yjzy1f98m4f2csdg89libb74fm36gn8ly0hli";
};

buildInputs = [ pkgconfig unzip portaudio wxGTK ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ unzip portaudio wxGTK ];

# TODO:
# Uhm, seems like espeakedit still wants espeak-data/ in $HOME, even thought
Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/faust/faust1.nix
View file
Expand Up @@ -158,7 +158,8 @@ let

stdenv.mkDerivation ((faust2ApplBase args) // {

buildInputs = [ makeWrapper pkgconfig ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ makeWrapper ];

propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs;

Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/faust/faust2.nix
View file
Expand Up @@ -187,7 +187,8 @@ let

stdenv.mkDerivation ((faust2ApplBase args) // {

buildInputs = [ makeWrapper pkgconfig ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ makeWrapper ];

propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs;

Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/fluidsynth/default.nix
View file
Expand Up @@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin
"-framework CoreAudio -framework CoreServices";

buildInputs = [ glib libsndfile pkgconfig ]
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib libsndfile ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ]
++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreAudio AudioUnit ];

Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/fmsynth/default.nix
View file
Expand Up @@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1bk0bpr069hzx2508rgfbwpxiqgr7dmdkhqdywmd2i4rmibgrm1q";
};

buildInputs = [ gtkmm2 lv2 lvtk pkgconfig ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtkmm2 lv2 lvtk ];

buildPhase = ''
cd lv2
Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/fomp/default.nix
View file
Expand Up @@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5";
};

buildInputs = [ lv2 pkgconfig python2 ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ lv2 python2 ];

installPhase = ''
python waf configure --prefix=$out
Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/foo-yc20/default.nix
View file
Expand Up @@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "0i8261n95n4xic766h70xkrpbvw3sag96n1883ahmg6h7yb94avq";
};

buildInputs = [ libjack2 gtk2 lv2 faust pkgconfig ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libjack2 gtk2 lv2 faust ];

makeFlags = "PREFIX=$(out)";

Expand Down
7 changes: 5 additions & 2 deletions pkgs/applications/audio/gmpc/default.nix
View file
Expand Up @@ -14,16 +14,19 @@ stdenv.mkDerivation rec {
sha256 = "10vspwsgr8pwf3qp2bviw6b2l8prgdiswgv7qiqiyr0h1mmk487y";
};
patches = [ ./libmpd-11.8.17-remove-strndup.patch ];
buildInputs = [ pkgconfig glib ];

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib ];
};

src = fetchurl {
url = "http://download.sarine.nl/Programs/gmpc/11.8/gmpc-11.8.16.tar.gz";
sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556";
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [
libtool intltool pkgconfig glib gtk2 curl mpd_clientlib libsoup
libtool intltool glib gtk2 curl mpd_clientlib libsoup
libunique libmpd gob2 vala_0_23 libSM libICE sqlite hicolor_icon_theme
wrapGAppsHook
];
Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/gnaural/default.nix
View file
Expand Up @@ -2,7 +2,8 @@

stdenv.mkDerivation rec {
name = "gnaural-1.0.20110606";
buildInputs = [ pkgconfig gtk2 libsndfile portaudio ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 libsndfile portaudio ];
src = fetchurl {
url = "mirror://sourceforge/gnaural/Gnaural/${name}.tar.gz";
sha256 = "0p9rasz1jmxf16vnpj17g3vzdjygcyz3l6nmbq6wr402l61f1vy5";
Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/gtkpod/default.nix
View file
Expand Up @@ -13,7 +13,8 @@ stdenv.mkDerivation rec {

propagatedUserEnvPkgs = [ gnome.gnome_themes_standard ];

buildInputs = [ pkgconfig makeWrapper intltool curl gettext perl perlXMLParser
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ makeWrapper intltool curl gettext perl perlXMLParser
flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta
gnome.gdl gnome.defaultIconTheme
hicolor_icon_theme ];
Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/hydrogen/default.nix
View file
Expand Up @@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "1dy2jfkdw0nchars4xi4isrz66fqn53a9qk13bqza7lhmsg3s3qy";
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [
alsaLib boost cmake glib lash libjack2 libarchive liblrdf libsndfile pkgconfig qt4
alsaLib boost cmake glib lash libjack2 libarchive liblrdf libsndfile qt4
];

meta = with stdenv.lib; {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/iannix/default.nix
View file
Expand Up @@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "184ydb9f1303v332k5k3f1ki7cb6nkxhh6ij0yn72v7dp7figrgj";
};

nativeBuildInputs = [ qmake ];
buildInputs = [ alsaLib pkgconfig qtbase qtscript ];
nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [ alsaLib qtbase qtscript ];

qmakeFlags = [ "PREFIX=/" ];

Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/ingen/default.nix
View file
Expand Up @@ -13,8 +13,9 @@ stdenv.mkDerivation rec {
sha256 = "15s8nrzn68hc2s6iw0zshbz3lfnsq0mr6gflq05xm911b7xbp74k";
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [
boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper pkgconfig
boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper
python raul serd sord sratom suil
];

Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/jack-capture/default.nix
View file
Expand Up @@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0sk7b92my1v1g7rhkpl1c608rb0rdb28m9zqfll95kflxajd16zv";
};

buildInputs = [ libjack2 libsndfile pkgconfig ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libjack2 libsndfile ];

buildPhase = "PREFIX=$out make jack_capture";

Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/jack-oscrolloscope/default.nix
View file
Expand Up @@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash";
};

buildInputs = [ SDL libjack2 mesa pkgconfig ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ SDL libjack2 mesa ];

installPhase = ''
mkdir -p $out/bin
Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/jack-rack/default.nix
View file
Expand Up @@ -5,7 +5,8 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/jack-rack/${name}.tar.bz2";
sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045";
};
buildInputs = [ pkgconfig libjack2 ladspaH gtk2 alsaLib libxml2 librdf ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libjack2 ladspaH gtk2 alsaLib libxml2 librdf ];

meta = {
description = ''An effects "rack" for the JACK low latency audio API'';
Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/jackmeter/default.nix
View file
Expand Up @@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r";
};

buildInputs = [ libjack2 pkgconfig ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libjack2 ];

meta = {
description = "Console jack loudness meter";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/jackmix/default.nix
View file
Expand Up @@ -9,8 +9,8 @@ stdenv.mkDerivation rec {

patches = [ ./no_error.patch ];

nativeBuildInputs = [ pkgconfig ];
buildInputs = [
pkgconfig
scons
qt4
lash
Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/audio/jalv/default.nix
View file
Expand Up @@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "1x2wpzzx2cgvz3dgdcgsj8dr0w3zsasy62mvl199bsdj5fbjaili";
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [
gtk2 libjack2 lilv lv2 pkgconfig python serd sord sratom suil
gtk2 libjack2 lilv lv2 python serd sord sratom suil
];

configurePhase = "python waf configure --prefix=$out";
Expand Down

0 comments on commit a982b20

Please sign in to comment.