3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1675 commits

Author SHA1 Message Date
Patrick Mahoney cf5f282940 Consolidate conf-compile steps for skarnet.org pkgs. 2014-11-28 13:10:37 -06:00
Vladimír Čunát cbd2305d4d Merge branch 'master' into staging 2014-11-28 18:59:07 +01:00
Vladimír Čunát 06c6d4696d *: fix builds by disregarding warning from new glibc
Also, in case of collectd, the -lgcc_s shouldn't be needed anymore,
as the library is in ${glibc}/lib/ now, which is practically always on RPATH.

In case of seyren it was some stdenv change uncovering the mistake of
putting src into buildInputs.
2014-11-28 18:42:03 +01:00
Oliver Charles f2e2ab6231 Bosun only builds on x86_64-linux
Reported upstream at https://github.com/bosun-monitor/bosun/issues/427
2014-11-27 12:14:38 +00:00
Vladimír Čunát abcb355453 restund, openssh_hpn: mark as broken 2014-11-27 01:19:24 +01:00
Vladimír Čunát b5ff06eda4 Merge branch 'master' into staging 2014-11-26 21:48:26 +01:00
Mathijs Kwik a5dafe7746 rethinkdb: upgrade to 1.15.2 2014-11-26 14:30:19 +01:00
Vladimír Čunát a9bad25ffe Merge branch 'master' into staging 2014-11-24 22:14:25 +01:00
Oliver Charles 9cab0e1b8a Add meta information to hbase, bosun, scollector, opentsdb 2014-11-24 14:40:48 +00:00
Oliver Charles 5a8d5f3094 bosun: Update to 20141119233013 2014-11-24 14:40:48 +00:00
Oliver Charles bc8fd69fe8 New packages: bosun and scollector 2014-11-24 14:40:47 +00:00
Oliver Charles 8964667bcd hbase: New package and NixOS module 2014-11-24 14:40:47 +00:00
William A. Kennington III b4c3eadd08 unifi: 3.2.1 -> 3.2.7 2014-11-24 00:06:07 -08:00
Shea Levy 2db4171978 Add jetty 9.2.5 2014-11-23 19:27:11 -05:00
Jaka Hudoklin 444bda1936 Merge pull request #4991 from offlinehacker/nixos/etcd
nixos: add etcd module
2014-11-22 12:05:35 +01:00
Shea Levy d123f1faf0 solr: bump 2014-11-21 15:10:59 -05:00
Jaka Hudoklin bcf9da32f7 etcd: update to v0.5.0-alpha3 2014-11-21 13:54:45 +01:00
Emery Hemingway e6f70fd2b3 icecast: update 2.3.3 to 2.4.0
now with opus support
2014-11-20 17:41:22 -05:00
Mateusz Kowalczyk 5fc61b7fa0 mpd: update to 0.19.4 2014-11-20 13:30:01 +00:00
David Virgilio 9a2b2e7b34 new package: xwayland 2014-11-20 06:21:47 -06:00
Domen Kožar 49a933c596 Revert "zmq: initial package"
This reverts commit b9c7f8dba1.

Conflicts:
	pkgs/servers/zeromq/default.nix
	pkgs/top-level/all-packages.nix
