Merge pull request #4 from justinwoo/updates

update 1.25
This commit is contained in:
Justin Woo 2019-07-29 23:35:43 +03:00 committed by GitHub
commit 1f0f602adb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 29 deletions

View file

@ -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 {};
}

View file

@ -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 = ''

View file

@ -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 = ''

View file

@ -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 = ''

View file

@ -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
'';
}

View file

@ -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
];
}

View file

@ -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;