diff --git a/artiq-board-generated/artiq-board.nix b/artiq-board-generated/artiq-board.nix index 710c84e..3d59e71 100644 --- a/artiq-board-generated/artiq-board.nix +++ b/artiq-board-generated/artiq-board.nix @@ -9,7 +9,7 @@ let artiqSrc = import (artiq-fast + "/pkgs/artiq-src.nix") { fetchgit = pkgs.fetchgit; }; artiqpkgs = import artiq-fast { inherit pkgs; }; pythonEnv = pkgs.python3.withPackages (ps: with ps; [ - jinja2 jsonschema numpy artiqpkgs.migen artiqpkgs.microscope artiqpkgs.misoc artiqpkgs.jesd204b artiqpkgs.artiq + jinja2 numpy artiqpkgs.migen artiqpkgs.microscope artiqpkgs.misoc artiqpkgs.jesd204b artiqpkgs.artiq ]); fetchcargo = import (artiq-fast + "/fetchcargo.nix") { inherit (pkgs) stdenv cacert git; diff --git a/artiq-fast/shell-dev.nix b/artiq-fast/shell-dev.nix index 6ef516a..7fd0519 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 jsonschema numpy paramiko ]) ++ (with artiqpkgs; [ migen microscope misoc jesd204b migen-axi artiq ]))) + (pkgs.python3.withPackages(ps: (with ps; [ jinja2 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 57b44cf..77eb8d4 100644 --- a/artiq-full.nix +++ b/artiq-full.nix @@ -78,10 +78,6 @@ let let artiq-fast = import ${if a6p then "./board-generated" else "."}/fast { inherit pkgs; }; - ddbDeps = [ - artiq-fast.artiq - (pkgs.python3.withPackages (ps: [ ps.jsonschema ])) - ]; kasliVariants = [${builtins.concatStringsSep " " ( builtins.map (variant: "\"${variant}\"") kasliVariants @@ -135,7 +131,7 @@ let ) { "device-db-\''${target}-\''${variant}" = pkgs.stdenv.mkDerivation { name = "device-db-\''${target}-\''${variant}"; - buildInputs = ddbDeps; + buildInputs = artiq-fast.artiq; phases = [ "buildPhase" ]; buildPhase = " mkdir \$out @@ -196,7 +192,7 @@ let (system: crates: pkgs.lib.attrsets.nameValuePair ("device-db-" + system) (pkgs.stdenv.mkDerivation { name = "device-db-\''${system}"; - buildInputs = ddbDeps; + buildInputs = artiq-fast.artiq; phases = [ "buildPhase" ]; buildPhase = " mkdir \$out