From 82b19b36568b53cb97cb2cfec5e71a951429e51e Mon Sep 17 00:00:00 2001 From: seth Date: Thu, 25 May 2023 15:25:25 -0400 Subject: hydra: add hydra jobset --- .hydra.json | 14 ++++++++++++++ flake.lock | 8 ++++---- flake.nix | 19 ++++++++++++++----- 3 files changed, 32 insertions(+), 9 deletions(-) create mode 100644 .hydra.json diff --git a/.hydra.json b/.hydra.json new file mode 100644 index 0000000..201bd13 --- /dev/null +++ b/.hydra.json @@ -0,0 +1,14 @@ +{ + "main": { + "enabled": 1, + "type": 1, + "hidden": false, + "description": "build flake", + "checkinterval": 600, + "schedulingshares": 100, + "enableemail": false, + "emailoverride": "", + "keepnr": 2, + "flake": "github:getchoo/nix-exprs/main" + } +} diff --git a/flake.lock b/flake.lock index 71e430d..70a2002 100644 --- a/flake.lock +++ b/flake.lock @@ -18,16 +18,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1684919781, - "narHash": "sha256-YoPHy7ZDw5I154nFnRd20OfZA26NW53BO9S9jg4IRxs=", + "lastModified": 1684935479, + "narHash": "sha256-6QMMsXMr2nhmOPHdti2j3KRHt+bai2zw+LJfdCl97Mk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "56fb53c5a8406c176d470b2ffaef9920cad8305e", + "rev": "f91ee3065de91a3531329a674a45ddcb3467a650", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-unstable-small", + "ref": "nixos-unstable", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index a44db25..13ec873 100644 --- a/flake.nix +++ b/flake.nix @@ -7,14 +7,18 @@ }; inputs = { - nixpkgs.url = "nixpkgs/nixos-unstable-small"; + nixpkgs.url = "nixpkgs/nixos-unstable"; flake-compat = { url = "github:edolstra/flake-compat"; flake = false; }; }; - outputs = {nixpkgs, ...}: let + outputs = { + self, + nixpkgs, + ... + }: let systems = [ "x86_64-linux" "x86_64-darwin" @@ -47,12 +51,17 @@ formatter = forAllSystems (system: nixpkgsFor.${system}.alejandra); - herculesCI = { - ciSystems = [ + hydraJobs = let + supportedSystems = [ "x86_64-linux" "aarch64-linux" ]; - }; + + lib = self.lib {inherit (self) inputs;}; + in + with lib.ci supportedSystems; { + packages = mkCompatiblePkgs self.packages; + }; packages = forAllSystems ( system: let -- cgit v1.2.3