Skip to content

Commit e273bc8

Browse files
committed
treewide: remove existing usages of pname+version in fetchCargoTarball
This is done because the existing fetchCargoTarball does not support pname or version, resulting in a vendor tarball with the name cargo-deps-vendor.tar.gz. Since adding pname+version support would change the name of the derivation, and therefore its hash, we remove existing usages to avoid treewide breakage.
1 parent 5588371 commit e273bc8

File tree

9 files changed

+9
-9
lines changed

9 files changed

+9
-9
lines changed

pkgs/applications/audio/gnome-podcasts/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
3434
};
3535

3636
cargoDeps = rustPlatform.fetchCargoTarball {
37-
inherit pname version src;
37+
inherit src;
3838
hash = "sha256-XTfKqKs7874ak7Lzscxw8E2qcnJOWMZaaol8TpIB6Vw=";
3939
};
4040

pkgs/by-name/ch/chance/package.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
2626
};
2727

2828
cargoDeps = rustPlatform.fetchCargoTarball {
29-
inherit (finalAttrs) pname version src;
29+
inherit (finalAttrs) src;
3030
hash = "sha256-Q4CfDQxlhspjg7Et+0zHwZ/iSnp0CnwwpW/gT7htlL8=";
3131
};
3232

pkgs/by-name/ge/geopard/package.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
2626
};
2727

2828
cargoDeps = rustPlatform.fetchCargoTarball {
29-
inherit (finalAttrs) pname version src;
29+
inherit (finalAttrs) src;
3030
hash = "sha256-YVbaXGGwQaqjUkA47ryW1VgJpZTx5ApRGdCcB5aA71M=";
3131
};
3232

pkgs/by-name/ke/key-rack/package.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
3232
'';
3333

3434
cargoDeps = rustPlatform.fetchCargoTarball {
35-
inherit (finalAttrs) pname version src;
35+
inherit (finalAttrs) src;
3636
hash = "sha256-wCJTm0W+g3+O1t1fR4maqJoxpPM0NeJG7d54MMAH33c=";
3737
};
3838

pkgs/by-name/su/surrealist/package.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ in stdenv.mkDerivation (finalAttrs: {
111111
};
112112

113113
cargoDeps = rustPlatform.fetchCargoTarball {
114-
inherit (finalAttrs) patches src sourceRoot version;
114+
inherit (finalAttrs) patches src sourceRoot;
115115
name = "${finalAttrs.pname}-${finalAttrs.version}";
116116
hash = "sha256-LtQS0kH+2P4odV7BJYiH6T51+iZHAM9W9mV96rNfNWs=";
117117
};

pkgs/development/libraries/libkrun/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
3333
outputs = [ "out" "dev" ];
3434

3535
cargoDeps = rustPlatform.fetchCargoTarball {
36-
inherit (finalAttrs) pname version src;
36+
inherit (finalAttrs) src;
3737
hash = "sha256-33s62iOWYh1a8ETY/fbPRxvnj8dR4/UfG8mjFyWwz5k=";
3838
};
3939

pkgs/development/python-modules/datafusion/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ buildPythonPackage rec {
4646

4747
cargoDeps = rustPlatform.fetchCargoTarball {
4848
name = "datafusion-cargo-deps";
49-
inherit src pname version;
49+
inherit src;
5050
hash = "sha256-M2ZNAFWdsnN9C4+YbqFxZVH9fHR10Bimf1Xzrd9oy9E=";
5151
};
5252

pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ buildPythonPackage rec {
2121
};
2222

2323
cargoDeps = rustPlatform.fetchCargoTarball {
24-
inherit pname version src;
24+
inherit src;
2525
hash = "sha256-KrEBr998AV/bKcIoq0tX72/QwPD9bQplrS0Zw+JiSMQ=";
2626
};
2727

pkgs/tools/filesystems/stratisd/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737
};
3838

3939
cargoDeps = rustPlatform.fetchCargoTarball {
40-
inherit pname version src;
40+
inherit src;
4141
hash = "sha256-1KzOKo5Q1uBqO3aCBYUJJxla4873AzrwoFPaNpKKFJU=";
4242
};
4343

0 commit comments

Comments
 (0)