From e38bf09c260420325b539478321882a1abf598f5 Mon Sep 17 00:00:00 2001
From: mwojcik <mw@m-labs.hk>
Date: Wed, 19 Jan 2022 16:21:31 +0800
Subject: [PATCH] cargo: set minimq version to 0.1.0 flake: removed check
 phase, develop fix, update rust manifest

---
 Cargo.toml |  2 +-
 flake.nix  | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 4b27d38..8b2958e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,7 @@ stm32h7xx-hal = {version = "0.7.1", features = [ "stm32h743v", "rt", "unproven",
 smoltcp = { version = "0.6.0", default-features = false, features = [ "ethernet", "proto-ipv4", "proto-ipv6", "socket-tcp" ] }
 nb = "1.0.0"
 embedded-nal = "0.1.0"
-minimq = { git = "https://github.com/quartiq/minimq.git", branch = "master" }
+minimq = { version = "0.1.0", git = "https://github.com/quartiq/minimq.git" }
 heapless = "0.5.6"
 nom = { version = "5.1.2", default-features = false, features = [] }
 ryu = "1.0"
diff --git a/flake.nix b/flake.nix
index 24de16f..19f8cef 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,8 +9,8 @@
     let
       pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ (import mozilla-overlay) ]; };
       rustManifest = pkgs.fetchurl {
-        url = "https://static.rust-lang.org/dist/2020-07-29/channel-rust-nightly.toml";
-        sha256 = "sha256-h8Irym/tKl0cJY3DmoxRD81IYZB/xLf7/AILLDuxDKY=";
+        url = "https://static.rust-lang.org/dist/2020-10-30/channel-rust-nightly.toml";
+        sha256 = "0iygcwzh8s0lfdghj5809krvzifc1ii1wm4sd3qqn7s0rz1s14hi";
       };
 
       migen = pkgs.python3Packages.buildPythonPackage rec {
@@ -52,10 +52,10 @@
 
         nativeBuildInputs = [
           pkgs.llvm
-          (pkgs.python3.withPackages(ps: [ migen ]))
           pkgs.yosys
           pkgs.nextpnr
           pkgs.icestorm
+          (pkgs.python3.withPackages(ps: [ migen ]))
         ];
 
         buildPhase = ''
@@ -70,6 +70,7 @@
           echo file binary-dist $out/humpback-dds.bin >> $out/nix-support/hydra-build-products
         '';
 
+        doCheck = false;
         dontFixup = true;
       };
     in {
@@ -86,7 +87,8 @@
         buildInputs = with pkgs; [
           rustPlatform.rust.rustc
           rustPlatform.rust.cargo
-          openocd dfu-util
+          openocd dfu-util 
+          yosys nextpnr icestorm
           ] ++ (with python3Packages; [
             numpy matplotlib migen
           ]);