summary refs log tree commit diff
path: root/pkgs/tools/compression
diff options
context:
space:
mode:
authorBart Brouns <bart@magnetophon.nl>2020-05-26 16:20:47 +0200
committerBart Brouns <bart@magnetophon.nl>2020-05-26 22:23:33 +0200
commit9b3ca0c6149bb222da800a89cf9b6b2bc838dc4c (patch)
tree21e3a851ab491ef52641d9a68b20bd08aaed27fe /pkgs/tools/compression
parent5f63bf75a3b3aa4c115bb0e618d94d79eb06e651 (diff)
downloadnixpkgs-9b3ca0c6149bb222da800a89cf9b6b2bc838dc4c.tar
nixpkgs-9b3ca0c6149bb222da800a89cf9b6b2bc838dc4c.tar.gz
nixpkgs-9b3ca0c6149bb222da800a89cf9b6b2bc838dc4c.tar.bz2
nixpkgs-9b3ca0c6149bb222da800a89cf9b6b2bc838dc4c.tar.lz
nixpkgs-9b3ca0c6149bb222da800a89cf9b6b2bc838dc4c.tar.xz
nixpkgs-9b3ca0c6149bb222da800a89cf9b6b2bc838dc4c.tar.zst
nixpkgs-9b3ca0c6149bb222da800a89cf9b6b2bc838dc4c.zip
dtrx: remove p7zip, since it's unsafe
Diffstat (limited to 'pkgs/tools/compression')
-rw-r--r--pkgs/tools/compression/dtrx/default.nix17
1 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix
index 81a446066d9..edca969a1e8 100644
--- a/pkgs/tools/compression/dtrx/default.nix
+++ b/pkgs/tools/compression/dtrx/default.nix
@@ -1,15 +1,18 @@
 {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 ]
-  ++ lib.optional (unzipSupport) unzip
-  ++ lib.optional (unrarSupport) unrar
-  ++ [ bzip2 xz lzip ]);
+  # p7zip
+  archivers = lib.makeBinPath ([ gnutar lhasa rpm binutils cpio gzip cabextract unshield ]
+                               ++ lib.optional (unzipSupport) unzip
+                               ++ lib.optional (unrarSupport) unrar
+                               ++ [ bzip2 xz lzip ]);
 
 in pythonPackages.buildPythonApplication rec {
   pname = "dtrx";