Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix NIX_PATH for real #11079

Merged
merged 6 commits into from
Jul 24, 2024
Merged

fix NIX_PATH for real #11079

merged 6 commits into from
Jul 24, 2024

Commits on Jul 23, 2024

  1. fix NIX_PATH overriding 

    - test restricted evaluation
- test precedence for setting the search path
    @fricklerhandwerk
    fricklerhandwerk committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    3b23fe6 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. Move nix-path overriding by NIX_PATH into loadConfFile 

    This ensures that the overriding happens even when no config file
exists.

This can happen when running Nix in a bare sandbox, for example.
    @roberth
    roberth committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    d605aa9 View commit details
    Browse the repository at this point in the history

  2. tests/functional/nix_path.sh: Use $test_nix_conf 

    NIX_CONF_DIR is not set when running the tests on NixOS.
    @roberth
    roberth committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    82ec493 View commit details
    Browse the repository at this point in the history

  3. don't duplicate helper code

    @fricklerhandwerk
    fricklerhandwerk committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    ec5748a View commit details
    Browse the repository at this point in the history

  4. don't change parseNixPath

    @fricklerhandwerk
    fricklerhandwerk committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    f96ae37 View commit details
    Browse the repository at this point in the history

  5. clang-format

    @fricklerhandwerk
    fricklerhandwerk committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    85c4b1c View commit details
    Browse the repository at this point in the history