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.

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

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

Conversation

domenkozar
Copy link
Member

Collects a few smallish commits from master for a maintenance release

edolstra and others added 4 commits April 9, 2020 14:51
Hopefully fixes NixOS#3278.

(cherry picked from commit 1ab8d6a)
Signed-off-by: Domen Kožar <domen@dev.si>
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>
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>
(cherry picked from commit 12556e5)
Signed-off-by: Domen Kožar <domen@dev.si>
@domenkozar domenkozar requested a review from edolstra April 9, 2020 13:01
@edolstra edolstra merged commit 2007b4a into NixOS:2.3-maintenance Apr 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants