Vladimír Čunát
f2cb132c34
libtiff: fixup
2015-10-03 14:37:35 +02:00
Vladimír Čunát
8c811ea13a
jasper: fixup
2015-10-03 14:37:07 +02:00
Tuomas Tynkkynen
837c104512
perl: Port multiple-output changes from 5.16 to 5.20 and 5.22
2015-10-03 14:34:13 +02:00
Tuomas Tynkkynen
0da9c49303
autogen: Split into multiple outputs
...
In particular, this avoids runtime-depending on guile.
2015-10-03 14:08:55 +02:00
Tuomas Tynkkynen
09637ac363
kernel: Don't propagate the dev output
...
The current default multiple-output propagation rules don't seem to work
too well if the dev output isn't the first one; without this we get an
unnecessary runtime reference to the kernel headers.
2015-10-03 14:08:55 +02:00
Tuomas Tynkkynen
54dcadad6c
librsvg: Reference correct output of gdk_pixbuf
2015-10-03 14:08:54 +02:00
Tuomas Tynkkynen
7cd13b9003
apache-httpd: Enable SSL via buildInputs
...
The old approach doesn't seem to work with multiple outputs.
2015-10-03 14:08:53 +02:00
Tuomas Tynkkynen
0b5353b319
kbd: Reference correct output of bzip2
2015-10-03 14:08:52 +02:00
Tuomas Tynkkynen
331aee2a61
slim: Add glibc as build input
...
I don't know why this is needed, but other cmake packages seem to need
this as well.
2015-10-03 14:08:51 +02:00
Tuomas Tynkkynen
0100b27069
imake: Add uberhack to workaround broken 'gcc -x c'
...
Our cc-wrapper is broken whenever the '-x' flag is used:
'gcc -x c foo.c -o bar' doesn't work the same way as 'gcc foo.c -o bar'
does. (Try both with NIX_DEBUG=1.)
What happens is that passing '-x' causes linker-related flags (such as
-Wl,-dynamic-linker) not to be added, just like if '-c' is passed.
The bug happens outside the multiple-outputs branch as well, but it
doesn't break imake there. It only breaks in multiple-outputs because
linking without -Wl,-dynamic-linker produces a binary with an invalid
ELF interpreter path. (Which arguably, is a bug in its own.)
2015-10-03 14:08:51 +02:00
Tuomas Tynkkynen
0054c8aa5a
python3: Use correct build inputs for multi-output deps
...
Without this, python will silently build without native extensions (e.g
openssl); this causes wget to fail its tests for instance.
vcunat added python-3.5.
2015-10-03 14:08:51 +02:00
Tuomas Tynkkynen
4be9702fe0
libffi: Don't manually move lib64 stuff
...
It breaks the i686 build. TODO: test that this doesn't break x86_64 ;)
2015-10-03 14:08:50 +02:00
Tuomas Tynkkynen
947542be6d
libxft: Fix reference to incorrect output
2015-10-03 14:08:50 +02:00
Tuomas Tynkkynen
a39f5839ea
groff: Fix multiple-output build
2015-10-03 14:08:50 +02:00
Tuomas Tynkkynen
15471a8659
gcc: Do bootstrapped compilation on MIPS and ARM as well
...
Since the multiple-output changes building a non-bootstrapped gcc
doesn't work anymore. TODO: also test if cross compilation is broken
2015-10-03 14:08:50 +02:00
Tuomas Tynkkynen
bd028b24bb
gcc 4.9: Fix multi-out fixups
...
- $out/libexec/ now contains subdirectories that we want to patchelf too
- $out/libexec/ now contains some .so and a related .la file, which must
not be passed to patchelf
2015-10-03 14:08:49 +02:00
Tuomas Tynkkynen
8a460bf953
gcc 4.8, 4.9: Revert conflicting info output
2015-10-03 14:08:49 +02:00
Tuomas Tynkkynen
61b4bdded4
gcc 4.9: Port multiple-outputs changes from gcc 4.8
2015-10-03 14:08:49 +02:00
Tuomas Tynkkynen
d844a1002f
stdenv/multiple-outputs: Fix checking of propagatedOutputs
...
'[[ ! -v "$propagatedOutputs" ]]' is incorrect and always evaluates to
true. The correct form using double brackets would be
'[[ ! -v propagatedOutputs ]]', but I strongly dislike '[[ ]]' due to
the totally different quoting rules compared to everything else in bash.
2015-10-03 14:08:48 +02:00
Tuomas Tynkkynen
52c4337356
stdenv/multiple-outputs: Guard greps with 'set +/-o pipefail'
...
This is required since #7524 is fixed ("stdenv: Errors in hooks (such as
postUnpack) get ignored")
2015-10-03 14:08:48 +02:00
Vladimír Čunát
2b67ba2ad2
pkgconfig: post-merge fixup
2015-10-03 14:08:48 +02:00
Tuomas Tynkkynen
f72376fd20
x11: Remove conflicting outputs produced by auto merge
2015-10-03 13:39:33 +02:00
Tuomas Tynkkynen
98419b2e54
flac: Remove conflicting outputs produced by auto merge
2015-10-03 13:36:16 +02:00
Vladimír Čunát
5227fb1dd5
Merge commit staging+systemd into closure-size
...
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Vladimír Čunát
33373d939a
Merge: staging with systemd
2015-10-02 10:24:41 +02:00
Tobias Geerinckx-Rice
d1047f7c12
shared-mime-info: 1.3 -> 1.5
2015-10-02 05:31:41 +02:00
Tobias Geerinckx-Rice
18b3295970
tzdata: 2015f -> 2015g
2015-10-02 05:31:41 +02:00
Vladimír Čunát
4d3198ca31
libaccounts-glib: fixup build after glib update
2015-10-01 21:37:19 +02:00
William A. Kennington III
98172435f7
Merge branch 'master.upstream' into staging.upstream
2015-10-01 10:43:44 -07:00
William A. Kennington III
14961c8781
v8: Fix compilation issue with gcc4.9+
2015-10-01 10:40:50 -07:00
Jude Taylor
ccf48cea4d
revert rubies callPackages change
2015-10-01 09:45:05 -07:00
Jude Taylor
4520a19151
add darwin libtool to nodejs 4.1.0
2015-10-01 09:20:12 -07:00
Jude Taylor
4833a37791
bring darwin libtool back into scope for node
2015-10-01 09:20:12 -07:00
Thomas Strobel
64eed4b98a
deskcon: init at 0.3
2015-10-01 18:14:03 +02:00
Jude Taylor
2b1d851e3e
add mpw
2015-10-01 08:58:28 -07:00
Jude Taylor
10054a676a
update bundler-head SHA256
2015-10-01 08:58:28 -07:00
Jude Taylor
5379504451
Merge pull request #9834 from NixOS/rubies
...
Merge Ruby versions into one file
2015-10-01 08:58:28 -07:00
Thomas Strobel
c720f06f7c
linux kernel common config: re-enable NFC support
...
As test, Linux kernels were build successfully with NFC support for 3.18.x and
for 4.1.x.
2015-10-01 17:53:51 +02:00
goibhniu
972b100b9a
Merge pull request #10167 from ardumont/update-elpy-environment
...
[python+emacs packages] Update elpy environment
2015-10-01 17:45:10 +02:00
Thomas Strobel
e0d5b14ce4
neard: enable support for Secure Elements
2015-10-01 15:30:34 +02:00
Eelco Dolstra
b23038dd80
Merge remote-tracking branch 'origin/master' into systemd-219
2015-10-01 14:17:46 +02:00
Eelco Dolstra
96e1b7eaf9
gnome-settins-daemon: Use libgudev
2015-10-01 14:17:24 +02:00
Arseniy Seroka
375ab720b3
Merge pull request #10124 from maurer/capnproto-bump
...
capnproto: 0.5.1.2 -> 0.5.3
2015-10-01 15:16:44 +03:00
Antoine R. Dumont (@ardumont)
2f5cbb1b62
emacs-packages: elpy add runtime dependencies on pythonpackages.elpy
2015-10-01 14:08:19 +02:00
Eelco Dolstra
562851a068
thunderbird: Update to 38.3.0
2015-10-01 13:54:00 +02:00
Eelco Dolstra
25bb1e10f3
firefox: Update to 41.0.1
2015-10-01 13:51:24 +02:00
taku0
57155e04a7
firefox-bin: 41.0 -> 41.0.1, thunderbird-bin: 38.2.0 -> 38.3.0
2015-10-01 20:44:37 +09:00
Arseniy Seroka
237428a938
Merge pull request #10130 from matthiasbeyer/update-avfs
...
avfs: 1.0.2 -> 1.0.3
2015-10-01 14:22:09 +03:00
Arseniy Seroka
3489413f46
Merge pull request #10131 from matthiasbeyer/update-openbox
...
openbox: 3.5.2 -> 3.6.1
2015-10-01 14:21:53 +03:00
Arseniy Seroka
e0ae584dc7
Merge pull request #10134 from matthiasbeyer/update-wmutils-core
...
wmutils-core: 1.0 -> 1.1
2015-10-01 14:21:44 +03:00