gitAndTools.git-fast-export: 190107 -> 200213, fix
fixing involves providing it with mercurial_4 (and implicitly python27 - current released fast-export doesn't support py3 yet) and adding git to the wrapped PATH. this shouldn't be a runtime-resolved dependency.
This commit is contained in:
parent
f84aae6f67
commit
6b1e2a51aa
@ -98,7 +98,7 @@ let
|
||||
|
||||
git-fame = callPackage ./git-fame {};
|
||||
|
||||
git-fast-export = callPackage ./fast-export { };
|
||||
git-fast-export = callPackage ./fast-export { mercurial = mercurial_4; };
|
||||
|
||||
git-filter-repo = callPackage ./git-filter-repo {
|
||||
pythonPackages = python3Packages;
|
||||
|
@ -1,13 +1,14 @@
|
||||
{stdenv, fetchgit, mercurial, makeWrapper}:
|
||||
{stdenv, fetchFromGitHub, git, mercurial, makeWrapper}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fast-export";
|
||||
version = "190107";
|
||||
version = "200213";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://repo.or.cz/fast-export.git";
|
||||
src = fetchFromGitHub {
|
||||
owner = "frej";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "14azfps9jd5anivcvfwflgsvqdyy6gm9jy284kzx2ng9f7871d14";
|
||||
sha256 = "0hzyh66rlawxip4n2pvz7pbs0cq82clqv1d6c7hf60v1drjxw287";
|
||||
};
|
||||
|
||||
buildInputs = [mercurial.python mercurial makeWrapper];
|
||||
@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
for script in $out/bin/*.sh; do
|
||||
wrapProgram $script \
|
||||
--prefix PATH : "${mercurial.python}/bin":$libexec \
|
||||
--prefix PATH : "${git}/bin":"${mercurial.python}/bin":$libexec \
|
||||
--prefix PYTHONPATH : "${mercurial}/${mercurial.python.sitePackages}":$sitepackagesPath
|
||||
done
|
||||
'';
|
||||
|
Loading…
Reference in New Issue
Block a user