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/nixpkgs
base: 974386dfba47
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: e0ae89007bad
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 28, 2018

  1. nixos/version: fix nixops pre 1.6 compatibility 

    We should be able to deploy a NixOS 18.03 system with the current nixops
stable release. Some options were renamed, so instead of
`mkRenamedOptionModule` we introduce them as read-only interal options
that won't be rendered in the manual.

Only the options that are needed to make nixops evaluations succeed were
added.

This commit should probably be reverted after or before the 18.09 release,
depending on the nixops 1.6 release.

The user will not get the warning that these have been renamed but
this change is mentioned in the release notes.

Fixes #34253.
    @fpletz
    fpletz committed Mar 28, 2018
    Configuration menu
    Copy the full SHA
    70c6f65 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2018

  1. Merge pull request #37955 from mayflower/fix/nixops-pre-1.6-eval 

    nixos/version: fix nixops pre 1.6 compatibility
    @fpletz
    fpletz committed Mar 29, 2018
    Configuration menu
    Copy the full SHA
    e0ae890 View commit details
    Browse the repository at this point in the history