diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 2a3316b8d01..31d3d0ca3c4 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -1005,6 +1005,13 @@ but only if the doCheck variable is enabled.
+
+ checkInputs
+
+ A list of dependencies used by the phase. This gets included in buildInputs when doCheck is set.
+
+
+
makeFlags /
makeFlagsArray /
@@ -1291,6 +1298,13 @@ installcheck.
+
+ installCheckInputs
+
+ A list of dependencies used by the phase. This gets included in buildInputs when doInstallCheck is set.
+
+
+
preInstallCheck
Hook executed at the start of the installCheck
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 277ae9e292c..6aa6d9b271f 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -33,7 +33,7 @@ let
sh = pkgs.runtimeShell;
binshDeps = pkgs.writeReferencesToFile sh;
in
- pkgs.runCommand "nix.conf" { extraOptions = cfg.extraOptions; } ''
+ pkgs.runCommand "nix.conf" { extraOptions = cfg.extraOptions; } (''
${optionalString (!isNix20) ''
extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done)
''}
@@ -62,7 +62,11 @@ let
''}
$extraOptions
END
- '';
+ '' + optionalString cfg.checkConfig ''
+ echo "Checking that Nix can read nix.conf..."
+ ln -s $out ./nix.conf
+ NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config >/dev/null
+ '');
in
@@ -351,6 +355,13 @@ in
'';
};
+ checkConfig = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ If enabled (the default), checks that Nix can parse the generated nix.conf.
+ '';
+ };
};
};
diff --git a/nixos/release.nix b/nixos/release.nix
index 5b6640f1d3c..8956d6df855 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -286,6 +286,7 @@ in rec {
tests.firewall = callTest tests/firewall.nix {};
tests.fleet = callTestOnMatchingSystems ["x86_64-linux"] tests/fleet.nix {};
tests.fwupd = callTest tests/fwupd.nix {};
+ tests.gdk-pixbuf = callTest tests/gdk-pixbuf.nix {};
#tests.gitlab = callTest tests/gitlab.nix {};
tests.gitolite = callTest tests/gitolite.nix {};
tests.gjs = callTest tests/gjs.nix {};
diff --git a/nixos/tests/gdk-pixbuf.nix b/nixos/tests/gdk-pixbuf.nix
new file mode 100644
index 00000000000..b20f61b5ffe
--- /dev/null
+++ b/nixos/tests/gdk-pixbuf.nix
@@ -0,0 +1,19 @@
+# run installed tests
+import ./make-test.nix ({ pkgs, ... }: {
+ name = "gdk-pixbuf";
+
+ meta = {
+ maintainers = pkgs.gdk_pixbuf.meta.maintainers;
+ };
+
+ machine = { pkgs, ... }: {
+ environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
+ environment.variables.XDG_DATA_DIRS = [ "${pkgs.gdk_pixbuf.installedTests}/share" ];
+
+ virtualisation.memorySize = 4096; # Tests allocate a lot of memory trying to exploit a CVE
+ };
+
+ testScript = ''
+ $machine->succeed("gnome-desktop-testing-runner");
+ '';
+})
diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index 0acd616eeaf..30bbcb2c839 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec{
"--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
];
+ # Fails with "This application failed to start because it could not
+ # find or load the Qt platform plugin "minimal""
+ doCheck = false;
+
meta = {
description = "Peer-to-peer electronic cash system";
longDescription= ''
diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix
index e3263c944f4..f3bcff7a2c5 100644
--- a/pkgs/applications/audio/easytag/default.nix
+++ b/pkgs/applications/audio/easytag/default.nix
@@ -22,6 +22,8 @@ in stdenv.mkDerivation rec {
gsettings-desktop-schemas gnome3.defaultIconTheme
];
+ doCheck = false; # fails 1 out of 9 tests
+
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 4bbc34bb7bb..4b8d2ab291b 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -78,6 +78,8 @@ stdenv.mkDerivation rec {
[ libX11 libXext libXt libwebp ]
;
+ doCheck = false; # fails 6 out of 76 tests
+
postInstall = ''
(cd "$dev/include" && ln -s ImageMagick* ImageMagick)
moveToOutput "bin/*-config" "$dev"
diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix
index 12da125bb3e..7c4e6ff8c3d 100644
--- a/pkgs/applications/misc/audio/soxr/default.nix
+++ b/pkgs/applications/misc/audio/soxr/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec {
- name = "soxr-0.1.2";
+ name = "soxr-0.1.3";
src = fetchurl {
url = "mirror://sourceforge/soxr/${name}-Source.tar.xz";
- sha256 = "0xf2w3piwz9gfr1xqyrj4k685q5dy53kq3igv663i4f4y4sg9rjl";
+ sha256 = "12aql6svkplxq5fjycar18863hcq84c5kx8g6f4rj0lcvigw24di";
};
outputs = [ "out" "doc" ]; # headers are just two and very small
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index e8e1862d7f8..5b88a61afce 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -213,6 +213,7 @@ stdenv.mkDerivation (rec {
++ extraMakeFlags;
enableParallelBuilding = true;
+ doCheck = false; # "--disable-tests" above
preInstall = ''
# The following is needed for startup cache creation on grsecurity kernels.
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 45917bf65c1..d56ceff8184 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -7,7 +7,6 @@
, trezor-bridge, bluejeans, djview4, adobe-reader
, google_talk_plugin, fribid, gnome3/*.gnome-shell*/
, esteidfirefoxplugin
-, vlc_npapi
, browserpass, chrome-gnome-shell
, libudev
, kerberos
@@ -57,7 +56,6 @@ let
++ lib.optional (cfg.enableBluejeans or false) bluejeans
++ lib.optional (cfg.enableAdobeReader or false) adobe-reader
++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin
- ++ lib.optional (cfg.enableVLC or false) vlc_npapi
++ extraPlugins
);
nativeMessagingHosts =
diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
index eb88d1c24c2..3ddbe9be4fc 100644
--- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
+++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
@@ -21,13 +21,16 @@ stdenv.mkDerivation rec {
pkgconfig intltool autoconf-archive
appstream-glib
];
+
buildInputs = [ gtk3 json-glib curl glib hicolor-icon-theme ];
- meta = with stdenv.lib;
- { description = "GTK remote control for the Transmission BitTorrent client";
- homepage = https://github.com/ajf8/transmission-remote-gtk;
- license = licenses.gpl2;
- maintainers = [ maintainers.ehmry ];
- platforms = platforms.linux;
- };
+ doCheck = false; # fails with style validation error
+
+ meta = with stdenv.lib; {
+ description = "GTK remote control for the Transmission BitTorrent client";
+ homepage = https://github.com/ajf8/transmission-remote-gtk;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.ehmry ];
+ platforms = platforms.linux;
+ };
}
diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index d5982f33e78..a721900f20a 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -23,7 +23,7 @@
, alsaLib
, libidn
, zlib
-, version ? null
+, version ? "13.9.0"
}:
let
diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix
index 8a729c28da9..71fb7612b33 100644
--- a/pkgs/applications/version-management/cvs/default.nix
+++ b/pkgs/applications/version-management/cvs/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation {
buildInputs = [ nano ];
+ doCheck = false; # fails 1 of 1 tests
+
meta = {
homepage = http://cvs.nongnu.org;
description = "Concurrent Versions System - a source control system";
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 74e88430239..21e9a805c10 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -18,7 +18,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;
let
- version = "2.16.3";
+ version = "2.17.0";
svn = subversionClient.override { perlBindings = perlSupport; };
in
@@ -27,19 +27,24 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
- sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn";
+ sha256 = "1ismz7nsz8dgjmk782xr9s0mr2qh06f72pdcgbxfmnw1bvlya5p9";
};
outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb";
hardeningDisable = [ "format" ];
+ enableParallelBuilding = true;
+
+ ## Patch
+
patches = [
./docbook2texi.patch
./symlinks-in-bin.patch
./git-sh-i18n.patch
./ssh-path.patch
./git-send-email-honor-PATH.patch
+ ./installCheck-path.patch
];
postPatch = ''
@@ -47,6 +52,10 @@ stdenv.mkDerivation {
substituteInPlace "$x" \
--subst-var-by ssh "${openssh}/bin/ssh"
done
+
+ # Fix references to gettext introduced by ./git-sh-i18n.patch
+ substituteInPlace git-sh-i18n.sh \
+ --subst-var-by gettext ${gettext}
'';
nativeBuildInputs = [ gettext perl ]
@@ -58,7 +67,6 @@ stdenv.mkDerivation {
++ stdenv.lib.optionals withpcre2 [ pcre2 ]
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ];
-
# required to support pthread_cancel()
NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.cc.isClang) "-lgcc_s"
+ stdenv.lib.optionalString (stdenv.isFreeBSD) "-lthr";
@@ -68,6 +76,10 @@ stdenv.mkDerivation {
"ac_cv_snprintf_returns_bogus=no"
];
+ preBuild = ''
+ makeFlagsArray+=( perllibdir=$out/$(perl -MConfig -wle 'print substr $Config{installsitelib}, 1 + length $Config{siteprefixexp}') )
+ '';
+
makeFlags = [
"prefix=\${out}"
"SHELL_PATH=${stdenv.shell}"
@@ -86,15 +98,17 @@ stdenv.mkDerivation {
popd
'';
- # FIXME: "make check" requires Sparse; the Makefile must be tweaked
- # so that `SPARSE_FLAGS' corresponds to the current architecture...
- #doCheck = true;
+
+ ## Install
+
+ # WARNING: Do not `rm` or `mv` files from the source tree; use `cp` instead.
+ # We need many of these files during the installCheckPhase.
installFlags = "NO_INSTALL_HARDLINKS=1";
preInstall = stdenv.lib.optionalString stdenv.isDarwin ''
mkdir -p $out/bin
- mv $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin
+ cp -a $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin
'';
postInstall =
@@ -112,7 +126,7 @@ stdenv.mkDerivation {
# Install contrib stuff.
mkdir -p $out/share/git
- mv contrib $out/share/git/
+ cp -a contrib $out/share/git/
ln -s "$out/share/git/contrib/credential/netrc/git-credential-netrc" $out/bin/
mkdir -p $out/share/emacs/site-lisp
ln -s "$out/share/git/contrib/emacs/"*.el $out/share/emacs/site-lisp/
@@ -145,9 +159,6 @@ stdenv.mkDerivation {
perl -0777 -i -pe "$SCRIPT" \
$out/libexec/git-core/git-{sh-setup,filter-branch,merge-octopus,mergetool,quiltimport,request-pull,stash,submodule,subtree,web--browse}
- # Fix references to gettext.
- substituteInPlace $out/libexec/git-core/git-sh-i18n \
- --subst-var-by gettext ${gettext}
# Also put git-http-backend into $PATH, so that we can use smart
# HTTP(s) transports for pushing
@@ -225,7 +236,49 @@ EOF
'';
- enableParallelBuilding = true;
+ ## InstallCheck
+
+ doInstallCheck = true;
+
+ installCheckTarget = "test";
+
+ # see also installCheckFlagsArray
+ installCheckFlags = "DEFAULT_TEST_TARGET=prove";
+
+ preInstallCheck = ''
+ installCheckFlagsArray+=(
+ GIT_PROVE_OPTS="--jobs $NIX_BUILD_CORES --failures --state=failed,save"
+ GIT_TEST_INSTALLED=$out/bin
+ ${stdenv.lib.optionalString (!svnSupport) "NO_SVN_TESTS=y"}
+ )
+
+ function disable_test {
+ local test=$1 pattern=$2
+ if [ $# -eq 1 ]; then
+ mv t/{,skip-}$test.sh || true
+ else
+ sed -i t/$test.sh \
+ -e "/^ *test_expect_.*$pattern/,/^ *' *\$/{s/^/#/}"
+ fi
+ }
+
+ # Shared permissions are forbidden in sandbox builds.
+ disable_test t0001-init shared
+ disable_test t1301-shared-repo
+
+ # Our patched gettext never fallbacks
+ disable_test t0201-gettext-fallbacks
+
+ ${stdenv.lib.optionalString (!sendEmailSupport) ''
+ # Disable sendmail tests
+ disable_test t9001-send-email
+ ''}
+
+ # XXX: I failed to understand why this one fails.
+ # Could someone try to re-enable it on the next release ?
+ disable_test t1700-split-index "null sha1"
+ '';
+
meta = {
homepage = https://git-scm.com/;
diff --git a/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch b/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch
index bf36b2d321f..ab5bb3c3a6c 100644
--- a/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch
+++ b/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch
@@ -2,19 +2,19 @@ This patch does two things: (1) use the right name for `docbook2texi',
and (2) make sure `gitman.info' isn't produced since it's broken (duplicate
node names).
-diff -ru git-1.8.4-orig/Documentation/Makefile git-1.8.4/Documentation/Makefile
---- git-1.8.4-orig/Documentation/Makefile 2013-08-23 21:38:43.000000000 +0200
-+++ git-1.8.4/Documentation/Makefile 2013-09-30 14:48:51.532890378 +0200
-@@ -101,7 +101,7 @@
+diff --git a/Documentation/Makefile b/Documentation/Makefile
+--- a/Documentation/Makefile
++++ b/Documentation/Makefile
+@@ -122,7 +122,7 @@
MAKEINFO = makeinfo
INSTALL_INFO = install-info
-DOCBOOK2X_TEXI = docbook2x-texi
+DOCBOOK2X_TEXI = docbook2texi
DBLATEX = dblatex
- ifndef PERL_PATH
- PERL_PATH = /usr/bin/perl
-@@ -205,7 +205,7 @@
+ ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex
+ DBLATEX_COMMON = -p $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.xsl -s $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.sty
+@@ -240,7 +240,7 @@
man5: $(DOC_MAN5)
man7: $(DOC_MAN7)
@@ -23,7 +23,7 @@ diff -ru git-1.8.4-orig/Documentation/Makefile git-1.8.4/Documentation/Makefile
pdf: user-manual.pdf
-@@ -221,10 +221,9 @@
+@@ -256,10 +256,9 @@
install-info: info
$(INSTALL) -d -m 755 $(DESTDIR)$(infodir)
diff --git a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch b/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch
index 9a484262b7b..6b93d061a3b 100644
--- a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch
+++ b/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch
@@ -1,22 +1,20 @@
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
-index 8060ea35c..c81067a19 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
-@@ -203,8 +203,7 @@ a password is obtained using 'git-credential'.
+@@ -208,8 +208,7 @@ a password is obtained using 'git-credential'.
specify a full pathname of a sendmail-like program instead;
the program must support the `-i` option. Default value can
be specified by the `sendemail.smtpServer` configuration
- option; the built-in default is to search for `sendmail` in
- `/usr/sbin`, `/usr/lib` and $PATH if such program is
-+ option; the built-in default is to search in $PATH if such program is
++ option; the built-in default is to search in $PATH if such program is
available, falling back to `localhost` otherwise.
--smtp-server-port=::
diff --git a/git-send-email.perl b/git-send-email.perl
-index edcc6d346..8e357aeab 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
-@@ -885,8 +885,7 @@ if (defined $initial_reply_to) {
+@@ -944,8 +944,7 @@ if (defined $reply_to) {
}
if (!defined $smtp_server) {
diff --git a/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch b/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch
new file mode 100644
index 00000000000..8c68fb9f186
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch
@@ -0,0 +1,12 @@
+diff --git a/t/test-lib.sh b/t/test-lib.sh
+--- a/t/test-lib.sh
++++ b/t/test-lib.sh
+@@ -923,7 +923,7 @@
+ then
+ GIT_EXEC_PATH=$($GIT_TEST_INSTALLED/git --exec-path) ||
+ error "Cannot run git from $GIT_TEST_INSTALLED."
+- PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR:$PATH
++ PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$GIT_BUILD_DIR:$PATH
+ GIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:-$GIT_EXEC_PATH}
+ else # normal case, use ../bin-wrappers only unless $with_dashes:
+ git_bin_dir="$GIT_BUILD_DIR/bin-wrappers"
diff --git a/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch b/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch
index 29d537db25f..0a581a61d46 100644
--- a/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch
+++ b/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch
@@ -1,7 +1,7 @@
-diff -ru -x '*~' git-1.8.2.1-orig/Makefile git-1.8.2.1/Makefile
---- git-1.8.2.1-orig/Makefile 2013-04-08 00:52:04.000000000 +0200
-+++ git-1.8.2.1/Makefile 2013-04-22 15:46:42.906026940 +0200
-@@ -2319,8 +2319,7 @@
+diff --git a/Makefile b/Makefile
+--- a/Makefile
++++ b/Makefile
+@@ -2609,8 +2609,7 @@
{ test "$$bindir/" = "$$execdir/" || \
for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
$(RM) "$$execdir/$$p" && \
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index e069c39f059..6b8ef7b88e8 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -88,6 +88,8 @@ let
enableParallelBuilding = true;
+ doCheck = false; # fails 10 out of ~2300 tests
+
meta = {
description = "A version control system intended to be a compelling replacement for CVS in the open source community";
homepage = http://subversion.apache.org/;
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 44c4d317d36..6cc26baf70c 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -1,86 +1,81 @@
-{ stdenv, fetchurl, xz, bzip2, perl, xorg, libdvdnav, libbluray
+{ stdenv, fetchurl, autoreconfHook
+, libarchive, perl, xorg, libdvdnav, libbluray
, zlib, a52dec, libmad, faad2, ffmpeg, alsaLib
, pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska
-, libvorbis, libtheora, speex, lua5, libgcrypt, libupnp
+, libvorbis, libtheora, speex, lua5, libgcrypt, libgpgerror, libupnp
, libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg
-, mpeg2dec, udev, gnutls, avahi, libcddb, libjack2, SDL, SDL_image
+, mpeg2dec, systemd, gnutls, avahi, libcddb, libjack2, SDL, SDL_image
, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
-, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
-, libvdpau, libsamplerate, live555, fluidsynth
-, qt4 ? null
-, withQt5 ? false, qtbase ? null, qtx11extras ? null
+, libass, libva-full, libdvbpsi, libdc1394, libraw1394, libopus
+, libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols
+, onlyLibVLC ? false
+, withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null
, jackSupport ? false
, fetchpatch
}:
with stdenv.lib;
-assert (withQt5 -> qtbase != null && qtx11extras != null);
-assert (!withQt5 -> qt4 != null);
+assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null);
stdenv.mkDerivation rec {
name = "vlc-${version}";
- version = "2.2.8";
+ version = "3.0.1";
src = fetchurl {
url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz";
- sha256 = "1v32snw46rkgbdqdy3dssl2y13i8p2cr1cw1i18r6vdmiy24dw4v";
+ sha256 = "008krfhykm9447wc1kkw82bsw3f6ikljgrqyb1sinwlxnkghqw6f";
};
- # Comment-out the Qt 5.5 version check, as we do apply the relevant patch.
- # https://trac.videolan.org/vlc/ticket/16497
- postPatch = if (!withQt5) then null else
- "sed '/I78ef29975181ee22429c9bd4b11d96d9e68b7a9c/s/^/: #/' -i configure";
-
- buildInputs =
- [ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
- libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt
- libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
- udev gnutls avahi libcddb SDL SDL_image libmtp unzip taglib
- libkate libtiger libv4l samba liboggz libass libdvbpsi libva
- xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
- libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate live555
- fluidsynth
- ]
- ++ [(if withQt5 then qtbase else qt4)]
- ++ optional withQt5 qtx11extras
+ # VLC uses a *ton* of libraries for various pieces of functionality, many of
+ # which are not included here for no other reason that nobody has mentioned
+ # needing them
+ buildInputs = [
+ zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
+ libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror
+ libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
+ systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive
+ libkate libtiger libv4l samba liboggz libass libdvbpsi libva-full
+ xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
+ libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate live555
+ fluidsynth wayland wayland-protocols
+ ] ++ optionals withQt5 [ qtbase qtsvg qtx11extras ]
++ optional jackSupport libjack2;
- nativeBuildInputs = [ pkgconfig ];
-
- LIVE555_PREFIX = live555;
-
- preConfigure = ''
- sed -e "s@/bin/echo@echo@g" -i configure
- '' + optionalString withQt5 ''
- # Make sure we only *add* "-std=c++11" to CXXFLAGS instead of overriding the
- # values figured out by configure (for example "-g -O2").
- sed -i -re '/^ *CXXFLAGS=("[^$"]+")? *$/s/CXXFLAGS="?/&-std=c++11 /' \
- configure
- '';
-
- configureFlags =
- [ "--enable-alsa"
- "--with-kde-solid=$out/share/apps/solid/actions"
- "--enable-dc1394"
- "--enable-ncurses"
- "--enable-vdpau"
- "--enable-dvdnav"
- "--enable-samplerate"
- ];
+ nativeBuildInputs = [ autoreconfHook perl pkgconfig ];
enableParallelBuilding = true;
- preBuild = ''
- substituteInPlace modules/text_renderer/freetype.c --replace \
- /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf \
- ${freefont_ttf}/share/fonts/truetype/FreeSerifBold.ttf
+ LIVE555_PREFIX = live555;
+
+ # vlc depends on a c11-gcc wrapper script which we don't have so we need to
+ # set the path to the compiler
+ BUILDCC = "${stdenv.cc}/bin/gcc";
+
+ postPatch = ''
+ substituteInPlace configure \
+ --replace /bin/echo echo
+
+ substituteInPlace modules/text_renderer/freetype/platform_fonts.h --replace \
+ /usr/share/fonts/truetype/freefont ${freefont_ttf}/share/fonts/truetype
'';
+ # https://github.com/NixOS/nixpkgs/pull/35124#issuecomment-370552830
+ postFixup = ''
+ find $out/lib/vlc/plugins -exec touch -d @1 '{}' ';'
+ $out/lib/vlc/vlc-cache-gen $out/vlc/plugins
+ '';
+
+ # Most of the libraries are auto-detected so we don't need to set a bunch of
+ # "--enable-foo" flags here
+ configureFlags = [
+ "--with-kde-solid=$out/share/apps/solid/actions"
+ ] ++ optional onlyLibVLC "--disable-vlc";
+
meta = with stdenv.lib; {
description = "Cross-platform media player and streaming server";
homepage = http://www.videolan.org/vlc/;
- platforms = platforms.linux;
license = licenses.lgpl21Plus;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/video/vlc/plugin.nix b/pkgs/applications/video/vlc/plugin.nix
deleted file mode 100644
index 583d978a551..00000000000
--- a/pkgs/applications/video/vlc/plugin.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchgit, vlc, autoconf, automake, libtool, pkgconfig, npapi_sdk,
-libxcb, xlibsWrapper, gtk}:
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
- name = "vlc-plugin-${version}";
- version = "2.2.2"; # This 2.2.2 builds fine with vlc 2.2.4
-
- src = fetchgit {
- url = "https://code.videolan.org/videolan/npapi-vlc.git";
- rev = "5fa6fbc11cf5bad983f57656c0085e47e18fbf20";
- sha256 = "0k4s0657kv1mx1md8vj87scs0hz59xy7syqdsxb48w3w8gnfljs0";
- };
-
- preConfigure = "sh autogen.sh";
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ vlc autoconf automake libtool npapi_sdk libxcb
- xlibsWrapper gtk ];
-
- enableParallelBuilding = true;
-
- passthru = {
- mozillaPlugin = "/lib/mozilla/plugins";
- };
-
- meta = with stdenv.lib; {
- description = "Webplugins based on libVLC (for firefox, npapi)";
- homepage = https://code.videolan.org/videolan/npapi-vlc;
- platforms = platforms.linux;
- license = licenses.gpl2Plus;
- };
-}
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index dd68eb19380..bb2243ca97b 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -119,6 +119,8 @@ stdenv.mkDerivation rec {
++ optional openGLSupport "--enable-opengl"
++ optional virglSupport "--enable-virglrenderer";
+ doCheck = false; # tries to access /dev
+
postFixup =
''
for exe in $out/bin/qemu-system-* ; do
diff --git a/pkgs/build-support/bintools-wrapper/add-flags.sh b/pkgs/build-support/bintools-wrapper/add-flags.sh
index 7d118d20fc6..a9780925895 100644
--- a/pkgs/build-support/bintools-wrapper/add-flags.sh
+++ b/pkgs/build-support/bintools-wrapper/add-flags.sh
@@ -5,6 +5,7 @@ var_templates_list=(
NIX+LDFLAGS_BEFORE
NIX+LDFLAGS_AFTER
NIX+LDFLAGS_HARDEN
+ NIX+HARDENING_ENABLE
)
var_templates_bool=(
NIX+SET_BUILD_ID
@@ -23,10 +24,10 @@ if [ "${NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_TARGET:-}" ]; then
fi
for var in "${var_templates_list[@]}"; do
- mangleVarList "$var" "${role_infixes[@]}"
+ mangleVarList "$var" ${role_infixes[@]+"${role_infixes[@]}"}
done
for var in "${var_templates_bool[@]}"; do
- mangleVarBool "$var" "${role_infixes[@]}"
+ mangleVarBool "$var" ${role_infixes[@]+"${role_infixes[@]}"}
done
if [ -e @out@/nix-support/libc-ldflags ]; then
diff --git a/pkgs/build-support/bintools-wrapper/add-hardening.sh b/pkgs/build-support/bintools-wrapper/add-hardening.sh
index 5282d17fce2..b7180870860 100644
--- a/pkgs/build-support/bintools-wrapper/add-hardening.sh
+++ b/pkgs/build-support/bintools-wrapper/add-hardening.sh
@@ -1,53 +1,58 @@
-hardeningFlags=(relro bindnow)
-# Intentionally word-split in case 'hardeningEnable' is defined in
-# Nix. Also, our bootstrap tools version of bash is old enough that
-# undefined arrays trip `set -u`.
-if [[ -v hardeningEnable[@] ]]; then
- hardeningFlags+=(${hardeningEnable[@]})
-fi
-hardeningLDFlags=()
+declare -a hardeningLDFlags=()
-declare -A hardeningDisableMap
+declare -A hardeningEnableMap=()
-# Intentionally word-split in case 'hardeningDisable' is defined in Nix.
-for flag in ${hardeningDisable[@]:-IGNORED_KEY} @hardening_unsupported_flags@
-do
- hardeningDisableMap[$flag]=1
+# Intentionally word-split in case 'NIX_HARDENING_ENABLE' is defined in Nix. The
+# array expansion also prevents undefined variables from causing trouble with
+# `set -u`.
+for flag in ${NIX_@infixSalt@_HARDENING_ENABLE-}; do
+ hardeningEnableMap["$flag"]=1
+done
+
+# Remove unsupported flags.
+for flag in @hardening_unsupported_flags@; do
+ unset -v "hardeningEnableMap[$flag]"
done
if (( "${NIX_DEBUG:-0}" >= 1 )); then
+ declare -a allHardeningFlags=(pie relro bindnow)
+ declare -A hardeningDisableMap=()
+
+ # Determine which flags were effectively disabled so we can report below.
+ for flag in "${allHardeningFlags[@]}"; do
+ if [[ -z "${hardeningEnableMap[$flag]-}" ]]; then
+ hardeningDisableMap[$flag]=1
+ fi
+ done
+
printf 'HARDENING: disabled flags:' >&2
(( "${#hardeningDisableMap[@]}" )) && printf ' %q' "${!hardeningDisableMap[@]}" >&2
echo >&2
-fi
-if [[ -z "${hardeningDisableMap[all]:-}" ]]; then
- if (( "${NIX_DEBUG:-0}" >= 1 )); then
+ if (( "${#hardeningEnableMap[@]}" )); then
echo 'HARDENING: Is active (not completely disabled with "all" flag)' >&2;
fi
- for flag in "${hardeningFlags[@]}"
- do
- if [[ -z "${hardeningDisableMap[$flag]:-}" ]]; then
- case $flag in
- pie)
- if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then
- if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi
- hardeningLDFlags+=('-pie')
- fi
- ;;
- relro)
- if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling relro >&2; fi
- hardeningLDFlags+=('-z' 'relro')
- ;;
- bindnow)
- if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling bindnow >&2; fi
- hardeningLDFlags+=('-z' 'now')
- ;;
- *)
- # Ignore unsupported. Checked in Nix that at least *some*
- # tool supports each flag.
- ;;
- esac
- fi
- done
fi
+
+for flag in "${!hardeningEnableMap[@]}"; do
+ case $flag in
+ pie)
+ if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi
+ hardeningLDFlags+=('-pie')
+ fi
+ ;;
+ relro)
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling relro >&2; fi
+ hardeningLDFlags+=('-z' 'relro')
+ ;;
+ bindnow)
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling bindnow >&2; fi
+ hardeningLDFlags+=('-z' 'now')
+ ;;
+ *)
+ # Ignore unsupported. Checked in Nix that at least *some*
+ # tool supports each flag.
+ ;;
+ esac
+done
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 47301bbdde6..19e2902cb0d 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -74,7 +74,7 @@ in
stdenv.mkDerivation {
name = targetPrefix
- + (if name != "" then name else "${bintoolsName}-wrapper")
+ + (if name != "" then name else stdenv.lib.removePrefix targetPrefix "${bintoolsName}-wrapper")
+ (stdenv.lib.optionalString (bintools != null && bintoolsVersion != "") "-${bintoolsVersion}");
preferLocalBuild = true;
diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh
index 991ed0fe263..672a3dcbe38 100644
--- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh
@@ -57,8 +57,8 @@ fi
source @out@/nix-support/add-hardening.sh
-extraAfter=("${hardeningLDFlags[@]}")
-extraBefore=()
+extraAfter=()
+extraBefore=(${hardeningLDFlags[@]+"${hardeningLDFlags[@]}"})
if [ -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ]; then
extraAfter+=($NIX_@infixSalt@_LDFLAGS)
diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh
index 48a00b0b9b0..831ee9b0387 100644
--- a/pkgs/build-support/bintools-wrapper/setup-hook.sh
+++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh
@@ -83,6 +83,10 @@ do
fi
done
+# If unset, assume the default hardening flags.
+: ${NIX_HARDENING_ENABLE="fortify stackprotector pic strictoverflow format relro bindnow"}
+export NIX_HARDENING_ENABLE
+
# No local scope in sourced file
unset -v role_pre role_post cmd upper_case
set +u
diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh
index 604aaf6b6cf..e384d30ecbb 100644
--- a/pkgs/build-support/cc-wrapper/add-flags.sh
+++ b/pkgs/build-support/cc-wrapper/add-flags.sh
@@ -30,10 +30,10 @@ fi
# We need to mangle names for hygiene, but also take parameters/overrides
# from the environment.
for var in "${var_templates_list[@]}"; do
- mangleVarList "$var" "${role_infixes[@]}"
+ mangleVarList "$var" ${role_infixes[@]+"${role_infixes[@]}"}
done
for var in "${var_templates_bool[@]}"; do
- mangleVarBool "$var" "${role_infixes[@]}"
+ mangleVarBool "$var" ${role_infixes[@]+"${role_infixes[@]}"}
done
# `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld.
diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh
index a35ff3cb426..fc40fe7408b 100644
--- a/pkgs/build-support/cc-wrapper/add-hardening.sh
+++ b/pkgs/build-support/cc-wrapper/add-hardening.sh
@@ -1,67 +1,72 @@
-hardeningFlags=(fortify stackprotector pic strictoverflow format relro bindnow)
-# Intentionally word-split in case 'hardeningEnable' is defined in
-# Nix. Also, our bootstrap tools version of bash is old enough that
-# undefined arrays trip `set -u`.
-if [[ -v hardeningEnable[@] ]]; then
- hardeningFlags+=(${hardeningEnable[@]})
-fi
-hardeningCFlags=()
+declare -a hardeningCFlags=()
-declare -A hardeningDisableMap
+declare -A hardeningEnableMap=()
-# Intentionally word-split in case 'hardeningDisable' is defined in Nix.
-for flag in ${hardeningDisable[@]:-IGNORED_KEY} @hardening_unsupported_flags@
-do
- hardeningDisableMap[$flag]=1
+# Intentionally word-split in case 'NIX_HARDENING_ENABLE' is defined in Nix. The
+# array expansion also prevents undefined variables from causing trouble with
+# `set -u`.
+for flag in ${NIX_@infixSalt@_HARDENING_ENABLE-}; do
+ hardeningEnableMap["$flag"]=1
+done
+
+# Remove unsupported flags.
+for flag in @hardening_unsupported_flags@; do
+ unset -v "hardeningEnableMap[$flag]"
done
if (( "${NIX_DEBUG:-0}" >= 1 )); then
+ declare -a allHardeningFlags=(fortify stackprotector pie pic strictoverflow format)
+ declare -A hardeningDisableMap=()
+
+ # Determine which flags were effectively disabled so we can report below.
+ for flag in "${allHardeningFlags[@]}"; do
+ if [[ -z "${hardeningEnableMap[$flag]-}" ]]; then
+ hardeningDisableMap["$flag"]=1
+ fi
+ done
+
printf 'HARDENING: disabled flags:' >&2
(( "${#hardeningDisableMap[@]}" )) && printf ' %q' "${!hardeningDisableMap[@]}" >&2
echo >&2
-fi
-if [[ -z "${hardeningDisableMap[all]:-}" ]]; then
- if (( "${NIX_DEBUG:-0}" >= 1 )); then
+ if (( "${#hardeningEnableMap[@]}" )); then
echo 'HARDENING: Is active (not completely disabled with "all" flag)' >&2;
fi
- for flag in "${hardeningFlags[@]}"
- do
- if [[ -z "${hardeningDisableMap[$flag]:-}" ]]; then
- case $flag in
- fortify)
- if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling fortify >&2; fi
- hardeningCFlags+=('-O2' '-D_FORTIFY_SOURCE=2')
- ;;
- stackprotector)
- if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stackprotector >&2; fi
- hardeningCFlags+=('-fstack-protector-strong' '--param' 'ssp-buffer-size=4')
- ;;
- pie)
- if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling CFlags -fPIE >&2; fi
- hardeningCFlags+=('-fPIE')
- if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then
- if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi
- hardeningCFlags+=('-pie')
- fi
- ;;
- pic)
- if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling pic >&2; fi
- hardeningCFlags+=('-fPIC')
- ;;
- strictoverflow)
- if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling strictoverflow >&2; fi
- hardeningCFlags+=('-fno-strict-overflow')
- ;;
- format)
- if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling format >&2; fi
- hardeningCFlags+=('-Wformat' '-Wformat-security' '-Werror=format-security')
- ;;
- *)
- # Ignore unsupported. Checked in Nix that at least *some*
- # tool supports each flag.
- ;;
- esac
- fi
- done
fi
+
+for flag in "${!hardeningEnableMap[@]}"; do
+ case $flag in
+ fortify)
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling fortify >&2; fi
+ hardeningCFlags+=('-O2' '-D_FORTIFY_SOURCE=2')
+ ;;
+ stackprotector)
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stackprotector >&2; fi
+ hardeningCFlags+=('-fstack-protector-strong' '--param' 'ssp-buffer-size=4')
+ ;;
+ pie)
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling CFlags -fPIE >&2; fi
+ hardeningCFlags+=('-fPIE')
+ if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi
+ hardeningCFlags+=('-pie')
+ fi
+ ;;
+ pic)
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling pic >&2; fi
+ hardeningCFlags+=('-fPIC')
+ ;;
+ strictoverflow)
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling strictoverflow >&2; fi
+ hardeningCFlags+=('-fno-strict-overflow')
+ ;;
+ format)
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling format >&2; fi
+ hardeningCFlags+=('-Wformat' '-Wformat-security' '-Werror=format-security')
+ ;;
+ *)
+ # Ignore unsupported. Checked in Nix that at least *some*
+ # tool supports each flag.
+ ;;
+ esac
+done
diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
index c2e6c140635..8a3cfb694b4 100644
--- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
@@ -134,8 +134,8 @@ fi
source @out@/nix-support/add-hardening.sh
# Add the flags for the C compiler proper.
-extraAfter=($NIX_@infixSalt@_CFLAGS_COMPILE "${hardeningCFlags[@]}")
-extraBefore=()
+extraAfter=($NIX_@infixSalt@_CFLAGS_COMPILE)
+extraBefore=(${hardeningCFlags[@]+"${hardeningCFlags[@]}"})
if [ "$dontLink" != 1 ]; then
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 43cd87fb459..700e7547b7a 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -71,7 +71,7 @@ assert nativePrefix == bintools.nativePrefix;
stdenv.mkDerivation {
name = targetPrefix
- + (if name != "" then name else "${ccName}-wrapper")
+ + (if name != "" then name else stdenv.lib.removePrefix targetPrefix "${ccName}-wrapper")
+ (stdenv.lib.optionalString (cc != null && ccVersion != "") "-${ccVersion}");
preferLocalBuild = true;
diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh
index 29a7306b9b7..15b84dca279 100644
--- a/pkgs/build-support/cc-wrapper/setup-hook.sh
+++ b/pkgs/build-support/cc-wrapper/setup-hook.sh
@@ -147,6 +147,10 @@ export ${role_pre}CXX=@named_cxx@
export CC${role_post}=@named_cc@
export CXX${role_post}=@named_cxx@
+# If unset, assume the default hardening flags.
+: ${NIX_HARDENING_ENABLE="fortify stackprotector pic strictoverflow format relro bindnow"}
+export NIX_HARDENING_ENABLE
+
# No local scope in sourced file
unset -v role_pre role_post
set +u
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index f407ba25bf8..d7d03aae33e 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -91,7 +91,7 @@ in stdenv.mkDerivation (args // {
installPhase = args.installPhase or ''
runHook preInstall
mkdir -p $out/bin
- find target/release -maxdepth 1 -executable -exec cp "{}" $out/bin \;
+ find target/release -maxdepth 1 -executable -type f -exec cp "{}" $out/bin \;
runHook postInstall
'';
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 6c8fd6229a3..2c22bfe93b9 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ];
+ doCheck = false; # needs more tools
+
installFlags = [ "ZIC=./zic-native" ];
preInstall = ''
diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
index 9efca75e8f8..6feaf13d88e 100644
--- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
@@ -40,4 +40,7 @@ stdenv.mkDerivation rec {
'';
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
+
+ doCheck = false; # requires X11 daemon
+
}
diff --git a/pkgs/desktops/gnome-2/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix
index 014255785dd..a9b692aadf5 100644
--- a/pkgs/desktops/gnome-2/desktop/zenity/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/zenity/default.nix
@@ -13,4 +13,6 @@ stdenv.mkDerivation {
buildInputs = [ gtk libglade libxml2 libxslt libX11 docbook_xml_dtd_412 ];
nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which ];
+
+ doCheck = false; # fails, tries to access the net
}
diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
index 4ca0e791a2a..9d71b999d11 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
@@ -21,4 +21,6 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ GConf glib ];
postPatch = "find . -name Makefile.in | xargs sed 's/-DG_DISABLE_DEPRECATED//g' -i ";
+
+ doCheck = false; # needs dbus daemon
}
diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 8921d70787c..8ce9617aaae 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -24,6 +24,9 @@ in stdenv.mkDerivation rec {
meson ninja vala pkgconfig gettext itstool wrapGAppsHook gobjectIntrospection desktop-file-utils
];
+ # Required for USB redirection PolicyKit rules file
+ propagatedUserEnvPkgs = [ spice-gtk ];
+
buildInputs = [
libvirt-glib glib gtk3 gtkvnc libxml2
libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd
diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix
index 9b1adeb953d..400b3ea9a9b 100644
--- a/pkgs/desktops/gnome-3/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja vala pkgconfig python3 libxslt libxml2 docbook_xsl ];
buildInputs = [ glib dbus-glib ];
+ doCheck = false; # fails 2 out of 9 tests, maybe needs dbus daemon?
+
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix
index 9aa66a1343f..9af365c6f14 100644
--- a/pkgs/desktops/xfce/core/xfconf.nix
+++ b/pkgs/desktops/xfce/core/xfconf.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
buildInputs = [ intltool glib libxfce4util ];
propagatedBuildInputs = [ dbus-glib ];
+ doCheck = false; # requires dbus daemon
+
meta = with stdenv.lib; {
homepage = http://docs.xfce.org/xfce/xfconf/start;
description = "Simple client-server configuration storage and query system for Xfce";
@@ -26,4 +28,3 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
};
}
-
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 532c56d5257..74bb9433565 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -170,7 +170,7 @@ let version = "4.8.5";
"--disable-decimal-float" # No final libdecnumber (it may work only in 386)
]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
- crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
+ crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
bootstrap = targetPlatform == hostPlatform;
@@ -180,7 +180,7 @@ in
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
- name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
+ name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
builder = ../builder.sh;
@@ -375,6 +375,8 @@ stdenv.mkDerivation ({
(if profiledCompiler then "profiledbootstrap" else "bootstrap")
else "";
+ doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv
+
installTargets =
if stripped
then "install-strip"
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index fb82eee4ab8..c85f3e002cc 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -164,7 +164,7 @@ let version = "4.9.4";
"--disable-decimal-float" # No final libdecnumber (it may work only in 386)
]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
- crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
+ crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
bootstrap = targetPlatform == hostPlatform;
@@ -174,7 +174,7 @@ in
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
- name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
+ name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
builder = ../builder.sh;
@@ -383,6 +383,8 @@ stdenv.mkDerivation ({
(if profiledCompiler then "profiledbootstrap" else "bootstrap")
else "";
+ doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv
+
installTargets =
if stripped
then "install-strip"
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index dee798eb09b..1179be7d79c 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -168,7 +168,7 @@ let version = "5.5.0";
"--disable-decimal-float" # No final libdecnumber (it may work only in 386)
]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
- crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
+ crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
bootstrap = targetPlatform == hostPlatform;
@@ -178,7 +178,7 @@ in
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
- name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
+ name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
builder = ../builder.sh;
@@ -400,6 +400,8 @@ stdenv.mkDerivation ({
(if profiledCompiler then "profiledbootstrap" else "bootstrap")
else "";
+ doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv
+
installTargets =
if stripped
then "install-strip"
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index b99ab8fce7f..e2d69c05982 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -167,7 +167,7 @@ let version = "6.4.0";
"--disable-decimal-float" # No final libdecnumber (it may work only in 386)
]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
- crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
+ crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
bootstrap = targetPlatform == hostPlatform;
@@ -177,7 +177,7 @@ in
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
- name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
+ name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
builder = ../builder.sh;
@@ -403,6 +403,8 @@ stdenv.mkDerivation ({
buildFlags =
optional bootstrap (if profiledCompiler then "profiledbootstrap" else "bootstrap");
+ doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv
+
installTargets =
if stripped
then "install-strip"
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 493e50d9f32..d0dd4008334 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -172,7 +172,7 @@ let version = "7.3.0";
"--disable-decimal-float" # No final libdecnumber (it may work only in 386)
]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
- crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
+ crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
bootstrap = targetPlatform == hostPlatform;
@@ -182,7 +182,7 @@ in
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
- name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
+ name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
builder = ../builder.sh;
@@ -409,6 +409,8 @@ stdenv.mkDerivation ({
buildFlags =
optional bootstrap (if profiledCompiler then "profiledbootstrap" else "bootstrap");
+ doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv
+
installTargets =
if stripped
then "install-strip"
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index 192ff1ba207..1e399d47764 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -170,6 +170,7 @@ stdenv.mkDerivation rec {
stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
checkTarget = "test";
+ doCheck = false; # fails with "testsuite/tests: No such file or directory. Stop."
# zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't
# treat that as a unary `{x,y,z,..}` repetition.
diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix
index 10510c75035..863e7eb2247 100644
--- a/pkgs/development/compilers/llvm/3.4/clang.nix
+++ b/pkgs/development/compilers/llvm/3.4/clang.nix
@@ -29,7 +29,10 @@ stdenv.mkDerivation {
# Clang expects to find LLVMgold in its own prefix
# Clang expects to find sanitizer libraries in its own prefix
postInstall = ''
- ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+ if [ -e ${llvm}/lib/LLVMgold.so ]; then
+ ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+ fi
+
ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
'';
diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix
index f15c989ef51..7e0163577ba 100644
--- a/pkgs/development/compilers/llvm/3.5/clang.nix
+++ b/pkgs/development/compilers/llvm/3.5/clang.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }:
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src }:
let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in stdenv.mkDerivation {
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
mv clang-tools-extra-* $sourceRoot/tools/extra
'';
- buildInputs = [ cmake libedit libxml2 llvm ];
+ buildInputs = [ cmake libxml2 llvm ];
cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++11"
@@ -31,7 +31,10 @@ in stdenv.mkDerivation {
# Clang expects to find LLVMgold in its own prefix
# Clang expects to find sanitizer libraries in its own prefix
postInstall = ''
- ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+ if [ -e ${llvm}/lib/LLVMgold.so ]; then
+ ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+ fi
+
ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
ln -sv $out/bin/clang $out/bin/cpp
'';
diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix
index f27e3f0089e..4ccd00af684 100644
--- a/pkgs/development/compilers/llvm/3.7/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }:
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src }:
let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
@@ -13,7 +13,7 @@ let
mv clang-tools-extra-* $sourceRoot/tools/extra
'';
- buildInputs = [ cmake libedit libxml2 llvm ];
+ buildInputs = [ cmake libxml2 llvm ];
cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++11"
@@ -32,7 +32,10 @@ let
# Clang expects to find LLVMgold in its own prefix
# Clang expects to find sanitizer libraries in its own prefix
postInstall = ''
- ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+ if [ -e ${llvm}/lib/LLVMgold.so ]; then
+ ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+ fi
+
ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
ln -sv $out/bin/clang $out/bin/cpp
'';
diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix
index 0147485dd58..05893704d87 100644
--- a/pkgs/development/compilers/llvm/3.8/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src, python }:
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python }:
let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
@@ -13,7 +13,7 @@ let
mv clang-tools-extra-* $sourceRoot/tools/extra
'';
- buildInputs = [ cmake libedit libxml2 llvm python ];
+ buildInputs = [ cmake libxml2 llvm python ];
cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++11"
@@ -34,7 +34,10 @@ let
# Clang expects to find LLVMgold in its own prefix
# Clang expects to find sanitizer libraries in its own prefix
postInstall = ''
- ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+ if [ -e ${llvm}/lib/LLVMgold.so ]; then
+ ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+ fi
+
ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
ln -sv $out/bin/clang $out/bin/cpp
diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix
index aafe30e4c9b..1f6d80ab3be 100644
--- a/pkgs/development/compilers/llvm/3.9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src, python }:
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python }:
let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
@@ -15,7 +15,7 @@ let
nativeBuildInputs = [ cmake ];
- buildInputs = [ libedit libxml2 llvm python ];
+ buildInputs = [ libxml2 llvm python ];
cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++11"
@@ -36,7 +36,10 @@ let
# Clang expects to find LLVMgold in its own prefix
# Clang expects to find sanitizer libraries in its own prefix
postInstall = ''
- ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+ if [ -e ${llvm}/lib/LLVMgold.so ]; then
+ ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+ fi
+
ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
ln -sv $out/bin/clang $out/bin/cpp
diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix
index 5531fd2ab77..c6538282f23 100644
--- a/pkgs/development/compilers/llvm/4/clang/default.nix
+++ b/pkgs/development/compilers/llvm/4/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python
+{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python
, fixDarwinDylibNames
, enableManpages ? false
}:
@@ -19,7 +19,7 @@ let
nativeBuildInputs = [ cmake python ]
++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
- buildInputs = [ libedit libxml2 llvm ]
+ buildInputs = [ libxml2 llvm ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
cmakeFlags = [
@@ -52,7 +52,10 @@ let
# Clang expects to find LLVMgold in its own prefix
# Clang expects to find sanitizer libraries in its own prefix
postInstall = ''
- ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+ if [ -e ${llvm}/lib/LLVMgold.so ]; then
+ ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+ fi
+
ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/
ln -sv $out/bin/clang $out/bin/cpp
diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix
index b5aea54b577..6499be2a0bd 100644
--- a/pkgs/development/compilers/llvm/5/clang/default.nix
+++ b/pkgs/development/compilers/llvm/5/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python
+{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python
, fixDarwinDylibNames
, enableManpages ? false
}:
@@ -19,7 +19,7 @@ let
nativeBuildInputs = [ cmake python ]
++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
- buildInputs = [ libedit libxml2 llvm ]
+ buildInputs = [ libxml2 llvm ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
cmakeFlags = [
@@ -50,10 +50,12 @@ let
outputs = [ "out" "lib" "python" ];
- # Clang expects to find LLVMgold in its own prefix
- # Clang expects to find sanitizer libraries in its own prefix
postInstall = ''
- ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+ # Clang expects to find LLVMgold in its own prefix
+ if [ -e ${llvm}/lib/LLVMgold.so ]; then
+ ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+ fi
+ # Clang expects to find sanitizer libraries in its own prefix
ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/
ln -sv $out/bin/clang $out/bin/cpp
diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix
index 919efdc8ef9..3d02062a4a3 100644
--- a/pkgs/development/compilers/llvm/6/clang/default.nix
+++ b/pkgs/development/compilers/llvm/6/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python
+{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python
, fixDarwinDylibNames
, enableManpages ? false
}:
@@ -19,7 +19,7 @@ let
nativeBuildInputs = [ cmake python ]
++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
- buildInputs = [ libedit libxml2 llvm ]
+ buildInputs = [ libxml2 llvm ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
cmakeFlags = [
@@ -53,7 +53,10 @@ let
# Clang expects to find LLVMgold in its own prefix
# Clang expects to find sanitizer libraries in its own prefix
postInstall = ''
- ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+ if [ -e ${llvm}/lib/LLVMgold.so ]; then
+ ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+ fi
+
ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/
ln -sv $out/bin/clang $out/bin/cpp
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 7798418ebfd..9db5e8ba23c 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -133,6 +133,8 @@ let
buildFlags = [ "all" ];
+ doCheck = false; # fails with "No rule to make target 'y'."
+
installPhase = ''
mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 3ab77c42cbb..a15a67d3241 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -20,7 +20,7 @@ in
, buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchmarkToolDepends ? []
, configureFlags ? []
, description ? ""
-, doCheck ? !isCross && (stdenv.lib.versionOlder "7.4" ghc.version)
+, doCheck ? !isCross && stdenv.lib.versionOlder "7.4" ghc.version
, doBenchmark ? false
, doHoogle ? true
, editedCabalFile ? null
@@ -172,7 +172,7 @@ let
buildTools ++ libraryToolDepends ++ executableToolDepends;
propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
- optionals (allPkgconfigDepends != []) allPkgconfigDepends ++
+ allPkgconfigDepends ++
optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++
optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends);
allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;
@@ -314,6 +314,8 @@ stdenv.mkDerivation ({
runHook postBuild
'';
+ inherit doCheck;
+
checkPhase = ''
runHook preCheck
${setupCommand} test ${testTarget}
@@ -428,7 +430,6 @@ stdenv.mkDerivation ({
// optionalAttrs (postConfigure != "") { inherit postConfigure; }
// optionalAttrs (preBuild != "") { inherit preBuild; }
// optionalAttrs (postBuild != "") { inherit postBuild; }
-// optionalAttrs (doCheck) { inherit doCheck; }
// optionalAttrs (doBenchmark) { inherit doBenchmark; }
// optionalAttrs (checkPhase != "") { inherit checkPhase; }
// optionalAttrs (preCheck != "") { inherit preCheck; }
diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix
index 17f124e7989..ae7f8686b78 100644
--- a/pkgs/development/interpreters/dart/default.nix
+++ b/pkgs/development/interpreters/dart/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, version }:
+{ stdenv, fetchurl, unzip, version ? "1.24.3" }:
let
@@ -57,9 +57,9 @@ stdenv.mkDerivation {
'';
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ];
-
+
dontStrip = true;
-
+
meta = {
platforms = [ "i686-linux" "x86_64-linux" ];
homepage = https://www.dartlang.org/;
diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix
index cf42c9a7b68..03326f7a759 100644
--- a/pkgs/development/interpreters/guile/1.8.nix
+++ b/pkgs/development/interpreters/guile/1.8.nix
@@ -66,6 +66,7 @@ stdenv.mkDerivation rec {
# This is fixed here:
# .
doCheck = false;
+ doInstallCheck = doCheck;
setupHook = ./setup-hook.sh;
diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index 2c9aec5b695..e670f145a5d 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -89,6 +89,7 @@
# make check doesn't work on darwin
# On Linuxes+Hydra the tests are flaky; feel free to investigate deeper.
doCheck = false;
+ doInstallCheck = doCheck;
setupHook = ./setup-hook-2.0.sh;
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index 3d5c51dc420..f3b36ecd940 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -85,6 +85,7 @@
# make check doesn't work on darwin
# On Linuxes+Hydra the tests are flaky; feel free to investigate deeper.
doCheck = false;
+ doInstallCheck = doCheck;
setupHook = ./setup-hook-2.2.sh;
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 3541c92fd9d..4d6f426fae4 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -105,6 +105,8 @@ let
passthru.libPrefix = "lib/perl5/site_perl";
+ doCheck = false; # some tests fail, expensive
+
# TODO: it seems like absolute paths to some coreutils is required.
postInstall =
''
diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix
index 6a07a006c6b..b55d6d874bb 100644
--- a/pkgs/development/interpreters/python/build-python-package.nix
+++ b/pkgs/development/interpreters/python/build-python-package.nix
@@ -2,6 +2,7 @@
# and can build packages that use distutils, setuptools or flit.
{ lib
+, config
, python
, wrapPython
, setuptools
@@ -19,7 +20,7 @@ let
wheel-specific = import ./build-python-package-wheel.nix { };
common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; };
mkPythonDerivation = import ./mk-python-derivation.nix {
- inherit lib python wrapPython setuptools unzip ensureNewerSourcesForZipFilesHook toPythonModule namePrefix;
+ inherit lib config python wrapPython setuptools unzip ensureNewerSourcesForZipFilesHook toPythonModule namePrefix;
};
in
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 98e5b4b1da0..9d89e96383f 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -140,7 +140,10 @@ let
"ac_cv_computed_gotos=yes"
"ac_cv_file__dev_ptmx=yes"
"ac_cv_file__dev_ptc=yes"
- ];
+ ]
+ # Never even try to use lchmod on linux,
+ # don't rely on detecting glibc-isms.
+ ++ optional hostPlatform.isLinux "ac_cv_func_lchmod=no";
postConfigure = if hostPlatform.isCygwin then ''
sed -i Makefile -e 's,PYTHONPATH="$(srcdir),PYTHONPATH="$(abs_srcdir),'
@@ -241,6 +244,8 @@ in stdenv.mkDerivation {
enableParallelBuilding = true;
+ doCheck = false; # expensive, and fails
+
meta = {
homepage = http://python.org;
description = "A high-level dynamically-typed programming language";
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index 797a5be40ff..85c45a9d396 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -96,7 +96,10 @@ in stdenv.mkDerivation {
"--without-ensurepip"
"--with-system-expat"
"--with-system-ffi"
- ];
+ ]
+ # Never even try to use lchmod on linux,
+ # don't rely on detecting glibc-isms.
+ ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no";
preConfigure = ''
for i in /usr /sw /opt /pkg; do # improve purity
@@ -176,6 +179,8 @@ in stdenv.mkDerivation {
enableParallelBuilding = true;
+ doCheck = false; # expensive, and fails
+
meta = {
homepage = http://python.org;
description = "A high-level dynamically-typed programming language";
diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index 6dbf9a09cf5..c6d572aca16 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -67,6 +67,12 @@ in stdenv.mkDerivation {
patches = [
./no-ldconfig.patch
./ld_library_path.patch
+ ] ++ optionals stdenv.isDarwin [
+ # Fix for https://bugs.python.org/issue24658
+ (fetchpatch {
+ url = "https://bugs.python.org/file45178/issue24658-3-3.6.diff";
+ sha256 = "1x060hs80nl34mcl2ji2i7l4shxkmxwgq8h8lcmav8rjqqz1nb4a";
+ })
] ++ optionals (x11Support && stdenv.isDarwin) [
./use-correct-tcl-tk-on-darwin.patch
];
@@ -90,7 +96,10 @@ in stdenv.mkDerivation {
"--without-ensurepip"
"--with-system-expat"
"--with-system-ffi"
- ];
+ ]
+ # Never even try to use lchmod on linux,
+ # don't rely on detecting glibc-isms.
+ ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no";
preConfigure = ''
for i in /usr /sw /opt /pkg; do # improve purity
@@ -169,6 +178,8 @@ in stdenv.mkDerivation {
enableParallelBuilding = true;
+ doCheck = false; # expensive, and fails
+
meta = {
homepage = http://python.org;
description = "A high-level dynamically-typed programming language";
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index cc8f6228f62..e5e05c0ac7a 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -69,6 +69,12 @@ in stdenv.mkDerivation {
patches = [
./no-ldconfig.patch
+ ] ++ optionals stdenv.isDarwin [
+ # Fix for https://bugs.python.org/issue24658
+ (fetchpatch {
+ url = "https://bugs.python.org/file45178/issue24658-3-3.6.diff";
+ sha256 = "1x060hs80nl34mcl2ji2i7l4shxkmxwgq8h8lcmav8rjqqz1nb4a";
+ })
] ++ optionals (x11Support && stdenv.isDarwin) [
./use-correct-tcl-tk-on-darwin.patch
];
@@ -113,7 +119,10 @@ in stdenv.mkDerivation {
"ac_cv_computed_gotos=yes"
"ac_cv_file__dev_ptmx=yes"
"ac_cv_file__dev_ptc=yes"
- ];
+ ]
+ # Never even try to use lchmod on linux,
+ # don't rely on detecting glibc-isms.
+ ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no";
preConfigure = ''
for i in /usr /sw /opt /pkg; do # improve purity
@@ -193,6 +202,8 @@ in stdenv.mkDerivation {
enableParallelBuilding = true;
+ doCheck = false; # expensive, and fails
+
meta = {
homepage = http://python.org;
description = "A high-level dynamically-typed programming language";
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index 96a9cdf0c61..63ffdbb8c0a 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -1,6 +1,7 @@
# Generic builder.
{ lib
+, config
, python
, wrapPython
, setuptools
@@ -53,7 +54,7 @@
, passthru ? {}
-, doCheck ? false
+, doCheck ? config.doCheckByDefault or false
, ... } @ attrs:
@@ -74,7 +75,6 @@ toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [
buildInputs = [ wrapPython ]
++ lib.optional (lib.hasSuffix "zip" (attrs.src.name or "")) unzip
- ++ lib.optionals doCheck checkInputs
++ lib.optional catchConflicts setuptools # If we no longer propagate setuptools
++ buildInputs
++ pythonPath;
@@ -85,6 +85,7 @@ toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [
# Python packages don't have a checkPhase, only an installCheckPhase
doCheck = false;
doInstallCheck = doCheck;
+ installCheckInputs = checkInputs;
postFixup = lib.optionalString (!dontWrapPythonPrograms) ''
wrapPythonPrograms
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 4ebc488d998..a96320f45ae 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -94,7 +94,7 @@ let
# support is disabled (if it's enabled, we already have it) and we're
# running on darwin
++ (op (!cursesSupport && stdenv.isDarwin) readline)
- ++ (op (isRuby25 && stdenv.isDarwin) Foundation)
+ ++ (op stdenv.isDarwin Foundation)
++ (ops stdenv.isDarwin (with darwin; [ libiconv libobjc libunwind ]));
enableParallelBuilding = true;
@@ -136,6 +136,8 @@ let
++ op (stdenv.hostPlatform != stdenv.buildPlatform)
"--with-baseruby=${buildRuby}";
+ doCheck = false; # expensive, fails
+
preInstall = ''
# Ruby installs gems here itself now.
mkdir -pv "$out/${passthru.gemPath}"
@@ -200,26 +202,26 @@ let
in {
ruby_2_3 = generic {
- version = rubyVersion "2" "3" "6" "";
+ version = rubyVersion "2" "3" "7" "";
sha256 = {
- src = "07jpa7fw1gyf069m7alf2b0zm53qm08w2ns45mhzmvgrg4r528l3";
- git = "1bk59i0ygdc5z3zz3k6indfrxd2ix55np6rwvkcdpdw8svm749ds";
+ src = "0zvx5kdp1frjs9n95n7ba7dy0alax33wi3nj8034m3ppvnf39k9m";
+ git = "11wbzw2ywwfnvlkg3qjg0as2pzk5zyk63y2iis42d91lg1l2flrk";
};
};
ruby_2_4 = generic {
- version = rubyVersion "2" "4" "3" "";
+ version = rubyVersion "2" "4" "4" "";
sha256 = {
- src = "161smb52q19r9lrzy22b3bhnkd0z8wjffm0qsfkml14j5ic7a0zx";
- git = "0x2lqbqm2rq9j5zh1p72dma56nqvdkfbgzb9wybm4y4hwhiw8c1m";
+ src = "0nmfr2lijik6cykk0zbj11zcapcrvmdvq83k3r6q3k74g4d1qkr5";
+ git = "103cs7hz1v0h84lbrippl87s4lawi20m406rs5dgxl2gr2wyjpy5";
};
};
ruby_2_5 = generic {
- version = rubyVersion "2" "5" "0" "";
+ version = rubyVersion "2" "5" "1" "";
sha256 = {
- src = "1azj0d2lzziw6iml7bx3sxpxzcdmfwfq3yhm7djyp20q1xiz7rj6";
- git = "0d436nqmp3ykdkp4sck5bb8sf3qvx30x1p58xh8axv66mvsyc2jd";
+ src = "1c99k0fjaq7k09104h1b1cqx6mrk2b14ic1jjnxc6yav68i1ij6s";
+ git = "1j0fd16aq9x98n0kq9c3kfp2sh6xcsq8q4733p0wfqjh3vz50kyj";
};
};
}
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index fc79761252f..e53f231884d 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -6,17 +6,17 @@ rec {
"${patchSet}/patches/ruby/2.2/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.2/head/railsexpress/03-display-more-detailed-stack-trace.patch"
];
- "2.3.6" = ops useRailsExpress [
+ "2.3.7" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch"
"${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
];
- "2.4.3" = ops useRailsExpress [
+ "2.4.4" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch"
"${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch"
];
- "2.5.0" = ops useRailsExpress [
+ "2.5.1" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
"${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"
diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
index 6ad6b158826..b09f5f67f56 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
"-Ddep11=false"
];
+ doCheck = false; # fails at least 1 test
+
postInstall = ''
moveToOutput "share/installed-tests" "$installedTests"
'';
diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix
index 86f35d7f578..1e5d003654c 100644
--- a/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/pkgs/development/libraries/at-spi2-atk/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
buildInputs = [ python popt atk libX11 libICE xorg.libXtst libXi
dbus-glib at-spi2-core libSM ];
+ doCheck = false; # needs dbus daemon
+
meta = with stdenv.lib; {
platforms = platforms.unix;
};
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index 6715a59579b..b7547c29392 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
# ToDo: on non-NixOS we create a symlink from there?
configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/";
+ doCheck = false; # needs dbus daemon
+
meta = with stdenv.lib; {
platforms = platforms.unix;
};
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index d4e91deb744..14479a56091 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
name = "boehm-gc-${version}";
- version = "7.6.4";
+ version = "7.6.6";
src = fetchurl {
urls = [
"http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz"
"https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz"
];
- sha256 = "076dzsqqyxd3nlzs0z277vvhqjp8nv5dqi763s0m90zr6ljiyk5r";
+ sha256 = "1p1r015a7jbpvkkbgzv1y8nxrbbp6dg0mq3ksi6ji0qdz3wfss79";
};
buildInputs = [ libatomic_ops ];
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 14ea512afbd..efe1151359d 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -55,11 +55,11 @@ let
"--layout=${layout}"
"variant=${variant}"
"threading=${threading}"
- "runtime-link=${runtime-link}"
"link=${link}"
"-sEXPAT_INCLUDE=${expat.dev}/include"
"-sEXPAT_LIBPATH=${expat.out}/lib"
- ] ++ optional (variant == "release") "debug-symbols=off"
+ ] ++ optional (link != "static") "runtime-link=${runtime-link}"
+ ++ optional (variant == "release") "debug-symbols=off"
++ optional (toolset != null) "toolset=${toolset}"
++ optional (mpi != null || hostPlatform != buildPlatform) "--user-config=user-config.jam"
++ optionals (hostPlatform.libc == "msvcrt") [
diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix
index 6b3b69f9997..a384a770783 100644
--- a/pkgs/development/libraries/c-ares/default.nix
+++ b/pkgs/development/libraries/c-ares/default.nix
@@ -2,11 +2,11 @@
let self =
stdenv.mkDerivation rec {
- name = "c-ares-1.13.0";
+ name = "c-ares-1.14.0";
src = fetchurl {
url = "http://c-ares.haxx.se/download/${name}.tar.gz";
- sha256 = "19qxhv9aiw903fr808y77r6l9js0fq9m3gcaqckan9jan7qhixq3";
+ sha256 = "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 6a7beb1cc1a..74ae4abaedf 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -9,25 +9,17 @@
assert glSupport -> libGL != null;
-let inherit (stdenv.lib) optional optionals; in
-
-stdenv.mkDerivation rec {
- name = "cairo-1.14.10";
+let
+ version = "1.15.10";
+ inherit (stdenv.lib) optional optionals;
+in stdenv.mkDerivation rec {
+ name = "cairo-${version}";
src = fetchurl {
- url = "http://cairographics.org/releases/${name}.tar.xz";
- sha256 = "02banr0wxckq62nbhc3mqidfdh2q956i2r7w2hd9bjgjb238g1vy";
+ url = "http://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz";
+ sha256 = "14l3jll98pjdlpm8f972v0spzcsf6y5nz85y2k8iybyg6ihj5jk2";
};
- patches = [
- # from https://bugs.freedesktop.org/show_bug.cgi?id=98165
- (fetchpatch {
- name = "cairo-CVE-2016-9082.patch";
- url = "https://bugs.freedesktop.org/attachment.cgi?id=127421";
- sha256 = "03sfyaclzlglip4pvfjb4zj4dmm8mlphhxl30mb6giinkc74bfri";
- })
- ];
-
outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev"; # very small
@@ -80,6 +72,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ doCheck = false; # fails
+
postInstall = stdenv.lib.optionalString stdenv.isDarwin glib.flattenInclude;
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix
index 9d861f2c432..6bf7975034b 100644
--- a/pkgs/development/libraries/celt/generic.nix
+++ b/pkgs/development/libraries/celt/generic.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
buildInputs = []
++ stdenv.lib.optional liboggSupport libogg;
+ doCheck = false; # fails
+
meta = with stdenv.lib; {
description = "Ultra-low delay audio codec";
homepage = http://www.celt-codec.org/;
diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix
index bb1d4458f50..bf57bab2f22 100644
--- a/pkgs/development/libraries/ctpp2/default.nix
+++ b/pkgs/development/libraries/ctpp2/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
sed -ie 's//\n#include /' src/CTPP2FileSourceLoader.cpp
'';
+ doCheck = false; # fails
+
meta = {
description = "A high performance templating engine";
homepage = http://ctpp.havoc.ru;
diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix
index 4a11c2b9893..d4398692a4e 100644
--- a/pkgs/development/libraries/db/generic.nix
+++ b/pkgs/development/libraries/db/generic.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation (rec {
patches = extraPatches;
+ outputs = [ "out" "lib" ];
+
configureFlags =
[
(if cxxSupport then "--enable-cxx" else "--disable-cxx")
diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index 5869276a797..4e1559e5c73 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -5,19 +5,21 @@ let
in
stdenv.mkDerivation {
name = "eigen-${version}";
-
+
src = fetchurl {
url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
name = "eigen-${version}.tar.gz";
sha256 = "00l52y7m276gh8wjkqqcxz6x687azrm7a70s3iraxnpy9bxa9y04";
};
-
+
nativeBuildInputs = [ cmake ];
+ doCheck = false; # a couple of tests fail with "Child aborted"
+
postInstall = ''
sed -e '/Cflags:/s@''${prefix}/@@' -i "$out"/share/pkgconfig/eigen3.pc
'';
-
+
meta = with stdenv.lib; {
description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
license = licenses.lgpl3Plus;
diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix
index 458b23c33e9..8b559bd03c8 100644
--- a/pkgs/development/libraries/enchant/2.x.nix
+++ b/pkgs/development/libraries/enchant/2.x.nix
@@ -17,6 +17,8 @@ in stdenv.mkDerivation rec {
buildInputs = [ glib hunspell ];
propagatedBuildInputs = [ hspell aspell ]; # libtool puts it to la file
+ doCheck = false; # fails to compile with with "UnitTest++.h: No such file or directory"
+
meta = with stdenv.lib; {
description = "Generic spell checking library";
homepage = https://abiword.github.io/enchant/;
diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix
index e0f8e9ff8c7..cc62b2776ed 100644
--- a/pkgs/development/libraries/epoxy/default.nix
+++ b/pkgs/development/libraries/epoxy/default.nix
@@ -6,13 +6,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "epoxy-${version}";
- version = "1.5.0";
+ version = "1.5.1";
src = fetchFromGitHub {
owner = "anholt";
repo = "libepoxy";
rev = "${version}";
- sha256 = "1ixpqb10pmdy3n9nxd5inflig9dal5502ggadcns5b58j6jr0yv0";
+ sha256 = "1811agxr7g9wd832np8sw152j468kg3qydmfkc564v54ncfcgaci";
};
outputs = [ "out" "dev" ];
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = ''-DLIBGL_PATH="${getLib libGL}/lib"'';
+ doCheck = false; # needs X11
+
meta = {
description = "A library for handling OpenGL function pointer management";
homepage = https://github.com/anholt/libepoxy;
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 4a05eab87bd..7226645381b 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -160,9 +160,10 @@ stdenv.mkDerivation rec {
++ optional vdpauSupport libvdpau
++ optional sdlSupport (if reqMin "3.2" then SDL2 else SDL);
-
enableParallelBuilding = true;
+ doCheck = false; # fails
+
postFixup = ''
moveToOutput bin "$bin"
moveToOutput share/ffmpeg/examples "$doc"
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 069b78f6bca..f1e73a77bea 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -1,40 +1,74 @@
-{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, gnome3
-, jasper, gobjectIntrospection, doCheck ? false }:
+{ stdenv, fetchurl, fetchgit, fetchpatch, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
+, docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3
+, jasper, gobjectIntrospection, doCheck ? false, makeWrapper }:
let
pname = "gdk-pixbuf";
- version = "2.36.7";
- # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing,
- # which apparently requires access to shared-mime-info files during runtime.
+ version = "2.36.12";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
- src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "1b6e5eef09d98f05f383014ecd3503e25dfb03d7e5b5f5904e5a65b049a6a4d8";
+ # TODO: Change back once tests/bug753605-atsize.jpg is part of the dist tarball
+ # src = fetchurl {
+ # url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ # sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z";
+ # };
+ src = fetchgit {
+ url = https://git.gnome.org/browse/gdk-pixbuf;
+ rev = version;
+ sha256 = "18lwqg63vyap2m1mw049rnb8fm869429xbf7636a2n21gs3d3jwv";
};
- outputs = [ "out" "dev" "devdoc" ];
+ patches = [
+ # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing,
+ # which requires access to shared-mime-info files during runtime.
+ # For now, we are patching the build script to avoid the dependency.
+ ./no-mime-sniffing.patch
+
+ # Fix installed tests with meson
+ # https://bugzilla.gnome.org/show_bug.cgi?id=795527
+ (fetchurl {
+ url = https://bugzilla.gnome.org/attachment.cgi?id=371381;
+ sha256 = "0nl1cixkjfa5kcfh0laz8h6hdsrpdkxqn7a1k35jrb6zwc9hbydn";
+ })
+
+ # Add missing test file bug753605-atsize.jpg
+ (fetchpatch {
+ url = https://git.gnome.org/browse/gdk-pixbuf/patch/?id=87f8f4bf01dfb9982c1ef991e4060a5e19fdb7a7;
+ sha256 = "1slzywwnrzfx3zjzdsxrvp4g2q4skmv50pdfmyccp41j7bfyb2j0";
+ })
+
+ # Move installed tests to a separate output
+ ./installed-tests-path.patch
+ ];
+
+ outputs = [ "out" "dev" "man" "devdoc" "installedTests" ];
setupHook = ./setup-hook.sh;
- enableParallelBuilding = true;
-
# !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
- buildInputs = [ libX11 gobjectIntrospection ];
+ buildInputs = [ libX11 ];
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [
+ meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43
+ gtk-doc gobjectIntrospection makeWrapper
+ ];
propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];
- configureFlags = "--with-libjasper --with-x11"
- + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
- ;
+ mesonFlags = [
+ "-Ddocs=true"
+ "-Djasper=true"
+ "-Dx11=true"
+ "-Dgir=${if gobjectIntrospection != null then "true" else "false"}"
+ ];
- # on darwin, tests don't link
- preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) ''
- substituteInPlace Makefile --replace "docs tests" "docs"
+ postPatch = ''
+ chmod +x build-aux/* # patchShebangs only applies to executables
+ patchShebangs build-aux
+
+ substituteInPlace tests/meson.build --subst-var-by installedtestsprefix "$installedTests"
'';
postInstall =
@@ -42,10 +76,13 @@ stdenv.mkDerivation rec {
''
moveToOutput "bin" "$dev"
moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"
+
+ # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/
+ $dev/bin/gdk-pixbuf-query-loaders --update-cache
'';
# The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).
- inherit (doCheck);
+ inherit doCheck;
passthru = {
updateScript = gnome3.updateScript {
diff --git a/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch b/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch
new file mode 100644
index 00000000000..1da2b0a10dc
--- /dev/null
+++ b/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch
@@ -0,0 +1,13 @@
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -85,8 +85,8 @@
+ 'aero.gif',
+ ]
+
+-installed_test_bindir = join_paths(gdk_pixbuf_libexecdir, 'installed-tests', meson.project_name())
+-installed_test_datadir = join_paths(gdk_pixbuf_datadir, 'installed-tests', meson.project_name())
++installed_test_bindir = join_paths('@installedtestsprefix@', 'libexec', 'installed-tests', meson.project_name())
++installed_test_datadir = join_paths('@installedtestsprefix@', 'share', 'installed-tests', meson.project_name())
+
+ install_data(test_data, install_dir: installed_test_bindir)
+ install_subdir('test-images', install_dir: installed_test_bindir)
diff --git a/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch b/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch
new file mode 100644
index 00000000000..9896e25acda
--- /dev/null
+++ b/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch
@@ -0,0 +1,18 @@
+--- a/meson.build
++++ b/meson.build
+@@ -186,13 +186,8 @@
+ gmodule_dep = dependency('gmodule-no-export-2.0')
+ gio_dep = dependency('gio-2.0')
+
+-# On non-Windows/macOS systems we always required shared-mime-info and GIO
+-if host_system != 'windows' and host_system != 'darwin'
+- shared_mime_dep = dependency('shared-mime-info')
+- gdk_pixbuf_conf.set('GDK_PIXBUF_USE_GIO_MIME', 1)
+-else
+- shared_mime_dep = []
+-endif
++# No MIME sniffing for now
++shared_mime_dep = []
+
+ gdk_pixbuf_deps = [ mathlib_dep, gobject_dep, gmodule_dep, gio_dep, shared_mime_dep ]
+
diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix
index 8c93428a078..d2987be6a3d 100644
--- a/pkgs/development/libraries/gegl/default.nix
+++ b/pkgs/development/libraries/gegl/default.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
+ doCheck = false; # fails 3 out of 19 tests
+
meta = {
description = "Graph-based image processing framework";
homepage = http://www.gegl.org;
diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix
index 495a113391e..4d348c92171 100644
--- a/pkgs/development/libraries/geoclue/2.0.nix
+++ b/pkgs/development/libraries/geoclue/2.0.nix
@@ -5,11 +5,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "geoclue-2.4.7";
+ name = "geoclue-2.4.8";
src = fetchurl {
url = "http://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz";
- sha256 = "19hfmr8fa1js8ynazdyjxlyrqpjn6m1719ay70ilga4rayxrcyyi";
+ sha256 = "08yg1r7m0n9hwyvcy769qkmkf8lslqwv69cjfffwnc3zm5km25qj";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/git2/0.25.nix b/pkgs/development/libraries/git2/0.25.nix
index 9743b82a14a..6bb1de2cf34 100644
--- a/pkgs/development/libraries/git2/0.25.nix
+++ b/pkgs/development/libraries/git2/0.25.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ doCheck = false; # hangs. or very expensive?
+
meta = {
description = "The Git linkable library";
homepage = https://libgit2.github.com/;
diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index c0659a79fd3..2da1a9ba2a6 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation (rec {
enableParallelBuilding = true;
+ doCheck = false; # hangs. or very expensive?
+
meta = with stdenv.lib; {
description = "The Git linkable library";
homepage = https://libgit2.github.com/;
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 37e0a20a957..af006bdb4cf 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -191,6 +191,8 @@ stdenv.mkDerivation ({
preBuild = lib.optionalString withGd "unset NIX_DONT_SET_RPATH";
+ doCheck = false; # fails
+
meta = {
homepage = http://www.gnu.org/software/libc/;
description = "The GNU C Library";
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index f79511897fb..f5ab5005bad 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -49,6 +49,8 @@ stdenv.mkDerivation rec {
cairoLib = "${getLib cairo}/lib";
});
+ doCheck = false; # fails
+
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix
index 3eed4f0c2e2..aa670cd4c86 100644
--- a/pkgs/development/libraries/grantlee/5/default.nix
+++ b/pkgs/development/libraries/grantlee/5/default.nix
@@ -31,6 +31,8 @@ mkDerivation rec {
setupHook = ./setup-hook.sh;
+ doCheck = false; # fails all the tests (ctest)
+
meta = with lib; {
description = "Qt5 port of Django template system";
longDescription = ''
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index de1a3700cc2..122285da99e 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -70,4 +70,9 @@ stdenv.mkDerivation rec {
++ optional (!stdenv.isDarwin) wildmidi
# TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin
++ optional (!stdenv.isDarwin) mjpegtools;
+
+ enableParallelBuilding = true;
+
+ doCheck = false; # fails 20 out of 58 tests, expensive
+
}
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index d35e47f312f..9731280dedd 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -49,6 +49,8 @@ stdenv.mkDerivation rec {
"--disable-visibility"
];
+ doCheck = false; # needs X11
+
postInstall = ''
moveToOutput share/gtk-2.0/demo "$devdoc"
# The updater is needed for nixos env and it's tiny.
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index dc6a519dfad..0a9513b0fc4 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -63,6 +63,8 @@ stdenv.mkDerivation rec {
"--enable-wayland-backend"
];
+ doCheck = false; # needs X11
+
postInstall = optionalString (!stdenv.isDarwin) ''
substituteInPlace "$out/lib/gtk-3.0/3.0.0/printbackends/libprintbackend-cups.la" \
--replace '-L${gmp.dev}/lib' '-L${gmp.out}/lib'
diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix
index 770f743fd26..d0da7f8cef6 100644
--- a/pkgs/development/libraries/gts/default.nix
+++ b/pkgs/development/libraries/gts/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib gettext ];
+ doCheck = false; # fails with "permission denied"
+
meta = {
homepage = http://gts.sourceforge.net/;
license = stdenv.lib.licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix
index 199ac7c902b..dda1435c1da 100644
--- a/pkgs/development/libraries/id3lib/default.nix
+++ b/pkgs/development/libraries/id3lib/default.nix
@@ -9,12 +9,14 @@ stdenv.mkDerivation {
];
buildInputs = [ zlib ];
-
+
src = fetchurl {
url = mirror://sourceforge/id3lib/id3lib-3.8.3.tar.gz;
sha256 = "0yfhqwk0w8q2hyv1jib1008jvzmwlpsxvc8qjllhna6p1hycqj97";
};
+ doCheck = false; # fails to compile
+
meta = {
platforms = stdenv.lib.platforms.unix;
};
diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index d374c935a2a..bc18a13884b 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ doCheck = false; # fails
+
postInstall = ''
moveToOutput bin "$bin"
'';
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 98073b7bbdc..d705aa3388f 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -62,6 +62,7 @@ stdenv.mkDerivation rec {
'';
enableParallelBuilding = true;
+ doCheck = false; # fails with "No suitable file for testing purposes"
meta = {
description = "MIT Kerberos 5";
diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/development/libraries/lcms/default.nix
index 3e4f0d4265f..63c81822ddf 100644
--- a/pkgs/development/libraries/lcms/default.nix
+++ b/pkgs/development/libraries/lcms/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation {
outputs = [ "bin" "dev" "out" "man" ];
+ doCheck = false; # fails with "Error in Linear interpolation (2p): Must be i=8000, But is n=8001"
+
meta = {
description = "Color management engine";
homepage = http://www.littlecms.com/;
diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix
index 6c87588fd3d..71c388be6ea 100644
--- a/pkgs/development/libraries/libappindicator/default.nix
+++ b/pkgs/development/libraries/libappindicator/default.nix
@@ -2,7 +2,7 @@
{ stdenv, fetchurl, lib, file
, pkgconfig, autoconf
-, glib, dbus-glib, gtkVersion
+, glib, dbus-glib, gtkVersion ? "3"
, gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null
, gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null
, python2Packages, gobjectIntrospection, vala
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index e0242802fd3..9a9c3b1fa64 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -38,6 +38,8 @@ stdenv.mkDerivation rec {
echo "#include " >> config.h
'' else null;
+ doCheck = false; # fails
+
preFixup = ''
sed -i $lib/lib/libarchive.la \
-e 's|-lcrypto|-L${openssl.out}/lib -lcrypto|' \
diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix
index 6a164ef9055..591369df83f 100644
--- a/pkgs/development/libraries/libcddb/default.nix
+++ b/pkgs/development/libraries/libcddb/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
+ doCheck = false; # fails 3 of 5 tests with locale errors
+
meta = with stdenv.lib; {
description = "C library to access data on a CDDB server (freedb.org)";
homepage = http://libcddb.sourceforge.net/;
diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix
index fb0f0d3d3f9..683a5bee4c7 100644
--- a/pkgs/development/libraries/libcue/default.nix
+++ b/pkgs/development/libraries/libcue/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake bison flex ];
+ doCheck = false; # fails all the tests (ctest)
+
meta = with stdenv.lib; {
description = "CUE Sheet Parser Library";
longDescription = ''
diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix
index 66cb5215a8a..f18e0622d0c 100644
--- a/pkgs/development/libraries/libdvdcss/default.nix
+++ b/pkgs/development/libraries/libdvdcss/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "libdvdcss-${version}";
- version = "1.4.1";
+ version = "1.4.2";
buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit;
src = fetchurl {
url = "http://get.videolan.org/libdvdcss/${version}/${name}.tar.bz2";
- sha256 = "1b7awvyahivglp7qmgx2g5005kc5npv257gw7wxdprjsnx93f1zb";
+ sha256 = "0x957zzpf4w2cp8zlk29prj8i2q6hay3lzdzsyz8y3cwxivyvhkq";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix
index 5bcb9a1ede2..2ef1d3965ce 100644
--- a/pkgs/development/libraries/libevdev/default.nix
+++ b/pkgs/development/libraries/libevdev/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, python }:
stdenv.mkDerivation rec {
- name = "libevdev-1.5.8";
+ name = "libevdev-1.5.9";
src = fetchurl {
url = "https://www.freedesktop.org/software/libevdev/${name}.tar.xz";
- sha256 = "0vac7n1miqdprikq4g63vsk681q8v416r0nbh2xai7b08qgdi0v0";
+ sha256 = "0xca343ff12wh6nsq76r0nbsfrm8dypjrzm4fqz9vv9v8i8kfrp1";
};
buildInputs = [ python ];
diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index 871437f1908..b74e64aa849 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames
;
+ doCheck = false; # needs the net
+
postInstall = stdenv.lib.optionalString sslSupport ''
moveToOutput "lib/libevent_openssl*" "$openssl"
substituteInPlace "$dev/lib/pkgconfig/libevent_openssl.pc" \
diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix
index 5ba8bb66784..fd9c8dc9a5e 100644
--- a/pkgs/development/libraries/libical/default.nix
+++ b/pkgs/development/libraries/libical/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
./respect-env-tzdir.patch
];
+ doCheck = false; # fails all the tests (ctest)
+
meta = with stdenv.lib; {
homepage = https://github.com/libical/libical;
description = "An Open Source implementation of the iCalendar protocols";
diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix
index 54d669f1913..b6f08a9206e 100644
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/pkgs/development/libraries/libidn/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, libiconv }:
stdenv.mkDerivation rec {
- name = "libidn-1.33";
+ name = "libidn-1.34";
src = fetchurl {
url = "mirror://gnu/libidn/${name}.tar.gz";
- sha256 = "068fjg2arlppjqqpzd714n1lf6gxkpac9v5yyvp1qwmv6nvam9s4";
+ sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p";
};
outputs = [ "bin" "dev" "out" "info" "devdoc" ];
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
+ doCheck = false; # fails
+
meta = {
homepage = http://www.gnu.org/software/libidn/;
description = "Library for internationalized domain names";
diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix
index 445a505b68c..1bde9336c66 100644
--- a/pkgs/development/libraries/libindicate/default.nix
+++ b/pkgs/development/libraries/libindicate/default.nix
@@ -3,7 +3,7 @@
{ stdenv, fetchurl, lib, file
, pkgconfig, autoconf
, glib, dbus-glib, libdbusmenu-glib
-, gtkVersion, gtk2 ? null, gtk3 ? null
+, gtkVersion ? "3", gtk2 ? null, gtk3 ? null
, pythonPackages, gobjectIntrospection, vala, gnome-doc-utils
, monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null
}:
diff --git a/pkgs/development/libraries/libindicator/default.nix b/pkgs/development/libraries/libindicator/default.nix
index 67936fecdf4..33691f79a4c 100644
--- a/pkgs/development/libraries/libindicator/default.nix
+++ b/pkgs/development/libraries/libindicator/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, lib, file
, pkgconfig
-, gtkVersion, gtk2 ? null, gtk3 ? null }:
+, gtkVersion ? "3", gtk2 ? null, gtk3 ? null }:
with lib;
@@ -40,6 +40,8 @@ stdenv.mkDerivation rec {
"localstatedir=\${TMPDIR}"
];
+ doCheck = false; # fails 8 out of 8 tests
+
meta = {
description = "A set of symbols and convenience functions for Ayatana indicators";
homepage = https://launchpad.net/libindicator;
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 0e2458a3895..6773b7c1b1f 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -16,11 +16,11 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "libinput-${version}";
- version = "1.10.0";
+ version = "1.10.3";
src = fetchurl {
url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
- sha256 = "0mrzsf0349d1g68lizkzxw7vaw459fl8xhl7v0s8njb31hp2riy2";
+ sha256 = "0002xk9cqzpqrlhgav1wp8nimsbp9d2w8rd8mgygczq2hjar0lhd";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix
index 8b0a4ec98ed..96dbd463370 100644
--- a/pkgs/development/libraries/libjpeg/default.nix
+++ b/pkgs/development/libraries/libjpeg/default.nix
@@ -3,11 +3,11 @@
with stdenv.lib;
stdenv.mkDerivation {
- name = "libjpeg-8d";
+ name = "libjpeg-9c";
src = fetchurl {
- url = http://www.ijg.org/files/jpegsrc.v8d.tar.gz;
- sha256 = "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0";
+ url = http://www.ijg.org/files/jpegsrc.v9c.tar.gz;
+ sha256 = "08kixcf3a7s9x91174abjnk1xbvj4v8crdc73zi4k9h3jfbm00k5";
};
configureFlags = optional static "--enable-static --disable-shared";
diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix
index ae1d458b0d5..c72b9723dc5 100644
--- a/pkgs/development/libraries/liblo/default.nix
+++ b/pkgs/development/libraries/liblo/default.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "0sn0ckc1d0845mhsaa62wf7f9v0c0ykiq796a30ja5096kib9qdc";
};
- meta = {
+ doCheck = false; # fails 1 out of 3 tests
+
+ meta = {
description = "Lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol";
homepage = https://sourceforge.net/projects/liblo;
license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/development/libraries/libnfsidmap/default.nix b/pkgs/development/libraries/libnfsidmap/default.nix
index 74562ebe132..ce21cda4a5d 100644
--- a/pkgs/development/libraries/libnfsidmap/default.nix
+++ b/pkgs/development/libraries/libnfsidmap/default.nix
@@ -2,12 +2,16 @@
stdenv.mkDerivation rec {
name = "libnfsidmap-0.25";
-
+
src = fetchurl {
url = "http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${name}.tar.gz";
sha256 = "1kzgwxzh83qi97rblcm9qj80cdvnv8kml2plz0q103j0hifj8vb5";
};
+ postPatch = ''
+ sed -i '1i#include ' cfg.h
+ '';
+
preConfigure =
''
configureFlags="--with-pluginpath=$out/lib/libnfsidmap"
diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix
index 4903d54b4a3..22eb8ed64dd 100644
--- a/pkgs/development/libraries/libnih/default.nix
+++ b/pkgs/development/libraries/libnih/default.nix
@@ -4,7 +4,7 @@ let version = "1.0.3"; in
stdenv.mkDerivation rec {
name = "libnih-${version}";
-
+
src = fetchurl {
url = "http://code.launchpad.net/libnih/1.0/${version}/+download/libnih-${version}.tar.gz";
sha256 = "01glc6y7z1g726zwpvp2zm79pyb37ki729jkh45akh35fpgp4xc9";
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ dbus expat ];
+ doCheck = false; # fails 1 of 17 test
+
meta = {
description = "A small library for C application development";
homepage = https://launchpad.net/libnih;
diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix
index 28c8a915c63..68302acac29 100644
--- a/pkgs/development/libraries/libomxil-bellagio/default.nix
+++ b/pkgs/development/libraries/libomxil-bellagio/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
patches = [ ./fedora-fixes.patch ];
+ doCheck = false; # fails
+
meta = with stdenv.lib; {
homepage = https://sourceforge.net/projects/omxil/;
description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components";
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index bf9e2d079cd..02e634b22a3 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
)
'';
+ doCheck = false; # fails 1 out of 10 tests
+
meta = with stdenv.lib; {
platforms = platforms.linux ++ platforms.darwin;
license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index c2e1739117b..dfd45f8e4ff 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -5,14 +5,14 @@
let
pname = "librsvg";
- version = "2.42.2";
+ version = "2.42.3";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "0c550a0bffef768a436286116c03d9f6cd3f97f5021c13e7f093b550fac12562";
+ sha256 = "0mz6rdxpnnjnk15nahlwpa2gba0ws1hs2dnyk1agqw5ip522qkvh";
};
outputs = [ "out" "dev" ];
@@ -52,6 +52,8 @@ stdenv.mkDerivation rec {
-i gdk-pixbuf-loader/librsvg.thumbnailer.in
'';
+ doCheck = false; # fails 20 of 145 tests, very likely to be buggy
+
# Merge gdkpixbuf and librsvg loaders
postInstall = ''
mv $GDK_PIXBUF/loaders.cache $GDK_PIXBUF/loaders.cache.tmp
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 92e9c3662c9..75898852a09 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -36,6 +36,8 @@ stdenv.mkDerivation rec {
"--with-gnome=${if gnomeSupport then "yes" else "no"}"
];
+ doCheck = false; # fails with "no: command not found"
+
passthru = {
propagatedUserEnvPackages = [ glib-networking.out ];
updateScript = gnome3.updateScript {
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix
index 8c85864f87a..c112ab65a20 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix
@@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ doCheck = false; # fails to link
+
meta = with stdenv.lib; {
homepage = http://www.rasterbar.com/products/libtorrent/;
description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index 42d2fe11f7b..6256702010f 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -29,6 +29,12 @@ let
enableParallelBuilding = true;
+ doCheck = false; # hangs, tries to access the net?
+
+ # for some reason the tests are not running - it says "No tests found!!"
+ checkInputs = [ check ];
+ checkPhase = "ctest";
+
meta = with stdenv.lib; {
description = "P2P FOSS instant messaging application aimed to replace Skype";
homepage = https://tox.chat;
diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix
index ea411d73b31..52bc0ac5cfd 100644
--- a/pkgs/development/libraries/libuchardet/default.nix
+++ b/pkgs/development/libraries/libuchardet/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake ];
+ doCheck = false; # fails all the tests (ctest)
+
meta = with stdenv.lib; {
description = "Mozilla's Universal Charset Detector C/C++ API";
homepage = https://www.byvoid.com/zht/project/uchardet;
diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index b901d352808..dbf1d7a3756 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
done
'';
+ doCheck = false; # fails
+
meta = with stdenv.lib; {
homepage = http://www.nongnu.org/libunwind;
description = "A portable and efficient API to determine the call-chain of a program";
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index e8877c7f54b..ed4397c88f0 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -2,14 +2,14 @@
, ApplicationServices, CoreServices }:
stdenv.mkDerivation rec {
- version = "1.19.2";
+ version = "1.20.2";
name = "libuv-${version}";
src = fetchFromGitHub {
owner = "libuv";
repo = "libuv";
rev = "v${version}";
- sha256 = "118r8wigm65107fm7kzfz7gc4awy8xxg0knvwnshx1j40ks08x9z";
+ sha256 = "14zlf59fr03v684ryapc57r9nfrznyk5xvcd59q04rb435ibib48";
};
postPatch = let
diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix
index 3ea0155b4f4..50b995a0356 100644
--- a/pkgs/development/libraries/libvdpau-va-gl/default.nix
+++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg libGLU ];
+ doCheck = false; # fails. needs DRI access
+
meta = with stdenv.lib; {
homepage = https://github.com/i-rinat/libvdpau-va-gl;
description = "VDPAU driver with OpenGL/VAAPI backend";
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index 272761cc6af..466ffa0cf18 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -58,13 +58,13 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport;
stdenv.mkDerivation rec {
name = "libvpx-${version}";
- version = "1.6.1";
+ version = "1.7.0";
src = fetchFromGitHub {
owner = "webmproject";
repo = "libvpx";
rev = "v${version}";
- sha256 = "10fs7xilf2bsj5bqw206lb5r5dgl84p5m6nibiirk28lmjx1i3l0";
+ sha256 = "0vvh89hvp8qg9an9vcmwb7d9k3nixhxaz6zi65qdjnd0i56kkcz6";
};
patchPhase = ''patchShebangs .'';
diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix
index 8e36edff7ed..cc3f19ab7d3 100644
--- a/pkgs/development/libraries/libwacom/default.nix
+++ b/pkgs/development/libraries/libwacom/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libwacom-${version}";
- version = "0.28";
+ version = "0.29";
src = fetchurl {
url = "mirror://sourceforge/linuxwacom/libwacom/${name}.tar.bz2";
- sha256 = "1vv768870597rvwxdb59v6pjn1pxaxg4r6znbb5j3cl828q35mp7";
+ sha256 = "1diklgcjhmvcxi9p1ifp6wcnyr6k7z9jhrlzfhzjqd6zipk01slw";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix
index faeed680f3d..3e0a2872c00 100644
--- a/pkgs/development/libraries/libxkbcommon/default.nix
+++ b/pkgs/development/libraries/libxkbcommon/default.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
"-Dx-locale-root=${libX11.out}/share/X11/locale"
];
+ doCheck = false; # fails, needs unicode locale
+
meta = with stdenv.lib; {
description = "A library to handle keyboard descriptions";
homepage = https://xkbcommon.org;
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index c4f3ff1efdd..be2f83cb498 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -10,11 +10,11 @@ let
in stdenv.mkDerivation rec {
name = "libxml2-${version}";
- version = "2.9.7";
+ version = "2.9.8";
src = fetchurl {
url = "http://xmlsoft.org/sources/${name}.tar.gz";
- sha256 = "034hylzspvkm0p4bczqbf8q05a7r2disr8dz725x4bin61ymwg7n";
+ sha256 = "0ci7is75bwqqw2p32vxvrk6ds51ik7qgx73m920rakv5jlayax0b";
};
outputs = [ "bin" "dev" "out" "man" "doc" ]
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 2beb7e60080..0811362bfca 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -67,7 +67,7 @@ let
in
let
- version = "17.3.8";
+ version = "17.3.9";
branch = head (splitString "." version);
in
@@ -81,7 +81,7 @@ let self = stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
];
- sha256 = "1cd6a4ll5arla3kncxnw9196ak1v4rvnb098aa7lm3n4h7r9p7cg";
+ sha256 = "0yg4nvagg5y2fxyl3jjdgbi6gjqqw4z3j6pyzsac5q7h0pybbgn5";
};
prePatch = "patchShebangs .";
@@ -161,7 +161,7 @@ let self = stdenv.mkDerivation {
doCheck = false;
installFlags = [
- "sysconfdir=\${out}/etc"
+ "sysconfdir=\${drivers}/etc"
"localstatedir=\${TMPDIR}"
"vendorjsondir=\${out}/share/glvnd/egl_vendor.d"
];
diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix
index c88c8da6378..6b607e94bd4 100644
--- a/pkgs/development/libraries/mpfi/default.nix
+++ b/pkgs/development/libraries/mpfi/default.nix
@@ -1,15 +1,20 @@
{stdenv, fetchurl, mpfr}:
stdenv.mkDerivation rec {
name = "mpfi-${version}";
- version = "1.5.1";
+ version = "1.5.3";
+ file_nr = "37331";
src = fetchurl {
- url = "https://gforge.inria.fr/frs/download.php/file/30129/mpfi-${version}.tar.bz2";
- sha256 = "0vk9jfcfiqda0zksg1ffy36pdznpng9b4nl7pfzpz9hps4v6bk1z";
+ # NOTE: the file_nr is whats important here. The actual package name (including the version)
+ # is ignored. To find out the correct file_nr, go to https://gforge.inria.fr/projects/mpfi/
+ # and click on Download in the section "Latest File Releases".
+ url = "https://gforge.inria.fr/frs/download.php/file/${file_nr}/mpfi-${version}.tar.bz2";
+ sha256 = "0bqr8yibl7jbrp0bw7xk1lm7nis7rv26jsz6y8ycvih8n9bx90r3";
};
buildInputs = [mpfr];
meta = {
inherit version;
description = ''A multiple precision interval arithmetic library based on MPFR'';
+ homepage = https://gforge.inria.fr/projects/mpfi/;
license = stdenv.lib.licenses.lgpl21Plus;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix
index 4aac5a92709..d75d9d6b9d9 100644
--- a/pkgs/development/libraries/mpfr/default.nix
+++ b/pkgs/development/libraries/mpfr/default.nix
@@ -3,11 +3,12 @@
}:
stdenv.mkDerivation rec {
- name = "mpfr-3.1.6";
+ version = "4.0.1";
+ name = "mpfr-${version}";
src = fetchurl {
url = "mirror://gnu/mpfr/${name}.tar.xz";
- sha256 = "0l598h9klpgkz2bp0rxiqb90mkqh9f2f81n5rpy191j00hdaqqks";
+ sha256 = "0vp1lrc08gcmwdaqck6bpzllkrykvp06vz5gnqpyw0v3h9h4m1v7";
};
outputs = [ "out" "dev" "doc" "info" ];
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 4c93faedcce..cf478837b86 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, pkgconfig
-, abiVersion
+, abiVersion ? "6"
, mouseSupport ? false
, unicode ? true
, enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt
diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 17805f32afb..ce18498ee85 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl
, CoreServices ? null }:
-let version = "4.18"; in
+let version = "4.19"; in
stdenv.mkDerivation {
name = "nspr-${version}";
src = fetchurl {
url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
- sha256 = "0d7vr3wrgp73qbywrvdkikk8vq1s1n9vhf62db80g1zqkg05g5mq";
+ sha256 = "0agpv3f17h8kmzi0ifibaaxc1k3xc0q61wqw3l6r2xr2z8bmkn9f";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 8662b956ce2..840b349035b 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -15,11 +15,11 @@ let
in stdenv.mkDerivation rec {
name = "nss-${version}";
- version = "3.35";
+ version = "3.36.1";
src = fetchurl {
- url = "mirror://mozilla/security/nss/releases/NSS_3_35_RTM/src/${name}.tar.gz";
- sha256 = "1ypn68z9ncbbshi3184ywrhx5i846lyd72gps1grzqzdkgh7s4pl";
+ url = "mirror://mozilla/security/nss/releases/NSS_3_36_1_RTM/src/${name}.tar.gz";
+ sha256 = "1zrb49mp7cy3snnday1zv8d76h1mgppbcwxnlkqsgxlga8fl89b0";
};
buildInputs = [ perl zlib sqlite ]
diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index 8d5a6bb65a9..60ee30177c0 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ ilmbase zlib ];
enableParallelBuilding = true;
+ doCheck = false; # fails 1 of 1 tests
meta = with stdenv.lib; {
homepage = http://www.openexr.com/;
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 56118c9bbb2..93ba3f15a09 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl"
++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
+ doCheck = false; # needs a running LDAP server
+
installFlags = [ "sysconfdir=$(out)/etc" "localstatedir=$(out)/var" ];
# 1. Fixup broken libtool
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 1eac225387d..31e9d661a58 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -73,8 +73,7 @@ let
makeFlags = [ "MANDIR=$(man)/share/man" ];
- # Parallel building is broken in OpenSSL.
- enableParallelBuilding = false;
+ enableParallelBuilding = true;
postInstall = ''
# If we're building dynamic libraries, then don't install static
diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index a3d4857d57a..9c663186287 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
installFlags = [ "exampledir=\${out}/etc/pkcs11" ];
+ doInstallCheck = false; # probably a bug in this derivation
+
meta = with stdenv.lib; {
homepage = https://p11-glue.freedesktop.org/;
platforms = platforms.all;
diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix
index 9603e45a8b4..2e1ed060aca 100644
--- a/pkgs/development/libraries/pcre2/default.nix
+++ b/pkgs/development/libraries/pcre2/default.nix
@@ -40,6 +40,8 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ];
+ doCheck = false; # fails 1 of 3 tests
+
postFixup = ''
moveToOutput bin/pcre2-config "$dev"
'';
diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix
index 53281ddc657..643e36ba6cd 100644
--- a/pkgs/development/libraries/phonon/backends/vlc.nix
+++ b/pkgs/development/libraries/phonon/backends/vlc.nix
@@ -7,7 +7,7 @@
with lib;
let
- v = "0.9.0";
+ v = "0.10.1";
pname = "phonon-backend-vlc";
in
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://kde/stable/phonon/${pname}/${v}/${pname}-${v}.tar.xz";
- sha256 = "1gnd1j305mqajw5gxm42vg6ajkvi8611bxgc3qhj5k0saz5dgkn0";
+ sha256 = "0b87mzkw9fdkrwgnh1kw5i5wnrd05rl42hynlykb7cfymsk6v5h9";
};
buildInputs =
diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix
index 441da25836d..edec0b7f069 100644
--- a/pkgs/development/libraries/popt/default.nix
+++ b/pkgs/development/libraries/popt/default.nix
@@ -8,10 +8,12 @@ stdenv.mkDerivation rec {
sha256 = "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77";
};
- patches = if stdenv.isCygwin then [
+ patches = stdenv.lib.optionals stdenv.isCygwin [
./1.16-cygwin.patch
./1.16-vpath.patch
- ] else null;
+ ];
+
+ doCheck = false; # fails
meta = {
description = "Command line option parsing library";
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 10f892bc4d0..c37c59997f6 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -192,6 +192,8 @@ stdenv.mkDerivation rec {
sed -i 's/^\(LIBS[[:space:]]*=.*$\)/\1 -lobjc/' ./src/corelib/Makefile.Release
'';
+ doCheck = false; # qwebframe test fails with fontconfig errors
+
postInstall = ''
rm -rf $out/tests
'';
diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index 0564459b24c..05fd952eb2e 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -52,7 +52,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobjectIntrospection ];
- PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "share/polkit-1/actions";
+ PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "$(out)/share/polkit-1/actions";
configureFlags = [
"--with-gtk3"
diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix
index ed19814be34..fbf7d8df53e 100644
--- a/pkgs/development/libraries/sqlcipher/default.nix
+++ b/pkgs/development/libraries/sqlcipher/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
CFLAGS = [ "-DSQLITE_ENABLE_COLUMN_METADATA=1" "-DSQLITE_SECURE_DELETE=1" "-DSQLITE_ENABLE_UNLOCK_NOTIFY=1" "-DSQLITE_HAS_CODEC" ];
LDFLAGS = lib.optional (readline != null) "-lncurses";
+ doCheck = false; # fails. requires tcl?
+
meta = with stdenv.lib; {
homepage = http://sqlcipher.net/;
description = "Full Database Encryption for SQLite";
diff --git a/pkgs/development/libraries/tk/8.5.nix b/pkgs/development/libraries/tk/8.5.nix
index c3396dcdad2..141f6da14ce 100644
--- a/pkgs/development/libraries/tk/8.5.nix
+++ b/pkgs/development/libraries/tk/8.5.nix
@@ -8,4 +8,3 @@ callPackage ./generic.nix (args // rec {
};
})
-
diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix
index 666332d45fb..cd8d42faa91 100644
--- a/pkgs/development/libraries/tk/8.6.nix
+++ b/pkgs/development/libraries/tk/8.6.nix
@@ -10,4 +10,3 @@ callPackage ./generic.nix (args // rec {
patches = [ ./different-prefix-with-tcl.patch ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ];
})
-
diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix
index 843c6157479..34024b23e27 100644
--- a/pkgs/development/libraries/tk/generic.nix
+++ b/pkgs/development/libraries/tk/generic.nix
@@ -31,6 +31,8 @@ stdenv.mkDerivation {
NIX_CFLAGS_LINK = if stdenv.isDarwin then "-lfontconfig" else null;
+ doCheck = false; # fails. can't find itself
+
inherit tcl;
passthru = rec {
diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index a5b7a6a99ce..bbc33f33e70 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -8,11 +8,11 @@ assert expat != null;
stdenv.mkDerivation rec {
name = "wayland-${version}";
- version = "1.14.0";
+ version = "1.15.0";
src = fetchurl {
url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
- sha256 = "1f3sla6h0bw15fz8pjc67jhwj7pwmfdc7qlj42j5k9v116ycm07d";
+ sha256 = "1c5fnys8hi71cnzjv5k7j0r8gx80p0yyqlrpmn06mmarhnxvwgzb";
};
configureFlags = [ "--with-scanner" "--disable-documentation" ];
diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index 418829e7af8..d11a93254bf 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -16,14 +16,14 @@ in
stdenv.mkDerivation rec {
name = "x265-${version}";
- version = "2.6";
+ version = "2.7";
src = fetchurl {
urls = [
"http://get.videolan.org/x265/x265_${version}.tar.gz"
"https://github.com/videolan/x265/archive/${version}.tar.gz"
];
- sha256 = "1gyd94jkwdii9308m07nymsbxrmrcl81c0j8i10zhslr2mj07w0v";
+ sha256 = "18llni1m8kfvdwy5bp950z6gyd0nijmvi3hzd6gd8vpy5yk5zrym";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/zeromq/3.x.nix b/pkgs/development/libraries/zeromq/3.x.nix
index 2252f8fe43c..009826eef47 100644
--- a/pkgs/development/libraries/zeromq/3.x.nix
+++ b/pkgs/development/libraries/zeromq/3.x.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
buildInputs = [ libuuid ];
+ doCheck = false; # fails all the tests (ctest)
+
meta = with stdenv.lib; {
branch = "3";
homepage = http://www.zeromq.org;
diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix
index eea0fb727b0..333a37ba85d 100644
--- a/pkgs/development/libraries/zeromq/4.x.nix
+++ b/pkgs/development/libraries/zeromq/4.x.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
sed -i 's,''${PACKAGE_PREFIX_DIR}/,,g' ZeroMQConfig.cmake.in
'';
+ doCheck = false; # fails all the tests (ctest)
+
meta = with stdenv.lib; {
branch = "4";
homepage = http://www.zeromq.org;
diff --git a/pkgs/development/python-modules/deprecation/default.nix b/pkgs/development/python-modules/deprecation/default.nix
new file mode 100644
index 00000000000..63c3fcd74ca
--- /dev/null
+++ b/pkgs/development/python-modules/deprecation/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchPypi, python, packaging, unittest2 }:
+
+buildPythonPackage rec {
+ pname = "deprecation";
+ version = "2.0.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "e8d0dc5a17d7d551730e5f23ff3a53fc9e438364b9efb47d41c3e9b05522eabe";
+ };
+
+ propagatedBuildInputs = [ packaging ];
+
+ checkInputs = [ unittest2 ];
+
+ checkPhase = ''
+ ${python.interpreter} -m unittest discover
+ '';
+
+ meta = with lib; {
+ description = "A library to handle automated deprecations";
+ homepage = https://deprecation.readthedocs.io/;
+ license = licenses.asl20;
+ };
+}
diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index 39c06bff3bf..091ac809a9b 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -2,8 +2,7 @@
buildPythonPackage rec {
pname = "pycairo";
- version = "1.15.4";
- name = "${pname}-${version}";
+ version = "1.16.3";
disabled = isPyPy;
@@ -11,13 +10,21 @@ buildPythonPackage rec {
owner = "pygobject";
repo = "pycairo";
rev = "v${version}";
- sha256 = "02vzmfxx8nl6dbwzc911wcj7hqspgqz6v9xmq6579vwfla0vaglv";
+ sha256 = "0clk6wrfls3fa1xrn844762qfaw6gs4ivwkrfysidbzmlbxhpngl";
};
- postPatch = ''
- # we are unable to pass --prefix to bdist_wheel
- # see https://github.com/NixOS/nixpkgs/pull/32034#discussion_r153285955
- substituteInPlace setup.py --replace '"prefix": self.install_base' "'prefix': '$out'"
+ # We need to create the pkgconfig file but it cannot be installed as a wheel since wheels
+ # are supposed to be relocatable and do not support --prefix option
+ buildPhase = ''
+ ${python.interpreter} setup.py build
+ '';
+
+ installPhase = ''
+ ${python.interpreter} setup.py install --skip-build --prefix="$out" --optimize=1
+ '';
+
+ checkPhase = ''
+ ${python.interpreter} setup.py test
'';
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix
index 6ba1d5f10ec..0c754fcfe3b 100644
--- a/pkgs/development/ruby-modules/bundler/default.nix
+++ b/pkgs/development/ruby-modules/bundler/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
inherit ruby;
name = "${gemName}-${version}";
gemName = "bundler";
- version = "1.14.6";
- source.sha256 = "0h3x2csvlz99v2ryj1w72vn6kixf7rl35lhdryvh7s49brnj0cgl";
+ version = "1.16.1";
+ source.sha256 = "42b8e0f57093e1d10c15542f956a871446b759e7969d99f91caf3b6731c156e8";
dontPatchShebangs = true;
postFixup = ''
diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index 875feea84d4..131533896ff 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -59,6 +59,8 @@ stdenv.mkDerivation rec {
configureFlags =
stdenv.lib.optional (stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin") "--enable-only64bit";
+ doCheck = false; # fails
+
postInstall = ''
for i in $out/lib/valgrind/*.supp; do
substituteInPlace $i \
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 97c02cd9cc1..70ea1623f89 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -101,6 +101,7 @@ stdenv.mkDerivation rec {
# CMAKE_SYSTEM_NAME, etc.
configurePlatforms = [ ];
+ doCheck = false; # fails
meta = with stdenv.lib; {
homepage = http://www.cmake.org/;
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index 04d7d93455e..849c722e554 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -20,12 +20,12 @@ let newPython = python.override {
};
in newPython.pkgs.buildPythonApplication rec {
- version = "1.1.1"; # remove patch below when updating
+ version = "1.2.3";
pname = "conan";
src = newPython.pkgs.fetchPypi {
inherit pname version;
- sha256 = "1k1r401bc9fgmhd5n5f29mjcn346r3zdrm7p28nwpr2r2p3fslrl";
+ sha256 = "623e92d99cd0f4ec92552b23af66a6bb066071e213659f502480bb9a96d7be23";
};
checkInputs = with newPython.pkgs; [
@@ -39,15 +39,7 @@ in newPython.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with newPython.pkgs; [
requests fasteners pyyaml pyjwt colorama patch
bottle pluginbase six distro pylint node-semver
- future pygments mccabe
- ];
-
- patches = [
- # already merged, remove with the next package update
- (fetchpatch {
- url = "https://github.com/conan-io/conan/commit/51cc4cbd51ac8f9b9efa2bf678a2d7810e273ff3.patch";
- sha256 = "0d93g4hjpfk8z870imwdswkw5qba2h5zhfgwwijiqhr2pv7fl1y7";
- })
+ future pygments mccabe deprecation
];
preCheck = ''
diff --git a/pkgs/development/tools/dcadec/default.nix b/pkgs/development/tools/dcadec/default.nix
index 95f992e490f..f9ca826cd62 100644
--- a/pkgs/development/tools/dcadec/default.nix
+++ b/pkgs/development/tools/dcadec/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
installPhase = "make PREFIX=/ DESTDIR=$out install";
+ doCheck = false; # fails with "ERROR: Run 'git submodule update --init test/samples' first."
+
meta = with stdenv.lib; {
description = "DTS Coherent Acoustics decoder with support for HD extensions";
maintainers = with maintainers; [ edwtjo ];
@@ -21,4 +23,4 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21;
platforms = platforms.linux;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index 05418aa39a8..d25f00276f6 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
stdenv.lib.optional stdenv.isDarwin "-mmacosx-version-min=10.9";
enableParallelBuilding = true;
+ doCheck = false; # fails
meta = {
license = stdenv.lib.licenses.gpl2Plus;
diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index a52afd6c39a..5bd989a4da8 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -28,6 +28,9 @@ stdenv.mkDerivation rec {
configureFlags = "--disable-scrollkeeper";
+ doCheck = false; # requires a lot of stuff
+ doInstallCheck = false; # fails
+
passthru = {
# Consumers are expected to copy the m4 files to their source tree, let them reuse the patch
respect_xml_catalog_files_var_patch = ./respect-xml-catalog-files-var.patch;
diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix
index 9a3ff192ba9..5ef12d88c06 100644
--- a/pkgs/development/tools/go2nix/default.nix
+++ b/pkgs/development/tools/go2nix/default.nix
@@ -33,6 +33,8 @@ buildGoPackage rec {
allowGoReference = true;
+ doCheck = false; # tries to access the net
+
meta = with stdenv.lib; {
description = "Go apps packaging for Nix";
homepage = https://github.com/kamilchm/go2nix;
diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix
index bd4dd28f599..a80f1569329 100644
--- a/pkgs/development/tools/govers/default.nix
+++ b/pkgs/development/tools/govers/default.nix
@@ -4,7 +4,7 @@ buildGoPackage rec {
name = "govers-${version}";
version = "20150109-${stdenv.lib.strings.substring 0 7 rev}";
rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9";
-
+
goPackagePath = "github.com/rogpeppe/govers";
src = fetchgit {
@@ -14,4 +14,7 @@ buildGoPackage rec {
};
dontRenameImports = true;
+
+ doCheck = false; # fails, silently
+
}
diff --git a/pkgs/development/tools/misc/autoconf/2.64.nix b/pkgs/development/tools/misc/autoconf/2.64.nix
index 9e70833e008..31df050d5f8 100644
--- a/pkgs/development/tools/misc/autoconf/2.64.nix
+++ b/pkgs/development/tools/misc/autoconf/2.64.nix
@@ -23,10 +23,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- preCheck =
- # Make the Autotest test suite run in parallel.
- '' export TESTSUITEFLAGS="-j$NIX_BUILD_CORES"
- '';
+ # Make the Autotest test suite run in parallel.
+ preCheck =''
+ export TESTSUITEFLAGS="-j$NIX_BUILD_CORES"
+ '';
+
+ doInstallCheck = false; # fails
meta = {
homepage = http://www.gnu.org/software/autoconf/;
diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix
index 579dea33df4..e9ea0ea1ea4 100644
--- a/pkgs/development/tools/misc/autoconf/default.nix
+++ b/pkgs/development/tools/misc/autoconf/default.nix
@@ -24,10 +24,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- preCheck =
- # Make the Autotest test suite run in parallel.
- '' export TESTSUITEFLAGS="-j$NIX_BUILD_CORES"
- '';
+ # Make the Autotest test suite run in parallel.
+ preCheck =''
+ export TESTSUITEFLAGS="-j$NIX_BUILD_CORES"
+ '';
+
+ doInstallCheck = false; # fails
meta = {
homepage = http://www.gnu.org/software/autoconf/;
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index ac055171658..77622f579f3 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
# be satisfied on aarch64 platform. Add backported fix from bugzilla.
# https://sourceware.org/bugzilla/show_bug.cgi?id=22764
./relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch
- ];
+ ] ++ stdenv.lib.optional targetPlatform.isiOS ./support-ios.patch;
outputs = [ "out" "info" "man" ];
@@ -121,6 +121,8 @@ stdenv.mkDerivation rec {
"--enable-fix-loongson2f-nop"
] ++ optionals gold [ "--enable-gold" "--enable-plugins" ];
+ doCheck = false; # fails
+
enableParallelBuilding = true;
passthru = {
diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix
index 70ed9cd0570..129c1c6b3a9 100644
--- a/pkgs/development/tools/misc/itstool/default.nix
+++ b/pkgs/development/tools/misc/itstool/default.nix
@@ -2,11 +2,11 @@
# We need the same Python as is used to build libxml2Python
stdenv.mkDerivation rec {
- name = "itstool-2.0.2";
+ name = "itstool-2.0.4";
src = fetchurl {
url = "http://files.itstool.org/itstool/${name}.tar.bz2";
- sha256 = "bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a";
+ sha256 = "0q7b4qrc758zfx3adsgvz0r93swdbxjr42w37rahngm33nshihlp";
};
buildInputs = [ python2 libxml2Python ];
diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix
index 85821ee2089..d1d35d9a482 100644
--- a/pkgs/development/tools/misc/libtool/libtool2.nix
+++ b/pkgs/development/tools/misc/libtool/libtool2.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
# XXX: The GNU ld wrapper does all sorts of nasty things wrt. RPATH, which
# leads to the failure of a number of tests.
doCheck = false;
+ doInstallCheck = false;
# Don't run the native `strip' when cross-compiling. This breaks at least
# with `.a' files for MinGW.
diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix
index 15d00b0a2a5..219281f4ec1 100644
--- a/pkgs/development/tools/misc/pkgconfig/default.nix
+++ b/pkgs/development/tools/misc/pkgconfig/default.nix
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
"ac_cv_func_posix_getgrgid_r=yes"
];
+ doCheck = false; # fails
postInstall = ''rm -f "$out"/bin/*-pkg-config''; # clean the duplicate file
@@ -42,4 +43,3 @@ stdenv.mkDerivation rec {
};
}
-
diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix
index 2e0d020688e..63e5bea19d7 100644
--- a/pkgs/development/tools/misc/texinfo/4.13a.nix
+++ b/pkgs/development/tools/misc/texinfo/4.13a.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchurl, ncurses, lzma }:
+{ stdenv, fetchurl, texinfo, ncurses, lzma }:
stdenv.mkDerivation rec {
- name = "texinfo-4.13a";
+ name = "texinfo-${version}";
+ version = "4.13a";
src = fetchurl {
- url = "mirror://gnu/texinfo/texinfo-4.13a.tar.lzma";
+ url = "mirror://gnu/texinfo/${name}.tar.lzma";
sha256 = "1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d";
};
@@ -14,29 +15,5 @@ stdenv.mkDerivation rec {
# Disabled because we don't have zdiff in the stdenv bootstrap.
#doCheck = true;
- meta = {
- description = "The GNU documentation system";
-
- longDescription = ''
- Texinfo is the official documentation format of the GNU project.
- It was invented by Richard Stallman and Bob Chassell many years
- ago, loosely based on Brian Reid's Scribe and other formatting
- languages of the time. It is used by many non-GNU projects as
- well.
-
- Texinfo uses a single source file to produce output in a number
- of formats, both online and printed (dvi, html, info, pdf, xml,
- etc.). This means that instead of writing different documents
- for online information and another for a printed manual, you
- need write only one document. And when the work is revised, you
- need revise only that one document. The Texinfo system is
- well-integrated with GNU Emacs.
- '';
-
- license = stdenv.lib.licenses.gpl3Plus;
-
- homepage = http://www.gnu.org/software/texinfo/;
- branch = "4.13";
- platforms = stdenv.lib.platforms.unix;
- };
+ meta = texinfo.meta // { branch = version; };
}
diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix
index 0feb4b943df..d395494984d 100644
--- a/pkgs/development/tools/misc/texinfo/5.2.nix
+++ b/pkgs/development/tools/misc/texinfo/5.2.nix
@@ -1,54 +1,4 @@
-{ stdenv, buildPackages, fetchurl, ncurses, perl, xz, procps, interactive ? false }:
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
- name = "texinfo-5.2";
-
- src = fetchurl {
- url = "mirror://gnu/texinfo/${name}.tar.xz";
- sha256 = "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal";
- };
-
- # We need a native compiler to build perl XS extensions
- # when cross-compiling.
- depsBuildBuild = [ buildPackages.stdenv.cc perl ];
-
- buildInputs = [ perl xz.bin ]
- ++ optional interactive ncurses
- ++ optional doCheck procps; # for tests
-
- configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ]
- ++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
-
- preInstall = ''
- installFlags="TEXMF=$out/texmf-dist";
- installTargets="install install-tex";
- '';
-
- doCheck = !stdenv.isDarwin;
-
- meta = {
- homepage = http://www.gnu.org/software/texinfo/;
- description = "The GNU documentation system";
- license = licenses.gpl3Plus;
- platforms = platforms.all;
-
- longDescription = ''
- Texinfo is the official documentation format of the GNU project.
- It was invented by Richard Stallman and Bob Chassell many years
- ago, loosely based on Brian Reid's Scribe and other formatting
- languages of the time. It is used by many non-GNU projects as
- well.
-
- Texinfo uses a single source file to produce output in a number
- of formats, both online and printed (dvi, html, info, pdf, xml,
- etc.). This means that instead of writing different documents
- for online information and another for a printed manual, you
- need write only one document. And when the work is revised, you
- need revise only that one document. The Texinfo system is
- well-integrated with GNU Emacs.
- '';
- branch = "5.2";
- };
+import ./common.nix {
+ version = "5.2";
+ sha256 = "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal";
}
diff --git a/pkgs/development/tools/misc/texinfo/6.5.nix b/pkgs/development/tools/misc/texinfo/6.5.nix
index afa7e9a0a20..34596f30658 100644
--- a/pkgs/development/tools/misc/texinfo/6.5.nix
+++ b/pkgs/development/tools/misc/texinfo/6.5.nix
@@ -1,56 +1,4 @@
-{ stdenv, buildPackages, fetchurl, ncurses, perl, xz, libiconv, gawk, procps, interactive ? false }:
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
- name = "texinfo-6.5";
-
- src = fetchurl {
- url = "mirror://gnu/texinfo/${name}.tar.xz";
- sha256 = "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp";
- };
-
- # We need a native compiler to build perl XS extensions
- # when cross-compiling.
- depsBuildBuild = [ buildPackages.stdenv.cc perl ];
-
- buildInputs = [ xz ]
- ++ optionals stdenv.isSunOS [ libiconv gawk ]
- ++ optional interactive ncurses
- ++ optional doCheck procps; # for tests
-
- configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ]
- ++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
-
- preInstall = ''
- installFlags="TEXMF=$out/texmf-dist";
- installTargets="install install-tex";
- '';
-
- doCheck = interactive # simplify bootstrapping
- && !stdenv.isDarwin && !stdenv.isSunOS/*flaky*/;
-
- meta = with stdenv.lib; {
- homepage = http://www.gnu.org/software/texinfo/;
- description = "The GNU documentation system";
- license = licenses.gpl3Plus;
- platforms = platforms.all;
- maintainers = [ maintainers.vrthra ];
-
- longDescription = ''
- Texinfo is the official documentation format of the GNU project.
- It was invented by Richard Stallman and Bob Chassell many years
- ago, loosely based on Brian Reid's Scribe and other formatting
- languages of the time. It is used by many non-GNU projects as
- well.
-
- Texinfo uses a single source file to produce output in a number
- of formats, both online and printed (dvi, html, info, pdf, xml,
- etc.). This means that instead of writing different documents
- for online information and another for a printed manual, you
- need write only one document. And when the work is revised, you
- need revise only that one document. The Texinfo system is
- well-integrated with GNU Emacs.
- '';
- };
+import ./common.nix {
+ version = "6.5";
+ sha256 = "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp";
}
diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix
new file mode 100644
index 00000000000..12534297ff3
--- /dev/null
+++ b/pkgs/development/tools/misc/texinfo/common.nix
@@ -0,0 +1,64 @@
+{ version, sha256 }:
+
+{ stdenv, buildPackages, fetchurl, perl, xz
+
+# we are a dependency of gcc, this simplifies bootstraping
+, interactive ? false, ncurses, procps
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ name = "texinfo-${optionalString interactive "interactive-"}${version}";
+ inherit version;
+
+ src = fetchurl {
+ url = "mirror://gnu/texinfo/texinfo-${version}.tar.xz";
+ inherit sha256;
+ };
+
+ # We need a native compiler to build perl XS extensions
+ # when cross-compiling.
+ depsBuildBuild = [ buildPackages.stdenv.cc perl ];
+
+ buildInputs = [ xz.bin ]
+ ++ optionals stdenv.isSunOS [ libiconv gawk ]
+ ++ optionals interactive [ ncurses procps ];
+
+ configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ]
+ ++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
+
+ preInstall = ''
+ installFlags="TEXMF=$out/texmf-dist";
+ installTargets="install install-tex";
+ '';
+
+ doCheck = interactive
+ && !stdenv.isDarwin
+ && !stdenv.isSunOS; # flaky
+
+ meta = {
+ homepage = http://www.gnu.org/software/texinfo/;
+ description = "The GNU documentation system";
+ license = licenses.gpl3Plus;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ vrthra oxij ];
+
+ longDescription = ''
+ Texinfo is the official documentation format of the GNU project.
+ It was invented by Richard Stallman and Bob Chassell many years
+ ago, loosely based on Brian Reid's Scribe and other formatting
+ languages of the time. It is used by many non-GNU projects as
+ well.
+
+ Texinfo uses a single source file to produce output in a number
+ of formats, both online and printed (dvi, html, info, pdf, xml,
+ etc.). This means that instead of writing different documents
+ for online information and another for a printed manual, you
+ need write only one document. And when the work is revised, you
+ need revise only that one document. The Texinfo system is
+ well-integrated with GNU Emacs.
+ '';
+ branch = version;
+ };
+}
diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix
index 2b0c14ea832..9c75e93bb1c 100644
--- a/pkgs/development/tools/parsing/bison/3.x.nix
+++ b/pkgs/development/tools/parsing/bison/3.x.nix
@@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man;
propagatedBuildInputs = [ m4 ];
+ doCheck = false; # fails
+ doInstallCheck = false; # fails
+
meta = {
homepage = http://www.gnu.org/software/bison/;
description = "Yacc-compatible parser generator";
diff --git a/pkgs/development/tools/vagrant/Gemfile b/pkgs/development/tools/vagrant/Gemfile
index d32951f1c05..f25a77c9398 100644
--- a/pkgs/development/tools/vagrant/Gemfile
+++ b/pkgs/development/tools/vagrant/Gemfile
@@ -1,2 +1,2 @@
source "https://rubygems.org"
-gem 'vagrant'
+gem 'vagrant', git: "https://github.com/hashicorp/vagrant.git", tag: "v2.0.4"
diff --git a/pkgs/development/tools/vagrant/Gemfile.lock b/pkgs/development/tools/vagrant/Gemfile.lock
index 2c63b57443a..fd5cb8dbee9 100644
--- a/pkgs/development/tools/vagrant/Gemfile.lock
+++ b/pkgs/development/tools/vagrant/Gemfile.lock
@@ -1,17 +1,9 @@
GIT
- remote: https://github.com/mitchellh/vagrant-spec.git
- revision: 7ac8b4191de578e345b29acaf62ecc72c8e73be1
+ remote: https://github.com/hashicorp/vagrant.git
+ revision: 6a6805f284dff05207e359acdfb1ca8443b78751
+ tag: v2.0.4
specs:
- vagrant-spec (0.0.1)
- childprocess (~> 0.6.0)
- log4r (~> 1.1.9)
- rspec (~> 3.5.0)
- thor (~> 0.18.1)
-
-PATH
- remote: .
- specs:
- vagrant (2.0.2)
+ vagrant (2.0.4)
childprocess (~> 0.6.0)
erubis (~> 2.7.0)
hashicorp-checkpoint (~> 0.1.5)
@@ -25,6 +17,8 @@ PATH
rest-client (>= 1.6.0, < 3.0)
ruby_dep (<= 1.3.1)
wdm (~> 0.1.0)
+ win32-file (~> 0.8.1)
+ win32-file-security (~> 1.0.10)
winrm (~> 2.1)
winrm-elevated (~> 1.1)
winrm-fs (~> 1.0)
@@ -32,24 +26,19 @@ PATH
GEM
remote: https://rubygems.org/
specs:
- addressable (2.5.2)
- public_suffix (>= 2.0.2, < 4.0)
builder (3.2.3)
childprocess (0.6.3)
ffi (~> 1.0, >= 1.0.11)
- crack (0.4.3)
- safe_yaml (~> 1.0.0)
- diff-lcs (1.3)
- domain_name (0.5.20170404)
+ domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
erubis (2.7.0)
- fake_ftp (0.1.1)
- ffi (1.9.18)
+ ffi (1.9.23)
+ ffi-win32-extensions (1.0.3)
+ ffi
gssapi (1.2.0)
ffi (>= 1.0.1)
gyoku (1.3.1)
builder (>= 2.1.2)
- hashdiff (0.3.7)
hashicorp-checkpoint (0.1.5)
http-cookie (1.0.3)
domain_name (~> 0.5)
@@ -75,8 +64,6 @@ GEM
net-ssh (4.2.0)
netrc (0.11.0)
nori (2.6.0)
- public_suffix (3.0.1)
- rake (12.0.0)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
@@ -86,35 +73,23 @@ GEM
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
- rspec (3.5.0)
- rspec-core (~> 3.5.0)
- rspec-expectations (~> 3.5.0)
- rspec-mocks (~> 3.5.0)
- rspec-core (3.5.4)
- rspec-support (~> 3.5.0)
- rspec-expectations (3.5.0)
- diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.5.0)
- rspec-its (1.2.0)
- rspec-core (>= 3.0.0)
- rspec-expectations (>= 3.0.0)
- rspec-mocks (3.5.0)
- diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.5.0)
- rspec-support (3.5.0)
ruby_dep (1.3.1)
rubyntlm (0.6.2)
rubyzip (1.2.1)
- safe_yaml (1.0.4)
- thor (0.18.1)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
wdm (0.1.1)
- webmock (2.3.2)
- addressable (>= 2.3.6)
- crack (>= 0.3.2)
- hashdiff
+ win32-file (0.8.1)
+ ffi
+ ffi-win32-extensions
+ win32-file-stat (>= 1.4.0)
+ win32-file-security (1.0.10)
+ ffi
+ ffi-win32-extensions
+ win32-file-stat (1.5.5)
+ ffi
+ ffi-win32-extensions
winrm (2.2.3)
builder (>= 2.1.2)
erubis (~> 2.7)
@@ -137,13 +112,7 @@ PLATFORMS
ruby
DEPENDENCIES
- fake_ftp (~> 0.1.1)
- rake (~> 12.0.0)
- rspec (~> 3.5.0)
- rspec-its (~> 1.2.0)
vagrant!
- vagrant-spec!
- webmock (~> 2.3.1)
BUNDLED WITH
- 1.14.6
+ 1.16.1
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 3b055d38d03..11ca6014b2d 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -1,36 +1,29 @@
-{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive }:
+{ lib, buildRubyGem, bundlerEnv, ruby, libarchive }:
+
+
+# To update vagrant, visit the Gemfile and re-run bundix.
let
- version = "2.0.2";
- url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
- sha256 = "1sjfwgy2y6q5s1drd8h8xgz2a0sv1l3kx9jilgc02hlcdz070iir";
+ gemset = import ./gemset.nix;
+ inherit (gemset.vagrant) version;
deps = bundlerEnv rec {
- name = "${pname}-${version}";
+ name = "vagrant-${version}";
pname = "vagrant";
inherit version;
inherit ruby;
gemdir = ./.;
- gemset = lib.recursiveUpdate (import ./gemset.nix) {
- vagrant = {
- source = {
- type = "url";
- inherit url sha256;
- };
- inherit version;
- };
- };
};
in buildRubyGem rec {
name = "${gemName}-${version}";
gemName = "vagrant";
- inherit version;
doInstallCheck = true;
dontBuild = false;
- src = fetchurl { inherit url sha256; };
+
+ inherit (deps.gems.vagrant) src;
patches = [
./unofficial-installation-nowarn.patch
diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix
index 5d3d2693d01..7a432d30217 100644
--- a/pkgs/development/tools/vagrant/gemset.nix
+++ b/pkgs/development/tools/vagrant/gemset.nix
@@ -1,13 +1,4 @@
{
- addressable = {
- dependencies = ["public_suffix"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
- type = "gem";
- };
- version = "2.5.2";
- };
builder = {
source = {
remotes = ["https://rubygems.org"];
@@ -25,31 +16,14 @@
};
version = "0.6.3";
};
- crack = {
- dependencies = ["safe_yaml"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k";
- type = "gem";
- };
- version = "0.4.3";
- };
- diff-lcs = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza";
- type = "gem";
- };
- version = "1.3";
- };
domain_name = {
dependencies = ["unf"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf";
+ sha256 = "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v";
type = "gem";
};
- version = "0.5.20170404";
+ version = "0.5.20180417";
};
erubis = {
source = {
@@ -59,21 +33,22 @@
};
version = "2.7.0";
};
- fake_ftp = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0rn7lxdk3sqc2i4v2c5k25b9ca1qnkdf32nv04y760aml9mszwf7";
- type = "gem";
- };
- version = "0.1.1";
- };
ffi = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0";
+ sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr";
type = "gem";
};
- version = "1.9.18";
+ version = "1.9.23";
+ };
+ ffi-win32-extensions = {
+ dependencies = ["ffi"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ywkkbr3bpi2ais2jr8yrsqwwrm48jg262anmdkcb9if95vajx7l";
+ type = "gem";
+ };
+ version = "1.0.3";
};
gssapi = {
dependencies = ["ffi"];
@@ -93,14 +68,6 @@
};
version = "1.3.1";
};
- hashdiff = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0yj5l2rw8i8jc725hbcpc4wks0qlaaimr3dpaqamfjkjkxl0hjp9";
- type = "gem";
- };
- version = "0.3.7";
- };
hashicorp-checkpoint = {
source = {
remotes = ["https://rubygems.org"];
@@ -235,22 +202,6 @@
};
version = "2.6.0";
};
- public_suffix = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0mvzd9ycjw8ydb9qy3daq3kdzqs2vpqvac4dqss6ckk4rfcjc637";
- type = "gem";
- };
- version = "3.0.1";
- };
- rake = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n";
- type = "gem";
- };
- version = "12.0.0";
- };
rb-fsevent = {
source = {
remotes = ["https://rubygems.org"];
@@ -286,59 +237,6 @@
};
version = "2.0.2";
};
- rspec = {
- dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "16g3mmih999f0b6vcz2c3qsc7ks5zy4lj1rzjh8hf6wk531nvc6s";
- type = "gem";
- };
- version = "3.5.0";
- };
- rspec-core = {
- dependencies = ["rspec-support"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1nacs062qbr98fx6czf1vwppn1js956nv2c8vfwj6i65axdfs46i";
- type = "gem";
- };
- version = "3.5.4";
- };
- rspec-expectations = {
- dependencies = ["diff-lcs" "rspec-support"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0bbqfrb1x8gmwf8x2xhhwvvlhwbbafq4isbvlibxi6jk602f09gs";
- type = "gem";
- };
- version = "3.5.0";
- };
- rspec-its = {
- dependencies = ["rspec-core" "rspec-expectations"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1pwphny5jawcm1hda3vs9pjv1cybaxy17dc1s75qd7drrvx697p3";
- type = "gem";
- };
- version = "1.2.0";
- };
- rspec-mocks = {
- dependencies = ["diff-lcs" "rspec-support"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0nl3ksivh9wwrjjd47z5dggrwx40v6gpb3a0gzbp1gs06a5dmk24";
- type = "gem";
- };
- version = "3.5.0";
- };
- rspec-support = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "10vf3k3d472y573mag2kzfsfrf6rv355s13kadnpryk8d36yq5r0";
- type = "gem";
- };
- version = "3.5.0";
- };
ruby_dep = {
source = {
remotes = ["https://rubygems.org"];
@@ -363,22 +261,6 @@
};
version = "1.2.1";
};
- safe_yaml = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
- type = "gem";
- };
- version = "1.0.4";
- };
- thor = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3";
- type = "gem";
- };
- version = "0.18.1";
- };
unf = {
dependencies = ["unf_ext"];
source = {
@@ -397,18 +279,15 @@
version = "0.0.7.5";
};
vagrant = {
- dependencies = ["childprocess" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "wdm" "winrm" "winrm-elevated" "winrm-fs"];
- };
- vagrant-spec = {
- dependencies = ["childprocess" "log4r" "rspec" "thor"];
+ dependencies = ["childprocess" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "wdm" "win32-file" "win32-file-security" "winrm" "winrm-elevated" "winrm-fs"];
source = {
fetchSubmodules = false;
- rev = "7ac8b4191de578e345b29acaf62ecc72c8e73be1";
- sha256 = "0qybgxdnndx7xfmhyjcj46b2mv78d98yk30d68ppmfnmm3jx590h";
+ rev = "6a6805f284dff05207e359acdfb1ca8443b78751";
+ sha256 = "07c7r4xk0md9hkbcnij0kp7acxz0li9ak1ah7lmh52j10gq4cjmw";
type = "git";
- url = "https://github.com/mitchellh/vagrant-spec.git";
+ url = "https://github.com/hashicorp/vagrant.git";
};
- version = "0.0.1";
+ version = "2.0.4";
};
wdm = {
source = {
@@ -418,14 +297,32 @@
};
version = "0.1.1";
};
- webmock = {
- dependencies = ["addressable" "crack" "hashdiff"];
+ win32-file = {
+ dependencies = ["ffi" "ffi-win32-extensions" "win32-file-stat"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5";
+ sha256 = "0mjylzv4bbnxyjqf7hnd9ghcs5xr2sv8chnmkqdi2cc6pya2xax0";
type = "gem";
};
- version = "2.3.2";
+ version = "0.8.1";
+ };
+ win32-file-security = {
+ dependencies = ["ffi" "ffi-win32-extensions"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lpq821a1hrxmm0ki5c34wijzhn77g4ny76v698ixwg853y2ir9r";
+ type = "gem";
+ };
+ version = "1.0.10";
+ };
+ win32-file-stat = {
+ dependencies = ["ffi" "ffi-win32-extensions"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lc3yajcb8xxabvj9qian938k60ixydvs3ixl5fldi0nlvnvk468";
+ type = "gem";
+ };
+ version = "1.5.5";
};
winrm = {
dependencies = ["builder" "erubis" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"];
diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix
new file mode 100644
index 00000000000..9f5f1880989
--- /dev/null
+++ b/pkgs/development/web/nodejs/v10.nix
@@ -0,0 +1,11 @@
+{ stdenv, callPackage, lib, openssl, enableNpm ? true }:
+
+let
+ buildNodejs = callPackage ./nodejs.nix { inherit openssl; };
+in
+ buildNodejs {
+ inherit enableNpm;
+ version = "10.0.0";
+ sha256 = "0l5bx2j4f2ij19kx14my7g7k37j3fn9qpjvbisjvhpbm42810fg2";
+ patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ./no-xcodebuild.patch ];
+ }
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index 02a7ce219c4..2195cf7d2a3 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -56,6 +56,7 @@ in stdenv.mkDerivation rec {
'';
enableParallelBuilding = true;
+ doCheck = false; # fails 4 out of 6 tests
meta = {
homepage = http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters;
diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix
index f5f8d6a5f10..76606edf53c 100644
--- a/pkgs/misc/emulators/wine/winetricks.nix
+++ b/pkgs/misc/emulators/wine/winetricks.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" ];
+ doCheck = false; # requires "bashate"
+
postInstall = ''
sed -i \
-e '2i PATH="${pathAdd}:$PATH"' \
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
index d9b3dfb7404..c67609e9675 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, appleDerivation }:
+{ stdenv, appleDerivation, autoreconfHook }:
appleDerivation {
- preConfigure = "cd libiconv";
+ postUnpack = "sourceRoot=$sourceRoot/libiconv";
postInstall = ''
mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib
- install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib
+ ${stdenv.cc.bintools.targetPrefix}install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib
# re-export one useless symbol; ld will reject a dylib that only reexports other dylibs
- echo 'void dont_use_this(){}' | clang -dynamiclib -x c - -current_version 2.4.0 \
+ echo 'void dont_use_this(){}' | ${stdenv.cc.bintools.targetPrefix}clang -dynamiclib -x c - -current_version 2.4.0 \
-compatibility_version 7.0.0 -current_version 7.0.0 -o $out/lib/libiconv.dylib \
-Wl,-reexport_library -Wl,$out/lib/libiconv-nocharset.dylib \
-Wl,-reexport_library -Wl,$out/lib/libcharset.dylib
'';
- setup-hook = ../../../../development/libraries/libiconv/setup-hook.sh;
+ setupHook = ../../../../development/libraries/libiconv/setup-hook.sh;
meta = {
platforms = stdenv.lib.platforms.darwin;
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
index d8abdc2c6f8..24f21b498aa 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -108,17 +108,15 @@ let
# include_next "unistd.h"
#endif
EOF
- '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
- sed -i -e 's|clang++|& -I${libcxx}/include/c++/v1|' cctools/autogen.sh
- '' + stdenv.lib.optionalString useOld ''
+
cd cctools
+ '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+ sed -i -e 's|clang++|& -I${libcxx}/include/c++/v1|' autogen.sh
'';
# TODO: this builds an ld without support for LLVM's LTO. We need to teach it, but that's rather
# hairy to handle during bootstrap. Perhaps it could be optional?
- preConfigure = stdenv.lib.optionalString (!useOld) ''
- cd cctools
- '' + ''
+ preConfigure = ''
sh autogen.sh
'';
diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix
index c8e58dfbf6f..cbbe4d5ca46 100644
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@@ -36,9 +36,7 @@ let
substituteInPlace ./common/Make.rules --replace "/usr/share/man" "share/man"
'';
- # use 'if c then x else null' to avoid rebuilding
- # patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
- patches = if stdenv.hostPlatform.isMusl then [
+ patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
(fetchpatch {
url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0002-Provide-missing-secure_getenv-and-scandirat-function.patch?id=74b8427cc21f04e32030d047ae92caa618105b53";
name = "0002-Provide-missing-secure_getenv-and-scandirat-function.patch";
@@ -55,7 +53,11 @@ let
sha256 = "1m4dx901biqgnr4w4wz8a2z9r9dxyw7wv6m6mqglqwf2lxinqmp4";
})
# (alpine patches {1,4,5,6,8} are needed for apparmor 2.11, but not 2.12)
- ] else null;
+ ];
+
+ # Set to `true` after the next FIXME gets fixed or this gets some
+ # common derivation infra. Too much copy-paste to fix one by one.
+ doCheck = false;
# FIXME: convert these to a single multiple-outputs package?
@@ -99,6 +101,8 @@ let
mv $out/lib/python* $python/lib/
'';
+ inherit doCheck;
+
meta = apparmor-meta "library";
};
@@ -131,6 +135,8 @@ let
done
'';
+ inherit doCheck;
+
meta = apparmor-meta "user-land utilities";
};
@@ -154,6 +160,8 @@ let
makeFlags = ''LANGS= USE_SYSTEM=1'';
installFlags = ''DESTDIR=$(out) BINDIR=$(out)/bin'';
+ inherit doCheck;
+
meta = apparmor-meta "binary user-land utilities";
};
@@ -177,6 +185,8 @@ let
makeFlags = ''LANGS= USE_SYSTEM=1 INCLUDEDIR=${libapparmor}/include'';
installFlags = ''DESTDIR=$(out) DISTRO=unknown'';
+ inherit doCheck;
+
meta = apparmor-meta "rule parser";
};
@@ -192,6 +202,8 @@ let
makeFlags = ''USE_SYSTEM=1'';
installFlags = ''DESTDIR=$(out)'';
+ inherit doCheck;
+
meta = apparmor-meta "PAM service";
};
@@ -204,6 +216,8 @@ let
postPatch = "cd ./profiles";
installFlags = ''DESTDIR=$(out) EXTRAS_DEST=$(out)/share/apparmor/extra-profiles'';
+ inherit doCheck;
+
meta = apparmor-meta "profiles";
};
@@ -218,6 +232,8 @@ let
cp -R ./kernel-patches/* "$out"
'';
+ inherit doCheck;
+
meta = apparmor-meta "kernel patches";
};
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index b844bf72d82..ab75d38ba71 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -98,6 +98,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ doCheck = false; # tries to access the net
+
meta = with stdenv.lib; {
description = "Tiny versions of common UNIX utilities in a single small executable";
homepage = https://busybox.net/;
diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix
index 15b3903ddd1..54a92d784e2 100644
--- a/pkgs/os-specific/linux/hwdata/default.nix
+++ b/pkgs/os-specific/linux/hwdata/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
configureFlags = "--datadir=$(prefix)/data";
+ doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus)
+
meta = {
homepage = https://github.com/vcrhonek/hwdata;
description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards";
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index a6f399c0fba..bbef2bd19ae 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -53,6 +53,9 @@ stdenv.mkDerivation {
"-Wno-error=unused-const-variable" "-Wno-error=misleading-indentation"
];
+ doCheck = false; # requires "sparse"
+ doInstallCheck = false; # same
+
separateDebugInfo = true;
installFlags = "install install-man ASCIIDOC8=1 prefix=$(out)";
diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix
index 26f3d89c662..f5f0916b90a 100644
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "kexec-tools-${version}";
- version = "2.0.16";
+ version = "2.0.17";
src = fetchurl {
urls = [
"mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz"
"http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz"
];
- sha256 = "043hasx5b9zk7r7dzx24z5wybg74dpmh0nyns6nrnb3mmm8k642v";
+ sha256 = "1ac20jws8iys9w6dpn4q3hihyx73zkabdwv3gcb779cxfrmq2k2h";
};
hardeningDisable = [ "format" "pic" "relro" ];
diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix
index d4625687c47..845e4e704eb 100644
--- a/pkgs/os-specific/linux/libcap-ng/default.nix
+++ b/pkgs/os-specific/linux/libcap-ng/default.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
name = "libcap-ng-${version}";
# When updating make sure to test that the version with
# all of the python bindings still works
- version = "0.7.8";
+ version = "0.7.9";
src = fetchurl {
url = "${meta.homepage}/${name}.tar.gz";
- sha256 = "0pyhjxgsph3p28ayk4ynxab6wvzaqmazk1nkamx11m2w8jbzj6n2";
+ sha256 = "0a0k484kwv0zilry2mbl9k56cnpdhsjxdxin17jas6kkyfy345aa";
};
nativeBuildInputs = [ swig ];
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index bd84e121a7d..8cda636e987 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -59,6 +59,8 @@ stdenv.mkDerivation {
})
];
+ doCheck = false; # requires root
+
# To prevent make install from failing.
preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\"";
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index 904dae55c9c..359d1869084 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, pkgconfig, utillinux, libcap, libtirpc, libevent, libnfsidmap
+{ stdenv, fetchurl, fetchpatch, lib, pkgconfig, utillinux, libcap, libtirpc, libevent, libnfsidmap
, sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers
, buildEnv
}:
@@ -39,6 +39,18 @@ in stdenv.mkDerivation rec {
]
++ lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc.bin}/bin/rpcgen";
+ patches = lib.optionals stdenv.hostPlatform.isMusl [
+ (fetchpatch {
+ url = "https://raw.githubusercontent.com/alpinelinux/aports/cb880042d48d77af412d4688f24b8310ae44f55f/main/nfs-utils/0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch";
+ sha256 = "0rrddrykz8prk0dcgfvmnz0vxn09dbgq8cb098yjjg19zz6d7vid";
+ })
+ # http://openwall.com/lists/musl/2015/08/18/10
+ (fetchpatch {
+ url = "https://raw.githubusercontent.com/alpinelinux/aports/cb880042d48d77af412d4688f24b8310ae44f55f/main/nfs-utils/musl-getservbyport.patch";
+ sha256 = "1fqws9dz8n1d9a418c54r11y3w330qgy2652dpwcy96cm44sqyhf";
+ })
+ ];
+
postPatch =
''
patchShebangs tests
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 5f92dfcc839..1db1a493ae2 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, hostPlatform, fetchurl, fetchpatch, flex, cracklib }:
+{ stdenv, buildPackages, hostPlatform, fetchurl, fetchpatch, flex, cracklib, db4 }:
stdenv.mkDerivation rec {
name = "linux-pam-${version}";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ flex ];
- buildInputs = [ cracklib ];
+ buildInputs = [ cracklib db4 ];
enableParallelBuilding = true;
@@ -70,9 +70,12 @@ stdenv.mkDerivation rec {
sed -e 's/pam_rhosts//g' -i modules/Makefile.in
'';
- meta = {
- homepage = http://ftp.kernel.org/pub/linux/libs/pam/;
+ doCheck = false; # fails
+
+ meta = with stdenv.lib; {
+ homepage = http://www.linux-pam.org/;
description = "Pluggable Authentication Modules, a flexible mechanism for authenticating user";
- platforms = stdenv.lib.platforms.linux;
+ platforms = platforms.linux;
+ license = licenses.bsd3;
};
}
diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index 316f0ad1a28..08420e36c65 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -1,38 +1,17 @@
-{ lib, stdenv, fetchFromGitLab, fetchpatch, ncurses, libtool, gettext, autoconf, automake, pkgconfig }:
+{ lib, stdenv, fetchurl, ncurses, pkgconfig }:
stdenv.mkDerivation rec {
name = "procps-${version}";
- version = "3.3.13";
+ version = "3.3.14";
- src = fetchFromGitLab {
- owner ="procps-ng";
- repo = "procps";
- rev = "v${version}";
- sha256 = "0r3h9adhqi5fi62lx65z839fww35lfh2isnknhkaw71xndjpzr0q";
+ # The project's releases are on SF, but git repo on gitlab.
+ src = fetchurl {
+ url = "mirror://sourceforge/procps-ng/procps-ng-${version}.tar.xz";
+ sha256 = "0v3j6rkzzscqds37i105cxx3q4dk04rsgpqfd5p7hzcvk59h5njy";
};
buildInputs = [ ncurses ];
- nativeBuildInputs = [ libtool gettext autoconf automake pkgconfig ];
-
- # https://gitlab.com/procps-ng/procps/issues/88
- # Patches needed for musl and glibc 2.28
- patches = [
- (fetchpatch {
- url = "https://gitlab.com/procps-ng/procps/uploads/f91ff094be1e4638aeffb67bdbb751ba/numa.h.diff";
- sha256 = "16r537d2wfrvbv6dg9vyfck8n31xa58903mnssw1s4kb5ap83yd5";
- extraPrefix = "";
- })
- (fetchpatch {
- url = "https://gitlab.com/procps-ng/procps/uploads/6a7bdea4d82ba781451316fda74192ae/libio_detection.diff";
- sha256 = "0qp0j60kiycjsv213ih10imjirmxz8zja3rk9fq5lr5xf7k2lr3p";
- })
- ];
-
- # autoreconfHook doesn't quite get, what procps-ng buildprocss does
- # with po/Makefile.in.in and stuff.
- preConfigure = ''
- ./autogen.sh
- '';
+ nativeBuildInputs = [ pkgconfig ];
makeFlags = "usrbin_execdir=$(out)/bin";
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 615e4f867c4..ad8f5fb08e0 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod
, zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi
, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor
-, audit, lz4, bzip2, kexectools, libmicrohttpd
+, audit, lz4, bzip2, kexectools, libmicrohttpd, pcre2
, linuxHeaders ? stdenv.cc.libc.linuxHeaders
, libseccomp, iptables, gnu-efi
, autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
@@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {
buildInputs =
[ linuxHeaders libcap kmod xz pam acl
/* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2
- libmicrohttpd ] ++
+ libmicrohttpd pcre2 ] ++
stdenv.lib.meta.enableIfAvailable kexectools ++
stdenv.lib.meta.enableIfAvailable libseccomp ++
[ libffi audit lz4 bzip2 libapparmor
@@ -155,6 +155,14 @@ in stdenv.mkDerivation rec {
--replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH"
'';
+ patches = [
+ # https://github.com/systemd/systemd/pull/8580
+ (fetchpatch {
+ url = https://github.com/systemd/systemd/pull/8580.patch;
+ sha256 = "1yp07hlpgqq0h2y0qc3kasswzkycz6p8d56d695ck1qa2f5bdfgn";
+ })
+ ];
+
hardeningDisable = [ "stackprotector" ];
NIX_CFLAGS_COMPILE =
@@ -170,6 +178,8 @@ in stdenv.mkDerivation rec {
"-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\""
];
+ doCheck = false; # fails a bunch of tests
+
postInstall = ''
# sysinit.target: Don't depend on
# systemd-tmpfiles-setup.service. This interferes with NixOps's
diff --git a/pkgs/os-specific/linux/tcp-wrappers/cdecls.patch b/pkgs/os-specific/linux/tcp-wrappers/cdecls.patch
new file mode 100644
index 00000000000..eee640e8a82
--- /dev/null
+++ b/pkgs/os-specific/linux/tcp-wrappers/cdecls.patch
@@ -0,0 +1,31 @@
+__BEGIN_DECLS/__END_DECLS are BSD specific and not defined in musl
+glibc and uclibc had sys/cdefs.h doing it.
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj
+
+Index: tcp_wrappers_7.6/tcpd.h
+===================================================================
+--- tcp_wrappers_7.6.orig/tcpd.h
++++ tcp_wrappers_7.6/tcpd.h
+@@ -11,7 +11,9 @@
+ #include
+ #include
+
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+
+ /* Structure to describe one communications endpoint. */
+
+@@ -252,6 +254,8 @@ extern char *fix_strtok();
+ extern char *my_strtok();
+ #endif
+
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+
+ #endif
diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix
index 7da4e39ca6c..e3aae30babc 100644
--- a/pkgs/os-specific/linux/tcp-wrappers/default.nix
+++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix
@@ -20,11 +20,22 @@ in stdenv.mkDerivation rec {
prePatch = ''
tar -xaf $debian
patches="$(cat debian/patches/series | sed 's,^,debian/patches/,') $patches"
+
+ substituteInPlace Makefile --replace STRINGS STRINGDEFS
+ substituteInPlace debian/patches/13_shlib_weaksym --replace STRINGS STRINGDEFS
+ '';
+
+ # Fix __BEGIN_DECLS usage (even if it wasn't non-standard, this doesn't include sys/cdefs.h)
+ patches = [ ./cdecls.patch ];
+
+ postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+ substituteInPlace Makefile \
+ --replace '-DNETGROUP' '-DUSE_GETDOMAIN'
'';
buildInputs = [ libnsl ];
- makeFlags = [ "STRINGS=" "REAL_DAEMON_DIR=$(out)/bin" "linux" ];
+ makeFlags = [ "REAL_DAEMON_DIR=$(out)/bin" "linux" ];
installPhase = ''
mkdir -p "$out/bin"
diff --git a/pkgs/os-specific/linux/tcp-wrappers/tcp-wrappers-7.6-headers.patch b/pkgs/os-specific/linux/tcp-wrappers/tcp-wrappers-7.6-headers.patch
new file mode 100644
index 00000000000..328a4a10261
--- /dev/null
+++ b/pkgs/os-specific/linux/tcp-wrappers/tcp-wrappers-7.6-headers.patch
@@ -0,0 +1,295 @@
+--- a/options.c
++++ b/options.c
+@@ -34,6 +34,8 @@
+
+ /* System libraries. */
+
++#include
++#include
+ #include
+ #include
+ #include
+--- a/safe_finger.c
++++ b/safe_finger.c
+@@ -20,6 +20,11 @@
+
+ /* System libraries */
+
++#include
++#include
++#include
++#include
++#include
+ #include
+ #include
+ #include
+@@ -27,7 +31,7 @@
+ #include
+ #include
+
+-extern void exit();
++int pipe_stdin(char **argv);
+
+ /* Local stuff */
+
+--- a/scaffold.c
++++ b/scaffold.c
+@@ -10,6 +10,7 @@
+
+ /* System libraries. */
+
++#include
+ #include
+ #include
+ #include
+@@ -27,7 +27,4 @@
+ #endif
+
+-#ifndef INET6
+-extern char *malloc();
+-#endif
+
+ /* Application-specific. */
+--- a/shell_cmd.c
++++ b/shell_cmd.c
+@@ -14,6 +14,10 @@
+
+ /* System libraries. */
+
++#include
++#include
++#include
++#include
+ #include
+ #include
+ #include
+@@ -25,8 +25,6 @@
+ #include
+ #include
+
+-extern void exit();
+-
+ /* Local stuff. */
+
+ #include "tcpd.h"
+--- a/tcpdchk.c
++++ b/tcpdchk.c
+@@ -20,6 +20,8 @@
+
+ /* System libraries. */
+
++#include
++#include
+ #include
+ #include
+ #ifdef INET6
+@@ -35,10 +36,7 @@
+ #include
+ #include
+
+-extern int errno;
+-extern void exit();
+-extern int optind;
+-extern char *optarg;
++int cidr_mask_addr(char *str);
+
+ #ifndef INADDR_NONE
+ #define INADDR_NONE (-1) /* XXX should be 0xffffffff */
+--- a/clean_exit.c
++++ b/clean_exit.c
+@@ -13,8 +13,8 @@
+ #endif
+
+ #include
+-
+-extern void exit();
++#include
++#include
+
+ #include "tcpd.h"
+
+--- a/hosts_access.c
++++ b/hosts_access.c
+@@ -23,6 +23,7 @@
+
+ /* System libraries. */
+
++#include
+ #include
+ #ifdef INT32_T
+ typedef uint32_t u_int32_t;
+@@ -43,8 +44,8 @@
+ #include
+ #endif
+
+-extern char *fgets();
+-extern int errno;
++static int match_pattern_ylo(const char *s, const char *pattern);
++int cidr_mask_addr(char *str);
+
+ #ifndef INADDR_NONE
+ #define INADDR_NONE (-1) /* XXX should be 0xffffffff */
+--- a/inetcf.c
++++ b/inetcf.c
+@@ -9,15 +9,14 @@
+ static char sccsid[] = "@(#) inetcf.c 1.7 97/02/12 02:13:23";
+ #endif
+
++#include
+ #include
+ #include
+ #include
+ #include
+ #include
+
+-extern int errno;
+-extern void exit();
+-
++#include "scaffold.h"
+ #include "tcpd.h"
+ #include "inetcf.h"
+
+--- a/percent_x.c
++++ b/percent_x.c
+@@ -16,12 +16,12 @@
+
+ /* System libraries. */
+
++#include
++#include
+ #include
+ #include
+ #include
+
+-extern void exit();
+-
+ /* Local stuff. */
+
+ #include "tcpd.h"
+--- a/rfc931.c
++++ b/rfc931.c
+@@ -15,6 +15,7 @@
+
+ /* System libraries. */
+
++#include
+ #include
+ #include
+ #include
+--- a/tcpd.c
++++ b/tcpd.c
+@@ -16,6 +16,7 @@
+
+ /* System libraries. */
+
++#include
+ #include
+ #include
+ #include
+@@ -39,6 +39,8 @@
+ #include "patchlevel.h"
+ #include "tcpd.h"
+
++void fix_options(struct request_info *request);
++
+ int allow_severity = SEVERITY; /* run-time adjustable */
+ int deny_severity = LOG_WARNING; /* ditto */
+
+--- a/tcpdmatch.c
++++ b/tcpdmatch.c
+@@ -19,6 +19,8 @@
+
+ /* System libraries. */
+
++#include
++#include
+ #include
+ #include
+ #include
+@@ -30,9 +32,6 @@
+ #include
+ #include
+
+-extern void exit();
+-extern int optind;
+-extern char *optarg;
+
+ #ifndef INADDR_NONE
+ #define INADDR_NONE (-1) /* XXX should be 0xffffffff */
+--- a/update.c
++++ b/update.c
+@@ -19,6 +19,7 @@
+
+ /* System libraries */
+
++#include
+ #include
+ #include
+ #include
+--- a/misc.c
++++ b/misc.c
+@@ -14,11 +14,10 @@
+ #include
+ #include
+ #include
++#include
+
+ #include "tcpd.h"
+
+-extern char *fgets();
+-
+ #ifndef INADDR_NONE
+ #define INADDR_NONE (-1) /* XXX should be 0xffffffff */
+ #endif
+--- a/fix_options.c
++++ b/fix_options.c
+@@ -32,6 +32,7 @@
+
+ /* fix_options - get rid of IP-level socket options */
+
++void
+ fix_options(request)
+ struct request_info *request;
+ {
+@@ -38,11 +38,8 @@
+ #ifdef IP_OPTIONS
+ unsigned char optbuf[BUFFER_SIZE / 3], *cp;
+ char lbuf[BUFFER_SIZE], *lp;
+-#ifdef __GLIBC__
+- size_t optsize = sizeof(optbuf), ipproto;
+-#else
+- int optsize = sizeof(optbuf), ipproto;
+-#endif
++ socklen_t optsize = sizeof(optbuf);
++ int ipproto;
+ struct protoent *ip;
+ int fd = request->fd;
+ unsigned int opt;
+--- a/socket.c
++++ b/socket.c
+@@ -95,11 +95,7 @@
+ static struct sockaddr_in client;
+ static struct sockaddr_in server;
+ #endif
+-#ifdef __GLIBC__
+- size_t len;
+-#else
+- int len;
+-#endif
++ socklen_t len;
+ char buf[BUFSIZ];
+ int fd = request->fd;
+
+@@ -430,11 +426,7 @@
+ #else
+ struct sockaddr_in sin;
+ #endif
+-#ifdef __GLIBC__
+- size_t size = sizeof(sin);
+-#else
+- int size = sizeof(sin);
+-#endif
++ socklen_t size;
+
+ /*
+ * Eat up the not-yet received datagram. Some systems insist on a
diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index 1c8e429c945..a057cb3c101 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -48,6 +48,8 @@ stdenv.mkDerivation rec {
"INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
];
+ doCheck = false; # fails
+
meta = {
homepage = http://www.freedesktop.org/wiki/Software/udisks;
description = "A daemon and command-line utility for querying and manipulating storage devices";
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
index 713ef974f9f..d62038c7b0b 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_LINK = "-lgcc_s";
+ doCheck = false; # fails with "env: './linux/integration-test': No such file or directory"
+
installFlags = "historydir=$(TMPDIR)/foo";
meta = {
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 618ba42e741..9ec6c22d32a 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -4,15 +4,15 @@
let
version = lib.concatStringsSep "." ([ majorVersion ]
++ lib.optional (patchVersion != "") patchVersion);
- majorVersion = "2.31";
- patchVersion = "1";
+ majorVersion = "2.32";
+ patchVersion = "";
in stdenv.mkDerivation rec {
name = "util-linux-${version}";
src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz";
- sha256 = "04fzrnrr3pvqskvjn9f81y0knh0jvvqx4lmbz5pd4lfdm5pv2l8s";
+ sha256 = "0d2758kjll5xqm5fpp3sww1h66aahx161sf2b60jxqv4qymrfwvc";
};
patches = [
diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index 84b31d4d516..9bdb16cd1f1 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
name = "v4l-utils-${version}";
- version = "1.12.3";
+ version = "1.14.2";
src = fetchurl {
url = "http://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2";
- sha256 = "0vpl3jl0x441y7b5cn7zhdsyi954hp9h2p30jhnr1zkx1rpxsiss";
+ sha256 = "14h6d2p3n4jmxhd8i0p1m5dbwz5vnpb3z88xqd9ghg15n7265fg6";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 3d4a8902c91..4cc187846d0 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -1,17 +1,11 @@
{ stdenv, fetchurl, runCommand
, erlang, python, libxml2, libxslt, xmlto
, docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync
-
, AppKit, Carbon, Cocoa
+, getconf
}:
-let
- # we only need that one glibc binary (28k instead of 2.7M)
- getconf = runCommand "getconf" {} ''
- install -D ${stdenv.lib.getBin stdenv.cc.libc}/bin/getconf $out/bin/getconf
- '';
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
name = "rabbitmq-server-${version}";
version = "3.6.15";
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 4002c6b3542..1aa487055e2 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -67,6 +67,8 @@ stdenv.mkDerivation rec {
done
'';
+ doCheck = false; # requires root and the net
+
meta = {
homepage = http://www.isc.org/software/bind;
description = "Domain name server";
diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix
index 77dcfa43c43..a6b738270a9 100644
--- a/pkgs/servers/monitoring/net-snmp/default.nix
+++ b/pkgs/servers/monitoring/net-snmp/default.nix
@@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
buildInputs = [ file perl unzip openssl ];
enableParallelBuilding = true;
+ doCheck = false; # fails
postInstall = ''
for f in "$out/lib/"*.la $out/bin/net-snmp-config $out/bin/net-snmp-create-v3-user; do
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index a9de5508371..63425fbb28c 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -167,11 +167,11 @@ everything = stdenv.mkDerivation (common // {
connector-c = stdenv.mkDerivation rec {
name = "mariadb-connector-c-${version}";
- version = "2.3.4";
+ version = "2.3.5";
src = fetchurl {
url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve";
- sha256 = "1g1sq5knarxkfhpkcczr6qxmq12pid65cdkqnhnfs94av89hbswb";
+ sha256 = "0vvlfs56hxin130vh8pcs5w7jpv1yc6g76bhpzg88hnp4v1z8frg";
name = "mariadb-connector-c-${version}-src.tar.gz";
};
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index a2093962ea9..5d348c12943 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -75,6 +75,8 @@ let
wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin
'';
+ doInstallCheck = false; # needs a running daemon?
+
disallowedReferences = [ stdenv.cc ];
passthru = {
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 07faa8d3cc7..d15c5924b77 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2468,11 +2468,11 @@ let
}) // {inherit inputproto libX11 libXaw xproto libXt ;};
xkeyboardconfig = (mkDerivation "xkeyboardconfig" {
- name = "xkeyboard-config-2.22";
+ name = "xkeyboard-config-2.23.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.22.tar.bz2;
- sha256 = "1garmbyfjp0han04l2l90zzwlfbdgdxl6r1qnic36i5wkycckbny";
+ url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.23.1.tar.bz2;
+ sha256 = "1wq27cs1c9y7d1d7zp5yhq29paj9smajdb68lyvm28d2zq2vqjra";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libX11 xproto ];
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 5efa4bfcfd5..5d4c528bb0b 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -582,6 +582,10 @@ in
nativeBuildInputs = attrs.nativeBuildInputs ++ [args.bison args.flex];
};
+ xauth = attrs: attrs // {
+ doCheck = false; # fails
+ };
+
xcursorthemes = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [xorg.xcursorgen];
configureFlags = "--with-cursordir=$(out)/share/icons";
diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix
index 04a03698289..72ce29bf3f2 100644
--- a/pkgs/shells/bash/4.4.nix
+++ b/pkgs/shells/bash/4.4.nix
@@ -1,37 +1,33 @@
{ stdenv, buildPackages
-, fetchurl, readline70 ? null, texinfo ? null, binutils ? null, bison, autoconf
+, fetchurl, binutils ? null, bison, autoconf
, buildPlatform, hostPlatform
-, interactive ? false
+
+# patch for cygwin requires readline support
+, interactive ? stdenv.isCygwin, readline70 ? null
+, withDocs ? false, texinfo ? null
+, self
}:
+with stdenv.lib;
+
assert interactive -> readline70 != null;
+assert withDocs -> texinfo != null;
assert hostPlatform.isDarwin -> binutils != null;
let
- version = "4.4";
- realName = "bash-${version}";
- shortName = "bash44";
- sha256 = "1jyz6snd63xjn6skk7za6psgidsd53k05cr3lksqybi0q6936syq";
-
- upstreamPatches =
- let
- patch = nr: sha256:
- fetchurl {
- url = "mirror://gnu/bash/${realName}-patches/${shortName}-${nr}";
- inherit sha256;
- };
- in
- import ./bash-4.4-patches.nix patch;
-
- inherit (stdenv.lib) optional optionals optionalString;
+ upstreamPatches = import ./bash-4.4-patches.nix (nr: sha256: fetchurl {
+ url = "mirror://gnu/bash/bash-4.4-patches/bash44-${nr}";
+ inherit sha256;
+ });
in
stdenv.mkDerivation rec {
- name = "${realName}-p${toString (builtins.length upstreamPatches)}";
+ name = "bash-${optionalString interactive "interactive-"}${version}-p${toString (builtins.length upstreamPatches)}";
+ version = "4.4";
src = fetchurl {
- url = "mirror://gnu/bash/${realName}.tar.gz";
- inherit sha256;
+ url = "mirror://gnu/bash/bash-${version}.tar.gz";
+ sha256 = "1jyz6snd63xjn6skk7za6psgidsd53k05cr3lksqybi0q6936syq";
};
hardeningDisable = [ "format" ];
@@ -50,18 +46,19 @@ stdenv.mkDerivation rec {
patchFlags = "-p0";
patches = upstreamPatches
+ ++ optional hostPlatform.isCygwin ./cygwin-bash-4.4.11-2.src.patch
# https://lists.gnu.org/archive/html/bug-bash/2016-10/msg00006.html
- ++ optional (hostPlatform.libc == "musl") (fetchurl {
+ ++ optional hostPlatform.isMusl (fetchurl {
url = "https://lists.gnu.org/archive/html/bug-bash/2016-10/patchJxugOXrY2y.patch";
sha256 = "1m4v9imidb1cc1h91f2na0b8y9kc5c5fgmpvy9apcyv2kbdcghg1";
- });
-
- postPatch = optionalString hostPlatform.isCygwin "patch -p2 < ${./cygwin-bash-4.4.11-2.src.patch}";
+ });
configureFlags = [
(if interactive then "--with-installed-readline" else "--disable-readline")
] ++ optionals (hostPlatform != buildPlatform) [
- "bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing bash_cv_getcwd_malloc=yes"
+ "bash_cv_job_control_missing=nomissing"
+ "bash_cv_sys_named_pipes=nomissing"
+ "bash_cv_getcwd_malloc=yes"
] ++ optionals hostPlatform.isCygwin [
"--without-libintl-prefix --without-libiconv-prefix"
"--with-installed-readline"
@@ -75,8 +72,8 @@ stdenv.mkDerivation rec {
# Note: Bison is needed because the patches above modify parse.y.
depsBuildBuild = [ buildPackages.stdenv.cc ];
- nativeBuildInputs = [bison]
- ++ optional (texinfo != null) texinfo
+ nativeBuildInputs = [ bison ]
+ ++ optional withDocs texinfo
++ optional hostPlatform.isDarwin binutils
++ optional (hostPlatform.libc == "musl") autoconf;
diff --git a/pkgs/shells/bash/cygwin-bash-4.4.11-2.src.patch b/pkgs/shells/bash/cygwin-bash-4.4.11-2.src.patch
index c854e8828ae..48837310962 100644
--- a/pkgs/shells/bash/cygwin-bash-4.4.11-2.src.patch
+++ b/pkgs/shells/bash/cygwin-bash-4.4.11-2.src.patch
@@ -1,5 +1,5 @@
---- origsrc/bash-4.4/bashline.c 2017-01-23 13:28:06.955247200 -0600
-+++ src/bash-4.4/bashline.c 2017-01-23 13:55:07.992877600 -0600
+--- bashline.c 2017-01-23 13:28:06.955247200 -0600
++++ bashline.c 2017-01-23 13:55:07.992877600 -0600
@@ -76,6 +76,16 @@
# include "pcomplete.h"
#endif
@@ -104,8 +104,8 @@
r = file_isdir (fn);
free (fn);
---- origsrc/bash-4.4/builtins/read.def 2017-01-23 13:28:07.017686500 -0600
-+++ src/bash-4.4/builtins/read.def 2017-01-23 13:55:07.992877600 -0600
+--- builtins/read.def 2017-01-23 13:28:07.017686500 -0600
++++ builtins/read.def 2017-01-23 13:55:07.992877600 -0600
@@ -85,7 +85,6 @@ $END
#ifdef __CYGWIN__
@@ -140,8 +140,8 @@
if ((skip_ctlesc == 0 && c == CTLESC) || (skip_ctlnul == 0 && c == CTLNUL))
{
saw_escape++;
---- origsrc/bash-4.4/builtins/set.def 2016-06-02 19:10:10.000000000 -0500
-+++ src/bash-4.4/builtins/set.def 2017-01-23 13:55:07.992877600 -0600
+--- builtins/set.def 2016-06-02 19:10:10.000000000 -0500
++++ builtins/set.def 2017-01-23 13:55:07.992877600 -0600
@@ -56,6 +56,13 @@ extern int dont_save_function_defs;
#if defined (READLINE)
extern int no_line_editing;
@@ -258,8 +258,8 @@
free (vname);
}
}
---- origsrc/bash-4.4/builtins/shopt.def 2016-05-06 14:00:02.000000000 -0500
-+++ src/bash-4.4/builtins/shopt.def 2017-01-23 13:55:07.992877600 -0600
+--- builtins/shopt.def 2016-05-06 14:00:02.000000000 -0500
++++ builtins/shopt.def 2017-01-23 13:55:07.992877600 -0600
@@ -92,6 +92,10 @@ extern int glob_asciirange;
extern int lastpipe_opt;
extern int inherit_errexit;
@@ -281,8 +281,8 @@
#if defined (READLINE)
{ "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL},
{ "direxpand", &dircomplete_expand, shopt_set_complete_direxpand },
---- origsrc/bash-4.4/config-top.h 2016-05-19 13:34:02.000000000 -0500
-+++ src/bash-4.4/config-top.h 2017-01-23 13:55:07.992877600 -0600
+--- config-top.h 2016-05-19 13:34:02.000000000 -0500
++++ config-top.h 2017-01-23 13:55:07.992877600 -0600
@@ -87,10 +87,10 @@
#define DEFAULT_BASHRC "~/.bashrc"
@@ -305,8 +305,8 @@
/* Define if you want the case-capitalizing operators (~[~]) and the
`capcase' variable attribute (declare -c). */
---- origsrc/bash-4.4/doc/Makefile.in 2015-12-06 18:55:56.000000000 -0600
-+++ src/bash-4.4/doc/Makefile.in 2017-01-23 13:55:07.992877600 -0600
+--- doc/Makefile.in 2015-12-06 18:55:56.000000000 -0600
++++ doc/Makefile.in 2017-01-23 13:55:07.992877600 -0600
@@ -189,7 +189,7 @@ bashref.html: $(BASHREF_FILES) $(HSUSER)
$(MAKEINFO) --html --no-split -I$(TEXINPUTDIR) $(srcdir)/bashref.texi
@@ -329,8 +329,8 @@
-if test -f bash.info; then d=.; else d=$(srcdir); fi; \
$(INSTALL_DATA) $$d/bash.info $(DESTDIR)$(infodir)/bash.info
# run install-info if it is present to update the info directory
---- origsrc/bash-4.4/doc/bash.1 2016-08-26 08:45:17.000000000 -0500
-+++ src/bash-4.4/doc/bash.1 2017-01-23 13:55:08.008447700 -0600
+--- doc/bash.1 2016-08-26 08:45:17.000000000 -0500
++++ doc/bash.1 2017-01-23 13:55:08.008447700 -0600
@@ -9607,6 +9607,10 @@ filenames.
This variable is set by default, which is the default bash behavior in
versions through 4.2.
@@ -342,8 +342,8 @@
.B direxpand
If set,
.B bash
---- origsrc/bash-4.4/doc/bashref.texi 2016-09-07 16:13:36.000000000 -0500
-+++ src/bash-4.4/doc/bashref.texi 2017-01-23 13:55:08.008447700 -0600
+--- doc/bashref.texi 2016-09-07 16:13:36.000000000 -0500
++++ doc/bashref.texi 2017-01-23 13:55:08.008447700 -0600
@@ -5123,6 +5123,10 @@ filenames.
This variable is set by default, which is the default Bash behavior in
versions through 4.2.
@@ -355,8 +355,8 @@
@item direxpand
If set, Bash
replaces directory names with the results of word expansion when performing
---- origsrc/bash-4.4/doc/builtins.1 2012-02-21 13:32:05.000000000 -0600
-+++ src/bash-4.4/doc/builtins.1 2017-01-23 13:55:08.008447700 -0600
+--- doc/builtins.1 2012-02-21 13:32:05.000000000 -0600
++++ doc/builtins.1 2017-01-23 13:55:08.008447700 -0600
@@ -19,6 +19,6 @@ shift, shopt, source, suspend, test, tim
ulimit, umask, unalias, unset, wait \- bash built-in commands, see \fBbash\fR(1)
.SH BASH BUILTIN COMMANDS
@@ -365,8 +365,8 @@
+.so man1/bash.1
.SH SEE ALSO
bash(1), sh(1)
---- origsrc/bash-4.4/general.c 2016-08-11 10:16:56.000000000 -0500
-+++ src/bash-4.4/general.c 2017-01-23 13:55:08.008447700 -0600
+--- general.c 2016-08-11 10:16:56.000000000 -0500
++++ general.c 2017-01-23 13:55:08.008447700 -0600
@@ -48,6 +48,10 @@
#include
@@ -388,8 +388,8 @@
result = savestring (pathbuf);
}
#else
---- origsrc/bash-4.4/input.c 2015-09-24 18:49:23.000000000 -0500
-+++ src/bash-4.4/input.c 2017-01-23 13:55:08.008447700 -0600
+--- input.c 2015-09-24 18:49:23.000000000 -0500
++++ input.c 2017-01-23 13:55:08.008447700 -0600
@@ -44,6 +44,10 @@
#include "quit.h"
#include "trap.h"
@@ -421,8 +421,8 @@
#if !defined (DJGPP)
return (bufstream_getc (buffers[bash_input.location.buffered_fd]));
#else
---- origsrc/bash-4.4/lib/sh/pathphys.c 2013-05-28 14:33:58.000000000 -0500
-+++ src/bash-4.4/lib/sh/pathphys.c 2017-01-23 13:55:08.008447700 -0600
+--- lib/sh/pathphys.c 2013-05-28 14:33:58.000000000 -0500
++++ lib/sh/pathphys.c 2017-01-23 13:55:08.008447700 -0600
@@ -35,6 +35,7 @@
#include
#include
@@ -453,8 +453,8 @@
double_slash_path = DOUBLE_SLASH (workpath);
qbase += double_slash_path;
---- origsrc/bash-4.4/lib/sh/tmpfile.c 2016-08-11 10:05:58.000000000 -0500
-+++ src/bash-4.4/lib/sh/tmpfile.c 2017-01-23 13:55:08.008447700 -0600
+--- lib/sh/tmpfile.c 2016-08-11 10:05:58.000000000 -0500
++++ lib/sh/tmpfile.c 2017-01-23 13:55:08.008447700 -0600
@@ -101,7 +101,7 @@ get_tmpdir (flags)
if (tdir && (file_iswdir (tdir) == 0 || strlen (tdir) > PATH_MAX))
tdir = 0;
@@ -464,8 +464,8 @@
tdir = get_sys_tmpdir ();
#if defined (HAVE_PATHCONF) && defined (_PC_NAME_MAX)
---- origsrc/bash-4.4/mksyntax.c 2012-07-29 18:48:38.000000000 -0500
-+++ src/bash-4.4/mksyntax.c 2017-01-23 13:55:08.008447700 -0600
+--- mksyntax.c 2012-07-29 18:48:38.000000000 -0500
++++ mksyntax.c 2017-01-23 13:55:08.008447700 -0600
@@ -29,13 +29,13 @@
#ifdef HAVE_UNISTD_H
@@ -483,8 +483,8 @@
#ifndef errno
extern int errno;
#endif
---- origsrc/bash-4.4/parse.y 2016-09-11 10:31:46.000000000 -0500
-+++ src/bash-4.4/parse.y 2017-01-23 13:55:08.008447700 -0600
+--- parse.y 2016-09-11 10:31:46.000000000 -0500
++++ parse.y 2017-01-23 13:55:08.008447700 -0600
@@ -1539,14 +1539,20 @@ yy_string_get ()
string = bash_input.location.string;
@@ -509,8 +509,8 @@
}
static int
---- origsrc/bash-4.4/subst.c 2017-01-23 13:28:06.955247200 -0600
-+++ src/bash-4.4/subst.c 2017-01-23 13:55:08.008447700 -0600
+--- subst.c 2017-01-23 13:28:06.955247200 -0600
++++ subst.c 2017-01-23 13:55:08.008447700 -0600
@@ -43,6 +43,7 @@
#include "posixstat.h"
#include "bashintl.h"
@@ -562,8 +562,8 @@
old_pid = last_made_pid;
#if defined (JOB_CONTROL)
old_pipeline_pgrp = pipeline_pgrp;
---- origsrc/bash-4.4/support/bashversion.c 2008-09-09 08:31:53.000000000 -0500
-+++ src/bash-4.4/support/bashversion.c 2017-01-23 13:55:08.024037200 -0600
+--- support/bashversion.c 2008-09-09 08:31:53.000000000 -0500
++++ support/bashversion.c 2017-01-23 13:55:08.024037200 -0600
@@ -26,6 +26,9 @@
#if defined (HAVE_UNISTD_H)
@@ -584,8 +584,8 @@
extern char *dist_version;
extern int patch_level;
---- origsrc/bash-4.4/support/mkversion.sh 2008-08-13 07:25:57.000000000 -0500
-+++ src/bash-4.4/support/mkversion.sh 2017-01-23 13:55:08.024037200 -0600
+--- support/mkversion.sh 2008-08-13 07:25:57.000000000 -0500
++++ support/mkversion.sh 2017-01-23 13:55:08.024037200 -0600
@@ -29,7 +29,7 @@ source_dir="."
while [ $# -gt 0 ]; do
case "$1" in
@@ -595,8 +595,8 @@
-s) shift; rel_status=$1; shift ;;
-p) shift; patch_level=$1; shift ;;
-d) shift; dist_version=$1; shift ;;
---- origsrc/bash-4.4/variables.c 2016-06-15 15:05:52.000000000 -0500
-+++ src/bash-4.4/variables.c 2017-01-23 13:55:08.024037200 -0600
+--- variables.c 2016-06-15 15:05:52.000000000 -0500
++++ variables.c 2017-01-23 13:55:08.024037200 -0600
@@ -5239,6 +5239,7 @@ sv_winsize (name)
/* Update the value of HOME in the export environment so tilde expansion will
work on cygwin. */
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 46df958b839..b523374454f 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -36,6 +36,9 @@ rec {
, depsTargetTarget ? [] # 1 -> 1
, depsTargetTargetPropagated ? [] # 1 -> 1
+ , checkInputs ? []
+ , installCheckInputs ? []
+
# Configure Phase
, configureFlags ? []
, # Target is not included by default because most programs don't care.
@@ -46,11 +49,13 @@ rec {
(stdenv.hostPlatform != stdenv.buildPlatform)
[ "build" "host" ]
+ # TODO(@Ericson2314): Make unconditional / resolve #33599
# Check phase
- , doCheck ? false
+ , doCheck ? config.doCheckByDefault or false
+ # TODO(@Ericson2314): Make unconditional / resolve #33599
# InstallCheck phase
- , doInstallCheck ? false
+ , doInstallCheck ? config.doCheckByDefault or false
, crossConfig ? null
, meta ? {}
@@ -74,6 +79,11 @@ rec {
# TODO(@Ericson2314): Make this more modular, and not O(n^2).
let
supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ];
+ defaultHardeningFlags = lib.remove "pie" supportedHardeningFlags;
+ enabledHardeningOptions =
+ if builtins.elem "all" hardeningDisable
+ then []
+ else lib.subtractLists hardeningDisable (defaultHardeningFlags ++ hardeningEnable);
# hardeningDisable additionally supports "all".
erroneousHardeningFlags = lib.subtractLists supportedHardeningFlags (hardeningEnable ++ lib.remove "all" hardeningDisable);
in if builtins.length erroneousHardeningFlags != 0
@@ -94,7 +104,9 @@ rec {
]
[
(map (drv: drv.__spliced.hostHost or drv) depsHostHost)
- (map (drv: drv.crossDrv or drv) buildInputs)
+ (map (drv: drv.crossDrv or drv) (buildInputs
+ ++ lib.optionals doCheck' checkInputs
+ ++ lib.optionals doInstallCheck' installCheckInputs))
]
[
(map (drv: drv.__spliced.targetTarget or drv) depsTargetTarget)
@@ -115,34 +127,43 @@ rec {
]
];
+ # TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when
+ # no package has `doCheck = true`.
+ doCheck' = doCheck && stdenv.hostPlatform == stdenv.buildPlatform;
+ doInstallCheck' = doInstallCheck && stdenv.hostPlatform == stdenv.buildPlatform;
+
outputs' =
outputs ++
(if separateDebugInfo then assert stdenv.hostPlatform.isLinux; [ "debug" ] else []);
+ computedSandboxProfile =
+ lib.concatMap (input: input.__propagatedSandboxProfile or [])
+ (stdenv.extraNativeBuildInputs
+ ++ stdenv.extraBuildInputs
+ ++ lib.concatLists dependencies);
+
+ computedPropagatedSandboxProfile =
+ lib.concatMap (input: input.__propagatedSandboxProfile or [])
+ (lib.concatLists propagatedDependencies);
+
+ computedImpureHostDeps =
+ lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or [])
+ (stdenv.extraNativeBuildInputs
+ ++ stdenv.extraBuildInputs
+ ++ lib.concatLists dependencies));
+
+ computedPropagatedImpureHostDeps =
+ lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or [])
+ (lib.concatLists propagatedDependencies));
+
derivationArg =
(removeAttrs attrs
["meta" "passthru" "crossAttrs" "pos"
+ "doCheck" "doInstallCheck"
+ "checkInputs" "installCheckInputs"
"__impureHostDeps" "__propagatedImpureHostDeps"
"sandboxProfile" "propagatedSandboxProfile"])
- // (let
- computedSandboxProfile =
- lib.concatMap (input: input.__propagatedSandboxProfile or [])
- (stdenv.extraNativeBuildInputs
- ++ stdenv.extraBuildInputs
- ++ lib.concatLists dependencies);
- computedPropagatedSandboxProfile =
- lib.concatMap (input: input.__propagatedSandboxProfile or [])
- (lib.concatLists propagatedDependencies);
- computedImpureHostDeps =
- lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or [])
- (stdenv.extraNativeBuildInputs
- ++ stdenv.extraBuildInputs
- ++ lib.concatLists dependencies));
- computedPropagatedImpureHostDeps =
- lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or [])
- (lib.concatLists propagatedDependencies));
- in
- {
+ // {
# A hack to make `nix-env -qa` and `nix search` ignore broken packages.
# TODO(@oxij): remove this assert when something like NixOS/nix#1771 gets merged into nix.
name = assert validity.handled; name + lib.optionalString
@@ -179,6 +200,15 @@ rec {
++ optional (elem "host" configurePlatforms) "--host=${stdenv.hostPlatform.config}"
++ optional (elem "target" configurePlatforms) "--target=${stdenv.targetPlatform.config}";
+ } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) {
+ NIX_HARDENING_ENABLE = enabledHardeningOptions;
+ } // lib.optionalAttrs (outputs' != [ "out" ]) {
+ outputs = outputs';
+ } // lib.optionalAttrs doCheck' {
+ doCheck = true;
+ } // lib.optionalAttrs doInstallCheck' {
+ doInstallCheck = true;
+
} // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) {
# TODO: remove lib.unique once nix has a list canonicalization primitive
__sandboxProfile =
@@ -193,15 +223,7 @@ rec {
"/bin/sh"
];
__propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps;
- } // lib.optionalAttrs (outputs' != [ "out" ]) {
- outputs = outputs';
- } // lib.optionalAttrs (attrs ? doCheck) {
- # TODO(@Ericson2314): Make unconditional / resolve #33599
- doCheck = doCheck && (stdenv.hostPlatform == stdenv.buildPlatform);
- } // lib.optionalAttrs (attrs ? doInstallCheck) {
- # TODO(@Ericson2314): Make unconditional / resolve #33599
- doInstallCheck = doInstallCheck && (stdenv.hostPlatform == stdenv.buildPlatform);
- });
+ };
validity = import ./check-meta.nix {
inherit lib config meta;
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index d7a4781448a..c85f05d9a91 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -968,9 +968,11 @@ buildPhase() {
# set to empty if unset
: ${makeFlags=}
- if [[ -z "$makeFlags" && ! ( -n "${makefile:-}" || -e Makefile || -e makefile || -e GNUmakefile ) ]]; then
+ if [[ -z "$makeFlags" && -z "${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ]]; then
echo "no Makefile, doing nothing"
else
+ foundMakefile=1
+
# See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409
makeFlags="SHELL=$SHELL $makeFlags"
@@ -994,18 +996,38 @@ buildPhase() {
checkPhase() {
runHook preCheck
- # Old bash empty array hack
- # shellcheck disable=SC2086
- local flagsArray=(
- ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
- $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
- ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"}
- ${checkTarget:-check}
- )
+ if [[ -z "${foundMakefile:-}" ]]; then
+ echo "no Makefile or custom buildPhase, doing nothing"
+ runHook postCheck
+ return
+ fi
- echoCmd 'check flags' "${flagsArray[@]}"
- make ${makefile:+-f $makefile} "${flagsArray[@]}"
- unset flagsArray
+ if [[ -z "${checkTarget:-}" ]]; then
+ #TODO(@oxij): should flagsArray influence make -n?
+ if make -n ${makefile:+-f $makefile} check >/dev/null 2>&1; then
+ checkTarget=check
+ elif make -n ${makefile:+-f $makefile} test >/dev/null 2>&1; then
+ checkTarget=test
+ fi
+ fi
+
+ if [[ -z "${checkTarget:-}" ]]; then
+ echo "no check/test target in ${makefile:-Makefile}, doing nothing"
+ else
+ # Old bash empty array hack
+ # shellcheck disable=SC2086
+ local flagsArray=(
+ ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
+ $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
+ ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"}
+ ${checkTarget}
+ )
+
+ echoCmd 'check flags' "${flagsArray[@]}"
+ make ${makefile:+-f $makefile} "${flagsArray[@]}"
+
+ unset flagsArray
+ fi
runHook postCheck
}
@@ -1018,14 +1040,12 @@ installPhase() {
mkdir -p "$prefix"
fi
- installTargets="${installTargets:-install}"
-
# Old bash empty array hack
# shellcheck disable=SC2086
local flagsArray=(
- $installTargets
$makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
$installFlags ${installFlagsArray+"${installFlagsArray[@]}"}
+ ${installTargets:-install}
)
echoCmd 'install flags' "${flagsArray[@]}"
@@ -1106,18 +1126,26 @@ fixupPhase() {
installCheckPhase() {
runHook preInstallCheck
- # Old bash empty array hack
- # shellcheck disable=SC2086
- local flagsArray=(
- ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
- $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
- $installCheckFlags ${installCheckFlagsArray+"${installCheckFlagsArray[@]}"}
- ${installCheckTarget:-installcheck}
- )
+ if [[ -z "${foundMakefile:-}" ]]; then
+ echo "no Makefile or custom buildPhase, doing nothing"
+ #TODO(@oxij): should flagsArray influence make -n?
+ elif [[ -z "${installCheckTarget:-}" ]] \
+ && ! make -n ${makefile:+-f $makefile} ${installCheckTarget:-installcheck} >/dev/null 2>&1; then
+ echo "no installcheck target in ${makefile:-Makefile}, doing nothing"
+ else
+ # Old bash empty array hack
+ # shellcheck disable=SC2086
+ local flagsArray=(
+ ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
+ $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
+ $installCheckFlags ${installCheckFlagsArray+"${installCheckFlagsArray[@]}"}
+ ${installCheckTarget:-installcheck}
+ )
- echoCmd 'installcheck flags' "${flagsArray[@]}"
- make ${makefile:+-f $makefile} "${flagsArray[@]}"
- unset flagsArray
+ echoCmd 'installcheck flags' "${flagsArray[@]}"
+ make ${makefile:+-f $makefile} "${flagsArray[@]}"
+ unset flagsArray
+ fi
runHook postInstallCheck
}
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 92da0d7873d..eb793e7687a 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -107,11 +107,6 @@ let
# Having the proper 'platform' in all the stdenvs allows getting proper
# linuxHeaders for example.
inherit platform;
-
- # stdenv.glibc is used by GCC build to figure out the system-level
- # /usr/include directory.
- # TODO: Remove this!
- inherit (prevStage) glibc;
};
overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; };
};
@@ -129,8 +124,6 @@ in
__raw = true;
gcc-unwrapped = null;
- glibc = assert false; null;
- musl = assert false; null;
binutils = null;
coreutils = null;
gnugrep = null;
@@ -351,6 +344,7 @@ in
concatMap (p: [ (getBin p) (getLib p) ])
[ gzip bzip2 xz bash binutils.bintools coreutils diffutils findutils
gawk gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl
+ texinfo
]
# Library dependencies
++ map getLib (
@@ -369,7 +363,7 @@ in
inherit (prevStage)
gzip bzip2 xz bash coreutils diffutils findutils gawk
gnumake gnused gnutar gnugrep gnupatch patchelf
- attr acl paxctl zlib pcre;
+ attr acl paxctl zlib pcre texinfo;
${localSystem.libc} = getLibc prevStage;
} // lib.optionalAttrs (super.targetPlatform == localSystem) {
# Need to get rid of these when cross-compiling.
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index 4677ee45afb..7532cd899cc 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -36,6 +36,9 @@ stdenv.mkDerivation rec {
sed -i gnu/fpending.h -e 's,include ,,'
'' else null;
+ doCheck = false; # fails
+ doInstallCheck = false; # fails
+
meta = {
homepage = http://www.gnu.org/software/tar/;
description = "GNU implementation of the `tar' archiver";
diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix
index 707b8f0d799..1a42ba03d46 100644
--- a/pkgs/tools/compression/brotli/default.nix
+++ b/pkgs/tools/compression/brotli/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "brotli-${version}";
- version = "1.0.3";
+ version = "1.0.4";
src = fetchFromGitHub {
owner = "google";
repo = "brotli";
rev = "v" + version;
- sha256 = "1hlkqgkm2gv6q83dswg6b19hpw8j33y6iw924j8r647pd4qg1xs7";
+ sha256 = "0n5snycxgwqj2v8sgxiqxq4zqh5ydx70dr7qa4ygizs02ms69n1i";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index cfe41d3dfe7..c39216f1e0c 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
# In stdenv-linux, prevent a dependency on bootstrap-tools.
makeFlags = "SHELL=/bin/sh GREP=grep";
+ doCheck = false; # fails
+
meta = {
homepage = https://www.gnu.org/software/gzip/;
description = "GNU zip compression program";
diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix
index da3a537da28..37c0c6d1c7e 100644
--- a/pkgs/tools/compression/xz/default.nix
+++ b/pkgs/tools/compression/xz/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "xz-5.2.3";
+ name = "xz-5.2.4";
src = fetchurl {
url = "https://tukaani.org/xz/${name}.tar.bz2";
- sha256 = "1ha08wxcldgcl81021x5nhknr47s1p95ljfkka4sqah5w5ns377x";
+ sha256 = "1gxpayfagb4v7xfhs2w6h7k56c6hwwav1rk48bj8hggljlmgs4rk";
};
outputs = [ "bin" "dev" "out" "man" "doc" ];
diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/pkgs/tools/filesystems/curlftpfs/default.nix
index 8797c21aa23..4af7c9fb8c2 100644
--- a/pkgs/tools/filesystems/curlftpfs/default.nix
+++ b/pkgs/tools/filesystems/curlftpfs/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [fuse curl glib zlib];
+ doCheck = false; # fails, doesn't work well too, btw
+
meta = {
platforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix
index b360f9a3450..2fa4bb90a8e 100644
--- a/pkgs/tools/graphics/graphviz/base.nix
+++ b/pkgs/tools/graphics/graphviz/base.nix
@@ -43,6 +43,13 @@ stdenv.mkDerivation rec {
done
'';
+ # ''
+ # substituteInPlace rtest/rtest.sh \
+ # --replace "/bin/ksh" "${mksh}/bin/mksh"
+ # '';
+
+ doCheck = false; # fails with "Graphviz test suite requires ksh93" which is not in nixpkgs
+
preAutoreconf = "./autogen.sh";
postFixup = optionalString (xorg != null) ''
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 59ddab7294f..d3507b57cbd 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -125,6 +125,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ doCheck = false; # requires X11 daemon
doInstallCheck = true;
installCheckPhase = "$out/bin/ibus version";
diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix
index c192e9f42ab..f86d44c580d 100644
--- a/pkgs/tools/misc/bogofilter/default.nix
+++ b/pkgs/tools/misc/bogofilter/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
buildInputs = [ flex db ];
+ doCheck = false; # needs "y" tool
+
meta = {
homepage = http://bogofilter.sourceforge.net/;
longDescription = ''
diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix
index 2527c34feeb..62c782b26fe 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/pkgs/tools/misc/ethtool/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ethtool-${version}";
- version = "4.15";
+ version = "4.16";
src = fetchurl {
url = "mirror://kernel/software/network/ethtool/${name}.tar.xz";
- sha256 = "06pr3s7wg2pbvfbf7js61bgh3caff4qf50nqqk3cgz9z90rgvxvi";
+ sha256 = "00ss07jc7p276d83f6jpafgwyc9yiribciyqcgx9j86v49kpm5py";
};
meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index 3765f913430..aeb43d7c115 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "file-${version}";
- version = "5.32";
+ version = "5.33";
src = fetchurl {
urls = [
"ftp://ftp.astron.com/pub/file/${name}.tar.gz"
"https://distfiles.macports.org/file/${name}.tar.gz"
];
- sha256 = "0l1bfa0icng9vdwya00ff48fhvjazi5610ylbhl35qi13d6xqfc6";
+ sha256 = "1iipnwjkag7q04zjkaqic41r9nlw0ml6mhqian6qkkbisb1whlhw";
};
nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file;
diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix
index c7fd29da8ac..0f6fb38ef3b 100644
--- a/pkgs/tools/misc/fontforge/default.nix
+++ b/pkgs/tools/misc/fontforge/default.nix
@@ -57,6 +57,9 @@ stdenv.mkDerivation rec {
./bootstrap --skip-git --gnulib-srcdir=./gnulib
'';
+ doCheck = false; # tries to wget some fonts
+ doInstallCheck = doCheck;
+
postInstall =
# get rid of the runtime dependency on python
lib.optionalString (!withPython) ''
@@ -72,4 +75,3 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.bsd3;
};
}
-
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 093633e2114..9bb09d227c4 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, perl, makeWrapper, procps }:
stdenv.mkDerivation rec {
- name = "parallel-20180322";
+ name = "parallel-20180422";
src = fetchurl {
url = "mirror://gnu/parallel/${name}.tar.bz2";
- sha256 = "15v46pv4z98xm3fkwy7335faw4r7pilrxp4xis5a4zi4319sv2b3";
+ sha256 = "0xsfpbxwgd4197gra981iv0nmjfk58c0d88dxx6dh6yrqz523klx";
};
nativeBuildInputs = [ makeWrapper perl ];
diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix
index 23355d61bea..068e6887546 100644
--- a/pkgs/tools/networking/atftp/default.nix
+++ b/pkgs/tools/networking/atftp/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
# Expects pre-GCC5 inline semantics
NIX_CFLAGS_COMPILE = "-std=gnu89";
+ doCheck = false; # fails
+
meta = {
description = "Advanced tftp tools";
maintainers = [ lib.maintainers.raskin ];
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 32a8a788848..4a1ff7f1798 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -79,6 +79,8 @@ stdenv.mkDerivation rec {
CXX = "c++";
CXXCPP = "c++ -E";
+ doCheck = false; # expensive, fails
+
postInstall = ''
moveToOutput bin/curl-config "$dev"
sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la
diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix
index 8b1ac864a43..1ebf57997d0 100644
--- a/pkgs/tools/networking/dhcp/default.nix
+++ b/pkgs/tools/networking/dhcp/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "dhcp-${version}";
- version = "4.3.6-P1";
+ version = "4.4.1";
src = fetchurl {
url = "http://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz";
- sha256 = "1hx3az6ckvgvybr1ag4k9kqr8zfcpzcww4vpw5gz0mi8y2z7gl9g";
+ sha256 = "025nfqx4zwdgv4b3rkw26ihcj312vir08jk6yi57ndmb4a4m08ia";
};
patches =
diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix
index 950a6e310eb..134e9b6df76 100644
--- a/pkgs/tools/networking/maildrop/default.nix
+++ b/pkgs/tools/networking/maildrop/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
patches = [ ./maildrop.configure.hack.patch ]; # for building in chroot
+ doCheck = false; # fails with "setlocale: LC_ALL: cannot change locale (en_US.UTF-8)"
+
meta = with stdenv.lib; {
homepage = http://www.courier-mta.org/maildrop/;
description = "Mail filter/mail delivery agent that is used by the Courier Mail Server";
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index ebe40c6192c..9a129f52213 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -85,6 +85,8 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook intltool pkgconfig libxslt docbook_xsl ];
+ doCheck = false; # requires /sys, the net
+
preInstall = ''
installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" "runstatedir=$out/var/run" )
'';
diff --git a/pkgs/tools/networking/telnet/default.nix b/pkgs/tools/networking/telnet/default.nix
index c38f3c46fa4..d9de9c15763 100644
--- a/pkgs/tools/networking/telnet/default.nix
+++ b/pkgs/tools/networking/telnet/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation {
buildInputs = [ncurses];
+ doInstallCheck = false; # fails
+
meta = {
description = "A client and daemon for the Telnet protocol";
homepage = ftp://ftp.suse.com/pub/people/kukuk/ipv6/;
diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index a81fffa2035..4c6df817a72 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -53,6 +53,8 @@ in stdenv.mkDerivation rec {
libX11 gtk2 pygtk pysqlite pygobject2 pycairo
];
+ doCheck = false; # fails 3 tests, probably needs the net
+
meta = {
description = "A free and open source utility for network discovery and security auditing";
homepage = http://www.nmap.org;
diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix
index 485b34cff88..22d7e93fe47 100644
--- a/pkgs/tools/security/rhash/default.nix
+++ b/pkgs/tools/security/rhash/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
# configure script is not autotools-based, doesn't support these options
configurePlatforms = [ ];
+ doCheck = false; # fails
+
installTargets = [ "install" "install-lib-shared" "install-lib-so-link" ];
postInstall = "make -C librhash install-headers";
diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index 85dba08255d..bcafefb72c9 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -56,6 +56,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ doCheck = false; # needs root
+
postInstall =
''
rm -f $out/share/doc/sudo/ChangeLog
diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix
index eda2197b9f6..baac00bfa76 100644
--- a/pkgs/tools/system/at/default.nix
+++ b/pkgs/tools/system/at/default.nix
@@ -33,12 +33,15 @@ stdenv.mkDerivation rec {
substituteInPlace ./configure --replace "test -d /var/run" "true"
'';
- configureFlags =
- ''
- --with-etcdir=/etc/at
- --with-jobdir=/var/spool/atjobs --with-atspool=/var/spool/atspool
- --with-daemon_username=atd --with-daemon_groupname=atd
- '';
+ configureFlags = [
+ "--with-etcdir=/etc/at"
+ "--with-jobdir=/var/spool/atjobs"
+ "--with-atspool=/var/spool/atspool"
+ "--with-daemon_username=atd"
+ "--with-daemon_groupname=atd"
+ ];
+
+ doCheck = false; # need "prove" tool
# Ensure that "batch" can invoke the setuid "at" wrapper, if it exists, or
# else we get permission errors (on NixOS). "batch" is a shell script, so
diff --git a/pkgs/tools/text/gnupatch/CVE-2018-6951.patch b/pkgs/tools/text/gnupatch/CVE-2018-6951.patch
new file mode 100644
index 00000000000..22d5f061c33
--- /dev/null
+++ b/pkgs/tools/text/gnupatch/CVE-2018-6951.patch
@@ -0,0 +1,28 @@
+From f290f48a621867084884bfff87f8093c15195e6a Mon Sep 17 00:00:00 2001
+From: Andreas Gruenbacher
+Date: Mon, 12 Feb 2018 16:48:24 +0100
+Subject: Fix segfault with mangled rename patch
+
+http://savannah.gnu.org/bugs/?53132
+* src/pch.c (intuit_diff_type): Ensure that two filenames are specified
+for renames and copies (fix the existing check).
+---
+ src/pch.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/pch.c b/src/pch.c
+index ff9ed2c..bc6278c 100644
+--- a/src/pch.c
++++ b/src/pch.c
+@@ -974,7 +974,8 @@ intuit_diff_type (bool need_header, mode_t *p_file_type)
+ if ((pch_rename () || pch_copy ())
+ && ! inname
+ && ! ((i == OLD || i == NEW) &&
+- p_name[! reverse] &&
++ p_name[reverse] && p_name[! reverse] &&
++ name_is_valid (p_name[reverse]) &&
+ name_is_valid (p_name[! reverse])))
+ {
+ say ("Cannot %s file without two valid file names\n", pch_rename () ? "rename" : "copy");
+--
+cgit v1.0-41-gc330
diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix
index 3840811a3e3..c83eab2e2ef 100644
--- a/pkgs/tools/text/gnupatch/default.nix
+++ b/pkgs/tools/text/gnupatch/default.nix
@@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "1zfqy4rdcy279vwn2z1kbv19dcfw25d2aqy9nzvdkq5bjzd0nqdc";
};
+ patches = [
+ # https://git.savannah.gnu.org/cgit/patch.git/patch/?id=f290f48a621867084884bfff87f8093c15195e6a
+ ./CVE-2018-6951.patch
+ ];
+
buildInputs = stdenv.lib.optional doCheck ed;
configureFlags = stdenv.lib.optionals (hostPlatform != buildPlatform) [
diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix
index 72d632533ff..47193e61615 100644
--- a/pkgs/tools/text/gnused/default.nix
+++ b/pkgs/tools/text/gnused/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "gnused-${version}";
- version = "4.4";
+ version = "4.5";
src = fetchurl {
url = "mirror://gnu/sed/sed-${version}.tar.xz";
- sha256 = "0fv88bcnraixc8jvpacvxshi30p5x9m7yb8ns1hfv07hmb2ypmnb";
+ sha256 = "0h3b2jfj57wmz680vkbyavlsrkak556qhvs7m7fdlawwhg477bbs";
};
outputs = [ "out" "info" ];
diff --git a/pkgs/tools/text/patchutils/default.nix b/pkgs/tools/text/patchutils/default.nix
index 75922a6c830..238676020e8 100644
--- a/pkgs/tools/text/patchutils/default.nix
+++ b/pkgs/tools/text/patchutils/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
+ doCheck = false; # fails
+
meta = with stdenv.lib; {
description = "Tools to manipulate patch files";
homepage = http://cyberelk.net/tim/software/patchutils;
diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix
index bfd150eefda..27fa7bb91a8 100644
--- a/pkgs/tools/text/sgml/opensp/default.nix
+++ b/pkgs/tools/text/sgml/opensp/default.nix
@@ -32,6 +32,8 @@ stdenv.mkDerivation {
buildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake gettext libiconv libtool ]
++ [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl ];
+ doCheck = false; # fails
+
meta = {
description = "A suite of SGML/XML processing tools";
license = stdenv.lib.licenses.mit;
diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix
index 9c802a1187a..e38e4a1f059 100644
--- a/pkgs/tools/typesetting/docbook2x/default.nix
+++ b/pkgs/tools/typesetting/docbook2x/default.nix
@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
name = "docbook2X-0.8.8";
-
+
src = fetchurl {
url = "mirror://sourceforge/docbook2x/${name}.tar.gz";
sha256 = "0ifwzk99rzjws0ixzimbvs83x6cxqk1xzmg84wa1p7bs6rypaxs0";
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
--replace '${"\$" + "{prefix}"}' "$out"
'';
+ doCheck = false; # fails a lot of tests
+
postInstall = ''
perlPrograms="db2x_manxml db2x_texixml db2x_xsltproc
docbook2man docbook2texi";
@@ -34,12 +36,12 @@ stdenv.mkDerivation rec {
do
# XXX: We work around the fact that `wrapProgram' doesn't support
# spaces below by inserting escaped backslashes.
- wrapProgram $out/bin/$i --prefix PERL5LIB : \
+ wrapProgram $out/bin/$i --prefix PERL5LIB : \
"${XMLSAX}/lib/perl5/site_perl:${XMLSAXBase}/lib/perl5/site_perl:${XMLParser}/lib/perl5/site_perl" \
- --prefix PERL5LIB : \
- "${XMLNamespaceSupport}/lib/perl5/site_perl" \
- --prefix XML_CATALOG_FILES "\ " \
- "$out/share/docbook2X/dtd/catalog.xml\ $out/share/docbook2X/xslt/catalog.xml\ ${docbook_xml_dtd_43}/xml/dtd/docbook/catalog.xml"
+ --prefix PERL5LIB : \
+ "${XMLNamespaceSupport}/lib/perl5/site_perl" \
+ --prefix XML_CATALOG_FILES "\ " \
+ "$out/share/docbook2X/dtd/catalog.xml\ $out/share/docbook2X/xslt/catalog.xml\ ${docbook_xml_dtd_43}/xml/dtd/docbook/catalog.xml"
done
wrapProgram $out/bin/sgml2xml-isoent --prefix PATH : \
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 92778c5eed1..6555c999d7f 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -204,6 +204,8 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
CXXFLAGS = "-std=c++11 -Wno-reserved-user-defined-literal"; # TODO: remove once texlive 2018 is out?
enableParallelBuilding = true;
+ doCheck = false; # fails
+
# now distribute stuff into outputs, roughly as upstream TL
# (uninteresting stuff remains in $out, typically duplicates from `core`)
outputs = [ "out" "metafont" "metapost" "luatex" "xetex" ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 334905b79f2..5b3c69a0015 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -17,15 +17,27 @@ let
dontDistribute alias
else alias;
+ # Make sure that we are not shadowing something from
+ # all-packages.nix.
+ checkInPkgs = n: alias: if builtins.hasAttr n self
+ then throw "Alias ${n} is still in all-packages.nix"
+ else alias;
+
mapAliases = aliases:
- lib.mapAttrs (n: alias: removeDistribute (removeRecurseForDerivations alias)) aliases;
+ lib.mapAttrs (n: alias: removeDistribute
+ (removeRecurseForDerivations
+ (checkInPkgs n alias)))
+ aliases;
in
### Deprecated aliases - for backward compatibility
mapAliases (rec {
+ PPSSPP = ppsspp; # added 2017-10-01
+ QmidiNet = qmidinet; # added 2016-05-22
accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19
adobeReader = adobe-reader; # added 2013-11-04
+ ag = silver-searcher; # added 2018-04-25
aircrackng = aircrack-ng; # added 2016-01-14
ammonite-repl = ammonite; # added 2017-05-02
arduino_core = arduino-core; # added 2015-02-04
@@ -48,95 +60,128 @@ mapAliases (rec {
cupsBjnp = cups-bjnp; # added 2016-01-02
cups_filters = cups-filters; # added 2016-08
cv = progress; # added 2015-09-06
+ d1x_rebirth = dxx-rebirth; # added 2018-04-25
+ d2x_rebirth = dxx-rebirth; # added 2018-04-25
+ dbus_daemon = dbus.daemon; # added 2018-04-25
dbus_glib = dbus-glib; # added 2018-02-25
+ dbus_libs = dbus; # added 2018-04-25
+ dbus_tools = dbus.out; # added 2018-04-25
deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added 2018-02-23
+ deadpixi-sam = deadpixi-sam-unstable;
debian_devscripts = debian-devscripts; # added 2016-03-23
desktop_file_utils = desktop-file-utils; # added 2018-02-25
+ devicemapper = lvm2; # added 2018-04-25
digikam5 = digikam; # added 2017-02-18
+ dmtx = dmtx-utils; # added 2018-04-25
+ docbook5_xsl = docbook_xsl_ns; # added 2018-04-25
+ docbook_xml_xslt = docbook_xsl; # added 2018-04-25
double_conversion = double-conversion; # 2017-11-22
dwarf_fortress = dwarf-fortress; # added 2016-01-23
+ emacs25Macport_25_1 = emacs25Macport; # added 2018-04-25
enblendenfuse = enblend-enfuse; # 2015-09-30
evolution_data_server = evolution-data-server; # added 2018-02-25
+ etcdctl = etcd; # added 2018-04-25
exfat-utils = exfat; # 2015-09-11
+ fam = gamin; # added 2018-04-25
+ ffadoFull = ffado; # added 2018-05-01
firefox-esr-wrapper = firefox-esr; # 2016-01
firefox-wrapper = firefox; # 2016-01
firefoxWrapper = firefox; # 2015-09
+ flameGraph = flamegraph; # added 2018-04-25
font-awesome-ttf = font-awesome_4; # 2018-02-25
foomatic_filters = foomatic-filters; # 2016-08
fuse_exfat = exfat; # 2015-09-11
- gettextWithExpat = gettext; # 2016-02-19
+ fuseki = apache-jena-fuseki; # added 2018-04-25
+ gccApple = throw "gccApple is no longer supported"; # added 2018-04-25
gdb-multitarget = gdb; # added 2017-11-13
+ gettextWithExpat = gettext; # 2016-02-19
+ gflags = google-gflags; # added 2018-04-25
git-hub = gitAndTools.git-hub; # added 2016-04-29
glib_networking = glib-networking; # added 2018-02-25
+ gmock = gtest; # added 2018-04-25
+ gnome-themes-standard = gnome-themes-extra; # added 2018-03-14
+ gnome_doc_utils = gnome-doc-utils; # added 2018-02-25
+ gnome_themes_standard = gnome-themes-standard; # added 2018-02-25
+ gnustep-make = gnustep.make; # added 2016-7-6
go-pup = pup; # added 2017-12-19
googleAuthenticator = google-authenticator; # added 2016-10-16
- gnome_doc_utils = gnome-doc-utils; # added 2018-02-25
- gnome-themes-standard = gnome-themes-extra; # added 2018-03-14
- gnome_themes_standard = gnome-themes-standard; # added 2018-02-25
grantlee5 = libsForQt5.grantlee; # added 2015-12-19
gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25
gst_ffmpeg = gst-ffmpeg; # added 2017-02
+ gst_plugins_bad = gst-plugins-bad; # added 2017-02
gst_plugins_base = gst-plugins-base; # added 2017-02
gst_plugins_good = gst-plugins-good; # added 2017-02
- gst_plugins_bad = gst-plugins-bad; # added 2017-02
gst_plugins_ugly = gst-plugins-ugly; # added 2017-02
gst_python = gst-python; # added 2017-02
gtk_doc = gtk-doc; # added 2018-02-25
guileCairo = guile-cairo; # added 2017-09-24
guileGnome = guile-gnome; # added 2017-09-24
- guile_lib = guile-lib; # added 2017-09-24
guileLint = guile-lint; # added 2017-09-27
+ guile_lib = guile-lib; # added 2017-09-24
guile_ncurses = guile-ncurses; # added 2017-09-24
gupnp_av = gupnp-av; # added 2018-02-25
gupnp_dlna = gupnp-dlna; # added 2018-02-25
gupnp_igd = gupnp-igd; # added 2018-02-25
gupnptools = gupnp-tools; # added 2015-12-19
- gnustep-make = gnustep.make; # added 2016-7-6
+ heimdalFull = heimdal; # added 2018-05-01
hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25
htmlTidy = html-tidy; # added 2014-12-06
iana_etc = iana-etc; # added 2017-03-08
idea = jetbrains; # added 2017-04-03
inotifyTools = inotify-tools;
+ jack2Full = jack2; # added 2018-04-25
joseki = apache-jena-fuseki; # added 2016-02-28
json_glib = json-glib; # added 2018-02-25
kdiff3-qt5 = kdiff3; # added 2017-02-18
- keepassx2-http = keepassx-reboot; # added 2016-10-17
- keepassx-reboot = keepassx-community; # added 2017-02-01
+ keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02
keepassx-community = keepassxc; # added 2017-11
+ keepassx-reboot = keepassx-community; # added 2017-02-01
+ keepassx2-http = keepassx-reboot; # added 2016-10-17
+ kerberos = libkrb5; # added 2018-04-25
keybase-go = keybase; # added 2016-08-24
krename-qt5 = krename; # added 2017-02-18
+ kvm = qemu_kvm; # added 2018-04-25
letsencrypt = certbot; # added 2016-05-16
- libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19
+ libaudit = audit; # added 2018-04-25
libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25
libcanberra_gtk3 = libcanberra-gtk3; # added 2018-02-25
libcap_manpages = libcap.doc; # added 2016-04-29
libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29
libcap_progs = libcap.out; # added 2016-04-29
+ libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19
+ libdbusmenu-glib = libdbusmenu; # added 2018-05-01
libgnome_keyring = libgnome-keyring; # added 2018-02-25
libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25
libgumbo = gumbo; # added 2018-01-21
libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || hostPlatform.libc != "glibc") gettext; # added 2018-03-14
libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28
+ liblrdf = librdf; # added 2018-04-25
libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient
+ librecad2 = librecad; # backwards compatibility alias, added 2015-10
+ libsysfs = sysfsutils; # added 2018-04-25
libtidy = html-tidy; # added 2014-12-21
+ libudev = udev; # added 2018-04-25
links = links2; # added 2016-01-31
lttngTools = lttng-tools; # added 2014-07-31
lttngUst = lttng-ust; # added 2014-07-31
- lua5_sec = luaPackages.luasec; # added 2017-05-02
lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02
lua5_expat = luaPackages.luaexpat; # added 2017-05-02
+ lua5_sec = luaPackages.luasec; # added 2017-05-02
+ lzma = xz; # added 2018-04-25
m3d-linux = m33-linux; # added 2016-08-13
- manpages = man-pages; # added 2015-12-06
man_db = man-db; # added 2016-05
- piwik = matomo; # added 2018-01-16
+ manpages = man-pages; # added 2015-12-06
midoriWrapper = midori; # added 2015-01
mlt-qt5 = libsForQt5.mlt; # added 2015-12-19
mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25
module_init_tools = kmod; # added 2016-04-22
+ msf = metasploit; # added 2018-04-25
mssys = ms-sys; # added 2015-12-13
multipath_tools = multipath-tools; # added 2016-01-21
mupen64plus1_5 = mupen64plus; # added 2016-02-12
+ mysql = mariadb; # added 2018-04-25
mysqlWorkbench = mysql-workbench; # added 2017-01-19
+ nagiosPluginsOfficial = monitoring-plugins;
ncat = nmap; # added 2016-01-26
netcat-openbsd = libressl.nc; # added 2018-04-25
networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25
@@ -145,33 +190,43 @@ mapAliases (rec {
networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25
networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25
networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25
- nmap_graphical = nmap-graphical; # added 2017-01-19
nfsUtils = nfs-utils; # added 2014-12-06
+ nginxUnstable = nginxMainline; # added 2018-04-25
+ nilfs_utils = nilfs-utils; # added 2018-04-25
+ nmap_graphical = nmap-graphical; # added 2017-01-19
+ nologin = shadow; # added 2018-04-25
+ openal = openalSoft; # added 2018-04-25
+ opencascade_oce = opencascade; # added 2018-04-25
opencl-icd = ocl-icd; # added 2017-01-20
+ openexr_ctl = ctl; # added 2018-04-25
openssh_with_kerberos = openssh; # added 2018-01-28
owncloudclient = owncloud-client; # added 2016-08
p11_kit = p11-kit; # added 2018-02-25
pgp-tools = signing-party; # added 2017-03-26
pidgin-with-plugins = pidgin; # added 2016-06
- pidginlatexSF = pidgin-latex; # added 2014-11-02
pidginlatex = pidgin-latex; # added 2018-01-08
+ pidginlatexSF = pidgin-latex; # added 2014-11-02
pidginmsnpecan = pidgin-msn-pecan; # added 2018-01-08
- pidginotr = pidgin-otr; # added 2018-01-08
pidginosd = pidgin-osd; # added 2018-01-08
+ pidginotr = pidgin-otr; # added 2018-01-08
pidginsipe = pidgin-sipe; # added 2018-01-08
pidginwindowmerge = pidgin-window-merge; # added 2018-01-08
- postage = pgmanage; # added 2017-11-03
+ piwik = matomo; # added 2018-01-16
+ pltScheme = racket; # just to be sure
+ polarssl = mbedtls; # added 2018-04-25
poppler_qt5 = libsForQt5.poppler; # added 2015-12-19
- PPSSPP = ppsspp; # added 2017-10-01
+ postage = pgmanage; # added 2017-11-03
+ procps = procps-ng; # added 2018-04-25
prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27
+ pulseaudioLight = pulseaudio; # added 2018-04-25
qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19
- QmidiNet = qmidinet; # added 2016-05-22
qt_gstreamer = qt-gstreamer; # added 2017-02
qt_gstreamer1 = qt-gstreamer1; # added 2017-02
quake3game = ioquake3; # added 2016-01-14
qwt6 = libsForQt5.qwt; # added 2015-12-19
rdiff_backup = rdiff-backup; # added 2014-11-23
rdmd = dtools; # added 2017-08-19
+ redland = librdf_redland; # added 2018-04-25
robomongo = robo3t; #added 2017-09-28
rssglx = rss-glx; #added 2015-03-25
ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby";
@@ -182,24 +237,33 @@ mapAliases (rec {
ruby_2_5_0 = throw "deprecated 2018-0213: use ruby_2_5 instead";
rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby";
rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02
+ sam = deadpixi-sam; # added 2018-04-25
samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25
saneBackends = sane-backends; # added 2016-01-02
saneBackendsGit = sane-backends-git; # added 2016-01-02
saneFrontends = sane-frontends; # added 2016-01-02
scim = sc-im; # added 2016-01-22
+ scollector = bosun; # added 2018-04-25
shared_mime_info = shared-mime-info; # added 2018-02-25
skrooge2 = skrooge; # added 2017-02-18
skype = skypeforlinux; # added 2017-07-27
+ slurm-llnl = slurm; # renamed July 2017
+ slurm-llnl-full = slurm-full; # renamed July 2017
+ slurm-full = slurm; # added 2018-05-1
+ smbclient = samba; # added 2018-04-25
spaceOrbit = space-orbit; # addewd 2016-05-23
+ speech_tools = speech-tools; # added 2018-04-25
speedtest_cli = speedtest-cli; # added 2015-02-17
spice_gtk = spice-gtk; # added 2018-02-25
spice_protocol = spice-protocol; # added 2018-02-25
sqliteInteractive = sqlite-interactive; # added 2014-12-06
sshfs = sshfs-fuse; # added 2017-08-14
sshfsFuse = sshfs-fuse; # added 2016-09
+ suil-qt5 = suil; # added 2018-05-01
surf-webkit2 = surf; # added 2017-04-02
- tahoelafs = tahoe-lafs; # added 2018-03-26
system_config_printer = system-config-printer; # added 2016-01-03
+ systool = sysfsutils; # added 2018-04-25
+ tahoelafs = tahoe-lafs; # added 2018-03-26
telepathy_farstream = telepathy-farstream; # added 2018-02-25
telepathy_gabble = telepathy-gabble; # added 2018-02-25
telepathy_glib = telepathy-glib; # added 2018-02-25
@@ -215,9 +279,12 @@ mapAliases (rec {
tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03
tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03
tftp_hpa = tftp-hpa; # added 2015-04-03
+ trang = jing-trang; # added 2018-04-25
transmission_gtk = transmission-gtk; # added 2018-01-06
transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06
+ tshark = wireshark-cli; # added 2018-04-25
ucsFonts = ucs-fonts; # added 2016-07-15
+ udev = systemd; # added 2018-04-25
ultrastardx-beta = ultrastardx; # added 2017-08-12
usb_modeswitch = usb-modeswitch; # added 2016-05-10
vimbWrapper = vimb; # added 2015-01
@@ -227,8 +294,13 @@ mapAliases (rec {
wineStaging = wine-staging; # added 2018-01-08
winusb = woeusb; # added 2017-12-22
x11 = xlibsWrapper; # added 2015-09
+ xbmc = kodi; # added 2018-04-25
+ xbmcPlain = kodiPlain; # added 2018-04-25
+ xbmcPlugins = kodiPlugins; # added 2018-04-25
+ xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01
xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
xlibs = xorg; # added 2015-09
+ yacc = bison; # added 2018-04-25
youtubeDL = youtube-dl; # added 2014-10-26
# added 2017-05-27
@@ -246,6 +318,20 @@ mapAliases (rec {
ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02
ocamlPackages_4_03
ocamlPackages_latest;
+
+ gst_all = { # added 2018-04-25
+ inherit (pkgs) gstreamer gnonlin gst-python qt-gstreamer;
+ gstPluginsBase = pkgs.gst-plugins-base;
+ gstPluginsBad = pkgs.gst-plugins-bad;
+ gstPluginsGood = pkgs.gst-plugins-good;
+ gstPluginsUgly = pkgs.gst-plugins-ugly;
+ gstFfmpeg = pkgs.gst-ffmpeg;
+ gst-plugins-base = pkgs.gst-plugins-base;
+ gst-plugins-bad = pkgs.gst-plugins-bad;
+ gst-plugins-good = pkgs.gst-plugins-good;
+ gst-plugins-ugly = pkgs.gst-plugins-ugly;
+ gst-ffmpeg = pkgs.gst-ffmpeg;
+ };
} // (with ocaml-ng; { # added 2016-09-14
ocaml_3_08_0 = ocamlPackages_3_08_0.ocaml;
ocaml_3_10_0 = ocamlPackages_3_10_0.ocaml;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24dd47dc63a..024ba944ad4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -952,7 +952,6 @@ with pkgs;
calamares = libsForQt5.callPackage ../tools/misc/calamares {
python = python3;
boost = pkgs.boost.override { python = python3; };
- libyamlcpp = callPackage ../development/libraries/libyaml-cpp { inherit boost; };
};
capstone = callPackage ../development/libraries/capstone { };
@@ -1625,13 +1624,13 @@ with pkgs;
ciopfs = callPackage ../tools/filesystems/ciopfs { };
- citrix_receiver = hiPrio citrix_receiver_13_9_0;
- citrix_receiver_13_9_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.9.0"; };
- citrix_receiver_13_8_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.8.0"; };
- citrix_receiver_13_7_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.7.0"; };
- citrix_receiver_13_6_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.6.0"; };
- citrix_receiver_13_5_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.5.0"; };
- citrix_receiver_13_4_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.4.0"; };
+ citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver { };
+ citrix_receiver_13_9_0 = citrix_receiver.override { version = "13.9.0"; };
+ citrix_receiver_13_8_0 = citrix_receiver.override { version = "13.8.0"; };
+ citrix_receiver_13_7_0 = citrix_receiver.override { version = "13.7.0"; };
+ citrix_receiver_13_6_0 = citrix_receiver.override { version = "13.6.0"; };
+ citrix_receiver_13_5_0 = citrix_receiver.override { version = "13.5.0"; };
+ citrix_receiver_13_4_0 = citrix_receiver.override { version = "13.4.0"; };
citra = libsForQt5.callPackage ../misc/emulators/citra { };
@@ -2342,9 +2341,6 @@ with pkgs;
flamegraph = callPackage ../development/tools/flamegraph { };
- # Awkward historical capitalization for flamegraph. Remove eventually
- flameGraph = flamegraph;
-
flvtool2 = callPackage ../tools/video/flvtool2 { };
fmbt = callPackage ../development/tools/fmbt {
@@ -2354,7 +2350,7 @@ with pkgs;
fontforge = lowPrio (callPackage ../tools/misc/fontforge {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
});
- fontforge-gtk = callPackage ../tools/misc/fontforge {
+ fontforge-gtk = fontforge.override {
withSpiro = true;
withGTK = true;
gtk2 = gtk2-x11;
@@ -2469,7 +2465,7 @@ with pkgs;
gazebo7 = callPackage ../applications/science/robotics/gazebo { };
- gazebo7-headless = callPackage ../applications/science/robotics/gazebo { withHeadless = true; };
+ gazebo7-headless = gazebo7.override { withHeadless = true; };
};
@@ -2715,11 +2711,11 @@ with pkgs;
grub2_full = callPackage ../tools/misc/grub/2.0x.nix { };
- grub2_efi = grub2_full.override {
+ grub2_efi = grub2.override {
efiSupport = true;
};
- grub2_light = grub2_full.override {
+ grub2_light = grub2.override {
zfsSupport = false;
};
@@ -2747,7 +2743,6 @@ with pkgs;
gt5 = callPackage ../tools/system/gt5 { };
gtest = callPackage ../development/libraries/gtest {};
- gmock = gtest;
gbenchmark = callPackage ../development/libraries/gbenchmark {};
gtkdatabox = callPackage ../development/libraries/gtkdatabox {};
@@ -3398,6 +3393,14 @@ with pkgs;
nodejs-9_x = callPackage ../development/web/nodejs/v9.nix {};
nodejs-slim-9_x = callPackage ../development/web/nodejs/v9.nix { enableNpm = false; };
+ nodejs-10_x = callPackage ../development/web/nodejs/v10.nix {
+ openssl = openssl_1_1_0;
+ };
+ nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix {
+ enableNpm = false;
+ openssl = openssl_1_1_0;
+ };
+
nodePackages_8_x = callPackage ../development/node-packages/default-v8.nix {
nodejs = pkgs.nodejs-8_x;
};
@@ -3408,9 +3411,6 @@ with pkgs;
nodePackages = nodePackages_6_x;
- # Can be used as a user shell
- nologin = shadow;
-
npm2nix = nodePackages.npm2nix;
file-rename = callPackage ../tools/filesystems/file-rename { };
@@ -3501,7 +3501,7 @@ with pkgs;
libiberty = callPackage ../development/libraries/libiberty { };
- libiberty_static = callPackage ../development/libraries/libiberty { staticBuild = true; };
+ libiberty_static = libiberty.override { staticBuild = true; };
libibverbs = callPackage ../development/libraries/libibverbs { };
@@ -3571,8 +3571,6 @@ with pkgs;
lzip = callPackage ../tools/compression/lzip { };
- lzma = xz;
-
xz = callPackage ../tools/compression/xz { };
lz4 = callPackage ../tools/compression/lz4 { };
@@ -3730,12 +3728,14 @@ with pkgs;
mitmproxy = callPackage ../tools/networking/mitmproxy { };
- mjpegtoolsFull = callPackage ../tools/video/mjpegtools { };
-
- mjpegtools = self.mjpegtoolsFull.override {
+ mjpegtools = callPackage ../tools/video/mjpegtools {
withMinimal = true;
};
+ mjpegtoolsFull = mjpegtools.override {
+ withMinimal = false;
+ };
+
mkcue = callPackage ../tools/cd-dvd/mkcue { };
mkpasswd = hiPrio (callPackage ../tools/security/mkpasswd { });
@@ -3782,7 +3782,6 @@ with pkgs;
mscgen = callPackage ../tools/graphics/mscgen { };
metasploit = callPackage ../tools/security/metasploit { };
- msf = metasploit;
ms-sys = callPackage ../tools/misc/ms-sys { };
@@ -3959,7 +3958,6 @@ with pkgs;
nifskope = callPackage ../tools/graphics/nifskope { };
nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {};
- nilfs_utils = nilfs-utils;
nitrogen = callPackage ../tools/X11/nitrogen {};
@@ -3975,7 +3973,7 @@ with pkgs;
nmap = callPackage ../tools/security/nmap { };
- nmap-graphical = callPackage ../tools/security/nmap {
+ nmap-graphical = nmap.override {
graphicalSupport = true;
};
@@ -4319,28 +4317,27 @@ with pkgs;
philter = callPackage ../tools/networking/philter { };
- pinentry = pinentry_ncurses.override {
- inherit gtk2;
+ pinentry = callPackage ../tools/security/pinentry {
+ libcap = if stdenv.isDarwin then null else libcap;
};
- pinentry_ncurses = callPackage ../tools/security/pinentry {
- libcap = if stdenv.isDarwin then null else libcap;
+ pinentry_ncurses = pinentry.override {
gtk2 = null;
};
- pinentry_emacs = pinentry_ncurses.override {
+ pinentry_emacs = pinentry.override {
enableEmacs = true;
};
- pinentry_gnome = pinentry_ncurses.override {
+ pinentry_gnome = pinentry.override {
gcr = gnome3.gcr;
};
- pinentry_qt4 = pinentry_ncurses.override {
+ pinentry_qt4 = pinentry.override {
qt = qt4;
};
- pinentry_qt5 = pinentry_ncurses.override {
+ pinentry_qt5 = pinentry.override {
qt = qt5.qtbase;
};
@@ -4363,7 +4360,7 @@ with pkgs;
plan9port = callPackage ../tools/system/plan9port { };
platformioPackages = callPackage ../development/arduino/platformio { };
- platformio = platformioPackages.platformio-chrootenv.override {};
+ platformio = platformioPackages.platformio-chrootenv;
platinum-searcher = callPackage ../tools/text/platinum-searcher { };
@@ -4861,7 +4858,6 @@ with pkgs;
};
silver-searcher = callPackage ../tools/text/silver-searcher { };
- ag = self.silver-searcher;
simpleproxy = callPackage ../tools/networking/simpleproxy { };
@@ -5041,8 +5037,8 @@ with pkgs;
});
strongswan = callPackage ../tools/networking/strongswan { };
- strongswanTNC = callPackage ../tools/networking/strongswan { enableTNC = true; };
- strongswanNM = callPackage ../tools/networking/strongswan { enableNetworkManager = true; };
+ strongswanTNC = strongswan.override { enableTNC = true; };
+ strongswanNM = strongswan.override { enableNetworkManager = true; };
su = shadow.su;
@@ -5497,8 +5493,6 @@ with pkgs;
tradcpp = callPackage ../development/tools/tradcpp { };
- trang = self.jing-trang;
-
tre = callPackage ../development/libraries/tre { };
ts = callPackage ../tools/system/ts { };
@@ -5855,15 +5849,13 @@ with pkgs;
runtimeShell = "${runtimeShellPackage}/bin/bash";
runtimeShellPackage = bash;
- bash = lowPrio (callPackage ../shells/bash/4.4.nix {
- texinfo = null;
- interactive = stdenv.isCygwin; # patch for cygwin requires readline support
- });
+ bash = lowPrio (callPackage ../shells/bash/4.4.nix { });
# WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed
- bashInteractive = appendToName "interactive" (callPackage ../shells/bash/4.4.nix {
+ bashInteractive = callPackage ../shells/bash/4.4.nix {
interactive = true;
- });
+ withDocs = true;
+ };
bash-completion = callPackage ../shells/bash/bash-completion { };
@@ -6115,8 +6107,6 @@ with pkgs;
stripped = false;
}));
- gccApple = throw "gccApple is no longer supported";
-
libstdcxxHook = makeSetupHook
{ substitutions = { gcc = gcc-unwrapped; }; }
../development/compilers/gcc/libstdc++-hook.sh;
@@ -6142,7 +6132,6 @@ with pkgs;
libc = libcCross1;
};
in wrapCCWith {
- name = "gcc-cross-wrapper";
cc = gccFun {
# copy-pasted
inherit noSysDirs;
@@ -6466,18 +6455,19 @@ with pkgs;
hugs = callPackage ../development/interpreters/hugs { };
+ bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; };
+
openjdk8 =
if stdenv.isDarwin then
callPackage ../development/compilers/openjdk/darwin/8.nix { }
else
callPackage ../development/compilers/openjdk/8.nix {
- bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; };
+ bootjdk = bootjdk.override { version = "8"; };
inherit (gnome2) GConf gnome_vfs;
};
openjdk10 =
callPackage ../development/compilers/openjdk/10.nix {
- bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; };
inherit (gnome2) GConf gnome_vfs;
};
@@ -6700,7 +6690,7 @@ with pkgs;
xlibsWrapper = null;
};
- mitschemeX11 = callPackage ../development/compilers/mit-scheme {
+ mitschemeX11 = mitscheme.override {
texLive = texlive.combine { inherit (texlive) scheme-small; };
texinfo = texinfo5;
enableX11 = true;
@@ -7055,7 +7045,7 @@ with pkgs;
gtk2 = gtk2-x11;
};
- lxappearance-gtk3 = callPackage ../desktops/lxde/core/lxappearance {
+ lxappearance-gtk3 = lxappearance.override {
withGtk3 = true;
};
@@ -7155,7 +7145,7 @@ with pkgs;
octaveHg = lowPrio (callPackage ../development/interpreters/octave/hg.nix hgOctaveOptions);
}) octave octaveHg;
- octaveFull = (lowPrio (callPackage ../development/interpreters/octave {
+ octaveFull = (lowPrio (octave.override {
qt = qt4;
overridePlatforms = ["x86_64-linux" "x86_64-darwin"];
openblas = if stdenv.isDarwin then openblasCompat else openblas;
@@ -7209,8 +7199,6 @@ with pkgs;
picolisp = callPackage ../development/interpreters/picolisp {};
- pltScheme = racket; # just to be sure
-
polyml = callPackage ../development/compilers/polyml { };
polyml56 = callPackage ../development/compilers/polyml/5.6.nix { };
@@ -7384,22 +7372,21 @@ with pkgs;
amdadlsdk = callPackage ../development/misc/amdadl-sdk { };
- amdappsdk26 = callPackage ../development/misc/amdapp-sdk {
+ amdappsdk26 = amdappsdk.override {
version = "2.6";
};
- amdappsdk27 = callPackage ../development/misc/amdapp-sdk {
+ amdappsdk27 = amdappsdk.override {
version = "2.7";
};
- amdappsdk28 = callPackage ../development/misc/amdapp-sdk {
+ amdappsdk28 = amdappsdk.override {
version = "2.8";
};
- amdappsdk = amdappsdk28;
+ amdappsdk = callPackage ../development/misc/amdapp-sdk { };
- amdappsdkFull = callPackage ../development/misc/amdapp-sdk {
- version = "2.8";
+ amdappsdkFull = amdappsdk.override {
samples = true;
};
@@ -7496,17 +7483,15 @@ with pkgs;
antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix { };
antlr4 = antlr4_7;
+ apacheAnt = callPackage ../development/tools/build-managers/apache-ant { };
+ apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
ant = apacheAnt;
- apacheAnt = callPackage ../development/tools/build-managers/apache-ant { };
-
- apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
-
- apacheKafka = apacheKafka_1_0;
- apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; };
- apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; };
- apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; };
- apacheKafka_1_0 = callPackage ../servers/apache-kafka { majorVersion = "1.0"; };
+ apacheKafka_1_0 = apacheKafka.override { majorVersion = "1.0"; };
+ apacheKafka_0_9 = apacheKafka.override { majorVersion = "0.9"; };
+ apacheKafka_0_10 = apacheKafka.override { majorVersion = "0.10"; };
+ apacheKafka_0_11 = apacheKafka.override { majorVersion = "0.11"; };
+ apacheKafka = callPackage ../servers/apache-kafka { };
kt = callPackage ../tools/misc/kt {};
@@ -7866,8 +7851,6 @@ with pkgs;
flexcpp = callPackage ../development/tools/parsing/flexc++ { };
- m4 = gnum4;
-
geis = callPackage ../development/libraries/geis {
inherit (xorg) libX11 libXext libXi libXtst;
};
@@ -7883,6 +7866,7 @@ with pkgs;
gnome-usage = callPackage ../applications/misc/gnome-usage {};
gnum4 = callPackage ../development/tools/misc/gnum4 { };
+ m4 = gnum4;
gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { };
gnumake3 = gnumake382;
@@ -8193,7 +8177,7 @@ with pkgs;
remake = callPackage ../development/tools/build-managers/remake { };
retdec = callPackage ../development/tools/analysis/retdec { };
- retdec-full = callPackage ../development/tools/analysis/retdec {
+ retdec-full = retdec.override {
withPEPatterns = true;
};
@@ -8372,8 +8356,6 @@ with pkgs;
};
xxdiff-tip = libsForQt5.callPackage ../development/tools/misc/xxdiff/tip.nix { };
- yacc = bison;
-
yaml2json = callPackage ../development/tools/yaml2json { };
ycmd = callPackage ../development/tools/misc/ycmd {
@@ -8696,11 +8678,6 @@ with pkgs;
dbus-sharp-glib-1_0 = callPackage ../development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix { };
dbus-sharp-glib-2_0 = callPackage ../development/libraries/dbus-sharp-glib { };
- # FIXME: deprecate these.
- dbus_tools = dbus.out;
- dbus_libs = dbus;
- dbus_daemon = dbus.daemon;
-
makeDBusConf = { suidHelper, serviceDirectories }:
callPackage ../development/libraries/dbus/make-dbus-conf.nix {
inherit suidHelper serviceDirectories;
@@ -8923,8 +8900,6 @@ with pkgs;
funambol = callPackage ../development/libraries/funambol { };
- fam = gamin;
-
gamin = callPackage ../development/libraries/gamin { };
ganv = callPackage ../development/libraries/ganv { };
@@ -8976,8 +8951,6 @@ with pkgs;
gettext = callPackage ../development/libraries/gettext { };
- gflags = google-gflags;
-
gf2x = callPackage ../development/libraries/gf2x {};
gd = callPackage ../development/libraries/gd {
@@ -9039,7 +9012,7 @@ with pkgs;
stdenv = crossLibcStdenv;
};
- muslCross = callPackage ../os-specific/linux/musl {
+ muslCross = musl.override {
stdenv = crossLibcStdenv;
};
@@ -9136,22 +9109,6 @@ with pkgs;
callPackage = pkgs.newScope (pkgs // { libav = pkgs.ffmpeg; });
});
- gst_all = {
- inherit (pkgs) gstreamer gnonlin gst-python qt-gstreamer;
- gstPluginsBase = pkgs.gst-plugins-base;
- gstPluginsBad = pkgs.gst-plugins-bad;
- gstPluginsGood = pkgs.gst-plugins-good;
- gstPluginsUgly = pkgs.gst-plugins-ugly;
- gstFfmpeg = pkgs.gst-ffmpeg;
-
- # aliases with the dashed naming, same as in gst_all_1
- gst-plugins-base = pkgs.gst-plugins-base;
- gst-plugins-bad = pkgs.gst-plugins-bad;
- gst-plugins-good = pkgs.gst-plugins-good;
- gst-plugins-ugly = pkgs.gst-plugins-ugly;
- gst-ffmpeg = pkgs.gst-ffmpeg;
- };
-
gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer {
bison = bison2;
};
@@ -9318,12 +9275,14 @@ with pkgs;
gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { };
gtk-mac-integration = callPackage ../development/libraries/gtk-mac-integration {
+ gtk = gtk3;
+ };
+
+ gtk-mac-integration-gtk2 = gtk-mac-integration.override {
gtk = gtk2;
};
- gtk-mac-integration-gtk3 = callPackage ../development/libraries/gtk-mac-integration {
- gtk = gtk3;
- };
+ gtk-mac-integration-gtk3 = gtk-mac-integration;
gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler {};
@@ -9351,15 +9310,11 @@ with pkgs;
hamlib = callPackage ../development/libraries/hamlib { };
- # TODO : Let admin choose.
- # We are using mit-krb5 because it is better maintained
- kerberos = libkrb5;
-
- heimdalFull = callPackage ../development/libraries/kerberos/heimdal.nix { };
- libheimdal = heimdalFull.override { type = "lib"; };
+ heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
+ libheimdal = heimdal.override { type = "lib"; };
harfbuzz = callPackage ../development/libraries/harfbuzz { };
- harfbuzz-icu = callPackage ../development/libraries/harfbuzz {
+ harfbuzz-icu = harfbuzz.override {
withIcu = true;
withGraphite2 = true;
};
@@ -9409,7 +9364,7 @@ with pkgs;
hwloc = callPackage ../development/libraries/hwloc {};
- hwloc-nox = callPackage ../development/libraries/hwloc {
+ hwloc-nox = hwloc.override {
x11Support = false;
};
@@ -9546,10 +9501,11 @@ with pkgs;
kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { };
- krb5Full = callPackage ../development/libraries/kerberos/krb5.nix {
+ krb5 = callPackage ../development/libraries/kerberos/krb5.nix {
inherit (darwin) bootstrap_cmds;
};
- libkrb5 = krb5Full.override {
+ krb5Full = krb5;
+ libkrb5 = krb5.override {
fetchurl = fetchurlBoot;
type = "lib";
};
@@ -9608,8 +9564,9 @@ with pkgs;
libaom = callPackage ../development/libraries/libaom { };
- libappindicator-gtk2 = callPackage ../development/libraries/libappindicator { gtkVersion = "2"; };
- libappindicator-gtk3 = callPackage ../development/libraries/libappindicator { gtkVersion = "3"; };
+ libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; };
+ libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; };
+ libappindicator = callPackage ../development/libraries/libappindicator { };
libarchive = callPackage ../development/libraries/libarchive { };
@@ -9741,18 +9698,16 @@ with pkgs;
libdbi = callPackage ../development/libraries/libdbi { };
- libdbiDriversBase = callPackage ../development/libraries/libdbi-drivers {
+ libdbiDriversBase = libdbiDrivers.override {
mysql = null;
sqlite = null;
};
- libdbiDrivers = libdbiDriversBase.override {
- inherit sqlite mysql;
- };
+ libdbiDrivers = callPackage ../development/libraries/libdbi-drivers { };
- libdbusmenu-glib = callPackage ../development/libraries/libdbusmenu { };
- libdbusmenu-gtk2 = callPackage ../development/libraries/libdbusmenu { gtkVersion = "2"; };
- libdbusmenu-gtk3 = callPackage ../development/libraries/libdbusmenu { gtkVersion = "3"; };
+ libdbusmenu = callPackage ../development/libraries/libdbusmenu { };
+ libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; };
+ libdbusmenu-gtk3 = libdbusmenu.override { gtkVersion = "3"; };
libdbusmenu_qt = callPackage ../development/libraries/libdbusmenu-qt { };
@@ -9831,7 +9786,7 @@ with pkgs;
libfilezilla = callPackage ../development/libraries/libfilezilla { };
libfm = callPackage ../development/libraries/libfm { };
- libfm-extra = callPackage ../development/libraries/libfm {
+ libfm-extra = libfm.override {
extraOnly = true;
};
@@ -9876,8 +9831,6 @@ with pkgs;
liblo = callPackage ../development/libraries/liblo { };
- liblrdf = librdf;
-
liblscp = callPackage ../development/libraries/liblscp { };
libe-book = callPackage ../development/libraries/libe-book {};
@@ -9974,11 +9927,13 @@ with pkgs;
libimobiledevice = callPackage ../development/libraries/libimobiledevice { };
- libindicate-gtk2 = callPackage ../development/libraries/libindicate { gtkVersion = "2"; };
- libindicate-gtk3 = callPackage ../development/libraries/libindicate { gtkVersion = "3"; };
+ libindicate-gtk2 = libindicate.override { gtkVersion = "2"; };
+ libindicate-gtk3 = libindicate.override { gtkVersion = "3"; };
+ libindicate = callPackage ../development/libraries/libindicate { };
- libindicator-gtk2 = callPackage ../development/libraries/libindicator { gtkVersion = "2"; };
- libindicator-gtk3 = callPackage ../development/libraries/libindicator { gtkVersion = "3"; };
+ libindicator-gtk2 = libindicator.override { gtkVersion = "2"; };
+ libindicator-gtk3 = libindicator.override { gtkVersion = "3"; };
+ libindicator = callPackage ../development/libraries/libindicator { };
libiodbc = callPackage ../development/libraries/libiodbc {
useGTK = config.libiodbc.gtk or false;
@@ -10572,7 +10527,7 @@ with pkgs;
luabind = callPackage ../development/libraries/luabind { lua = lua5_1; };
- luabind_luajit = callPackage ../development/libraries/luabind { lua = luajit; };
+ luabind_luajit = luabind.override { lua = luajit; };
luaffi = callPackage ../development/libraries/luaffi { lua = lua5_1; };
@@ -10730,13 +10685,13 @@ with pkgs;
notify-sharp = callPackage ../development/libraries/notify-sharp { };
- ncurses5 = callPackage ../development/libraries/ncurses {
+ ncurses5 = ncurses.override {
abiVersion = "5";
};
- ncurses6 = callPackage ../development/libraries/ncurses {
+ ncurses6 = ncurses.override {
abiVersion = "6";
};
- ncurses = ncurses6;
+ ncurses = callPackage ../development/libraries/ncurses { };
neardal = callPackage ../development/libraries/neardal { };
@@ -10810,8 +10765,6 @@ with pkgs;
oobicpl = callPackage ../development/libraries/science/biology/oobicpl { };
- openal = self.openalSoft;
-
openalSoft = callPackage ../development/libraries/openal-soft {
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox;
};
@@ -10820,8 +10773,6 @@ with pkgs;
opencascade = callPackage ../development/libraries/opencascade { };
- opencascade_oce = opencascade;
-
opencl-headersGen = v: callPackage ../development/libraries/opencl-headers { version = v; };
opencl-headers_1_2 = opencl-headersGen "12";
opencl-headers_2_2 = opencl-headersGen "22";
@@ -10850,9 +10801,6 @@ with pkgs;
enableCuda = false;
};
- # this ctl version is needed by openexr_viewers
- openexr_ctl = ctl;
-
openexr = callPackage ../development/libraries/openexr { };
openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { };
@@ -10998,8 +10946,6 @@ with pkgs;
poker-eval = callPackage ../development/libraries/poker-eval { };
- polarssl = mbedtls;
-
polkit = callPackage ../development/libraries/polkit { };
polkit_qt4 = callPackage ../development/libraries/polkit-qt-1/qt-4.nix { };
@@ -11069,7 +11015,7 @@ with pkgs;
qbs = callPackage ../development/tools/build-managers/qbs { };
qca2 = callPackage ../development/libraries/qca2 { qt = qt4; };
- qca2-qt5 = callPackage ../development/libraries/qca2 { qt = qt5.qtbase; };
+ qca2-qt5 = qca2.override { qt = qt5.qtbase; };
qimageblitz = callPackage ../development/libraries/qimageblitz {};
@@ -11234,9 +11180,7 @@ with pkgs;
withQt5 = true;
};
- phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix {
- withQt5 = true;
- };
+ phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { };
polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { };
@@ -11271,11 +11215,7 @@ with pkgs;
telepathy = callPackage ../development/libraries/telepathy/qt { };
- vlc = lowPrio (callPackage ../applications/video/vlc {
- qt4 = null;
- withQt5 = true;
- ffmpeg = ffmpeg_2;
- });
+ vlc = callPackage ../applications/video/vlc {};
qtwebkit-plugins = callPackage ../development/libraries/qtwebkit-plugins { };
@@ -11358,8 +11298,6 @@ with pkgs;
qrupdate = callPackage ../development/libraries/qrupdate { };
- redland = pkgs.librdf_redland;
-
resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { };
rhino = callPackage ../development/libraries/java/rhino {
@@ -11506,7 +11444,6 @@ with pkgs;
speechd = callPackage ../development/libraries/speechd { };
speech-tools = callPackage ../development/libraries/speech-tools {};
- speech_tools = speech-tools;
speex = callPackage ../development/libraries/speex {
fftw = fftwFloat;
@@ -11570,17 +11507,16 @@ with pkgs;
subtitleeditor = callPackage ../applications/video/subtitleeditor { };
- suil-qt4 = callPackage ../development/libraries/audio/suil {
- withQt4 = true;
- withQt5 = false;
- };
+ suil = callPackage ../development/libraries/audio/suil { };
- suil-qt5 = callPackage ../development/libraries/audio/suil {
+ suil-qt5 = suil.override {
withQt4 = false;
withQt5 = true;
};
-
- suil = suil-qt4;
+ suil-qt4 = suil.override {
+ withQt4 = true;
+ withQt5 = false;
+ };
sundials = callPackage ../development/libraries/sundials { };
@@ -11975,7 +11911,7 @@ with pkgs;
zlog = callPackage ../development/libraries/zlog { };
- zlibStatic = lowPrio (appendToName "static" (callPackage ../development/libraries/zlib {
+ zlibStatic = lowPrio (appendToName "static" (zlib.override {
static = true;
}));
@@ -12279,8 +12215,6 @@ with pkgs;
java = jdk;
};
- fuseki = apache-jena-fuseki;
-
apcupsd = callPackage ../servers/apcupsd { };
asterisk = asterisk-stable;
@@ -12302,7 +12236,6 @@ with pkgs;
bird bird6 bird2;
bosun = callPackage ../servers/monitoring/bosun { };
- scollector = bosun;
cayley = callPackage ../servers/cayley { };
@@ -12375,8 +12308,6 @@ with pkgs;
v8 = v8_6_x;
};
- etcdctl = etcd;
-
exim = callPackage ../servers/mail/exim { };
fcgiwrap = callPackage ../servers/fcgiwrap { };
@@ -12388,7 +12319,7 @@ with pkgs;
fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { };
firebird = callPackage ../servers/firebird { icu = null; stdenv = overrideCC stdenv gcc5; };
- firebirdSuper = callPackage ../servers/firebird { icu = icu58; superServer = true; stdenv = overrideCC stdenv gcc5; };
+ firebirdSuper = firebird.override { icu = icu58; superServer = true; stdenv = overrideCC stdenv gcc5; };
fleet = callPackage ../servers/fleet { };
@@ -12505,12 +12436,10 @@ with pkgs;
modules = [ nginxModules.dav nginxModules.moreheaders ];
};
- nginxUnstable = nginxMainline;
-
nginxModules = callPackage ../servers/http/nginx/modules.nix { };
# We should move to dynmaic modules and create a nginxFull package with all modules
- nginxShibboleth = callPackage ../servers/http/nginx/stable.nix {
+ nginxShibboleth = nginxStable.override {
modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders nginxModules.shibboleth ];
};
@@ -12564,13 +12493,11 @@ with pkgs;
# PulseAudio daemons
- # Name is changed to prevent use in packages;
- # please use libpulseaudio instead.
- pulseaudioLight = callPackage ../servers/pulseaudio {
+ pulseaudio = callPackage ../servers/pulseaudio {
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
};
- pulseaudioFull = callPackage ../servers/pulseaudio {
+ pulseaudioFull = pulseaudio.override {
gconf = gnome3.gconf;
x11Support = true;
jackaudioSupport = true;
@@ -12583,8 +12510,7 @@ with pkgs;
};
# libpulse implementations
-
- libpulseaudio-vanilla = callPackage ../servers/pulseaudio {
+ libpulseaudio-vanilla = pulseaudio.override {
libOnly = true;
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
};
@@ -12648,8 +12574,6 @@ with pkgs;
boost = boost159;
};
- mysql = mariadb;
-
mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { };
nagios = callPackage ../servers/monitoring/nagios { };
@@ -12657,7 +12581,6 @@ with pkgs;
munin = callPackage ../servers/monitoring/munin { };
monitoring-plugins = callPackage ../servers/monitoring/plugins { };
- nagiosPluginsOfficial = monitoring-plugins;
inherit (callPackage ../servers/monitoring/plugins/labs_consol_de.nix { inherit (perlPackages) NetSNMP; })
check-nwc-health
@@ -12694,8 +12617,8 @@ with pkgs;
qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; };
OVMF = callPackage ../applications/virtualization/OVMF { seabios = null; openssl = null; };
- OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl = null; };
- #WIP: OVMF-secureBoot = callPackage ../applications/virtualization/OVMF { seabios = null; secureBoot = true; };
+ OVMF-CSM = OVMF.override { openssl = null; };
+ #WIP: OVMF-secureBoot = OVMF.override { seabios = null; secureBoot = true; };
seabios = callPackage ../applications/virtualization/seabios { };
@@ -12813,7 +12736,6 @@ with pkgs;
deadpixi-sam-unstable = callPackage ../applications/editors/deadpixi-sam { };
deadpixi-sam = deadpixi-sam-unstable;
- sam = deadpixi-sam;
samba3 = callPackage ../servers/samba/3.x.nix { };
@@ -12825,8 +12747,6 @@ with pkgs;
samba = samba4;
- smbclient = samba;
-
# A lightweight Samba 3, useful for non-Linux-based OSes.
samba3_light = lowPrio (samba3.override {
pam = null;
@@ -12890,10 +12810,6 @@ with pkgs;
storm = callPackage ../servers/computing/storm { };
slurm = callPackage ../servers/computing/slurm { gtk2 = null; };
- slurm-llnl = slurm; # renamed July 2017
-
- slurm-full = appendToName "full" (callPackage ../servers/computing/slurm { });
- slurm-llnl-full = slurm-full; # renamed July 2017
slurm-spank-x11 = callPackage ../servers/computing/slurm-spank-x11 { };
@@ -13037,7 +12953,6 @@ with pkgs;
atop = callPackage ../os-specific/linux/atop { };
audit = callPackage ../os-specific/linux/audit { };
- libaudit = audit;
b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { };
@@ -13103,8 +13018,6 @@ with pkgs;
# `.override` clobbered. C.F. `llvmPackages` which does the same.
darwin = callPackage ./darwin-packages.nix { };
- devicemapper = lvm2;
-
disk_indicator = callPackage ../os-specific/linux/disk-indicator { };
displaylink = callPackage ../os-specific/linux/displaylink {
@@ -13166,10 +13079,10 @@ with pkgs;
fatrace = callPackage ../os-specific/linux/fatrace { };
- ffadoFull = callPackage ../os-specific/linux/ffado {
+ ffado = callPackage ../os-specific/linux/ffado {
inherit (python2Packages) python pyqt4 dbus-python;
};
- libffado = ffadoFull.override { prefix = "lib"; };
+ libffado = ffado.override { prefix = "lib"; };
fbterm = callPackage ../os-specific/linux/fbterm { };
@@ -13264,7 +13177,7 @@ with pkgs;
iwd = callPackage ../os-specific/linux/iwd { };
jfbview = callPackage ../os-specific/linux/jfbview { };
- jfbpdf = callPackage ../os-specific/linux/jfbview {
+ jfbpdf = jfbview.override {
imageSupport = false;
};
@@ -13739,8 +13652,6 @@ with pkgs;
kmod-debian-aliases = callPackage ../os-specific/linux/kmod-debian-aliases { };
- kvm = qemu_kvm;
-
libcap = callPackage ../os-specific/linux/libcap { };
libcap_ng = callPackage ../os-specific/linux/libcap-ng {
@@ -13781,14 +13692,6 @@ with pkgs;
musl-fts = callPackage ../os-specific/linux/musl/fts.nix { };
musl-getconf = callPackage ../os-specific/linux/musl/getconf.nix { };
musl-getent = callPackage ../os-specific/linux/musl/getent.nix { };
- getent =
- if hostPlatform.isMusl then musl-getent
- # This may not be right on other platforms, but preserves existing behavior
- else /* if hostPlatform.libc == "glibc" then */ glibc.bin;
-
- getconf =
- if hostPlatform.isMusl then musl-getconf
- else lib.getBin stdenv.cc.libc;
nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { }
else unixtools.nettools;
@@ -13922,8 +13825,6 @@ with pkgs;
prayer = callPackage ../servers/prayer { };
- procps = procps-ng;
-
procps-ng = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { }
else unixtools.procps;
@@ -14014,10 +13915,6 @@ with pkgs;
inherit (gnome2) libglade;
};
- # Provided with sysfsutils.
- libsysfs = sysfsutils;
- systool = sysfsutils;
-
sysklogd = callPackage ../os-specific/linux/sysklogd { };
syslinux = callPackage ../os-specific/linux/syslinux { };
@@ -14041,7 +13938,7 @@ with pkgs;
sysvinit = callPackage ../os-specific/linux/sysvinit { };
- sysvtools = callPackage ../os-specific/linux/sysvinit {
+ sysvtools = sysvinit.override {
withoutInitTools = true;
};
@@ -14094,9 +13991,6 @@ with pkgs;
cross = assert targetPlatform != buildPlatform; targetPlatform;
});
- udev = systemd;
- libudev = udev;
-
eudev = callPackage ../os-specific/linux/eudev {};
libudev0-shim = callPackage ../os-specific/linux/libudev0-shim/default.nix { };
@@ -14304,10 +14198,6 @@ with pkgs;
docbook_xsl
docbook_xsl_ns;
- docbook_xml_xslt = docbook_xsl;
-
- docbook5_xsl = docbook_xsl_ns;
-
documentation-highlighter = callPackage ../misc/documentation-highlighter { };
cabin = callPackage ../data/fonts/cabin { };
@@ -15131,7 +15021,7 @@ with pkgs;
};
codeblocks = callPackage ../applications/editors/codeblocks { };
- codeblocksFull = callPackage ../applications/editors/codeblocks { contribPlugins = true; };
+ codeblocksFull = codeblocks.override { contribPlugins = true; };
comical = callPackage ../applications/graphics/comical { };
@@ -15240,8 +15130,6 @@ with pkgs;
inherit (python3Packages) buildPythonApplication requests;
};
- dmtx = dmtx-utils;
-
dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) {
};
@@ -15371,9 +15259,6 @@ with pkgs;
ImageCaptureCore GSS ImageIO;
};
- # for backwards compatibility
- emacs25Macport_25_1 = emacs25Macport;
-
emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec {
inherit emacs;
@@ -15606,7 +15491,6 @@ with pkgs;
keepass-keepasshttp = callPackage ../applications/misc/keepass-plugins/keepasshttp { };
keepass-keepassrpc = callPackage ../applications/misc/keepass-plugins/keepassrpc { };
- keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02
exrdisplay = callPackage ../applications/graphics/exrdisplay { };
@@ -15628,9 +15512,9 @@ with pkgs;
fldigi = callPackage ../applications/audio/fldigi { };
- flink = flink_1_4;
- flink_1_3 = callPackage ../applications/networking/cluster/flink { version = "1.3"; };
- flink_1_4 = callPackage ../applications/networking/cluster/flink { version = "1.4"; };
+ flink = callPackage ../applications/networking/cluster/flink { };
+ flink_1_3 = flink.override { version = "1.3"; };
+ flink_1_4 = flink.override { version = "1.4"; };
fluidsynth = callPackage ../applications/audio/fluidsynth {
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices;
@@ -15763,19 +15647,16 @@ with pkgs;
welle-io = libsForQt5.callPackage ../applications/misc/welle-io { };
- wireshark-cli = callPackage ../applications/networking/sniffers/wireshark {
- withQt = false;
+ wireshark = callPackage ../applications/networking/sniffers/wireshark {
+ withQt = true;
withGtk = false;
inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration;
};
-
- # the cli binary is actually called tshark and often packaged under this name
- tshark = wireshark-cli;
+ wireshark-qt = wireshark;
# The GTK UI is deprecated by upstream. You probably want the QT version.
- wireshark-gtk = wireshark-cli.override { withGtk = true; };
- wireshark-qt = wireshark-cli.override { withQt = true; };
- wireshark = wireshark-qt;
+ wireshark-gtk = wireshark.override { withGtk = true; };
+ wireshark-cli = wireshark.override { withGtk = false; withQt = false; };
fbida = callPackage ../applications/graphics/fbida { };
@@ -15817,7 +15698,7 @@ with pkgs;
desktopName = "Firefox";
};
- firefox-beta-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
+ firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override {
channel = "beta";
generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix;
gconf = pkgs.gnome2.GConf;
@@ -16049,7 +15930,7 @@ with pkgs;
};
graphicsmagick = callPackage ../applications/graphics/graphicsmagick { };
- graphicsmagick_q16 = callPackage ../applications/graphics/graphicsmagick { quantumdepth = 16; };
+ graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; };
grisbi = callPackage ../applications/office/grisbi { gtk = gtk2; };
@@ -16289,13 +16170,12 @@ with pkgs;
libwebp = null;
};
- imagemagick = imagemagickBig.override {
+ imagemagick = callPackage ../applications/graphics/ImageMagick {
+ inherit (darwin.apple_sdk.frameworks) ApplicationServices;
ghostscript = null;
};
- imagemagickBig = callPackage ../applications/graphics/ImageMagick {
- inherit (darwin.apple_sdk.frameworks) ApplicationServices;
- };
+ imagemagickBig = imagemagick.override { inherit ghostscript; };
imagemagick7_light = lowPrio (imagemagick7.override {
bzip2 = null;
@@ -16548,58 +16428,39 @@ with pkgs;
libowfat = callPackage ../development/libraries/libowfat { };
librecad = callPackage ../applications/misc/librecad { };
- librecad2 = librecad; # backwards compatibility alias, added 2015-10
libreoffice = hiPrio libreoffice-still;
- libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix
- { libreoffice = callPackage ../applications/office/libreoffice {
- inherit (perlPackages) ArchiveZip CompressZlib;
- inherit (gnome2) GConf ORBit2 gnome_vfs;
- inherit (gnome3) defaultIconTheme;
- zip = zip.override { enableNLS = false; };
- fontsConf = makeFontsConf {
- fontDirectories = [
- carlito dejavu_fonts
- freefont_ttf xorg.fontmiscmisc
- liberation_ttf_v1_binary
- liberation_ttf_v2_binary
- ];
- };
- clucene_core = clucene_core_2;
- lcms = lcms2;
- harfbuzz = harfbuzz.override {
- withIcu = true; withGraphite2 = true;
- };
- # checking whether g++ supports C++14 or C++11... configure: error: no
- # Still relevant: 2018-04-13
- stdenv = overrideCC stdenv gcc5;
- };});
+ libreoffice-unwrapped =callPackage ../applications/office/libreoffice {
+ inherit (perlPackages) ArchiveZip CompressZlib;
+ inherit (gnome2) GConf ORBit2 gnome_vfs;
+ inherit (gnome3) defaultIconTheme;
+ zip = zip.override { enableNLS = false; };
+ fontsConf = makeFontsConf {
+ fontDirectories = [
+ carlito dejavu_fonts
+ freefont_ttf xorg.fontmiscmisc
+ liberation_ttf_v1_binary
+ liberation_ttf_v2_binary
+ ];
+ };
+ clucene_core = clucene_core_2;
+ lcms = lcms2;
+ harfbuzz = harfbuzz.override {
+ withIcu = true; withGraphite2 = true;
+ };
+ # checking whether g++ supports C++14 or C++11... configure: error: no
+ # Still relevant: 2018-04-13
+ stdenv = overrideCC stdenv gcc5;
+ };
- libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix
- { libreoffice = callPackage ../applications/office/libreoffice/still.nix {
- inherit (perlPackages) ArchiveZip CompressZlib;
- inherit (gnome2) GConf ORBit2 gnome_vfs;
- inherit (gnome3) defaultIconTheme;
- zip = zip.override { enableNLS = false; };
+ libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice = libreoffice-unwrapped; });
+
+ libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix {
+ libreoffice = libreoffice-unwrapped.override {
poppler = poppler_0_61;
- fontsConf = makeFontsConf {
- fontDirectories = [
- carlito dejavu_fonts
- freefont_ttf xorg.fontmiscmisc
- liberation_ttf_v1_binary
- liberation_ttf_v2_binary
- ];
- };
- clucene_core = clucene_core_2;
- lcms = lcms2;
- harfbuzz = harfbuzz.override {
- withIcu = true; withGraphite2 = true;
- };
- # checking whether g++ supports C++14 or C++11... configure: error: no
- # Still relevant: 2018-04-13; gcc6 is not enough!
- stdenv = overrideCC stdenv gcc5;
- };});
+ };
+ });
liferea = callPackage ../applications/networking/newsreaders/liferea {
inherit (gnome3) libpeas gsettings-desktop-schemas dconf;
@@ -16966,7 +16827,7 @@ with pkgs;
libsForQt5.callPackage ../applications/audio/musescore { };
mutt = callPackage ../applications/networking/mailreaders/mutt { };
- mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt {
+ mutt-with-sidebar = mutt.override {
withSidebar = true;
};
@@ -18332,15 +18193,9 @@ with pkgs;
vkeybd = callPackage ../applications/audio/vkeybd {};
- vlc = callPackage ../applications/video/vlc {
- ffmpeg = ffmpeg_2;
- };
+ vlc = libsForQt5.vlc;
- vlc_npapi = callPackage ../applications/video/vlc/plugin.nix {
- gtk = gtk2;
- };
-
- vlc_qt5 = libsForQt5.vlc;
+ vlc_qt5 = vlc;
vmpk = callPackage ../applications/audio/vmpk { };
@@ -18411,7 +18266,7 @@ with pkgs;
weechat-xmpp = callPackage ../applications/networking/instant-messengers/weechat-xmpp {};
- westonLite = callPackage ../applications/window-managers/weston {
+ westonLite = weston.override {
pango = null;
freerdp = null;
libunwind = null;
@@ -18592,15 +18447,12 @@ with pkgs;
};
kodiPlain = callPackage ../applications/video/kodi { };
- xbmcPlain = kodiPlain;
kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {});
- xbmcPlugins = kodiPlugins;
kodi = wrapKodi {
kodi = kodiPlain;
};
- xbmc = kodi;
kodi-retroarch-advanced-launchers =
callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix {
@@ -18709,21 +18561,21 @@ with pkgs;
packages = self: [];
};
- xmonad_log_applet_gnome2 = callPackage ../applications/window-managers/xmonad/log-applet {
+ xmonad_log_applet_gnome2 = xmonad_log_applet.override {
desktopSupport = "gnome2";
inherit (xfce) libxfce4util xfce4-panel;
gnome2_panel = gnome2.gnome_panel;
GConf2 = gnome2.GConf;
};
- xmonad_log_applet_gnome3 = callPackage ../applications/window-managers/xmonad/log-applet {
+ xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet {
desktopSupport = "gnome3";
inherit (xfce) libxfce4util xfce4-panel;
gnome2_panel = gnome2.gnome_panel;
GConf2 = gnome2.GConf;
};
- xmonad_log_applet_xfce = callPackage ../applications/window-managers/xmonad/log-applet {
+ xmonad_log_applet_xfce = xmonad_log_applet.override {
desktopSupport = "xfce4";
inherit (xfce) libxfce4util xfce4-panel;
gnome2_panel = gnome2.gnome_panel;
@@ -18997,10 +18849,6 @@ with pkgs;
physfs = physfs_2;
};
- # these are here for compatibility
- d1x_rebirth = dxx-rebirth;
- d2x_rebirth = dxx-rebirth;
-
inherit (callPackages ../games/dxx-rebirth/assets.nix { })
descent1-assets
descent2-assets;
@@ -19033,13 +18881,13 @@ with pkgs;
factorio = callPackage ../games/factorio { releaseType = "alpha"; };
- factorio-experimental = callPackage ../games/factorio { releaseType = "alpha"; experimental = true; };
+ factorio-experimental = factorio.override { releaseType = "alpha"; experimental = true; };
- factorio-headless = callPackage ../games/factorio { releaseType = "headless"; };
+ factorio-headless = factorio.override { releaseType = "headless"; };
- factorio-headless-experimental = callPackage ../games/factorio { releaseType = "headless"; experimental = true; };
+ factorio-headless-experimental = factorio.override { releaseType = "headless"; experimental = true; };
- factorio-demo = callPackage ../games/factorio { releaseType = "demo"; };
+ factorio-demo = factorio.override { releaseType = "demo"; };
factorio-mods = callPackage ../games/factorio/mods.nix { };
@@ -19059,7 +18907,7 @@ with pkgs;
freeciv = callPackage ../games/freeciv { };
- freeciv_gtk = callPackage ../games/freeciv {
+ freeciv_gtk = freeciv.override {
gtkClient = true;
sdlClient = false;
};
@@ -19271,7 +19119,7 @@ with pkgs;
pokerth = callPackage ../games/pokerth { };
- pokerth-server = with callPackage ../games/pokerth { }; server;
+ pokerth-server = pokerth.server;
prboom = callPackage ../games/prboom { };
@@ -19540,7 +19388,7 @@ with pkgs;
lua = lua5_2;
};
- worldofgoo_demo = callPackage ../games/worldofgoo {
+ worldofgoo_demo = worldofgoo.override {
demo = true;
};
@@ -19910,12 +19758,12 @@ with pkgs;
# and with or without atlas as a dependency. The default `liblapack` is 3.4.1
# with atlas. Atlas, when built with liblapack as a dependency, uses 3.5.0
# without atlas. Etc.
- liblapackWithAtlas = callPackage ../development/libraries/science/math/liblapack {};
- liblapackWithoutAtlas = liblapackWithAtlas.override { atlas = null; };
- liblapack_3_5_0WithAtlas = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix {};
- liblapack_3_5_0WithoutAtlas = liblapack_3_5_0WithAtlas.override { atlas = null; };
- liblapack = liblapackWithAtlas;
- liblapack_3_5_0 = liblapack_3_5_0WithAtlas;
+ liblapack = callPackage ../development/libraries/science/math/liblapack {};
+ liblapackWithAtlas = liblapack;
+ liblapackWithoutAtlas = liblapack.override { atlas = null; };
+ liblapack_3_5_0 = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix {};
+ liblapack_3_5_0WithAtlas = liblapack_3_5_0;
+ liblapack_3_5_0WithoutAtlas = liblapack_3_5_0.override { atlas = null; };
liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
@@ -20002,21 +19850,21 @@ with pkgs;
cmake = cmakeCurses;
};
- gromacsMpi = lowPrio (callPackage ../applications/science/molecular-dynamics/gromacs {
+ gromacsMpi = lowPrio (gromacs.override {
singlePrec = true;
mpiEnabled = true;
fftw = fftwSinglePrec;
cmake = cmakeCurses;
});
- gromacsDouble = lowPrio (callPackage ../applications/science/molecular-dynamics/gromacs {
+ gromacsDouble = lowPrio (gromacs.override {
singlePrec = false;
mpiEnabled = false;
fftw = fftw;
cmake = cmakeCurses;
});
- gromacsDoubleMpi = lowPrio (callPackage ../applications/science/molecular-dynamics/gromacs {
+ gromacsDoubleMpi = lowPrio (gromacs.override {
singlePrec = false;
mpiEnabled = true;
fftw = fftw;
@@ -20297,7 +20145,7 @@ with pkgs;
maxima = callPackage ../applications/science/math/maxima {
ecl = null;
};
- maxima-ecl = callPackage ../applications/science/math/maxima {
+ maxima-ecl = maxima.override {
ecl = ecl_16_1_2;
ecl-fasl = true;
sbcl = null;
@@ -20452,7 +20300,7 @@ with pkgs;
thepeg = callPackage ../development/libraries/physics/thepeg { };
yoda = callPackage ../development/libraries/physics/yoda { };
- yoda-with-root = lowPrio (callPackage ../development/libraries/physics/yoda {
+ yoda-with-root = lowPrio (yoda.override {
withRootSupport = true;
});
@@ -20673,11 +20521,11 @@ with pkgs;
# using the new configuration style proposal which is unstable
jack1 = callPackage ../misc/jackaudio/jack1.nix { };
- jack2Full = callPackage ../misc/jackaudio {
+ jack2 = callPackage ../misc/jackaudio {
libopus = libopus.override { withCustomModes = true; };
inherit (darwin.apple_sdk.frameworks) AudioToolbox CoreAudio CoreFoundation;
};
- libjack2 = jack2Full.override { prefix = "lib"; };
+ libjack2 = jack2.override { prefix = "lib"; };
keynav = callPackage ../tools/X11/keynav { };
@@ -20741,7 +20589,7 @@ with pkgs;
nix-diff = haskell.lib.justStaticExecutables haskellPackages.nix-diff;
nix-info = callPackage ../tools/nix/info { };
- nix-info-tested = callPackage ../tools/nix/info { doCheck = true; };
+ nix-info-tested = nix-info.override { doCheck = true; };
nix-index = callPackage ../tools/package-management/nix-index { };
@@ -21270,10 +21118,10 @@ with pkgs;
spdlog = callPackage ../development/libraries/spdlog { };
- dart = dart_stable;
- dart_old = callPackage ../development/interpreters/dart { version = "1.16.1"; };
- dart_stable = callPackage ../development/interpreters/dart { version = "1.24.3"; };
- dart_dev = callPackage ../development/interpreters/dart { version = "2.0.0-dev.26.0"; };
+ dart = callPackage ../development/interpreters/dart { };
+ dart_stable = dart.override { version = "1.24.3"; };
+ dart_old = dart.override { version = "1.16.1"; };
+ dart_dev = dart.override { version = "2.0.0-dev.26.0"; };
httrack = callPackage ../tools/backup/httrack { };
@@ -21406,7 +21254,8 @@ with pkgs;
# Unix tools
unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { });
inherit (unixtools) hexdump ps logger eject umount
- mount wall hostname more sysctl;
+ mount wall hostname more sysctl getconf
+ getent;
inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { }))
netbsd;
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 3da44309803..97424a10160 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -438,6 +438,8 @@ let
);
'';
+ doCheck = false; # fails to find itself
+
installTargets = [ "install" "install-unix" ];
meta = with stdenv.lib; {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a97c023ca0f..6963b3d1096 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2079,6 +2079,8 @@ in {
demjson = callPackage ../development/python-modules/demjson { };
+ deprecation = callPackage ../development/python-modules/deprecation { };
+
derpconf = callPackage ../development/python-modules/derpconf { };
deskcon = self.buildPythonPackage rec {
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 3ea873cdc7f..58c00cd84d3 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -43,7 +43,7 @@ let
jobs.ghc.x86_64-darwin
jobs.git.x86_64-darwin
jobs.go.x86_64-darwin
- jobs.mysql.x86_64-darwin
+ jobs.mariadb.x86_64-darwin
jobs.nix-repl.x86_64-darwin
jobs.nix.x86_64-darwin
jobs.nox.x86_64-darwin
@@ -99,7 +99,7 @@ let
jobs.thunderbird.x86_64-linux
# Ensure that basic stuff works on darwin
jobs.git.x86_64-darwin
- jobs.mysql.x86_64-darwin
+ jobs.mariadb.x86_64-darwin
jobs.vim.x86_64-darwin
# Ensure that UI stuff works on darwin
jobs.inkscape.x86_64-darwin
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index de676c5a421..e38f5442d3a 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -97,7 +97,8 @@ let
res self;
in res;
- aliases = self: super: import ./aliases.nix super;
+ aliases = self: super: if config.skipAliases or false then {}
+ else import ./aliases.nix super;
# stdenvOverrides is used to avoid having multiple of versions
# of certain dependencies that were used in bootstrapping the
diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index 26adcda8ee1..9b8fefaf8ba 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -1,4 +1,4 @@
-{ pkgs, buildEnv, runCommand, hostPlatform, lib }:
+{ pkgs, buildEnv, runCommand, hostPlatform, stdenv, lib }:
# These are some unix tools that are commonly included in the /usr/bin
# and /usr/sbin directory under more normal distributions. Along with
@@ -13,18 +13,22 @@
let
singleBinary = cmd: providers: let
- provider = "${lib.getBin providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd}";
+ provider = lib.getBin providers.${hostPlatform.parsed.kernel.name};
in runCommand cmd {
meta.platforms = map (n: { kernel.name = n; }) (pkgs.lib.attrNames providers);
} ''
- mkdir -p $out/bin
+ mkdir -p $out/bin $out/share/man/man1
- if ! [ -x "${provider}" ]; then
+ if ! [ -x "${provider}/bin/${cmd}" ]; then
echo "Cannot find command ${cmd}"
exit 1
fi
- ln -s "${provider}" "$out/bin/${cmd}"
+ cp "${provider}/bin/${cmd}" "$out/bin/${cmd}"
+
+ if [ -f "${provider}/share/man/man1/${cmd}.1.gz" ]; then
+ cp "${provider}/share/man/man1/${cmd}.1.gz" "$out/share/man/man1/${cmd}.1.gz"
+ fi
'';
in rec {
@@ -48,6 +52,16 @@ in rec {
eject = singleBinary "eject" {
linux = pkgs.utillinux;
};
+ getconf = singleBinary "getconf" {
+ linux = if hostPlatform.isMusl then pkgs.musl-getconf
+ else lib.getBin stdenv.cc.libc;
+ darwin = pkgs.darwin.system_cmds;
+ };
+ getent = singleBinary "getent" {
+ linux = if hostPlatform.isMusl then pkgs.musl-getent
+ # This may not be right on other platforms, but preserves existing behavior
+ else /* if hostPlatform.libc == "glibc" then */ pkgs.glibc.bin;
+ };
getopt = singleBinary "getopt" {
linux = pkgs.utillinux;
darwin = pkgs.getopt;