From 228712f77fb00bc2bb021858de552789e80eca84 Mon Sep 17 00:00:00 2001
From: kiara <kiara.grouwstra@gmail.com>
Date: Thu, 26 Dec 2024 02:55:35 +0100
Subject: [PATCH] pass thru feature `nix-experimental` (#2132)

* uncomment import to facilitate current nixpkgs unstable

* pass thru feature `nix-experimental`
---
 cli/Cargo.toml              | 1 +
 core/src/nix_ffi/cpp/nix.cc | 5 +----
 lsp/nls/Cargo.toml          | 3 +++
 pyckel/Cargo.toml           | 5 ++++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 9d52bebff0..43a4fdc91f 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -21,6 +21,7 @@ repl = ["nickel-lang-core/repl"]
 doc = ["nickel-lang-core/doc", "comrak"]
 format = ["nickel-lang-core/format", "dep:tempfile"]
 metrics = ["dep:metrics", "dep:metrics-util", "nickel-lang-core/metrics"]
+nix-experimental = ["nickel-lang-core/nix-experimental"]
 
 [dependencies]
 nickel-lang-core = { workspace = true, features = [ "markdown", "clap" ], default-features = false }
diff --git a/core/src/nix_ffi/cpp/nix.cc b/core/src/nix_ffi/cpp/nix.cc
index 5195071560..4af0a483bb 100644
--- a/core/src/nix_ffi/cpp/nix.cc
+++ b/core/src/nix_ffi/cpp/nix.cc
@@ -11,10 +11,7 @@ using namespace nix;
 #include <nix/value-to-json.hh>
 #include <nix/command.hh>
 #include <nix/value.hh>
-// We will need this include when we update to latest Nix, but for now it's
-// pinned to a previous version where `initGC()` is still exported by already
-// imported headers, so we don't need it yet.
-// #include <nix/eval-gc.hh>
+#include <nix/eval-gc.hh>
 
 #include "nickel-lang-core/src/nix_ffi/mod.rs.h"
 
diff --git a/lsp/nls/Cargo.toml b/lsp/nls/Cargo.toml
index e7e54186ff..e057176f18 100644
--- a/lsp/nls/Cargo.toml
+++ b/lsp/nls/Cargo.toml
@@ -56,3 +56,6 @@ lsp-harness.workspace = true
 nickel-lang-utils.workspace = true
 pretty_assertions.workspace = true
 test-generator.workspace = true
+
+[features]
+nix-experimental = ["nickel-lang-core/nix-experimental"]
diff --git a/pyckel/Cargo.toml b/pyckel/Cargo.toml
index 5dc74f34c9..b78df6eb87 100644
--- a/pyckel/Cargo.toml
+++ b/pyckel/Cargo.toml
@@ -20,4 +20,7 @@ pyo3-build-config.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
-bench = false
\ No newline at end of file
+bench = false
+
+[features]
+nix-experimental = ["nickel-lang-core/nix-experimental"]