Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-01-25 18:52:08 +00:00
committed by GitHub
2813 changed files with 3233 additions and 2989 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
{stdenv, lib, fetchurl, pythonPackages
{ lib, fetchurl, pythonPackages
, gnutar, unzip, lhasa, rpm, binutils, cpio, gzip, p7zip, cabextract, unrar, unshield
, bzip2, xz, lzip
# unzip is handled by p7zip