Commit Graph

83932 Commits

Author SHA1 Message Date
Vladimír Čunát
c4661e9643 Merge: make dev output references explicit
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
Guillaume Maudoux
bfd522da63 setup-hooks: do not pass missing dirs to find (close #15405)
find fails when called with an inexistent search path.
That situation may arise when the output is created after by a postFixup hook.
vcunat amended the PR by clarifying one more `return` to `return 0`.
2016-05-22 12:08:01 +02:00
Vladimír Čunát
70cecb9cbd gcc: fix #15033: avoid lib64/ symlink to 32-bit lib/
This was caused by me in 90ee003240.
2016-05-22 12:03:12 +02:00
Eelco Dolstra
b8b898fbee Merge pull request #15567 from groxxda/bump/gnutar
gnutar: 1.28 -> 1.29
2016-05-20 16:11:20 +02:00
Vladimír Čunát
019e9a9aa6 Merge #15421: mariadb: wrap mysqld with --basedir 2016-05-20 10:50:13 +02:00
Robert Helgesson
34cf7934c3 expat: patch CVE-2015-1283 and CVE-2016-0718 (close #15561)
Note, CVE-2015-1283 is already patched in expat version 2.1.1 but, as
explained in the patch, the fix was insufficient.
2016-05-20 09:43:29 +02:00
Alexander Ried
1ffcc12bf6 gnutar: 1.28 -> 1.29 2016-05-20 01:51:43 +02:00
Vladimír Čunát
5eea16ee90 Merge branch 'master' into staging
... to get expat mass rebuild.
Hydra nixpkgs: ?compare=1272431
2016-05-19 15:42:18 +02:00
Bjørn Forsman
ca717d0d65 gnome-terminal: enable GNOME Shell search provider (for 3.18)
[This is a re-application of the patch that was originally written for
GNOME 3.16. It was lost during the transition to GNOME 3.18.]

Silly ./configure, it looks for dbus file from gnome-shell in the
installation tree of the package it is configuring. Fix by copying the
needed file from gnome-shell before ./configure is run.

This change makes gnome-shell a build time dependency (not runtime).
2016-05-19 13:59:16 +02:00
Nikolay Amiantov
74cba61eb0 linuxPackages.dpdk: force deterministic arch yet again 2016-05-19 13:53:24 +03:00
Frederik Rietdijk
79043d15cc build python35Packages.{blaze, pandas, scikitlearn} on Hydra
as these take a long time to build.
2016-05-19 12:05:39 +02:00
Frederik Rietdijk
295bcdfb5e Python 3 points to 3.5 instead of 3.4 (#15555)
Note that the documentation currently incorrectly states that 3 already
points to 3.5.
2016-05-19 10:55:13 +01:00
Profpatsch
28f8ca560f debian-build: fix checkinstall invocation (#15538)
Checkinstall had two problems:
1. when it was called without a version (e.g. with a derivation created
by fetchFromGitHub) it would use `src` as debian version, which caused
dpkg to fail
2. when dpkg failed, it would invoke the pager with the log, which hangs
the build

So now
1. the default version is the dummy `0.0.0`
2. the used pager is `cat`
2016-05-19 09:41:10 +01:00
Vladimír Čunát
da2788c3d7 Merge #15354: add tracefilegen and tracefilesim 2016-05-19 10:29:28 +02:00
Vladimír Čunát
70c66e9828 tracefilegen, tracefilesim: fixup source hashes
and also whitespace. This is probably due to #15469.
2016-05-19 10:27:57 +02:00
Vladimír Čunát
c02f0ade90 fix evaluation on darwin, fixing tarball job fully 2016-05-19 10:04:43 +02:00
Vladimír Čunát
99e68e7c83 ghc-*: fix evaluation when using single-output gmp 2016-05-19 10:04:42 +02:00
Tuomas Tynkkynen
e254750560 GCC: explicitly use some dev outputs 2016-05-19 10:04:41 +02:00
Tuomas Tynkkynen
1819181726 treewide: Make explicit that 'dev' output of xorgserver is used 2016-05-19 10:04:41 +02:00
Tuomas Tynkkynen
51ca347278 treewide: Make explicit that 'dev' output of libXxf86vm is used 2016-05-19 10:04:40 +02:00
Tuomas Tynkkynen
0f19dfd0ef treewide: Make explicit that 'dev' output of libXft is used 2016-05-19 10:04:40 +02:00
Tuomas Tynkkynen
b0d0752f2a treewide: Make explicit that 'dev' output of libXcursor is used 2016-05-19 10:04:39 +02:00
Tuomas Tynkkynen
c857552da8 treewide: Make explicit that 'dev' output of libX11 is used 2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen
7fb29bfa73 treewide: Make explicit that 'dev' output of zlib is used 2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen
c4ffd14184 treewide: Make explicit that 'dev' output of xorg.libX11 is used 2016-05-19 10:04:37 +02:00
Tuomas Tynkkynen
05d8174b0e treewide: Make explicit that 'dev' output of subversion is used 2016-05-19 10:04:37 +02:00
Tuomas Tynkkynen
e80e4ba2bb treewide: Make explicit that 'dev' output of sqlite is used 2016-05-19 10:04:34 +02:00
Tuomas Tynkkynen
5a8ad2d7a8 treewide: Make explicit that 'dev' output of slang is used 2016-05-19 10:03:35 +02:00
Tuomas Tynkkynen
8d473f107c treewide: Make explicit that 'dev' output of readline is used 2016-05-19 10:03:35 +02:00
Tuomas Tynkkynen
e0de3b1dc5 treewide: Make explicit that 'dev' output of qt5.qtbase is used 2016-05-19 10:03:31 +02:00
Tuomas Tynkkynen
d6d980c5df treewide: Make explicit that 'dev' output of poppler_utils is used 2016-05-19 10:02:30 +02:00
Tuomas Tynkkynen
a030794d06 treewide: Make explicit that 'dev' output of poppler_qt4 is used 2016-05-19 10:02:29 +02:00
Tuomas Tynkkynen
ebf6b3cd51 treewide: Make explicit that 'dev' output of poppler is used 2016-05-19 10:02:29 +02:00
Tuomas Tynkkynen
d42e94472d treewide: Make explicit that 'dev' output of pcre is used 2016-05-19 10:02:28 +02:00
Tuomas Tynkkynen
5152e01e87 treewide: Make explicit that 'dev' output of pango is used 2016-05-19 10:02:27 +02:00
Tuomas Tynkkynen
2a73de6e6c treewide: Make explicit that 'dev' output of openssl is used 2016-05-19 10:02:23 +02:00
Tuomas Tynkkynen
5eb01cd0ad treewide: Make explicit that 'dev' output of openldap is used 2016-05-19 10:00:50 +02:00
Tuomas Tynkkynen
99acb412ab treewide: Make explicit that 'dev' output of ncurses is used 2016-05-19 10:00:49 +02:00
Tuomas Tynkkynen
3f8b08f506 treewide: Make explicit that 'dev' output of mpfr is used 2016-05-19 10:00:49 +02:00
Tuomas Tynkkynen
3672f3edcb treewide: Make explicit that 'dev' output of libxslt is used 2016-05-19 10:00:48 +02:00
Tuomas Tynkkynen
9d5ba6ba68 treewide: Make explicit that 'dev' output of libusb1 is used 2016-05-19 10:00:47 +02:00
Tuomas Tynkkynen
b5c6069def treewide: Make explicit that 'dev' output of libusb is used 2016-05-19 10:00:47 +02:00
Tuomas Tynkkynen
ad1a47061e treewide: Make explicit that 'dev' output of libtiff is used 2016-05-19 10:00:46 +02:00
Tuomas Tynkkynen
d7071caba5 treewide: Make explicit that 'dev' output of libssh2 is used 2016-05-19 10:00:45 +02:00
Tuomas Tynkkynen
8638a08c9e treewide: Make explicit that 'dev' output of libsoup is used 2016-05-19 10:00:45 +02:00
Tuomas Tynkkynen
6c3ed5f1e1 treewide: Make explicit that 'dev' output of libsamplerate is used 2016-05-19 10:00:44 +02:00
Tuomas Tynkkynen
309b2644ac treewide: Make explicit that 'dev' output of libpng is used 2016-05-19 10:00:44 +02:00
Tuomas Tynkkynen
603dcd6263 treewide: Make explicit that 'dev' output of libnl is used 2016-05-19 10:00:43 +02:00
Tuomas Tynkkynen
be00816cab treewide: Make explicit that 'dev' output of libjpeg is used 2016-05-19 10:00:42 +02:00
Tuomas Tynkkynen
62479404ea treewide: Make explicit that 'dev' output of libidn is used 2016-05-19 10:00:42 +02:00