Commit Graph

61829 Commits

Author SHA1 Message Date
Vincent Laporte
7cf05bfe71 boost: use ${python.interpreter} rather than ${python}/bin/python 2015-04-25 22:35:25 +02:00
Domen Kožar
ff12c3274a Merge pull request #7548 from offlinehacker/etcdfix
nixos/etcd: fix enable type, so it could be enabled on multiple places
2015-04-25 22:14:55 +02:00
Domen Kožar
600d73df41 Merge pull request #7551 from offlinehacker/pkgs/node-packages/add
node-packages: updates
2015-04-25 21:55:25 +02:00
Domen Kožar
02b478e2c1 Merge pull request #7560 from offlinehacker/pkgs/docker/update
docker: update to 1.6.0
2015-04-25 21:53:43 +02:00
Bjørn Forsman
173da15f75 jquery: bump 1.11.1 -> 1.11.2 2015-04-25 20:27:07 +02:00
Peter Simons
991a23b5db haskell-edit-distance: update patch SHA 2015-04-25 18:02:02 +02:00
Peter Simons
848bf3b75d haskell-wreq-sb: disable failing test suite 2015-04-25 17:57:32 +02:00
Peter Simons
24f50d3e22 hackage-packages.nix: update to cc08310397 with hackage2nix revision c84f676708fec9d3a848f466468db04c7e641069 2015-04-25 17:57:32 +02:00
Jaka Hudoklin
6e79ba48f9 Merge pull request #7567 from joachifm/sxhkd-0_5_5
sxhkd: 0.5.4 -> 0.5.5
2015-04-25 17:51:09 +02:00
Peter Simons
cb3342f1dc Merge pull request #7543 from mdorman/master
Add patch for present not yet on hackage.
2015-04-25 17:48:53 +02:00
Joachim Fasting
d455153a9b sxhkd: 0.5.4 -> 0.5.5 2015-04-25 17:28:33 +02:00
Peter Simons
2ca6148bc7 hackage-packages.nix: re-generate from Hackage state 5af579af59 2015-04-25 17:09:04 +02:00
Jaka Hudoklin
a9cd286cd0 Merge pull request #7546 from offlinehacker/nixos/panamax/reload
nixos/fluentd: add support for config reload
2015-04-25 16:29:34 +02:00
Jaka Hudoklin
ffea231652 Merge pull request #7550 from offlinehacker/nixos/rippled/changes
nixos/rippled: new options, fixes
2015-04-25 16:28:15 +02:00
Jaka Hudoklin
8599cfdad4 Merge pull request #7552 from offlinehacker/pkgs/python-packages/docker-compose
fig: switch to docker-compose
2015-04-25 16:23:00 +02:00
Jaka Hudoklin
245b45f798 Merge pull request #7561 from offlinehacker/pkgs/fluentd/record_reformer
fluentd: add record_reformer plugin
2015-04-25 16:22:28 +02:00
Jaka Hudoklin
5e2b429e82 Merge pull request #7556 from offlinehacker/pkgs/node-packages/fix_platforms
nodePackages: fix platform detection
2015-04-25 16:21:51 +02:00
Jaka Hudoklin
95a8ecfd48 Merge pull request #7563 from offlinehacker/pkgs/goPackages/add
goPackages: add confd, grafana and vulcand
2015-04-25 16:10:11 +02:00
Jaka Hudoklin
efe6f06aa4 goPackages: add confd, grafana and vulcand 2015-04-25 15:58:55 +02:00
Jaka Hudoklin
515b06ef2a elasticsearchPlugins: add elasticsearch_kopf plugin 2015-04-25 15:54:00 +02:00
Jaka Hudoklin
a77ef79e5c fluentd: add record_reformer plugin 2015-04-25 15:48:47 +02:00
Jaka Hudoklin
eee1bb5ae5 docker: update to 1.6.0 2015-04-25 15:46:35 +02:00
Jaka Hudoklin
5c41b342d4 Merge pull request #7557 from offlinehacker/pkgs/rippled/update
rippled: update to 0.27.4
2015-04-25 15:45:02 +02:00
viric
dcdd9487ec Merge pull request #7394 from ehmry/cjdns
nixos: fix cjdns json config
2015-04-25 15:41:34 +02:00
Emery Hemingway
34f1c39fe0 nixos: fix cjdns json config
filter extraneous attributes from config modules
2015-04-25 09:40:44 -04:00
Jaka Hudoklin
fb8bc4da21 nixos/etcd: fix enable type, so it could be enabled on multiple places 2015-04-25 15:21:49 +02:00
Jaka Hudoklin
b8ff249e8f rippled: update to 0.27.4 2015-04-25 15:20:24 +02:00
Jaka Hudoklin
744b06cc28 nodePackages: fix platform detection 2015-04-25 15:18:54 +02:00
Jaka Hudoklin
494d1820e3 nixos/nginx: enable service/config reload 2015-04-25 15:17:06 +02:00
Jaka Hudoklin
3e480fde93 fig: switch to docker-compose 2015-04-25 15:11:19 +02:00
Jaka Hudoklin
fc1aa9f99a nodePackages: export npm2nix 2015-04-25 15:07:26 +02:00
Jaka Hudoklin
8a0dbafdc5 nodePackages: export packages for node 0.10 and 0.12 2015-04-25 15:06:29 +02:00
Jaka Hudoklin
2497836f66 node-packages: add a few packages, fix, regenerate 2015-04-25 14:54:26 +02:00
Jaka Hudoklin
54ddf2176b nixos/rippled: new options, fixes 2015-04-25 14:39:24 +02:00
Jaka Hudoklin
5984c04f1f nixos/ripple-data-api: add import mode option 2015-04-25 14:38:05 +02:00
vbgl
3591040468 Merge pull request #6535 from michelk/qgis_2.8.0
[WIP] qgis: update to 2.8.0
2015-04-25 14:35:40 +02:00
Thomas Tuegel
2a7a94d835 kdeApps_15_04: fix source urls 2015-04-25 07:31:45 -05:00
Jaka Hudoklin
f6bb49ad4a nixos/fluentd: add support for config reload 2015-04-25 14:21:27 +02:00
Jaka Hudoklin
6cb195a83d nixos/kubernetes: fix module 2015-04-25 14:18:25 +02:00
Jaka Hudoklin
cbf1c3ca22 kubernetes: update to 0.15 2015-04-25 14:18:05 +02:00
Michael Alan Dorman
54fb857a49 Add patch for present not yet on hackage. 2015-04-25 06:45:35 -04:00
Pascal Wittmann
fd15fe4f09 Merge pull request #7466 from matthiasbeyer/add-rtv
Add Package: rtv
2015-04-25 12:19:29 +02:00
Edward Tjörnhammar
9604dcc42f Merge pull request #7493 from malyn/hal-flash
Add hal-flash package
2015-04-25 12:14:15 +02:00
Luca Bruno
db3b86560f GNOME 3.16.1, closes #7357 2015-04-25 12:02:33 +02:00
Matthias Beyer
6acc1fe34d Add package: rtv 2015-04-25 11:55:47 +02:00
Luca Bruno
38d6aec3f6 network-manager: update to 1.0 2015-04-25 11:51:57 +02:00
Luca Bruno
d4a0cd2a94 Add gettextWithExpat function 2015-04-25 11:48:23 +02:00
Luca Bruno
cbfd3056b5 Merge branch 'lafix' into staging
Fix .la and .pc files of trousers and gnutls
2015-04-25 11:43:16 +02:00
Luca Bruno
6b6183125e gnutls, trousers: fix .la and .pc files, remove propagated build inputs
cc @vcunat @wkennington
2015-04-25 11:43:08 +02:00
Pascal Wittmann
8e86ec5bf0 Merge pull request #7529 from joachifm/trivial-builderDefs
Some trivial builderDefs->mkDerivation translations
2015-04-25 11:32:12 +02:00