picnoir/hnix
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update nixpkgs, use GHC 8.6.4

Browse source
This commit is contained in:
John Wiegley 2019-04-30 17:29:36 -07:00
parent 38219591d4
commit 646cc4adc7
No known key found for this signature in database
GPG key ID: C144D8F4F19FE630
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -15,7 +15,7 @@ env:
- secure: "dm6I+M4+V+C7QMTpcSADdKPE633SvmToXZrTbZ7miNDGmMN+/SfHeN2ybi1+PW6oViMlbPN/7J/aEfiGjSJI8vLk72Y4uCWGmpSb8TXZLu6+whnxtZzzW8+z4tsM4048QJg7CF3N/25U8thRFgs3DqUub1Sf3nG9LrNWdz6ZcDQ="
matrix:
- GHCVERSION=ghc863 STRICT=false TRACING=false
- GHCVERSION=ghc864 STRICT=false TRACING=false
# - GHCVERSION=ghcjs
#
# matrix:

11
default.nix
View file

@ -1,4 +1,4 @@
{ compiler ? "ghc863"
{ compiler ? "ghc864"
, doBenchmark ? false
, doTracing ? false
@ -6,10 +6,10 @@
, doProfiling ? false # enables profiling support in GHC
, doStrict ? false
, withHoogle ? false
, withHoogle ? true
, rev ? "120eab94e0981758a1c928ff81229cd802053158"
, sha256 ? "0qk6k8gxx5xlkyg05dljywj5wx5fvrc3dzp4v2h6ab83b7zwg813"
, rev ? "ed1b59a98e7bd61dd7eac266569c294fb6b16300"
, sha256 ? "0b2wdbbaqdqccl7q9gskhfjk7xaqvjwcls4b6218anyc247gscnb"
, pkgs ?
if builtins.compareVersions builtins.nixVersion "2.0" < 0
@ -57,7 +57,8 @@ let
mono-traversable = dontCheck super.mono-traversable;
these = doJailbreak super.these;
multistate = doJailbreak super.multistate;
multistate = doJailbreak (overrideCabal super.multistate (attrs: { broken = false; }));
butcher = doJailbreak (overrideCabal super.butcher (attrs: { broken = false; }));
brittany = doJailbreak (self.callCabal2nix "brittany"
(pkgs.fetchFromGitHub {