Commit Graph

2214 Commits

Author SHA1 Message Date
lethalman
a45a0911d4 Merge pull request #9376 from rick68/softether
softether: support SoftEther VPN 4.18
2015-08-26 10:45:46 +02:00
Wei-Ming Yang
efd34824eb softether: support SoftEther VPN 4.18 2015-08-21 13:59:00 +08:00
William A. Kennington III
2138f789bc Merge branch 'master.upstream' into staging.upstream 2015-08-20 10:32:29 -07:00
Jaka Hudoklin
2bec93dde8 elasticsearch: add search_guard plugin 2015-08-20 00:20:44 +02:00
Jaka Hudoklin
1d1a336c6a elasticsearch: update plugins 2015-08-20 00:20:31 +02:00
Jaka Hudoklin
8aa50beb1f elasticsearch 1.4.5 -> 1.5.2 2015-08-20 00:18:46 +02:00
William A. Kennington III
2ac70270e8 Merge branch 'master.upstream' into staging.upstream 2015-08-18 11:36:32 -07:00
Max Zerzouri
807a0e4609 xorg-server: fix XKB_BINDIR usage (close #8993)
Previously, XKB_BINDIR was read inside a loop over the program
arguments, so was only read if it had arguments that weren't matched by
the first some number of checks.
2015-08-18 10:14:11 +02:00
Bjørn Forsman
5079b4f27b cassandra: 2.1.7 -> 2.1.8
Version 2.1.7 is not available anymore from current mirror. This is a
stable update.
2015-08-16 19:30:05 +02:00
Pascal Wittmann
a1d4e7ff70 u9fs: move from googlecode to bitbucket 2015-08-15 21:04:32 +02:00
William A. Kennington III
952def0e3c Merge branch 'master.upstream' into staging.upstream 2015-08-13 11:55:02 -07:00
ts468
6ae2e2b0f9 Merge pull request #9200 from ts468/upstream.openpts
openpts: init at 0.2.6
2015-08-11 14:10:59 +02:00
Rickard Nilsson
3afc387b4a scollector: Update from 20150506172827 to 0.3.0 2015-08-11 13:46:17 +02:00
Rickard Nilsson
9f7cfea070 bosun: Update from 0.2.0 to 0.3.0 2015-08-11 13:46:17 +02:00
Thomas Strobel
3607cf316e openpts: init at 0.2.6 2015-08-11 13:38:58 +02:00
Eelco Dolstra
a6f466065c mysql: Update to 5.4.45 2015-08-11 11:46:31 +02:00
Bjørn Forsman
9c20b9c779 openxpki: fix license attribute (unbreak nixpkgs tarball job) 2015-08-10 23:11:15 +02:00
Thomas Strobel
4da188cf54 openxpki: init at git 2015/08/07 2015-08-10 22:05:20 +02:00
Alexander V. Nikolaev
2c2a4cd099 Revert "vault: init at v0.1.2"
This reverts commit 41bbb904eb.
2015-08-10 14:18:15 +03:00
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