From 267b017e0f87627a1fc7453e0a360eb6d7819e99 Mon Sep 17 00:00:00 2001 From: Phil Ruffwind Date: Sun, 21 Jan 2024 15:24:15 -0800 Subject: [PATCH] Relax Win32 version bounds to support 2.14.0.0 Fixes #166. --- .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 1bfe3d40..5f2b883a 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-19.21, stack-extra-deps: "bytestring-0.11.3.0, filepath-1.4.100.0, time-1.12.1, Win32-2.13.3.0" } + - { os: windows-latest, stack: lts-22.7, stack-extra-deps: "bytestring-0.11.5.3, filepath-1.4.100.0, time-1.12.2, Win32-2.14.0.0" } runs-on: ${{ matrix.os }} env: TESTSCRIPT_OVERRIDES: ${{ matrix.overrides }} diff --git a/changelog.md b/changelog.md index 7ba13d5a..67a13397 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,11 @@ Changelog for the [`directory`][1] package ========================================== +## 1.3.8.3 (TBD) + + * Relax `Win32` version bounds to support 2.14.0.0. + ([#166](https://github.com/haskell/directory/issues/166)) + ## 1.3.8.2 (Dec 2023) * Relax `base` version bounds to support 4.19. diff --git a/directory.cabal b/directory.cabal index 866460e5..828d33c4 100644 --- a/directory.cabal +++ b/directory.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: directory -version: 1.3.8.2 +version: 1.3.8.3 license: BSD-3-Clause license-file: LICENSE maintainer: libraries@haskell.org @@ -61,7 +61,7 @@ Library base >= 4.11.0 && < 4.20, time >= 1.8.0 && < 1.13 if os(windows) - build-depends: Win32 >= 2.13.3 && < 2.14 + build-depends: Win32 >= 2.13.3 && < 2.15 else build-depends: unix >= 2.8.0 && < 2.9