Merge pull request #33271 from LumiGuide/ghc802-inline-c

haskell: configuration-ghc-8.0.x.nix: keep inline-c at 0.5.6.1

3 files changed, 45 insertions, 0 deletions

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index 30ecbe92f16c..804da79f5689 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -65,4 +65,7 @@ self: super: {
   # Add appropriate Cabal library to build this code.
   stack = addSetupDepend super.stack self.Cabal_2_0_1_1;
 
+  # inline-c > 0.5.6.0 requires template-haskell >= 2.12
+  inline-c = super.inline-c_0_5_6_1;
+  inline-c-cpp = super.inline-c-cpp_0_1_0_0;
 }
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 573d256f42cd..97d6d9960e09 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2689,6 +2689,8 @@ extra-packages:
   - haskell-gi-overloading == 0.0       # gi-* packages use this dependency to disable overloading support
   - haskell-src-exts == 1.19.*          # required by hindent and structured-haskell-mode
   - hpack == 0.20.*                     # required by stack-1.6.1
+  - inline-c < 0.6                      # required on GHC 8.0.x
+  - inline-c-cpp < 0.2                  # required on GHC 8.0.x
   - language-c == 0.7.0                 # required by c2hs hack to work around https://github.com/haskell/c2hs/issues/192.
   - mtl < 2.2                           # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
   - mtl-prelude < 2                     # required for to build postgrest on mtl 2.1.x platforms
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 3094d3bbc87d..01fba37bee8d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -113458,6 +113458,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "inline-c_0_5_6_1" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring
+     , containers, cryptohash, directory, filepath, gsl, gslcblas
+     , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq
+     , regex-posix, stdenv, template-haskell, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "inline-c";
+       version = "0.5.6.1";
+       sha256 = "0kpbwrri9idllwd7gfamghrdrz16zqjphmb3cp5nq160dxz73brd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-wl-pprint base binary bytestring containers cryptohash
+         directory filepath hashable mtl parsec parsers QuickCheck
+         template-haskell transformers unordered-containers vector
+       ];
+       executableSystemDepends = [ gsl gslcblas ];
+       testHaskellDepends = [
+         ansi-wl-pprint base containers hashable hspec parsers QuickCheck
+         raw-strings-qq regex-posix template-haskell transformers
+         unordered-containers vector
+       ];
+       description = "Write Haskell source files including C code inline. No FFI required.";
+       license = stdenv.lib.licenses.mit;
+     }) {inherit (pkgs) gsl; gslcblas = null;};
+
   "inline-c" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers, gsl
      , gslcblas, hashable, hspec, mtl, parsec, parsers, QuickCheck
@@ -113484,6 +113512,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) gsl; gslcblas = null;};
 
+  "inline-c-cpp_0_1_0_0" = callPackage
+    ({ mkDerivation, base, inline-c, stdenv, template-haskell }:
+     mkDerivation {
+       pname = "inline-c-cpp";
+       version = "0.1.0.0";
+       sha256 = "0iba77p2ncxbg5sb4ks8f3lgp6zdnjhzvrr2ap3yg49is5b9f5rf";
+       libraryHaskellDepends = [ base inline-c template-haskell ];
+       testHaskellDepends = [ base ];
+       description = "Lets you embed C++ code into Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "inline-c-cpp" = callPackage
     ({ mkDerivation, base, hspec, inline-c, safe-exceptions
      , template-haskell