From 561efb0466c317538bc391fc4b79ad5712c9bf6d Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Fri, 8 Jul 2022 18:20:49 +0800 Subject: [PATCH] flake: switch to ARTIQ release 7 --- flake.lock | 41 +++++++++++++++++++++-------------------- flake.nix | 2 +- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index ac54cc27..1f0a5515 100644 --- a/flake.lock +++ b/flake.lock @@ -11,15 +11,16 @@ "src-pythonparser": "src-pythonparser" }, "locked": { - "lastModified": 1654087576, - "narHash": "sha256-d+LCvCXikhhEjsf4qBZakx3Sda85p+4vVZVwE1YuS90=", - "ref": "master", - "rev": "68ef0073ea66fe9c7f7c178979ecb8c681c47caa", - "revCount": 8068, + "lastModified": 1657275623, + "narHash": "sha256-FtVLsJtUsK7Yul2Ma4x8qzFsbqPla/w+IBaotcK/jDI=", + "ref": "release-7", + "rev": "59dfb9e902183bd76cb39ff550495e5fdd17c65d", + "revCount": 8111, "type": "git", "url": "https://github.com/m-labs/artiq.git" }, "original": { + "ref": "release-7", "type": "git", "url": "https://github.com/m-labs/artiq.git" } @@ -52,11 +53,11 @@ "mozilla-overlay": { "flake": false, "locked": { - "lastModified": 1650459918, - "narHash": "sha256-sroCK+QJTmoXtcRkwZyKOP9iAYOPID2Bwdxn4GkG16w=", + "lastModified": 1657214286, + "narHash": "sha256-rO/4oymKXU09wG2bcTt4uthPCp1XsBZjxuCJo3yVXNs=", "owner": "mozilla", "repo": "nixpkgs-mozilla", - "rev": "e1f7540fc0a8b989fb8cf701dc4fd7fc76bcf168", + "rev": "0508a66e28a5792fdfb126bbf4dec1029c2509e0", "type": "github" }, "original": { @@ -68,11 +69,11 @@ "mozilla-overlay_2": { "flake": false, "locked": { - "lastModified": 1650459918, - "narHash": "sha256-sroCK+QJTmoXtcRkwZyKOP9iAYOPID2Bwdxn4GkG16w=", + "lastModified": 1657214286, + "narHash": "sha256-rO/4oymKXU09wG2bcTt4uthPCp1XsBZjxuCJo3yVXNs=", "owner": "mozilla", "repo": "nixpkgs-mozilla", - "rev": "e1f7540fc0a8b989fb8cf701dc4fd7fc76bcf168", + "rev": "0508a66e28a5792fdfb126bbf4dec1029c2509e0", "type": "github" }, "original": { @@ -99,11 +100,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1653920503, - "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", + "lastModified": 1657123678, + "narHash": "sha256-cowVkScfUPlbBXUp08MeVk/wgm9E1zp1uC+9no2hZYw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a", + "rev": "316b762afdb9e142a803f29c49a88b4a47db80ee", "type": "github" }, "original": { @@ -128,11 +129,11 @@ ] }, "locked": { - "lastModified": 1654006751, - "narHash": "sha256-OWAnoTCutvTQcYdtdtLQuL6uRtG+7Jz7sbRhcScv8bo=", + "lastModified": 1654830914, + "narHash": "sha256-tratXcWu6Dgzd0Qd9V6EMjuNlE9qDN1pKFhP+Gt0b64=", "owner": "m-labs", "repo": "sipyco", - "rev": "b3d03a94c751a24769c54a61a0dbe9d6af52dade", + "rev": "58b0935f7ae47659abee5b5792fa594153328d6f", "type": "github" }, "original": { @@ -144,11 +145,11 @@ "src-migen": { "flake": false, "locked": { - "lastModified": 1650337393, - "narHash": "sha256-rm1SlFmF2ASz0vIy2nDEzGlyRw2oYNeJRr8Kh8Mg2Qc=", + "lastModified": 1656649178, + "narHash": "sha256-A91sZRrprEuPOtIUVxm6wX5djac9wnNZQ4+cU1nvJPc=", "owner": "m-labs", "repo": "migen", - "rev": "d4e3f34177c32f09904397179e6ed9c83175e528", + "rev": "0fb91737090fe45fd764ea3f71257a4c53c7a4ae", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 17d2e5ee..a7d04454 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "ARTIQ port to the Zynq-7000 platform"; - inputs.artiq.url = git+https://github.com/m-labs/artiq.git; + inputs.artiq.url = git+https://github.com/m-labs/artiq.git?ref=release-7; inputs.mozilla-overlay = { url = github:mozilla/nixpkgs-mozilla; flake = false; }; inputs.zynq-rs.url = git+https://git.m-labs.hk/m-labs/zynq-rs; inputs.zynq-rs.inputs.nixpkgs.follows = "artiq/nixpkgs";