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

---
 flake.lock | 113 +++++++++++++----------------------------------------
 1 file changed, 28 insertions(+), 85 deletions(-)

diff --git a/flake.lock b/flake.lock
index efa455e..70fbf38 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": 1653635853,
-        "narHash": "sha256-z/WpkQyQou8ESyMvpii18u9S6oC/owuNUfQWG4uMoWs=",
+        "lastModified": 1654087576,
+        "narHash": "sha256-d+LCvCXikhhEjsf4qBZakx3Sda85p+4vVZVwE1YuS90=",
         "ref": "master",
-        "rev": "7cff63e5394943b6f59aca5183f39f19d77add11",
-        "revCount": 8058,
+        "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": 1653635602,
-        "narHash": "sha256-8Osaeuo5/Yq4sU4mhsIXwmy7ZX3iDBbAAZF3lu1+KdQ=",
+        "lastModified": 1654007592,
+        "narHash": "sha256-vaDFhE1ItjqtIcinC/6RAJGbj44pxxMUEeQUa3FtgEE=",
         "owner": "m-labs",
         "repo": "artiq-comtools",
-        "rev": "accc6dd0ca1c1c240b906b14c5cb13098a14906b",
+        "rev": "cb73281154656ee8f74db1866859e31bf42755cd",
         "type": "github"
       },
       "original": {
@@ -61,64 +67,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1653229824,
-        "narHash": "sha256-klSCYMpR4TqWYoTD/xZ2qM9UIPRFC6pK+S/kJuVLbFw=",
+        "lastModified": 1653920503,
+        "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "06db2e2197401b74fcf82d4e84be15b0b5851c7b",
+        "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-21.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1653229824,
-        "narHash": "sha256-klSCYMpR4TqWYoTD/xZ2qM9UIPRFC6pK+S/kJuVLbFw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "06db2e2197401b74fcf82d4e84be15b0b5851c7b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-21.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1653229824,
-        "narHash": "sha256-klSCYMpR4TqWYoTD/xZ2qM9UIPRFC6pK+S/kJuVLbFw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "06db2e2197401b74fcf82d4e84be15b0b5851c7b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-21.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1653229824,
-        "narHash": "sha256-klSCYMpR4TqWYoTD/xZ2qM9UIPRFC6pK+S/kJuVLbFw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "06db2e2197401b74fcf82d4e84be15b0b5851c7b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-21.11",
+        "ref": "nixos-22.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -130,32 +88,17 @@
     },
     "sipyco": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": [
+          "artiq",
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1653633179,
-        "narHash": "sha256-xyHQ77RXI9Zq9is+9laArq1HnlyubozL+Ht9BEQGXow=",
+        "lastModified": 1654006751,
+        "narHash": "sha256-OWAnoTCutvTQcYdtdtLQuL6uRtG+7Jz7sbRhcScv8bo=",
         "owner": "m-labs",
         "repo": "sipyco",
-        "rev": "438f649864c58fa2eb213030a336864bba3a18a8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "m-labs",
-        "repo": "sipyco",
-        "type": "github"
-      }
-    },
-    "sipyco_2": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_4"
-      },
-      "locked": {
-        "lastModified": 1653633179,
-        "narHash": "sha256-xyHQ77RXI9Zq9is+9laArq1HnlyubozL+Ht9BEQGXow=",
-        "owner": "m-labs",
-        "repo": "sipyco",
-        "rev": "438f649864c58fa2eb213030a336864bba3a18a8",
+        "rev": "b3d03a94c751a24769c54a61a0dbe9d6af52dade",
         "type": "github"
       },
       "original": {