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

[WIP] File set combinators #222981

Closed
wants to merge 27 commits into from
Closed

[WIP] File set combinators #222981

wants to merge 27 commits into from

Commits on Jun 14, 2023

  1. lib.lists.commonPrefix[Length]: init

    @infinisil
    infinisil committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    e056656 View commit details
    Browse the repository at this point in the history

  2. Add some functions to lib.path

    @infinisil
    infinisil committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    6a5b2ff View commit details
    Browse the repository at this point in the history

  3. lib.fileset: init

    @infinisil
    infinisil committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    14e18fe View commit details
    Browse the repository at this point in the history

  4. Integrate sources with subpaths into mkDerivation 

    Make root, subpath internal

Adapted from NixOS#112083

Co-Authored-By: Robert Hensing <robert@roberthensing.nl>
    @infinisil @roberth
    infinisil and roberth committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    4576c67 View commit details
    Browse the repository at this point in the history

  5. lib.fileset: reference introduction docs

    @infinisil
    infinisil committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    559d3ef View commit details
    Browse the repository at this point in the history

  6. Slight branch optimization 

    Avoids a more costly string comparison, favoring an isString instead
    @infinisil
    infinisil committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    f9e0c13 View commit details
    Browse the repository at this point in the history

  7. Improve some error messages and add some code comments

    @infinisil
    infinisil committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    49baed0 View commit details
    Browse the repository at this point in the history

  8. Use lib.filesystem.pathType instead lib.sources.pathType

    @infinisil
    infinisil committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    0e939bf View commit details
    Browse the repository at this point in the history

  9. Add lib.fileset.optional

    @infinisil
    infinisil committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    ab93250 View commit details
    Browse the repository at this point in the history

  10. Minor formatting improvements

    @infinisil
    infinisil committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    c9b8398 View commit details
    Browse the repository at this point in the history

  11. Improve integration with lib.sources

    @infinisil
    infinisil committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    698773b View commit details
    Browse the repository at this point in the history

  12. filter -> fileFilter, directoryMatches -> directoryFilter

    @infinisil
    infinisil committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    ca9d82f View commit details
    Browse the repository at this point in the history

  13. Fix mkDerivation integration

    @infinisil
    infinisil committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    dad5189 View commit details
    Browse the repository at this point in the history

  14. Improve importToStore error message

    @infinisil
    infinisil committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    3941ef7 View commit details
    Browse the repository at this point in the history

  15. importToStore -> addToStore

    @infinisil
    infinisil committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    884ace1 View commit details
    Browse the repository at this point in the history

  16. Make the mkDerivation src behavior more lazy

    @infinisil
    infinisil committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    d3d3b8b View commit details
    Browse the repository at this point in the history

  17. Add myself as a code owner

    @infinisil
    infinisil committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    f0bd959 View commit details
    Browse the repository at this point in the history

  18. stdenv.mkDerivation: Implement srcWorkDir attribute 

    Instead of the odd custom file set handling

Entirely independent of file set combinators, only depends on the
existing `lib.sources`
    @infinisil
    infinisil committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    7257081 View commit details
    Browse the repository at this point in the history

  19. lib.fileset.getInfluenceBase: init

    @infinisil
    infinisil committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    633e785 View commit details
    Browse the repository at this point in the history

  20. lib.fileset.traceVal: init

    @infinisil
    infinisil committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    63957e2 View commit details
    Browse the repository at this point in the history

  21. lib.path.commonAncestor: init

    @infinisil
    infinisil committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    f32627a View commit details
    Browse the repository at this point in the history

  22. lib.fileset.{impureFromSource -> fromSource}

    @infinisil
    infinisil committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    5c2a1c7 View commit details
    Browse the repository at this point in the history

  23. Rethink store importing, lib.fileset.toSource

    @infinisil
    infinisil committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    f27d444 View commit details
    Browse the repository at this point in the history

  24. stdenv.mkDerivation: Add fileset integration with srcFileset

    @infinisil
    infinisil committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    145af37 View commit details
    Browse the repository at this point in the history

  25. Update reference documentation after recent commits

    @infinisil
    infinisil committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    80e6630 View commit details
    Browse the repository at this point in the history

  26. lib.filesystem.pathType: Fix for <2.14, pure eval, nix store paths

    @infinisil
    infinisil committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    0379f40 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2023

  1. Remove srcFileset stdenv.mkDerivation attribute again 

    As suggested by @roberth, this shouldn't be part of stdenv.mkDerivation,
it's too specialized. Also it's not that necessary, lib.fileset.toSource
and srcWorkDir are very self-explanatory
    @infinisil
    infinisil committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    5b0229c View commit details
    Browse the repository at this point in the history