haskellPackages.readline: fix Setup.hs to work with Cabal 3
See https://github.com/NixOS/nixpkgs/pull/111985/ for previous discussion
This commit is contained in:
parent
60b1048b91
commit
d3ec7e0c3d
|
@ -1458,6 +1458,10 @@ self: super: {
|
|||
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
|
||||
essence-of-live-coding-warp = doJailbreak (super.essence-of-live-coding-warp.override {
|
||||
http-client = self.http-client_0_7_8;
|
||||
|
|
|
@ -3898,7 +3898,6 @@ broken-packages:
|
|||
- read-bounded
|
||||
- read-ctags
|
||||
- read-io
|
||||
- readline
|
||||
- readme-lhs
|
||||
- readshp
|
||||
- really-simple-xml-parser
|
||||
|
|
|
@ -220115,8 +220115,6 @@ self: {
|
|||
librarySystemDepends = [ ncurses readline ];
|
||||
description = "An interface to the GNU readline library";
|
||||
license = "GPL";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
}) {inherit (pkgs) ncurses; inherit (pkgs) readline;};
|
||||
|
||||
"readline-statevar" = callPackage
|
||||
|
|
|
@ -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
|
Loading…
Reference in a new issue