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

Commits on Dec 20, 2017

  1. hackage2nix: update list of broken builds 

    Ping @alunduil for broken "collection-json" build.
Ping @gridaphobe for broken ghc-srcspan-plugin build.
Ping @gebner for broken hledger-diff build.
Ping @khumba for broken hoppy-docs and hoppy-runtime builds.
Ping @psibi for broken persistent-redis build.
    @peti
    peti committed Dec 20, 2017
    Copy the full SHA
    acc6389 View commit details

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

    This update was generated by hackage2nix v2.7-5-g07d8814 from Hackage revision
commercialhaskell/all-cabal-hashes@4112e5c.
    @peti
    peti committed Dec 20, 2017
    Copy the full SHA
    e058744 View commit details

  3. liquidhaskell: drop obsolete override

    @peti
    peti committed Dec 20, 2017
    Copy the full SHA
    e4bb2a7 View commit details

  4. haskell-wai-secure-cookies: drop obsolete overrides

    @peti
    peti committed Dec 20, 2017
    Copy the full SHA
    15b9537 View commit details

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

    This update was generated by hackage2nix v2.7-5-g07d8814 from Hackage revision
commercialhaskell/all-cabal-hashes@4112e5c.
    @peti
    peti committed Dec 20, 2017
    Copy the full SHA
    211a1ee View commit details

  6. pointfree, taffybar: jailbreak

    @mdorman @peti
    mdorman authored and peti committed Dec 20, 2017
    Copy the full SHA
    8e6d563 View commit details
15 changes: 6 additions & 9 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -874,9 +874,6 @@ self: super: {
# https://github.com/danidiaz/tailfile-hinotify/issues/2
tailfile-hinotify = dontCheck super.tailfile-hinotify;

# build liquidhaskell with the proper (new) aeson version
liquidhaskell = super.liquidhaskell.override { aeson = dontCheck self.aeson_1_2_3_0; };

# Test suite fails: https://github.com/lymar/hastache/issues/46.
# Don't install internal mkReadme tool.
hastache = overrideCabal super.hastache (drv: {
@@ -924,12 +921,6 @@ self: super: {
# https://github.com/graknlabs/grakn-haskell/pull/1
grakn = dontCheck (doJailbreak super.grakn);

# cryptonite == 0.24.x, protolude == 0.2.x
wai-secure-cookies = super.wai-secure-cookies.override {
cryptonite = super.cryptonite_0_24;
protolude = super.protolude_0_2;
};

# test suite requires git and does a bunch of git operations
restless-git = dontCheck super.restless-git;

@@ -980,6 +971,12 @@ self: super: {
nix-derivation = doJailbreak super.nix-derivation;
graphviz = doJailbreak super.graphviz;

# Needs QuickCheck <2.10, HUnit <1.6 and base <4.10
pointfree = doJailbreak super.pointfree;

# Needs time<1.7
taffybar = doJailbreak super.taffybar;

# Needs tasty-quickcheck ==0.8.*, which we don't have.
cryptohash-sha256 = doJailbreak super.cryptohash-sha256;
cryptohash-sha1 = doJailbreak super.cryptohash-sha1;
Loading