Commit Graph

2229 Commits

Author SHA1 Message Date
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
Jaka Hudoklin
bb708a5dad Merge pull request #9531 from offlinehacker/pkgs/skydns/update_2.5.2b
skydns: 2.5.0a -> 2.5.2b
2015-08-29 18:34:04 +02:00
Jaka Hudoklin
e2f673e024 skydns: 2.5.0a -> 2.5.2b 2015-08-29 18:28:50 +02:00
Domen Kožar
806b679b6d Merge pull request #9515 from benley/prometheus-0.15.1
Prometheus: update to 0.15.1
2015-08-29 14:04:43 +02:00
Benjamin Staffin
86eca38b0c prometheus: 0.14.0 -> 0.15.1 2015-08-29 00:19:22 -07:00
Tuomas Tynkkynen
6b866a37fc xrdb: Use mcpp as the preprocessor
Close #9501, fixes #9480.

By default, xrdb uses GCC as the preprocessor at runtime for X resource files.
However, gcc is a large dependency, so replace it with mcpp, a much smaller
preprocessor (currently under a megabyte on i686).

Arch Linux already does this as well, so this should be relatively safe:
https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/xorg-xrdb
2015-08-29 08:29:59 +02:00
Luca Bruno
591d43ec91 freeswitch: use gcc 4.8 to fix build (ZHF) 2015-08-27 11:54:38 +02:00
lethalman
a45a0911d4 Merge pull request #9376 from rick68/softether
softether: support SoftEther VPN 4.18
2015-08-26 10:45:46 +02:00
Wei-Ming Yang
efd34824eb softether: support SoftEther VPN 4.18 2015-08-21 13:59:00 +08:00
William A. Kennington III
2138f789bc Merge branch 'master.upstream' into staging.upstream 2015-08-20 10:32:29 -07:00
Jaka Hudoklin
2bec93dde8 elasticsearch: add search_guard plugin 2015-08-20 00:20:44 +02:00
Jaka Hudoklin
1d1a336c6a elasticsearch: update plugins 2015-08-20 00:20:31 +02:00
Jaka Hudoklin
8aa50beb1f elasticsearch 1.4.5 -> 1.5.2 2015-08-20 00:18:46 +02:00
William A. Kennington III
2ac70270e8 Merge branch 'master.upstream' into staging.upstream 2015-08-18 11:36:32 -07:00
Max Zerzouri
807a0e4609 xorg-server: fix XKB_BINDIR usage (close #8993)
Previously, XKB_BINDIR was read inside a loop over the program
arguments, so was only read if it had arguments that weren't matched by
the first some number of checks.
2015-08-18 10:14:11 +02:00
Bjørn Forsman
5079b4f27b cassandra: 2.1.7 -> 2.1.8
Version 2.1.7 is not available anymore from current mirror. This is a
stable update.
2015-08-16 19:30:05 +02:00
Pascal Wittmann
a1d4e7ff70 u9fs: move from googlecode to bitbucket 2015-08-15 21:04:32 +02:00
William A. Kennington III
952def0e3c Merge branch 'master.upstream' into staging.upstream 2015-08-13 11:55:02 -07:00
ts468
6ae2e2b0f9 Merge pull request #9200 from ts468/upstream.openpts
openpts: init at 0.2.6
2015-08-11 14:10:59 +02: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
Thomas Strobel
3607cf316e openpts: init at 0.2.6 2015-08-11 13:38:58 +02:00
Eelco Dolstra
a6f466065c mysql: Update to 5.4.45 2015-08-11 11:46:31 +02:00
Bjørn Forsman
9c20b9c779 openxpki: fix license attribute (unbreak nixpkgs tarball job) 2015-08-10 23:11:15 +02:00
Thomas Strobel
4da188cf54 openxpki: init at git 2015/08/07 2015-08-10 22:05:20 +02:00
Alexander V. Nikolaev
2c2a4cd099 Revert "vault: init at v0.1.2"
This reverts commit 41bbb904eb.
2015-08-10 14:18:15 +03:00
William A. Kennington III
6e698f9c61 Merge branch 'master.upstream' into staging.upstream 2015-08-09 13:34:18 -07:00
Michael Raskin
1caa629b33 Apache Jena: 2.13.0 -> 3.0.0 2015-08-08 21:01:31 +03:00
William A. Kennington III
5b6db8f1df mongodb: 3.0.4 -> 3.0.5 2015-08-07 14:23:09 -07:00
William A. Kennington III
6aa5502129 mariadb: 10.0.20 -> 10.0.21 2015-08-07 14:19:15 -07:00
William A. Kennington III
4624985561 Merge branch 'master.upstream' into staging.upstream 2015-08-07 13:40:39 -07:00
Luca Bruno
629ac021b7 Revert "rethinkdb: Force dynamic linking and allow dependency substitution"
This reverts commit 5960a652f1.

Build is broken since the beginning at configure phase @wkennington ,
I wonder how you were able to build this.

See http://hydra.nixos.org/build/24167778/nixlog/1/raw
2015-08-06 16:25:51 +02:00
Pascal Wittmann
7f2200117d serfdom: fix build by updating from 0.6.3 to 0.6.4
and using an old version of memberlist
2015-08-06 15:59:51 +02:00
Luca Bruno
855db4dbbc pulseaudio: fix .la file 2015-08-06 12:40:09 +02:00
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