summary refs log tree commit diff
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2022-12-29 13:34:48 +0100
committersternenseemann <sternenseemann@systemli.org>2022-12-29 13:35:15 +0100
commitfb32148a96e64be4b11000770ea1e9e83966b572 (patch)
treed0fb17377d429ba9c56ad6f63fc3fd5355356260
parentcdfe559a688ac55c5b7351f327edc7cf63edadb5 (diff)
downloadnixpkgs-fb32148a96e64be4b11000770ea1e9e83966b572.tar
nixpkgs-fb32148a96e64be4b11000770ea1e9e83966b572.tar.gz
nixpkgs-fb32148a96e64be4b11000770ea1e9e83966b572.tar.bz2
nixpkgs-fb32148a96e64be4b11000770ea1e9e83966b572.tar.lz
nixpkgs-fb32148a96e64be4b11000770ea1e9e83966b572.tar.xz
nixpkgs-fb32148a96e64be4b11000770ea1e9e83966b572.tar.zst
nixpkgs-fb32148a96e64be4b11000770ea1e9e83966b572.zip
carp: patch for GHC 9.2 and Stackage LTS-20
-rw-r--r--pkgs/development/compilers/carp/default.nix16
1 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/development/compilers/carp/default.nix
index 1c7408f3a17..5abb9b3fe64 100644
--- a/pkgs/development/compilers/carp/default.nix
+++ b/pkgs/development/compilers/carp/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, makeWrapper, clang, haskellPackages }:
+{ lib, fetchFromGitHub, fetchpatch, makeWrapper, clang, haskellPackages }:
 
 haskellPackages.mkDerivation rec {
   pname = "carp";
@@ -11,6 +11,16 @@ haskellPackages.mkDerivation rec {
     sha256 = "sha256-B7SBzjegFzL2gGivIJE6BZcLD3f0Bsh8yndjScG2TZI=";
   };
 
+  patches = [
+    # Compat with GHC 9.2 / Stackage LTS 20, can be dropped at the next release
+    # https://github.com/carp-lang/Carp/pull/1449
+    (fetchpatch {
+      name = "carp-lts-20.patch";
+      url = "https://github.com/carp-lang/Carp/commit/25f50c92a57cc91b6cb4ec48df658439f936b641.patch";
+      sha256 = "14yjv0hcvw1qyjmrhksrj6chac3n14d1f1gcaxldfa05llrbfqk0";
+    })
+  ];
+
   # -Werror breaks build with GHC >= 9.0
   # https://github.com/carp-lang/Carp/issues/1386
   postPatch = ''
@@ -49,8 +59,4 @@ haskellPackages.mkDerivation rec {
 
   # Windows not (yet) supported.
   platforms   = with lib.platforms; unix ++ darwin;
-
-  # doesn't build on ghc92
-  hydraPlatforms = lib.platforms.none;
-  broken = true;
 }