BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
300140 commits 1 branch 0 tags 3.8 GiB
Commit graph

4517 commits

Author SHA1 Message Date
Fabian Affolter
b77e9a2244
Merge pull request #126791 from dotlambda/gpg-tui-0.5.0 
gpg-tui: 0.4.1 -> 0.5.0
 2021-06-14 09:45:33 +02:00
github-actions[bot]
9a860729b2
Merge staging-next into staging 2021-06-14 00:08:51 +00:00
Robert Schütz
c54dab7de4 gpg-tui: 0.4.1 -> 0.5.0 
https://github.com/orhun/gpg-tui/blob/v0.5.0/CHANGELOG.md
 2021-06-13 23:23:51 +02:00
Zach
52d50b0585 pass-import: 3.1 -> 3.2 2021-06-12 18:03:38 -05:00
github-actions[bot]
9309a23dd3
Merge staging-next into staging 2021-06-12 18:04:58 +00:00
Sandro
b07cf14fcb
Merge pull request #121707 from prusnak/secp256k1 
secp256k1: (unstable-)2020-08-16 -> unstable-2021-06-06
 2021-06-12 18:24:14 +02:00
github-actions[bot]
b9b43d5872
Merge staging-next into staging 2021-06-12 12:07:06 +00:00
Alyssa Ross
e45f6131a6 rhash: fix static build 2021-06-11 16:11:01 -07:00
Fabian Affolter
e8f08487b1 metasploit: 6.0.47 -> 6.0.48 2021-06-11 22:42:50 +02:00
github-actions[bot]
8f3ead7190
Merge staging-next into staging 2021-06-11 18:05:09 +00:00
sternenseemann
9b794eb21a pass: 1.7.3 -> 1.7.4 
Mostly bug fixes, the following changes were required in the package:

* set-correct-program-name-for-sleep.patch needed to be rebased,
  b08781e2a6e183986eb1c24f51cdeff879b7a6af partially implemented
  the changes done in this patch, so we don't need to touch
  password-store.sh anymore.

* Remove wayland patch since it is part of the release now

* Reworked assert logic wrt to x11-/wayland- and dmenuSupport:
  passmenu now supports wayland as well via dmenu-wayland. Sadly
  the choice of menu is not changeable, pending
  https://lists.zx2c4.com/pipermail/password-store/2021-January/004363.html

* Rebased no-darwin-getopt.patch

* Note that f.el is no longer required

Reviews would be appreciated, I might've missed something.
 2021-06-11 19:58:00 +02:00
Maximilian Bosch
2c31bc7f20
Merge pull request #125918 from chris-martin/crypto-maintainer 
Removing myself from some maintainer lists
 2021-06-11 19:49:38 +02:00
Alyssa Ross
926765c5e3
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 
Conflicts:
	pkgs/servers/http/apache-httpd/2.4.nix
 2021-06-11 02:05:00 +00:00
Sandro
891bca0180
Merge pull request #126472 from ymatsiuk/lastpass-cli 
lastpass-cli: Add gitcredentials helper and format
 2021-06-10 20:45:55 +02:00
github-actions[bot]
f023076314
Merge staging-next into staging 2021-06-10 18:14:20 +00:00
Robert Schütz
26aa7e0880 gpg-tui: 0.4.0 -> 0.4.1 
https://github.com/orhun/gpg-tui/blob/v0.4.1/CHANGELOG.md
 2021-06-10 17:59:35 +02:00
Jan Tojnar
ba733d435b
Merge branch 'staging-next' into staging 2021-06-10 14:07:45 +02:00
Yurii Matsiuk
75a47625ad
lastpass-cli: Add gitcredentials helper and format 2021-06-10 13:48:27 +02:00
AndersonTorres
e9e5f5f84d Change all alsaLib references to alsa-lib 2021-06-10 01:12:49 -03:00
github-actions[bot]
f8b7190a42
Merge staging-next into staging 2021-06-10 00:06:44 +00:00
Fabian Affolter
da2100dc5d
Merge pull request #126157 from r-ryantm/auto-update/gpg-tui 
gpg-tui: 0.3.0 -> 0.4.0
 2021-06-10 00:16:03 +02:00
