From 83d5fbb72b29fecb174c96d4cfc111281644c04d Mon Sep 17 00:00:00 2001 From: Kristijan Rebernisak Date: Wed, 21 Aug 2024 14:32:23 +0200 Subject: [PATCH] Update golangci-lint Go dep to 1.22 --- shell.nix | 106 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 55 insertions(+), 51 deletions(-) diff --git a/shell.nix b/shell.nix index ff471f28..5a18c699 100644 --- a/shell.nix +++ b/shell.nix @@ -1,7 +1,10 @@ -{ stdenv, pkgs, lib, scriptDir }: - -with pkgs; -let +{ + stdenv, + pkgs, + lib, + scriptDir, +}: +with pkgs; let go = pkgs.go_1_21; mkShell' = mkShell.override { @@ -9,50 +12,51 @@ let stdenv = pkgs.clangStdenv; }; in -mkShell' { - nativeBuildInputs = [ - stdenv.cc.cc.lib - (rust-bin.stable.latest.default.override { extensions = [ "rust-src" ]; }) - nodejs-18_x - (yarn.override { nodejs = nodejs-18_x; }) - nodePackages.typescript - nodePackages.typescript-language-server - nodePackages.npm - python3 - - python311Packages.ledgerwallet - go - - gopls - delve - (golangci-lint.override { buildGoModule = buildGo121Module; }) - gotools - - kubectl - kubernetes-helm - - postgresql_15 # psql - - ] ++ lib.optionals stdenv.isLinux [ - # ledger specific packages - libudev-zero - libusb1 - ]; - - LD_LIBRARY_PATH = lib.makeLibraryPath [ pkgs.zlib stdenv.cc.cc.lib ]; # lib64 - - GOROOT = "${go}/share/go"; - CGO_ENABLED = 0; - HELM_REPOSITORY_CONFIG = "${scriptDir}/.helm-repositories.yaml"; - - shellHook = '' - # Update helm repositories - helm repo update > /dev/null - # setup go bin for nix - export GOBIN=$HOME/.nix-go/bin - mkdir -p $GOBIN - export PATH=$GOBIN:$PATH - # install gotestloghelper - go install github.com/smartcontractkit/chainlink-testing-framework/tools/gotestloghelper@latest - ''; -} + mkShell' { + nativeBuildInputs = + [ + stdenv.cc.cc.lib + (rust-bin.stable.latest.default.override {extensions = ["rust-src"];}) + nodejs-18_x + (yarn.override {nodejs = nodejs-18_x;}) + nodePackages.typescript + nodePackages.typescript-language-server + nodePackages.npm + python3 + + python311Packages.ledgerwallet + go + + gopls + delve + (golangci-lint.override {buildGoModule = buildGo122Module;}) + gotools + + kubectl + kubernetes-helm + + postgresql_15 # psql + ] + ++ lib.optionals stdenv.isLinux [ + # ledger specific packages + libudev-zero + libusb1 + ]; + + LD_LIBRARY_PATH = lib.makeLibraryPath [pkgs.zlib stdenv.cc.cc.lib]; # lib64 + + GOROOT = "${go}/share/go"; + CGO_ENABLED = 0; + HELM_REPOSITORY_CONFIG = "${scriptDir}/.helm-repositories.yaml"; + + shellHook = '' + # Update helm repositories + helm repo update > /dev/null + # setup go bin for nix + export GOBIN=$HOME/.nix-go/bin + mkdir -p $GOBIN + export PATH=$GOBIN:$PATH + # install gotestloghelper + go install github.com/smartcontractkit/chainlink-testing-framework/tools/gotestloghelper@latest + ''; + }