From 6dfc854673eeba66f7c59be14f7f262f3a779acd Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sun, 13 Feb 2022 17:15:25 +0800 Subject: [PATCH] flake: install artiq-comtools --- flake.lock | 30 +++++++++++++++++++++++++++--- flake.nix | 7 +++++-- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 70c4759f6..38f992b86 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,28 @@ { "nodes": { + "artiq-comtools": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "sipyco": [ + "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": { @@ -34,6 +57,7 @@ }, "root": { "inputs": { + "artiq-comtools": "artiq-comtools", "mozilla-overlay": "mozilla-overlay", "nixpkgs": "nixpkgs", "sipyco": "sipyco", @@ -49,11 +73,11 @@ ] }, "locked": { - "lastModified": 1644634510, - "narHash": "sha256-5p88NKK/DTdb0F0+/7uObBohthdxHWLl782AaiPRf8E=", + "lastModified": 1644649772, + "narHash": "sha256-LE9L5bDSunCPEnuf5Ed8enTAXA2vkTSmjvqPX9ILO0Y=", "owner": "m-labs", "repo": "sipyco", - "rev": "e9e69527927761544ab6d62f751e1ff512d1e661", + "rev": "8e4382352bc64bd01c9db35d9c9b0ef42b8b9d3b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 55e84d1dd..dd9c23457 100644 --- a/flake.nix +++ b/flake.nix @@ -6,11 +6,14 @@ inputs.sipyco.url = github:m-labs/sipyco; inputs.sipyco.inputs.nixpkgs.follows = "nixpkgs"; inputs.src-pythonparser = { url = github:m-labs/pythonparser; flake = false; }; + inputs.artiq-comtools.url = github:m-labs/artiq-comtools; + inputs.artiq-comtools.inputs.nixpkgs.follows = "nixpkgs"; + inputs.artiq-comtools.inputs.sipyco.follows = "sipyco"; inputs.src-migen = { url = github:m-labs/migen; flake = false; }; inputs.src-misoc = { type = "git"; url = "https://github.com/m-labs/misoc.git"; submodules = true; flake = false; }; - outputs = { self, nixpkgs, mozilla-overlay, sipyco, src-pythonparser, src-migen, src-misoc }: + outputs = { self, nixpkgs, mozilla-overlay, sipyco, src-pythonparser, artiq-comtools, src-migen, src-misoc }: let pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ (import mozilla-overlay) ]; }; @@ -153,7 +156,7 @@ nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ]; # keep llvm_x and lld_x in sync with llvmlite - propagatedBuildInputs = [ pkgs.llvm_11 pkgs.lld_11 llvmlite-new sipyco.packages.x86_64-linux.sipyco pythonparser ] + propagatedBuildInputs = [ pkgs.llvm_11 pkgs.lld_11 llvmlite-new sipyco.packages.x86_64-linux.sipyco pythonparser artiq-comtools.packages.x86_64-linux.artiq-comtools ] ++ (with pkgs.python3Packages; [ pyqtgraph pygit2 numpy dateutil scipy prettytable pyserial python-Levenshtein h5py pyqt5 qasync ]); dontWrapQtApps = true;