Vladimír Čunát
1197003966
fix references to ${libtool}/lib
2015-10-13 20:18:47 +02:00
Vladimír Čunát
17a3f6a6fa
icu: split into multiple outputs
2015-10-13 20:18:44 +02:00
Vladimír Čunát
e4f38fb050
xorg.xcb-util: split into multiple outputs
...
I see no references likely to break.
2015-10-05 16:00:55 +02:00
Vladimír Čunát
6d86a93c43
libevent: split into multiple outputs
...
Hopefully all references are fixed.
2015-10-05 15:58:37 +02:00
Vladimír Čunát
38313d5d87
libxml2,libxslt: split into multiple outputs
...
Fixed all references, hopefully.
libxml2Python is slightly hacky now, but it seems to work.
2015-10-05 13:44:16 +02:00
Vladimír Čunát
f8c211fd2b
fontconfig: split into multiple outputs
...
Fixed all 'fontconfig}' references as well, hopefully, ugh!
2015-10-05 12:23:56 +02:00
Vladimír Čunát
32b31398eb
xorg.libXt: re-split into multiple outputs
...
Fixed all 'libXt}' references, too.
2015-10-05 11:23:34 +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
f361938b21
Merge staging into closure-size
...
This makes gcc5 the default builder, etc.
2015-10-03 15:23:13 +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
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
947542be6d
libxft: Fix reference to incorrect output
2015-10-03 14:08:50 +02:00
Tuomas Tynkkynen
f72376fd20
x11: Remove conflicting outputs produced by auto merge
2015-10-03 13:39:33 +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
2ef6508c7f
Merge branch 'master.upstream' into staging.post-15.06
2015-10-02 12:41:09 -07: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
William A. Kennington III
98172435f7
Merge branch 'master.upstream' into staging.upstream
2015-10-01 10:43:44 -07:00
Thomas Strobel
e0d5b14ce4
neard: enable support for Secure Elements
2015-10-01 15:30:34 +02:00
Arseniy Seroka
b752952a33
Merge pull request #10132 from matthiasbeyer/update-jetty
...
jetty: 5.1.4 -> 6.1.4
2015-10-01 14:21:38 +03:00
William A. Kennington III
e7bb9e1023
Merge branch 'master.upstream' into staging.upstream
2015-09-30 13:26:04 -07:00
James ‘Twey’ Kay
1b5fdd1bc9
openfire: Fix JVM test
2015-09-30 16:39:09 +01:00
Thomas Strobel
cc29a6e788
neard: add sample applications
2015-09-30 16:10:16 +02:00
Tobias Geerinckx-Rice
c7c677bc7b
p910nd: init at 0.97
2015-09-30 02:29:52 +02:00
William A. Kennington III
271972de0a
Merge branch 'master.upstream' into staging.upstream
2015-09-29 15:54:33 -07:00
Jaka Hudoklin
ea4850ca64
Merge pull request #10023 from offlinehacker/pkgs/modsecurity/add
...
modsecurity: add modsecurity, and create nginx plugin
2015-09-30 00:19:38 +02:00
Thomas Strobel
8d7fba9b65
neard: init at 0.15-post-git-20510929
2015-09-29 17:54:26 +02:00
Matthias Beyer
e547393fac
jetty: 5.1.4 -> 6.1.4
2015-09-29 10:41:26 +02:00
Jude Taylor
4f9ef9bbfb
give xquartz impure deps to make it build
2015-09-28 14:45:45 -07:00
Charles Strahan
25e582c497
meteor: init at 1.2.0.1
...
closes #10064
2015-09-28 10:39:37 -04:00
Matthias Beyer
0f1620c887
taskserver: 1.0.0 -> 1.1.0
2015-09-27 13:13:11 +02:00
lethalman
3e4bbe048a
Merge pull request #10038 from pmahoney/skarnet
...
Skarnet updates
2015-09-25 15:15:53 +02:00
Jaka Hudoklin
5d6500fee8
Merge pull request #10028 from itkovian/elasticsearch-1.7.2
...
elasticsearch: 1.5.2 -> 1.7.2
2015-09-25 11:10:10 +02:00
Jaka Hudoklin
0322596721
Merge pull request #10040 from maxxk/libmemcached-darwin
...
libmemcached on darwin
2015-09-25 11:09:23 +02:00
Patrick Mahoney
560674ae83
s6 2.1.3.0 -> 2.2.1.0
2015-09-24 20:13:22 -05:00
William A. Kennington III
83ac62eb5d
pulseaudio: 6.0 -> 7.0
2015-09-24 16:33:57 -07:00
William A. Kennington III
0f85ef3982
unifi: 4.6.6 -> 4.7.5
2015-09-24 16:15:31 -07:00
Maxim Krivchikov
7216159cbe
memcached: build on darwin
...
Versions up to 1.4.24 are broken when building with clang:
https://code.google.com/p/memcached/issues/detail?id=409
2015-09-24 23:06:22 +03:00
Andy Georges
cdf13a0a06
elasticsearch: 1.5.2 -> 1.7.2
2015-09-24 00:18:29 +02:00
William A. Kennington III
d3f4ba9d6f
Merge branch 'master.upstream' into staging.upstream
2015-09-23 14:44:21 -07:00
William A. Kennington III
5cfe893cc4
Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream
...
This is a partial commit from staging in an attempt to make merges
smaller.
2015-09-23 14:35:36 -07:00
Jaka Hudoklin
46828582ab
nginx: add support for modescurity
2015-09-23 20:35:28 +02:00
Vladimír Čunát
76ef7a93e3
Merge: xlibs and x11 attribute cleanup
...
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
Jude Taylor
76a6539829
work on making xquartz buildable in a pure environment
2015-09-22 16:27:51 -07:00
Hoang Xuan Phu
4ac4f2dcd9
nginx: add an option to build the stream module
2015-09-22 13:09:11 +08:00
Hoang Xuan Phu
942d2798c5
nginx: bump lua module to fix build error
...
(https://github.com/openresty/lua-nginx-module/pull/500 )
2015-09-22 13:08:42 +08:00
William A. Kennington III
6e09223627
Merge branch 'master.upstream' into staging.upstream
2015-09-18 17:16:27 -07:00
William A. Kennington III
58a45a4459
samba: 4.2.3 -> 4.3.0
2015-09-18 14:52:51 -07:00
William A. Kennington III
37bba4ec2c
mongodb: 3.0.5 -> 3.0.6
2015-09-18 14:52:51 -07:00