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

treewide: remove existing usages of pname+version in fetchCargoTarball

Browse Source 
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.
This commit is contained in:
éclairevoyant 2024-08-09 21:53:11 -04:00
parent 558837126b
commit e273bc80a5
No known key found for this signature in database
GPG Key ID: E3813AEAA02DB54B
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/audio/gnome-podcasts/default.nix
View File

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit pname version src; inherit src;
hash = "sha256-XTfKqKs7874ak7Lzscxw8E2qcnJOWMZaaol8TpIB6Vw="; hash = "sha256-XTfKqKs7874ak7Lzscxw8E2qcnJOWMZaaol8TpIB6Vw=";
}; };

2
pkgs/by-name/ch/chance/package.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit (finalAttrs) pname version src; inherit (finalAttrs) src;
hash = "sha256-Q4CfDQxlhspjg7Et+0zHwZ/iSnp0CnwwpW/gT7htlL8="; hash = "sha256-Q4CfDQxlhspjg7Et+0zHwZ/iSnp0CnwwpW/gT7htlL8=";
}; };

2
pkgs/by-name/ge/geopard/package.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit (finalAttrs) pname version src; inherit (finalAttrs) src;
hash = "sha256-YVbaXGGwQaqjUkA47ryW1VgJpZTx5ApRGdCcB5aA71M="; hash = "sha256-YVbaXGGwQaqjUkA47ryW1VgJpZTx5ApRGdCcB5aA71M=";
}; };

2
pkgs/by-name/ke/key-rack/package.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
''; '';
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit (finalAttrs) pname version src; inherit (finalAttrs) src;
hash = "sha256-wCJTm0W+g3+O1t1fR4maqJoxpPM0NeJG7d54MMAH33c="; hash = "sha256-wCJTm0W+g3+O1t1fR4maqJoxpPM0NeJG7d54MMAH33c=";
}; };

2
pkgs/by-name/su/surrealist/package.nix
View File

@ -111,7 +111,7 @@ in stdenv.mkDerivation (finalAttrs: {
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit (finalAttrs) patches src sourceRoot version; inherit (finalAttrs) patches src sourceRoot;
name = "${finalAttrs.pname}-${finalAttrs.version}"; name = "${finalAttrs.pname}-${finalAttrs.version}";
hash = "sha256-LtQS0kH+2P4odV7BJYiH6T51+iZHAM9W9mV96rNfNWs="; hash = "sha256-LtQS0kH+2P4odV7BJYiH6T51+iZHAM9W9mV96rNfNWs=";
}; };

2
pkgs/development/libraries/libkrun/default.nix
View File

@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit (finalAttrs) pname version src; inherit (finalAttrs) src;
hash = "sha256-33s62iOWYh1a8ETY/fbPRxvnj8dR4/UfG8mjFyWwz5k="; hash = "sha256-33s62iOWYh1a8ETY/fbPRxvnj8dR4/UfG8mjFyWwz5k=";
}; };

2
pkgs/development/python-modules/datafusion/default.nix
View File

@ -46,7 +46,7 @@ buildPythonPackage rec {
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
name = "datafusion-cargo-deps"; name = "datafusion-cargo-deps";
inherit src pname version; inherit src;
hash = "sha256-M2ZNAFWdsnN9C4+YbqFxZVH9fHR10Bimf1Xzrd9oy9E="; hash = "sha256-M2ZNAFWdsnN9C4+YbqFxZVH9fHR10Bimf1Xzrd9oy9E=";
}; };

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

@ -21,7 +21,7 @@ buildPythonPackage rec {
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit pname version src; inherit src;
hash = "sha256-KrEBr998AV/bKcIoq0tX72/QwPD9bQplrS0Zw+JiSMQ="; hash = "sha256-KrEBr998AV/bKcIoq0tX72/QwPD9bQplrS0Zw+JiSMQ=";
}; };

2
pkgs/tools/filesystems/stratisd/default.nix
View File

@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit pname version src; inherit src;
hash = "sha256-1KzOKo5Q1uBqO3aCBYUJJxla4873AzrwoFPaNpKKFJU="; hash = "sha256-1KzOKo5Q1uBqO3aCBYUJJxla4873AzrwoFPaNpKKFJU=";
}; };