From d9af21cad43eff721ee87439602bcb82da414fad Mon Sep 17 00:00:00 2001 From: Tom Ellis Date: Sat, 7 Mar 2026 13:02:26 +0000 Subject: [PATCH 1/2] Also support Cabal 3.16 --- test/Setup.hs | 18 ++++++++++++++++-- test/process-tests.cabal | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/test/Setup.hs b/test/Setup.hs index 5dfa8a79..72b48722 100644 --- a/test/Setup.hs +++ b/test/Setup.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# OPTIONS_GHC -Wall #-} module Main (main) where @@ -31,6 +32,10 @@ import Distribution.Types.TargetInfo ( targetComponent ) import Distribution.Types.UnqualComponentName ( unUnqualComponentName ) +#if MIN_VERSION_Cabal(3,16,0) +import Distribution.Utils.Path + ( SymbolicPathX, interpretSymbolicPathCWD) +#endif -- directory import System.Directory @@ -45,6 +50,15 @@ import System.FilePath main :: IO () main = defaultMainWithHooks testProcessHooks +#if MIN_VERSION_Cabal(3,16,0) +pathToString :: + SymbolicPathX allowAbsolute from to -> String +pathToString = interpretSymbolicPathCWD +#else +pathToString :: String -> String +pathToString = id +#endif + -- The following code works around Cabal bug #9854. -- -- The process-tests package has an executable component named "cli-child", @@ -57,7 +71,7 @@ testProcessHooks = simpleUserHooks { buildHook = \ pd lbi userHooks buildFlags -> withTestLBI pd lbi $ \ _testSuite clbi -> do - let pathsFile = autogenComponentModulesDir lbi clbi "Test" "Paths" <.> "hs" + let pathsFile = pathToString (autogenComponentModulesDir lbi clbi) "Test" "Paths" <.> "hs" createDirectoryIfMissing True (takeDirectory pathsFile) writeFile pathsFile $ unlines [ "module Test.Paths where" @@ -74,6 +88,6 @@ processInternalExes pd lbi = , CExe exe <- [targetComponent tgt] , let toolName = unUnqualComponentName $ exeName exe toolLocation = - buildDir lbi + pathToString (buildDir lbi) (toolName toolName <.> exeExtension (hostPlatform lbi)) ] diff --git a/test/process-tests.cabal b/test/process-tests.cabal index aafcaede..809931c1 100644 --- a/test/process-tests.cabal +++ b/test/process-tests.cabal @@ -25,7 +25,7 @@ custom-setup base >= 4.10 && < 4.23, directory >= 1.1 && < 1.4, filepath >= 1.2 && < 1.6, - Cabal >= 2.4 && < 3.14, + Cabal >= 2.4 && < 3.18, -- Test executable for the CommunicationHandle functionality executable cli-child From 2ce8f7723b6f669036f08428da880443c1838d32 Mon Sep 17 00:00:00 2001 From: Tom Ellis Date: Sat, 7 Mar 2026 11:09:44 +0000 Subject: [PATCH 2/2] Release 1.6.26.2 --- changelog.md | 4 ++++ process.cabal | 2 +- test/process-tests.cabal | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changelog.md b/changelog.md index 9475410c..49f36845 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # Changelog for [`process` package](http://hackage.haskell.org/package/process) +## 1.6.26.2 *March 2026* + +* Fix `@since` annotations + ## 1.6.26.1 *May 2025* * Regenerate `configure` script (#343) diff --git a/process.cabal b/process.cabal index 4ace1780..125945dc 100644 --- a/process.cabal +++ b/process.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: process -version: 1.6.26.1 +version: 1.6.26.2 -- NOTE: Don't forget to update ./changelog.md license: BSD-3-Clause license-file: LICENSE diff --git a/test/process-tests.cabal b/test/process-tests.cabal index 809931c1..5c2c19e1 100644 --- a/test/process-tests.cabal +++ b/test/process-tests.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: process-tests -version: 1.6.26.1 +version: 1.6.26.2 license: BSD-3-Clause license-file: LICENSE maintainer: libraries@haskell.org @@ -18,7 +18,7 @@ source-repository head common process-dep build-depends: - process == 1.6.26.1 + process == 1.6.26.2 custom-setup setup-depends: