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
Sandro Jäckel
ac309027ab
unbound: wrap unbound-control-setup with openssl
2021-04-24 10:26:40 +02: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
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
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 50d604314e187d0371ab
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
