mirror of
https://github.com/nocodb/nocodb.git
synced 2026-04-25 01:25:32 +00:00
chore(nix/nodejs): pull in 22.12.0 from nixpkgs upstream
This commit is contained in:
2
.npmrc
2
.npmrc
@@ -1,3 +1,3 @@
|
||||
engine-strict=true
|
||||
shamefully-hoist=true
|
||||
use-node-version=22.11.0
|
||||
use-node-version=22.12.0
|
||||
|
||||
6
flake.lock
generated
6
flake.lock
generated
@@ -2,11 +2,11 @@
|
||||
"nodes": {
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1736883708,
|
||||
"narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=",
|
||||
"lastModified": 1737469691,
|
||||
"narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
|
||||
"owner": "NixOs",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8",
|
||||
"rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -22,8 +22,7 @@
|
||||
packages = forAllSystems (
|
||||
{ system, pkgs }:
|
||||
{
|
||||
nodejs = pkgs.callPackage ./nix/nodejs.nix { };
|
||||
nocodb = pkgs.callPackage ./nix/nocodb.nix { };
|
||||
nocodb = pkgs.callPackage ./nix/package.nix { };
|
||||
default = self.packages.${system}.nocodb;
|
||||
}
|
||||
);
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
{
|
||||
pkgs,
|
||||
callPackage,
|
||||
fetchpatch2,
|
||||
openssl,
|
||||
python3,
|
||||
enableNpm ? true,
|
||||
}:
|
||||
|
||||
let
|
||||
buildNodejs = callPackage "${pkgs.path}/pkgs/development/web/nodejs/nodejs.nix" {
|
||||
inherit openssl;
|
||||
python = python3;
|
||||
};
|
||||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "22.12.0";
|
||||
sha256 = "/hvEvgBNwSch6iy2cbCKId4BxpdpYO+KEkh5hYlnnhY=";
|
||||
patches = [
|
||||
"${pkgs.path}/pkgs/development/web/nodejs/configure-emulator.patch"
|
||||
"${pkgs.path}/pkgs/development/web/nodejs/configure-armv6-vfpv2.patch"
|
||||
"${pkgs.path}/pkgs/development/web/nodejs/disable-darwin-v8-system-instrumentation-node19.patch"
|
||||
"${pkgs.path}/pkgs/development/web/nodejs/bypass-darwin-xcrun-node16.patch"
|
||||
"${pkgs.path}/pkgs/development/web/nodejs/node-npm-build-npm-package-logic.patch"
|
||||
"${pkgs.path}/pkgs/development/web/nodejs/use-correct-env-in-tests.patch"
|
||||
"${pkgs.path}/pkgs/development/web/nodejs/bin-sh-node-run-v22.patch"
|
||||
|
||||
# fixes test failure, remove when included in release
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/nodejs/node/commit/b6fe731c55eb4cb9d14042a23e5002ed39b7c8b7.patch?full_index=1";
|
||||
hash = "sha256-KoKsQBFKUji0GeEPTR8ixBflCiHBhPqd2cPVPuKyua8=";
|
||||
})
|
||||
];
|
||||
}
|
||||
Reference in New Issue
Block a user