From 2e6db81634240a2b5006b2c39ae16bf264afbb54 Mon Sep 17 00:00:00 2001 From: Herbert Valerio Riedel Date: Sat, 30 Nov 2019 16:15:48 +0100 Subject: [PATCH] Prepare for hackage-repo-tool 1.1.1.2 release --- hackage-repo-tool/ChangeLog.md | 4 +++ hackage-repo-tool/hackage-repo-tool.cabal | 33 +++++++++-------------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/hackage-repo-tool/ChangeLog.md b/hackage-repo-tool/ChangeLog.md index 78f63b3f..7440c65c 100644 --- a/hackage-repo-tool/ChangeLog.md +++ b/hackage-repo-tool/ChangeLog.md @@ -1,3 +1,7 @@ +0.1.1.2 +------- +* Compat release for `hackage-security-0.6` + 0.1.1.1 ------- * Make `hackage-repo-tool` buildable on Windows (#175) diff --git a/hackage-repo-tool/hackage-repo-tool.cabal b/hackage-repo-tool/hackage-repo-tool.cabal index b1cb024c..00bd0922 100644 --- a/hackage-repo-tool/hackage-repo-tool.cabal +++ b/hackage-repo-tool/hackage-repo-tool.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 name: hackage-repo-tool -version: 0.1.1.1 +version: 0.1.1.2 synopsis: Manage secure file-based package repositories description: This utility can be used to manage secure file-based package @@ -28,7 +28,7 @@ tested-with: GHC==8.8.1, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2, GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2 extra-source-files: - ChangeLog.md + ChangeLog.md README.md source-repository head type: git @@ -38,10 +38,6 @@ flag use-network-uri description: Are we using @network-uri@? manual: False -flag use-old-time - description: Are we using @old-time@? - manual: False - executable hackage-repo-tool hs-source-dirs: src main-is: Main.hs @@ -52,30 +48,27 @@ executable hackage-repo-tool Hackage.Security.RepoTool.Util.IO Prelude - build-depends: base >= 4.5 && < 5, - Cabal >= 1.14 && < 3.1, + build-depends: base >= 4.5 && < 4.14, + Cabal >= 1.14 && < 1.26 + || >= 2.0 && < 2.6 + || >= 3.0 && < 3.2, bytestring >= 0.9 && < 0.11, directory >= 1.1 && < 1.4, - filepath >= 1.2 && < 1.5, + filepath >= 1.3 && < 1.5, microlens >= 0.4.11.2 && < 0.5, optparse-applicative >= 0.11 && < 0.16, - tar >= 0.4 && < 0.6, - time >= 1.2 && < 1.10, - zlib >= 0.5 && < 0.7, - hackage-security >= 0.5 && < 0.7 + tar >= 0.5 && < 0.6, + time >= 1.4 && < 1.10, + zlib >= 0.6 && < 0.7, + hackage-security >= 0.6 && < 0.7 if !os(windows) build-depends: unix >= 2.5 && < 2.8 - if flag(use-old-time) - build-depends: directory < 1.2 - , old-time == 1.1.* - else - build-depends: directory >= 1.2 - -- see comments in hackage-security.cabal if flag(use-network-uri) build-depends: network-uri >= 2.6 && < 2.7, - network >= 2.6 && < 3.2 + network >= 2.6 && < 2.9 + || >= 3.0 && < 3.2 else build-depends: network >= 2.5 && < 2.6