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/nix
base: 424bb5819f73
Choose a base ref
...
head repository: NixOS/nix
compare: 984e521392b3
Choose a head ref
  • 17 commits
  • 17 files changed
  • 3 contributors

Commits on Mar 29, 2020

  1. Use enum struct and drop prefixes

    This does a few enums; the rest will be gotten in subsequent commits.
    Ericson2314 committed Mar 29, 2020
    Copy the full SHA
    87b32ba View commit details
    Browse the repository at this point in the history

Commits on May 28, 2020

  1. Copy the full SHA
    4f597fb View commit details
    Browse the repository at this point in the history
  2. Fixing the result of merge

    meditans committed May 28, 2020
    Copy the full SHA
    6dd471e View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2020

  1. Remove HashType::Unknown

    Instead, `Hash` uses `std::optional<HashType>`. In the future, we may
    also make `Hash` itself require a known hash type, encoraging people to
    use `std::optional<Hash>` instead.
    Ericson2314 committed Jun 2, 2020
    Copy the full SHA
    450dcf2 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    64cffb8 View commit details
    Browse the repository at this point in the history
  3. Remove hashingWithUnknownAlgoExits

    A valid hash type must be provided now. The hash itself can still be
    invalid, but that doesn't cause an `abort()`.
    Ericson2314 committed Jun 2, 2020
    Copy the full SHA
    d73dbc8 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    c502119 View commit details
    Browse the repository at this point in the history
  5. Fix to-base --type handler to correctly set std::optional flag

    Now that we have a separate flag function, also describe why it is
    optional.
    Ericson2314 committed Jun 2, 2020
    Copy the full SHA
    c664e68 View commit details
    Browse the repository at this point in the history
  6. Fix hashes

    Ericson2314 committed Jun 2, 2020
    Copy the full SHA
    1fcd3af View commit details
    Browse the repository at this point in the history
  7. outputHashAlgo can be blank so parse accordingly

    It is blank for SRI hashes.
    Ericson2314 committed Jun 2, 2020
    Copy the full SHA
    406dbb7 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2020

  1. Copy the full SHA
    40526fb View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    bbbf360 View commit details
    Browse the repository at this point in the history
  3. Revert the enum struct change

    Not a regular git revert as there have been many merges and things.
    Ericson2314 committed Jun 18, 2020
    Copy the full SHA
    15abb2a View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2020

  1. tabs -> spaces

    Ericson2314 committed Jun 19, 2020
    Copy the full SHA
    c1892a5 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    c98081d View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    6829474 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #3650 from obsidiansystems/no-hash-type-unknown

    Remove `HashType::htUnknown`
    edolstra committed Jun 19, 2020
    Copy the full SHA
    984e521 View commit details
    Browse the repository at this point in the history