2014-11-20 10:08:52 +01:00
Rob Vermaas 0aa742989f mysql_jdbc: update from 5.1.31 to 5.1.32, potentially fixes CVE-2012-0075, CVE-2012-0087, CVE-2012-0101, CVE-2012-0102, CVE-2012-0112, CVE-2012-0113, CVE-2012-0114, CVE-2012-0115, CVE-2012-0116, CVE-2012-0118, CVE-2012-0119, CVE-2012-0120, CVE-2012-0484, CVE-2012-0485, CVE-2012-0490, CVE-2012-0492, CVE-2012-0540, CVE-2012-0553, CVE-2012-0572, CVE-2012-0574, CVE-2012-0583, CVE-2012-0882, CVE-2012-1688, CVE-2012-1689, CVE-2012-1690, CVE-2012-1696, CVE-2012-1697, CVE-2012-1702, CVE-2012-1703, CVE-2012-1705, CVE-2012-1734, CVE-2012-2102, CVE-2012-2749, CVE-2012-3150, CVE-2012-3158, CVE-2012-3160, CVE-2012-3163, CVE-2012-3166, CVE-2012-3167, CVE-2012-3173, CVE-2012-3177, CVE-2012-3180, CVE-2012-3197, CVE-2012-5060, CVE-2013-0375, CVE-2013-0383, CVE-2013-0384, CVE-2013-0385, CVE-2013-0389, CVE-2013-1492, CVE-2013-1506, CVE-2013-1521, CVE-2013-1548, CVE-2013-1552, CVE-2013-1555, CVE-2013-2378, CVE-2013-2389, CVE-2013-2391, CVE-2013-2392, CVE-2013-3802, CVE-2013-3804, CVE-2013-3808, CVE-2013-5908, CVE-2014-0386, CVE-2014-0393, CVE-2014-0401, CVE-2014-0402, CVE-2014-0412, CVE-2014-0437 2014-11-18 16:06:44 +01:00
Charles Strahan 973794b24a bundixify riemann-dash 2014-11-18 03:31:56 +00:00
Charles Strahan 44cdf4eac7 bundixify consul-ui 2014-11-18 03:06:56 +00:00
William A. Kennington III 583ab7512d consul: 0.4.0 -> 0.4.1 2014-11-17 13:19:30 -08:00
Eelco Dolstra a0f3faf34e Merge remote-tracking branch 'origin/glibc-2.20' into staging 2014-11-16 22:17:36 +01:00
William A. Kennington III 478e4b46d1 pgpool: Add derivation 2014-11-15 01:23:25 -08:00
Mateusz Kowalczyk 89e38c692f mpd: update to 0.19.3 2014-11-15 01:54:00 +00:00
Vladimír Čunát b4af993c3f Merge branch 'master' into staging
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
2014-11-14 14:28:23 +01:00
Gavin Rogers ec3e96683a zeromq: renamed package from zmq 2014-11-13 23:00:53 +00:00
Gavin Rogers b9c7f8dba1 zmq: initial package 2014-11-12 23:08:05 +00:00
Vladimír Čunát 4a62542f55 xorg.xf86-video-intel: use the new versions
The old driver wasn't updated since August 2013, and e.g. won't compile
with glibc-2.20. Distros like Arch or Ubuntu are using newer one for a long time.

(cherry picked from commit 515dcb0f66)
 because the old driver won't compile with new X server.
2014-11-12 16:33:20 +01:00
Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
Shea Levy f207fee725 bird: bump 2014-11-11 14:27:21 -05:00
Pascal Wittmann 8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Eelco Dolstra db4053fb59 httpd-2.2: Enable building of mod_cache and friends 2014-11-11 10:39:24 +01:00
Luca Bruno 6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Charles Strahan cf8f4963a7 rename rubyLibs to rubyPackages 2014-11-09 22:16:58 +00:00
Domen Kožar 824879cfd4 tomcat-connectors: 1.2.32 -> 1.2.40 2014-11-08 19:48:54 +01:00
Luca Bruno 83221f3886 Merge branch 'master' into staging
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
Eelco Dolstra 2819063c37 mod_evasive: Add Apache version check 2014-11-07 11:42:43 +01:00
Eelco Dolstra 690154993d mod_fastcgi: Fix building against Apache 2.4 2014-11-07 11:38:50 +01:00
Eelco Dolstra bad2955079 mod_python: Update to 3.5.0
This fixes building against Apache 2.4.
2014-11-07 11:31:04 +01:00
Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Bjørn Forsman 4f220bd0c3 munin: add missing dependency on 'NetCIDR'
Fixes

  munin-node[30100]: Can't locate Net/CIDR.pm in @INC (@INC contains: [...])

