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: 19dd11558866
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 96a604320a04
Choose a head ref
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on May 9, 2019

  1. stdenv, cacert: consider $NIX_SSL_CERT_FILE in hooks 

    Some SSL libs don't react to $SSL_CERT_FILE.
That actually makes sense to me, as we add this behavior
as nixpkgs-specific, so it seems "safer" to use $NIX_*.
    @vcunat
    vcunat committed May 9, 2019
    Copy the full SHA
    79bd4ad View commit details
    Browse the repository at this point in the history

  2. stdenv: also override cert files in pure nix-shell 

    That's very much consistent with the spirit of nix-shell --pure

BTW, nix 1.x shells will be always treated as pure;
in that version detection isn't possible.
NixOS/nix@1bffd83e1a9c
    @vcunat
    vcunat committed May 9, 2019
    Copy the full SHA
    b27cc37 View commit details
    Browse the repository at this point in the history

  3. pypi2nix: fix $IN_NIX_SHELL test 

    In nix 2.0 this changed: NixOS/nix@1bffd83
I only kept the original intention and did no kind of verification.
    @vcunat
    vcunat committed May 9, 2019
    Copy the full SHA
    99760ed View commit details
    Browse the repository at this point in the history

Commits on May 19, 2019

  1. Merge #61179: stdenv, cacert: $NIX_SSL_CERT_FILE changes 

    ... into staging
    @vcunat
    vcunat committed May 19, 2019
    Copy the full SHA
    96a6043 View commit details
    Browse the repository at this point in the history