Skip to content

Commit 4770513

Browse files
committed
packaging: Remove no longer necessary libgit2 patches
25.05 already has 1.9.0 and we don't support older nixpkgs versions.
1 parent 2308aaf commit 4770513

File tree

3 files changed

+0
-1246
lines changed

3 files changed

+0
-1246
lines changed

packaging/dependencies.nix

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -89,38 +89,4 @@ scope: {
8989
buildPhase = lib.replaceStrings [ "--without-python" ] [ "" ] old.buildPhase;
9090
installPhase = lib.replaceStrings [ "--without-python" ] [ "" ] old.installPhase;
9191
});
92-
93-
libgit2 =
94-
if lib.versionAtLeast pkgs.libgit2.version "1.9.0" then
95-
pkgs.libgit2
96-
else
97-
pkgs.libgit2.overrideAttrs (attrs: {
98-
# libgit2: Nixpkgs 24.11 has < 1.9.0, which needs our patches
99-
nativeBuildInputs =
100-
attrs.nativeBuildInputs or [ ]
101-
# gitMinimal does not build on Windows. See packbuilder patch.
102-
++ lib.optionals (!stdenv.hostPlatform.isWindows) [
103-
# Needed for `git apply`; see `prePatch`
104-
pkgs.buildPackages.gitMinimal
105-
];
106-
# Only `git apply` can handle git binary patches
107-
prePatch =
108-
attrs.prePatch or ""
109-
+ lib.optionalString (!stdenv.hostPlatform.isWindows) ''
110-
patch() {
111-
git apply
112-
}
113-
'';
114-
patches =
115-
attrs.patches or [ ]
116-
++ [
117-
./patches/libgit2-mempack-thin-packfile.patch
118-
]
119-
# gitMinimal does not build on Windows, but fortunately this patch only
120-
# impacts interruptibility
121-
++ lib.optionals (!stdenv.hostPlatform.isWindows) [
122-
# binary patch; see `prePatch`
123-
./patches/libgit2-packbuilder-callback-interruptible.patch
124-
];
125-
});
12692
}

packaging/patches/libgit2-mempack-thin-packfile.patch

Lines changed: 0 additions & 282 deletions
This file was deleted.

0 commit comments

Comments
 (0)