From e1116e948717737ab5e7dd2657a8bb2a9b4b73f2 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@matterlabs.dev>
Date: Wed, 13 Mar 2024 15:18:23 +0100
Subject: [PATCH] chore: flake.lock update and libuv fix

Signed-off-by: Harald Hoyer <harald@matterlabs.dev>
---
 flake.lock                        |  6 ++--
 packages/libuv/default.nix        | 11 +++----
 packages/libuv/no-getifaddr.patch | 55 -------------------------------
 3 files changed, 8 insertions(+), 64 deletions(-)
 delete mode 100644 packages/libuv/no-getifaddr.patch

diff --git a/flake.lock b/flake.lock
index cfdb8d8..70b7499 100644
--- a/flake.lock
+++ b/flake.lock
@@ -54,11 +54,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1707091808,
-        "narHash": "sha256-LahKBAfGbY836gtpVNnWwBTIzN7yf/uYM/S0g393r0Y=",
+        "lastModified": 1710283656,
+        "narHash": "sha256-nI+AOy4uK6jLGBi9nsbHjL1EdSIzoo8oa+9oeVhbyFc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9f2ee8c91ac42da3ae6c6a1d21555f283458247e",
+        "rev": "51063ed4f2343a59fdeebb279bb81d87d453942b",
         "type": "github"
       },
       "original": {
diff --git a/packages/libuv/default.nix b/packages/libuv/default.nix
index f3e736d..eaa6b72 100644
--- a/packages/libuv/default.nix
+++ b/packages/libuv/default.nix
@@ -2,9 +2,8 @@
 , libuv
 }:
 libuv.overrideAttrs (prevAttrs: {
-    separateDebugInfo = false;
-    patches = (prevAttrs.patches or [ ]) ++ [
-      ./no-getifaddr.patch
-      ./no-eventfd.patch
-    ];
-  })
+  separateDebugInfo = false;
+  patches = (prevAttrs.patches or [ ]) ++ [
+    ./no-eventfd.patch
+  ];
+})
diff --git a/packages/libuv/no-getifaddr.patch b/packages/libuv/no-getifaddr.patch
deleted file mode 100644
index de72f52..0000000
--- a/packages/libuv/no-getifaddr.patch
+++ /dev/null
@@ -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);