refactor: update to node 22

This commit is contained in:
Rainer Killinger
2025-06-30 15:17:51 +02:00
parent ef4e1f8ded
commit c8e290200f
56 changed files with 14214 additions and 13224 deletions

View File

@@ -11,7 +11,7 @@
flake-utils,
}:
let
aapt2buildToolsVersion = "33.0.2";
aapt2buildToolsVersion = "34.0.0";
in
flake-utils.lib.eachDefaultSystem (
system:
@@ -19,7 +19,7 @@
pkgs = import nixpkgs {
inherit system;
overlays = [
(final: prev: rec {
(final: prev: {
fontMin = prev.python311.withPackages (
ps:
with ps;
@@ -30,21 +30,20 @@
++ (with fonttools.optional-dependencies; [ woff ])
);
android = prev.androidenv.composeAndroidPackages {
buildToolsVersions = [
buildToolsVersions = prev.lib.lists.unique [
"34.0.0"
aapt2buildToolsVersion
];
platformVersions = [ "34" ];
};
cypress = prev.cypress.overrideAttrs (cyPrev: rec {
version = "13.2.0";
version = "13.10.0";
src = prev.fetchzip {
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
hash = "sha256-9o0nprGcJhudS1LNm+T7Vf0Dwd1RBauYKI+w1FBQ3ZM=";
hash = "sha256-wKNXo2lWndsQaouOiul0rsOWah+RRQ6fljzdeC8/KW4=";
};
});
nodejs = prev.nodejs_18;
corepack = prev.corepack_18;
nodejs = prev.nodejs_22;
})
];
config = {
@@ -54,7 +53,6 @@
};
androidFhs = pkgs.buildFHSUserEnv {
name = "android-env";
targetPkgs = pkgs: with pkgs; [ ];
runScript = "bash";
profile = ''
export ALLOW_NINJA_ENV=true
@@ -68,7 +66,7 @@
nativeBuildInputs = [ androidFhs ];
buildInputs = with pkgs; [
nodejs
corepack
nodePackages.pnpm
# tools
curl
jq
@@ -83,6 +81,8 @@
GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${aapt2buildToolsVersion}/aapt2";
CYPRESS_INSTALL_BINARY = "0";
CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress";
# https://github.com/nodejs/node/issues/48444#issuecomment-1591882694
UV_USE_IO_URING = "0";
};
}
);