From 94d5ad40acce6c82caaf78aab76cb15d699be936 Mon Sep 17 00:00:00 2001
From: Ivan FB <ivansete@status.im>
Date: Sun, 12 Apr 2026 22:32:33 +0200
Subject: [PATCH] pin nimble to 0.22.3 in ci and nix

---
 .github/workflows/ci.yml              |  2 +-
 .github/workflows/container-image.yml |  2 +-
 .github/workflows/windows-build.yml   |  2 +-
 flake.nix                             | 14 +++++++++++++-
 nix/shell.nix                         | 17 ++++++++++++++---
 5 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1f6fcdfec..0c8b710a0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ env:
   MAKEFLAGS: "-j${NPROC}"
   NIMFLAGS: "--parallelBuild:${NPROC} --colors:off -d:chronicles_colors:none"
   NIM_VERSION: '2.2.4'
-  NIMBLE_VERSION: '0.18.2'
+  NIMBLE_VERSION: '0.22.3'
 
 jobs:
   changes: # changes detection
diff --git a/.github/workflows/container-image.yml b/.github/workflows/container-image.yml
index c2fb9d4d2..b240bf05e 100644
--- a/.github/workflows/container-image.yml
+++ b/.github/workflows/container-image.yml
@@ -16,7 +16,7 @@ env:
   MAKEFLAGS: "-j${NPROC}"
   NIMFLAGS: "--parallelBuild:${NPROC}"
   NIM_VERSION: '2.2.4'
-  NIMBLE_VERSION: '0.18.2'
+  NIMBLE_VERSION: '0.22.3'
 
 # This workflow should not run for outside contributors
 # If org secrets are not available, we'll avoid building and publishing the docker image and we'll pass the workflow
diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
index 5b0894368..f436e7417 100644
--- a/.github/workflows/windows-build.yml
+++ b/.github/workflows/windows-build.yml
@@ -10,7 +10,7 @@ on:
 env:
   NPROC: 4
   NIM_VERSION: '2.2.4'
-  NIMBLE_VERSION: '0.18.2'
+  NIMBLE_VERSION: '0.22.3'
 
 jobs:
   build:
diff --git a/flake.nix b/flake.nix
index 57592722b..31d5a120c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,9 +36,21 @@
 
       forAllSystems = nixpkgs.lib.genAttrs systems;
 
+      nimbleOverlay = final: prev: {
+        nimble = prev.nimble.overrideAttrs (_: {
+          version = "0.22.3";
+          src = prev.fetchFromGitHub {
+            owner = "nim-lang";
+            repo  = "nimble";
+            rev   = "v0.22.3";
+            sha256 = "sha256-f7DYpRGVUeSi6basK1lfu5AxZpMFOSJ3oYsy+urYErg=";
+          };
+        });
+      };
+
       pkgsFor = system: import nixpkgs {
         inherit system;
-        overlays = [ (import rust-overlay) ];
+        overlays = [ (import rust-overlay) nimbleOverlay ];
       };
     in {
       packages = forAllSystems (system:
diff --git a/nix/shell.nix b/nix/shell.nix
index 80e3b7930..edff468ae 100644
--- a/nix/shell.nix
+++ b/nix/shell.nix
@@ -1,5 +1,17 @@
 { pkgs  }:
 
+let
+  nimble = pkgs.nimble.overrideAttrs (_: {
+    version = "0.22.3";
+    src = pkgs.fetchFromGitHub {
+      owner  = "nim-lang";
+      repo   = "nimble";
+      rev    = "v0.22.3";
+      sha256 = "sha256-f7DYpRGVUeSi6basK1lfu5AxZpMFOSJ3oYsy+urYErg=";
+    };
+  });
+in
+
 pkgs.mkShell {
   inputsFrom = [
     pkgs.androidShell
@@ -8,13 +20,12 @@ pkgs.mkShell {
     pkgs.darwin.apple_sdk.frameworks.Security
   ];
 
-  buildInputs = with pkgs; [
+  buildInputs = (with pkgs; [
     git
     cargo
     rustup
     rustc
     cmake
     nim-2_2
-    nimble
-  ];
+  ]) ++ [ nimble ]; # nimble pinned to 0.22.3 via let binding above
 }