diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ [PVP]: https://pvp.haskell.org/ +## 1.0.5.7 (2024-01-16) + +The program now builds against a wider set of dependencies. There were no changes in functionality. + ## 1.0.5.6 (2022-12-02) The program now builds against a wider set of dependencies. There were no changes in functionality. diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -141,7 +141,7 @@ ## License -Copyright © 2016–2017, 2019, 2021–2022 Benjamin D. Esham. +Copyright © 2016–2017, 2019, 2021–2024 Benjamin D. Esham. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/man/pnbackup.1 b/man/pnbackup.1 --- a/man/pnbackup.1 +++ b/man/pnbackup.1 @@ -1,5 +1,19 @@ -.\" Automatically generated by Pandoc 2.14.0.3 +.\" Automatically generated by Pandoc 2.19.2 .\" +.\" Define V font for inline verbatim, using C font in formats +.\" that render this, and otherwise B font. +.ie "\f[CB]x\f[]"x" \{\ +. ftr V B +. ftr VI BI +. ftr VB B +. ftr VBI BI +.\} +.el \{\ +. ftr V CR +. ftr VI CI +. ftr VB CB +. ftr VBI CBI +.\} .TH "PNBACKUP" "1" "" "pinboard-notes-backup" "" .hy .SH NAME @@ -9,29 +23,29 @@ .SH SYNOPSIS .PP \f[B]pnbackup\f[R] -\f[C][-v | --verbose] -t : \f[R] +\f[V][-v | --verbose] -t : \f[R] .SH OPTIONS .PP The following parameters must always be given: .TP -\f[B]\f[CB]-t :\f[B]\f[R] +\f[V]-t :\f[R] Your Pinboard username, a colon, and your Pinboard API token. You can find this on the Pinboard password settings page (https://pinboard.in/settings/password). .TP -\f[B]\f[CB]\f[B]\f[R] +\f[V]\f[R] The name of the SQLite database file where your notes will be stored. This file will be created if it doesn\[cq]t yet exist. .PP The following options are available: .TP -\f[B]\f[CB]-v, --verbose\f[B]\f[R] +\f[V]-v, --verbose\f[R] Display more information about the sync progress. .TP -\f[B]\f[CB]-h, --help\f[B]\f[R] +\f[V]-h, --help\f[R] Display the usage information and exit. .TP -\f[B]\f[CB]--version\f[B]\f[R] +\f[V]--version\f[R] Display the version number and exit. .SH DESCRIPTION .PP @@ -53,7 +67,7 @@ pnbackup will return zero on success or nonzero on failure. .SH EXAMPLE .TP -\f[B]\f[CB]pnbackup -t maciej:abc123456 Notes.sqlite\f[B]\f[R] +\f[V]pnbackup -t maciej:abc123456 Notes.sqlite\f[R] will put all of your notes into a SQLite database called \[lq]Notes.sqlite\[rq], assuming that your Pinboard username is \[lq]maciej\[rq] and your API token is \[lq]abc123456\[rq]. @@ -107,7 +121,7 @@ . .SH LICENSE .PP -Copyright \[co] 2016\[en]2017, 2019, 2021\[en]2022 Benjamin D.\ Esham. +Copyright \[co] 2016\[en]2017, 2019, 2021\[en]2024 Benjamin D.\ Esham. .PP This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/pinboard-notes-backup.cabal b/pinboard-notes-backup.cabal --- a/pinboard-notes-backup.cabal +++ b/pinboard-notes-backup.cabal @@ -1,5 +1,5 @@ name: pinboard-notes-backup -version: 1.0.5.6 +version: 1.0.5.7 synopsis: Back up the notes you've saved to Pinboard description: A command-line application to back up your notes from the Pinboard bookmarking service to a local SQLite database. @@ -8,7 +8,7 @@ license-file: LICENSE.txt author: Benjamin Esham maintainer: benjamin@esham.io -copyright: 2016-2017, 2019, 2021-2022 Benjamin D. Esham +copyright: 2016-2017, 2019, 2021-2024 Benjamin D. Esham category: Backup, CLI, Pinboard build-type: Simple cabal-version: >= 1.10 @@ -29,13 +29,13 @@ default-language: Haskell2010 build-depends: base >= 4.7 && < 5 , aeson >= 0.8 && < 2.2 - , ansi-wl-pprint >= 0.6 && < 0.7 + , ansi-wl-pprint >= 0.6 && < 1.1 , bytestring >= 0.10 && < 0.12 , containers >= 0.5 && < 0.7 , http-client >= 0.5 && < 0.8 , http-types >= 0.12 && < 0.13 - , mtl >= 2.2 && < 2.3 - , optparse-applicative >= 0.11 && < 0.18 + , mtl >= 2.2 && < 2.4 + , optparse-applicative >= 0.11 && < 0.19 , req >= 1.0 && < 3.14 , sqlite-simple >= 0.4 && < 0.5 , text >= 1.2 && < 2.1 diff --git a/src/Main.hs b/src/Main.hs --- a/src/Main.hs +++ b/src/Main.hs @@ -51,7 +51,7 @@ footerText :: Doc footerText = vsep [ "For more information, see \"man pnbackup\"." , "" - , "Copyright © 2016–2017, 2019, 2021–2022 Benjamin D. Esham" + , "Copyright © 2016–2017, 2019, 2021–2024 Benjamin D. Esham" , "" , "License GPLv3+: GNU GPL version 3 or later ." , "This is free software: you are free to change and redistribute it." diff --git a/src/Pinboard.hs b/src/Pinboard.hs --- a/src/Pinboard.hs +++ b/src/Pinboard.hs @@ -5,6 +5,7 @@ import Prelude hiding (log, putStrLn) import Control.Concurrent (threadDelay) +import Control.Monad (when) import Control.Monad.Except import Control.Monad.Reader import Control.Monad.State.Class diff --git a/stack.yaml b/stack.yaml --- a/stack.yaml +++ b/stack.yaml @@ -1,1 +1,1 @@ -resolver: lts-13.26 +resolver: lts-22.4 diff --git a/stack.yaml.lock b/stack.yaml.lock --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -6,7 +6,7 @@ packages: [] snapshots: - completed: - size: 499889 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/13/26.yaml - sha256: ecb02ee16829df8d7219e7d7fe6c310819820bf335b0b9534bce84d3ea896684 - original: lts-13.26 + sha256: 8b211c5a6aad3787e023dfddaf7de7868968e4f240ecedf14ad1c5b2199046ca + size: 714097 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/4.yaml + original: lts-22.4