From 0a3a3ff771485265a609f500ed60e222bfa6294e Mon Sep 17 00:00:00 2001 From: Lysxia Date: Sat, 16 May 2020 23:09:47 -0400 Subject: [PATCH 01/45] Relax first-class-families bounds (#5237) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 780d20d9..6d6be640 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -466,7 +466,7 @@ packages: "Li-yao Xia @Lysxia": - boltzmann-samplers - - first-class-families < 0.8.0.0 + - first-class-families - generic-data - generic-data-surgery < 0 # via generic-data - generic-random From 15804a5307eb55525debea1f0d501a9bfe04079a Mon Sep 17 00:00:00 2001 From: gbrsales Date: Sun, 17 May 2020 23:39:12 +0200 Subject: [PATCH 02/45] add cabal-appimage --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 3e171ee2..9813428e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4241,6 +4241,9 @@ packages: "Rickey Visinski @rickeyski": - slack-api + + "Gabriele Sales @gbrsales": + - cabal-appimage "Grandfathered dependencies": - network From 0d3d8779e0f008f0dcd1a357c5ac8e819c861ccb Mon Sep 17 00:00:00 2001 From: Pasqualino 'Titto' Assini Date: Mon, 18 May 2020 11:10:22 +0200 Subject: [PATCH 03/45] add flat and model --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 3e171ee2..70c35b9c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -313,8 +313,8 @@ packages: "Pasqualino Assini @tittoassini": # - zm - # - flat # fails to build - - model < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build + - flat + - model "Jose Iborra @pepeiborra": # - arrowp-qq # build failure https://github.com/pepeiborra/arrowp/issues/8 From 60b6ea807e1ac5e59a798fbd0251c22480432e24 Mon Sep 17 00:00:00 2001 From: Dobromir Nikolov Date: Mon, 18 May 2020 12:40:40 +0300 Subject: [PATCH 04/45] Add it-has package --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 3e171ee2..4ccd8cda 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4241,6 +4241,9 @@ packages: "Rickey Visinski @rickeyski": - slack-api + + "Dobromir Nikolov @dnikolovv": + - it-has "Grandfathered dependencies": - network From 4602d8ebb26706337d7ba2d8911c34e758e4a1d1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 18 May 2020 20:29:48 +0800 Subject: [PATCH 05/45] etc/diskspace/remove-old-stack-work-libs.hs: diskspace reclaimer should be run in work/{nightly,lts*}/unpack-dir/.stack-work/install/x86_64-linux/*/*/lib/x86_64-linux-ghc-*/ --- etc/diskspace/remove-old-stack-work-libs.hs | 55 +++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100755 etc/diskspace/remove-old-stack-work-libs.hs diff --git a/etc/diskspace/remove-old-stack-work-libs.hs b/etc/diskspace/remove-old-stack-work-libs.hs new file mode 100755 index 00000000..b1d7d7a4 --- /dev/null +++ b/etc/diskspace/remove-old-stack-work-libs.hs @@ -0,0 +1,55 @@ +#!/usr/bin/env stack +-- stack --resolver lts script + +-- Utility to remove old libs installed under .stack-work/ to save diskspace + +-- Should be run in: +-- work/*/unpack-dir/.stack-work/install/x86_64-linux/*/*/lib/x86_64-linux-ghc-* + +import Data.List +import System.Directory + +main = do + files <- listDirectory "." + (libdirs,dynlibs) <- partitionM doesDirectoryExist files + let pkglibdirs = groupBy samePkgLibDir libdirs + pkgdynlibs = groupBy samePkgDynLib dynlibs + mapM_ (removeOlder removeDirectoryRecursive) pkglibdirs + mapM_ (removeOlder removeFile) pkgdynlibs + where + samePkgLibDir l1 l2 = pkgDirName l1 == pkgDirName l2 + where + pkgDirName p = + if countDashes p < 2 + then error $ p ++ " not in name-version-hash format" + else (removeDashSegment . removeDashSegment) p + + countDashes = length . filter (== '-') + + removeDashSegment = init . dropWhileEnd (/= '-') + + samePkgDynLib d1 d2 = pkgDynName d1 == pkgDynName d2 + where + pkgDynName p = + if countDashes p < 3 + then error $ p ++ " not in libname-version-hash-ghc*.so format" + else (removeDashSegment . removeDashSegment . removeDashSegment) p + + removeOlder remover files = do + oldfiles <- drop 2 . reverse <$> sortByAge files + mapM_ remover oldfiles + + sortByAge files = do + timestamps <- mapM getModificationTime files + let fileTimes = zip files timestamps + return $ map fst $ sortBy compareSnd fileTimes + + compareSnd (_,t1) (_,t2) = compare t1 t2 + +-- borrowed from Control.Monad.Extra +partitionM :: Monad m => (a -> m Bool) -> [a] -> m ([a], [a]) +partitionM f [] = pure ([], []) +partitionM f (x:xs) = do + res <- f x + (as,bs) <- partitionM f xs + pure ([x | res]++as, [x | not res]++bs) From d833c0ba59e2470b8d288519b37b2412ee1a0d1f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 18 May 2020 20:42:00 +0800 Subject: [PATCH 06/45] remove-old-stack-work-libs.hs: use lts-14 because we have ghc-8.6.5 under ~/.stack/ (better would be to remove ~/.stack and use dot-stackage) --- etc/diskspace/remove-old-stack-work-libs.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/diskspace/remove-old-stack-work-libs.hs b/etc/diskspace/remove-old-stack-work-libs.hs index b1d7d7a4..0621490f 100755 --- a/etc/diskspace/remove-old-stack-work-libs.hs +++ b/etc/diskspace/remove-old-stack-work-libs.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack --- stack --resolver lts script +-- stack --resolver lts-14 script -- Utility to remove old libs installed under .stack-work/ to save diskspace From 4e43341b34fabfd2616251271346e7bd35c5afad Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 18 May 2020 21:17:16 +0800 Subject: [PATCH 07/45] remove-old-stack-work-libs.hs: sort directory list for grouping --- etc/diskspace/remove-old-stack-work-libs.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/diskspace/remove-old-stack-work-libs.hs b/etc/diskspace/remove-old-stack-work-libs.hs index 0621490f..7e81b5e7 100755 --- a/etc/diskspace/remove-old-stack-work-libs.hs +++ b/etc/diskspace/remove-old-stack-work-libs.hs @@ -10,7 +10,7 @@ import Data.List import System.Directory main = do - files <- listDirectory "." + files <- sort <$> listDirectory "." (libdirs,dynlibs) <- partitionM doesDirectoryExist files let pkglibdirs = groupBy samePkgLibDir libdirs pkgdynlibs = groupBy samePkgDynLib dynlibs From 25f97ff187a76ecd6efdc96f09a13df29d11a558 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 18 May 2020 21:39:33 +0800 Subject: [PATCH 08/45] conferer < 0.4.0.0 (#5374) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 3e171ee2..9bb200e5 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3865,7 +3865,7 @@ packages: - map-syntax < 0 # GHC 8.4 via base-4.11.0.0 - heist < 0 # GHC 8.4 via map-syntax - snap < 0 # GHC 8.4 via base-4.11.0.0 - - conferer + - conferer < 0.4.0.0 # https://github.com/commercialhaskell/stackage/issues/5374 # - conferer-snap # Because snap - conferer-warp - conferer-hspec From 3daeb1ce83d43682b3b2a18dac4ba82f8ca254ee Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 18 May 2020 21:51:22 +0800 Subject: [PATCH 09/45] conferer-hspec, conferer-warp < 0.4.0.0 (#5374) --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 20b3b13e..6b29bfdb 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3867,8 +3867,8 @@ packages: - snap < 0 # GHC 8.4 via base-4.11.0.0 - conferer < 0.4.0.0 # https://github.com/commercialhaskell/stackage/issues/5374 # - conferer-snap # Because snap - - conferer-warp - - conferer-hspec + - conferer-warp < 0.4.0.0 # https://github.com/commercialhaskell/stackage/issues/5374 + - conferer-hspec < 0.4.0.0 # https://github.com/commercialhaskell/stackage/issues/5374 - conferer-provider-json "Tim Humphries @thumphries": From 48e8bb875daa55e2db4a9ae33fb6fca0cd99433f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 18 May 2020 22:01:09 +0800 Subject: [PATCH 10/45] revert "constraints < 0.12" (#5124) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6b29bfdb..e2e3b165 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -862,7 +862,7 @@ packages: - compensated - compressed < 0 - concurrent-supply - - constraints < 0.12 # https://github.com/commercialhaskell/stackage/issues/5124 + - constraints - contravariant - distributive - discrimination < 0 From 58e6d38671d5d9185a8c16b58afcfa1ab0bc83c0 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 19 May 2020 01:02:58 +0800 Subject: [PATCH 11/45] mention remove-old-stack-work-libs.hs for diskspace clean --- CURATORS.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CURATORS.md b/CURATORS.md index 80da8441..89ee5394 100644 --- a/CURATORS.md +++ b/CURATORS.md @@ -333,14 +333,15 @@ early and hopefully the nightlies will be timely. LTS minor bumps typically are run on Sundays. -### Website sync debugging (and other out of disk space errors) +### Diskspace errors (and website sync debugging) * You can detect the problem by running `df`. If you see that `/` is out of space, we have a problem * If you see that `/var/stackage/` is out of space, you can: + * run `./stackage/etc/diskspace/remove-old-stack-work-libs.hs` in `/var/stackage/stackage/automated/work/*/unpack-dir/.stack-work/install/x86_64-linux/*/*/` (hopefully sufficient) + + optionally (not recommended?): * `rm -r /var/stackage/stackage/automated/work/lts*/unpack-dir/unpacked/` * `rm -r /var/stackage/stackage/automated/work/nightly/unpack-dir/unpacked/` -* (outdated) There are many temp files inside `/home/ubuntu/stackage-server-cron` that can be cleared out occasionally -* (outdated) You can then manually run `/home/ubuntu/stackage-server-cron.sh`, or wait for the cron job to do it ### Wiping the cache From efb2e62e0c1b6a2d610d7b7cf25e4e0ddc5b0b3d Mon Sep 17 00:00:00 2001 From: Koz Ross Date: Tue, 19 May 2020 08:49:49 +1200 Subject: [PATCH 12/45] Add Medea --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index c8e9a816..fee17d47 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -9,6 +9,9 @@ cabal-format-version: "3.0" # Constraints for brand new builds packages: + "Koz Ross @kozross": + - medea + "Ashlynn Anderson @lambdadog": - proto3-wire From 2d11c73421b19ce5e71718906925bf4ffe3c1d7a Mon Sep 17 00:00:00 2001 From: Eric Conlon Date: Mon, 18 May 2020 15:50:55 -0700 Subject: [PATCH 13/45] Re-enable ginger after 0.10 release --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c8e9a816..443e855b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -475,7 +475,7 @@ packages: - type-map "Tobias Dammers @tdammers": - - ginger < 0 # via regex-tdfa-1.3.0 + - ginger - yeshql < 0 # via yeshql-hdbc "Yair Chuchem @yairchu": From ba9264f0153a82a5083fcd7f453910325ab8b760 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 19 May 2020 10:51:18 +0800 Subject: [PATCH 14/45] add ghc-byteorder for base64-0.4.2 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index c8e9a816..c663f471 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4406,6 +4406,7 @@ packages: - functor-combinators < 0 # via dependent-sum - generic-arbitrary - generics-sop-lens + - ghc-byteorder - ghc-compact - ghc-paths - ghc-prof From e243a37f64deeab106579783eaf502bbd41446ce Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 19 May 2020 10:52:12 +0800 Subject: [PATCH 15/45] remove some spaces --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c663f471..4b74e9d2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4241,7 +4241,7 @@ packages: "Rickey Visinski @rickeyski": - slack-api - + "Dobromir Nikolov @dnikolovv": - it-has From 9ba15fcde0fdb78fca104d7e8d230576f85474f3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 19 May 2020 10:58:47 +0800 Subject: [PATCH 16/45] simplify remove-old-stack-work-libs.hs more --- etc/diskspace/remove-old-stack-work-libs.hs | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/etc/diskspace/remove-old-stack-work-libs.hs b/etc/diskspace/remove-old-stack-work-libs.hs index 7e81b5e7..210e5a1a 100755 --- a/etc/diskspace/remove-old-stack-work-libs.hs +++ b/etc/diskspace/remove-old-stack-work-libs.hs @@ -8,11 +8,12 @@ import Data.List import System.Directory +import System.FilePath main = do files <- sort <$> listDirectory "." - (libdirs,dynlibs) <- partitionM doesDirectoryExist files - let pkglibdirs = groupBy samePkgLibDir libdirs + let (dynlibs,libdirs) = partition (".so" `isExtensionOf`) files + pkglibdirs = groupBy samePkgLibDir libdirs pkgdynlibs = groupBy samePkgDynLib dynlibs mapM_ (removeOlder removeDirectoryRecursive) pkglibdirs mapM_ (removeOlder removeFile) pkgdynlibs @@ -32,10 +33,11 @@ main = do where pkgDynName p = if countDashes p < 3 - then error $ p ++ " not in libname-version-hash-ghc*.so format" + then error $ p ++ " not in libHSname-version-hash-ghc*.so format" else (removeDashSegment . removeDashSegment . removeDashSegment) p removeOlder remover files = do + -- keep 2 latest builds oldfiles <- drop 2 . reverse <$> sortByAge files mapM_ remover oldfiles @@ -45,11 +47,3 @@ main = do return $ map fst $ sortBy compareSnd fileTimes compareSnd (_,t1) (_,t2) = compare t1 t2 - --- borrowed from Control.Monad.Extra -partitionM :: Monad m => (a -> m Bool) -> [a] -> m ([a], [a]) -partitionM f [] = pure ([], []) -partitionM f (x:xs) = do - res <- f x - (as,bs) <- partitionM f xs - pure ([x | res]++as, [x | not res]++bs) From 6c6708be00b3cb0dbb2b83c06e457c8d1ec61e66 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 19 May 2020 11:22:37 +0800 Subject: [PATCH 17/45] remove-old-stack-work-libs.hs: check more carefully for libdir hash to avoid accidents, eg if run in wrong directory --- etc/diskspace/remove-old-stack-work-libs.hs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/etc/diskspace/remove-old-stack-work-libs.hs b/etc/diskspace/remove-old-stack-work-libs.hs index 210e5a1a..f99d0ebd 100755 --- a/etc/diskspace/remove-old-stack-work-libs.hs +++ b/etc/diskspace/remove-old-stack-work-libs.hs @@ -23,7 +23,9 @@ main = do pkgDirName p = if countDashes p < 2 then error $ p ++ " not in name-version-hash format" - else (removeDashSegment . removeDashSegment) p + else let nv_ = dropEnd 22 p in + if last nv_ == '-' then removeDashSegment $ init nv_ + else error $ p ++ " not in name-version-hash format" countDashes = length . filter (== '-') @@ -47,3 +49,9 @@ main = do return $ map fst $ sortBy compareSnd fileTimes compareSnd (_,t1) (_,t2) = compare t1 t2 + +-- from Data.List.Extra +dropEnd :: Int -> [a] -> [a] +dropEnd i xs = f xs (drop i xs) + where f (x:xs) (y:ys) = x : f xs ys + f _ _ = [] From c69a73c559c3aba21ef9f2e4b842eeb262511c1e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 19 May 2020 11:36:41 +0800 Subject: [PATCH 18/45] remove-old-stack-work-libs.hs: check hash length for more safety --- etc/diskspace/remove-old-stack-work-libs.hs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/etc/diskspace/remove-old-stack-work-libs.hs b/etc/diskspace/remove-old-stack-work-libs.hs index f99d0ebd..3411ba53 100755 --- a/etc/diskspace/remove-old-stack-work-libs.hs +++ b/etc/diskspace/remove-old-stack-work-libs.hs @@ -21,22 +21,24 @@ main = do samePkgLibDir l1 l2 = pkgDirName l1 == pkgDirName l2 where pkgDirName p = - if countDashes p < 2 + if length p < 26 || countDashes p < 2 then error $ p ++ " not in name-version-hash format" - else let nv_ = dropEnd 22 p in - if last nv_ == '-' then removeDashSegment $ init nv_ - else error $ p ++ " not in name-version-hash format" + else (removeDashSegment . removeHashSegment) p countDashes = length . filter (== '-') removeDashSegment = init . dropWhileEnd (/= '-') + removeHashSegment p = let nv_ = dropEnd 22 p in + if last nv_ == '-' then init nv_ + else error $ p ++ " has incorrect hash format" + samePkgDynLib d1 d2 = pkgDynName d1 == pkgDynName d2 where pkgDynName p = - if countDashes p < 3 + if length p < 43 || countDashes p < 3 then error $ p ++ " not in libHSname-version-hash-ghc*.so format" - else (removeDashSegment . removeDashSegment . removeDashSegment) p + else (removeDashSegment . removeHashSegment . removeDashSegment) p removeOlder remover files = do -- keep 2 latest builds From fda199ba9fe84612bf904ea4e049fe5102167eb7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 19 May 2020 12:19:08 +0800 Subject: [PATCH 19/45] remove-old-stack-work-libs.hs: hashes are either 22 or 21 chars --- etc/diskspace/remove-old-stack-work-libs.hs | 27 +++++++++------------ 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/etc/diskspace/remove-old-stack-work-libs.hs b/etc/diskspace/remove-old-stack-work-libs.hs index 3411ba53..798d4e96 100755 --- a/etc/diskspace/remove-old-stack-work-libs.hs +++ b/etc/diskspace/remove-old-stack-work-libs.hs @@ -7,6 +7,7 @@ -- work/*/unpack-dir/.stack-work/install/x86_64-linux/*/*/lib/x86_64-linux-ghc-* import Data.List +import Data.List.Extra import System.Directory import System.FilePath @@ -21,23 +22,25 @@ main = do samePkgLibDir l1 l2 = pkgDirName l1 == pkgDirName l2 where pkgDirName p = - if length p < 26 || countDashes p < 2 - then error $ p ++ " not in name-version-hash format" + if length p < 25 + then error $ p ++ " too short to be in correct name-version-hash format" else (removeDashSegment . removeHashSegment) p - countDashes = length . filter (== '-') + removeHashSegment p = + let dashes = elemIndices '-' p in + if length dashes < 2 + then error $ p ++ " not in name-version-hash format" + else let final = last dashes in + if length p - final `elem` [22,23] then take final p + else error $ p ++ " has incorrect hash length" removeDashSegment = init . dropWhileEnd (/= '-') - removeHashSegment p = let nv_ = dropEnd 22 p in - if last nv_ == '-' then init nv_ - else error $ p ++ " has incorrect hash format" - samePkgDynLib d1 d2 = pkgDynName d1 == pkgDynName d2 where pkgDynName p = - if length p < 43 || countDashes p < 3 - then error $ p ++ " not in libHSname-version-hash-ghc*.so format" + if length p < 42 + then error $ p ++ " too short to be libHSname-version-hash-ghc*.so format" else (removeDashSegment . removeHashSegment . removeDashSegment) p removeOlder remover files = do @@ -51,9 +54,3 @@ main = do return $ map fst $ sortBy compareSnd fileTimes compareSnd (_,t1) (_,t2) = compare t1 t2 - --- from Data.List.Extra -dropEnd :: Int -> [a] -> [a] -dropEnd i xs = f xs (drop i xs) - where f (x:xs) (y:ys) = x : f xs ys - f _ _ = [] From 6383d6e6fdf9622baeed8ffa6331b4084685665d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 19 May 2020 12:23:02 +0800 Subject: [PATCH 20/45] remove-old-stack-work-libs.hs: hash can also be 20 chars! --- etc/diskspace/remove-old-stack-work-libs.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/diskspace/remove-old-stack-work-libs.hs b/etc/diskspace/remove-old-stack-work-libs.hs index 798d4e96..77388d8e 100755 --- a/etc/diskspace/remove-old-stack-work-libs.hs +++ b/etc/diskspace/remove-old-stack-work-libs.hs @@ -31,7 +31,7 @@ main = do if length dashes < 2 then error $ p ++ " not in name-version-hash format" else let final = last dashes in - if length p - final `elem` [22,23] then take final p + if length p - final `elem` [23,22,21] then take final p else error $ p ++ " has incorrect hash length" removeDashSegment = init . dropWhileEnd (/= '-') From 3ced32f3430a2bcfabb314695c837b88693ed68d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 19 May 2020 12:47:25 +0800 Subject: [PATCH 21/45] remove-old-stack-work-libs.hs: ignore internal libs for now --- etc/diskspace/remove-old-stack-work-libs.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/etc/diskspace/remove-old-stack-work-libs.hs b/etc/diskspace/remove-old-stack-work-libs.hs index 77388d8e..50009d8d 100755 --- a/etc/diskspace/remove-old-stack-work-libs.hs +++ b/etc/diskspace/remove-old-stack-work-libs.hs @@ -14,8 +14,10 @@ import System.FilePath main = do files <- sort <$> listDirectory "." let (dynlibs,libdirs) = partition (".so" `isExtensionOf`) files - pkglibdirs = groupBy samePkgLibDir libdirs - pkgdynlibs = groupBy samePkgDynLib dynlibs + pkglibdirs = groupBy samePkgLibDir $ + filter (not . ("-internal" `isSuffixOf`)) libdirs + pkgdynlibs = groupBy samePkgDynLib $ + filter (not . ("-internal-" `isInfixOf`)) dynlibs mapM_ (removeOlder removeDirectoryRecursive) pkglibdirs mapM_ (removeOlder removeFile) pkgdynlibs where From 790362013b093c98d64fdefaa9bba79b4ca1a9fb Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 19 May 2020 13:34:42 +0800 Subject: [PATCH 22/45] remove-old-stack-work-libs.hs: use regexp to handle internal libraries regexp match filters out "-ver-hash" --- etc/diskspace/remove-old-stack-work-libs.hs | 27 +++++++++------------ 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/etc/diskspace/remove-old-stack-work-libs.hs b/etc/diskspace/remove-old-stack-work-libs.hs index 50009d8d..2a85942e 100755 --- a/etc/diskspace/remove-old-stack-work-libs.hs +++ b/etc/diskspace/remove-old-stack-work-libs.hs @@ -7,17 +7,15 @@ -- work/*/unpack-dir/.stack-work/install/x86_64-linux/*/*/lib/x86_64-linux-ghc-* import Data.List -import Data.List.Extra import System.Directory import System.FilePath +import Text.Regex.TDFA main = do files <- sort <$> listDirectory "." let (dynlibs,libdirs) = partition (".so" `isExtensionOf`) files - pkglibdirs = groupBy samePkgLibDir $ - filter (not . ("-internal" `isSuffixOf`)) libdirs - pkgdynlibs = groupBy samePkgDynLib $ - filter (not . ("-internal-" `isInfixOf`)) dynlibs + pkglibdirs = groupBy samePkgLibDir libdirs + pkgdynlibs = groupBy samePkgDynLib dynlibs mapM_ (removeOlder removeDirectoryRecursive) pkglibdirs mapM_ (removeOlder removeFile) pkgdynlibs where @@ -26,24 +24,21 @@ main = do pkgDirName p = if length p < 25 then error $ p ++ " too short to be in correct name-version-hash format" - else (removeDashSegment . removeHashSegment) p + else extractNameInternal p - removeHashSegment p = - let dashes = elemIndices '-' p in - if length dashes < 2 - then error $ p ++ " not in name-version-hash format" - else let final = last dashes in - if length p - final `elem` [23,22,21] then take final p - else error $ p ++ " has incorrect hash length" - - removeDashSegment = init . dropWhileEnd (/= '-') + extractNameInternal :: String -> String + extractNameInternal p = + let (name,_,internal) = p =~ "-[0-9.]+-[0-9A-Za-z]{20,22}" :: (String, String, String) + in name ++ internal samePkgDynLib d1 d2 = pkgDynName d1 == pkgDynName d2 where pkgDynName p = if length p < 42 then error $ p ++ " too short to be libHSname-version-hash-ghc*.so format" - else (removeDashSegment . removeHashSegment . removeDashSegment) p + else (extractNameInternal . removeDashSegment) p + + removeDashSegment = dropWhileEnd (/= '-') removeOlder remover files = do -- keep 2 latest builds From 86e5490e70a2aa9ffae5805ceba47f18eada0efb Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 19 May 2020 14:00:27 +0800 Subject: [PATCH 23/45] path-0.7.1 broke a couple of packages (commercialhaskell/path#161) --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4b74e9d2..10b16393 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4837,6 +4837,8 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5351 - pantry < 0.5 + # https://github.com/commercialhaskell/path/issues/161 + - path < 0.7.1 # end of packages # Package flags are applied to individual packages, and override the values of From f905c9455dcfb41815174b1beec824232477ec09 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 19 May 2020 14:08:36 +0800 Subject: [PATCH 24/45] remove-old-stack-work-libs.hs: need to check regexp match result --- etc/diskspace/remove-old-stack-work-libs.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/etc/diskspace/remove-old-stack-work-libs.hs b/etc/diskspace/remove-old-stack-work-libs.hs index 2a85942e..a2cd4e3b 100755 --- a/etc/diskspace/remove-old-stack-work-libs.hs +++ b/etc/diskspace/remove-old-stack-work-libs.hs @@ -28,8 +28,9 @@ main = do extractNameInternal :: String -> String extractNameInternal p = - let (name,_,internal) = p =~ "-[0-9.]+-[0-9A-Za-z]{20,22}" :: (String, String, String) - in name ++ internal + let (name,match,internal) = p =~ "-[0-9.]+-[0-9A-Za-z]{20,22}" :: (String, String, String) + in if null match || null name then error $ p ++ " not in correct name-version-hash format" + else name ++ internal samePkgDynLib d1 d2 = pkgDynName d1 == pkgDynName d2 where From 2c27b690d8251a316584ee5a7b3920f8f3340c39 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 19 May 2020 14:18:58 +0800 Subject: [PATCH 25/45] haskoin-core-0.13.5 haddock error (haskoin/haskoin-core#385) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 10b16393..36786155 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4035,7 +4035,7 @@ packages: - secp256k1-haskell - rocksdb-haskell - rocksdb-query - - haskoin-core + - haskoin-core < 0.13.5 # https://github.com/haskoin/haskoin-core/issues/385 - haskoin-node - haskoin-store < 0 # https://github.com/haskoin/haskoin-store/issues/12 From 95b3cae91d44be7d23f8f3b906231d43b0b9adfc Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 19 May 2020 14:29:07 +0800 Subject: [PATCH 26/45] etc/diskspace/clean-old-stack-libs.sh wrapper shell script --- etc/diskspace/clean-old-stack-libs.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 etc/diskspace/clean-old-stack-libs.sh diff --git a/etc/diskspace/clean-old-stack-libs.sh b/etc/diskspace/clean-old-stack-libs.sh new file mode 100644 index 00000000..06216b94 --- /dev/null +++ b/etc/diskspace/clean-old-stack-libs.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +if [ $# != 1 ]; then + echo "Usage: $0 [nightly|lts-xx]" + exit 1 +fi + +popd ~/stackage/automated/work/$1/unpack-dir/.stack-work/install/x86_64-linux/*/*/lib/x86_64-linux-ghc-* + +~/stackage/etc/diskspace/remove-old-stack-work-libs.hs From ca686bacd18c2a95a314a23b95e0a708ca42aba8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 19 May 2020 15:24:13 +0800 Subject: [PATCH 27/45] clean-old-stack-libs.sh: pushd to show dir and run stack script - bail if error - make shell script executable instead --- etc/diskspace/clean-old-stack-libs.sh | 8 ++++++-- etc/diskspace/remove-old-stack-work-libs.hs | 0 2 files changed, 6 insertions(+), 2 deletions(-) mode change 100644 => 100755 etc/diskspace/clean-old-stack-libs.sh mode change 100755 => 100644 etc/diskspace/remove-old-stack-work-libs.hs diff --git a/etc/diskspace/clean-old-stack-libs.sh b/etc/diskspace/clean-old-stack-libs.sh old mode 100644 new mode 100755 index 06216b94..18b5606b --- a/etc/diskspace/clean-old-stack-libs.sh +++ b/etc/diskspace/clean-old-stack-libs.sh @@ -1,10 +1,14 @@ #!/bin/sh +set -e + if [ $# != 1 ]; then echo "Usage: $0 [nightly|lts-xx]" exit 1 fi -popd ~/stackage/automated/work/$1/unpack-dir/.stack-work/install/x86_64-linux/*/*/lib/x86_64-linux-ghc-* +SRCDIR=$(dirname $0) -~/stackage/etc/diskspace/remove-old-stack-work-libs.hs +pushd ~/stackage/automated/work/$1/unpack-dir/.stack-work/install/x86_64-linux/*/*/lib/x86_64-linux-ghc-* + +stack --resolver lts-14 script ${SRCDIR}/remove-old-stack-work-libs.hs diff --git a/etc/diskspace/remove-old-stack-work-libs.hs b/etc/diskspace/remove-old-stack-work-libs.hs old mode 100755 new mode 100644 From dbdb2fcb86719854306d74477ffd1c8b34d8079c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 19 May 2020 15:28:29 +0800 Subject: [PATCH 28/45] clean-old-stack-libs.sh: pushd seems a bashism --- etc/diskspace/clean-old-stack-libs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/diskspace/clean-old-stack-libs.sh b/etc/diskspace/clean-old-stack-libs.sh index 18b5606b..761f9a67 100755 --- a/etc/diskspace/clean-old-stack-libs.sh +++ b/etc/diskspace/clean-old-stack-libs.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e From 120b5380e01beb6ff40fd773c97b578a3e91f48e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 19 May 2020 15:31:42 +0800 Subject: [PATCH 29/45] clean-old-stack-libs.sh: don't be clever with relpaths --- etc/diskspace/clean-old-stack-libs.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/etc/diskspace/clean-old-stack-libs.sh b/etc/diskspace/clean-old-stack-libs.sh index 761f9a67..1d306b3d 100755 --- a/etc/diskspace/clean-old-stack-libs.sh +++ b/etc/diskspace/clean-old-stack-libs.sh @@ -7,8 +7,6 @@ if [ $# != 1 ]; then exit 1 fi -SRCDIR=$(dirname $0) - pushd ~/stackage/automated/work/$1/unpack-dir/.stack-work/install/x86_64-linux/*/*/lib/x86_64-linux-ghc-* -stack --resolver lts-14 script ${SRCDIR}/remove-old-stack-work-libs.hs +stack --resolver lts-14 script ~/stackage/etc/diskspace/remove-old-stack-work-libs.hs From 4c3b80487e2a52ddf76b5223d1f140a2a94a3d8f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 19 May 2020 15:45:48 +0800 Subject: [PATCH 30/45] clean-old-stack-libs.sh: lts-14.27 and use cd/pwd --- etc/diskspace/clean-old-stack-libs.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/etc/diskspace/clean-old-stack-libs.sh b/etc/diskspace/clean-old-stack-libs.sh index 1d306b3d..e63044f9 100755 --- a/etc/diskspace/clean-old-stack-libs.sh +++ b/etc/diskspace/clean-old-stack-libs.sh @@ -7,6 +7,7 @@ if [ $# != 1 ]; then exit 1 fi -pushd ~/stackage/automated/work/$1/unpack-dir/.stack-work/install/x86_64-linux/*/*/lib/x86_64-linux-ghc-* +cd ~/stackage/automated/work/$1/unpack-dir/.stack-work/install/x86_64-linux/*/*/lib/x86_64-linux-ghc-* +pwd -stack --resolver lts-14 script ~/stackage/etc/diskspace/remove-old-stack-work-libs.hs +stack --resolver lts-14.27 script ~/stackage/etc/diskspace/remove-old-stack-work-libs.hs From e808040015a2cc64ec193a2e890156af0e9cb478 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 19 May 2020 15:49:57 +0800 Subject: [PATCH 31/45] CURATORS: recommend using etc/diskspace/clean-old-stack-libs.sh --- CURATORS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CURATORS.md b/CURATORS.md index 89ee5394..da594cb2 100644 --- a/CURATORS.md +++ b/CURATORS.md @@ -335,9 +335,9 @@ LTS minor bumps typically are run on Sundays. ### Diskspace errors (and website sync debugging) -* You can detect the problem by running `df`. If you see that `/` is out of space, we have a problem +* You can detect the problem by running `df`. If you see that `/` is out of space, we have a problem. * If you see that `/var/stackage/` is out of space, you can: - * run `./stackage/etc/diskspace/remove-old-stack-work-libs.hs` in `/var/stackage/stackage/automated/work/*/unpack-dir/.stack-work/install/x86_64-linux/*/*/` (hopefully sufficient) + * run `./etc/diskspace/clean-old-stack-libs.sh [nightly|lts-XX]` (hopefully sufficient) optionally (not recommended?): * `rm -r /var/stackage/stackage/automated/work/lts*/unpack-dir/unpacked/` From ac8bd86f3752ab920a1d006b85acbd9b18889ae3 Mon Sep 17 00:00:00 2001 From: charukiewicz Date: Tue, 19 May 2020 17:43:02 -0500 Subject: [PATCH 32/45] add isbn --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 36786155..c37a994f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -9,6 +9,9 @@ cabal-format-version: "3.0" # Constraints for brand new builds packages: + "Christian Charukiewicz @charukiewicz": + - isbn + "Ashlynn Anderson @lambdadog": - proto3-wire From ea678af55a4d7c51aa41c54d5684c2b25ee9a82f Mon Sep 17 00:00:00 2001 From: Colin Woodbury Date: Wed, 20 May 2020 13:35:57 -0700 Subject: [PATCH 33/45] Add aura --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 36786155..fa20654a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1217,6 +1217,7 @@ packages: "Colin Woodbury @fosskers": - aur + - aura - bounded-queue - kanji - language-bash From 4b3b026633a77d042c72fcce221f0cf01e9670e4 Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Thu, 21 May 2020 19:11:13 +0000 Subject: [PATCH 34/45] Restrict numhask < 0.5 (#5382) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 36786155..932a3174 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3263,7 +3263,7 @@ packages: - validation "Tony Day @tonyday567": - - numhask + - numhask < 0.5 # https://github.com/commercialhaskell/stackage/issues/5382 - numhask-array < 0 - numhask-prelude < 0 - numhask-space < 0 From bd930c230eb0d57fbcf0aec288e21159ae220821 Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Thu, 21 May 2020 19:24:16 +0000 Subject: [PATCH 35/45] Unrestricts validation-selective (#5346) --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 932a3174..72e2574d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4824,9 +4824,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5347 - persistent-template < 2.8.3 - # https://github.com/commercialhaskell/stackage/issues/5346 - - validation-selective < 0.1.0.0 - # https://github.com/commercialhaskell/stackage/issues/5348 - tasty < 1.3 - tasty-golden < 2.3.3.3 From 34e0237f1d0978162f665b5a7222e69978963c56 Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Thu, 21 May 2020 19:25:18 +0000 Subject: [PATCH 36/45] Unrestricts relude (#5361) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 72e2574d..c0d318d7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3622,7 +3622,7 @@ packages: - ilist - life-sync - membrain - - relude < 0.7 # https://github.com/commercialhaskell/stackage/issues/5361 + - relude - shellmet - shortcut-links - summoner From 26c967c04c8faf4ce7949051fa38e42a89d06393 Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Thu, 21 May 2020 19:26:04 +0000 Subject: [PATCH 37/45] Unrestricts colourista (#5336) --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c0d318d7..ddc73e50 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4818,9 +4818,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5335 - brick <0.53 - # https://github.com/commercialhaskell/stackage/issues/5336 - - colourista < 0.1.0.0 - # https://github.com/commercialhaskell/stackage/issues/5347 - persistent-template < 2.8.3 From 1a8092c1fc4db1fce1b8d9dd34cb369ab22c1398 Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Thu, 21 May 2020 19:30:52 +0000 Subject: [PATCH 38/45] Restricts postgrest < 7.0.1 (#5383) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ddc73e50..7d59a532 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -83,7 +83,7 @@ packages: "Robert Vollmert @robx": - configurator-pg - - postgrest + - postgrest < 7.0.1 # https://github.com/commercialhaskell/stackage/issues/5383 "Sandy Maguire @isovector": - ecstasy From 92408690d5927c25c99323eacb04f9aab3639f58 Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Thu, 21 May 2020 19:32:36 +0000 Subject: [PATCH 39/45] Restricts declarative < 0.5.2 (#5384) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7d59a532..ab065b64 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2586,7 +2586,7 @@ packages: - mighty-metropolis - speedy-slice - hasty-hamiltonian - - declarative + - declarative < 0.5.2 # https://github.com/commercialhaskell/stackage/issues/5384 - sampling - flat-mcmc - urbit-hob From 4cf80ec3ee9283f2c6c064d9d3144b237b32643f Mon Sep 17 00:00:00 2001 From: Lucas David Traverso Date: Tue, 19 May 2020 01:10:44 -0300 Subject: [PATCH 40/45] Removed contraints caused by deprecated packages conferer-provider-json was deprecated in favor of conferer-source-json, the former caused constraints on conferer-* packages that are not necessary --- build-constraints.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4b74e9d2..77e0a171 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3865,11 +3865,11 @@ packages: - map-syntax < 0 # GHC 8.4 via base-4.11.0.0 - heist < 0 # GHC 8.4 via map-syntax - snap < 0 # GHC 8.4 via base-4.11.0.0 - - conferer < 0.4.0.0 # https://github.com/commercialhaskell/stackage/issues/5374 - # - conferer-snap # Because snap - - conferer-warp < 0.4.0.0 # https://github.com/commercialhaskell/stackage/issues/5374 - - conferer-hspec < 0.4.0.0 # https://github.com/commercialhaskell/stackage/issues/5374 - - conferer-provider-json + - conferer + #- conferer-snap # Because snap + - conferer-warp + - conferer-hspec + - conferer-source-json "Tim Humphries @thumphries": - transformers-either < 0 # via exceptions-0.10.0 From 99d22cdb0210b1fe5b8ee4cf1b7fa427e0fc7bda Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Fri, 22 May 2020 04:06:56 +0000 Subject: [PATCH 41/45] Restricts morpheus-graphql < 0.12 (#5385) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ab065b64..587f3b60 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4172,7 +4172,7 @@ packages: - minimal-configuration "Davit Nalchevanidze @nalchevanidze": - - morpheus-graphql + - morpheus-graphql < 0.12 # https://github.com/commercialhaskell/stackage/issues/5385 "Satoshi Egi @egisatoshi": - egison From 1f714994b6f739ce8f470ecce61e406394b22a3e Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Fri, 22 May 2020 04:32:02 +0000 Subject: [PATCH 42/45] Restricts mighty-metropolis (#5384) --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 587f3b60..ea3aa271 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2583,10 +2583,10 @@ packages: "Jared Tobin @jtobin": - mwc-probability - mcmc-types - - mighty-metropolis + - mighty-metropolis < 2 # https://github.com/commercialhaskell/stackage/issues/5384 - speedy-slice - hasty-hamiltonian - - declarative < 0.5.2 # https://github.com/commercialhaskell/stackage/issues/5384 + - declarative - sampling - flat-mcmc - urbit-hob From 71bc219be021048378b70d0d632d3dfd90c3c286 Mon Sep 17 00:00:00 2001 From: Jared Tobin Date: Fri, 22 May 2020 08:52:20 +0400 Subject: [PATCH 43/45] Remove mighty-metropolis < 2 constraint. --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ea3aa271..3a42b58c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2583,7 +2583,7 @@ packages: "Jared Tobin @jtobin": - mwc-probability - mcmc-types - - mighty-metropolis < 2 # https://github.com/commercialhaskell/stackage/issues/5384 + - mighty-metropolis - speedy-slice - hasty-hamiltonian - declarative From f264854459f395c107af1640f6dbacfc5fef132f Mon Sep 17 00:00:00 2001 From: david Date: Fri, 22 May 2020 10:37:38 +0200 Subject: [PATCH 44/45] add morpheus graphql (core , client) --- build-constraints.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ea3aa271..a0eaf38f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4172,7 +4172,9 @@ packages: - minimal-configuration "Davit Nalchevanidze @nalchevanidze": - - morpheus-graphql < 0.12 # https://github.com/commercialhaskell/stackage/issues/5385 + - morpheus-graphql + - morpheus-graphql-core + - morpheus-graphql-client "Satoshi Egi @egisatoshi": - egison From 205b2bd4d6ddc9a08d17a1224e3ec2f1ae723566 Mon Sep 17 00:00:00 2001 From: david Date: Fri, 22 May 2020 11:03:06 +0200 Subject: [PATCH 45/45] remove morpheus-graphql-client --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index a0eaf38f..77a0ddb8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4174,7 +4174,6 @@ packages: "Davit Nalchevanidze @nalchevanidze": - morpheus-graphql - morpheus-graphql-core - - morpheus-graphql-client "Satoshi Egi @egisatoshi": - egison