[Git][haskell-team/DHG_packages][master] cabal-install: Upgrading from 3.0.0.0 to 3.4.1.0
Clint Adams (@clint)
gitlab at salsa.debian.org
Sun Jul 24 16:41:19 BST 2022
Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
f5fd17cb by Clint Adams at 2022-07-24T11:40:03-04:00
cabal-install: Upgrading from 3.0.0.0 to 3.4.1.0
- - - - -
4 changed files:
- p/haskell-cabal-install/debian/changelog
- p/haskell-cabal-install/debian/control
- − p/haskell-cabal-install/debian/patches/newer-deps
- − p/haskell-cabal-install/debian/patches/series
Changes:
=====================================
p/haskell-cabal-install/debian/changelog
=====================================
@@ -1,8 +1,12 @@
-haskell-cabal-install (3.0.0.0-4) UNRELEASED; urgency=medium
+haskell-cabal-install (3.4.1.0-1) unstable; urgency=medium
+ [ Ilias Tsitsimpis ]
* Declare compliance with Debian policy 4.6.1
- -- Ilias Tsitsimpis <iliastsi at debian.org> Tue, 28 Jun 2022 15:32:06 +0300
+ [ Clint Adams ]
+ * New upstream version.
+
+ -- Clint Adams <clint at debian.org> Sun, 24 Jul 2022 11:39:10 -0400
haskell-cabal-install (3.0.0.0-3) unstable; urgency=medium
=====================================
p/haskell-cabal-install/debian/control
=====================================
@@ -19,26 +19,36 @@ Build-Depends:
libghc-async-dev (<< 2.3),
libghc-async-prof,
libghc-base16-bytestring-dev (>= 0.1.1),
- libghc-base16-bytestring-dev (<< 0.2),
+ libghc-base16-bytestring-dev (<< 1.1.0.0),
+ libghc-base16-bytestring-prof,
libghc-cryptohash-sha256-dev (>= 0.11),
libghc-cryptohash-sha256-dev (<< 0.12),
libghc-echo-dev (>= 0.1.3),
libghc-echo-dev (<< 0.2),
libghc-edit-distance-dev (>= 0.2.2),
libghc-edit-distance-dev (<< 0.3),
- libghc-hackage-security-dev (>= 0.5.2.2),
+ libghc-edit-distance-prof,
+ libghc-hackage-security-dev (>= 0.6.0.1),
libghc-hackage-security-dev (<< 0.7),
libghc-hackage-security-prof,
libghc-hashable-dev (>= 1.0),
libghc-hashable-dev (<< 1.4),
libghc-hashable-prof,
- libghc-network-dev (>= 2.6),
- libghc-network-dev (<< 3.2),
- libghc-network-prof,
+ libghc-lukko-dev (>= 0.1),
+ libghc-lukko-dev (<< 0.2),
+ libghc-lukko-prof,
libghc-network-uri-dev (>= 2.6.0.2),
libghc-network-uri-dev (<< 2.7),
- libghc-network-uri-dev (>= 2.6),
- libghc-random-dev (<< 1.2),
+ libghc-network-uri-prof,
+ libghc-random-dev (>= 1.2),
+ libghc-random-dev (<< 1.3),
+ libghc-random-prof,
+ libghc-regex-base-dev (>= 0.94.0.0),
+ libghc-regex-base-dev (<< 0.95),
+ libghc-regex-base-prof,
+ libghc-regex-posix-dev (>= 0.96.0.0),
+ libghc-regex-posix-dev (<< 0.97),
+ libghc-regex-posix-prof,
libghc-resolv-dev (>= 0.1.1),
libghc-resolv-dev (<< 0.2),
libghc-tar-dev (>= 0.5.0.3),
=====================================
p/haskell-cabal-install/debian/patches/newer-deps deleted
=====================================
@@ -1,79 +0,0 @@
-From 0165f0a739a634ed03e6c87f258ebb5810005d21 Mon Sep 17 00:00:00 2001
-From: Oleg Grenrus <oleg.grenrus at iki.fi>
-Date: Fri, 29 Nov 2019 01:48:44 +0200
-Subject: [PATCH 002/274] Use hackage-security-0.6
-
-Also in CI setup, install hackage-repo-tool using `cabal new-install`.
-And remove slightly confusing cabal.project.travis file.
----
- .../Distribution/Client/Security/HTTP.hs | 10 ++++++--
- cabal-install/bootstrap.sh | 4 ++--
- cabal-install/cabal-install.cabal | 2 +-
- cabal-install/cabal-install.cabal.pp | 2 +-
- cabal.project.travis | 20 ----------------
- cabal.project.travis.libonly | 24 -------------------
- travis-common.sh | 2 --
- travis-script.sh | 16 ++++---------
- 8 files changed, 16 insertions(+), 64 deletions(-)
- delete mode 100644 cabal.project.travis
- delete mode 100644 cabal.project.travis.libonly
-
---- a/Distribution/Client/Security/HTTP.hs
-+++ b/Distribution/Client/Security/HTTP.hs
-@@ -35,7 +35,6 @@
- import Hackage.Security.Client.Repository.HttpLib
- import Hackage.Security.Util.Checked
- import Hackage.Security.Util.Pretty
--import qualified Hackage.Security.Util.Lens as Lens
-
- {-------------------------------------------------------------------------------
- 'HttpLib' implementation
-@@ -142,7 +141,14 @@
- finalize (name, strs) = [HTTP.Header name (intercalate ", " (reverse strs))]
-
- insert :: Eq a => a -> [b] -> [(a, [b])] -> [(a, [b])]
-- insert x y = Lens.modify (Lens.lookupM x) (++ y)
-+ insert x y = modifyAssocList x (++ y)
-+
-+ -- modify the first maching element
-+ modifyAssocList :: Eq a => a -> (b -> b) -> [(a, b)] -> [(a, b)]
-+ modifyAssocList a f = go where
-+ go [] = []
-+ go (p@(a', b) : xs) | a == a' = (a', f b) : xs
-+ | otherwise = p : go xs
-
- {-------------------------------------------------------------------------------
- Custom exceptions
---- a/bootstrap.sh
-+++ b/bootstrap.sh
-@@ -260,8 +260,8 @@
- # 0.2.2.*
- ED25519_VER="0.0.5.0"; ED25519_VER_REGEXP="0\.0\.?"
- # 0.0.*
--HACKAGE_SECURITY_VER="0.5.3.0"; HACKAGE_SECURITY_VER_REGEXP="0\.5\.((2\.[2-9]|[3-9])|3)"
-- # >= 0.5.2 && < 0.6
-+HACKAGE_SECURITY_VER="0.6.0.0"; HACKAGE_SECURITY_VER_REGEXP="0\.6\."
-+ # >= 0.7.0.0 && < 0.7
- TAR_VER="0.5.1.0"; TAR_VER_REGEXP="0\.5\.([1-9]|1[0-9]|0\.[3-9]|0\.1[0-9])\.?"
- # >= 0.5.0.3 && < 0.6
- DIGEST_VER="0.0.1.2"; DIGEST_REGEXP="0\.0\.(1\.[2-9]|[2-9]\.?)"
---- a/cabal-install.cabal
-+++ b/cabal-install.cabal
-@@ -308,7 +308,7 @@
- build-depends:
- async >= 2.0 && < 2.3,
- array >= 0.4 && < 0.6,
-- base >= 4.8 && < 4.13,
-+ base >= 4.8 && < 4.15,
- base16-bytestring >= 0.1.1 && < 0.2,
- binary >= 0.7.3 && < 0.9,
- bytestring >= 0.10.6.0 && < 0.11,
-@@ -332,7 +332,7 @@
- tar >= 0.5.0.3 && < 0.6,
- time >= 1.5.0.1 && < 1.10,
- zlib >= 0.5.3 && < 0.7,
-- hackage-security >= 0.5.2.2 && < 0.6,
-+ hackage-security >= 0.6.0.0 && < 0.7,
- text >= 1.2.3 && < 1.3,
- parsec >= 3.1.13.0 && < 3.2
-
=====================================
p/haskell-cabal-install/debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-newer-deps
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/f5fd17cb77c66f0662cf721b0157986797da77fb
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/f5fd17cb77c66f0662cf721b0157986797da77fb
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20220724/b1481124/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list