From 015b8da0e18afb5fe860a3d9dab2ad3f0d5e250f Mon Sep 17 00:00:00 2001 From: Dmitry Dzhus Date: Mon, 16 Jul 2018 11:59:22 +0100 Subject: [PATCH 1/2] Re-enable csg benchmarks csg-0.1.0.4 allows criterion-1.5.0.0 --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6d3cb707..f6f89405 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4234,7 +4234,6 @@ skipped-benchmarks: - avers # criterion 1.3 - binary-parsers # criterion 1.2 - cryptohash-sha512 # criterion 1.2 - - csg # via criterion-1.5.0.0 - heist # criterion 1.3 - hw-rankselect # via criterion-1.5.0.0 - identicon # via criterion-1.5.0.0 From 84bd58cf17a09d1ff6bd122b1dcdaf2c77e43358 Mon Sep 17 00:00:00 2001 From: Dmitry Dzhus Date: Mon, 16 Jul 2018 12:00:04 +0100 Subject: [PATCH 2/2] M-x whitespace-cleanup --- build-constraints.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f6f89405..80e990be 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -264,7 +264,7 @@ packages: - boltzmann-samplers - generic-data - generic-random - - scanf + - scanf - show-combinators "Tobias Dammers @tdammers": @@ -3501,7 +3501,7 @@ packages: "Owen Lynch @olynch": - natural-sort - + "John Biesnecker @biesnecker": - async-pool @@ -3593,7 +3593,7 @@ packages: # https://github.com/commercialhaskell/stackage/issues/3787 - semigroupoids < 5.3 - # needed by foldl, in turn needed by many others (mono-traversable, + # needed by foldl, in turn needed by many others (mono-traversable, # turtle, etc.) # https://github.com/commercialhaskell/stackage/issues/3828 - mwc-random < 0.14