diff options
Diffstat (limited to 'users')
-rw-r--r-- | users/Profpatsch/cas-serve/cas-serve.cabal | 3 | ||||
-rw-r--r-- | users/Profpatsch/cas-serve/default.nix | 2 | ||||
-rw-r--r-- | users/Profpatsch/ical-smolify/default.nix | 11 | ||||
-rw-r--r-- | users/Profpatsch/my-prelude/src/MyPrelude.hs | 3 | ||||
-rw-r--r-- | users/Profpatsch/my-prelude/src/Postgres/MonadPostgres.hs | 1 | ||||
-rw-r--r-- | users/Profpatsch/whatcd-resolver/default.nix | 2 | ||||
-rw-r--r-- | users/Profpatsch/whatcd-resolver/whatcd-resolver.cabal | 4 |
7 files changed, 13 insertions, 13 deletions
diff --git a/users/Profpatsch/cas-serve/cas-serve.cabal b/users/Profpatsch/cas-serve/cas-serve.cabal index 82db1f5fd89a..d14776700a7c 100644 --- a/users/Profpatsch/cas-serve/cas-serve.cabal +++ b/users/Profpatsch/cas-serve/cas-serve.cabal @@ -65,10 +65,9 @@ executable cas-serve text, sqlite-simple, http-types, - ihp-hsx, wai, warp, mtl, bytestring, memory, - cryptonite, + crypton, diff --git a/users/Profpatsch/cas-serve/default.nix b/users/Profpatsch/cas-serve/default.nix index 1b4fbe03e78f..14c3e4aa13b4 100644 --- a/users/Profpatsch/cas-serve/default.nix +++ b/users/Profpatsch/cas-serve/default.nix @@ -15,7 +15,7 @@ let libraryHaskellDepends = [ pkgs.haskellPackages.pa-prelude pkgs.haskellPackages.pa-label - pkgs.haskellPackages.ihp-hsx + pkgs.haskellPackages.crypton pkgs.haskellPackages.wai pkgs.haskellPackages.warp pkgs.haskellPackages.sqlite-simple diff --git a/users/Profpatsch/ical-smolify/default.nix b/users/Profpatsch/ical-smolify/default.nix index f67d175ce3f3..bf766db0e974 100644 --- a/users/Profpatsch/ical-smolify/default.nix +++ b/users/Profpatsch/ical-smolify/default.nix @@ -1,7 +1,7 @@ { depot, pkgs, lib, ... }: let - cas-serve = pkgs.writers.writeHaskell "ical-smolify" + ical-smolify = pkgs.writers.writeHaskell "ical-smolify" { libraries = [ pkgs.haskellPackages.iCalendar @@ -13,4 +13,11 @@ let } ./IcalSmolify.hs; in -cas-serve + +ical-smolify.overrideAttrs (old: { + meta = lib.recursiveUpdate old.meta or { } { + # Dependency iCalendar no longer builds in nixpkgs due to a lack of maintenance upstream + # https://github.com/nixos/nixpkgs/commit/13d10cc6e302e7d5800c6a08c1728b14c3801e26 + ci.skip = true; + }; +}) diff --git a/users/Profpatsch/my-prelude/src/MyPrelude.hs b/users/Profpatsch/my-prelude/src/MyPrelude.hs index ffc03c5ecdde..880983c47e92 100644 --- a/users/Profpatsch/my-prelude/src/MyPrelude.hs +++ b/users/Profpatsch/my-prelude/src/MyPrelude.hs @@ -345,7 +345,8 @@ stringToText = Data.Text.pack -- -- ATTN: Don’t use `String` in code if you can avoid it, prefer `Text` instead. stringToBytesUtf8 :: String -> ByteString -stringToBytesUtf8 = GHC.utf8EncodeString +-- TODO(Profpatsch): use a stable interface +stringToBytesUtf8 = GHC.utf8EncodeByteString -- | Like `show`, but generate a 'Text' -- diff --git a/users/Profpatsch/my-prelude/src/Postgres/MonadPostgres.hs b/users/Profpatsch/my-prelude/src/Postgres/MonadPostgres.hs index 2585f6637c41..f83a6d7fcf51 100644 --- a/users/Profpatsch/my-prelude/src/Postgres/MonadPostgres.hs +++ b/users/Profpatsch/my-prelude/src/Postgres/MonadPostgres.hs @@ -8,7 +8,6 @@ module Postgres.MonadPostgres where import AtLeast (AtLeast) import Control.Exception import Control.Foldl qualified as Fold -import Control.Monad.Except import Control.Monad.Logger.CallStack (MonadLogger, logDebug, logWarn) import Control.Monad.Reader (MonadReader (ask), ReaderT (..)) import Control.Monad.Trans.Resource diff --git a/users/Profpatsch/whatcd-resolver/default.nix b/users/Profpatsch/whatcd-resolver/default.nix index 6d5d0834b1a7..27468507ac5a 100644 --- a/users/Profpatsch/whatcd-resolver/default.nix +++ b/users/Profpatsch/whatcd-resolver/default.nix @@ -31,7 +31,6 @@ let pkgs.haskellPackages.pa-run-command pkgs.haskellPackages.aeson-better-errors pkgs.haskellPackages.blaze-html - pkgs.haskellPackages.dlist pkgs.haskellPackages.hs-opentelemetry-sdk pkgs.haskellPackages.http-conduit pkgs.haskellPackages.http-types @@ -39,7 +38,6 @@ let pkgs.haskellPackages.monad-logger pkgs.haskellPackages.resource-pool pkgs.haskellPackages.postgresql-simple - pkgs.haskellPackages.selective pkgs.haskellPackages.tmp-postgres pkgs.haskellPackages.unliftio pkgs.haskellPackages.wai-extra diff --git a/users/Profpatsch/whatcd-resolver/whatcd-resolver.cabal b/users/Profpatsch/whatcd-resolver/whatcd-resolver.cabal index cad1fabe9905..a9bd04827b83 100644 --- a/users/Profpatsch/whatcd-resolver/whatcd-resolver.cabal +++ b/users/Profpatsch/whatcd-resolver/whatcd-resolver.cabal @@ -86,13 +86,11 @@ library aeson-better-errors, aeson, blaze-html, - blaze-markup, bytestring, case-insensitive, containers, unordered-containers, directory, - dlist, exceptions, filepath, hs-opentelemetry-sdk, @@ -107,8 +105,6 @@ library resource-pool, postgresql-simple, punycode, - scientific, - selective, tmp-postgres, unliftio, wai-extra, |