From edf1999bb2ecc3a395d22876ec9c850f2577602a Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Thu, 2 Jun 2022 19:10:03 +0800
Subject: [PATCH] flake: update dependencies, rebuild with nix 2.8

---
 flake.lock | 119 ++++++++++++++---------------------------------------
 1 file changed, 31 insertions(+), 88 deletions(-)

diff --git a/flake.lock b/flake.lock
index c69db55d..ac54cc27 100644
--- a/flake.lock
+++ b/flake.lock
@@ -4,18 +4,18 @@
       "inputs": {
         "artiq-comtools": "artiq-comtools",
         "mozilla-overlay": "mozilla-overlay",
-        "nixpkgs": "nixpkgs_3",
-        "sipyco": "sipyco_2",
+        "nixpkgs": "nixpkgs",
+        "sipyco": "sipyco",
         "src-migen": "src-migen",
         "src-misoc": "src-misoc",
         "src-pythonparser": "src-pythonparser"
       },
       "locked": {
-        "lastModified": 1654001961,
-        "narHash": "sha256-aUJGmiG7JP02w0A7lPc6xP1uratZCmjlsXG9ImNX4z8=",
+        "lastModified": 1654087576,
+        "narHash": "sha256-d+LCvCXikhhEjsf4qBZakx3Sda85p+4vVZVwE1YuS90=",
         "ref": "master",
-        "rev": "8bf6bc4d1fdc92065b866d5f15e7593cf21a3ab3",
-        "revCount": 8062,
+        "rev": "68ef0073ea66fe9c7f7c178979ecb8c681c47caa",
+        "revCount": 8068,
         "type": "git",
         "url": "https://github.com/m-labs/artiq.git"
       },
@@ -26,15 +26,21 @@
     },
     "artiq-comtools": {
       "inputs": {
-        "nixpkgs": "nixpkgs",
-        "sipyco": "sipyco"
+        "nixpkgs": [
+          "artiq",
+          "nixpkgs"
+        ],
+        "sipyco": [
+          "artiq",
+          "sipyco"
+        ]
       },
       "locked": {
-        "lastModified": 1654001815,
-        "narHash": "sha256-wMVXlnMh64cWfG0LNpDExAGL5iHNoCstmVkOVr31NSE=",
+        "lastModified": 1654007592,
+        "narHash": "sha256-vaDFhE1ItjqtIcinC/6RAJGbj44pxxMUEeQUa3FtgEE=",
         "owner": "m-labs",
         "repo": "artiq-comtools",
-        "rev": "2b4899ecddfaac160f92341377262ac61d6329b7",
+        "rev": "cb73281154656ee8f74db1866859e31bf42755cd",
         "type": "github"
       },
       "original": {
@@ -78,11 +84,11 @@
     "mozilla-overlay_3": {
       "flake": false,
       "locked": {
-        "lastModified": 1645464064,
-        "narHash": "sha256-YeN4bpPvHkVOpQzb8APTAfE7/R+MFMwJUMkqmfvytSk=",
+        "lastModified": 1650459918,
+        "narHash": "sha256-sroCK+QJTmoXtcRkwZyKOP9iAYOPID2Bwdxn4GkG16w=",
         "owner": "mozilla",
         "repo": "nixpkgs-mozilla",
-        "rev": "15b7a05f20aab51c4ffbefddb1b448e862dccb7d",
+        "rev": "e1f7540fc0a8b989fb8cf701dc4fd7fc76bcf168",
         "type": "github"
       },
       "original": {
@@ -107,54 +113,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1653920503,
-        "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-22.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1653920503,
-        "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-22.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1653920503,
-        "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-22.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "artiq": "artiq",
@@ -164,32 +122,17 @@
     },
     "sipyco": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": [
+          "artiq",
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1654001788,
-        "narHash": "sha256-vUSep33N66pcvy7ojnBLSmyyVfN20+WZvP/c4b0T2CI=",
+        "lastModified": 1654006751,
+        "narHash": "sha256-OWAnoTCutvTQcYdtdtLQuL6uRtG+7Jz7sbRhcScv8bo=",
         "owner": "m-labs",
         "repo": "sipyco",
-        "rev": "951de4cf198419712ea3f52991d8f9293f3d9d15",
-        "type": "github"
-      },
-      "original": {
-        "owner": "m-labs",
-        "repo": "sipyco",
-        "type": "github"
-      }
-    },
-    "sipyco_2": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_4"
-      },
-      "locked": {
-        "lastModified": 1654001788,
-        "narHash": "sha256-vUSep33N66pcvy7ojnBLSmyyVfN20+WZvP/c4b0T2CI=",
-        "owner": "m-labs",
-        "repo": "sipyco",
-        "rev": "951de4cf198419712ea3f52991d8f9293f3d9d15",
+        "rev": "b3d03a94c751a24769c54a61a0dbe9d6af52dade",
         "type": "github"
       },
       "original": {
@@ -257,11 +200,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1653445336,
-        "narHash": "sha256-xuwesRrQiccopPTCkwGqQxld74X74q7EVsKIrE0zirc=",
+        "lastModified": 1654002148,
+        "narHash": "sha256-Ztzx7ze8o0gdu+sDpc+PS2M88h/b22rwFq0b12wMqZQ=",
         "ref": "master",
-        "rev": "605c8f73a60cf41a6e2d535c5850933d3154e935",
-        "revCount": 616,
+        "rev": "6cd32f6ee0e7bb7ce5a279f8be943903a393a476",
+        "revCount": 617,
         "type": "git",
         "url": "https://git.m-labs.hk/m-labs/zynq-rs"
       },