From 4ec9caab593a3c9ac9ade32d66216dd749f9da90 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 26 Mar 2015 18:50:38 +0200 Subject: [PATCH] LTS update, warning cleanup --- Data/Hackage/DeprecationInfo.hs | 2 - Data/Slug.hs | 1 - Data/Unpacking.hs | 1 - Foundation.hs | 9 +- Handler/BuildPlan.hs | 2 +- cabal.config | 520 ++++++++++++++++---------------- test/Data/SlugSpec.hs | 1 - 7 files changed, 268 insertions(+), 268 deletions(-) diff --git a/Data/Hackage/DeprecationInfo.hs b/Data/Hackage/DeprecationInfo.hs index e59844e..d79be1d 100644 --- a/Data/Hackage/DeprecationInfo.hs +++ b/Data/Hackage/DeprecationInfo.hs @@ -33,8 +33,6 @@ instance FromJSON DeprecationRecord where package <- PackageName <$> (obj .: "deprecated-package") inFavourOf <- map PackageName <$> (obj .: "in-favour-of") return $ DeprecationRecord package inFavourOf - where - parsePackageName = fmap PackageName toDeprecated :: DeprecationRecord -> Deprecated toDeprecated (DeprecationRecord deprecated _) = Deprecated deprecated diff --git a/Data/Slug.hs b/Data/Slug.hs index 12c301a..7dead6d 100644 --- a/Data/Slug.hs +++ b/Data/Slug.hs @@ -14,7 +14,6 @@ module Data.Slug import ClassyPrelude.Yesod import Database.Persist.Sql (PersistFieldSql (sqlType)) import qualified System.Random.MWC as MWC -import GHC.Prim (RealWorld) import Text.Blaze (ToMarkup) newtype Slug = Slug Text diff --git a/Data/Unpacking.hs b/Data/Unpacking.hs index 309da3f..43a70df 100644 --- a/Data/Unpacking.hs +++ b/Data/Unpacking.hs @@ -24,7 +24,6 @@ import qualified Data.Yaml as Y import System.IO (IOMode (ReadMode), withBinaryFile, openBinaryFile) import System.IO.Temp (withSystemTempFile, withTempFile, withSystemTempDirectory) import System.Exit (ExitCode (ExitSuccess)) -import System.Process (createProcess, proc, cwd, waitForProcess) import qualified Filesystem.Path.CurrentOS as F import Data.Conduit.Zlib (gzip, ungzip) import qualified Data.ByteString.Base16 as B16 diff --git a/Foundation.hs b/Foundation.hs index a42273b..896118c 100644 --- a/Foundation.hs +++ b/Foundation.hs @@ -14,16 +14,13 @@ import Settings.StaticFiles import qualified System.Random.MWC as MWC import Text.Blaze import Text.Hamlet (hamletFile) -import Text.Jasmine (minifym) import Types import Yesod.Auth import Yesod.Auth.BrowserId -import Yesod.Auth.GoogleEmail2 +import Yesod.Auth.GoogleEmail2 (authGoogleEmail) import Yesod.Core.Types (Logger, GWData) import Yesod.Default.Config -import Yesod.Default.Util (addStaticContentExternal) import Yesod.GitRepo -import Stackage.Types -- | The site argument for your application. This can be a good place to -- keep settings and values requiring initialization before your application @@ -215,7 +212,7 @@ instance YesodAuth App where , userDisplay = credsIdent creds , userToken = token } - void $ insert Email + insert_ Email { emailEmail = credsIdent creds , emailUser = userid } @@ -224,7 +221,7 @@ instance YesodAuth App where memail <- getBy $ UniqueEmail $ credsIdent creds case memail of Nothing -> do - void $ insert Email + insert_ Email { emailEmail = credsIdent creds , emailUser = uid } diff --git a/Handler/BuildPlan.hs b/Handler/BuildPlan.hs index 9c6d2ba..963a182 100644 --- a/Handler/BuildPlan.hs +++ b/Handler/BuildPlan.hs @@ -1,7 +1,7 @@ {-# LANGUAGE ConstraintKinds #-} module Handler.BuildPlan where -import Import hiding (get, PackageName (..), Version (..)) +import Import hiding (get, PackageName (..), Version (..), DList) import Data.Slug (SnapSlug) import qualified Filesystem as F import Data.Yaml (decodeFileEither) diff --git a/cabal.config b/cabal.config index 14f726b..9de77cd 100644 --- a/cabal.config +++ b/cabal.config @@ -1,13 +1,13 @@ --- Stackage snapshot from: http://www.stackage.org/snapshot/lts-1.0 +-- Stackage snapshot from: http://www.stackage.org/snapshot/lts-1.14 -- Please place this file next to your .cabal file as cabal.config -- To only use tested packages, uncomment the following line: --- remote-repo: stackage-lts-1.0:http://www.stackage.org/snapshot/lts-1.0 +-- remote-repo: stackage-lts-1.14:http://www.stackage.org/snapshot/lts-1.14 constraints: abstract-deque ==0.3, abstract-par ==0.3.3, accelerate ==0.15.0.0, ace ==0.6, action-permutations ==0.0.0.1, - active ==0.1.0.17, + active ==0.1.0.18, AC-Vector ==2.3.2, ad ==4.2.1.1, adjunctions ==4.2, @@ -16,7 +16,7 @@ constraints: abstract-deque ==0.3, aeson-qq ==0.7.4, aeson-utils ==0.2.2.1, alarmclock ==0.2.0.5, - alex ==3.1.3, + alex ==3.1.4, amqp ==0.10.1, ansi-terminal ==0.6.2.1, ansi-wl-pprint ==0.6.7.1, @@ -32,28 +32,29 @@ constraints: abstract-deque ==0.3, asn1-types ==0.3.0, async ==2.0.2, atto-lisp ==0.2.2, - attoparsec ==0.12.1.2, + attoparsec ==0.12.1.3, attoparsec-conduit ==1.1.0, attoparsec-enumerator ==0.3.3, attoparsec-expr ==0.1.1.1, authenticate ==1.3.2.11, auto-update ==0.1.2.1, - aws ==0.11, + aws ==0.11.2, bake ==0.2, bank-holidays-england ==0.1.0.2, - barecheck ==0.2.0.6, + barecheck ==0.2.0.8, base installed, base16-bytestring ==0.1.1.6, base64-bytestring ==1.0.0.1, base-compat ==0.5.0, - base-prelude ==0.1.11, + base-prelude ==0.1.16, base-unicode-symbols ==0.2.2.4, - basic-prelude ==0.3.10, - bifunctors ==4.2, + basic-prelude ==0.3.11.1, + bifunctors ==4.2.1, binary installed, binary-conduit ==1.2.3, binary-list ==1.0.1.0, - bindings-DSL ==1.0.21, + bindings-DSL ==1.0.22, + bin-package-db installed, bioace ==0.0.1, bioalign ==0.0.5, biocore ==0.3.1, @@ -67,9 +68,9 @@ constraints: abstract-deque ==0.3, blastxml ==0.3.2, blaze-builder ==0.3.3.4, blaze-builder-enumerator ==0.2.0.6, - blaze-html ==0.7.0.3, - blaze-markup ==0.6.2.0, - blaze-svg ==0.3.4, + blaze-html ==0.7.1.0, + blaze-markup ==0.6.3.0, + blaze-svg ==0.3.4.1, blaze-textual ==0.2.0.9, BlogLiterately ==0.7.1.7, BlogLiterately-diagrams ==0.1.4.3, @@ -81,56 +82,56 @@ constraints: abstract-deque ==0.3, BoundedChan ==1.0.3.0, broadcast-chan ==0.1.0, bson ==0.3.1, - bumper ==0.6.0.2, + bumper ==0.6.0.3, byteable ==0.1.1, bytedump ==1.0, byteorder ==1.0.4, - bytes ==0.14.1.2, + bytes ==0.14.1.3, bytestring installed, - bytestring-builder ==0.10.4.0.1, + bytestring-builder ==0.10.4.1.2, bytestring-lexing ==0.4.3.2, bytestring-mmap ==0.2.2, bytestring-progress ==1.0.3, bytestring-show ==0.3.5.6, bytestring-trie ==0.2.4, - bzlib ==0.5.0.4, + bzlib ==0.5.0.5, bzlib-conduit ==0.2.1.3, c2hs ==0.20.1, Cabal installed, - cabal-install ==1.18.0.7, + cabal-install ==1.18.0.8, cabal-src ==0.2.5, - cairo ==0.13.0.6, - case-insensitive ==1.2.0.3, + cairo ==0.13.1.0, + case-insensitive ==1.2.0.4, cases ==0.1.2, - cassava ==0.4.2.1, + cassava ==0.4.2.2, cautious-file ==1.0.2, - cereal ==0.4.1.0, + cereal ==0.4.1.1, cereal-conduit ==0.7.2.3, certificate ==1.3.9, charset ==0.3.7, - Chart ==1.3.2, - Chart-diagrams ==1.3.2, - ChasingBottoms ==1.3.0.9, + Chart ==1.3.3, + Chart-diagrams ==1.3.3, + ChasingBottoms ==1.3.0.11, check-email ==1.0, - checkers ==0.4.1, - chell ==0.4, + checkers ==0.4.2, + chell ==0.4.0.1, chell-quickcheck ==0.2.4, chunked-data ==0.1.0.1, - cipher-aes ==0.2.9, + cipher-aes ==0.2.10, cipher-blowfish ==0.0.3, cipher-camellia ==0.0.2, cipher-des ==0.0.6, cipher-rc4 ==0.1.4, circle-packing ==0.1.0.4, - classy-prelude ==0.10.2, - classy-prelude-conduit ==0.10.2, - classy-prelude-yesod ==0.10.2, + classy-prelude ==0.10.5, + classy-prelude-conduit ==0.10.5, + classy-prelude-yesod ==0.10.5, clientsession ==0.9.1.1, clock ==0.4.1.3, cmdargs ==0.10.12, code-builder ==0.1.3, colour ==2.3.3, - comonad ==4.2.2, + comonad ==4.2.5, comonads-fd ==4.0, comonad-transformers ==4.0, compdata ==0.9, @@ -141,21 +142,21 @@ constraints: abstract-deque ==0.3, concurrent-extra ==0.7.0.9, concurrent-supply ==0.1.7, cond ==0.4.1.1, - conduit ==1.2.3.1, - conduit-combinators ==0.3.0.5, - conduit-extra ==1.1.6, + conduit ==1.2.4, + conduit-combinators ==0.3.0.6, + conduit-extra ==1.1.7.1, configurator ==0.3.0.0, - connection ==0.2.3, - constraints ==0.4.1.2, + connection ==0.2.4, + constraints ==0.4.1.3, containers installed, containers-unicode-symbols ==0.3.1.1, - contravariant ==1.2.0.1, + contravariant ==1.2.2.1, control-monad-free ==0.5.3, control-monad-loop ==0.1, convertible ==1.1.0.0, cookie ==0.4.1.4, courier ==0.1.0.15, - cpphs ==1.18.6, + cpphs ==1.18.9, cprng-aes ==0.6.1, cpu ==0.1.2, criterion ==1.0.2.0, @@ -167,9 +168,9 @@ constraints: abstract-deque ==0.3, cryptohash-conduit ==0.1.1, cryptohash-cryptoapi ==0.1.3, crypto-numbers ==0.2.7, - crypto-pubkey ==0.2.7, - crypto-pubkey-types ==0.4.2.3, - crypto-random ==0.0.8, + crypto-pubkey ==0.2.8, + crypto-pubkey-types ==0.4.3, + crypto-random ==0.0.9, crypto-random-api ==0.2.0, css-text ==0.1.2.1, csv ==0.1.2, @@ -192,23 +193,23 @@ constraints: abstract-deque ==0.3, Decimal ==0.4.2, deepseq installed, deepseq-generics ==0.1.1.2, - derive ==2.5.18, + derive ==2.5.22, diagrams ==1.2, - diagrams-builder ==0.6.0.2, - diagrams-cairo ==1.2.0.5, - diagrams-contrib ==1.1.2.4, - diagrams-core ==1.2.0.4, - diagrams-haddock ==0.2.2.12, - diagrams-lib ==1.2.0.7, - diagrams-postscript ==1.1.0.3, - diagrams-svg ==1.1.0.3, + diagrams-builder ==0.6.0.3, + diagrams-cairo ==1.2.0.6, + diagrams-contrib ==1.1.2.5, + diagrams-core ==1.2.0.5, + diagrams-haddock ==0.2.2.13, + diagrams-lib ==1.2.0.8, + diagrams-postscript ==1.1.0.4, + diagrams-svg ==1.1.0.4, Diff ==0.3.0, digest ==0.0.1.2, - digestive-functors ==0.7.1.3, + digestive-functors ==0.7.1.5, dimensional ==0.13.0.1, directory installed, directory-tree ==0.12.0, - direct-sqlite ==2.3.14, + direct-sqlite ==2.3.15, distributed-process ==0.5.3, distributed-process-async ==0.2.1, distributed-process-client-server ==0.1.2, @@ -219,22 +220,22 @@ constraints: abstract-deque ==0.3, distributed-process-task ==0.1.1, distributed-static ==0.3.1.0, distributive ==0.4.4, - djinn-ghc ==0.0.2.2, + djinn-ghc ==0.0.2.3, djinn-lib ==0.0.1.2, - dlist ==0.7.1, + dlist ==0.7.1.1, dlist-instances ==0.1, - doctest ==0.9.11.1, + doctest ==0.9.13, double-conversion ==2.0.1.0, dual-tree ==0.2.0.5, easy-file ==0.2.0, - either ==4.3.2.1, + either ==4.3.3.2, elm-build-lib ==0.14.0.0, - elm-compiler ==0.14, + elm-compiler ==0.14.1, elm-core-sources ==1.0.0, elm-package ==0.2.2, email-validate ==2.0.1, enclosed-exceptions ==1.0.1, - entropy ==0.3.4.1, + entropy ==0.3.6, enumerator ==0.4.20, eq ==4.0.3, erf ==2.0.0.0, @@ -246,36 +247,37 @@ constraints: abstract-deque ==0.3, exception-transformers ==0.3.0.4, executable-path ==0.0.3, extensible-exceptions ==0.1.1.4, - extra ==1.0, + extra ==1.0.1, failure ==0.2.0.3, fast-logger ==2.2.3, fay ==0.21.2.1, - fay-base ==0.19.4.1, - fay-builder ==0.2.0.1, - fay-dom ==0.5, - fay-jquery ==0.6.0.2, - fay-text ==0.3.2, + fay-base ==0.19.4.2, + fay-builder ==0.2.0.3, + fay-dom ==0.5.0.1, + fay-jquery ==0.6.0.3, + fay-text ==0.3.2.2, fay-uri ==0.2.0.0, - fb ==1.0.7, + fb ==1.0.8, fb-persistent ==0.3.4, - fclabels ==2.0.2, - FenwickTree ==0.1.2, - fgl ==5.5.0.1, - file-embed ==0.0.7, - file-location ==0.4.5.3, - filemanip ==0.3.6.2, + fclabels ==2.0.2.2, + FenwickTree ==0.1.2.1, + fgl ==5.5.1.0, + file-embed ==0.0.8.2, + file-location ==0.4.6, + filemanip ==0.3.6.3, filepath installed, - fingertree ==0.1.0.0, - fixed ==0.2.1, + fingertree ==0.1.0.1, + fixed ==0.2.1.1, fixed-list ==0.1.5, flexible-defaults ==0.0.1.1, focus ==0.1.3, - foldl ==1.0.7, - FontyFruity ==0.4, - force-layout ==0.3.0.8, + foldl ==1.0.8, + FontyFruity ==0.4.1, + force-layout ==0.3.0.10, foreign-store ==0.1, + foreign-var ==0.0.0.1, formatting ==6.0.0, - fpco-api ==1.2.0.4, + fpco-api ==1.2.0.5, free ==4.10.0.1, freenect ==1.2, frisby ==0.2, @@ -285,27 +287,28 @@ constraints: abstract-deque ==0.3, generic-aeson ==0.2.0.2, generic-deriving ==1.6.3, GenericPretty ==1.2.1, - generics-sop ==0.1.0.4, + generics-sop ==0.1.1.1, + ghc installed, ghc-heap-view ==0.5.3, ghcid ==0.3.4, ghc-mod ==5.2.1.2, ghc-mtl ==1.2.1.0, ghc-paths ==0.1.0.9, ghc-prim installed, - ghc-syb-utils ==0.2.2, + ghc-syb-utils ==0.2.3, gio ==0.13.0.4, git-embed ==0.1.0, - gl ==0.6.2, - glib ==0.13.0.7, + gl ==0.6.3, + glib ==0.13.1.0, Glob ==0.7.5, - GLURaw ==1.4.0.1, + GLURaw ==1.4.0.2, GLUT ==2.5.1.1, graph-core ==0.2.1.0, graphs ==0.5.0.1, gravatar ==0.6, - groundhog ==0.7.0.1, + groundhog ==0.7.0.3, groundhog-mysql ==0.7.0.1, - groundhog-postgresql ==0.7.0.1, + groundhog-postgresql ==0.7.0.2, groundhog-sqlite ==0.7.0.1, groundhog-th ==0.7.0, groupoids ==4.0, @@ -317,71 +320,72 @@ constraints: abstract-deque ==0.3, half ==0.2.0.1, HandsomeSoup ==0.3.5, happstack-server ==7.3.9, - happy ==1.19.4, - hashable ==1.2.3.1, + happy ==1.19.5, + hashable ==1.2.3.2, hashable-extras ==0.2.0.1, hashmap ==1.3.0.1, - hashtables ==1.2.0.1, + hashtables ==1.2.0.2, haskeline installed, haskell2010 installed, haskell98 installed, haskell-lexer ==1.0, haskell-names ==0.4.1, - haskell-packages ==0.2.4.3, - haskell-src ==1.0.1.6, + haskell-packages ==0.2.4.4, + haskell-src ==1.0.2.0, haskell-src-exts ==1.16.0.1, haskell-src-meta ==0.6.0.8, - hasql ==0.7.1, + hasql ==0.7.2, hasql-backend ==0.4.0, - hasql-postgres ==0.10.1, + hasql-postgres ==0.10.2, hastache ==0.6.1, HaTeX ==3.16.0.0, - HaXml ==1.25, + HaXml ==1.25.3, haxr ==3000.10.3.1, HCodecs ==0.5, hdaemonize ==0.5.0.0, hdevtools ==0.1.0.6, - heaps ==0.3.1, + heap ==1.0.2, + heaps ==0.3.2, hebrew-time ==0.1.1, - heist ==0.14.0.1, - here ==1.2.6, + heist ==0.14.1, + here ==1.2.7, heredoc ==0.2.0.0, hflags ==0.4, - highlighting-kate ==0.5.11.1, + highlighting-kate ==0.5.12, hinotify ==0.3.7, - hint ==0.4.2.1, - histogram-fill ==0.8.3.0, - hit ==0.6.2, + hint ==0.4.2.2, + histogram-fill ==0.8.4.1, + hit ==0.6.3, hjsmin ==0.1.4.7, - hledger ==0.24, - hledger-lib ==0.24, - hlibgit2 ==0.18.0.13, - hlint ==1.9.14, - hmatrix ==0.16.1.3, - hmatrix-gsl ==0.16.0.2, + hledger ==0.24.1, + hledger-lib ==0.24.1, + hlibgit2 ==0.18.0.14, + hlint ==1.9.16, + hmatrix ==0.16.1.5, + hmatrix-gsl ==0.16.0.3, hoauth2 ==0.4.3, holy-project ==0.1.1.1, - hoogle ==4.2.36, + hoogle ==4.2.38, hoopl installed, hOpenPGP ==1.11, hostname ==1.0, hostname-validate ==1.0.0, - hourglass ==0.2.6, + hourglass ==0.2.8, hpc installed, hPDB ==1.2.0.2, hPDB-examples ==1.2.0.1, hs-bibutils ==5.5, hscolour ==1.20.3, hse-cpp ==0.1, - hslogger ==1.2.6, + hslogger ==1.2.8, hslua ==0.3.13, - hspec ==2.1.2, + hspec ==2.1.5, hspec2 ==0.6.1, - hspec-core ==2.1.2, - hspec-discover ==2.1.2, + hspec-core ==2.1.5, + hspec-discover ==2.1.5, hspec-expectations ==0.6.1.1, hspec-meta ==2.0.0, - hspec-wai ==0.6.2, + hspec-wai ==0.6.3, hspec-wai-json ==0.6.0, HStringTemplate ==0.7.3, hsyslog ==2.0, @@ -389,36 +393,36 @@ constraints: abstract-deque ==0.3, html ==1.0.1.2, html-conduit ==1.1.1.1, HTTP ==4000.2.19, - http-client ==0.4.6.1, + http-client ==0.4.9, http-client-tls ==0.2.2, http-conduit ==2.1.5, - http-date ==0.0.4, + http-date ==0.0.6, http-reverse-proxy ==0.4.1.2, - http-types ==0.8.5, + http-types ==0.8.6, HUnit ==1.2.5.2, hweblib ==0.6.3, - hxt ==9.3.1.10, - hxt-charproperties ==9.2.0.0, - hxt-http ==9.1.5, + hxt ==9.3.1.15, + hxt-charproperties ==9.2.0.1, + hxt-http ==9.1.5.2, hxt-pickle-utils ==0.1.0.2, - hxt-regex-xmlschema ==9.2.0, - hxt-relaxng ==9.1.5.1, - hxt-unicode ==9.0.2.2, - hybrid-vectors ==0.1.2, - hyphenation ==0.4, + hxt-regex-xmlschema ==9.2.0.2, + hxt-relaxng ==9.1.5.5, + hxt-unicode ==9.0.2.4, + hybrid-vectors ==0.1.2.1, + hyphenation ==0.4.2.1, idna ==0.3.0, - ieee754 ==0.7.4, + ieee754 ==0.7.6, IfElse ==0.85, imagesize-conduit ==1.0.0.4, immortal ==0.2, - incremental-parser ==0.2.3.3, + incremental-parser ==0.2.3.4, indents ==0.3.3, - ini ==0.3.0, + ini ==0.3.1, integer-gmp installed, - integration ==0.2.0.1, + integration ==0.2.1, interpolate ==0.1.0, interpolatedstring-perl6 ==0.9.0, - intervals ==0.7.0.1, + intervals ==0.7.1, io-choice ==0.0.5, io-manager ==0.1.0.2, io-memoize ==1.1.1.0, @@ -427,71 +431,71 @@ constraints: abstract-deque ==0.3, ixset ==1.0.6, js-flot ==0.8.3, js-jquery ==1.11.2, - json-autotype ==0.2.5.4, - json-schema ==0.7.3.0, - JuicyPixels ==3.2.1, + json-autotype ==0.2.5.9, + json-schema ==0.7.3.1, + JuicyPixels ==3.2.3, JuicyPixels-repa ==0.7, - kan-extensions ==4.2, - kdt ==0.2.2, - keter ==1.3.7.1, + kan-extensions ==4.2.1, + kdt ==0.2.3, + keter ==1.3.9.1, keys ==3.10.1, - kure ==2.16.4, + kure ==2.16.8, language-c ==0.4.7, language-ecmascript ==0.16.2, language-glsl ==0.1.1, language-haskell-extract ==0.2.4, language-java ==0.2.7, - language-javascript ==0.5.13, + language-javascript ==0.5.13.3, lazy-csv ==0.5, lca ==0.2.4, lens ==4.6.0.1, lens-aeson ==1.0.0.3, - lens-family-th ==0.4.0.0, + lens-family-th ==0.4.1.0, lhs2tex ==1.18.1, libgit ==0.3.0, libnotify ==0.1.1.0, lifted-async ==0.2.0.2, - lifted-base ==0.2.3.3, + lifted-base ==0.2.3.6, linear ==1.15.5, linear-accelerate ==0.2, - list-t ==0.4.2, + list-t ==0.4.3, loch-th ==0.2.1, log-domain ==0.9.3, logfloat ==0.12.1, logict ==0.6.0.2, loop ==0.2.0, lucid ==2.5, - lzma-conduit ==1.1.1, + lzma-conduit ==1.1.3, machines ==0.4.1, mandrill ==0.1.1.0, map-syntax ==0.2, - markdown ==0.1.13, + markdown ==0.1.13.1, markdown-unlit ==0.2.0.1, math-functions ==0.1.5.2, - matrix ==0.3.4.0, + matrix ==0.3.4.2, MaybeT ==0.1.2, MemoTrie ==0.6.2, mersenne-random-pure64 ==0.2.0.4, messagepack ==0.3.0, messagepack-rpc ==0.1.0.3, - mime-mail ==0.4.6.2, - mime-mail-ses ==0.3.2.1, - mime-types ==0.1.0.5, + mime-mail ==0.4.8.1, + mime-mail-ses ==0.3.2.2, + mime-types ==0.1.0.6, missing-foreign ==0.1.1, MissingH ==1.3.0.1, mmap ==0.5.9, mmorph ==1.0.4, MonadCatchIO-transformers ==0.3.1.3, - monad-control ==0.3.3.0, + monad-control ==0.3.3.1, monad-coroutine ==0.8.0.1, monadcryptorandom ==0.6.1, monad-extras ==0.5.9, - monadic-arrays ==0.2.1.3, + monadic-arrays ==0.2.1.4, monad-journal ==0.6.0.2, - monad-logger ==0.3.11.1, + monad-logger ==0.3.13.1, monad-loops ==0.4.2.1, monad-par ==0.3.4.7, - monad-parallel ==0.7.1.3, + monad-parallel ==0.7.1.4, monad-par-extras ==0.3.3, monad-primitive ==0.1, monad-products ==4.0.0.1, @@ -504,12 +508,13 @@ constraints: abstract-deque ==0.3, monoid-subclasses ==0.3.6.2, mono-traversable ==0.7.0, mtl ==2.1.3.1, - mtlparse ==0.1.2, - mtl-prelude ==1.0.2, + mtlparse ==0.1.4.0, + mtl-prelude ==1.0.3, multimap ==1.2.1, multipart ==0.1.2, - MusicBrainz ==0.2.2, - mwc-random ==0.13.2.2, + MusicBrainz ==0.2.3, + mutable-containers ==0.2.1.2, + mwc-random ==0.13.3.0, mysql ==0.1.1.7, mysql-simple ==0.2.2.4, nanospec ==0.2.0, @@ -517,16 +522,16 @@ constraints: abstract-deque ==0.3, neat-interpolation ==0.2.2, nettle ==0.1.0, network ==2.6.0.2, - network-conduit-tls ==1.1.0.2, + network-conduit-tls ==1.1.1, network-info ==0.2.0.5, network-multicast ==0.0.11, - network-simple ==0.4.0.2, + network-simple ==0.4.0.4, network-transport ==0.4.1.0, network-transport-tcp ==0.4.1, network-transport-tests ==0.2.2.0, network-uri ==2.6.0.1, newtype ==0.2, - nsis ==0.2.4, + nsis ==0.2.5, numbers ==3000.2.0.1, numeric-extras ==0.0.3, NumInstances ==1.4, @@ -535,46 +540,46 @@ constraints: abstract-deque ==0.3, old-locale installed, old-time installed, OneTuple ==0.2.1, - opaleye ==0.3, + opaleye ==0.3.1.2, OpenGL ==2.9.2.0, - OpenGLRaw ==1.5.0.0, + OpenGLRaw ==1.5.0.1, openpgp-asciiarmor ==0.1, operational ==0.2.3.2, - options ==1.2.1, - optparse-applicative ==0.11.0.1, + options ==1.2.1.1, + optparse-applicative ==0.11.0.2, osdkeys ==0.0, pandoc ==1.13.2, pandoc-citeproc ==0.6, - pandoc-types ==1.12.4.1, + pandoc-types ==1.12.4.2, pango ==0.13.0.5, parallel ==3.2.0.6, parallel-io ==0.3.3, parseargs ==0.1.5.2, - parsec ==3.1.7, + parsec ==3.1.8, parsers ==0.12.1.1, partial-handler ==0.1.0, path-pieces ==0.1.5, patience ==0.1.1, pcre-light ==0.4.0.3, - pdfinfo ==1.5.1, + pdfinfo ==1.5.2, pem ==0.2.2, persistent ==2.1.2, - persistent-mongoDB ==2.1.2, - persistent-mysql ==2.1.2, - persistent-postgresql ==2.1.2, + persistent-mongoDB ==2.1.2.1, + persistent-mysql ==2.1.2.1, + persistent-postgresql ==2.1.2.2, persistent-sqlite ==2.1.1.2, persistent-template ==2.1.0.1, phantom-state ==0.2.0.2, pipes ==4.1.4, - pipes-concurrency ==2.0.2, + pipes-concurrency ==2.0.3, pipes-parse ==3.0.2, placeholders ==0.1, pointed ==4.2, polyparse ==1.10, pool-conduit ==0.1.2.3, - postgresql-binary ==0.5.0, - postgresql-libpq ==0.9.0.1, - postgresql-simple ==0.4.9.0, + postgresql-binary ==0.5.1, + postgresql-libpq ==0.9.0.2, + postgresql-simple ==0.4.10.0, pqueue ==1.2.1, prefix-units ==0.1.0.2, prelude-extras ==0.4, @@ -582,7 +587,7 @@ constraints: abstract-deque ==0.3, pretty installed, prettyclass ==1.0.0.0, pretty-class ==1.0.1.1, - pretty-show ==1.6.8, + pretty-show ==1.6.8.2, primes ==0.2.1.0, primitive ==0.5.4.0, process installed, @@ -604,20 +609,20 @@ constraints: abstract-deque ==0.3, quickcheck-instances ==0.3.10, quickcheck-io ==0.1.1, quickcheck-unicode ==1.0.0.0, - quickpull ==0.4.0.0, + quickpull ==0.4.2.2, rainbow ==0.20.0.4, rainbow-tests ==0.20.0.4, random ==1.0.1.1, - random-fu ==0.2.6.1, + random-fu ==0.2.6.2, random-shuffle ==0.0.4, random-source ==0.3.0.6, rank1dynamic ==0.2.0.1, - Rasterific ==0.4, + Rasterific ==0.4.2, raw-strings-qq ==1.0.2, ReadArgs ==1.2.2, - reducers ==3.10.3, - reflection ==1.5.1, - regex-applicative ==0.3.0.3, + reducers ==3.10.3.1, + reflection ==1.5.1.2, + regex-applicative ==0.3.1, regex-base ==0.93.2, regex-compat ==0.95.1, regex-pcre-builtin ==0.94.4.8.8.35, @@ -634,38 +639,39 @@ constraints: abstract-deque ==0.3, repa-io ==3.3.1.2, reroute ==0.2.2.1, resource-pool ==0.2.3.2, - resourcet ==1.1.3.3, - rest-client ==0.4.0.2, + resourcet ==1.1.4.1, + rest-client ==0.4.0.5, rest-core ==0.33.1.2, - rest-gen ==0.16.1.3, - rest-happstack ==0.2.10.3, + rest-gen ==0.16.1.8, + rest-happstack ==0.2.10.4, rest-snap ==0.1.17.14, - rest-stringmap ==0.2.0.2, + rest-stringmap ==0.2.0.3, rest-types ==1.11.1.1, rest-wai ==0.1.0.4, rev-state ==0.1, rfc5051 ==0.1.0.3, + rts installed, runmemo ==1.0.0.1, rvar ==0.2.0.2, safe ==0.3.8, - safecopy ==0.8.3, - scientific ==0.3.3.3, + safecopy ==0.8.4, + scientific ==0.3.3.8, scotty ==0.9.0, scrobble ==0.2.1.1, - securemem ==0.1.4, + securemem ==0.1.7, semigroupoid-extras ==4.0, semigroupoids ==4.2, - semigroups ==0.16.0.1, + semigroups ==0.16.2.2, sendfile ==0.7.9, - seqloc ==0.6, - setenv ==0.1.1.1, + seqloc ==0.6.1.1, + setenv ==0.1.1.3, SHA ==1.6.4.1, - shake ==0.14.2, - shake-language-c ==0.6.3, - shakespeare ==2.0.2.1, + shake ==0.14.3, + shake-language-c ==0.6.4, + shakespeare ==2.0.4.1, shakespeare-i18n ==1.1.0, shakespeare-text ==1.1.0, - shell-conduit ==4.5, + shell-conduit ==4.5.2, shelly ==1.5.7, silently ==1.2.4.1, simple-reflect ==0.3.2, @@ -678,57 +684,58 @@ constraints: abstract-deque ==0.3, smtLib ==1.0.7, snap ==0.13.3.2, snap-core ==0.9.6.4, - snaplet-fay ==0.3.3.8, + snaplet-fay ==0.3.3.11, snap-server ==0.9.4.6, socks ==0.5.4, sodium ==0.11.0.3, sourcemap ==0.1.3.0, - speculation ==1.5.0.1, + speculation ==1.5.0.2, sphinx ==0.6.0.1, split ==0.2.2, - Spock ==0.7.6.0, + Spock ==0.7.7.0, Spock-digestive ==0.1.0.0, Spock-worker ==0.2.1.3, spoon ==0.3.1, sqlite-simple ==0.4.8.0, - stackage == 0.6.0, + stackage ==0.3.1, stateref ==0.3, statestack ==0.2.0.3, statistics ==0.13.2.1, statistics-linreg ==0.3, stm ==2.4.4, stm-chans ==3.0.0.2, - stm-conduit ==2.5.3, - stm-containers ==0.2.7, + stm-conduit ==2.5.4, + stm-containers ==0.2.8, stm-stats ==0.2.0.0, - storable-complex ==0.2.1, + storable-complex ==0.2.2, storable-endian ==0.2.5, - streaming-commons ==0.1.8, + streaming-commons ==0.1.10.0, streams ==3.2, strict ==0.3.2, stringable ==0.1.3, stringbuilder ==0.5.0, stringprep ==1.0.0, stringsearch ==0.3.6.5, - stylish-haskell ==0.5.11.0, + stylish-haskell ==0.5.11.1, SVGFonts ==1.4.0.3, - syb ==0.4.3, + syb ==0.4.4, syb-with-class ==0.6.1.5, - system-canonicalpath ==0.2.0.0, - system-fileio ==0.3.16, - system-filepath ==0.4.13.1, + system-canonicalpath ==0.2.3.0, + system-fileio ==0.3.16.1, + system-filepath ==0.4.13.2, system-posix-redirect ==1.1.0.1, - tabular ==0.2.2.5, + tabular ==0.2.2.7, tagged ==0.7.3, tagshare ==0.0, tagsoup ==0.13.3, tagstream-conduit ==0.5.5.3, - tar ==0.4.0.1, + tar ==0.4.1.0, tardis ==0.3.0.0, tasty ==0.10.1, tasty-ant-xml ==1.0.1, tasty-golden ==2.2.2.4, - tasty-hunit ==0.9.0.1, + tasty-hunit ==0.9.2, + tasty-kat ==0.0.3, tasty-quickcheck ==0.8.3.2, tasty-smallcheck ==0.8.0.1, tasty-th ==0.1.3, @@ -738,51 +745,52 @@ constraints: abstract-deque ==0.3, terminal-progress-bar ==0.0.1.4, terminal-size ==0.3.0, terminfo installed, - test-framework ==0.8.1.0, + test-framework ==0.8.1.1, test-framework-hunit ==0.3.0.1, test-framework-quickcheck2 ==0.3.0.3, test-framework-th ==0.2.4, testing-feat ==0.4.0.2, testpack ==2.1.3.0, - texmath ==0.8.0.1, - text ==1.2.0.3, + texmath ==0.8.0.2, + text ==1.2.0.4, text-binary ==0.1.0, text-format ==0.3.1.1, - text-icu ==0.7.0.0, + text-icu ==0.7.0.1, tf-random ==0.5, - th-desugar ==1.4.2, - th-expand-syns ==0.3.0.4, + th-desugar ==1.4.2.1, + th-expand-syns ==0.3.0.6, th-extras ==0.0.0.2, - th-lift ==0.7, + th-lift ==0.7.2, th-orphans ==0.8.3, - threads ==0.5.1.2, - th-reify-many ==0.1.2, + threads ==0.5.1.3, + th-reify-many ==0.1.3, thyme ==0.3.5.5, time installed, time-compat ==0.1.0.3, time-lens ==0.4.0.1, + time-locale-compat ==0.1.0.1, timezone-olson ==0.1.6, timezone-series ==0.1.4, - tls ==1.2.13, + tls ==1.2.16, tls-debug ==0.3.4, - tostring ==0.2.1, + tostring ==0.2.1.1, transformers installed, - transformers-base ==0.4.3, + transformers-base ==0.4.4, transformers-compat ==0.3.3.3, traverse-with-class ==0.2.0.3, tree-view ==0.4, tuple ==0.3.0.2, type-eq ==0.4.2, - type-list ==0.0.0.0, + type-list ==0.0.0.1, udbus ==0.2.1, unbounded-delays ==0.1.0.9, union-find ==0.2, uniplate ==1.6.12, unix installed, - unix-compat ==0.4.1.3, - unix-time ==0.3.4, + unix-compat ==0.4.1.4, + unix-time ==0.3.5, unordered-containers ==0.2.5.1, - uri-encode ==1.5.0.3, + uri-encode ==1.5.0.4, url ==2.1.3, utf8-light ==0.4.2, utf8-string ==0.3.8, @@ -791,32 +799,32 @@ constraints: abstract-deque ==0.3, vector ==0.10.12.2, vector-algorithms ==0.6.0.3, vector-binary-instances ==0.2.1.0, - vector-instances ==3.3, + vector-instances ==3.3.0.1, vector-space ==0.8.7, - vector-space-points ==0.2, - vector-th-unbox ==0.2.1.0, + vector-space-points ==0.2.1, + vector-th-unbox ==0.2.1.2, vhd ==0.2.2, void ==0.7, - wai ==3.0.2.1, - wai-app-static ==3.0.0.5, + wai ==3.0.2.3, + wai-app-static ==3.0.0.6, wai-conduit ==3.0.0.2, wai-eventsource ==3.0.0, - wai-extra ==3.0.3.2, + wai-extra ==3.0.4.6, wai-logger ==2.2.3, wai-middleware-static ==0.6.0.1, - wai-websockets ==3.0.0.3, - warp ==3.0.5, - warp-tls ==3.0.1.1, - webdriver ==0.6.0.3, + wai-websockets ==3.0.0.5, + warp ==3.0.10, + warp-tls ==3.0.3, + webdriver ==0.6.1, web-fpco ==0.1.1.0, - websockets ==0.9.2.2, + websockets ==0.9.3.1, wizards ==1.0.1, wl-pprint ==1.1, - wl-pprint-extras ==3.5.0.3, + wl-pprint-extras ==3.5.0.4, wl-pprint-terminfo ==3.7.1.3, wl-pprint-text ==1.1.0.3, - word8 ==0.1.1, - wordpass ==1.0.0.2, + word8 ==0.1.2, + wordpass ==1.0.0.3, X11 ==1.6.1.2, x509 ==1.5.0.1, x509-store ==1.5.0, @@ -824,40 +832,40 @@ constraints: abstract-deque ==0.3, x509-validation ==1.5.1, xenstore ==0.1.1, xhtml installed, - xml ==1.3.13, - xml-conduit ==1.2.3.1, + xml ==1.3.14, + xml-conduit ==1.2.3.3, xmlgen ==0.6.2.1, - xml-hamlet ==0.4.0.9, + xml-hamlet ==0.4.0.10, xmlhtml ==0.2.3.4, xml-types ==0.3.4, - xss-sanitize ==0.3.5.4, - yackage ==0.7.0.6, + xss-sanitize ==0.3.5.5, + yackage ==0.7.0.7, yaml ==0.8.10.1, Yampa ==0.9.6, YampaSynth ==0.2, - yesod ==1.4.1.3, - yesod-auth ==1.4.1.2, + yesod ==1.4.1.4, + yesod-auth ==1.4.3.1, yesod-auth-deskcom ==1.4.0, yesod-auth-fb ==1.6.6, yesod-auth-hashdb ==1.4.1.2, - yesod-auth-oauth2 ==0.0.11, - yesod-bin ==1.4.3.2, - yesod-core ==1.4.7.1, + yesod-auth-oauth2 ==0.0.12, + yesod-bin ==1.4.5.1, + yesod-core ==1.4.8.3, yesod-eventsource ==1.4.0.1, - yesod-fay ==0.7.0, + yesod-fay ==0.7.1, yesod-fb ==0.3.4, - yesod-form ==1.4.3.1, + yesod-form ==1.4.4.1, yesod-gitrepo ==0.1.1.0, yesod-newsfeed ==1.4.0.1, yesod-persistent ==1.4.0.2, yesod-sitemap ==1.4.0.1, yesod-static ==1.4.0.4, - yesod-test ==1.4.2.2, + yesod-test ==1.4.3.1, yesod-text-markdown ==0.1.7, yesod-websockets ==0.2.1.1, - zeromq4-haskell ==0.6.2, - zip-archive ==0.2.3.5, + zeromq4-haskell ==0.6.3, + zip-archive ==0.2.3.7, zlib ==0.5.4.2, zlib-bindings ==0.1.1.5, zlib-enum ==0.2.3.1, - zlib-lens ==0.1 + zlib-lens ==0.1.1.2 diff --git a/test/Data/SlugSpec.hs b/test/Data/SlugSpec.hs index 9453dd1..b661236 100644 --- a/test/Data/SlugSpec.hs +++ b/test/Data/SlugSpec.hs @@ -7,7 +7,6 @@ import Test.Hspec.QuickCheck import Data.Slug import ClassyPrelude.Yesod import qualified System.Random.MWC as MWC -import Control.Monad.Reader (runReaderT) spec :: Spec spec = describe "Data.Slug" $ do