github-actions[bot]
cf8441dd85
Merge staging-next into staging 2021-06-09 18:14:53 +00:00
Stig Brautaset
38e40a73fe aws-iam-authenticator: 0.5.2 -> 0.5.3 
I had to work around inconsistent vendoring; see
https://github.com/kubernetes-sigs/aws-iam-authenticator/issues/377
 2021-06-09 14:37:39 +01:00
Sandro
6e65848854
Merge pull request #126169 from chvp/update-eid-mw 2021-06-09 13:19:21 +02:00
Sandro
7e343d4ca0
Merge pull request #118744 from rnpgp/rnp 2021-06-09 12:57:28 +02:00
Pavol Rusnak
b66975c129
secp256k1: (unstable-)2020-08-16 -> unstable-2021-06-06 
- use sane defaults
- drop JNI option which is not available anymore https://github.com/bitcoin-core/secp256k1/pull/682
 2021-06-08 23:52:43 +02:00
github-actions[bot]
e40e33d9d8
Merge staging-next into staging 2021-06-08 18:16:30 +00:00
Charlotte Van Petegem
d29130cf23
eid-mw: use more specific license 2021-06-08 09:51:02 +02:00
Charlotte Van Petegem
45096ecfdc
eid-mw: 5.0.21 -> 5.0.23 2021-06-08 09:26:38 +02:00
R. RyanTM
91953dbf60 gpg-tui: 0.3.0 -> 0.4.0 2021-06-08 04:33:22 +00:00
Elis Hirwing
0ac806adeb
passExtensions.pass-checkup: 0.2.0 -> 0.2.1 2021-06-07 21:31:42 +02:00
Jeffrey Lau
bb2d32cab8
rnp: init at 0.15.1 2021-06-07 13:07:11 +08:00
github-actions[bot]
a1f68141f3
Merge staging-next into staging 2021-06-06 18:30:36 +00:00
Chris Martin
53387621e5 remove chris-martin from maintainer list on various crypto packages 2021-06-06 02:38:34 -06:00
R. RyanTM
47371be95b exploitdb: 2021-06-03 -> 2021-06-05 2021-06-06 08:03:43 +00:00
github-actions[bot]
500db2661d
Merge staging-next into staging 2021-06-06 00:15:23 +00:00
R. RyanTM
acb4c290de cfssl: 1.5.0 -> 1.6.0 2021-06-05 21:07:27 +00:00
Sandro Jäckel
42df77f763
gpg-tui: 0.2.0 -> 0.3.0 2021-06-05 21:01:30 +02:00
github-actions[bot]
0397e518b7
Merge staging-next into staging 2021-06-05 18:30:31 +00:00
Sandro
59edafbc31
Merge pull request #121491 from schnusch/oathtoolkit 
oathToolkit: 2.6.6 -> 2.6.7
 2021-06-05 18:50:57 +02:00
Sandro
7f9574c064
Merge pull request #125719 from kk-boop/qdigidoc-update 2021-06-05 18:36:34 +02:00
Fabian Affolter
ca96bed8c3 metasploit: 6.0.46 -> 6.0.47 2021-06-05 10:33:07 +02:00
schnusch
9da90bfa87 oathToolkit: 2.6.6 -> 2.6.7 
add update script
 2021-06-04 23:23:20 +02:00
R. RyanTM
a23ea6d559 gau: 1.1.0 -> 1.2.0 2021-06-04 20:13:20 +00:00
kk-boop
ce5e8c343b qdigidoc: 4.2.3 -> 4.2.8 2021-06-04 21:51:09 +03:00
Maximilian Bosch
b096b6d308
Merge pull request #125541 from r-ryantm/auto-update/gpg-tui 
gpg-tui: 0.1.5 -> 0.2.0
 2021-06-04 11:44:02 +02:00
Sandro
afe29f185a
Merge pull request #125583 from fabaff/kiterunner 
kiterunner: init at 1.0.2
 2021-06-04 10:46:25 +02:00
Thomas Gerbet
b3c2321264 cosign: 0.3.1 -> 0.5.0 
https://github.com/sigstore/cosign/releases/tag/v0.4.0
https://github.com/sigstore/cosign/releases/tag/v0.5.0
 2021-06-04 09:10:06 +02:00
