From e20c77650d0384f4fae83ffcb4386688c879c992 Mon Sep 17 00:00:00 2001 From: mwojcik Date: Wed, 25 May 2022 12:52:39 +0800 Subject: [PATCH] flake: update dependencies --- flake.lock | 125 +++++++++++++++-------------------------------------- 1 file changed, 34 insertions(+), 91 deletions(-) diff --git a/flake.lock b/flake.lock index 5401cba6..5becd39b 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": 1650337489, - "narHash": "sha256-pKS38KZKiibPHX57iwmlH7i3JqdVVK8HYkxeifRqsY0=", + "lastModified": 1652950139, + "narHash": "sha256-t+u0KQPnq+vGF9PhrGKMnj2BtknODijQYqAH9nufaSY=", "ref": "master", - "rev": "58b59b99ff665860a5101075d4e2e2a47e35db43", - "revCount": 8030, + "rev": "cf8e5838474ed1c6f9252ad0caa0f2773c7e0565", + "revCount": 8053, "type": "git", "url": "https://github.com/m-labs/artiq.git" }, @@ -26,8 +26,14 @@ }, "artiq-comtools": { "inputs": { - "nixpkgs": "nixpkgs", - "sipyco": "sipyco" + "nixpkgs": [ + "artiq", + "nixpkgs" + ], + "sipyco": [ + "artiq", + "sipyco" + ] }, "locked": { "lastModified": 1649124276, @@ -46,11 +52,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": { @@ -62,11 +68,11 @@ "mozilla-overlay_2": { "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": { @@ -93,59 +99,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1650244918, - "narHash": "sha256-DsS5nxjTpnoUC4pNXJI1rit7TnDTij8vQDa5PtcDCD0=", + "lastModified": 1652559422, + "narHash": "sha256-jPVTNImBTUIFdtur+d4IVot6eXmsvtOcBm0TzxmhWPk=", "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", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-21.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1650244918, - "narHash": "sha256-DsS5nxjTpnoUC4pNXJI1rit7TnDTij8vQDa5PtcDCD0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7b38b03d76ab71bdc8dc325e3f6338d984cc35ca", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-21.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1650244918, - "narHash": "sha256-DsS5nxjTpnoUC4pNXJI1rit7TnDTij8vQDa5PtcDCD0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7b38b03d76ab71bdc8dc325e3f6338d984cc35ca", + "rev": "8b3398bc7587ebb79f93dfeea1b8c574d3c6dba1", "type": "github" }, "original": { @@ -164,32 +122,17 @@ }, "sipyco": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "artiq", + "nixpkgs" + ] }, "locked": { - "lastModified": 1649724535, - "narHash": "sha256-15Nun4EY35j+6SPZkjzZtyH/ncxLS60KuGJjFh5kSTc=", + "lastModified": 1651624017, + "narHash": "sha256-engReD8l4xzQQJP8BJ7gILUyA1KH5d60lexDVfnoiRM=", "owner": "m-labs", "repo": "sipyco", - "rev": "939f84f9b5eef7efbf7423c735d1834783b6140e", - "type": "github" - }, - "original": { - "owner": "m-labs", - "repo": "sipyco", - "type": "github" - } - }, - "sipyco_2": { - "inputs": { - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1649724535, - "narHash": "sha256-15Nun4EY35j+6SPZkjzZtyH/ncxLS60KuGJjFh5kSTc=", - "owner": "m-labs", - "repo": "sipyco", - "rev": "939f84f9b5eef7efbf7423c735d1834783b6140e", + "rev": "efda015e9994faf6cafc19b239d8e69ca4d26226", "type": "github" }, "original": { @@ -257,11 +200,11 @@ ] }, "locked": { - "lastModified": 1649317447, - "narHash": "sha256-7qRHEHg+CXqqZSLgV4j9XLrLj6mlaeXzCZ8eFkRa0U8=", + "lastModified": 1653445336, + "narHash": "sha256-xuwesRrQiccopPTCkwGqQxld74X74q7EVsKIrE0zirc=", "ref": "master", - "rev": "56c27e98e4fc2bd719d26abaa98a7628c395b9c0", - "revCount": 615, + "rev": "605c8f73a60cf41a6e2d535c5850933d3154e935", + "revCount": 616, "type": "git", "url": "https://git.m-labs.hk/m-labs/zynq-rs" },