From 234c2b0400ae9f35684785dae9cf85554b17c36d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Fri, 14 Apr 2023 15:28:42 +0200 Subject: [PATCH] nix: install golangci-lint in devel shell MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This way we don't need to depend on `make deps`. Signed-off-by: Jakub SokoĊ‚owski --- ci/Jenkinsfile.tests | 6 ------ flake.nix | 1 + 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/ci/Jenkinsfile.tests b/ci/Jenkinsfile.tests index a43df425..3fec5d27 100644 --- a/ci/Jenkinsfile.tests +++ b/ci/Jenkinsfile.tests @@ -21,12 +21,6 @@ pipeline { } stages { - stage('Deps') { - steps { script { - nix.develop('make deps', pure: false) - } } - } - stage('Lint') { steps { script { nix.develop('make lint', pure: false) diff --git a/flake.nix b/flake.nix index d6e3a6f8..ee1a56ab 100644 --- a/flake.nix +++ b/flake.nix @@ -49,6 +49,7 @@ default = mkShell { GOFLAGS = "-trimpath"; # Drop -mod=vendor inputsFrom = [ packages.${system}.node ]; + buildInputs = with pkgs; [ golangci-lint ]; nativeBuildInputs = lib.optional stdenv.isDarwin [ (pkgs.xcodeenv.composeXcodeWrapper { version = "14.2"; }) ];