Commit Graph

29965 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
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
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
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
0f19dfd0ef treewide: Make explicit that 'dev' output of libXft is used 2016-05-19 10:04:40 +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
e80e4ba2bb treewide: Make explicit that 'dev' output of sqlite is used 2016-05-19 10:04:34 +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
d42e94472d treewide: Make explicit that 'dev' output of pcre is used 2016-05-19 10:02:28 +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
ad1a47061e treewide: Make explicit that 'dev' output of libtiff is used 2016-05-19 10:00:46 +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
309b2644ac treewide: Make explicit that 'dev' output of libpng is used 2016-05-19 10:00:44 +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
5ecce6b94a treewide: Make explicit that 'dev' output of libffi is used 2016-05-19 10:00:41 +02:00
Tuomas Tynkkynen
674eb400ef treewide: Make explicit that 'dev' output of libevent is used 2016-05-19 10:00:40 +02:00
Tuomas Tynkkynen
d6dc1bce76 treewide: Make explicit that 'dev' output of json_c is used 2016-05-19 10:00:39 +02:00
Tuomas Tynkkynen
47c45e2041 treewide: Make explicit that 'dev' output of gmp is used 2016-05-19 10:00:36 +02:00
Tuomas Tynkkynen
f81af4e6f0 treewide: Make explicit that 'dev' output of glib is used 2016-05-19 10:00:35 +02:00
Tuomas Tynkkynen
288912c2c4 treewide: Make explicit that 'dev' output of freetype is used 2016-05-19 10:00:34 +02:00
Tuomas Tynkkynen
8bbc3fe801 treewide: Make explicit that 'dev' output of expat is used 2016-05-19 10:00:30 +02:00
Tuomas Tynkkynen
e28e010b36 treewide: Make explicit that 'dev' output of curl is used 2016-05-19 10:00:29 +02:00
Tuomas Tynkkynen
c22f86a853 treewide: Make explicit that 'dev' output of bzip2 is used 2016-05-19 10:00:28 +02:00
Tuomas Tynkkynen
825bd69b38 treewide: Make explicit that 'dev' output of boehmgc is used 2016-05-19 10:00:27 +02:00
Tuomas Tynkkynen
9f8a22fae5 treewide: Make explicit that 'dev' output of binutils is used 2016-05-19 10:00:26 +02:00
Tuomas Tynkkynen
d298b52fd3 treewide: Make explicit that 'dev' output of aprutil is used 2016-05-19 10:00:25 +02:00
Tuomas Tynkkynen
29694b43b6 treewide: Make explicit that 'dev' output of apr is used 2016-05-19 10:00:24 +02:00
Roger Qiu
c02bc80d86 garcosim: Added tracefilegen and tracefilesim 2016-05-19 18:00:09 +10:00
Bjørn Forsman
b06ecd7f85 qtcreator: 3.6.0 -> 3.6.1 (bugfixes)
Changelog:
http://code.qt.io/cgit/qt-creator/qt-creator.git/tree/dist/changes-3.6.1.md?h=3.6
2016-05-18 21:03:40 +02:00
Joachim Fasting
455a4aebe0 Merge pull request #15540 from groxxda/fix/dust
dust: fix hash, use fetchFromGitHub, add meta
2016-05-18 19:01:19 +02:00
Alexander Ried
3e39cfe860 dust: add meta field 2016-05-18 17:31:12 +02:00
Alexander Ried
b5ae9ad3fb dust: use fetchFromGitHub (sha was broken) 2016-05-18 17:31:07 +02:00
James Cook
35c0d1aba8 Merge pull request #15526 from rycee/bump/expat
expat: 2.1.0 -> 2.1.1
2016-05-18 08:30:06 -07:00
Moritz Ulrich
29644950d4 rr: Only build native architecture.
rr wants to build itself with 32+64bit support on 64bit systems, but
this fails in recent NixOS versions as it can't find libstdc++.so.6 at
runtime.

This patch disables 32bit builds on 64bit. To debug 32bit binaries,
pkgsi686Linux.rr can be used.
2016-05-18 12:56:48 +02:00
Rok Garbas
0431fe6194 Merge pull request #15529 from holidaycheck/node-6.2.0
nodejs: 6.1.0 -> 6.2.0
2016-05-18 12:54:23 +02:00
Nikolay Amiantov
d3da0bd78f elm: add documentation on how to use update scripts and run them properly 2016-05-18 13:30:38 +03:00
Nikolay Amiantov
c366ab933d haskell.packages.ghc801.ghc: upstream tarball updated 2016-05-18 13:25:48 +03:00
Mathias Schreck
22b0cb9a72 nodejs: 6.1.0 -> 6.2.0 2016-05-18 10:31:21 +02:00
Robert Helgesson
6658077815 expat: 2.1.0 -> 2.1.1
Also remove CVE patch merged upstream and enable tests.
2016-05-17 21:20:48 +02:00