From 2d50e6cc46e99c727c33cd64b8a93e9af024a4a0 Mon Sep 17 00:00:00 2001 From: Sebastian Wendel Date: Mon, 17 Apr 2023 17:33:43 +0200 Subject: [PATCH] added hydra build jobs --- flake.lock | 42 ++++++++++++++++++++++++++++++++++++++---- flake.nix | 12 +++++++++++- 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 8fb9dc7..9d67ce0 100644 --- a/flake.lock +++ b/flake.lock @@ -167,12 +167,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -196,6 +199,21 @@ "type": "github" } }, + "flake-utils_2": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flakeCompat": { "flake": false, "locked": { @@ -412,7 +430,7 @@ "pre-commit": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "gitignore": "gitignore", "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable" @@ -477,6 +495,7 @@ "inputs": { "d2n": "d2n", "flake-parts": "flake-parts_2", + "flake-utils": "flake-utils", "nix-filter": "nix-filter", "nixpkgs": "nixpkgs_2", "pre-commit": "pre-commit" @@ -498,6 +517,21 @@ "repo": "rust-analyzer", "type": "github" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index fe594f6..5fbfd4c 100644 --- a/flake.nix +++ b/flake.nix @@ -6,14 +6,17 @@ d2n.url = "github:nix-community/dream2nix"; d2n.inputs.all-cabal-json.follows = "nixpkgs"; nix-filter.url = "github:numtide/nix-filter"; + flake-utils.url = "github:numtide/flake-utils"; flake-parts.url = "github:hercules-ci/flake-parts"; pre-commit.url = "github:cachix/pre-commit-hooks.nix"; }; outputs = { d2n, + self, nix-filter, flake-parts, + flake-utils, pre-commit, ... } @ inputs: let @@ -47,5 +50,12 @@ shellHook = config.pre-commit.installationScript; }; }; - }; + } + // flake-utils.lib.eachSystem ["aarch64-linux" "x86_64-linux"] (localSystem: { + hydraJobs = { + build = { + inherit (self.packages.${localSystem}) nix-hh-website; + }; + }; + }); }