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/nixpkgs
base: 6ffa699c86b0
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 374d22d68d9e
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 18, 2018

  1. stdenv: Validate meta.outputsToInstall 

    If meta.outputsToInstall is set to include absent outputs, various
tools break including channel updates and nix-env.

    grahamc@Morbo> nix-env -i -f . -A elf-header-real
    installing 'elf-header'
    error: this derivation has bad 'meta.outputsToInstall'

This patch verifies each value in meta.outputsToInstall is a valid
output. It validates this condition only if checkMeta is true.

    grahamc@Morbo> nix-build . -A elf-header-real
    error: Package ‘elf-header’ in /home/grahamc/projects/nixpkgs/pkgs/development/libraries/elf-header/default.nix:36 has invalid meta.outputsToInstall, refusing to evaluate.

    The package elf-header has set meta.outputsToInstall to: bin

    however elf-header only has the outputs: out

    and is missing the following ouputs:

      - bin

    (use '--show-trace' to show detailed location information)

Note, now the nix-env experience is decidedly worse for users who have
checkMeta set to true:

    grahamc@Morbo> nix-env -i -f . -A elf-header-real; echo $?
    0

though since this is already an issue for unfree, broken, unsupported,
and insecure validity problems I'm not sure we should do something
different here.

(cherry picked from commit b80c9ce)
    @grahamc
    grahamc committed Sep 18, 2018
    Copy the full SHA
    da5fd39 View commit details
    Browse the repository at this point in the history

  2. elf-header-real: fixup outputsToInstall 

    (cherry picked from commit 301109a)
    @grahamc
    grahamc committed Sep 18, 2018
    Copy the full SHA
    24ad8ad View commit details
    Browse the repository at this point in the history

  3. Merge pull request #46838 from grahamc/check-outputs-in-meta-18.09 

    stdenv: Validate meta.outputsToInstall
    @grahamc
    grahamc committed Sep 18, 2018
    Copy the full SHA
    374d22d View commit details
    Browse the repository at this point in the history