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).
This commit is contained in:
Alexander Foremny
2022-05-31 12:49:00 +02:00
parent 5250c9bcbc
commit 0bbe2a7fc9
4 changed files with 54 additions and 3 deletions

View File

@@ -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;

View File

@@ -1744,7 +1744,6 @@ broken-packages:
- gli
- glicko
- glider-nlp
- glirc
- GLMatrix
- global-variables
- glob-posix

View File

@@ -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

View File

@@ -111055,6 +111055,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
@@ -111083,7 +111114,6 @@ self: {
license = lib.licenses.isc;
hydraPlatforms = lib.platforms.none;
maintainers = with lib.maintainers; [ kiwi ];
broken = true;
}) {};
"gll" = callPackage
@@ -138799,6 +138829,24 @@ 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
}:
@@ -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