From 5a7dbb3f29676f465c550cae4859c9db6faac477 Mon Sep 17 00:00:00 2001
From: mwojcik <mw@m-labs.hk>
Date: Fri, 8 Apr 2022 15:50:11 +0800
Subject: [PATCH] flake: update sypico dependency (fix duplicate)

---
 flake.lock | 85 +++++++++---------------------------------------------
 1 file changed, 14 insertions(+), 71 deletions(-)

diff --git a/flake.lock b/flake.lock
index e6ff139..dbee101 100644
--- a/flake.lock
+++ b/flake.lock
@@ -4,8 +4,8 @@
       "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"
@@ -26,8 +26,14 @@
     },
     "artiq-comtools": {
       "inputs": {
-        "nixpkgs": "nixpkgs",
-        "sipyco": "sipyco"
+        "nixpkgs": [
+          "artiq",
+          "nixpkgs"
+        ],
+        "sipyco": [
+          "artiq",
+          "sipyco"
+        ]
       },
       "locked": {
         "lastModified": 1647688999,
@@ -92,38 +98,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1649117019,
-        "narHash": "sha256-ID7nw/8MDgqj/cbJ0wy6AtQ9wp58hSnE6+weZwuHnso=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ccb90fb9e11459aeaf83cc28d5f8910816d90dd0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-21.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1649117019,
-        "narHash": "sha256-ID7nw/8MDgqj/cbJ0wy6AtQ9wp58hSnE6+weZwuHnso=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ccb90fb9e11459aeaf83cc28d5f8910816d90dd0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-21.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1647490331,
         "narHash": "sha256-Jcc+vHNDN3KDWuzGNTl3A24ICGovPneJDejiN2t57QI=",
@@ -139,22 +113,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1649117019,
-        "narHash": "sha256-ID7nw/8MDgqj/cbJ0wy6AtQ9wp58hSnE6+weZwuHnso=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ccb90fb9e11459aeaf83cc28d5f8910816d90dd0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-21.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "artiq": "artiq",
@@ -164,25 +122,10 @@
     },
     "sipyco": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1649151322,
-        "narHash": "sha256-CwTpGx2Vx/m3bMbeWMculOSsvGmg+OD/hd69dxBwU48=",
-        "owner": "m-labs",
-        "repo": "sipyco",
-        "rev": "4a4a04988206db8821c3c8fa33dca478c738677c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "m-labs",
-        "repo": "sipyco",
-        "type": "github"
-      }
-    },
-    "sipyco_2": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": [
+          "artiq",
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1647688038,