Commit Graph

17641 Commits

Author SHA1 Message Date
github-actions[bot]
83750a4f3d
Merge staging-next into staging 2021-12-14 18:01:49 +00:00
github-actions[bot]
dfda17d6ba
Merge master into staging-next 2021-12-14 18:01:09 +00:00
Martin Weinelt
8b4ef37d96
Merge pull request #150606 from herbetom/prometheus-mikrotik-exporter 2021-12-14 14:43:40 +01:00
github-actions[bot]
a292b5fe68
Merge staging-next into staging 2021-12-14 12:02:00 +00:00
github-actions[bot]
0242879f3f
Merge master into staging-next 2021-12-14 12:01:17 +00:00
Janne Heß
b5186024e1
Merge pull request #150561 from onny/dokuwikitest 2021-12-14 11:43:34 +01:00
Kim Lindberger
c89ae4d3da
Merge pull request #150553 from talyz/keycloak-15.1.0
keycloak: 15.0.2 -> 15.1.0
2021-12-14 10:26:28 +01:00
Joerie de Gram
d2d9d4c862 apache-jena: 4.2.0 -> 4.3.1; apache-jena-fuseki: 4.2.0 -> 4.3.1
Fixes CVE-2021-44228. See #150288.
2021-12-14 00:16:36 +01:00
Tom Herbers
7ea4ffd640
prometheus-mikrotik-exporter: 2020-02-10 -> 2021-08-10 2021-12-13 23:44:59 +01:00
Jonas Heinrich
cc8ab71ee9 nixos/dokuwiki: add passthru test 2021-12-13 17:26:36 +01:00
talyz
b94a1f842a
keycloak: 15.0.2 -> 15.1.0 2021-12-13 16:21:50 +01:00
github-actions[bot]
60c2e603bb
Merge staging-next into staging 2021-12-13 12:02:07 +00:00
Martin Weinelt
423119b70b
Merge branch 'master' into staging-next 2021-12-13 12:20:07 +01:00
Martin Weinelt
fbd5e62e12
home-assistant: 2021.12.0 -> 2021.12.1 2021-12-13 02:44:51 +01:00
Martin Weinelt
ea11136279
Merge pull request #148050 from mweinelt/python/pyoctoprintapi 2021-12-12 22:12:24 +01:00
Martin Weinelt
1445fca5d6
home-assistant: test octoprint component 2021-12-12 21:36:14 +01:00
Martin Weinelt
1180267064
home-assistant: update component-packages 2021-12-12 21:36:14 +01:00
Martin Weinelt
fd19df269d
home-assistant: 2021.11.4 -> 2021.12.0 2021-12-12 20:25:50 +01:00
github-actions[bot]
f73f987c8a
Merge staging-next into staging 2021-12-12 18:01:48 +00:00
github-actions[bot]
fcf88f377b
Merge master into staging-next 2021-12-12 18:01:08 +00:00
Maximilian Bosch
6f85f5991b
Merge pull request #150410 from Ma27/bump-grafana
grafana: 8.3.1 -> 8.3.2, fix CVE-2021-43813, CVE-2021-43815
2021-12-12 17:53:57 +01:00
Martin Weinelt
37527494b6
Merge pull request #150329 from zhaofengli/unifi-6.5.54 2021-12-12 14:10:10 +01:00
Maximilian Bosch
3c8f6c5407
grafana: 8.3.1 -> 8.3.2, fix CVE-2021-43813, CVE-2021-43815
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.3.2
2021-12-12 13:04:35 +01:00
github-actions[bot]
caebe15ce1
Merge staging-next into staging 2021-12-12 00:02:28 +00:00
github-actions[bot]
c6ad49e2f0
Merge master into staging-next 2021-12-12 00:01:54 +00:00
Zhaofeng Li
48feb21a3c unifi6: 6.5.53 -> 6.5.54 2021-12-11 15:07:48 -08:00
Mario Rodas
507e9bde13
Merge pull request #149546 from r-ryantm/auto-update/plr
postgresql11Packages.plr: 8.4.4 -> 8.4.5
2021-12-11 16:57:58 -05:00
Robert Scott
5755fb5f60
Merge pull request #150151 from xfix/metabase_0_41_4
metabase: 0.38.0 -> 0.41.4
2021-12-11 21:40:47 +00:00
Dmitry Kalinkin
07a8ae0c5a
Merge branch 'staging-next' into staging
Conflicts:
	pkgs/development/libraries/log4cplus/default.nix
