diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..3363fa3 --- /dev/null +++ b/flake.lock @@ -0,0 +1,25 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1615991631, + "narHash": "sha256-TEDPXYy9sVLyctW/OBqxhxlxPmvTwRqXBch0eexJm8Y=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f137bcd5c92906ae0f924769a95b8c8e6602f90b", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..08e18b9 --- /dev/null +++ b/flake.nix @@ -0,0 +1,25 @@ +{ + description = "C3D2 Hydra projects"; + + outputs = { self, nixpkgs }: { + packages.x86_64-linux = { + jobsets = + nixpkgs.legacyPackages.x86_64-linux.writeText "jobsets.json" (builtins.toJSON ({ + jobsets = { + type = 1; + enabled = 1; + hidden = false; + checkinterval = 300; + schedulingshares = 100; + enableemail = true; + emailoverride = ""; + keepnr = 12; + flake = "git+https://gitea.c3d2.de/C3D2/hydra-config.git"; + }; + #inherit (import ./jobsets.nix { pkgs = nixpkgs.legacyPackages.x86_64-linux; }) jobsets; + })); + }; + + checks = {}; + }; +} diff --git a/jobsets.json b/jobsets.json index 68c4638..71e18cd 100644 --- a/jobsets.json +++ b/jobsets.json @@ -2,16 +2,11 @@ "enabled": 1, "hidden": true, "description": "Jobsets", - "nixexprinput": "hydra-config", - "nixexprpath": "jobsets.nix", "checkinterval": 300, "schedulingshares": 100, "enableemail": false, "emailoverride": "astro@spaceboyz.net", "keepnr": 10, - "inputs": { - "nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git release-20.03 1", "emailresponsible": false }, - "hydra-config": { "type": "git", "value": "https://gitea.c3d2.de/C3D2/hydra-config.git master 1", "emailresponsible": false } - }, - "type": 0 + "flake": "git+https://gitea.c3d2.de/C3D2/hydra-config.git", + "type": 1 }