Skip to content

Commit c84b9af

Browse files
committed
updated to stack lts-8.3 (ghc-8.0.2)
1 parent a27bcbe commit c84b9af

File tree

22 files changed

+38
-32
lines changed

22 files changed

+38
-32
lines changed

Diff for: Blackjack/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# For more information, see: https://github.com/commercialhaskell/stack/blob/master/doc/yaml_configuration.md
22

33
# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
4-
resolver: lts-6.0
4+
resolver: lts-8.3
55

66
# Local packages, usually specified by relative directory name
77
packages:

Diff for: ClientServer/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# For more information, see: https://github.com/commercialhaskell/stack/blob/master/doc/yaml_configuration.md
22

33
# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
4-
resolver: lts-6.0
4+
resolver: lts-8.3
55

66
# Local packages, usually specified by relative directory name
77
packages:

Diff for: CommandLineApp/CommandLine1.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import Data.Char (toUpper)
55

66
main = do
77
putStrLn "Enter a line of text for test 1:"
8-
--s <- getLine
9-
putStrLn $ "As upper case:\t" ++ (map toUpper getLine)
8+
s <- getLine
9+
putStrLn $ "As upper case:\t" ++ (map toUpper s)
1010
main
1111

Diff for: CommandLineApp/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# For more information, see: https://github.com/commercialhaskell/stack/blob/master/doc/yaml_configuration.md
22

33
# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
4-
resolver: lts-6.0
4+
resolver: lts-8.3
55

66
# Local packages, usually specified by relative directory name
77
packages:

Diff for: Database-postgres/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# For more information, see: https://github.com/commercialhaskell/stack/blob/master/doc/yaml_configuration.md
22

33
# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
4-
resolver: lts-6.0
4+
resolver: lts-8.3
55

66
# Local packages, usually specified by relative directory name
77
packages:

Diff for: Database-sqlite/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# For more information, see: https://github.com/commercialhaskell/stack/blob/master/doc/yaml_configuration.md
22

33
# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
4-
resolver: lts-6.0
4+
resolver: lts-8.3
55

66
# Local packages, usually specified by relative directory name
77
packages:

Diff for: FastTag/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# For more information, see: https://github.com/commercialhaskell/stack/blob/master/doc/yaml_configuration.md
22

33
# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
4-
resolver: lts-6.0
4+
resolver: lts-8.3
55

66
# Local packages, usually specified by relative directory name
77
packages:

Diff for: ImPure/ImPure.cabal

-5
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,4 @@ executable DoLetExample3
3030
default-language: Haskell2010
3131
build-depends: base >= 4.7 && < 5
3232

33-
executable DoLetExample3
34-
hs-source-dirs: .
35-
main-is: DoLetExample3.hs
36-
default-language: Haskell2010
37-
build-depends: base >= 4.7 && < 5, containers
3833

Diff for: ImPure/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# For more information, see: https://github.com/commercialhaskell/stack/blob/master/doc/yaml_configuration.md
22

33
# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
4-
resolver: lts-6.0
4+
resolver: lts-8.3
55

66
# Local packages, usually specified by relative directory name
77
packages:

Diff for: LinkedDataApp/stack.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ extra-package-dbs: []
55
packages:
66
- '.'
77
extra-deps:
8-
- hsparql-0.2.7
9-
- rdf4h-1.3.6
10-
resolver: lts-5.0
8+
- hsparql-0.3.0
9+
- hgal-2.0.0.2
10+
- rdf4h-3.0.1
11+
resolver: lts-8.3

Diff for: NlpTool/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# For more information, see: https://github.com/commercialhaskell/stack/blob/master/doc/yaml_configuration.md
22

33
# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
4-
resolver: lts-6.0
4+
resolver: lts-8.3
55

66
# Local packages, usually specified by relative directory name
77
packages:

Diff for: Pure/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# For more information, see: https://github.com/commercialhaskell/stack/blob/master/doc/yaml_configuration.md
22

33
# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
4-
resolver: lts-6.0
4+
resolver: lts-8.3
55

