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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 467097464c75
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 220b35b62ec2
Choose a head ref
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 5, 2018

  1. Make haskell-modules backward compatible

    @4e6
    4e6 committed Feb 5, 2018
    Copy the full SHA
    bbeec79 View commit details

  2. Add comments

    @4e6
    4e6 committed Feb 5, 2018
    Copy the full SHA
    817a2dd View commit details

  3. Replace ellipsis with null argument

    @4e6
    4e6 committed Feb 5, 2018
    Copy the full SHA
    df8e9d0 View commit details

  4. Merge pull request #34557 from 4e6/haskell-modules-compatibility 

    haskell modules: Make 17.09 forwards compatible
    @Ericson2314
    Ericson2314 authored Feb 5, 2018
    Copy the full SHA
    220b35b View commit details
Showing with 5 additions and 0 deletions.
  1. +5 −0 pkgs/development/haskell-modules/make-package-set.nix
5 changes: 5 additions & 0 deletions pkgs/development/haskell-modules/make-package-set.nix
View file
Original file line number Diff line number Diff line change
@@ -22,6 +22,11 @@
, # The final, fully overriden package set usable with the nixpkgs fixpoint
# overriding functionality
extensible-self

, # A haskell package set for Setup.hs, compiler plugins, and similar
# build-time uses.
# dummy argument for compatibility with nixpkgs-unstable channel
buildHaskellPackages ? null
}:

# return value: a function from self to the package set