JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,499 Commits 2 Branches 0 Tags 12 GiB
3c29b8e7da
Commit Graph

298 Commits

Author SHA1 Message Date
Kamil Chmielewski
28b6e9863c prometheus-node-exporter: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
0f13eab7c8 prometheus-nginx-exporter: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
f44b557476 prometheus-mysqld-exporter: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
485ad053e0 prometheus-mesos-exporter: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
fdebbdb889 prometheus-haproxy-exporter: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
a3cf92fdba prometheus-collectd-exporter: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
2665cae1f4 prometheus-cli: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
a6cd1321b9 prometheus-alertmanager: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
4bf5a93f2d prom2json: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
a95e0b9385 prometheus: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
6fe27955fd consul-alerts: extracted from goPackages 2016-06-09 11:22:02 +02:00
Vladimír Čunát
c4661e9643 Merge: make dev output references explicit 
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
 2016-05-22 12:09:23 +02:00
Tuomas Tynkkynen
2a73de6e6c treewide: Make explicit that 'dev' output of openssl is used 2016-05-19 10:02:23 +02:00
Tuomas Tynkkynen
5eb01cd0ad treewide: Make explicit that 'dev' output of openldap is used 2016-05-19 10:00:50 +02:00
Tuomas Tynkkynen
d7071caba5 treewide: Make explicit that 'dev' output of libssh2 is used 2016-05-19 10:00:45 +02:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Vladimír Čunát
3e387c3e00 Merge branch 'staging' 
Darwin isn't in a perfect state, in particular its bootstrap tools won't
build which will block nixpkgs channel. But on the whole it seems
acceptable.
 2016-05-13 10:14:53 +02:00
