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

update misoc 

Use misoc with newer (risc-v) libunwind for beta.
Update misoc for ARTIQ legacy to the version used in stable, so we do not have to carry too many versions around.
unstable-2021-02-15 has seen good testing with 10/100 Ethernet support on Kasli being the main change.
This commit is contained in:
Sebastien Bourdeauducq 2021-07-27 11:07:08 +08:00
parent c9efc20aeb
commit e79318171b
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
artiq-fast/default.nix
View File

@ -2,7 +2,8 @@
with pkgs; with pkgs;
let let
artiq6 = pkgs.lib.strings.versionAtLeast mainPackages.artiq.version "6.0"; artiq6 = pkgs.lib.strings.versionAtLeast mainPackages.artiq.version "6.0";
pythonDeps = import ./pkgs/python-deps.nix { inherit (pkgs) lib fetchgit fetchFromGitHub python3Packages; misoc-new = artiq6; }; artiq7 = pkgs.lib.strings.versionAtLeast mainPackages.artiq.version "7.0";
pythonDeps = import ./pkgs/python-deps.nix { inherit (pkgs) lib fetchgit fetchFromGitHub python3Packages; misoc-new = artiq7; };
boards = [ boards = [
{ target = "kasli"; variant = "tester"; } { target = "kasli"; variant = "tester"; }

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

@ -86,21 +86,21 @@ rec {
misoc = python3Packages.buildPythonPackage { misoc = python3Packages.buildPythonPackage {
pname = "misoc"; pname = "misoc";
version = if misoc-new then "unstable-2021-02-15" else "unstable-2020-05-29"; version = if misoc-new then "unstable-2021-07-22" else "unstable-2021-02-15";
src = if misoc-new src = if misoc-new
then (fetchFromGitHub { then (fetchFromGitHub {
owner = "m-labs"; owner = "m-labs";
repo = "misoc"; repo = "misoc";
rev = "d84551418042cea0891ea743442e20684b51e77a"; rev = "79a27a82050266ce4d99d35ca0fe6b53a44649ac";
sha256 = "1id5qjr9dl4r3vi6jdn7dfpnr2wb08nrm3nfscn18clbbdxybyjn"; sha256 = "10pq3ll3h7mrfgk552nlr80v26gr4mvmpb5pd2h5ck2s9gpkkb82";
fetchSubmodules = true; fetchSubmodules = true;
}) })
else (fetchFromGitHub { else (fetchFromGitHub {
owner = "m-labs"; owner = "m-labs";
repo = "misoc"; repo = "misoc";
rev = "7e5fe8d38835175202dad2c51d37b20b76fd9e16"; rev = "d84551418042cea0891ea743442e20684b51e77a";
sha256 = "0i8bppz7x2s45lx9n49c0r87pqps09z35yzc17amvx21qsplahxn"; sha256 = "1id5qjr9dl4r3vi6jdn7dfpnr2wb08nrm3nfscn18clbbdxybyjn";
fetchSubmodules = true; fetchSubmodules = true;
}); });