R. RyanTM
d80b158d39 exploitdb: 2021-05-29 -> 2021-06-03 2021-06-04 04:05:57 +00:00
Fabian Affolter
9048c259e3 kiterunner: init at 1.0.2 2021-06-04 01:23:00 +02:00
Ryan Mulligan
5cc08e40f6
Merge pull request #125487 from r-ryantm/auto-update/libtpms 
libtpms: 0.8.2 -> 0.8.3
 2021-06-03 11:48:45 -07:00
R. RyanTM
b705d0f800 gpg-tui: 0.1.5 -> 0.2.0 2021-06-03 17:38:17 +00:00
Fabian Affolter
125e6b5594
Merge pull request #125519 from r-ryantm/auto-update/dnsx 
dnsx: 1.0.3 -> 1.0.4
 2021-06-03 18:13:14 +02:00
R. RyanTM
ad8ea0b901 dnsx: 1.0.3 -> 1.0.4 2021-06-03 15:42:30 +00:00
R. RyanTM
b00ce50f6d libtpms: 0.8.2 -> 0.8.3 2021-06-03 11:33:39 +00:00
Sandro Jäckel
89d5f4b3d0
treewide: setuptools_scm -> setuptools-scm 2021-06-03 12:44:33 +02:00
Fabian Affolter
7b488d2b94
Merge pull request #125384 from r-ryantm/auto-update/grype 
grype: 0.12.1 -> 0.13.0
 2021-06-03 09:33:25 +02:00
Domen Kožar
bf00839d04
Merge pull request #119571 from hennersz/fix/pass-import-install-extension 
passExtensions.pass-import: install extension script and completion
 2021-06-02 17:33:18 +02:00
R. RyanTM
6cfc181c7f grype: 0.12.1 -> 0.13.0 2021-06-02 14:47:51 +00:00
Fabian Affolter
99febc68c9
Merge pull request #125293 from fabaff/bump-wpscan 
wpscan: 3.7.5 -> 3.8.17
 2021-06-02 11:15:56 +02:00
Fabian Affolter
cdb7efa0f9 wpscan: 3.7.5 -> 3.8.17 2021-06-02 00:22:28 +02:00
Sandro
aab0384e92
Merge pull request #124892 from risicle/ris-yara-4.1.1 2021-06-01 15:59:25 +02:00
Fabian Affolter
f78c3be0cd
Merge pull request #125209 from r-ryantm/auto-update/httpx 
httpx: 1.0.8 -> 1.0.9
 2021-06-01 14:31:02 +02:00
R. RyanTM
43ced2ab6f httpx: 1.0.8 -> 1.0.9 2021-06-01 11:45:21 +00:00
Maximilian Bosch
ad0879920c
Merge pull request #125130 from dotlambda/gpg-tui-init 
gpg-tui: init at 0.1.5
 2021-06-01 11:14:41 +02:00
Robert Schütz
ffb2c737e2 gpg-tui: init at 0.1.5 2021-06-01 00:41:00 +02:00
R. RyanTM
285a29f23b exploitdb: 2021-05-26 -> 2021-05-29 2021-05-31 14:28:30 +00:00
Sandro
f59e8fec7d
Merge pull request #124128 from fabaff/gosh 2021-05-31 11:38:08 +02:00
Robert Scott
8cda1cc59e yara: add enableStatic mode 
useful because tests can be enabled in this mode
 2021-05-30 11:59:05 +01:00
Robert Scott
2d7f554229 yara: 4.0.5 -> 4.1.1 2021-05-30 11:59:04 +01:00
Sandro
bb4bf36471
Merge pull request #124690 from 239/submit/update-bitwarden 
bitwarden: 1.24.6 -> 1.26.4
 2021-05-30 04:26:55 +02:00
Sandro
b484394022
Merge pull request #124792 from dywedir/b3sum 
b3sum: 0.3.7 -> 0.3.8
 2021-05-29 02:48:32 +02:00
