public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "dtrx: remove p7zip, since it's unsafe"

Browse Source 
This reverts commit 9b3ca0c6149bb222da800a89cf9b6b2bc838dc4c.
p7zip is now switched to a maintained fork
This commit is contained in:
Bart Brouns 2020-06-11 14:39:48 +02:00
parent 955701709f
commit 1683a5f146
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/tools/compression/dtrx/default.nix
View File

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