From a3b370fa87a0bdb714d01046420a296586ebee2d Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Fri, 10 Dec 2021 17:13:48 +0100
Subject: [PATCH] let Nim support Nimble 0.14 with lock-file support
 [backport:1.6] (#19236)

(cherry picked from commit 908fc2a22e7336670173bcd06ab30f440ca6d321)
---
 changelog.md   | 4 ++++
 config/nim.cfg | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/changelog.md b/changelog.md
index a9296ebdf1..f18d8419a1 100644
--- a/changelog.md
+++ b/changelog.md
@@ -60,5 +60,9 @@
 - The `gc` switch has been renamed to `mm` ("memory management") in order to reflect the
   reality better. (Nim moved away from all techniques based on "tracing".)
 
+- Nim now supports Nimble version 0.14 which added support for lock-files. This is done by
+  a simple configuration change setting that you can do yourself too. In `$nim/config/nim.cfg`
+  replace `pkgs` by `pkgs2`.
+
 - There is a new switch `--nimMainPrefix:prefix` to influence the `NimMain` that the
   compiler produces. This is particularly useful for generating static libraries.
diff --git a/config/nim.cfg b/config/nim.cfg
index 86c6e2141e..59d7f48d29 100644
--- a/config/nim.cfg
+++ b/config/nim.cfg
@@ -44,10 +44,12 @@ path="$lib/core"
 path="$lib/pure"
 
 @if not windows:
+  nimblepath="/opt/nimble/pkgs2/"
   nimblepath="/opt/nimble/pkgs/"
 @else:
   # TODO:
 @end
+nimblepath="$home/.nimble/pkgs2/"
 nimblepath="$home/.nimble/pkgs/"
 
 # Syncronize with compiler/commands.specialDefine