treewide: directly pass cargoRoot to fetcher (#373541)

K900 bf8cde15 7c961946

Changed files
+54 -37
doc
languages-frameworks
pkgs
applications
misc
openbangla-keyboard
science
electronics
librepcb
by-name
cc
ccextractor
op
opengamepadui
su
surrealist
we
wealthfolio
development
interpreters
python-modules
bcrypt
biliass
libcst
temporalio
kde
gear
akonadi-search
kdepim-addons
tools
filesystems
ceph
old-python-packages
+8 -4
doc/languages-frameworks/rust.section.md
···
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
{
···
};
cargoDeps = rustPlatform.fetchCargoVendor {
-
inherit pname version src;
-
sourceRoot = "${pname}-${version}/${cargoRoot}";
+
inherit
+
pname
+
version
+
src
+
cargoRoot
+
;
hash = "sha256-ctUt8maCjnGddKPf+Ii++wKsAXA1h+JM6zKQNXXwJqQ=";
};
+1 -5
pkgs/applications/misc/openbangla-keyboard/default.nix
···
];
cargoDeps = rustPlatform.fetchCargoVendor {
-
inherit src;
-
postPatch = ''
-
cp ${./Cargo.lock} Cargo.lock
-
'';
-
sourceRoot = "${src.name}/${cargoRoot}";
+
inherit src cargoRoot postPatch;
hash = "sha256-qZMTZi7eqEp5kSmVx7qdS7eDKOzSv9fMjWT0h/MGyeY=";
};
+1 -2
pkgs/applications/science/electronics/librepcb/default.nix
···
buildInputs = [ qtbase ];
cargoDeps = rustPlatform.fetchCargoVendor {
-
inherit src;
-
sourceRoot = "source/${cargoRoot}";
+
inherit src cargoRoot;
hash = "sha256-1td3WjxbDq2lX7c0trpYRhO82ChNAG/ZABBRsekYtq4=";
};
+1 -3
pkgs/by-name/cc/ccextractor/package.nix
···
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=";
};
+1 -2
pkgs/by-name/op/opengamepadui/package.nix
···
};
cargoDeps = rustPlatform.fetchCargoVendor {
-
inherit (finalAttrs) src;
-
sourceRoot = "source/${finalAttrs.cargoRoot}";
+
inherit (finalAttrs) src cargoRoot;
hash = "sha256-T79G2bShJuFRfaCqG3IDHqW0s68yAdGyv58kdDYg6kg=";
};
cargoRoot = "extensions";
+1 -2
pkgs/by-name/su/surrealist/package.nix
···
};
cargoDeps = rustPlatform.fetchCargoVendor {
-
inherit (finalAttrs) src;
-
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}";
+
inherit (finalAttrs) src cargoRoot;
hash = "sha256-Su9ZOPIskV5poeS8pgtri+sZANBpdgnuCsQqE4WKFdA=";
};
+6 -2
pkgs/by-name/we/wealthfolio/package.nix
···
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=";
};
+1 -2
pkgs/development/interpreters/ruby/default.nix
···
cargoDeps =
if yjitSupport then
rustPlatform.fetchCargoVendor {
-
inherit (finalAttrs) src;
-
sourceRoot = "${finalAttrs.pname}-${version}/${finalAttrs.cargoRoot}";
+
inherit (finalAttrs) src cargoRoot;
hash =
assert cargoHash != null;
cargoHash;
+6 -2
pkgs/development/python-modules/bcrypt/default.nix
···
cargoRoot = "src/_bcrypt";
cargoDeps = rustPlatform.fetchCargoVendor {
-
inherit pname version src;
-
sourceRoot = "${pname}-${version}/${cargoRoot}";
+
inherit
+
pname
+
version
+
src
+
cargoRoot
+
;
hash = "sha256-HgHvfMBspPsSYhllnKBg5XZB6zxFIqJj+4//xKG8HwA=";
};
+2 -1
pkgs/development/python-modules/biliass/default.nix
···
pname
version
src
+
sourceRoot
+
cargoRoot
;
-
sourceRoot = "${sourceRoot}/${cargoRoot}";
hash = "sha256-tkHl6z0En+od//fCGJXK/p8Dz5KDOXltHrXhxHmHL6U=";
};
+6 -2
pkgs/development/python-modules/libcst/default.nix
···
};
cargoDeps = rustPlatform.fetchCargoVendor {
-
inherit pname version src;
-
sourceRoot = "${src.name}/${cargoRoot}";
+
inherit
+
pname
+
version
+
src
+
cargoRoot
+
;
hash = "sha256-K8hug7JeLPIvrqgVaONKfixu8XRvn+pnqS0fHV+nTqg=";
};
+6 -2
pkgs/development/python-modules/temporalio/default.nix
···
};
cargoDeps = rustPlatform.fetchCargoVendor {
-
inherit pname version src;
-
sourceRoot = "${src.name}/${cargoRoot}";
+
inherit
+
pname
+
version
+
src
+
cargoRoot
+
;
hash = "sha256-9hP+zN6jcRmRhPmcZ4Zgp61IeS7gDPfsOvweAxKHnHM=";
};
+1 -2
pkgs/kde/gear/akonadi-search/default.nix
···
cargoRoot = "agent/rs/htmlparser";
cargoDeps = rustPlatform.fetchCargoVendor {
-
inherit pname version;
+
inherit pname version cargoRoot;
src = sources.${pname};
-
sourceRoot = "${pname}-${version}/${cargoRoot}";
hash = "sha256-hdm4LfQcs4TTfBLzlZYJ0uzqfLxMXuYQExLGJg81W2U=";
};
+1 -2
pkgs/kde/gear/kdepim-addons/default.nix
···
cargoRoot = "plugins/webengineurlinterceptor/adblock";
cargoDeps = rustPlatform.fetchCargoVendor {
-
inherit pname version;
+
inherit pname version cargoRoot;
src = sources.${pname};
-
sourceRoot = "${pname}-${version}/${cargoRoot}";
hash = "sha256-66FqoD3JoPbtg6zc32uaPYaTo4zHxywiN8wPI2jtcjc=";
};
+6 -2
pkgs/tools/filesystems/ceph/default.nix
···
};
cargoRoot = "src/_bcrypt";
cargoDeps = rustPlatform.fetchCargoVendor {
-
inherit pname version src;
-
sourceRoot = "${pname}-${version}/${cargoRoot}";
+
inherit
+
pname
+
version
+
src
+
cargoRoot
+
;
hash = "sha256-8PyCgh/rUO8uynzGdgylAsb5k55dP9fCnf40UOTCR/M=";
};
});
+6 -2
pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix
···
};
cargoDeps = rustPlatform.fetchCargoVendor {
-
inherit pname version src;
-
sourceRoot = "${pname}-${version}/${cargoRoot}";
+
inherit
+
pname
+
version
+
src
+
cargoRoot
+
;
hash = "sha256-pZHu3Oo9DWRAtldU0UvrH1FIg0bEvyfizPUhj9IBL58=";
};