stevefan1999
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: stevefan1999:patch-migen-axl
Branches Tags
stevefan1999:master
stevefan1999:patch-migen-axl
M-Labs:master
..
compare: stevefan1999:master
Branches Tags
stevefan1999:patch-migen-axl
stevefan1999:master
M-Labs:master

No commits in common. "patch-migen-axl" and "master" have entirely different histories.
patch-mige ... master

2 changed files with 13 additions and 2 deletions
Show Stats Expand all files Collapse all files

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

@ -50,6 +50,18 @@ 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
@ -76,6 +88,7 @@ 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

2
artiq-fast/pkgs/python-deps.nix
View File

@ -238,8 +238,6 @@ rec {
--replace "toolz==0.10.0" "toolz" --replace "toolz==0.10.0" "toolz"
substituteInPlace requirements.txt \ substituteInPlace requirements.txt \
--replace "pyserial==3.4" "pyserial" --replace "pyserial==3.4" "pyserial"
substituteInPlace requirements.txt \
--replace "markupsafe==1.1.1" "markupsafe"
''; '';