harald/nixsgx
1
0
Fork 0
mirror of https://github.com/matter-labs/nixsgx.git synced 2025-07-21 07:33:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #70 from matter-labs/flake_update

Browse source 
chore: update flake.nix to nixos 24.11
This commit is contained in:
Harald Hoyer 2024-12-10 10:51:30 +01:00 • committed by GitHub
commit 788ff52330
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 18 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

9
flake.lock generated
View file

@ -55,16 +55,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1728740863, "lastModified": 1733550349,
"narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=", "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077", "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-24.05", "ref": "nixos-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -93,6 +93,7 @@
}, },
"original": { "original": {
"owner": "snowfallorg", "owner": "snowfallorg",
"ref": "c6238c83de101729c5de3a29586ba166a9a65622",
"repo": "lib", "repo": "lib",
"type": "github" "type": "github"
} }

4
flake.nix
View file

@ -5,10 +5,10 @@
}; };
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
snowfall-lib = { snowfall-lib = {
url = "github:snowfallorg/lib"; url = "github:snowfallorg/lib?ref=c6238c83de101729c5de3a29586ba166a9a65622";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };

14
packages/gramine/default.nix
View file

@ -15,7 +15,9 @@
, gawk , gawk
, bison , bison
, patchelf , patchelf
, protobufc
, which , which
, python3Packages
}: }:
let let
python = pkgs.python3; python = pkgs.python3;
@ -96,7 +98,7 @@ python.pkgs.buildPythonPackage {
cmake cmake
pkg-config pkg-config
nixsgx.sgx-sdk nixsgx.sgx-sdk
nixsgx.protobufc protobufc
nixsgx.sgx-dcap.dev nixsgx.sgx-dcap.dev
nixsgx.sgx-dcap.quote_verify nixsgx.sgx-dcap.quote_verify
autoconf autoconf
@ -107,9 +109,15 @@ python.pkgs.buildPythonPackage {
perl perl
]; ];
build-system = with python3Packages; [
setuptools
distutils
];
buildInputs = [ buildInputs = [
nixsgx.protobufc.dev protobufc.dev
nixsgx.protobufc.lib protobufc.lib
bash bash
]; ];

38
packages/protobufc/default.nix
View file

@ -1,38 +0,0 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, autoreconfHook
, pkg-config
, protobuf
, zlib
, buildPackages
}:
stdenv.mkDerivation rec {
pname = "protobuf-c";
version = "1.5.0";
src = fetchFromGitHub {
owner = "protobuf-c";
repo = "protobuf-c";
rev = "refs/tags/v${version}";
hash = "sha256-Dkpcc7ZfvAIVY91trRiHuiRFcUGUbQxbheYKTBcq80I=";
};
outputs = [ "out" "dev" "lib" ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ protobuf zlib ];
PROTOC = lib.getExe buildPackages.protobuf;
meta = with lib; {
homepage = "https://github.com/protobuf-c/protobuf-c/";
description = "C bindings for Google's Protocol Buffers";
license = licenses.bsd2;
platforms = platforms.all;
maintainers = with maintainers; [ nickcao ];
};
}