From f5fa5532b6f0dd9dee9754a4bfeacf9b9b824494 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Thu, 10 Mar 2022 16:31:23 +0800 Subject: [PATCH] flake: update artiq --- flake.lock | 95 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 63 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index a711f0b9..74cdaab9 100644 --- a/flake.lock +++ b/flake.lock @@ -2,19 +2,20 @@ "nodes": { "artiq": { "inputs": { + "artiq-comtools": "artiq-comtools", "mozilla-overlay": "mozilla-overlay", "nixpkgs": "nixpkgs", + "sipyco": "sipyco", "src-migen": "src-migen", "src-misoc": "src-misoc", - "src-pythonparser": "src-pythonparser", - "src-sipyco": "src-sipyco" + "src-pythonparser": "src-pythonparser" }, "locked": { - "lastModified": 1644375232, - "narHash": "sha256-jd8sAlAz6xGQoxiRUV5ChtEjdjh4pdIksUPsqftcK5s=", + "lastModified": 1646901022, + "narHash": "sha256-igaiq3d+jKWd2QhI96Wh0ROiyE5w3OXR/TQrr7nax/8=", "ref": "master", - "rev": "a0070d4396136b84e0a50a1c57ee72bcf4e7f6f9", - "revCount": 7961, + "rev": "ebfeb1869fff1f11a40bba05e19a0b4e09cb02bd", + "revCount": 7998, "type": "git", "url": "https://github.com/m-labs/artiq.git" }, @@ -23,6 +24,31 @@ "url": "https://github.com/m-labs/artiq.git" } }, + "artiq-comtools": { + "inputs": { + "nixpkgs": [ + "artiq", + "nixpkgs" + ], + "sipyco": [ + "artiq", + "sipyco" + ] + }, + "locked": { + "lastModified": 1644743100, + "narHash": "sha256-XqxMq2l2DXSovV7r2k/FXjYRM3bvVl3Mjy+C1koVAx4=", + "owner": "m-labs", + "repo": "artiq-comtools", + "rev": "8a126dd7d0a3f2d50ae151ec633cd52587d98796", + "type": "github" + }, + "original": { + "owner": "m-labs", + "repo": "artiq-comtools", + "type": "github" + } + }, "mozilla-overlay": { "flake": false, "locked": { @@ -42,11 +68,11 @@ "mozilla-overlay_2": { "flake": false, "locked": { - "lastModified": 1643634764, - "narHash": "sha256-EcFlgzZnZSHwZixELYV1pa267t+u5mCeLhSNBeAA/+c=", + "lastModified": 1645464064, + "narHash": "sha256-YeN4bpPvHkVOpQzb8APTAfE7/R+MFMwJUMkqmfvytSk=", "owner": "mozilla", "repo": "nixpkgs-mozilla", - "rev": "f233fdc4ff6ba2ffeb1e3e3cd6d63bb1297d6996", + "rev": "15b7a05f20aab51c4ffbefddb1b448e862dccb7d", "type": "github" }, "original": { @@ -73,11 +99,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1643503720, - "narHash": "sha256-tJic20ufuRnG8V+fTCd3YU6xl1ImxNspoEkXHct0AG4=", + "lastModified": 1644472683, + "narHash": "sha256-sP6iM4NksOYO6NFfTJ96cg+ClPnq6cdY30xKA1iYtyU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0f316e4d72daed659233817ffe52bf08e081b5de", + "rev": "7adc9c14ec74b27358a8df9b973087e351425a79", "type": "github" }, "original": { @@ -94,6 +120,27 @@ "zynq-rs": "zynq-rs" } }, + "sipyco": { + "inputs": { + "nixpkgs": [ + "artiq", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1644649772, + "narHash": "sha256-LE9L5bDSunCPEnuf5Ed8enTAXA2vkTSmjvqPX9ILO0Y=", + "owner": "m-labs", + "repo": "sipyco", + "rev": "8e4382352bc64bd01c9db35d9c9b0ef42b8b9d3b", + "type": "github" + }, + "original": { + "owner": "m-labs", + "repo": "sipyco", + "type": "github" + } + }, "src-migen": { "flake": false, "locked": { @@ -144,22 +191,6 @@ "type": "github" } }, - "src-sipyco": { - "flake": false, - "locked": { - "lastModified": 1641866796, - "narHash": "sha256-TSH0IgNbi9IcMcBDb2nWRphKlxstbWeATjrGbi6K2m0=", - "owner": "m-labs", - "repo": "sipyco", - "rev": "b04234c49379cd446d4cb3346d4741868d86841a", - "type": "github" - }, - "original": { - "owner": "m-labs", - "repo": "sipyco", - "type": "github" - } - }, "zynq-rs": { "inputs": { "mozilla-overlay": "mozilla-overlay_3", @@ -169,11 +200,11 @@ ] }, "locked": { - "lastModified": 1644558411, - "narHash": "sha256-PC/gVlVLmtZCv1Tw8Xz5ZCTxqmS2osncg5hlt9BoJ/8=", + "lastModified": 1646647304, + "narHash": "sha256-gFE/x8aw6riVkYkls5FjAlQNQ+NaUt2+9yjLUDICEr4=", "ref": "master", - "rev": "3e95df1f640aa761740feaf9eec797acb58dd942", - "revCount": 604, + "rev": "43e0440911e13b58e88fbbdbac01a073841f4943", + "revCount": 605, "type": "git", "url": "https://git.m-labs.hk/m-labs/zynq-rs" },