From c494427f7b14fcf914dd4c01f56ac2180ce493d8 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 8 Dec 2023 10:25:31 +0100 Subject: [PATCH] Hercules CI builds only for `x86_64-linux` --- ci/default.nix | 9 +++++++ flake.lock | 64 ++++++++++++++++++++++++++++++++++++++++++++++---- flake.nix | 11 ++------- 3 files changed, 71 insertions(+), 13 deletions(-) create mode 100644 ci/default.nix diff --git a/ci/default.nix b/ci/default.nix new file mode 100644 index 0000000..56bef34 --- /dev/null +++ b/ci/default.nix @@ -0,0 +1,9 @@ +{inputs, ...}: { + imports = [ + inputs.hercules-ci-effects.flakeModule + ]; + herculesCI.ciSystems = [ + "x86_64-linux" + # "aarch64-linux" + ]; +} diff --git a/flake.lock b/flake.lock index 975432d..2938122 100644 --- a/flake.lock +++ b/flake.lock @@ -131,13 +131,52 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "hercules-ci-effects", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1696343447, + "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, + "hercules-ci-effects": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1701009247, + "narHash": "sha256-GuX16rzRze2y7CsewJLTV6qXkXWyEwp6VCZXi8HLruU=", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "rev": "31b6cd7569191bfcd0a548575b0e2ef953ed7d09", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1698318101, - "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", + "lastModified": 1697723726, + "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", + "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", "type": "github" }, "original": { @@ -165,6 +204,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1698318101, + "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "extra-package-agenix-el": "extra-package-agenix-el", @@ -175,7 +230,8 @@ "extra-package-nix-ts-mode": "extra-package-nix-ts-mode", "extra-package-notmuch-notify": "extra-package-notmuch-notify", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs" + "hercules-ci-effects": "hercules-ci-effects", + "nixpkgs": "nixpkgs_2" } } }, diff --git a/flake.nix b/flake.nix index f061920..9d9677f 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ inputs = { flake-parts.url = "github:hercules-ci/flake-parts"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + hercules-ci-effects.url = "github:hercules-ci/hercules-ci-effects"; extra-package-indent-bars = { url = "github:jdtsmith/indent-bars"; flake = false; @@ -43,15 +44,7 @@ ./formatter ./diff-closures ./checks + ./ci ]; }; - - nixConfig = { - extra-substituters = [ - "https://nix-community.cachix.org" - ]; - extra-trusted-public-keys = [ - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - ]; - }; }