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: d7c0f094cbcf
Choose a base ref
...
head repository: NixOS/nix
compare: a5f7d310dd10
Choose a head ref
  • 16 commits
  • 15 files changed
  • 4 contributors

Commits on Jul 8, 2020

  1. Add name to BasicDerivation 

    We always have a name for BasicDerivation, since we have a derivation
store path that has a name.
    @matthewbauer
    matthewbauer committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    af95a7c View commit details
    Browse the repository at this point in the history

  2. Only store hash of fixed derivation output 

    we don’t need a full storepath for a fixedoutput derivation. So just
putting the ingestion method + the hash is sufficient.
    @matthewbauer
    matthewbauer committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    8e0d068 View commit details
    Browse the repository at this point in the history

  3. Fix build.cc on linux

    @matthewbauer
    matthewbauer committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    06a4e15 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2020

  1. Fix DerivationOutputExtensional name

    @matthewbauer
    matthewbauer committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    a788497 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2020

  1. Merge remote-tracking branch 'upstream/master' into optional-derivati… 

    …on-output-storepath
    @Ericson2314
    Ericson2314 committed Jul 11, 2020
    Configuration menu
    Copy the full SHA
    442d431 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2020

  1. BasicDerivation::findOutput cannot return reference anymore

    @Ericson2314
    Ericson2314 committed Jul 12, 2020
    Configuration menu
    Copy the full SHA
    abea26a View commit details
    Browse the repository at this point in the history

  2. Don't improperly assume path is store path

    @Ericson2314
    Ericson2314 committed Jul 12, 2020
    Configuration menu
    Copy the full SHA
    1c9bec2 View commit details
    Browse the repository at this point in the history

  3. Set derivation name in dervationStrict

    @Ericson2314
    Ericson2314 committed Jul 12, 2020
    Configuration menu
    Copy the full SHA
    13ec627 View commit details
    Browse the repository at this point in the history

  4. std::string_view for new derivation name parameters

    @Ericson2314
    Ericson2314 committed Jul 12, 2020
    Configuration menu
    Copy the full SHA
    5d0b75e View commit details
    Browse the repository at this point in the history

  5. String .drv suffix to create derivation name

    @Ericson2314
    Ericson2314 committed Jul 12, 2020
    Configuration menu
    Copy the full SHA
    1815240 View commit details
    Browse the repository at this point in the history

  6. Undo erroneous indentation change

    @Ericson2314
    Ericson2314 committed Jul 12, 2020
    Configuration menu
    Copy the full SHA
    a8d4707 View commit details
    Browse the repository at this point in the history

  7. DerivationOutputExtensional -> DerivationOutputInputAddressed 

    Thanks @regnat for the great name.
    @Ericson2314
    Ericson2314 committed Jul 12, 2020
    Configuration menu
    Copy the full SHA
    503b425 View commit details
    Browse the repository at this point in the history

  8. Try to fix perl bindings

    @Ericson2314
    Ericson2314 committed Jul 12, 2020
    Configuration menu
    Copy the full SHA
    886c91d View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2020

  1. Merge branch 'master' of github.com:NixOS/nix into optional-derivatio… 

    …n-output-storepath
    @meditans
    meditans committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    048e916 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2020

  1. Merge remote-tracking branch 'upstream/master' into optional-derivati… 

    …on-output-storepath
    @Ericson2314
    Ericson2314 committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    d5bb67c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3795 from obsidiansystems/optional-derivation-out… 

    …put-storepath

Only store hash in DerivationOutput for fixed output derivations
    @edolstra
    edolstra committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    a5f7d31 View commit details
    Browse the repository at this point in the history