Release 0.7.0.1

Author: TravisCardwell

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ghc: ['8.2.2', '8.4.4', '8.6.5', '8.8.4', '8.10.4']
+        ghc: ['8.2.2', '8.4.4', '8.6.5', '8.8.4', '8.10.7']
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ghc: ['8.2.2', '8.4.4', '8.6.5', '8.8.4', '8.10.4']
+        ghc: ['8.2.2', '8.4.4', '8.6.5', '8.8.4', '8.10.7']
     steps:
       - name: Checkout
         uses: actions/checkout@v2

CHANGELOG.md

@@ -24,8 +24,18 @@ following conventions:
 
 [KaC]: <https://keepachangelog.com/en/1.0.0/>
 
+## 0.7.0.1 (2021-10-10)
+
+### Non-Breaking
+
+* Add dependency bounds
+
 ## 0.7.0.0 (2021-06-25)
 
+### Non-Breaking
+
+* Use TTC 1.1.0.1
+
 ### Breaking
 
 * Fix `--help` when using `optparse-applicative` `0.16`

Makefile

@@ -124,7 +124,7 @@ deb: # build .deb package for VERSION in a Debian container
 >   -e DEBFULLNAME="$(MAINTAINER_NAME)" \
 >   -e DEBEMAIL="$(MAINTAINER_EMAIL)" \
 >   -v $(PWD)/build:/host \
->   extremais/pkg-debian-stack:buster \
+>   extremais/pkg-debian-stack:bullseye \
 >   /home/docker/bin/make-deb.sh "$(SRC)"
 .PHONY: deb
 
@@ -311,8 +311,8 @@ test-all: # run tests for all configured Stackage releases
 > @make test CONFIG=stack-8.6.5.yaml
 > @command -v hr >/dev/null 2>&1 && hr "stack-8.8.4.yaml" || true
 > @make test CONFIG=stack-8.8.4.yaml
-> @command -v hr >/dev/null 2>&1 && hr "stack-8.10.4.yaml" || true
-> @make test CONFIG=stack-8.10.4.yaml
+> @command -v hr >/dev/null 2>&1 && hr "stack-8.10.7.yaml" || true
+> @make test CONFIG=stack-8.10.7.yaml
 .PHONY: test-all
 
 test-nightly: # run tests for the latest Stackage nightly release

README.md

@@ -42,7 +42,7 @@ packages used depend entirely on the contents of the template.
 ### Installation From Source
 
 Queue Sheet can be built from source using [Stack][].  For example, you can
