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

Update message to reflect nix 2.0 availability of imperative nix-update #36123

Merged
merged 1 commit into from Jun 24, 2018

Conversation

leenaars
Copy link
Contributor

Motivation for this change

With Nix 2.0 out, there is a new way of updating which should be reflected in the message printed to users.

Things done

@lopsided98
Copy link
Contributor

nix upgrade-nix is not an alternative for nixos-rebuild, is it? nixos-rebuild only exists on NixOS, and if I do nix upgrade-nix on NixOS I get this message:

error: Nix on NixOS must be upgraded via 'nixos-rebuild'

@leenaars
Copy link
Contributor Author

leenaars commented Mar 4, 2018

You are right, I should have added a dash in front as it does not apply to Nixos but to other operating systems nixpkgs can be used with. Fixed it, and added a suggestion how the user may find out which version of Nix he or she is using.

(note to others: This is the message that gets printed when the Nix version is too old to evaluate it. The new nix command offers its own proper upgrade capability, so the user should be prompted to use that instead of other options.)

default.nix Outdated
@@ -8,6 +8,9 @@ if ! builtins ? nixVersion || builtins.compareVersions requiredVersion builtins.

- If you are running NixOS, use `nixos-rebuild' to upgrade your system.

- Alternatively, with Nix > 2.0 you can use `nix upgrade-nix' to imperatively
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"you can use" to "can be used" in both lines

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@leenaars
Copy link
Contributor Author

leenaars commented Mar 4, 2018

@FRidh: Done.

@xeji xeji merged commit b197363 into NixOS:master Jun 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants