Commit Graph

7328 Commits

Author SHA1 Message Date
github-actions[bot]
c6548b2832
Merge staging-next into staging 2021-04-30 06:21:40 +00:00
Markus S. Wamser
9e143db301 minidlna: switch from ffmpeg_3 to ffmpeg 2021-04-29 18:58:13 -07:00
Sandro
b9ed7b607c
Merge pull request #121078 from wamserma/fix-croc-test
croc: fix passthru.tests
2021-04-30 03:34:03 +02:00
github-actions[bot]
b4766e97ee
Merge staging-next into staging 2021-04-30 00:52:06 +00:00
Martin Weinelt
dbcbb7ec48
Merge pull request #121165 from r-ryantm/auto-update/kea
kea: 1.9.5 -> 1.9.6
2021-04-30 02:41:37 +02:00
R. RyanTM
34c288f014
kea: 1.9.5 -> 1.9.6 2021-04-30 02:31:10 +02:00
Sandro
838af7acbf
Merge pull request #121214 from r-ryantm/auto-update/croc
croc: 9.1.0 -> 9.1.1
2021-04-30 01:40:04 +02:00
Sandro
ecaf5e946c
Merge pull request #120801 from rb2k/patch-2
eternal-terminal: 6.0.13 -> 6.1.7
2021-04-30 01:16:53 +02:00
R. RyanTM
d9906b0576 croc: 9.1.0 -> 9.1.1 2021-04-29 22:48:09 +00:00
Sandro
5c80c7ce86
Merge pull request #120500 from SuperSandro2000/unbound
unbound: wrap unbound-control-setup with openssl
2021-04-30 00:22:38 +02:00
Andrey Kuznetsov
0b02fa01a9
innernet: fix build on darwin 2021-04-29 23:56:38 +03:00
Jan Tojnar
76c3a6aafd
Merge branch 'staging-next' into staging 2021-04-29 02:35:54 +02:00
Markus S. Wamser
77c0a4907f croc: fix passthru.tests 2021-04-28 22:36:36 +02:00
R. RyanTM
1a58aec6a2 haproxy: 2.3.7 -> 2.3.10 2021-04-28 17:02:10 +00:00
Marc Seeger
715f47fe06 eternal-terminal: 6.0.13 -> 6.1.7 2021-04-28 05:48:42 -07:00
github-actions[bot]
655989d7b3
Merge staging-next into staging 2021-04-28 00:15:29 +00:00
Sandro
90c58c5023
Merge pull request #120768 from 0x4A6F/main-innernet
innernet: test and fixup
2021-04-28 00:55:06 +02:00
github-actions[bot]
92003c2ff7
Merge staging-next into staging 2021-04-27 06:05:54 +00:00
Ryan Mulligan
99241d8c03
Merge pull request #120654 from r-ryantm/auto-update/dnsproxy
dnsproxy: 0.37.1 -> 0.37.2
2021-04-26 19:49:14 -07:00
github-actions[bot]
489dda0090
Merge staging-next into staging 2021-04-27 00:15:12 +00:00
Maximilian Bosch
2d9689351c
Merge pull request #120661 from Zopieux/nxdomain
nxdomain: 1.0.1 -> 1.0.2
2021-04-26 23:34:45 +02:00
0x4A6F
1a6899f701
innernet:
- add simple packaging test
- add manpages
- remove unused linuxHeaders input
2021-04-26 20:17:57 +02:00
github-actions[bot]
f0290a5d27
Merge staging-next into staging 2021-04-26 18:14:28 +00:00
Ryan Mulligan
c2ca3d5593
Merge pull request #120686 from r-ryantm/auto-update/innernet
innernet: 1.1.0 -> 1.2.0
2021-04-26 11:12:19 -07:00
José Luis Lafuente
ec8f6bc932
zerotierone: 1.6.4 -> 1.6.5 (#120722) 2021-04-26 15:55:31 +02:00
R. RyanTM
c62b3e0d6a innernet: 1.1.0 -> 1.2.0 2021-04-26 01:46:24 +00:00
Alexandre Macabies
17f00cd216 nxdomain: 1.0.1 -> 1.0.2 2021-04-26 01:06:52 +02:00
R. RyanTM
68c34de775 dnsproxy: 0.37.1 -> 0.37.2 2021-04-25 21:52:07 +00:00
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
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