pass thru feature nix-experimental (#2132)

* uncomment import to facilitate current nixpkgs unstable * pass thru feature `nix-experimental`
tweag · Dec 26, 2024 · 228712f · 228712f
1 parent 691a522
commit 228712f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -20,4 +20,7 @@ pyo3-build-config.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
-bench = false
+bench = false
+
+[features]
+nix-experimental = ["nickel-lang-core/nix-experimental"]