Vladyslav M
42d671a80d
b3sum: 0.3.7 -> 0.3.8 2021-05-28 22:40:23 +03:00
R. RyanTM
698d79fd76 exploitdb: 2021-05-22 -> 2021-05-26 2021-05-28 14:41:21 +00:00
Fabian Affolter
c745d07fe8
Merge pull request #124731 from r-ryantm/auto-update/httpx 
httpx: 1.0.7 -> 1.0.8
 2021-05-28 11:14:05 +02:00
Fabian Affolter
e96cd9dccc
Merge pull request #124733 from r-ryantm/auto-update/kubesec 
kubesec: 2.11.0 -> 2.11.1
 2021-05-28 11:13:48 +02:00
R. RyanTM
9ebbbc69a9 kubesec: 2.11.0 -> 2.11.1 2021-05-28 07:41:47 +00:00
R. RyanTM
f85ecdf38c httpx: 1.0.7 -> 1.0.8 2021-05-28 06:36:24 +00:00
Fabian Affolter
d35af2cae3 metasploit: 6.0.45 -> 6.0.46 2021-05-27 23:01:55 +02:00
239
cdffcc9048 bitwarden: 1.24.6 -> 1.26.4 2021-05-27 21:14:18 +02:00
Sandro
590d8a1581
Merge pull request #124171 from fabaff/sammler 
sammler: init at 20210523-259b9fc
 2021-05-27 05:17:44 +02:00
Sandro
250316dc72
Merge pull request #124347 from dguibert/dg/step-ca 2021-05-27 04:42:32 +02:00
Ronuk Raval
bf0a5ffbf4 gfshare: init at 2.0.0 2021-05-26 17:56:36 -04:00
David Guibert
1270b79771 step-cli: 0.15.3-22 -> 0.15.16 2021-05-26 15:00:29 +02:00
Fabian Affolter
8fc3b5bbc3
Merge pull request #124461 from r-ryantm/auto-update/grype 
grype: 0.11.0 -> 0.12.1
 2021-05-26 10:57:35 +02:00
Fabian Affolter
4cd5642864
Merge pull request #124465 from r-ryantm/auto-update/httpx 
httpx: 1.0.6 -> 1.0.7
 2021-05-26 10:57:24 +02:00
