Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rustPlatform.rust: deprecate #230951

Merged
merged 2 commits into from
May 12, 2023
Merged

rustPlatform.rust: deprecate #230951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b63134
treewide: don't use rustPlatform.rust
alyssais May 12, 2023
d0f8e51
rustPlatform.rust: deprecate
alyssais May 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions doc/languages-frameworks/rust.section.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,9 @@ directory of the `tokenizers` project's source archive, we use
```nix
{ fetchFromGitHub
, buildPythonPackage
, cargo
, rustPlatform
, rustc
, setuptools-rust
}:

Expand All @@ -558,11 +560,12 @@ buildPythonPackage rec {

sourceRoot = "source/bindings/python";

nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [
cargoSetupHook
rust.cargo
rust.rustc
]);
nativeBuildInputs = [
cargo
rustPlatform.cargoSetupHook
rustc
setuptools-rust
];

# ...
}
Expand Down
6 changes: 4 additions & 2 deletions pkgs/applications/accessibility/contrast/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
, lib
, fetchFromGitLab
, cairo
, cargo
, desktop-file-utils
, gettext
, glib
Expand All @@ -12,6 +13,7 @@
, pango
, pkg-config
, rustPlatform
, rustc
, wrapGAppsHook4
}:

Expand Down Expand Up @@ -40,9 +42,9 @@ stdenv.mkDerivation rec {
meson
ninja
pkg-config
rustPlatform.rust.cargo
cargo
rustPlatform.cargoSetupHook
rustPlatform.rust.rustc
rustc
wrapGAppsHook4
];

Expand Down
11 changes: 6 additions & 5 deletions pkgs/applications/accessibility/squeekboard/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitLab
, cargo
, meson
, ninja
, pkg-config
Expand All @@ -14,6 +15,7 @@
, libxml2
, libxkbcommon
, rustPlatform
, rustc
, feedbackd
, wrapGAppsHook
, fetchpatch
Expand Down Expand Up @@ -54,11 +56,10 @@ stdenv.mkDerivation rec {
glib
wayland
wrapGAppsHook
] ++ (with rustPlatform; [
cargoSetupHook
rust.cargo
rust.rustc
]);
rustPlatform.cargoSetupHook
cargo
rustc
];

buildInputs = [
gtk3
Expand Down
11 changes: 6 additions & 5 deletions pkgs/applications/audio/amberol/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
, stdenv
, fetchFromGitLab
, rustPlatform
, cargo
, desktop-file-utils
, appstream-glib
, meson
, ninja
, pkg-config
, reuse
, rustc
, m4
, wrapGAppsHook4
, glib
Expand Down Expand Up @@ -48,11 +50,10 @@ stdenv.mkDerivation rec {
reuse
m4
wrapGAppsHook4
] ++ (with rustPlatform; [
cargoSetupHook
rust.cargo
rust.rustc
]);
rustPlatform.cargoSetupHook
cargo
rustc
];

buildInputs = [
glib
Expand Down
6 changes: 4 additions & 2 deletions pkgs/applications/audio/gnome-podcasts/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
, rustPlatform
, fetchFromGitLab
, fetchpatch
, cargo
, meson
, ninja
, gettext
, python3
, pkg-config
, rustc
, glib
, libhandy
, gtk3
Expand Down Expand Up @@ -55,9 +57,9 @@ stdenv.mkDerivation rec {
pkg-config
gettext
python3
rustPlatform.rust.cargo
cargo
rustPlatform.cargoSetupHook
rustPlatform.rust.rustc
rustc
wrapGAppsHook
glib
];
Expand Down
6 changes: 4 additions & 2 deletions pkgs/applications/audio/helvum/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ lib
, cargo
, clang
, desktop-file-utils
, fetchFromGitLab
Expand All @@ -11,6 +12,7 @@
, pipewire
, pkg-config
, rustPlatform
, rustc
, stdenv
}:

Expand Down Expand Up @@ -38,8 +40,8 @@ stdenv.mkDerivation rec {
ninja
pkg-config
rustPlatform.cargoSetupHook
rustPlatform.rust.cargo
rustPlatform.rust.rustc
cargo
rustc
rustPlatform.bindgenHook
];

Expand Down
11 changes: 6 additions & 5 deletions pkgs/applications/audio/mousai/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
, stdenv
, fetchFromGitHub
, appstream-glib
, cargo
, dbus
, desktop-file-utils
, glib
Expand All @@ -16,6 +17,7 @@
, ninja
, pkg-config
, rustPlatform
, rustc
, wrapGAppsHook4
}:

Expand Down Expand Up @@ -43,11 +45,10 @@ stdenv.mkDerivation rec {
ninja
pkg-config
wrapGAppsHook4
] ++ (with rustPlatform; [
cargoSetupHook
rust.cargo
rust.rustc
]);
rustPlatform.cargoSetupHook
cargo
rustc
];

buildInputs = [
dbus
Expand Down
11 changes: 6 additions & 5 deletions pkgs/applications/audio/netease-cloud-music-gtk/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
, stdenv
, fetchFromGitHub
, rustPlatform
, cargo
, meson
, ninja
, pkg-config
Expand All @@ -10,6 +11,7 @@
, appstream-glib
, desktop-file-utils
, libxml2
, rustc
, wrapGAppsHook4
, openssl
, dbus
Expand Down Expand Up @@ -47,11 +49,10 @@ stdenv.mkDerivation rec {
desktop-file-utils # update-desktop-database
libxml2 # xmllint
wrapGAppsHook4
] ++ (with rustPlatform; [
cargoSetupHook
rust.cargo
rust.rustc
]);
rustPlatform.cargoSetupHook
cargo
rustc
];

buildInputs = [
openssl
Expand Down
6 changes: 4 additions & 2 deletions pkgs/applications/audio/shortwave/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchFromGitLab
, cargo
, dbus
, desktop-file-utils
, gdk-pixbuf
Expand All @@ -15,6 +16,7 @@
, openssl
, pkg-config
, rustPlatform
, rustc
, sqlite
, wrapGAppsHook4
, cmake
Expand Down Expand Up @@ -47,9 +49,9 @@ stdenv.mkDerivation rec {
meson
ninja
pkg-config
rustPlatform.rust.cargo
cargo
rustPlatform.cargoSetupHook
rustPlatform.rust.rustc
rustc
wrapGAppsHook4
cmake
];
Expand Down
6 changes: 4 additions & 2 deletions pkgs/applications/audio/spot/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
, gettext
, python3
, desktop-file-utils
, cargo
, rustPlatform
, rustc
, pkg-config
, glib
, libadwaita
Expand Down Expand Up @@ -45,9 +47,9 @@ stdenv.mkDerivation rec {
gtk4 # for gtk-update-icon-cache
glib # for glib-compile-schemas
desktop-file-utils
rustPlatform.rust.cargo
cargo
rustPlatform.cargoSetupHook
rustPlatform.rust.rustc
rustc
wrapGAppsHook4
];

Expand Down
11 changes: 6 additions & 5 deletions pkgs/applications/backup/pika-backup/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
, fetchFromGitLab
, rustPlatform
, substituteAll
, cargo
, desktop-file-utils
, git
, itstool
, meson
, ninja
, pkg-config
, python3
, rustc
, wrapGAppsHook4
, borgbackup
, gtk4
Expand Down Expand Up @@ -55,11 +57,10 @@ stdenv.mkDerivation rec {
pkg-config
python3
wrapGAppsHook4
] ++ (with rustPlatform; [
cargoSetupHook
rust.cargo
rust.rustc
]);
rustPlatform.cargoSetupHook
cargo
rustc
];

buildInputs = [
gtk4
Expand Down
11 changes: 6 additions & 5 deletions pkgs/applications/graphics/emblem/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
, fetchFromGitLab
, rustPlatform
, appstream-glib
, cargo
, desktop-file-utils
, glib
, meson
, ninja
, pkg-config
, rustc
, wrapGAppsHook4
, gtk4
, libadwaita
Expand Down Expand Up @@ -43,11 +45,10 @@ stdenv.mkDerivation rec {
ninja
pkg-config
wrapGAppsHook4
] ++ (with rustPlatform; [
cargoSetupHook
rust.cargo
rust.rustc
]);
rustPlatform.cargoSetupHook
cargo
rustc
];

buildInputs = [
gtk4
Expand Down
11 changes: 6 additions & 5 deletions pkgs/applications/graphics/eyedropper/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
, stdenv
, fetchFromGitHub
, rustPlatform
, cargo
, pkg-config
, meson
, ninja
, glib
, gtk4
, libadwaita
, rustc
, wrapGAppsHook4
, appstream-glib
, desktop-file-utils
Expand Down Expand Up @@ -37,11 +39,10 @@ stdenv.mkDerivation rec {
wrapGAppsHook4
appstream-glib
desktop-file-utils
] ++ (with rustPlatform; [
rust.cargo
rust.rustc
cargoSetupHook
]);
cargo
rustc
rustPlatform.cargoSetupHook
];

buildInputs = [
glib
Expand Down
Loading