William A. Kennington III
6e698f9c61
Merge branch 'master.upstream' into staging.upstream
2015-08-09 13:34:18 -07:00
Michael Raskin
1caa629b33
Apache Jena: 2.13.0 -> 3.0.0
2015-08-08 21:01:31 +03:00
William A. Kennington III
5b6db8f1df
mongodb: 3.0.4 -> 3.0.5
2015-08-07 14:23:09 -07:00
William A. Kennington III
6aa5502129
mariadb: 10.0.20 -> 10.0.21
2015-08-07 14:19:15 -07:00
William A. Kennington III
4624985561
Merge branch 'master.upstream' into staging.upstream
2015-08-07 13:40:39 -07:00
Luca Bruno
629ac021b7
Revert "rethinkdb: Force dynamic linking and allow dependency substitution"
...
This reverts commit 5960a652f1
.
Build is broken since the beginning at configure phase @wkennington ,
I wonder how you were able to build this.
See http://hydra.nixos.org/build/24167778/nixlog/1/raw
2015-08-06 16:25:51 +02:00
Pascal Wittmann
7f2200117d
serfdom: fix build by updating from 0.6.3 to 0.6.4
...
and using an old version of memberlist
2015-08-06 15:59:51 +02:00
Luca Bruno
855db4dbbc
pulseaudio: fix .la file
2015-08-06 12:40:09 +02:00
William A. Kennington III
0ecc61b4d7
Merge branch 'master.upstream' into staging.upstream
2015-08-05 16:24:57 -07:00
Charles Strahan
f178817aee
xquartz: 1.14.6 -> 1.17.2
...
closes #9126
2015-08-05 13:57:02 -05:00
Cillian de Róiste
f63fd63eb1
yaws: update from 1.99 to 2.0
2015-08-05 10:29:47 +02:00
William A. Kennington III
926f073f55
Merge branch 'master.upstream' into staging.upstream
2015-08-04 15:32:43 -07:00
Charles Strahan
878e69c67c
riak2: use sensible default paths
...
Make exporting the RIAK_{ETC,LOG,DATA}_DIR variables optional;
if they're not in the environment, we use the same default values as
NixOS.
2015-08-03 21:48:29 -04:00
William A. Kennington III
09b4a7cc1b
Merge branch 'master.upstream' into staging.upstream
2015-07-31 17:26:20 -07:00
Eelco Dolstra
55932c1bec
Don't statically depend on cacert for certificates
...
This reverts commit cd52c04456
and
others.
Managing certificates (including revoking certificates and adding
custom certificates) becomes extremely painful if every package in the
system potentially depends on a different copy of cacert. Also, it
makes updating cacert rather expensive.
2015-07-31 01:34:58 +02:00
John Wiegley
23562aad59
Revert "emacs: Update Mac Port Emacs to 24.5-mac-5.9"
...
This reverts commit 5c896e5511
, which was
a set of local changes unrelated to the commit title.
2015-07-30 16:21:39 -07:00
William A. Kennington III
7ebe164ae0
Merge branch 'master.upstream' into staging.upstream
2015-07-30 15:03:10 -07:00
Vladimír Čunát
862900e42e
mass-replace deprecated usage of find -perm ( Fixes #9044 )
...
sed 's|-perm +0|-perm /0|g'
It's a mass-rebuild due to usage in stdenv's default setup hooks.
2015-07-30 10:30:17 +02:00
William A. Kennington III
58e3c658ce
etcd: Use goPackages version
2015-07-29 18:28:28 -07:00
William A. Kennington III
884e3cd772
vault: Use the gopackage version
2015-07-29 18:17:27 -07:00
William A. Kennington III
3932ba7a54
bind: 9.10.2-P2 -> 9.10.2-P3
2015-07-29 10:36:45 -07:00
William A. Kennington III
aaef42ab8c
Merge branch 'master.upstream' into staging.upstream
2015-07-29 10:23:08 -07:00
John Wiegley
5c896e5511
emacs: Update Mac Port Emacs to 24.5-mac-5.9
2015-07-28 20:08:53 -07:00
Eelco Dolstra
0770a49d8c
Unify the PostgreSQL expressions again
2015-07-28 21:42:25 +02:00
Eelco Dolstra
2bc305c1c6
postgresql: Prevent runtime dependency on gcc-wrapper
2015-07-28 21:42:25 +02:00
Vladimír Čunát
2600e00ca9
xorg.xproto: maintenance update
2015-07-28 19:13:50 +02:00
Luca Bruno
13a1d3bb22
postgresql91: create doc directory (ZHF)
2015-07-28 18:11:05 +02:00
Luca Bruno
6525b63870
postgresql90: create doc directory (ZHF)
2015-07-28 18:10:59 +02:00
Luca Bruno
5b9554a4e6
riak2: does not build on i686 (ZHF)
2015-07-28 17:59:56 +02:00
Vladimír Čunát
f5ca543c46
mariadb: disable parallel building
...
Discussed on:
https://github.com/NixOS/nixpkgs/commit/01e37fe92dedabd
2015-07-28 13:32:27 +02:00
Tobias Geerinckx-Rice
0c3e31a662
vsftpd: 3.0.2 -> 3.0.3
...
Does not fix CVE-2015-1419; keep patch.
2015-07-28 13:20:48 +02:00
Vladimír Čunát
0c4e4e6849
Merge branch 'master' into staging
...
There was a mass-rebuild due to expat CVE.
2015-07-28 13:09:43 +02:00
Nikolay Amiantov
c60ce5fa9b
Revert "rpcbind: 0.2.3 -> 1.0.7"
...
This reverts commit 5c31245047
. See #8902 .
2015-07-28 12:47:44 +03:00
Nikolay Amiantov
89fa3513ca
uwsgi: update package
2015-07-28 12:33:30 +03:00
William A. Kennington III
eb4a73af93
Merge branch 'master.upstream' into staging.upstream
2015-07-27 17:48:09 -07:00
William A. Kennington III
5960a652f1
rethinkdb: Force dynamic linking and allow dependency substitution
2015-07-27 17:35:05 -07:00
William A. Kennington III
6b55ca513d
Merge branch 'master.upstream' into staging.upstream
2015-07-27 16:11:03 -07:00
William A. Kennington III
5b0a676d5b
rethinkdb: Remove pin on boost 1.55 and remove gperf dependency
2015-07-27 13:12:24 -07:00
William A. Kennington III
8e7ecd6de6
rethinkdb: 2.0.3 -> 2.0.4
2015-07-27 13:12:24 -07:00
Eelco Dolstra
277a85b15c
Merge pull request #8985 from Beauhurst/newapaches
...
apache-httpd: update minor versions of both 2.2 and 2.4 for security-related fixes
2015-07-27 17:30:18 +02:00
William A. Kennington III
bd5f2c9638
Merge branch 'master.upstream' into staging.upstream
2015-07-27 08:17:19 -07:00
Eelco Dolstra
e1f78bf677
More docs/manpages in separate outputs
2015-07-27 00:27:54 +02:00
Eelco Dolstra
f7e13ad70c
postgresql: Move docs to separate output
...
This cuts almost 15 MB.
2015-07-26 22:46:24 +02:00
Eelco Dolstra
c4a399f106
mariadb: Don't install static libraries
...
Issue #8990 .
2015-07-26 22:46:23 +02:00
Vladimír Čunát
b875ea5d29
Merge branch 'master' into staging
2015-07-26 17:57:46 +02:00
Robert Scott
1dca2fba7f
apache-httpd: update minor versions of both 2.2 and 2.4 for security-related fixes
2015-07-25 15:40:29 +01:00
Vladimír Čunát
a2f16fdcff
Merge branch 'staging'
2015-07-24 15:12:28 +02:00
Jude Taylor
4fab7321bf
make changes needed to build mongodb
2015-07-23 15:47:16 -07:00
Vladimír Čunát
2cacf77c13
Merge branch 'master' into staging
2015-07-22 22:33:55 +02:00
William A. Kennington III
d8991a7b3b
xf86-video-intel: 2.99.917 -> 2015-07-22
2015-07-22 13:14:27 -07:00