M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

flake: fix rustPlatform deprecation warnings

This commit is contained in:
Sebastien Bourdeauducq 2023-05-27 17:40:36 +08:00
parent b9c7905b20
commit 779810163f
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.nix
View File

@ -96,7 +96,7 @@
libartiq-support = pkgs.stdenv.mkDerivation { libartiq-support = pkgs.stdenv.mkDerivation {
name = "libartiq-support"; name = "libartiq-support";
src = self; src = self;
buildInputs = [ rustPlatform.rust.rustc ]; buildInputs = [ rust ];
buildPhase = '' buildPhase = ''
rustc $src/artiq/test/libartiq_support/lib.rs -Cpanic=unwind -g rustc $src/artiq/test/libartiq_support/lib.rs -Cpanic=unwind -g
''; '';
@ -225,8 +225,7 @@
}; };
nativeBuildInputs = [ nativeBuildInputs = [
(pkgs.python3.withPackages(ps: [ ps.jsonschema migen misoc (artiq.withExperimentalFeatures experimentalFeatures) ])) (pkgs.python3.withPackages(ps: [ ps.jsonschema migen misoc (artiq.withExperimentalFeatures experimentalFeatures) ]))
rustPlatform.rust.rustc rust
rustPlatform.rust.cargo
pkgs.cargo-xbuild pkgs.cargo-xbuild
pkgs.llvmPackages_11.clang-unwrapped pkgs.llvmPackages_11.clang-unwrapped
pkgs.llvm_11 pkgs.llvm_11
@ -386,8 +385,7 @@
name = "artiq-dev-shell"; name = "artiq-dev-shell";
buildInputs = [ buildInputs = [
(pkgs.python3.withPackages(ps: with packages.x86_64-linux; [ migen misoc artiq ps.paramiko ps.jsonschema microscope ])) (pkgs.python3.withPackages(ps: with packages.x86_64-linux; [ migen misoc artiq ps.paramiko ps.jsonschema microscope ]))
rustPlatform.rust.rustc rust
rustPlatform.rust.cargo
pkgs.cargo-xbuild pkgs.cargo-xbuild
pkgs.llvmPackages_11.clang-unwrapped pkgs.llvmPackages_11.clang-unwrapped
pkgs.llvm_11 pkgs.llvm_11