From c368e3cb07b0d6949085faca436b37e4f002e3ad Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 23 Jan 2025 14:35:41 +0100 Subject: [PATCH] treewide: migrate to fetchCargoVendor, batch 3 Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. It should be possible to reproduce this diff. To do so, get the list of files changed by this commit, e.g. with git diff --name-only, then run the following two commands, each with that list of files as their standard input: xargs sed -i 's/fetchCargoTarball/fetchCargoVendor/' cut -d / -f 4 | xargs -n 1 nix-update --version=skip This will take a long time. It might be possible to parallelize it using xargs' -P option. I haven't tested it. --- pkgs/by-name/_3/_389-ds-base/package.nix | 4 ++-- pkgs/by-name/am/amberol/package.nix | 4 ++-- pkgs/by-name/as/ashpd-demo/package.nix | 4 ++-- pkgs/by-name/au/audio-sharing/package.nix | 4 ++-- pkgs/by-name/au/authenticator/package.nix | 4 ++-- pkgs/by-name/bc/bcachefs-tools/package.nix | 4 ++-- pkgs/by-name/bu/bustle/package.nix | 4 ++-- pkgs/by-name/ca/cargo-tauri_1/package.nix | 4 ++-- pkgs/by-name/ca/cartero/package.nix | 4 ++-- pkgs/by-name/cc/ccextractor/package.nix | 4 ++-- pkgs/by-name/ch/chance/package.nix | 4 ++-- pkgs/by-name/ch/chromatic/package.nix | 4 ++-- pkgs/by-name/ci/citations/package.nix | 4 ++-- pkgs/by-name/co/contrast/package.nix | 4 ++-- pkgs/by-name/de/delfin/package.nix | 4 ++-- pkgs/by-name/di/diebahn/package.nix | 4 ++-- pkgs/by-name/do/done/package.nix | 4 ++-- pkgs/by-name/em/emblem/package.nix | 4 ++-- pkgs/by-name/en/envision-unwrapped/package.nix | 4 ++-- pkgs/by-name/ey/eyedropper/package.nix | 4 ++-- pkgs/by-name/fo/fontfinder/package.nix | 4 ++-- pkgs/by-name/fo/footage/package.nix | 4 ++-- pkgs/by-name/fr/fragments/package.nix | 4 ++-- pkgs/by-name/fr/fretboard/package.nix | 4 ++-- pkgs/by-name/fu/furtherance/package.nix | 4 ++-- pkgs/by-name/ga/gale/package.nix | 4 ++-- pkgs/by-name/ge/geopard/package.nix | 4 ++-- pkgs/by-name/gg/gg-jj/package.nix | 4 ++-- pkgs/by-name/gl/glide-media-player/package.nix | 4 ++-- pkgs/by-name/gn/gnome-commander/package.nix | 4 ++-- pkgs/by-name/gn/gnome-podcasts/package.nix | 4 ++-- pkgs/by-name/gn/gnome-robots/package.nix | 4 ++-- pkgs/by-name/gn/gnome-solanum/package.nix | 4 ++-- pkgs/by-name/gr/granian/package.nix | 4 ++-- pkgs/by-name/he/health/package.nix | 4 ++-- pkgs/by-name/he/helvum/package.nix | 4 ++-- pkgs/by-name/id/identity/package.nix | 4 ++-- pkgs/by-name/im/impression/package.nix | 4 ++-- pkgs/by-name/in/intiface-central/package.nix | 4 ++-- pkgs/by-name/ip/iplan/package.nix | 4 ++-- pkgs/by-name/jo/jogger/package.nix | 4 ++-- pkgs/by-name/ka/kana/package.nix | 4 ++-- pkgs/by-name/ke/key-rack/package.nix | 4 ++-- pkgs/by-name/ke/keypunch/package.nix | 4 ++-- pkgs/by-name/ki/kime/package.nix | 4 ++-- pkgs/by-name/ko/kooha/package.nix | 4 ++-- pkgs/by-name/li/libkrun/package.nix | 4 ++-- pkgs/by-name/lo/lorem/package.nix | 4 ++-- pkgs/by-name/me/metronome/package.nix | 4 ++-- pkgs/by-name/mo/mousai/package.nix | 4 ++-- pkgs/by-name/mo/mozillavpn/package.nix | 4 ++-- pkgs/by-name/no/notify-client/package.nix | 4 ++-- pkgs/by-name/pa/paleta/package.nix | 4 ++-- pkgs/by-name/pa/papers/package.nix | 4 ++-- pkgs/by-name/pd/pdns-recursor/package.nix | 4 ++-- pkgs/by-name/pi/pika-backup/package.nix | 4 ++-- pkgs/by-name/re/read-it-later/package.nix | 4 ++-- pkgs/by-name/re/resonance/package.nix | 4 ++-- pkgs/by-name/re/resources/package.nix | 4 ++-- pkgs/by-name/ro/rofi-games/package.nix | 4 ++-- pkgs/by-name/ru/rustls-ffi/package.nix | 4 ++-- pkgs/by-name/ru/rutabaga_gfx/package.nix | 4 ++-- pkgs/by-name/sh/share-preview/package.nix | 4 ++-- pkgs/by-name/sh/shortwave/package.nix | 4 ++-- pkgs/by-name/sp/spot/package.nix | 4 ++-- pkgs/by-name/sq/squeekboard/package.nix | 4 ++-- pkgs/by-name/st/stratisd/package.nix | 4 ++-- pkgs/by-name/su/surrealist/package.nix | 4 ++-- pkgs/by-name/sw/swayosd/package.nix | 4 ++-- pkgs/by-name/sw/switcheroo/package.nix | 4 ++-- pkgs/by-name/ta/tailor-gui/package.nix | 4 ++-- pkgs/by-name/ta/taskwarrior3/package.nix | 4 ++-- pkgs/by-name/ta/taterclient-ddnet/package.nix | 4 ++-- pkgs/by-name/te/televido/package.nix | 4 ++-- pkgs/by-name/uu/uutils-coreutils/package.nix | 4 ++-- pkgs/by-name/va/vaults/package.nix | 4 ++-- pkgs/by-name/vi/video-trimmer/package.nix | 4 ++-- pkgs/by-name/vp/vpv/package.nix | 4 ++-- pkgs/by-name/wa/waypipe/package.nix | 4 ++-- pkgs/by-name/we/wealthfolio/package.nix | 4 ++-- pkgs/by-name/wi/wildcard/package.nix | 4 ++-- 81 files changed, 162 insertions(+), 162 deletions(-) diff --git a/pkgs/by-name/_3/_389-ds-base/package.nix b/pkgs/by-name/_3/_389-ds-base/package.nix index a847b0eefb97..6eb041873cd8 100644 --- a/pkgs/by-name/_3/_389-ds-base/package.nix +++ b/pkgs/by-name/_3/_389-ds-base/package.nix @@ -49,11 +49,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-OPtyeF1D46X6DslP3NewbjVgqPXngWUz943UsTqgWRo="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/src"; name = "389-ds-base-${finalAttrs.version}"; - hash = "sha256-xI0T+Riw+6gjBGVYg5SI3GWH7MyAzt5At54fI7PH010="; + hash = "sha256-8A2xnJI22mjupX5FVsvRa5RfWyOE+VLH2aJwBHjDOME="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/am/amberol/package.nix b/pkgs/by-name/am/amberol/package.nix index f19812224e0f..1bb0406a50b2 100644 --- a/pkgs/by-name/am/amberol/package.nix +++ b/pkgs/by-name/am/amberol/package.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { hash = "sha256-FK0TJFjknEFraY8T+PQ/ABiid36kEYIEhekgyx0y3aI="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "amberol-${version}"; - hash = "sha256-9YRd1iOh+l+Jy8eSwJP6pxonEofBkMpFqb+JAAFDbCA="; + hash = "sha256-OsQMiye/sUsnmfx2V49ZUMGS/HQH9m9i5/qvho0jTD8="; }; postPatch = '' diff --git a/pkgs/by-name/as/ashpd-demo/package.nix b/pkgs/by-name/as/ashpd-demo/package.nix index d06352c70581..bcfca11eaa5e 100644 --- a/pkgs/by-name/as/ashpd-demo/package.nix +++ b/pkgs/by-name/as/ashpd-demo/package.nix @@ -30,9 +30,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-fIyJEUcyTcjTbBycjuJb99wALQelMT7Zq6PHKcL2F80="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = "${finalAttrs.src}/ashpd-demo"; - hash = "sha256-ldflCBErM9w3eO2DwWfYTrdO7lowZtqfj7Fft6Crl1w="; + hash = "sha256-iluV24uSEHDcYi6pO2HNrKs4ShwFvZ/ryv8ioopaNMI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/au/audio-sharing/package.nix b/pkgs/by-name/au/audio-sharing/package.nix index 269058a150b2..955d8ad736e3 100644 --- a/pkgs/by-name/au/audio-sharing/package.nix +++ b/pkgs/by-name/au/audio-sharing/package.nix @@ -32,10 +32,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-yUMiy5DaCPfCmBIGCXpqtvSSmQl5wo6vsLdW7Tt/Wfo="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-FfjSttXf6WF2w59CP6L/+BIuuXp2yKPTku7FMvdIHg0="; + hash = "sha256-ePgEAVYXLOHWQXG92Grb9nmenyGj0JkgVy1UDsQF0xw="; }; nativeBuildInputs = diff --git a/pkgs/by-name/au/authenticator/package.nix b/pkgs/by-name/au/authenticator/package.nix index 472c604d0ec3..7065de716fa1 100644 --- a/pkgs/by-name/au/authenticator/package.nix +++ b/pkgs/by-name/au/authenticator/package.nix @@ -36,10 +36,10 @@ stdenv.mkDerivation rec { hash = "sha256-g4+ntBuAEH9sj61CiS5t95nMfCgaWJTgiwRXtwrUTs0="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-XNAC1eA+11gAvMRu95huRM+YHdsrg5Sqpzb6F3Rgu5U="; + hash = "sha256-fG0xABK/qzoACFEYhMeDF6Qbucx0FCPpuTuInDFHnu8="; }; preFixup = '' diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index fb5d64a39825..aaefee067a7f 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -70,9 +70,9 @@ stdenv.mkDerivation (finalAttrs: { udev ] ++ lib.optional fuseSupport fuse3; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; - hash = "sha256-rO4AjCnxmHQPk0hxgXK4yxUK5eag/+Q+fRG/BsRi0i0="; + hash = "sha256-xP3V3Cqb+F33I1fVhp7ru/qBl22ww4oZDUCb1OHBiag="; }; makeFlags = [ diff --git a/pkgs/by-name/bu/bustle/package.nix b/pkgs/by-name/bu/bustle/package.nix index 3d783eeb97b8..95fc7553949b 100644 --- a/pkgs/by-name/bu/bustle/package.nix +++ b/pkgs/by-name/bu/bustle/package.nix @@ -31,9 +31,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-5ZZiRD64OOMtTNxI0uvilGM22rsJv7vU3yPDY8ROrxU="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-tUSGldWeCLEHi35bDLMnfjnfofF2Qse5uBu2mDGJrsE="; + hash = "sha256-XCKKzgSqTGF9WoaYnNtXB7e8BvtElmAfKH6s/7h8cGs="; }; env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { diff --git a/pkgs/by-name/ca/cargo-tauri_1/package.nix b/pkgs/by-name/ca/cargo-tauri_1/package.nix index 3ec0a69ddcbd..c8f7ee7ba7b7 100644 --- a/pkgs/by-name/ca/cargo-tauri_1/package.nix +++ b/pkgs/by-name/ca/cargo-tauri_1/package.nix @@ -26,14 +26,14 @@ cargo-tauri.overrideAttrs ( # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 sourceRoot = "${newAttrs.src.name}/tooling/cli"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (newAttrs) pname version src sourceRoot ; - hash = "sha256-OIXC4kwGIemIL8KaqK5SUDZZrOX3PX0w3h9bNiM/pCw="; + hash = "sha256-t5sR02qC06H7A2vukwyZYKA2XMVUzJrgIOYuNSf42mE="; }; buildInputs = diff --git a/pkgs/by-name/ca/cartero/package.nix b/pkgs/by-name/ca/cartero/package.nix index e73bf605cb88..6b09665e97a8 100644 --- a/pkgs/by-name/ca/cartero/package.nix +++ b/pkgs/by-name/ca/cartero/package.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-fXFrxaqHgf7XWX1guySsaP6PxmAPwVxoPaEOTpz4OqY="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-hbByC2r48+Zm/On99m9VWj4TJi6aeM/km2vcfvMMz38="; + hash = "sha256-+HygFNqW2CDksFTX9qdac6615zxCav0/sNLbICwTaKw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cc/ccextractor/package.nix b/pkgs/by-name/cc/ccextractor/package.nix index 293784acd422..b9998dd6e369 100644 --- a/pkgs/by-name/cc/ccextractor/package.nix +++ b/pkgs/by-name/cc/ccextractor/package.nix @@ -48,12 +48,12 @@ stdenv.mkDerivation (finalAttrs: { cargoRoot = "src/rust"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; patches = [ ./use-rsmpeg-0.15.patch ]; patchFlags = [ "-p3" ]; - hash = "sha256-jh8hHKAad+tCJGwuGdoJp/TMm/IsMrZmz8aag9lj0BA="; + hash = "sha256-7v3gQghByUDWZLJRRGa/7X2ivUumirq6BbexNQcCXCk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ch/chance/package.nix b/pkgs/by-name/ch/chance/package.nix index 872670789be2..748bce5deb08 100644 --- a/pkgs/by-name/ch/chance/package.nix +++ b/pkgs/by-name/ch/chance/package.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-25+/TvTba/QF7+QE8+O7u4yc9BNi0pcZeNj11dGkEfg="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-Jy/Tc5Rmqh6NIcLzGSIxQg1dLiAkw+xbrdo6qfqrRSg="; + hash = "sha256-ObT3l/Exk6UzUGmzCed7mJ7hVzg8CsQIT3fe1RIUfIM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ch/chromatic/package.nix b/pkgs/by-name/ch/chromatic/package.nix index 32a518b36ce9..d5f3c194133c 100644 --- a/pkgs/by-name/ch/chromatic/package.nix +++ b/pkgs/by-name/ch/chromatic/package.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { ./rustc_serialize_update.patch ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; patches = [ ./rustc_serialize_update.patch ]; - hash = "sha256-1Zb0J2tO/gIifDymmoXxZf6RNV8foE9QiQqZcrHrWzE="; + hash = "sha256-9fdOOkxs4L0sYZIRT9wbgp169mQc2IyFRZlAcOHcOcg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ci/citations/package.nix b/pkgs/by-name/ci/citations/package.nix index b030947b0238..e18b80bf04aa 100644 --- a/pkgs/by-name/ci/citations/package.nix +++ b/pkgs/by-name/ci/citations/package.nix @@ -34,9 +34,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-WYy6cyPmyWL/11yHf+dRbcZGBfvVfELeTwKvpJMu5ns="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; - hash = "sha256-SmKt3oPzeJRAFjgZvJubNCTsjhqCrGZfE1LfDQ8AxZA="; + hash = "sha256-bqZZIA7sE0viAhI5GUFIVCXTkK+U9aWPvCPCug5SR94="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/contrast/package.nix b/pkgs/by-name/co/contrast/package.nix index adb038462893..bc9839926ac8 100644 --- a/pkgs/by-name/co/contrast/package.nix +++ b/pkgs/by-name/co/contrast/package.nix @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { hash = "sha256-8A1qX1H0cET5AUvMoHC1/VyIQiaTysEY5RJRrVYvGng="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-Z5Gn1J/ziDlSowUk3HYLdx1PDg0WlQJQDjto2xYYK44="; + hash = "sha256-Nj5MkYDeYUzgqegCbPt/XofSCw8ULFXAD7XHNecPznc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/delfin/package.nix b/pkgs/by-name/de/delfin/package.nix index 05ab8c25203d..3f9353585d2a 100644 --- a/pkgs/by-name/de/delfin/package.nix +++ b/pkgs/by-name/de/delfin/package.nix @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { hash = "sha256-2ussvPXMX4wGE9N+Zh8KYIjbbqEKkPaNymN1Oqj8w8U="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-JEHiLdEU9QkCxWPoTFVn2c6UDqnRbTG1WPetdsW/N8g="; + hash = "sha256-zZc2+0oskptpWZE4fyVcR4QHxqzpj71GXMXNXMK4an0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/di/diebahn/package.nix b/pkgs/by-name/di/diebahn/package.nix index b658d952e376..317500b7fb0e 100644 --- a/pkgs/by-name/di/diebahn/package.nix +++ b/pkgs/by-name/di/diebahn/package.nix @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { hash = "sha256-jk2Pn/kqjMx5reMkIL8nLMWMZylwdoVq4FmnzaohnjU="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-UE+N6cvcWVJTxE8m4hHmBLyd5RBecDQy1kR4zDzPyf0="; + hash = "sha256-WiFW+xz5kxFKe9y8vHaFD9xW7f9iHc9hyCBWW4uMquU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/do/done/package.nix b/pkgs/by-name/do/done/package.nix index 7c44157b21d8..7b4398e1e2bb 100644 --- a/pkgs/by-name/do/done/package.nix +++ b/pkgs/by-name/do/done/package.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { hash = "sha256-SbeP7PnJd7jjdXa9uDIAlMAJLOrYHqNP5p9gQclb6RU="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-YJJGQR1tkK5z7vQQgkd8xPSqYhtiZIN+s9Xnwjn0z5A="; + hash = "sha256-yEpaQa9hKOq0k9MurihbFM4tDB//TPCJdOgKA9tyqVc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/em/emblem/package.nix b/pkgs/by-name/em/emblem/package.nix index 439d8368a3c3..d5687cfd4469 100644 --- a/pkgs/by-name/em/emblem/package.nix +++ b/pkgs/by-name/em/emblem/package.nix @@ -30,10 +30,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-pW+2kQANZ9M1f0jMoBqCxMjLCu0xAnuEE2EdzDq4ZCE="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-2mxDXDGQA2YB+gnGwy6VSZP/RRBKg0RiR1GlXIkio9E="; + hash = "sha256-j9PrnXt0GyyfCKmcq1zYmDNlrvogtK5n316MIC+z+w0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/en/envision-unwrapped/package.nix b/pkgs/by-name/en/envision-unwrapped/package.nix index de64e6eb852e..2eec7d035295 100644 --- a/pkgs/by-name/en/envision-unwrapped/package.nix +++ b/pkgs/by-name/en/envision-unwrapped/package.nix @@ -48,13 +48,13 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version; # TODO: Use srcOnly instead src = applyPatches { inherit (finalAttrs) src patches; }; - hash = "sha256-zWaw6K2H67PEmFISDNce5jDUXKV39qu35SO+Ai0DP90="; + hash = "sha256-O3+urY2FlnHfxoJLn4iehnVWf1Y0uATEteyQVnZLxTQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ey/eyedropper/package.nix b/pkgs/by-name/ey/eyedropper/package.nix index 5c30bd814332..a5631ff046ef 100644 --- a/pkgs/by-name/ey/eyedropper/package.nix +++ b/pkgs/by-name/ey/eyedropper/package.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation rec { hash = "sha256-FyGj0180Wn8iIDTdDqnNEvFYegwdWCsCq+hmyTTUIo4="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-jXo7Aq+pXWySe6MyH9GCTQVNwbboER7RwJe6Asqbxxc="; + hash = "sha256-nYmH7Nu43TDJKvwfSaBKSihD0acLPmIUQpQM6kV4CAk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fo/fontfinder/package.nix b/pkgs/by-name/fo/fontfinder/package.nix index b421bf00876d..bde673c84a56 100644 --- a/pkgs/by-name/fo/fontfinder/package.nix +++ b/pkgs/by-name/fo/fontfinder/package.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { hash = "sha256-C4KqEdqToVnPXFPWvNkl/md9L2W4NxRd5jvZ4E7CtfA="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-PXO8E41KHPNOR527gs2vM3J9JMG0PWi8Eg/13UCkr3U="; + hash = "sha256-g6PRGHrkHA0JTekKaQs+8mtyOCj99m0zPbgP8AnP7GU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fo/footage/package.nix b/pkgs/by-name/fo/footage/package.nix index 595603530e86..bf636a7e2978 100644 --- a/pkgs/by-name/fo/footage/package.nix +++ b/pkgs/by-name/fo/footage/package.nix @@ -38,10 +38,10 @@ stdenv.mkDerivation rec { hash = "sha256-VEL96JrJ5eJEoX2miiB4dqGUXizNlYWCUZkkYkh09B8="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-RWMNeMrctIlcA4MiRx9t7OfzKeHtw3phrYsYFZH7z4c="; + hash = "sha256-H8sv7faI/qbmcP7ir++/vIpN+cvRQ254rXmAvGyjdsY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fr/fragments/package.nix b/pkgs/by-name/fr/fragments/package.nix index 2107dd0c6631..19bb0a8c9dda 100644 --- a/pkgs/by-name/fr/fragments/package.nix +++ b/pkgs/by-name/fr/fragments/package.nix @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { hash = "sha256-lTOO6ZQWImaFqYZ3qerYYHWj/eOLYU/2k2Wh/ju9Njw="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-7TIjd1ewazJGY8uG6f1B97ol+7+uLjnZVGC2/2DlUdQ="; + hash = "sha256-i77LHbaAURxWrEpuR40jRkUGPk8wZR+q3DB+rzH3sEc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fr/fretboard/package.nix b/pkgs/by-name/fr/fretboard/package.nix index d9debb71f9f6..ba4ed09bac00 100644 --- a/pkgs/by-name/fr/fretboard/package.nix +++ b/pkgs/by-name/fr/fretboard/package.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-8xINlVhWgg73DrRi8S5rhNc1sbG4DbWOsiEBjU8NSXo="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-LSL7VvRgA8MaFXn/vi5Zf1sY4cqv0a9PNnZ3JlDNIaE="; + hash = "sha256-wYDlJ5n878Apv+ywnHnDy1Rgn+WJtcuePsGYEWSNvs4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fu/furtherance/package.nix b/pkgs/by-name/fu/furtherance/package.nix index a983b914cae6..a9445a231233 100644 --- a/pkgs/by-name/fu/furtherance/package.nix +++ b/pkgs/by-name/fu/furtherance/package.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-TxYARpCqqjjwinoRU2Wjihp+FYIvcI0YCGlOuumX6To="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-VGBxBHs/kqW0mvOiz0UQRg0duDmW8ee9cSh6EOT9aaY="; + hash = "sha256-SFp9YCmneOll2pItWmg2b2jrpRqPnvV9vwz4mjjvwM4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ga/gale/package.nix b/pkgs/by-name/ga/gale/package.nix index e0b98cfb0c8a..af74f730976a 100644 --- a/pkgs/by-name/ga/gale/package.nix +++ b/pkgs/by-name/ga/gale/package.nix @@ -39,14 +39,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-xKg/ABUdtylFpT3EisXVvyv38++KjucrZ+s3/fFjzmM="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src cargoRoot ; - hash = "sha256-xaqNps2AimGWKSwtnfkP3RkLgTNlkaAUtOgDWpB2yEg="; + hash = "sha256-OocLkYAdmnAwvojzywNlg6BirkItoopX36aDYfqeeTA="; }; cargoRoot = "src-tauri"; diff --git a/pkgs/by-name/ge/geopard/package.nix b/pkgs/by-name/ge/geopard/package.nix index a844858f5078..edd037894a11 100644 --- a/pkgs/by-name/ge/geopard/package.nix +++ b/pkgs/by-name/ge/geopard/package.nix @@ -26,9 +26,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-etx8YPEFGSNyiSLpTNIXTZZiLSgAntQsM93On7dPGI0="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-YVbaXGGwQaqjUkA47ryW1VgJpZTx5ApRGdCcB5aA71M="; + hash = "sha256-FHYWpMmJvcHuAHr9fFKl1qIhJb32NJEA/0j3R6/mVgQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gg/gg-jj/package.nix b/pkgs/by-name/gg/gg-jj/package.nix index 7372c8236c3b..2ac88766f92a 100644 --- a/pkgs/by-name/gg/gg-jj/package.nix +++ b/pkgs/by-name/gg/gg-jj/package.nix @@ -36,10 +36,10 @@ stdenv.mkDerivation (finalAttrs: { buildAndTestSubdir = "src-tauri"; # FIXME: Switch back to cargoHash when https://github.com/NixOS/nixpkgs/issues/356811 is fixed - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; - hash = "sha256-Lr/0GkWHvfDy/leRLxisuTzGPZYFo2beHq9UCl6XlDo="; + hash = "sha256-IyU8dqtQbKcoymTOP01givB1968MUNas2znqsdbcqdw="; nativeBuildInputs = [ yq ]; diff --git a/pkgs/by-name/gl/glide-media-player/package.nix b/pkgs/by-name/gl/glide-media-player/package.nix index 41125d042729..3df8b59ba5a4 100644 --- a/pkgs/by-name/gl/glide-media-player/package.nix +++ b/pkgs/by-name/gl/glide-media-player/package.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { hash = "sha256-gmBXUj6LxC7VDH/ni8neYivysagqcbI/UCUq9Ly3D24="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-u41H746/nPX2PmpyweUp4Y9k+XIruazgMdU6B4ig708="; + hash = "sha256-5cohhm8/QP+vYzVf8iz3hLtu0ej7lQiHpDAC9I52+ME="; }; postPatch = '' diff --git a/pkgs/by-name/gn/gnome-commander/package.nix b/pkgs/by-name/gn/gnome-commander/package.nix index 4de7e5f1e051..4504abf84c3b 100644 --- a/pkgs/by-name/gn/gnome-commander/package.nix +++ b/pkgs/by-name/gn/gnome-commander/package.nix @@ -40,9 +40,9 @@ stdenv.mkDerivation (finalAttrs: { '/share/gsettings-schemas/${finalAttrs.finalPackage.name}/glib-2.0/schemas' ''; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-Nx/e2H9NxCTj62xVDlKTpPdjlxAx2YAcQJh1kHByrd4="; + hash = "sha256-dOd/4n8G/zEsF0ClqhI2QBLosEz3uyzC9q5sHDVWAx4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-podcasts/package.nix b/pkgs/by-name/gn/gnome-podcasts/package.nix index 94504c6e2324..bc69273c4869 100644 --- a/pkgs/by-name/gn/gnome-podcasts/package.nix +++ b/pkgs/by-name/gn/gnome-podcasts/package.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { hash = "sha256-KCjHT/4AeJ+RXCtawkhs6f4D8NCJotYIPk3tGr5YG9M="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-XTfKqKs7874ak7Lzscxw8E2qcnJOWMZaaol8TpIB6Vw="; + hash = "sha256-L9/PCYanv8AgxD/fkEsNXQA1Zyz2+ia88lVahg9IOdA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-robots/package.nix b/pkgs/by-name/gn/gnome-robots/package.nix index 72b8725d3da6..b34f8a5c8c0b 100644 --- a/pkgs/by-name/gn/gnome-robots/package.nix +++ b/pkgs/by-name/gn/gnome-robots/package.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-K4BQcFrIPpOL56iREyYB62XHk/IJzX6RDGzWQphzBHg="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "gnome-robots-${finalAttrs.version}"; - hash = "sha256-rn/rs0D2qKDYf8oxpegQalPQIVuT8rSrHTzeZqWGn44="; + hash = "sha256-7kwjpZJqAqqKlt6mOFyjaaxZ1Tr2WuhE72jwjCZpX9E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-solanum/package.nix b/pkgs/by-name/gn/gnome-solanum/package.nix index 2b22d1bf2d43..b23b4c3dda2d 100644 --- a/pkgs/by-name/gn/gnome-solanum/package.nix +++ b/pkgs/by-name/gn/gnome-solanum/package.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { hash = "sha256-Xf/b/9o6zHF1hjHSyAXb90ySoBj+DMMe31e6RfF8C4Y="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-POvKpwzi+bkEkfSDhi/vjs/ey+A2vNN5ta4Q7Ma/RBQ="; + hash = "sha256-jtMTW9tIf0UGbE9bJU31maub+o0agf0pDRO4s9QReyc="; }; postPatch = '' diff --git a/pkgs/by-name/gr/granian/package.nix b/pkgs/by-name/gr/granian/package.nix index c5884fdce8b0..4ed069e3a31c 100644 --- a/pkgs/by-name/gr/granian/package.nix +++ b/pkgs/by-name/gr/granian/package.nix @@ -18,10 +18,10 @@ python3Packages.buildPythonApplication rec { hash = "sha256-OjyDwfp0d779oFQ7wUdR1eRPP35kcJa3wIdcYGrGGME="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-NiDGVQGKo+aku1is8OpRavuSalxLc5XfLai0XdtxUMA="; + hash = "sha256-jAjHvVyFhGGE/OwfusUE/GdrNrEgvh48lmC5tla4lhI="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/by-name/he/health/package.nix b/pkgs/by-name/he/health/package.nix index e87cda81e63f..6c9c1810f468 100644 --- a/pkgs/by-name/he/health/package.nix +++ b/pkgs/by-name/he/health/package.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation rec { hash = "sha256-PrNPprSS98yN8b8yw2G6hzTSaoE65VbsM3q7FVB4mds="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-8fa3fa+sFi5H+49B5sr2vYPkp9C9s6CcE0zv4xB8gww="; + hash = "sha256-eR1ZGtTZQNhofFUEjI7IX16sMKPJmAl7aIFfPJukecg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/he/helvum/package.nix b/pkgs/by-name/he/helvum/package.nix index 9ba438c3df1f..5ebf326c7b09 100644 --- a/pkgs/by-name/he/helvum/package.nix +++ b/pkgs/by-name/he/helvum/package.nix @@ -28,10 +28,10 @@ stdenv.mkDerivation rec { hash = "sha256-9vlzLPpyZ9qtCEbCDvYhWDcV+8T63ukdos1l2U6fD+E="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-Xebm3XlsO6kBoMnxJsOk/3SO7avVoaGqi2CVWBRzr88="; + hash = "sha256-rwhhbEaUg7IiszmJUFh4vQV7cYyyh3tqr1z4QgmwIDY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/id/identity/package.nix b/pkgs/by-name/id/identity/package.nix index 0965765ec6b7..89eb8fc44aa3 100644 --- a/pkgs/by-name/id/identity/package.nix +++ b/pkgs/by-name/id/identity/package.nix @@ -36,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-h8/mWGuosBiQRpoW8rINJht/7UBVEnUnTKY5HBCAyw4="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-oO7l4zVKR93fFLqkY67DfzrAA9kUN06ov9ogwDuaVlE="; + hash = "sha256-YkbhZQUpe8ffBpHcYl7wjFgs3krAXlvHgcBdP/6uvek="; }; strictDeps = true; diff --git a/pkgs/by-name/im/impression/package.nix b/pkgs/by-name/im/impression/package.nix index 22b359200ff3..edc1963095d5 100644 --- a/pkgs/by-name/im/impression/package.nix +++ b/pkgs/by-name/im/impression/package.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-F2ZyATDKnUgEOAI++54fR6coJOr9rtyGm5TzsKzkDmg="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-H4x7D25UzDdAEad7QEsZZGLXhfiUupm3mTrNho+ShFo="; + hash = "sha256-mQyGQXEFmMkTvkZcniws/11u1RqnsxgNi9dvYn1Mx0o="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/in/intiface-central/package.nix b/pkgs/by-name/in/intiface-central/package.nix index 26da97f6c643..f79235ba55f0 100644 --- a/pkgs/by-name/in/intiface-central/package.nix +++ b/pkgs/by-name/in/intiface-central/package.nix @@ -25,11 +25,11 @@ flutterPackages.stable.buildFlutterApplication rec { pubspecLock = lib.importJSON ./pubspec.lock.json; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { name = "${pname}-${version}-cargo-deps"; inherit src; sourceRoot = "${src.name}/intiface-engine-flutter-bridge"; - hash = "sha256-S3Yy0IIMiRUUpFNlLvS1PGwpvxePMB1sO5M6mpm1OgY="; + hash = "sha256-1j1maTrR7V/Tlu7uimTJuoEtxhn5Hn0VmR0GnJuKIoo="; }; cargoRoot = "intiface-engine-flutter-bridge"; diff --git a/pkgs/by-name/ip/iplan/package.nix b/pkgs/by-name/ip/iplan/package.nix index 018ba38d80ee..9bce3b9683bc 100644 --- a/pkgs/by-name/ip/iplan/package.nix +++ b/pkgs/by-name/ip/iplan/package.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { hash = "sha256-BIoxaE8c3HmvPjgj4wcZK9YFTZ0wr9338AIdYEoAiqs="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-p8ETWWvjtP9f/lc347ORPqTai5p/TWQCCMRe+c0FyFk="; + hash = "sha256-ATEm7RYfW9nYtTDAx580tvokVUIS7BL9mA65aEeJJvk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/jo/jogger/package.nix b/pkgs/by-name/jo/jogger/package.nix index d4d4dbf67317..68032948b103 100644 --- a/pkgs/by-name/jo/jogger/package.nix +++ b/pkgs/by-name/jo/jogger/package.nix @@ -31,9 +31,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-bju9XXMT6HRHG9QViO+FQCYQ+llrC+GP/AlIha0mxkM="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-YCLIxKl4QCmqHx/WXwxpqOqIMx1Ab16QyAi+j542eoY="; + hash = "sha256-k4nUtFdwCWa8flSkOEQe7UqorpYPCGrcXHTvVOqoAQI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ka/kana/package.nix b/pkgs/by-name/ka/kana/package.nix index 78902b4c2fca..ba8cf79ef86a 100644 --- a/pkgs/by-name/ka/kana/package.nix +++ b/pkgs/by-name/ka/kana/package.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { hash = "sha256-/Ri723ub8LMlhbPObC83bay63JuWIQpgxAT5UUYuwZI="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "kana-${version}"; - hash = "sha256-Z7DpPe8/Tt8AcLjCwKbwzQTsLe6YvWBCG7DlDkkklew="; + hash = "sha256-3ODkAstBZQE3eqGmRUdm3xyCoBXV41hK4ndxeDK8+Yc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ke/key-rack/package.nix b/pkgs/by-name/ke/key-rack/package.nix index dcb5ac1c82ff..2f5b9bc356c6 100644 --- a/pkgs/by-name/ke/key-rack/package.nix +++ b/pkgs/by-name/ke/key-rack/package.nix @@ -31,9 +31,9 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs --build build-aux/{checks.sh,read-manifest.py} ''; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-wCJTm0W+g3+O1t1fR4maqJoxpPM0NeJG7d54MMAH33c="; + hash = "sha256-iV9ILi3/Uqi8lDHh1Uf2caz6Kc129CDThnqTN9VfUHc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ke/keypunch/package.nix b/pkgs/by-name/ke/keypunch/package.nix index ed8f60a0b84f..f87e343aa4e4 100644 --- a/pkgs/by-name/ke/keypunch/package.nix +++ b/pkgs/by-name/ke/keypunch/package.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-C0WD8vBPlKvCJHVJHSfEbMIxNARoRrCn7PNebJ0rkoI="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-RufJy5mHuirAO056p5/w63jw5h00E41t+H4VQP3kPks="; + hash = "sha256-SQ1BI9BuUfUvafsBnC1P5YQ8qVAaer6ywuRQkfS/V1w="; }; strictDeps = true; diff --git a/pkgs/by-name/ki/kime/package.nix b/pkgs/by-name/ki/kime/package.nix index 2b8e2951571b..b0debbb29f02 100644 --- a/pkgs/by-name/ki/kime/package.nix +++ b/pkgs/by-name/ki/kime/package.nix @@ -45,9 +45,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-apQkxAUve7+2h9XACZZgroqBK1sCUYMNfsX/4nEnCPA="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-2MG6xigiKdvQX8PR457d6AXswTRPRJBPERvZqemjv24="; + hash = "sha256-U3SOHZvgyPwv98wY41dnwSCUg+DTkb/LY6woffrAli8="; }; # Replace autostart path diff --git a/pkgs/by-name/ko/kooha/package.nix b/pkgs/by-name/ko/kooha/package.nix index 83ac277aabd4..c466270cac12 100644 --- a/pkgs/by-name/ko/kooha/package.nix +++ b/pkgs/by-name/ko/kooha/package.nix @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { hash = "sha256-Z+PMSV6fipfHBrqGS24SOgGJS173Vct12sVzCGZL0IA="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-m5y/VfjTJgK+/ZjsMo/9zPVxcV3kuwXb+HNdXR6hkV4="; + hash = "sha256-3LYoNQquYbyiEd9ZXRr4UPIcl3gultsBYWCWaCYshwQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libkrun/package.nix b/pkgs/by-name/li/libkrun/package.nix index 692b989f11c9..71ff653b002e 100644 --- a/pkgs/by-name/li/libkrun/package.nix +++ b/pkgs/by-name/li/libkrun/package.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-oa3M/HL0hWoXlqY0Wxy9jf6hIvMqevtpuYiTCrS1Q74="; + hash = "sha256-X1NPZQaXFBw9IKD2DbBCPug0WDjv8XnpefbA2RNJgFU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/lo/lorem/package.nix b/pkgs/by-name/lo/lorem/package.nix index 0ac17840129b..f8e1da98c726 100644 --- a/pkgs/by-name/lo/lorem/package.nix +++ b/pkgs/by-name/lo/lorem/package.nix @@ -28,10 +28,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-6+kDKKK1bkIOZlqzKWpzpjAS5o7bkbVFITMZVmJijuU="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-nzP2Jp9l1QgL7Wk9SWlsSVNaeVe3t48MmeX7Xuz+PKM="; + hash = "sha256-l6vd521DmV019Yu5O1Kf5RKan2ROCBHlPiEDhf34Grc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/metronome/package.nix b/pkgs/by-name/me/metronome/package.nix index 9c78def44931..c2010ce3a10b 100644 --- a/pkgs/by-name/me/metronome/package.nix +++ b/pkgs/by-name/me/metronome/package.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { hash = "sha256-Sn2Ua/XxPnJjcQvWeOPkphl+BE7/BdOrUIpf+tLt20U="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "metronome-${version}"; - hash = "sha256-HYO/IY5yGW8JLBxD/SZz16GFnwvv77kFl/x+QXhV+V0="; + hash = "sha256-T/x5LpODpKWGA40W1je6jw1DS9attVUK4ZjAnRAyf6k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/mousai/package.nix b/pkgs/by-name/mo/mousai/package.nix index 5bbee8e4ac02..3a45a524d8e9 100644 --- a/pkgs/by-name/mo/mousai/package.nix +++ b/pkgs/by-name/mo/mousai/package.nix @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { hash = "sha256-lib2rPUTKudzbZQIGZxxxzvWNlbLkLdWtb9h7+C05QE="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-KrOvPeT8zhxSTNDRJPrAbUnSgnIQegRmNe5TEgGE8+s="; + hash = "sha256-59mxTtXQaGiHHbS4vOtwm5py/1BWwaSf+CBdKEtUpno="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix index 8a5f309fb7fb..faa881f229a5 100644 --- a/pkgs/by-name/mo/mozillavpn/package.nix +++ b/pkgs/by-name/mo/mozillavpn/package.nix @@ -56,9 +56,9 @@ stdenv.mkDerivation (finalAttrs: { vendorHash = "sha256-Cmo0wnl0z5r1paaEf1MhCPbInWeoMhGjnxCxGh0cyO8="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src patches; - hash = "sha256-ryJFvnJIiDKf2EqlzHj79hSPYrD+3UtZ5lT/QeFv6V0="; + hash = "sha256-EUD6eAhe5Qjom60EZ9LTRmBsfDyIJV1Kx7PBU4ikR0w="; }; buildInputs = [ diff --git a/pkgs/by-name/no/notify-client/package.nix b/pkgs/by-name/no/notify-client/package.nix index 2b034f8f13c9..8e0a22416530 100644 --- a/pkgs/by-name/no/notify-client/package.nix +++ b/pkgs/by-name/no/notify-client/package.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation rec { hash = "sha256-0p/XIGaawreGHbMRoHNmUEIxgwEgigtrubeJpndHsug="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-uZRAGnydPGwyzAyHIyY+UlT42m+GyEasM0cSa8Bp9Hs="; + hash = "sha256-hnv4XXsx/kmhH4YUTdTvvxxjbguHBx3TnUKacGwnCTw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pa/paleta/package.nix b/pkgs/by-name/pa/paleta/package.nix index e9a26b9274e5..072acba9cb02 100644 --- a/pkgs/by-name/pa/paleta/package.nix +++ b/pkgs/by-name/pa/paleta/package.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { hash = "sha256-c+X49bMywstRg7cSAbbpG/vd8OUB7RhdQVRumTIBDDk="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-2/ZfKvlvAY4pfUU3F9pEw+OR5oRSsSAAi3/W5x4zVs0="; + hash = "sha256-RuzqU06iyK+IN7aO+Lq/IaRLh2oFpWM1rz69Koiicgg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix index aab00d5121ec..aa877d8d8d5e 100644 --- a/pkgs/by-name/pa/papers/package.nix +++ b/pkgs/by-name/pa/papers/package.nix @@ -64,14 +64,14 @@ stdenv.mkDerivation (finalAttrs: { cargoRoot = "shell-rs"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src pname version cargoRoot ; - hash = "sha256-/5IySNEUkwiQezLx4n4jlPJdqJhlcgt5bXIelUFftZI="; + hash = "sha256-66pOdZxgzbvXkvF07rNvWtcF/dJ2+RuS24IeI/VWykE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pd/pdns-recursor/package.nix b/pkgs/by-name/pd/pdns-recursor/package.nix index fc4ed4524681..bba6c4f4d185 100644 --- a/pkgs/by-name/pd/pdns-recursor/package.nix +++ b/pkgs/by-name/pd/pdns-recursor/package.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-s6N+uyAoWrmsu7DhNw5iO7OY7TCH8OZ48j/6OwBjmD0="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; sourceRoot = "pdns-recursor-${finalAttrs.version}/settings/rust"; - hash = "sha256-1CHhnW8s4AA06HAgW+A/mx1jGTynj4CvIc/I7n0h+VY"; + hash = "sha256-/fxFqs5lDzOhatc6KBc7Zwsq3A7N5AOanGOebttr1l8="; }; cargoRoot = "settings/rust"; diff --git a/pkgs/by-name/pi/pika-backup/package.nix b/pkgs/by-name/pi/pika-backup/package.nix index 760fdc069c24..efe3b973bd06 100644 --- a/pkgs/by-name/pi/pika-backup/package.nix +++ b/pkgs/by-name/pi/pika-backup/package.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { hash = "sha256-DtLGD7+Ydj2fvEHU+bDQDMC/E/9VgrlVNMCG6OlPmfg="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-8nFkc77FiLxMA1hMm8k5VB84l+pQeL0JSzYDytXrNUE="; + hash = "sha256-1JFXSVs9HPPzh+IjH4RGugrZEifPVcQho9B3hLSTL6s="; }; patches = [ diff --git a/pkgs/by-name/re/read-it-later/package.nix b/pkgs/by-name/re/read-it-later/package.nix index 5c8e417841b1..2f0d2a3b3ba6 100644 --- a/pkgs/by-name/re/read-it-later/package.nix +++ b/pkgs/by-name/re/read-it-later/package.nix @@ -30,10 +30,10 @@ stdenv.mkDerivation rec { hash = "sha256-A8u1fecJAsVlordgZmUJt/KZWxx6EWMhfdayKWHTTFY="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-wK7cegcjiu8i1Grey6ELoqAn2BrvElDXlCwafTLuFv0="; + hash = "sha256-DgqFdihMVKWMdbGEmyGH9yXkC9Ywmh7FcmFtLBCJeDc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/resonance/package.nix b/pkgs/by-name/re/resonance/package.nix index 4e642c2d736c..e2b89e9027e3 100644 --- a/pkgs/by-name/re/resonance/package.nix +++ b/pkgs/by-name/re/resonance/package.nix @@ -33,9 +33,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-DgNUjb8+2WTw91OGgFf97YL6lnODtkftYAP/c05RUPI="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; - hash = "sha256-/v3OokClOk95GOzidBHRkUG7kjHQm35yPeC1n3PzcyM="; + hash = "sha256-g0gNgTw9zpC9sWAKy/jFNGVtPH/6a84v6r6pRuS0NpU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/resources/package.nix b/pkgs/by-name/re/resources/package.nix index 602e9d081157..791e11b8dfd8 100644 --- a/pkgs/by-name/re/resources/package.nix +++ b/pkgs/by-name/re/resources/package.nix @@ -30,10 +30,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-SHawaH09+mDovFiznZ+ZkUgUbv5tQGcXBgUGrdetOcA="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "resources-${finalAttrs.version}"; - hash = "sha256-tUD+gx9nQiGWKKRPcR7OHbPvU2j1dQjYck7FF9vYqSQ="; + hash = "sha256-zqCqbQAUAIhjntX4gcV1aoJwjozZFlF7Sr49w7uIgaI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ro/rofi-games/package.nix b/pkgs/by-name/ro/rofi-games/package.nix index d5e7291376a9..31c802344912 100644 --- a/pkgs/by-name/ro/rofi-games/package.nix +++ b/pkgs/by-name/ro/rofi-games/package.nix @@ -23,9 +23,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-4L3gk/RG9g5QnUW1AJkZIl0VkBiO/L0HUBC3pibN/qo="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-cU7gp/c1yx3ZLaZuGs1bvOV4AKgLusraILVJ2EhH1iA="; + hash = "sha256-jTc4dAp7OogjYZWqtxVcjJc2sPozRLM5WcgMe7QS09s="; }; patches = [ diff --git a/pkgs/by-name/ru/rustls-ffi/package.nix b/pkgs/by-name/ru/rustls-ffi/package.nix index 8b83c212e4f1..61bbb514cc75 100644 --- a/pkgs/by-name/ru/rustls-ffi/package.nix +++ b/pkgs/by-name/ru/rustls-ffi/package.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ZKAyKcKwhnPE6PrfBFjLJKkTlGbdLcmW1EP/xSv2cpM="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-IaOhQfDEgLhGmes0xzhLVym29aP691TY0EXdOIgXEMA="; + hash = "sha256-cZ92wSKoygt9x6O/ginOEiCiarlR5qGVFOHrIFdWOWE="; }; propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/ru/rutabaga_gfx/package.nix b/pkgs/by-name/ru/rutabaga_gfx/package.nix index 36592007c942..a0656b9fcc54 100644 --- a/pkgs/by-name/ru/rutabaga_gfx/package.nix +++ b/pkgs/by-name/ru/rutabaga_gfx/package.nix @@ -59,9 +59,9 @@ stdenv.mkDerivation (finalAttrs: { ] ); - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-wuF3Isrp+u5J8jPQoPsIOWYGNKLSNa2pLfvladAWkLs="; + hash = "sha256-53xCzKuXtnnbS0TWdQrh4Rwy+V+D9soK41ycYd656Uc="; }; CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; diff --git a/pkgs/by-name/sh/share-preview/package.nix b/pkgs/by-name/sh/share-preview/package.nix index 2945bd6582fe..961c6ca606bc 100644 --- a/pkgs/by-name/sh/share-preview/package.nix +++ b/pkgs/by-name/sh/share-preview/package.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-FqualaTkirB+gBcgkThQpSBHhM4iaXkiGujwBUnUX0E="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "share-preview-${finalAttrs.version}"; - hash = "sha256-Gh6bQZD1mlkj3XeGp+fF/NShC4PZCZSEqymrsSdX4Ec="; + hash = "sha256-XY48fQ5HLvZ1nxLk6rbuxSBAHAPUcnwu/5AwgTWhfbg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sh/shortwave/package.nix b/pkgs/by-name/sh/shortwave/package.nix index e4344f093437..fbab3ca14b4b 100644 --- a/pkgs/by-name/sh/shortwave/package.nix +++ b/pkgs/by-name/sh/shortwave/package.nix @@ -38,10 +38,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-W1eOMyiooDesI13lOze/JcxzhSSxYOW6FOY85NkVyps="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-O5K5aNcWwUYkaJbGzTzS3FdNbEsQsdliyi0YShw+6PU="; + hash = "sha256-vtQRt8/eWwMA1+tKULpStLR7E1+R7LkNutS2Joz7zeI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sp/spot/package.nix b/pkgs/by-name/sp/spot/package.nix index 8e40e70a51ad..630682bce77c 100644 --- a/pkgs/by-name/sp/spot/package.nix +++ b/pkgs/by-name/sp/spot/package.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { hash = "sha256-7zWK0wkh53ojnoznv4T/X//JeyKJVKOrfYF0IkvciIY="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-AaRmTOgFmBi0s1zdIVHc6bLjrUopy9YuB3GJOCnbjU4="; + hash = "sha256-731aD+yJkyrNMmYtgKYzXIAyLegDBzTT2XqZs5usXiI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sq/squeekboard/package.nix b/pkgs/by-name/sq/squeekboard/package.nix index 811a1eb65f23..7ce2811362de 100644 --- a/pkgs/by-name/sq/squeekboard/package.nix +++ b/pkgs/by-name/sq/squeekboard/package.nix @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { hash = "sha256-UsUr4UnYNo2ybEdNyOD/IiafEZ1YJFwRQ3CVy76X2H0="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-1yBGn8cZxwpEOeF2BcUIIcI4Uxn80vRau/MvlufX9GU="; + hash = "sha256-3K1heokPYxYbiAGha9TrrjQXguzGv/djIB4eWa8dVjg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/st/stratisd/package.nix b/pkgs/by-name/st/stratisd/package.nix index 018eb7feaf69..1b8259928646 100644 --- a/pkgs/by-name/st/stratisd/package.nix +++ b/pkgs/by-name/st/stratisd/package.nix @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { hash = "sha256-W8ssLTFU36t6iLrt9S9V8qcN7EP4IsL7VbhNPLpftio="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-Qv2qknWNx2OQeucUFwL1veu3MSF+fd19jFfHCCVGprM="; + hash = "sha256-blhB+UfvG22Xe2O0csZ00/jgnVcLTUIkDJG5P22mffQ="; }; postPatch = '' diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix index 371dcab6dbe5..99bf40004f78 100644 --- a/pkgs/by-name/su/surrealist/package.nix +++ b/pkgs/by-name/su/surrealist/package.nix @@ -69,10 +69,10 @@ stdenv.mkDerivation (finalAttrs: { ./0001-Cargo.patch ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) patches src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; - hash = "sha256-8rw3x17f5pLLyvxozFPWq9pJNHy4wXwV9CcaUGAbdd0="; + hash = "sha256-qrPIcWpdrvTmaFcfKAfz+n8a6lp6IcIMq9ZCHaa7AHQ="; patchFlags = [ "-p2" ]; }; diff --git a/pkgs/by-name/sw/swayosd/package.nix b/pkgs/by-name/sw/swayosd/package.nix index 1b4d736f56ca..d4ed483bc8ed 100644 --- a/pkgs/by-name/sw/swayosd/package.nix +++ b/pkgs/by-name/sw/swayosd/package.nix @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { hash = "sha256-GyvRWEzTxQxTAk+xCLFsHdd1SttBliOgJ6eZqAxQMME="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-EUxJ+aGtYAO0kNggNXIZqj2DmPzc4serj0/V+fvH7ds="; + hash = "sha256-oeLhJwlOITp8YHJdZQY7oo8Z31WUT4Y70dHd3tDDsk8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sw/switcheroo/package.nix b/pkgs/by-name/sw/switcheroo/package.nix index 796a84638ad5..601e2c322bde 100644 --- a/pkgs/by-name/sw/switcheroo/package.nix +++ b/pkgs/by-name/sw/switcheroo/package.nix @@ -30,10 +30,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-AwecOA8HWGimhQyCEG3Z3hhwa9RVWssykUXsdvqqs9U="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; name = "switcheroo-${finalAttrs.version}"; - hash = "sha256-fpI4ue30DhkeWAolyeots+LkaRyaIPhYmIqRmx08i2s="; + hash = "sha256-Ose1gx6vwKZCdtMDkyM9Y+f6wt7VDKTI3Wc7kep1428="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/tailor-gui/package.nix b/pkgs/by-name/ta/tailor-gui/package.nix index ab26609fb7dd..5341a7b999af 100644 --- a/pkgs/by-name/ta/tailor-gui/package.nix +++ b/pkgs/by-name/ta/tailor-gui/package.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation { version ; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src sourceRoot; name = "${pname}-${version}"; - hash = "sha256-jcjq0uls28V8Ka2CMM8oOQmZZRUr9eEQeVtW56AmU28="; + hash = "sha256-9jMy23VD+C87hg/TMXGbzAoqx76dhVOkWcQNudSwsYA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/taskwarrior3/package.nix b/pkgs/by-name/ta/taskwarrior3/package.nix index 277c54025681..7567d205173a 100644 --- a/pkgs/by-name/ta/taskwarrior3/package.nix +++ b/pkgs/by-name/ta/taskwarrior3/package.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-aKDwRCJ1yopRdsPxnHhgOpSho1i8/dcAurI+XhpSbn4="; fetchSubmodules = true; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { name = "${finalAttrs.pname}-${finalAttrs.version}-cargo-deps"; inherit (finalAttrs) src; - hash = "sha256-mzmrbsUuIjUVuNEa33EgtOTl9r+0xYj2WkKqFjxX1oU="; + hash = "sha256-UbJodQBCrmXbw5+ahusBnEcoCYGFHRA6bg5hf9/prmA="; }; postPatch = '' diff --git a/pkgs/by-name/ta/taterclient-ddnet/package.nix b/pkgs/by-name/ta/taterclient-ddnet/package.nix index 55ad58d4abaf..beecfa75f8c5 100644 --- a/pkgs/by-name/ta/taterclient-ddnet/package.nix +++ b/pkgs/by-name/ta/taterclient-ddnet/package.nix @@ -43,9 +43,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-RhOZuPsjyXq5UcM+5dawDi1BfjMMQ3K9O3PHkCg5sDI="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname src version; - hash = "sha256-NDeHpf1iYApP/Y/DE7FGBu67ld6A0+8227oTVlOMe1M="; + hash = "sha256-VKGc4LQjt2FHbELLBKtV8rKpxjGBrzlA3m9BSdZ/6Z0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/te/televido/package.nix b/pkgs/by-name/te/televido/package.nix index bf82f2a107c9..014f23f73af9 100644 --- a/pkgs/by-name/te/televido/package.nix +++ b/pkgs/by-name/te/televido/package.nix @@ -26,10 +26,10 @@ stdenv.mkDerivation rec { hash = "sha256-pMrMXRnfvpDLFkL2IqYJKRao/OF78mXUCBqBgT97+hc="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-wavxkhDS0hspGMw5ZKTxjZ07TiZ67OkbMhicB8h5y64="; + hash = "sha256-o857QBRfANkk6e/zIwc0JLpsiP2+wCb5U7Umlx4xMdI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/uu/uutils-coreutils/package.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix index 2499fcbb07ba..7c58c01e568d 100644 --- a/pkgs/by-name/uu/uutils-coreutils/package.nix +++ b/pkgs/by-name/uu/uutils-coreutils/package.nix @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { hash = "sha256-B6lz75uxROo7npiZNCdTt0NCxVvsaIgtWnuGOKevDQQ="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "uutils-coreutils-${version}"; - hash = "sha256-BSRYL9qsa+FUjfXTP/vx7VZwOyjhBM7DREvI6/X2tCA="; + hash = "sha256-Z5A1Tyf7SbvIBVGG3YPxh4q/SLU+yNlVv2jBRNumNwM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/va/vaults/package.nix b/pkgs/by-name/va/vaults/package.nix index 8e854c0d485a..84e57cada7f4 100644 --- a/pkgs/by-name/va/vaults/package.nix +++ b/pkgs/by-name/va/vaults/package.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { hash = "sha256-USVP/7TNdpUNx1kDsCReGYIP8gHUeij2dqy8TR4R+CE="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-h25YRqQ4Z+Af+zHITnmnwpg09V7sik88YRGbG8BZUjg="; + hash = "sha256-93X2BCn6Ih2DqYJNvYvUCYrC1E6wpCT5X8Hyux/8mno="; }; postPatch = '' diff --git a/pkgs/by-name/vi/video-trimmer/package.nix b/pkgs/by-name/vi/video-trimmer/package.nix index 766d59a4f72c..6e7b14b75474 100644 --- a/pkgs/by-name/vi/video-trimmer/package.nix +++ b/pkgs/by-name/vi/video-trimmer/package.nix @@ -30,9 +30,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-4B3NNGww+UjI/VbsKL62vWlKye7NYXYPzlJ4TfywJDw="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-vtV5TrF81TK4PUwzOF/CuDsKH1vTLO+4PFufyIOp2zk="; + hash = "sha256-H7KB4O3Wyp2YdMLFwvQuYLhk7Ei7SecnMN9wg60FIm8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vp/vpv/package.nix b/pkgs/by-name/vp/vpv/package.nix index 89631f60af51..d54ae34dd0a3 100644 --- a/pkgs/by-name/vp/vpv/package.nix +++ b/pkgs/by-name/vp/vpv/package.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation (finalAttrs: { }; cargoRoot = "src/fuzzy-finder"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; sourceRoot = "${finalAttrs.src.name}/src/fuzzy-finder"; - hash = "sha256-CDKlmwA2Wj78xPaSiYPmIJ7xmiE5Co+oGGejZU3v1zI="; + hash = "sha256-5QjKvndExImVn+w6OZNSD5n7K3C+tmN2jJOcDCVEW8I="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wa/waypipe/package.nix b/pkgs/by-name/wa/waypipe/package.nix index 61eedc92e513..3d4e7e8593e5 100644 --- a/pkgs/by-name/wa/waypipe/package.nix +++ b/pkgs/by-name/wa/waypipe/package.nix @@ -31,9 +31,9 @@ llvmPackages.stdenv.mkDerivation rec { tag = "v${version}"; hash = "sha256-l9gZ7FtLxGKBRlMem3VGJGTvOkVAtLBa7eF9+gA5Vfo="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-DjqyKXbCQ6kzb1138wNWPnRXIgUaaE1nnCExLeLX6pw="; + hash = "sha256-CTLSMm8GN21L+5WtPBWSTTbeD3WoeScKV27TCu7tovI="; }; strictDeps = true; diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix index f2a5c3c0289a..43f8b347be35 100644 --- a/pkgs/by-name/we/wealthfolio/package.nix +++ b/pkgs/by-name/we/wealthfolio/package.nix @@ -35,10 +35,10 @@ stdenv.mkDerivation (finalAttrs: { cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; - hash = "sha256-Teno9y+busOGbreer2RzT+3sigRKvJbO1obfo0QpcPU="; + hash = "sha256-UyVIBctAbzslqID44+9zTXyx7wL4UosTQHqMdAX9mmE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wi/wildcard/package.nix b/pkgs/by-name/wi/wildcard/package.nix index ada2cffde23f..3f7591026262 100644 --- a/pkgs/by-name/wi/wildcard/package.nix +++ b/pkgs/by-name/wi/wildcard/package.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-8jNNCcZRoLyOHdaWmYTOGD7Nf7NkmJ1MIxBXLJGrm5Y="; + hash = "sha256-eUT3K7DJk0U4GZ/oqvMAGUjTctcDMaRdsjq1sD+fitg="; name = "wildcard-${finalAttrs.version}"; };