cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
70280 commits 1 branch 0 tags 3.7 GiB
Commit graph

70280 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
1ac0e05f69 nixos/setuid-wrappers: Build with normal mkDerivation phases 
This way the binary gets stripped & rpath-shrinked etc. as usual.
We'd seem to get a runtime reference to gcc otherwise.
 2015-10-03 14:08:55 +02:00
Tuomas Tynkkynen
cd3088455d nixos/stage-2: Build readonly-mountpoint with normal mkDerivation phases 
This way the binary gets stripped & rpath-shrinked etc. as usual.
We'd seem to get a runtime reference to gcc otherwise.

TODO: Maybe we should be able to set e.g. 'dontUnpack = true;'
to make this more pretty.
 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
95e11c3569 nixos/lightdm: Reference correct output of gdk_pixbuf 2015-10-03 14:08:54 +02:00
Tuomas Tynkkynen
92bf5c5277 nixos/x11: Refer to correct outputs of libX11 and libXext 2015-10-03 14:08:54 +02:00
Tuomas Tynkkynen
8088ad396c nixos/networking: Reference correct glibc output 2015-10-03 14:08:53 +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
c856b13067 nixos/nix-daemon: Reference correct output of openssl 2015-10-03 14:08:53 +02:00
Tuomas Tynkkynen
86919e2ae4 nixos/auto-upgrade: Reference correct xz output 2015-10-03 14:08:52 +02:00
Tuomas Tynkkynen
0b5353b319 kbd: Reference correct output of bzip2 2015-10-03 14:08:52 +02:00
Tuomas Tynkkynen
0e6d0a5868 unionfs-fuse: Fix the utillinux path hack for multiple-outputs 
Double ugh.
 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
f61176c539 Merge pull request #9543 from NixOS/staging.post-15.06 
Collection of core package updates with breaking changes
 2015-10-02 12:42:23 -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