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" } } diff --git a/rust/stackablectl/CHANGELOG.md b/rust/stackablectl/CHANGELOG.md index aa4c6fce..2cdceca1 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 ([#384]). + +[#384]: https://github.com/stackabletech/stackable-cockpit/pull/384 + ## [1.0.0] - 2025-06-02 ### Added