diff --git a/flake.lock b/flake.lock
index 3916a2404..4315f26f3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -27,11 +27,11 @@
     "mozilla-overlay": {
       "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": {
@@ -42,15 +42,14 @@
     },
     "nac3": {
       "inputs": {
-        "nixpkgs": "nixpkgs",
-        "sipyco": "sipyco"
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1650297523,
-        "narHash": "sha256-B61t3/L8rzyxl4AkaF3OrjnWKAWWwB06ZkmnD8hiScM=",
+        "lastModified": 1651045306,
+        "narHash": "sha256-YNrfAwepqN4Fv5tTLzuZeKEEFvY1uL25IC2wQAQPf40=",
         "ref": "master",
-        "rev": "42d1aad50734b70d7f05f8cfd89696facb4bf20f",
-        "revCount": 755,
+        "rev": "3f327113b25ce34519fe686bd5531ef0efa31e27",
+        "revCount": 763,
         "type": "git",
         "url": "https://git.m-labs.hk/m-labs/nac3.git"
       },
@@ -61,27 +60,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1650244918,
-        "narHash": "sha256-DsS5nxjTpnoUC4pNXJI1rit7TnDTij8vQDa5PtcDCD0=",
+        "lastModified": 1650921206,
+        "narHash": "sha256-RGlfTC2ktqLVw0gBvZeCM//B4ig2CdQJm39sDvm0DBQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7b38b03d76ab71bdc8dc325e3f6338d984cc35ca",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-21.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1650244918,
-        "narHash": "sha256-DsS5nxjTpnoUC4pNXJI1rit7TnDTij8vQDa5PtcDCD0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "7b38b03d76ab71bdc8dc325e3f6338d984cc35ca",
+        "rev": "3a9e0f239d80fa134e8fcbdee4dfc793902da37e",
         "type": "github"
       },
       "original": {
@@ -96,30 +79,12 @@
         "artiq-comtools": "artiq-comtools",
         "mozilla-overlay": "mozilla-overlay",
         "nac3": "nac3",
-        "sipyco": "sipyco_2",
+        "sipyco": "sipyco",
         "src-migen": "src-migen",
         "src-misoc": "src-misoc"
       }
     },
     "sipyco": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1649724535,
-        "narHash": "sha256-15Nun4EY35j+6SPZkjzZtyH/ncxLS60KuGJjFh5kSTc=",
-        "owner": "m-labs",
-        "repo": "sipyco",
-        "rev": "939f84f9b5eef7efbf7423c735d1834783b6140e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "m-labs",
-        "repo": "sipyco",
-        "type": "github"
-      }
-    },
-    "sipyco_2": {
       "inputs": {
         "nixpkgs": [
           "nac3",
@@ -143,11 +108,11 @@
     "src-migen": {
       "flake": false,
       "locked": {
-        "lastModified": 1639659493,
-        "narHash": "sha256-qpVj/yJf4hDDc99XXpVPH4EbLC8aCmEtACn5qNc3DGI=",
+        "lastModified": 1650337393,
+        "narHash": "sha256-rm1SlFmF2ASz0vIy2nDEzGlyRw2oYNeJRr8Kh8Mg2Qc=",
         "owner": "m-labs",
         "repo": "migen",
-        "rev": "ac703010eaa06ac9b6e32f97c6fa98b15de22b31",
+        "rev": "d4e3f34177c32f09904397179e6ed9c83175e528",
         "type": "github"
       },
       "original": {