Skip to content

Commit bb9d17e

Browse files
authored
git-fast-export: 221024 -> 231118 (#353612)
2 parents 93c031a + 5dee69a commit bb9d17e

File tree

2 files changed

+34
-15
lines changed

2 files changed

+34
-15
lines changed

pkgs/applications/version-management/fast-export/default.nix renamed to pkgs/by-name/gi/git-fast-export/package.nix

Lines changed: 34 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,41 @@
1-
{lib, stdenv, fetchFromGitHub, git, mercurial, makeWrapper}:
1+
{
2+
lib,
3+
stdenv,
4+
fetchFromGitHub,
5+
git,
6+
mercurial,
7+
makeWrapper,
8+
nix-update-script,
9+
fetchpatch,
10+
}:
211

3-
stdenv.mkDerivation rec {
12+
stdenv.mkDerivation (finalAttrs: {
413
pname = "fast-export";
5-
version = "221024";
14+
version = "231118";
615

716
src = fetchFromGitHub {
817
owner = "frej";
9-
repo = pname;
10-
rev = "v${version}";
11-
sha256 = "sha256-re8iXM8s+TD35UGKalq2kVn8fx68fsnUC7Yo+/DQ9SM=";
18+
repo = "fast-export";
19+
rev = "v${finalAttrs.version}";
20+
hash = "sha256-JUy0t2yzd4bI7WPGG1E8L1topLfR5leV/WTU+u0bCyM=";
1221
};
1322

23+
patches = [
24+
(fetchpatch {
25+
url = "https://github.com/frej/fast-export/commit/a3d0562737e1e711659e03264e45cb47a5a2f46d.patch?full_index=1";
26+
hash = "sha256-vZOHnb5lXO22ElCK4oWQKCcPIqRyZV5axWfZqa84V1Y=";
27+
})
28+
];
29+
1430
nativeBuildInputs = [ makeWrapper ];
15-
buildInputs = [mercurial.python mercurial];
31+
buildInputs = [
32+
mercurial.python
33+
mercurial
34+
];
1635

1736
installPhase = ''
1837
binPath=$out/bin
19-
libexecPath=$out/libexec/${pname}
38+
libexecPath=$out/libexec/fast-export
2039
sitepackagesPath=$out/${mercurial.python.sitePackages}
2140
mkdir -p $binPath $libexecPath $sitepackagesPath
2241
@@ -57,11 +76,13 @@ stdenv.mkDerivation rec {
5776
popd
5877
'';
5978

60-
meta = with lib; {
79+
passthru.updateScript = nix-update-script { };
80+
81+
meta = {
6182
description = "Import mercurial into git";
6283
homepage = "https://repo.or.cz/w/fast-export.git";
63-
license = licenses.gpl2;
64-
maintainers = [ maintainers.koral ];
65-
platforms = platforms.unix;
84+
license = lib.licenses.gpl2;
85+
maintainers = [ lib.maintainers.koral ];
86+
platforms = lib.platforms.unix;
6687
};
67-
}
88+
})

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2225,8 +2225,6 @@ with pkgs;
22252225

22262226
git-fame = callPackage ../applications/version-management/git-fame { };
22272227

2228-
git-fast-export = callPackage ../applications/version-management/fast-export { };
2229-
22302228
git-fire = callPackage ../applications/version-management/git-fire { };
22312229

22322230
git-ftp = callPackage ../applications/version-management/git-ftp { };

0 commit comments

Comments
 (0)