swish 0.10.0.5 → 0.10.0.6
raw patch · 7 files changed
+19/−59 lines, 7 filesdep ~basedep ~network-uridep ~semigroupsPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: base, network-uri, semigroups, time
API changes (from Hackage documentation)
Files
- CHANGELOG +5/−0
- README.md +3/−5
- default.nix +1/−43
- shell.nix +1/−2
- src/Swish/RDF/Parser/NTriples.hs +2/−2
- stack.yaml +1/−1
- swish.cabal +6/−6
CHANGELOG view
@@ -1,3 +1,8 @@+0.10.0.6:++ Support recent time, network-uri, and semigroups releases.+ Bumped the minimum base version to 4.8 (GHC 7.10).+ 0.10.0.5: Support for base from ghc 9.0.
README.md view
@@ -40,7 +40,7 @@ (c) 2003, 2004 G. Klyne (c) 2009 Vasili I Galchin (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,- 2020 Doug Burke+ 2020, 2021 Doug Burke All rights reserved. @@ -79,6 +79,8 @@ % cd swish % stack install+ % STACK_YAML=stack-9.0.yaml stack install+ % STACK_YAML=stack-8.10.yaml stack install % STACK_YAML=stack-8.8.yaml stack install % STACK_YAML=stack-8.6.yaml stack install % STACK_YAML=stack-8.4.yaml stack install@@ -94,7 +96,3 @@ % nix-shell ... nix-shell% cabal test--At the time of writing this uses GHC 8.8.2, but you can switch compiler-- % nix-shell --argstr compiler ghc865
default.nix view
@@ -1,43 +1,1 @@-# { compiler ? "ghc8102" }:--# Looks like release-20.03 doesn't have haskell-language-server so stick-# with nixpkgs-unstable-{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc8102" }:--let- # sources = import ../nix/sources.nix;- # pkgs = import sources.nixpkgs {};-- inherit (nixpkgs) pkgs;-- gitignore = pkgs.nix-gitignore.gitignoreSourcePure [ ./.gitignore ];-- myHaskellPackages = pkgs.haskell.packages.${compiler}.override {- overrides = hself: hsuper: {- "swish" =- hself.callCabal2nix "swish" (gitignore ./.) {};- };- };-- shell = myHaskellPackages.shellFor {- packages = p: [- p."swish"- ];- buildInputs = [- pkgs.haskellPackages.cabal-install- pkgs.haskellPackages.haskell-language-server- pkgs.haskellPackages.hlint- pkgs.niv- ];- withHoogle = true;- };-- exe = pkgs.haskell.lib.justStaticExecutables (myHaskellPackages."swish");--in-{- inherit shell;- inherit exe;- inherit myHaskellPackages;- "swish" = myHaskellPackages."swish";-}+(import ./release.nix {}).exe
shell.nix view
@@ -1,2 +1,1 @@-{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc8102" }:-(import ./default.nix { inherit nixpkgs compiler; }).shell+(import ./release.nix {}).shell
src/Swish/RDF/Parser/NTriples.hs view
@@ -6,7 +6,7 @@ -- | -- Module : NTriples--- Copyright : (c) 2011, 2012, 2013, 2018 Douglas Burke+-- Copyright : (c) 2011, 2012, 2013, 2018, 2021 Douglas Burke -- License : GPL V2 -- -- Maintainer : Douglas Burke@@ -192,7 +192,7 @@ -} isWS :: Char -> Bool-isWS = (`elem` " \t")+isWS = (`elem` (" \t" :: String)) {- ws :: NTParser ()
stack.yaml view
@@ -1,4 +1,4 @@ flags: {} packages: - '.'-resolver: lts-16.31+resolver: lts-18.13
swish.cabal view
@@ -1,10 +1,10 @@ Name: swish-Version: 0.10.0.5+Version: 0.10.0.6 Stability: experimental License: LGPL-2.1 License-file: LICENSE Author: Graham Klyne - GK@ninebynine.org-Copyright: (c) 2003, 2004 G. Klyne; 2009 Vasili I Galchin; 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Doug Burke; All rights reserved.+Copyright: (c) 2003, 2004 G. Klyne; 2009 Vasili I Galchin; 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Doug Burke; All rights reserved. Maintainer: dburke@cfa.harvard.edu Category: Semantic Web Synopsis: A semantic web toolkit. @@ -94,7 +94,7 @@ Library Default-Language: Haskell2010 Build-Depends:- base >= 4.5 && < 4.16,+ base >= 4.8 && < 4.16, containers >= 0.5 && < 0.7, directory >= 1.0 && < 1.4, filepath >= 1.1 && < 1.5,@@ -108,10 +108,10 @@ text >= 0.11 && < 1.3, -- I don't think 1.9.0 will work and it was quickly replaced -- so do not support it - time (>= 1.1 && < 1.9) || (>= 1.9.1 && < 1.10)+ time (>= 1.1 && < 1.9) || (>= 1.9.1 && < 1.12) if flag(network-uri)- build-depends: network-uri == 2.6.*+ build-depends: network-uri >= 2.6 && < 2.8 else build-depends: network-uri < 2.6 , network >= 2.4 && < 2.6@@ -119,7 +119,7 @@ if impl(ghc < 8.0.0) ghc-options: -Wall -fno-warn-orphans- build-depends: semigroups >= 0.16 && < 0.19+ build-depends: semigroups >= 0.16 && < 0.20 else if impl(ghc < 8.8.0) ghc-options: