diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ -1.6.1. +1.6.2 + +* Build against latest `ansi-wl-pprint` and `optparse-applicative` [[#445]](https://github.com/Gabriella439/turtle/pull/445) / [[#446]](https://github.com/Gabriella439/turtle/pull/446) / [[#447]](https://github.com/Gabriella439/turtle/pull/447) + +1.6.1 * BUG FIX: Fix `turtle` to build on Windows * BUG FIX: `stripPrefix` and `commonPrefix` now correctly handle files with diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2017 Gabriel Gonzalez +Copyright (c) 2017 Gabriella Gonzalez All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -8,7 +8,7 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Gabriel Gonzalez nor the names of other contributors + * Neither the name of Gabriella Gonzalez nor the names of other contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/src/Turtle/Tutorial.hs b/src/Turtle/Tutorial.hs --- a/src/Turtle/Tutorial.hs +++ b/src/Turtle/Tutorial.hs @@ -882,9 +882,9 @@ -- > FilePath "/tmp/.X0-lock" -- > FilePath "/tmp/pulse-PKdhtXMmr18n" -- > FilePath "/tmp/pulse-xHYcZ3zmN3Fv" --- > FilePath "/tmp/tracker-gabriel" +-- > FilePath "/tmp/tracker-gabriella" -- > FilePath "/tmp/pulse-PYi1hSlWgNj2" --- > FilePath "/tmp/orbit-gabriel" +-- > FilePath "/tmp/orbit-gabriella" -- > FilePath "/tmp/ssh-vREYGbWGpiCa" -- > FilePath "/tmp/.ICE-unix -- @@ -991,9 +991,9 @@ -- > FilePath "/tmp/.X0-lock" -- > FilePath "/tmp/pulse-PKdhtXMmr18n" -- > FilePath "/tmp/pulse-xHYcZ3zmN3Fv" --- > FilePath "/tmp/tracker-gabriel" +-- > FilePath "/tmp/tracker-gabriella" -- > FilePath "/tmp/pulse-PYi1hSlWgNj2" --- > FilePath "/tmp/orbit-gabriel" +-- > FilePath "/tmp/orbit-gabriella" -- > FilePath "/tmp/ssh-vREYGbWGpiCa" -- > FilePath "/tmp/.ICE-unix" -- > FilePath "/usr/lib" @@ -1109,9 +1109,9 @@ -- > FilePath "/tmp/.X0-lock" -- > FilePath "/tmp/pulse-PKdhtXMmr18n" -- > FilePath "/tmp/pulse-xHYcZ3zmN3Fv" --- > FilePath "/tmp/tracker-gabriel" +-- > FilePath "/tmp/tracker-gabriella" -- > FilePath "/tmp/pulse-PYi1hSlWgNj2" --- > FilePath "/tmp/orbit-gabriel" +-- > FilePath "/tmp/orbit-gabriella" -- > FilePath "/tmp/ssh-vREYGbWGpiCa" -- > FilePath "/tmp/.ICE-unix" -- @@ -1164,8 +1164,8 @@ -- @ -- Prelude Turtle Fold> `fold` (ls \"\/tmp\") Fold.list -- [FilePath \"\/tmp\/.X11-unix\",FilePath \"\/tmp\/.X0-lock\",FilePath \"\/tmp\/pulse-PKd --- htXMmr18n\",FilePath \"\/tmp\/pulse-xHYcZ3zmN3Fv\",FilePath \"\/tmp\/tracker-gabriel --- \",FilePath \"\/tmp\/pulse-PYi1hSlWgNj2\",FilePath \"\/tmp\/orbit-gabriel\",FilePath +-- htXMmr18n\",FilePath \"\/tmp\/pulse-xHYcZ3zmN3Fv\",FilePath \"\/tmp\/tracker-gabriella +-- \",FilePath \"\/tmp\/pulse-PYi1hSlWgNj2\",FilePath \"\/tmp\/orbit-gabriella\",FilePath -- \"\/tmp\/ssh-vREYGbWGpiCa\",FilePath \"\/tmp\/.ICE-unix\"] -- @ -- @@ -1254,9 +1254,9 @@ -- > .X0-lock -- > pulse-PKdhtXMmr18n -- > pulse-xHYcZ3zmN3Fv --- > tracker-gabriel +-- > tracker-gabriella -- > pulse-PYi1hSlWgNj2 --- > orbit-gabriel +-- > orbit-gabriella -- > ssh-vREYGbWGpiCa -- > .ICE-unix -- @@ -1793,7 +1793,7 @@ -- If you have more questions or need help learning the library, ask a question -- on Stack Overflow under the @haskell-turtle@ tag. For bugs or feature -- requests, create an issue on Github at --- +-- -- -- This library provides an extended suite of Unix-like utilities, but would -- still benefit from adding more utilities for better parity with the Unix diff --git a/turtle.cabal b/turtle.cabal --- a/turtle.cabal +++ b/turtle.cabal @@ -1,13 +1,13 @@ Name: turtle -Version: 1.6.1 +Version: 1.6.2 Cabal-Version: >=1.10 Build-Type: Simple License: BSD3 License-File: LICENSE -Copyright: 2015 Gabriel Gonzalez -Author: Gabriel Gonzalez -Maintainer: Gabriel439@gmail.com -Bug-Reports: https://github.com/Gabriel439/Haskell-Turtle-Library/issues +Copyright: 2015 Gabriella Gonzalez +Author: Gabriella Gonzalez +Maintainer: GenuineGabriella@gmail.com +Bug-Reports: https://github.com/Gabriella439/turtle/issues Synopsis: Shell programming, Haskell-style Description: @turtle@ is a reimplementation of the Unix command line environment in Haskell so that you can use Haskell as both a shell and a scripting @@ -41,7 +41,9 @@ Category: System Tested-With: - GHC == 9.2.1 + GHC == 9.6.1 + GHC == 9.4.4 + GHC == 9.2.7 GHC == 9.0.2 GHC == 8.10.7 GHC == 8.8.4 @@ -55,14 +57,18 @@ Source-Repository head Type: git - Location: https://github.com/Gabriel439/Haskell-Turtle-Library + Location: https://github.com/Gabriella439/turtle +Flag new-deps + Description: Use new versions of ansi-wl-pprint and optparse-applicative + Manual: False + Default: True + Library HS-Source-Dirs: src Build-Depends: -- 2021-09-07: Turtle.Prelude uses GHC-8.0 features, so base >= 4.9 base >= 4.9 && < 5 , - ansi-wl-pprint >= 0.6 && < 0.7 , async >= 2.0.0.0 && < 2.3 , bytestring >= 0.9.1.8 && < 0.12, clock >= 0.4.1.2 && < 0.9 , @@ -80,13 +86,22 @@ text >= 1.0.0 && < 2.1 , time < 1.13, transformers >= 0.2.0.0 && < 0.7 , - optparse-applicative >= 0.16 && < 0.18, optional-args >= 1.0 && < 2.0 , - unix-compat >= 0.4 && < 0.7 + unix-compat >= 0.4 && < 0.8 if os(windows) Build-Depends: Win32 >= 2.12 else - Build-Depends: unix >= 2.5.1.0 && < 2.8 + Build-Depends: unix >= 2.5.1.0 && < 2.9 + + -- A possible Cabal issue makes it try an old version of ansi-wl-pprint + -- even though a newer would work. + -- See discussion in https://github.com/Gabriella439/turtle/pull/446 + if flag(new-deps) + Build-Depends: ansi-wl-pprint >= 1.0 && < 1.1 , + optparse-applicative >= 0.18 && < 0.19 + else + Build-Depends: ansi-wl-pprint >= 0.6 && < 1.0 , + optparse-applicative >= 0.16 && < 0.18 Exposed-Modules: Turtle,