From 8c4730c433ba01cb17aab2917d495d055c4f468e Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 28 May 2023 20:58:20 +0200 Subject: chore(users/Profpatsch/*): more cabal maintenance Change-Id: Ib1714abce2815873eb50dbeac088e812fa9098ab Reviewed-on: https://cl.tvl.fyi/c/depot/+/8686 Tested-by: BuildkiteCI Reviewed-by: Profpatsch Autosubmit: Profpatsch --- users/Profpatsch/mailbox-org/AesonQQ.hs | 2 +- users/Profpatsch/mailbox-org/MailboxOrg.hs | 5 +++-- users/Profpatsch/mailbox-org/default.nix | 2 ++ users/Profpatsch/mailbox-org/mailbox-org.cabal | 4 +++- 4 files changed, 9 insertions(+), 4 deletions(-) (limited to 'users/Profpatsch/mailbox-org') diff --git a/users/Profpatsch/mailbox-org/AesonQQ.hs b/users/Profpatsch/mailbox-org/AesonQQ.hs index 02e1c2f3dff0..f12afdf51584 100644 --- a/users/Profpatsch/mailbox-org/AesonQQ.hs +++ b/users/Profpatsch/mailbox-org/AesonQQ.hs @@ -4,7 +4,7 @@ module AesonQQ where import Data.Aeson qualified as Json import Data.Either qualified as Either -import MyPrelude +import PossehlAnalyticsPrelude import PyF qualified import PyF.Internal.QQ qualified as PyFConf diff --git a/users/Profpatsch/mailbox-org/MailboxOrg.hs b/users/Profpatsch/mailbox-org/MailboxOrg.hs index 5e062979543b..c66db49c13c7 100644 --- a/users/Profpatsch/mailbox-org/MailboxOrg.hs +++ b/users/Profpatsch/mailbox-org/MailboxOrg.hs @@ -6,6 +6,7 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE OverloadedRecordDot #-} {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE PackageImports #-} {-# LANGUAGE QuasiQuotes #-} {-# LANGUAGE RecordWildCards #-} {-# LANGUAGE NoFieldSelectors #-} @@ -24,7 +25,7 @@ import Data.Aeson.KeyMap qualified as KeyMap import Data.ByteString qualified as ByteString import Data.ByteString.Lazy qualified as Lazy import Data.Char qualified as Char -import Data.Error.Tree +import "pa-error-tree" Data.Error.Tree import Data.Functor.Compose import Data.List qualified as List import Data.Map.Strict qualified as Map @@ -32,11 +33,11 @@ import Data.Text qualified as Text import ExecHelpers import GHC.Records (HasField (..)) import Label -import MyPrelude import Netencode qualified import Netencode.Parse qualified as NetParse import Network.HTTP.Conduit qualified as Client import Network.HTTP.Simple qualified as Client +import PossehlAnalyticsPrelude import Pretty import System.Directory qualified as File import System.Environment qualified as Env diff --git a/users/Profpatsch/mailbox-org/default.nix b/users/Profpatsch/mailbox-org/default.nix index 0387c7b12de3..2cb4c7af8e6c 100644 --- a/users/Profpatsch/mailbox-org/default.nix +++ b/users/Profpatsch/mailbox-org/default.nix @@ -16,6 +16,8 @@ let depot.users.Profpatsch.execline.exec-helpers-hs depot.users.Profpatsch.arglib.netencode.haskell pkgs.haskellPackages.pa-prelude + pkgs.haskellPackages.pa-label + pkgs.haskellPackages.pa-error-tree pkgs.haskellPackages.aeson pkgs.haskellPackages.http-conduit pkgs.haskellPackages.aeson-better-errors diff --git a/users/Profpatsch/mailbox-org/mailbox-org.cabal b/users/Profpatsch/mailbox-org/mailbox-org.cabal index c4b04ce66de2..8125baef7144 100644 --- a/users/Profpatsch/mailbox-org/mailbox-org.cabal +++ b/users/Profpatsch/mailbox-org/mailbox-org.cabal @@ -1,4 +1,4 @@ -cabal-version: 2.4 +cabal-version: 3.0 name: mailbox-org version: 0.1.0.0 author: Profpatsch @@ -10,7 +10,9 @@ executable mailbox-org build-depends: base >=4.15 && <5, my-prelude, + pa-prelude, pa-label, + pa-error-tree, exec-helpers, netencode, text, -- cgit 1.4.1