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: 7c8d3aa21d42
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 8366525cbf40
Choose a head ref
  • 13 commits
  • 16 files changed
  • 1 contributor

Commits on Jan 16, 2017

  1. Add overlays mechanism to Nixpkgs. 

    This patch add a new argument to Nixpkgs default expression named "overlays".

By default, the value of the argument is either taken from the environment variable `NIXPKGS_OVERLAYS`,
or from the directory `~/.nixpkgs/overlays/`.  If the environment variable does not name a valid directory
then this mechanism would fallback on the home directory.  If the home directory does not exists it will
fallback on an empty list of overlays.

The overlays directory should contain the list of extra Nixpkgs stages which would be used to extend the
content of Nixpkgs, with additional set of packages.  The overlays, i-e directory, files, symbolic links
are used in alphabetical order.

The simplest overlay which extends Nixpkgs with nothing looks like:

```nix
self: super: {
}
```

More refined overlays can use `super` as the basis for building new packages, and `self` as a way to query
the final result of the fix-point.

An example of overlay which extends Nixpkgs with a small set of packages can be found at:
  https://github.com/nbp/nixpkgs-mozilla/blob/nixpkgs-overlay/moz-overlay.nix

To use this file, checkout the repository and add a symbolic link to
the `moz-overlay.nix` file in `~/.nixpkgs/overlays` directory.
    @nbp
    nbp committed Jan 16, 2017
    Configuration menu
    Copy the full SHA
    f5dfe78 View commit details
    Browse the repository at this point in the history

  2. Add NixOS option 'nixpkgs.overlays' to set the argument of Nixpkgs.

    @nbp
    nbp committed Jan 16, 2017
    Configuration menu
    Copy the full SHA
    83f7d5f View commit details
    Browse the repository at this point in the history

  3. Add missing line break in the release notes.

    @nbp
    nbp committed Jan 16, 2017
    Configuration menu
    Copy the full SHA
    6a83c31 View commit details
    Browse the repository at this point in the history

  4. Throw an error if NIXPKGS_OVERLAYS is invalid and improve documentation.

    @nbp
    nbp committed Jan 16, 2017
    Configuration menu
    Copy the full SHA
    f9da1fa View commit details
    Browse the repository at this point in the history

  5. Replace 'phases' by 'layers' in overlays documentation.

    @nbp
    nbp committed Jan 16, 2017
    Configuration menu
    Copy the full SHA
    51d3c93 View commit details
    Browse the repository at this point in the history

  6. Improve the realse notes with the upcoming documentation links, and a… 

    … better example of how to convert overridePackages usage.
    @nbp
    nbp committed Jan 16, 2017
    Configuration menu
    Copy the full SHA
    ae7e893 View commit details
    Browse the repository at this point in the history

  7. Update overlay documentation by following nits from aneeshusa.

    @nbp
    nbp committed Jan 16, 2017
    Configuration menu
    Copy the full SHA
    2d6532b View commit details
    Browse the repository at this point in the history

  8. Fix typo in nixpkgs.nix module.

    @nbp
    nbp committed Jan 16, 2017
    Configuration menu
    Copy the full SHA
    a0615e2 View commit details
    Browse the repository at this point in the history

  9. Fix missing overlays argument in stdenv/linux/default.nix

    @nbp
    nbp committed Jan 16, 2017
    Configuration menu
    Copy the full SHA
    da8cf26 View commit details
    Browse the repository at this point in the history

  10. Fix extra nits from aneeshusa

    @nbp
    nbp committed Jan 16, 2017
    Configuration menu
    Copy the full SHA
    2ad710e View commit details
    Browse the repository at this point in the history

  11. Fix typo, lib.listOf --> types.listOf

    @nbp
    nbp committed Jan 16, 2017
    Configuration menu
    Copy the full SHA
    c4e2dc3 View commit details
    Browse the repository at this point in the history

  12. Fix nixpkgs manual generation, missing para closing tag.

    @nbp
    nbp committed Jan 16, 2017
    Configuration menu
    Copy the full SHA
    88ba960 View commit details
    Browse the repository at this point in the history

  13. Fix release-notes compilation.

    @nbp
    nbp committed Jan 16, 2017
    Configuration menu
    Copy the full SHA
    8366525 View commit details
    Browse the repository at this point in the history