From 1e27f2320be96b924353b308950fcf3e8f186421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Ribeiro?= Date: Sat, 4 May 2024 22:32:49 +0100 Subject: [PATCH 1/3] zx: 7.2.3 -> 8.1.2 Diff: https://github.com/google/zx/compare/7.2.3...8.1.2 Changelog: - https://github.com/google/zx/releases/tag/8.0.0 - https://github.com/google/zx/releases/tag/8.0.1 - https://github.com/google/zx/releases/tag/8.0.2 - https://github.com/google/zx/releases/tag/8.1.0 - https://github.com/google/zx/releases/tag/8.1.1 - https://github.com/google/zx/releases/tag/8.1.2 Fixes #309047. --- pkgs/tools/system/zx/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/system/zx/default.nix b/pkgs/tools/system/zx/default.nix index 1dec344ed3aaff..a1ae3947b70114 100644 --- a/pkgs/tools/system/zx/default.nix +++ b/pkgs/tools/system/zx/default.nix @@ -1,24 +1,26 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub +{ + lib, + buildNpmPackage, + fetchFromGitHub, }: buildNpmPackage rec { pname = "zx"; - version = "7.2.3"; + version = "8.1.2"; src = fetchFromGitHub { owner = "google"; repo = "zx"; rev = version; - hash = "sha256-YMfecNazmL8J+f80FdIRvr2upQ7VgXSkQQnm8z0Swhw="; + hash = "sha256-tv66idt+IfELc5TpMwDujJeIOi+kxFSl3RX3SrYL9ac="; }; - npmDepsHash = "sha256-ywNd2LGjM35ecW4dnj0oNwdSX2CRy8i9OGKPIdI0UEQ="; + npmDepsHash = "sha256-WZJDbdqoy/JkKAR00nG4IdM6okHLsqfudHw0Gs+WntM="; meta = { description = "Tool for writing scripts using JavaScript"; homepage = "https://github.com/google/zx"; + changelog = "https://github.com/google/zx/releases/tag/${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ hlolli ]; mainProgram = "zx"; From f555d4ca3cd5406d77c93d9882220a783fbced1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Ribeiro?= Date: Mon, 6 May 2024 15:55:19 +0100 Subject: [PATCH 2/3] zx: change maintainer to jlbribeiro Following https://github.com/NixOS/nixpkgs/issues/309047#issuecomment-2095530702, I'm replacing @hlolli as zx maintainer. --- pkgs/tools/system/zx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/zx/default.nix b/pkgs/tools/system/zx/default.nix index a1ae3947b70114..f8e18a310629e8 100644 --- a/pkgs/tools/system/zx/default.nix +++ b/pkgs/tools/system/zx/default.nix @@ -22,7 +22,7 @@ buildNpmPackage rec { homepage = "https://github.com/google/zx"; changelog = "https://github.com/google/zx/releases/tag/${version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ hlolli ]; + maintainers = with lib.maintainers; [ jlbribeiro ]; mainProgram = "zx"; }; } From 6fc5c63584ab71e042acbc74d09b828cf03504b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Ribeiro?= Date: Mon, 3 Jun 2024 22:16:55 +0100 Subject: [PATCH 3/3] doc(rl-24.11): zx v8 breaking changes --- nixos/doc/manual/release-notes/rl-2411.section.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 28264b0b3429d1..51904352b3b7e8 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -30,6 +30,9 @@ for `stateVersion` ≥ 24.11. (It was previously using SQLite for structured data and the filesystem for blobs). +- `zx` was updated to v8, which introduces several breaking changes. + See the [v8 changelog](https://github.com/google/zx/releases/tag/8.0.0) for more information. + - The `portunus` package and service do not support weak password hashes anymore. If you installed Portunus on NixOS 23.11 or earlier, upgrade to NixOS 24.05 first to get support for strong password hashing. Then, follow the instructions on the [upstream release notes](https://github.com/majewsky/portunus/releases/tag/v2.0.0) to upgrade all existing user accounts to strong password hashes.