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

chore: flake.lock update and libuv fix

Browse source 
Signed-off-by: Harald Hoyer <harald@matterlabs.dev>
This commit is contained in:
Harald Hoyer 2024-03-13 15:18:23 +01:00
parent 6aef709945
commit e1116e9487
Signed by: harald
GPG key ID: F519A1143B3FBE32
3 changed files with 8 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.lock generated
View file

@ -54,11 +54,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1707091808, "lastModified": 1710283656,
"narHash": "sha256-LahKBAfGbY836gtpVNnWwBTIzN7yf/uYM/S0g393r0Y=", "narHash": "sha256-nI+AOy4uK6jLGBi9nsbHjL1EdSIzoo8oa+9oeVhbyFc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9f2ee8c91ac42da3ae6c6a1d21555f283458247e", "rev": "51063ed4f2343a59fdeebb279bb81d87d453942b",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
packages/libuv/default.nix
View file

@ -4,7 +4,6 @@
libuv.overrideAttrs (prevAttrs: { libuv.overrideAttrs (prevAttrs: {
separateDebugInfo = false; separateDebugInfo = false;
patches = (prevAttrs.patches or [ ]) ++ [ patches = (prevAttrs.patches or [ ]) ++ [
./no-getifaddr.patch
./no-eventfd.patch ./no-eventfd.patch
]; ];
}) })

55
packages/libuv/no-getifaddr.patch
View file

@ -1,55 +0,0 @@
diff --git a/src/unix/linux.c b/src/unix/linux.c
index 48b9c2c4..4ae67296 100644
--- a/src/unix/linux.c
+++ b/src/unix/linux.c
@@ -114,7 +114,7 @@
# endif
#endif /* __NR_getrandom */
-#define HAVE_IFADDRS_H 1
+#undef HAVE_IFADDRS_H
# if defined(__ANDROID_API__) && __ANDROID_API__ < 24
# undef HAVE_IFADDRS_H
diff --git a/test/test-list.h b/test/test-list.h
index 78ff9c2d..c05ab80b 100644
--- a/test/test-list.h
+++ b/test/test-list.h
@@ -483,7 +483,7 @@ TEST_DECLARE (poll_nested_kqueue)
TEST_DECLARE (poll_multiple_handles)
TEST_DECLARE (ip4_addr)
-TEST_DECLARE (ip6_addr_link_local)
+// NO_TEST_DECLARE (ip6_addr_link_local)
TEST_DECLARE (ip_name)
TEST_DECLARE (poll_close_doesnt_corrupt_stack)
@@ -1157,7 +1157,7 @@ TASK_LIST_START
TEST_ENTRY (thread_affinity)
TEST_ENTRY (dlerror)
TEST_ENTRY (ip4_addr)
- TEST_ENTRY (ip6_addr_link_local)
+// NO_TEST_ENTRY (ip6_addr_link_local)
TEST_ENTRY (ip_name)
TEST_ENTRY (queue_foreach_delete)
diff --git a/test/test-platform-output.c b/test/test-platform-output.c
index 5839f52d..8ba16d1f 100644
--- a/test/test-platform-output.c
+++ b/test/test-platform-output.c
@@ -112,6 +112,7 @@ TEST_IMPL(platform_output) {
#endif
uv_free_cpu_info(cpus, count);
+#if 0
err = uv_interface_addresses(&interfaces, &count);
ASSERT(err == 0);
@@ -147,6 +148,7 @@ TEST_IMPL(platform_output) {
}
}
uv_free_interface_addresses(interfaces, count);
+#endif
err = uv_os_get_passwd(&pwd);
ASSERT_EQ(err, 0);