nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-11 04:56:01 +01:00
Code Activity

Add legacy setting: nix-shell-always-looks-for-shell-nix

Browse source
This commit is contained in:
Robert Hensing 2024-07-06 22:58:15 +02:00
parent b865625a8e
commit 32fb127b9c
5 changed files with 41 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libcmd/common-eval-args.cc
View file

@ -11,6 +11,8 @@
#include "command.hh"
#include "tarball.hh"
#include "fetch-to-store.hh"
#include "compatibility-settings.hh"
#include "eval-settings.hh"
namespace nix {
@ -33,6 +35,11 @@ EvalSettings evalSettings {
static GlobalConfig::Register rEvalSettings(&evalSettings);
CompatibilitySettings compatibilitySettings {};
static GlobalConfig::Register rCompatibilitySettings(&compatibilitySettings);
MixEvalArgs::MixEvalArgs()
{
addFlag({

6
src/libcmd/common-eval-args.hh
View file

@ -13,6 +13,7 @@ namespace nix {
class Store;
class EvalState;
struct EvalSettings;
struct CompatibilitySettings;
class Bindings;
struct SourcePath;
@ -21,6 +22,11 @@ struct SourcePath;
*/
extern EvalSettings evalSettings;
/**
* Settings that control behaviors that have changed since Nix 2.3.
*/
extern CompatibilitySettings compatibilitySettings;
struct MixEvalArgs : virtual Args, virtual MixRepair
{
static constexpr auto category = "Common evaluation options";

1
src/libcmd/meson.build
View file

@ -97,6 +97,7 @@ headers = [config_h] + files(
'command-installable-value.hh',
'command.hh',
'common-eval-args.hh',
'compatibility-settings.hh',
'editor-for.hh',
'installable-attr-path.hh',
'installable-derived-path.hh',