From 13c72a9a82a96751c185c653208cb13fa84f53bc Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Mon, 7 Jun 2021 18:54:53 +0200
Subject: [PATCH] haskellPackages.dhall-{nix,openapi}: pin to support dhall
 1.38.*

---
 .../configuration-hackage2nix/main.yaml       |  3 ++
 .../haskell-modules/hackage-packages.nix      | 51 +++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 6f3808103063..02739f83c4ea 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -93,6 +93,9 @@ default-package-overrides:
   - futhark < 0.19.5
   # 2021-06-05: remove once pandoc 2.14 is in stackage
   - pandoc-crossref < 0.3.11.0
+  # 2021-06-07: stackage still has dhall < 1.39
+  - dhall-nix < 1.1.21
+  - dhall-openapi < 1.0.1
 
 extra-packages:
   - base16-bytestring < 1               # required for cabal-install etc.
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d7aa37d59c80..b9cc0d00004f 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -74058,6 +74058,30 @@ self: {
      }) {};
 
   "dhall-nix" = callPackage
+    ({ mkDerivation, base, containers, data-fix, dhall, hnix
+     , lens-family-core, neat-interpolation, optparse-generic, text
+     }:
+     mkDerivation {
+       pname = "dhall-nix";
+       version = "1.1.20";
+       sha256 = "14d9icvgmrphnbjjwlskh88p7vgphgb0xqd91p217bf2xhl9k2xd";
+       revision = "2";
+       editedCabalFile = "1w90jrkzmbv5nasafkkv0kyfmnqkngldx2lr891113h2mqbbr3wx";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers data-fix dhall hnix lens-family-core
+         neat-interpolation text
+       ];
+       executableHaskellDepends = [
+         base dhall hnix optparse-generic text
+       ];
+       description = "Dhall to Nix compiler";
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ Gabriel439 ];
+     }) {};
+
+  "dhall-nix_1_1_21" = callPackage
     ({ mkDerivation, base, containers, data-fix, dhall, hnix
      , lens-family-core, neat-interpolation, optparse-generic, text
      }:
@@ -74076,6 +74100,7 @@ self: {
        ];
        description = "Dhall to Nix compiler";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        maintainers = with lib.maintainers; [ Gabriel439 ];
      }) {};
 
@@ -74102,6 +74127,31 @@ self: {
      }) {};
 
   "dhall-openapi" = callPackage
+    ({ mkDerivation, aeson, base, containers, dhall, directory
+     , filepath, megaparsec, optparse-applicative, parser-combinators
+     , prettyprinter, scientific, sort, text, vector
+     }:
+     mkDerivation {
+       pname = "dhall-openapi";
+       version = "1.0.0";
+       sha256 = "1dg1hj8yfm08bzzirzg6cq26vkxv6i86rrf96a73pb1hpz3jjq7j";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base containers dhall prettyprinter scientific sort text
+         vector
+       ];
+       executableHaskellDepends = [
+         aeson base containers dhall directory filepath megaparsec
+         optparse-applicative parser-combinators prettyprinter sort text
+         vector
+       ];
+       description = "Convert an OpenAPI specification to a Dhall package";
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ Gabriel439 ];
+     }) {};
+
+  "dhall-openapi_1_0_1" = callPackage
     ({ mkDerivation, aeson, base, containers, dhall, directory
      , filepath, megaparsec, optparse-applicative, parser-combinators
      , prettyprinter, scientific, sort, text, vector
@@ -74123,6 +74173,7 @@ self: {
        ];
        description = "Convert an OpenAPI specification to a Dhall package";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        maintainers = with lib.maintainers; [ Gabriel439 ];
      }) {};