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.

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

Fix conflicts in lazy trees from master #14

Draft
wants to merge 176 commits into
base: lazy-trees
Choose a base branch
from

Commits on Nov 27, 2023

  1. Evaluate nix-shell -i args relative to script

    When writing a shebang script, you expect your path to be relative to
    the script, not the cwd. We previously handled this correctly for
    relative file paths, but not for expressions.
    
    This handles both -p & -E args. My understanding is this should be
    what we want in any cases I can think of - people run scripts from
    many different working directories. @edolstra is there any reason to
    handle -p args differently in this case?
    
    Fixes NixOS#4232
    matthewbauer authored and tomberek committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    0402336 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9a46411 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2023

  1. Configuration menu
    Copy the full SHA
    f66f498 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. Support hard links in tarballs

    edolstra committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    35bdb9c View commit details
    Browse the repository at this point in the history
  2. Update tests/functional/tarball.sh

    Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
    edolstra and roberth authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    bd37a70 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. Update src/libfetchers/git-utils.cc

    Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
    edolstra and roberth authored Jun 12, 2024
    Configuration menu
    Copy the full SHA
    efd4bf6 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. Configuration menu
    Copy the full SHA
    68b8a28 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    316b58d View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. Configuration menu
    Copy the full SHA
    992912f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1fac22b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a409c1a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f032956 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2024

  1. Configuration menu
    Copy the full SHA
    1318135 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5c367ec View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e9479b2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    76245ff View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    32fb127 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    a22f8b5 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    b865625 View commit details
    Browse the repository at this point in the history
  8. rl-next: Enter PR

    roberth committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    afbe7c3 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    8838f5c View commit details
    Browse the repository at this point in the history
  10. rl-next: Typo

    roberth committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    d5854f3 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    f5b59fb View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    6c6d526 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    6959ac1 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    4c59d6e View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    63262e7 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    73602a7 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    2f1fada View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    c4a20a4 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2024

  1. Configuration menu
    Copy the full SHA
    0f8a655 View commit details
    Browse the repository at this point in the history
  2. tests/functional/nix-shell.sh: Fix Polo test for VM test

    It is unclear to me why this worked when not in a VM test, but the
    explanation would be in the part of nix-shell we're getting rid of
    with the devShell attribute.
    roberth committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    e1106b4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3e424b1 View commit details
    Browse the repository at this point in the history
  4. Fixup: add missing test file

    roberth committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    193dd5d View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. Configuration menu
    Copy the full SHA
    48804cf View commit details
    Browse the repository at this point in the history
  2. Remove the Hydra status check workflow

    I'm sick of receiving an email about this every 30 minutes.
    edolstra committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    ab0b54b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c5284a8 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6e5cec2 View commit details
    Browse the repository at this point in the history
  5. Merge pull request NixOS#11063 from obsidiansystems/config-expr

    Forgot to include `config-expr.hh` in two places
    Ericson2314 authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    1439de8 View commit details
    Browse the repository at this point in the history
  6. Merge pull request NixOS#11064 from obsidiansystems/header-generater

    Use a meson "generator" to deduplicate `.gen.hh` creation
    Ericson2314 authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    f1d88e0 View commit details
    Browse the repository at this point in the history
  7. Package the Nix CLI with Meson

    Co-Authored-By: Qyriad <qyriad@qyriad.me>
    Ericson2314 and Qyriad committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    7a6269b View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Merge pull request NixOS#11065 from DeterminateSystems/remove-hydra-s…

    …tatus-check
    
    Remove the Hydra status check workflow
    roberth authored Jul 9, 2024
    Configuration menu
    Copy the full SHA
    d69fcbc View commit details
    Browse the repository at this point in the history
  2. Merge pull request NixOS#11060 from obsidiansystems/meson-nix

    Package the Nix CLI with Meson
    Ericson2314 authored Jul 9, 2024
    Configuration menu
    Copy the full SHA
    3755493 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4c78850 View commit details
    Browse the repository at this point in the history
  4. Merge pull request NixOS#11071 from DeterminateSystems/remove-stray-line

    Remove reference to check-hydra-status
    edolstra authored Jul 9, 2024
    Configuration menu
    Copy the full SHA
    142e566 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. Configuration menu
    Copy the full SHA
    d942d50 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c4e3e2d View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. Configuration menu
    Copy the full SHA
    8642075 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4fd8f19 View commit details
    Browse the repository at this point in the history
  3. Merge pull request NixOS#11077 from hercules-ci/support-hardlinks-in-…

    …tarballs
    
    Support hardlinks in tarballs
    Ericson2314 authored Jul 11, 2024
    Configuration menu
    Copy the full SHA
    426e2af View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6f5f741 View commit details
    Browse the repository at this point in the history
  5. Edit CompatibilitySettings

    roberth committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    bb312a7 View commit details
    Browse the repository at this point in the history
  6. packaging: Set darwinMinVersion to fix x86_64-darwin build

    Ported from NixOS/nixpkgs#326172
    
    Co-authored-by: Emily <vcs@emily.moe>
    roberth and emilazy committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    0395ff9 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    87323a5 View commit details
    Browse the repository at this point in the history
  8. Merge pull request NixOS#11081 from DeterminateSystems/remove-dead-code

    Remove unused InstallableFlake::getFlakeOutputs()
    edolstra authored Jul 11, 2024
    Configuration menu
    Copy the full SHA
    0363dbf View commit details
    Browse the repository at this point in the history
  9. SymbolStr: Remove std::string conversion

    This refactoring allows the symbol table to be stored as something
    other than std::strings.
    edolstra committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    6108055 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. Merge pull request NixOS#11082 from DeterminateSystems/symbol-table-s…

    …tring-view
    
    SymbolStr: Remove std::string conversion
    edolstra authored Jul 12, 2024
    Configuration menu
    Copy the full SHA
    b57c361 View commit details
    Browse the repository at this point in the history
  2. Add BaseError assignment operators

    The move assignment was implicitly generated and used in
    
        src/libstore/build/goal.cc:90:22:
           90 |             this->ex = std::move(*ex);
    
    Clang warns about this generated method being deprecated, so making
    them explicit fixes the warning.
    roberth committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    f070d68 View commit details
    Browse the repository at this point in the history
  3. No global settings in libnixfetchers and libnixflake

    Progress on NixOS#5638
    
    There are still a global fetcher and eval settings, but they are pushed
    down into `libnixcmd`, which is a lot less bad a place for this sort of
    thing.
    
    Continuing process pioneered in
    52bfccf.
    Ericson2314 committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    3fc77f2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8df041c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    27eaeeb View commit details
    Browse the repository at this point in the history
  6. Merge pull request NixOS#11007 from obsidiansystems/push-down-fetcher…

    …-flake-settings
    
    No global settings in `libnixfetchers` and `libnixflake`
    Ericson2314 authored Jul 12, 2024
    Configuration menu
    Copy the full SHA
    dfb169c View commit details
    Browse the repository at this point in the history
  7. Merge pull request NixOS#11089 from NixOS/warnings-includes

    Fix warnings and optimize includes
    Ericson2314 authored Jul 12, 2024
    Configuration menu
    Copy the full SHA
    337a5a2 View commit details
    Browse the repository at this point in the history
  8. Fix stackoverflow during doc generation

    On some systems, previous usage of `match` may cause a stackoverflow
    (presumably due to the large size of the match result). Avoid this by
    (ab)using `replaceStrings` to test for containment without using
    regexes, thereby avoiding the issue. The causal configuration seems to
    be the stack size hard limit, which e.g. Amazon Linux sets, whereas most
    Linux distros leave unlimited.
    
    Match the fn name to similar fn in nixpkgs.lib, but different
    implementation that does not use `match`. This impl gives perhaps
    unexpected results when the needle is `""`, but the scope of this is
    narrow and that case is a bit odd anyway.
    
    This makes for some duplication-of-work as we do a different
    `replaceStrings` if this one is true, but this only runs during doc
    generation at build time so has no runtime impact.
    
    See NixOS#11085 for details.
    amarshall committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    51a12b3 View commit details
    Browse the repository at this point in the history
  9. Remove unused operator<=>'s that darwin can't generate

    It was complaining *a lot*, with dozens of MB of logs.
    roberth committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    11a6db5 View commit details
    Browse the repository at this point in the history
  10. Merge pull request NixOS#11090 from amarshall/fix-stackoverflow-build

    Fix stackoverflow during doc generation
    roberth authored Jul 12, 2024
    Configuration menu
    Copy the full SHA
    6c5d2a1 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    cdc23b6 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    750ba9f View commit details
    Browse the repository at this point in the history
  13. Merge pull request NixOS#11091 from NixOS/darwin-no-map-spaceship

    Remove unused `operator<=>`'s that darwin can't generate
    edolstra authored Jul 12, 2024
    Configuration menu
    Copy the full SHA
    2a95a2d View commit details
    Browse the repository at this point in the history
  14. Eval cache: fix cache regressions

    - Fix eval cache not being persisted in `nix develop` (since NixOS#10570)
    - Don't attempt to commit cache transaction if there is no active transaction, which will spew errors in edge cases
    - Drive-by: trivial typo fix
    kognise committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    e764ed3 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    6c4470e View commit details
    Browse the repository at this point in the history
  16. Remove comparator.hh and switch to <=> in a bunch of places

    Known behavior changes:
    
    - `MemorySourceAccessor`'s comparison operators no longer forget to
      compare the `SourceAccessor` base class.
    
    Progress on NixOS#10832
    
    What remains for that issue is hopefully much easier!
    Ericson2314 committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    bc83b9d View commit details
    Browse the repository at this point in the history
  17. Merge pull request NixOS#10838 from obsidiansystems/spaceship-no-comp…

    …arator
    
    Remove `comparator.hh` and switch to `<=>` in a bunch of places
    Ericson2314 authored Jul 12, 2024
    Configuration menu
    Copy the full SHA
    db3e99d View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2024

  1. Merge pull request NixOS#11080 from NixOS/fix-build-x86_64-darwin-minSDK

    packaging: Set darwinMinVersion to fix x86_64-darwin build
    tomberek authored Jul 13, 2024
    Configuration menu
    Copy the full SHA
    b1effc9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1a8defd View commit details
    Browse the repository at this point in the history
  3. dropEmptyInitThenConcatStringSep: Check that we don't drop...

    ... initial empty strings.
    
    The tests pass, which is encouraging.
    roberth committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    79eb0ad View commit details
    Browse the repository at this point in the history
  4. Add fresh concatStringsSep without bug

    The buggy version was previously renamed to
    dropEmptyInitThenConcatStringsSep
    roberth committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    a681d35 View commit details
    Browse the repository at this point in the history
  5. dropEmptyInitThenConcatStringsSep -> concatStringSep: diagnostics and…

    … docs
    
    These are non-critical, so their behavior is ok to change.
    Dropping empty items is not needed and usually not expected.
    roberth committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    ea966a7 View commit details
    Browse the repository at this point in the history
  6. dropEmptyInitThenConcatStringsSep -> concatStringSep: preserve empty …

    …attr
    
    The empty attribute name should not be dropped from attribute paths.
    Rendering attribute paths with concatStringsSep is lossy and wrong,
    but this is just a first improvement while dealing with the
    dropEmptyInitThenConcatStringsSep problem.
    roberth committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    39878c8 View commit details
    Browse the repository at this point in the history
  7. NIX_REMOTE_SYSTEMS: actually support multiple :-separated entries

    Bug not reported in 6 years, but here you go.
    
    Also it is safe to switch to normal concatStringsSep behavior
    because tokenizeString does not produce empty items.
    roberth committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    3f37785 View commit details
    Browse the repository at this point in the history
  8. dropEmptyInitThenConcatStringsSep -> concatStringSep: sigs are non-empty

    The sigs field is produced by tokenizeStrings, which does not return
    empty strings.
    roberth committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    75dde71 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    608a425 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    d3e49ac View commit details
    Browse the repository at this point in the history
  11. dropEmptyInitThenConcatStringsSep -> concatStringSep: output name emp…

    …ty not feasible
    
    I don't think it's completely impossible, but I can't construct
    one easily as derivationStrict seems to (re)tokenize the outputs
    attribute, dropping the empty output.
    
    It's not a scenario we have to account for here.
    roberth committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    49d100b View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    f1966e2 View commit details
    Browse the repository at this point in the history
  13. dropEmptyInitThenConcatStringsSep -> concatStringSep: feature should …

    …not be empty
    
    (System) features are unlikely to be empty strings, but when they
    come in through structuredAttrs, they probably can.
    I don't think this means we should drop them, but most likely they
    will be dropped after this because next time they'll be parsed with
    tokenizeString.
    
    TODO: We should forbid empty features.
    roberth committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    e64643b View commit details
    Browse the repository at this point in the history
  14. dropEmptyInitThenConcatStringsSep -> concatStringSep: experimental fe…

    …atures do not render as empty strings
    roberth committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    3b77f13 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    837c361 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    4b34feb View commit details
    Browse the repository at this point in the history
  17. dropEmptyInitThenConcatStringsSep -> concatStringSep: do not drop att…

    …ributes with empty names
    
    Empty attributes are probably not well supported, but the least we
    could do is leave a hint.
    Attribute path rendering and parsing should be done according to
    Nix expression syntax in my opinion.
    roberth committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    0480bfe View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    062672b View commit details
    Browse the repository at this point in the history
  19. dropEmptyInitThenConcatStringsSep -> concatStringSep: break nix help …

    …"" "" "" build
    
    Garbage in, error out. Experimental CLI. Zero derivations given.
    roberth committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    d904302 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    cf3c5cd View commit details
    Browse the repository at this point in the history
  21. illegal configuration line -> syntax error in configuration line

    The law has nothing to do with this, although I do feel like a
    badass when I mess with the config.
    I'm a conf artist.
    roberth committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    0fe3525 View commit details
    Browse the repository at this point in the history
  22. dropEmptyInitThenConcatStringsSep -> concatStringSep: tokens from tok…

    …enizeString are not empty
    roberth committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    4029426 View commit details
    Browse the repository at this point in the history
  23. dropEmptyInitThenConcatStringsSep -> concatStringSep: setting value w…

    …as already harmed
    
    Considering that `value` was probably parsed with tokenizeString
    prior, it's unlikely to contain empty strings, and we have no
    reason to remove them either.
    roberth committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    9ca42d5 View commit details
    Browse the repository at this point in the history
  24. dropEmptyInitThenConcatStringsSep -> concatStringSep: PATH handling

    It's still wrong, but one step closer to correct.
    Not that anyone should use "" or "." in their PATH, but that is not
    for us to intervene.
    roberth committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    76b2d5e View commit details
    Browse the repository at this point in the history
  25. dropEmptyInitThenConcatStringsSep -> concatStringSep: sigs are not empty

    ... but if they are, I'd like to see at least a hint of it so that
    I'd know to fix it.
    roberth committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    6b2c277 View commit details
    Browse the repository at this point in the history
  26. dropEmptyInitThenConcatStringsSep: Allow it to drop items again

    It's usually harmless, if it occurs at all.
    roberth committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    1c97718 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2024

  1. Configuration menu
    Copy the full SHA
    d40fdb5 View commit details
    Browse the repository at this point in the history
  2. dropEmptyInitThenConcatStringsSep -> concatStringSep: empty separator

    When the separator is empty, no difference is observable.
    
    Note that concatStringsSep has centralized definitions. This adds the
    required definitions. Alternatively, `strings-inline.hh` could be
    included at call sites.
    roberth committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    97e0110 View commit details
    Browse the repository at this point in the history
  3. concatStrings: Give compiler access to definition for inlining

    ... at call sites that are may be in the hot path.
    
    I do not know how clever the compiler gets at these sites.
    My primary concern is to not regress performance and I am confident
    that this achieves it the easy way.
    roberth committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    7e604f7 View commit details
    Browse the repository at this point in the history
  4. Merge pull request NixOS#11093 from NixOS/fix-concatStringsSep

    Fix C++ `concatStringsSep`
    roberth authored Jul 14, 2024
    Configuration menu
    Copy the full SHA
    9d7397c View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. lint: fix shellcheck for misc/systemv/nix-daemon

    Got shellcheck passing for misc/systemv/nix-daemon
    
    Not sure how to test this since it's not running on my NixOS machine and
    I see no references to it in the directory otherwise.
    
    See NixOS#10795
    fzakaria committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    bc801e2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    104aba0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    550b347 View commit details
    Browse the repository at this point in the history
  4. doc/testing: Typo

    roberth committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    63f520f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    e5af7cb View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    7fae378 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    e68234c View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    491b9cf View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    d4f576b View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    cef11b2 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    f9243ec View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    77e9f9e View commit details
    Browse the repository at this point in the history
  13. libexpr: Rename "column" fields to offset

    ... because that's what they are.
    roberth committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    71cb8bf View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    8a85529 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    6bbd493 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    131b6cc View commit details
    Browse the repository at this point in the history
  17. Doc comments: use std::unordered_map

    Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
    roberth and edolstra committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    2181747 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    ac89df8 View commit details
    Browse the repository at this point in the history
  19. Revert "Doc comments: use std::unordered_map"

    hash<SourcePath> isn't implemented yet, and I can't cherry-pick
    a bug-free commit yet.
    
    This reverts commit 95529f31e3bbda99111c5ce98a33484dc6e7a462.
    roberth committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    6a125e6 View commit details
    Browse the repository at this point in the history
  20. Use HintFmt for doc comments

    roberth committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    ce31a04 View commit details
    Browse the repository at this point in the history
  21. Revert "Use HintFmt for doc comments"

    Unfortunately these don't render correctly, because they go into the
    markdown renderer, instead of the terminal.
    
    ```
    nix-repl> :doc lib.version
    Attribute '[35;1mversion[0m'
    
        … defined at [35;1m/home/user/h/nixpkgs/lib/default.nix:73:40[0m
    ```
    
    We could switch that to go direct to the terminal, but then we should
    do the same for the primops, to get a consistent look.
    
    Reverting for now.
    
    This reverts commit 3413e0338cbee1c7734d5cb614b5325e51815cde.
    roberth committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    03d3370 View commit details
    Browse the repository at this point in the history
  22. getSnippetUpTo: Return optional

    This makes it possible to certain discern failures from empty
    snippets, which I think is an ok review comment.
    
    Maybe it should do so for swapped column indexes too, but I'm not
    sure.
    
    I don't think it matters in the grand scheme. We don't even have
    a real use case for `nullopt` now anyway.
    
    Since we don't have a use case, I'm not applying this logic to
    higher level functions yet.
    roberth committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    61a4d3d View commit details
    Browse the repository at this point in the history
  23. Merge pull request NixOS#11072 from NixOS/doc-comments

    Doc comments
    roberth authored Jul 15, 2024
    Configuration menu
    Copy the full SHA
    c6b5503 View commit details
    Browse the repository at this point in the history
  24. tests/functional/repl.sh: fail test on wrong stdout

    Previous test implementation assumed that grep supports newlines
    in patterns. It doesn't, so tests spuriously passed, even though
    some tests outputs were broken.
    
    This patches output (and expected output) before grepping,
    so there're no newlines in pattern.
    GoldsteinE committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    1bec90e View commit details
    Browse the repository at this point in the history
  25. Make goals use C++20 coroutines (NixOS#11005)

    undefined
    L-as authored Jul 15, 2024
    Configuration menu
    Copy the full SHA
    846869d View commit details
    Browse the repository at this point in the history
  26. Inline settings.pluginFiles.name

    In theory the warning is more noisy now, but in practice this will not
    happen unless the client is older than 2.14 (highly unlikely).
    Ericson2314 committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    1a273a6 View commit details
    Browse the repository at this point in the history
  27. Move plugins infra to libnixmain

    They are not actually part of the store layer, but instead part of the
    Nix executable infra (libraries don't need plugins, executables do).
    
    This is part of a larger project of moving all of our legacy settings
    infra to libmain, and having the underlying libraries just have plain
    configuration structs detached from any settings infra / UI layer.
    
    Progress on NixOS#5638
    Ericson2314 committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    0feeab7 View commit details
    Browse the repository at this point in the history
  28. Ensure we can construct remote store configs in isolation

    Progress towards NixOS#10766
    
    I thought that NixOS#10768 achieved, but when I went to use this stuff (in
    Hydra), turns out it did not. (Those `using FooConfig;` lines were not
    working --- they are so finicky!) This PR gets the job done, and adds
    some trivial unit tests to make sure I did what I intended.
    
    I had to add add a header to expose `SSHStoreConfig`, after which the
    preexisting `ssh-store-config.*` were very confusingly named files, so I
    renamed them to `common-ssh-store-config.hh` to match the type defined
    therein.
    Ericson2314 committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    808082e View commit details
    Browse the repository at this point in the history
  29. Merge pull request NixOS#11110 from GoldsteinE/fix-repl-tests

    tests/functional/repl.sh: fail test on wrong stdout
    roberth authored Jul 15, 2024
    Configuration menu
    Copy the full SHA
    03326d6 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. Merge pull request NixOS#11108 from obsidiansystems/remote-store-cons…

    …tructors
    
    Ensure we can construct remote store configs in isolation
    Ericson2314 authored Jul 16, 2024
    Configuration menu
    Copy the full SHA
    4bbadba View commit details
    Browse the repository at this point in the history
  2. Merge pull request NixOS#11092 from DeterminateSystems/hash-SourcePath

    Use std::unordered_map for the EvalState caches
    edolstra authored Jul 16, 2024
    Configuration menu
    Copy the full SHA
    9c6678d View commit details
    Browse the repository at this point in the history
  3. Doc comments: use std::unordered_map

    Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
    roberth and edolstra committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    6c9d62d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3d8fa9f View commit details
    Browse the repository at this point in the history
  5. Add std::hash<PosIdx>

    roberth committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    64b4600 View commit details
    Browse the repository at this point in the history
  6. Merge pull request NixOS#11114 from DeterminateSystems/fix-warning

    Pos::getSnippetUpTo(): Fix warning
    edolstra authored Jul 16, 2024
    Configuration menu
    Copy the full SHA
    9300f85 View commit details
    Browse the repository at this point in the history
  7. Remove unused boost include and split out std-hash.hh

    Splitting it out immediately answers questions like [this],
    without increasing the number of compilation units.
    
    I did consider using boost::hash_combine instead, but it doesn't seem
    to be quite as capable, accepting only two arguments.
    
    [this]: NixOS#11113 (comment)
    roberth committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    d0e9878 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    0a1a116 View commit details
    Browse the repository at this point in the history
  9. Merge pull request NixOS#11119 from philiptaron/attrbute

    builtins.genericClosure: fix documentation typo
    roberth authored Jul 16, 2024
    Configuration menu
    Copy the full SHA
    8f22245 View commit details
    Browse the repository at this point in the history
  10. Avoid casting function pointer in libutil test support

    Casting function pointers seems to be almost always UB.
    See https://stackoverflow.com/questions/559581/casting-a-function-pointer-to-another-type
    
    Fixed by doing the casting of `void*` to `std::string*` inside the function instead.
    
    Caught by UBSan.
    L-as committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    5b6a21a View commit details
    Browse the repository at this point in the history
  11. Check if drv is initialized in DerivationGoal::waiteeDone

    It might not be set, in which case we shouldn't do anything.
    Surprisingly, this somehow did not cause segfaults before?
    
    Caught by UBSan.
    L-as committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    a1f3f10 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    463256b View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. Add parser test for indented strings

    So that in the next commit we can see what changes about this test
    infinisil committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    9fae50e View commit details
    Browse the repository at this point in the history
  2. Merge pull request NixOS#11014 from obsidiansystems/plugins-libmain

    Move plugins infra to `libnixmain`
    roberth authored Jul 17, 2024
    Configuration menu
    Copy the full SHA
    b230c01 View commit details
    Browse the repository at this point in the history
  3. Simplify PosIdx::hash()

    In C++ we don't need to salt the hash.
    roberth committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    f5ebaea View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ece334b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a0635a8 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    da3eff6 View commit details
    Browse the repository at this point in the history
  7. Avoid accessing uninitialized settings in own init (NixOS#11117)

    The default value for the setting was evaluated by
    calling a method on the object _being currently constructed_,
    so we were using it before all fields were initialized.
    
    This has been fixed by making the called method static,
    and not using the previously used fields at all.
    
    But functionality hasn't changed!
    The fields were usually always zero (by chance?) anyway,
    meaning the conditional path was always taken.
    
    Thus the current logic has been kept, the code simplified,
    and UB removed.
    
    This was found with the helper of UBSan.
    L-as authored Jul 17, 2024
    Configuration menu
    Copy the full SHA
    464e592 View commit details
    Browse the repository at this point in the history
  8. Merge pull request NixOS#11113 from NixOS/doc-comment-unordered-map

    Doc comments: use std::unordered_map
    edolstra authored Jul 17, 2024
    Configuration menu
    Copy the full SHA
    621c23b View commit details
    Browse the repository at this point in the history
  9. BasicClientConnection::handshake(): Don't send our version twice

    This was accidentally introduced
    in f71b4da.  We didn't notice this
    because the version got interpreted by the daemon as the obsolete "CPU
    affinity will follow" field, and being non-zero, it would then read
    another integer for the ignored CPU affinity.
    edolstra committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    87f8ff2 View commit details
    Browse the repository at this point in the history
  10. doc: add example usage for Gitea in tarball fetcher (NixOS#11116)

    Co-authored-by: Valentin Gagarin <valentin@gagarin.work>
    RTUnreal and fricklerhandwerk authored Jul 17, 2024
    Configuration menu
    Copy the full SHA
    f0a1c13 View commit details
    Browse the repository at this point in the history
  11. Merge pull request NixOS#10931 from hercules-ci/test-run-and-shell-envs

    Test the `run` and `shell` envs for stray variables
    edolstra authored Jul 17, 2024
    Configuration menu
    Copy the full SHA
    05751de View commit details
    Browse the repository at this point in the history
  12. Merge pull request NixOS#11100 from NixOS/pretty-print-idempotent

    Pretty print idempotently
    edolstra authored Jul 17, 2024
    Configuration menu
    Copy the full SHA
    b23da1c View commit details
    Browse the repository at this point in the history
  13. Merge pull request NixOS#11103 from fzakaria/issue-10795

    lint: fix shellcheck for misc/systemv/nix-daemon
    edolstra authored Jul 17, 2024
    Configuration menu
    Copy the full SHA
    6867cb1 View commit details
    Browse the repository at this point in the history
  14. Merge pull request NixOS#11126 from DeterminateSystems/dont-send-vers…

    …ion-twice
    
    BasicClientConnection::handshake(): Don't send our version twice
    Ericson2314 authored Jul 17, 2024
    Configuration menu
    Copy the full SHA
    a915862 View commit details
    Browse the repository at this point in the history
  15. Merge pull request NixOS#11058 from hercules-ci/more-nix-shell

    Make `#!nix-shell` arguments and options relative to script
    edolstra authored Jul 17, 2024
    Configuration menu
    Copy the full SHA
    1e1a8e8 View commit details
    Browse the repository at this point in the history
  16. Merge pull request NixOS#11061 from rhendric/rhendric/reference-manual

    docs: fill out language/types.md#type-path
    edolstra authored Jul 17, 2024
    Configuration menu
    Copy the full SHA
    17051ca View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. Refactor unix domain socket store config (NixOS#11109)

    Following what is outlined in NixOS#10766 refactor the uds-remote-store such
    that the member variables (state) don't live in the store itself but in
    the config object.
    
    Additionally, the config object includes a new necessary constructor
    that takes a scheme & authority.
    
    Tests are commented out because of linking errors with the current config system.
    When there is a new config system we can reenable them.
    
    Co-authored-by: John Ericson <John.Ericson@Obsidian.Systems>
    fzakaria and Ericson2314 authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    57399bf View commit details
    Browse the repository at this point in the history
  2. Move uriSchemes to *StoreConfig

    It is a property of the configuration of a store --- how a store URL is
    parsed into a store config, not a store itself.
    
    Progress towards NixOS#10766
    Ericson2314 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    2aa9cf3 View commit details
    Browse the repository at this point in the history
  3. Merge pull request NixOS#11112 from obsidiansystems/move-schemes-set

    Move `uriSchemes` to `*StoreConfig`
    Ericson2314 authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    606ace4 View commit details
    Browse the repository at this point in the history
  4. Merge pull request NixOS#11086 from kognise/eval-cache-fixes

    Eval cache: fix cache regressions
    roberth authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    8ce4287 View commit details
    Browse the repository at this point in the history
  5. Factor out commonality between WorkerProto::Basic{Client,Server}Conne…

    …ction
    
    This also renames clientVersion and daemonVersion to the more correct
    protoVersion (since it's the version agreed to by both sides).
    edolstra committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    c1d5cf6 View commit details
    Browse the repository at this point in the history
  6. Typo

    edolstra committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    d231d80 View commit details
    Browse the repository at this point in the history
  7. FdSource: Fix operator =

    This wasn't moving the underlying buffer, so if the buffer was
    non-empty, it could lose data.
    edolstra committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    fa7aa03 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    31e1513 View commit details
    Browse the repository at this point in the history
  9. Fix non-deterministic parser printing

    In _very_ rare cases (I had about 7 cases out of 32200 files!),
    the order of how inherit-from bindings are printed when using
    `nix-instantiate --parse` gets messed up.
    
    The cause of this seems to be because the std::map the bindings are
    placed in is keyed on a _pointer_, which then uses an
    [implementation-defined strict total order](https://en.cppreference.com/w/cpp/language/operator_comparison#Pointer_total_order).
    
    The fix here is to key the bindings on their displacement instead,
    which maintains the same order as they appear in the file.
    
    Unfortunately I wasn't able to make a reproducible test for this in the
    source, there's something about the local environment that makes it
    unreproducible for me.
    
    However I was able to make a reproducible test in a Nix build on a Nix
    version from a very recent master:
    
        nix build github:infinisil/non-det-nix-parsing-repro
    
    Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
    infinisil and roberth committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    a6dccae View commit details
    Browse the repository at this point in the history
  10. parser: Remove empty multiline string parts earlier

    Makes parsing more consistent and is a super minor optimisation
    
    Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
    infinisil and roberth committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    0c91bb9 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. Merge pull request NixOS#11138 from emilazy/push-znxusvxozllv

    libmain: add missing header include
    Ericson2314 authored Jul 19, 2024
    Configuration menu
    Copy the full SHA
    d629b27 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    58a79b6 View commit details
    Browse the repository at this point in the history
  3. Merge pull request NixOS#11125 from DeterminateSystems/basic-connection

    Factor out commonality between WorkerProto::Basic{Client,Server}Connection
    edolstra authored Jul 19, 2024
    Configuration menu
    Copy the full SHA
    c4213f0 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2024

  1. Merge pull request NixOS#11120 from tweag/early-string-cutoff

    parser: Remove empty multiline string parts earlier
    roberth authored Jul 20, 2024
    Configuration menu
    Copy the full SHA
    584f8cb View commit details
    Browse the repository at this point in the history
  2. Merge pull request NixOS#11123 from tweag/fix-non-det-parser-printing

    Fix non-deterministic inherit printing
    roberth authored Jul 20, 2024
    Configuration menu
    Copy the full SHA
    56757e1 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2024

  1. Configuration menu
    Copy the full SHA
    3426e54 View commit details
    Browse the repository at this point in the history