From 5b38d1d2a6196774b85053927382f66df1dca18f Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 30 May 2025 04:18:04 +0200 Subject: [PATCH] treewide: fetchCargoVendor: inherit pname+version --- pkgs/applications/graphics/gnome-decoder/default.nix | 3 +-- .../version-management/silver-platter/default.nix | 3 +-- pkgs/by-name/co/contrast/package.nix | 3 +-- pkgs/by-name/dd/ddnet/package.nix | 3 +-- pkgs/by-name/de/delfin/package.nix | 3 +-- pkgs/by-name/do/done/package.nix | 3 +-- pkgs/by-name/em/emblem/package.nix | 3 +-- pkgs/by-name/fo/fontfinder/package.nix | 3 +-- pkgs/by-name/fo/footage/package.nix | 3 +-- pkgs/by-name/fr/fragments/package.nix | 3 +-- pkgs/by-name/gl/glide-media-player/package.nix | 3 +-- pkgs/by-name/he/health/package.nix | 3 +-- pkgs/by-name/he/helvum/package.nix | 3 +-- pkgs/by-name/ip/iplan/package.nix | 3 +-- pkgs/by-name/ko/kooha/package.nix | 3 +-- pkgs/by-name/ma/matrix-hookshot/package.nix | 3 +-- pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix | 3 +-- pkgs/by-name/no/notify-client/package.nix | 3 +-- pkgs/by-name/pa/paleta/package.nix | 3 +-- pkgs/by-name/re/read-it-later/package.nix | 3 +-- pkgs/by-name/sh/shortwave/package.nix | 3 +-- pkgs/by-name/sq/squeekboard/package.nix | 3 +-- pkgs/by-name/ta/tailor-gui/package.nix | 8 ++++++-- pkgs/by-name/te/televido/package.nix | 3 +-- pkgs/by-name/va/vaults/package.nix | 3 +-- pkgs/by-name/wa/waytrogen/package.nix | 3 +-- pkgs/development/python-modules/aardwolf/default.nix | 3 +-- pkgs/development/python-modules/adblock/default.nix | 3 +-- .../development/python-modules/ahocorasick-rs/default.nix | 3 +-- pkgs/development/python-modules/bcrypt/default.nix | 3 +-- pkgs/development/python-modules/chromadb/default.nix | 3 +-- pkgs/development/python-modules/clarabel/default.nix | 3 +-- pkgs/development/python-modules/css-inline/default.nix | 3 +-- pkgs/development/python-modules/etebase/default.nix | 3 +-- pkgs/development/python-modules/evtx/default.nix | 3 +-- pkgs/development/python-modules/fastcrc/default.nix | 3 +-- pkgs/development/python-modules/gb-io/default.nix | 8 ++++++-- pkgs/development/python-modules/gilknocker/default.nix | 4 +--- pkgs/development/python-modules/glean-sdk/default.nix | 3 +-- pkgs/development/python-modules/hf-transfer/default.nix | 3 +-- pkgs/development/python-modules/jh2/default.nix | 3 +-- .../python-modules/johnnycanencrypt/default.nix | 3 +-- pkgs/development/python-modules/jsonschema-rs/default.nix | 3 +-- pkgs/development/python-modules/kurbopy/default.nix | 3 +-- pkgs/development/python-modules/lzallright/default.nix | 3 +-- pkgs/development/python-modules/minify-html/default.nix | 3 +-- pkgs/development/python-modules/nh3/default.nix | 3 +-- pkgs/development/python-modules/nutils-poly/default.nix | 3 +-- pkgs/development/python-modules/nutpie/default.nix | 3 +-- pkgs/development/python-modules/pcodec/default.nix | 3 +-- pkgs/development/python-modules/primp/default.nix | 3 +-- .../python-modules/py-sr25519-bindings/default.nix | 3 +-- pkgs/development/python-modules/pycddl/default.nix | 3 +-- pkgs/development/python-modules/pyperscan/default.nix | 3 +-- pkgs/development/python-modules/pysequoia/default.nix | 3 +-- pkgs/development/python-modules/python-bidi/default.nix | 3 +-- pkgs/development/python-modules/regress/default.nix | 3 +-- pkgs/development/python-modules/rtoml/default.nix | 3 +-- .../development/python-modules/skytemple-rust/default.nix | 3 +-- pkgs/development/python-modules/sourmash/default.nix | 3 +-- .../python-modules/spacy-alignments/default.nix | 3 +-- pkgs/development/python-modules/tiktoken/default.nix | 8 ++++++-- .../python-modules/tree-sitter-make/default.nix | 3 +-- pkgs/development/python-modules/typst/default.nix | 3 +-- pkgs/development/python-modules/wasmer/default.nix | 3 +-- pkgs/development/python-modules/y-py/default.nix | 3 +-- pkgs/development/python-modules/zxcvbn-rs-py/default.nix | 3 +-- pkgs/kde/gear/akonadi-search/default.nix | 3 +-- pkgs/kde/gear/angelfish/default.nix | 3 +-- pkgs/kde/gear/kdepim-addons/default.nix | 3 +-- 70 files changed, 85 insertions(+), 141 deletions(-) diff --git a/pkgs/applications/graphics/gnome-decoder/default.nix b/pkgs/applications/graphics/gnome-decoder/default.nix index 253c9f54b64b..39e309b70e5f 100644 --- a/pkgs/applications/graphics/gnome-decoder/default.nix +++ b/pkgs/applications/graphics/gnome-decoder/default.nix @@ -40,8 +40,7 @@ clangStdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-USfC7HSL1TtjP1SmBRTKkPyKE4DkSn6xeH4mzfIBQWg="; }; diff --git a/pkgs/applications/version-management/silver-platter/default.nix b/pkgs/applications/version-management/silver-platter/default.nix index 8c585b7e6f8e..21592a1f174b 100644 --- a/pkgs/applications/version-management/silver-platter/default.nix +++ b/pkgs/applications/version-management/silver-platter/default.nix @@ -31,8 +31,7 @@ buildPythonApplication rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-hZQfzaLvHSN/hGR5vn+/2TRH6GwDTTp+UcnePXY7JlM="; }; diff --git a/pkgs/by-name/co/contrast/package.nix b/pkgs/by-name/co/contrast/package.nix index bc9839926ac8..d5d86fe645c4 100644 --- a/pkgs/by-name/co/contrast/package.nix +++ b/pkgs/by-name/co/contrast/package.nix @@ -33,8 +33,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-Nj5MkYDeYUzgqegCbPt/XofSCw8ULFXAD7XHNecPznc="; }; diff --git a/pkgs/by-name/dd/ddnet/package.nix b/pkgs/by-name/dd/ddnet/package.nix index 8f49b6b9e41c..772f83d13f09 100644 --- a/pkgs/by-name/dd/ddnet/package.nix +++ b/pkgs/by-name/dd/ddnet/package.nix @@ -42,8 +42,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - name = "${pname}-${version}"; - inherit src; + inherit pname version src; hash = "sha256-VKGc4LQjt2FHbELLBKtV8rKpxjGBrzlA3m9BSdZ/6Z0="; }; diff --git a/pkgs/by-name/de/delfin/package.nix b/pkgs/by-name/de/delfin/package.nix index 3f9353585d2a..3abd16a55833 100644 --- a/pkgs/by-name/de/delfin/package.nix +++ b/pkgs/by-name/de/delfin/package.nix @@ -33,8 +33,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-zZc2+0oskptpWZE4fyVcR4QHxqzpj71GXMXNXMK4an0="; }; diff --git a/pkgs/by-name/do/done/package.nix b/pkgs/by-name/do/done/package.nix index e7c1e70b8d6e..cd8b4fa4c9ac 100644 --- a/pkgs/by-name/do/done/package.nix +++ b/pkgs/by-name/do/done/package.nix @@ -31,8 +31,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-yEpaQa9hKOq0k9MurihbFM4tDB//TPCJdOgKA9tyqVc="; }; diff --git a/pkgs/by-name/em/emblem/package.nix b/pkgs/by-name/em/emblem/package.nix index 7032068f91e6..386180572979 100644 --- a/pkgs/by-name/em/emblem/package.nix +++ b/pkgs/by-name/em/emblem/package.nix @@ -30,8 +30,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-CsISaVlRGtVVEna1jyGZo/IdWcJdwHJv6LXcXYha2UE="; }; diff --git a/pkgs/by-name/fo/fontfinder/package.nix b/pkgs/by-name/fo/fontfinder/package.nix index bde673c84a56..a95d333f9029 100644 --- a/pkgs/by-name/fo/fontfinder/package.nix +++ b/pkgs/by-name/fo/fontfinder/package.nix @@ -25,8 +25,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-g6PRGHrkHA0JTekKaQs+8mtyOCj99m0zPbgP8AnP7GU="; }; diff --git a/pkgs/by-name/fo/footage/package.nix b/pkgs/by-name/fo/footage/package.nix index bf636a7e2978..c0b1fab98b1a 100644 --- a/pkgs/by-name/fo/footage/package.nix +++ b/pkgs/by-name/fo/footage/package.nix @@ -39,8 +39,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-H8sv7faI/qbmcP7ir++/vIpN+cvRQ254rXmAvGyjdsY="; }; diff --git a/pkgs/by-name/fr/fragments/package.nix b/pkgs/by-name/fr/fragments/package.nix index 9781462adb76..793b92a7ece8 100644 --- a/pkgs/by-name/fr/fragments/package.nix +++ b/pkgs/by-name/fr/fragments/package.nix @@ -35,8 +35,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-i77LHbaAURxWrEpuR40jRkUGPk8wZR+q3DB+rzH3sEc="; }; diff --git a/pkgs/by-name/gl/glide-media-player/package.nix b/pkgs/by-name/gl/glide-media-player/package.nix index 3df8b59ba5a4..6049b993a788 100644 --- a/pkgs/by-name/gl/glide-media-player/package.nix +++ b/pkgs/by-name/gl/glide-media-player/package.nix @@ -28,8 +28,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-5cohhm8/QP+vYzVf8iz3hLtu0ej7lQiHpDAC9I52+ME="; }; diff --git a/pkgs/by-name/he/health/package.nix b/pkgs/by-name/he/health/package.nix index d059ed8fd02f..8781062dd6b9 100644 --- a/pkgs/by-name/he/health/package.nix +++ b/pkgs/by-name/he/health/package.nix @@ -29,8 +29,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-eR1ZGtTZQNhofFUEjI7IX16sMKPJmAl7aIFfPJukecg="; }; diff --git a/pkgs/by-name/he/helvum/package.nix b/pkgs/by-name/he/helvum/package.nix index a8edc07d1150..39717339ce4b 100644 --- a/pkgs/by-name/he/helvum/package.nix +++ b/pkgs/by-name/he/helvum/package.nix @@ -29,8 +29,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-rwhhbEaUg7IiszmJUFh4vQV7cYyyh3tqr1z4QgmwIDY="; }; diff --git a/pkgs/by-name/ip/iplan/package.nix b/pkgs/by-name/ip/iplan/package.nix index 9bce3b9683bc..5bf74bbe83f1 100644 --- a/pkgs/by-name/ip/iplan/package.nix +++ b/pkgs/by-name/ip/iplan/package.nix @@ -25,8 +25,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-ATEm7RYfW9nYtTDAx580tvokVUIS7BL9mA65aEeJJvk="; }; diff --git a/pkgs/by-name/ko/kooha/package.nix b/pkgs/by-name/ko/kooha/package.nix index c466270cac12..344831c69279 100644 --- a/pkgs/by-name/ko/kooha/package.nix +++ b/pkgs/by-name/ko/kooha/package.nix @@ -33,8 +33,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-3LYoNQquYbyiEd9ZXRr4UPIcl3gultsBYWCWaCYshwQ="; }; diff --git a/pkgs/by-name/ma/matrix-hookshot/package.nix b/pkgs/by-name/ma/matrix-hookshot/package.nix index ccb7b7fa6117..fbeacff97178 100644 --- a/pkgs/by-name/ma/matrix-hookshot/package.nix +++ b/pkgs/by-name/ma/matrix-hookshot/package.nix @@ -38,8 +38,7 @@ mkYarnPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = data.cargoHash; }; diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix index b39467d5750e..e61711ebe1f0 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix @@ -28,8 +28,7 @@ python3.pkgs.buildPythonApplication rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-Gq3QvQSRfxRovzuvdboLCheNuMW58GFO9x2N2os+p38="; }; diff --git a/pkgs/by-name/no/notify-client/package.nix b/pkgs/by-name/no/notify-client/package.nix index 8e0a22416530..714f422d97cd 100644 --- a/pkgs/by-name/no/notify-client/package.nix +++ b/pkgs/by-name/no/notify-client/package.nix @@ -30,8 +30,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-hnv4XXsx/kmhH4YUTdTvvxxjbguHBx3TnUKacGwnCTw="; }; diff --git a/pkgs/by-name/pa/paleta/package.nix b/pkgs/by-name/pa/paleta/package.nix index 6517e38ad6ab..44ff17cf0ea7 100644 --- a/pkgs/by-name/pa/paleta/package.nix +++ b/pkgs/by-name/pa/paleta/package.nix @@ -28,8 +28,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-RuzqU06iyK+IN7aO+Lq/IaRLh2oFpWM1rz69Koiicgg="; }; diff --git a/pkgs/by-name/re/read-it-later/package.nix b/pkgs/by-name/re/read-it-later/package.nix index 3a446859b7eb..ae4a0a77b032 100644 --- a/pkgs/by-name/re/read-it-later/package.nix +++ b/pkgs/by-name/re/read-it-later/package.nix @@ -31,8 +31,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-mn3Jl5XEHYbCCFjLd8TBqtZKEdevH95IWKdgHwAtXk0="; }; diff --git a/pkgs/by-name/sh/shortwave/package.nix b/pkgs/by-name/sh/shortwave/package.nix index fcefe9289ce9..6801c70c182f 100644 --- a/pkgs/by-name/sh/shortwave/package.nix +++ b/pkgs/by-name/sh/shortwave/package.nix @@ -39,8 +39,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-DBWg9Xss1ChbPyI3MiN7eTXhSUG37ZaYS/HFxou9d/w="; }; diff --git a/pkgs/by-name/sq/squeekboard/package.nix b/pkgs/by-name/sq/squeekboard/package.nix index 189403cb4238..8f02879d91a5 100644 --- a/pkgs/by-name/sq/squeekboard/package.nix +++ b/pkgs/by-name/sq/squeekboard/package.nix @@ -36,8 +36,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "squeekboard-${version}"; + inherit pname version src; hash = "sha256-3K1heokPYxYbiAGha9TrrjQXguzGv/djIB4eWa8dVjg="; }; diff --git a/pkgs/by-name/ta/tailor-gui/package.nix b/pkgs/by-name/ta/tailor-gui/package.nix index 5341a7b999af..32efee34d46e 100644 --- a/pkgs/by-name/ta/tailor-gui/package.nix +++ b/pkgs/by-name/ta/tailor-gui/package.nix @@ -30,8 +30,12 @@ stdenv.mkDerivation { ; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src sourceRoot; - name = "${pname}-${version}"; + inherit + pname + version + src + sourceRoot + ; hash = "sha256-9jMy23VD+C87hg/TMXGbzAoqx76dhVOkWcQNudSwsYA="; }; diff --git a/pkgs/by-name/te/televido/package.nix b/pkgs/by-name/te/televido/package.nix index fa02c90a65f3..5dc8490d45d9 100644 --- a/pkgs/by-name/te/televido/package.nix +++ b/pkgs/by-name/te/televido/package.nix @@ -29,8 +29,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-D9gchFS5zrD1cttq/gveT7wY2Y/5hfiUrwBa7qHD9cs="; }; diff --git a/pkgs/by-name/va/vaults/package.nix b/pkgs/by-name/va/vaults/package.nix index 24e52a8e7bf6..ea854d043f7f 100644 --- a/pkgs/by-name/va/vaults/package.nix +++ b/pkgs/by-name/va/vaults/package.nix @@ -32,8 +32,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-j0A6HlApV0l7LuB7ISHp+k/bSH5Icdv+aNQ9juCCO9I="; }; diff --git a/pkgs/by-name/wa/waytrogen/package.nix b/pkgs/by-name/wa/waytrogen/package.nix index 95b9ca9752e5..da891eca8508 100644 --- a/pkgs/by-name/wa/waytrogen/package.nix +++ b/pkgs/by-name/wa/waytrogen/package.nix @@ -29,8 +29,7 @@ stdenv.mkDerivation rec { useFetchCargoVendor = true; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-S+JW6OvmB9vj9cR9/qnw5EIECjpD8JPhxfgwDEEtlC0="; }; diff --git a/pkgs/development/python-modules/aardwolf/default.nix b/pkgs/development/python-modules/aardwolf/default.nix index 100cced60f23..1b6ec2c19ec0 100644 --- a/pkgs/development/python-modules/aardwolf/default.nix +++ b/pkgs/development/python-modules/aardwolf/default.nix @@ -37,9 +37,8 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; + inherit pname version src; sourceRoot = "${src.name}/aardwolf/utils/rlers"; - name = "${pname}-${version}"; hash = "sha256-doBraJQtekrO/ZZV9KFz7BdIgBVVWtQztUS2Gz8dDdA="; }; diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix index 66e6f1377943..f98f0cf100e2 100644 --- a/pkgs/development/python-modules/adblock/default.nix +++ b/pkgs/development/python-modules/adblock/default.nix @@ -44,8 +44,7 @@ buildPythonPackage rec { ''; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-fetJX6HQxRZ/Az7rJeU9S+s8ttgNPnJEvTLfzGt4xjk="; }; diff --git a/pkgs/development/python-modules/ahocorasick-rs/default.nix b/pkgs/development/python-modules/ahocorasick-rs/default.nix index 48922c37127f..239ea2f453b9 100644 --- a/pkgs/development/python-modules/ahocorasick-rs/default.nix +++ b/pkgs/development/python-modules/ahocorasick-rs/default.nix @@ -24,8 +24,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-uB3r6+Ewpi4dVke/TsCZltfc+ZABYLOLKuNxw+Jfu/M="; }; diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index 2c46f8599ff6..9c83ab0c5b1b 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -33,9 +33,8 @@ buildPythonPackage rec { cargoRoot = "src/_bcrypt"; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; + inherit pname version src; sourceRoot = "${pname}-${version}/${cargoRoot}"; - name = "${pname}-${version}"; hash = "sha256-HgHvfMBspPsSYhllnKBg5XZB6zxFIqJj+4//xKG8HwA="; }; diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index 9e298088ab37..e2f9faf49b38 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -64,8 +64,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-ZtCTg8qNCiqlH7RsZxaWUNAoazdgmXP2GtpjDpRdvbk="; }; diff --git a/pkgs/development/python-modules/clarabel/default.nix b/pkgs/development/python-modules/clarabel/default.nix index e7b76593a7bb..b21bf0cdab14 100644 --- a/pkgs/development/python-modules/clarabel/default.nix +++ b/pkgs/development/python-modules/clarabel/default.nix @@ -21,8 +21,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-Ohbeavkayl6vMyYX9kVVLRddvVB9gWOxfzdWAOg+gac="; }; diff --git a/pkgs/development/python-modules/css-inline/default.nix b/pkgs/development/python-modules/css-inline/default.nix index dffc8a82ca19..d8ad071162c2 100644 --- a/pkgs/development/python-modules/css-inline/default.nix +++ b/pkgs/development/python-modules/css-inline/default.nix @@ -35,12 +35,11 @@ buildPythonPackage rec { # call `cargo build --release` in bindings/python and copy the # resulting lock file cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; + inherit pname version src; postPatch = '' cd bindings/python ln -s ${./Cargo.lock} Cargo.lock ''; - name = "${pname}-${version}"; hash = "sha256-4zi29ZdALummwcWxYqDDEPAjKptmLqyYUJzWMrEK4os="; }; diff --git a/pkgs/development/python-modules/etebase/default.nix b/pkgs/development/python-modules/etebase/default.nix index 119ab454014c..db9c900376e5 100644 --- a/pkgs/development/python-modules/etebase/default.nix +++ b/pkgs/development/python-modules/etebase/default.nix @@ -40,8 +40,7 @@ buildPythonPackage rec { ]; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-tFOZJFrNge3N+ux2Hp4Mlm9K/AXYxuuBzEQdQYGGDjg="; inherit patches; }; diff --git a/pkgs/development/python-modules/evtx/default.nix b/pkgs/development/python-modules/evtx/default.nix index e43a86f28702..b286bfd60ba4 100644 --- a/pkgs/development/python-modules/evtx/default.nix +++ b/pkgs/development/python-modules/evtx/default.nix @@ -24,8 +24,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-IqV4BsLE+5Dk3ey4M+h5wxR/SToZTLf8vU0BlWU5e8c="; }; diff --git a/pkgs/development/python-modules/fastcrc/default.nix b/pkgs/development/python-modules/fastcrc/default.nix index d1ae326e96ea..1a87ccbec7c9 100644 --- a/pkgs/development/python-modules/fastcrc/default.nix +++ b/pkgs/development/python-modules/fastcrc/default.nix @@ -31,8 +31,7 @@ buildPythonPackage { ]; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-9Vap8E71TkBIf4eIB2lapUqcMukdsHX4LR7U8AD77SU="; }; diff --git a/pkgs/development/python-modules/gb-io/default.nix b/pkgs/development/python-modules/gb-io/default.nix index 32890d833233..56a9a73bbb6a 100644 --- a/pkgs/development/python-modules/gb-io/default.nix +++ b/pkgs/development/python-modules/gb-io/default.nix @@ -21,8 +21,12 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src sourceRoot; - name = "${pname}-${version}"; + inherit + pname + version + src + sourceRoot + ; hash = "sha256-97aEuXdq9oEqYJs6sgQU5a0vAMJmWJzu2WGjOqzxZ4c="; }; diff --git a/pkgs/development/python-modules/gilknocker/default.nix b/pkgs/development/python-modules/gilknocker/default.nix index 4d8e826e16b9..e3a9438d8cab 100644 --- a/pkgs/development/python-modules/gilknocker/default.nix +++ b/pkgs/development/python-modules/gilknocker/default.nix @@ -28,9 +28,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-cUv0CT8d6Nxjzh/S/hY9jcpeFX/5KvBxSkqOkt4htyU="; }; diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix index 4816c176d852..b6fac6b3c0f9 100644 --- a/pkgs/development/python-modules/glean-sdk/default.nix +++ b/pkgs/development/python-modules/glean-sdk/default.nix @@ -24,8 +24,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-Ppc+6ex3yLC4xuhbZGZDKLqxDjSdGpgrLDpbbbqMgPY="; }; diff --git a/pkgs/development/python-modules/hf-transfer/default.nix b/pkgs/development/python-modules/hf-transfer/default.nix index 1683c9958e35..31bad5ac800d 100644 --- a/pkgs/development/python-modules/hf-transfer/default.nix +++ b/pkgs/development/python-modules/hf-transfer/default.nix @@ -28,8 +28,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-O4aKqVSShFpt8mdZkY3WV55j9CIczRSRkIMC7dJoGv0="; }; diff --git a/pkgs/development/python-modules/jh2/default.nix b/pkgs/development/python-modules/jh2/default.nix index c5023de79ef2..613fed741dd5 100644 --- a/pkgs/development/python-modules/jh2/default.nix +++ b/pkgs/development/python-modules/jh2/default.nix @@ -26,8 +26,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-CW95omstpWm76TTSKsb04iChU0EW1Vl+OA3QXxfZAX0="; }; diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix index 796d074481be..21f5b58143ea 100644 --- a/pkgs/development/python-modules/johnnycanencrypt/default.nix +++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -29,8 +29,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-V1z16GKaSQVjp+stWir7kAO2wsnOYPdhKi4KzIKmKx8="; }; diff --git a/pkgs/development/python-modules/jsonschema-rs/default.nix b/pkgs/development/python-modules/jsonschema-rs/default.nix index f3ab23537947..dbeae90c20ea 100644 --- a/pkgs/development/python-modules/jsonschema-rs/default.nix +++ b/pkgs/development/python-modules/jsonschema-rs/default.nix @@ -25,8 +25,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-LNT2wQnOaVMBrI+fW6wbIRaTYPvw3ESinI5KY8wjp1o="; }; diff --git a/pkgs/development/python-modules/kurbopy/default.nix b/pkgs/development/python-modules/kurbopy/default.nix index 31c1aa18edda..86774c95758e 100644 --- a/pkgs/development/python-modules/kurbopy/default.nix +++ b/pkgs/development/python-modules/kurbopy/default.nix @@ -24,8 +24,7 @@ buildPythonPackage rec { ]; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-51qJAcJvolYCW3XWeymc2xd2QHiKLd7MdRdDedEH8QY="; }; diff --git a/pkgs/development/python-modules/lzallright/default.nix b/pkgs/development/python-modules/lzallright/default.nix index fe9a2212b62e..b5f385810d6e 100644 --- a/pkgs/development/python-modules/lzallright/default.nix +++ b/pkgs/development/python-modules/lzallright/default.nix @@ -20,8 +20,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-2AR9slC/vWv5Ump1DLE2em8LLSTXHVkI/PBW5PxCXXg="; }; diff --git a/pkgs/development/python-modules/minify-html/default.nix b/pkgs/development/python-modules/minify-html/default.nix index d114134ae924..e5c1073ebc82 100644 --- a/pkgs/development/python-modules/minify-html/default.nix +++ b/pkgs/development/python-modules/minify-html/default.nix @@ -19,8 +19,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-NLPei6ajR55mLyFhsjzUpXB/TsqqeDvP8yKE74t0ufk="; }; diff --git a/pkgs/development/python-modules/nh3/default.nix b/pkgs/development/python-modules/nh3/default.nix index 3c774de642b7..2e5bd5687fe6 100644 --- a/pkgs/development/python-modules/nh3/default.nix +++ b/pkgs/development/python-modules/nh3/default.nix @@ -23,8 +23,7 @@ buildPythonPackage { disabled = pythonOlder "3.8"; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-1Ytca/GiHidR8JOcz+DydN6N/iguLchbP8Wnrd/0NTk="; }; diff --git a/pkgs/development/python-modules/nutils-poly/default.nix b/pkgs/development/python-modules/nutils-poly/default.nix index e59a281ee7a9..92eef0ad15a7 100644 --- a/pkgs/development/python-modules/nutils-poly/default.nix +++ b/pkgs/development/python-modules/nutils-poly/default.nix @@ -25,8 +25,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - name = "${pname}-${version}"; - inherit src; + inherit pname version src; hash = "sha256-3UBQJfMPVo37V7mJnN9loF1+vKh3JxFJWgynwsOnAg4="; }; diff --git a/pkgs/development/python-modules/nutpie/default.nix b/pkgs/development/python-modules/nutpie/default.nix index a5b42f2d775c..83a8a010d139 100644 --- a/pkgs/development/python-modules/nutpie/default.nix +++ b/pkgs/development/python-modules/nutpie/default.nix @@ -42,8 +42,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-ZUBrZqdesy0qKaxuD5gSlq7qOoXWn0aZNOidUb0grMM="; }; diff --git a/pkgs/development/python-modules/pcodec/default.nix b/pkgs/development/python-modules/pcodec/default.nix index 88f6c37cf308..7b4a9c5c11f8 100644 --- a/pkgs/development/python-modules/pcodec/default.nix +++ b/pkgs/development/python-modules/pcodec/default.nix @@ -21,8 +21,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-91p0eoVRzc9S8pHRhAlRey4k4jW9IMttiH+9Joh91IQ="; }; diff --git a/pkgs/development/python-modules/primp/default.nix b/pkgs/development/python-modules/primp/default.nix index 1bbedf13c469..4c3d72fbc39a 100644 --- a/pkgs/development/python-modules/primp/default.nix +++ b/pkgs/development/python-modules/primp/default.nix @@ -72,8 +72,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-iPf25DMGNHrWYByNTylB6bPpLfzs0ADwgkjfhVxiiXA="; }; diff --git a/pkgs/development/python-modules/py-sr25519-bindings/default.nix b/pkgs/development/python-modules/py-sr25519-bindings/default.nix index 43cd5ba26af6..d3e29379fe8b 100644 --- a/pkgs/development/python-modules/py-sr25519-bindings/default.nix +++ b/pkgs/development/python-modules/py-sr25519-bindings/default.nix @@ -22,8 +22,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-OSnPGRZwuAzcvu80GgTXdc740SfhDIsXrQZq9a/BCdE="; }; diff --git a/pkgs/development/python-modules/pycddl/default.nix b/pkgs/development/python-modules/pycddl/default.nix index 6f7407f0a8fb..0492a0e1d7f1 100644 --- a/pkgs/development/python-modules/pycddl/default.nix +++ b/pkgs/development/python-modules/pycddl/default.nix @@ -40,8 +40,7 @@ buildPythonPackage rec { ''; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-Qep5YD4LQ+r118L5H+hUqeS00SibyvsbtLWDrJJBNc0="; }; diff --git a/pkgs/development/python-modules/pyperscan/default.nix b/pkgs/development/python-modules/pyperscan/default.nix index 99511047b1a5..152911285702 100644 --- a/pkgs/development/python-modules/pyperscan/default.nix +++ b/pkgs/development/python-modules/pyperscan/default.nix @@ -22,8 +22,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-9kKHLYD0tXMGJFhsCBgO/NpWB4J5QZh0qKIuI3PFn2c="; }; diff --git a/pkgs/development/python-modules/pysequoia/default.nix b/pkgs/development/python-modules/pysequoia/default.nix index 1f3c231b564f..1075019cae39 100644 --- a/pkgs/development/python-modules/pysequoia/default.nix +++ b/pkgs/development/python-modules/pysequoia/default.nix @@ -17,8 +17,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-cq55j3wNcV8CRbnqZPV8zrRzvUud5RXJDX1oh7WZoiU="; }; diff --git a/pkgs/development/python-modules/python-bidi/default.nix b/pkgs/development/python-modules/python-bidi/default.nix index 9580b2c10d48..2c41582904e7 100644 --- a/pkgs/development/python-modules/python-bidi/default.nix +++ b/pkgs/development/python-modules/python-bidi/default.nix @@ -20,8 +20,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-Oqtva9cTHAcuOXr/uPbqZczDbPVr0zeIEr5p6PoJ610="; }; diff --git a/pkgs/development/python-modules/regress/default.nix b/pkgs/development/python-modules/regress/default.nix index 1bd88df72ee0..08cd3bb42713 100644 --- a/pkgs/development/python-modules/regress/default.nix +++ b/pkgs/development/python-modules/regress/default.nix @@ -26,8 +26,7 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-B652Bfanw51e+U6rHukWtfdr7bjoWDUx/nUczDwyzZk="; }; diff --git a/pkgs/development/python-modules/rtoml/default.nix b/pkgs/development/python-modules/rtoml/default.nix index 77c9848b873d..b0043a841bd5 100644 --- a/pkgs/development/python-modules/rtoml/default.nix +++ b/pkgs/development/python-modules/rtoml/default.nix @@ -25,8 +25,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-/elui0Rf3XwvD2jX+NGoJgf9S3XSp16qzdwkGZbKaZg="; }; diff --git a/pkgs/development/python-modules/skytemple-rust/default.nix b/pkgs/development/python-modules/skytemple-rust/default.nix index df0cb72737f9..ef45f7042396 100644 --- a/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/pkgs/development/python-modules/skytemple-rust/default.nix @@ -24,8 +24,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-9OgUuuMuo2l4YsZMhBZJBqKqbNwj1W4yidoogjcNgm8="; }; diff --git a/pkgs/development/python-modules/sourmash/default.nix b/pkgs/development/python-modules/sourmash/default.nix index be3d84103383..ef8d8b23171f 100644 --- a/pkgs/development/python-modules/sourmash/default.nix +++ b/pkgs/development/python-modules/sourmash/default.nix @@ -31,8 +31,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-DnJ0RFc03+rBg7yNdezgb/YuoQr3RKj+NeMyin/kSRk="; }; diff --git a/pkgs/development/python-modules/spacy-alignments/default.nix b/pkgs/development/python-modules/spacy-alignments/default.nix index 226853535576..2e7ec4f19371 100644 --- a/pkgs/development/python-modules/spacy-alignments/default.nix +++ b/pkgs/development/python-modules/spacy-alignments/default.nix @@ -24,8 +24,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-0U1ELUMh4YV6M+zrrZGuzvY8SdgyN66F7bJ6sMhOdXs="; }; diff --git a/pkgs/development/python-modules/tiktoken/default.nix b/pkgs/development/python-modules/tiktoken/default.nix index 2e919fc33e5a..2b94529a3fa0 100644 --- a/pkgs/development/python-modules/tiktoken/default.nix +++ b/pkgs/development/python-modules/tiktoken/default.nix @@ -42,8 +42,12 @@ buildPythonPackage { ]; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src postPatch; - name = "${pname}-${version}"; + inherit + pname + version + src + postPatch + ; hash = "sha256-MfTTRbSM+KgrYrWHYlJkGDc1qn3oulalDJM+huTaJ0g="; }; diff --git a/pkgs/development/python-modules/tree-sitter-make/default.nix b/pkgs/development/python-modules/tree-sitter-make/default.nix index 3a2abf3d04ee..a4afba24412b 100644 --- a/pkgs/development/python-modules/tree-sitter-make/default.nix +++ b/pkgs/development/python-modules/tree-sitter-make/default.nix @@ -21,8 +21,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-75jtur5rmG4zpNXSE3OpPVR+/lf4SICsh+kgzIKfbd4="; }; diff --git a/pkgs/development/python-modules/typst/default.nix b/pkgs/development/python-modules/typst/default.nix index ea86870247f0..8425bba9e7a0 100644 --- a/pkgs/development/python-modules/typst/default.nix +++ b/pkgs/development/python-modules/typst/default.nix @@ -26,8 +26,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-bcO+irLT4Sy8IZ/YQZFD2jVjZAUCO0j+TitigHo4xbM="; }; diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix index 5ea52995d331..148003ffafab 100644 --- a/pkgs/development/python-modules/wasmer/default.nix +++ b/pkgs/development/python-modules/wasmer/default.nix @@ -38,8 +38,7 @@ let }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = cargoHash; }; diff --git a/pkgs/development/python-modules/y-py/default.nix b/pkgs/development/python-modules/y-py/default.nix index 9c50b845958e..090f4889bb58 100644 --- a/pkgs/development/python-modules/y-py/default.nix +++ b/pkgs/development/python-modules/y-py/default.nix @@ -22,8 +22,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-Wh25tLOVhAYFLqjOrKSu4klB1hGSOMconC1xZG31Dbw="; }; diff --git a/pkgs/development/python-modules/zxcvbn-rs-py/default.nix b/pkgs/development/python-modules/zxcvbn-rs-py/default.nix index 6c98f6e68859..5531fb6c4ba0 100644 --- a/pkgs/development/python-modules/zxcvbn-rs-py/default.nix +++ b/pkgs/development/python-modules/zxcvbn-rs-py/default.nix @@ -27,8 +27,7 @@ buildPythonPackage rec { ]; cargoDeps = rustPlatform.fetchCargoVendor { - name = "${pname}-${version}"; - inherit src; + inherit pname version src; hash = "sha256-WkaTEoVQVOwxcTyOIG5oHEvcv65fBEpokl3/6SxqiUw="; }; diff --git a/pkgs/kde/gear/akonadi-search/default.nix b/pkgs/kde/gear/akonadi-search/default.nix index 08ef95aadafe..7d46f87af0e1 100644 --- a/pkgs/kde/gear/akonadi-search/default.nix +++ b/pkgs/kde/gear/akonadi-search/default.nix @@ -14,8 +14,7 @@ mkKdeDerivation rec { cargoRoot = "agent/rs/htmlparser"; cargoDeps = rustPlatform.fetchCargoVendor { - # include version in the name so we invalidate the FOD - name = "${pname}-${version}"; + inherit pname version; src = sources.${pname}; sourceRoot = "${pname}-${version}/${cargoRoot}"; hash = "sha256-hdm4LfQcs4TTfBLzlZYJ0uzqfLxMXuYQExLGJg81W2U="; diff --git a/pkgs/kde/gear/angelfish/default.nix b/pkgs/kde/gear/angelfish/default.nix index 9436f1bb07ef..49c578b1c3d3 100644 --- a/pkgs/kde/gear/angelfish/default.nix +++ b/pkgs/kde/gear/angelfish/default.nix @@ -14,8 +14,7 @@ mkKdeDerivation rec { inherit (sources.${pname}) version; cargoDeps = rustPlatform.fetchCargoVendor { - # include version in the name so we invalidate the FOD - name = "${pname}-${version}"; + inherit pname version; src = sources.${pname}; hash = "sha256-FgzmWw8FZb+DNSf2n6H14Rq07+x1LzG9hX4hFetuqDw="; }; diff --git a/pkgs/kde/gear/kdepim-addons/default.nix b/pkgs/kde/gear/kdepim-addons/default.nix index e6d8bb48a81f..b898e5d6410f 100644 --- a/pkgs/kde/gear/kdepim-addons/default.nix +++ b/pkgs/kde/gear/kdepim-addons/default.nix @@ -17,8 +17,7 @@ mkKdeDerivation rec { cargoRoot = "plugins/webengineurlinterceptor/adblock"; cargoDeps = rustPlatform.fetchCargoVendor { - # include version in the name so we invalidate the FOD - name = "${pname}-${version}"; + inherit pname version; src = sources.${pname}; sourceRoot = "${pname}-${version}/${cargoRoot}"; hash = "sha256-66FqoD3JoPbtg6zc32uaPYaTo4zHxywiN8wPI2jtcjc=";