Franz Pletz
df8958435e grafana: 2.6.0 -> 3.0.1 (#15395) 
* grafana: 2.6.0 -> 3.0.1

* grafana module: Fix anonymous auth & add analytics config
 2016-05-13 02:28:24 +02:00
Robin Gloster
9820cb1bf2 use dontBuild instead of hacks 
changes:
 * buildPhase = "true"
 * buildPhase = ":"
 2016-05-04 10:11:04 +00:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
 2016-04-01 10:06:01 +02:00
Domen Kožar
b4e2172ad4 fix munin (and the test), refs #12801 #13999 
(cherry picked from commit 7877e33af8c0ec7f3a91c650ae4da6288b7dfe49)
Signed-off-by: Domen Kožar <domen@dev.si>
 2016-03-28 10:26:35 +01:00
Vladimír Čunát
09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00
zimbatm
17348dc094 Remove all dots at end of descriptions 
Specially crafted for @JagaJaga

    find pkgs -name "*.nix" -exec \
      sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
 2016-02-27 17:30:29 +00:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Franz Pletz
70e47ab981 grafana: 2.5.0 -> 2.6.0 2016-01-08 17:19:02 +01:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size 
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
 2015-12-31 09:53:02 +01:00
Vladimír Čunát
adb2b803b9 net-snmp: avoid nested list, /cc #11739 2015-12-17 12:35:15 +01:00
michael bishop
88bccd83fe
net-snmp: fix mnttab path when built under chroot 2015-12-15 08:45:58 -04:00
Luca Bruno
cf4b503692 net-snmp: fix references to openssl in multiple-outputs 2015-12-07 16:32:58 +01:00
Rodney Lorrimar
96f81e3be5 longview: Linode metrics collector 
Longview is a perl script used for sending server metrics to Linode
virtual private server hosting.
 2015-11-22 12:37:00 +00:00
Pascal Wittmann
c283a3da68 Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-18 11:34:09 +01:00
Jaka Hudoklin
7955be7a82 Merge pull request #11051 from offlinehacker/pkgs/bosun/update_0.5.0 
bosun: 0.3.0 -> 0.5.0-alpha, udpate module
 2015-11-17 17:17:44 +01:00
Jaka Hudoklin
0667fe29c9 Merge pull request #11061 from offlinehacker/nixos/heapster/add 
heapster module: init
 2015-11-17 17:17:01 +01:00
Jaka Hudoklin
15c76d17fe heapster: init at 3057a2c07061c8d9ffaf77e5442ffd7512ac0133 2015-11-16 16:58:09 +01:00
Jaka Hudoklin
abda14309f grafana: 2.0.0-beta1 -> 2.5.0 2015-11-16 14:59:16 +01:00
Jaka Hudoklin
c8d1e900d6 bosun: 0.3.0 -> 0.5.0-alpha 2015-11-16 14:23:54 +01:00
William A. Kennington III
8fe216dd3e bosun: Move to go-packages 2015-09-04 21:11:42 -07:00
Benjamin Staffin
395c268ab7 prometheus-statsd-bridge: fold into go-packages.nix 2015-08-30 00:26:10 -07:00
Benjamin Staffin
d17a29a150 prometheus-pushgateway: fold into go-packages.nix 2015-08-30 00:22:09 -07:00
Benjamin Staffin
4c95e49593 prometheus-node-exporter: fold into go-packages.nix 2015-08-30 00:16:00 -07:00
Benjamin Staffin
6122488297 prometheus-nginx-exporter: fold into go-packages.nix 2015-08-30 00:12:09 -07:00
Benjamin Staffin
4f53847ca2 prometheus-mysqld-exporter: fold into go-packages.nix 2015-08-29 23:51:19 -07:00
Benjamin Staffin
52dd6ea9d9 prometheus-mesos-exporter: fold into go-packages.nix 2015-08-29 23:47:13 -07:00
Benjamin Staffin
9001ad4106 prometheus-haproxy-exporter: fold into go-packages.nix 2015-08-29 23:37:48 -07:00
Benjamin Staffin
c5b6f17e1c prometheus-collectd-exporter: fold into go-packages.nix 2015-08-29 23:30:27 -07:00
Benjamin Staffin
fe5a2b0a39 prom2json: fold into go-packages.nix 2015-08-29 23:19:48 -07:00
Benjamin Staffin
853602fae5 prometheus-cli: fold into go-packages.nix 2015-08-29 23:17:13 -07:00
Benjamin Staffin
87655d9fe8 prometheus-alertmanager: fold into go-packages.nix 2015-08-29 22:55:22 -07:00
Benjamin Staffin
d74e65bd6f prometheus: fold definition into go-packages.nix 2015-08-29 22:46:57 -07:00
Benjamin Staffin
ff03cf23c6 prometheus-*: trivial cleanup 2015-08-29 22:30:26 -07:00
Benjamin Staffin
e734ce05b8 prometheus-pushgateway: move go-bindata into nativeBuildInputs 
Thereotically make life easier for a future cross-compilation path.
 2015-08-29 22:13:51 -07:00
Benjamin Staffin
94407ad644 prometheus-alertmanager: streamline build, prune buildInputs 
It turns out it's no longer necessary to run the protoc and
static-asset compile steps ourselves, as those are included in the
upstream repo now.
 2015-08-29 22:13:51 -07:00
Benjamin Staffin
a480bd89dc prometheus-*: fixes to deal with goPackages multiple-outputs changes 2015-08-29 22:13:51 -07:00
Benjamin Staffin
96882b14d5 prometheus: Include console templates and libraries 
Also tweaked to work with the recent goPackages multiple-outputs stuff.
 2015-08-29 22:13:51 -07:00
Benjamin Staffin
86eca38b0c prometheus: 0.14.0 -> 0.15.1 2015-08-29 00:19:22 -07: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
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
Shea Levy
145768bf9b Unmaintain a bunch of packages 2015-07-01 08:11:05 -04:00
Pascal Wittmann
512225ef81 Fixed some descriptions 2015-06-29 16:20:58 +02:00
Rickard Nilsson
03e4e3e92a bosun: Update to 0.2.0 2015-06-11 19:55:33 +02:00
Pascal Wittmann
62d62b6588 Fixed some licenses 2015-06-10 13:00:42 +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
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
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
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
Benjamin Staffin
d3fe5487ad New package: prometheus-collectd-exporter 2015-05-24 14:33:39 -07: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
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
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
Shea Levy
e3ed4b590b Fix tarball 2015-05-20 14:09:15 -04:00
Luca Bruno
76c34a9590 prometheus/pushgateway: fix after golang_protobuf_extensions update 2015-05-19 10:43:06 +02:00
Oliver Charles
e995f971ae bosun/scollector: Update to 20150506172827 2015-05-14 12:11:35 +01:00
Pascal Wittmann
f99d5cf2fc Fixed some descriptions 2015-04-28 10:55:20 +02:00
Joachim Fasting
8488d133f3 meta.licenses -> license 2015-04-21 23:10:07 +02:00
Rickard Nilsson
5b495bec46 bosun/scollector: Update to 20150409220449 2015-04-15 13:12:56 +02:00
Christian Theune
b15078b579 Provide a basic package for sensu. 
The server currently starts without error messages (on OS X) if you also
install redis and rabbitmq-server and start their processes without any
further configuration:

$ redis-server
$ rabbitmq-server
$ sensu-server

Haven't tried much more yet, but will in a bit.

(Amended: fix whitespace and string literal formatting issues, and
superfluous dependencies created by the generator script.
Thanks the-kenny!)
 2015-03-30 23:56:15 +02:00
Benjamin Staffin
bcc8293cba New package: prometheus-statsd-bridge 2015-03-23 12:07:22 -07:00
Benjamin Staffin
781dbfb9b8 New package: prometheus-mesos-exporter 2015-03-23 12:07:22 -07:00
Benjamin Staffin
d8c2cebf01 prometheus-node-exporter: update to 0.8.0 2015-03-23 12:07:21 -07:00
Benjamin Staffin
95be71cf91 Prometheus: update to 0.12.0 2015-03-23 12:07:21 -07:00
Benjamin Staffin
5b3254a8d1 New package: prometheus-node-exporter 2015-03-23 12:07:21 -07:00
Benjamin Staffin
d11bb48234 New package: prometheus-cli 2015-03-23 12:07:20 -07:00
Benjamin Staffin
6564dd8199 New package: prometheus-pushgateway 2015-03-23 12:07:20 -07:00
Benjamin Staffin
b2d17977be New package: prometheus-haproxy-exporter 2015-03-23 12:07:20 -07:00
Benjamin Staffin
92b08cd406 New package: prometheus-alertmanager 2015-03-23 12:07:19 -07:00
Benjamin Staffin
9c1f0b33a3 New package: Prometheus monitoring system 2015-03-23 12:06:57 -07:00
Rickard Nilsson
e8892b3ba5 bosun/scollector: Update to rev 20150311224711 2015-03-18 21:16:30 +01:00
Jaka Hudoklin
853358bca6 cadvisor: update to 0.10.1 2015-03-18 14:39:04 +01:00
Luca Bruno
df097fe2c3 Fix and port bosun and scollector to buildGoPackage 2015-02-04 13:41:31 +01:00
Charles Strahan
8d49e87dec Merge pull request #4677 from cstrahan/pleasant-ruby 
Pleasant ruby
 2015-01-21 23:27:38 -05:00
Charles Strahan
8085f088cb ruby: exorcise the last few remaining rubyPackages 2015-01-21 22:23:37 -05:00
Charles Strahan
dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby 
Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix
 2015-01-20 20:21:03 -05:00
Benjamin Staffin
e1f2da5314 Riemann: update to 0.2.8 
Change-Id: I42b8e5f1341df826e8424141e9f9623e60b63767
 2015-01-20 14:37:28 -05:00
Bjørn Forsman
412cb5a3a2 munin: remove /usr/{bin,sbin}/ references from plugins 
Instead, run things out of $PATH.

Fixes errors like these (on NixOS):
  munin-available-plugins/.mysql_slowqueries-wrapped: line 67: /usr/bin/printf: No such file or directory

(Basically, this unbreaks some plugins.)
 2015-01-18 14:39:57 +01:00
Ben Moseley
b7d72dbf5b Upgrading Riemann 0.26 -> 0.27 2015-01-10 15:17:46 +00:00
William A. Kennington III
90a641310c net-snmp: Don't propagate openssl as this may break builds 
Instead, explicility specify openssl during configuration which forces
the builder to include -L${openssl}/lib whenever linking against
net-snmp libraries.
 2015-01-09 10:40:29 -08:00
William A. Kennington III
c82410eeda java: Normalize to the default jre / jdk 2015-01-07 14:55:41 -08:00
Oliver Charles
4092a7cdd6 bosun: Update to 20141215200935 2015-01-05 10:35:20 +00:00
William A. Kennington III
30db6f177d net_snmp: 5.7.2.1 -> 5.7.3 2014-12-31 23:57:51 -08:00
Jaka Hudoklin
1b19b7a3bf Merge pull request #5491 from offlinehacker/cadvisor 
Add cadvisor package and nixos module
 2014-12-29 17:58:43 +01:00
Charles Strahan
145733c479 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby 
Conflicts:
	pkgs/applications/version-management/redmine/default.nix
	pkgs/development/interpreters/ruby/gem.nix
	pkgs/development/interpreters/ruby/generated.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/tools/vagrant/default.nix
	pkgs/servers/consul/default.nix
 2014-12-28 14:29:52 -05:00
Jaka Hudoklin
b232395a06 Add cadvisor 2014-12-28 20:20:38 +01:00
Shea Levy
05edd656f6 Missed gcc refs 2014-12-26 12:28:15 -05:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc 
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
 2014-12-26 11:06:21 -06:00
Shea Levy
4e558732e7 Add newrelic-sysmond 2014-12-22 15:13:08 -05:00
Eelco Dolstra
d717fcc7b8 zabbix: Update to 1.8.22 2014-12-18 14:11:11 +01:00
Domen Kožar
4aa3eec330 Merge branch 'master' into staging 
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
 2014-12-07 14:02:48 +01:00
Oliver Charles
bcb9f0853c bosun: Now builds on all Unix platforms 2014-12-05 11:43:58 +00:00
Oliver Charles
e56a8df827 scollector: Update to 20141204222654 2014-12-05 11:39:56 +00:00
Oliver Charles
66d234917a bosun: Update to 2014120422265 2014-12-05 11:36:48 +00:00
Domen Kožar
7f021fe566 munin: 2.0.21 -> 2.0.25 2014-11-30 20:42:06 +01: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
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
Charles Strahan
973794b24a bundixify riemann-dash 2014-11-18 03:31:56 +00:00
Pascal Wittmann
8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01: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
Longrin Wischnewski
7fb934c4d0 zabbix-server: add new optional build options 2014-11-03 16:51:09 +01:00
Rob Vermaas
6596dccfd9 zabbix.server: update from 1.8.20 to 1.8.21 2014-10-22 15:29:05 +02: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
Jaka Hudoklin
f8284a083f seyren: udpate to 1.1.0 2014-09-17 18:33:51 +02:00
Domen Kožar
f70acd2584 munin: fix test 2014-08-31 16:54:09 +02:00
Rickard Nilsson
9bec5e1288 New package: riemann 0.2.6 2014-08-23 12:49:10 +02:00
Austin Seipp
a8b59789d0 nagios-plugins: 2.0 -> 2.0.3 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-08-20 01:59:02 -05:00
Austin Seipp
53adb67395 nagios: 4.0.7 -> 4.0.8 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-08-20 01:58:50 -05:00
Eelco Dolstra
7f410ef923 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/misc/vim-plugins/default.nix
 2014-07-22 11:00:00 +02:00
Bjørn Forsman
f2d5fe86bd munin: simplify setting of PERL5PATH 
Use lib.makePerlPath instead of manually duplicating
"/lib/perl5/site_perl" all over.
 2014-07-18 12:37:36 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir 
See c556a6ea46.
 2014-06-30 14:56:10 +02:00
Austin Seipp
6cfa38ce7d nagios: significant upgrades 
- Upgrade Nagios Core to 4.x
 - Expose mainConfigFile and cgiConfigFile in module for finer
   configuration control.
 - Upgrade Plugins to 2.x
 - Remove default objectDefs, which users probably want to customize.
 - Systemd-ify Nagios module and simplify directory structure
 - Upgrade Nagios package with more modern patch, and ensure the
   statedir is set to /var/lib/nagios

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-22 00:22:10 -05:00
Bjørn Forsman
5e460b2dee munin: update 2.0.20 -> 2.0.21 (bug fix) 2014-05-25 13:55:20 +02:00
Domen Kožar
d2efe82eaa munin: 2.0.19 -> 2.0.20 2014-04-09 11:29:47 +02:00
Evgeny Egorochkin
fa49cba237 net_snmp: update from 5.7.2 to 5.7.2.1, potentially fixes CVE-2014-2284, change source to .zip because tar.gz is broken 2014-03-26 13:43:51 +02:00
Jaka Hudoklin
72d8c4225b Add seyren, an alerting dashboard for Graphite 2014-03-25 23:45:11 +00:00
Eelco Dolstra
2ea4ec798b zabbix: Update from 2.2.1 to 2.2.2 
Potentially fixes CVE-2012-0031, CVE-2012-0053, CVE-2012-0883,
CVE-2012-2687, CVE-2012-3499, CVE-2012-4558, CVE-2013-1862,
CVE-2013-1896, CVE-2013-2249, CVE-2013-1034, CVE-2013-5143.
 2014-02-13 18:34:01 +01:00
Eelco Dolstra
5dfff3a970 zabbix: Update from 2.0.10 to 2.0.11 2014-02-13 18:34:01 +01:00
Eelco Dolstra
da60b53242 zabbix: Update from 1.8.19 to 1.8.20 2014-02-13 18:34:01 +01:00
Evgeny Egorochkin
9b538a96f1 nagios-plugins: change source location and homepage since the original site has been hijacked. https://bugzilla.redhat.com/show_bug.cgi?id=1054340 2014-01-22 08:42:35 +02:00
Vladimír Čunát
0a58b512cb Merge master into stdenv-updates 
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
 2014-01-18 14:46:20 +01:00
Rok Garbas
a39490d709 fixing munin (broken by latest version update) also switch to fetchgit 2014-01-16 18:07:16 +00:00
Nixpkgs Monitor
36c0702156 munin: update from 2.0.17 to 2.0.19, potentially fixes CVE-2013-6048, CVE-2013-6359 2014-01-14 11:59:41 +01:00