From f07c747fa79e1b6263f6270e6c4ea94121dfbf82 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Fri, 12 Nov 2021 16:27:08 +0800
Subject: [PATCH] flake: update nac3, use patched nixpkgs from nac3

---
 flake.lock | 34 ++++++++++++++++------------------
 flake.nix  |  7 +++----
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8f8b53624..ce8d04b6a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "mozilla-overlay": {
       "flake": false,
       "locked": {
-        "lastModified": 1634833229,
-        "narHash": "sha256-uDbVCkW91/AY87mTwm8XrX2E133LTFqwYsYNNxBcY9M=",
+        "lastModified": 1636569584,
+        "narHash": "sha256-iDFogua24bhFJZSxG/jhZbbNxDXuKP9S/pyRIYzrRPM=",
         "owner": "mozilla",
         "repo": "nixpkgs-mozilla",
-        "rev": "6070a8ee799f629cb1d0004821f77ceed94d3992",
+        "rev": "9f70f86d73fa97e043bebeb58e5676d157069cfb",
         "type": "github"
       },
       "original": {
@@ -18,15 +18,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1635946136,
-        "narHash": "sha256-y1l0FK/nyRqb9CCImHNDJYYTtCnSNF2rK5RFc+qaMEg=",
+        "lastModified": 1636698608,
+        "narHash": "sha256-sxLLeQmH3UrP3UANqXzMLE0bPDgY5aIt04iBoPffG2E=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8429ae8722a319ebc26e9a38105e0797a824eb87",
+        "rev": "92c881b6a72abce5bb2f5db3f903b4871d13aaa9",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
+        "ref": "master",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -34,7 +35,6 @@
     "root": {
       "inputs": {
         "mozilla-overlay": "mozilla-overlay",
-        "nixpkgs": "nixpkgs",
         "src-migen": "src-migen",
         "src-misoc": "src-misoc",
         "src-nac3": "src-nac3",
@@ -60,11 +60,11 @@
     "src-misoc": {
       "flake": false,
       "locked": {
-        "lastModified": 1635235511,
-        "narHash": "sha256-XdBMBfup7JbUPzBi0An8GnQCIp7tiaczTrOwsPpvKCM=",
+        "lastModified": 1636527305,
+        "narHash": "sha256-/2XTejqj0Bo81HaTrlTSWwInnWwsuqnq+CURXbpIrkA=",
         "ref": "master",
-        "rev": "34e545c190e08ada3f59712bdb71208ac6c39cbc",
-        "revCount": 2397,
+        "rev": "f5203e406520874e15ab5d070058ef642fc57fd9",
+        "revCount": 2417,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/m-labs/misoc.git"
@@ -77,16 +77,14 @@
     },
     "src-nac3": {
       "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1636619740,
-        "narHash": "sha256-hJP4hjn9z2Mj/2I3jWZqqvUIOGGfmAKmmN6F8HegC4Y=",
+        "lastModified": 1636703241,
+        "narHash": "sha256-5Bm5+4YctgGGrX8ncZVDJ5LONKIFyGjqQexWLCGUI9k=",
         "ref": "master",
-        "rev": "612b6768c0b0099d8b1bbd4f51014bc0cacba0b6",
-        "revCount": 416,
+        "rev": "aa84fefa5629d1367a00d5703dd2f0b7ee7c26b0",
+        "revCount": 426,
         "type": "git",
         "url": "https://git.m-labs.hk/M-Labs/nac3.git"
       },
diff --git a/flake.nix b/flake.nix
index ada7bab88..c68745836 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,17 +1,16 @@
 {
   description = "A leading-edge control system for quantum information experiments";
 
-  inputs.nixpkgs.url = github:NixOS/nixpkgs;
   inputs.mozilla-overlay = { url = github:mozilla/nixpkgs-mozilla; flake = false; };
   inputs.src-sipyco = { url = github:m-labs/sipyco; flake = false; };
-  inputs.src-nac3 = { type = "git"; url = "https://git.m-labs.hk/M-Labs/nac3.git"; inputs.nixpkgs.follows = "nixpkgs"; };
+  inputs.src-nac3 = { type = "git"; url = "https://git.m-labs.hk/M-Labs/nac3.git"; };
 
   inputs.src-migen = { url = github:m-labs/migen; flake = false; };
   inputs.src-misoc = { type = "git"; url = "https://github.com/m-labs/misoc.git"; submodules = true; flake = false; };
 
-  outputs = { self, nixpkgs, mozilla-overlay, src-sipyco, src-nac3, src-migen, src-misoc }:
+  outputs = { self, mozilla-overlay, src-sipyco, src-nac3, src-migen, src-misoc }:
     let
-      pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ (import mozilla-overlay) ]; };
+      pkgs = import src-nac3.nixpkgs-patched { system = "x86_64-linux"; overlays = [ (import mozilla-overlay) ]; };
       rustManifest = pkgs.fetchurl {
         url = "https://static.rust-lang.org/dist/2021-01-29/channel-rust-nightly.toml";
         sha256 = "sha256-EZKgw89AH4vxaJpUHmIMzMW/80wAFQlfcxRoBD9nz0c=";