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: 94e62d505ffe
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 5aabf0fc3483
Choose a head ref
  • 8 commits
  • 13 files changed
  • 2 contributors

Commits on Feb 9, 2018

  1. lib: implement compare, splitByAndCompare, and compareLists

    @oxij
    oxij committed Feb 9, 2018
    Copy the full SHA
    ee32204 View commit details
    Browse the repository at this point in the history

  2. nixos/doc: push all the enable*' and package*` options to the top o… 

    …f their option group

Why? Because this way configuration.nix(5) can be read linearly.

Before:

> virtualisation.xen.bootParams
> ...
> virtualisation.xen.enable
> ...
> virtualisation.xen.package
> ...

After:

> virtualisation.xen.enable
> virtualisation.xen.package
> virtualisation.xen.bootParams
> ...
    @oxij
    oxij committed Feb 9, 2018
    1
    Copy the full SHA
    a7d75ab View commit details
    Browse the repository at this point in the history

  3. nixos, lib: implement relatedPackages option 

    This allows one to specify "related packages" in NixOS that get rendered into
the configuration.nix(5) man page. The interface philosophy is pretty much
stolen from TeX bibliography.

See the next several commits for examples.
    @oxij
    oxij committed Feb 9, 2018
    Copy the full SHA
    6608060 View commit details
    Browse the repository at this point in the history

  4. nixos/tmux: add related package 

    This is a trivial example of `relatedPackages` option usage.
    @oxij
    oxij committed Feb 9, 2018
    Copy the full SHA
    eb38b86 View commit details
    Browse the repository at this point in the history

  5. nixos/adb: add related package 

    This is an attribute path example of `relatedPackages` option usage.
    @oxij
    oxij committed Feb 9, 2018
    Copy the full SHA
    e526834 View commit details
    Browse the repository at this point in the history

  6. xen, qemu: passthru the path to qemu-system-i386

    @oxij
    oxij committed Feb 9, 2018
    Copy the full SHA
    06adc17 View commit details
    Browse the repository at this point in the history

  7. nixos/xen-dom0: add related packages, make it play well with them 

    This is a custom attribute set example of `relatedPackages` option usage.
    @oxij
    oxij committed Feb 9, 2018
    Copy the full SHA
    0d1a643 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2018

  1. Merge pull request #33898 from oxij/nixos/related-packages-v5 

    nixos: doc: implement related packages in the manual (again)
    @grahamc
    grahamc committed Feb 10, 2018
    Copy the full SHA
    5aabf0f View commit details
    Browse the repository at this point in the history