William A. Kennington III
f93d565c28
Merge branch 'master.upstream' into staging.upstream
2015-06-27 10:44:00 -07:00
Vladimír Čunát
e6ca18e9bf
xwayland: fix build
...
Maybe it was just covered by #7524 until now.
/cc #5061 and @echo-oddly.
2015-06-27 11:40:04 +02:00
Michael Raskin
9bf2c6a8ab
Fix wrong condition related to enableKerberos
2015-06-27 11:40:38 +03:00
William A. Kennington III
12102562f7
Merge branch 'master.upstream' into staging.upstream
2015-06-27 00:18:18 -07:00
William A. Kennington III
7297255019
Convert all jack references to libjack2
2015-06-27 00:17:52 -07:00
William A. Kennington III
ef253212f4
Merge branch 'master.upstream' into staging.upstream
2015-06-26 17:25:49 -07:00
Russell O'Connor
946a6823b2
cassandra: add procps depencency, closes #8512
...
${cassandra}/conf/cassandra-env.sh calls free program on Linux systems in
calculate_heap_sizes().
Adding procps to the path makes the free program available.
2015-06-26 18:03:54 +02:00
Alexander V. Nikolaev
41bbb904eb
vault: init at v0.1.2
2015-06-26 01:34:32 +03:00
Thomas Tuegel
a8c52d0958
Merge branch 'master' into staging
2015-06-25 09:15:05 -05:00
William A. Kennington III
4fe22edf14
mongodb: Build on gcc5
2015-06-24 23:04:41 -07:00
Simon Vandel Sillesen
9dab1a840c
tvheadend: init at 4.0.4
2015-06-24 13:22:09 +00:00
William A. Kennington III
6532863ac4
unifi: 3.2.10 -> 4.6.3
2015-06-23 10:09:44 -07:00
William A. Kennington III
1e58156159
Merge branch 'master.upstream' into staging.upstream
2015-06-22 20:03:10 -07:00
Tobias Geerinckx-Rice
5cd1fd8012
cassandra 2.0.15 -> 2.0.16
2015-06-22 23:27:03 +02:00
Tobias Geerinckx-Rice
4bfcfef9fc
cassandra 2.1.6 -> 2.1.7
2015-06-22 23:27:03 +02:00
Pascal Wittmann
abee7fbe2c
mysql55: update from 5.5.43 to 5.5.44
2015-06-22 23:23:54 +02:00
William A. Kennington III
282d03befa
Merge branch 'master.upstream' into staging.upstream
2015-06-22 10:57:36 -07:00
Dario Bertini
1e40c2347a
Fix conflict, Merge branch 'master' of github.com:NixOS/nixpkgs into redis-3.0.2
2015-06-22 12:20:02 +01:00
Jaka Hudoklin
ef1f827671
skydns: update to 2.5.0a
2015-06-19 13:35:32 +02:00
William A. Kennington III
31cedc7ee7
mariadb: Fix for darwin
2015-06-18 23:47:08 -07:00
William A. Kennington III
fe4f8903b4
Merge branch 'master.upstream' into staging.upstream
2015-06-18 22:37:00 -07:00
William A. Kennington III
14792f12d6
mongodb: 3.0.3 -> 3.0.4
2015-06-18 21:35:12 -07:00
Vladimír Čunát
61596bf405
Merge #8363 : pure-darwin stdenv
2015-06-18 22:38:08 +02:00
Christoph Hrdinka
7b207ab10b
nsd: update 4.1.1 -> 4.1.2
2015-06-18 14:08:39 +02:00
Tobias Geerinckx-Rice
98b2d7b727
Separate nativeBuildInputs where maintainers |= nckx
2015-06-17 22:21:32 +02:00
William A. Kennington III
8e19ac8d7c
Merge branch 'master.upstream' into staging.upstream
2015-06-17 11:57:40 -07:00
William A. Kennington III
8310045b14
Add missing patch
2015-06-16 23:56:15 -07:00
William A. Kennington III
061887e38a
xf86-video-intel: Kernel 4.0 match
2015-06-16 23:37:05 -07:00
William A. Kennington III
e4316b8c17
xorg-server: 1.16.4 -> 1.17.2
2015-06-16 23:36:11 -07:00
William A. Kennington III
57ee8d6131
xorgserver: Add gcc5 compat patch
2015-06-16 14:21:54 -07:00
Luca Bruno
aa800fa0fe
Merge branch 'master' into staging
2015-06-15 09:56:29 +02:00
William A. Kennington III
fa5eb0a7da
rethinkdb: 2.0.0-1 -> 2.0.3
2015-06-14 20:00:21 -07:00
Pascal Wittmann
f4d7b23a68
tomcat-connectors: update from 1.2.40 to 1.2.41-dev, fixes CVE-2014-8111
...
Using the prerelease version, because there was no response on when a
new official release will happen, see
http://tomcat.10.x6.nabble.com/Release-of-tomcat-connectors-1-2-41-td5035487.html
2015-06-15 11:07:02 +02:00
Michael Raskin
5d5bb71567
Update PostgreSQL to latest point-releases
2015-06-14 11:37:33 +03:00
Michael Raskin
ed145cb07f
Update Nginx unstable
2015-06-14 11:22:23 +03:00
William A. Kennington III
954801a9a8
Merge branch 'master.upstream' into staging.upstream
2015-06-12 13:47:46 -07:00
Rok Garbas
b980b7445f
cygwin: skip ssl support for postgresql (temporary)
2015-06-12 12:17:12 +02:00
Rickard Nilsson
03e4e3e92a
bosun: Update to 0.2.0
2015-06-11 19:55:33 +02:00
Rickard Nilsson
8a7c23456d
jetty: Update from 9.2.5 to 9.2.11
2015-06-11 13:33:32 +02:00
Pascal Wittmann
6125f583e6
redis: update from 3.0.1 to 3.0.2, fixes CVE-2015-4335
2015-06-11 10:46:57 +02:00
Eelco Dolstra
8b2f226a96
Fix Samba build
2015-06-11 01:22:37 +02:00
Eelco Dolstra
4970574409
Merge remote-tracking branch 'origin/gcc-4.9' into staging
...
Conflicts:
pkgs/development/libraries/wayland/default.nix
2015-06-11 00:23:03 +02:00
Eelco Dolstra
4a57b07653
Merge remote-tracking branch 'origin/master' into staging
2015-06-11 00:18:24 +02:00
Pascal Wittmann
62d62b6588
Fixed some licenses
2015-06-10 13:00:42 +02:00
Tobias Geerinckx-Rice
21f8130dda
cassandra 2.1.5 -> 2.1.6
2015-06-09 20:22:26 +02:00
Pascal Wittmann
023be72082
tomcat8: update from 8.0.9 to 8.0.23, fixes CVE-2014-7810
2015-06-09 14:28:39 +02:00
Pascal Wittmann
9b417df916
tomcat7: update from 7.0.55 to 7.0.62, fixes CVE-2014-7810
2015-06-09 14:27:13 +02:00
Jaka Hudoklin
b570c644c9
Merge pull request #8223 from offlinehacker/pkgs/rippled/update
...
rippled: Update to 0.28.1
2015-06-08 16:49:39 +02:00
Jaka Hudoklin
161418537c
rippled: Update to 0.28.1
2015-06-08 14:15:07 +02:00
Jaka Hudoklin
2e5dbc4746
Add ripple rest module
2015-06-08 13:48:23 +02:00
Pascal Wittmann
9cd6786acb
elasticsearch: update from 1.4.4 to 1.4.5, potenially fixes CVE-2015-3337
2015-06-08 13:21:58 +02:00
Lengyel Balázs
c3d9e90f0e
Updated apcupsd to version 3.14.13
2015-06-08 09:03:30 +02:00
Aristid Breitkreuz
f63a9f2534
fix libcap for packages depending on pulseaudio
2015-06-07 11:06:54 +00:00
William A. Kennington III
9d6555dc0a
Merge branch 'master.upstream' into staging.upstream
2015-06-06 12:04:42 -07:00
Arseniy Seroka
70b5e51456
Merge pull request #8178 from jagajaga/fix/versions
...
fix: add missing versions
2015-06-06 00:22:10 +03:00
William A. Kennington III
ffd0539eba
cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out
2015-06-05 13:00:52 -07:00
Arseniy Seroka
daf4ec39a5
fix: add missing versions
2015-06-04 23:34:14 +03:00
Dario Bertini
0ed91e1c4d
Update redis to 3.0.2 (now that 3 is stable, squash it into default)
...
include fix for http://benmmurphy.github.io/blog/2015/06/04/redis-eval-lua-sandbox-escape/
2015-06-04 16:36:53 +01:00
Eelco Dolstra
f1d465f429
pulseaudio: Revert to regular style
...
Also, the NixOS module uses pulseaudioLight in order to prevent
excessive dependency bloat.
2015-06-04 14:54:54 +02:00
Eelco Dolstra
f08c8bc752
postgresql: Latest versions
2015-06-04 14:54:54 +02:00
Eelco Dolstra
22c627bf5b
Remove PostgreSQL 8.4 (EOL)
2015-06-04 14:54:54 +02:00
Eelco Dolstra
fb2d45233a
Fix typos
2015-06-04 14:54:54 +02:00
Eelco Dolstra
ab8b68cd99
Revert "bind: Modify build"
...
This reverts commit 0a06b99d69
.
2015-06-04 14:54:51 +02:00
Eelco Dolstra
676fbc2578
Revert "bind: Enable parallel building"
...
This reverts commit e74b5704a8
.
2015-06-04 14:54:51 +02:00
Eelco Dolstra
4fdf489073
Revert "dnsutils: Add smaller derivation of bind"
...
This reverts commit bb6ac771c4
.
2015-06-04 14:54:51 +02:00
Eelco Dolstra
0a4de71cb0
Revert "bind: Add propagatedBuildInputs"
...
This reverts commit 9f70b1ab31
.
2015-06-04 14:54:51 +02:00
Eelco Dolstra
832aeb66f8
Revert "Fix krb5 reference"
...
This reverts commit 9f0da5315b
.
2015-06-04 14:54:50 +02:00
Eelco Dolstra
5d8fe045b6
Revert "Refactor mkFlag out of old packages"
...
This reverts commit 3117e0c897
.
Conflicts:
pkgs/development/libraries/wayland/default.nix
pkgs/servers/samba/4.x.nix
2015-06-04 14:54:50 +02:00
Eelco Dolstra
05f1457c1e
Revert "postgresql: Refactor 8.4 into generic"
...
This reverts commit 1bb67e514b
.
2015-06-04 14:54:50 +02:00
Eelco Dolstra
5efd73fce6
Revert "postgresql: 9.0.19 -> 9.0.20"
...
This reverts commit 8c99f2e3d6
.
2015-06-04 14:54:49 +02:00
Eelco Dolstra
e3ab9804ba
Revert "postgresql: 9.1.15 -> 9.1.16"
...
This reverts commit be94d4bc25
.
2015-06-04 14:54:49 +02:00
Eelco Dolstra
eb269336f1
Revert "postgresql: Add schema version"
...
This reverts commit 243dc10b0b
.
2015-06-04 14:54:49 +02:00
Eelco Dolstra
3da0f64088
Revert "postgresql: Add myself as maintainer"
...
This reverts commit e9d0c395d1
.
2015-06-04 14:54:49 +02:00
Eelco Dolstra
4d0156025d
Revert "postgresql: 9.2.10 -> 9.2.11"
...
This reverts commit 601e713bb8
.
2015-06-04 14:54:49 +02:00
Eelco Dolstra
bcd9f792da
Revert "postgresql: Correct propagated readline"
...
This reverts commit d9efd0676f
.
2015-06-04 14:54:49 +02:00
Eelco Dolstra
f1b8931cc9
Revert "postgresql: Consolidate patches"
...
This reverts commit 7174391e5b
.
2015-06-04 14:54:49 +02:00
Eelco Dolstra
ef5647d757
Revert "postgresql: 9.3.6 -> 9.3.7"
...
This reverts commit 5486c08dc2
.
2015-06-04 14:54:49 +02:00
Eelco Dolstra
f4b5cd8dde
Revert "postgresql: Fix sha256 for 9.3.7"
...
This reverts commit adcf1c7a90
.
2015-06-04 14:54:49 +02:00
Eelco Dolstra
c82da1ece6
Revert "postgresql: 9.4.1 -> 9.4.2"
...
This reverts commit 6775c0696f
.
2015-06-04 14:54:48 +02:00
Eelco Dolstra
aa2a0ff1d8
Revert "postgres: Fix maintainers"
...
This reverts commit e8392bb33f
.
2015-06-04 14:54:48 +02:00
Eelco Dolstra
3096d03435
Revert "Refactor mkFlag / shouldUsePkg into the nixpkgs libraries"
...
This reverts commit 25a148fa19
.
2015-06-04 14:54:48 +02:00
lethalman
6e0ca8cd11
Merge pull request #8122 from benley/prometheus-0.14
...
Prometheus: update to 0.14.0
2015-06-03 11:09:44 +02:00
Arseniy Seroka
eb2c3c6681
Merge pull request #8124 from pmahoney/skarnet-update
...
Skarnet update
2015-06-02 19:25:37 +03:00
Benjamin Staffin
3309a15be9
New package: prometheus-nginx-exporter
...
Adding to the growing collection of prometheus tools...
2015-06-01 15:32:51 -07:00
Benjamin Staffin
23bc70208c
Prometheus: update to 0.14.0
2015-06-01 15:28:47 -07:00
Patrick Mahoney
9835f18fbd
Add myself as maintainer for skarnet software
2015-06-01 15:20:56 -05:00
Eelco Dolstra
553abf71ba
Merge remote-tracking branch 'origin/staging' into gcc-4.9
...
Conflicts:
pkgs/build-support/cc-wrapper/default.nix
pkgs/development/libraries/wayland/default.nix
pkgs/development/tools/build-managers/cmake/default.nix
pkgs/top-level/all-packages.nix
2015-06-01 20:08:43 +02:00
Eelco Dolstra
0645f5eab7
samba: Revert style changes and get rid of some dependencies
...
Packages like glusterfs are now optional dependencies. A bunch of
dependencies like subunit are gone: as far as I can tell, these are
only used by Samba's test suite, which we're not even running, so
they're pointless.
Fixes #8067 .
2015-06-01 15:35:59 +02:00
Domen Kožar
dc3316268e
Merge branch 'master' into staging
2015-06-01 11:00:51 +02:00
Pascal Wittmann
bd62b7cd00
tomcat: update from 6.0.39 to 6.0.44
...
potentially fixes CVE-2014-0227, CVE-2014-0119, CVE-2014-0099, CVE-2014-0096, CVE-2014-0075
2015-05-31 16:55:26 +02:00
Benjamin Staffin
c40c1be798
prometheus-mesos-exporter: Fix misplaced dependencies
...
goPackages.mesos-stats doesn't actually have any dependencies of its
own; the mesos_exporter app does.
2015-05-30 11:50:59 -07:00
Pascal Wittmann
080dc99df7
torque: update from 4.2.8 to 4.2.10, fixes CVE-2014-3684
2015-05-30 18:07:20 +02:00
William A. Kennington III
da4177c36e
libpulse: Use glib
2015-05-29 20:50:40 -07:00
William A. Kennington III
e5bf20a6c6
Merge branch 'master' into staging
2015-05-29 14:52:51 -07:00
William A. Kennington III
b9a366e5c4
Fix typo
2015-05-29 14:35:23 -07:00
William A. Kennington III
b07929b0a3
Use libpulseaudio instead of pulseaudio
2015-05-29 14:32:56 -07:00
William A. Kennington III
cd52c04456
Fix more ca-bundle paths
2015-05-29 14:26:32 -07:00
Pascal Wittmann
84208c3d00
mysql55: update from 5.5.42 to 5.5.43
2015-05-29 20:52:02 +02:00
William A. Kennington III
9f0da5315b
Fix krb5 reference
2015-05-29 10:25:32 -07:00
Pascal Wittmann
27ffee3631
owncloud: update from 7.0.4 to 7.0.5 (fixes CVE-2015-3012 and CVE-2014-9716)
2015-05-29 13:14:44 +02:00