Browse Source

rename jobsets to artiq-fast/artiq-full

pull/30/head
parent
commit
dfa5b47d9b
  1. 6
      artiq-fast.nix
  2. 0
      artiq-fast/artiq-board.nix
  3. 0
      artiq-fast/artiq-extras.nix
  4. 0
      artiq-fast/conda-artiq-board.nix
  5. 0
      artiq-fast/conda-artiq-deps.nix
  6. 0
      artiq-fast/conda-artiq.nix
  7. 0
      artiq-fast/conda-build.nix
  8. 0
      artiq-fast/conda-fake-source.nix
  9. 0
      artiq-fast/default.nix
  10. 0
      artiq-fast/fetchcargo.nix
  11. 0
      artiq-fast/pkgs/artiq-manual.nix
  12. 0
      artiq-fast/pkgs/artiq-src.nix
  13. 0
      artiq-fast/pkgs/artiq-timestamp.nix
  14. 0
      artiq-fast/pkgs/artiq-version.nix
  15. 0
      artiq-fast/pkgs/artiq.nix
  16. 0
      artiq-fast/pkgs/binutils-or1k.nix
  17. 0
      artiq-fast/pkgs/libartiq-support.nix
  18. 0
      artiq-fast/pkgs/llvm-or1k.nix
  19. 0
      artiq-fast/pkgs/llvmlite-artiq.nix
  20. 0
      artiq-fast/pkgs/openocd.nix
  21. 0
      artiq-fast/pkgs/python-deps.nix
  22. 0
      artiq-fast/pkgs/python37hack.patch
  23. 0
      artiq-fast/pkgs/rust/binaryBuild.nix
  24. 0
      artiq-fast/pkgs/rust/bootstrap.nix
  25. 0
      artiq-fast/pkgs/rust/default.nix
  26. 0
      artiq-fast/pkgs/rust/patches/disable-test-inherit-env.patch
  27. 0
      artiq-fast/pkgs/rust/patches/net-tcp-disable-tests.patch
  28. 0
      artiq-fast/pkgs/rust/patches/stdsimd-disable-doctest.patch
  29. 0
      artiq-fast/pkgs/rust/print-hashes.sh
  30. 0
      artiq-fast/pkgs/rust/rustc.nix
  31. 0
      artiq-fast/shell-dev.nix
  32. 0
      artiq-fast/shell.nix
  33. 0
      artiq-fast/vivado.nix
  34. 0
      artiq-fast/windows/README.md
  35. 0
      artiq-fast/windows/install.nix
  36. 0
      artiq-fast/windows/install.txt
  37. 0
      artiq-fast/windows/manual-test-run.nix
  38. 0
      artiq-fast/windows/qemu.nix
  39. 0
      artiq-fast/windows/run-test.nix
  40. 8
      artiq-full.nix
  41. 14
      hydra/artiq.nix

6
main.nix → artiq-fast.nix

