diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 5078de14d80f5..39a24856cd319 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -605,8 +605,8 @@ In some projects, the Rust crate is not in the main Python source directory. In such cases, the `cargoRoot` attribute can be used to specify the crate's directory relative to `sourceRoot`. In the following example, the crate is in `src/rust`, as specified in the -`cargoRoot` attribute. Note that we also need to specify the correct -path for `fetchCargoVendor`. +`cargoRoot` attribute. Note that we also need to pass in `cargoRoot` +to `fetchCargoVendor`. ```nix { @@ -627,8 +627,12 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; - sourceRoot = "${pname}-${version}/${cargoRoot}"; + inherit + pname + version + src + cargoRoot + ; hash = "sha256-ctUt8maCjnGddKPf+Ii++wKsAXA1h+JM6zKQNXXwJqQ="; }; diff --git a/pkgs/applications/misc/openbangla-keyboard/default.nix b/pkgs/applications/misc/openbangla-keyboard/default.nix index a059a14df05ae..b2239c5d38a84 100644 --- a/pkgs/applications/misc/openbangla-keyboard/default.nix +++ b/pkgs/applications/misc/openbangla-keyboard/default.nix @@ -62,11 +62,7 @@ stdenv.mkDerivation rec { ]; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - postPatch = '' - cp ${./Cargo.lock} Cargo.lock - ''; - sourceRoot = "${src.name}/${cargoRoot}"; + inherit src cargoRoot postPatch; hash = "sha256-qZMTZi7eqEp5kSmVx7qdS7eDKOzSv9fMjWT0h/MGyeY="; }; diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index 6a706e5a81c48..34b430b07e104 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -42,8 +42,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase ]; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - sourceRoot = "source/${cargoRoot}"; + inherit src cargoRoot; hash = "sha256-1td3WjxbDq2lX7c0trpYRhO82ChNAG/ZABBRsekYtq4="; }; diff --git a/pkgs/by-name/cc/ccextractor/package.nix b/pkgs/by-name/cc/ccextractor/package.nix index ae94897395ff7..7c8fbb886b86c 100644 --- a/pkgs/by-name/cc/ccextractor/package.nix +++ b/pkgs/by-name/cc/ccextractor/package.nix @@ -49,10 +49,8 @@ stdenv.mkDerivation (finalAttrs: { cargoRoot = "src/rust"; cargoDeps = rustPlatform.fetchCargoVendor { - inherit (finalAttrs) src; - sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; + inherit (finalAttrs) src cargoRoot; patches = [ ./use-rsmpeg-0.15.patch ]; - patchFlags = [ "-p3" ]; hash = "sha256-7v3gQghByUDWZLJRRGa/7X2ivUumirq6BbexNQcCXCk="; }; diff --git a/pkgs/by-name/op/opengamepadui/package.nix b/pkgs/by-name/op/opengamepadui/package.nix index 497f1e03eda13..e700d72d27e97 100644 --- a/pkgs/by-name/op/opengamepadui/package.nix +++ b/pkgs/by-name/op/opengamepadui/package.nix @@ -35,8 +35,7 @@ stdenv.mkDerivation (finalAttrs: { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit (finalAttrs) src; - sourceRoot = "source/${finalAttrs.cargoRoot}"; + inherit (finalAttrs) src cargoRoot; hash = "sha256-T79G2bShJuFRfaCqG3IDHqW0s68yAdGyv58kdDYg6kg="; }; cargoRoot = "extensions"; diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix index 175366a2c8feb..ac23727367507 100644 --- a/pkgs/by-name/su/surrealist/package.nix +++ b/pkgs/by-name/su/surrealist/package.nix @@ -60,8 +60,7 @@ stdenv.mkDerivation (finalAttrs: { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit (finalAttrs) src; - sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; + inherit (finalAttrs) src cargoRoot; hash = "sha256-Su9ZOPIskV5poeS8pgtri+sZANBpdgnuCsQqE4WKFdA="; }; diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix index 4f8b7ac07fafb..56672781d4550 100644 --- a/pkgs/by-name/we/wealthfolio/package.nix +++ b/pkgs/by-name/we/wealthfolio/package.nix @@ -36,8 +36,12 @@ stdenv.mkDerivation (finalAttrs: { buildAndTestSubdir = finalAttrs.cargoRoot; cargoDeps = rustPlatform.fetchCargoVendor { - inherit (finalAttrs) pname version src; - sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; + inherit (finalAttrs) + pname + version + src + cargoRoot + ; hash = "sha256-MmdvEutdkX98DgX1aVuxs4gabuMX5aM8yC4eqgvd8Q4="; }; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 48a5724b150b0..5e7357f2d01e4 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -216,8 +216,7 @@ let cargoDeps = if yjitSupport then rustPlatform.fetchCargoVendor { - inherit (finalAttrs) src; - sourceRoot = "${finalAttrs.pname}-${version}/${finalAttrs.cargoRoot}"; + inherit (finalAttrs) src cargoRoot; hash = assert cargoHash != null; cargoHash; diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index 9c83ab0c5b1be..fa49f45058fdb 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -33,8 +33,12 @@ buildPythonPackage rec { cargoRoot = "src/_bcrypt"; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; - sourceRoot = "${pname}-${version}/${cargoRoot}"; + inherit + pname + version + src + cargoRoot + ; hash = "sha256-HgHvfMBspPsSYhllnKBg5XZB6zxFIqJj+4//xKG8HwA="; }; diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix index f58f280dae5e6..03a8c74936f5b 100644 --- a/pkgs/development/python-modules/biliass/default.nix +++ b/pkgs/development/python-modules/biliass/default.nix @@ -28,8 +28,9 @@ buildPythonPackage rec { pname version src + sourceRoot + cargoRoot ; - sourceRoot = "${sourceRoot}/${cargoRoot}"; hash = "sha256-tkHl6z0En+od//fCGJXK/p8Dz5KDOXltHrXhxHmHL6U="; }; diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index 5740deda9663a..58c7c5e677817 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -33,8 +33,12 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; - sourceRoot = "${src.name}/${cargoRoot}"; + inherit + pname + version + src + cargoRoot + ; hash = "sha256-K8hug7JeLPIvrqgVaONKfixu8XRvn+pnqS0fHV+nTqg="; }; diff --git a/pkgs/development/python-modules/temporalio/default.nix b/pkgs/development/python-modules/temporalio/default.nix index 63c45ee9f3f76..110d9a68b333a 100644 --- a/pkgs/development/python-modules/temporalio/default.nix +++ b/pkgs/development/python-modules/temporalio/default.nix @@ -33,8 +33,12 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; - sourceRoot = "${src.name}/${cargoRoot}"; + inherit + pname + version + src + cargoRoot + ; hash = "sha256-9hP+zN6jcRmRhPmcZ4Zgp61IeS7gDPfsOvweAxKHnHM="; }; diff --git a/pkgs/kde/gear/akonadi-search/default.nix b/pkgs/kde/gear/akonadi-search/default.nix index 7d46f87af0e18..03b37bb7bc7eb 100644 --- a/pkgs/kde/gear/akonadi-search/default.nix +++ b/pkgs/kde/gear/akonadi-search/default.nix @@ -14,9 +14,8 @@ mkKdeDerivation rec { cargoRoot = "agent/rs/htmlparser"; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version; + inherit pname version cargoRoot; src = sources.${pname}; - sourceRoot = "${pname}-${version}/${cargoRoot}"; hash = "sha256-hdm4LfQcs4TTfBLzlZYJ0uzqfLxMXuYQExLGJg81W2U="; }; diff --git a/pkgs/kde/gear/kdepim-addons/default.nix b/pkgs/kde/gear/kdepim-addons/default.nix index b898e5d6410f0..edae47c991bc4 100644 --- a/pkgs/kde/gear/kdepim-addons/default.nix +++ b/pkgs/kde/gear/kdepim-addons/default.nix @@ -17,9 +17,8 @@ mkKdeDerivation rec { cargoRoot = "plugins/webengineurlinterceptor/adblock"; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version; + inherit pname version cargoRoot; src = sources.${pname}; - sourceRoot = "${pname}-${version}/${cargoRoot}"; hash = "sha256-66FqoD3JoPbtg6zc32uaPYaTo4zHxywiN8wPI2jtcjc="; }; diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 1e9b4618c1b6b..88c636048ab48 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -243,8 +243,12 @@ let }; cargoRoot = "src/_bcrypt"; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; - sourceRoot = "${pname}-${version}/${cargoRoot}"; + inherit + pname + version + src + cargoRoot + ; hash = "sha256-8PyCgh/rUO8uynzGdgylAsb5k55dP9fCnf40UOTCR/M="; }; }); diff --git a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix index 0ecf97dc27b5f..5d82beffd690c 100644 --- a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix +++ b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix @@ -42,8 +42,12 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; - sourceRoot = "${pname}-${version}/${cargoRoot}"; + inherit + pname + version + src + cargoRoot + ; hash = "sha256-pZHu3Oo9DWRAtldU0UvrH1FIg0bEvyfizPUhj9IBL58="; };