Merge pull request #288999 from aiotter/dev/git-filter-repo
git-filter-repo: fix broken --help option
This commit is contained in:
commit
f7341d3c92
@ -1,15 +1,19 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchpatch
|
, fetchFromGitHub
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
|
, fetchpatch
|
||||||
|
, installShellFiles
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
, setuptools-scm
|
, setuptools-scm
|
||||||
|
, writeScript
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "git-filter-repo";
|
pname = "git-filter-repo";
|
||||||
version = "2.38.0";
|
version = "2.38.0";
|
||||||
format = "setuptools";
|
docs_version = "01ead411966a83dfcfb35f9d2e8a9f7f215eaa65";
|
||||||
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.5";
|
disabled = pythonOlder "3.5";
|
||||||
|
|
||||||
@ -18,6 +22,13 @@ buildPythonPackage rec {
|
|||||||
hash = "sha256-/hdT4Y8L1tPJtXhoyAEa59BWpuurcGcGOWoV71MScl4=";
|
hash = "sha256-/hdT4Y8L1tPJtXhoyAEa59BWpuurcGcGOWoV71MScl4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
docs = fetchFromGitHub {
|
||||||
|
owner = "newren";
|
||||||
|
repo = "git-filter-repo";
|
||||||
|
rev = docs_version;
|
||||||
|
hash = "sha256-Z/3w3Rguo8sfuc/OQ25eFbMfiOHjxQqPY6S32zuvoY4=";
|
||||||
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# https://github.com/newren/git-filter-repo/pull/498
|
# https://github.com/newren/git-filter-repo/pull/498
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
@ -28,8 +39,13 @@ buildPythonPackage rec {
|
|||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
installManPage ${docs}/man1/git-filter-repo.1
|
||||||
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
setuptools-scm
|
setuptools-scm
|
||||||
|
installShellFiles
|
||||||
];
|
];
|
||||||
|
|
||||||
# Project has no tests
|
# Project has no tests
|
||||||
@ -44,6 +60,20 @@ buildPythonPackage rec {
|
|||||||
mainProgram = "git-filter-repo";
|
mainProgram = "git-filter-repo";
|
||||||
homepage = "https://github.com/newren/git-filter-repo";
|
homepage = "https://github.com/newren/git-filter-repo";
|
||||||
license = with licenses; [ mit /* or */ gpl2Plus ];
|
license = with licenses; [ mit /* or */ gpl2Plus ];
|
||||||
maintainers = with maintainers; [ fab ];
|
maintainers = with maintainers; [ aiotter fab ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
passthru.updateScript = writeScript "update-${pname}" ''
|
||||||
|
#!/usr/bin/env nix-shell
|
||||||
|
#!nix-shell -i bash -p common-updater-scripts curl jq nix-update
|
||||||
|
|
||||||
|
set -eu -o pipefail
|
||||||
|
|
||||||
|
# Update program
|
||||||
|
nix-update ${pname}
|
||||||
|
|
||||||
|
# Update docs
|
||||||
|
docs_latest=$(curl -s https://api.github.com/repos/newren/git-filter-repo/commits/heads/docs/status | jq -r '.sha')
|
||||||
|
[[ "${docs_version}" = "$docs_latest" ]] || update-source-version ${pname} "$docs_latest" --version-key=docs_version --source-key=docs
|
||||||
|
'';
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user