diff --git a/.golangci.yaml b/.golangci.yaml index 9e4ab89249..0d3a603ef4 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -42,10 +42,10 @@ linters: - nlreturn # Use empty line at least before return/break/continue. - goerr113 # Do not define dynamic errors with Errorf. - varnamelen # m, d, p < These are not so meaningful variables. - - testpackage # Blackbox testing is preffered. + - testpackage # Blackbox testing is preferred. - funlen # Break long functions. - gomnd # Give constant values a name with constants. - - ireturn # Accept interface, return concrate. + - ireturn # Accept interface, return concrete. - nestif # Some nexted if statements are 8 or 9 deep. - dupl # Check code duplications. - cyclop # Complex functions are not good. diff --git a/flake.nix b/flake.nix index e6f9d9ddd2..9530eba467 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { # NixPkgs (nixos-23.11) - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; }; outputs = { self, nixpkgs, ... }: @@ -28,7 +28,7 @@ inherit (pkgs) stdenv lib ; in { - ${pname} = pkgs.buildGo121Module rec { + ${pname} = pkgs.buildGo122Module rec { inherit pname self; version = lib.fileContents ./VERSION; gitCommit = if (self ? rev) then self.rev else self.dirtyRev; @@ -86,7 +86,7 @@ { default = pkgs.mkShell { buildInputs = with pkgs; [ - go_1_21 # golang 1.21 + go_1_22 # golang 1.22 gopls # go language server gotools # go imports go-tools # static checks