From 1dd88f300b6006c8a5b9fe93aa1e1b34fc951318 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 2 Jun 2025 22:49:57 +0200 Subject: [PATCH 1/3] fix(nix): Update nixpkgs and bump nodejs from 18 to 20 --- default.nix | 4 ++-- nix/sources.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/default.nix b/default.nix index cac82bf0..17b96349 100644 --- a/default.nix +++ b/default.nix @@ -10,7 +10,7 @@ inherit nixpkgs pkgs; release = false; defaultCrateOverrides = pkgs.defaultCrateOverrides // { stackable-cockpit-web = attrs: { - nativeBuildInputs = [ pkgs.nodePackages.yarn pkgs.nodejs ]; + nativeBuildInputs = [ pkgs.nodePackages.yarn pkgs.nodejs_20 ]; preConfigure = '' [[ ! -e node_modules ]] || rm -r node_modules @@ -69,7 +69,7 @@ done ''; } -, js2nix ? pkgs.callPackage sources.js2nix { nodejs = pkgs.nodejs-18_x; } +, js2nix ? pkgs.callPackage sources.js2nix { nodejs = pkgs.nodejs_20; } , gomod2nix ? pkgs.callPackage sources.gomod2nix {} }: rec { diff --git a/nix/sources.json b/nix/sources.json index b1071336..36b4714b 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -42,10 +42,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", - "sha256": "0ha2a6j3y4dbclcw7s6p473fcrzxhn4yap4wbm8s4jg7v6wal0ph", + "rev": "5929de975bcf4c7c8d8b5ca65c8cd9ef9e44523e", + "sha256": "0ngai9c0z9ail3w2zwkriby2nckw4shmb8cln1i569a2g5ya0y84", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/5929de975bcf4c7c8d8b5ca65c8cd9ef9e44523e.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } From 4a482f9f1dc3a11998bdfd98d9090a00d937a367 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 2 Jun 2025 22:51:13 +0200 Subject: [PATCH 2/3] chore: Update changelog --- rust/stackablectl/CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rust/stackablectl/CHANGELOG.md b/rust/stackablectl/CHANGELOG.md index aa4c6fce..105bd085 100644 --- a/rust/stackablectl/CHANGELOG.md +++ b/rust/stackablectl/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Fixed + +- nix: Update nixpkgs and upgrade nodejs-18 to nodejs_20 ([#xxx]). + +[#xxx]: https://github.com/stackabletech/stackable-cockpit/pull/xxx + ## [1.0.0] - 2025-06-02 ### Added From 6016bb51d7067927679163a9543eb44c735e6d75 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 2 Jun 2025 23:03:19 +0200 Subject: [PATCH 3/3] chore: Update changelog --- rust/stackablectl/CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust/stackablectl/CHANGELOG.md b/rust/stackablectl/CHANGELOG.md index 105bd085..2cdceca1 100644 --- a/rust/stackablectl/CHANGELOG.md +++ b/rust/stackablectl/CHANGELOG.md @@ -6,9 +6,9 @@ All notable changes to this project will be documented in this file. ### Fixed -- nix: Update nixpkgs and upgrade nodejs-18 to nodejs_20 ([#xxx]). +- nix: Update nixpkgs and upgrade nodejs-18 to nodejs_20 ([#384]). -[#xxx]: https://github.com/stackabletech/stackable-cockpit/pull/xxx +[#384]: https://github.com/stackabletech/stackable-cockpit/pull/384 ## [1.0.0] - 2025-06-02