@ -3,7 +3,7 @@ let
artiqSrc = <artiqSrc>;
generatedNix = pkgs.runCommand "generated-nix" { buildInputs = [ pkgs.nix pkgs.git ]; }
''
cp --no-preserve=mode,ownership -R ${./artiq} $out
cp --no-preserve=mode,ownership -R ${./artiq-fast} $out
REV=`git --git-dir ${artiqSrc}/.git rev-parse HEAD`
MAJOR_VERSION=`cat ${artiqSrc}/MAJOR_VERSION`
COMMIT_COUNT=`git --git-dir ${artiqSrc}/.git rev-list --count HEAD`
@ -44,11 +44,11 @@ let
# installation for users.
matplotlib-qt = pkgs.lib.hydraJob (pkgs.python3Packages.matplotlib.override { enableQt = true; });
# For Raspberry Pi JTAG servers
openocd-aarch64 = pkgs.lib.hydraJob ((import <nixpkgs> { system = "aarch64-linux"; }).callPackage ./artiq/pkgs/openocd.nix {});
openocd-aarch64 = pkgs.lib.hydraJob ((import <nixpkgs> { system = "aarch64-linux"; }).callPackage ./artiq-fast/pkgs/openocd.nix {});
};
in
jobs // {
generated-nix = pkgs.lib.hydraJob generatedNix; # used by sinara-systems
generated-nix = pkgs.lib.hydraJob generatedNix; # used by artiq-full
channel = pkgs.releaseTools.channel rec {
name = "main";
src = generatedNix;

0
artiq/artiq-board.nix → artiq-fast/artiq-board.nix

0
artiq/artiq-extras.nix → artiq-fast/artiq-extras.nix

0
artiq/conda-artiq-board.nix → artiq-fast/conda-artiq-board.nix

0
artiq/conda-artiq-deps.nix → artiq-fast/conda-artiq-deps.nix

0
artiq/conda-artiq.nix → artiq-fast/conda-artiq.nix

0
artiq/conda-build.nix → artiq-fast/conda-build.nix

0
artiq/conda-fake-source.nix → artiq-fast/conda-fake-source.nix

0
artiq/default.nix → artiq-fast/default.nix

0
artiq/fetchcargo.nix → artiq-fast/fetchcargo.nix

0
artiq/pkgs/artiq-manual.nix → artiq-fast/pkgs/artiq-manual.nix

0
artiq/pkgs/artiq-src.nix → artiq-fast/pkgs/artiq-src.nix

0
artiq/pkgs/artiq-timestamp.nix → artiq-fast/pkgs/artiq-timestamp.nix

0
artiq/pkgs/artiq-version.nix → artiq-fast/pkgs/artiq-version.nix

0
artiq/pkgs/artiq.nix → artiq-fast/pkgs/artiq.nix

0
artiq/pkgs/binutils-or1k.nix → artiq-fast/pkgs/binutils-or1k.nix

0
artiq/pkgs/libartiq-support.nix → artiq-fast/pkgs/libartiq-support.nix

0
artiq/pkgs/llvm-or1k.nix → artiq-fast/pkgs/llvm-or1k.nix

0
artiq/pkgs/llvmlite-artiq.nix → artiq-fast/pkgs/llvmlite-artiq.nix

0
artiq/pkgs/openocd.nix → artiq-fast/pkgs/openocd.nix

0
artiq/pkgs/python-deps.nix → artiq-fast/pkgs/python-deps.nix

0
artiq/pkgs/python37hack.patch → artiq-fast/pkgs/python37hack.patch

0
artiq/pkgs/rust/binaryBuild.nix → artiq-fast/pkgs/rust/binaryBuild.nix

0
artiq/pkgs/rust/bootstrap.nix → artiq-fast/pkgs/rust/bootstrap.nix

0
artiq/pkgs/rust/default.nix → artiq-fast/pkgs/rust/default.nix

0
artiq/pkgs/rust/patches/disable-test-inherit-env.patch → artiq-fast/pkgs/rust/patches/disable-test-inherit-env.patch

0
artiq/pkgs/rust/patches/net-tcp-disable-tests.patch → artiq-fast/pkgs/rust/patches/net-tcp-disable-tests.patch

0
artiq/pkgs/rust/patches/stdsimd-disable-doctest.patch → artiq-fast/pkgs/rust/patches/stdsimd-disable-doctest.patch

0
artiq/pkgs/rust/print-hashes.sh → artiq-fast/pkgs/rust/print-hashes.sh

0
artiq/pkgs/rust/rustc.nix → artiq-fast/pkgs/rust/rustc.nix

0
artiq/shell-dev.nix → artiq-fast/shell-dev.nix

0
artiq/shell.nix → artiq-fast/shell.nix

0
artiq/vivado.nix → artiq-fast/vivado.nix

0
artiq/windows/README.md → artiq-fast/windows/README.md

0
artiq/windows/install.nix → artiq-fast/windows/install.nix

0
artiq/windows/install.txt → artiq-fast/windows/install.txt

0
artiq/windows/manual-test-run.nix → artiq-fast/windows/manual-test-run.nix

0
artiq/windows/qemu.nix → artiq-fast/windows/qemu.nix

0
artiq/windows/run-test.nix → artiq-fast/windows/run-test.nix

8
sinara-systems.nix → artiq-full.nix

@ -53,9 +53,9 @@ let
"wipm3"
];
artiq = import <m-labs> { inherit pkgs; };
artiq-board = import <m-labs/artiq-board.nix> { inherit pkgs; };
conda-artiq-board = import <m-labs/conda-artiq-board.nix> { inherit pkgs; };
artiq-fast = import <artiq-fast> { inherit pkgs; };
artiq-board = import <artiq-fast/artiq-board.nix> { inherit pkgs; };
conda-artiq-board = import <artiq-fast/conda-artiq-board.nix> { inherit pkgs; };
src = pkgs.fetchgit {
url = "https://git.m-labs.hk/M-Labs/sinara-systems.git";
rev = "$REV";
@ -78,7 +78,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.artiq ];
buildInputs = [ artiq-fast.artiq ];
phases = [ "buildPhase" ];
buildPhase = "
mkdir \$out

14
hydra/artiq.nix

@ -4,12 +4,12 @@
''
cat > $out << EOF
{
"main": {
"fast": {
"enabled": 1,
"hidden": false,
"description": "Main ARTIQ packages and board support packages for HITL CI",
"description": "Core ARTIQ packages to build fast for CI purposes",
"nixexprinput": "nixScripts",
"nixexprpath": "main.nix",
"nixexprpath": "artiq-fast.nix",
"checkinterval": 300,
"schedulingshares": 10,
"enableemail": false,
@ -21,12 +21,12 @@
"artiqSrc": { "type": "git", "value": "git://github.com/m-labs/artiq.git master 1", "emailresponsible": false }
}
},
"sinara-systems": {
"full": {
"enabled": 1,
"hidden": false,
"description": "Board support packages for other Sinara systems",
"description": "Full set of ARTIQ packages",
"nixexprinput": "nixScripts",
"nixexprpath": "sinara-systems.nix",
"nixexprpath": "artiq-full.nix",
"checkinterval": 86400,
"schedulingshares": 1,
"enableemail": false,
@ -36,7 +36,7 @@
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-19.03", "emailresponsible": false },
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
"sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems.git master 1", "emailresponsible": false },
"m-labs": { "type": "sysbuild", "value": "artiq:main:generated-nix", "emailresponsible": false }
"artiq-fast": { "type": "sysbuild", "value": "artiq:artiq-fast:generated-nix", "emailresponsible": false }
}
},
"urukul": {

Loading…
Cancel
Save