Browse Source

Build under LTS-5.15 with all hlint warnings fixed

tags/v0.2.2.0
Peter J. Jones 3 years ago
parent
commit
5f98a3cea6

+ 2
- 4
vendor/themoviedb/.gitignore View File

@@ -1,5 +1,3 @@
/dist
/.deps.mk
/cabal.sandbox.config
/.cabal-sandbox
/default.nix
/.stack-work
/build/.stack-work

vendor/themoviedb/CHANGES → vendor/themoviedb/CHANGES.md View File

@@ -1,18 +1,20 @@
-*- org -*-
#+title: Version History
#+startup: showall
# Version History

* 1.1.1.0 (July 22, 2015)
## 1.1.2.0 (June 9, 2016)

- Widen dependencies for LTS-5.15

## 1.1.1.0 (July 22, 2015)

- Widen dependencies for aeson, either, and text-binary

* 1.1.0.0 (May 22, 2015)
## 1.1.0.0 (May 22, 2015)

- Added Ord instance for TV, Season, and Episode
- Removed unused dependencies from build-depends
- Changes to build with GHC 7.8.4. and 7.10.1

* 1.0.0.0 (April 5, 2015)
## 1.0.0.0 (April 5, 2015)

- Major rewrite of the interface
- Removed utility functions for loading API keys
@@ -20,11 +22,11 @@
- Fixed bug: https://github.com/pjones/themoviedb/issues/1
- Fixed bug: https://github.com/pjones/themoviedb/issues/2

* 0.1.0.1 (December 17, 2012)
## 0.1.0.1 (December 17, 2012)

- Small internal changes to compile with GHC 7.6.1.
- Also compiles with GHC 7.4.2 and HP 2012.4.0.0.

* 0.1.0.0 (December 14, 2012)
## 0.1.0.0 (December 14, 2012)

- Initial release.

+ 28
- 0
vendor/themoviedb/GNUmakefile View File

@@ -0,0 +1,28 @@
################################################################################
export TMPDIR = $(HOME)/tmp

################################################################################
TMP_DUMMY = $(TMPDIR)/.dummy
STACK_OPTS = --stack-yaml=build/stack.yaml

################################################################################
.PHONY: all test clean install

################################################################################
all: $(TMP_DUMMY)
stack $(STACK_OPTS) setup
stack $(STACK_OPTS) build
hlint src test example

################################################################################
test:
stack $(STACK_OPTS) test

################################################################################
clean:
stack $(STACK_OPTS) clean

################################################################################
$(TMP_DUMMY):
mkdir -p $(dir $@)
touch $@

+ 1
- 1
vendor/themoviedb/LICENSE View File

@@ -1,6 +1,6 @@
# Copyright and Authors

Copyright (C) 2012-2015 Peter Jones <pjones@devalot.com>
Copyright (C) 2012-2016 Peter Jones <pjones@devalot.com>

# License (MIT)


+ 20
- 0
vendor/themoviedb/build/nixpkgs.nix View File

@@ -0,0 +1,20 @@
with (import <nixpkgs> {});

stdenv.mkDerivation {
name = "themoviedb";

buildInputs = [
# GHC:
haskell.packages.lts-5_15.ghc

# Non-Haskell Dependencies:
zlib # For the header files.
zlib.out # For the .so file.
];

# Work around a bug in GHC:
# https://ghc.haskell.org/trac/ghc/ticket/11042
shellHook = ''
export LD_LIBRARY_PATH=${zlib.out}/lib
'';
}

+ 8
- 0
vendor/themoviedb/build/stack.yaml View File

@@ -0,0 +1,8 @@
resolver: lts-5.15

packages:
- ../

flags:
themoviedb:
maintainer: true

+ 1
- 1
vendor/themoviedb/src/Network/API/TheMovieDB/Internal/Date.hs View File

@@ -53,7 +53,7 @@ parseDay v key =
--------------------------------------------------------------------------------
-- | Parse release dates in JSON.
instance FromJSON Date where
parseJSON (Null) = return (Date Nothing)
parseJSON Null = return (Date Nothing)
parseJSON (String t)
| T.null t = return (Date Nothing)
| otherwise = case parseTime defaultTimeLocale "%Y-%m-%d" (T.unpack t) of

+ 2
- 1
vendor/themoviedb/src/Network/API/TheMovieDB/Internal/TheMovieDB.hs View File

@@ -1,3 +1,4 @@
{-# OPTIONS_GHC -Wwarn #-} -- Kludge to not error out on withManager deprecation.
{-# LANGUAGE GeneralizedNewtypeDeriving #-}

{-
@@ -85,7 +86,7 @@ runTheMovieDB
:: Key -- ^ The API key to include in all requests.
-> TheMovieDB a -- ^ The API calls to make.
-> IO (Either Error a) -- ^ Response or error.
runTheMovieDB k t =
runTheMovieDB k t = -- TODO: replace withManager with newManager.
withManager tlsManagerSettings (\m -> runTheMovieDBWithManager m k t)

--------------------------------------------------------------------------------

+ 4
- 4
vendor/themoviedb/themoviedb.cabal View File

@@ -1,6 +1,6 @@
--------------------------------------------------------------------------------
name: themoviedb
version: 1.1.1.0
version: 1.1.2.0
synopsis: Haskell API bindings for http://themoviedb.org
homepage: http://github.com/pjones/themoviedb
bug-reports: http://github.com/pjones/themoviedb/issues
@@ -20,7 +20,7 @@ description: This library provides functions for retrieving metadata

--------------------------------------------------------------------------------
extra-source-files:
CHANGES
CHANGES.md
README.md
TODO.org
test/*.json
@@ -68,7 +68,7 @@ library
, either >= 4.3 && < 4.5
, http-client >= 0.4 && < 0.5
, http-client-tls >= 0.2.2 && < 0.3
, http-types >= 0.8 && < 0.9
, http-types >= 0.8 && < 0.10
, mtl >= 2.1 && < 2.3
, text >= 0.11 && < 1.3
, text-binary >= 0.1 && < 0.3
@@ -109,7 +109,7 @@ test-suite test

build-depends: base
, bytestring
, tasty >= 0.10 && < 0.11
, tasty >= 0.10 && < 0.12
, tasty-hunit >= 0.9 && < 0.10
, text
, themoviedb

Loading…
Cancel
Save