Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

2.3 bugfixes #3481

Merged
merged 4 commits into from
Apr 10, 2020
Merged

2.3 bugfixes #3481

merged 4 commits into from
Apr 10, 2020

Commits on Apr 9, 2020

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

    Hopefully fixes NixOS#3278.

(cherry picked from commit 1ab8d6a)
Signed-off-by: Domen Kožar <domen@dev.si>
    @edolstra @domenkozar
    edolstra authored and domenkozar committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    7de5d2d 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 @domenkozar
    cole-h authored and domenkozar committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    75b9a2c 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 @domenkozar
    LnL7 authored and domenkozar committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    128f93b 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 @domenkozar
    Ninlives authored and domenkozar committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    a4ebf99 View commit details
    Browse the repository at this point in the history