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

Commits on Mar 6, 2018

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

    This update was generated by hackage2nix v2.8.2-10-g32cfe74 from Hackage revision
commercialhaskell/all-cabal-hashes@d14774a.
    @peti
    peti committed Mar 6, 2018
    Copy the full SHA
    ebfecf3 View commit details

  2. haskell-changelogged: add override to fix the build

    @peti
    peti committed Mar 6, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    yurrriq Eric Bailey
    GPG key ID: 29E1B8D32C1635C4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f4b757b View commit details

  3. hackage: update database snapshot to latest version

    @peti
    peti committed Mar 6, 2018
    Copy the full SHA
    68fd23f View commit details
Showing with 289 additions and 123 deletions.
  1. +2 −2 pkgs/data/misc/hackage/default.nix
  2. +3 −0 pkgs/development/haskell-modules/configuration-common.nix
  3. +284 −121 pkgs/development/haskell-modules/hackage-packages.nix
4 changes: 2 additions & 2 deletions pkgs/data/misc/hackage/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ fetchurl }:

fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/30eca1c57b9358eff984ab93dbfd213d6b08706b.tar.gz";
sha256 = "0kd5y2jlydbr1jv2ckdpsn2ialbxk2aj19c8i0brzz0wwzirg7q5";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/56955295749aea09bd42591cd506c2616d48ebfd.tar.gz";
sha256 = "17c8a1wj1jxr14sxvwq0i9kidwycz2hkl1ls51yfz14anylxr84l";
}
3 changes: 3 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -1006,4 +1006,7 @@ self: super: {
# Needs older hlint
hpio = dontCheck super.hpio;

# Needs turtle >=1.5.0, which we use by default in lts-10.x.
changelogged = super.changelogged.override { turtle = self.turtle_1_5_4; };

}
Loading