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: d77eaf79765d
Choose a base ref
...
head repository: NixOS/nix
compare: 2007b4a89bec
Choose a head ref
  • 4 commits
  • 3 files changed
  • 4 contributors

Commits on Apr 10, 2020

  1. Downloader: Only write data to the sink on a 200 response 

    Hopefully fixes #3278.

(cherry picked from commit 1ab8d6a)
Signed-off-by: Domen Kožar <domen@dev.si>
    @edolstra
    edolstra committed Apr 10, 2020
    Copy the full SHA
    e914cfb View commit details
    Browse the repository at this point in the history

  2. Don't retry on "unsupported protocol" error 

    When encountering an unsupported protocol, there's no need to retry.
Chances are, it won't suddenly be supported between retry attempts;
error instead. Otherwise, you see something like the following:

    $ nix-env -i -f git://git@github.com/foo/bar
    warning: unable to download 'git://git@github.com/foo/bar': Unsupported protocol (1); retrying in 335 ms
    warning: unable to download 'git://git@github.com/foo/bar': Unsupported protocol (1); retrying in 604 ms
    warning: unable to download 'git://git@github.com/foo/bar': Unsupported protocol (1); retrying in 1340 ms
    warning: unable to download 'git://git@github.com/foo/bar': Unsupported protocol (1); retrying in 2685 ms

With this change, you now see:

    $ nix-env -i -f git://git@github.com/foo/bar
    error: unable to download 'git://git@github.com/foo/bar': Unsupported protocol (1)

(cherry picked from commit c976cb0)
Signed-off-by: Domen Kožar <domen@dev.si>
    @cole-h @edolstra
    cole-h authored and edolstra committed Apr 10, 2020
    Copy the full SHA
    7fee49e View commit details
    Browse the repository at this point in the history

  3. libexpr: show expression in assertion errors 

    Includes the expression of the condition in the assertion message if
the assertion failed, making assertions much easier to debug. eg.

    error: assertion (withPython -> (python2Packages != null)) failed at pkgs/tools/security/nmap/default.nix:11:1

(cherry picked from commit 307bcb9)
Signed-off-by: Domen Kožar <domen@dev.si>
    @LnL7 @edolstra
    LnL7 authored and edolstra committed Apr 10, 2020
    Copy the full SHA
    eba0892 View commit details
    Browse the repository at this point in the history

  4. fix placeholder not substituted in passAsFile 

    (cherry picked from commit 12556e5)
Signed-off-by: Domen Kožar <domen@dev.si>
    @Ninlives @edolstra
    Ninlives authored and edolstra committed Apr 10, 2020
    Copy the full SHA
    2007b4a View commit details
    Browse the repository at this point in the history