Merge pull request #10 from justinwoo/upgrade

upgrade versions
This commit is contained in:
Justin Woo 2019-09-12 16:52:43 +03:00 committed by GitHub
commit d8043ca5c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 39 additions and 31 deletions

View file

@ -1,9 +1,15 @@
{ pkgs ? import <nixpkgs> {} }:
{
dhall-simple = import ./dhall-simple.nix { inherit pkgs; };
dhall-simple = import ./dhall-simple.nix {
inherit pkgs;
};
dhall-json-simple = import ./dhall-json-simple.nix { inherit pkgs; };
dhall-json-simple = import ./dhall-json-simple.nix {
inherit pkgs;
};
dhall-bash-simple = import ./dhall-bash-simple.nix { inherit pkgs; };
dhall-bash-simple = import ./dhall-bash-simple.nix {
inherit pkgs;
};
}

View file

@ -5,12 +5,12 @@ pkgs.stdenv.mkDerivation rec {
src = if pkgs.stdenv.isDarwin
then pkgs.fetchurl {
url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.25.0/dhall-bash-1.0.22-x86_64-macos.tar.bz2";
sha256 = "1dqahd3rnsi8rh14cxyn7xvzg9p9brjqmymy085a1iq2bykqydp1";
url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.26.0/dhall-bash-1.0.23-x86_64-macos.tar.bz2";
sha256 = "1v941mad72xww4zyz4kr1d6czyl8834pbfrqpafnixj4brs6vzy5";
}
else pkgs.fetchurl {
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";
url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.26.0/dhall-bash-1.0.23-x86_64-linux.tar.bz2";
sha256 = "1viq504bg5s9as984f93isakhzrb4nxg43s9y63jfhb17xf9rb3b";
};
installPhase = ''

View file

@ -5,12 +5,12 @@ pkgs.stdenv.mkDerivation rec {
src = if pkgs.stdenv.isDarwin
then pkgs.fetchurl {
url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.25.0/dhall-json-1.4.0-x86_64-macos.tar.bz2";
sha256 = "0427xy59mzyrz978l36x0ha610bpckg14m3svkvg8hipvblgh19r";
url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.26.0/dhall-json-1.4.1-x86_64-macos.tar.bz2";
sha256 = "1m5cw6b9xhr9qi55ih3dvkj7vzmh9jpswfqdadmw4r6rgsia8jg1";
}
else pkgs.fetchurl {
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";
url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.26.0/dhall-json-1.4.1-x86_64-linux.tar.bz2";
sha256 = "0hv5x8ps0z74acsh91ivlg5vw7r0c8p0g92ca1mxm7m4p4vf936k";
};
installPhase = ''

View file

@ -2,14 +2,15 @@
pkgs.stdenv.mkDerivation rec {
name = "dhall-simple";
src = if pkgs.stdenv.isDarwin
then pkgs.fetchurl {
url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.25.0/dhall-1.25.0-x86_64-macos.tar.bz2";
sha256 = "1ar1wh0kp1fn0xbr60b61bkj4q3bd2k0df6lgzyqngbjackx2yn2";
url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.26.0/dhall-1.26.0-x86_64-macos.tar.bz2";
sha256 = "0jy9bwgywqwb7nk1qhpqhi56g7fsk8vhzybwxb8h07qcm47wa6vw";
}
else pkgs.fetchurl {
url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.25.0/dhall-1.25.0-x86_64-linux.tar.bz2";
sha256 = "12w2549mx4js7dz4qjcrps6nivj37ikg3daybl5fskshdyf44ia7";
url = "https://github.com/dhall-lang/dhall-haskell/releases/download/1.26.0/dhall-1.26.0-x86_64-linux.tar.bz2";
sha256 = "0q6zdkf1grzj1hblx1ngdfss41bisl7a3fz9xl9zz229s7n5grq5";
};
installPhase = ''

View file

@ -1,8 +1,9 @@
let
pkgs = import <nixpkgs> {};
default = import ./default.nix {};
in
pkgs.mkShell {
buildInputs =
builtins.attrValues default;
}
pkgs.mkShell {
buildInputs = builtins.attrValues default;
}