forked from M-Labs/nix-scripts
remove artiq-extras from artiq-fast
This commit is contained in:
parent
11608e139c
commit
c4b57f341b
|
@ -37,7 +37,6 @@ let
|
||||||
artiq-env = (pkgs.python3.withPackages(ps: [ artiq ])).overrideAttrs (oldAttrs: { name = "${pkgs.python3.name}-artiq-env-${artiq.version}"; });
|
artiq-env = (pkgs.python3.withPackages(ps: [ artiq ])).overrideAttrs (oldAttrs: { name = "${pkgs.python3.name}-artiq-env-${artiq.version}"; });
|
||||||
openocd = callPackage ./pkgs/openocd.nix {};
|
openocd = callPackage ./pkgs/openocd.nix {};
|
||||||
conda-artiq = import ./conda-artiq.nix { inherit pkgs; };
|
conda-artiq = import ./conda-artiq.nix { inherit pkgs; };
|
||||||
} // boardPackages;
|
};
|
||||||
extraPackages = import ./artiq-extras.nix { inherit pkgs; inherit (mainPackages) asyncserial artiq; };
|
|
||||||
in
|
in
|
||||||
mainPackages // extraPackages
|
mainPackages // boardPackages
|
||||||
|
|
Loading…
Reference in New Issue