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

Get settings info out of headers, out of libutil #11033

Draft
wants to merge 48 commits into
base: master
Choose a base branch
from
Draft

Get settings info out of headers, out of libutil #11033

wants to merge 48 commits into from

Commits on Jul 15, 2024

  1. feat: Refactor unix domain socket store config 

    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.

Minor:
* code formatting
* cleanup of getting default path
* added some comments
    @fzakaria
    fzakaria committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    f90e771 View commit details
    Browse the repository at this point in the history

  2. uds-remote-store is now clang-formatted

    @fzakaria
    fzakaria committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    1f72267 View commit details
    Browse the repository at this point in the history

  3. Removed clang-format changes

    @fzakaria
    fzakaria committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    660d868 View commit details
    Browse the repository at this point in the history

  4. Reference public variable

    @fzakaria
    fzakaria committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    6585c6e View commit details
    Browse the repository at this point in the history

  5. Update src/libstore/uds-remote-store.hh 

    Co-authored-by: John Ericson <git@JohnEricson.me>
    @fzakaria @Ericson2314
    fzakaria and Ericson2314 committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    10c5c65 View commit details
    Browse the repository at this point in the history

  6. Move constant to within Config object

    @fzakaria
    fzakaria committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    030d91d View commit details
    Browse the repository at this point in the history

  7. Lowercase constexpr

    @fzakaria
    fzakaria committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    7169905 View commit details
    Browse the repository at this point in the history

  8. Update src/libstore/store-api.cc 

    Revert back to basic constructor in store-api.cc

Co-authored-by: John Ericson <git@JohnEricson.me>
    @fzakaria @Ericson2314
    fzakaria and Ericson2314 committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    4af5092 View commit details
    Browse the repository at this point in the history

  9. Revert back returning daemon for URI if path empty

    @fzakaria
    fzakaria committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    dd74b72 View commit details
    Browse the repository at this point in the history

  10. Added unit test

    @fzakaria
    fzakaria committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    01fbb4b View commit details
    Browse the repository at this point in the history

  11. Added to meson

    @fzakaria
    fzakaria committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    6eb3303 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. Changed to protected and added another test

    @fzakaria
    fzakaria committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    d3275e8 View commit details
    Browse the repository at this point in the history

  2. Clang formatted test file

    @fzakaria
    fzakaria committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    0087d7d View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master' into issue-10766-unix-… 

    …socket
    @Ericson2314
    Ericson2314 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    1e97346 View commit details
    Browse the repository at this point in the history

  4. Move UdsRemoteStore{,Config} defs out of headers, and other cleanups 

    Hopefully this fixes the macOS link error. It's also good for
compilation time.
    @Ericson2314
    Ericson2314 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    e733f6d View commit details
    Browse the repository at this point in the history

  5. Add two more headers to try to provide missing template instantiations

    @Ericson2314
    Ericson2314 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    e435f3e View commit details
    Browse the repository at this point in the history

  6. Add globals.hh to uds-remote-store.cc

    @fzakaria
    fzakaria committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    ed2ccdc View commit details
    Browse the repository at this point in the history

  7. Fix linking issue, convert many more

    @Ericson2314
    Ericson2314 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    e9c0636 View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'upstream/master' into issue-10766-unix-… 

    …socket
    @Ericson2314
    Ericson2314 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    8162dbd View commit details
    Browse the repository at this point in the history

  9. make format

    @Ericson2314
    Ericson2314 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    f23d168 View commit details
    Browse the repository at this point in the history

  10. Declare some template specializations in the header 

    Not having these causes some issues with the new unit tests.
    @Ericson2314
    Ericson2314 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    c4c148f View commit details
    Browse the repository at this point in the history

  11. WIP get settings info out of headers, out of libutil

    @Ericson2314
    Ericson2314 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    13d573b View commit details
    Browse the repository at this point in the history

  12. 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
    Ericson2314 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    4e79b4e View commit details
    Browse the repository at this point in the history

  13. Revert "Declare some template specializations in the header" 

    This reverts commit c4c148f.
    @Ericson2314
    Ericson2314 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    1e25c22 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'move-schemes-set' into new-store-settings

    @Ericson2314
    Ericson2314 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    ea3a420 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. make format

    @Ericson2314
    Ericson2314 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    414d6ad View commit details
    Browse the repository at this point in the history

  2. Merge branch 'move-schemes-set' into HEAD

    @Ericson2314
    Ericson2314 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    fcf3e32 View commit details
    Browse the repository at this point in the history

  3. WIP Start getting store settings off config.hh

    @Ericson2314
    Ericson2314 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    3b0edea View commit details
    Browse the repository at this point in the history

  4. Merge branch 'new-store-settings' into settings-split

    @Ericson2314
    Ericson2314 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    afee3ee View commit details
    Browse the repository at this point in the history

  5. WIP

    @Ericson2314
    Ericson2314 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    d095fa3 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'upstream/master' into new-store-settings

    @Ericson2314
    Ericson2314 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    121e607 View commit details
    Browse the repository at this point in the history

  7. Comment out tests

    @fzakaria
    fzakaria committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    7b135d5 View commit details
    Browse the repository at this point in the history

  8. Dummy store compiles

    @Ericson2314
    Ericson2314 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    596a682 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'issue-10766-unix-socket' of github.com:fzakaria/nix int… 

    …o issue-10766-unix-socket
    @Ericson2314
    Ericson2314 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    95b36f4 View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'upstream/master' into issue-10766-unix-… 

    …socket
    @Ericson2314
    Ericson2314 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    0e65638 View commit details
    Browse the repository at this point in the history

  11. Format, CI hopefully happy now

    @Ericson2314
    Ericson2314 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    34f876f View commit details
    Browse the repository at this point in the history

  12. Merge branch 'issue-10766-unix-socket' into new-store-settings

    @Ericson2314
    Ericson2314 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    a7d9394 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. Get LocalFSStore building

    @Ericson2314
    Ericson2314 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    4909f9a View commit details
    Browse the repository at this point in the history

  2. Merge commit '17051ca80ab9bcee896e040cfe0ea699702ac0ff' into new-stor… 

    …e-settings
    @Ericson2314
    Ericson2314 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    9052c09 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master' into new-store-settings

    @Ericson2314
    Ericson2314 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    118b050 View commit details
    Browse the repository at this point in the history

  4. Convert LocalStoreConfig to new system

    @Ericson2314
    Ericson2314 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    307440b View commit details
    Browse the repository at this point in the history

  5. A bunch of small fixes

    @Ericson2314
    Ericson2314 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    de1ec5a View commit details
    Browse the repository at this point in the history

  6. Merge branch 'new-store-settings' into settings-split

    @Ericson2314
    Ericson2314 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    f7df182 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'upstream/master' into new-store-settings

    @Ericson2314
    Ericson2314 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    9b30c20 View commit details
    Browse the repository at this point in the history

  8. More progress converting

    @Ericson2314
    Ericson2314 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    bb7bf73 View commit details
    Browse the repository at this point in the history

  9. WIP

    @Ericson2314
    Ericson2314 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    ca1e895 View commit details
    Browse the repository at this point in the history

  10. WIP

    @Ericson2314
    Ericson2314 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    901b34f View commit details
    Browse the repository at this point in the history

  11. Merge branch 'new-store-settings' into settings-split

    @Ericson2314
    Ericson2314 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    9e6d1eb View commit details
    Browse the repository at this point in the history