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

Commits on Jan 10, 2020

  1. haskellPackages.ormolu: fix overrides so it builds

    @aforemny
    aforemny committed Jan 10, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    MichaReiser Micha Reiser
    SSH Key Fingerprint: ecGsN1ElBc6rDn4Ge3zV90y0fffKRH+1PNbJCxfpPEs
    Verified
    Learn about vigilant mode
    Copy the full SHA
    47ddee7 View commit details

  2. haskellPackages.ormolu: mark unbroken 

    Builds fine with 6b5bb4261c6dacbe65d348376c416c75ddafaebd
    @aforemny
    aforemny committed Jan 10, 2020
    Copy the full SHA
    9e80857 View commit details

  3. Merge pull request #77439 from aforemny/ormolu 

    Fix haskellPackages.ormolu
    @peti
    peti authored Jan 10, 2020
    Copy the full SHA
    6a36e65 View commit details
Showing with 4 additions and 1 deletion.
  1. +4 −0 pkgs/development/haskell-modules/configuration-common.nix
  2. +0 −1 pkgs/development/haskell-modules/configuration-hackage2nix.yaml
4 changes: 4 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -1361,4 +1361,8 @@ self: super: {
# https://github.com/haskell-servant/servant-ekg/issues/15
servant-ekg = doJailbreak super.servant-ekg;

# Needs ghc-lib-parser 8.8.1 (does not build with 8.8.0)
ormolu = doJailbreak (super.ormolu.override {
ghc-lib-parser = self.ghc-lib-parser_8_8_1_20191204;
});
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
1 change: 0 additions & 1 deletion pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file
Original file line number Diff line number Diff line change
@@ -7731,7 +7731,6 @@ broken-packages:
- orgstat
- origami
- orizentic
- ormolu
- OrPatterns
- osc
- oscpacking