diff --git a/HTTP-4000.3.16.tar.gz b/HTTP-4000.3.16.tar.gz new file mode 100644 index 0000000..1044258 --- /dev/null +++ b/HTTP-4000.3.16.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6091c037871ac3d08d021c906206174567499d5a26a6cb804cf530cd590fe2d +size 74516 diff --git a/HTTP-4000.4.1.tar.gz b/HTTP-4000.4.1.tar.gz deleted file mode 100644 index e09a14e..0000000 --- a/HTTP-4000.4.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df31d8efec775124dab856d7177ddcba31be9f9e0836ebdab03d94392f2dd453 -size 74330 diff --git a/HTTP.cabal b/HTTP.cabal index a77eacb..434b2b0 100644 --- a/HTTP.cabal +++ b/HTTP.cabal @@ -1,7 +1,7 @@ -Cabal-Version: >= 1.10 Name: HTTP -Version: 4000.4.1 +Version: 4000.3.16 x-revision: 1 +Cabal-Version: >= 1.10 Build-type: Simple License: BSD3 License-file: LICENSE @@ -57,15 +57,16 @@ Description: Extra-Source-Files: CHANGES -tested-with: - GHC==9.2.1, GHC==9.0.1, - GHC==8.10.7, GHC==8.8.4, 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 +tested-with: GHC==9.0.1, GHC==8.10.4, GHC==8.8.3, 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, GHC==7.2.2, GHC==7.0.4 Source-Repository head type: git location: https://github.com/haskell/HTTP.git +Flag mtl1 + description: Use the old mtl version 1. + default: False + Flag warn-as-error default: False description: Build with warnings-as-errors @@ -109,26 +110,23 @@ Library -- note the test harness constraints should be kept in sync with these -- where dependencies are shared - build-depends: - base >= 4.6.0.0 && < 4.18 - , array >= 0.3.0.2 && < 0.6 - , bytestring >= 0.9.1.5 && < 0.12 - , parsec >= 2.0 && < 3.2 - , time >= 1.1.2.3 && < 1.13 - , transformers >= 0.2.0.0 && < 0.7 - -- transformers-0.2.0.0 is the first to have Control.Monad.IO.Class - -- The following dependencies are refined by flags, but they should - -- still be mentioned here on the top-level. - , mtl >= 2.0.0.0 && < 2.4 - , network >= 2.4 && < 3.2 + Build-depends: base >= 4.3.0.0 && < 4.17, parsec >= 2.0 && < 3.2 + Build-depends: array >= 0.3.0.2 && < 0.6, bytestring >= 0.9.1.5 && < 0.12 + Build-depends: time >= 1.1.2.3 && < 1.13 default-language: Haskell98 default-extensions: FlexibleInstances - if flag(network-uri) - Build-depends: network-uri == 2.6.*, network >= 2.6 + if flag(mtl1) + Build-depends: mtl >= 1.1.1.0 && < 1.2 + CPP-Options: -DMTL1 else - Build-depends: network < 2.6 + Build-depends: mtl >= 2.0 && < 2.3 + + if flag(network-uri) + Build-depends: network-uri == 2.6.*, network >= 2.6 && < 3.2 + else + Build-depends: network >= 2.4 && < 2.6 if flag(warn-as-error) ghc-options: -Werror @@ -149,37 +147,37 @@ Test-Suite test ghc-options: -Wall - build-depends: - HTTP - -- constraints inherited from HTTP - , base - , bytestring - , mtl - , network - -- extra dependencies - , deepseq >= 1.3.0.0 && < 1.5 - , httpd-shed >= 0.4 && < 0.5 - , HUnit >= 1.2.0.1 && < 1.7 - , pureMD5 >= 0.2.4 && < 2.2 - , split >= 0.1.3 && < 0.3 - , test-framework >= 0.2.0 && < 0.9 - , test-framework-hunit >= 0.3.0 && < 0.4 + -- note: version constraints for dependencies shared with the library + -- should be the same + build-depends: HTTP, + HUnit >= 1.2.0.1 && < 1.7, + httpd-shed >= 0.4 && < 0.5, + mtl >= 1.1.1.0 && < 2.3, + bytestring >= 0.9.1.5 && < 0.12, + deepseq >= 1.3.0.0 && < 1.5, + pureMD5 >= 0.2.4 && < 2.2, + base >= 4.3.0.0 && < 4.16, + split >= 0.1.3 && < 0.3, + test-framework >= 0.2.0 && < 0.9, + test-framework-hunit >= 0.3.0 && <0.4 if flag(network-uri) - Build-depends: network-uri == 2.6.*, network >= 2.6 + Build-depends: network-uri == 2.6.*, network >= 2.6 && < 3.2 else - Build-depends: network < 2.6 + Build-depends: network >= 2.3 && < 2.6 if flag(warp-tests) CPP-Options: -DWARP_TESTS build-depends: - case-insensitive >= 0.4.0.1 && < 1.3 - , conduit >= 1.0.8 && < 1.4 - , http-types >= 0.8.0 && < 1.0 - , wai >= 2.1.0 && < 3.3 - , warp >= 2.1.0 && < 3.4 + case-insensitive >= 0.4.0.1 && < 1.3, + http-types >= 0.8.0 && < 1.0, + wai >= 2.1.0 && < 3.3, + warp >= 2.1.0 && < 3.4 if flag(conduit10) - build-depends: conduit < 1.1 + build-depends: + conduit >= 1.0.8 && < 1.1 else - build-depends: conduit >= 1.1, conduit-extra >= 1.1 && < 1.4 + build-depends: + conduit >= 1.1 && < 1.4, + conduit-extra >= 1.1 && < 1.4 diff --git a/ghc-HTTP.changes b/ghc-HTTP.changes index 7af400d..c81a712 100644 --- a/ghc-HTTP.changes +++ b/ghc-HTTP.changes @@ -1,14 +1,3 @@ -------------------------------------------------------------------- -Sun Aug 14 21:34:43 UTC 2022 - Peter Simons - -- Update HTTP to version 4000.4.1 revision 1. - Version 4000.4.0: release 2022-02-22 - * Restrict to GHC >=7.6 and associated cleanups (Andreas Abel) - * Drop deprecated instance Error (Andreas Abel) - * Preparation for mtl-2.3 (Andreas Abel) - * General tidying (Andreas Abel) - * Support GHC 9.2 (Bodigrim) - ------------------------------------------------------------------- Tue Oct 12 11:34:09 UTC 2021 - psimons@suse.com diff --git a/ghc-HTTP.spec b/ghc-HTTP.spec index f71eacb..8410d23 100644 --- a/ghc-HTTP.spec +++ b/ghc-HTTP.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-HTTP # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global pkg_name HTTP %bcond_with tests Name: ghc-%{pkg_name} -Version: 4000.4.1 +Version: 4000.3.16 Release: 0 Summary: A library for client-side HTTP License: BSD-3-Clause @@ -35,7 +35,6 @@ BuildRequires: ghc-network-uri-devel BuildRequires: ghc-parsec-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-time-devel -BuildRequires: ghc-transformers-devel ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-HUnit-devel