From dfa5b47d9b5ccc7604eced26eb39ab52a14e99a2 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 17 Jul 2019 19:19:43 +0800 Subject: [PATCH] rename jobsets to artiq-fast/artiq-full --- main.nix => artiq-fast.nix | 6 +++--- {artiq => artiq-fast}/artiq-board.nix | 0 {artiq => artiq-fast}/artiq-extras.nix | 0 {artiq => artiq-fast}/conda-artiq-board.nix | 0 {artiq => artiq-fast}/conda-artiq-deps.nix | 0 {artiq => artiq-fast}/conda-artiq.nix | 0 {artiq => artiq-fast}/conda-build.nix | 0 {artiq => artiq-fast}/conda-fake-source.nix | 0 {artiq => artiq-fast}/default.nix | 0 {artiq => artiq-fast}/fetchcargo.nix | 0 {artiq => artiq-fast}/pkgs/artiq-manual.nix | 0 {artiq => artiq-fast}/pkgs/artiq-src.nix | 0 {artiq => artiq-fast}/pkgs/artiq-timestamp.nix | 0 {artiq => artiq-fast}/pkgs/artiq-version.nix | 0 {artiq => artiq-fast}/pkgs/artiq.nix | 0 {artiq => artiq-fast}/pkgs/binutils-or1k.nix | 0 {artiq => artiq-fast}/pkgs/libartiq-support.nix | 0 {artiq => artiq-fast}/pkgs/llvm-or1k.nix | 0 {artiq => artiq-fast}/pkgs/llvmlite-artiq.nix | 0 {artiq => artiq-fast}/pkgs/openocd.nix | 0 {artiq => artiq-fast}/pkgs/python-deps.nix | 0 {artiq => artiq-fast}/pkgs/python37hack.patch | 0 {artiq => artiq-fast}/pkgs/rust/binaryBuild.nix | 0 {artiq => artiq-fast}/pkgs/rust/bootstrap.nix | 0 {artiq => artiq-fast}/pkgs/rust/default.nix | 0 .../rust/patches/disable-test-inherit-env.patch | 0 .../pkgs/rust/patches/net-tcp-disable-tests.patch | 0 .../rust/patches/stdsimd-disable-doctest.patch | 0 {artiq => artiq-fast}/pkgs/rust/print-hashes.sh | 0 {artiq => artiq-fast}/pkgs/rust/rustc.nix | 0 {artiq => artiq-fast}/shell-dev.nix | 0 {artiq => artiq-fast}/shell.nix | 0 {artiq => artiq-fast}/vivado.nix | 0 {artiq => artiq-fast}/windows/README.md | 0 {artiq => artiq-fast}/windows/install.nix | 0 {artiq => artiq-fast}/windows/install.txt | 0 {artiq => artiq-fast}/windows/manual-test-run.nix | 0 {artiq => artiq-fast}/windows/qemu.nix | 0 {artiq => artiq-fast}/windows/run-test.nix | 0 sinara-systems.nix => artiq-full.nix | 8 ++++---- hydra/artiq.nix | 14 +++++++------- 41 files changed, 14 insertions(+), 14 deletions(-) rename main.nix => artiq-fast.nix (95%) rename {artiq => artiq-fast}/artiq-board.nix (100%) rename {artiq => artiq-fast}/artiq-extras.nix (100%) rename {artiq => artiq-fast}/conda-artiq-board.nix (100%) rename {artiq => artiq-fast}/conda-artiq-deps.nix (100%) rename {artiq => artiq-fast}/conda-artiq.nix (100%) rename {artiq => artiq-fast}/conda-build.nix (100%) rename {artiq => artiq-fast}/conda-fake-source.nix (100%) rename {artiq => artiq-fast}/default.nix (100%) rename {artiq => artiq-fast}/fetchcargo.nix (100%) rename {artiq => artiq-fast}/pkgs/artiq-manual.nix (100%) rename {artiq => artiq-fast}/pkgs/artiq-src.nix (100%) rename {artiq => artiq-fast}/pkgs/artiq-timestamp.nix (100%) rename {artiq => artiq-fast}/pkgs/artiq-version.nix (100%) rename {artiq => artiq-fast}/pkgs/artiq.nix (100%) rename {artiq => artiq-fast}/pkgs/binutils-or1k.nix (100%) rename {artiq => artiq-fast}/pkgs/libartiq-support.nix (100%) rename {artiq => artiq-fast}/pkgs/llvm-or1k.nix (100%) rename {artiq => artiq-fast}/pkgs/llvmlite-artiq.nix (100%) rename {artiq => artiq-fast}/pkgs/openocd.nix (100%) rename {artiq => artiq-fast}/pkgs/python-deps.nix (100%) rename {artiq => artiq-fast}/pkgs/python37hack.patch (100%) rename {artiq => artiq-fast}/pkgs/rust/binaryBuild.nix (100%) rename {artiq => artiq-fast}/pkgs/rust/bootstrap.nix (100%) rename {artiq => artiq-fast}/pkgs/rust/default.nix (100%) rename {artiq => artiq-fast}/pkgs/rust/patches/disable-test-inherit-env.patch (100%) rename {artiq => artiq-fast}/pkgs/rust/patches/net-tcp-disable-tests.patch (100%) rename {artiq => artiq-fast}/pkgs/rust/patches/stdsimd-disable-doctest.patch (100%) rename {artiq => artiq-fast}/pkgs/rust/print-hashes.sh (100%) rename {artiq => artiq-fast}/pkgs/rust/rustc.nix (100%) rename {artiq => artiq-fast}/shell-dev.nix (100%) rename {artiq => artiq-fast}/shell.nix (100%) rename {artiq => artiq-fast}/vivado.nix (100%) rename {artiq => artiq-fast}/windows/README.md (100%) rename {artiq => artiq-fast}/windows/install.nix (100%) rename {artiq => artiq-fast}/windows/install.txt (100%) rename {artiq => artiq-fast}/windows/manual-test-run.nix (100%) rename {artiq => artiq-fast}/windows/qemu.nix (100%) rename {artiq => artiq-fast}/windows/run-test.nix (100%) rename sinara-systems.nix => artiq-full.nix (92%) diff --git a/main.nix b/artiq-fast.nix similarity index 95% rename from main.nix rename to artiq-fast.nix index f8e7553..b2bf620 100644 --- a/main.nix +++ b/artiq-fast.nix @@ -3,7 +3,7 @@ let 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 { system = "aarch64-linux"; }).callPackage ./artiq/pkgs/openocd.nix {}); + openocd-aarch64 = pkgs.lib.hydraJob ((import { 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; diff --git a/artiq/artiq-board.nix b/artiq-fast/artiq-board.nix similarity index 100% rename from artiq/artiq-board.nix rename to artiq-fast/artiq-board.nix diff --git a/artiq/artiq-extras.nix b/artiq-fast/artiq-extras.nix similarity index 100% rename from artiq/artiq-extras.nix rename to artiq-fast/artiq-extras.nix diff --git a/artiq/conda-artiq-board.nix b/artiq-fast/conda-artiq-board.nix similarity index 100% rename from artiq/conda-artiq-board.nix rename to artiq-fast/conda-artiq-board.nix diff --git a/artiq/conda-artiq-deps.nix b/artiq-fast/conda-artiq-deps.nix similarity index 100% rename from artiq/conda-artiq-deps.nix rename to artiq-fast/conda-artiq-deps.nix diff --git a/artiq/conda-artiq.nix b/artiq-fast/conda-artiq.nix similarity index 100% rename from artiq/conda-artiq.nix rename to artiq-fast/conda-artiq.nix diff --git a/artiq/conda-build.nix b/artiq-fast/conda-build.nix similarity index 100% rename from artiq/conda-build.nix rename to artiq-fast/conda-build.nix diff --git a/artiq/conda-fake-source.nix b/artiq-fast/conda-fake-source.nix similarity index 100% rename from artiq/conda-fake-source.nix rename to artiq-fast/conda-fake-source.nix diff --git a/artiq/default.nix b/artiq-fast/default.nix similarity index 100% rename from artiq/default.nix rename to artiq-fast/default.nix diff --git a/artiq/fetchcargo.nix b/artiq-fast/fetchcargo.nix similarity index 100% rename from artiq/fetchcargo.nix rename to artiq-fast/fetchcargo.nix diff --git a/artiq/pkgs/artiq-manual.nix b/artiq-fast/pkgs/artiq-manual.nix similarity index 100% rename from artiq/pkgs/artiq-manual.nix rename to artiq-fast/pkgs/artiq-manual.nix diff --git a/artiq/pkgs/artiq-src.nix b/artiq-fast/pkgs/artiq-src.nix similarity index 100% rename from artiq/pkgs/artiq-src.nix rename to artiq-fast/pkgs/artiq-src.nix diff --git a/artiq/pkgs/artiq-timestamp.nix b/artiq-fast/pkgs/artiq-timestamp.nix similarity index 100% rename from artiq/pkgs/artiq-timestamp.nix rename to artiq-fast/pkgs/artiq-timestamp.nix diff --git a/artiq/pkgs/artiq-version.nix b/artiq-fast/pkgs/artiq-version.nix similarity index 100% rename from artiq/pkgs/artiq-version.nix rename to artiq-fast/pkgs/artiq-version.nix diff --git a/artiq/pkgs/artiq.nix b/artiq-fast/pkgs/artiq.nix similarity index 100% rename from artiq/pkgs/artiq.nix rename to artiq-fast/pkgs/artiq.nix diff --git a/artiq/pkgs/binutils-or1k.nix b/artiq-fast/pkgs/binutils-or1k.nix similarity index 100% rename from artiq/pkgs/binutils-or1k.nix rename to artiq-fast/pkgs/binutils-or1k.nix diff --git a/artiq/pkgs/libartiq-support.nix b/artiq-fast/pkgs/libartiq-support.nix similarity index 100% rename from artiq/pkgs/libartiq-support.nix rename to artiq-fast/pkgs/libartiq-support.nix diff --git a/artiq/pkgs/llvm-or1k.nix b/artiq-fast/pkgs/llvm-or1k.nix similarity index 100% rename from artiq/pkgs/llvm-or1k.nix rename to artiq-fast/pkgs/llvm-or1k.nix diff --git a/artiq/pkgs/llvmlite-artiq.nix b/artiq-fast/pkgs/llvmlite-artiq.nix similarity index 100% rename from artiq/pkgs/llvmlite-artiq.nix rename to artiq-fast/pkgs/llvmlite-artiq.nix diff --git a/artiq/pkgs/openocd.nix b/artiq-fast/pkgs/openocd.nix similarity index 100% rename from artiq/pkgs/openocd.nix rename to artiq-fast/pkgs/openocd.nix diff --git a/artiq/pkgs/python-deps.nix b/artiq-fast/pkgs/python-deps.nix similarity index 100% rename from artiq/pkgs/python-deps.nix rename to artiq-fast/pkgs/python-deps.nix diff --git a/artiq/pkgs/python37hack.patch b/artiq-fast/pkgs/python37hack.patch similarity index 100% rename from artiq/pkgs/python37hack.patch rename to artiq-fast/pkgs/python37hack.patch diff --git a/artiq/pkgs/rust/binaryBuild.nix b/artiq-fast/pkgs/rust/binaryBuild.nix similarity index 100% rename from artiq/pkgs/rust/binaryBuild.nix rename to artiq-fast/pkgs/rust/binaryBuild.nix diff --git a/artiq/pkgs/rust/bootstrap.nix b/artiq-fast/pkgs/rust/bootstrap.nix similarity index 100% rename from artiq/pkgs/rust/bootstrap.nix rename to artiq-fast/pkgs/rust/bootstrap.nix diff --git a/artiq/pkgs/rust/default.nix b/artiq-fast/pkgs/rust/default.nix similarity index 100% rename from artiq/pkgs/rust/default.nix rename to artiq-fast/pkgs/rust/default.nix diff --git a/artiq/pkgs/rust/patches/disable-test-inherit-env.patch b/artiq-fast/pkgs/rust/patches/disable-test-inherit-env.patch similarity index 100% rename from artiq/pkgs/rust/patches/disable-test-inherit-env.patch rename to artiq-fast/pkgs/rust/patches/disable-test-inherit-env.patch diff --git a/artiq/pkgs/rust/patches/net-tcp-disable-tests.patch b/artiq-fast/pkgs/rust/patches/net-tcp-disable-tests.patch similarity index 100% rename from artiq/pkgs/rust/patches/net-tcp-disable-tests.patch rename to artiq-fast/pkgs/rust/patches/net-tcp-disable-tests.patch diff --git a/artiq/pkgs/rust/patches/stdsimd-disable-doctest.patch b/artiq-fast/pkgs/rust/patches/stdsimd-disable-doctest.patch similarity index 100% rename from artiq/pkgs/rust/patches/stdsimd-disable-doctest.patch rename to artiq-fast/pkgs/rust/patches/stdsimd-disable-doctest.patch diff --git a/artiq/pkgs/rust/print-hashes.sh b/artiq-fast/pkgs/rust/print-hashes.sh similarity index 100% rename from artiq/pkgs/rust/print-hashes.sh rename to artiq-fast/pkgs/rust/print-hashes.sh diff --git a/artiq/pkgs/rust/rustc.nix b/artiq-fast/pkgs/rust/rustc.nix similarity index 100% rename from artiq/pkgs/rust/rustc.nix rename to artiq-fast/pkgs/rust/rustc.nix diff --git a/artiq/shell-dev.nix b/artiq-fast/shell-dev.nix similarity index 100% rename from artiq/shell-dev.nix rename to artiq-fast/shell-dev.nix diff --git a/artiq/shell.nix b/artiq-fast/shell.nix similarity index 100% rename from artiq/shell.nix rename to artiq-fast/shell.nix diff --git a/artiq/vivado.nix b/artiq-fast/vivado.nix similarity index 100% rename from artiq/vivado.nix rename to artiq-fast/vivado.nix diff --git a/artiq/windows/README.md b/artiq-fast/windows/README.md similarity index 100% rename from artiq/windows/README.md rename to artiq-fast/windows/README.md diff --git a/artiq/windows/install.nix b/artiq-fast/windows/install.nix similarity index 100% rename from artiq/windows/install.nix rename to artiq-fast/windows/install.nix diff --git a/artiq/windows/install.txt b/artiq-fast/windows/install.txt similarity index 100% rename from artiq/windows/install.txt rename to artiq-fast/windows/install.txt diff --git a/artiq/windows/manual-test-run.nix b/artiq-fast/windows/manual-test-run.nix similarity index 100% rename from artiq/windows/manual-test-run.nix rename to artiq-fast/windows/manual-test-run.nix diff --git a/artiq/windows/qemu.nix b/artiq-fast/windows/qemu.nix similarity index 100% rename from artiq/windows/qemu.nix rename to artiq-fast/windows/qemu.nix diff --git a/artiq/windows/run-test.nix b/artiq-fast/windows/run-test.nix similarity index 100% rename from artiq/windows/run-test.nix rename to artiq-fast/windows/run-test.nix diff --git a/sinara-systems.nix b/artiq-full.nix similarity index 92% rename from sinara-systems.nix rename to artiq-full.nix index 472f25e..68e6275 100644 --- a/sinara-systems.nix +++ b/artiq-full.nix @@ -53,9 +53,9 @@ let "wipm3" ]; - artiq = import { inherit pkgs; }; - artiq-board = import { inherit pkgs; }; - conda-artiq-board = import { inherit pkgs; }; + artiq-fast = import { inherit pkgs; }; + artiq-board = import { inherit pkgs; }; + conda-artiq-board = import { 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 diff --git a/hydra/artiq.nix b/hydra/artiq.nix index e8f686a..285ea00 100644 --- a/hydra/artiq.nix +++ b/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": {