summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-04-30Revert "Added dependency on concurrent-output; removed embedded copy."Joey Hess
This reverts commit 02eca2ae4cf51d8e83d94d8359e15ac053451109. This seems to have broken propellor badly, in testing I'm seeing it crash at the end of a run with "thread blocked indefinitely in an STM transaction" and also during the run it printed out some odd output like: apache2: apache2: dummy IN SSHFP 4 1 35df80973f5877e4041f1b70947385eb2f6a0822 dummy IN SSHFP 4 2 3a0bb426e76eebc5c56e3b0f1428aa9d18539e9621bf8f9e3b7f56a4e7d81c85 Which seems like it might be output of commands that propellor is supposed to be reading? Seems likely that there's a bug or two that have crept into then concurrent-output library since the version embedded in propellor.
2018-04-30propellor spinJoey Hess
2018-04-30propellor spinJoey Hess
2018-04-30propellor spinJoey Hess
2018-04-30Merge branch 'master' into joeyconfigJoey Hess
2018-04-30fix broken SemigroupMonoid transition <<loop>>Joey Hess
Turns out that with ghc 8.2.2, the instructions given on the page don't work. And the cppless variant that I had compiles, but into effectively mappend = mappend so it loops. The only way I can see to make it work without cpp is to use mappend = (Sem.<>) which is ugly and a land mine waiting to explode if someone changes it to a nicer mappend = (<>) with a newer version of ghc which will compile it and work ok, while breaking it with 8.2.2. Sigh. I posted to haskell-cafe about this.
2018-04-30Merge branch 'master' into joeyconfigJoey Hess
2018-04-30fix build with ghc 8.2Joey Hess
Seems newer ghc can figure out that metatypes is SingI, but not this one?
2018-04-29setting up joeyconfig after mergeJoey Hess
2018-04-29Merge branch 'master' into joeyconfigJoey Hess
2018-04-29propellor spinJoey Hess
2018-04-29propellor spinJoey Hess
2018-04-29propellor spinJoey Hess
2018-04-29propellor spinJoey Hess
2018-04-29signaturespwhitton
2018-04-29we should factor out code in Grub.configuredspwhitton
2018-04-29Added a commentpicca
2018-04-29Added a commentpicca
2018-04-29(no commit message)picca
2018-04-28(no commit message)jsza
2018-04-28(no commit message)jsza
2018-04-23clean up after mergeJoey Hess
2018-04-23Merge branch 'joeyconfig'Joey Hess
2018-04-23more ghc 8.4 build fixesJoey Hess
Tested build with ghc 8.4 now.
2018-04-23stack.yaml: Updated to lts-9.21.Joey Hess
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.
2018-04-23Added dependency on concurrent-output; removed embedded copy.Joey Hess
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.
2018-04-23setting up joeyconfig after mergeJoey Hess
2018-04-23Added dependency on concurrent-output; removed embedded copy.Joey Hess
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.
2018-04-23update note about singletons libraryJoey Hess
ghc version is ok to use it now. However, seems debian has not packaged it, so it won't be in stable for years, so I can't even think about using it for propellor. Proably ghc will get built-in singletons support before I can drop the current singletons code.
2018-04-23semigroup monoid change fallout; drop ghc 7 supportJoey Hess
Fix build with ghc 8.4, which broke due to the Semigroup Monoid change. See https://prime.haskell.org/wiki/Libraries/Proposals/SemigroupMonoid 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. If we indeed drop ghc 7 support entirely, some code to support "jessie" can be removed; concurrent-output can be de-embedded, and the Singletons code can be simplified. This commit was sponsored by Jack Hill on Patreon.
2018-04-22updateJoey Hess
2018-04-22few more cabal executable build tweaksJoey Hess
2018-04-22remove -O0 for propellor-configJoey Hess
It's only needed for compiling the internals of the propellor library, which is no longer part of building this.
2018-04-22fix cabal check warningJoey Hess
2018-04-22add news item for propellor 5.3.5Joey Hess
2018-04-22releasing package propellor version 5.3.5Joey Hess
2018-04-22clean up after mergeJoey Hess
2018-04-22remove unused importJoey Hess
2018-04-22tested change with old ghc; okJoey Hess
475b936c5111619225bc36c6706e6a987d2f709d works with ghc 8.0.2
2018-04-22propellor spinJoey Hess
2018-04-22simplify constraints for new ghcJoey Hess
ghc started warning about the IsProp (Property i) constraint; removing it the code builds. This may break building with older ghc.
2018-04-22setting up joeyconfig after mergeJoey Hess
2018-04-22separate Hs-Source-Dirs for binariesJoey Hess
This is a trick I only just learned about, see https://stackoverflow.com/questions/6711151/how-to-avoid-recompiling-in-this-cabal-file#6711739 Significantly increased propellor build speed when your config.hs is in a fork of the propellor repository, by avoiding redundant builds of propellor library. Also avoids needing to list all the build deps 3 times. Also avoids cabal 2.x wanting every module to be listed 3 times. Note that the bulk of wrapper.hs had to move into the propellor library, since that code depended on stuff not exposed by the library. This commit was sponsored by Henrik Riomar on Patreon.
2018-04-18Merge branch 'master' of ssh://propellor.branchable.comJoey Hess
2018-04-18Merge branch 'joeyconfig'Joey Hess
2018-04-18changelogJoey Hess
2018-04-18Apt.stdSourcesList now adds stable-updates suiteSean Whitton
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
2018-04-13propellor spinJoey Hess
2018-04-13(no commit message)Tony
2018-04-13(no commit message)Tony