2021-12-11 14:01:19 -05:00
Dmitry Kalinkin
c71b1bb92c
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/jenkins-job-builder/default.nix
	pkgs/development/python-modules/snowflake-connector-python/default.nix
2021-12-11 13:59:09 -05:00
Ryan Mulligan
26501a9f6f
Merge pull request #150232 from r-ryantm/auto-update/corosync
corosync: 3.1.5 -> 3.1.6
2021-12-11 10:41:04 -08:00
Dmitry Kalinkin
b6b59334bb
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/celery/default.nix
	pkgs/development/python-modules/kombu/default.nix
2021-12-11 13:15:49 -05:00
Jörg Thalheim
5c1a8b91b0
Merge pull request #149978 from r-ryantm/auto-update/libmpdclient
libmpdclient: 2.19 -> 2.20
2021-12-11 16:07:20 +00:00
Jörg Thalheim
48b2876479
Merge pull request #150098 from r-ryantm/auto-update/hitch
hitch: 1.7.0 -> 1.7.2
2021-12-11 15:28:47 +00:00
Jörg Thalheim
512e08db70
Merge pull request #150067 from r-ryantm/auto-update/ircd-hybrid
ircdHybrid: 8.2.38 -> 8.2.39
2021-12-11 15:11:12 +00:00
Thiago Kenji Okada
74d38c0c08
Merge pull request #149885 from r-ryantm/auto-update/memcached
memcached: 1.6.9 -> 1.6.12
2021-12-11 11:52:53 -03:00
Jörg Thalheim
d8717f0946
Merge pull request #150228 from r-ryantm/auto-update/dictd
dict: 1.13.0 -> 1.13.1
2021-12-11 14:40:35 +00:00
Jörg Thalheim
cb0d9e8f2c
Merge pull request #150075 from r-ryantm/auto-update/janus-gateway
janus-gateway: 0.11.3 -> 0.11.5
2021-12-11 13:29:57 +00:00
Jörg Thalheim
d4adca28c5
Merge pull request #150156 from r-ryantm/auto-update/gitlab-pages
gitlab-pages: 1.41.0 -> 1.48.0
2021-12-11 13:21:43 +00:00
github-actions[bot]
a875f4053e
Merge master into staging-next 2021-12-11 12:01:07 +00:00
R. Ryantm
390ea16609 corosync: 3.1.5 -> 3.1.6 2021-12-11 11:56:06 +00:00
R. Ryantm
69df9ef318 dict: 1.13.0 -> 1.13.1 2021-12-11 11:01:35 +00:00
Bobby Rong
b4f7deb2fa
Merge pull request #149529 from r-ryantm/auto-update/plexmediaserver
plexRaw: 1.25.0.5282-2edd3c44d -> 1.25.1.5286-34f965be8
2021-12-11 17:41:51 +08:00
github-actions[bot]
209e8d0932
Merge master into staging-next 2021-12-11 00:01:48 +00:00
R. Ryantm
e0d66d1cc7 gitlab-pages: 1.41.0 -> 1.48.0 2021-12-10 23:32:58 +00:00
Konrad Borowski
9eee84f9f0 metabase: add passthru tests 2021-12-11 00:13:02 +01:00
Konrad Borowski
6dfe6024b0 metabase: 0.38.0 -> 0.41.4 2021-12-11 00:00:57 +01:00
lewo
ba1b1d162e
Merge pull request #149830 from r-ryantm/auto-update/munin
munin: 2.0.66 -> 2.0.69
2021-12-10 22:20:00 +01:00
github-actions[bot]
cc51bd619c
Merge master into staging-next 2021-12-10 18:01:06 +00:00
Martin Weinelt
2a89cb4c1b
Merge pull request #150100 from mweinelt/hass-fix-deps 2021-12-10 18:50:31 +01:00