From 39fbf2cfb4886c69fc9445a75d4d0aeae66f5ef9 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Sun, 17 Aug 2025 19:50:35 -0700 Subject: small cleanup --- flake.nix | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index d0c01b3..5d584e2 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,7 @@ treefmtEval = treefmt-nix.lib.evalModule pkgs ./treefmt.nix; - ciPackagesBackend = with pkgs; [ + ciPackages = with pkgs; [ go # Need that obviously gofumpt # Go formatter golangci-lint # Local/CI linter @@ -75,37 +75,23 @@ }; }; }; - - # ci = - # pkgs.runCommand "ci-runner" - # { - # nativeBuildInputs = [ ci-script ] ++ ciPackages; # Include ci-script and ciPackages - # inherit (self.checks.${system}.pre-commit-check) shellHook; # Reuse pre-commit shellHook if needed - # } - # '' - # echo "Running CI script with essential packages..." - # # Ensure the ci-script is executable and in PATH for this check - # export PATH=$out/bin:$PATH - # run-ci - # touch $out # Ensure the output path is created - # ''; }; devShells = { default = pkgs.mkShell { buildInputs = - [ ] ++ ciPackagesBackend ++ devPackages ++ self.checks.${system}.pre-commit-check.enabledPackages; + [ ] ++ ciPackages ++ devPackages ++ self.checks.${system}.pre-commit-check.enabledPackages; shellHook = '' ${self.checks.${system}.pre-commit-check.shellHook} ''; }; - ci-backend = pkgs.mkShell { - buildInputs = [ ] ++ ciPackagesBackend; + ci = pkgs.mkShell { + buildInputs = [ ] ++ ciPackages; CI = true; shellHook = '' - echo "Entering CI backend shell. Only essential CI tools available." + echo "Entering CI shell. Only essential CI tools available." ''; }; }; -- cgit v1.2.3