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: ab224b550cc1
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 9c5389e47a6d
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 25, 2021

  1. Copy the full SHA
    190173e View commit details
    Browse the repository at this point in the history
  2. zz: install modules shipped with the compiler

    Previously zz wouldn't be able to compile anything using standard
    modules like mem or log out of the box.
    
    To fix this we copy the modules directory included in the source to
    $out/share/zz/modules and add an entry to ZZ_MODULE_PATHS in the wrapper
    around zz.
    
    We also remove a search path entry which used to reference /build
    because it used CARGO_MANIFEST_DIR at build time. The default search
    path now includes:
    
    * /nix/store/modules
    * $out/share/zz/modules
    * $(pwd)/modules
    
    Patching out /nix/store/modules would be kind of cumbersome as it is a
    multi-line entry, but it probably does no harm and fine to leave in.
    
    An issue arising by this PR might be that the added search path entry
    may take priority over an user specified location even though we use
    --suffix. This is because zz internally uses a HashSet which has no
    guaranteed iteration order. This may lead to unexpected behavior for
    users wo previously provided custom versions of the standard modules via
    ZZ_MODULE_PATHS. However, this is an issue in upstream issue as well
    where ZZ_MODULE_PATHS may or may not take priority over the compiled in
    search path, so this issue should probably be resolved upstream (I'll
    file a report or PR).
    sternenseemann committed Jan 25, 2021
    Copy the full SHA
    4aa937d View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2021

  1. Merge pull request #110771 from sternenseemann/zz

    zz: install modules shipped with compiler
    marsam committed Jan 27, 2021
    Copy the full SHA
    9c5389e View commit details
    Browse the repository at this point in the history