From e41f270233a3fc21ddb16b7a718ec37cd8cdf675 Mon Sep 17 00:00:00 2001 From: Vanessa McHale Date: Thu, 28 Mar 2019 17:06:13 -0500 Subject: [PATCH 1/4] Bump package bounds --- threadscope.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/threadscope.cabal b/threadscope.cabal index b542775b..72fc60f1 100644 --- a/threadscope.cabal +++ b/threadscope.cabal @@ -47,7 +47,7 @@ source-repository head Executable threadscope Main-is: Main.hs Build-Depends: base >= 4.6 && < 5, - gtk >= 0.12 && < 0.15, + gtk >= 0.12 && < 0.16, cairo < 0.14, glib < 0.14, pango < 0.14, @@ -62,7 +62,7 @@ Executable threadscope time >= 1.1 && < 1.10, bytestring < 0.11, file-embed < 0.1, - template-haskell < 2.14, + template-haskell < 2.15, temporary >= 1.1 && < 1.4 if os(osx) build-depends: gtk-mac-integration < 0.4 From e5ab1df7df8f32806315e477e27164dba57c3a2a Mon Sep 17 00:00:00 2001 From: Vanessa McHale Date: Thu, 28 Mar 2019 17:07:50 -0500 Subject: [PATCH 2/4] Bump binary package bound --- threadscope.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/threadscope.cabal b/threadscope.cabal index 72fc60f1..fcabae79 100644 --- a/threadscope.cabal +++ b/threadscope.cabal @@ -51,7 +51,7 @@ Executable threadscope cairo < 0.14, glib < 0.14, pango < 0.14, - binary < 0.10, + binary < 0.11, array < 0.6, mtl < 2.3, filepath < 1.5, From d7e6277a048142bb8e48177ac38e44667ede1899 Mon Sep 17 00:00:00 2001 From: Vanessa McHale Date: Thu, 28 Mar 2019 18:48:45 -0500 Subject: [PATCH 3/4] Try to fix travis script --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a5d6b27e..84131a9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,7 +87,7 @@ install: script: # test that source-distributions can be generated - (cd "." && cabal sdist) - - mv "."/dist/threadscope-*.tar.gz ${DISTDIR}/ + - mv "."/dist-newstyle/threadscope-*.tar.gz ${DISTDIR}/ - cd ${DISTDIR} || false - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \; - "printf 'packages: threadscope-*/*.cabal\\n' > cabal.project" From 14b6add084feb9cefe591176dcf6af302b28557e Mon Sep 17 00:00:00 2001 From: Vanessa McHale Date: Thu, 28 Mar 2019 19:17:01 -0500 Subject: [PATCH 4/4] Fix travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 84131a9c..f0a26335 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,7 +87,7 @@ install: script: # test that source-distributions can be generated - (cd "." && cabal sdist) - - mv "."/dist-newstyle/threadscope-*.tar.gz ${DISTDIR}/ + - mv "."/dist-newstyle/sdist/threadscope-*.tar.gz ${DISTDIR}/ - cd ${DISTDIR} || false - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \; - "printf 'packages: threadscope-*/*.cabal\\n' > cabal.project"