Merge pull request #88974 from magnetophon/dtrx

dtrx: remove p7zip, since it's unsafe
This commit is contained in:
Mario Rodas 2020-05-27 06:57:37 -05:00 committed by GitHub
commit 7a056d4cb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,12 +1,15 @@
{stdenv, lib, fetchurl, pythonPackages
, gnutar, unzip, lhasa, rpm, binutils, cpio, gzip, p7zip, cabextract, unrar, unshield
, gnutar, unzip, lhasa, rpm, binutils, cpio, gzip, cabextract, unrar, unshield
, bzip2, xz, lzip
# unzip is handled by p7zip
, unzipSupport ? false
# unsafe:
# ,p7zip
# unzip is no longer handled by p7zip, since it's unsafe
, unzipSupport ? true
, unrarSupport ? false }:
let
archivers = lib.makeBinPath ([ gnutar lhasa rpm binutils cpio gzip p7zip cabextract unshield ]
# p7zip
archivers = lib.makeBinPath ([ gnutar lhasa rpm binutils cpio gzip cabextract unshield ]
++ lib.optional (unzipSupport) unzip
++ lib.optional (unrarSupport) unrar
++ [ bzip2 xz lzip ]);