ship a modern nimble with lock files support (#21061)

* change `include genode/env` to an import 

ref 0b262e9496 (diff-8718bd20d8f61d6638d3d64b19efc31bcd40a6d5be8215b2a1f0b75ed93e8d56)

* fixes comments

* ship a modern nimble with lock files support

* not sure whether the latest nimble has a regression

now I'm trying  0.14.0

* change `pkgs` to `pkgs2` (#21073)

* overwrite problematic packages

* Apply suggestions from code review

* Apply suggestions from code review

* Apply suggestions from code review
This commit is contained in:
ringabout
2022-12-12 14:25:39 +08:00
committed by GitHub
parent 5917c2d5b7
commit b981f3eeb7
4 changed files with 5 additions and 5 deletions

View File

@@ -10,7 +10,7 @@
#
const
NimbleStableCommit = "d13f3b8ce288b4dc8c34c219a4e050aaeaf43fc9" # master
NimbleStableCommit = "0777f33d1ddbd505b3aa7b714032125349323ceb" # master
# examples of possible values: #head, #ea82b54, 1.2.3
FusionStableHash = "#372ee4313827ef9f2ea388840f7d6b46c2b1b014"
HeadHash = "#head"

View File

@@ -51,8 +51,8 @@ pkg "c2nim", "nim c testsuite/tester.nim"
pkg "cascade"
pkg "cello", url = "https://github.com/nim-lang/cello", useHead = true
pkg "chroma"
pkg "chronicles", "nim c -o:chr -r chronicles.nim"
pkg "chronos", "nim c -r -d:release tests/testall"
pkg "chronicles", "nimble install -y stew@#head; nim c -o:chr -r chronicles.nim"
pkg "chronos", "nimble install -y bearssl@#head stew@#head httputils@#head; nim c -r -d:release tests/testall"
pkg "cligen", "nim c --path:. -r cligen.nim"
pkg "combparser", "nimble test --gc:orc"
pkg "compactdict"

View File

@@ -105,7 +105,7 @@ type
proc getCmd*(s: TSpec): string =
if s.cmd.len == 0:
result = compilerPrefix & " $target --hints:on -d:testing --nimblePath:build/deps/pkgs $options $file"
result = compilerPrefix & " $target --hints:on -d:testing --nimblePath:build/deps/pkgs2 $options $file"
else:
result = s.cmd

View File

@@ -1,7 +1,7 @@
discard """
targets: "cpp"
output: "hello"
cmd: "nim cpp --clearNimblePath --nimblePath:build/deps/pkgs $file"
cmd: "nim cpp --clearNimblePath --nimblePath:build/deps/pkgs2 $file"
"""
# bug #3299