R. RyanTM
88325edab9 httpx: 1.0.6 -> 1.0.7 2021-05-26 08:04:59 +00:00
R. RyanTM
d729a5ce7c grype: 0.11.0 -> 0.12.1 2021-05-26 07:24:50 +00:00
applePrincess
69f5a9460c
exploitdb: init at 2021-05-22 (#124209) 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2021-05-26 04:02:01 +02:00
Sandro
d8ac55716b
Merge pull request #124430 from fabaff/snowcrash 2021-05-26 03:15:28 +02:00
Fabian Affolter
7f7262ce0f snowcrash: init at unstable-2021-04-29 2021-05-25 23:55:34 +02:00
Fabian Affolter
0995d4e24d kubei: 1.0.11 -> 1.0.12 2021-05-25 13:38:50 -07:00
David Guibert
f9eedc3457 step-ca: 0.15.11 -> 0.15.15 2021-05-25 09:49:30 +02:00
Fabian Affolter
e614f164fd
Merge pull request #124139 from fabaff/bump-sn0int 
sn0int: 0.20.1 -> 0.21.1
 2021-05-24 23:32:17 +02:00
Matthieu Coudron
a528f2a48d metasploit: set mainProgram 2021-05-23 23:41:15 +02:00
Fabian Affolter
d37134ba05 sammler: init at -20210523-259b9fc 2021-05-23 18:31:16 +02:00
Fabian Affolter
90cafaba30
Merge pull request #124096 from r-ryantm/auto-update/lynis 
lynis: 3.0.3 -> 3.0.4
 2021-05-23 15:49:05 +02:00
Luke Granger-Brown
1a7f1748ec
Merge pull request #124129 from fabaff/bump-terrascan 
terrascan: 1.5.1 -> 1.6.0
 2021-05-23 14:42:17 +01:00
Fabian Affolter
c1d698e5c2 sn0int: 0.20.1 -> 0.21.1 2021-05-23 13:29:01 +02:00
Fabian Affolter
d8c0615b4f terrascan: 1.5.1 -> 1.6.0 2021-05-23 12:43:14 +02:00
Fabian Affolter
4dbad1fad8 gosh: init at 2020523-7ccb068 2021-05-23 12:38:49 +02:00
Fabian Affolter
38931d9783
lynis: specify license 2021-05-23 11:56:25 +02:00
Fabian Affolter
5478c845c0
Merge pull request #124107 from r-ryantm/auto-update/bettercap 
bettercap: 2.31.0 -> 2.31.1
 2021-05-23 11:23:44 +02:00
R. RyanTM
38c36d61a3 bettercap: 2.31.0 -> 2.31.1 2021-05-23 06:38:14 +00:00
R. RyanTM
2b993783de lynis: 3.0.3 -> 3.0.4 2021-05-23 02:43:02 +00:00
Jonathan Ringer
11a9ac00fc
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
 pkgs/tools/networking/xh/default.nix
 2021-05-22 18:19:10 -07:00
Sandro
f8818b9aed
Merge pull request #123983 from LeSuisse/vault-1.7.2 
vault: 1.7.1 -> 1.7.2
 2021-05-22 16:41:37 +02:00
Charlotte Van Petegem
f29969988d
eid-mw: 4.4.27 -> 5.0.21 (#122247) 2021-05-22 15:47:53 +02:00
Thomas Gerbet
4a51f49781 vault: 1.7.1 -> 1.7.2 
Fixes CVE-2021-32923.
 2021-05-22 09:03:22 +02:00
Jonathan Ringer
6b15fdce86
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
 pkgs/shells/ion/default.nix
 pkgs/tools/misc/cicero-tui/default.nix
 2021-05-20 22:11:42 -07:00
Fabian Affolter
0f8ef5f82f metasploit: 6.0.44 -> 6.0.45 2021-05-20 17:24:25 -07:00
R. RyanTM
81283187aa doppler: 3.24.4 -> 3.25.0 2021-05-20 14:39:03 -07:00
Jonathan Ringer
c1f8a15dac
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
  nixos/doc/manual/release-notes/rl-2105.xml
  pkgs/tools/security/sequoia/default.nix
 2021-05-19 10:39:54 -07:00
David Yamnitsky
d904c14b34 sequoia: 0.24.0 -> 0.25.0 2021-05-18 19:47:44 -07:00
github-actions[bot]
7000ae2b9a
Merge master into staging-next 2021-05-19 00:55:36 +00:00
Robert Scott
4b14908706 python3Packages.sequoia: fix build by providing correct libclang output 
broken by the big llvmPackages output split
 2021-05-18 13:50:25 -07:00
Jonathan Ringer
f7a112f6c4
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
  pkgs/applications/graphics/emulsion/default.nix
  pkgs/development/tools/misc/texlab/default.nix
  pkgs/development/tools/rust/bindgen/default.nix
  pkgs/development/tools/rust/cargo-udeps/default.nix
  pkgs/misc/emulators/ruffle/default.nix
  pkgs/tools/misc/code-minimap/default.nix
 2021-05-18 08:57:16 -07:00
Vladyslav M
bf639f5226
Merge pull request #123451 from r-ryantm/auto-update/hcxtools 
hcxtools: 6.1.6 -> 6.2.0
 2021-05-18 09:27:08 +03:00
R. RyanTM
841bfbfb95 hcxtools: 6.1.6 -> 6.2.0 2021-05-18 04:31:29 +00:00
Sandro
01a5232c3b
Merge pull request #121531 from devhell/init-sheesy 
sheesy-cli: init at 4.0.11
 2021-05-18 03:03:42 +02:00
github-actions[bot]
3ff6965554
Merge master into staging-next 2021-05-17 06:22:23 +00:00
Jonathan Ringer
d8e62d8e41
Merge remote-tracking branch 'origin/master' into staging-next 
Fix cargo-flash build
 2021-05-16 18:27:14 -07:00
Martin Weinelt
7bd65d54f7 treewide: remove nand0p as maintainer 
While looking at the sphinx package I noticed it was heavily
undermaintained, which is when we noticed nand0p has been inactive for
roughly 18 months. It is therefore prudent to assume they will not be
maintaining their packages, modules and tests.

- Their last contribution to nixpkgs was in 2019/12
- On 2021/05/08 I wrote them an email to the address listed in the
  maintainer-list, which they didn't reply to.
 2021-05-17 01:50:49 +02:00
Stéphan Kochen
dc2efe7680 libacr38u: fix darwin build 2021-05-16 14:35:14 -07:00
R. RyanTM
06741b34d8
hashcat: 6.1.1 -> 6.2.1 (#123256) 2021-05-16 20:50:14 +00:00
Robert Hensing
338baef861
Merge pull request #122458 from serokell/team-serokell 
maintainers: add serokell team, move various packages to it
 2021-05-16 22:37:50 +02:00
github-actions[bot]
c10600230e
Merge staging-next into staging 2021-05-15 18:30:31 +00:00
github-actions[bot]
f1b78f8618
Merge master into staging-next 2021-05-15 18:30:28 +00:00
devhell
f944147dbb sheesy-cli: init at 4.0.11 2021-05-15 16:36:50 +01:00
Pierre Bourdon
c88cbfedeb
sudo: 1.9.6p1 -> 1.9.7 
Signed-off-by: Pierre Bourdon <delroth@gmail.com>
 2021-05-15 15:24:15 +02:00
github-actions[bot]
78ae7ac75e
Merge staging-next into staging 2021-05-15 06:22:25 +00:00
Vladimír Čunát
c48eaa70e3
Merge branch 'master' into staging-next 2021-05-14 22:27:34 +02:00
Fabian Affolter
a800bd2a93 metasploit: 6.0.43 -> 6.0.44 2021-05-14 00:13:47 +02:00
github-actions[bot]
b057978bb2
Merge staging-next into staging 2021-05-12 18:32:29 +00:00
Martin Weinelt
a18880bf72 Merge remote-tracking branch 'origin/master' into staging-next 2021-05-12 18:28:03 +02:00
Michael Raitza
c818dec738 gencfsm: 1.8.19 -> 1.9 
ZHF: #122042
 2021-05-12 13:58:05 +02:00
John Ericson
cf02b24813 Merge remote-tracking branch 'upstream/staging-next' into staging 2021-05-11 22:30:46 +00:00
github-actions[bot]
37c26a396b
Merge master into staging-next 2021-05-11 18:28:07 +00:00
Stéphan Kochen
cd66ac5fc3 bitwarden_rs: fix darwin build 2021-05-11 09:14:06 -07: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
Arthur Gautier
ab8e2e46d9
hashcat: fixup opencl support (#121961) 
This fixes the following compilation error:
```
clBuildProgram(): CL_BUILD_PROGRAM_FAILURE

/run/user/1000/comgr-64ff7f/input/CompileSource:2252:18: fatal error:
cannot open file
'/run/user/1000/comgr-64ff7f/input/inc_comp_multi_bs.cl': No such file
or directory
        #include COMPARE_M
                 ^
/run/user/1000/comgr-64ff7f/input/CompileSource:16:19: note: expanded
from macro 'COMPARE_M'
                  ^
1 error generated.
Error: Failed to compile opencl source (from CL or HIP source to LLVM
IR).
```

Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
 2021-05-11 14:01:35 +02:00
github-actions[bot]
7ce907b413
Merge staging-next into staging 2021-05-10 12:24:36 +00:00
github-actions[bot]
115881e756
Merge master into staging-next 2021-05-10 12:24:32 +00:00
Jan Tojnar
594a885912
Merge branch 'staging-next' into staging 2021-05-10 09:45:47 +02:00
Fabian Affolter
44d6925c3f
Merge pull request #122387 from fabaff/bump-nuclei 
nuclei: 2.3.6 -> 2.3.7
 2021-05-10 08:45:31 +02:00
github-actions[bot]
f4d69ad1f2
Merge master into staging-next 2021-05-10 06:20:28 +00:00
R. RyanTM
a8dc2d594b ipscan: 3.7.3 -> 3.7.6 2021-05-09 20:19:41 -07:00
Fabian Affolter
0cde88f4b1 nuclei: 2.3.6 -> 2.3.7 2021-05-09 22:48:29 +02: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