From afe05bb87aca20b4fb5bb78b51acfd730fb3e7ed Mon Sep 17 00:00:00 2001 From: Gershom Date: Fri, 8 Dec 2017 13:29:40 -0500 Subject: [PATCH] last updates for 8.2.2 release --- hptool/src/PlatformDB.hs | 4 ++-- hptool/src/Releases2017.hs | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hptool/src/PlatformDB.hs b/hptool/src/PlatformDB.hs index 4e2eb1c..3883e3b 100644 --- a/hptool/src/PlatformDB.hs +++ b/hptool/src/PlatformDB.hs @@ -33,12 +33,12 @@ release vstr incs = Release (HpVersion $ version vstr) incs [] -- | Construct list of Includes as a delta to packages in another release. -- The contents of the single list provided are applied to both the core and -- the full include lists (since full is just the additions to core with no --- overlap). +-- overlap). Note that this will only _update_ packages, not provide new ones. deltaFrom :: Release -> [Include] -> ([Include], [Include]) deltaFrom base deltas = ( go (relMinimalIncludes base) deltas , go (relIncludes base) deltas ) where - go [] dIncs = dIncs + go [] dIncs = [] --dIncs go (bInc : bIncs) dIncs = let (updates, dIncs') = partition (match bInc) dIncs in merge bInc updates : go bIncs dIncs' diff --git a/hptool/src/Releases2017.hs b/hptool/src/Releases2017.hs index 02f0bf5..e89a1dd 100644 --- a/hptool/src/Releases2017.hs +++ b/hptool/src/Releases2017.hs @@ -121,6 +121,7 @@ hp_8_2_2 = and as such, do not carry the same stability guaruntees. , incGHCLib "ghc-prim" "0.5.1.1" -} + , incTool "alex" "3.2.3" , incTool "happy" "1.19.8" @@ -128,6 +129,9 @@ hp_8_2_2 = , incLib "HTTP" "4000.3.8" , incLib "QuickCheck" "2.10.1" , incLib "scientific" "0.3.5.2" + + , incGHCTool "cabal-install" "2.0.0.1" + , incGHCTool "stack" "1.6.1" ]