forked from M-Labs/nix-scripts
Compare commits
No commits in common. "f5429f28ae7c0fcf6385eac2bedf89f52bbc697e" and "c1490f2c681b7e45877a30aa8e42ee99a60e51b9" have entirely different histories.
f5429f28ae
...
c1490f2c68
|
@ -100,7 +100,7 @@ let
|
||||||
"uamsterdam"
|
"uamsterdam"
|
||||||
]);
|
]);
|
||||||
|
|
||||||
artiq-board = builtins.trace "artiq-board" (import ./fast/artiq-board.nix { inherit pkgs; });
|
artiq-board = import ./fast/artiq-board.nix { inherit pkgs; };
|
||||||
conda-artiq-board = import ./conda-artiq-board.nix { inherit pkgs; };
|
conda-artiq-board = import ./conda-artiq-board.nix { inherit pkgs; };
|
||||||
src = pkgs.fetchgit {
|
src = pkgs.fetchgit {
|
||||||
url = "https://git.m-labs.hk/M-Labs/sinara-systems.git";
|
url = "https://git.m-labs.hk/M-Labs/sinara-systems.git";
|
||||||
|
@ -253,17 +253,18 @@ let
|
||||||
inherit (pkgs) stdenv lib fetchgit git python3Packages texlive texinfo;
|
inherit (pkgs) stdenv lib fetchgit git python3Packages texlive texinfo;
|
||||||
inherit (pythonDeps) sphinxcontrib-wavedrom;
|
inherit (pythonDeps) sphinxcontrib-wavedrom;
|
||||||
};
|
};
|
||||||
jobs = (import generatedNix { inherit pkgs; }) // sipycoManualPackages // artiqManualPackages // {
|
jobs = import generatedNix { inherit pkgs; };
|
||||||
|
_jobs = (import generatedNix { inherit pkgs; }) // sipycoManualPackages // artiqManualPackages // {
|
||||||
# This is in the example in the ARTIQ manual - precompile it to speed up
|
# This is in the example in the ARTIQ manual - precompile it to speed up
|
||||||
# installation for users.
|
# installation for users.
|
||||||
matplotlib-qt = pkgs.lib.hydraJob (pkgs.python3Packages.matplotlib.override { enableQt = true; });
|
matplotlib-qt = pkgs.lib.hydraJob (pkgs.python3Packages.matplotlib.override { enableQt = true; });
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
builtins.mapAttrs (key: value: builtins.trace "full-${key}" pkgs.lib.hydraJob value) jobs // {
|
builtins.mapAttrs (key: value: builtins.trace "full-${key}" pkgs.lib.hydraJob value) jobs // {
|
||||||
artiq-full = builtins.trace "channel" (pkgs.releaseTools.channel {
|
#artiq-full = pkgs.releaseTools.channel {
|
||||||
name = "artiq-full";
|
# name = "artiq-full";
|
||||||
src = generatedNix;
|
# src = generatedNix;
|
||||||
constituents = builtins.attrValues jobs;
|
# constituents = builtins.attrValues jobs;
|
||||||
});
|
#};
|
||||||
conda-channel = builtins.trace "conda-channel" (import ./artiq-full/conda-channel.nix { inherit pkgs; }) { inherit jobs; };
|
#conda-channel = import ./artiq-full/conda-channel.nix { inherit pkgs; } { inherit jobs; };
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue