Commit graph

7647 commits

Author SHA1 Message Date
Jonathan Ringer 0546e68ef7
Merge remote-tracking branch 'origin/master' into staging-next 2021-05-14 21:57:09 -07:00
Stéphan Kochen 2ff319e055
findomain: fix darwin build (#123019) 2021-05-14 17:36:55 -04:00
Vladimír Čunát c48eaa70e3
Merge branch 'master' into staging-next 2021-05-14 22:27:34 +02:00
Austin Seipp e7241be2e2
Merge pull request #122965 from r-ryantm/auto-update/chrony
chrony: 4.0 -> 4.1
2021-05-14 13:51:58 -05:00
Vladimír Čunát 850880e854
Merge #123005: apparmor: fix profile building on darwin 2021-05-14 18:16:58 +02:00
Julien Moutinho 8184d8b0f2 apparmor: fix profile building on darwin 2021-05-14 17:37:33 +02:00
Jan Tojnar e9bc45000f
Merge pull request #122881 from maxeaubrey/iwd_ell_bump
ell: 0.38 -> 0.40, iwd: 1.12 -> 1.14, ofono: 1.31 -> 1.32
2021-05-14 16:36:17 +02:00
Robert Schütz e611d663f4
Merge pull request #120440 from dotlambda/radicale-settings
nixos/radicale: add settings option
2021-05-14 15:37:26 +02:00
Fabian Affolter 92dcaba935
Merge pull request #122724 from r-ryantm/auto-update/findomain
findomain: 4.1.1 -> 4.2.0
2021-05-14 13:09:19 +02:00
Fabian Affolter 6c9b24191b ipinfo: init at 1.1.2 2021-05-14 12:27:13 +02:00
R. RyanTM 0391ca2b41 chrony: 4.0 -> 4.1 2021-05-14 09:29:20 +00:00
R. RyanTM 75075aabac getmail6: 6.15 -> 6.16 2021-05-14 05:30:58 +00:00
Maxine Aubrey aa72ab918d
ofono: 1.31 -> 1.32 2021-05-13 23:14:51 +02:00
Jan Tojnar 0313c77b55
Merge branch 'staging-next' into staging 2021-05-13 11:42:36 +02:00
Eduardo Quiros 089735097f
croc: 9.1.3 -> 9.1.4 2021-05-12 19:16:13 -06:00
github-actions[bot] a8e5ac148b
Merge master into staging-next 2021-05-13 00:56:26 +00:00
Mauricio Scheffer 368ef57d31 telepresence2: init at 2.2.1 2021-05-12 23:09:35 +01:00
Victor Roest 83a8517e5a
rtorrent-jesec: 0.9.8-r10 -> 0.9.8-r13 2021-05-12 21:57:32 +00:00
Robert Schütz 808d88971a
Merge pull request #121058 from winterqt/init-jesec-rtorrent
rtorrent-jesec: init at 0.9.8-r11
2021-05-12 20:42:32 +02:00
github-actions[bot] b057978bb2
Merge staging-next into staging 2021-05-12 18:32:29 +00:00
Winter 0c6b4f2c75 rtorrent-jesec: init at 0.9.8-r11 2021-05-12 13:43:30 -04:00
Winter ce6d077290 libtorrent-jesec: init at 0.13.8-r1 2021-05-12 13:43:30 -04:00
Maxine Aubrey 907d3482f8
modemmanager: 1.14.10 -> 1.14.12 2021-05-12 19:32:00 +02:00
Martin Weinelt a18880bf72 Merge remote-tracking branch 'origin/master' into staging-next 2021-05-12 18:28:03 +02:00
Sandro 665c70cc0f
Merge pull request #122616 from stephank/fix-anevicon-darwin
anevicon: fix darwin build
2021-05-12 18:14:55 +02:00
Sandro 1089d06133
Merge pull request #122488 from symphorien/nmappletwg
networkmanagerapplet: 1.20.0 -> 1.22.0
2021-05-12 17:55:18 +02:00
Sandro 5f087724c9
Merge pull request #122652 from equirosa/croc
croc: 9.1.2 -> 9.1.3
2021-05-12 17:36:56 +02:00
R. RyanTM 45a855c1d6 findomain: 4.1.1 -> 4.2.0 2021-05-12 13:43:16 +00:00
Jan Tojnar 71fa678899
Merge branch 'staging-next' into staging 2021-05-12 14:31:36 +02:00
github-actions[bot] 1d2db66464
Merge master into staging-next 2021-05-12 12:27:04 +00:00
Sandro 092a05da72
Merge pull request #122691 from jnetod/zhf-sniffglue
sniffglue: 0.12.0 -> 0.12.1
2021-05-12 13:58:26 +02:00
Alyssa Ross ec170d97d9 fastd: don't manually enableParallelBuilding
This is automatic for Meson builds.
2021-05-12 11:57:35 +00:00
J. Neto 19fa85a66d sniffglue: 0.12.0 -> 0.12.1 2021-05-12 05:26:04 -03:00
John Ericson cf02b24813 Merge remote-tracking branch 'upstream/staging-next' into staging 2021-05-11 22:30:46 +00:00
Eduardo Quiros 85aa041a06
croc: 9.1.2 -> 9.1.3 2021-05-11 16:10:42 -06:00
Maximilian Bosch 5a48b5ec83
wireguard-tools: 1.0.20210315 -> 1.0.20210424
ChangeLog: https://lists.zx2c4.com/pipermail/wireguard/2021-April/006663.html
2021-05-11 22:58:27 +02:00
Stéphan Kochen 967c6d8640 anevicon: fix darwin build 2021-05-11 20:40:33 +02:00
github-actions[bot] 37c26a396b
Merge master into staging-next 2021-05-11 18:28:07 +00:00
rnhmjoj 64f2ba269f
tnat64: init at 0.05 2021-05-11 16:16:13 +02:00
github-actions[bot] 309163aed7
Merge staging-next into staging 2021-05-11 12:24:31 +00:00
github-actions[bot] 1e7a48b474
Merge master into staging-next 2021-05-11 12:24:28 +00:00
Jan Tojnar 7982550ac4
Merge branch 'staging-next' into staging 2021-05-11 09:09:10 +02:00
Fabian Affolter 0249e0417e
Merge pull request #122523 from r-ryantm/auto-update/findomain
findomain: 4.1.0 -> 4.1.1
2021-05-11 09:05:20 +02:00
R. RyanTM 971d2ea6cc findomain: 4.1.0 -> 4.1.1 2021-05-11 03:13:59 +00:00
github-actions[bot] 61fa3fdde8
Merge master into staging-next 2021-05-10 18:28:17 +00:00
Sandro 42a2d82f21
Merge pull request #122471 from fgaz/qrcp/0.8.4 2021-05-10 19:29:05 +02:00
Francesco Gazzetta f4a1f8e461 qrcp: 0.8.1 -> 0.8.4 2021-05-10 18:57:50 +02:00
Guillaume Girol 723b22e416 networkmanagerapplet: 1.20.0 -> 1.22.0 2021-05-10 12:00:00 +00:00
Jan Tojnar 594a885912
Merge branch 'staging-next' into staging 2021-05-10 09:45:47 +02:00
Markus S. Wamser 286bca1830 croc.passthru.tests: partially revert 77c0a490
`--overwrite` is no longer needed for receiving text
2021-05-09 21:24:06 +02:00
github-actions[bot] 450e66080b
Merge master into staging-next 2021-05-09 18:23:01 +00:00
Ryan Mulligan 6ff4eff461
Merge pull request #122295 from r-ryantm/auto-update/croc
croc: 9.1.1 -> 9.1.2
2021-05-09 07:48:17 -07:00
github-actions[bot] bc1f4b790e
Merge master into staging-next 2021-05-09 12:23:16 +00:00
Oleksii Filonenko 2c1a792911
Merge pull request #122291 from r-ryantm/auto-update/clash
clash: 1.5.0 -> 1.6.0
2021-05-09 14:28:06 +03:00
Vladimír Čunát 5663b2b2d3
Merge branch 'master' into staging-next
(a trivial conflict in transmission)
2021-05-09 09:31:55 +02:00
R. RyanTM 54f592da6a croc: 9.1.1 -> 9.1.2 2021-05-09 02:50:51 +00:00
R. RyanTM c6f9eceb3d clash: 1.5.0 -> 1.6.0 2021-05-09 02:18:51 +00:00
Léo Gaspard 08b00c20e0
Merge pull request #118442 from Ekleog/nixos-tests
Add nixos tests with names starting by A or B to all relevant packages
2021-05-09 00:37:26 +02:00
R. RyanTM 7f1a670e79 findomain: 4.0.1 -> 4.1.0 2021-05-08 15:35:50 -07:00
birlorg 1a5f2a4e25
spipe: 1.5.0 -> 1.6.1
fix by re-adding '';
2021-05-08 22:22:52 +00:00
birlorg e6ed1aca78
spiped: 1.5.0 -> 1.6.1
oops, I'm editing using the web UI and I forgot to delete this patch as it's no longer needed.
2021-05-08 20:53:17 +00:00
birlorg a3f27b5482
spiped: 1.5.0 -> 1.6.1
fix changes per @r-rmcgibbo
2021-05-08 20:51:32 +00:00
birlorg 7e41999280
spiped: 1.5.0 -> 1.6.1
upgrade spiped from 1.5.0 to 1.6.1
2021-05-08 20:22:39 +00:00
Léo Gaspard 53f43a2048 openssh: add link to related nixos test
It'd certainly be better to have an openssh-specific integration test,
but it's not there yet and this is better than nothing.
2021-05-08 21:42:50 +02:00
Léo Gaspard 865d28a8b6 miniupnpd: add link to related nixos test 2021-05-08 21:42:34 +02:00
Jan Tojnar dd78ce1c53
Merge branch 'staging-next' into staging 2021-05-08 20:59:05 +02:00
Martin Weinelt 9651084620 Merge remote-tracking branch 'origin/master' into staging-next 2021-05-08 14:43:43 +02:00
Vladimír Čunát 080cd658ca
Merge #121780: treewide meta.maintainers tweaks 2021-05-08 10:47:08 +02:00
Jan Tojnar 468cb5980b gnome: rename from gnome3
Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
2021-05-08 09:47:42 +02:00
Daniël de Kok 85f96822a0 treewide: fix cargoSha256/cargoHash
Rust 1.50.0 incorporated a Cargo change (rust-lang/cargo#8937) in
which cargo vendor erroneously changed permissions of vendored
crates. This was fixed in Rust
1.51.0 (rust-lang/cargo#9131). Unfortunately, this means that all
cargoSha256/cargoHashes produced during the Rust 1.50.0 cycle are
potentially broken.

This change updates cargoSha256/cargoHash tree-wide.

Fixes #121994.
2021-05-08 00:36:37 -07:00
Jonathan Ringer 01bf147849 haproxy: fix lua lib name 2021-05-07 23:08:20 -07:00
github-actions[bot] 1ae6d3d02f
Merge master into staging-next 2021-05-07 18:24:29 +00:00
Sandro 1197715c0e
Merge pull request #122010 from 06kellyjac/boundary
boundary: 0.2.0 -> 0.2.1
2021-05-07 16:38:21 +02:00
Vladimír Čunát 73e17a3594
treewide: remove lethalman from meta.maintainers
He hasn't been heard of for years.
2021-05-07 15:36:40 +02:00
Jan Tojnar 0420282780
treewide maintainers: add teams.{freedesktop,gnome} 2021-05-07 15:36:40 +02:00
Vladimír Čunát 9f054b5e1a
treewide: remove worldofpeace from meta.maintainers
(It was requested by them.)
I left one case due to fetching from their personal repo:
pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
2021-05-07 15:36:40 +02:00
github-actions[bot] 12193913a1
Merge staging-next into staging 2021-05-07 12:23:21 +00:00
Jan Tojnar 9468b07326
Merge branch 'gnome-40' 2021-05-07 12:12:40 +02:00
06kellyjac 99261c0daf boundary: 0.2.0 -> 0.2.1 2021-05-07 11:02:56 +01:00
github-actions[bot] e5f4def056
Merge staging-next into staging 2021-05-07 00:46:58 +00:00
rnhmjoj 2d1090a058
openconnect-head: init at 2021-05-05 2021-05-06 23:47:26 +02:00
John Ericson a3e54cb582 Merge remote-tracking branch 'upstream/staging-next' into staging 2021-05-06 15:48:25 -04:00
Michael Raskin 3b3671ba99
Merge pull request #121784 from fabaff/bump-siege
siege: 4.0.8 -> 4.0.9
2021-05-06 19:47:32 +00:00
Fabian Affolter 427a089f7f siege: 4.0.8 -> 4.0.9 2021-05-06 18:35:51 +02:00
Robert Hensing 66fd2ea7ee openapi-generator-cli: Invoke install hooks 2021-05-06 16:25:26 +02:00
Robert Hensing 99d5c97a8c openapi-generator-cli: Add passthru.tests.example 2021-05-06 16:25:24 +02:00
Domen Kožar a4c8569ed5
Merge pull request #121900 from hercules-ci/update-openapi-generator-cli
openapi-generator-cli: 5.0.0 -> 5.1.0
2021-05-06 16:10:37 +02:00
Robert Hensing 89fffee73f openapi-generator-cli: 5.0.0 -> 5.1.0 2021-05-06 11:24:56 +02:00
Jan Tojnar d9f177eb4d
Merge branch 'staging-next' into staging
The transmission conflict was non-trivial:
- libbrotli added to apparmor rules <1bdda029cd>
- apparmor rules rewritten <b280e64078>

Chosen the rewrite and verified that brotli is part of the rule set generated by `apparmorRulesFromClosure`.
2021-05-06 08:42:50 +02:00
Mario Rodas 101ab29b40
Merge pull request #121079 from r-ryantm/auto-update/dnsproxy
dnsproxy: 0.37.2 -> 0.37.3
2021-05-05 22:41:37 -05:00
Sandro 1cf7fae1de
Merge pull request #121377 from LeSuisse/burpsuite-2021.4.2
burpsuite: 2020.12.1 -> 2021.4.2
2021-05-05 23:23:28 +02:00
Jan Tojnar 7d535edec5
gnome3: support new versioning scheme in the update script
https://discourse.gnome.org/t/new-gnome-versioning-scheme/4235
2021-05-05 22:20:20 +02:00
github-actions[bot] 68e3ba2b1d
Merge staging-next into staging 2021-05-05 00:46:07 +00:00
Martin Weinelt 54d0d2b43b
Merge pull request #121650 from r-ryantm/auto-update/gobgp
gobgp: 2.26.0 -> 2.27.0
2021-05-05 01:11:13 +02:00
Maximilian Bosch 1083927067
Merge pull request #121477 from dotlambda/tcpreplay-4.3.4
tcpreplay: 4.3.3 -> 4.3.4
2021-05-04 23:28:57 +02:00
Robert Schütz 870b3a3054 calendar-cli: init at 0.12.0 2021-05-04 10:04:56 +02:00
R. RyanTM a5e088088d gobgp: 2.26.0 -> 2.27.0 2021-05-04 04:35:41 +00:00
Robert Schütz f50700dfec tcpreplay: 4.3.3 -> 4.3.4
https://github.com/appneta/tcpreplay/releases/tag/v4.3.4
2021-05-03 19:00:25 +02:00
github-actions[bot] a4c3a2d732
Merge staging-next into staging 2021-05-03 12:26:48 +00:00
Luke Granger-Brown 4b42da3d85
Merge pull request #120791 from mweinelt/babeld
babeld: 1.9.2 -> 1.10
2021-05-03 10:00:12 +01:00
github-actions[bot] b7e3cd0993
Merge staging-next into staging 2021-05-03 06:22:31 +00:00
Serval 2dfa311e56
v2ray: 4.37.3 -> 4.38.3 2021-05-02 19:39:24 +08:00
Thomas Gerbet f392ff23cc burpsuite: 2020.12.1 -> 2021.4.2
Fixes the build, solves CVE-2021-29416 and pull the latest version.
https://portswigger.net/burp/releases/professional-community-2021-4-2
2021-05-01 11:10:39 +02:00
R. RyanTM cd188311dc grpcurl: 1.8.0 -> 1.8.1 2021-05-01 04:25:30 +00:00
github-actions[bot] ef6416a6ba
Merge staging-next into staging 2021-05-01 00:54:32 +00:00
Martin Weinelt 5c0c0f0ee8
Merge pull request #121334 from r-ryantm/auto-update/lldpd
lldpd: 1.0.8 -> 1.0.10
2021-05-01 00:04:04 +02:00
R. RyanTM eae41465ad lldpd: 1.0.8 -> 1.0.10 2021-04-30 21:43:19 +00:00
github-actions[bot] 20ebbe6b59
Merge staging-next into staging 2021-04-30 18:26:34 +00:00
John Ericson 17305d2df0
Merge pull request #111487 from Ericson2314/llvm-outputs-and-cross-compile-tools
llvmPackages: Clean up outputs
2021-04-30 11:28:08 -04:00
Martin Weinelt de6af39b43
Merge pull request #120859 from mweinelt/fastd
fastd: fix build on aarch64
2021-04-30 14:31:22 +02:00
github-actions[bot] d7882499f8
Merge staging-next into staging 2021-04-30 12:26:14 +00:00
Sandro 411f57ea2d
Merge pull request #121235 from r-ryantm/auto-update/bgpq4
bgpq4: 0.0.6 -> 0.0.7
2021-04-30 10:15:48 +02:00
github-actions[bot] c6548b2832
Merge staging-next into staging 2021-04-30 06:21:40 +00:00
Andrew Childs 7869d16545 llvmPackages: Multuple outputs for everythting
Also begin to start work on cross compilation, though that will have to
be finished later.

The patches are based on the first version of
https://reviews.llvm.org/D99484. It's very annoying to do the
back-porting but the review has uncovered nothing super major so I'm
fine sticking with what I've got.

Beyond making the outputs work, I also strove to re-sync the packages,
as they have been drifting pointlessly apart for some time.

----

Other misc notes, highly incomplete

- lvm-config-native and llvm-config are put in `dev` because they are
  tools just for build time.

- Clang no longer has an lld dep. That was introduced in
  db29857eb3, but if clang needs help
  finding lld when it is used we should just pass it flags / put in the
  resource dir. Providing it at build time increases critical path
  length for no good reason.

----

A note on `nativeCC`:

`stdenv` takes tools from the previous stage, so:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.stdenv.cc`: `(?0, ?1, x)`

while:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.targetPackages`: `(x, x, ?2)`
3. `pkgsBuildBuild.targetPackages.stdenv.cc`: `(?1, x, x)`
2021-04-30 05:41:00 +00:00
R. RyanTM 4b47f1504e bgpq4: 0.0.6 -> 0.0.7 2021-04-30 04:24:12 +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 Jäckel ae02415ee8
treewide: remove gnidorah
due to github account removal/deletion and not other mean of contact.
2021-04-30 01:48:19 +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
R. RyanTM bc0b50087a dnsproxy: 0.37.2 -> 0.37.3 2021-04-28 20:53:01 +00: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
Martin Weinelt f2a5083dc7
fastd: fix build on aarch64 2021-04-28 01:50:21 +02:00
Sandro 90c58c5023
Merge pull request #120768 from 0x4A6F/main-innernet
innernet: test and fixup
2021-04-28 00:55:06 +02:00
Martin Weinelt d0b3735c0e
babeld: start maintaining the package 2021-04-27 14:11:45 +02:00
Martin Weinelt 430bfd6fab
babeld: 1.9.2 -> 1.10
Update to new mirror, the previous one did not receive the 1.10 tarball
for some reason. Also remove a patch that was merged upstream in time
for this release.
2021-04-27 14:11:22 +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
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 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