Skip to content

Commit 788ff52

Browse files
authored
Merge pull request #70 from matter-labs/flake_update
chore: update flake.nix to nixos 24.11
2 parents b6b4571 + fa4178a commit 788ff52

File tree

4 files changed

+18
-47
lines changed

4 files changed

+18
-47
lines changed

flake.lock

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
};
66

77
inputs = {
8-
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
8+
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
99

1010
snowfall-lib = {
11-
url = "github:snowfallorg/lib";
11+
url = "github:snowfallorg/lib?ref=c6238c83de101729c5de3a29586ba166a9a65622";
1212
inputs.nixpkgs.follows = "nixpkgs";
1313
};
1414
};

packages/gramine/default.nix

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
, gawk
1616
, bison
1717
, patchelf
18+
, protobufc
1819
, which
20+
, python3Packages
1921
}:
2022
let
2123
python = pkgs.python3;
@@ -96,7 +98,7 @@ python.pkgs.buildPythonPackage {
9698
cmake
9799
pkg-config
98100
nixsgx.sgx-sdk
99-
nixsgx.protobufc
101+
protobufc
100102
nixsgx.sgx-dcap.dev
101103
nixsgx.sgx-dcap.quote_verify
102104
autoconf
@@ -107,9 +109,15 @@ python.pkgs.buildPythonPackage {
107109
perl
108110
];
109111

112+
113+
build-system = with python3Packages; [
114+
setuptools
115+
distutils
116+
];
117+
110118
buildInputs = [
111-
nixsgx.protobufc.dev
112-
nixsgx.protobufc.lib
119+
protobufc.dev
120+
protobufc.lib
113121
bash
114122
];
115123

packages/protobufc/default.nix

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)