From f3e47598523d09b8713d921e9c69b32d71195cd1 Mon Sep 17 00:00:00 2001 From: Phil Ruffwind Date: Sat, 16 Mar 2024 18:07:13 -0700 Subject: [PATCH] Relax time version bounds to support 1.14 --- .github/workflows/build.yml | 2 +- changelog.md | 5 +++++ directory.cabal | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b1ed5bce..9b26bcca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: - { os: ubuntu-latest, ghc: latest, cabal: latest } - { os: windows-latest, stack: lts-12.26, stack-extra-deps: "bytestring-0.11.3.0, filepath-1.4.100.0, time-1.8.0.2, Win32-2.13.3.0", overrides: "before_prepare() { sed -i.bak -e /CreateSymbolicLinkW/d -e /GetFinalPathNameByHandleW/d configure.ac; }" } - { os: windows-latest, stack: lts-17.5, stack-extra-deps: "bytestring-0.11.3.0, filepath-1.4.100.0, time-1.9.3, Win32-2.13.3.0" } - - { os: windows-latest, stack: lts-22.7, stack-extra-deps: "bytestring-0.11.5.3, filepath-1.5.2.0, os-string-2.0.2, time-1.12.2, Win32-2.14.0.0", stack-package-flags: "{directory: {os-string: true}, Win32: {os-string: true}}" } + - { os: windows-latest, stack: lts-22.7, stack-extra-deps: "bytestring-0.11.5.3, filepath-1.5.2.0, os-string-2.0.2, time-1.14, Win32-2.14.0.0", stack-package-flags: "{directory: {os-string: true}, Win32: {os-string: true}}" } runs-on: ${{ matrix.os }} env: TESTSCRIPT_OVERRIDES: ${{ matrix.overrides }} diff --git a/changelog.md b/changelog.md index 9a4cce2b..0affb4e9 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,11 @@ Changelog for the [`directory`][1] package ========================================== +## 1.3.8.4 (unreleased) + + * Relax `time` version bounds to support 1.14. + ([#171](https://github.com/haskell/directory/issues/171)) + ## 1.3.8.3 (Jan 2024) * Relax `Win32` version bounds to support 2.14.0.0. diff --git a/directory.cabal b/directory.cabal index 05008345..648b0977 100644 --- a/directory.cabal +++ b/directory.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: directory -version: 1.3.8.3 +version: 1.3.8.4 license: BSD-3-Clause license-file: LICENSE maintainer: libraries@haskell.org @@ -61,7 +61,7 @@ Library build-depends: base >= 4.11.0 && < 4.20, - time >= 1.8.0 && < 1.13 + time >= 1.8.0 && < 1.15 if os(windows) build-depends: Win32 >= 2.13.3 && < 2.15 else