nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-16 10:43:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
131,132 Commits 175 Branches 125 Tags 5.7 GiB
ce5a76274d
Commit Graph

4961 Commits

Author SHA1 Message Date
gnidorah
fbeb32994b softether module: fix dataDir option 2018-02-22 18:37:59 +03:00
Franz Pletz
41ce36b7ea
Merge pull request #35254 from aborsu/nextcloud 
nextcloud: 12.0.5 -> 13.0.0
 2018-02-22 05:51:22 +00:00
Jörg Thalheim
8a0efd8fbb
Merge pull request #35289 from volth/patch-95 
varnish-modules: 0.10.2 -> 0.13.0
 2018-02-21 23:45:03 +00:00
Frederik Rietdijk
b5391b2451 Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-21 20:43:10 +01:00
volth
d44bd9cb57
varnish-modules: 0.10.2 -> 0.13.0 2018-02-21 19:42:57 +00:00
Matthias Beyer
f683d0abf8 Remove myself from maintainers 
I don't want to maintain go packages anymore because packaging is such a
PITA for go packages.
 2018-02-21 14:25:45 +01:00
Augustin Borsu
4fcb56d139 nextcloud: 12.0.5 -> 13.0.0 2018-02-20 23:53:03 +01:00
Jörg Thalheim
57ad5dc844
Merge pull request #35078 from Mic92/powerdns 
powerdns: 4.0.5 -> 4.1.1
 2018-02-20 21:49:41 +00:00
