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: c1ae18941a22
Choose a base ref
...
head repository: NixOS/nix
compare: 23ce4b339322
Choose a head ref
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on Oct 30, 2017

  1. builtins.fetchgit: Support a "name" attribute 

    The "name" attribute defaults to "source", which we should use for all
similar functions (e.g. fetchTarball and in Hydra) to ensure that we
get a consistent store path regardless of how the tree is fetched.

"source" is not necessarily a correct label, but using an empty name
is problematic: you get an ugly store path ending in a dash, and it's
impossible to have a fixed-output derivation that produces that path
because ".drv" is not a valid store name.

Fixes #904.
    @edolstra
    edolstra committed Oct 30, 2017
    Copy the full SHA
    65b5f17 View commit details
    Browse the repository at this point in the history

  2. builtins.fetchgit: Don't mess up the progress indicator

    @edolstra
    edolstra committed Oct 30, 2017
    Copy the full SHA
    f25791c View commit details
    Browse the repository at this point in the history

  3. fetchurl/fetchTarball: Respect name changes 

    The computation of urlHash didn't take the name into account, so
subsequent fetchurl calls with the same URL but a different name would
resolve to the same cached store path.
    @edolstra
    edolstra committed Oct 30, 2017
    Copy the full SHA
    66ddbef View commit details
    Browse the repository at this point in the history

  4. fetchTarball: Use "source" as the default name 

    This ensures that it produces the same output as fetchgit:

  $ nix eval --raw '(builtins.fetchgit https://github.com/NixOS/patchelf.git)'
  /nix/store/ghigrkw02l440g8vfxa9wj4c3zpfmw99-source

  $ nix eval --raw '(fetchTarball https://github.com/NixOS/patchelf/archive/master.tar.gz)'
  /nix/store/ghigrkw02l440g8vfxa9wj4c3zpfmw99-source
    @edolstra
    edolstra committed Oct 30, 2017
    Copy the full SHA
    23ce4b3 View commit details
    Browse the repository at this point in the history