max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-22 14:06:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10299 from detroyejr/remove-repl-flake

Browse source 
flakes: remove experimental repl-flake
This commit is contained in:
Théophane Hufschmitt 2024-03-29 15:06:23 +01:00 committed by GitHub
commit b72e1c79da
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/manual/rl-next/remove-repl-flake.md Normal file
View file

@ -0,0 +1,8 @@
---
synopsis: Remove experimental repl-flake
significance: significant
issues: 10103
prs: 10299
---
The `repl-flake` experimental feature has been removed. The `nix repl` command now works like the rest of the new CLI in that `nix repl {path}` now tries to load a flake at `{path}` (or fails if the `flakes` experimental feature isn't enabled).*

10
src/libutil/experimental-features.cc
View file

@ -203,16 +203,6 @@ constexpr std::array<ExperimentalFeatureDetails, numXpFeatures> xpFeatureDetails
)", )",
.trackingUrl = "https://github.com/NixOS/nix/milestone/40", .trackingUrl = "https://github.com/NixOS/nix/milestone/40",
}, },
{
.tag = Xp::ReplFlake,
.name = "repl-flake",
.description = R"(
*Enabled with [`flakes`](#xp-feature-flakes) since 2.19*
Allow passing [installables](@docroot@/command-ref/new-cli/nix.md#installables) to `nix repl`, making its interface consistent with the other experimental commands.
)",
.trackingUrl = "https://github.com/NixOS/nix/milestone/32",
},
{ {
.tag = Xp::AutoAllocateUids, .tag = Xp::AutoAllocateUids,
.name = "auto-allocate-uids", .name = "auto-allocate-uids",

1
src/libutil/experimental-features.hh
View file

@ -26,7 +26,6 @@ enum struct ExperimentalFeature
RecursiveNix, RecursiveNix,
NoUrlLiterals, NoUrlLiterals,
FetchClosure, FetchClosure,
ReplFlake,
AutoAllocateUids, AutoAllocateUids,
Cgroups, Cgroups,
DaemonTrustOverride, DaemonTrustOverride,

9
src/nix/repl.cc
View file

@ -47,15 +47,6 @@ struct CmdRepl : RawInstallablesCommand
void applyDefaultInstallables(std::vector<std::string> & rawInstallables) override void applyDefaultInstallables(std::vector<std::string> & rawInstallables) override
{ {
if (!experimentalFeatureSettings.isEnabled(Xp::Flakes) && !(file) && rawInstallables.size() >= 1) {
warn("future versions of Nix will require using `--file` to load a file");
if (rawInstallables.size() > 1)
warn("more than one input file is not currently supported");
auto filePath = rawInstallables[0].data();
file = std::optional(filePath);
rawInstallables.front() = rawInstallables.back();
rawInstallables.pop_back();
}
if (rawInstallables.empty() && (file.has_value() || expr.has_value())) { if (rawInstallables.empty() && (file.has_value() || expr.has_value())) {
rawInstallables.push_back("."); rawInstallables.push_back(".");
} }

3
tests/functional/repl.sh
View file

@ -47,6 +47,9 @@ testRepl () {
| grep "attribute 'currentSystem' missing" | grep "attribute 'currentSystem' missing"
nix repl "${nixArgs[@]}" 2>&1 <<< "builtins.currentSystem" \ nix repl "${nixArgs[@]}" 2>&1 <<< "builtins.currentSystem" \
| grep "$(nix-instantiate --eval -E 'builtins.currentSystem')" | grep "$(nix-instantiate --eval -E 'builtins.currentSystem')"
expectStderr 1 nix repl ${testDir}/simple.nix \
| grepQuiet -s "error: path '$testDir/simple.nix' is not a flake"
} }
# Simple test, try building a drv # Simple test, try building a drv