glirc: unbreak via downgrade to 2.38

glirc 2.39 does not compile against any set of released packages and is
unlikely to be fixed without a subsequent release
(https://github.com/glguy/irc-core/issues/99).

4 files changed, 54 insertions, 3 deletions

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8adc4a39eea..df2574f0395 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2513,7 +2513,6 @@ self: super: {
   # 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;
-  hookup = assert super.irc-core.version == "2.10"; doJailbreak super.hookup;
 
   # 2022-02-25: Unmaintained and to strict upper bounds
   paths = doJailbreak super.paths;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index 833ae06e250..fb99b68d2cd 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -1744,7 +1744,6 @@ broken-packages:
   - gli
   - glicko
   - glider-nlp
-  - glirc
   - GLMatrix
   - global-variables
   - glob-posix
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 15d16ff2307..84d308d40be 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -87,6 +87,10 @@ 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 61a3763d6b1..0ac574f1105 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -111057,6 +111057,37 @@ 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" = callPackage
+    ({ mkDerivation, async, attoparsec, base, base64-bytestring
+     , bytestring, Cabal, config-schema, config-value, containers
      , curve25519, directory, filepath, free, githash, hashable, hookup
      , HsOpenSSL, HUnit, irc-core, kan-extensions, lens, network
      , process, psqueues, random, regex-tdfa, split, stm
@@ -111083,7 +111114,6 @@ self: {
        license = lib.licenses.isc;
        hydraPlatforms = lib.platforms.none;
        maintainers = with lib.maintainers; [ kiwi ];
-       broken = true;
      }) {};
 
   "gll" = callPackage
@@ -138804,6 +138834,24 @@ self: {
      }:
      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
+     }:
+     mkDerivation {
+       pname = "hookup";
        version = "0.7";
        sha256 = "02prkwj4rj8g330z17bpjh7hpwfdvasaxsk74mcvbi03gjpydrib";
        libraryHaskellDepends = [
@@ -138812,6 +138860,7 @@ self: {
        ];
        description = "Abstraction over creating network connections with SOCKS5 and TLS";
        license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hoop" = callPackage