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: d1139ff36b5d
Choose a base ref
...
head repository: NixOS/nix
compare: 302386f775ee
Choose a head ref
  • 5 commits
  • 12 files changed
  • 1 contributor

Commits on Feb 16, 2017

  1. Include "curl" in the User-Agent header 

    Some sites (e.g. BitBucket) give a helpful 401 error when trying to
download a private archive if the User-Agent contains "curl", but give
a redirect to a login page otherwise (so for instance
"nix-prefetch-url" will succeed but produce useless output).
    @edolstra
    edolstra committed Feb 16, 2017
    Configuration menu
    Copy the full SHA
    40f0e3b View commit details
    Browse the repository at this point in the history

  2. <nix/fetchurl.nix>: Remove unnecessary assertion

    @edolstra
    edolstra committed Feb 16, 2017
    1 Configuration menu
    Copy the full SHA
    b63f791 View commit details
    Browse the repository at this point in the history

  3. Tweak netrc docs

    @edolstra
    edolstra committed Feb 16, 2017
    Configuration menu
    Copy the full SHA
    bd5388e View commit details
    Browse the repository at this point in the history

  4. Move netrcFile to Settings 

    Also get rid of Settings::processEnvironment(), it appears to be
useless.
    @edolstra
    edolstra committed Feb 16, 2017
    Configuration menu
    Copy the full SHA
    cde4b60 View commit details
    Browse the repository at this point in the history

  5. Support netrc in <nix/fetchurl.nix> 

    This allows <nix/fetchurl.nix> to fetch private Git/Mercurial
repositories, e.g.

  import <nix/fetchurl.nix> {
    url = https://edolstra@bitbucket.org/edolstra/my-private-repo/get/80a14018daed.tar.bz2;
    sha256 = "1mgqzn7biqkq3hf2697b0jc4wabkqhmzq2srdymjfa6sb9zb6qs7";
  }

where /etc/nix/netrc contains:

  machine bitbucket.org
  login edolstra
  password blabla...

This works even when sandboxing is enabled.

To do: add unpacking support (i.e. fetchzip functionality).
    @edolstra
    edolstra committed Feb 16, 2017
    Configuration menu
    Copy the full SHA
    302386f View commit details
    Browse the repository at this point in the history