From 3a32759c3cd5f3062de2613aec14126040febe98 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sat, 12 Feb 2022 17:56:08 +0800 Subject: [PATCH] build sipyco and pythonparser conda packages --- flake.lock | 8 ++++---- flake.nix | 12 ++++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 0c227ce..05f0e4b 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "src-pythonparser": "src-pythonparser" }, "locked": { - "lastModified": 1644635081, - "narHash": "sha256-d7rDZjHK5znKtUT72uVI4eegoRWtAqkJamyHQ+7FuZg=", + "lastModified": 1644659315, + "narHash": "sha256-1Bbv+sQsdnFF4SAa3YtyKq5r2kbNtKCtt7vsMzJqTBI=", "ref": "master", - "rev": "b3b73948a256e2d738f05948671dacbd55dcf557", - "revCount": 7968, + "rev": "5a8928fbf351fcc252389710e9a9c588ea9aa0f2", + "revCount": 7969, "type": "git", "url": "https://github.com/m-labs/artiq.git" }, diff --git a/flake.nix b/flake.nix index 91bba88..10e3308 100644 --- a/flake.nix +++ b/flake.nix @@ -114,6 +114,18 @@ in rec { packages.x86_64-linux = { condaChannel = makeCondaChannel [ + { + name = "sipyco"; + version = artiq.inputs.sipyco.packages.x86_64-linux.sipyco.version; + src = artiq.inputs.sipyco.packages.x86_64-linux.sipyco.src; + dependencies = [ "numpy" "pybase64" ]; + } + { + name = "pythonparser"; + version = artiq.packages.x86_64-linux.pythonparser.version; + src = artiq.packages.x86_64-linux.pythonparser.src; + dependencies = [ "regex" ]; + } { name = "artiq"; version = artiq.packages.x86_64-linux.artiq.version;