Commit Graph

7240 Commits

Author SHA1 Message Date
Martin Weinelt
61c9c7888f curl: 7.74.0 -> 7.76.1 2021-04-14 17:06:07 +02:00
Luke Granger-Brown
08b22e605b Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging 2021-04-12 18:49:01 +00:00
Sandro
b50d86446a
Merge pull request #119046 from eduardosm/amule
amule: unbreak (except daemon), unstable-20201006 -> 2.3.3, use cmake
2021-04-12 16:27:53 +02:00
Sandro
dd69888b9c
Merge pull request #119098 from marsam/update-shadowsocks-rust
shadowsocks-rust: 1.10.3 -> 1.10.5
2021-04-11 16:25:45 +02:00
Maximilian Bosch
7e736eb80c
Merge pull request #119005 from LeSuisse/tcpdump-4.9.99
tcpdump: 4.9.3 -> 4.99.0
2021-04-11 14:34:12 +02:00
Thomas Gerbet
da55ee488f tcpdump: 4.9.3 -> 4.99.0
Changelog:
https://www.tcpdump.org/tcpdump-changes.txt
2021-04-11 09:39:59 +02:00
Eduardo Sánchez Muñoz
1a8cf34ce4 amule: unbreak (except daemon), unstable-20201006 -> 2.3.3, use cmake 2021-04-10 17:20:29 +02:00
Sandro
4c99c73069
Merge pull request #118983 from r-ryantm/auto-update/dnsproxy
dnsproxy: 0.36.0 -> 0.37.0
2021-04-10 16:32:01 +02:00
Sandro
ed64b0ddf4
Merge pull request #118971 from r-ryantm/auto-update/clash
clash: 1.4.2 -> 1.5.0
2021-04-10 16:29:10 +02:00
R. RyanTM
715186f4cd dnsproxy: 0.36.0 -> 0.37.0 2021-04-10 08:05:15 +00:00
R. RyanTM
eb4b25b29b clash: 1.4.2 -> 1.5.0 2021-04-10 06:53:52 +00:00
Mario Rodas
e7bba4ff57 shadowsocks-rust: 1.10.3 -> 1.10.5 2021-04-10 04:20:00 +00:00
Ryan Mulligan
2930fdf6c2
Merge pull request #118526 from r-ryantm/auto-update/oapi-codegen
oapi-codegen: 1.5.6 -> 1.6.0
2021-04-09 20:51:02 -07:00
github-actions[bot]
c876eb99be
Merge master into staging-next 2021-04-09 12:06:22 +00:00
Mario Rodas
01af3003e4 shadowsocks-rust: 1.10.2 -> 1.10.3
https://github.com/shadowsocks/shadowsocks-rust/releases/tag/v1.10.3
2021-04-09 04:20:00 +00:00
Dmitry Kalinkin
219590673c
Merge branch 'staging-next' into staging
Conflicts:
	pkgs/development/python-modules/panel/default.nix
	pkgs/os-specific/linux/kernel/generic.nix
	pkgs/servers/home-assistant/default.nix
