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

Commits on Mar 27, 2018

  1. LTS Haskell 11.2 

    This update was generated by hackage2nix v2.9.2-2-gebc40be from Hackage revision
commercialhaskell/all-cabal-hashes@0200fec.
    @peti
    peti committed Mar 27, 2018
    Copy the full SHA
    fc58ab2 View commit details

  2. haskell-getopt-generics: drop obsolete override for GHC 8.4.1

    @peti
    peti committed Mar 27, 2018
    Copy the full SHA
    5dd264a View commit details

  3. haskell-json: drop obsolete override for GHC 8.4.1

    @peti
    peti committed Mar 27, 2018
    Copy the full SHA
    234c42b View commit details

  4. haskell-hnix: jailbreak deriving-compat dependency 

    Reported as haskell-nix/hnix#98
    @mdorman @peti
    mdorman authored and peti committed Mar 27, 2018
    Copy the full SHA
    dddf031 View commit details
2 changes: 2 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -244,6 +244,8 @@ self: super: {
# base bound
digit = doJailbreak super.digit;

# https://github.com/jwiegley/hnix/issues/98 - tied to an older deriving-compat
hnix = doJailbreak super.hnix;

# Fails for non-obvious reasons while attempting to use doctest.
search = dontCheck super.search;
2 changes: 0 additions & 2 deletions pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
View file
Original file line number Diff line number Diff line change
@@ -628,9 +628,7 @@ self: super: {

# Older versions don't compile.
brick = self.brick_0_35_1;
getopt-generics = self.getopt-generics_0_13_0_2;
HaTeX = self.HaTeX_3_19_0_0;
json = self.json_0_9_2;
matrix = self.matrix_0_3_6_1;
pandoc = self.pandoc_2_1_3;
pandoc-types = self.pandoc-types_1_17_4_2;
Loading