From 8d8329803e71a3f37034cb97bbe366b7b7332a1f Mon Sep 17 00:00:00 2001
From: David Johnson <djohnson.m@gmail.com>
Date: Sat, 3 Aug 2019 16:23:18 -0400
Subject: [PATCH] Bump to 2.0.0.0

---
 .travis.yml | 16 +---------------
 LICENSE     |  2 +-
 default.nix |  4 ++--
 envy.cabal  |  6 +++---
 envy.nix    | 18 ------------------
 upload.nix  |  4 ++--
 6 files changed, 9 insertions(+), 41 deletions(-)
 delete mode 100644 envy.nix

diff --git a/.travis.yml b/.travis.yml
index 04be677..669ebf7 100644
--- 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
index 6519854..f2ea209 100644
--- 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
index bb9d888..06996bc 100644
--- a/default.nix
+++ b/default.nix
@@ -1,4 +1,4 @@
-{ compiler ? "ghc844" }:
+{ compiler ? "ghc865" }:
 let
   config = {
     packageOverrides = pkgs: with pkgs.haskell.lib; {
@@ -6,7 +6,7 @@ let
         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
index 4ad59c3..3c18d47 100644
--- 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
deleted file mode 100644
index 4409cea..0000000
--- a/envy.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ mkDerivation, base, bytestring, containers, hspec, mtl
-, QuickCheck, quickcheck-instances, stdenv, text, time
-, transformers
-}:
-mkDerivation {
-  pname = "envy";
-  version = "1.5.1.0";
-  src = ./.;
-  libraryHaskellDepends = [
-    base bytestring containers mtl text time transformers
-  ];
-  testHaskellDepends = [
-    base bytestring hspec mtl QuickCheck quickcheck-instances text time
-    transformers
-  ];
-  description = "An environmentally friendly way to deal with environment variables";
-  license = stdenv.lib.licenses.bsd3;
-}
diff --git a/upload.nix b/upload.nix
index 413f557..7e8b926 100644
--- 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" ./. {}))