diff --git a/server/default.nix b/server/default.nix index 7d6d520d8490..315bc308a9ca 100644 --- a/server/default.nix +++ b/server/default.nix @@ -1,13 +1,17 @@ let release = (import ../release.nix {}); pkgs = release.pkgs; + recentPkgs = release.recentPkgs; + # we set only the running Node to be 20.x, for project dependencies + node = recentPkgs.nodejs_20; + yarn = recentPkgs.yarn.override { nodejs = node; }; compiler = "ghc902"; utopia-server = pkgs.haskell.packages.${compiler}.callCabal2nix "utopia-server" ./. {}; haskell = pkgs.haskell.lib; trivial = pkgs.lib.trivial; disableProfiling = pkg: haskell.disableLibraryProfiling (haskell.disableExecutableProfiling pkg); disableExternalTests = pkg: haskell.appendConfigureFlag pkg "--flags -enable-external-tests"; - withNodeTooling = pkg: haskell.addBuildTools pkg [pkgs.nodejs pkgs.yarn]; + withNodeTooling = pkg: haskell.addBuildTools pkg [node yarn]; serverModifications = pkg: trivial.pipe pkg [disableProfiling disableExternalTests withNodeTooling]; overriddenHaskellPackages = pkgs.haskell.packages.${compiler}.override { overrides = self: super: {