From d71c6f8c5955e8a9861e3f3957b293a369aac954 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Fri, 3 May 2024 22:34:10 -0400 Subject: Switch to nixpkgs-23.11, ghc 9.6.3 This brings a bunch of improvements. I got rid of some custom packages, I can now build exllama without using a non-default cuda version. Oh yeah and I get to use GHC 9.6.2 now, a huge upgrade from 9.4. Unfortunately I also updated ormolu and some unrelated formatting changed, but that's life I guess. --- Alpha.hs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Alpha.hs') diff --git a/Alpha.hs b/Alpha.hs index ba35e5b..4f672fc 100644 --- a/Alpha.hs +++ b/Alpha.hs @@ -110,7 +110,7 @@ g <. f = compose f g -- | Alias for map, fmap, <$> -- -- Pronunciation: gal-fas -( (a -> b) -> f a -> f b +( (a -> b) -> f a -> f b f -- functor. Could also be defined as `f +> return <. g` -- -- Pronunciation: fas-gar -(/>) :: Functor f => f a -> (a -> b) -> f b +(/>) :: (Functor f) => f a -> (a -> b) -> f b f /> g = fmap g f infixl 1 /> -bind :: Monad m => m a -> (a -> m b) -> m b +bind :: (Monad m) => m a -> (a -> m b) -> m b bind a f = a Prelude.>>= f {- HLINT ignore "Use +>" -} -(+>) :: Monad m => m a -> (a -> m b) -> m b +(+>) :: (Monad m) => m a -> (a -> m b) -> m b a +> b = a Prelude.>>= b infixl 1 +> @@ -189,7 +189,7 @@ _ ?+ [] = panic "wutlus: empty cond list" a ?< f = if not a then f a else panic "wutgal failed" -- | When. wutbar -(?|) :: Applicative f => Bool -> f () -> f () +(?|) :: (Applicative f) => Bool -> f () -> f () a ?| f = when a f -- | Removes newlinse from a string. @@ -253,5 +253,5 @@ str = toS instance StringConv Int String where strConv _ = show -tshow :: Show a => a -> Text +tshow :: (Show a) => a -> Text tshow = show -- cgit v1.2.3