dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

treewide: don't use rustPlatform.rust

Browse Source 
This will be deprecated in the next commit.
This commit is contained in:
Alyssa Ross 2023-05-12 14:17:16 +00:00
parent b22c35f05b
commit 5e06b3cb19
82 changed files with 410 additions and 287 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
doc/languages-frameworks/rust.section.md
View File

@ -535,7 +535,9 @@ directory of the `tokenizers` project's source archive, we use
```nix ```nix
{ fetchFromGitHub { fetchFromGitHub
, buildPythonPackage , buildPythonPackage
, cargo
, rustPlatform , rustPlatform
, rustc
, setuptools-rust , setuptools-rust
}: }:
@ -558,11 +560,12 @@ buildPythonPackage rec {
sourceRoot = "source/bindings/python"; sourceRoot = "source/bindings/python";
nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ nativeBuildInputs = [
cargoSetupHook cargo
rust.cargo rustPlatform.cargoSetupHook
rust.rustc rustc
]); setuptools-rust
];
# ... # ...
} }

6
pkgs/applications/accessibility/contrast/default.nix
View File

@ -2,6 +2,7 @@
, lib , lib
, fetchFromGitLab , fetchFromGitLab
, cairo , cairo
, cargo
, desktop-file-utils , desktop-file-utils
, gettext , gettext
, glib , glib
@ -12,6 +13,7 @@
, pango , pango
, pkg-config , pkg-config
, rustPlatform , rustPlatform
, rustc
, wrapGAppsHook4 , wrapGAppsHook4
}: }:
@ -40,9 +42,9 @@ stdenv.mkDerivation rec {
meson meson
ninja ninja
pkg-config pkg-config
rustPlatform.rust.cargo cargo
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
rustPlatform.rust.rustc rustc
wrapGAppsHook4 wrapGAppsHook4
]; ];

