Skip to content

Commit 7ec9e7b

Browse files
authored
Merge branch 'main' into fix/demo-installations
2 parents f63b77c + 5b03f54 commit 7ec9e7b

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
inherit nixpkgs pkgs; release = false;
1111
defaultCrateOverrides = pkgs.defaultCrateOverrides // {
1212
stackable-cockpit-web = attrs: {
13-
nativeBuildInputs = [ pkgs.nodePackages.yarn pkgs.nodejs ];
13+
nativeBuildInputs = [ pkgs.nodePackages.yarn pkgs.nodejs_20 ];
1414
preConfigure =
1515
''
1616
[[ ! -e node_modules ]] || rm -r node_modules
@@ -69,7 +69,7 @@
6969
done
7070
'';
7171
}
72-
, js2nix ? pkgs.callPackage sources.js2nix { nodejs = pkgs.nodejs-18_x; }
72+
, js2nix ? pkgs.callPackage sources.js2nix { nodejs = pkgs.nodejs_20; }
7373
, gomod2nix ? pkgs.callPackage sources.gomod2nix {}
7474
}:
7575
rec {

nix/sources.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/stackablectl/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ All notable changes to this project will be documented in this file.
66

77
### Fixed
88

9+
- nix: Update nixpkgs and upgrade nodejs-18 to nodejs_20 ([#384]).
910
- Switch to idempotent Helm installations for demos and stacks ([#386]).
1011
- Ignore failed re-application of Jobs due to immutability in demo and stack installations.
1112
Display those manifests to the user, so they can decide if they need to delete and recreate it ([#386]).
1213

14+
[#384]: https://github.com/stackabletech/stackable-cockpit/pull/384
1315
[#386]: https://github.com/stackabletech/stackable-cockpit/pull/386
1416

1517
## [1.0.0] - 2025-06-02

0 commit comments

Comments
 (0)