From ed6cef5c004228ba0fc143ecc254fa1f0d4d1da6 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Mon, 31 Mar 2025 17:25:41 -1000 Subject: [PATCH] ;pkg: clean up package.yaml files Consistent layout. Group metadata at the top in similar order to `cabal format`. --- hledger-lib/package.yaml | 47 ++++++++++------------- hledger-ui/package.yaml | 82 +++++++++++++++++++--------------------- hledger-web/package.yaml | 27 ++++++------- hledger/package.yaml | 44 ++++++++++----------- 4 files changed, 90 insertions(+), 110 deletions(-) diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml index d32a3dfd2..d880e8c96 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -1,6 +1,15 @@ -name: hledger-lib -version: 1.42.99 -synopsis: A library providing the core functionality of hledger +name: hledger-lib +version: 1.42.99 +license: GPL-3.0-or-later +maintainer: Simon Michael +author: Simon Michael +stability: stable +tested-with: ghc==8.10.7, ghc==9.0.2, ghc==9.2.8, ghc==9.4.8, ghc==9.6.7, ghc==9.8.4, ghc==9.10.1 +homepage: http://hledger.org +bug-reports: http://bugs.hledger.org +github: simonmichael/hledger +category: Finance +synopsis: A library providing the core functionality of hledger description: | This library contains hledger's core functionality. It is used by most hledger* packages so that they support the same @@ -20,24 +29,21 @@ description: | - https://hackage.haskell.org/package/hledger-lib/docs/Hledger.html - starting point for hledger's haddock docs -category: Finance -license: GPL-3.0-or-later -author: Simon Michael -maintainer: Simon Michael -github: simonmichael/hledger -homepage: http://hledger.org -bug-reports: http://bugs.hledger.org -stability: stable - extra-source-files: - CHANGES.md - README.md - test/unittest.hs - test/doctests.hs -#data-files: - -tested-with: GHC==8.10.7, GHC==9.0.2, GHC==9.2.8, GHC==9.4.8, GHC==9.6.7, GHC==9.8.4, GHC==9.10.1 +flags: + debug: + description: Build with GHC 9.10+'s stack traces enabled + default: false + manual: true +# ghcdebug: +# description: Build with support for attaching a ghc-debug client +# default: false +# manual: true dependencies: - base >=4.14 && <4.21 @@ -96,17 +102,6 @@ ghc-options: - -Wno-type-defaults - -Wno-unused-do-bind -flags: - debug: - description: Build with GHC 9.10+'s stack traces enabled - default: false - manual: true -# bitrotted -# ghcdebug: -# description: Build with support for attaching a ghc-debug client -# default: false -# manual: true - when: - condition: (flag(debug)) cpp-options: -DDEBUG diff --git a/hledger-ui/package.yaml b/hledger-ui/package.yaml index 92f691051..07d480115 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -1,7 +1,16 @@ -name : hledger-ui -version : 1.42.99 -synopsis : Terminal interface for the hledger accounting system -description : | +name: hledger-ui +version: 1.42.99 +license: GPL-3.0-or-later +maintainer: Simon Michael +author: Simon Michael +stability: stable +tested-with: ghc==8.10.7, ghc==9.0.2, ghc==9.2.8, ghc==9.4.8, ghc==9.6.7, ghc==9.8.4, ghc==9.10.1 +homepage: http://hledger.org +bug-reports: http://bugs.hledger.org +github: simonmichael/hledger +category: Finance, Console +synopsis: Terminal interface for the hledger accounting system +description: | A simple terminal user interface for the hledger accounting system. It can be a more convenient way to browse your accounts than the CLI. @@ -12,15 +21,6 @@ description : | implementations of Plain Text Accounting. Read more at: -category : Finance, Console -license : GPL-3.0-or-later -author : Simon Michael -maintainer : Simon Michael -github : simonmichael/hledger -homepage : http://hledger.org -bug-reports : http://bugs.hledger.org -stability : stable - extra-source-files: - CHANGES.md - README.md @@ -28,46 +28,20 @@ extra-source-files: - hledger-ui.txt - hledger-ui.info -#data-files: - flags: - threaded: - description: Build with support for multithreaded execution - default: true - manual: false debug: description: Build with GHC 9.10+'s stack traces enabled default: false manual: true -# bitrotted + threaded: + description: Build with support for multithreaded execution + default: true + manual: false # ghcdebug: # description: Build with support for attaching a ghc-debug client # default: false # manual: true -cpp-options: -DVERSION="1.42.99" - -ghc-options: -- -Wall -- -Wno-incomplete-uni-patterns -- -Wno-missing-signatures -- -Wno-orphans -- -Wno-type-defaults -- -Wno-unused-do-bind - -tested-with: GHC==8.10.7, GHC==9.0.2, GHC==9.2.8, GHC==9.4.8, GHC==9.6.7, GHC==9.8.4, GHC==9.10.1 - -dependencies: -- base >=4.14 && <4.21 - -when: -- condition: (flag(debug)) - cpp-options: -DDEBUG -# - condition: (flag(ghcdebug)) -# cpp-options: -DGHCDEBUG -# dependencies: -# - ghc-debug-stub >=0.6.0.0 && <0.7 - # curses is required to build terminfo for vty for hledger-ui. # On POSIX systems it might be not present. # On windows it's very likely not present, but possibly it could be. @@ -82,6 +56,27 @@ when: # like Windows Terminal. # mintty-based backends (default for cygwin/gitbash/msys2) are not supported (yet) +cpp-options: -DVERSION="1.42.99" + +ghc-options: +- -Wall +- -Wno-incomplete-uni-patterns +- -Wno-missing-signatures +- -Wno-orphans +- -Wno-type-defaults +- -Wno-unused-do-bind + +when: +- condition: (flag(debug)) + cpp-options: -DDEBUG +# - condition: (flag(ghcdebug)) +# cpp-options: -DGHCDEBUG +# dependencies: +# - ghc-debug-stub >=0.6.0.0 && <0.7 + +dependencies: +- base >=4.14 && <4.21 + library: source-dirs: . cpp-options: -DVERSION="1.42.99" @@ -126,7 +121,6 @@ library: else: dependencies: unix - executables: hledger-ui: source-dirs: app diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index 8206a056e..15c2ed240 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -1,6 +1,15 @@ -name: hledger-web -version: 1.42.99 -synopsis: Web user interface for the hledger accounting system +name: hledger-web +version: 1.42.99 +license: GPL-3.0-or-later +maintainer: Simon Michael +author: Simon Michael +stability: stable +tested-with: ghc==8.10.7, ghc==9.0.2, ghc==9.2.8, ghc==9.4.8, ghc==9.6.7, ghc==9.8.4, ghc==9.10.1 +homepage: http://hledger.org +bug-reports: http://bugs.hledger.org +github: simonmichael/hledger +category: Finance +synopsis: Web user interface for the hledger accounting system description: | A simple web user interface for the hledger accounting system, providing a more modern UI than the command-line or terminal interfaces. @@ -14,15 +23,6 @@ description: | implementations of Plain Text Accounting. Read more at: -category: Finance -license: GPL-3.0-or-later -author: Simon Michael -maintainer: Simon Michael -github: simonmichael/hledger -homepage: http://hledger.org -bug-reports: http://bugs.hledger.org -stability: stable - extra-source-files: - CHANGES.md - README.md @@ -62,7 +62,6 @@ flags: description: Build with GHC 9.10+'s stack traces enabled # ' default: false manual: true -# bitrotted # ghcdebug: # description: Build with support for attaching a ghc-debug client # default: false @@ -93,8 +92,6 @@ when: # dependencies: # - ghc-debug-stub >=0.6.0.0 && <0.7 -tested-with: GHC==8.10.7, GHC==9.0.2, GHC==9.2.8, GHC==9.4.8, GHC==9.6.7, GHC==9.8.4, GHC==9.10.1 - dependencies: - base >=4.14 && <4.21 diff --git a/hledger/package.yaml b/hledger/package.yaml index 1693a0064..ec8b350ef 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -1,6 +1,15 @@ -name: hledger -version: 1.42.99 -synopsis: Command-line interface for the hledger accounting system +name: hledger +version: 1.42.99 +license: GPL-3.0-or-later +maintainer: Simon Michael +author: Simon Michael +stability: stable +tested-with: ghc==8.10.7, ghc==9.0.2, ghc==9.2.8, ghc==9.4.8, ghc==9.6.7, ghc==9.8.4, ghc==9.10.1 +homepage: http://hledger.org +bug-reports: http://bugs.hledger.org +github: simonmichael/hledger +category: Finance, Console +synopsis: Command-line interface for the hledger accounting system description: | The command-line interface for the hledger accounting system. Its basic function is to read a plain text file describing @@ -13,15 +22,6 @@ description: | implementations of Plain Text Accounting. Read more at: -category: Finance, Console -license: GPL-3.0-or-later -author: Simon Michael -maintainer: Simon Michael -github: simonmichael/hledger -homepage: http://hledger.org -bug-reports: http://bugs.hledger.org -stability: stable - extra-source-files: - CHANGES.md - README.md @@ -89,9 +89,6 @@ extra-source-files: - Hledger/Cli/Commands/Tags.txt - Hledger/Cli/Commands/Test.txt - -#data-files: - flags: threaded: description: Build with support for multithreaded execution @@ -101,7 +98,6 @@ flags: description: Build with GHC 9.10+'s stack traces enabled default: false manual: true -# bitrotted # ghcdebug: # description: Build with support for attaching a ghc-debug client # default: false @@ -117,7 +113,13 @@ ghc-options: # avoid stack's "non-portable path" warning/error on mac, https://github.com/commercialhaskell/stack/issues/3918 - -optP-Wno-nonportable-include-path -tested-with: GHC==8.10.7, GHC==9.0.2, GHC==9.2.8, GHC==9.4.8, GHC==9.6.7, GHC==9.8.4, GHC==9.10.1 +when: +- condition: (flag(debug)) + cpp-options: -DDEBUG +# - condition: (flag(ghcdebug)) +# cpp-options: -DGHCDEBUG +# dependencies: +# - ghc-debug-stub >=0.6.0.0 && <0.7 dependencies: - base >=4.14 && <4.21 @@ -156,14 +158,6 @@ dependencies: - utility-ht >=0.0.13 - wizards >=1.0 -when: -- condition: (flag(debug)) - cpp-options: -DDEBUG -# - condition: (flag(ghcdebug)) -# cpp-options: -DGHCDEBUG -# dependencies: -# - ghc-debug-stub >=0.6.0.0 && <0.7 - library: cpp-options: -DVERSION="1.42.99" exposed-modules: