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

treewide: support structuredAttrs in setup hooks #318614

Merged

Commits on Jul 30, 2024

  1. stdenv: refactor appendToVar and prependToVar

    No need to call declare -p twice. The case statement is easier to read
    than the multi-if.
    wolfgangwalther committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    cdb2f29 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

  1. Configuration menu
    Copy the full SHA
    929db7b View commit details
    Browse the repository at this point in the history
  2. stdenv: make _accumFlagsArray independent of structuredAttrs

    structuredAttrs was used here to make an assumption about the type of
    the named variables passed as arguments.  This can be done better by
    looking at the actual types of those variables.
    
    This gives a bit more backwards compatibility as well: Once you turn to
    structuredAttrs, you should still be able to pass a bare string instead
    of a list and have it behave as a whitespace-separated string like
    before.
    wolfgangwalther committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    bfd97a6 View commit details
    Browse the repository at this point in the history
  3. stdenv: generalize _accumFlagsArray to concatTo

    Passing "flagsArray" as the first argument allows using this function
    in a few more places.
    wolfgangwalther committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    6bdfef9 View commit details
    Browse the repository at this point in the history
  4. stdenv: refactor default flags without __structuredAttrs use

    Instead of checking for __structuredAttrs everywhere, it's easier to
    just set the default value via parameter expansion and then hand the
    array construction off to "concatTo".
    
    Once more setup-hooks will be made structuredAttrs-aware, this pattern
    will reduce the use of this implementation detail even more.
    wolfgangwalther committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    8cb51ec View commit details
    Browse the repository at this point in the history
  5. stdenv: add concatStringsSep helper

    This can be used to separate lists for example with commas, when
    creating argument strings. This works with both structuredAttrs disabled
    and enabled.
    wolfgangwalther committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    471cbdd View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2024

  1. meson: support structuredAttrs in setup hook

    Tested emilua with and without __structuredAttrs.
    wolfgangwalther committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    55933d9 View commit details
    Browse the repository at this point in the history
  2. meson: remove unused crossMesonFlags from setup hook

    This was used in #NixOS#35666 to add the --cross-file argument, but NixOS#86080
    moved that somewhere else - leaving crossMesonFlags unused.
    wolfgangwalther committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    7c732de View commit details
    Browse the repository at this point in the history
  3. ninja: support structuredAttrs in setup hook

    Tested clasp-common-lisp with and without __structuredAttrs.
    wolfgangwalther committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    7752cea View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4b45acf View commit details
    Browse the repository at this point in the history
  5. cmake: support structuredAttrs in setup hook

    Tested litehtml with and without __structuredAttrs.
    
    Resolves NixOS#289037
    Supersedes NixOS#299622 (at least parts)
    wolfgangwalther committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    34a2b7a View commit details
    Browse the repository at this point in the history
  6. setup-hooks/autoreconf: support structuredAttrs

    Tested db with and without __structuredAttrs.
    wolfgangwalther committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    d7c2570 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2024

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

Commits on Aug 11, 2024

  1. stdenv: concatStringsSep: test sep="&"

    The test fails without 64eaa63
    ("stdenv: concatStringsSep: quote ${sep}")
    
    Co-authored-by: Ivan Trubach <mr.trubach@icloud.com>
    Co-authored-by: Wolfgang Walther <walther@technowledgy.de>
    3 people committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    9876c2f View commit details
    Browse the repository at this point in the history