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

Commits on Jan 28, 2019

  1. make-derivation: fix position in trace

    For a long time now, tracing has been broken in Nixpkgs. So when you
    have an eval error you would get something like this:
    
      error: while evaluating the attribute 'buildInputs' of the derivation 'hello-2.10' at /home/mbauer/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:185:11:
      while evaluating 'chooseDevOutputs' at /home/mbauer/nixpkgs/lib/attrsets.nix:474:22, called from undefined position:
      while evaluating 'optionals' at /home/mbauer/nixpkgs/lib/lists.nix:257:5, called from /home/mbauer/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:132:17:
    
    This is coming from how Nix handles string context and how
    make-derivation messes with the "name" attribute. This commit should
    restore the old behavior so you get a nice line number like:
    
      error: while evaluating the attribute 'buildInputs' of the derivation 'hello-2.10' at /home/mbauer/nixpkgs/pkgs/applications/misc/hello/default.nix:4:3:
      while evaluating 'chooseDevOutputs' at /home/mbauer/nixpkgs/lib/attrsets.nix:474:22, called from undefined position:
      while evaluating 'optionals' at /home/mbauer/nixpkgs/lib/lists.nix:257:5, called from /home/mbauer/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:132:17:
    
    NOTE: This will still be broken for cross compilation due to the
    prefixes we are adding to name.
    matthewbauer committed Jan 28, 2019
    Copy the full SHA
    7e589e5 View commit details
    Browse the repository at this point in the history
  2. coq-modules: add default to fix eval

    We don’t want these to not even evaluate, otherwise we won’t know why
    they’re broken. For now, I’ve left these as the latest version for a
    default. In the future, maybe we should be smarter about choosing these.
    matthewbauer committed Jan 28, 2019
    Copy the full SHA
    e20b651 View commit details
    Browse the repository at this point in the history
  3. make-derivation: try to fix stdenv.cc == null conditional

    sometimes this gets an infinite recursion error
    matthewbauer committed Jan 28, 2019
    Copy the full SHA
    9fd1c17 View commit details
    Browse the repository at this point in the history
  4. Revert "mingw: use current package set for headers"

    This reverts commit 0307203.
    matthewbauer committed Jan 28, 2019
    Copy the full SHA
    febda2b View commit details
    Browse the repository at this point in the history
  5. make-derivation: fix ordering of conditionals

    cross should have higher precedence
    matthewbauer committed Jan 28, 2019
    Copy the full SHA
    e2fe4c2 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2019

  1. Merge pull request #54801 from matthewbauer/fix-trace-pos

    make-derivation: fix position in trace
    matthewbauer committed Jan 31, 2019
    Copy the full SHA
    ab118f3 View commit details
    Browse the repository at this point in the history