when using the 'cidr_allow' configuration directive.
2014-11-05 22:27:27 +01:00
Vladimír Čunát 52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Vladimír Čunát dcd2590c98 xorg-server: major bump 1.14.* -> 1.16.1 (incl. deps) 2014-11-05 07:55:25 +01:00
Eelco Dolstra 7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
Rob Vermaas 40ccad06c9 mysql55: update from 5.5.39 to 5.5.40, potentially fixes CVE-2014-6464, CVE-2014-6469, CVE-2014-6491, CVE-2014-6494, CVE-2014-6496, CVE-2014-6500, CVE-2014-6507, CVE-2014-6555, CVE-2014-6559 2014-11-04 10:19:39 +01:00
lethalman 636a4c00ca Merge pull request #4801 from robberer/pkgs/zabbix-server
zabbix-server: add extraConfig option
2014-11-04 00:32:46 +01:00
Peter Simons b5fed52c43 Merge pull request #4238 from wkennington/master.boost
Make boost 156 the default
2014-11-03 23:03:01 +01:00
Michael Raskin b7f7341169 Add Nginx 1.7.7; RTMP module fails for some reason 2014-11-04 00:54:15 +03:00
Michael Raskin 09e505a4c4 Update Squid proxy 2014-11-04 00:37:42 +03:00
Mateusz Kowalczyk 81b402faf8 mpd: 0.19.1 -> 0.19.2 2014-11-03 17:14:38 +00:00
Longrin Wischnewski 7fb934c4d0 zabbix-server: add new optional build options 2014-11-03 16:51:09 +01:00
William A. Kennington III 3aa7f22228 rippled: Refactor and update to 0.26.2 2014-11-02 17:22:28 -08:00
William A. Kennington III aa3e800be7 boost: Remove boost.lib 2014-11-02 17:22:27 -08:00
Michael Raskin 1c5baac639 Update Apache Jena 2014-11-02 23:51:59 +03:00
Edward Tjörnhammar 942085daab Merge pull request #4556 from edwtjo/elastic-river-twitter
elasticsearchPlugins.elasticsearch_river_twitter: added package
2014-11-02 21:38:12 +01:00
Luca Bruno cb2752721e mysql: use another download url, cdn.mysql.com is slow after 30% 2014-11-02 18:26:38 +01:00
Peter Simons a9c53037fa Merge remote-tracking branch 'origin/master' into staging. 2014-11-02 16:15:53 +01:00
Vladimír Čunát 515dcb0f66 xorg.xf86-video-intel: use the new versions
The old driver wasn't updated since August 2013, and e.g. won't compile
with glibc-2.20. Distros like Arch or Ubuntu are using newer one for a long time.
2014-11-01 23:38:06 +01:00
Vladimír Čunát 95b475da09 xorg.xf86-input-vmmouse: fix build with glibc-2.20 2014-11-01 23:26:44 +01:00
Vladimír Čunát 4cc61d6d08 xorg.xf86-video-vmware: fix build against glibc-2.20 2014-11-01 22:29:42 +01:00
Domen Kožar 12b909bba1 mongodb: 2.6.4 -> 2.6.5 2014-11-01 13:13:15 +01:00
Aristid Breitkreuz 53c287f5cd postgresql 9.4beta3, but keep beta2 around because they are not compatible 2014-10-31 22:21:16 +01:00
Peter Simons b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00
Edward Tjörnhammar b69410764f elasticsearchPlugins.elasticsearch_river_twitter: added package 2014-10-30 12:28:39 +01:00
cillianderoiste 2b706f6aaf Merge pull request #4724 from flosse/prosody-update
prosody: updated to v0.9.6
2014-10-29 21:51:07 +01:00
Markus Kohlhase bc86dfa6b5 prosody: updated to v0.9.6 2014-10-29 21:11:25 +01:00
Evgeny Egorochkin 40979710f7 mediatomb: fix build by fetching a slightly newer git revision which has patches for new versions of dependencies, add more dependencies, clean up. 2014-10-29 05:09:28 +02:00
Rickard Nilsson b6f505c60a postfix: Update from 2.11.1 to 2.11.3 2014-10-27 21:48:33 +01:00
Rickard Nilsson 2d58efd3e4 dovecot: Update from 2.2.14 to 2.2.15 2014-10-27 21:24:08 +01:00
Joachim Schiele 40f24dca0f brickd: packaged version 2.1.1 2014-10-27 19:11:51 +01:00
Bjørn Forsman e8dc583eb4 tomcat: set meta.platforms 2014-10-27 18:44:25 +01:00
Eelco Dolstra f4be4f5e54 Merge remote-tracking branch 'origin/master' into staging 2014-10-24 12:24:13 +02:00
Aristid Breitkreuz 3c6b3c587d Merge pull request #4603 from exlevan/master
mysql: make cleaner directory layout for 5.5.*
2014-10-23 21:24:58 +02:00
Vladimír Čunát 2cf17b0802 Merge recent master into staging
Hydra nixpkgs: ?compare=1156478
2014-10-23 17:40:41 +02:00
Rob Vermaas 6596dccfd9 zabbix.server: update from 1.8.20 to 1.8.21 2014-10-22 15:29:05 +02:00
Michael Raskin 6b727e8d68 Merge pull request #4596 from abbradar/rpmextract
Add "rpmextract" script and use it
2014-10-20 22:00:59 +04:00
Alexey Levan 4ea7e3e97b mysql: make cleaner directory layout for 5.5.* 2014-10-20 19:39:48 +03:00
Nikolay Amiantov 307af9148b use rpmextract in some packages 2014-10-20 03:16:59 +04:00
Vladimír Čunát 9877fdb39d xorg: updates some modules; mostly minor changes 2014-10-19 20:10:19 +02:00
Mateusz Kowalczyk 67a1a96b49 mpd: update to 0.19.1 2014-10-19 17:34:13 +01:00
Domen Kožar 74fde7c388 Merge pull request #4495 from NixOS/pythonFull_improvements
PythonFull improvements
2014-10-16 13:24:18 +02:00
Rickard Nilsson 91be9d5796 dovecot: Update from 2.2.13 to 2.2.14 2014-10-16 08:14:46 +02:00
Joachim Schiele 9d5431d1a2 Merge pull request #4536 from flosse/prosody
prosody: updated to v0.9.5
2014-10-15 09:41:48 +02:00
Joachim Schiele 13298fcbb9 Merge pull request #4535 from flosse/lua-bitop
lua-packages: added lua-bitop to add websocket support for prosody
2014-10-15 09:41:32 +02:00
Markus Kohlhase 0f3f017f3e prosody: updated to v0.9.5 2014-10-15 04:11:24 +02:00
Markus Kohlhase 5308d3284b prosody: added websocket support 2014-10-15 03:57:00 +02:00
Rickard Nilsson d1d39dea3d elasticsearch: Update from 1.3.2 to 1.3.4 2014-10-14 19:06:03 +02:00
Domen Kožar a2a7abc67c pythonFull -> python with all modules, pythonFullWithPkgs -> buildEnv 2014-10-13 21:35:21 +02:00
Longrin Wischnewski 6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Joachim Schiele df95acd13c Merge pull request #3960 from flosse/prosody-service
Prosody service
2014-10-11 23:10:05 +02:00
Markus Kohlhase d86c2c30c5 prosody: packaged as a service
Conflicts:
	nixos/modules/misc/ids.nix
