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

Commits on May 12, 2017

  1. hackage-packages.nix: automatic Haskell package set update 

    This update was generated by hackage2nix v2.2.1 from Hackage revision
commercialhaskell/all-cabal-hashes@979529c.
    @peti
    peti committed May 12, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    GPG key ID: 5CC908FDB71E12C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    450a76e View commit details

  2. haskell-loc-test: break infinite recursion in test dependencies

    @peti
    peti committed May 12, 2017
    Copy the full SHA
    890fd54 View commit details
Showing with 2,214 additions and 426 deletions.
  1. +4 −0 pkgs/development/haskell-modules/configuration-nix.nix
  2. +2,210 −426 pkgs/development/haskell-modules/hackage-packages.nix
4 changes: 4 additions & 0 deletions pkgs/development/haskell-modules/configuration-nix.nix
View file
Original file line number Diff line number Diff line change
@@ -454,4 +454,8 @@ self: super: builtins.intersectAttrs super {
export PATH="$PWD/dist/build/intero:$PATH"
'';
});

# loc and loc-test depend on each other for testing. Break that infinite cycle:
loc-test = super.loc-test.override { loc = dontCheck self.loc; };

}
2,636 changes: 2,210 additions & 426 deletions pkgs/development/haskell-modules/hackage-packages.nix
View file

Large diffs are not rendered by default.