From 5d199527486ead0f416a7b3b7edb78c9c0c7b584 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@matterlabs.dev>
Date: Fri, 30 May 2025 14:45:09 +0200
Subject: [PATCH] chore(deps): update dependencies and configs

- Update nixpkgs to 25.05 and Node.js to version 24.
- Adjust SGX SDK build flags to suppress additional warnings.
- Disable parallel building for SGX SDK due to Intel constraints.

Signed-off-by: Harald Hoyer <harald@matterlabs.dev>
---
 .github/workflows/nix.yml    |  6 ------
 flake.lock                   |  8 ++++----
 flake.nix                    |  2 +-
 packages/nodejs/default.nix  |  4 ++--
 packages/sgx-sdk/default.nix | 10 +++++++++-
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index d474c3a..604a1bc 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -28,8 +28,6 @@ jobs:
           endpoint: https://attic.teepot.org/
           cache: tee-pot
           token: ${{ secrets.ATTIC_TOKEN }}
-      - name: Enable magic Nix cache
-        uses: DeterminateSystems/magic-nix-cache-action@main
 
       - run: nix fmt . -- --check
 
@@ -50,8 +48,6 @@ jobs:
           endpoint: https://attic.teepot.org/
           cache: tee-pot
           token: ${{ secrets.ATTIC_TOKEN }}
-      - name: Enable magic Nix cache
-        uses: DeterminateSystems/magic-nix-cache-action@main
 
       - run: nix flake check -L --show-trace --keep-going
 
@@ -73,8 +69,6 @@ jobs:
           endpoint: https://attic.teepot.org/
           cache: tee-pot
           token: ${{ secrets.ATTIC_TOKEN }}
-      - name: Enable magic Nix cache
-        uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: nix build
         run: nix run github:nixos/nixpkgs/nixos-23.11#nixci
diff --git a/flake.lock b/flake.lock
index 5e0f92b..803ec47 100644
--- a/flake.lock
+++ b/flake.lock
@@ -55,16 +55,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1733550349,
-        "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=",
+        "lastModified": 1748437600,
+        "narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34",
+        "rev": "7282cb574e0607e65224d33be8241eae7cfe0979",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index dff30ce..91f2bc4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
   };
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
 
     snowfall-lib = {
       url = "github:snowfallorg/lib?ref=c6238c83de101729c5de3a29586ba166a9a65622";
diff --git a/packages/nodejs/default.nix b/packages/nodejs/default.nix
index e5e177d..5ba0ec7 100644
--- a/packages/nodejs/default.nix
+++ b/packages/nodejs/default.nix
@@ -1,5 +1,5 @@
-{ nodejs_18, enableNpm ? false }:
-nodejs_18.overrideAttrs (prevAttrs: {
+{ nodejs_24, enableNpm ? false }:
+nodejs_24.overrideAttrs (prevAttrs: {
   inherit enableNpm;
   configureFlags = prevAttrs.configureFlags ++ [ "--without-node-snapshot" ];
 })
diff --git a/packages/sgx-sdk/default.nix b/packages/sgx-sdk/default.nix
index 057059d..9e24a4b 100644
--- a/packages/sgx-sdk/default.nix
+++ b/packages/sgx-sdk/default.nix
@@ -146,14 +146,22 @@ stdenv.mkDerivation rec {
       popd
     '';
 
-  env.NIX_CFLAGS_COMPILE = "-Wno-error=missing-include-dirs";
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=missing-include-dirs -Wno-error=implicit-fallthrough -Wno-error=implicit-int -Wno-error=declaration-missing-parameter-type";
 
   buildFlags = [
     "sdk_install_pkg"
+    "COMMON_FLAGS+=-Wno-error=missing-include-dirs"
+    "COMMON_FLAGS+=-Wno-error=implicit-fallthrough"
+    "COMMON_FLAGS+=-Wno-error=implicit-int"
+    "COMMON_FLAGS+=-Wno-error=declaration-missing-parameter-type"
+    "V=1"
   ] ++ lib.optionals debug [
     "DEBUG=1"
   ];
 
+  # sigh! Intel
+  enableParallelBuilding = false;
+
   postBuild = ''
     patchShebangs linux/installer/bin/sgx_linux_x64_sdk_${version}.bin
   '';