Integrate dhall-nix into CI (#887)

Author: Gabriella439

README.md

@@ -10,6 +10,7 @@ the following packages:
 * [`dhall`](./dhall) - [![Hackage](https://img.shields.io/hackage/v/dhall.svg)](https://hackage.haskell.org/package/dhall)
 * [`dhall-bash`](./dhall-bash) - [![Hackage](https://img.shields.io/hackage/v/dhall-bash.svg)](https://hackage.haskell.org/package/dhall-bash)
 * [`dhall-json`](./dhall-json) - [![Hackage](https://img.shields.io/hackage/v/dhall-json.svg)](https://hackage.haskell.org/package/dhall-json)
+* [`dhall-nix`](./dhall-nix) - [![Hackage](https://img.shields.io/hackage/v/dhall-nix.svg)](https://hackage.haskell.org/package/dhall-nix)
 * [`dhall-text`](./dhall-text) - [![Hackage](https://img.shields.io/hackage/v/dhall-text.svg)](https://hackage.haskell.org/package/dhall-text)
 
 Navigate to each package's directory for their respective `README`s
@@ -38,6 +39,7 @@ visit one of the following links:
 * [https://hydra.dhall-lang.org/job/dhall-haskell/master/linux-dhall/latest](https://hydra.dhall-lang.org/job/dhall-haskell/master/linux-dhall/latest)
 * [https://hydra.dhall-lang.org/job/dhall-haskell/master/linux-dhall-bash/latest](https://hydra.dhall-lang.org/job/dhall-haskell/master/linux-dhall-bash/latest)
 * [https://hydra.dhall-lang.org/job/dhall-haskell/master/linux-dhall-json/latest](https://hydra.dhall-lang.org/job/dhall-haskell/master/linux-dhall-json/latest)
+* [https://hydra.dhall-lang.org/job/dhall-haskell/master/linux-dhall-nix/latest](https://hydra.dhall-lang.org/job/dhall-haskell/master/linux-dhall-nix/latest)
 * [https://hydra.dhall-lang.org/job/dhall-haskell/master/linux-dhall-lsp-server/latest](https://hydra.dhall-lang.org/job/dhall-haskell/master/linux-dhall-lsp-server/latest)
 * [https://hydra.dhall-lang.org/job/dhall-haskell/master/linux-dhall-text/latest](https://hydra.dhall-lang.org/job/dhall-haskell/master/linux-dhall-text/latest)
 

default.nix

@@ -12,6 +12,7 @@ in
       dhall-bash
       dhall-json
       dhall-lsp-server
+      dhall-nix
       dhall-text
     ;
 

dhall-nix/README.md

@@ -1,4 +1,14 @@
-# `dhall-nix 1.1.6`
+# `dhall-nix`
+
+For installation or development instructions, see:
+
+* [`dhall-haskell` - `README`](https://github.com/dhall-lang/dhall-haskell/blob/master/README.md)
+
+Full documentation here:
+
+* [`dhall-nix` instructions](https://hackage.haskell.org/package/dhall-nix/docs/Dhall-Nix.html)
+
+## Introduction
 
 This `dhall-nix` package provides a Dhall to Nix compiler.  You can use this
 compiler to program Nix using the Dhall language.  This package targets people
@@ -9,12 +19,11 @@ who wish Nix had a type system.
 If you have Nix installed then you can build and run this package using:
 
 ```bash
-$ nix-build -A dhall-nix release.nix
-$ result/bin/dhall-to-nix <<< "λ(x : Bool) → x == False"
+$ dhall-to-nix <<< "λ(x : Bool) → x == False"
 x: x == false
-$ result/bin/dhall-to-nix <<< "{ foo = 1, bar = True }"
+$ dhall-to-nix <<< "{ foo = 1, bar = True }"
 { bar = true; foo = 1; }
-$ result/bin/dhall-to-nix <<< "< Left = 2 | Right : Natural >"
+$ dhall-to-nix <<< "< Left = 2 | Right : Natural >"
 { Left, Right }: Left 2
 ```
 
@@ -40,42 +49,5 @@ dhallToNix = code :
     import "${drv}";
 ```
 
-The above `dhallToNix` utility is now in `nixpkgs` so you can use `pkgs.dhallToNix`
-to transform Dhall expressions to Nix expressions
-
-## Development status
-
-[![Build Status](https://travis-ci.org/Gabriel439/Haskell-Dhall-Nix-Library.png)](https://travis-ci.org/Gabriel439/Haskell-Dhall-Nix-Library)
-
-I don't expect this library to change unless:
-
-* ... the Dhall language changes, which is possible but not very likely
-* ... there are bugs, but the test suite in [release.nix](./release.nix) should
-  protect against this
-
-## License (BSD 3-clause)
-
-    Copyright (c) 2017 Gabriel Gonzalez
-    All rights reserved.
-    
-    Redistribution and use in source and binary forms, with or without modification,
-    are permitted provided that the following conditions are met:
-        * Redistributions of source code must retain the above copyright notice,
-          this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above copyright notice,
-          this list of conditions and the following disclaimer in the documentation
-          and/or other materials provided with the distribution.
-        * Neither the name of Gabriel Gonzalez nor the names of other contributors
-          may be used to endorse or promote products derived from this software
-          without specific prior written permission.
-    
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-    ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+The above `dhallToNix` utility is now in `nixpkgs` so you can use
+`pkgs.dhallToNix` to transform Dhall expressions to Nix expressions

dhall-nix/default.nix

@@ -0,0 +1 @@
+(import ../nix/shared.nix {}).possibly-static.dhall-nix

dhall-nix/nix/base-orphans.nix

@@ -1 +1 @@
-(import ./release.nix).shell
+(import ../nix/shared.nix {}).shell-dhall-nix

dhall-nix/nix/cborg-json.nix

@@ -0,0 +1,26 @@
+{ mkDerivation, ansi-terminal, array, base, call-stack, clock
+, deepseq, directory, filepath, hspec-expectations, hspec-meta
+, HUnit, process, QuickCheck, quickcheck-io, random, setenv
+, silently, stdenv, stm, temporary, tf-random, transformers
+}:
+mkDerivation {
+  pname = "hspec-core";
+  version = "2.5.6";
+  sha256 = "6f188cf2322d0bafca7a9a11feb80a66631bdf6911d236ed16e4f4a22c1e455e";
+  libraryHaskellDepends = [
+    ansi-terminal array base call-stack clock deepseq directory
+    filepath hspec-expectations HUnit QuickCheck quickcheck-io random
+    setenv stm tf-random transformers
+  ];
+  testHaskellDepends = [
+    ansi-terminal array base call-stack clock deepseq directory
+    filepath hspec-expectations hspec-meta HUnit process QuickCheck
+    quickcheck-io random setenv silently stm temporary tf-random
+    transformers
+  ];
+  testToolDepends = [ hspec-meta ];
+  testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
+  homepage = "http://hspec.github.io/";
+  description = "A Testing Framework for Haskell";
+  license = stdenv.lib.licenses.mit;
+}

dhall-nix/nix/contravariant.nix

@@ -0,0 +1,19 @@
+{ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
+, stdenv
+}:
+mkDerivation {
+  pname = "hspec-discover";
+  version = "2.5.6";
+  sha256 = "8c9689b51aa44b8278a5ff3059e0e8a609dce077df3781aad977c647a8c18a46";
+  isLibrary = true;
+  isExecutable = true;
+  libraryHaskellDepends = [ base directory filepath ];
+  executableHaskellDepends = [ base directory filepath ];
+  testHaskellDepends = [
+    base directory filepath hspec-meta QuickCheck
+  ];
+  testToolDepends = [ hspec-meta ];
+  homepage = "http://hspec.github.io/";
+  description = "Automatically discover and run Hspec tests";
+  license = stdenv.lib.licenses.mit;
+}

dhall-nix/nix/dhall-nix.nix

@@ -0,0 +1,14 @@
+{ mkDerivation, base, hspec-core, hspec-discover
+, hspec-expectations, QuickCheck, stdenv
+}:
+mkDerivation {
+  pname = "hspec";
+  version = "2.5.6";
+  sha256 = "9ea6eb6ac6b49e1593e272707b760e125d3bdca2d8845d76e116c1ea8112da59";
+  libraryHaskellDepends = [
+    base hspec-core hspec-discover hspec-expectations QuickCheck
+  ];
+  homepage = "http://hspec.github.io/";
+  description = "A Testing Framework for Haskell";
+  license = stdenv.lib.licenses.mit;
+}