7266 commits

Author	SHA1	Message	Date
github-actions[bot]	9b3e698b14	Merge master into staging-next	2021-04-21 12:06:23 +00: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]	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]	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
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]	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
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
github-actions[bot]	6a0f49f240	Merge master into staging-next	2021-04-16 18:13:19 +00:00
Henner Zeller	72255d3fef	gmrender-resurrect: 0.0.8 -> 0.0.9 ... Updating the latest version of gmrender-resurrect lets us skip adding the cherrypick patch, as this is already included in 0.0.9. (Note, I am not maintainer of this nix package, but maintainer of gmrender-resurrect) Signed-off-by: Henner Zeller <h.zeller@acm.org>	2021-04-15 23:50:17 -07:00
Martin Weinelt	cd7a519012	Merge branch 'master' into staging-next	2021-04-16 01:32:09 +02:00
Sandro	433b4b1f51	Merge pull request #119525 from fabaff/bump-siege ... siege: 4.0.7 -> 4.0.8	2021-04-15 23:15:32 +02:00
Serval	9c6b229442	v2ray: 4.37.0 -> 4.37.3	2021-04-16 03:20:06 +08:00
github-actions[bot]	dfd4f14303	Merge master into staging-next	2021-04-15 18:13:27 +00:00
06kellyjac	01940a7328	boundary: 0.1.8 -> 0.2.0	2021-04-15 12:58:14 +01:00
Fabian Affolter	c81bfad279	siege: 4.0.7 -> 4.0.8	2021-04-15 11:34:48 +02:00
R. RyanTM	cba915574f	dnsproxy: 0.37.0 -> 0.37.1	2021-04-14 23:08:13 +00: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