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: 4010075ea7f8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1250a08538d1
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 17, 2019

  1. haskell-tls: update ghc-8.8.x override for the latest version

    @peti
    peti committed Oct 17, 2019
    Copy the full SHA
    515faf8 View commit details

  2. hackage2nix: mark broken builds to fix evaluation on Hydra

    @peti
    peti committed Oct 17, 2019
    Copy the full SHA
    1250a08 View commit details
Showing with 5 additions and 1 deletion.
  1. +1 −1 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
  2. +4 −0 pkgs/development/haskell-modules/configuration-hackage2nix.yaml
2 changes: 1 addition & 1 deletion pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View file
Original file line number Diff line number Diff line change
@@ -79,7 +79,7 @@ self: super: {
regex-posix = self.regex-posix_0_96_0_0;
regex-tdfa = self.regex-tdfa_1_3_0;
shelly = self.shelly_1_9_0;
tls = self.tls_1_5_1;
tls = self.tls_1_5_2;
xmonad-contrib = self.xmonad-contrib_0_16;

# These packages don't work and need patching and/or an update.
4 changes: 4 additions & 0 deletions pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file
Original file line number Diff line number Diff line change
@@ -5691,6 +5691,9 @@ broken-packages:
- hgen
- hgeometric
- hgeometry
- hgeometry-combinatorial
- hgeometry-ipe
- hgeometry-svg
- hgeos
- hgettext
- hgis
@@ -10219,6 +10222,7 @@ broken-packages:
- yaya-hedgehog
- yaya-unsafe
- ycextra
- yeamer
- yeller
- yeshql-postgresql-simple
- yesod-angular