sat and checksums are now git submodules (#1285)

Author: jmgomez

.gitmodules

@@ -1,3 +1,9 @@
 [submodule "vendor/zippy"]
 	path = vendor/zippy
 	url = https://github.com/guzba/zippy.git
+[submodule "vendor/sat"]
+	path = vendor/sat
+	url = https://github.com/nim-lang/sat.git
+[submodule "vendor/checksums"]
+	path = vendor/checksums
+	url = https://github.com/nim-lang/checksums.git

config.nims

@@ -4,3 +4,5 @@ import std/os
 switch("warning", "ObservableStores:off")
 switch("define", "ssl")
 switch("path", "vendor" / "zippy" / "src")
+switch("path", "vendor" / "sat" / "src")
+switch("path", "vendor" / "checksums" / "src")

nimble.nimble

@@ -10,9 +10,7 @@ srcDir = "src"
 installExt = @["nim"]
 
 # Dependencies
-
-requires "nim >= 0.13.0", "sat"
-requires "checksums"
+requires "nim >= 2.0.12"
 
 when defined(nimdistros):
   import distros

src/nimble.nim

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

src/nimblepkg/checksums.nim

@@ -3,11 +3,7 @@
 
 import os, strformat, algorithm
 import common, version, sha1hashes, vcstools, paths, cli
-
-when defined(nimNimbleBootstrap):
-  import ../../dist/checksums/src/checksums/sha1
-else:
-  import pkg/checksums/sha1
+import pkg/checksums/sha1
 
 type
   ChecksumError* = object of NimbleError

src/nimblepkg/nimblesat.nim

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

src/nimblepkg/sha1hashes.nim

@@ -3,11 +3,7 @@
 
 import strformat, strutils, json,  hashes
 import common
-
-when defined(nimNimbleBootstrap):
-  import ../../dist/checksums/src/checksums/sha1
-else:
-  import pkg/checksums/sha1
+import pkg/checksums/sha1
 
 type
   InvalidSha1HashError* = object of NimbleError

src/nimblepkg/vcstools.nim

@@ -638,10 +638,7 @@ proc fastForwardMerge*(path: Path, remoteBranch, localBranch: string) =
 
 when isMainModule:
   import unittest, sequtils
-  when defined(nimNimbleBootstrap):
-    import ../../dist/checksums/src/checksums/sha1
-  else:
-    import pkg/checksums/sha1
+  import pkg/checksums/sha1
 
   type
     NameToVcsRevision = OrderedTable[string, Sha1Hash]

tests/testscommon.nim

@@ -4,11 +4,7 @@
 {.used.}
 
 import sequtils, strutils, strformat, os, osproc, sugar, unittest, macros
-
-when defined(nimNimbleBootstrap):
-  import ../dist/checksums/src/checksums/sha1
-else:
-  import pkg/checksums/sha1
+import pkg/checksums/sha1
 
 from nimblepkg/common import cd, nimblePackagesDirName, ProcessOutput
 from nimblepkg/developfile import developFileVersion