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

Commits on Jul 12, 2017

  1. Added makeExtensibleWithInterface

    @ElvishJerricco
    ElvishJerricco committed Jul 12, 2017
    Configuration menu
    Copy the full SHA
    08021dd View commit details
    Browse the repository at this point in the history

  2. Improved makeOverridable with extend and overridePackage

    @ElvishJerricco
    ElvishJerricco committed Jul 12, 2017
    Configuration menu
    Copy the full SHA
    927c4f8 View commit details
    Browse the repository at this point in the history

  3. Added callPackageWithSelfWith and callPackageWithSelf

    @ElvishJerricco
    ElvishJerricco committed Jul 12, 2017
    Configuration menu
    Copy the full SHA
    af479c1 View commit details
    Browse the repository at this point in the history

  4. Update haskellPackages to use new features of makeOverridable 

    Instead of manually using `makeExtensible`, which broke `override`.

Fixes #26561
    @ElvishJerricco
    ElvishJerricco committed Jul 12, 2017
    Configuration menu
    Copy the full SHA
    e11dbc3 View commit details
    Browse the repository at this point in the history

  5. Re-added overrideAttrs in makeOverridable

    @ElvishJerricco
    ElvishJerricco committed Jul 12, 2017
    Configuration menu
    Copy the full SHA
    5a5f861 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2017

  1. Added overrideScope for callPackageWith 

    Consequently removing several ad-hoc definitions of the same concept.
    @ElvishJerricco
    ElvishJerricco committed Jul 13, 2017
    Configuration menu
    Copy the full SHA
    8b76496 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2017

  1. Added self views of the interface in makeExtensibleWithInterface 

    Fixing the `overrideScope` in `haskellpackages`.
    @ElvishJerricco
    ElvishJerricco committed Jul 14, 2017
    Configuration menu
    Copy the full SHA
    05f9db6 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2017

  1. Merge branch 'master' into improved-make-overridable

    @ElvishJerricco
    ElvishJerricco committed Aug 26, 2017
    Configuration menu
    Copy the full SHA
    4d86038 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2017

  1. Merge branch 'master' into improved-make-overridable

    @ElvishJerricco
    ElvishJerricco committed Sep 12, 2017
    Configuration menu
    Copy the full SHA
    dbd5009 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2017

  1. Merge branch 'improved-make-overridable' of git://github.com/ElvishJe… 

    …rricco/nixpkgs
    @shlevy
    shlevy committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    c3af121 View commit details
    Browse the repository at this point in the history