public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

multi-ghc-travis: update to current Git master

Browse Source
This commit is contained in:
Peter Simons 2018-02-13 10:57:40 +01:00
parent 4b39930ee6
commit afb83e0e03
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -950,7 +950,7 @@ self: super: {
ChasingBottoms = dontCheck super.ChasingBottoms; ChasingBottoms = dontCheck super.ChasingBottoms;
# Add support for https://github.com/haskell-hvr/multi-ghc-travis. # Add support for https://github.com/haskell-hvr/multi-ghc-travis.
multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis { ShellCheck = self.ShellCheck_0_4_6; }; multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis {};
# https://github.com/yesodweb/Shelly.hs/issues/162 # https://github.com/yesodweb/Shelly.hs/issues/162
shelly = dontCheck super.shelly; shelly = dontCheck super.shelly;

1
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -2706,7 +2706,6 @@ extra-packages:
- QuickCheck < 2 # required by test-framework-quickcheck and its users - QuickCheck < 2 # required by test-framework-quickcheck and its users
- seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
- seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
- ShellCheck == 0.4.6 # required by multi-ghc-travis
- split < 0.2 # newer versions don't work with GHC 6.12.3 - split < 0.2 # newer versions don't work with GHC 6.12.3
- tar < 0.4.2.0 # later versions don't work with GHC < 7.6.x - tar < 0.4.2.0 # later versions don't work with GHC < 7.6.x
- transformers == 0.4.3.* # the latest version isn't supported by mtl yet - transformers == 0.4.3.* # the latest version isn't supported by mtl yet

4
pkgs/development/tools/haskell/multi-ghc-travis/default.nix
View File

@ -8,8 +8,8 @@ mkDerivation {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hvr"; owner = "hvr";
repo = "multi-ghc-travis"; repo = "multi-ghc-travis";
rev = "0d1b4089f6829659149747c9551712d24fd0b124"; rev = "612a29439ba61b01efb98ea6d36b7ffd987dc5a0";
sha256 = "00dbg8hbncv74c2baskyhg4h0yv8wrz0fnkvw2bzcn0cjrz7xqwr"; sha256 = "0q416rzzwipbnvslhwmm43w38dwma3lks12fghb0svcwj5lzgxsf";
}; };
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;