Преглед изворни кода

Update dependencies, release 0.2.1.1

tags/v0.2.1.1^0
Peter J. Jones пре 5 месеци
родитељ
комит
30cd1944dd
Signed by: Peter Jones <pjones@devalot.com> GPG Key ID: 9DAFAA8D01941E49
7 измењених фајлова са 23 додато и 155 уклоњено
  1. 0
    104
      .travis.yml
  2. 1
    1
      LICENSE
  3. 1
    4
      README.md
  4. 13
    14
      default.nix
  5. 6
    18
      playlists-http.cabal
  6. 2
    2
      playlists-http.nix
  7. 0
    12
      stack.yaml

+ 0
- 104
.travis.yml Прегледај датотеку

@@ -1,104 +0,0 @@
# This Travis job script has been generated by a script via
#
# runghc make_travis_yml_2.hs 'playlists-http.cabal'
#
# For more information, see https://github.com/hvr/multi-ghc-travis
#
language: c
sudo: false

git:
submodules: false # whether to recursively clone submodules

cache:
directories:
- $HOME/.cabal/packages
- $HOME/.cabal/store

before_cache:
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
# remove files that are regenerated by 'cabal update'
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx

- rm -rfv $HOME/.cabal/packages/head.hackage

matrix:
include:
- compiler: "ghc-7.10.3"
# env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.3], sources: [hvr-ghc]}}
- compiler: "ghc-8.0.2"
# env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}
- compiler: "ghc-8.2.2"
# env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
- compiler: "ghc-8.4.1"
# env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}

before_install:
- HC=${CC}
- HCPKG=${HC/ghc/ghc-pkg}
- unset CC
- ROOTDIR=$(pwd)
- mkdir -p $HOME/.local/bin
- "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"
- HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
- echo $HCNUMVER

install:
- cabal --version
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
- BENCH=${BENCH---enable-benchmarks}
- TEST=${TEST---enable-tests}
- HADDOCK=${HADDOCK-true}
- INSTALLED=${INSTALLED-true}
- GHCHEAD=${GHCHEAD-false}
- travis_retry cabal update -v
- "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
- rm -fv cabal.project cabal.project.local
- grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
- "printf 'packages: \".\"\\n' > cabal.project"
- cat cabal.project
- if [ -f "./configure.ac" ]; then
(cd "." && autoreconf -i);
fi
- rm -f cabal.project.freeze
- cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
- rm -rf .ghc.environment.* "."/dist
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)

# Here starts the actual work to be performed for the package under test;
# any command which exits with a non-zero exit code causes the build to fail.
script:
# test that source-distributions can be generated
- (cd "." && cabal sdist)
- mv "."/dist/playlists-http-*.tar.gz ${DISTDIR}/
- cd ${DISTDIR} || false
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
- "printf 'packages: playlists-http-*/*.cabal\\n' > cabal.project"
- cat cabal.project
# this builds all libraries and executables (without tests/benchmarks)
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks all

# Build with installed constraints for packages in global-db
- if $INSTALLED; then echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks $(${HCPKG} list --global --simple-output --names-only | sed 's/\([a-zA-Z0-9-]\{1,\}\) */--constraint="\1 installed" /g') all | sh; else echo "Not building with installed constraints"; fi

# build & run tests, build benchmarks
- cabal new-build -w ${HC} ${TEST} ${BENCH} all

# cabal check
- (cd playlists-http-* && cabal check)

# haddock
- rm -rf ./dist-newstyle
- if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi

# REGENDATA ["playlists-http.cabal"]
# EOF

+ 1
- 1
LICENSE Прегледај датотеку

@@ -1,4 +1,4 @@
Copyright (c) 2016,2018 Peter Jones <pjones@devalot.com>
Copyright (c) 2016-2019 Peter Jones <pjones@devalot.com>

All rights reserved.


+ 1
- 4
README.md Прегледај датотеку

@@ -1,4 +1,4 @@
playlists-http [![Travis][travis-shield]][travis]
playlists-http
==============

Download and parse playlists over HTTP.
@@ -15,6 +15,3 @@ See the following modules for more details:

There is also an `examples/example.hs` that demonstrates how to use
the `download` function which is found in `Text.Playlist.HTTP.Full`.

