diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 0f493783..ed809ac5 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -77,17 +77,3 @@ jobs: if: steps.changed-files.outputs.files == 'true' run: nix develop --fallback --command -- prettier --no-error-on-unmatched-pattern --ignore-unknown --check **/*.{ts,js,md,yaml,yml,sass,css,scss,html} - - proto-lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 - - uses: nixbuild/nix-quick-install-action@2c9db80fb984ceb1bcaa77cdda3fdf8cfba92035 # v34 - - uses: nix-community/cache-nix-action@135667ec418502fa5a3598af6fb9eb733888ce6a # v6.1.3 - with: - primary-key: nix-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('**/*.nix', - '**/flake.lock') }} - restore-prefixes-first-match: nix-${{ runner.os }}-${{ runner.arch }} - - - name: Buf lint - run: nix develop --fallback --command -- buf lint proto diff --git a/flake.nix b/flake.nix index b948dde3..78daf742 100644 --- a/flake.nix +++ b/flake.nix @@ -66,40 +66,6 @@ subPackages = [ "cmd/hi" ]; }; - protoc-gen-grpc-gateway = buildGo rec { - pname = "grpc-gateway"; - version = "2.29.0"; - - src = pkgs.fetchFromGitHub { - owner = "grpc-ecosystem"; - repo = "grpc-gateway"; - rev = "v${version}"; - sha256 = "sha256-d9OIIGttyMBSNgpS6mbR5JEIm13qGu2gFHJazJAexdw="; - }; - - vendorHash = "sha256-p51yD+v8+rPs+ztlX7r0VQ4XlwUkxu+PxgknKEvH00k="; - - nativeBuildInputs = [ pkgs.installShellFiles ]; - - subPackages = [ "protoc-gen-grpc-gateway" "protoc-gen-openapiv2" ]; - }; - - protobuf-language-server = buildGo rec { - pname = "protobuf-language-server"; - version = "ab4c128"; - - src = pkgs.fetchFromGitHub { - owner = "lasorda"; - repo = "protobuf-language-server"; - rev = "ab4c128f00774d51bd6d1f4cfa735f4b7c8619e3"; - sha256 = "sha256-yF6kG+qTRxVO/qp2V9HgTyFBeOm5RQzeqdZFrdidwxM="; - }; - - vendorHash = "sha256-4nTpKBe7ekJsfQf+P6edT/9Vp2SBYbKz1ITawD3bhkI="; - - subPackages = [ "." ]; - }; - # Build golangci-lint with stock Go 1.26 (upstream uses hardcoded Go # version); it does not build against the pinned 1.26.4. golangci-lint = buildGo rec { @@ -195,15 +161,6 @@ # 'dot' is needed for pprof graphs # go tool pprof -http=: graphviz - - # Protobuf dependencies - protobuf - protoc-gen-go - protoc-gen-go-grpc - protoc-gen-grpc-gateway - buf - clang-tools # clang-format - protobuf-language-server ] ++ lib.optionals pkgs.stdenv.isLinux [ traceroute ];