diff options
| author | Peter Simons <simons@cryp.to> | 2018-02-13 10:57:40 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2018-02-13 10:57:40 +0100 |
| commit | afb83e0e0380abea2b97a21e25b3003ee5fce33e (patch) | |
| tree | 742493f76dfc5339237852994744a85d8a12141b /pkgs | |
| parent | 4b39930ee6b1a75bbb91ec2cb929e2c112a2daa6 (diff) | |
| download | nixlib-afb83e0e0380abea2b97a21e25b3003ee5fce33e.tar nixlib-afb83e0e0380abea2b97a21e25b3003ee5fce33e.tar.gz nixlib-afb83e0e0380abea2b97a21e25b3003ee5fce33e.tar.bz2 nixlib-afb83e0e0380abea2b97a21e25b3003ee5fce33e.tar.lz nixlib-afb83e0e0380abea2b97a21e25b3003ee5fce33e.tar.xz nixlib-afb83e0e0380abea2b97a21e25b3003ee5fce33e.tar.zst nixlib-afb83e0e0380abea2b97a21e25b3003ee5fce33e.zip | |
multi-ghc-travis: update to current Git master
Diffstat (limited to 'pkgs')
3 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c242f65b2b16..3b36c6d6318d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -950,7 +950,7 @@ self: super: { ChasingBottoms = dontCheck super.ChasingBottoms; # 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 shelly = dontCheck super.shelly; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 654bcb7c155f..02286e7762ae 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2706,7 +2706,6 @@ extra-packages: - 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-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 - 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 diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index c21d5595708a..ae78774f8f38 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -8,8 +8,8 @@ mkDerivation { src = fetchFromGitHub { owner = "hvr"; repo = "multi-ghc-travis"; - rev = "0d1b4089f6829659149747c9551712d24fd0b124"; - sha256 = "00dbg8hbncv74c2baskyhg4h0yv8wrz0fnkvw2bzcn0cjrz7xqwr"; + rev = "612a29439ba61b01efb98ea6d36b7ffd987dc5a0"; + sha256 = "0q416rzzwipbnvslhwmm43w38dwma3lks12fghb0svcwj5lzgxsf"; }; isLibrary = true; isExecutable = true; |