66
# Local packages, usually specified by relative directory name
77
packages:

Diff for: README.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ This repo contains the examples for my Haskell book:
44

55
[Haskell Tutorial and Cookbook](https://leanpub.com/haskell-cookbook)
66

7+
Updated 3/2/2017 to stack lts-8.3 (ghc-8.0.2)
78

89
## Book Table of Contents (This will change as the book is written)
910

Diff for: SparqlClient/HttpSparqlClient.hs

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
{-# LANGUAGE OverloadedStrings #-}
22

3-
module HttpSparqlClient where
3+
module Main where
44

55
import Network.HTTP.Conduit (simpleHttp)
66
import Network.HTTP.Base (urlEncode)
77
import Text.XML.HXT.Core
88
import Text.HandsomeSoup
99
import qualified Data.ByteString.Lazy.Char8 as B
10+
--import qualified Data.Text as T
11+
12+
prefixUrl :: [Char]
13+
prefixUrl = "http://dbpedia.org/sparql/?query="
1014

1115
buildQuery :: String -> [Char]
12-
buildQuery sparqlString =
13-
"http://dbpedia.org/sparql/?query=" ++ urlEncode sparqlString
16+
buildQuery sparqlString = prefixUrl ++ urlEncode sparqlString
1417

1518
main :: IO ()
1619
main = do

Diff for: SparqlClient/README.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# Run example
22

3-
stack build --exec TestSparqlClient
3+
stack ghci
4+
*Main> :l HttpSparqlClient
5+
*Main> main
6+
*Main> :l RobsExample
7+
*Main> main
8+
49

510
# Using RDF4H
611

Diff for: SparqlClient/SparqlClient.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ executable HttpSparqlClient
2828
hs-source-dirs: .
2929
main-is: HttpSparqlClient.hs
3030
default-language: Haskell2010
31-
build-depends: base >= 4.7 && < 5, HTTP >= 4, http-conduit, containers, hxt, HandsomeSoup, bytestring
31+
build-depends: base >= 4.7 && < 5, HTTP >= 4, http-conduit, containers, hxt, HandsomeSoup, text, bytestring
3232

Diff for: SparqlClient/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ extra-deps:
1212
- hgal-2.0.0.2
1313
- rdf4-3.0.0
1414
- hsparql-0.2.9
15-
resolver: lts-6.11
15+
resolver: lts-8.3
1616

Diff for: StateMonad/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# For more information, see: https://github.com/commercialhaskell/stack/blob/master/doc/yaml_configuration.md
22

33
# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
4-
resolver: lts-6.11
4+
resolver: lts-8.3
55

66
# Local packages, usually specified by relative directory name
77
packages:

Diff for: TestingHaskell/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# resolver:
1616
# name: custom-snapshot
1717
# location: "./custom-snapshot.yaml"
18-
resolver: lts-7.0
18+
resolver: lts-8.3
1919

2020
# User packages to be built.
2121
# Various formats can be used as shown in the example below.

Diff for: TextProcessing/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ extra-package-dbs: []
33
packages:
44
- '.'
55
extra-deps:
6-
resolver: lts-6.11
6+
resolver: lts-8.3
77

Diff for: Timers/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# For more information, see: https://github.com/commercialhaskell/stack/blob/master/doc/yaml_configuration.md
22

33
# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
4-
resolver: lts-6.0
4+
resolver: lts-8.3
55

66
# Local packages, usually specified by relative directory name
77
packages:

Diff for: WebScraping/stack.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
# For more information, see: https://github.com/commercialhaskell/stack/blob/master/doc/yaml_configuration.md
22

33
# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
4-
resolver: lts-5.0
4+
resolver: lts-8.3
55

66
# Local packages, usually specified by relative directory name
77
packages:
88
- '.'
99

1010
# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
11-
extra-deps: []
12-
11+
extra-deps:
12+
- wreq-0.5.0.0
13+
1314
# Override default flag values for local packages and extra-deps
1415
flags: {}
1516

0 commit comments

Comments
 (0)