From 1cd8f3569f4a264fb506ffccd373aba983b112e1 Mon Sep 17 00:00:00 2001 From: Eric Mertens Date: Wed, 20 Sep 2023 10:44:13 -0700 Subject: [PATCH] version bumps --- Setup.hs | 6 ++++-- bot/irc-core-bot.cabal | 4 ++-- config-schema | 2 +- config-value | 2 +- hookup/hookup.cabal | 2 +- lib/irc-core.cabal | 4 ++-- src/Client/Commands/Queries.hs | 2 +- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Setup.hs b/Setup.hs index 5c126020..86125011 100644 --- a/Setup.hs +++ b/Setup.hs @@ -9,7 +9,7 @@ This is a default setup script except that it checks that all transitive dependencies of this package use free licenses and generates a Build module detailing the versions of build tools and transitive library dependencies. - + -} module Main (main) where @@ -98,10 +98,12 @@ validateLicenses :: validateLicenses pkgs = do let toLicense = either licenseFromSPDX id isBad pkg = toLicense (license pkg) `notElem` freeLicenses + && pkgName (sourcePackageId pkg) `notElem` exemptions badPkgs = filter isBad pkgs + exemptions = [mkPackageName "system-cxx-std-lib"] unless (null badPkgs) $ - do mapM_ print [ toLicense (license pkg) | pkg <- badPkgs ] + do mapM_ print [ (sourcePackageId pkg, toLicense (license pkg)) | pkg <- badPkgs ] fail "BAD LICENSE" diff --git a/bot/irc-core-bot.cabal b/bot/irc-core-bot.cabal index b0a1937d..f1a35364 100644 --- a/bot/irc-core-bot.cabal +++ b/bot/irc-core-bot.cabal @@ -29,9 +29,9 @@ executable irc-core-bot build-depends: base >=4.9 && <4.19, - bytestring >=0.10 && <0.12, + bytestring >=0.10 && <0.13, hookup ^>=0.8, irc-core ^>=2.11, random >=1.1 && <1.3, - text >=1.2 && <2.1, + text >=1.2 && <2.2, containers ^>=0.6, diff --git a/config-schema b/config-schema index 5fd16a0d..a1664dad 160000 --- a/config-schema +++ b/config-schema @@ -1 +1 @@ -Subproject commit 5fd16a0d6e74422ff3d92f2dc7a9f1a3a379177f +Subproject commit a1664dad1a006561f966bfe694863974dac0163c diff --git a/config-value b/config-value index 9a6329c2..3c263689 160000 --- a/config-value +++ b/config-value @@ -1 +1 @@ -Subproject commit 9a6329c2d1ea78df06a378de4e04b7c393117d5f +Subproject commit 3c263689c2ed21aedd311a74eb99baa58f62873a diff --git a/hookup/hookup.cabal b/hookup/hookup.cabal index b733a0d1..c2eb415d 100644 --- a/hookup/hookup.cabal +++ b/hookup/hookup.cabal @@ -41,7 +41,7 @@ library async ^>=2.2, stm ^>=2.5, network >=3.0 && <3.2, - bytestring >=0.10 && <0.12, + bytestring >=0.10 && <0.13, attoparsec ^>=0.14, HsOpenSSL >=0.11.2.3 && <0.12, HsOpenSSL-x509-system >=0.1 && <0.2, diff --git a/lib/irc-core.cabal b/lib/irc-core.cabal index acce9da4..9d880c09 100644 --- a/lib/irc-core.cabal +++ b/lib/irc-core.cabal @@ -36,10 +36,10 @@ library build-depends: base >=4.11 && <4.19, base64-bytestring >= 1.0.0.1 && <1.3, attoparsec ^>=0.14, - bytestring >=0.10 && <0.12, + bytestring >=0.10 && <0.13, hashable >=1.2 && <1.5, primitive >=0.6 && <0.9, - text >=1.2 && <2.1, + text >=1.2 && <2.2, time >=1.6 && <1.13, vector >=0.11 && <0.14 diff --git a/src/Client/Commands/Queries.hs b/src/Client/Commands/Queries.hs index f809caa7..cc738dfd 100644 --- a/src/Client/Commands/Queries.hs +++ b/src/Client/Commands/Queries.hs @@ -263,7 +263,7 @@ cmdWho cs st (Just (query, arg)) = let query' = Text.pack query let arg' = fromMaybe "" arg let cs' = set csWhoReply (newWhoReply query' arg') cs - sendMsg cs (ircWho (query' : (maybeToList $ Text.pack <$> arg))) + sendMsg cs (ircWho (query' : maybeToList (Text.pack <$> arg))) commandSuccessUpdateCS cs' (changeSubfocus FocusWho st) cmdWhowas :: NetworkCommand String