3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2387 commits

Author SHA1 Message Date
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
Luca Bruno 04e782f380 hbase: 0.98.8 -> 0.98.13. Fixes download (ZHF) 2015-07-22 10:10:03 +02:00
Luca Bruno 04356dc250 samba: drop heimdal compat patch to fix the build (ZHF) 2015-07-21 18:54:08 +02:00
Luca Bruno 14502c6446 Revert "Revert "samba: 4.2.1 -> 4.2.3""
This reverts commit eee8823c37.

Wrong revert. Sorry.
2015-07-21 17:37:08 +02:00
Luca Bruno dc5b74ab78 spamassassin: fix rules installation (ZHF) 2015-07-21 17:34:52 +02:00
Luca Bruno c6b1625a53 sipwitch: 1.6.1 -> 1.9.8. Fixes build (ZHF) 2015-07-21 17:32:44 +02:00
Luca Bruno eee8823c37 Revert "samba: 4.2.1 -> 4.2.3"
This reverts commit be0f468926.
2015-07-21 17:22:01 +02:00
Luca Bruno e4239cc8ad qpid-cpp: 0.26 -> 0.34. Fixes build (ZHF) 2015-07-21 16:52:04 +02:00
Edward Tjörnhammar bed11354e9 Merge pull request #8902 from dezgeg/pr-nfs
nfs-utils, rpcbind: Update packages to fix nfs3 test
2015-07-21 16:48:38 +02:00
Charles Strahan a3552280f8 riak-2.1.1: new package 2015-07-21 06:17:42 -04:00
Austin Seipp 131e41191b nixpkgs: nginxUnstable 1.9.2 -> 1.9.3
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-20 13:52:33 -05:00
Tuomas Tynkkynen 5c31245047 rpcbind: 0.2.3 -> 1.0.7 2015-07-20 12:21:12 +03:00
Vladimír Čunát 1be2acd131 xkeyboard-config: updates
Also drop Esperanto patch for now, as it doesn't apply anymore
and there are some Esperanto variants inside. Discussed:
https://github.com/NixOS/nixpkgs/commit/fa5a583098
2015-07-19 13:33:04 +02:00
Vladimír Čunát 00dfcfb76a xorg: driver updates
Also fixup tarball list after e4316b8c17,
and drop a patch integrated in the update.
2015-07-19 13:33:03 +02:00
Vladimír Čunát 9a80550cc4 Merge branch 'staging', discussion #8844 2015-07-19 08:09:29 +02:00
William A. Kennington III 068db75d68 unifi: 4.6.3 -> 4.6.6 2015-07-17 20:43:11 -07:00
Vladimír Čunát 9f37e91ec5 Merge master into staging
There are larger-rebuild changes: gnutls and samba.
2015-07-17 06:38:04 +02:00
William A. Kennington III 291b006285 Merge pull request #8847 from rycee/fix/vsftpd-CVE-2015-1419
vsftpd: fix CVE-2015-1419
2015-07-15 17:40:22 -07:00
Austin Seipp 01e37fe92d pkgs: mariadb 10.0.19 -> 10.0.20
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-15 16:11:18 -05:00
Robert Helgesson 66bc50a968 vsftpd: fix CVE-2015-1419
Adds patch from Debian.
2015-07-15 22:33:04 +02:00
William A. Kennington III be0f468926 samba: 4.2.1 -> 4.2.3 2015-07-15 12:55:39 -07:00
Brandon Carrell 4f4fa58199 cassandra-1.2: Add package.
- Add myself to maintainers.
- Add package to all-packages.nix.
2015-07-14 19:35:16 -04:00
William A. Kennington III 333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
Christoph Hrdinka 1e95b76c67 nsd: 4.1.2 -> 4.1.3 2015-07-13 14:49:50 +02:00
Arseniy Seroka 79a41bb24c Merge pull request #8760 from fpletz/package/postfix
postfix: 2.11.4 -> 2.11.5
2015-07-12 22:12:03 +03:00
James Cook 87f916590b Merge pull request #8176 from berdario/redis-3.0.2
Update redis to 3.0.2 (now that 3 is stable, squash it into default)
2015-07-12 10:24:48 -07:00
Franz Pletz cc802f4940 postfix: 2.11.4 -> 2.11.5 2015-07-12 04:42:13 +02:00
Rickard Nilsson 7e021a0fd6 nginx package: Allow adding arbitrary modules 2015-07-12 00:49:18 +02:00
Rickard Nilsson ef5dafd66d lua-nginx-module: Update from v0.9.16rc1 to v0.9.16 2015-07-12 00:49:18 +02:00
Pascal Wittmann 007e288912 bind: update from 9.10.2 to 9.10.2-P2, fixes CVE-2015-4620 2015-07-10 18:20:29 +02:00
William A. Kennington III 813f124471 consul-ui: Remove uneeded nodejs 2015-07-08 15:10:50 -07:00
William A. Kennington III dae5b35463 ruby: Fixup libv8 versions 2015-07-08 15:10:50 -07:00
Arseniy Seroka 76229bc546 Merge pull request #8709 from telotortium/subsonic-maintainer
subsonic: add telotortium as maintainer
2015-07-09 00:54:19 +03:00
William A. Kennington III 7cda24c01e Merge branch 'master.upstream' into staging.upstream 2015-07-08 14:11:16 -07:00
Robert Irelan f9efcd47a1 subsonic: add telotortium as maintainer 2015-07-08 09:21:27 -07:00
Tobias Geerinckx-Rice 8ff60567ae shairport-sync: 2.3.0 -> 2.3.6.5
- Enable additional backends: pipe, stdout
- Support high-quality resampling with soxr
- Support configuration files, but don't install one
- Cut down on boilerplate code with fetchFromGitHub/autoreconfHook
2015-07-08 17:13:03 +02:00
William A. Kennington III ae28ff8b91 Merge branch 'master.upstream' into staging.upstream 2015-07-06 17:15:11 -07:00
William A. Kennington III 1d7990b0e1 consul-ui: Update dependencies 2015-07-06 16:42:16 -07:00
Robert Irelan 3e61595a3e subsonic: init at 5.2.1
Add package for the Subsonic personal media streamer server
(<http://subsonic.org>).
2015-07-05 17:10:26 -07:00
William A. Kennington III d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Arseniy Seroka d1bb51798e Merge pull request #8613 from benley/prometheus
updates: prometheus-node-exporter, prometheus-alertmanager
2015-07-05 01:08:41 +03:00
Michael Raskin 7c5129706f nginx unstable: update 1.9.1 -> 1.9.2 2015-07-05 00:32:53 +03:00
Benjamin Staffin bcf990c7fd prometheus-alertmanager: 0.0.1 -> 0.0.4 2015-07-04 14:05:32 -07:00
Benjamin Staffin a9c403d38b prometheus-node-exporter: 0.8.1 -> 0.10.0 2015-07-04 14:05:32 -07:00
William A. Kennington III 7eae48871f Merge branch 'master.upstream' into staging.upstream 2015-07-01 13:38:17 -07:00
Shea Levy 145768bf9b Unmaintain a bunch of packages 2015-07-01 08:11:05 -04:00
William A. Kennington III 612f0bdd67 Merge branch 'master.upstream' into staging.upstream 2015-06-30 23:58:07 -07:00
Lane Seppala f5268e9f09 Enable uuid-ossp in Postgres 9.4 on Darwin
Based on documentation section F.44.2 at
http://www.postgresql.org/docs/9.4/static/uuid-ossp.html
2015-06-30 11:16:39 -06:00
Pascal Wittmann 18308e6b56 tvheadend: fix build by disabling dvbscan 2015-06-30 13:00:21 +02:00
Pascal Wittmann 512225ef81 Fixed some descriptions 2015-06-29 16:20:58 +02:00
Leroy Hopson d0633a28ff Fix SSL/TLS support for shellinaboxd
shellinboxd was not finding libssl.so in it's library path, so it was
falling back to ssl disabled mode. Also, the path to openssl was
hardcoded to /usr/bin/openssl, so shellinaboxd could not generate SSL
certificates once libssl.so was added to LD_LIBRARY_PATH.
2015-06-28 23:08:10 +12:00
Michael Raskin 124a61f10d Fix alternative samba configuration evaluations 2015-06-28 13:41:27 +03:00
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
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
Vladimír Čunát edeab75913 xcompmgr: generate along with xorg stuff
Also a minor update.
/cc maintainer @astsmtl.
2015-05-26 20:06:53 +02:00
Vladimír Čunát 0e270def52 xorg.x11perf: larger update
Seems to run fine.
2015-05-26 20:06:52 +02:00
Vladimír Čunát 471a2a7ee7 xorg {xorg-docs,kbproto}: minor updates 2015-05-26 20:06:52 +02:00
Vladimír Čunát e5fa9ab0fd xlsfonts: generate along with xorg stuff
Also a minor update.
/cc maintainer @viric.
2015-05-26 20:06:51 +02:00
Vladimír Čunát 688b4ca5db xorg: add xmag and xgc apps
Tested very briefly.
2015-05-26 20:06:51 +02:00
Vladimír Čunát 1a13909173 xorg: minor updates of apps 2015-05-26 20:06:50 +02:00
Vladimír Čunát 6bddcbda8a xorg: maintenance updates of libs 2015-05-26 20:06:50 +02:00
Vladimír Čunát 3287103b00 xorg: add libXpresent and xcb-util-errors 2015-05-26 20:06:48 +02:00
Rickard Nilsson a92271f195 lua-nginx-module: Update from 0.9.15 to 0.9.16rc1
This fixes the build that has been broken since nginx was bumped to 1.8.0
2015-05-26 08:05:26 +02:00
Arseniy Seroka 54be459b7f Merge pull request #7988 from johbo/fix-mod-python
mod_python: Avoid that git is called to generate a version
2015-05-25 21:23:35 +03:00
Johannes Bornhold 2ed4587b61 mod_python: Avoid that git is called to generate a version
This failed when building mod_python and resulted in a broken
value being included in the file "version.py".
2015-05-25 18:24:22 +02:00
Arseniy Seroka 054295210c Merge pull request #7978 from benley/prometheus
More Prometheus helpers: prom2json, prometheus-mysqld-exporter, prometheus-collectd-exporter
2015-05-25 01:52:49 +03:00
William A. Kennington III 9f70b1ab31 bind: Add propagatedBuildInputs 2015-05-24 15:01:21 -07:00
Benjamin Staffin d3fe5487ad New package: prometheus-collectd-exporter 2015-05-24 14:33:39 -07:00
Vladimír Čunát 34c9d898da xorg: update randr 2015-05-24 23:28:41 +02:00
Vladimír Čunát 3c5b83262b xorg: update cirrus and libinput drivers 2015-05-24 23:26:07 +02:00
Vladimír Čunát 3115d18c53 xorg: update drivers that seem useless 2015-05-24 23:10:52 +02:00
Benjamin Staffin af142824cb New package: prometheus-mysqld-exporter 2015-05-24 14:08:16 -07:00
Benjamin Staffin adf59e7110 New package: prom2json 2015-05-24 14:08:16 -07:00
William A. Kennington III 1592c81d54 redis: 3.0.0-rc3 -> 3.0.1 2015-05-24 02:00:21 -07:00
William A. Kennington III 9b44fcf259 Merge pull request #7964 from benley/riemann-dash-0.2.11
riemann-dash: update to 0.2.11
2015-05-23 22:44:50 -07:00
William A. Kennington III 55636defbc Merge pull request #7961 from benley/prometheus
Update Prometheus and its various helper packages
2015-05-23 22:44:21 -07:00
William A. Kennington III e8392bb33f postgres: Fix maintainers 2015-05-23 22:26:23 -07:00
William A. Kennington III bb6ac771c4 dnsutils: Add smaller derivation of bind 2015-05-23 22:26:23 -07:00
William A. Kennington III c6dea6fea6 Merge pull request #7962 from benley/riemann-0.2.9
riemann: update to 0.2.9
2015-05-23 20:41:41 -07:00
William A. Kennington III e74b5704a8 bind: Enable parallel building 2015-05-23 20:07:51 -07:00
William A. Kennington III adcf1c7a90 postgresql: Fix sha256 for 9.3.7 2015-05-23 19:39:21 -07:00
William A. Kennington III 6775c0696f postgresql: 9.4.1 -> 9.4.2 2015-05-23 19:38:34 -07:00
William A. Kennington III 5486c08dc2 postgresql: 9.3.6 -> 9.3.7 2015-05-23 19:34:28 -07:00
William A. Kennington III 7174391e5b postgresql: Consolidate patches 2015-05-23 19:34:00 -07:00
William A. Kennington III d9efd0676f postgresql: Correct propagated readline 2015-05-23 19:30:30 -07:00
William A. Kennington III 601e713bb8 postgresql: 9.2.10 -> 9.2.11 2015-05-23 19:18:26 -07:00
William A. Kennington III e9d0c395d1 postgresql: Add myself as maintainer 2015-05-23 19:07:36 -07:00
William A. Kennington III 243dc10b0b postgresql: Add schema version 2015-05-23 19:07:14 -07:00
William A. Kennington III be94d4bc25 postgresql: 9.1.15 -> 9.1.16 2015-05-23 19:07:14 -07:00
William A. Kennington III 8c99f2e3d6 postgresql: 9.0.19 -> 9.0.20 2015-05-23 19:07:13 -07:00
William A. Kennington III 1bb67e514b postgresql: Refactor 8.4 into generic 2015-05-23 19:07:13 -07:00
William A. Kennington III 9c6d4533d0 mariadb: 10.0.18 -> 10.0.19 2015-05-23 19:07:13 -07:00
William A. Kennington III 0a06b99d69 bind: Modify build 2015-05-23 19:07:13 -07:00
William A. Kennington III c078890a19 postgres: Cleanup meta 2015-05-23 19:07:12 -07:00
Benjamin Staffin ec027fbb42 riemann-dash: update to 0.2.11 2015-05-23 18:14:56 -07:00
Benjamin Staffin 34ad0a304a riemann: update to 0.2.9 2015-05-23 17:51:00 -07:00
Benjamin Staffin b2de6ccc8e Update prometheus and its various helper packages
Updates to:

 - prometheus
 - prometheus-alertmanager
 - prometheus-cli
 - prometheus-mesos-exporter
 - prometheus-node-exporter
 - prometheus-pushgateway
 - prometheus-statsd-bridge
2015-05-23 17:34:43 -07:00
William A. Kennington III 3117e0c897 Refactor mkFlag out of old packages 2015-05-22 13:54:52 -07:00
William A. Kennington III 25a148fa19 Refactor mkFlag / shouldUsePkg into the nixpkgs libraries 2015-05-22 13:26:55 -07:00
John Wiegley 5ac9e87b1b nginx: Fix build for Darwin (no AIO there) 2015-05-21 12:42:06 -05:00
Arseniy Seroka a9171953c6 Merge pull request #7860 from Lassulus/bird
nixos: add bird module
2015-05-21 03:24:20 +03:00
Shea Levy e3ed4b590b Fix tarball 2015-05-20 14:09:15 -04:00
Tobias Geerinckx-Rice 622bd2e15f cassandra 2.1.4 -> 2.1.5 2015-05-20 16:42:12 +02:00
Tobias Geerinckx-Rice b4ceac808b cassandra 2.0.14 -> 2.0.15 2015-05-20 16:42:12 +02:00
William A. Kennington III 3cb3247ae0 mongodb: Support 32 bit platforms 2015-05-19 22:01:08 -07:00
William A. Kennington III b76d6c1699 mongodb: 3.0.2 -> 3.0.3 2015-05-19 21:43:59 -07:00