don't enable lint for old golang version

This commit is contained in:
Jörg Thalheim 2025-04-02 16:25:40 +02:00
parent e8d422438a
commit 3ef71738ad
2 changed files with 11 additions and 5 deletions

View file

@ -23,12 +23,13 @@ rec {
}; };
unit-tests = pkgs.callPackage ./pkgs/unit-tests.nix { }; unit-tests = pkgs.callPackage ./pkgs/unit-tests.nix { };
} }
// (pkgs.lib.optionalAttrs pkgs.stdenv.isLinux { // pkgs.lib.optionalAttrs (pkgs ? buildGo124Module) {
lint = pkgs.callPackage ./pkgs/lint.nix { lint = pkgs.callPackage ./pkgs/lint.nix {
inherit sops-install-secrets; inherit sops-install-secrets;
}; };
}
// pkgs.lib.optionalAttrs pkgs.stdenv.isLinux {
cross-build = pkgs.callPackage ./pkgs/cross-build.nix { cross-build = pkgs.callPackage ./pkgs/cross-build.nix {
inherit sops-install-secrets; inherit sops-install-secrets;
}; };
}) }

View file

@ -1,7 +1,12 @@
{ sops-install-secrets, golangci-lint }: {
sops-install-secrets,
golangci-lint,
}:
sops-install-secrets.overrideAttrs (old: { sops-install-secrets.overrideAttrs (old: {
name = "golangci-lint"; name = "golangci-lint";
nativeBuildInputs = old.nativeBuildInputs ++ [ golangci-lint ]; nativeBuildInputs = old.nativeBuildInputs ++ [
golangci-lint
];
buildPhase = '' buildPhase = ''
HOME=$TMPDIR golangci-lint run --timeout 360s HOME=$TMPDIR golangci-lint run --timeout 360s
''; '';