Aycan iRiCAN
4e9f5328a5
snort: move dynamic path defs to wrapper script.
2015-10-03 17:22:40 +03:00
Arseniy Seroka
c20aae96e4
Merge pull request #10209 from gebner/qutebrowser-0.4.1
...
qutebrowser: 0.4.0 -> 0.4.1
2015-10-03 16:37:37 +03:00
Gabriel Ebner
31779e6347
qutebrowser: 0.4.0 -> 0.4.1
2015-10-03 15:30:32 +02:00
Jaka Hudoklin
f660729e35
grafana service: fix package option name
2015-10-03 15:26:14 +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
Joachim Fasting
e1ca9303d2
torbrowser: 4.5.3 -> 5.0.3
...
torbrowser 5.0.3 requires gcc5, otherwise it fails with
libstdc++.so.6: version `GLIBCXX_3.4.21' not found (required by Browser/firefox)
2015-10-03 15:02:08 +02:00
Bjørn Forsman
05668fbe92
build-fhs-chrootenv: add /etc/os-release from host
...
This allows software inside the chroot to identify the host OS via the
standard /etc/os-release file.
2015-10-03 14:58:41 +02:00
Ryan Mulligan
a41d07074d
calibre-server service: configuration improvements
...
based on @eldostra feedback:
* remove user and group configuration, because it is probably
unnecessary
* remove libraryDir default
* capitalize and shorten service description
2015-10-03 05:48:46 -07: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
Peter Simons
51db26ee03
Merge pull request #10200 from matthiasbeyer/fix-davfs2
...
davfs2: Fix broken build
2015-10-03 14:34:04 +02:00
Joachim Fasting
c34cc5d54e
torbrowser: use stdenv.is64bit
2015-10-03 14:27:57 +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
Nikolay Amiantov
e2e4e59975
llvm: add debug builds support
2015-10-03 14:18:57 +03:00
Nikolay Amiantov
9d430e6446
haskell-llvm-general: fix build
2015-10-03 14:15:51 +03:00
Matthias Beyer
413d9f4177
davfs2: Set dependency of neon to neon v0.29.6
2015-10-03 13:01:31 +02:00
Matthias Beyer
3e5dbb7b78
neon: Re-add version 0.29.6
2015-10-03 13:01:31 +02:00
Vladimír Čunát
e0ebb928e1
claws-mail: use a better-maintainable URL
...
/cc maintainer @khumba.
2015-10-03 12:43:39 +02:00
devhell
c412e048b5
nload: init at 0.7.4
...
Built and tested locally.
nload is a console application which monitors network traffic and
bandwidth usage in real time. It visualizes the in- and outgoing traffic
using two graphs and provides additional info like total amount of
transfered [sic] data and min/max networking usage.
2015-10-03 11:29:51 +01:00
Arseniy Seroka
e4f0e0e50a
Merge pull request #10191 from khumba/claws-mail-3.12.0
...
claws-mail: 3.11.1 -> 3.12.0, remove priority workaround
2015-10-03 13:07:56 +03:00
Vladimír Čunát
f7d5210677
mysql55: remove lib/*.a, as probably noone needs it
...
/cc #172 .
2015-10-03 11:24:17 +02:00