From 30abe60cdaeb8f28d751c3e9acdbe3e3cbdce132 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20M=20G=C3=B3mez?= <info@jmgomez.me>
Date: Fri, 13 Dec 2024 18:00:18 +0000
Subject: [PATCH] Bumps `nimble v0.16.4` (#24437)

(cherry picked from commit be4d19e562a087b521f8df461d0712b52718c9b5)
---
 koch.nim                         | 10 +++-------
 testament/important_packages.nim |  2 +-
 tools/deps.nim                   |  6 ++++++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/koch.nim b/koch.nim
index 3419fa3487..246b9371c2 100644
--- a/koch.nim
+++ b/koch.nim
@@ -11,7 +11,7 @@
 
 const
   # examples of possible values for repos: Head, ea82b54
-  NimbleStableCommit = "46e2ae13eeb95619a371a74d16efc5aff30ea371" # 0.16.2
+  NimbleStableCommit = "4e7e646b9819b72044e5262c2800e9f7ccfd1b16" # 0.16.4
   AtlasStableCommit = "5faec3e9a33afe99a7d22377dd1b45a5391f5504"
   ChecksumsStableCommit = "bd9bf4eaea124bf8d01e08f92ac1b14c6879d8d3"
   SatStableCommit = "faf1617f44d7632ee9601ebc13887644925dcc01"
@@ -156,13 +156,9 @@ proc bundleNimbleExe(latest: bool, args: string) =
   let commit = if latest: "HEAD" else: NimbleStableCommit
   cloneDependency(distDir, "https://github.com/nim-lang/nimble.git",
                   commit = commit, allowBundled = true)
-  cloneDependency(distDir / "nimble" / distDir, "https://github.com/nim-lang/checksums.git",
-                commit = ChecksumsStableCommit, allowBundled = true) # or copy it from dist?
-  cloneDependency(distDir / "nimble" / distDir, "https://github.com/nim-lang/sat.git",
-                commit = SatStableCommit, allowBundled = true)
-  # installer.ini expects it under $nim/bin
+  updateSubmodules(distDir / "nimble")
   nimCompile("dist/nimble/src/nimble.nim",
-             options = "-d:release -d:nimNimbleBootstrap --mm:refc --noNimblePath " & args)
+             options = "-d:release --mm:refc --noNimblePath " & args)
 
 proc bundleAtlasExe(latest: bool, args: string) =
   let commit = if latest: "HEAD" else: AtlasStableCommit
diff --git a/testament/important_packages.nim b/testament/important_packages.nim
index 2f5bf8eb1d..014285e193 100644
--- a/testament/important_packages.nim
+++ b/testament/important_packages.nim
@@ -30,7 +30,7 @@ type NimblePackage* = object
 
 var packages*: seq[NimblePackage]
 
-proc pkg(name: string; cmd = "nimble test"; url = "", useHead = true, allowFailure = false) =
+proc pkg(name: string; cmd = "nimble test -l"; url = "", useHead = true, allowFailure = false) =
   packages.add NimblePackage(name: name, cmd: cmd, url: url, useHead: useHead, allowFailure: allowFailure)
 
 pkg "alea"
diff --git a/tools/deps.nim b/tools/deps.nim
index e43f7a2b42..6568de7ff2 100644
--- a/tools/deps.nim
+++ b/tools/deps.nim
@@ -42,3 +42,9 @@ proc cloneDependency*(destDirBase: string, url: string, commit = commitHead,
     discard "this dependency was bundled with Nim, don't do anything"
   else:
     quit "FAILURE: " & destdir & " already exists but is not a git repo"
+
+proc updateSubmodules*(dir: string) =
+  let oldDir = getCurrentDir()
+  setCurrentDir(dir)
+  exec "git submodule update --init"
+  setCurrentDir(oldDir)