2021-04-08 22:42:26 -04:00
github-actions[bot]
85b57e4446
Merge master into staging-next 2021-04-08 18:14:17 +00:00
Jan Tojnar
625ce6c7f6 Merge branch 'staging-next' into staging
In python-packages.nix, resolve conflict between 50d604314e and 187d0371ab.
2021-04-08 17:14:31 +02:00
midchildan
2e2a36f082
ssh-copy-id: init at 8.4p1 (#105896)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-08 14:53:06 +02:00
github-actions[bot]
bf6abedefb
Merge master into staging-next 2021-04-08 12:06:16 +00:00
Jörg Thalheim
034c49f514
Merge pull request #118041 from Mic92/cutter
cutter: 1.12.0 -> 2.0.0
2021-04-08 11:32:54 +01:00
Jan Tojnar
b47bf79d2a Merge branch 'staging-next' into staging 2021-04-07 05:41:17 +02:00
Jan Tojnar
714ef27ffe Merge branch 'master' into staging-next 2021-04-07 05:32:57 +02:00
Alyssa Ross
b0372cefc4
connman: set sysconfdir to /etc
If sysconfdir is set to something in connman's prefix, it's not
possible to change the configuration (at least without providing a
flag to connman).
2021-04-06 16:09:47 +00:00
Jan Tojnar
70babe5bcf Merge branch 'staging-next' into staging 2021-04-06 16:25:41 +02:00
Jan Tojnar
c04a14edd6 Merge branch 'master' into staging-next 2021-04-06 16:01:14 +02:00
R. RyanTM
6590636885 gobgp: 2.25.0 -> 2.26.0 2021-04-06 04:14:41 -04:00
zowoq
60d217b32a saldl: 40 -> 41
https://github.com/saldl/saldl/releases/tag/v41
2021-04-06 16:26:59 +10:00
R. RyanTM
11a2772e74 ytcc: 2.1.0 -> 2.2.0 2021-04-05 23:42:58 -04:00
Pacman99
2a87462479 linkchecker: add pyopenssl dependency to fix build 2021-04-05 11:38:06 -07:00
R. RyanTM
98a5158418
i2pd: 2.36.0 -> 2.37.0 2021-04-05 10:18:45 +02:00
Sandro
7c932296e0
Merge pull request #116335 from SuperSandro2000/move-aliases.nix 2021-04-05 04:07:15 +02:00
R. RyanTM
6d6dddd19a oapi-codegen: 1.5.6 -> 1.6.0 2021-04-05 00:57:20 +00:00
Sandro Jäckel
3453b89f4b
lzma: deprecate alias 2021-04-04 19:49:52 +02:00
Sandro Jäckel
33a395f195
yacc: deprecate alias
and add a new line after the alphabetically sorting to please my inner monk
2021-04-04 03:18:58 +02:00
Sandro Jäckel
62733b37b4
mysql: deprecate alias 2021-04-04 03:18:57 +02:00
Sandro Jäckel
dcb501f993
kerberos: deprecate alias 2021-04-04 03:18:56 +02:00
github-actions[bot]
1ffe4a4f49
Merge staging-next into staging 2021-04-04 00:20:48 +00:00
github-actions[bot]
3cc7116425
Merge master into staging-next 2021-04-04 00:20:45 +00:00
Sandro Jäckel
9378fdf87e
iproute: deprecate alias 2021-04-04 01:43:46 +02:00
Serval
9531c4adef
v2ray: 4.36.2 -> 4.37.0 2021-04-04 02:51:57 +08:00
github-actions[bot]
e4d0dd66a1
Merge staging-next into staging 2021-04-03 18:18:54 +00:00
github-actions[bot]
3bf92ca4db
Merge master into staging-next 2021-04-03 18:18:51 +00:00
Martin Weinelt
73e54be67d
Merge pull request #118343 from risicle/ris-curl-CVE-2021-22876-CVE-2021-22890
curl: add patches for CVE-2021-22876, CVE-2021-22890
2021-04-03 18:39:50 +02:00
Frederik Rietdijk
fa9d5aa4aa httpstat: use python3 2021-04-03 17:06:09 +02:00
Frederik Rietdijk
ba6f1213f0 libreswan: use python3 2021-04-03 17:06:09 +02:00
github-actions[bot]
74200a7126
Merge master into staging-next 2021-04-03 00:14:57 +00:00
Sandro
a82f4038d3
Merge pull request #117544 from jraygauthier/jrg/swagger-codegen-update
swagger-codegen: 2.4.17 -> 2.4.19
2021-04-02 21:06:16 +02:00
Robert Scott
6808269554 curl: add patches for CVE-2021-22876, CVE-2021-22890
hand-backported from upstream fixes
2021-04-02 18:13:36 +01:00
github-actions[bot]
b719e2423f
Merge staging-next into staging 2021-04-02 06:05:30 +00:00