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/nix
base: 21830cb0447f
Choose a base ref
...
head repository: NixOS/nix
compare: a78582c70fdd
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 22, 2020

  1. nix develop: Add --redirect flag to redirect dependencies 

    This is primarily useful if you're hacking simultaneously on a package
and one of its dependencies. E.g. if you're hacking on Hydra and Nix,
you would start a dev shell for Nix, and then a dev shell for Hydra as
follows:

  $ nix develop \
    --redirect .#hydraJobs.build.x86_64-linux.nix ~/Dev/nix/outputs/out \
    --redirect .#hydraJobs.build.x86_64-linux.nix.dev ~/Dev/nix/outputs/dev

(This assumes hydraJobs.build.x86_64-linux has a passthru.nix
attribute. You can also use a store path.)

This causes all references in the environment to those store paths to
be rewritten to ~/Dev/nix/outputs/{out,dev}. Note: unfortunately, you
may need to set LD_LIBRARY_PATH=~/Dev/nix/outputs/out/lib because
Nixpkgs' ld-wrapper only adds -rpath entries for -L flags that point
to the Nix store.
    @edolstra
    edolstra committed Oct 22, 2020
    1
    Copy the full SHA
    f9438fb View commit details
    Browse the repository at this point in the history

  2. Fix clang build

    @edolstra
    edolstra committed Oct 22, 2020
    Copy the full SHA
    750ce50 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #4161 from edolstra/nix-develop-redirects 

    nix develop: Add --redirect flag to redirect dependencies
    @edolstra
    edolstra committed Oct 22, 2020
    Copy the full SHA
    a78582c View commit details
    Browse the repository at this point in the history