Skip to content

Commit

Permalink
revert lock check
Browse files Browse the repository at this point in the history
  • Loading branch information
jmgomez committed Dec 4, 2024
1 parent 143dd3a commit f0e9244
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions src/nimblepkg/nimblesat.nim
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,7 @@ proc getMinimalInfo*(pkg: PackageInfo, options: Options): PackageMinimalInfo =
result.name = pkg.basicInfo.name
result.version = pkg.basicInfo.version
result.requires = pkg.requires.map(convertNimrodToNim)
var addNimRequire = options.action.typ notin {actionLock, actionDeps} and not options.hasNimInLockFile()
if addNimRequire:
if options.action.typ in {actionLock, actionDeps} or options.hasNimInLockFile():
result.requires = result.requires.filterIt(not it.isNim)

proc hasVersion*(packageVersions: PackageVersions, pv: PkgTuple): bool =
Expand Down Expand Up @@ -635,8 +634,6 @@ proc topologicalSort*(solvedPkgs: seq[SolvedPackage]): seq[SolvedPackage] =
zeroInDegree.add(neighbor)

proc isSystemNimCompatible*(solvedPkgs: seq[SolvedPackage], options: Options): bool =
if options.action.typ in {actionLock, actionDeps} or options.hasNimInLockFile():
return false
for solvedPkg in solvedPkgs:
for req in solvedPkg.requirements:
if req.isNim and options.nimBin.isSome and not options.nimBin.get.version.withinRange(req.ver):
Expand Down

0 comments on commit f0e9244

Please sign in to comment.