Compare commits

...

1 Commits

Author SHA1 Message Date
69868663cb feat: update to node 22 2024-06-03 13:16:16 +02:00
8 changed files with 96 additions and 79 deletions

View File

@@ -1,3 +1,3 @@
nodejs 18.19.1 nodejs 22.2.0
pnpm 8.15.4 pnpm 8.15.4
python 3.11.5 python 3.11.5

12
flake.lock generated
View File

@@ -5,11 +5,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1709126324, "lastModified": 1710146030,
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "d465f4819400de7c8d874d50b982301f28a84605", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1709747860, "lastModified": 1717112898,
"narHash": "sha256-RT4zuBy579m+l8VyIQFOR66WXfcs4g1jntZUHjh6eoI=", "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "58ae79ea707579c40102ddf62d84b902a987c58b", "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -4,21 +4,36 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
}; };
outputs = { outputs =
{
self, self,
nixpkgs, nixpkgs,
flake-utils, flake-utils,
}: let }:
let
aapt2buildToolsVersion = "33.0.2"; aapt2buildToolsVersion = "33.0.2";
in in
flake-utils.lib.eachDefaultSystem (system: let flake-utils.lib.eachDefaultSystem (
system:
let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
overlays = [ overlays = [
(final: prev: rec { (final: prev: rec {
fontMin = prev.python311.withPackages (ps: with ps; [brotli fonttools] ++ (with fonttools.optional-dependencies; [woff])); fontMin = prev.python311.withPackages (
ps:
with ps;
[
brotli
fonttools
]
++ (with fonttools.optional-dependencies; [ woff ])
);
android = prev.androidenv.composeAndroidPackages { android = prev.androidenv.composeAndroidPackages {
buildToolsVersions = ["30.0.3" aapt2buildToolsVersion]; buildToolsVersions = [
"30.0.3"
aapt2buildToolsVersion
];
platformVersions = [ "33" ]; platformVersions = [ "33" ];
}; };
cypress = prev.cypress.overrideAttrs (cyPrev: rec { cypress = prev.cypress.overrideAttrs (cyPrev: rec {
@@ -28,7 +43,7 @@
hash = "sha256-9o0nprGcJhudS1LNm+T7Vf0Dwd1RBauYKI+w1FBQ3ZM="; hash = "sha256-9o0nprGcJhudS1LNm+T7Vf0Dwd1RBauYKI+w1FBQ3ZM=";
}; };
}); });
nodejs = prev.nodejs_18; nodejs = prev.nodejs_22;
}) })
]; ];
config = { config = {
@@ -46,7 +61,8 @@
export LD_LIBRARY_PATH=/usr/lib:/usr/lib32 export LD_LIBRARY_PATH=/usr/lib:/usr/lib32
''; '';
}; };
in { in
{
devShell = pkgs.mkShell rec { devShell = pkgs.mkShell rec {
nativeBuildInputs = [ androidFhs ]; nativeBuildInputs = [ androidFhs ];
buildInputs = with pkgs; [ buildInputs = with pkgs; [
@@ -67,5 +83,6 @@
CYPRESS_INSTALL_BINARY = "0"; CYPRESS_INSTALL_BINARY = "0";
CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress"; CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress";
}; };
}); }
);
} }

View File

@@ -21,9 +21,9 @@
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
SCRSUFFIX="_18.x" SCRSUFFIX="_22.x"
NODENAME="Node.js 18.x" NODENAME="Node.js 22.x"
NODEREPO="node_18.x" NODEREPO="node_22.x"
NODEPKG="nodejs" NODEPKG="nodejs"
print_status() { print_status() {

View File

@@ -1,5 +1,5 @@
### Set base image ### Set base image
FROM cypress/base:18.16.1 FROM cypress/base:22.0.0
USER root USER root

View File

@@ -1,4 +1,4 @@
FROM node:18-alpine3.18 FROM node:22-alpine
RUN apk update && apk add git curl jq && mkdir -p /opt RUN apk update && apk add git curl jq && mkdir -p /opt

View File

@@ -1,4 +1,4 @@
FROM node:18-alpine3.18 FROM node:22-alpine
RUN apk update && apk add git jq curl python3 build-base RUN apk update && apk add git jq curl python3 build-base

View File

@@ -2,8 +2,8 @@
"name": "@openstapps/openstapps", "name": "@openstapps/openstapps",
"private": true, "private": true,
"engines": { "engines": {
"node": ">=18.16", "node": "^22.0.0",
"pnpm": ">=8" "pnpm": "^8.15.4"
}, },
"scripts": { "scripts": {
"build": "dotenv -c -- turbo run build", "build": "dotenv -c -- turbo run build",