Commit Graph

7299 Commits

Author SHA1 Message Date
Luke Granger-Brown
d30f31222f
Merge pull request #119845 from helsinki-systems/upd/openssh
[staging] openssh: 8.5p1 -> 8.6p1
2021-04-25 13:52:43 +01:00
Luke Granger-Brown
09dae93155
Merge pull request #120046 from maxeaubrey/NetworkManager-1.30.4
networkmanager: 1.30.2 -> 1.30.4
2021-04-25 12:57:27 +01:00
Jan Tojnar
c1f851b2ee
Merge branch 'staging-next' into staging 2021-04-25 08:22:13 +02:00
github-actions[bot]
a956f62ea4
Merge master into staging-next 2021-04-25 06:05:34 +00:00
Martin Weinelt
70c96f0e02 babeld: add patch to skip per interface rp_filter setup
This is in preparation to run babeld as DynamicUser and was submitted
upstream in https://github.com/jech/babeld/pull/68 and will be part of
the 1.10 release.
2021-04-25 00:51:41 +02:00
Michael Raskin
d04f1c4314
Merge pull request #101071 from ju1m/apparmor
apparmor: try again to fix and improve
2021-04-24 11:24:26 +00:00
Luke Granger-Brown
6b24bc6db8
Merge pull request #120330 from LeSuisse/dnsmasq-2.85
dnsmasq: 2.84 -> 2.85
2021-04-24 11:34:56 +01:00
Thomas Gerbet
380bb617c0 dnsmasq: 2.84 -> 2.85
Fixes CVE-2021-3448.
https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2021q1/014835.html
2021-04-24 09:52:50 +02:00
github-actions[bot]
944e32775d
Merge staging-next into staging 2021-04-24 00:16:20 +00:00
github-actions[bot]
6e7c70d02d
Merge master into staging-next 2021-04-24 00:16:17 +00:00
Peter Simons
a8ade4385f Merge origin/master into haskell-updates. 2021-04-23 17:15:13 +02:00
Alyssa Ross
bb8d9a49ff
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
This will bring in the fix for the yarGen eval failure.
2021-04-23 13:35:52 +00:00
Vladimír Čunát
ca65d6f7d2
Merge branch 'master' into staging-next 2021-04-23 09:10:50 +02:00
Julien Moutinho
05d334cfe2 Revert "Revert "apparmor: fix and improve the service""
This reverts commit 420f89ceb2.
2021-04-23 07:17:55 +02:00
Sandro
cc9e099e63
Merge pull request #119902 from tuxinaut/master
lychee: 0.5.0 -> 0.7.0
2021-04-23 05:26:08 +02:00
Ryan Mulligan
f048f2fa51
Merge pull request #120172 from r-ryantm/auto-update/croc
croc: 8.6.12 -> 9.1.0
2021-04-22 18:46:52 -07:00
Henri Menke
ff856b1342 wstunnel: deduplicate by using haskellPackages
wstunnel is packaged twice in nixpkgs, once standalone and once in
haskellPackages. The standalone version is outdated while the version in
haskellPackages is updated automatically from Hackage, so we are
removing the standalone Nix expression but still keep the static
executable.
2021-04-22 23:57:02 +02:00
Denny Schäfer
7d6fb7ec3b
lychee: 0.5.0 -> 0.7.0 2021-04-22 22:25:03 +02:00
R. RyanTM
0a6f41e438 croc: 8.6.12 -> 9.1.0 2021-04-22 08:08:18 +00:00
github-actions[bot]
dde5369c50
Merge staging-next into staging 2021-04-22 06:05:54 +00:00
github-actions[bot]
8248f4db36
Merge master into staging-next 2021-04-22 06:05:51 +00:00
Fabian Affolter
391c5fcb5a
anevicon: init at 0.1.0 (#120043)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-22 05:39:12 +02:00
github-actions[bot]
a260b67879
Merge staging-next into staging 2021-04-21 12:06:26 +00:00
github-actions[bot]
9b3e698b14
Merge master into staging-next 2021-04-21 12:06:23 +00:00
Maxine Aubrey
6e3b8543bc
networkmanager: add maxeaubrey to maintainers 2021-04-21 13:43:11 +02:00
Maxine Aubrey
52f7632252
networkmanager: 1.30.2 -> 1.30.4 2021-04-21 13:34:21 +02:00
Fabian Affolter
3121998f6b dnstwist: init at 20201228 2021-04-21 10:44:06 +02:00
Sandro
3cf87928e6
Merge pull request #119988 from fabaff/sish
sish: init at 1.1.5
2021-04-21 03:04:23 +02:00
github-actions[bot]
6faea022df
Merge staging-next into staging 2021-04-21 00:15:23 +00:00
github-actions[bot]
99c7bab106
Merge master into staging-next 2021-04-21 00:15:20 +00:00
Fabian Affolter
da711cec88 sish: init at 1.1.5 2021-04-21 00:06:27 +02:00
Sandro
0df8f62144
Merge pull request #119880 from fgaz/qrcp/0.7.1
qrcp: 0.7.0 -> 0.8.1
2021-04-20 21:02:26 +02:00
Francesco Gazzetta
7aecbba178 qrcp: 0.7.0 -> 0.8.1 2021-04-19 21:54:34 +02:00
github-actions[bot]
ea5bd4364e
Merge staging-next into staging 2021-04-19 18:11:54 +00:00
github-actions[bot]
6ef7c23763
Merge master into staging-next 2021-04-19 18:11:51 +00:00
Sandro
51ea9d0acc
Merge pull request #111930 from 1000101/swagger-codegen 2021-04-19 17:34:46 +02:00
1000101
e1980bb876 swagger-codegen: do not override phases 2021-04-19 10:56:52 +02:00
1000101
d7fda9f65c swagger-codegen3: init at 3.0.25 2021-04-19 10:56:52 +02:00
Janne Heß
35da81b990
openssh: 8.5p1 -> 8.6p1 2021-04-19 08:33:03 +02:00
github-actions[bot]
7742d40a37
Merge staging-next into staging 2021-04-19 06:05:52 +00:00
github-actions[bot]
36faabcd7c
Merge master into staging-next 2021-04-19 06:05:48 +00:00
tomberek
cd251bfd11
innernet: init at 1.0.0 (#118007)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-19 04:33:03 +02:00
Sandro
a8b5aa3570
Merge pull request #119755 from marsam/update-shadowsocks-rust
shadowsocks-rust: 1.10.5 -> 1.10.7
2021-04-19 02:19:59 +02:00
github-actions[bot]
c577e0ee09
Merge staging-next into staging 2021-04-19 00:15:24 +00:00
github-actions[bot]
a28d31ed86
Merge master into staging-next 2021-04-19 00:15:22 +00:00
Pascal Bach
4ba679b159
Merge pull request #119484 from r-ryantm/auto-update/dnsproxy
dnsproxy: 0.37.0 -> 0.37.1
2021-04-18 21:16:54 +02:00
Jörg Thalheim
b2a1e04eed
Merge remote-tracking branch 'upstream/staging-next' into HEAD 2021-04-17 16:37:04 +02:00
Mario Rodas
dabbf9d447 shadowsocks-rust: 1.10.5 -> 1.10.7
https://github.com/shadowsocks/shadowsocks-rust/releases/tag/v1.10.6
https://github.com/shadowsocks/shadowsocks-rust/releases/tag/v1.10.7
2021-04-17 04:20:00 +00:00
github-actions[bot]
f620e30ca4
Merge master into staging-next 2021-04-17 00:15:03 +00:00
Marc Seeger
f7cb740de8
ntp: set platforms to unix (#119644)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-17 00:43:03 +02:00