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: 9f736dd89d06
Choose a base ref
...
head repository: NixOS/nix
compare: 00fa7e220587
Choose a head ref
  • 5 commits
  • 6 files changed
  • 2 contributors

Commits on Jun 9, 2020

  1. Allow empty hash in derivations 

    follow up of #3544

This allows hash="" so that it can be used for debugging purposes. For
instance, this gives you an error message like:

  warning: found empty hash, assuming you wanted 'sha256:0000000000000000000000000000000000000000000000000000'
  hash mismatch in fixed-output derivation '/nix/store/asx6qw1r1xk6iak6y6jph4n58h4hdmbm-nix':
    wanted: sha256:0000000000000000000000000000000000000000000000000000
    got:    sha256:0fpfhipl9v1mfzw2ffmxiyyzqwlkvww22bh9wcy4qrfslb4jm429
    @matthewbauer
    matthewbauer committed Jun 9, 2020
    Copy the full SHA
    762273f View commit details
    Browse the repository at this point in the history

  2. Support empty hash in fetchers 

    fetchTarball, fetchTree, and fetchGit all have *optional* hash attrs.
This means that we need to be careful with what we allow to avoid
accidentally making these defaults. When ‘hash = ""’ we assume the
empty hash is wanted.
    @matthewbauer
    matthewbauer committed Jun 9, 2020
    Copy the full SHA
    19aa892 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2020

  1. Add newHashAllowEmpty helper function 

    This replaces the copy&paste with a helper function in hash.hh.
    @matthewbauer
    matthewbauer committed Jun 12, 2020
    Copy the full SHA
    b260c9e View commit details
    Browse the repository at this point in the history

  2. Provide base argument to to_string

    @matthewbauer
    matthewbauer committed Jun 12, 2020
    Copy the full SHA
    ea0d29d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3674 from matthewbauer/allow-empty-hash2 

    Allow empty hash in derivations
    @edolstra
    edolstra committed Jun 12, 2020
    Copy the full SHA
    00fa7e2 View commit details
    Browse the repository at this point in the history