diff --git a/artiq-fast/shell-dev.nix b/artiq-fast/shell-dev.nix index 7fd0519..6ef516a 100644 --- a/artiq-fast/shell-dev.nix +++ b/artiq-fast/shell-dev.nix @@ -8,7 +8,7 @@ in buildInputs = [ vivado pkgs.gnumake - (pkgs.python3.withPackages(ps: (with ps; [ jinja2 numpy paramiko ]) ++ (with artiqpkgs; [ migen microscope misoc jesd204b migen-axi artiq ]))) + (pkgs.python3.withPackages(ps: (with ps; [ jinja2 jsonschema numpy paramiko ]) ++ (with artiqpkgs; [ migen microscope misoc jesd204b migen-axi artiq ]))) artiqpkgs.cargo artiqpkgs.rustc artiqpkgs.binutils-or1k diff --git a/artiq-full.nix b/artiq-full.nix index 69d7b22..5f3e43d 100644 --- a/artiq-full.nix +++ b/artiq-full.nix @@ -26,7 +26,10 @@ let let artiq-fast = import ./fast { inherit pkgs; }; - ddbDeps = pkgs.python3.withPackages (ps: [ ps.jsonschema ]); + ddbDeps = [ + artiq-fast.artiq + (pkgs.python3.withPackages (ps: [ ps.jsonschema ])) + ]; target = "kasli"; variants = [ @@ -146,7 +149,7 @@ let } // (pkgs.lib.optionalAttrs ((builtins.fromJSON (builtins.readFile json)).base == "standalone") { "device-db-\''${target}-\''${variant}" = pkgs.stdenv.mkDerivation { name = "device-db-\''${target}-\''${variant}"; - buildInputs = [ artiq-fast.artiq ddbDeps ]; + buildInputs = ddbDeps; phases = [ "buildPhase" ]; buildPhase = " mkdir \$out @@ -211,7 +214,7 @@ let (system: crates: pkgs.lib.attrsets.nameValuePair ("device-db-" + system) (pkgs.stdenv.mkDerivation { name = "device-db-\''${system}"; - buildInputs = [ artiq-fast.artiq ddbDeps ]; + buildInputs = ddbDeps; phases = [ "buildPhase" ]; buildPhase = " mkdir \$out diff --git a/artiq-full/artiq-board.nix b/artiq-full/artiq-board.nix index 81c36e4..840f692 100644 --- a/artiq-full/artiq-board.nix +++ b/artiq-full/artiq-board.nix @@ -77,12 +77,8 @@ let name = "artiq-board-${target}-${variant}-${version}"; installPath = builtins.unsafeDiscardStringContext "${pkgs.python3Packages.python.sitePackages}/artiq/board-support/${target}-${variant}"; pythonEnv = pkgs.python3.withPackages (ps: with ps; [ - jinja2 numpy artiqpkgs.migen artiqpkgs.microscope artiqpkgs.misoc artiqpkgs.jesd204b artiqpkgs.artiq - ] ++ - (if target == "kasli" - then [ jsonschema ] - else [] - )); + jinja2 jsonschema numpy artiqpkgs.migen artiqpkgs.microscope artiqpkgs.misoc artiqpkgs.jesd204b artiqpkgs.artiq + ]; generatedSources = pkgs.stdenv.mkDerivation {