harald/nixsgx
1
0
Fork 0
mirror of https://github.com/matter-labs/nixsgx.git synced 2025-10-29 13:14:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 5d19952748 into fa0bf8ab6a

Browse source
This commit is contained in:
Harald Hoyer 2025-07-31 12:35:16 +02:00 • committed by GitHub
commit 3acd5b199d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/nix.yml vendored
View file

@ -28,8 +28,6 @@ jobs:
endpoint: https://static.188.92.12.49.clients.your-server.de/
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://static.188.92.12.49.clients.your-server.de/
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://static.188.92.12.49.clients.your-server.de/
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

8
flake.lock generated
View file

@ -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"
}

2
flake.nix
View file

@ -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";

4
packages/nodejs/default.nix
View file

@ -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" ];
})

10
packages/sgx-sdk/default.nix
View file

@ -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
'';