From 871e0ddca7841e5ec2b7f34ee23893da40c3f3c4 Mon Sep 17 00:00:00 2001 From: Dhruv Dang Date: Mon, 24 Aug 2020 10:29:58 -0700 Subject: [PATCH] move shelly 1.8.1 from configuration-ghc-8.6.x.nix to configuration-hackage2nix.yaml --- .../haskell-modules/configuration-ghc-8.6.x.nix | 8 -------- .../haskell-modules/configuration-hackage2nix.yaml | 3 ++- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index f68eec94200..339fda5d6fb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -94,12 +94,4 @@ self: super: { # Only 0.6 is compatible with ghc 8.6 https://hackage.haskell.org/package/apply-refact/changelog apply-refact = super.apply-refact_0_6_0_0; - - # ghcjs 8.6.x relies on shelly < 1.9.0 (default is 1.9.0 in current package set, adding 1.8.1). - shelly_1_8_1 = super.callCabal2nix "shelly" (pkgs.fetchFromGitHub { - owner = "gregwebs"; - repo = "Shelly.hs"; - rev = "d0a185c7dee96820fc3652e7603d81a28276d76c"; - sha256 = "173msjlq6yxpvd3900ajmd8znyg9kfg5csbxbiz4m7hvxkg8kbkn"; - }) {}; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index a9b0b88eaef..86f0e8e640e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -64,7 +64,7 @@ core-packages: # # WARNING: This list is generated semiautomatically based on the most recent # LTS package set. If you want to add entries to it, you must do so before the -# comment saying "# LTS Haskell x.y". Any changes after that commend will be +# comment saying "# LTS Haskell x.y". Any changes after that comment will be # lost the next time `update-stackage.sh` runs. default-package-overrides: # This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag @@ -72,6 +72,7 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 + - shelly ==1.8.1 # LTS Haskell 16.10 - abstract-deque ==0.3 - abstract-par ==0.3.3