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: d2a537568a7e
Choose a base ref
...
head repository: NixOS/nix
compare: de141fcb7923
Choose a head ref
  • 12 commits
  • 26 files changed
  • 5 contributors

Commits on Mar 29, 2020

  1. Replace some bool recursive with a new FileIngestionMethod enum

    @Ericson2314
    Ericson2314 committed Mar 29, 2020
    Copy the full SHA
    225e62a View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2020

  1. Use auto with some FileIngestionMethod local variables

    @Ericson2314
    Ericson2314 committed Mar 30, 2020
    Copy the full SHA
    bbbb7c1 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into enum-FileIngestio… 

    …nMethod
    @Ericson2314
    Ericson2314 committed Mar 30, 2020
    Copy the full SHA
    c251b01 View commit details
    Browse the repository at this point in the history

  3. Never cast FileIngestionMethod to or from boolean

    @Ericson2314
    Ericson2314 committed Mar 30, 2020
    Copy the full SHA
    51afea3 View commit details
    Browse the repository at this point in the history

  4. s/outputHashRecursive/ingestionMethod/c

    @Ericson2314
    Ericson2314 committed Mar 30, 2020
    Copy the full SHA
    7e9a271 View commit details
    Browse the repository at this point in the history

  5. Get rid of FileIngestionMethod casts in perl bindings, too

    @Ericson2314
    Ericson2314 committed Mar 30, 2020
    Copy the full SHA
    8aa46cd View commit details
    Browse the repository at this point in the history

Commits on May 26, 2020

  1. Merge remote-tracking branch 'origin/master' into enum-FileIngestionM… 

    …ethod
    @meditans
    meditans committed May 26, 2020
    Copy the full SHA
    6d73c10 View commit details
    Browse the repository at this point in the history

  2. Change remaining bools with FileIngestionMethod

    @meditans
    meditans committed May 26, 2020
    Copy the full SHA
    b90241c View commit details
    Browse the repository at this point in the history

Commits on May 27, 2020

  1. Don’t use FileIngestionMethod for StorePathsCommand 

    This is a different recursive than used in makeFixedOutputPath.
    @matthewbauer
    matthewbauer committed May 27, 2020
    Copy the full SHA
    7873fd1 View commit details
    Browse the repository at this point in the history

  2. Rename some variables named “recursive” to “method” 

    This is much less confusing since recursive is no longer a boolean.
    @matthewbauer
    matthewbauer committed May 27, 2020
    Copy the full SHA
    c66441a View commit details
    Browse the repository at this point in the history

Commits on May 28, 2020

  1. Use FileIngestionMethod for nix hash 

    There was an enum there that matched in perfectly.
    @Ericson2314
    Ericson2314 committed May 28, 2020
    Copy the full SHA
    0f96f45 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3455 from Ericson2314/enum-FileIngestionMethod 

    Replace some `bool recursive` with a new `FileIngestionMethod` enum
    @edolstra
    edolstra committed May 28, 2020
    Copy the full SHA
    de141fc View commit details
    Browse the repository at this point in the history