Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

.golangci.yml: update rules #514

Merged
merged 3 commits into from
Aug 21, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 55 additions & 51 deletions shell.nix
Original file line number Diff line number Diff line change
@@ -1,58 +1,62 @@
{ stdenv, pkgs, lib, scriptDir }:

with pkgs;
let
{
stdenv,
pkgs,
lib,
scriptDir,
}:
with pkgs; let
go = pkgs.go_1_21;

mkShell' = mkShell.override {
# juno requires building with clang, not gcc
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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the only change, the rest is the formatter


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
'';
}
Loading