From 8daac1b061853a08b203ea1dc10a8d4b65789c4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20M=20G=C3=B3mez?= Date: Sun, 2 Jun 2024 14:16:04 +0100 Subject: [PATCH] [Backport 2.0] Updates nimble (#23643) --- koch.nim | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/koch.nim b/koch.nim index a10e01dbbe..7747a3195e 100644 --- a/koch.nim +++ b/koch.nim @@ -11,9 +11,10 @@ const # examples of possible values for repos: Head, ea82b54 - NimbleStableCommit = "168416290e49023894fc26106799d6f1fc964a2d" # master + NimbleStableCommit = "f8bd7b5fa6ea7a583b411b5959b06e6b5eb23667" # master AtlasStableCommit = "7b780811a168f3f32bff4822369dda46a7f87f9a" ChecksumsStableCommit = "b4c73320253f78e3a265aec6d9e8feb83f97c77b" + SatStableCommit = "faf1617f44d7632ee9601ebc13887644925dcc01" # examples of possible values for fusion: #head, #ea82b54, 1.2.3 FusionStableHash = "#372ee4313827ef9f2ea388840f7d6b46c2b1b014" @@ -156,9 +157,11 @@ proc bundleNimbleExe(latest: bool, args: string) = 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 nimCompile("dist/nimble/src/nimble.nim", - options = "-d:release --mm:refc --noNimblePath " & args) + options = "-d:release -d:nimNimbleBootstrap --mm:refc --noNimblePath " & args) proc bundleAtlasExe(latest: bool, args: string) = let commit = if latest: "HEAD" else: AtlasStableCommit