diff options
| author | ringabout <43030857+ringabout@users.noreply.github.com> | 2022-12-12 14:25:39 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-12 07:25:39 +0100 |
| commit | b981f3eeb73bc2a8e068cf7dc7cf54c4362bf19e (patch) | |
| tree | 589c422516b8c06b2202a3d48c960cbc66188dc9 | |
| parent | 5917c2d5b7bda82a8feb521890e255cdf08cf718 (diff) | |
| download | Nim-b981f3eeb73bc2a8e068cf7dc7cf54c4362bf19e.tar.gz | |
ship a modern nimble with lock files support (#21061)
* change `include genode/env` to an import ref https://github.com/nim-lang/Nim/commit/0b262e9496387d5e8adc0c5f6020b3f3300e8f79#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
| -rw-r--r-- | koch.nim | 2 | ||||
| -rw-r--r-- | testament/important_packages.nim | 4 | ||||
| -rw-r--r-- | testament/specs.nim | 2 | ||||
| -rw-r--r-- | tests/cpp/tasync_cpp.nim | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/koch.nim b/koch.nim index 766c8b223..84d0911ac 100644 --- a/koch.nim +++ b/koch.nim @@ -10,7 +10,7 @@ # const - NimbleStableCommit = "d13f3b8ce288b4dc8c34c219a4e050aaeaf43fc9" # master + NimbleStableCommit = "0777f33d1ddbd505b3aa7b714032125349323ceb" # master # examples of possible values: #head, #ea82b54, 1.2.3 FusionStableHash = "#372ee4313827ef9f2ea388840f7d6b46c2b1b014" HeadHash = "#head" diff --git a/testament/important_packages.nim b/testament/important_packages.nim index 26d457136..75283edbc 100644 --- a/testament/important_packages.nim +++ b/testament/important_packages.nim @@ -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" diff --git a/testament/specs.nim b/testament/specs.nim index cbb73a5f2..9edbde3b7 100644 --- a/testament/specs.nim +++ b/testament/specs.nim @@ -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 diff --git a/tests/cpp/tasync_cpp.nim b/tests/cpp/tasync_cpp.nim index 696274ec4..3f4ec6208 100644 --- a/tests/cpp/tasync_cpp.nim +++ b/tests/cpp/tasync_cpp.nim @@ -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 |