mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 00:12:56 +00:00
pakcs: build on ghc9
This commit is contained in:
parent
efbd62e79f
commit
5bf4123d0d
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, makeWrapper
|
||||
{ lib, stdenv, fetchurl, fetchpatch2, makeWrapper
|
||||
, haskellPackages, haskell
|
||||
, which, swi-prolog, rlwrap, tk
|
||||
, curl, git, unzip, gnutar, coreutils, sqlite }:
|
||||
@ -16,10 +16,21 @@ let
|
||||
|
||||
curry-frontend = (haskellPackages.override {
|
||||
overrides = self: super: {
|
||||
curry-frontend = haskell.lib.compose.overrideCabal (drv: {
|
||||
inherit src;
|
||||
postUnpack = "sourceRoot+=/frontend";
|
||||
}) (super.callPackage ./curry-frontend.nix { });
|
||||
curry-frontend = lib.pipe (super.callPackage ./curry-frontend.nix { })
|
||||
[ haskell.lib.doJailbreak
|
||||
(haskell.lib.compose.overrideCabal (drv: {
|
||||
inherit src;
|
||||
postUnpack = "sourceRoot+=/frontend";
|
||||
}))
|
||||
(haskell.lib.compose.appendPatch
|
||||
# mtl 2.3 compatibility has been fixed upstream but it's not in
|
||||
# the release yet
|
||||
(fetchpatch2 {
|
||||
name = "fix-mtl-2.3.patch";
|
||||
url = "https://git.ps.informatik.uni-kiel.de/curry/curry-frontend/-/commit/3b26d2826141fee676da07939c2929a049279b70.diff";
|
||||
hash = "sha256-R3XjoUzAwTvDoUEAIIjmrSh2r4RHMqe00RMIs+7jFPY=";
|
||||
}))
|
||||
];
|
||||
};
|
||||
}).curry-frontend;
|
||||
|
||||
|
@ -10995,11 +10995,7 @@ with pkgs;
|
||||
|
||||
paho-mqtt-c = callPackage ../development/libraries/paho-mqtt-c { };
|
||||
|
||||
pakcs = callPackage ../development/compilers/pakcs {
|
||||
# Doesn't compile with GHC 9.0 due to whitespace syntax changes
|
||||
# see also https://github.com/NixOS/nixpkgs/issues/166108
|
||||
haskellPackages = haskell.packages.ghc810;
|
||||
};
|
||||
pakcs = callPackage ../development/compilers/pakcs { };
|
||||
|
||||
pal = callPackage ../tools/misc/pal { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user