git-unroll: 0-unstable-2025-08-14 -> 0-unstable-2026-03-25 (#503357)
This commit is contained in:
@@ -2,11 +2,10 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromCodeberg,
|
||||
fetchpatch,
|
||||
makeWrapper,
|
||||
bash,
|
||||
|
||||
git,
|
||||
gitMinimal,
|
||||
nix-prefetch-git,
|
||||
rWrapper,
|
||||
rPackages,
|
||||
@@ -16,26 +15,15 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "git-unroll";
|
||||
version = "0-unstable-2025-08-14";
|
||||
version = "0-unstable-2026-03-25";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "gm6k";
|
||||
repo = "git-unroll";
|
||||
rev = "a66aad56af0440e1d6e807518af298264861b2c7";
|
||||
hash = "sha256-Mpc2p+W8PqQ6Os9AJJJwvL00a4cjFKBUTBG5bF+IzL4=";
|
||||
rev = "62fc6ff3fcb62b6972182d64b4f3710c2188c082";
|
||||
hash = "sha256-We3nbdZIxk27T2VXoKiwRTrBAZ2qoANpDpUXq+MgvbY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Discovered when bumping pytorch to 2.10.0
|
||||
# See https://github.com/NixOS/nixpkgs/pull/484881#issuecomment-3814200207
|
||||
# https://codeberg.org/gm6k/git-unroll/pulls/2
|
||||
(fetchpatch {
|
||||
name = "fix-name-decollision-for-multi-parent-submodules";
|
||||
url = "https://codeberg.org/glepage/git-unroll/commit/3a16e138a6c4bc9d8226f025fb53e281c80fc1ef.patch";
|
||||
hash = "sha256-mHDqpDh6aiQRDgfxeZs/ufa5Af0lDFDRGpSlmD1+kEo=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace unroll \
|
||||
--replace-fail "#! /usr/bin/env nix-shell" "#!/usr/bin/env bash" \
|
||||
@@ -60,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
wrapProgram $out/bin/unroll \
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
git
|
||||
gitMinimal
|
||||
nix-prefetch-git
|
||||
(rWrapper.override {
|
||||
packages = with rPackages; [
|
||||
|
||||
Reference in New Issue
Block a user