Skip to content

Commit 00408c3

Browse files
authored
cargo-*: start maintaining and migrate to finalAttrs (#466878)
2 parents ad631c9 + 7b5ab1d commit 00408c3

File tree

10 files changed

+127
-64
lines changed

10 files changed

+127
-64
lines changed

pkgs/by-name/ca/cargo-benchcmp/package.nix

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@
44
fetchFromGitHub,
55
replaceVars,
66
stdenv,
7+
nix-update-script,
78
}:
89

9-
rustPlatform.buildRustPackage rec {
10+
rustPlatform.buildRustPackage (finalAttrs: {
1011
pname = "cargo-benchcmp";
1112
version = "0.4.5";
1213

1314
src = fetchFromGitHub {
1415
owner = "BurntSushi";
1516
repo = "cargo-benchcmp";
16-
tag = version;
17+
tag = finalAttrs.version;
1718
hash = "sha256-J8KFI0V/mOhUlYtVnFAQgPIpXL9/dLhOFxSly4bR00I=";
1819
};
1920

@@ -31,14 +32,16 @@ rustPlatform.buildRustPackage rec {
3132
"--skip=different_input_colored"
3233
];
3334

34-
meta = with lib; {
35+
passthru.updateScript = nix-update-script { };
36+
37+
meta = {
3538
description = "Small utility to compare Rust micro-benchmarks";
3639
mainProgram = "cargo-benchcmp";
3740
homepage = "https://github.com/BurntSushi/cargo-benchcmp";
38-
license = with licenses; [
41+
license = with lib.licenses; [
3942
mit
4043
unlicense
4144
];
42-
maintainers = [ ];
45+
maintainers = [ lib.maintainers.progrm_jarvis ];
4346
};
44-
}
47+
})

pkgs/by-name/ca/cargo-component/package.nix

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@
44
fetchFromGitHub,
55
pkg-config,
66
openssl,
7+
versionCheckHook,
8+
nix-update-script,
79
}:
810

9-
rustPlatform.buildRustPackage rec {
11+
rustPlatform.buildRustPackage (finalAttrs: {
1012
pname = "cargo-component";
1113
version = "0.21.1";
1214

1315
src = fetchFromGitHub {
1416
owner = "bytecodealliance";
1517
repo = "cargo-component";
16-
rev = "v${version}";
18+
tag = "v${finalAttrs.version}";
1719
hash = "sha256-Tlx14q/2k/0jZZ1nECX7zF/xNTeMCZg/fN+fhRM4uhc=";
1820
};
1921

@@ -30,12 +32,18 @@ rustPlatform.buildRustPackage rec {
3032
# requires the wasm32-wasi target
3133
doCheck = false;
3234

33-
meta = with lib; {
35+
doInstallCheck = true;
36+
nativeInstallCheckInputs = [ versionCheckHook ];
37+
versionCheckProgramArg = "--version";
38+
39+
passthru.updateScript = nix-update-script { };
40+
41+
meta = {
3442
description = "Cargo subcommand for creating WebAssembly components based on the component model proposal";
3543
homepage = "https://github.com/bytecodealliance/cargo-component";
36-
changelog = "https://github.com/bytecodealliance/cargo-component/releases/tag/${src.rev}";
37-
license = licenses.asl20;
38-
maintainers = [ ];
44+
changelog = "https://github.com/bytecodealliance/cargo-component/releases/tag/v${finalAttrs.version}";
45+
license = lib.licenses.asl20;
46+
maintainers = [ lib.maintainers.progrm_jarvis ];
3947
mainProgram = "cargo-component";
4048
};
41-
}
49+
})

pkgs/by-name/ca/cargo-cranky/package.nix

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,33 @@
22
lib,
33
rustPlatform,
44
fetchFromGitHub,
5+
nix-update-script,
56
}:
67

7-
rustPlatform.buildRustPackage rec {
8+
rustPlatform.buildRustPackage (finalAttrs: {
89
pname = "cargo-cranky";
910
version = "0.3.0";
1011

1112
src = fetchFromGitHub {
1213
owner = "ericseppanen";
1314
repo = "cargo-cranky";
14-
rev = "v${version}";
15+
tag = "v${finalAttrs.version}";
1516
hash = "sha256-3ARl3z+2nz05UaKf8ChN6mvPY2qMjUNxGnGJ1P0xkas=";
1617
};
1718

1819
cargoHash = "sha256-m9n2YyrMpuz/X/kvHgn+g4w9/Pg+n6VnnfwjaOnyPvY=";
1920

20-
meta = with lib; {
21+
passthru.updateScript = nix-update-script { };
22+
23+
meta = {
2124
description = "Easy to configure wrapper for Rust's clippy";
2225
mainProgram = "cargo-cranky";
2326
homepage = "https://github.com/ericseppanen/cargo-cranky";
24-
changelog = "https://github.com/ericseppanen/cargo-cranky/releases/tag/${src.rev}";
25-
license = with licenses; [
27+
changelog = "https://github.com/ericseppanen/cargo-cranky/releases/tag/v${finalAttrs.version}";
28+
license = with lib.licenses; [
2629
asl20
2730
mit
2831
];
29-
maintainers = [ ];
32+
maintainers = [ lib.maintainers.progrm_jarvis ];
3033
};
31-
}
34+
})

pkgs/by-name/ca/cargo-local-registry/package.nix

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,18 @@
77
libgit2,
88
openssl,
99
zlib,
10+
versionCheckHook,
11+
nix-update-script,
1012
}:
1113

12-
rustPlatform.buildRustPackage rec {
14+
rustPlatform.buildRustPackage (finalAttrs: {
1315
pname = "cargo-local-registry";
1416
version = "0.2.9";
1517

1618
src = fetchFromGitHub {
1719
owner = "dhovart";
1820
repo = "cargo-local-registry";
19-
rev = "v${version}";
21+
tag = "v${finalAttrs.version}";
2022
hash = "sha256-DzBD7N7GQZ9nhF22DnxRse0P8MUGReOcXHQ56KOqW6I=";
2123
};
2224

@@ -37,15 +39,21 @@ rustPlatform.buildRustPackage rec {
3739
# tests require internet access
3840
doCheck = false;
3941

40-
meta = with lib; {
42+
doInstallCheck = true;
43+
nativeInstallCheckInputs = [ versionCheckHook ];
44+
versionCheckProgramArg = "--version";
45+
46+
passthru.updateScript = nix-update-script { };
47+
48+
meta = {
4149
description = "Cargo subcommand to manage local registries";
4250
mainProgram = "cargo-local-registry";
4351
homepage = "https://github.com/dhovart/cargo-local-registry";
44-
changelog = "https://github.com/dhovart/cargo-local-registry/releases/tag/${src.rev}";
45-
license = with licenses; [
52+
changelog = "https://github.com/dhovart/cargo-local-registry/releases/tag/v${finalAttrs.version}";
53+
license = with lib.licenses; [
4654
asl20
4755
mit
4856
];
49-
maintainers = [ ];
57+
maintainers = [ lib.maintainers.progrm_jarvis ];
5058
};
51-
}
59+
})

pkgs/by-name/ca/cargo-mutants/package.nix

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22
lib,
33
rustPlatform,
44
fetchFromGitHub,
5+
nix-update-script,
56
}:
67

7-
rustPlatform.buildRustPackage rec {
8+
rustPlatform.buildRustPackage (finalAttrs: {
89
pname = "cargo-mutants";
910
version = "25.3.1";
1011

1112
src = fetchFromGitHub {
1213
owner = "sourcefrog";
1314
repo = "cargo-mutants";
14-
rev = "v${version}";
15+
tag = "v${finalAttrs.version}";
1516
hash = "sha256-T+BMLjp74IO71u/ftNfz67FPSt1LYCgsRP65gL0wScg=";
1617
};
1718

@@ -20,12 +21,14 @@ rustPlatform.buildRustPackage rec {
2021
# too many tests require internet access
2122
doCheck = false;
2223

23-
meta = with lib; {
24+
passthru.updateScript = nix-update-script { };
25+
26+
meta = {
2427
description = "Mutation testing tool for Rust";
2528
mainProgram = "cargo-mutants";
2629
homepage = "https://github.com/sourcefrog/cargo-mutants";
27-
changelog = "https://github.com/sourcefrog/cargo-mutants/releases/tag/${src.rev}";
28-
license = licenses.mit;
29-
maintainers = [ ];
30+
changelog = "https://github.com/sourcefrog/cargo-mutants/releases/tag/v${finalAttrs.version}";
31+
license = lib.licenses.mit;
32+
maintainers = [ lib.maintainers.progrm_jarvis ];
3033
};
31-
}
34+
})

pkgs/by-name/ca/cargo-play/package.nix

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,18 @@
22
lib,
33
rustPlatform,
44
fetchFromGitHub,
5+
versionCheckHook,
6+
nix-update-script,
57
}:
68

7-
rustPlatform.buildRustPackage rec {
9+
rustPlatform.buildRustPackage (finalAttrs: {
810
pname = "cargo-play";
911
version = "0.5.1";
1012

1113
src = fetchFromGitHub {
1214
owner = "fanzeyi";
1315
repo = "cargo-play";
14-
tag = version;
16+
tag = finalAttrs.version;
1517
sha256 = "sha256-Z5zcLQYfQeGybsnt2U+4Z+peRHxNPbDriPMKWhJ+PeA=";
1618
};
1719

@@ -23,11 +25,18 @@ rustPlatform.buildRustPackage rec {
2325
"--skip=infer_override"
2426
];
2527

26-
meta = with lib; {
28+
doInstallCheck = true;
29+
nativeInstallCheckInputs = [ versionCheckHook ];
30+
versionCheckProgramArg = "--version";
31+
32+
passthru.updateScript = nix-update-script { };
33+
34+
meta = {
2735
description = "Run your rust code without setting up cargo";
2836
mainProgram = "cargo-play";
2937
homepage = "https://github.com/fanzeyi/cargo-play";
30-
license = licenses.mit;
31-
maintainers = [ ];
38+
changelog = "https://github.com/fanzeyi/cargo-play/releases/tag/v${finalAttrs.version}";
39+
license = lib.licenses.mit;
40+
maintainers = [ lib.maintainers.progrm_jarvis ];
3241
};
33-
}
42+
})

pkgs/by-name/ca/cargo-release/package.nix

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,17 @@
88
stdenv,
99
curl,
1010
git,
11+
nix-update-script,
1112
}:
1213

13-
rustPlatform.buildRustPackage rec {
14+
rustPlatform.buildRustPackage (finalAttrs: {
1415
pname = "cargo-release";
1516
version = "0.25.22";
1617

1718
src = fetchFromGitHub {
1819
owner = "crate-ci";
1920
repo = "cargo-release";
20-
tag = "v${version}";
21+
tag = "v${finalAttrs.version}";
2122
hash = "sha256-NFI7UIHbo1xcH+pXim3ar8hvkn2EdIFpI2rpsivhVHg=";
2223
};
2324

@@ -42,17 +43,20 @@ rustPlatform.buildRustPackage rec {
4243
# disable vendored-libgit2 and vendored-openssl
4344
buildNoDefaultFeatures = true;
4445

46+
passthru.updateScript = nix-update-script { };
47+
4548
meta = {
4649
description = ''Cargo subcommand "release": everything about releasing a rust crate'';
4750
mainProgram = "cargo-release";
4851
homepage = "https://github.com/crate-ci/cargo-release";
49-
changelog = "https://github.com/crate-ci/cargo-release/blob/v${version}/CHANGELOG.md";
52+
changelog = "https://github.com/crate-ci/cargo-release/blob/v${finalAttrs.version}/CHANGELOG.md";
5053
license = with lib.licenses; [
5154
asl20 # or
5255
mit
5356
];
5457
maintainers = with lib.maintainers; [
5558
gerschtli
59+
progrm_jarvis
5660
];
5761
};
58-
}
62+
})

pkgs/by-name/ca/cargo-shuttle/package.nix

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,18 @@
55
pkg-config,
66
openssl,
77
zlib,
8+
versionCheckHook,
9+
nix-update-script,
810
}:
911

10-
rustPlatform.buildRustPackage rec {
12+
rustPlatform.buildRustPackage (finalAttrs: {
1113
pname = "cargo-shuttle";
1214
version = "0.57.3";
1315

1416
src = fetchFromGitHub {
1517
owner = "shuttle-hq";
1618
repo = "shuttle";
17-
rev = "v${version}";
19+
tag = "v${finalAttrs.version}";
1820
hash = "sha256-qPevl75wmOYVhTgMiJOi+6j8LBWKzM7HPhd5mdf2B+8=";
1921
};
2022

@@ -32,17 +34,23 @@ rustPlatform.buildRustPackage rec {
3234
"cargo-shuttle"
3335
];
3436

35-
cargoTestFlags = cargoBuildFlags ++ [
37+
cargoTestFlags = finalAttrs.cargoBuildFlags ++ [
3638
# other tests are failing for different reasons
3739
"init::shuttle_init_tests::"
3840
];
3941

40-
meta = with lib; {
42+
doInstallCheck = true;
43+
nativeInstallCheckInputs = [ versionCheckHook ];
44+
versionCheckProgramArg = "--version";
45+
46+
passthru.updateScript = nix-update-script { };
47+
48+
meta = {
4149
description = "Cargo command for the shuttle platform";
4250
mainProgram = "cargo-shuttle";
4351
homepage = "https://shuttle.rs";
44-
changelog = "https://github.com/shuttle-hq/shuttle/releases/tag/${src.rev}";
45-
license = licenses.asl20;
46-
maintainers = [ ];
52+
changelog = "https://github.com/shuttle-hq/shuttle/releases/tag/v${finalAttrs.version}";
53+
license = lib.licenses.asl20;
54+
maintainers = [ lib.maintainers.progrm_jarvis ];
4755
};
48-
}
56+
})

0 commit comments

Comments
 (0)