From 71eeca58011561015305a4ab2712bc208040d08f Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 22 May 2026 22:54:48 +0200 Subject: [PATCH] Fix Nix eval warnings (#112) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * runCommandNoCC -> runCommand * drop x86_64-darwin * use upstream hercules-ci-effects * flake.lock: Update Flake lock file updates: • Updated input 'hercules-ci-effects': 'github:max-privatevoid/hercules-ci-effects/f3a32947c119cfe0f0130ad91b37028a3dae22d1?narHash=sha256-3A2B8k6YCuzt5pT/CQEltUghtE6heSlk2tMYkg/fUWI%3D' (2026-04-15) → 'github:hercules-ci/hercules-ci-effects/af4331c44f13977b6964745454eadcfee2d244d1?narHash=sha256-OOEWyt8ma7QAysDbiP65J7li7KIdtZfnbA11gFnwyEI%3D' (2026-05-16) --- dev/formatting.nix | 4 ++-- flake.lock | 11 +++++------ flake.nix | 3 +-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dev/formatting.nix b/dev/formatting.nix index dbf0b68..5a58a56 100644 --- a/dev/formatting.nix +++ b/dev/formatting.nix @@ -16,11 +16,11 @@ }; in { - format-nix = pkgs.runCommandNoCC "format-nix" { } '' + format-nix = pkgs.runCommand "format-nix" { } '' ${lib.getExe config.formatter} -c ${filesWithExtension "nix"} touch $out ''; - format-go = pkgs.runCommandNoCC "format-go" { } '' + format-go = pkgs.runCommand "format-go" { } '' test "$(${lib.getExe' pkgs.go "gofmt"} -l ${filesWithExtension "go"} | tee /dev/stderr | wc -l)" == 0 touch $out ''; diff --git a/flake.lock b/flake.lock index e64fab9..e6da634 100644 --- a/flake.lock +++ b/flake.lock @@ -30,16 +30,15 @@ ] }, "locked": { - "lastModified": 1776270251, - "narHash": "sha256-3A2B8k6YCuzt5pT/CQEltUghtE6heSlk2tMYkg/fUWI=", - "owner": "max-privatevoid", + "lastModified": 1778930899, + "narHash": "sha256-OOEWyt8ma7QAysDbiP65J7li7KIdtZfnbA11gFnwyEI=", + "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "f3a32947c119cfe0f0130ad91b37028a3dae22d1", + "rev": "af4331c44f13977b6964745454eadcfee2d244d1", "type": "github" }, "original": { - "owner": "max-privatevoid", - "ref": "pr/skip-if-exists", + "owner": "hercules-ci", "repo": "hercules-ci-effects", "type": "github" } diff --git a/flake.nix b/flake.nix index ea7efd5..9c2f670 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ inputs.nixpkgs-lib.follows = "nixpkgs"; }; hercules-ci-effects = { - url = "github:max-privatevoid/hercules-ci-effects/pr/skip-if-exists"; + url = "github:hercules-ci/hercules-ci-effects"; inputs = { nixpkgs.follows = "nixpkgs"; flake-parts.follows = "flake-parts"; @@ -27,7 +27,6 @@ "x86_64-linux" "aarch64-linux" "aarch64-darwin" - "x86_64-darwin" ]; herculesCI.ciSystems = [ "x86_64-linux"