Commit graph

60834 commits

Author SHA1 Message Date
Vladimír Čunát 32a5deb455 libffi: fixup libffi.pc, and refactor 2015-10-03 17:07:49 +02:00
Vladimír Čunát c071e4aab4 planetary-annihilation: fixup to use multiple-output paths
Hopefully... there are way too many similar references everywhere.
2015-10-03 16:49:36 +02:00
Vladimír Čunát c8d9e2fb67 orc: split dev stuff, and refactor meta 2015-10-03 16:48:44 +02:00
Tuomas Tynkkynen ad1eb36dac binutils: Don't use multiple-outputs when cross compiling 2015-10-03 16:43:23 +02:00
Tuomas Tynkkynen 77580d42ad php: Enable SSL via buildInputs
The old way doesn't seem to work with multiple outputs.
TODO: this seems to be a recurring pattern with openssl, maybe the
splitting isn't done correctly?
2015-10-03 16:42:46 +02:00
Vladimír Čunát 1858a39c9a apr: don't manually move apr-1-config
Also refactor meta.
2015-10-03 16:41:51 +02:00
Vladimír Čunát 9d19ac7d0d apparmor: fixup to use some multiple-output paths 2015-10-03 16:37:26 +02:00
Tuomas Tynkkynen 753cfbe09b libXmu: Split into multiple outputs
We need to override BITMAPDIR, since the default:
    -DBITMAPDIR=\"$(includedir)/X11/bitmaps\"
would cause cycles between the outputs. Setting it to a nonexistent path
doesn't affect the code logic, since the corresponding single-output
directory $out/include/X11/bitmaps doesn't exist either.

(cherry picked from commit 15007c88108d9c6a3bc82b22eff53175bbddf75e)
2015-10-03 16:36:21 +02:00
Vladimír Čunát 2f7568e092 guile: fixup with multiple-output libtool 2015-10-03 16:34:00 +02:00
Vladimír Čunát 9fbb83b467 openssl: fixup after merge 2015-10-03 16:28:39 +02:00
Vladimír Čunát b1a38cd40d nodejs: fixup 2015-10-03 16:28:06 +02:00
Vladimír Čunát cf7163f6f4 rustc: re-add missing file from staging
I'm not sure why it has disappeared.
Also try to fixup with multiple-output changes.
2015-10-03 16:27:04 +02:00
Vladimír Čunát f361938b21 Merge staging into closure-size
This makes gcc5 the default builder, etc.
2015-10-03 15:23:13 +02:00
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
William A. Kennington III b233ecdca6 poppler: 0.34.0 -> 0.36.0
Tested building cups-filters and rendering a pdf
2015-10-02 16:08:55 -07:00
William A. Kennington III 33f1ebb8f2 glew: 1.11.0 -> 1.13.0 2015-10-02 16:08:42 -07:00
William A. Kennington III 2ef6508c7f Merge branch 'master.upstream' into staging.post-15.06 2015-10-02 12:41:09 -07:00
William A. Kennington III ed71860928 Merge branch 'staging.upstream' into staging.post-15.06 2015-10-02 12:41:04 -07:00
William A. Kennington III a27ca029ee Merge pull request #10162 from wkennington/master.mesa
Major update mesa and bump llvm forward
2015-10-02 12:33:03 -07:00
Nikolay Amiantov 4236131295 Merge pull request #10185 from bjornfor/build-fhs-env-with-usr-include
build-fhs-chrootenv: add missing /usr/include
2015-10-02 21:51:18 +03:00
Vincent Laporte a4db37c4e9 smplayer: 14.9.0.6690 -> 15.9.0 2015-10-02 19:31:05 +02:00
vbgl 1e6f0cc139 Merge pull request #10179 from lancelotsix/update_glpk
glpk: 4.52.1 -> 4.56
2015-10-02 19:28:18 +02:00
Bjørn Forsman cd22214e0e build-fhs-chrootenv: add missing /usr/include
This patch brings the include/ directories of all specified packages to
appear under /usr/include in the FHS chroot. As per spec[1].

