From 162238b1f7bce62cc765ebce7572cdc932007259 Mon Sep 17 00:00:00 2001 From: Leon Riesebos Date: Mon, 5 Jul 2021 17:39:58 -0400 Subject: [PATCH] extras: added enabled flag for dualpackage, only build dax for matching artiq version --- artiq-full/extras.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/artiq-full/extras.nix b/artiq-full/extras.nix index ea6a55a..4ebf325 100644 --- a/artiq-full/extras.nix +++ b/artiq-full/extras.nix @@ -3,8 +3,8 @@ let condaBuild = import ./fast/conda/build.nix { inherit pkgs; }; condaFakeSource = import ./fast/conda/fake-source.nix { inherit pkgs; }; dualPackage = ( - { name, version, src, pythonOptions ? {}, condaOptions ? {}, withManual ? true}: - { + { name, version, src, pythonOptions ? {}, condaOptions ? {}, enabled ? true, withManual ? true}: + pkgs.lib.optionalAttrs enabled ({ "${name}" = pkgs.python3Packages.buildPythonPackage ({ inherit version; name = "${name}-${version}"; @@ -38,7 +38,7 @@ let echo doc manual ${dest}/html index.html >> $out/nix-support/hydra-build-products ''; }; - }) + })) ); # https://github.com/m-labs/artiq/issues/23 hidapi = pkgs.hidapi.overrideAttrs (oa: { @@ -242,6 +242,7 @@ in }) // (dualPackage rec { name = "dax"; version = "6.4"; + enabled = builtins.head (builtins.splitVersion version) == builtins.head (builtins.splitVersion artiq.version); withManual = false; src = pkgs.fetchgit { url = "https://gitlab.com/duke-artiq/dax.git";