Prepare to bootstrap with SAT (#1207)

* Prepare to bootstrap with SAT

* clone SAT

* fix path

src/nimble.nim

@@ -8,7 +8,10 @@ import std/options as std_opt
 
 import strutils except toLower
 from unicode import toLower
-import sat/sat
+when defined(nimNimbleBootstrap):
+ import ../dist/sat/src/sat/sat
+else:
+ import sat/sat
 import nimblepkg/packageinfotypes, nimblepkg/packageinfo, nimblepkg/version,
  nimblepkg/tools, nimblepkg/download, nimblepkg/common,
  nimblepkg/publish, nimblepkg/options, nimblepkg/packageparser,

src/nimblepkg/nimblesat.nim

@@ -1,4 +1,7 @@
-import sat/[sat, satvars] 
+when defined(nimNimbleBootstrap):
+ import ../../dist/sat/src/sat/[sat, satvars]
+else:
+ import sat/[sat, satvars] 
 import version, packageinfotypes, download, packageinfo, packageparser, options, 
  sha1hashes
 

tests/private/clone.nim

@@ -43,7 +43,10 @@ proc cloneDependency(destDirBase: string, url: string, commit = commitHead,
 
 proc command =
  const distDir = "dist"
- const commit = "3fa15df7d27ecef624ed932d60f63d6a8949618d"
- cloneDependency(distDir, "https://github.com/nim-lang/checksums.git", commit)
+ const ChecksumsStableCommit = "3fa15df7d27ecef624ed932d60f63d6a8949618d"
+ const SatStableCommit = "faf1617f44d7632ee9601ebc13887644925dcc01"
+
+ cloneDependency(distDir, "https://github.com/nim-lang/checksums.git", ChecksumsStableCommit)
+ cloneDependency(distDir, "https://github.com/nim-lang/sat.git", SatStableCommit)
 
 command()