Skip to content

Commit

Permalink
dtrx: remove p7zip, since it's unsafe
Browse files Browse the repository at this point in the history
  • Loading branch information
magnetophon committed May 26, 2020
1 parent 5f63bf7 commit 9b3ca0c
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions 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";
Expand Down

0 comments on commit 9b3ca0c

Please sign in to comment.