M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

artiq-fast: remove xbuild since upstream doesn't need it anymore #74

Closed
stevefan1999 wants to merge 1 commits from stevefan1999/nix-scripts:master into master
pull from: stevefan1999/nix-scripts:master
merge into: M-Labs:master
Conversation 1 Commits 1 Files Changed 1 -13
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit eb45add9fa - Show all commits

13
artiq-fast/artiq-board.nix
View File

@ -50,18 +50,6 @@ let
sha256 = "sha256-Lf6M4M/jdRiO5MsWSoqtOSNfRIhbze+qvg4kaiiBWW4="; sha256 = "sha256-Lf6M4M/jdRiO5MsWSoqtOSNfRIhbze+qvg4kaiiBWW4=";
}; };
cargo-xbuild = rustPlatform.buildRustPackage rec {
pname = "cargo-xbuild";
version = "0.6.5";
src = pkgs.fetchFromGitHub {
owner = "rust-osdev";
repo = pname;
rev = "v${version}";
sha256 = "18djvygq9v8rmfchvi2hfj0i6fhn36m716vqndqnj56fiqviwxvf";
};
cargoSha256 = "13sj9j9kl6js75h9xq0yidxy63vixxm9q3f8jil6ymarml5wkhx8";
};
artiq7 = pkgs.lib.strings.versionAtLeast artiqpkgs.artiq.version "7.0"; artiq7 = pkgs.lib.strings.versionAtLeast artiqpkgs.artiq.version "7.0";
in in
@ -88,7 +76,6 @@ pkgs.python3Packages.toPythonModule (pkgs.stdenv.mkDerivation rec {
pkgs.llvm_11 pkgs.llvm_11
pkgs.lld_11 pkgs.lld_11
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
cargo-xbuild
] else [ ] else [
artiqpkgs.cargo-legacy artiqpkgs.cargo-legacy
artiqpkgs.rustc-legacy artiqpkgs.rustc-legacy