diff --git a/pkgs/by-name/gi/git-mit/libgit2-update.patch b/pkgs/by-name/gi/git-mit/libgit2-update.patch new file mode 100644 index 000000000000..604636dacd97 --- /dev/null +++ b/pkgs/by-name/gi/git-mit/libgit2-update.patch @@ -0,0 +1,163 @@ +From 3e82a4f5017972c7d28151a468bb71fe7d2279e0 Mon Sep 17 00:00:00 2001 +From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> +Date: Mon, 13 Jan 2025 01:45:12 +0000 +Subject: [PATCH] fix(deps): update rust crate git2 to 0.20.0 + +--- + Cargo.lock | 8 ++++---- + git-mit-config/Cargo.toml | 2 +- + git-mit-install/Cargo.toml | 2 +- + git-mit-relates-to/Cargo.toml | 2 +- + git-mit/Cargo.toml | 2 +- + mit-commit-message-lints/Cargo.toml | 2 +- + mit-commit-msg/Cargo.toml | 2 +- + mit-hook-test-helper/Cargo.toml | 2 +- + mit-pre-commit/Cargo.toml | 2 +- + mit-prepare-commit-msg/Cargo.toml | 2 +- + 10 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 11c858e8..db9e01dd 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -783,9 +783,9 @@ dependencies = [ + + [[package]] + name = "git2" +-version = "0.19.0" ++version = "0.20.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" ++checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff" + dependencies = [ + "bitflags 2.7.0", + "libc", +@@ -1075,9 +1075,9 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" + + [[package]] + name = "libgit2-sys" +-version = "0.17.0+1.8.1" ++version = "0.18.0+1.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" ++checksum = "e1a117465e7e1597e8febea8bb0c410f1c7fb93b1e1cddf34363f8390367ffec" + dependencies = [ + "cc", + "libc", +diff --git a/git-mit-config/Cargo.toml b/git-mit-config/Cargo.toml +index aa1fd61e..3ec0cd93 100644 +--- a/git-mit-config/Cargo.toml ++++ b/git-mit-config/Cargo.toml +@@ -15,7 +15,7 @@ mit-lint = "3.2.9" + shell-words = "1.1.0" + thiserror = "1.0.69" + miette = { version = "7.4.0", features = [ "fancy" ] } +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + clap_complete = "4.5.42" + clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] } +diff --git a/git-mit-install/Cargo.toml b/git-mit-install/Cargo.toml +index a7611272..96f58672 100644 +--- a/git-mit-install/Cargo.toml ++++ b/git-mit-install/Cargo.toml +@@ -18,7 +18,7 @@ clap_complete = "4.5.42" + clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] } + + +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + + indoc = "2.0.5" +diff --git a/git-mit-relates-to/Cargo.toml b/git-mit-relates-to/Cargo.toml +index d50d2aa9..c6676bf8 100644 +--- a/git-mit-relates-to/Cargo.toml ++++ b/git-mit-relates-to/Cargo.toml +@@ -17,7 +17,7 @@ thiserror = "1.0.69" + miette = { version = "7.4.0", features = [ "fancy" ] } + clap_complete = "4.5.42" + clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] } +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + + +diff --git a/git-mit/Cargo.toml b/git-mit/Cargo.toml +index ce108e96..fdda0c55 100644 +--- a/git-mit/Cargo.toml ++++ b/git-mit/Cargo.toml +@@ -17,7 +17,7 @@ thiserror = "1.0.69" + miette = { version = "7.4.0", features = [ "fancy" ] } + clap_complete = "4.5.42" + clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] } +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + + +diff --git a/mit-commit-message-lints/Cargo.toml b/mit-commit-message-lints/Cargo.toml +index 623b120b..042d71b6 100644 +--- a/mit-commit-message-lints/Cargo.toml ++++ b/mit-commit-message-lints/Cargo.toml +@@ -18,7 +18,7 @@ time = { version = "0.3.37", features = ["local-offset"] } + glob = "0.3.2" + thiserror = "1.0.69" + miette = { version = "7.4.0", features = [ "fancy" ] } +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + regex = "1.11.1" + serde_yaml = "0.9.34" +diff --git a/mit-commit-msg/Cargo.toml b/mit-commit-msg/Cargo.toml +index 3b8c626e..2c5e1a4f 100644 +--- a/mit-commit-msg/Cargo.toml ++++ b/mit-commit-msg/Cargo.toml +@@ -16,7 +16,7 @@ tokio = { version = "1.43.0", features = ["full"] } + mit-lint = "3.2.9" + clap_complete = "4.5.42" + clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] } +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + miette = { version = "7.4.0", features = [ "fancy" ] } + mit-commit = "3.2.1" +diff --git a/mit-hook-test-helper/Cargo.toml b/mit-hook-test-helper/Cargo.toml +index 44131375..bccd79ab 100644 +--- a/mit-hook-test-helper/Cargo.toml ++++ b/mit-hook-test-helper/Cargo.toml +@@ -14,7 +14,7 @@ description = "Testing help tools for git-mit" + + [dependencies] + tempfile = "3.15.0" +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + + +diff --git a/mit-pre-commit/Cargo.toml b/mit-pre-commit/Cargo.toml +index 40ff8a0f..4ce23ff7 100644 +--- a/mit-pre-commit/Cargo.toml ++++ b/mit-pre-commit/Cargo.toml +@@ -16,7 +16,7 @@ thiserror = "1.0.69" + miette = { version = "7.4.0", features = [ "fancy" ] } + clap_complete = "4.5.42" + clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] } +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + mit-commit = "3.2.1" + +diff --git a/mit-prepare-commit-msg/Cargo.toml b/mit-prepare-commit-msg/Cargo.toml +index fcbbcd14..2aa93263 100644 +--- a/mit-prepare-commit-msg/Cargo.toml ++++ b/mit-prepare-commit-msg/Cargo.toml +@@ -19,7 +19,7 @@ miette = { version = "7.4.0", features = [ "fancy" ] } + shell-words = "1.1.0" + clap_complete = "4.5.42" + clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] } +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + mit-commit = "3.2.1" + diff --git a/pkgs/by-name/gi/git-mit/package.nix b/pkgs/by-name/gi/git-mit/package.nix index d0ca3b0f5c00..608adfa25c0f 100644 --- a/pkgs/by-name/gi/git-mit/package.nix +++ b/pkgs/by-name/gi/git-mit/package.nix @@ -28,11 +28,8 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoPatches = [ - (fetchpatch { - name = "libgit2-update.patch"; - url = "https://github.com/PurpleBooth/git-mit/pull/1543/commits/3e82a4f5017972c7d28151a468bb71fe7d2279e0.patch"; - hash = "sha256-M9RpZHjOpZZqdHQe57LwMZ9zX6/4BNg3ymz8H3qupFk="; - }) + # https://github.com/PurpleBooth/git-mit/pull/1543 + ./libgit2-update.patch ]; cargoHash = "sha256-uoS6vmHmOVkHS81mrsbbXqP/dAC/FNHAlpTDHSa632k=";