From a5f7608182e6d63e2a97d54230e49784de3be075 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Mon, 14 Jun 2021 23:05:21 +0200
Subject: [PATCH] haskellPackages.dhall-{openapi,nix}: unrestrict

stackage has updated to dhall 1.39, so we can update these as well:

haskellPackages.dhall-openapi: 1.0.0 -> 1.0.1

haskellPackages.dhall-nix: 1.1.20 -> 1.1.21
---
 .../configuration-hackage2nix/main.yaml       |  3 --
 .../haskell-modules/hackage-packages.nix      | 51 -------------------
 2 files changed, 54 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 7c8ca8be75bf..56bd4ac4ab8e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -93,9 +93,6 @@ 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
   # 2021-06-14: hnix still needs old versions https://github.com/haskell-nix/hnix/issues/952
   - hnix-store-core < 0.5
   - hnix-store-remote < 0.5
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 724077d620fe..7fa16fc96e4a 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -73900,30 +73900,6 @@ 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
      }:
@@ -73942,7 +73918,6 @@ self: {
        ];
        description = "Dhall to Nix compiler";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
        maintainers = with lib.maintainers; [ Gabriel439 ];
      }) {};
 
@@ -73969,31 +73944,6 @@ 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
@@ -74015,7 +73965,6 @@ self: {
        ];
        description = "Convert an OpenAPI specification to a Dhall package";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
        maintainers = with lib.maintainers; [ Gabriel439 ];
      }) {};