colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #200390 from figsoda/cargo-generate

Browse Source 
cargo-generate: 0.16.0 -> 0.17.2
This commit is contained in:
figsoda 2022-11-09 10:34:30 -05:00 committed by GitHub
commit e122112010
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/tools/rust/cargo-generate/default.nix
View File

@ -10,19 +10,19 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-generate";
version = "0.16.0";
version = "0.17.2";
src = fetchFromGitHub {
owner = "cargo-generate";
repo = "cargo-generate";
rev = "v${version}";
sha256 = "sha256-qL5ZbLimpsi/7yuhubHF3/tAouE/5zCWRx4nZG841cU=";
sha256 = "sha256-so69T2mDq/nFGiug2zYIX6Z+Dhxk3riV+TkEYTpFrTg=";
};
# patch Cargo.toml to not vendor libgit2 and openssl
cargoPatches = [ ./no-vendor.patch ];
cargoSha256 = "sha256-OB3rjJNxkUKRQPsWRvCniNPfYBgLFV4yXO7dnVvL7wo=";
cargoSha256 = "sha256-JRoD6SuGQPJ8HOePXrH3avIY+sW61ErZFOHLafqmxMY=";
nativeBuildInputs = [ pkg-config ];
@ -39,14 +39,13 @@ rustPlatform.buildRustPackage rec {
# - favorites_default_to_git_if_not_defined: requires network access to github.com
# - should_canonicalize: the test assumes that it will be called from the /Users/<project_dir>/ folder on darwin variant.
checkFlags = [
"--skip favorites::favorites_default_to_git_if_not_defined"
# Probably git 2.38.1 releated failure
# Upstream issue https://github.com/cargo-generate/cargo-generate/issues/777
"--skip basics::it_loads_a_submodule"
] ++ lib.optionals stdenv.isDarwin [ "--skip git::utils::should_canonicalize" ];
"--skip=favorites::favorites_default_to_git_if_not_defined"
] ++ lib.optionals stdenv.isDarwin [
"--skip=git::utils::should_canonicalize"
];
meta = with lib; {
description = "cargo, make me a project";
description = "A tool to generaet a new Rust project by leveraging a pre-existing git repository as a template";
homepage = "https://github.com/cargo-generate/cargo-generate";
changelog = "https://github.com/cargo-generate/cargo-generate/blob/v${version}/CHANGELOG.md";
license = with licenses; [ asl20 /* or */ mit ];

6
pkgs/development/tools/rust/cargo-generate/no-vendor.patch
View File

@ -3,9 +3,9 @@
@@ -10,7 +10,7 @@ include = ["src/**/*", "LICENSE-*", "*.md"]
[dependencies]
clap = { version = "3.2", features = ["derive", "std"], default-features = false }
-git2 = { version = "0.14", features = ["ssh", "https", "vendored-libgit2", "vendored-openssl"], default-features = false }
+git2 = { version = "0.14", features = ["ssh", "https"], default-features = false }
clap = { version = "4.0", features = ["derive", "std", "help"], default-features = false }
-git2 = { version = "0.15", features = ["ssh", "https", "vendored-libgit2", "vendored-openssl"], default-features = false }
+git2 = { version = "0.15", features = ["ssh", "https"], default-features = false }
console = "0.15"
dialoguer = "0.10"
dirs = "4.0"