Bump to 2.0.0.0

dmjio · Aug 3, 2019 · 8d83298 · 8d83298
1 parent 802c29e
commit 8d83298
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 41 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,22 +1,8 @@
 language: nix
 
-matrix:
-  fast_finish: true
-  include:
-    - env: GHCVER=ghcHEAD
-    - env: GHCVER=ghc861
-    - env: GHCVER=ghc844
-    - env: GHCVER=ghc822
-    - env: GHCVER=ghc802
-
-  allow_failures:
-    - env: GHCVER=ghcHEAD
-    - env: GHCVER=ghc822
-    - env: GHCVER=ghc802
-
 before_install:
  - nix-channel --list
  - nix-channel --update
 
 script:
- - nix-build --argstr compiler $GHCVER
+ - nix-build
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2015, David Johnson
+Copyright (c) 2015-2020, David Johnson
 
 All rights reserved.
 

diff --git a/default.nix b/default.nix
@@ -1,12 +1,12 @@
-{ compiler ? "ghc844" }:
+{ compiler ? "ghc865" }:
 let
   config = {
     packageOverrides = pkgs: with pkgs.haskell.lib; {
       haskell = pkgs.haskell // {
         packages = pkgs.haskell.packages // {
           ${compiler} = pkgs.haskell.packages.${compiler}.override {
             overrides = self: super: {
-              envy = buildStrictly (self.callPackage ./envy.nix {});
+              envy = buildStrictly (self.callCabal2nix "envy" ./. {});
             };
           };
         };

diff --git a/envy.cabal b/envy.cabal
@@ -1,11 +1,11 @@
 name:                envy
-version:             1.5.1.0
+version:             2.0.0.0
 synopsis:            An environmentally friendly way to deal with environment variables
 license:             BSD3
 license-file:        LICENSE
-author:              David Johnson, Tim Adams, Eric Mertens
+author:              David Johnson, Tim Adams, Eric Mertens, Nicolas Rolland
 maintainer:          djohnson.m@gmail.com
-copyright:           David Johnson (c) 2015
+copyright:           David Johnson (c) 2015-2020
 category:            System
 build-type:          Simple
 cabal-version:       >=1.10

diff --git a/envy.nix b/envy.nix
diff --git a/upload.nix b/upload.nix
@@ -1,4 +1,4 @@
-{ pkgs ? import <nixpkgs> {}, compiler ? "ghc844" }:
+{ pkgs ? import <nixpkgs> {}, compiler ? "ghc865" }:
 with pkgs.haskell.lib;
-sdistTarball (buildStrictly (pkgs.haskell.packages.${compiler}.callPackage ./envy.nix {}))
+sdistTarball (buildStrictly (pkgs.haskell.packages.${compiler}.callCabal2nix "envy" ./. {}))