From 2a7ddcab2dc22f6be81380a313b604806f4c428c Mon Sep 17 00:00:00 2001 From: ringabout <43030857+ringabout@users.noreply.github.com> Date: Fri, 19 Apr 2024 03:54:20 +0800 Subject: [PATCH] bundle atlas with sat (#23375) pending https://github.com/nim-lang/atlas/pull/119 pending AtlasStableCommit updates --- koch.nim | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/koch.nim b/koch.nim index 231ce0b797..cd84830e23 100644 --- a/koch.nim +++ b/koch.nim @@ -14,6 +14,7 @@ const NimbleStableCommit = "39b61c5d85afffd53aa404ac9126419ae1bd8d67" # master AtlasStableCommit = "7b780811a168f3f32bff4822369dda46a7f87f9a" ChecksumsStableCommit = "025bcca3915a1b9f19878cea12ad68f9884648fc" + SatStableCommit = "5faec3e9a33afe99a7d22377dd1b45a5391f5504" # examples of possible values for fusion: #head, #ea82b54, 1.2.3 FusionStableHash = "#372ee4313827ef9f2ea388840f7d6b46c2b1b014" @@ -167,9 +168,11 @@ proc bundleAtlasExe(latest: bool, args: string) = let commit = if latest: "HEAD" else: AtlasStableCommit cloneDependency(distDir, "https://github.com/nim-lang/atlas.git", commit = commit, allowBundled = true) + cloneDependency(distDir / "atlas" / distDir, "https://github.com/nim-lang/sat.git", + commit = SatStableCommit, allowBundled = true) # installer.ini expects it under $nim/bin nimCompile("dist/atlas/src/atlas.nim", - options = "-d:release --noNimblePath " & args) + options = "-d:release --noNimblePath -d:nimAtlasBootstrap " & args) proc bundleNimsuggest(args: string) = nimCompileFold("Compile nimsuggest", "nimsuggest/nimsuggest.nim",