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

Update dependencies, release 0.2.1.1

tags/v0.2.1.1^0
Peter J. Jones пре 3 месеци
родитељ
комит
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 @@
1
-# This Travis job script has been generated by a script via
2
-#
3
-#   runghc make_travis_yml_2.hs 'playlists-http.cabal'
4
-#
5
-# For more information, see https://github.com/hvr/multi-ghc-travis
6
-#
7
-language: c
8
-sudo: false
9
-
10
-git:
11
-  submodules: false  # whether to recursively clone submodules
12
-
13
-cache:
14
-  directories:
15
-    - $HOME/.cabal/packages
16
-    - $HOME/.cabal/store
17
-
18
-before_cache:
19
-  - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
20
-  # remove files that are regenerated by 'cabal update'
21
-  - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*
22
-  - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json
23
-  - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache
24
-  - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
25
-  - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
26
-
27
-  - rm -rfv $HOME/.cabal/packages/head.hackage
28
-
29
-matrix:
30
-  include:
31
-    - compiler: "ghc-7.10.3"
32
-    # env: TEST=--disable-tests BENCH=--disable-benchmarks
33
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.3], sources: [hvr-ghc]}}
34
-    - compiler: "ghc-8.0.2"
35
-    # env: TEST=--disable-tests BENCH=--disable-benchmarks
36
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}
37
-    - compiler: "ghc-8.2.2"
38
-    # env: TEST=--disable-tests BENCH=--disable-benchmarks
39
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
40
-    - compiler: "ghc-8.4.1"
41
-    # env: TEST=--disable-tests BENCH=--disable-benchmarks
42
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}
43
-
44
-before_install:
45
-  - HC=${CC}
46
-  - HCPKG=${HC/ghc/ghc-pkg}
47
-  - unset CC
48
-  - ROOTDIR=$(pwd)
49
-  - mkdir -p $HOME/.local/bin
50
-  - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"
51
-  - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
52
-  - echo $HCNUMVER
53
-
54
-install:
55
-  - cabal --version
56
-  - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
57
-  - BENCH=${BENCH---enable-benchmarks}
58
-  - TEST=${TEST---enable-tests}
59
-  - HADDOCK=${HADDOCK-true}
60
-  - INSTALLED=${INSTALLED-true}
61
-  - GHCHEAD=${GHCHEAD-false}
62
-  - travis_retry cabal update -v
63
-  - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
64
-  - rm -fv cabal.project cabal.project.local
65
-  - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
66
-  - "printf 'packages: \".\"\\n' > cabal.project"
67
-  - cat cabal.project
68
-  - if [ -f "./configure.ac" ]; then
69
-      (cd "." && autoreconf -i);
70
-    fi
71
-  - rm -f cabal.project.freeze
72
-  - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
73
-  - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
74
-  - rm -rf .ghc.environment.* "."/dist
75
-  - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
76
-
77
-# Here starts the actual work to be performed for the package under test;
78
-# any command which exits with a non-zero exit code causes the build to fail.
79
-script:
80
-  # test that source-distributions can be generated
81
-  - (cd "." && cabal sdist)
82
-  - mv "."/dist/playlists-http-*.tar.gz ${DISTDIR}/
83
-  - cd ${DISTDIR} || false
84
-  - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
85
-  - "printf 'packages: playlists-http-*/*.cabal\\n' > cabal.project"
86
-  - cat cabal.project
87
-  # this builds all libraries and executables (without tests/benchmarks)
88
-  - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
89
-
90
-  # Build with installed constraints for packages in global-db
91
-  - 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
92
-
93
-  # build & run tests, build benchmarks
94
-  - cabal new-build -w ${HC} ${TEST} ${BENCH} all
95
-
96
-  # cabal check
97
-  - (cd playlists-http-* && cabal check)
98
-
99
-  # haddock
100
-  - rm -rf ./dist-newstyle
101
-  - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
102
-
103
-# REGENDATA ["playlists-http.cabal"]
104
-# EOF

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

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

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

@@ -1,4 +1,4 @@
1
-playlists-http [![Travis][travis-shield]][travis]
1
+playlists-http
2 2
 ==============
3 3
 
4 4
 Download and parse playlists over HTTP.
@@ -15,6 +15,3 @@ See the following modules for more details:
15 15
 
16 16
 There is also an `examples/example.hs` that demonstrates how to use
17 17
 the `download` function which is found in `Text.Playlist.HTTP.Full`.
