Vladimír Čunát
0b32140b34
Merge branch 'staging-next' into staging
2020-10-28 18:48:56 +01:00
Vladimír Čunát
31839c352e
Merge branch 'master' into staging-next
2020-10-28 18:48:18 +01:00
Linus Heckemann
6a0a9fbd55
Merge pull request #101353 from WilliButz/update/atlassian-crowd/4.2.0
...
atlassian-crowd: 4.0.2 -> 4.2.0
2020-10-28 16:41:27 +01:00
Linus Heckemann
6ee80e39fc
Merge pull request #101354 from WilliButz/update/atlassian-confluence/7.8.1
...
atlassian-confluence: 7.8.0 -> 7.8.1
2020-10-28 16:33:05 +01:00
Linus Heckemann
da5209c89f
Merge pull request #101343 from WilliButz/update/prometheus-snmp-exporter/0.19.0
...
prometheus-snmp-exporter: 0.18.0 -> 0.19.0
2020-10-28 16:13:56 +01:00
stovemeerkat
4c7982a2c5
metabase: 0.36.4 -> 0.37.0.2
2020-10-28 13:02:30 +01:00
Andreas Rammhold
db0fe5c3eb
Merge branch master into staging to fix eval error
...
This fixes the eval error of the small (and "big"?) NixOS test set that
was fixed in 1088f05
& eba8f542
.
2020-10-28 03:03:27 +01:00
Jonathan Ringer
f175726bd2
Merge pull request #101874 from davidak/fix-release-notes
...
doc: improve 20.09 release notes
2020-10-27 17:26:53 -07:00
Aaron Andersen
48148913b6
Merge pull request #101808 from aanderse/zabbix
...
zabbix: 4.0.25 -> 4.0.26, 5.0.4 -> 5.0.5
2020-10-27 20:09:58 -04:00
Ivan Kozik
5074b8e473
postgresqlPackages.periods: 1.1 -> 1.2
2020-10-27 21:07:29 +00:00
davidak
4166a767de
doc: improve 20.09 release notes
2020-10-27 21:11:22 +01:00
Martin Weinelt
0ead6f8cfd
Merge pull request #101557 from mvnetbiz/zigpy-znp
...
home-assistant: pythonPackages.zigpy-znp: init at 0.2.2; pythonPackages.zigpy: 0.22.2 -> 0.26.0; pythonPackages.zigpy-cc: 0.5.1 -> 0.5.2; pythonPackages.zigpy-xbee: 0.12.1 -> 0.13.0; pythonPackages.zigpy-zigate: 0.6.1 -> 0.6.2
2020-10-27 18:30:26 +01:00
Ben Siraphob
db74029e3e
treewide: remove package names from prefix of descriptions
2020-10-27 09:15:07 -07:00
Matthieu Coudron
e3d3bc66dc
Merge pull request #101695 from lourkeur/xkeyboard-config
...
xkeyboard-config: 2.27 -> 2.31
2020-10-27 15:11:04 +01:00
Louis
3f381d579d
setxkbmap: include xkeyboard-config manpage
2020-10-27 13:59:14 +01:00
Aaron Andersen
7298f524e5
Merge pull request #100413 from helsinki-systems/fix/mariadb-perl
...
pkgs/mariadb: Fix when running without aliases
2020-10-27 08:23:56 -04:00
Mario Rodas
3692288f91
Merge pull request #101584 from r-ryantm/auto-update/dnsdist
...
dnsdist: 1.5.0 -> 1.5.1
2020-10-27 06:48:58 -05:00
Pierre Bourdon
02796d77f8
bind: 9.16.7 -> 9.16.8
...
https://bind9.readthedocs.io/en/v9_16_8/notes.html#notes-for-bind-9-16-8
2020-10-27 08:48:19 +01:00
Matt Votava
c4e2e9adf8
home-assistant: update component-packages.nix
2020-10-26 22:48:40 -07:00
Aaron Andersen
9aa5b53b5a
zabbix: 5.0.4 -> 5.0.5
2020-10-26 20:13:51 -04:00
Aaron Andersen
855a6bb9c1
zabbix: 4.0.25 -> 4.0.26
2020-10-26 20:11:52 -04:00
V
99fabc5779
mpd: remove unused fetchpatch argument
...
This argument is no longer referenced anywhere as of #93143 .
2020-10-26 15:40:32 +00:00
Vladimír Čunát
89023c38fc
Recover the complicated situation after my bad merge
...
I made a mistake merge. Reverting it in c778945806
undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.
I reconstructed the "desired" state of staging-next tree by:
- checking out the last commit of the problematic range: 4effe769e2
- `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
merge commit and its revert from that range (while keeping
reapplication from 4effe769e2
)
- merging the last unaffected staging-next commit (803ca85c20
)
- fortunately no other commits have been pushed to staging-next yet
- applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
Vladimír Čunát
336bc8283b
Re-Revert "Merge #101508 : libraw: 0.20.0 -> 0.20.2"
...
This reverts commit c778945806
.
I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
2020-10-26 08:19:17 +01:00
Ryan Mulligan
b7bb3aa602
Merge pull request #101680 from r-ryantm/auto-update/livepeer
...
livepeer: 0.5.10 -> 0.5.11
2020-10-25 18:04:40 -07:00
Mario Rodas
ccb6aff774
Merge pull request #101664 from r-ryantm/auto-update/jackett
...
jackett: 0.16.1757 -> 0.16.1883
2020-10-25 19:28:08 -05:00
R. RyanTM
a37ff262d4
livepeer: 0.5.10 -> 0.5.11
2020-10-25 19:45:44 +00:00
R. RyanTM
96a163601a
jackett: 0.16.1757 -> 0.16.1883
2020-10-25 16:27:37 +00:00
R. RyanTM
6fecc33dad
bazarr: 0.9.0.2 -> 0.9.0.5
2020-10-25 09:51:22 +01:00
R. RyanTM
7461989bd9
icingaweb2: 2.8.1 -> 2.8.2
2020-10-25 09:50:06 +01:00
R. RyanTM
4b023fb1da
caddy: 2.2.0 -> 2.2.1
2020-10-25 09:49:15 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508 : libraw: 0.20.0 -> 0.20.2"
...
I'm sorry; I didn't notice it contained staging commits.
This reverts commit 17f5305b6c
, reversing
changes made to a8a018ddc0
.
2020-10-25 09:41:51 +01:00
R. RyanTM
2f474d44ff
storm: 2.1.0 -> 2.2.0
2020-10-25 09:33:38 +01:00
Vladimír Čunát
17f5305b6c
Merge #101508 : libraw: 0.20.0 -> 0.20.2
2020-10-25 09:28:53 +01:00
lewo
7c84c74897
Merge pull request #101328 from r-ryantm/auto-update/consul_exporter
...
prometheus-consul-exporter: 0.6.0 -> 0.7.1
2020-10-25 08:09:44 +01:00
R. RyanTM
b90d8c6849
dgraph: 20.07.0 -> 20.07.1
2020-10-24 23:18:43 -07:00
Aaron Andersen
603f0dcae8
powerdns: 4.2.3 -> 4.3.1
2020-10-24 16:40:20 -04:00
R. RyanTM
d14027748b
dnsdist: 1.5.0 -> 1.5.1
2020-10-24 18:33:26 +00:00
Louis
3cf12aa9c6
xkeyboard-config: 2.27 -> 2.31
2020-10-24 20:22:31 +02:00
Andreas Rammhold
f0af7d27b8
Merge pull request #98748 from TredwellGit/xorg.xorgserver
...
xorg.xorgserver: 1.20.8 -> 1.20.9
2020-10-24 00:44:52 +02:00
WilliButz
993437d0d6
Merge pull request #96511 from Zopieux/rtl_433_prom
...
Add rtl_433 Prometheus exporter
2020-10-23 23:24:38 +02:00
Alexandre Macabies
af28dac3ac
prometheus-rtl_433-exporter: init at 641a1f5
2020-10-23 20:33:35 +02:00
Michael Weiss
3bde36537c
monetdb: 11.37.11 -> 11.39.5 ( #101362 )
2020-10-23 20:30:17 +02:00
Andreas Rammhold
e894c00e1c
Merge pull request #101452 from stigtsp/package/mariadb-10.4.15
...
mariadb: 10.4.14 -> 10.4.15 (CVE-2020-15180)
2020-10-23 17:46:32 +02:00
Graham Christensen
ad9c8e6f04
Merge pull request #101416 from endocrimes/dani/tailscale-version
...
tailscale: Include version in build flags
2020-10-23 09:47:28 -04:00
Stig Palmquist
2929f5edb9
mariadb: 10.4.14 -> 10.4.15
...
Fixes CVE-2020-15180
2020-10-23 12:24:20 +02:00
Ryan Mulligan
9b8b7065cd
Merge pull request #101345 from r-ryantm/auto-update/couchdb
...
couchdb3: 3.1.0 -> 3.1.1
2020-10-22 14:03:40 -07:00
Danielle Lancashire
7526ae55d7
tailscale: Include version in build flags
...
This commit adds the user-facing version to the tailscale version
output.
Prior to this change, it used a hardcoded fallback that is fairly
infrequently updated (https://github.com/tailscale/tailscale/commits/main/version/version.go ).
After this change, we print the user-friendlier tag version, which is
helpful when wanting to e.g check to see if you have a version that is
compatible with a feature like [magic dns][magic-dns].
E.g:
```
[nixpkgs(dani/tailscale-version)] $ ./result/bin/tailscale version
1.0.5
```
[magic-dns]: https://tailscale.com/kb/1081/magic-dns
2020-10-22 22:47:18 +02:00
Jan Tojnar
3e01d383ee
Merge branch 'staging-next' into staging
2020-10-22 21:20:32 +02:00
Jan Tojnar
d13fc932cd
Merge branch 'master' into staging-next
2020-10-22 21:20:14 +02:00