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

move shelly 1.8.1 from configuration-ghc-8.6.x.nix to configuration-hackage2nix.yaml

Browse Source
This commit is contained in:
Dhruv Dang 2020-08-24 10:29:58 -07:00
parent 3369b35031
commit 871e0ddca7
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
View File

@ -94,12 +94,4 @@ self: super: {
# Only 0.6 is compatible with ghc 8.6 https://hackage.haskell.org/package/apply-refact/changelog # 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; 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";
}) {};
} }

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

@ -64,7 +64,7 @@ core-packages:
# #
# WARNING: This list is generated semiautomatically based on the most recent # 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 # 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. # lost the next time `update-stackage.sh` runs.
default-package-overrides: default-package-overrides:
# This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag # 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 # gi-gdkx11-4.x requires gtk-4.x, which is still under development and
# not yet available in Nixpkgs # not yet available in Nixpkgs
- gi-gdkx11 < 4 - gi-gdkx11 < 4
- shelly ==1.8.1
# LTS Haskell 16.10 # LTS Haskell 16.10
- abstract-deque ==0.3 - abstract-deque ==0.3
- abstract-par ==0.3.3 - abstract-par ==0.3.3