From e79318171bb39d3efea78f925a6600b095f1f2aa Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Tue, 27 Jul 2021 11:07:08 +0800
Subject: [PATCH] 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.
---
 artiq-fast/default.nix          |  3 ++-
 artiq-fast/pkgs/python-deps.nix | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/artiq-fast/default.nix b/artiq-fast/default.nix
index bed127c..d3af6aa 100644
--- a/artiq-fast/default.nix
+++ b/artiq-fast/default.nix
@@ -2,7 +2,8 @@
 with pkgs;
 let
   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 = [
     { target = "kasli"; variant = "tester"; }
diff --git a/artiq-fast/pkgs/python-deps.nix b/artiq-fast/pkgs/python-deps.nix
index c0d511b..da90002 100644
--- a/artiq-fast/pkgs/python-deps.nix
+++ b/artiq-fast/pkgs/python-deps.nix
@@ -86,21 +86,21 @@ rec {
 
   misoc = python3Packages.buildPythonPackage {
     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
       then (fetchFromGitHub {
         owner = "m-labs";
         repo = "misoc";
-        rev = "d84551418042cea0891ea743442e20684b51e77a";
-        sha256 = "1id5qjr9dl4r3vi6jdn7dfpnr2wb08nrm3nfscn18clbbdxybyjn";
+        rev = "79a27a82050266ce4d99d35ca0fe6b53a44649ac";
+        sha256 = "10pq3ll3h7mrfgk552nlr80v26gr4mvmpb5pd2h5ck2s9gpkkb82";
         fetchSubmodules = true;
       })
       else (fetchFromGitHub {
         owner = "m-labs";
         repo = "misoc";
-        rev = "7e5fe8d38835175202dad2c51d37b20b76fd9e16";
-        sha256 = "0i8bppz7x2s45lx9n49c0r87pqps09z35yzc17amvx21qsplahxn";
+        rev = "d84551418042cea0891ea743442e20684b51e77a";
+        sha256 = "1id5qjr9dl4r3vi6jdn7dfpnr2wb08nrm3nfscn18clbbdxybyjn";
         fetchSubmodules = true;
       });