From 8a89f2b62c2f5a663aa9bdf1ceb7b0bd27ff317c Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sat, 5 Feb 2022 16:33:16 +0800 Subject: [PATCH] flake: sync nixpkgs, update description --- flake.lock | 38 ++++---------------------------------- flake.nix | 10 +++++----- 2 files changed, 9 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index a0998d40..92c3c94b 100644 --- a/flake.lock +++ b/flake.lock @@ -87,43 +87,10 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1643247693, - "narHash": "sha256-rmShxIuNjYBz4l83J0J++sug+MURUY1koPCzX4F8hfo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6c4b9f1a2fd761e2d384ef86cff0d208ca27fdca", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-21.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1642961095, - "narHash": "sha256-RLatktZmvwFBOyqdoIk4qdS4OGKB7aKIvvs4ZP2L8D8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "604c44137d97b5111be1ca5c0d97f6e24fbc5c2c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-21.11", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "artiq": "artiq", "mozilla-overlay": "mozilla-overlay_2", - "nixpkgs": "nixpkgs_2", "zynq-rs": "zynq-rs" } }, @@ -196,7 +163,10 @@ "zynq-rs": { "inputs": { "mozilla-overlay": "mozilla-overlay_3", - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "artiq", + "nixpkgs" + ] }, "locked": { "lastModified": 1643971355, diff --git a/flake.nix b/flake.nix index b01b2d2b..444291ac 100644 --- a/flake.nix +++ b/flake.nix @@ -1,14 +1,14 @@ { - description = "ARTIQ port for Zynq platform"; + description = "ARTIQ port to the Zynq-7000 platform"; - inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-21.11; + inputs.artiq.url = git+https://github.com/m-labs/artiq.git; 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.artiq.url = git+https://github.com/m-labs/artiq.git; + inputs.zynq-rs.inputs.nixpkgs.follows = "artiq/nixpkgs"; - outputs = { self, nixpkgs, mozilla-overlay, zynq-rs, artiq }: + outputs = { self, mozilla-overlay, zynq-rs, artiq }: let - pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ (import mozilla-overlay) ]; }; + pkgs = import artiq.inputs.nixpkgs { system = "x86_64-linux"; overlays = [ (import mozilla-overlay) ]; }; zynqpkgs = zynq-rs.packages.x86_64-linux; artiqpkgs = artiq.packages.x86_64-linux;