Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixops
base: ab0780d7c152
Choose a base ref
...
head repository: NixOS/nixops
compare: 9962fe4dbae9
Choose a head ref
  • 14 commits
  • 14 files changed
  • 4 contributors

Commits on Apr 23, 2020

  1. Move from xml intermediate Nix representation to JSON

    This change is intended to make life easier for plugin authors.
    We have removed the XML parameter to ResourceDefinition and you are
    now only provided with a name & a dict containing the evaluated
    values.
    adisbladis committed Apr 23, 2020
    Copy the full SHA
    770cad3 View commit details
    Browse the repository at this point in the history
  2. keys: apply toString to all keyFiles

    With nix-instantiate --xml, the output of evaluation of a path shows
    the original path to the file. With --json, the output shows the path
    if it were copied to the Nix store.
    
    Applying toString in the expression forces Nix to skip copying it to
    the store under any circumstance.
    grahamc authored and adisbladis committed Apr 23, 2020
    Copy the full SHA
    006f66e View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    c10359f View commit details
    Browse the repository at this point in the history
  4. Remove xml_expr_to_python function

    It's no longer required since moving to JSON representation.
    adisbladis committed Apr 23, 2020
    Copy the full SHA
    0046728 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    30a27c5 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    429e150 View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    cd9319b View commit details
    Browse the repository at this point in the history
  8. Copy the full SHA
    369fc5a View commit details
    Browse the repository at this point in the history
  9. Copy the full SHA
    84dae82 View commit details
    Browse the repository at this point in the history
  10. ImmutableMapping: support encoding as JSON

    Co-authored-by: Adam Höse <adam.hose@tweag.io>
    2 people authored and adisbladis committed Apr 23, 2020
    Copy the full SHA
    f453034 View commit details
    Browse the repository at this point in the history
  11. deployment.keys: Applying toString on null results in empty string

    Fix assertion to check for empty string.
    adisbladis committed Apr 23, 2020
    Copy the full SHA
    e0efcaf View commit details
    Browse the repository at this point in the history
  12. Add type annotations to deployment.keys

    Also fix type checking in ImmutableValidatedObject even when an
    attribute is _not_ passed to the constructor.
    
    Co-authored-by: Graham Christensen <graham.christensen@tweag.io>
    adisbladis and Graham Christensen committed Apr 23, 2020
    Copy the full SHA
    4444f5f View commit details
    Browse the repository at this point in the history
  13. Copy the full SHA
    85faae0 View commit details
    Browse the repository at this point in the history
  14. Merge pull request #1275 from adisbladis/xml-to-json

    Move from xml intermediate Nix representation to JSON
    grahamc committed Apr 23, 2020
    Copy the full SHA
    9962fe4 View commit details
    Browse the repository at this point in the history