From 96348a5e403786dd7fbb4ec77761072fd9b042bc Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande <ivansete@status.im>
Date: Thu, 12 Feb 2026 11:41:15 +0100
Subject: [PATCH 1/2] use nimble 0.22.0 with macos segfault fix

---
 .github/workflows/ci-nix.yml | 11 -----------
 flake.nix                    | 13 +++++++++++++
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci-nix.yml b/.github/workflows/ci-nix.yml
index f324b4a..1d4e544 100644
--- a/.github/workflows/ci-nix.yml
+++ b/.github/workflows/ci-nix.yml
@@ -29,17 +29,6 @@ jobs:
           - system: x86_64-linux
             runs_on: [self-hosted, Linux, X64]
 
-        # Nimble segfaults on MacOS hosts.
-        exclude:
-          - system: aarch64-darwin
-            nixpkg: libsds-android-arm64
-          - system: aarch64-darwin
-            nixpkg: libsds-android-amd64
-          - system: aarch64-darwin
-            nixpkg: libsds-android-x86
-          - system: aarch64-darwin
-            nixpkg: libsds-android-arm
-
     name: '${{ matrix.system }} / ${{ matrix.nixpkg }}'
     runs-on: ${{ matrix.runs_on }}
     steps:
diff --git a/flake.nix b/flake.nix
index 6eaffdd..0c3eaf7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,6 +35,19 @@
               androidPkgs = final.androidEnvCustom.pkgs;
               androidShell = final.androidEnvCustom.shell;
             })
+
+            (final: prev: {
+              nimble = prev.nimble.overrideAttrs (old: {
+                src = prev.fetchFromGitHub {
+                  version = "0.22.0"
+                  owner = "nim-lang";
+                  repo = "nimble";
+                  rev = "802e158ddce88c93367ebd9b3c66714b215a7928";
+                  hash = "sha256-m0i6JOwdxvp33XAr9XJ1Daly+4DOLPTUDNXKCHJj3I8=";
+                  fetchSubmodules = true;
+                };
+              });
+            })
           ];
         }
       );

From 959b0fc7171b1057c1ecb3dbdc5d051152fb33c3 Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande <ivansete@status.im>
Date: Thu, 12 Feb 2026 12:00:52 +0100
Subject: [PATCH 2/2] add missing semicolon

---
 flake.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index 0c3eaf7..b3b3830 100644
--- a/flake.nix
+++ b/flake.nix
@@ -39,7 +39,7 @@
             (final: prev: {
               nimble = prev.nimble.overrideAttrs (old: {
                 src = prev.fetchFromGitHub {
-                  version = "0.22.0"
+                  version = "0.22.0";
                   owner = "nim-lang";
                   repo = "nimble";
                   rev = "802e158ddce88c93367ebd9b3c66714b215a7928";