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

haskellPackages.readline: fix Setup.hs to work with Cabal 3

Browse Source 
See https://github.com/NixOS/nixpkgs/pull/111985/ for previous discussion

(cherry picked from commit b950ecaf3a49662ba92e6c978aa472155eddd47f)
This commit is contained in:
Samuel Rivas 2021-08-14 09:59:29 +02:00 committed by sterni
parent 5d89a1188e
commit b3743e6325
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1583,6 +1583,10 @@ self: super: {
addBuildDepend (unmarkBroken super.hercules-ci-cli) super.hercules-ci-optparse-applicative addBuildDepend (unmarkBroken super.hercules-ci-cli) super.hercules-ci-optparse-applicative
); );
# Readline uses Distribution.Simple from Cabal 2, in a way that is not
# compatible with Cabal 3. No upstream repository found so far
readline = appendPatch super.readline ./patches/readline-fix-for-cabal-3.patch;
# 2020-12-05: http-client is fixed on too old version # 2020-12-05: http-client is fixed on too old version
essence-of-live-coding-warp = doJailbreak (super.essence-of-live-coding-warp.override { essence-of-live-coding-warp = doJailbreak (super.essence-of-live-coding-warp.override {
http-client = self.http-client_0_7_8; http-client = self.http-client_0_7_8;

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

@ -3772,7 +3772,6 @@ broken-packages:
- read-bounded - read-bounded
- read-ctags - read-ctags
- read-io - read-io
- readline
- readme-lhs - readme-lhs
- readshp - readshp
- really-simple-xml-parser - really-simple-xml-parser

2
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -216709,8 +216709,6 @@ self: {
librarySystemDepends = [ ncurses readline ]; librarySystemDepends = [ ncurses readline ];
description = "An interface to the GNU readline library"; description = "An interface to the GNU readline library";
license = "GPL"; license = "GPL";
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) ncurses; inherit (pkgs) readline;}; }) {inherit (pkgs) ncurses; inherit (pkgs) readline;};
"readline-statevar" = callPackage "readline-statevar" = callPackage

8
pkgs/development/haskell-modules/patches/readline-fix-for-cabal-3.patch Normal file
View File

@ -0,0 +1,8 @@
--- a/Setup.hs 2021-02-04 14:01:09.557970245 +0100
+++ b/Setup.hs 2021-02-04 14:07:45.047443753 +0100
@@ -3,4 +3,4 @@
import Distribution.Simple
main :: IO ()
-main = defaultMainWithHooks defaultUserHooks
+main = defaultMainWithHooks autoconfUserHooks