From 0a211317f68b0c8d95ec0620477105074a1f5f25 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sun, 17 Feb 2019 11:30:46 +0800 Subject: [PATCH] Revert "use direct JSON for project declaration" This reverts commit 9b489c0eed541ff080a020e871d6cee17ae350e6. --- hydra-project.json | 19 ------------------- hydra-project.nix | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 19 deletions(-) delete mode 100644 hydra-project.json create mode 100644 hydra-project.nix diff --git a/hydra-project.json b/hydra-project.json deleted file mode 100644 index 563c0c6..0000000 --- a/hydra-project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "main": { - "enabled": 1, - "hidden": false, - "description": "js", - "nixexprinput": "nixScripts", - "nixexprpath": "main.nix", - "checkinterval": 300, - "schedulingshares": 10, - "enableemail": false, - "emailoverride": "", - "keepnr": 10, - "inputs": { - "nixScripts": { "type": "git", "value": "git://github.com/m-labs/nix-scripts.git", "emailresponsible": false }, - "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-18.09", "emailresponsible": false }, - "artiqSrc": { "type": "git", "value": "git://github.com/m-labs/artiq.git master 1", "emailresponsible": false } - } - } -} diff --git a/hydra-project.nix b/hydra-project.nix new file mode 100644 index 0000000..ef8634b --- /dev/null +++ b/hydra-project.nix @@ -0,0 +1,27 @@ +{ pkgs ? import {}}: +{ + jobsets = pkgs.runCommand "spec.json" {} + '' + cat > $out << EOF + { + "main": { + "enabled": 1, + "hidden": false, + "description": "js", + "nixexprinput": "nixScripts", + "nixexprpath": "main.nix", + "checkinterval": 300, + "schedulingshares": 10, + "enableemail": false, + "emailoverride": "", + "keepnr": 10, + "inputs": { + "nixScripts": { "type": "git", "value": "git://github.com/m-labs/nix-scripts.git", "emailresponsible": false }, + "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-18.09", "emailresponsible": false }, + "artiqSrc": { "type": "git", "value": "git://github.com/m-labs/artiq.git master 1", "emailresponsible": false } + } + } + } + EOF + ''; +}