2014-10-11 18:53:43 +02:00
Mateusz Kowalczyk 01854619cd mpd: fix URL
Stable is now 0.19; we're not updating to 0.19 yet because upstream
forgot to include a necessary file in the 0.19 tarball.

FTR 0.19 requires boost and icu as dependencies

cc @astsmtl
2014-10-11 14:32:51 +01:00
Austin Seipp 37b9a2bad5 mariadb: 10.0.13 -> 10.0.14
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-10-09 17:01:06 -05:00
Domen Kožar 1f284665fa add patches for openafs-client on kerel 3.17 2014-10-09 13:12:52 +02:00
Eelco Dolstra 811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
Conflicts:
	pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
Aristid Breitkreuz 7a9bf3540e thttpd: update from 2.25b to 2.26, potentially fixes CVE-2013-0348 2014-10-08 20:23:26 +02:00
William A. Kennington III ee8a97a25e corosync: Add package 2014-10-08 01:46:23 -07:00
William A. Kennington III 3efcae2652 net_snmp: openssl must be propagated as it required when linking against libnetsnmp 2014-10-08 01:37:46 -07:00
Aristid Breitkreuz 28b5e2b685 memcached: update from 1.4.17 to 1.4.20 2014-10-07 22:50:46 +02:00
Aristid Breitkreuz a5ca3f3e0e mpd: update from 0.18.12 to 0.18.16 2014-10-07 21:50:40 +02:00
Aristid Breitkreuz 5e426e753a redis: update from 2.8.9 to 2.8.17 2014-10-07 21:07:41 +02:00
Aristid Breitkreuz 0d2989f438 postgresql84: update from 8.4.21 to 8.4.22 2014-10-07 20:54:22 +02:00
Aristid Breitkreuz 4d133363d4 couchdb: update from 1.6.0 to 1.6.1 2014-10-06 22:03:42 +02:00
Aristid Breitkreuz a839129fde Merge pull request #4388 from NixOS/minecraft-sound
Minecraft sound with Pulseaudio
2014-10-06 20:08:29 +02:00
Domen Kožar b4d12184ce elasticsearch_river_jdbc: 1.2.1.1 -> 1.3.0.4 2014-10-06 16:44:23 +02:00
Jaka Hudoklin f719f0b230 elasticsearch: fix plugins install 2014-10-06 16:22:05 +02:00
Aristid Breitkreuz 6c7786074f fix sound in minecraft for pulseaudio users 2014-10-05 19:50:35 +02:00
Francesco Lazzarino 94a6db6cda cassandra: environment fix for cassandra shell script 2014-10-03 17:36:50 -05:00
Francesco Lazzarino 17aae5742d Apache Cassandra 2.1.0 2014-10-01 15:25:32 -05:00
Michael Raskin 4dabba4d1e Add a binary distribution of Apache Jena RDF storage system 2014-09-30 23:11:19 +04:00
Mateusz Kowalczyk e3dc5b5072 bird: update from 1.4.0 to 1.4.4
cc @viric
2014-09-30 11:18:42 +01:00
Mateusz Kowalczyk ded8bde06b elasticsearchPlugins.elasticsearch_http_basic: update from 1.2.0 to 1.3.2, potentially fixes CVE-2013-5307 2014-09-30 10:56:11 +01:00
Mateusz Kowalczyk 18476acaff elasticsearch: update from 1.2.2 to 1.3.2 2014-09-30 10:56:10 +01:00
Christoph Hrdinka f5cd9d2460 nsd: fix description, license and platforms 2014-09-28 15:30:39 +02:00
Christoph Hrdinka f1b3196f2d nsd: update to version 4.1.0 2014-09-28 14:43:26 +02:00
Christoph Hrdinka 29b4258622 nsd: add hrdinka to maintainers 2014-09-28 14:43:16 +02:00
Eelco Dolstra 8e40703f6c apache-httpd: Update to 2.2.29
CVE-2014-0118, CVE-2014-0231, CVE-2014-0226, CVE-2013-5704.
2014-09-24 21:04:24 +02:00
Domen Kožar 5853c2da91 openafs: fix on kernel 3.16 with upstream patches 2014-09-23 21:33:25 +02:00
Eelco Dolstra cd71f7a2e6 Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
2014-09-23 11:27:53 +02:00
William A. Kennington III 31220480d8 boost: Update depdendent packages 2014-09-21 17:20:59 -07:00
William A. Kennington III a1d6c60e2d mongodb: Fix build 2014-09-21 15:18:16 -07:00
William A. Kennington III f327e9c922 boostHeaders: regular boost package now only contains headers 2014-09-21 15:18:16 -07:00
Austin Seipp 9f15333589 openresty: 1.7.4.1rc1 -> 1.7.4.1rc2
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-09-20 08:21:11 -05:00
William A. Kennington III 0001e4819e nginx: 1.6.1 -> 1.6.2
Additionally, update all extensions and convert them to fetchFromGitHub
2014-09-19 16:42:04 -07:00
Marco Maggesi 2a75276c88 Update OpenAFS client to version 1.6.9 2014-09-19 23:20:23 +02:00
Jaka Hudoklin f8284a083f seyren: udpate to 1.1.0 2014-09-17 18:33:51 +02:00
Rickard Nilsson 155053bcd9 diod: Update from 1.0.22 to 1.0.23 2014-09-16 13:53:18 +02:00
Pascal Wittmann 7bcd577bd1 mod-wsgi: update from 3.4 to 3.5, fixes CVE-2014-0240 2014-09-13 20:32:26 +02:00
Pascal Wittmann 8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
Jaka Hudoklin be2fe360db elasticsearchPlugins.elasticsearch_http_basic: set platform to build on 2014-09-13 02:24:48 +02:00
Jaka Hudoklin f5e5815236 elasticsearchPlugins: add elasticsearch_http_basic, plugin for basic http authentication 2014-09-13 02:22:26 +02:00
William A. Kennington III 65f103175e consul: 0.3.0 -> 0.4.0 2014-09-11 15:40:41 -07:00
Jaka Hudoklin dbae0b628e influxdb: update 0.7.0 -> 0.8.2 2014-09-11 18:06:06 +02:00
Rob Vermaas 75f8d6a19e ircdHybrid: update from 7.2.2 to 7.2.3, potentially fixes CVE-2013-0238 2014-09-11 13:37:45 +02:00
Domen Kožar 33ce850b82 fix a bunch of packages with lua5_1 2014-09-10 17:24:56 +02:00
Joel Taylor afa1db198b fix even more clang builds 2014-09-09 13:54:57 -07:00
Joel Taylor 374648deaa X11 build purity 2014-09-09 13:54:25 -07:00
Joel Taylor 3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Luca Bruno ac724e7bbc Added TORQUE package and nixos module
Resource management system for submitting and controlling
jobs on supercomputers, clusters, and grids

