From 662ed9c918359af08858e617f268b530d7c22487 Mon Sep 17 00:00:00 2001
From: justinwoo <moomoowoo@gmail.com>
Date: Mon, 29 Jul 2019 23:32:04 +0300
Subject: [PATCH] update 1.25

---
 default.nix           |  3 ++-
 dhall-bash-simple.nix |  4 ++--
 dhall-json-simple.nix |  4 ++--
 dhall-simple.nix      |  4 ++--
 dhall-text-simple.nix | 19 -------------------
 shell.nix             |  8 ++++++--
 test.bash             |  1 -
 7 files changed, 14 insertions(+), 29 deletions(-)
 delete mode 100644 dhall-text-simple.nix

diff --git a/default.nix b/default.nix
index 23c0f0f..9b23e6f 100644
--- a/default.nix
+++ b/default.nix
@@ -2,7 +2,8 @@
 
 {
   dhall-simple = import ./dhall-simple.nix {};
+
   dhall-json-simple = import ./dhall-json-simple.nix {};
+
   dhall-bash-simple = import ./dhall-bash-simple.nix {};
-  dhall-text-simple = import ./dhall-text-simple.nix {};
 }
diff --git a/dhall-bash-simple.nix b/dhall-bash-simple.nix
index 636ef14..d3bb37d 100644
--- a/dhall-bash-simple.nix
+++ b/dhall-bash-simple.nix
@@ -4,8 +4,8 @@ pkgs.stdenv.mkDerivation rec {
   name = "dhall-bash-simple";
 
   src = pkgs.fetchurl {
-    url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.24.0/dhall-bash-1.0.21-x86_64-linux.tar.bz2";
-    sha256 = "1l17jdb1yv4kj2hnwzbyziy1m90mbyihrf40b0bbvfc15rfh6fl6";
+    url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.25.0/dhall-bash-1.0.22-x86_64-linux.tar.bz2";
+    sha256 = "1849qacj6xk3ki8hyw3862jrabq2gp44sjay0r9iiygifzm51pk6";
   };
 
   installPhase = ''
diff --git a/dhall-json-simple.nix b/dhall-json-simple.nix
index 78ca4a2..cac5354 100644
--- a/dhall-json-simple.nix
+++ b/dhall-json-simple.nix
@@ -4,8 +4,8 @@ pkgs.stdenv.mkDerivation rec {
   name = "dhall-json-simple";
 
   src = pkgs.fetchurl {
-    url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.24.0/dhall-json-1.3.0-x86_64-linux.tar.bz2";
-    sha256 = "1hh11yy7smk9dgp1ji7rm2q1ld4gqsdj0w0gpxrybs938h5pzxcm";
+    url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.25.0/dhall-json-1.4.0-x86_64-linux.tar.bz2";
+    sha256 = "14apqq0dj3lmm8yccygf8bb27scxjfkjkmr8zgnwb98znr51gfwn";
   };
 
   installPhase = ''
diff --git a/dhall-simple.nix b/dhall-simple.nix
index 9a6904e..7b5ebc8 100644
--- a/dhall-simple.nix
+++ b/dhall-simple.nix
@@ -4,8 +4,8 @@ pkgs.stdenv.mkDerivation rec {
   name = "dhall-simple";
 
   src = pkgs.fetchurl {
-    url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.24.0/dhall-1.24.0-x86_64-linux.tar.bz2";
-    sha256 = "04k6qfd83vjb380wj4nrn7l0gzh5v9d7l7mw5nzsy812nl1jfpfq";
+    url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.25.0/dhall-1.25.0-x86_64-linux.tar.bz2";
+    sha256 = "12w2549mx4js7dz4qjcrps6nivj37ikg3daybl5fskshdyf44ia7";
   };
 
   installPhase = ''
diff --git a/dhall-text-simple.nix b/dhall-text-simple.nix
deleted file mode 100644
index ca12a2e..0000000
--- a/dhall-text-simple.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ pkgs ? import <nixpkgs> {} }:
-
-pkgs.stdenv.mkDerivation rec {
-  name = "dhall-text-simple";
-
-  src = pkgs.fetchurl {
-    url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.24.0/dhall-text-1.0.18-x86_64-linux.tar.bz2";
-    sha256 = "1d3rdglc9r4iqx207vsm41ka96i7xpa47ffg5z2kbgylf65qrfsa";
-  };
-
-  installPhase = ''
-    mkdir -p $out/bin
-    DHALL_TO_TEXT=$out/bin/dhall-to-text
-    install -D -m555 -T dhall-to-text $DHALL_TO_TEXT
-
-    mkdir -p $out/etc/bash_completion.d/
-    $DHALL_TO_TEXT --bash-completion-script $DHALL_TO_TEXT > $out/etc/bash_completion.d/dhall-to-text-completion.bash
-  '';
-}
diff --git a/shell.nix b/shell.nix
index 0c43568..0d8be5d 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,12 +1,16 @@
 { pkgs ? import <nixpkgs> {} }:
 
-let easy-dhall = import ./default.nix { inherit pkgs; };
+let
+  easy-dhall = import ./default.nix {
+    inherit pkgs;
+  };
+
 in pkgs.stdenv.mkDerivation {
   name = "easy-dhall-nix-shell";
+
   buildInputs = [
     easy-dhall.dhall-simple
     easy-dhall.dhall-json-simple
     easy-dhall.dhall-bash-simple
-    easy-dhall.dhall-text-simple
   ];
 }
diff --git a/test.bash b/test.bash
index 53f919f..87ef4ca 100755
--- a/test.bash
+++ b/test.bash
@@ -17,6 +17,5 @@ test_exe dhall;
 test_exe dhall-to-json;
 test_exe dhall-to-yaml;
 test_exe dhall-to-bash;
-test_exe dhall-to-text;
 
 exit $ERRORS;