hercules-ci-cnix-store 0.3.0.0 → 0.3.0.1

raw patch · 10 files changed

+61/−11 lines, 10 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• CHANGELOG.md +6/−0
• hercules-ci-cnix-store.cabal +1/−1
• src/Hercules/CNix.hs +10/−1
• src/Hercules/CNix/Exception.hs +17/−2
• src/Hercules/CNix/Settings.hs +10/−1
• src/Hercules/CNix/Std/String/Context.hs +6/−2
• src/Hercules/CNix/Std/String/Instances.hs +1/−1
• src/Hercules/CNix/Store/Context.hs +1/−1
• src/Hercules/CNix/Store/Instances.hs +1/−1
• src/Hercules/CNix/Verbosity.hs +8/−1

@@ -5,6 +5,12 @@  The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## 0.3.0.1 - 2022-03-21++### Removed++ - Clean up inline-c generated exports+ ## 0.3.0.0 - 2022-03-15  ### Added

@@ -1,7 +1,7 @@ cabal-version: 2.4  name:           hercules-ci-cnix-store-version:        0.3.0.0+version:        0.3.0.1 synopsis:       Haskell bindings for Nix's libstore category:       Nix homepage:       https://docs.hercules-ci.com

@@ -3,7 +3,16 @@ {-# LANGUAGE TemplateHaskell #-}  module Hercules.CNix-  ( module Hercules.CNix,+  ( init,+    setTalkative,+    setDebug,+    setGlobalOption,+    setOption,+    logInfo,+    appendString,+    nixVersion,++    -- * Re-exports     module Hercules.CNix.Store,   ) where

@@ -1,7 +1,12 @@ {-# LANGUAGE QuasiQuotes #-} {-# LANGUAGE TemplateHaskell #-} -module Hercules.CNix.Exception where+module Hercules.CNix.Exception+  ( handleExceptions,+    handleExceptions',+    handleExceptionPtr,+  )+where  import Hercules.CNix.Store.Context (context) import qualified Language.C.Inline.Cpp as C@@ -15,12 +20,21 @@ C.include "<nix/shared.hh>" C.include "<nix/globals.hh>" +-- | Log C++ exceptions and call 'exitWith' the way Nix would exit when an+-- exception occurs. handleExceptions :: IO a -> IO a handleExceptions io = do   progName <- System.Environment.getProgName   handleExceptions' exitWith (toS progName) io -handleExceptions' :: (ExitCode -> IO a) -> Text -> IO a -> IO a+-- | Log C++ exceptions and call 'exitWith' the way Nix would exit.+handleExceptions' ::+  -- | What to do when Nix would want to exit with 'ExitCode'+  (ExitCode -> IO a) ->+  -- | Program name (command name)+  Text ->+  IO a ->+  IO a handleExceptions' handleExit programName io =   let select (C.CppStdException eptr _msg _t) = Just eptr       select _ = Nothing@@ -31,6 +45,7 @@       doHandle = handleExit . convertExit <=< handleExceptionPtr (encodeUtf8 programName)    in handleJust select doHandle io +-- | Low-level wrapper around @nix::handleExceptions(rethrow_exception(e))@. handleExceptionPtr :: ByteString -> C.CppExceptionPtr -> IO C.CInt handleExceptionPtr programName eptr =   [C.throwBlock| int {

@@ -3,7 +3,16 @@ {-# LANGUAGE QuasiQuotes #-} {-# LANGUAGE TemplateHaskell #-} -module Hercules.CNix.Settings where+module Hercules.CNix.Settings+  ( getExtraPlatforms,+    getSystem,+    getSystemFeatures,+    getSubstituters,+    getTrustedPublicKeys,+    getNarinfoCacheNegativeTtl,+    getNetrcFile,+  )+where  import Data.ByteString.Unsafe (unsafePackMallocCString) import qualified Data.Set as S

@@ -1,7 +1,11 @@ {-# LANGUAGE QuasiQuotes #-}-{-# LANGUAGE TemplateHaskell #-}+{-# LANGUAGE TemplateHaskellQuotes #-} -module Hercules.CNix.Std.String.Context where+module Hercules.CNix.Std.String.Context+  ( CStdString,+    stdStringCtx,+  )+where  import qualified Data.Map as M import qualified Language.C.Inline as C

@@ -4,7 +4,7 @@  -- | Define instances for C++ types in the Context module that can't be in that -- module because of TH staging restrictions.-module Hercules.CNix.Std.String.Instances where+module Hercules.CNix.Std.String.Instances () where  import Data.Semigroup (Semigroup ((<>))) import Hercules.CNix.Std.Set

@@ -1,6 +1,6 @@ {-# LANGUAGE EmptyDataDecls #-} {-# LANGUAGE QuasiQuotes #-}-{-# LANGUAGE TemplateHaskell #-}+{-# LANGUAGE TemplateHaskellQuotes #-}  module Hercules.CNix.Store.Context where 

@@ -4,7 +4,7 @@  -- | Define instances for C++ types in the Context module that can't be in that -- module because of TH staging restrictions.-module Hercules.CNix.Store.Instances where+module Hercules.CNix.Store.Instances () where  import Data.Data (Proxy (Proxy)) import Data.Function (($))

@@ -1,7 +1,14 @@ {-# LANGUAGE QuasiQuotes #-} {-# LANGUAGE TemplateHaskell #-} -module Hercules.CNix.Verbosity where+module Hercules.CNix.Verbosity+  ( Verbosity (..),+    setVerbosity,+    getVerbosity,+    setShowTrace,+    getShowTrace,+  )+where  import Foreign (fromBool, toBool) import Hercules.CNix.Store.Context (context)