[1] http://www.pathname.com/fhs/pub/fhs-2.3.html#USRINCLUDEDIRECTORYFORSTANDARDINCLU
2015-10-02 19:13:41 +02:00
Luca Bruno b3d1184693 jack2: do not propagate uuid 2015-10-02 16:33:40 +02:00
Arnold Krille 3bce303e05 jackmix: Build jackmix in two flavours
Flavours are:
- *jackmix* using jack2 (default)
- *jackmix_jack1* using jack1
2015-10-02 15:42:00 +02:00
Arnold Krille 48f05f7b10 jackaudio: Add libuuid as propagatedBuildInput
The jack/jack.h includes uuid/uuid.h, therefox libuuid should be a propagated input for anything using jack.
2015-10-02 14:56:59 +02:00
Arnold Krille bb7eb9829d jackmix: init at version 0.5.2
Add jackmix to the nix pkgs.
2015-10-02 14:56:59 +02:00
Tobias Geerinckx-Rice 0e5458edac tzdata: 2015f -> 2015g
(cherry picked from commit 18b3295970)
2015-10-02 14:17:22 +02:00
Gabriel Ebner 0dfddc5a54 opensmtpd: support filters. 2015-10-02 13:01:50 +02:00
Gabriel Ebner db18b6e828 opensmtpd-extras: init at 5.7.1 2015-10-02 13:01:47 +02:00
Gabriel Ebner c5f2f2d814 opensmtpd: 5.4.5p1 -> 5.7.1p1 2015-10-02 13:01:43 +02:00
Renzo Carbonara 4902ec1c78 nvidiabl: fix for kernel >= 4 (close #10174) 2015-10-02 12:31:37 +02:00
Thomas Strobel 9e33e2365e miraclecast: init at 0.0-git-20151002 2015-10-02 12:16:37 +02:00
Thomas Strobel 26150153ba systemd: add option to build with "--enable-kdbus" 2015-10-02 12:16:27 +02:00
Eelco Dolstra 277d44f8fb linux: Update to 3.14.54 2015-10-02 12:02:27 +02:00
lethalman 5f30859a1d Merge pull request #10173 from devhell/iptraf-ng
iptraf-ng: init at 1.1.4
2015-10-02 11:40:28 +02:00
lethalman e3e6e53a1c Merge pull request #10059 from matthiasbeyer/update-neon
neon: 0.29.6 -> 0.30.1
2015-10-02 11:39:10 +02:00
lethalman e9d554580c Merge pull request #10066 from michaelpj/p/heatseeker
heatseeker: init at 1.3.0
2015-10-02 11:36:07 +02:00
lethalman 5c4dc85121 Merge pull request #10117 from laMudri/urbit
urbit: init at 2015.09.26
2015-10-02 11:28:32 +02:00
Lancelot SIX 5a7ad7d36c glpk: 4.52.1 -> 4.56 2015-10-02 09:19:30 +00:00
Aycan iRiCAN 5d952d68de snort: typo fix 2015-10-02 12:08:25 +03:00
Aycan iRiCAN 0e69d85980 snort: provide dynamic preprocessor path via wrapper 2015-10-02 11:43:03 +03:00
Vladimír Čunát 33373d939a Merge: staging with systemd 2015-10-02 10:24:41 +02:00
Aycan iRiCAN c416e4a129 Merge pull request #10178 from aycanirican/snort_inline_support
snort: introducing inline snort support via nfq daq
2015-10-02 10:27:23 +03:00
Aycan iRiCAN 8d8457d9ae add wrapProgram to buildInputs 2015-10-02 10:18:55 +03:00
Aycan iRiCAN 6b84f5cd61 snort: introducing inline snort support via nfq daq 2015-10-02 10:11:04 +03:00
Karn Kallio ff742d5475 symbola: fix zip hash and adjust documentation installation 2015-10-02 08:35:43 +02:00
Tobias Geerinckx-Rice 9594fcf5ec duff: 0.5.2 -> 2014-07-03 2015-10-02 05:34:36 +02:00
Tobias Geerinckx-Rice ab94830c60 goPackages.git-lfs: init at 1.0.0 2015-10-02 05:34:35 +02:00
Tobias Geerinckx-Rice e38fb2ea25 perlPackages.Glib: 1.313 -> 1.314 2015-10-02 05:34:35 +02:00
Tobias Geerinckx-Rice 7d78c0b84b perlPackages.Cairo: 1.105 -> 1.106 2015-10-02 05:34:35 +02:00
Tobias Geerinckx-Rice 910dfd53bd git-hub: minor clean-up
Move meta out of the way; inherit the GitHub home page from src;
`with platforms; linux` -> `platforms.linux`.
2015-10-02 05:34:34 +02:00
Tobias Geerinckx-Rice 4a92863fd5 enblend-enfuse: rename to actual package name
Retain old and unreadable "enblendenfuse" alias for compatibility.
2015-10-02 05:34:34 +02:00
Tobias Geerinckx-Rice 8c45057764 enblend-enfuse: 4.1.3 -> 4.1.4 2015-10-02 05:34:33 +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
Jude Taylor 07d9b3cded remove obsolete libunwindNative 2015-10-01 16:34:45 -07:00
Jude Taylor d4081c2f97 fix patches for both node versions 2015-10-01 16:34:42 -07:00
Martin Sturm 63e3ec8ce1 audacity: Use soundtouch
This enables change pitch (without changing tempo) and change tempo
(without changing pitch) effects.
2015-10-02 00:36:27 +02:00
devhell 66dd86d4ca iptraf-ng: init at 1.1.4
This commit adds `iptraf-ng` which is a fork of `iptraf`. The original
has not been updated in ~10 years. This fork is more modern but
development is a bit slow (last update to master 15 months ago).
Nevertheless, unlike `iptraf` this one doesn't barf around and works
properly.
2015-10-01 22:38:50 +01:00
Jude Taylor 83a5cfb260 add darwin.libobjc to some ruby gems that need it 2015-10-01 13:30:30 -07:00
Vladimír Čunát e9fcbe67b0 kde4.kdesdk-kioslaves: fix by resurrecting svn-1.8
Just bringing back pre-bc54ecd811e state as well.
2015-10-01 22:23:31 +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