11
pkgs/applications/accessibility/squeekboard/default.nix
View File

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitLab , fetchFromGitLab
, cargo
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
@ -14,6 +15,7 @@
, libxml2 , libxml2
, libxkbcommon , libxkbcommon
, rustPlatform , rustPlatform
, rustc
, feedbackd , feedbackd
, wrapGAppsHook , wrapGAppsHook
, fetchpatch , fetchpatch
@ -54,11 +56,10 @@ stdenv.mkDerivation rec {
glib glib
wayland wayland
wrapGAppsHook wrapGAppsHook
] ++ (with rustPlatform; [ rustPlatform.cargoSetupHook
cargoSetupHook cargo
rust.cargo rustc
rust.rustc ];
]);
buildInputs = [ buildInputs = [
gtk3 gtk3

11
pkgs/applications/audio/amberol/default.nix
View File

@ -2,12 +2,14 @@
, stdenv , stdenv
, fetchFromGitLab , fetchFromGitLab
, rustPlatform , rustPlatform
, cargo
, desktop-file-utils , desktop-file-utils
, appstream-glib , appstream-glib
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
, reuse , reuse
, rustc
, m4 , m4
, wrapGAppsHook4 , wrapGAppsHook4
, glib , glib
@ -48,11 +50,10 @@ stdenv.mkDerivation rec {
reuse reuse
m4 m4
wrapGAppsHook4 wrapGAppsHook4
] ++ (with rustPlatform; [ rustPlatform.cargoSetupHook
cargoSetupHook cargo
rust.cargo rustc
rust.rustc ];
]);
buildInputs = [ buildInputs = [
glib glib

6
pkgs/applications/audio/gnome-podcasts/default.nix
View File

@ -3,11 +3,13 @@
, rustPlatform , rustPlatform
, fetchFromGitLab , fetchFromGitLab
, fetchpatch , fetchpatch
, cargo
, meson , meson
, ninja , ninja
, gettext , gettext
, python3 , python3
, pkg-config , pkg-config
, rustc
, glib , glib
, libhandy , libhandy
, gtk3 , gtk3
@ -55,9 +57,9 @@ stdenv.mkDerivation rec {
pkg-config pkg-config
gettext gettext
python3 python3
rustPlatform.rust.cargo cargo
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
rustPlatform.rust.rustc rustc
wrapGAppsHook wrapGAppsHook
glib glib
]; ];

6
pkgs/applications/audio/helvum/default.nix
View File

@ -1,4 +1,5 @@
{ lib { lib
, cargo
, clang , clang
, desktop-file-utils , desktop-file-utils
, fetchFromGitLab , fetchFromGitLab
@ -11,6 +12,7 @@
, pipewire , pipewire
, pkg-config , pkg-config
, rustPlatform , rustPlatform
, rustc
, stdenv , stdenv
}: }:
@ -38,8 +40,8 @@ stdenv.mkDerivation rec {
ninja ninja
pkg-config pkg-config
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
rustPlatform.rust.cargo cargo
rustPlatform.rust.rustc rustc
rustPlatform.bindgenHook rustPlatform.bindgenHook
]; ];

11
pkgs/applications/audio/mousai/default.nix
View File

@ -2,6 +2,7 @@
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, appstream-glib , appstream-glib
, cargo
, dbus , dbus
, desktop-file-utils , desktop-file-utils
, glib , glib
@ -16,6 +17,7 @@
, ninja , ninja
, pkg-config , pkg-config
, rustPlatform , rustPlatform
, rustc
, wrapGAppsHook4 , wrapGAppsHook4
}: }:
@ -43,11 +45,10 @@ stdenv.mkDerivation rec {
ninja ninja
pkg-config pkg-config
wrapGAppsHook4 wrapGAppsHook4
] ++ (with rustPlatform; [ rustPlatform.cargoSetupHook
cargoSetupHook cargo
rust.cargo rustc
rust.rustc ];
]);
buildInputs = [ buildInputs = [
dbus dbus

11
pkgs/applications/audio/netease-cloud-music-gtk/default.nix
View File

@ -2,6 +2,7 @@
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, rustPlatform , rustPlatform
, cargo
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
@ -10,6 +11,7 @@
, appstream-glib , appstream-glib
, desktop-file-utils , desktop-file-utils
, libxml2 , libxml2
, rustc
, wrapGAppsHook4 , wrapGAppsHook4
, openssl , openssl
, dbus , dbus
@ -47,11 +49,10 @@ stdenv.mkDerivation rec {
desktop-file-utils # update-desktop-database desktop-file-utils # update-desktop-database
libxml2 # xmllint libxml2 # xmllint
wrapGAppsHook4 wrapGAppsHook4
] ++ (with rustPlatform; [ rustPlatform.cargoSetupHook
cargoSetupHook cargo
rust.cargo rustc
rust.rustc ];
]);
buildInputs = [ buildInputs = [
openssl openssl

6
pkgs/applications/audio/shortwave/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv { stdenv
, lib , lib
, fetchFromGitLab , fetchFromGitLab
, cargo
, dbus , dbus
, desktop-file-utils , desktop-file-utils
, gdk-pixbuf , gdk-pixbuf
@ -15,6 +16,7 @@
, openssl , openssl
, pkg-config , pkg-config
, rustPlatform , rustPlatform
, rustc
, sqlite , sqlite
, wrapGAppsHook4 , wrapGAppsHook4
, cmake , cmake
@ -47,9 +49,9 @@ stdenv.mkDerivation rec {
meson meson
ninja ninja
pkg-config pkg-config
rustPlatform.rust.cargo cargo
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
rustPlatform.rust.rustc rustc
wrapGAppsHook4 wrapGAppsHook4
cmake cmake
]; ];

6
pkgs/applications/audio/spot/default.nix
View File

@ -7,7 +7,9 @@
, gettext , gettext
, python3 , python3
, desktop-file-utils , desktop-file-utils
, cargo
, rustPlatform , rustPlatform
, rustc
, pkg-config , pkg-config
, glib , glib
, libadwaita , libadwaita
@ -45,9 +47,9 @@ stdenv.mkDerivation rec {
gtk4 # for gtk-update-icon-cache gtk4 # for gtk-update-icon-cache
glib # for glib-compile-schemas glib # for glib-compile-schemas
desktop-file-utils desktop-file-utils
rustPlatform.rust.cargo cargo
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
rustPlatform.rust.rustc rustc
wrapGAppsHook4 wrapGAppsHook4
]; ];

11
pkgs/applications/backup/pika-backup/default.nix
View File

@ -3,6 +3,7 @@
, fetchFromGitLab , fetchFromGitLab
, rustPlatform , rustPlatform
, substituteAll , substituteAll
, cargo
, desktop-file-utils , desktop-file-utils
, git , git
, itstool , itstool
@ -10,6 +11,7 @@
, ninja , ninja
, pkg-config , pkg-config
, python3 , python3
, rustc
, wrapGAppsHook4 , wrapGAppsHook4
, borgbackup , borgbackup
, gtk4 , gtk4
@ -55,11 +57,10 @@ stdenv.mkDerivation rec {
pkg-config pkg-config
python3 python3
wrapGAppsHook4 wrapGAppsHook4
] ++ (with rustPlatform; [ rustPlatform.cargoSetupHook
cargoSetupHook cargo
rust.cargo rustc
rust.rustc ];
]);
buildInputs = [ buildInputs = [
gtk4 gtk4

11
pkgs/applications/graphics/emblem/default.nix
View File

@ -3,11 +3,13 @@
, fetchFromGitLab , fetchFromGitLab
, rustPlatform , rustPlatform
, appstream-glib , appstream-glib
, cargo
, desktop-file-utils , desktop-file-utils
, glib , glib
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
, rustc
, wrapGAppsHook4 , wrapGAppsHook4
, gtk4 , gtk4
, libadwaita , libadwaita
@ -43,11 +45,10 @@ stdenv.mkDerivation rec {
ninja ninja
pkg-config pkg-config
wrapGAppsHook4 wrapGAppsHook4
] ++ (with rustPlatform; [ rustPlatform.cargoSetupHook
cargoSetupHook cargo
rust.cargo rustc
rust.rustc ];
]);
buildInputs = [ buildInputs = [
gtk4 gtk4

11
pkgs/applications/graphics/eyedropper/default.nix
View File

@ -2,12 +2,14 @@
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, rustPlatform , rustPlatform
, cargo
, pkg-config , pkg-config
, meson , meson
, ninja , ninja
, glib , glib
, gtk4 , gtk4
, libadwaita , libadwaita
, rustc
, wrapGAppsHook4 , wrapGAppsHook4
, appstream-glib , appstream-glib
, desktop-file-utils , desktop-file-utils
@ -37,11 +39,10 @@ stdenv.mkDerivation rec {
wrapGAppsHook4 wrapGAppsHook4
appstream-glib appstream-glib
desktop-file-utils desktop-file-utils
] ++ (with rustPlatform; [ cargo
rust.cargo rustc
rust.rustc rustPlatform.cargoSetupHook
cargoSetupHook ];
]);
buildInputs = [ buildInputs = [
glib glib

11
pkgs/applications/graphics/gnome-decoder/default.nix
View File

@ -3,9 +3,11 @@
, fetchFromGitLab , fetchFromGitLab
, libclang , libclang
, rustPlatform , rustPlatform
, cargo
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
, rustc
, glib , glib
, gtk4 , gtk4
, libadwaita , libadwaita
@ -46,11 +48,10 @@ clangStdenv.mkDerivation rec {
wrapGAppsHook4 wrapGAppsHook4
appstream-glib appstream-glib
desktop-file-utils desktop-file-utils
] ++ (with rustPlatform; [ cargo
rust.cargo rustc
rust.rustc rustPlatform.cargoSetupHook
cargoSetupHook ];
]);
buildInputs = [ buildInputs = [
glib glib

6
pkgs/applications/graphics/gnome-obfuscate/default.nix
View File

@ -1,11 +1,13 @@
{ stdenv { stdenv
, lib , lib
, fetchFromGitLab , fetchFromGitLab
, cargo
, gettext , gettext
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
, rustPlatform , rustPlatform
, rustc
, wrapGAppsHook4 , wrapGAppsHook4
, appstream-glib , appstream-glib
, desktop-file-utils , desktop-file-utils
@ -40,8 +42,8 @@ stdenv.mkDerivation rec {
ninja ninja
pkg-config pkg-config
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
rustPlatform.rust.cargo cargo
rustPlatform.rust.rustc rustc
wrapGAppsHook4 wrapGAppsHook4
appstream-glib appstream-glib
desktop-file-utils desktop-file-utils

11
pkgs/applications/graphics/identity/default.nix
View File

@ -6,11 +6,13 @@
, gtk4 , gtk4
, lib , lib
, libadwaita , libadwaita
, cargo
, meson , meson
, ninja , ninja
, nix-update-script , nix-update-script
, pkg-config , pkg-config
, rustPlatform , rustPlatform
, rustc
, stdenv , stdenv
, wrapGAppsHook4 , wrapGAppsHook4
}: }:
@ -41,11 +43,10 @@ stdenv.mkDerivation rec {
ninja ninja
pkg-config pkg-config
wrapGAppsHook4 wrapGAppsHook4
] ++ (with rustPlatform; [ rustPlatform.cargoSetupHook
cargoSetupHook cargo
rust.cargo rustc
rust.rustc ];
]);
buildInputs = [ buildInputs = [
gst_all_1.gst-libav gst_all_1.gst-libav

11
pkgs/applications/graphics/paleta/default.nix
View File

@ -2,9 +2,11 @@
, stdenv , stdenv
, rustPlatform , rustPlatform
, fetchFromGitHub , fetchFromGitHub
, cargo
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
, rustc
, wrapGAppsHook4 , wrapGAppsHook4
, appstream-glib , appstream-glib
, desktop-file-utils , desktop-file-utils
@ -37,11 +39,10 @@ stdenv.mkDerivation rec {
wrapGAppsHook4 wrapGAppsHook4
appstream-glib appstream-glib
desktop-file-utils desktop-file-utils
] ++ (with rustPlatform; [ rustPlatform.cargoSetupHook
cargoSetupHook cargo
rust.cargo rustc
rust.rustc ];
]);
buildInputs = [ buildInputs = [
glib glib

6
pkgs/applications/graphics/rnote/default.nix
View File

@ -3,6 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, alsa-lib , alsa-lib
, appstream-glib , appstream-glib
, cargo
, cmake , cmake
, desktop-file-utils , desktop-file-utils
, glib , glib
@ -16,6 +17,7 @@
, poppler , poppler
, python3 , python3
, rustPlatform , rustPlatform
, rustc
, shared-mime-info , shared-mime-info
, wrapGAppsHook4 , wrapGAppsHook4
, AudioUnit , AudioUnit
@ -51,8 +53,8 @@ stdenv.mkDerivation rec {
python3 # For the postinstall script python3 # For the postinstall script
rustPlatform.bindgenHook rustPlatform.bindgenHook
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
rustPlatform.rust.cargo cargo
rustPlatform.rust.rustc rustc
shared-mime-info # For update-mime-database shared-mime-info # For update-mime-database
wrapGAppsHook4 wrapGAppsHook4
]; ];

11
pkgs/applications/kde/angelfish.nix
View File

@ -1,5 +1,6 @@
{ lib { lib
, mkDerivation , mkDerivation
, cargo
, cmake , cmake
, corrosion , corrosion
, extra-cmake-modules , extra-cmake-modules
@ -17,6 +18,7 @@
, qqc2-desktop-style , qqc2-desktop-style
, qtwebengine , qtwebengine
, rustPlatform , rustPlatform
, rustc
, srcs , srcs
# These must be updated in tandem with package updates. # These must be updated in tandem with package updates.
@ -46,11 +48,10 @@ mkDerivation rec {
cmake cmake
corrosion corrosion
extra-cmake-modules extra-cmake-modules
] ++ (with rustPlatform; [ rustPlatform.cargoSetupHook
cargoSetupHook cargo
rust.cargo rustc
rust.rustc ];
]);
buildInputs = [ buildInputs = [
kconfig kconfig

13
pkgs/applications/misc/authenticator/default.nix
View File

@ -2,11 +2,13 @@
, stdenv , stdenv
, fetchFromGitLab , fetchFromGitLab
, appstream-glib , appstream-glib
, cargo
, desktop-file-utils , desktop-file-utils
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
, rustPlatform , rustPlatform
, rustc
, wrapGAppsHook4 , wrapGAppsHook4
, gdk-pixbuf , gdk-pixbuf
, glib , glib
@ -45,12 +47,11 @@ stdenv.mkDerivation rec {
ninja ninja
pkg-config pkg-config
wrapGAppsHook4 wrapGAppsHook4
] ++ (with rustPlatform; [ rustPlatform.cargoSetupHook
cargoSetupHook cargo
rust.cargo rustc
rust.rustc rustPlatform.bindgenHook
bindgenHook ];
]);
buildInputs = [ buildInputs = [
gdk-pixbuf gdk-pixbuf

8
pkgs/applications/misc/citations/default.nix
View File

@ -1,4 +1,5 @@
{ darwin { cargo
, darwin
, desktop-file-utils , desktop-file-utils
, fetchFromGitLab , fetchFromGitLab
, gettext , gettext
@ -12,6 +13,7 @@
, pkg-config , pkg-config
, poppler , poppler
, rustPlatform , rustPlatform
, rustc
, stdenv , stdenv
, testers , testers
, wrapGAppsHook4 , wrapGAppsHook4
@ -43,8 +45,8 @@ stdenv.mkDerivation (finalAttrs: {
ninja ninja
pkg-config pkg-config
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
rustPlatform.rust.cargo cargo
rustPlatform.rust.rustc rustc
wrapGAppsHook4 wrapGAppsHook4
]; ];

11
pkgs/applications/misc/furtherance/default.nix
View File

@ -1,5 +1,8 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, appstream-glib, desktop-file-utils { lib, stdenv, fetchFromGitHub, rustPlatform
, glib, libadwaita, meson, ninja, pkg-config, wrapGAppsHook4, dbus , gtk4, sqlite }: , appstream-glib, cargo, desktop-file-utils, glib, libadwaita, meson, ninja
, pkg-config, rustc, wrapGAppsHook4
, dbus, gtk4, sqlite
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "furtherance"; pname = "furtherance";
@ -25,8 +28,8 @@ stdenv.mkDerivation rec {
ninja ninja
pkg-config pkg-config
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
rustPlatform.rust.cargo cargo
rustPlatform.rust.rustc rustc
wrapGAppsHook4 wrapGAppsHook4
]; ];

11
pkgs/applications/misc/gnome-solanum/default.nix
View File

@ -3,10 +3,12 @@
, fetchFromGitLab , fetchFromGitLab
, fetchpatch , fetchpatch
, rustPlatform , rustPlatform
, cargo
, desktop-file-utils , desktop-file-utils
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
, rustc
, wrapGAppsHook , wrapGAppsHook
, python3 , python3
, git , git
@ -55,11 +57,10 @@ stdenv.mkDerivation rec {
python3 python3
git git
desktop-file-utils desktop-file-utils
] ++ (with rustPlatform; [ rustPlatform.cargoSetupHook
cargoSetupHook cargo
rust.cargo rustc
rust.rustc ];
]);
buildInputs = [ buildInputs = [
glib glib

6
pkgs/applications/misc/openbangla-keyboard/default.nix
View File

@ -1,9 +1,11 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, cargo
, cmake , cmake
, pkg-config , pkg-config
, rustPlatform , rustPlatform
, rustc
, wrapQtAppsHook , wrapQtAppsHook
, ibus , ibus
, qtbase , qtbase
@ -25,8 +27,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkg-config pkg-config
rustPlatform.rust.cargo cargo
rustPlatform.rust.rustc rustc
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
wrapQtAppsHook wrapQtAppsHook
]; ];

11
pkgs/applications/networking/feedreaders/newsflash/default.nix
View File

@ -2,9 +2,11 @@
, stdenv , stdenv
, rustPlatform , rustPlatform
, fetchFromGitLab , fetchFromGitLab
, cargo
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
, rustc
, wrapGAppsHook4 , wrapGAppsHook4
, gdk-pixbuf , gdk-pixbuf
, glib , glib
@ -65,11 +67,10 @@ stdenv.mkDerivation (finalAttrs: {
# Provides glib-compile-resources to compile gresources # Provides glib-compile-resources to compile gresources
glib glib
] ++ (with rustPlatform; [ rustPlatform.cargoSetupHook
cargoSetupHook cargo
rust.cargo rustc
rust.rustc ];
]);
buildInputs = [ buildInputs = [
gtk4 gtk4

11
pkgs/applications/networking/instant-messengers/flare-signal/default.nix
View File

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitLab , fetchFromGitLab
, cargo
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
@ -8,6 +9,7 @@
, libsecret , libsecret
, libadwaita , libadwaita
, rustPlatform , rustPlatform
, rustc
, desktop-file-utils , desktop-file-utils
, wrapGAppsHook4 , wrapGAppsHook4
}: }:
@ -40,11 +42,10 @@ stdenv.mkDerivation rec {
ninja ninja
pkg-config pkg-config
wrapGAppsHook4 wrapGAppsHook4
] ++ (with rustPlatform; [ rustPlatform.cargoSetupHook
cargoSetupHook cargo
rust.cargo rustc
rust.rustc ];
]);
buildInputs = [ buildInputs = [
libadwaita libadwaita

6
pkgs/applications/networking/instant-messengers/fractal-next/default.nix
View File

@ -1,9 +1,11 @@
{ stdenv { stdenv
, lib , lib
, fetchFromGitLab , fetchFromGitLab
, cargo
, meson , meson
, ninja , ninja
, rustPlatform , rustPlatform
, rustc
, pkg-config , pkg-config
, glib , glib
, gtk4 , gtk4
@ -49,8 +51,8 @@ stdenv.mkDerivation rec {
pkg-config pkg-config
rustPlatform.bindgenHook rustPlatform.bindgenHook
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
rustPlatform.rust.cargo cargo
rustPlatform.rust.rustc rustc
desktop-file-utils desktop-file-utils
appstream-glib appstream-glib
wrapGAppsHook4 wrapGAppsHook4

6
pkgs/applications/networking/instant-messengers/fractal/default.nix
View File

@ -2,11 +2,13 @@
, lib , lib
, fetchFromGitLab , fetchFromGitLab
, nix-update-script , nix-update-script
, cargo
, meson , meson
, ninja , ninja
, gettext , gettext
, python3 , python3
, rustPlatform , rustPlatform
, rustc
, pkg-config , pkg-config
, gtksourceview4 , gtksourceview4
, glib , glib
@ -49,9 +51,9 @@ stdenv.mkDerivation rec {
ninja ninja
pkg-config pkg-config
python3 python3
rustPlatform.rust.cargo cargo
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
rustPlatform.rust.rustc rustc
wrapGAppsHook wrapGAppsHook
glib glib
]; ];

11
pkgs/applications/networking/p2p/fragments/default.nix
View File

@ -3,6 +3,7 @@
, fetchFromGitLab , fetchFromGitLab
, fetchpatch , fetchpatch
, appstream-glib , appstream-glib
, cargo
, dbus , dbus
, desktop-file-utils , desktop-file-utils
, git , git
@ -14,6 +15,7 @@
, openssl , openssl
, pkg-config , pkg-config
, rustPlatform , rustPlatform
, rustc
, sqlite , sqlite
, transmission , transmission
, wrapGAppsHook4 , wrapGAppsHook4
@ -56,11 +58,10 @@ in stdenv.mkDerivation rec {
ninja ninja
pkg-config pkg-config
wrapGAppsHook4 wrapGAppsHook4
] ++ (with rustPlatform; [ rustPlatform.cargoSetupHook
cargoSetupHook cargo
rust.cargo rustc
rust.rustc ];
]);
buildInputs = [ buildInputs = [
dbus dbus

11
pkgs/applications/networking/warp/default.nix
View File

@ -2,6 +2,7 @@
, stdenv , stdenv
, fetchFromGitLab , fetchFromGitLab
, appstream-glib , appstream-glib
, cargo
, desktop-file-utils , desktop-file-utils
, itstool , itstool
, meson , meson
@ -9,6 +10,7 @@
, pkg-config , pkg-config
, python3 , python3
, rustPlatform , rustPlatform
, rustc
, wrapGAppsHook4 , wrapGAppsHook4
, glib , glib
, gtk4 , gtk4
@ -46,11 +48,10 @@ stdenv.mkDerivation rec {
pkg-config pkg-config
python3 python3
wrapGAppsHook4 wrapGAppsHook4
] ++ (with rustPlatform; [ rustPlatform.cargoSetupHook
cargoSetupHook cargo
rust.cargo rustc
rust.rustc ];
]);
buildInputs = [ buildInputs = [
glib glib

4
pkgs/applications/version-management/git-cinnabar/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, pkg-config, rustPlatform { stdenv, lib, fetchFromGitHub, cargo, pkg-config, rustPlatform
, bzip2, curl, zlib, zstd, libiconv, CoreServices , bzip2, curl, zlib, zstd, libiconv, CoreServices
}: }:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config rustPlatform.cargoSetupHook rustPlatform.rust.cargo pkg-config rustPlatform.cargoSetupHook cargo
]; ];
buildInputs = [ bzip2 curl zlib zstd ] buildInputs = [ bzip2 curl zlib zstd ]

12
pkgs/applications/version-management/mercurial/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, fetchpatch, python3Packages, makeWrapper, gettext, installShellFiles { lib, stdenv, fetchurl, fetchpatch, python3Packages, makeWrapper, gettext, installShellFiles
, re2Support ? true , re2Support ? true
, rustSupport ? stdenv.hostPlatform.isLinux, rustPlatform , rustSupport ? stdenv.hostPlatform.isLinux, cargo, rustPlatform, rustc
, fullBuild ? false , fullBuild ? false
, gitSupport ? fullBuild , gitSupport ? fullBuild
, guiSupport ? fullBuild, tk , guiSupport ? fullBuild, tk
@ -44,11 +44,11 @@ let
++ lib.optional gitSupport pygit2 ++ lib.optional gitSupport pygit2
++ lib.optional highlightSupport pygments; ++ lib.optional highlightSupport pygments;
nativeBuildInputs = [ makeWrapper gettext installShellFiles ] nativeBuildInputs = [ makeWrapper gettext installShellFiles ]
++ lib.optionals rustSupport (with rustPlatform; [ ++ lib.optionals rustSupport [
cargoSetupHook rustPlatform.cargoSetupHook
rust.cargo cargo
rust.rustc rustc
]); ];
buildInputs = [ docutils ] buildInputs = [ docutils ]
++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; ++ lib.optionals stdenv.isDarwin [ ApplicationServices ];

9
pkgs/applications/version-management/sapling/default.nix
View File

@ -4,10 +4,12 @@
, fetchFromGitHub , fetchFromGitHub
, fetchurl , fetchurl
, sd , sd
, cargo
, curl , curl
, pkg-config , pkg-config
, openssl , openssl
, rustPlatform , rustPlatform
, rustc
, fetchYarnDeps , fetchYarnDeps
, yarn , yarn
, nodejs , nodejs
@ -147,11 +149,10 @@ python3Packages.buildPythonApplication {
nativeBuildInputs = [ nativeBuildInputs = [
curl curl
pkg-config pkg-config
] ++ (with rustPlatform; [
myCargoSetupHook myCargoSetupHook
rust.cargo cargo
rust.rustc rustc
]); ];
buildInputs = [ buildInputs = [
openssl openssl

6
pkgs/applications/video/kooha/default.nix
View File

@ -2,6 +2,7 @@
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, appstream-glib , appstream-glib
, cargo
, desktop-file-utils , desktop-file-utils
, glib , glib
, gst_all_1 , gst_all_1
@ -14,6 +15,7 @@
, ninja , ninja
, pkg-config , pkg-config
, rustPlatform , rustPlatform
, rustc
, wayland , wayland
, wrapGAppsHook4 , wrapGAppsHook4
}: }:
@ -42,8 +44,8 @@ stdenv.mkDerivation rec {
ninja ninja
pkg-config pkg-config
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
rustPlatform.rust.cargo cargo
rustPlatform.rust.rustc rustc
wrapGAppsHook4 wrapGAppsHook4
]; ];

11
pkgs/applications/video/video-trimmer/default.nix
View File

@ -2,8 +2,10 @@
, lib , lib
, fetchFromGitLab , fetchFromGitLab
, rustPlatform , rustPlatform
, cargo
, pkg-config , pkg-config
, meson , meson
, rustc
, wrapGAppsHook4 , wrapGAppsHook4
, desktop-file-utils , desktop-file-utils
, blueprint-compiler , blueprint-compiler
@ -43,11 +45,10 @@ stdenv.mkDerivation rec {
# `gtk4-update-icon-cache` during installPhase, thanks to: # `gtk4-update-icon-cache` during installPhase, thanks to:
# https://gitlab.gnome.org/YaLTeR/video-trimmer/-/merge_requests/12 # https://gitlab.gnome.org/YaLTeR/video-trimmer/-/merge_requests/12
gtk4 gtk4
] ++ (with rustPlatform; [ rustPlatform.cargoSetupHook
cargoSetupHook cargo
rust.cargo rustc
rust.rustc ];
]);
buildInputs = [ buildInputs = [
gtk4 gtk4

10
pkgs/applications/virtualization/krunvm/default.nix
View File

@ -5,9 +5,11 @@
, asciidoctor , asciidoctor
, buildah , buildah
, buildah-unwrapped , buildah-unwrapped
, cargo
, libiconv , libiconv
, libkrun , libkrun
, makeWrapper , makeWrapper
, rustc
, sigtool , sigtool
}: }:
@ -27,10 +29,10 @@ stdenv.mkDerivation rec {
hash = "sha256-Y0FNi/+HuN5SqexHTKjcW6lEaeis7xZDYc2/FOAANIA="; hash = "sha256-Y0FNi/+HuN5SqexHTKjcW6lEaeis7xZDYc2/FOAANIA=";
}; };
nativeBuildInputs = with rustPlatform; [ nativeBuildInputs = [
cargoSetupHook rustPlatform.cargoSetupHook
rust.cargo cargo
rust.rustc rustc
asciidoctor asciidoctor
makeWrapper makeWrapper
] ++ lib.optionals stdenv.isDarwin [ sigtool ]; ] ++ lib.optionals stdenv.isDarwin [ sigtool ];

6
pkgs/applications/virtualization/pods/default.nix
View File

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, cargo
, desktop-file-utils , desktop-file-utils
, glib , glib
, gtk4 , gtk4
@ -8,6 +9,7 @@
, ninja , ninja
, pkg-config , pkg-config
, rustPlatform , rustPlatform
, rustc
, wrapGAppsHook4 , wrapGAppsHook4
, gtksourceview5 , gtksourceview5
, libadwaita , libadwaita
@ -38,8 +40,8 @@ stdenv.mkDerivation rec {
ninja ninja
pkg-config pkg-config
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
rustPlatform.rust.cargo cargo
rustPlatform.rust.rustc rustc
wrapGAppsHook4 wrapGAppsHook4
]; ];

10
pkgs/development/compilers/rust/clippy.nix
View File

@ -1,8 +1,8 @@
{ stdenv, lib, rustPlatform, Security, patchelf }: { stdenv, lib, rustPlatform, rustc, Security, patchelf }:
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
pname = "clippy"; pname = "clippy";
inherit (rustPlatform.rust.rustc) version src; inherit (rustc) version src;
separateDebugInfo = true; separateDebugInfo = true;
@ -13,7 +13,7 @@ rustPlatform.buildRustPackage {
# changes hash of vendor directory otherwise # changes hash of vendor directory otherwise
dontUpdateAutotoolsGnuConfigScripts = true; dontUpdateAutotoolsGnuConfigScripts = true;
buildInputs = [ rustPlatform.rust.rustc.llvm ] buildInputs = [ rustc.llvm ]
++ lib.optionals stdenv.isDarwin [ Security ]; ++ lib.optionals stdenv.isDarwin [ Security ];
# fixes: error: the option `Z` is only accepted on the nightly compiler # fixes: error: the option `Z` is only accepted on the nightly compiler
@ -31,8 +31,8 @@ rustPlatform.buildRustPackage {
# [0]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/src/bootstrap/builder.rs#L1543 # [0]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/src/bootstrap/builder.rs#L1543
# [1]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/compiler/rustc_codegen_ssa/src/back/linker.rs#L323-L331 # [1]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/compiler/rustc_codegen_ssa/src/back/linker.rs#L323-L331
preFixup = lib.optionalString stdenv.isDarwin '' preFixup = lib.optionalString stdenv.isDarwin ''
install_name_tool -add_rpath "${rustPlatform.rust.rustc}/lib" "$out/bin/clippy-driver" install_name_tool -add_rpath "${rustc}/lib" "$out/bin/clippy-driver"
install_name_tool -add_rpath "${rustPlatform.rust.rustc}/lib" "$out/bin/cargo-clippy" install_name_tool -add_rpath "${rustc}/lib" "$out/bin/cargo-clippy"
''; '';
meta = with lib; { meta = with lib; {

8
pkgs/development/compilers/rust/default.nix
View File

@ -68,6 +68,7 @@ in
patches = rustcPatches; patches = rustcPatches;
# Use boot package set to break cycle # Use boot package set to break cycle
inherit (bootstrapRustPackages) cargo rustc;
rustPlatform = bootRustPlatform; rustPlatform = bootRustPlatform;
} // lib.optionalAttrs (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) { } // lib.optionalAttrs (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) {
stdenv = llvmBootstrapForDarwin.stdenv; stdenv = llvmBootstrapForDarwin.stdenv;
@ -75,7 +76,10 @@ in
pkgsBuildHost = pkgsBuildBuild // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; }; pkgsBuildHost = pkgsBuildBuild // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; };
pkgsBuildTarget = pkgsBuildTarget // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; }; pkgsBuildTarget = pkgsBuildTarget // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; };
}); });
rustfmt = self.callPackage ./rustfmt.nix { inherit Security; }; rustfmt = self.callPackage ./rustfmt.nix {
inherit Security;
inherit (self.buildRustPackages) rustc;
};
cargo = self.callPackage ./cargo.nix { cargo = self.callPackage ./cargo.nix {
# Use boot package set to break cycle # Use boot package set to break cycle
rustPlatform = bootRustPlatform; rustPlatform = bootRustPlatform;
@ -83,7 +87,7 @@ in
}; };
cargo-auditable = self.callPackage ./cargo-auditable.nix { }; cargo-auditable = self.callPackage ./cargo-auditable.nix { };
cargo-auditable-cargo-wrapper = self.callPackage ./cargo-auditable-cargo-wrapper.nix { }; cargo-auditable-cargo-wrapper = self.callPackage ./cargo-auditable-cargo-wrapper.nix { };
clippy = callPackage ./clippy.nix { clippy = self.callPackage ./clippy.nix {
# We want to use self, not buildRustPackages, so that # We want to use self, not buildRustPackages, so that
# buildPackages.clippy uses the cross compiler and supports # buildPackages.clippy uses the cross compiler and supports
# linting for the target platform. # linting for the target platform.

8
pkgs/development/compilers/rust/rustc.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, targetPackages { lib, stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, targetPackages
, llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget, llvmPackages , llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget, llvmPackages
, fetchurl, file, python3 , fetchurl, file, python3
, darwin, cmake, rust, rustPlatform , darwin, cargo, cmake, rust, rustc, rustPlatform
, pkg-config, openssl, xz , pkg-config, openssl, xz
, libiconv , libiconv
, which, libffi , which, libffi
@ -73,8 +73,8 @@ in stdenv.mkDerivation rec {
cxxForTarget = "${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}c++"; cxxForTarget = "${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}c++";
in [ in [
"--release-channel=stable" "--release-channel=stable"
"--set=build.rustc=${rustPlatform.rust.rustc}/bin/rustc" "--set=build.rustc=${rustc}/bin/rustc"
"--set=build.cargo=${rustPlatform.rust.cargo}/bin/cargo" "--set=build.cargo=${cargo}/bin/cargo"
"--enable-rpath" "--enable-rpath"
"--enable-vendor" "--enable-vendor"
"--build=${rust.toRustTargetSpec stdenv.buildPlatform}" "--build=${rust.toRustTargetSpec stdenv.buildPlatform}"
@ -180,7 +180,7 @@ in stdenv.mkDerivation rec {
depsBuildBuild = [ pkgsBuildHost.stdenv.cc pkg-config ]; depsBuildBuild = [ pkgsBuildHost.stdenv.cc pkg-config ];
nativeBuildInputs = [ nativeBuildInputs = [
file python3 rustPlatform.rust.rustc cmake file python3 rustc cmake
which libffi removeReferencesTo pkg-config xz which libffi removeReferencesTo pkg-config xz
]; ];

8
pkgs/development/compilers/rust/rustfmt.nix
View File

@ -1,8 +1,8 @@
{ lib, stdenv, rustPlatform, Security, asNightly ? false }: { lib, stdenv, rustPlatform, rustc, Security, asNightly ? false }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rustfmt" + lib.optionalString asNightly "-nightly"; pname = "rustfmt" + lib.optionalString asNightly "-nightly";
inherit (rustPlatform.rust.rustc) version src; inherit (rustc) version src;
# the rust source tarball already has all the dependencies vendored, no need to fetch them again # the rust source tarball already has all the dependencies vendored, no need to fetch them again
cargoVendorDir = "vendor"; cargoVendorDir = "vendor";
@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
dontUpdateAutotoolsGnuConfigScripts = true; dontUpdateAutotoolsGnuConfigScripts = true;
buildInputs = [ buildInputs = [
rustPlatform.rust.rustc.llvm rustc.llvm
] ++ lib.optional stdenv.isDarwin Security; ] ++ lib.optional stdenv.isDarwin Security;
# As of 1.0.0 and rustc 1.30 rustfmt requires a nightly compiler # As of 1.0.0 and rustc 1.30 rustfmt requires a nightly compiler
@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
# As of rustc 1.45.0, these env vars are required to build rustfmt (due to # As of rustc 1.45.0, these env vars are required to build rustfmt (due to
# https://github.com/rust-lang/rust/pull/72001) # https://github.com/rust-lang/rust/pull/72001)
CFG_RELEASE = rustPlatform.rust.rustc.version; CFG_RELEASE = rustc.version;
CFG_RELEASE_CHANNEL = if asNightly then "nightly" else "stable"; CFG_RELEASE_CHANNEL = if asNightly then "nightly" else "stable";
meta = with lib; { meta = with lib; {

6
pkgs/development/interpreters/ruby/default.nix
View File

@ -2,7 +2,7 @@
, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
, zlib, gdbm, ncurses, readline, groff, libyaml, libffi, jemalloc, autoreconfHook, bison , zlib, gdbm, ncurses, readline, groff, libyaml, libffi, jemalloc, autoreconfHook, bison
, autoconf, libiconv, libobjc, libunwind, Foundation , autoconf, libiconv, libobjc, libunwind, Foundation
, buildEnv, bundler, bundix, rustPlatform , buildEnv, bundler, bundix, cargo, rustPlatform, rustc
, makeBinaryWrapper, buildRubyGem, defaultGemConfig, removeReferencesTo , makeBinaryWrapper, buildRubyGem, defaultGemConfig, removeReferencesTo
, openssl, openssl_1_1 , openssl, openssl_1_1
, linuxPackages, libsystemtap , linuxPackages, libsystemtap
@ -48,7 +48,7 @@ let
# $(nix-build -A ruby)/lib/ruby/2.6.0/x86_64-linux/rbconfig.rb # $(nix-build -A ruby)/lib/ruby/2.6.0/x86_64-linux/rbconfig.rb
# - In $out/lib/libruby.so and/or $out/lib/libruby.dylib # - In $out/lib/libruby.so and/or $out/lib/libruby.dylib
, removeReferencesTo, jitSupport ? yjitSupport , removeReferencesTo, jitSupport ? yjitSupport
, rustPlatform, yjitSupport ? yjitSupported , cargo, rustPlatform, rustc, yjitSupport ? yjitSupported
, autoreconfHook, bison, autoconf , autoreconfHook, bison, autoconf
, buildEnv, bundler, bundix , buildEnv, bundler, bundix
, libiconv, libobjc, libunwind, Foundation , libiconv, libobjc, libunwind, Foundation
@ -78,7 +78,7 @@ let
nativeBuildInputs = [ autoreconfHook bison ] nativeBuildInputs = [ autoreconfHook bison ]
++ (op docSupport groff) ++ (op docSupport groff)
++ (ops (dtraceSupport && stdenv.isLinux) [ systemtap libsystemtap ]) ++ (ops (dtraceSupport && stdenv.isLinux) [ systemtap libsystemtap ])
++ ops yjitSupport [ rustPlatform.cargoSetupHook rustPlatform.rust.cargo rustPlatform.rust.rustc ] ++ ops yjitSupport [ rustPlatform.cargoSetupHook cargo rustc ]
++ op useBaseRuby baseRuby; ++ op useBaseRuby baseRuby;
buildInputs = [ autoconf ] buildInputs = [ autoconf ]
++ (op fiddleSupport libffi) ++ (op fiddleSupport libffi)

8
pkgs/development/libraries/libdeltachat/default.nix
View File

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, cargo
, cmake , cmake
, openssl , openssl
, perl , perl
@ -45,10 +46,9 @@ stdenv.mkDerivation rec {
cmake cmake
perl perl
pkg-config pkg-config
] ++ (with rustPlatform; [ rustPlatform.cargoSetupHook
cargoSetupHook cargo
rust.cargo ] ++ lib.optionals stdenv.isDarwin [
]) ++ lib.optionals stdenv.isDarwin [
fixDarwinDylibNames fixDarwinDylibNames
]; ];

10
pkgs/development/libraries/libkrun/default.nix
View File

@ -3,12 +3,14 @@
, fetchFromGitHub , fetchFromGitHub
, fetchurl , fetchurl
, rustPlatform , rustPlatform
, cargo
, pkg-config , pkg-config
, dtc , dtc
, glibc , glibc
, openssl , openssl
, libiconv , libiconv
, libkrunfw , libkrunfw
, rustc
, Hypervisor , Hypervisor
, sevVariant ? false , sevVariant ? false
}: }:
@ -32,10 +34,10 @@ stdenv.mkDerivation rec {
hash = "sha256-nbtp7FP+ObVGfDOEzTt4Z7TZwcNlREczTKIAXGSflZU="; hash = "sha256-nbtp7FP+ObVGfDOEzTt4Z7TZwcNlREczTKIAXGSflZU=";
}; };
nativeBuildInputs = with rustPlatform; [ nativeBuildInputs = [
cargoSetupHook rustPlatform.cargoSetupHook
rust.cargo cargo
rust.rustc rustc
] ++ lib.optional sevVariant pkg-config; ] ++ lib.optional sevVariant pkg-config;
buildInputs = [ buildInputs = [

8
pkgs/development/libraries/matrix-sdk-crypto-nodejs/default.nix
View File

@ -1,4 +1,6 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, napi-rs-cli, nodejs, libiconv }: { lib, stdenv, fetchFromGitHub
, cargo, rustPlatform, rustc, napi-rs-cli, nodejs, libiconv
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "matrix-sdk-crypto-nodejs"; pname = "matrix-sdk-crypto-nodejs";
@ -26,8 +28,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
rustPlatform.rust.cargo cargo
rustPlatform.rust.rustc rustc
napi-rs-cli napi-rs-cli
nodejs nodejs
]; ];

5
pkgs/development/python-modules/aardwolf/default.nix
View File

@ -6,6 +6,7 @@
, asyauth , asyauth
, asysocks , asysocks
, buildPythonPackage , buildPythonPackage
, cargo
, colorama , colorama
, fetchFromGitHub , fetchFromGitHub
, iconv , iconv
@ -14,6 +15,7 @@
, pyperclip , pyperclip
, pythonOlder , pythonOlder
, rustPlatform , rustPlatform
, rustc
, setuptools-rust , setuptools-rust
, tqdm , tqdm
, unicrypto , unicrypto
@ -46,10 +48,9 @@ buildPythonPackage rec {
nativeBuildInputs = [ nativeBuildInputs = [
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
setuptools-rust setuptools-rust
] ++ (with rustPlatform.rust; [
cargo cargo
rustc rustc
]); ];
propagatedBuildInputs = [ propagatedBuildInputs = [
arc4 arc4

11
pkgs/development/python-modules/bcrypt/default.nix
View File

@ -1,6 +1,8 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, cargo
, rustPlatform , rustPlatform
, rustc
, setuptools , setuptools
, setuptools-rust , setuptools-rust
, isPyPy , isPyPy
@ -41,11 +43,10 @@ buildPythonPackage rec {
nativeBuildInputs = [ nativeBuildInputs = [
setuptools setuptools
setuptools-rust setuptools-rust
] ++ (with rustPlatform; [ rustPlatform.cargoSetupHook
cargoSetupHook cargo
rust.cargo rustc
rust.rustc ];
]);
# Remove when https://github.com/NixOS/nixpkgs/pull/190093 lands. # Remove when https://github.com/NixOS/nixpkgs/pull/190093 lands.
buildInputs = lib.optional stdenv.isDarwin libiconv; buildInputs = lib.optional stdenv.isDarwin libiconv;

6
pkgs/development/python-modules/breezy/default.nix
View File

@ -2,6 +2,7 @@
, stdenv , stdenv
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, cargo
, configobj , configobj
, cython , cython
, dulwich , dulwich
@ -18,6 +19,7 @@
, pythonOlder , pythonOlder
, installShellFiles , installShellFiles
, rustPlatform , rustPlatform
, rustc
, setuptools-gettext , setuptools-gettext
, setuptools-rust , setuptools-rust
, testers , testers
@ -49,8 +51,8 @@ buildPythonPackage rec {
cython cython
installShellFiles installShellFiles
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
rustPlatform.rust.cargo cargo
rustPlatform.rust.rustc rustc
setuptools-gettext setuptools-gettext
setuptools-rust setuptools-rust
]; ];

10
pkgs/development/python-modules/cryptg/default.nix
View File

@ -3,7 +3,9 @@
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, pythonOlder , pythonOlder
, cargo
, rustPlatform , rustPlatform
, rustc
, setuptools-rust , setuptools-rust
, libiconv , libiconv
}: }:
@ -27,11 +29,11 @@ buildPythonPackage rec {
hash = "sha256-AqSVFOB9Lfvk9h3GtoYlEOXBEt7YZYLhCDNKM9upQ2U="; hash = "sha256-AqSVFOB9Lfvk9h3GtoYlEOXBEt7YZYLhCDNKM9upQ2U=";
}; };
nativeBuildInputs = with rustPlatform;[ nativeBuildInputs = [
setuptools-rust setuptools-rust
cargoSetupHook rustPlatform.cargoSetupHook
rust.rustc rustc
rust.cargo cargo
]; ];
buildInputs = lib.optionals stdenv.isDarwin [ buildInputs = lib.optionals stdenv.isDarwin [

6
pkgs/development/python-modules/cryptography/default.nix
View File

@ -4,6 +4,8 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, rustPlatform , rustPlatform
, cargo
, rustc
, setuptools-rust , setuptools-rust
, openssl , openssl
, Security , Security
@ -58,7 +60,9 @@ buildPythonPackage rec {
] ++ [ ] ++ [
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
setuptools-rust setuptools-rust
] ++ (with rustPlatform; [ rust.cargo rust.rustc ]); cargo
rustc
];
buildInputs = [ openssl ] buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security libiconv ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]

11
pkgs/development/python-modules/etebase/default.nix
View File

@ -3,7 +3,9 @@
, fetchFromGitHub , fetchFromGitHub
, buildPythonPackage , buildPythonPackage
, rustPlatform , rustPlatform
, cargo
, pkg-config , pkg-config
, rustc
, rustfmt , rustfmt
, setuptools-rust , setuptools-rust
, openssl , openssl
@ -34,11 +36,10 @@ buildPythonPackage rec {
pkg-config pkg-config
rustfmt rustfmt
setuptools-rust setuptools-rust
] ++ (with rustPlatform; [ rustPlatform.cargoSetupHook
cargoSetupHook cargo
rust.cargo rustc
rust.rustc ];
]);
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];

13
pkgs/development/python-modules/gb-io/default.nix
View File

@ -3,6 +3,8 @@
, fetchFromGitHub , fetchFromGitHub
, buildPythonPackage , buildPythonPackage
, rustPlatform , rustPlatform
, cargo
, rustc
, setuptools-rust , setuptools-rust
, unittestCheckHook , unittestCheckHook
}: }:
@ -26,11 +28,12 @@ buildPythonPackage rec {
sourceRoot = "source"; sourceRoot = "source";
nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ nativeBuildInputs = [
cargoSetupHook setuptools-rust
rust.cargo rustPlatform.cargoSetupHook
rust.rustc cargo
]); rustc
];
nativeCheckInputs = [ unittestCheckHook ]; nativeCheckInputs = [ unittestCheckHook ];

12
pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix
View File

@ -2,6 +2,8 @@
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, rustPlatform , rustPlatform
, cargo
, rustc
, setuptools-rust , setuptools-rust
, json-stream-rs-tokenizer , json-stream-rs-tokenizer
, json-stream , json-stream
@ -31,12 +33,10 @@ buildPythonPackage rec {
nativeBuildInputs = [ nativeBuildInputs = [
setuptools-rust setuptools-rust
] rustPlatform.cargoSetupHook
++ (with rustPlatform; [ cargo
cargoSetupHook rustc
rust.cargo ];
rust.rustc
]);
# Tests depend on json-stream, which depends on this package. # Tests depend on json-stream, which depends on this package.
# To avoid infinite recursion, we only enable tests when building passthru.tests. # To avoid infinite recursion, we only enable tests when building passthru.tests.

6
pkgs/development/python-modules/libcst/default.nix
View File

@ -2,6 +2,7 @@
, stdenv , stdenv
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, cargo
, hypothesis , hypothesis
, libiconv , libiconv
, pytestCheckHook , pytestCheckHook
@ -9,6 +10,7 @@
, pythonOlder , pythonOlder
, pyyaml , pyyaml
, rustPlatform , rustPlatform
, rustc
, setuptools-rust , setuptools-rust
, setuptools-scm , setuptools-scm
, typing-extensions , typing-extensions
@ -50,7 +52,9 @@ buildPythonPackage rec {
setuptools-rust setuptools-rust
setuptools-scm setuptools-scm
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
] ++ (with rustPlatform; [ rust.cargo rust.rustc ]); cargo
rustc
];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

4
pkgs/development/python-modules/qiskit-terra/default.nix
View File

@ -3,7 +3,9 @@
, pythonOlder , pythonOlder
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, cargo
, rustPlatform , rustPlatform
, rustc
# Python requirements # Python requirements
, dill , dill
, numpy , numpy
@ -67,7 +69,7 @@ buildPythonPackage rec {
hash = "sha256-imktzBpgP+lq6FsVWIUK82+t76gKTgt53kPfKOnsseQ="; hash = "sha256-imktzBpgP+lq6FsVWIUK82+t76gKTgt53kPfKOnsseQ=";
}; };
nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ rust.rustc rust.cargo cargoSetupHook ]); nativeBuildInputs = [ setuptools-rust rustc cargo rustPlatform.cargoSetupHook ];
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src; inherit src;

8
pkgs/development/python-modules/rtoml/default.nix
View File

@ -1,10 +1,12 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, cargo
, fetchFromGitHub , fetchFromGitHub
, libiconv , libiconv
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
, rustPlatform , rustPlatform
, rustc
, setuptools-rust , setuptools-rust
}: }:
@ -29,9 +31,9 @@ buildPythonPackage rec {
nativeBuildInputs = with rustPlatform; [ nativeBuildInputs = with rustPlatform; [
setuptools-rust setuptools-rust
rust.rustc rustc
rust.cargo cargo
cargoSetupHook rustPlatform.cargoSetupHook
]; ];
buildInputs = [ buildInputs = [

13
pkgs/development/python-modules/rustworkx/default.nix
View File

@ -1,6 +1,8 @@
{ fetchFromGitHub { fetchFromGitHub
, buildPythonPackage , buildPythonPackage
, cargo
, rustPlatform , rustPlatform
, rustc
, setuptools-rust , setuptools-rust
, numpy , numpy
, fixtures , fixtures
@ -26,11 +28,12 @@ buildPythonPackage rec {
hash = "sha256-imhiPj763iumRQb+oeBOpICD1nCvzZx+3yQWu1QRRQQ="; hash = "sha256-imhiPj763iumRQb+oeBOpICD1nCvzZx+3yQWu1QRRQQ=";
}; };
nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ nativeBuildInputs = [
cargoSetupHook setuptools-rust
rust.cargo rustPlatform.cargoSetupHook
rust.rustc cargo
]); rustc
];
buildInputs = [ numpy ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; buildInputs = [ numpy ] ++ lib.optionals stdenv.isDarwin [ libiconv ];

10
pkgs/development/python-modules/safetensors/default.nix
View File

@ -1,12 +1,14 @@
{ stdenv { stdenv
, lib , lib
, buildPythonPackage , buildPythonPackage
, cargo
, fetchFromGitHub , fetchFromGitHub
, fetchpatch , fetchpatch
, h5py , h5py
, numpy , numpy
, pythonOlder , pythonOlder
, pytestCheckHook , pytestCheckHook
, rustc
, rustPlatform , rustPlatform
, setuptools-rust , setuptools-rust
, torch , torch
@ -45,11 +47,11 @@ buildPythonPackage rec {
sourceRoot = "source/bindings/python"; sourceRoot = "source/bindings/python";
nativeBuildInputs = with rustPlatform; [ nativeBuildInputs = [
setuptools-rust setuptools-rust
rust.cargo cargo
rust.rustc rustc
cargoSetupHook rustPlatform.cargoSetupHook
]; ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

12
pkgs/development/python-modules/setuptools-rust/pyo3-test/default.nix
View File

@ -1,5 +1,7 @@
{ callPackage { callPackage
, cargo
, rustPlatform , rustPlatform
, rustc
, setuptools-rust , setuptools-rust
}: }:
@ -11,11 +13,11 @@ callPackage ../../../tools/rust/maturin/pyo3-test/generic.nix {
# #
format = "setuptools"; format = "setuptools";
nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ nativeBuildInputs = [ setuptools-rust ] ++ [
cargoSetupHook rustPlatform.cargoSetupHook
rust.cargo cargo
rust.rustc rustc
]); ];
preConfigure = '' preConfigure = ''
# sourceRoot puts Cargo.lock in the wrong place due to the # sourceRoot puts Cargo.lock in the wrong place due to the

4
pkgs/development/python-modules/skytemple-rust/default.nix
View File

@ -1,10 +1,12 @@
{ lib { lib
, stdenv , stdenv
, buildPythonPackage , buildPythonPackage
, cargo
, fetchFromGitHub , fetchFromGitHub
, libiconv , libiconv
, Foundation , Foundation
, rustPlatform , rustPlatform
, rustc
, setuptools-rust , setuptools-rust
, range-typed-integers , range-typed-integers
}: }:
@ -27,7 +29,7 @@ buildPythonPackage rec {
}; };
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];
nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]); nativeBuildInputs = [ setuptools-rust rustPlatform.cargoSetupHook cargo rustc ];
propagatedBuildInputs = [ range-typed-integers ]; propagatedBuildInputs = [ range-typed-integers ];
GETTEXT_SYSTEM = true; GETTEXT_SYSTEM = true;

11
pkgs/development/python-modules/spacy-alignments/default.nix
View File

@ -1,10 +1,12 @@
{ lib { lib
, stdenv , stdenv
, cargo
, fetchPypi , fetchPypi
, fetchpatch , fetchpatch
, buildPythonPackage , buildPythonPackage
, isPy3k , isPy3k
, rustPlatform , rustPlatform
, rustc
, setuptools-rust , setuptools-rust
, libiconv , libiconv
}: }:
@ -28,11 +30,10 @@ buildPythonPackage rec {
nativeBuildInputs = [ nativeBuildInputs = [
setuptools-rust setuptools-rust
] ++ (with rustPlatform; [ rustPlatform.cargoSetupHook
cargoSetupHook cargo
rust.cargo rustc
rust.rustc ];
]);
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

6
pkgs/development/python-modules/tiktoken/default.nix
View File

@ -4,6 +4,8 @@
, fetchPypi , fetchPypi
, pythonOlder , pythonOlder
, rustPlatform , rustPlatform
, cargo
, rustc
, setuptools-rust , setuptools-rust
, libiconv , libiconv
, requests , requests
@ -40,7 +42,9 @@ buildPythonPackage {
nativeBuildInputs = [ nativeBuildInputs = [
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
setuptools-rust setuptools-rust
] ++ (with rustPlatform; [ rust.cargo rust.rustc ]); cargo
rustc
];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

11
pkgs/development/python-modules/tokenizers/default.nix
View File

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, buildPythonPackage , buildPythonPackage
, cargo
, datasets , datasets
, fetchFromGitHub , fetchFromGitHub
, fetchurl , fetchurl
@ -12,6 +13,7 @@
, pythonOlder , pythonOlder
, requests , requests
, rustPlatform , rustPlatform
, rustc
, Security , Security
, setuptools-rust , setuptools-rust
}: }:
@ -82,11 +84,10 @@ buildPythonPackage rec {
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
setuptools-rust setuptools-rust
] ++ (with rustPlatform; [ rustPlatform.cargoSetupHook
cargoSetupHook cargo
rust.cargo rustc
rust.rustc ];
]);
buildInputs = [ buildInputs = [
openssl openssl

3
pkgs/development/python-modules/wasmer/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv { stdenv
, lib , lib
, rustPlatform , rustPlatform
, rustc
, callPackage , callPackage
, fetchFromGitHub , fetchFromGitHub
, buildPythonPackage , buildPythonPackage
@ -93,7 +94,7 @@ rec {
pname = "wasmer-compiler-llvm"; pname = "wasmer-compiler-llvm";
buildAndTestSubdir = "packages/compiler-llvm"; buildAndTestSubdir = "packages/compiler-llvm";
cargoHash = "sha256-xawbf5gXXV+7I2F2fDSaMvjtFvGDBtqX7wL3c28TSbA="; cargoHash = "sha256-xawbf5gXXV+7I2F2fDSaMvjtFvGDBtqX7wL3c28TSbA=";
extraNativeBuildInputs = [ rustPlatform.rust.rustc.llvm ]; extraNativeBuildInputs = [ rustc.llvm ];
extraBuildInputs = [ libffi libxml2.out ncurses zlib ]; extraBuildInputs = [ libffi libxml2.out ncurses zlib ];
}; };

13
pkgs/development/python-modules/watchfiles/default.nix
View File

@ -2,8 +2,10 @@
, stdenv , stdenv
, anyio , anyio
, buildPythonPackage , buildPythonPackage
, cargo
, fetchFromGitHub , fetchFromGitHub
, rustPlatform , rustPlatform
, rustc
, setuptools-rust , setuptools-rust
, pythonOlder , pythonOlder
, dirty-equals , dirty-equals
@ -41,12 +43,11 @@ buildPythonPackage rec {
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
] ++ (with rustPlatform; [ rustPlatform.cargoSetupHook
cargoSetupHook rustPlatform.maturinBuildHook
maturinBuildHook cargo
rust.cargo rustc
rust.rustc ];
]);
propagatedBuildInputs = [ propagatedBuildInputs = [
anyio anyio

12
pkgs/development/python-modules/y-py/default.nix
View File

@ -3,6 +3,8 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, rustPlatform , rustPlatform
, cargo
, rustc
, libiconv , libiconv
, pytestCheckHook , pytestCheckHook
}: }:
@ -24,11 +26,11 @@ buildPythonPackage rec {
hash = "sha256-tpUDGBIHqXsKPsK+1h2sNuiV2I0pGVBokKh+hdFazRQ="; hash = "sha256-tpUDGBIHqXsKPsK+1h2sNuiV2I0pGVBokKh+hdFazRQ=";
}; };
nativeBuildInputs = with rustPlatform; [ nativeBuildInputs = [
cargoSetupHook rustPlatform.cargoSetupHook
maturinBuildHook rustPlatform.maturinBuildHook
rust.cargo cargo
rust.rustc rustc
]; ];
buildInputs = lib.optional stdenv.isDarwin libiconv; buildInputs = lib.optional stdenv.isDarwin libiconv;

6
pkgs/development/tools/ashpd-demo/default.nix
View File

@ -2,9 +2,11 @@
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, nix-update-script , nix-update-script
, cargo
, meson , meson
, ninja , ninja
, rustPlatform , rustPlatform
, rustc
, pkg-config , pkg-config
, glib , glib
, libshumate , libshumate
@ -44,9 +46,9 @@ stdenv.mkDerivation rec {
meson meson
ninja ninja
pkg-config pkg-config
rustPlatform.rust.cargo cargo
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
rustPlatform.rust.rustc rustc
wrapGAppsHook4 wrapGAppsHook4
rustPlatform.bindgenHook rustPlatform.bindgenHook
desktop-file-utils desktop-file-utils

11
pkgs/development/tools/build-managers/corrosion/default.nix
View File

@ -1,8 +1,10 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, cargo
, cmake , cmake
, rustPlatform , rustPlatform
, rustc
, libiconv , libiconv
}: }:
@ -30,11 +32,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
] ++ (with rustPlatform; [ rustPlatform.cargoSetupHook
cargoSetupHook cargo
rust.cargo rustc
rust.rustc ];
]);
meta = with lib; { meta = with lib; {
description = "Tool for integrating Rust into an existing CMake project"; description = "Tool for integrating Rust into an existing CMake project";

4
pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix
View File

@ -212,7 +212,7 @@ lib.composeManyExtensions [
nativeBuildInputs = with pkgs; nativeBuildInputs = with pkgs;
(old.nativeBuildInputs or [ ]) (old.nativeBuildInputs or [ ])
++ lib.optionals (lib.versionAtLeast old.version "4") ++ lib.optionals (lib.versionAtLeast old.version "4")
(with pkgs.rustPlatform; [ rust.rustc rust.cargo cargoSetupHook self.setuptools-rust ]); [ rustc cargo rustPlatform.cargoSetupHook self.setuptools-rust ];
} // lib.optionalAttrs (lib.versionAtLeast old.version "4") { } // lib.optionalAttrs (lib.versionAtLeast old.version "4") {
cargoDeps = cargoDeps =
pkgs.rustPlatform.fetchCargoTarball pkgs.rustPlatform.fetchCargoTarball
@ -402,7 +402,7 @@ lib.composeManyExtensions [
++ lib.optionals (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ] ++ lib.optionals (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ]
++ lib.optional (!self.isPyPy) pyBuildPackages.cffi ++ lib.optional (!self.isPyPy) pyBuildPackages.cffi
++ lib.optional (lib.versionAtLeast old.version "3.5" && !isWheel) ++ lib.optional (lib.versionAtLeast old.version "3.5" && !isWheel)
(with pkgs.rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]) (with pkgs; [ rustPlatform.cargoSetupHook cargo rustc ])
++ [ pkg-config ] ++ [ pkg-config ]
; ;
buildInputs = (old.buildInputs or [ ]) buildInputs = (old.buildInputs or [ ])

11
pkgs/development/tools/watchman/default.nix
View File

@ -1,4 +1,5 @@
{ boost { boost
, cargo
, cmake , cmake
, config , config
, CoreServices , CoreServices
@ -25,6 +26,7 @@
, pkg-config , pkg-config
, python3 , python3
, rustPlatform , rustPlatform
, rustc
, stateDir ? "/tmp" , stateDir ? "/tmp"
, stdenv , stdenv
, wangle , wangle
@ -56,11 +58,10 @@ stdenv.mkDerivation rec {
cmake cmake
pkg-config pkg-config
ensureNewerSourcesForZipFilesHook ensureNewerSourcesForZipFilesHook
] ++ (with rustPlatform; [ rustPlatform.cargoSetupHook
cargoSetupHook cargo
rust.cargo rustc
rust.rustc ];
]);
buildInputs = [ buildInputs = [
pcre pcre

3
pkgs/games/anki/default.nix
View File

@ -4,6 +4,7 @@
, fetchFromGitHub , fetchFromGitHub
, fetchYarnDeps , fetchYarnDeps
, fixup_yarn_lock , fixup_yarn_lock
, cargo
, installShellFiles , installShellFiles
, lame , lame
, mpv-unwrapped , mpv-unwrapped
@ -135,7 +136,7 @@ python3.pkgs.buildPythonApplication {
offlineYarn offlineYarn
installShellFiles installShellFiles
rustPlatform.rust.cargo cargo
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
ninja ninja
qt6.wrapQtAppsHook qt6.wrapQtAppsHook

6
pkgs/games/ddnet/default.nix
View File

@ -2,10 +2,12 @@
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch , fetchpatch
, cargo
, cmake , cmake
, ninja , ninja
, pkg-config , pkg-config
, rustPlatform , rustPlatform
, rustc
, curl , curl
, freetype , freetype
, libGLU , libGLU
@ -52,8 +54,8 @@ stdenv.mkDerivation rec {
cmake cmake
ninja ninja
pkg-config pkg-config
rustPlatform.rust.rustc rustc
rustPlatform.rust.cargo cargo
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
]; ];

10
pkgs/os-specific/linux/firmware/firmware-manager/default.nix
View File

@ -2,7 +2,9 @@
, stdenv , stdenv
, rustPlatform , rustPlatform
, fetchFromGitHub , fetchFromGitHub
, cargo
, pkg-config , pkg-config
, rustc
, openssl , openssl
, udev , udev
, gtk3 , gtk3
@ -32,11 +34,11 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile --replace '$(DESTDIR)/etc' '$(DESTDIR)$(prefix)/etc' substituteInPlace Makefile --replace '$(DESTDIR)/etc' '$(DESTDIR)$(prefix)/etc'
''; '';
nativeBuildInputs = with rustPlatform; [ nativeBuildInputs = [
rust.cargo cargo
rust.rustc rustc
pkg-config pkg-config
cargoSetupHook rustPlatform.cargoSetupHook
wrapGAppsHook wrapGAppsHook
]; ];

6
pkgs/servers/ldap/389/default.nix
View File

@ -3,6 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, autoconf , autoconf
, automake , automake
, cargo
, libtool , libtool
, pkg-config , pkg-config
, cracklib , cracklib
@ -25,6 +26,7 @@
, pcre2 , pcre2
, python3 , python3
, rustPlatform , rustPlatform
, rustc
, openssl , openssl
, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd
, zlib , zlib
@ -57,8 +59,8 @@ stdenv.mkDerivation rec {
libtool libtool
pkg-config pkg-config
python3 python3
rustPlatform.rust.cargo cargo
rustPlatform.rust.rustc rustc
] ]
++ lib.optional withCockpit rsync; ++ lib.optional withCockpit rsync;

3
pkgs/servers/ldap/lldap/default.nix
View File

@ -6,6 +6,7 @@
, lldap , lldap
, nixosTests , nixosTests
, rustPlatform , rustPlatform
, rustc
, stdenv , stdenv
, wasm-bindgen-cli , wasm-bindgen-cli
, wasm-pack , wasm-pack
@ -25,7 +26,7 @@ let
# replace with upstream wasm rustc, after resolution of # replace with upstream wasm rustc, after resolution of
# https://github.com/NixOS/nixpkgs/issues/89426 # https://github.com/NixOS/nixpkgs/issues/89426
rustc-wasm = (rustPlatform.rust.rustc.override { rustc-wasm = (rustc.override {
stdenv = stdenv.override { stdenv = stdenv.override {
targetPlatform = stdenv.targetPlatform // { targetPlatform = stdenv.targetPlatform // {
parsed = { parsed = {

5
pkgs/servers/matrix-synapse/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, python3, openssl, rustPlatform { lib, stdenv, fetchFromGitHub, python3, openssl, cargo, rustPlatform, rustc
, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform python3.pkgs.systemd , enableSystemd ? lib.meta.availableOn stdenv.hostPlatform python3.pkgs.systemd
, nixosTests , nixosTests
, enableRedis ? true , enableRedis ? true
@ -38,10 +38,9 @@ buildPythonApplication rec {
poetry-core poetry-core
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
setuptools-rust setuptools-rust
] ++ (with rustPlatform.rust; [
cargo cargo
rustc rustc
]); ];
buildInputs = [ openssl ]; buildInputs = [ openssl ];

6
pkgs/servers/matrix-synapse/matrix-hookshot/default.nix
View File

@ -6,7 +6,9 @@
, matrix-sdk-crypto-nodejs , matrix-sdk-crypto-nodejs
, mkYarnPackage , mkYarnPackage
, rust , rust
, cargo
, rustPlatform , rustPlatform
, rustc
, napi-rs-cli , napi-rs-cli
, nodejs , nodejs
}: }:
@ -44,8 +46,8 @@ mkYarnPackage rec {
nativeBuildInputs = [ nativeBuildInputs = [
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
rustPlatform.rust.cargo cargo
rustPlatform.rust.rustc rustc
napi-rs-cli napi-rs-cli
makeWrapper makeWrapper
]; ];

4
pkgs/servers/sql/postgresql/default.nix
View File

@ -22,7 +22,7 @@ let
# JIT # JIT
, jitSupport ? false , jitSupport ? false
, nukeReferences, patchelf, llvmPackages , nukeReferences, patchelf, llvmPackages
, makeRustPlatform, buildPgxExtension, rustPlatform , makeRustPlatform, buildPgxExtension, cargo, rustc
# detection of crypt fails when using llvm stdenv, so we add it manually # detection of crypt fails when using llvm stdenv, so we add it manually
# for <13 (where it got removed: https://github.com/postgres/postgres/commit/c45643d618e35ec2fe91438df15abd4f3c0d85ca) # for <13 (where it got removed: https://github.com/postgres/postgres/commit/c45643d618e35ec2fe91438df15abd4f3c0d85ca)
@ -215,7 +215,7 @@ let
stdenv = stdenv'; stdenv = stdenv';
rustPlatform = makeRustPlatform { rustPlatform = makeRustPlatform {
stdenv = stdenv'; stdenv = stdenv';
inherit (rustPlatform.rust) rustc cargo; inherit rustc cargo;
}; };
}; };
}; };

12
pkgs/tools/filesystems/stratisd/default.nix
View File

@ -2,6 +2,8 @@
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, rustPlatform , rustPlatform
, cargo
, rustc
, pkg-config , pkg-config
, asciidoc , asciidoc
, ncurses , ncurses
@ -52,11 +54,11 @@ stdenv.mkDerivation rec {
--replace udevadm "${udev}/bin/udevadm" --replace udevadm "${udev}/bin/udevadm"
''; '';
nativeBuildInputs = with rustPlatform; [ nativeBuildInputs = [
cargoSetupHook rustPlatform.cargoSetupHook
bindgenHook rustPlatform.bindgenHook
rust.cargo cargo
rust.rustc rustc
pkg-config pkg-config
asciidoc asciidoc
ncurses # tput ncurses # tput

6
pkgs/tools/misc/popsicle/default.nix
View File

@ -1,7 +1,9 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, cargo
, rustPlatform , rustPlatform
, rustc
, glib , glib
, pkg-config , pkg-config
, gdk-pixbuf , gdk-pixbuf
@ -32,8 +34,8 @@ stdenv.mkDerivation rec {
glib glib
pkg-config pkg-config
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
rustPlatform.rust.cargo cargo
rustPlatform.rust.rustc rustc
wrapGAppsHook wrapGAppsHook
]; ];

6
pkgs/tools/networking/mozillavpn/default.nix
View File

@ -1,4 +1,5 @@
{ buildGoModule { buildGoModule
, cargo
, cmake , cmake
, fetchFromGitHub , fetchFromGitHub
, go , go
@ -14,6 +15,7 @@
, qttools , qttools
, qtwebsockets , qtwebsockets
, rustPlatform , rustPlatform
, rustc
, stdenv , stdenv
, wireguard-tools , wireguard-tools
, wrapQtAppsHook , wrapQtAppsHook
@ -77,8 +79,8 @@ stdenv.mkDerivation {
python3.pkgs.pyyaml python3.pkgs.pyyaml
python3.pkgs.setuptools python3.pkgs.setuptools
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
rustPlatform.rust.cargo cargo
rustPlatform.rust.rustc rustc
wrapQtAppsHook wrapQtAppsHook
]; ];

6
pkgs/tools/networking/zerotierone/default.nix
View File

@ -4,11 +4,13 @@
, fetchFromGitHub , fetchFromGitHub
, buildPackages , buildPackages
, cargo
, iproute2 , iproute2
, lzo , lzo
, openssl , openssl
, pkg-config , pkg-config
, ronn , ronn
, rustc
, zlib , zlib
}: }:
@ -53,8 +55,8 @@ in stdenv.mkDerivation {
pkg-config pkg-config
ronn ronn
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
rustPlatform.rust.cargo cargo
rustPlatform.rust.rustc rustc
]; ];
buildInputs = [ buildInputs = [
iproute2 iproute2