From 54f63650cdbbbbfcd09c1b90ff092f906f7a7fa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Tue, 18 Feb 2025 18:24:22 +0100
Subject: [PATCH] protoc-gen-connect-es: remove

`protoc-gen-connect-es` is no longer needed since `protoc-gen-es` v2
generates service information now:
https://github.com/connectrpc/connect-es/pull/1224
---
 .../pr/protoc-gen-connect-es/package.nix      | 39 -------------------
 .../pr/protoc-gen-connect-es/update.sh        | 30 --------------
 pkgs/top-level/aliases.nix                    |  1 +
 3 files changed, 1 insertion(+), 69 deletions(-)
 delete mode 100644 pkgs/by-name/pr/protoc-gen-connect-es/package.nix
 delete mode 100755 pkgs/by-name/pr/protoc-gen-connect-es/update.sh

diff --git a/pkgs/by-name/pr/protoc-gen-connect-es/package.nix b/pkgs/by-name/pr/protoc-gen-connect-es/package.nix
deleted file mode 100644
index 6940b01b88fd..000000000000
--- a/pkgs/by-name/pr/protoc-gen-connect-es/package.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  lib,
-  buildNpmPackage,
-  fetchFromGitHub,
-  npm-lockfile-fix,
-}:
-
-buildNpmPackage rec {
-  pname = "protoc-gen-connect-es";
-  version = "1.6.1";
-
-  src = fetchFromGitHub {
-    owner = "connectrpc";
-    repo = "connect-es";
-    tag = "v${version}";
-    hash = "sha256-cB1OTolnwHOqeXrj8wL5FbFnjok6s03z1jC58ABTW3o=";
-
-    postFetch = ''
-      ${lib.getExe npm-lockfile-fix} $out/package-lock.json
-    '';
-  };
-
-  npmDepsHash = "sha256-VkvWHKERJwG7MVZ5Pb7ufRCBBWkcoMCoabtMETcPvrU=";
-
-  npmWorkspace = "packages/protoc-gen-connect-es";
-
-  passthru.updateScript = ./update.sh;
-
-  meta = with lib; {
-    description = "Protobuf plugin for generating Connect-ecompatiblenabled ECMAScript code";
-    homepage = "https://github.com/connectrpc/connect-es";
-    changelog = "https://github.com/connectrpc/connect-es/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
-      felschr
-      jtszalay
-    ];
-  };
-}
diff --git a/pkgs/by-name/pr/protoc-gen-connect-es/update.sh b/pkgs/by-name/pr/protoc-gen-connect-es/update.sh
deleted file mode 100755
index 6306267da77f..000000000000
--- a/pkgs/by-name/pr/protoc-gen-connect-es/update.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /usr/bin/env -S nix shell nixpkgs#gnugrep nixpkgs#gnused nixpkgs#coreutils nixpkgs#curl nixpkgs#wget nixpkgs#jq nixpkgs#nix-update nixpkgs#prefetch-npm-deps nixpkgs#npm-lockfile-fix nixpkgs#nodejs --command bash
-
-set -euo pipefail
-
-version="$(
-  curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/connectrpc/connect-es/releases" |
-    jq -r 'map(select(.prerelease == false)) | .[0].tag_name' |
-    grep -oP "^v\K.*"
-)"
-url="https://raw.githubusercontent.com/connectrpc/connect-es/v$version/"
-
-if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then
-  echo "Already up to date!"
-  exit 0
-fi
-
-tmp="$(mktemp -d)"
-trap 'rm -rf -- "$tmp"' EXIT
-
-pushd -- "$tmp"
-wget "$url/package-lock.json"
-npm-lockfile-fix package-lock.json
-npm_hash=$(prefetch-npm-deps package-lock.json)
-popd
-
-pushd "$(dirname "${BASH_SOURCE[0]}")"
-sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' package.nix
-popd
-
-nix-update protoc-gen-connect-es --version "$version"
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 1f24eadb8713..6c1db0292ba8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1162,6 +1162,7 @@ mapAliases {
   protobuf3_24 = protobuf_24;
   protobuf3_23 = protobuf_23;
   protobuf3_21 = protobuf_21;
+  protoc-gen-connect-es = throw "'protoc-gen-connect-es' has been removed because it is deprecated upstream. Functionality has been integrated into 'protoc-gen-es' v2."; # Added 2025-02-18
   protonup = protonup-ng; # Added 2022-11-06
   protonvpn-gui_legacy = throw "protonvpn-gui_legacy source code was removed from upstream. Use protonvpn-gui instead."; # Added 2024-10-12
   proxmark3-rrg = proxmark3; # Added 2023-07-25