From c1d2184a49c7e590536020fc8121531dc96a5527 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 9 Mar 2025 19:38:36 +0100 Subject: [PATCH 01/15] ccextractor: directly pass cargoRoot to fetcher --- pkgs/by-name/cc/ccextractor/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/cc/ccextractor/package.nix b/pkgs/by-name/cc/ccextractor/package.nix index ae94897395ff..7c8fbb886b86 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="; }; From e99c97f254c2f71d586287b773904eaf2d911eff Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 9 Mar 2025 19:52:19 +0100 Subject: [PATCH 02/15] ceph: directly pass cargoRoot to fetcher --- pkgs/tools/filesystems/ceph/default.nix | 8 ++++++-- .../filesystems/ceph/old-python-packages/cryptography.nix | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 1e9b4618c1b6..88c636048ab4 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 0ecf97dc27b5..5d82beffd690 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="; }; From 3a6328f75aa7a31166b3401992a1e6a2d5996a11 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 9 Mar 2025 19:19:45 +0100 Subject: [PATCH 03/15] ibus-engines.openbangla-keyboard: directly pass cargoRoot to fetcher --- pkgs/applications/misc/openbangla-keyboard/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/applications/misc/openbangla-keyboard/default.nix b/pkgs/applications/misc/openbangla-keyboard/default.nix index a059a14df05a..b2239c5d38a8 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="; }; From 9a40ac05c18987b0508fe6273ac39414a7d380f5 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 9 Mar 2025 19:23:31 +0100 Subject: [PATCH 04/15] kdePackages.akonadi-search: directly pass cargoRoot to fetcher --- pkgs/kde/gear/akonadi-search/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/kde/gear/akonadi-search/default.nix b/pkgs/kde/gear/akonadi-search/default.nix index 7d46f87af0e1..03b37bb7bc7e 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="; }; From 9e2751327b434d49aff907ae2b811c0675dc654e Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 9 Mar 2025 19:23:42 +0100 Subject: [PATCH 05/15] kdePackages.kdepim-addons: directly pass cargoRoot to fetcher --- pkgs/kde/gear/kdepim-addons/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/kde/gear/kdepim-addons/default.nix b/pkgs/kde/gear/kdepim-addons/default.nix index b898e5d6410f..edae47c991bc 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="; }; From 6c1bc14c30bf404c45e64537a1e1a1a8c216e392 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Fri, 30 May 2025 16:52:25 +0200 Subject: [PATCH 06/15] librepcb: directly pass cargoRoot to fetcher --- pkgs/applications/science/electronics/librepcb/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index 6a706e5a81c4..34b430b07e10 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="; }; From b67755bccd5d0e0db2ea6ac35f58f484884871c2 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 9 Mar 2025 19:54:05 +0100 Subject: [PATCH 07/15] opengamepadui: directly pass cargoRoot to fetcher --- pkgs/by-name/op/opengamepadui/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/op/opengamepadui/package.nix b/pkgs/by-name/op/opengamepadui/package.nix index 497f1e03eda1..e700d72d27e9 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"; From c158832c51e5af38dd5e37291a1c49cbcb52af1a Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 9 Mar 2025 19:24:32 +0100 Subject: [PATCH 08/15] python313Packages.bcrypt: directly pass cargoRoot to fetcher --- pkgs/development/python-modules/bcrypt/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index 9c83ab0c5b1b..fa49f45058fd 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="; }; From 6d8de291b422f67abb2a85dc01dcb6f229df209a Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 9 Mar 2025 19:27:22 +0100 Subject: [PATCH 09/15] python313Packages.biliass: directly pass cargoRoot to fetcher --- pkgs/development/python-modules/biliass/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix index f58f280dae5e..03a8c74936f5 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="; }; From 7c6f50aedd536bd9aa03ed3a51a141db212a2200 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 9 Mar 2025 19:29:10 +0100 Subject: [PATCH 10/15] python313Packages.libcst: directly pass cargoRoot to fetcher --- pkgs/development/python-modules/libcst/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index 5740deda9663..58c7c5e67781 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="; }; From 8aa2633d5600daab737e1e626daa18c489d85fbe Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 15 May 2025 01:38:37 +0200 Subject: [PATCH 11/15] python313Packages.temporalio: directly pass cargoRoot to fetcher --- pkgs/development/python-modules/temporalio/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/temporalio/default.nix b/pkgs/development/python-modules/temporalio/default.nix index 63c45ee9f3f7..110d9a68b333 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="; }; From 6d70a4ac0eb912ddaecba2b89eab560ae09b2834 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Fri, 30 May 2025 16:42:15 +0200 Subject: [PATCH 12/15] ruby: directly pass cargoRoot to fetcher --- pkgs/development/interpreters/ruby/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 48a5724b150b..5e7357f2d01e 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; From 071c2273ef0d1a8ac96fee095a3eb7e28fd37c2a Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 9 Mar 2025 19:40:29 +0100 Subject: [PATCH 13/15] surrealist: directly pass cargoRoot to fetcher --- pkgs/by-name/su/surrealist/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix index 175366a2c8fe..ac2372736750 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="; }; From 501b8f1c698bc10902b70b2f36f9c6ebd24d55d9 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 9 Mar 2025 19:35:43 +0100 Subject: [PATCH 14/15] wealthfolio: directly pass cargoRoot to fetcher --- pkgs/by-name/we/wealthfolio/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix index 4f8b7ac07faf..56672781d455 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="; }; From 8e876759944795a410b39455d5c79b19b697d0e9 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 9 Mar 2025 19:59:12 +0100 Subject: [PATCH 15/15] doc/rust: pass cargoRoot to fetcher in example --- doc/languages-frameworks/rust.section.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 5078de14d80f..39a24856cd31 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="; };