Browse Source

Update dependency versions and release 0.2.5.1

tags/v0.2.5.1^0
Peter J. Jones 2 months ago
parent
commit
6fb427b5ac
Signed by: Peter Jones <pjones@devalot.com> GPG Key ID: 9DAFAA8D01941E49
5 changed files with 33 additions and 33 deletions
  1. 6
    0
      CHANGES.md
  2. 1
    1
      LICENSE
  3. 17
    10
      default.nix
  4. 7
    20
      vimeta.cabal
  5. 2
    2
      vimeta.nix

+ 6
- 0
CHANGES.md View File

@@ -1,5 +1,11 @@
1 1
 # Version History
2 2
 
3
+## 0.2.5.1 (April 16, 2019)
4
+
5
+  - Update dependency versions
6
+
7
+  - Builds on NixOS 18.09, 19.03, and unstable
8
+
3 9
 ## 0.2.5.0 (October 09, 2018)
4 10
 
5 11
   - Update dependency versions

+ 1
- 1
LICENSE View File

@@ -1,4 +1,4 @@
1
-Copyright (c) 2013-2018 Peter J. Jones <pjones@devalot.com>
1
+Copyright (c) 2013-2019 Peter J. Jones <pjones@devalot.com>
2 2
 All rights reserved.
3 3
 
4 4
 Redistribution and use in source and binary forms, with or without

+ 17
- 10
default.nix View File

@@ -1,21 +1,28 @@
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:
5
+  # Extra system dependencies needed:
6 6
   extraPackages = with pkgs; [ atomicparsley ];
7 7
 
8
-  # Grab the latest TheMovieDB package:
9
-  themoviedb = fetchGit "git://git.devalot.com/themoviedb.git";
8
+  # Grab the latest version of some dependencies:
9
+  themoviedb = fetchGit "https://code.devalot.com/open/themoviedb.git";
10
+  byline = fetchGit "https://code.devalot.com/open/byline.git";
10 11
 
11 12
   # Helpful if you want to override any Haskell packages:
13
+  overrides = self: super: {
14
+    http-client = if super ? http-client_0_6_2
15
+      then super.http-client_0_6_2
16
+      else super.http-client;
17
+
18
+    byline = self.callPackage "${byline}/byline.nix" { };
19
+    themoviedb = self.callPackage "${themoviedb}/themoviedb.nix" { };
20
+  };
21
+
22
+  # Apply the overrides from above:
12 23
   haskell = pkgs.haskellPackages.override (orig: {
13 24
     overrides = pkgs.lib.composeExtensions
14
-                  (orig.overrides or (_: _: {}))
15
-                  (self: super: with pkgs.haskell.lib; {
16
-                    themoviedb = self.callPackage "${themoviedb}/themoviedb.nix" { };
17
-                  });
18
-    });
25
+      (orig.overrides or (_: _: {})) overrides; });
19 26
 in
20 27
 
21 28
 # Load the local nix file and use the overrides from above:

+ 7
- 20
vimeta.cabal View File

@@ -1,17 +1,16 @@
1 1
 --------------------------------------------------------------------------------
2 2
 name:          vimeta
3
-version:       0.2.5.0
3
+version:       0.2.5.1
4 4
 synopsis:      Frontend for video metadata tagging tools
5
-homepage:      http://github.com/pjones/vimeta
6
-bug-reports:   http://github.com/pjones/vimeta/issues
5
+homepage:      https://code.devalot.com/open/vimeta
6
+bug-reports:   https://code.devalot.com/open/vimeta/issues
7 7
 license:       BSD2
8 8
 license-file:  LICENSE
9 9
 author:        Peter Jones <pjones@devalot.com>
10 10
 maintainer:    Peter Jones <pjones@devalot.com>
11
-copyright:     Copyright (c) 2013-2018 Peter Jones
11
+copyright:     Copyright (c) 2013-2019 Peter Jones
12 12
 category:      Video
13 13
 stability:     experimental
14
-tested-with:   GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2
15 14
 build-type:    Simple
16 15
 cabal-version: 1.18
17 16
 description:
@@ -27,13 +26,7 @@ extra-source-files:
27 26
 --------------------------------------------------------------------------------
28 27
 source-repository head
29 28
   type: git
30
-  location: git://github.com/pjones/vimeta.git
31
-
32
---------------------------------------------------------------------------------
33
-flag maintainer
34
-  description: Enable settings for the package maintainer.
35
-  manual: True
36
-  default: False
29
+  location: https://code.devalot.com/open/vimeta.git
37 30
 
38 31
 --------------------------------------------------------------------------------
39 32
 library
@@ -66,9 +59,6 @@ library
66 59
   default-language: Haskell2010
67 60
   ghc-options: -Wall -fwarn-incomplete-uni-patterns
68 61
 
69
-  if flag(maintainer)
70
-    ghc-options: -Werror
71
-
72 62
   build-depends: base                 >= 4.6    && < 5.0
73 63
                , aeson                >= 0.8    && < 1.5
74 64
                , byline               >= 0.1    && < 1.0
@@ -77,7 +67,7 @@ library
77 67
                , directory            >= 1.2    && < 1.4
78 68
                , either               >= 4.3    && < 6
79 69
                , filepath             >= 1.3    && < 1.5
80
-               , http-client          >= 0.4.30 && < 0.6
70
+               , http-client          >= 0.4.30 && < 0.7
81 71
                , http-client-tls      >= 0.2.2  && < 0.4
82 72
                , http-types           >= 0.8    && < 0.13
83 73
                , mtl                  >= 2.1    && < 2.3
@@ -92,7 +82,7 @@ library
92 82
                , time-locale-compat   >= 0.1    && < 0.2
93 83
                , transformers         >= 0.3    && < 0.6
94 84
                , xdg-basedir          >= 0.2    && < 0.3
95
-               , yaml                 >= 0.8    && < 0.10
85
+               , yaml                 >= 0.8    && < 0.12
96 86
 
97 87
 --------------------------------------------------------------------------------
98 88
 executable vimeta
@@ -100,6 +90,3 @@ executable vimeta
100 90
   main-is: src/Main.hs
101 91
   build-depends: base, vimeta
102 92
   ghc-options: -Wall -fwarn-incomplete-uni-patterns
103
-
104
-  if flag(maintainer)
105
-    ghc-options: -Werror

+ 2
- 2
vimeta.nix View File

@@ -6,7 +6,7 @@
6 6
 }:
7 7
 mkDerivation {
8 8
   pname = "vimeta";
9
-  version = "0.2.5.0";
9
+  version = "0.2.5.1";
10 10
   src = ./.;
11 11
   isLibrary = true;
12 12
   isExecutable = true;
@@ -17,7 +17,7 @@ mkDerivation {
17 17
     time-locale-compat transformers xdg-basedir yaml
18 18
   ];
19 19
   executableHaskellDepends = [ base ];
20
-  homepage = "http://github.com/pjones/vimeta";
20
+  homepage = "https://code.devalot.com/open/vimeta";
21 21
   description = "Frontend for video metadata tagging tools";
22 22
   license = stdenv.lib.licenses.bsd2;
23 23
 }

Loading…
Cancel
Save