Merge pull request #217605 from figsoda/cargo-generate
cargo-generate: 0.17.6 -> 0.18.0
This commit is contained in:
commit
98c31410e8
|
@ -11,19 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-generate";
|
||||
version = "0.17.6";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cargo-generate";
|
||||
repo = "cargo-generate";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SDcJmEh4DBxe6icKom559B8tkvl0dbXUeACwH69PZRM=";
|
||||
sha256 = "sha256-OPbDxUNqHGyTMokDayyJjS1GAekGP7LLJDUwQFjyVUM=";
|
||||
};
|
||||
|
||||
# patch Cargo.toml to not vendor libgit2 and openssl
|
||||
cargoPatches = [ ./no-vendor.patch ];
|
||||
|
||||
cargoSha256 = "sha256-wbovccAWeAPa8xbVhM2TGiLcqQYGBvGnS5/05672QKU=";
|
||||
cargoSha256 = "sha256-skgSFVxHa6DBm6qLbk6MUK4jaVdC8GQBGl1HgHRnxX0=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
@ -33,6 +30,9 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
nativeCheckInputs = [ git ];
|
||||
|
||||
# disable vendored libgit2 and openssl
|
||||
buildNoDefaultFeatures = true;
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d) USER=nixbld
|
||||
git config --global user.name Nixbld
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -10,7 +10,7 @@ include = ["src/**/*", "LICENSE-*", "*.md"]
|
||||
|
||||
[dependencies]
|
||||
clap = { version = "4.0", features = ["derive", "std", "help"], default-features = false }
|
||||
-git2 = { version = "0.16", features = ["ssh", "https", "vendored-libgit2", "vendored-openssl"], default-features = false }
|
||||
+git2 = { version = "0.16", features = ["ssh", "https"], default-features = false }
|
||||
console = "0.15"
|
||||
dialoguer = "0.10"
|
||||
dirs = "4.0"
|
Loading…
Reference in a new issue