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: da7ddd822e32
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d2a2ec2ebe49
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 12, 2020

  1. lib.version: change pre-git to post-git on the release branch 

    When there is no .version-suffix file in nixpkgs (like when fetching
nixpkgs with builtins.fetchGit), lib.version suffixes the version string
with "pre-git". The "pre" bit is special cased in
builtins.compareVersions which means "20.03pre-git" is interpreted as
"less than 20.03". This is clearly wrong for the release-20.03 branch
*after* the release has been made.

Change the suffix to "post-git" to make code like this behave the same
whether nixpkgs is fetched from git or the channel (which has
.version-suffix file):

  lib.versionOlder lib.version "20.03"
  lib.versionAtLeast lib.version "20.03"

(Currently the result depend on how nixpkgs was obtained!)

This change should be made part of the release process.
    @bjornfor
    bjornfor committed May 12, 2020
    Copy the full SHA
    d2a2ec2 View commit details
    Browse the repository at this point in the history