From f1c68d46f9e957fb79fccc9f5d876a8da6e45392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9cate=20Kleidukos?= Date: Tue, 25 Nov 2025 22:39:04 +0100 Subject: [PATCH 1/2] Remove dependency on old network version This allows us to remove the flag. Fixes #160 --- HTTP.cabal | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/HTTP.cabal b/HTTP.cabal index 257a0ba..1c69728 100644 --- a/HTTP.cabal +++ b/HTTP.cabal @@ -91,10 +91,6 @@ Flag warp-tests default: False manual: True -flag network-uri - description: Get Network.URI from the network-uri package - default: True - Library Exposed-modules: Network.BufferType, @@ -114,7 +110,7 @@ Library Other-modules: Network.HTTP.Base64, Network.HTTP.MD5Aux, - Network.HTTP.Utils + Network.HTTP.Utils, Paths_HTTP GHC-options: -fwarn-missing-signatures -Wall @@ -131,16 +127,12 @@ Library -- 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.3 + , network >= 2.6 && < 3.3 + , network-uri >= 2.6 && < 2.7 default-language: Haskell98 default-extensions: FlexibleInstances - if flag(network-uri) - Build-depends: network-uri == 2.6.*, network >= 2.6 - else - Build-depends: network < 2.6 - if flag(warn-as-error) ghc-options: -Werror @@ -167,6 +159,7 @@ Test-Suite test , bytestring , mtl , network + , network-uri -- extra dependencies , deepseq >= 1.3.0.0 && < 1.6 , httpd-shed >= 0.4 && < 0.5 @@ -176,11 +169,6 @@ Test-Suite test , 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 - else - Build-depends: network < 2.6 - if flag(warp-tests) CPP-Options: -DWARP_TESTS build-depends: From e640e02df8c1aa12d1fb36fc284b8772f62e34b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9cate=20Kleidukos?= Date: Tue, 25 Nov 2025 23:21:46 +0100 Subject: [PATCH 2/2] Use cabal-version 3.0 and proper SPDX license identifier --- HTTP.cabal | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/HTTP.cabal b/HTTP.cabal index 1c69728..afff1bc 100644 --- a/HTTP.cabal +++ b/HTTP.cabal @@ -1,9 +1,9 @@ -Cabal-Version: >= 1.10 +Cabal-Version: 3.0 Name: HTTP Version: 4000.4.1 x-revision: 5 Build-type: Simple -License: BSD3 +License: BSD-3-Clause License-file: LICENSE Author: Warrick Gray Maintainer: Ganesh Sittampalam @@ -92,6 +92,7 @@ Flag warp-tests manual: True Library + Autogen-modules: Paths_HTTP Exposed-modules: Network.BufferType, Network.Stream,