From 1c79272d8728b9ee3506b435713201339e84593d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Sun, 15 Oct 2023 23:39:47 +0200 Subject: [PATCH 1/4] npm-lockfile-fix: add felschr as maintainer --- pkgs/by-name/np/npm-lockfile-fix/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/np/npm-lockfile-fix/package.nix b/pkgs/by-name/np/npm-lockfile-fix/package.nix index 8e5564172dafa..947e9059a75a1 100644 --- a/pkgs/by-name/np/npm-lockfile-fix/package.nix +++ b/pkgs/by-name/np/npm-lockfile-fix/package.nix @@ -28,6 +28,6 @@ python3.pkgs.buildPythonApplication rec { description = "Add missing integrity and resolved fields to a package-lock.json file"; mainProgram = "npm-lockfile-fix"; license = lib.licenses.mit; - maintainers = [ maintainers.lucasew ]; + maintainers = with maintainers; [ lucasew felschr ]; }; } From 2e132e1cadbe174c221feb6bf2610d8b4860c8cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Sat, 22 Jun 2024 14:20:46 +0200 Subject: [PATCH 2/4] npm-lockfile-fix: add meta.homepage --- pkgs/by-name/np/npm-lockfile-fix/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/np/npm-lockfile-fix/package.nix b/pkgs/by-name/np/npm-lockfile-fix/package.nix index 947e9059a75a1..69c5d40756b7b 100644 --- a/pkgs/by-name/np/npm-lockfile-fix/package.nix +++ b/pkgs/by-name/np/npm-lockfile-fix/package.nix @@ -26,6 +26,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Add missing integrity and resolved fields to a package-lock.json file"; + homepage = "https://github.com/jeslie0/npm-lockfile-fix"; mainProgram = "npm-lockfile-fix"; license = lib.licenses.mit; maintainers = with maintainers; [ lucasew felschr ]; From 3bb58a1ea6cc064e9620da58815185e03de2d483 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Sun, 15 Oct 2023 23:39:47 +0200 Subject: [PATCH 3/4] protoc-gen-es: init at 1.10.0 --- pkgs/by-name/pr/protoc-gen-es/package.nix | 44 +++++++++++++++++++++++ pkgs/by-name/pr/protoc-gen-es/update.sh | 30 ++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 pkgs/by-name/pr/protoc-gen-es/package.nix create mode 100755 pkgs/by-name/pr/protoc-gen-es/update.sh diff --git a/pkgs/by-name/pr/protoc-gen-es/package.nix b/pkgs/by-name/pr/protoc-gen-es/package.nix new file mode 100644 index 0000000000000..4b357e4705503 --- /dev/null +++ b/pkgs/by-name/pr/protoc-gen-es/package.nix @@ -0,0 +1,44 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + npm-lockfile-fix, +}: + +buildNpmPackage rec { + pname = "protoc-gen-es"; + version = "1.10.0"; + + src = fetchFromGitHub { + owner = "bufbuild"; + repo = "protobuf-es"; + rev = "refs/tags/v${version}"; + hash = "sha256-bHl8gqNrTm1+Cnj43RWmrLDUz+G11C4gprEiNOpyOdQ="; + + postFetch = '' + ${lib.getExe npm-lockfile-fix} $out/package-lock.json + ''; + }; + + npmDepsHash = "sha256-ozkkakfSBycu83gTs8Orhm5Tg8kRSrF/vMJxVnPjhIw="; + + npmWorkspace = "packages/protoc-gen-es"; + + preBuild = '' + npm run --workspace=packages/protobuf build + npm run --workspace=packages/protoplugin build + ''; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "Protobuf plugin for generating ECMAScript code"; + homepage = "https://github.com/bufbuild/protobuf-es"; + changelog = "https://github.com/bufbuild/protobuf-es/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ + felschr + jtszalay + ]; + }; +} diff --git a/pkgs/by-name/pr/protoc-gen-es/update.sh b/pkgs/by-name/pr/protoc-gen-es/update.sh new file mode 100755 index 0000000000000..7507fbd1fe338 --- /dev/null +++ b/pkgs/by-name/pr/protoc-gen-es/update.sh @@ -0,0 +1,30 @@ +#! /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/bufbuild/protobuf-es/releases" | + jq -r 'map(select(.prerelease == false)) | .[0].tag_name' | + grep -oP "^v\K.*" +)" +url="https://raw.githubusercontent.com/bufbuild/protobuf-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-es --version "$version" From 974b5eb2d5ef3d564b5b358a3743eac415ed6af5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Sun, 15 Oct 2023 23:39:47 +0200 Subject: [PATCH 4/4] protoc-gen-connect-es: init at 1.4.0 --- .../pr/protoc-gen-connect-es/package.nix | 39 +++++++++++++++++++ .../pr/protoc-gen-connect-es/update.sh | 30 ++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 pkgs/by-name/pr/protoc-gen-connect-es/package.nix create 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 new file mode 100644 index 0000000000000..a245ee5e4f02f --- /dev/null +++ b/pkgs/by-name/pr/protoc-gen-connect-es/package.nix @@ -0,0 +1,39 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + npm-lockfile-fix, +}: + +buildNpmPackage rec { + pname = "protoc-gen-connect-es"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "connectrpc"; + repo = "connect-es"; + rev = "refs/tags/v${version}"; + hash = "sha256-qCIwr4Hyc5PARUa7tMntuyWRmO6ognmtjxN0myo8FXc="; + + postFetch = '' + ${lib.getExe npm-lockfile-fix} $out/package-lock.json + ''; + }; + + npmDepsHash = "sha256-OGwEpXZqzMSIES+cmseQlo6/vzkx5ztO0gM/rUB0tGY="; + + 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 new file mode 100755 index 0000000000000..6306267da77fd --- /dev/null +++ b/pkgs/by-name/pr/protoc-gen-connect-es/update.sh @@ -0,0 +1,30 @@ +#! /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"