-install the latest release (to `/usr/bin` on Linux) as follows:
+install the latest release (to `/usr/local` on Linux) as follows:
 
 ```
 $ git clone https://github.com/ExtremaIS/queue-sheet-haskell.git

app/LibOA.hs

@@ -11,10 +11,12 @@
 -- projects as required.  If the library grows to a substantial size or others
 -- with to use it, I will reconsider.
 --
--- Revision: 2021-06-24
+-- Revision: 2021-07-20
 ------------------------------------------------------------------------------
 
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE TupleSections #-}
 
 module LibOA
   ( -- * Options
@@ -27,6 +29,7 @@ module LibOA
   , (<||>)
   , section
   , table
+  , table_
   , vspace
   ) where
 
@@ -35,7 +38,8 @@ import qualified Text.PrettyPrint.ANSI.Leijen as Doc
 import Text.PrettyPrint.ANSI.Leijen (Doc)
 
 -- https://hackage.haskell.org/package/base
-import qualified Data.List as List
+import Data.List (intersperse, transpose)
+import Data.Maybe (fromMaybe)
 #if !MIN_VERSION_base (4,11,0)
 import Data.Monoid ((<>))
 #endif
@@ -115,15 +119,23 @@ infixr 5 <||>
 section :: String -> Doc -> Doc
 section title = (Doc.text title Doc.<$$>) . Doc.indent 2
 
--- | Create a two-column table
-table :: [(String, String)] -> Doc
-table rows =
-    let width = 1 + maximum (map (length . fst) rows)
-    in  Doc.vcat
-          [ Doc.fillBreak width (Doc.text l) Doc.<+> Doc.text r
-          | (l, r) <- rows
-          ]
+-- | Create a table, with formatting
+table :: Int -> [[(String, Doc -> Doc)]] -> Doc
+table sep rows = Doc.vcat $
+    map (fromMaybe Doc.empty . foldr go Nothing . zip lengths) rows
+  where
+    lengths :: [Int]
+    lengths = map ((+) sep . maximum . map (length . fst)) $ transpose rows
+
+    go :: (Int, (String, Doc -> Doc)) -> Maybe Doc -> Maybe Doc
+    go (len, (s, f)) = Just . \case
+      Just doc -> Doc.fill len (f $ Doc.string s) <> doc
+      Nothing  -> f $ Doc.string s
+
+-- | Create a table, without formatting
+table_ :: Int -> [[String]] -> Doc
+table_ sep = table sep . (map . map) (, id)
 
 -- | Vertically space documents with blank lines between them
 vspace :: [Doc] -> Doc
-vspace = mconcat . List.intersperse (Doc.line <> Doc.line)
+vspace = mconcat . intersperse (Doc.line <> Doc.line)

default.nix

@@ -8,9 +8,9 @@
 #
 # * Build QueueSheet with a specific compiler version:
 #
-#     $ nix-build --argstr compiler ghc8104
+#     $ nix-build --argstr compiler ghc8107
 
-{ # This string argument specifies the compiler (example: "ghc8104").  When
+{ # This string argument specifies the compiler (example: "ghc8107").  When
   # not specified, the default compiler (configured below) is used.
   compiler ? null
   # This path argument specifies the packages to use.  When not specified, a
@@ -26,12 +26,12 @@
 let
 
   # This string defines the default compiler version.
-  defaultCompiler = "ghc8104";
+  defaultCompiler = "ghc8107";
 
   # This set defines working revisions for supported compiler versions.
   nixpkgsRevs = {
-    ghc8104 = "c92ca95afb5043bc6faa0d526460584eccff2277";
-    ghc884  = "c92ca95afb5043bc6faa0d526460584eccff2277";
+    ghc8107 = "b7d0ebd8f898c9a4b55653d2fefd12319f1bc3cf";
+    ghc884  = "b7d0ebd8f898c9a4b55653d2fefd12319f1bc3cf";
     # ghc865  = "2d9888f61c80f28b09d64f5e39d0ba02e3923057"; NOTE ginger broken
     ghc844  = "6a80140fdf2157d1a5500a04c87033c0dcd6bf9b";
     ghc822  = "6a80140fdf2157d1a5500a04c87033c0dcd6bf9b";
@@ -63,7 +63,7 @@ let
   # Git ignore functionality from a fixed `nixpkgs` revision is used.  Old
   # revisions do not work, proably due to an API change.
   gitIgnore = (
-    import (nixpkgsTarball nixpkgsRevs.ghc8104) {}
+    import (nixpkgsTarball nixpkgsRevs.ghc8107) {}
   ).nix-gitignore.gitignoreSourcePure;
 
 in
@@ -74,7 +74,10 @@ in
     root = gitIgnore [./.gitignore] ./.;
     name = "queue-sheet";
     source-overrides = {
-      ttc = githubTagTarball "ExtremaIS" "ttc-haskell" "ttc-haskell-1.1.0.0";
+      ttc = githubTagTarball "ExtremaIS" "ttc-haskell" "ttc-haskell-1.1.0.2";
+    };
+    overrides = self: super: {
+      mono-traversable = pkgs.haskell.lib.dontCheck super.mono-traversable;
     };
     modifier = drv:
       if isShell

doc/queue-sheet.1

@@ -1,6 +1,6 @@
 .\" Automatically generated by Pandoc 2.11.4
 .\"
-.TH "QUEUE-SHEET" "1" "" "queue-sheet-haskell 0.7.0.0 (2021-06-25)" "queue-sheet Manual"
+.TH "QUEUE-SHEET" "1" "" "queue-sheet-haskell 0.7.0.1 (2021-10-10)" "queue-sheet Manual"
 .nh
 .SH NAME
 .PP

project/release/queue-sheet-haskell-0.7.0.1.md

@@ -0,0 +1,10 @@
+# `queue-sheet-haskell` `0.7.0.1` Release Notes
+
+Date
+: 2021-10-10
+
+## Overview
+
+This is a minor release of Queue Sheet that adds bounds to the dependencies,
+to make sure that builds do not break with breaking releases of dependencies
+(`aeson`).  There are no changes to the code in this release.

queue-sheet.cabal

@@ -1,5 +1,5 @@
 name:           queue-sheet
-version:        0.7.0.0
+version:        0.7.0.1
 category:       Utils
 synopsis:       queue sheet utility
 description:
@@ -15,14 +15,14 @@ copyright:      Copyright (c) 2020-2021 Travis Cardwell
 license:        MIT
 license-file:   LICENSE
 
-cabal-version:  >=1.10
+cabal-version:  1.24
 build-type:     Simple
 tested-with:
   GHC ==8.2.2
    || ==8.4.4
    || ==8.6.5
    || ==8.8.4
-   || ==8.10.4
+   || ==8.10.7
 
 extra-source-files:
   CHANGELOG.md
@@ -47,19 +47,19 @@ library
   other-modules:
       Paths_queue_sheet
   build-depends:
-      aeson
+      aeson >= 1.2 && <1.6
     , base >=4.7 && <5
-    , bytestring
-    , directory
-    , filepath
-    , ginger
-    , process
-    , scientific
-    , text
-    , transformers
-    , ttc
-    , vector
-    , yaml
+    , bytestring >=0.10.8 && <0.12
+    , directory >=1.3 && <1.4
+    , filepath >=1.4 && <1.5
+    , ginger >=0.7.3 && <0.11
+    , process >=1.6 && <1.7
+    , scientific >=0.3 && <0.4
+    , text >=1.2.3 && <1.3
+    , transformers >=0.5.2 && <0.6
+    , ttc >=1.1 && <1.2
+    , vector >=0.12 && <0.13
+    , yaml >=0.8 && <0.12
   default-language: Haskell2010
   if flag(write-hie)
     ghc-options: -Wall -fwrite-ide-info -hiedir=.hie
@@ -73,7 +73,7 @@ executable queue-sheet
       LibOA
   build-depends:
       ansi-wl-pprint >=0.6 && <0.7
-    , base >=4.7 && <5
+    , base
     , optparse-applicative >=0.14 && <0.17
     , queue-sheet
   default-language: Haskell2010
@@ -89,7 +89,7 @@ test-suite queue-sheet-test
       base
     , bytestring
     , queue-sheet
-    , tasty
-    , tasty-hunit
+    , tasty >=1.0 && <1.5
+    , tasty-hunit >=0.10 && <0.11
   default-language: Haskell2010
   ghc-options: -Wall

shell.nix

@@ -8,9 +8,9 @@
 #
 # * Run a Nix shell with a specific compiler version:
 #
-#     $ nix-shell --argstr compiler ghc8104
+#     $ nix-shell --argstr compiler ghc8107
 
-{ # This string argument specifies the compiler (example: "ghc8104").  When
+{ # This string argument specifies the compiler (example: "ghc8107").  When
   # not specified, the default compiler is used.
   compiler ? null
   # This path argument specifies the packages to use.  When not specified, a

stack-8.10.4.yaml

@@ -0,0 +1,4 @@
+resolver: lts-18.13
+
+packages:
+  - .

stack-8.10.7.yaml

@@ -5,4 +5,4 @@ packages:
 
 extra-deps:
   - ginger-0.8.4.0
-  - ttc-1.1.0.0
+  - ttc-1.1.0.1

stack-8.2.2.yaml

@@ -5,4 +5,4 @@ packages:
 
 extra-deps:
   - ginger-0.8.4.0
-  - ttc-1.1.0.0
+  - ttc-1.1.0.1

stack-8.4.4.yaml

@@ -4,4 +4,4 @@ packages:
   - .
 
 extra-deps:
-  - ttc-1.1.0.0
+  - ttc-1.1.0.1

stack-8.6.5.yaml

@@ -4,4 +4,4 @@ packages:
   - .
 
 extra-deps:
-  - ttc-1.1.0.0
+  - ttc-1.1.0.1

stack-8.8.4.yaml

@@ -1 +1 @@
-stack-8.10.4.yaml
+stack-8.10.7.yaml

stack.yaml

@@ -7,8 +7,7 @@
 {
   queue-sheet-ghc-822 = import ./default.nix { compiler = "ghc822"; };
   queue-sheet-ghc-844 = import ./default.nix { compiler = "ghc844"; };
-  queue-sheet-ghc-865 = import ./default.nix { compiler = "ghc865"; };
+  # queue-sheet-ghc-865 = import ./default.nix { compiler = "ghc865"; }; NOTE ginger broken
   queue-sheet-ghc-884 = import ./default.nix { compiler = "ghc884"; };
-  queue-sheet-ghc-8104 = import ./default.nix { compiler = "ghc8104"; };
-  queue-sheet-ghc-901 = import ./default.nix { compiler = "ghc901"; };
+  queue-sheet-ghc-8107 = import ./default.nix { compiler = "ghc8107"; };
 }