Izorkin
2470d22ae1 mariadb: 10.2.12 -> 10.2.13 (#35119) 2018-02-20 22:24:38 +01:00
Vladimír Čunát
1d15dadbec
Merge branch 'master' into staging 
Larger rebuilds from master.
 2018-02-20 20:33:40 +01:00
Joachim F
eb39de0a1c
Merge pull request #32061 from volth/patch-72 
varnish: 5.1.3 -> 5.2.1 [fixes CVE-2017-8807]
 2018-02-20 19:23:36 +00:00
Robert Schütz
c8d3a81d2a matrix-synapse: fix pynacl dependency 
closes #34959
 2018-02-19 15:57:28 +01:00
Robert Schütz
edee98a9d1 home-assistant: pin voluptuous version 2018-02-19 13:04:36 +01:00
Robert Schütz
061a16a415 home-assistant: 0.63.2 -> 0.63.3 2018-02-18 12:16:54 +01:00
Daiderd Jordan
956272b14b
Merge pull request #31590 from matthewbauer/quartz-wm 
quartz-wm: fix building
 2018-02-17 19:35:24 +01:00
Jörg Thalheim
03d9a36941 powerdns: 4.0.5 -> 4.1.1 2018-02-17 14:16:24 +00:00
Joachim F
828b635bd9
Merge pull request #34997 from rick68/softether 
softether: 4.20 -> 4.25
 2018-02-17 11:06:02 +00:00
Joachim F
c826025163
Merge pull request #33518 from schneefux/pkg.wallabag 
wallabag: fix config file not being loaded from WALLABAG_DATA
 2018-02-17 10:47:23 +00:00
Joachim F
0ab789639f
Merge pull request #34430 from dtzWill/update/pagespeed-1.13.35.2 
psol, ngx_pagespeed: 1.13.35.1 -> 1.13.35.2
 2018-02-17 10:20:59 +00:00
Joachim F
94bc7fad4e
Merge pull request #35062 from yrashk/simplehttp2server 
simplehttp2server: init at 3.1.3
 2018-02-17 00:02:38 +00:00
Yurii Rashkovskii
4eb5711706
simplehttp2server: init at 3.1.3 2018-02-17 06:35:35 +07:00
Pascal Bach
b701eed46e arangodb: 3.2.3 -> 3.3.3 2018-02-16 23:51:53 +01:00
Joachim F
a90e137b23
Merge pull request #35049 from ryantm/mattermost470 
mattermost: 4.6.0 -> 4.7.0
 2018-02-16 19:31:58 +00:00
Joachim F
d938deb551
Merge pull request #35050 from ryantm/matterbridge171 
matterbridge: 1.6.3 -> 1.7.1
 2018-02-16 19:31:51 +00:00
Vladimír Čunát
01a49f38ef
knot-resolver: 2.0.0 -> 2.1.0 
No exciting changes to most people, I suppose.
https://lists.nic.cz/pipermail/knot-resolver-users/2018/000007.html
 2018-02-16 18:16:33 +01:00
Ryan Mulligan
8023dc9cf5 mattermost: 4.6.0 -> 4.7.0 2018-02-16 09:14:53 -08:00
Ryan Mulligan
453a31b591 matterbridge: 1.6.3 -> 1.7.1 2018-02-16 09:14:16 -08:00
Vladimír Čunát
b5aaaf87a7
Merge staging and PR #35021 
It's the last staging commit (mostly) built on Hydra,
and a minimal fix for Darwin regression in pysqlite.
 2018-02-16 09:13:12 +01:00
Austin Seipp
acd80e4725 h2o: init at 2.2.4 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2018-02-15 13:46:48 -06:00
Rick Yang
2e45234acf softether: 4.20 -> 4.25 2018-02-15 16:52:30 +08:00
Frederik Rietdijk
672bb6b4ab Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-14 21:30:08 +01:00
Robert Schütz
d60da6054f home-assistant: 0.63.1 -> 0.63.2 2018-02-14 10:01:50 +01:00
Will Dietz
06e50006d4 nginxModules.pagespeed: be consistent about rev 
Yes hash doesn't change, stable is copy of beta used previously.
 2018-02-13 15:17:21 -06:00
Pascal Bach
827d1bd618 minio,minio-client: support on all unix platforms 
Minio 32bit support seems to be fixed:
https://github.com/minio/minio/pull/4921
 2018-02-13 21:54:48 +01:00
Pascal Bach
6247872c78 minio: 2018-01-18T20-33-21Z -> 2018-02-09T22-40-05Z 2018-02-13 21:54:47 +01:00
Will Dietz
24721aad18 mariadb: disable tokudb on musl, per docs (and fix build) 2018-02-13 09:45:02 -06:00
Will Dietz
e7580d0f92 xorgserver: Builds! small workaround re:bad types 2018-02-13 09:44:55 -06:00
Will Dietz
a0ee888f1d pulseaudio: patch for musl 2018-02-13 09:44:54 -06:00
Will Dietz
1ac2b79745 squid{,4}: only enable netfilter bits on non-musl 2018-02-13 09:44:47 -06:00
Will Dietz
317ac44121 net-snmp: alpine patches 2018-02-13 09:44:45 -06:00
Will Dietz
81eef05f86 postgresql: don't try to use 'locale' if not building to run on glibc 2018-02-13 09:44:31 -06:00
Frederik Rietdijk
02b8929b70
Merge pull request #34901 from dotlambda/home-assistant 
home-assistant: 0.63 -> 0.63.1
 2018-02-12 18:14:55 +00:00
Robert Schütz
3e42833a7f home-assistant: 0.63 -> 0.63.1 2018-02-12 18:15:29 +01:00
Vladimír Čunát
47d479253d
knot-dns: 2.6.4 -> 2.6.5 (maintenance) 2018-02-12 17:08:51 +01:00
Profpatsch
2922bee722 remove profpatsch from maintainer list of a few packages 2018-02-12 06:24:38 +01:00
Franz Pletz
74736f26c2
bird2: init at 2.0.1 2018-02-11 23:35:05 +01:00
Robert Schütz
7b616b6240 home-assistant: 0.62.1 -> 0.63 2018-02-10 23:19:19 +01:00
Robert Schütz
b1603e951e home-assistant: make parse-requirements.py detect more packages 2018-02-10 23:18:41 +01:00
Vladimír Čunát
968b866dcc
Merge #32774: slurm-spank-x11: init at 0.2.5 2018-02-10 22:48:22 +01:00
tv
274de25f5f exim: 4.90 -> 4.90.1 
Fixes CVE-2018-6789.

https://lists.exim.org/lurker/message/20180210.180351.bc65dc61.en.html
 2018-02-10 19:27:28 +00:00
Franz Pletz
1c696c4edf
Merge pull request #33665 from 4z3/exim-ldap 
exim: add optional LDAP support
 2018-02-10 19:25:56 +00:00
Eric Wolf
e2859068b1 pythonPackages.msgpack: renamed to msgpack-python 2018-02-10 14:47:19 +01:00
Jörg Thalheim
fec3788753
Merge pull request #34059 from ryantm/mattermost 
mattermost: 4.4.1 -> 4.6.0
 2018-02-10 13:39:25 +00:00
Robert Schütz
6fb6616f17 home-assistant: remove dependencies which should be loaded via autoExtraComponents 2018-02-10 13:46:24 +01:00
Vladimír Čunát
9d5ab32f01
polipo: mark as vulnerable (close #33709) 2018-02-08 18:50:41 +01:00
Robert Schütz
bfcea0c05d home-assistant: fix tests by pinning pytest==3.3.1 2018-02-08 13:02:57 +01:00
Andreas Rammhold
90c0341ca5
Merge pull request #34581 from andir/squid 
Squid fix CVE-2018-1000024 & CVE-2018-1000027
 2018-02-07 11:09:42 +00:00
Andreas Rammhold
ea817d7b6f
squid: fix CVE-2018-1000024 & CVE-2018-1000027 2018-02-07 11:40:46 +01:00
Andreas Rammhold
291b05ee21
squid4: hack to detect our libxml2 2018-02-07 11:40:46 +01:00
Thomas Bach
30c71376c9
cassandra: 3.0.9 -> 3.0.15 2018-02-07 09:09:04 +08:00
Thomas Bach
798c6cdaca
cassandra: 2.2.9 -> 2.2.11 2018-02-07 09:08:41 +08:00
Thomas Bach
a9264dbeab
cassandra: 2.1.15 -> 2.1.19 2018-02-07 09:08:17 +08:00
Michael Raskin
fdcbb263ac
Merge pull request #32579 from leenaars/lwan 
lwan: init -> 0.1
 2018-02-06 21:26:18 +00:00
Frederik Rietdijk
ef64766efb
Merge pull request #34653 from mbrgm/upgrade-unifi 
unifi: 5.6.29 -> 5.6.30
 2018-02-06 16:26:07 +00:00
Joachim F
97ab8d8981
Merge pull request #17106 from spacefrogg/openafs 
openafs: Refactor and introduce server module
 2018-02-06 14:43:55 +00:00
Michael Raitza
eca3e88e63 openafs: 1.6.22.1 -> 1.6.22.2 
Minor update. Adds support for linux kernel up to 4.15.
 2018-02-06 14:14:08 +01:00
Marius Bergmann
2841725034 unifi: 5.6.29 -> 5.6.30 2018-02-06 08:48:17 +01:00
adisbladis
35b76e23e4
Merge pull request #34639 from aborsu/nextcloud 
nextcloud: 12.0.4 -> 12.0.5
 2018-02-06 09:54:40 +08:00
Augustin Borsu
ab664977bb nextcloud: 12.0.4 -> 12.0.5 2018-02-05 21:31:04 +01:00
adisbladis
2d724b68bf
airsonic: 10.0.1 -> 10.1.1 2018-02-05 03:37:40 +08:00
Andreas Rammhold
5cdcd3fef4 squid4: 4.0.21 -> 4.0.23 (fixes CVE-2018-1000024 & CVE-2018-1000027) 2018-02-03 16:13:17 +01:00
Frederik Rietdijk
55e0f12761 Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-03 09:48:42 +01:00
Frederik Rietdijk
db58049f75
Merge pull request #34494 from dotlambda/home-assistant 
home-assistant: compute extraComponents from config
 2018-02-03 08:01:50 +00:00
Tuomas Tynkkynen
10c8e6d0c5 Merge remote-tracking branch 'upstream/master' into staging 2018-02-03 02:50:21 +02:00
Vladimír Čunát
b31642ac72
knot-dns: 2.6.3 -> 2.6.4 (bugfix) 2018-02-02 15:26:39 +01:00
Vladimír Čunát
bbfca0f371
knot-resolver: 1.5.3 -> 2.0.0 (feature update) 
Also split extraFeatures into a wrapper derivation.
So far, no changes like user renaming nor systemd unit rework.
 2018-02-02 15:26:36 +01:00
Jörg Thalheim
2bd4820421
Merge pull request #33853 from tomberek/add_teleport 
teleport: init at v2.4.0
 2018-02-02 12:47:15 +00:00
Robert Schütz
78c2ca326e home-assistant: compute extraComponents from config 2018-02-02 09:48:50 +01:00
Daiderd Jordan
fa56fc4be0
Merge pull request #34445 from vbgl/mpd_clientlib-darwin 
mpd_clientlib, ncmpc: fix on Darwin
 2018-02-02 00:34:21 +01:00
Michael Raitza
44a4844744 openafs: Break into multiple packages with multiple outputs 
Two packages:
- pkgs.linuxPackages.openafs (only kernel module)
- pkgs.openafs (client/server programs, manpages, docs)

Disable `ncurses` by default
- Only needed for debugging tools

Introduce but disable `tsmbac` by default
- IBM's on-site backup service called Tivoli Storage Manager Backup
  Client
- Make openafs ready to use tsmbac when supplied via local overlay
  (needs special patching)
- TSM is not in nixpkgs due to unclear/unfree licensing. (Binaries need
  to be modified to work with nixos)
 2018-02-01 16:21:38 +01:00
Andreas Rammhold
f92fd9554e
Merge pull request #34483 from andir/dovecot-cve-2017-15132 
dovecot: fix CVE-2017-15132
 2018-02-01 12:29:34 +00:00
Jörg Thalheim
adfeacc547 teleport: use fetchFromGitHub instead of fetchurl 2018-02-01 10:27:07 +00:00
Frederik Rietdijk
d30735f889
Merge pull request #34188 from dotlambda/home-assistant 
home-assistant: init at 0.62.1
 2018-02-01 08:44:48 +00:00
Vladimír Čunát
2fb4606f38
Merge branch 'master' into staging 
Haskell rebuild.
Hydra: ?compare=1430378
 2018-02-01 09:36:23 +01:00
Franz Pletz
c7885866e4
Merge pull request #34414 from dotlambda/postfix 
postfix: Correct license
 2018-02-01 08:34:33 +00:00
Andreas Rammhold
4dd92c4466
dovecot_antispam: removed since upstream deprecated the package [1] and it fails to build anyway 
[1] https://wiki2.dovecot.org/Plugins/Antispam
 2018-02-01 04:51:07 +01:00
Andreas Rammhold
e27e026539
dovecot: fix CVE-2017-15132 2018-02-01 04:28:14 +01:00
Ruben Maher
0b0afe9a8e dovecot_pigeonhole: 0.4.21 -> 0.5.0.1 (#34449) 2018-01-31 13:32:16 +00:00
Vincent Laporte
1c04923d64
mpd_clientlib: fix dynamic library on darwin 2018-01-31 06:50:20 +00:00
Will Dietz
75068a6770 psol, ngx_pagespeed: 1.13.35.1 -> 1.13.35.2 2018-01-31 05:46:52 +09:00
Vladimír Čunát
c9171e5a4c
Merge branch 'master' into staging 
Hydra: ?compare=1430035
 2018-01-30 19:51:33 +01:00
Robert Schütz
dff396484d postfix: Correct license 2018-01-30 13:15:41 +01:00
Robert Schütz
5bf6d94473 home-assistant: init at 0.62.1 2018-01-30 11:23:24 +01:00
Robert Schütz
bf3b8a45bd postfix: 3.2.4 -> 3.2.5 2018-01-29 02:46:26 +01:00
rnhmjoj
8853d4408b
pdns-recursor: 4.0.8 -> 4.1.1 2018-01-29 00:57:05 +01:00
Franz Pletz
1e4ebccde4
xcbutilxrm: 1.0 -> 1.2 2018-01-28 18:52:27 +01:00
Franz Pletz
646a2e9a6f
dovecot: 2.2.33.2 -> 2.3.0 2018-01-28 18:52:26 +01:00
Franz Pletz
b1a4e239db
mpd: 0.20.10 -> 0.20.15 2018-01-28 18:52:22 +01:00
Franz Pletz
ae939c29cc
sslh: 1.18 -> 1.19 2018-01-28 18:52:21 +01:00
Daiderd Jordan
72d120e7b6
Merge pull request #34345 from LnL7/darwin-mariadb 
mariadb: fix connector-c library install_name on darwin
 2018-01-28 18:23:34 +01:00
adisbladis
1f80e7384e
redis: 4.0.6 -> 4.0.7 2018-01-28 06:51:37 +08:00
adisbladis
1ca9fb1085
cadvisor: 0.26.1 -> 0.28.3 2018-01-28 06:51:28 +08:00
Daiderd Jordan
d71c8da8da
mariadb: fix connector-c library install_name on darwin 2018-01-27 22:52:33 +01:00
Vladimír Čunát
2d2dbe083f
Merge branch 'master' into staging 
Hydra: ?compare=1429281
 2018-01-27 09:14:22 +01:00
Peter Hoeg
afdc186a03 uchiwa: 1.1.1 -> 1.1.2 2018-01-27 14:40:38 +08:00
Franz Pletz
ed8e98f653
Merge pull request #34304 from mayflower/add-postfix-dovecot-exporters 
add prometheus-{postfix,dovecot}-exporter
 2018-01-26 23:11:07 +00:00
Luke Adams
bdf4eeb49c sambaMaster: 4.8_2017-12-25 -> 4.8.0_2018-01-25 2018-01-26 22:37:17 +01:00
Luke Adams
09fa345f20 sambaMaster: init at 4.8_2017-12-25 2018-01-26 22:37:17 +01:00
Luke Adams
d937ea3101 samba: split 4.x-no-persistent-install.patch 
reason: Second hunk does not work on 4.8-master
 2018-01-26 22:37:17 +01:00
WilliButz
2f237868ab
prometheus-postfix-exporter: init at 2017-06-01 2018-01-26 20:07:01 +01:00
WilliButz
a7a9653b06
prometheus-dovecot-exporter: init at 2018-01-18 2018-01-26 20:06:35 +01:00
adisbladis
31e388dff2
traefik: 1.4.6 -> 1.5.0 2018-01-27 01:19:18 +08:00
Eric Sagnes
828d19a7c6 groonga: 7.0.8 -> 7.1.0 2018-01-26 22:17:04 +09:00
Benjamin Staffin
0a0f8d637d
prometheus-alertmanager: 0.9.1 -> 0.13.0 2018-01-25 17:41:25 -05:00
Markus Kowalewski
85ca8f121b slurm-spank-x11: init at 0.2.5 2018-01-25 13:58:14 -08:00
Frederik Rietdijk
769342b37b Merge remote-tracking branch 'upstream/master' into HEAD 2018-01-24 14:17:49 +01:00
Michael Raitza
8a77ae81ad openafsClient: rename to openafs 2018-01-24 13:20:47 +01:00
Graham Christensen
2a2793f618
Merge pull request #34085 from ikervagyok/samba 
samba: 4.6.11 -> 4.7.4
 2018-01-23 20:55:15 -05:00
Franz Pletz
9f16756f77
atlassian-jira: 7.5.2 -> 7.7.0 2018-01-24 02:14:54 +01:00
Franz Pletz
8c88168d2d
atlassian-confluence: 6.5.1 -> 6.6.0 2018-01-24 02:14:53 +01:00
Vladimír Čunát
b200979d6e
knot-resolver: 1.5.2 -> 1.5.3 (bugfix) 
The fixed problem seems not to happen on NixOS, but let's update anyway.
 2018-01-23 15:47:28 +01:00
Will Dietz
24dd0323b1 bind: perl as nativeBuildInput 2018-01-22 17:24:53 -06:00
Justin Humm
92aa0fa437
osrm-backend: 5.14.3 -> 5.15.0 2018-01-22 18:13:35 +01:00
Vladimír Čunát
7dd50deae5
knot-resolver: 1.5.1 -> 1.5.2 (security) 
Fixes CVE-2018-1000002.
https://gitlab.labs.nic.cz/knot/knot-resolver/blob/v1.5.2/NEWS
 2018-01-22 12:03:56 +01:00
Pascal Bach
f694b98b8e prometheus-minio-exporter: 0.1.0 -> 0.2.0 2018-01-21 17:45:30 +01:00
Jörg Thalheim
6d52bbb0dc
Merge pull request #34061 from ryantm/matterbridge 
matterbridge: 1.4.1 -> 1.6.3
 2018-01-20 09:01:29 +00:00
Ryan Mulligan
91fa800a34 matterbridge: 1.4.1 -> 1.6.3 2018-01-19 10:04:09 -08:00
Ryan Mulligan
684fec002a mattermost: 4.4.1 -> 4.6.0 2018-01-19 09:55:58 -08:00
Andreas Rammhold
a4edba9943
Merge pull request #34045 from andir/kmod-missing-libelf 
Fix remaining 4.14 libelf outbreak
 2018-01-19 14:16:22 +00:00
Andreas Rammhold
cf199ff56c
linuxPackages.openafs: 1.6.21.1 -> 1.6.22.1 (fixes build with kernel >=4.14) 2018-01-19 14:40:09 +01:00
Lengyel Balazs
49aa5804ed samba: apply patch mailinglist, which fixes #ifdef boundaries 
http://samba.2283325.n4.nabble.com/Fix-compilation-of-Samba-4-7-4-with-disabled-ADS-td4728041.html
 2018-01-18 23:49:31 +01:00
Pascal Bach
11e91c61ef minio: 2018-01-02T23-07-00Z -> 2018-01-18T20-33-21Z 
Critical security fix that fixes an issue that allows
bypassing authentication.

See: https://blog.minio.io/minio-release-jan-18-2018-security-advisory-4c64ca87721b
 2018-01-18 22:58:28 +01:00
Lengyel Balazs
5ca7b34ed8 samba: 4.6.11 -> 4.7.4 2018-01-18 21:27:54 +01:00
Frederik Rietdijk
27f6f9409b
Merge pull request #33967 from yegortimoshenko/20180117.050213/mornfall 
maintainers: remove mornfall from packages
 2018-01-18 11:27:31 +01:00
John Wiegley
3deeecddad squid, squid4: Allowing build on Darwin 2018-01-17 09:53:46 -08:00
Tuomas Tynkkynen
67c73b4e64 Merge commit '2e56ba' from staging into master 2018-01-17 12:50:46 +02:00
Yegor Timoshenko
506c89c30a maintainers: remove mornfall from packages 2018-01-17 05:17:33 +00:00
adisbladis
ca094d7af2
bind: License changed to MPL 2.0 2018-01-17 09:39:20 +08:00
Tom Bereknyei
256d147931 teleport: init at v2.4.0 2018-01-16 20:34:40 -05:00
Andreas Rammhold
d2b852fe7d
bind: 9.11.2 -> 9.11.2-P1 (fixes CVE-2017-3145, CVE-2017-3143, CVE-2017-3141 & CVE-2017-3140) 
For more details see [1].

[1] http://ftp.isc.org/isc/bind9/9.11.2-P1/RELEASE-NOTES-bind-9.11.2-P1.html
 2018-01-17 02:29:13 +01:00
Bas van Dijk
af47db6a3a elk: 5.6.5 -> 5.6.6 
Security fix for CVE-2018-3818.

https://www.elastic.co/guide/en/kibana/5.6/release-notes-5.6.6.html
https://www.elastic.co/guide/en/logstash/5.6/logstash-5-6-6.html
 2018-01-17 02:11:19 +01:00
Bas van Dijk
e842ffbb33 elk: 6.1.1 -> 6.1.2 
Contains a security fix for kibana: CVE-2018-3818.

https://www.elastic.co/guide/en/elasticsearch/reference/current/release-notes-6.1.2.html
https://www.elastic.co/guide/en/logstash/6.1/logstash-6-1-2.html
https://www.elastic.co/guide/en/kibana/6.1/release-notes-6.1.2.html
https://www.elastic.co/guide/en/beats/libbeat/6.1/release-notes-6.1.2.html
 2018-01-17 01:29:53 +01:00
Tobias Geerinckx-Rice
0f84673f3d
Remove nckx as a maintainer for all packages 
Goodbye, and thanks for all the Nix...
 2018-01-16 23:00:49 +01:00
Tuomas Tynkkynen
2e56ba6fbd Merge remote-tracking branch 'upstream/master' into staging 2018-01-16 22:49:20 +02:00
WilliButz
d8d17d101d
freeradius: 3.0.15 -> 3.0.16 2018-01-15 19:29:20 +01:00
Tuomas Tynkkynen
6ed0fe7e45 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/build-support/fetchbower/default.nix
	pkgs/build-support/fetchdarcs/default.nix
	pkgs/build-support/fetchgx/default.nix
	pkgs/development/python-modules/botocore/default.nix
	pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
	pkgs/tools/admin/awscli/default.nix
 2018-01-14 21:18:27 +02:00
Sarah Brofeldt
ee4e6ebbfa
Merge pull request #32822 from LumiGuide/elk6 
ELK: 5.6.1 -> 5.6.5 & add ELK 6.1.0
 2018-01-14 10:40:50 +01:00
Jörg Thalheim
2769a38c1d telegraf: 1.5.0 -> 1.5.1 2018-01-12 19:40:56 +00:00
Peter Hoeg
96e777adfd uchiwa: add update script 2018-01-12 23:02:39 +08:00
Peter Hoeg
754b5961a2 uchiwa: 1.1.0 -> 1.1.1 2018-01-12 23:02:39 +08:00