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

chore: update to nixos 24.05

Browse source 
Signed-off-by: Harald Hoyer <harald@matterlabs.dev>
This commit is contained in:
Harald Hoyer 2024-06-05 15:22:47 +02:00
parent 74a45f2eb2
commit ea5b94f682
Signed by: harald
GPG key ID: F519A1143B3FBE32
6 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

21
flake.lock generated
View file

@ -39,31 +39,32 @@
"flake-utils": "flake-utils" "flake-utils": "flake-utils"
}, },
"locked": { "locked": {
"lastModified": 1696331477, "lastModified": 1715533576,
"narHash": "sha256-YkbRa/1wQWdWkVJ01JvV+75KIdM37UErqKgTf0L54Fk=", "narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=",
"owner": "gytis-ivaskevicius", "owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"rev": "bfc53579db89de750b25b0c5e7af299e0c06d7d3", "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "gytis-ivaskevicius", "owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1710283656, "lastModified": 1717281328,
"narHash": "sha256-nI+AOy4uK6jLGBi9nsbHjL1EdSIzoo8oa+9oeVhbyFc=", "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "51063ed4f2343a59fdeebb279bb81d87d453942b", "rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -83,11 +84,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1696432959, "lastModified": 1716675292,
"narHash": "sha256-oJQZv2MYyJaVyVJY5IeevzqpGvMGKu5pZcCCJvb+xjc=", "narHash": "sha256-7TFvVE4HR/b65/0AAhewYHEJzUXxIEJn82ow5bCkrDo=",
"owner": "snowfallorg", "owner": "snowfallorg",
"repo": "lib", "repo": "lib",
"rev": "92803a029b5314d4436a8d9311d8707b71d9f0b6", "rev": "5d6e9f235735393c28e1145bec919610b172a20f",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -7,7 +7,7 @@
]; ];
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
snowfall-lib = { snowfall-lib = {
url = "github:snowfallorg/lib"; url = "github:snowfallorg/lib";

4
packages/azure-dcap-client/default.nix
View file

@ -70,8 +70,8 @@ stdenv.mkDerivation rec {
find -L '${headers}' -type f -exec ln -s {} src/Linux/ext/intel \; find -L '${headers}' -type f -exec ln -s {} src/Linux/ext/intel \;
substitute src/Linux/Makefile{.in,} \ substitute src/Linux/Makefile{.in,} \
--replace '##CURLINC##' '${curl.dev}/include/curl/' \ --replace-fail '##CURLINC##' '${curl.dev}/include/curl/' \
--replace '$(TEST_SUITE): $(PROVIDER_LIB) $(TEST_SUITE_OBJ)' '$(TEST_SUITE): $(TEST_SUITE_OBJ)' --replace-fail '$(TEST_SUITE): $(PROVIDER_LIB) $(TEST_SUITE_OBJ)' '$(TEST_SUITE): $(TEST_SUITE_OBJ)'
''; '';
env.NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; env.NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";

14
packages/sgx-psw/default.nix
View file

@ -161,19 +161,19 @@ stdenv.mkDerivation rec {
# is helpful to have properly patched versions for non-NixOS distributions. # is helpful to have properly patched versions for non-NixOS distributions.
echo "Fixing aesmd.service" echo "Fixing aesmd.service"
substituteInPlace $out/lib/systemd/system/aesmd.service \ substituteInPlace $out/lib/systemd/system/aesmd.service \
--replace '@aesm_folder@' \ --replace-fail '@aesm_folder@' \
"$out/aesm" \ "$out/aesm" \
--replace 'Type=forking' \ --replace-fail 'Type=forking' \
'Type=simple' \ 'Type=simple' \
--replace "ExecStart=$out/aesm/aesm_service" \ --replace-fail "ExecStart=$out/aesm/aesm_service" \
"ExecStart=$out/bin/aesm_service --no-daemon"\ "ExecStart=$out/bin/aesm_service --no-daemon"\
--replace "/bin/mkdir" \ --replace-fail "/bin/mkdir" \
"${coreutils}/bin/mkdir" \ "${coreutils}/bin/mkdir" \
--replace "/bin/chown" \ --replace-fail "/bin/chown" \
"${coreutils}/bin/chown" \ "${coreutils}/bin/chown" \
--replace "/bin/chmod" \ --replace-fail "/bin/chmod" \
"${coreutils}/bin/chmod" \ "${coreutils}/bin/chmod" \
--replace "/bin/kill" \ --replace-fail "/bin/kill" \
"${coreutils}/bin/kill" "${coreutils}/bin/kill"
''; '';

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

@ -224,7 +224,7 @@ stdenv.mkDerivation rec {
preFixup = '' preFixup = ''
echo "Strip sgxsdk prefix" echo "Strip sgxsdk prefix"
for path in "$out/share/bin/environment" "$out/bin/sgx-gdb"; do for path in "$out/share/bin/environment" "$out/bin/sgx-gdb"; do
substituteInPlace $path --replace "$TMPDIR/sgxsdk" "$out" substituteInPlace $path --replace-fail "$TMPDIR/sgxsdk" "$out"
done done
echo "Fixing pkg-config files" echo "Fixing pkg-config files"
@ -232,7 +232,7 @@ stdenv.mkDerivation rec {
echo "Fixing SGX_SDK default in samples" echo "Fixing SGX_SDK default in samples"
substituteInPlace $out/share/SampleCode/LocalAttestation/buildenv.mk \ substituteInPlace $out/share/SampleCode/LocalAttestation/buildenv.mk \
--replace '/opt/intel/sgxsdk' "$out" --replace-fail '/opt/intel/sgxsdk' "$out"
for file in $out/share/SampleCode/*/Makefile; do for file in $out/share/SampleCode/*/Makefile; do
substituteInPlace $file \ substituteInPlace $file \
--replace '/opt/intel/sgxsdk' "$out" --replace '/opt/intel/sgxsdk' "$out"
@ -240,11 +240,11 @@ stdenv.mkDerivation rec {
echo "Fixing BINUTILS_DIR in buildenv.mk" echo "Fixing BINUTILS_DIR in buildenv.mk"
substituteInPlace $out/share/bin/buildenv.mk \ substituteInPlace $out/share/bin/buildenv.mk \
--replace 'BINUTILS_DIR ?= /usr/local/bin' \ --replace-fail 'BINUTILS_DIR ?= /usr/local/bin' \
'BINUTILS_DIR ?= ${BINUTILS_DIR}' 'BINUTILS_DIR ?= ${BINUTILS_DIR}'
echo "Fixing GDB path in bin/sgx-gdb" echo "Fixing GDB path in bin/sgx-gdb"
substituteInPlace $out/bin/sgx-gdb --replace '/usr/local/bin/gdb' '${gdb}/bin/gdb' substituteInPlace $out/bin/sgx-gdb --replace-fail '/usr/local/bin/gdb' '${gdb}/bin/gdb'
''; '';
doInstallCheck = true; doInstallCheck = true;

2
packages/sgx-ssl/default.nix
View file

@ -40,7 +40,7 @@ stdenv.mkDerivation {
# Skip the tests. Build and run separately (see below). # Skip the tests. Build and run separately (see below).
substituteInPlace Linux/sgx/Makefile \ substituteInPlace Linux/sgx/Makefile \
--replace '$(MAKE) -C $(TEST_DIR) all' \ --replace-fail '$(MAKE) -C $(TEST_DIR) all' \
'bash -c "true"' 'bash -c "true"'
''; '';