mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 03:23:29 +03:00
patool: 3.1.0 -> 4.0.1
Diff: https://github.com/wummel/patool/compare/refs/tags/3.1.0...refs/tags/4.0.1
This commit is contained in:
parent
1bc34e6907
commit
0235c3f34b
1 changed files with 10 additions and 16 deletions
|
@ -1,10 +1,11 @@
|
||||||
{
|
{
|
||||||
argcomplete,
|
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
buildPythonPackage,
|
buildPythonPackage,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
|
setuptools,
|
||||||
installShellFiles,
|
installShellFiles,
|
||||||
|
argcomplete,
|
||||||
pytestCheckHook,
|
pytestCheckHook,
|
||||||
p7zip,
|
p7zip,
|
||||||
cabextract,
|
cabextract,
|
||||||
|
@ -40,25 +41,20 @@ let
|
||||||
in
|
in
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "patool";
|
pname = "patool";
|
||||||
version = "3.1.0";
|
version = "4.0.1";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
#pypi doesn't have test data
|
#pypi doesn't have test data
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "wummel";
|
owner = "wummel";
|
||||||
repo = pname;
|
repo = "patool";
|
||||||
tag = version;
|
tag = version;
|
||||||
hash = "sha256-mt/GUIRJHB2/Rritc+uNkolZzguYy2G/NKnSKNxKsLk=";
|
hash = "sha256-KAOJi8vUP9kPa++dLEXf3mwrv1kmV7uDZmtvngPxQ90=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# https://github.com/wummel/patool/pull/173
|
|
||||||
./fix-rar-detection.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace patoolib/util.py \
|
substituteInPlace patoolib/util.py \
|
||||||
--replace "path = None" 'path = os.environ["PATH"] + ":${lib.makeBinPath compression-utilities}"'
|
--replace-fail 'path = os.environ.get("PATH", os.defpath)' 'path = os.environ.get("PATH", os.defpath) + ":${lib.makeBinPath compression-utilities}"'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||||
|
@ -68,9 +64,7 @@ buildPythonPackage rec {
|
||||||
--zsh <(${argcomplete}/bin/register-python-argcomplete -s zsh $out/bin/patool)
|
--zsh <(${argcomplete}/bin/register-python-argcomplete -s zsh $out/bin/patool)
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
installShellFiles
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeCheckInputs = [ pytestCheckHook ] ++ compression-utilities;
|
nativeCheckInputs = [ pytestCheckHook ] ++ compression-utilities;
|
||||||
|
|
||||||
|
@ -85,11 +79,11 @@ buildPythonPackage rec {
|
||||||
"test_p7azip"
|
"test_p7azip"
|
||||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_ar" ];
|
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_ar" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "portable archive file manager";
|
description = "portable archive file manager";
|
||||||
mainProgram = "patool";
|
mainProgram = "patool";
|
||||||
homepage = "https://wummel.github.io/patool/";
|
homepage = "https://wummel.github.io/patool/";
|
||||||
license = licenses.gpl3;
|
license = lib.licenses.gpl3;
|
||||||
maintainers = with maintainers; [ marius851000 ];
|
maintainers = with lib.maintainers; [ marius851000 ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue