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: f506b80fffd0
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: b1f854867033
Choose a head ref
  • 9 commits
  • 27 files changed
  • 3 contributors

Commits on Dec 13, 2017

  1. stdenv/generic/check-meta: fix error message evaluation 

    (cherry picked from commit 8ae51ff)
    @oxij @grahamc
    oxij authored and grahamc committed Dec 13, 2017
    Copy the full SHA
    cf76a80 View commit details
    Browse the repository at this point in the history

  2. tree-wide: fix either check-meta or meta attrs of all the packages I … 

    …evaluate

(cherry picked from commit 1858e89)
    @oxij @grahamc
    oxij authored and grahamc committed Dec 13, 2017
    Copy the full SHA
    fcbf6ee View commit details
    Browse the repository at this point in the history

  3. stdenv checkMeta: throw -> trace 

    - tracing seems annoying enough
- we get errors for all packages instead of aborting on the first one
- easier to differentiate from unwanted packages (broken, unfree, etc.)

(cherry picked from commit 76bf375)
    @vcunat @grahamc
    vcunat authored and grahamc committed Dec 13, 2017
    Copy the full SHA
    b640ae6 View commit details
    Browse the repository at this point in the history

  4. treewide platform checks: abort -> throw 

    They aren't meant to be critical (uncatchable) errors.
Tested with nix-env + checkMeta:
[ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]

(cherry picked from commit 3a110ea)
    @vcunat @grahamc
    vcunat authored and grahamc committed Dec 13, 2017
    Copy the full SHA
    39b4b8d View commit details
    Browse the repository at this point in the history

  5. stdenv: allow specifying a eval issuee handler 

    (cherry picked from commit f33a513)
    @grahamc
    grahamc committed Dec 13, 2017
    Copy the full SHA
    ec819b8 View commit details
    Browse the repository at this point in the history

  6. Additional aborts -> throws on platform checks

    @grahamc
    grahamc committed Dec 13, 2017
    Copy the full SHA
    0bc2abb View commit details
    Browse the repository at this point in the history

  7. additional meta fixes

    @grahamc
    grahamc committed Dec 13, 2017
    Copy the full SHA
    a268942 View commit details
    Browse the repository at this point in the history

  8. whitespace

    @grahamc
    grahamc committed Dec 13, 2017
    Copy the full SHA
    7d16425 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2017

  1. Merge pull request #32620 from grahamc/check-meta-17.09 

    Backporting meta fixes and from master
    @grahamc
    grahamc committed Dec 14, 2017
    Copy the full SHA
    b1f8548 View commit details
    Browse the repository at this point in the history