[travis]: https://travis-ci.org/pjones/playlists-http
[travis-shield]: https://travis-ci.org/pjones/playlists-http.svg?branch=master

+ 13
- 14
default.nix Прегледај датотеку

@@ -1,20 +1,19 @@
{ pkgs ? (import <nixpkgs> {}).pkgs }:
{ pkgs ? import <nixpkgs> { }
}:

let
# List any extra packages you want available while your package is
# building or while in a nix shell:
extraPackages = with pkgs; [ ];

# Helpful if you want to override any Haskell packages:
haskell = pkgs.haskellPackages;
overrides = self: super: {
http-client = if super ? http-client_0_6_2
then super.http-client_0_6_2
else super.http-client;
};

# Apply the overrides from above:
haskell = pkgs.haskellPackages.override (orig: {
overrides = pkgs.lib.composeExtensions
(orig.overrides or (_: _: {})) overrides; });
in

# Load the local nix file and use the overrides from above:
haskell.callPackage ./playlists-http.nix {
mkDerivation = { buildTools ? []
, ...
}@args:
haskell.mkDerivation (args // {
buildTools = buildTools ++ extraPackages;
});
}
haskell.callPackage ./playlists-http.nix { }

+ 6
- 18
playlists-http.cabal Прегледај датотеку

@@ -1,16 +1,16 @@
name: playlists-http
version: 0.2.1.0
version: 0.2.1.1
synopsis: Library to glue together playlists and http-client
homepage: https://github.com/pjones/playlists-http
homepage: https://code.devalot.com/open/playlists-http
bug-reports: https://code.devalot.com/open/playlists-http/issues
license: BSD3
license-file: LICENSE
author: Peter Jones <pjones@devalot.com>
maintainer: Peter Jones <pjones@devalot.com>
copyright: Copyright (c) 2016,2018 Peter Jones
copyright: Copyright (c) 2016-2019 Peter Jones
category: Text
build-type: Simple
cabal-version: 1.18
tested-with: GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.1
description: Simple library for resolving playlists using http-client.

--------------------------------------------------------------------------------
@@ -22,13 +22,7 @@ extra-source-files:
--------------------------------------------------------------------------------
source-repository head
type: git
location: https://github.com/pjones/playlists-http.git

--------------------------------------------------------------------------------
flag maintainer
description: Enable settings for the package maintainer.
default: False
manual: True
location: https://code.devalot.com/open/playlists-http.git

--------------------------------------------------------------------------------
flag build-examples
@@ -46,14 +40,11 @@ library
hs-source-dirs: src
ghc-options: -Wall

if flag(maintainer)
ghc-options: -Werror

build-depends: attoparsec >= 0.10 && < 1.0
, base >= 4.6 && < 5
, bytestring >= 0.10 && < 1.0
, exceptions >= 0.8 && < 0.11
, http-client >= 0.4 && < 0.6
, http-client >= 0.4 && < 0.7
, mtl >= 2.2 && < 2.3
, playlists >= 0.5 && < 1.0
, text >= 0.11 && < 1.3
@@ -66,9 +57,6 @@ executable example
main-is: example.hs
ghc-options: -Wall

if flag(maintainer)
ghc-options: -Werror

if !flag(build-examples)
buildable: False
else

+ 2
- 2
playlists-http.nix Прегледај датотеку

@@ -3,7 +3,7 @@
}:
mkDerivation {
pname = "playlists-http";
version = "0.2.1.0";
version = "0.2.1.1";
src = ./.;
isLibrary = true;
isExecutable = true;
@@ -11,7 +11,7 @@ mkDerivation {
attoparsec base bytestring exceptions http-client mtl playlists
text transformers
];
homepage = "https://github.com/pjones/playlists-http";
homepage = "https://code.devalot.com/open/playlists-http";
description = "Library to glue together playlists and http-client";
license = stdenv.lib.licenses.bsd3;
}

+ 0
- 12
stack.yaml Прегледај датотеку

@@ -1,12 +0,0 @@
resolver: lts-9.14
# resolver: lts-7.19
# resolver: lts-6.30

packages:
- ../playlists
- ./

flags:
playlists-http:
maintainer: true
build-examples: true

Loading…
Откажи
Сачувај