nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 07:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #88974 from magnetophon/dtrx

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