Browse Source

Update dependency versions and release 0.2.5.1

tags/v0.2.5.1^0
Peter J. Jones 4 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 @@
# Version History

## 0.2.5.1 (April 16, 2019)

- Update dependency versions

- Builds on NixOS 18.09, 19.03, and unstable

## 0.2.5.0 (October 09, 2018)

- Update dependency versions

+ 1
- 1
LICENSE View File

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

Redistribution and use in source and binary forms, with or without

+ 17
- 10
default.nix View File

@@ -1,21 +1,28 @@
{ 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:
# Extra system dependencies needed:
extraPackages = with pkgs; [ atomicparsley ];

# Grab the latest TheMovieDB package:
themoviedb = fetchGit "git://git.devalot.com/themoviedb.git";
# Grab the latest version of some dependencies:
themoviedb = fetchGit "https://code.devalot.com/open/themoviedb.git";
byline = fetchGit "https://code.devalot.com/open/byline.git";

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

byline = self.callPackage "${byline}/byline.nix" { };
themoviedb = self.callPackage "${themoviedb}/themoviedb.nix" { };
};

# Apply the overrides from above:
haskell = pkgs.haskellPackages.override (orig: {
overrides = pkgs.lib.composeExtensions
(orig.overrides or (_: _: {}))
(self: super: with pkgs.haskell.lib; {
themoviedb = self.callPackage "${themoviedb}/themoviedb.nix" { };
});
});
(orig.overrides or (_: _: {})) overrides; });
in

# Load the local nix file and use the overrides from above:

+ 7
- 20
vimeta.cabal View File

@@ -1,17 +1,16 @@
--------------------------------------------------------------------------------
name: vimeta
version: 0.2.5.0
version: 0.2.5.1
synopsis: Frontend for video metadata tagging tools
homepage: http://github.com/pjones/vimeta
bug-reports: http://github.com/pjones/vimeta/issues
homepage: https://code.devalot.com/open/vimeta
bug-reports: https://code.devalot.com/open/vimeta/issues
license: BSD2
license-file: LICENSE
author: Peter Jones <pjones@devalot.com>
maintainer: Peter Jones <pjones@devalot.com>
copyright: Copyright (c) 2013-2018 Peter Jones
copyright: Copyright (c) 2013-2019 Peter Jones
category: Video
stability: experimental
tested-with: GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2
build-type: Simple
cabal-version: 1.18
description:
@@ -27,13 +26,7 @@ extra-source-files:
--------------------------------------------------------------------------------
source-repository head
type: git
location: git://github.com/pjones/vimeta.git

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

--------------------------------------------------------------------------------
library
@@ -66,9 +59,6 @@ library
default-language: Haskell2010
ghc-options: -Wall -fwarn-incomplete-uni-patterns

if flag(maintainer)
ghc-options: -Werror

build-depends: base >= 4.6 && < 5.0
, aeson >= 0.8 && < 1.5
, byline >= 0.1 && < 1.0
@@ -77,7 +67,7 @@ library
, directory >= 1.2 && < 1.4
, either >= 4.3 && < 6
, filepath >= 1.3 && < 1.5
, http-client >= 0.4.30 && < 0.6
, http-client >= 0.4.30 && < 0.7
, http-client-tls >= 0.2.2 && < 0.4
, http-types >= 0.8 && < 0.13
, mtl >= 2.1 && < 2.3
@@ -92,7 +82,7 @@ library
, time-locale-compat >= 0.1 && < 0.2
, transformers >= 0.3 && < 0.6
, xdg-basedir >= 0.2 && < 0.3
, yaml >= 0.8 && < 0.10
, yaml >= 0.8 && < 0.12

--------------------------------------------------------------------------------
executable vimeta
@@ -100,6 +90,3 @@ executable vimeta
main-is: src/Main.hs
build-depends: base, vimeta
ghc-options: -Wall -fwarn-incomplete-uni-patterns

if flag(maintainer)
ghc-options: -Werror

+ 2
- 2
vimeta.nix View File

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

Loading…
Cancel
Save