http://www.adaptivecomputing.com/products/open-source/torque
2014-09-09 18:24:46 +02:00
Eelco Dolstra 585983bc95 Merge remote-tracking branch 'origin/staging'
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
2014-09-08 11:42:09 +02:00
Nixpkgs Monitor 43fdbc0bd7 mysql: update from 5.1.72 to 5.1.73, potentially fixes CVE-2013-5908, CVE-2014-0401, CVE-2014-0412, CVE-2014-0437 2014-09-06 18:20:17 +02:00
Nixpkgs Monitor 7694fcf524 mysql55: update from 5.5.37 to 5.5.39, potentially fixes CVE-2014-2494, CVE-2014-4207, CVE-2014-4258, CVE-2014-4260 2014-09-06 18:18:21 +02:00
Vladimír Čunát 06fea81c6e Merge recent master into staging
Hydra: ?compare=1150594
2014-09-06 16:52:45 +02:00
Michael Raskin 2e33964a6a Fix leafnode by working around the check 2014-09-06 12:44:32 +04:00
aszlig fd9c8fa3dc
pkgs/nsd: Allow to easily override the package.
Allowing to use nixpkgs config to provide different defaults is not
going to help us here, so we would like to use nsd.override {} in order
to supply the correct options in the module.

Eventually removing the nixpkgs config option would make sense here as
well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-09-05 02:54:39 +02:00