From 2aa6ee92a627fdd39fcf81d7ec6003015d192742 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 4 Jun 2022 13:11:26 +0200
Subject: [PATCH] glirc: 2.38 -> 2.39

---
 .../haskell-modules/configuration-common.nix  |  6 +--
 .../configuration-hackage2nix/main.yaml       |  4 --
 .../haskell-modules/hackage-packages.nix      | 51 -------------------
 3 files changed, 3 insertions(+), 58 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e7dceb87370d..b8c9e49a9526 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2485,9 +2485,9 @@ self: super: {
   ema = assert super.ema.version == "0.6.0.0";
     super.ema.overrideScope (self: super: { relude = doJailbreak self.relude_0_7_0_0; });
 
-  # attoparsec bump is on v2 branch, but not released yet
-  irc-core = assert super.irc-core.version == "2.10"; doJailbreak super.irc-core;
-  glirc = assert super.irc-core.version == "2.10"; doJailbreak super.glirc;
+  glirc = super.glirc.override {
+    vty = self.vty_5_35_1;
+  };
 
   # 2022-02-25: Unmaintained and to strict upper bounds
   paths = doJailbreak super.paths;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index dece67d927df..2ddf5c2a534f 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -87,10 +87,6 @@ default-package-overrides:
   - dhall-nix < 1.1.24
   # Temporarily forbid distribution-nixpkgs updates until cabal2nix supports the new version
   - distribution-nixpkgs < 1.7.0
-  # glirc 2.39 is broken: https://github.com/glguy/irc-core/issues/99
-  - glirc == 2.38
-  # glirc 2.38 requires hookup 0.6
-  - hookup == 0.6
 
 extra-packages:
   - aeson < 2                           # required by pantry-0.5.2
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f186a881ed3a..599b63b8d2da 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -111132,37 +111132,6 @@ self: {
      }) {};
 
   "glirc" = callPackage
-    ({ mkDerivation, async, attoparsec, base, base64-bytestring
-     , bytestring, Cabal, config-schema, config-value, containers
-     , directory, filepath, free, gitrev, hashable, hookup, HsOpenSSL
-     , HUnit, irc-core, kan-extensions, lens, network, process, psqueues
-     , random, regex-tdfa, split, stm, template-haskell, text, time
-     , transformers, unix, unordered-containers, vector, vty
-     }:
-     mkDerivation {
-       pname = "glirc";
-       version = "2.38";
-       sha256 = "1azykkb9rc4q97v9xiqfjv0iys0wswa3nsy10smdkpp7yvv4mca7";
-       revision = "2";
-       editedCabalFile = "082ndcgp9z1w5pa3s5ss7kqhg66y01lbj57k14zq6zs6c54s4b5i";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal filepath ];
-       libraryHaskellDepends = [
-         async attoparsec base base64-bytestring bytestring config-schema
-         config-value containers directory filepath free gitrev hashable
-         hookup HsOpenSSL irc-core kan-extensions lens network process
-         psqueues random regex-tdfa split stm template-haskell text time
-         transformers unix unordered-containers vector vty
-       ];
-       executableHaskellDepends = [ base lens text vty ];
-       testHaskellDepends = [ base HUnit ];
-       description = "Console IRC client";
-       license = lib.licenses.isc;
-       maintainers = with lib.maintainers; [ kiwi ];
-     }) {};
-
-  "glirc_2_39_0_1" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
      , bytestring, Cabal, config-schema, config-value, containers
      , curve25519, directory, filepath, free, githash, hashable, hookup
@@ -111189,7 +111158,6 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Console IRC client";
        license = lib.licenses.isc;
-       hydraPlatforms = lib.platforms.none;
        maintainers = with lib.maintainers; [ kiwi ];
      }) {};
 
@@ -138985,24 +138953,6 @@ self: {
      }) {};
 
   "hookup" = callPackage
-    ({ mkDerivation, async, attoparsec, base, bytestring, HsOpenSSL
-     , HsOpenSSL-x509-system, network, stm
-     }:
-     mkDerivation {
-       pname = "hookup";
-       version = "0.6";
-       sha256 = "09rhsq0j2m1j87qsbsd3l1q3dv2zs4wrhcz2jhn4a6dx273w5528";
-       revision = "1";
-       editedCabalFile = "0dm7i3g8hlrg0rzfhfcryypgqlil2p8ny12bn49yir2b1qfd47dc";
-       libraryHaskellDepends = [
-         async attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system
-         network stm
-       ];
-       description = "Abstraction over creating network connections with SOCKS5 and TLS";
-       license = lib.licenses.isc;
-     }) {};
-
-  "hookup_0_7" = callPackage
     ({ mkDerivation, async, attoparsec, base, bytestring, HsOpenSSL
      , HsOpenSSL-x509-system, network, stm
      }:
@@ -139016,7 +138966,6 @@ self: {
        ];
        description = "Abstraction over creating network connections with SOCKS5 and TLS";
        license = lib.licenses.isc;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hoop" = callPackage