simplify/fix jsonschema dependency
This commit is contained in:
parent
ce676be8e4
commit
7a76d08cb0
|
@ -8,7 +8,7 @@ in
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
vivado
|
vivado
|
||||||
pkgs.gnumake
|
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.cargo
|
||||||
artiqpkgs.rustc
|
artiqpkgs.rustc
|
||||||
artiqpkgs.binutils-or1k
|
artiqpkgs.binutils-or1k
|
||||||
|
|
|
@ -26,7 +26,10 @@ let
|
||||||
|
|
||||||
let
|
let
|
||||||
artiq-fast = import ./fast { inherit pkgs; };
|
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";
|
target = "kasli";
|
||||||
variants = [
|
variants = [
|
||||||
|
@ -146,7 +149,7 @@ let
|
||||||
} // (pkgs.lib.optionalAttrs ((builtins.fromJSON (builtins.readFile json)).base == "standalone") {
|
} // (pkgs.lib.optionalAttrs ((builtins.fromJSON (builtins.readFile json)).base == "standalone") {
|
||||||
"device-db-\''${target}-\''${variant}" = pkgs.stdenv.mkDerivation {
|
"device-db-\''${target}-\''${variant}" = pkgs.stdenv.mkDerivation {
|
||||||
name = "device-db-\''${target}-\''${variant}";
|
name = "device-db-\''${target}-\''${variant}";
|
||||||
buildInputs = [ artiq-fast.artiq ddbDeps ];
|
buildInputs = ddbDeps;
|
||||||
phases = [ "buildPhase" ];
|
phases = [ "buildPhase" ];
|
||||||
buildPhase = "
|
buildPhase = "
|
||||||
mkdir \$out
|
mkdir \$out
|
||||||
|
@ -211,7 +214,7 @@ let
|
||||||
(system: crates: pkgs.lib.attrsets.nameValuePair ("device-db-" + system)
|
(system: crates: pkgs.lib.attrsets.nameValuePair ("device-db-" + system)
|
||||||
(pkgs.stdenv.mkDerivation {
|
(pkgs.stdenv.mkDerivation {
|
||||||
name = "device-db-\''${system}";
|
name = "device-db-\''${system}";
|
||||||
buildInputs = [ artiq-fast.artiq ddbDeps ];
|
buildInputs = ddbDeps;
|
||||||
phases = [ "buildPhase" ];
|
phases = [ "buildPhase" ];
|
||||||
buildPhase = "
|
buildPhase = "
|
||||||
mkdir \$out
|
mkdir \$out
|
||||||
|
|
|
@ -77,12 +77,8 @@ let
|
||||||
name = "artiq-board-${target}-${variant}-${version}";
|
name = "artiq-board-${target}-${variant}-${version}";
|
||||||
installPath = builtins.unsafeDiscardStringContext "${pkgs.python3Packages.python.sitePackages}/artiq/board-support/${target}-${variant}";
|
installPath = builtins.unsafeDiscardStringContext "${pkgs.python3Packages.python.sitePackages}/artiq/board-support/${target}-${variant}";
|
||||||
pythonEnv = pkgs.python3.withPackages (ps: with ps; [
|
pythonEnv = pkgs.python3.withPackages (ps: with ps; [
|
||||||
jinja2 numpy artiqpkgs.migen artiqpkgs.microscope artiqpkgs.misoc artiqpkgs.jesd204b artiqpkgs.artiq
|
jinja2 jsonschema numpy artiqpkgs.migen artiqpkgs.microscope artiqpkgs.misoc artiqpkgs.jesd204b artiqpkgs.artiq
|
||||||
] ++
|
];
|
||||||
(if target == "kasli"
|
|
||||||
then [ jsonschema ]
|
|
||||||
else []
|
|
||||||
));
|
|
||||||
|
|
||||||
generatedSources =
|
generatedSources =
|
||||||
pkgs.stdenv.mkDerivation {
|
pkgs.stdenv.mkDerivation {
|
||||||
|
|
Loading…
Reference in New Issue