Loading pkgs/by-name/gi/gitoxide/fix-cargo-dependencies.patch 0 → 100644 +24 −0 Original line number Diff line number Diff line diff -ur a/gix-packetline/Cargo.toml b/gix-packetline/Cargo.toml --- a/gix-packetline/Cargo.toml +++ b/gix-packetline/Cargo.toml @@ -24,7 +24,7 @@ ## If set, all IO will become blocking. The same types will be used preventing side-by-side usage of blocking and non-blocking IO. blocking-io = [] ## Implement IO traits from `futures-io`. -async-io = ["dep:futures-io", "dep:futures-lite", "dep:pin-project-lite"] +async-io = ["dep:futures-io", "futures-lite", "dep:pin-project-lite"] #! ### Other ## Data structures implement `serde::Serialize` and `serde::Deserialize`. diff -ur a/gix-protocol/Cargo.toml b/gix-protocol/Cargo.toml --- a/gix-protocol/Cargo.toml +++ b/gix-protocol/Cargo.toml @@ -34,7 +34,7 @@ "gix-transport/async-client", "dep:async-trait", "dep:futures-io", - "dep:futures-lite", + "futures-lite", "handshake", "fetch" ] pkgs/by-name/gi/gitoxide/package.nix +10 −6 Original line number Diff line number Diff line Loading @@ -18,17 +18,21 @@ let in rustPlatform.buildRustPackage rec { pname = "gitoxide"; version = "0.39.0"; version = "0.42.0"; src = fetchFromGitHub { owner = "Byron"; owner = "GitoxideLabs"; repo = "gitoxide"; rev = "v${version}"; hash = "sha256-xv4xGkrArJ/LTVLs2SYhvxhfNG6sjVm5nZWsi4s34iM="; hash = "sha256-hrCWt4cCnlH3NKH5Uugf/rvVN+YpbeZgZ/lhnQGZ2I0="; }; useFetchCargoVendor = true; cargoHash = "sha256-SRJkI61Z8revRWoschkUAJwcJfKB/U03+YfwEcnEIm8="; cargoHash = "sha256-q35MQGN/tvsK7gg0a/ljoVY6wedy7rwKlSakONgBIgk="; patches = [ ./fix-cargo-dependencies.patch ]; nativeBuildInputs = [ cmake Loading @@ -55,8 +59,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Command-line application for interacting with git repositories"; homepage = "https://github.com/Byron/gitoxide"; changelog = "https://github.com/Byron/gitoxide/blob/v${version}/CHANGELOG.md"; homepage = "https://github.com/GitoxideLabs/gitoxide"; changelog = "https://github.com/GitoxideLabs/gitoxide/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit # or asl20 Loading Loading
pkgs/by-name/gi/gitoxide/fix-cargo-dependencies.patch 0 → 100644 +24 −0 Original line number Diff line number Diff line diff -ur a/gix-packetline/Cargo.toml b/gix-packetline/Cargo.toml --- a/gix-packetline/Cargo.toml +++ b/gix-packetline/Cargo.toml @@ -24,7 +24,7 @@ ## If set, all IO will become blocking. The same types will be used preventing side-by-side usage of blocking and non-blocking IO. blocking-io = [] ## Implement IO traits from `futures-io`. -async-io = ["dep:futures-io", "dep:futures-lite", "dep:pin-project-lite"] +async-io = ["dep:futures-io", "futures-lite", "dep:pin-project-lite"] #! ### Other ## Data structures implement `serde::Serialize` and `serde::Deserialize`. diff -ur a/gix-protocol/Cargo.toml b/gix-protocol/Cargo.toml --- a/gix-protocol/Cargo.toml +++ b/gix-protocol/Cargo.toml @@ -34,7 +34,7 @@ "gix-transport/async-client", "dep:async-trait", "dep:futures-io", - "dep:futures-lite", + "futures-lite", "handshake", "fetch" ]
pkgs/by-name/gi/gitoxide/package.nix +10 −6 Original line number Diff line number Diff line Loading @@ -18,17 +18,21 @@ let in rustPlatform.buildRustPackage rec { pname = "gitoxide"; version = "0.39.0"; version = "0.42.0"; src = fetchFromGitHub { owner = "Byron"; owner = "GitoxideLabs"; repo = "gitoxide"; rev = "v${version}"; hash = "sha256-xv4xGkrArJ/LTVLs2SYhvxhfNG6sjVm5nZWsi4s34iM="; hash = "sha256-hrCWt4cCnlH3NKH5Uugf/rvVN+YpbeZgZ/lhnQGZ2I0="; }; useFetchCargoVendor = true; cargoHash = "sha256-SRJkI61Z8revRWoschkUAJwcJfKB/U03+YfwEcnEIm8="; cargoHash = "sha256-q35MQGN/tvsK7gg0a/ljoVY6wedy7rwKlSakONgBIgk="; patches = [ ./fix-cargo-dependencies.patch ]; nativeBuildInputs = [ cmake Loading @@ -55,8 +59,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Command-line application for interacting with git repositories"; homepage = "https://github.com/Byron/gitoxide"; changelog = "https://github.com/Byron/gitoxide/blob/v${version}/CHANGELOG.md"; homepage = "https://github.com/GitoxideLabs/gitoxide"; changelog = "https://github.com/GitoxideLabs/gitoxide/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit # or asl20 Loading