18
-
19
-[travis]: https://travis-ci.org/pjones/playlists-http
20
-[travis-shield]: https://travis-ci.org/pjones/playlists-http.svg?branch=master

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

@@ -1,20 +1,19 @@
1
-{ pkgs ? (import <nixpkgs> {}).pkgs }:
1
+{ pkgs ? import <nixpkgs> { }
2
+}:
2 3
 
3 4
 let
4
-  # List any extra packages you want available while your package is
5
-  # building or while in a nix shell:
6
-  extraPackages = with pkgs; [ ];
7
-
8 5
   # Helpful if you want to override any Haskell packages:
9
-  haskell = pkgs.haskellPackages;
6
+  overrides = self: super: {
7
+    http-client = if super ? http-client_0_6_2
8
+      then super.http-client_0_6_2
9
+      else super.http-client;
10
+  };
11
+
12
+  # Apply the overrides from above:
13
+  haskell = pkgs.haskellPackages.override (orig: {
14
+    overrides = pkgs.lib.composeExtensions
15
+      (orig.overrides or (_: _: {})) overrides; });
10 16
 in
11 17
 
12 18
 # Load the local nix file and use the overrides from above:
13
-haskell.callPackage ./playlists-http.nix {
14
-  mkDerivation = { buildTools ? []
15
-                 , ...
16
-                 }@args:
17
-    haskell.mkDerivation (args // {
18
-      buildTools = buildTools ++ extraPackages;
19
-    });
20
-}
19
+haskell.callPackage ./playlists-http.nix { }

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

@@ -1,16 +1,16 @@
1 1
 name:          playlists-http
2
-version:       0.2.1.0
2
+version:       0.2.1.1
3 3
 synopsis:      Library to glue together playlists and http-client
4
-homepage:      https://github.com/pjones/playlists-http
4
+homepage:      https://code.devalot.com/open/playlists-http
5
+bug-reports:   https://code.devalot.com/open/playlists-http/issues
5 6
 license:       BSD3
6 7
 license-file:  LICENSE
7 8
 author:        Peter Jones <pjones@devalot.com>
8 9
 maintainer:    Peter Jones <pjones@devalot.com>
9
-copyright:     Copyright (c) 2016,2018 Peter Jones
10
+copyright:     Copyright (c) 2016-2019 Peter Jones
10 11
 category:      Text
11 12
 build-type:    Simple
12 13
 cabal-version: 1.18
13
-tested-with:   GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.1
14 14
 description:   Simple library for resolving playlists using http-client.
15 15
 
16 16
 --------------------------------------------------------------------------------
@@ -22,13 +22,7 @@ extra-source-files:
22 22
 --------------------------------------------------------------------------------
23 23
 source-repository head
24 24
   type:     git
25
-  location: https://github.com/pjones/playlists-http.git
26
-
27
---------------------------------------------------------------------------------
28
-flag maintainer
29
-  description: Enable settings for the package maintainer.
30
-  default: False
31
-  manual: True
25
+  location: https://code.devalot.com/open/playlists-http.git
32 26
 
33 27
 --------------------------------------------------------------------------------
34 28
 flag build-examples
@@ -46,14 +40,11 @@ library
46 40
   hs-source-dirs: src
47 41
   ghc-options: -Wall
48 42
 
49
-  if flag(maintainer)
50
-    ghc-options: -Werror
51
-
52 43
   build-depends: attoparsec   >= 0.10  && < 1.0
53 44
                , base         >= 4.6   && < 5
54 45
                , bytestring   >= 0.10  && < 1.0
55 46
                , exceptions   >= 0.8   && < 0.11
56
-               , http-client  >= 0.4   && < 0.6
47
+               , http-client  >= 0.4   && < 0.7
57 48
                , mtl          >= 2.2   && < 2.3
58 49
                , playlists    >= 0.5   && < 1.0
59 50
                , text         >= 0.11  && < 1.3
@@ -66,9 +57,6 @@ executable example
66 57
   main-is: example.hs
67 58
   ghc-options: -Wall
68 59
 
69
-  if flag(maintainer)
70
-    ghc-options: -Werror
71
-
72 60
   if !flag(build-examples)
73 61
     buildable: False
74 62
   else

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

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

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

@@ -1,12 +0,0 @@
1
-resolver: lts-9.14
2
-# resolver: lts-7.19
3
-# resolver: lts-6.30
4
-
5
-packages:
6
-- ../playlists
7
-- ./
8
-
9
-flags:
10
-  playlists-http:
11
-    maintainer: true
12
-    build-examples: true

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