From 02eca2ae4cf51d8e83d94d8359e15ac053451109 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 23 Apr 2018 13:56:56 -0400 Subject: Added dependency on concurrent-output; removed embedded copy. Removed deps on transformers, text, stm. Updated debian/control and Propellor.Bootstrap accordingly. Sorted the lists of deps to make it easier to keep them in sync. This commit was sponsored by Nick Daly on Patreon. --- debian/changelog | 1 + debian/control | 32 ++++++++++++++------------------ 2 files changed, 15 insertions(+), 18 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index cb8ed552..729eed4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ propellor (5.3.6) UNRELEASED; urgency=medium * Dropped support for building propellor with ghc 7 (as in debian oldstable), to avoid needing to depend on the semigroups transitional package, but also because it's just too old to be worth supporting. + * Added dependency on concurrent-output; removed embedded copy. -- Joey Hess Mon, 23 Apr 2018 13:12:25 -0400 diff --git a/debian/control b/debian/control index 5a041c90..77bd7eae 100644 --- a/debian/control +++ b/debian/control @@ -6,19 +6,17 @@ Build-Depends: git, ghc (>= 7.6), cabal-install, + libghc-ansi-terminal-dev, libghc-async-dev, - libghc-split-dev, + libghc-concurrent-output-dev, + libghc-exceptions-dev (>= 0.6), + libghc-hashable-dev, libghc-hslogger-dev, - libghc-unix-compat-dev, - libghc-ansi-terminal-dev, libghc-ifelse-dev, - libghc-network-dev, libghc-mtl-dev, - libghc-transformers-dev, - libghc-exceptions-dev (>= 0.6), - libghc-stm-dev, - libghc-text-dev, - libghc-hashable-dev, + libghc-network-dev, + libghc-split-dev, + libghc-unix-compat-dev, Maintainer: Joey Hess Standards-Version: 3.9.8 Vcs-Git: git://git.joeyh.name/propellor @@ -30,19 +28,17 @@ Section: admin Depends: ${misc:Depends}, ${shlibs:Depends}, ghc (>= 7.4), cabal-install, + libghc-ansi-terminal-dev, libghc-async-dev, - libghc-split-dev, + libghc-concurrent-output-dev, + libghc-exceptions-dev (>= 0.6), + libghc-hashable-dev, libghc-hslogger-dev, - libghc-unix-compat-dev, - libghc-ansi-terminal-dev, libghc-ifelse-dev, - libghc-network-dev, libghc-mtl-dev, - libghc-transformers-dev, - libghc-exceptions-dev (>= 0.6), - libghc-stm-dev, - libghc-text-dev, - libghc-hashable-dev, + libghc-network-dev, + libghc-split-dev, + libghc-unix-compat-dev, git, Description: property-based host configuration management in haskell Propellor ensures that the system it's run in satisfies a list of -- cgit v1.3-2-g0d8e From 237a8a8b7035447f83731bf83d236c31d6a89e88 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 23 Apr 2018 14:49:03 -0400 Subject: stack.yaml: Updated to lts-9.21. Also tested with lts-11.6 / ghc 8.2.2 and it does build, however the stack in debian stable (and even unstable currently) does not support that version's data. --- debian/changelog | 1 + src/Propellor/DotDir.hs | 2 +- stack.yaml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 729eed4f..42871285 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ propellor (5.3.6) UNRELEASED; urgency=medium oldstable), to avoid needing to depend on the semigroups transitional package, but also because it's just too old to be worth supporting. * Added dependency on concurrent-output; removed embedded copy. + * stack.yaml: Updated to lts-9.21. -- Joey Hess Mon, 23 Apr 2018 13:12:25 -0400 diff --git a/src/Propellor/DotDir.hs b/src/Propellor/DotDir.hs index dc881eeb..749fcd9f 100644 --- a/src/Propellor/DotDir.hs +++ b/src/Propellor/DotDir.hs @@ -316,7 +316,7 @@ minimalConfig = do ] stackResolver :: String -stackResolver = "lts-8.22" +stackResolver = "lts-9.21" fullClone :: IO Result fullClone = do diff --git a/stack.yaml b/stack.yaml index f7377cc7..eb243950 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ # When updating the resolver here, also update stackResolver in Propellor.DotDir -resolver: lts-8.22 +resolver: lts-9.21 packages: - '.' -- cgit v1.3-2-g0d8e