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: 9b70630b9baa
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: fd8dcdfa9d32
Choose a head ref
  • 5 commits
  • 10 files changed
  • 2 contributors

Commits on Apr 28, 2018

  1. Revert ".version: remove final newline" 

    This reverts commit e109784.
    @Ma27
    Ma27 committed Apr 28, 2018
    Copy the full SHA
    9f2b67d View commit details
    Browse the repository at this point in the history

  2. osquery: use stdenv.lib.nixpkgsVersion 

    This way easier to understand and the officially recommended approach.

/cc @dezgeg @fpletz
    @Ma27
    Ma27 committed Apr 28, 2018
    Copy the full SHA
    f66cdc7 View commit details
    Browse the repository at this point in the history

  3. lib: deduplicate version/suffix references 

    The logic regarding the generated `.version-suffix` file is already
defined in `lib/trivial.nix` and shouldn't be duplicated in
`nixos/version`.
    @Ma27
    Ma27 committed Apr 28, 2018
    Copy the full SHA
    3990928 View commit details
    Browse the repository at this point in the history

  4. treewide: rename version attributes 

    As suggested in #39416 (comment)
the versioning attributes in `lib` should be consistent to
`nixos/version` which implicates the following changes:

* `lib.trivial.version` -> `lib.trivial.release`
* `lib.trivial.suffix` -> `lib.trivial.versionSuffix`
* `lib.nixpkgsVersion` -> `lib.version`

As `lib.nixpkgsVersion` is referenced several times in `NixOS/nixpkgs`,
`NixOS/nix` and probably several user's setups. As the rename will cause
a notable impact it's better to keep `lib.nixpkgsVersion` as alias with
a warning yielded by `builtins.trace`.
    @Ma27
    Ma27 committed Apr 28, 2018
    4
    Copy the full SHA
    9274ea3 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2018

  1. Merge pull request #39416 from Ma27/fix-.version-config 

    .version: don't read from `.version` and deduplicate `.version-suffix` references
    @7c6f434c
    7c6f434c committed Apr 30, 2018
    Copy the full SHA
    fd8dcdf View commit details
    Browse the repository at this point in the history