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
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
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
Tobias Geerinckx-Rice
158e1cfdd0
Don't use "with licenses;" for single licences
...
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Florian Friesdorf
447adb305f
cygwin: mysql patches
2015-05-28 10:53:35 +02:00
Dan Peebles
4d12ea8311
Add micro-httpd package
2015-05-28 03:16:46 +00:00
Tobias Geerinckx-Rice
b2d7f4b1ba
Use common licence attributes from lib/licenses.nix
...
Many (less easily automatically converted) old-style strings
remain.
Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.
Use `with stdenv.lib` wherever it makes sense.
2015-05-27 22:00:06 +02:00
Vladimír Čunát
710df5bb78
Merge master into staging
...
It contains some mass-rebuild stuff as well,
so best push the changes to staging, too.
2015-05-27 20:47:23 +02:00