Skip to content

Commit e981466

Browse files
authored
gitoxide: 0.39.0 -> 0.42.0 (NixOS#396234)
2 parents 99fd632 + b417ab1 commit e981466

File tree

2 files changed

+34
-6
lines changed

2 files changed

+34
-6
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff -ur a/gix-packetline/Cargo.toml b/gix-packetline/Cargo.toml
2+
--- a/gix-packetline/Cargo.toml
3+
+++ b/gix-packetline/Cargo.toml
4+
@@ -24,7 +24,7 @@
5+
## If set, all IO will become blocking. The same types will be used preventing side-by-side usage of blocking and non-blocking IO.
6+
blocking-io = []
7+
## Implement IO traits from `futures-io`.
8+
-async-io = ["dep:futures-io", "dep:futures-lite", "dep:pin-project-lite"]
9+
+async-io = ["dep:futures-io", "futures-lite", "dep:pin-project-lite"]
10+
11+
#! ### Other
12+
## Data structures implement `serde::Serialize` and `serde::Deserialize`.
13+
diff -ur a/gix-protocol/Cargo.toml b/gix-protocol/Cargo.toml
14+
--- a/gix-protocol/Cargo.toml
15+
+++ b/gix-protocol/Cargo.toml
16+
@@ -34,7 +34,7 @@
17+
"gix-transport/async-client",
18+
"dep:async-trait",
19+
"dep:futures-io",
20+
- "dep:futures-lite",
21+
+ "futures-lite",
22+
"handshake",
23+
"fetch"
24+
]

pkgs/by-name/gi/gitoxide/package.nix

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,21 @@ let
1818
in
1919
rustPlatform.buildRustPackage rec {
2020
pname = "gitoxide";
21-
version = "0.39.0";
21+
version = "0.42.0";
2222

2323
src = fetchFromGitHub {
24-
owner = "Byron";
24+
owner = "GitoxideLabs";
2525
repo = "gitoxide";
2626
rev = "v${version}";
27-
hash = "sha256-xv4xGkrArJ/LTVLs2SYhvxhfNG6sjVm5nZWsi4s34iM=";
27+
hash = "sha256-hrCWt4cCnlH3NKH5Uugf/rvVN+YpbeZgZ/lhnQGZ2I0=";
2828
};
2929

3030
useFetchCargoVendor = true;
31-
cargoHash = "sha256-SRJkI61Z8revRWoschkUAJwcJfKB/U03+YfwEcnEIm8=";
31+
cargoHash = "sha256-q35MQGN/tvsK7gg0a/ljoVY6wedy7rwKlSakONgBIgk=";
32+
33+
patches = [
34+
./fix-cargo-dependencies.patch
35+
];
3236

3337
nativeBuildInputs = [
3438
cmake
@@ -55,8 +59,8 @@ rustPlatform.buildRustPackage rec {
5559

5660
meta = with lib; {
5761
description = "Command-line application for interacting with git repositories";
58-
homepage = "https://github.com/Byron/gitoxide";
59-
changelog = "https://github.com/Byron/gitoxide/blob/v${version}/CHANGELOG.md";
62+
homepage = "https://github.com/GitoxideLabs/gitoxide";
63+
changelog = "https://github.com/GitoxideLabs/gitoxide/blob/v${version}/CHANGELOG.md";
6064
license = with licenses; [
6165
mit # or
6266
asl20

0 commit comments

Comments
 (0)