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: 1a054480d312
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 67e8392383d2
Choose a head ref
  • 12 commits
  • 6 files changed
  • 2 contributors

Commits on Jan 3, 2018

  1. lib: generalize addPassthru to extendDerivation

    @oxij
    oxij committed Jan 3, 2018
    Copy the full SHA
    b1ca851 View commit details
    Browse the repository at this point in the history

  2. stdenv: perform checks only when evaluating .drv and .out 

    This pushes check-meta evaluation to derivation evaluation step, leaving all other
attributes accessible.

Before this commit:

> $ HOME=/homeless-shelter NIX_PATH=nixpkgs=$(pwd) nix-instantiate --eval --strict ./default.nix -A xen --argstr system aarch64-linux
> Package ‘xen-4.5.5’ in pkgs/applications/virtualization/xen/generic.nix:226 is not supported on ‘aarch64-linux’, refusing to evaluate.

as expected

> $ HOME=/homeless-shelter NIX_PATH=nixpkgs=$(pwd) nix-instantiate --eval --strict ./default.nix -A xen.name --argstr system aarch64-linux
> Package ‘xen-4.5.5’ in pkgs/applications/virtualization/xen/generic.nix:226 is not supported on ‘aarch64-linux’, refusing to evaluate.

> $ HOME=/homeless-shelter NIX_PATH=nixpkgs=$(pwd) nix-instantiate --eval --strict ./default.nix -A xen.meta.description --argstr system aarch64-linux
> Package ‘xen-4.5.5’ in pkgs/applications/virtualization/xen/generic.nix:226 is not supported on ‘aarch64-linux’, refusing to evaluate.

which is unfortunate since its impossible to use packages in autogenerated
documentation on all platforms.

After this commit:

> $ HOME=/homeless-shelter NIX_PATH=nixpkgs=$(pwd) nix-instantiate --eval --strict ./default.nix -A xen --argstr system aarch64-linux

still fails

> $ HOME=/homeless-shelter NIX_PATH=nixpkgs=$(pwd) nix-instantiate --eval --strict ./default.nix -A xen.name --argstr system aarch64-linux
> "xen-4.5.5"

> $ HOME=/homeless-shelter NIX_PATH=nixpkgs=$(pwd) nix-instantiate --eval --strict ./default.nix -A xen.meta.description --argstr system aarch64-linux
> "Xen hypervisor and related components (vanilla)"
    @oxij
    oxij committed Jan 3, 2018
    Copy the full SHA
    d1d5ecb View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2018

  1. stdenv: change some indent

    @oxij
    oxij committed Jan 14, 2018
    Copy the full SHA
    9956687 View commit details
    Browse the repository at this point in the history

  2. stdenv: provide meta.evaluates 

    This gives a way to see the result of `check-meta` without triggering any assertions.
    @oxij
    oxij committed Jan 14, 2018
    Copy the full SHA
    ecd3990 View commit details
    Browse the repository at this point in the history

  3. stdenv: implement config.checkMetaRecursively 

    This option makes `meta.evaluate` into a close approximation of the result of
evaluating `.outPath` by checking all the dependencies recursively at a cost of
2x slowdown. Note that actually evaluating `.outPath` costs some
5x-7x more because `.outPath` also computes all the hashes.
    @oxij
    oxij committed Jan 14, 2018
    Copy the full SHA
    eaee2a1 View commit details
    Browse the repository at this point in the history

  4. stdenv: hide name under check-meta assert 

    This is a temporary workaround to make `nix-env -qa` and `nix search` ignore
broken packages as they they did before this patchset.

This patch should be reverted after `nix` gets a proper fix for this.
See NixOS/nix#1771.
    @oxij
    oxij committed Jan 14, 2018
    2
    Copy the full SHA
    50148f0 View commit details
    Browse the repository at this point in the history

  5. stdenv: provide meta.name

    @oxij
    oxij committed Jan 14, 2018
    Copy the full SHA
    fac3d49 View commit details
    Browse the repository at this point in the history

  6. lib: change the order of arguments of addPassthru

    @oxij
    oxij committed Jan 14, 2018
    Copy the full SHA
    8606dd8 View commit details
    Browse the repository at this point in the history

  7. treewide: replace addPassthru

    @oxij
    oxij committed Jan 14, 2018
    Copy the full SHA
    85cd22c View commit details
    Browse the repository at this point in the history

  8. lib: deprecate addPassthru

    @oxij
    oxij committed Jan 14, 2018
    Copy the full SHA
    41df994 View commit details
    Browse the repository at this point in the history

  9. release notes: mention removal of lib.addPassthru

    @vcunat
    vcunat committed Jan 14, 2018
    Copy the full SHA
    799b941 View commit details
    Browse the repository at this point in the history

  10. Merge #33057: stdenv meta checks: make them lazy 

    Closes #22277 - it's superseded;  I have some WIP on evaluation
performance, but best do that in a separate PR/thread.
    @vcunat
    vcunat committed Jan 14, 2018
    Copy the full SHA
    67e8392 View commit details
    Browse the repository at this point in the history