From deafd989a07c112922f3cb5054ad1688c0c49554 Mon Sep 17 00:00:00 2001 From: justinwoo Date: Thu, 12 Sep 2019 16:50:36 +0300 Subject: [PATCH] upgrade versions --- default.nix | 12 +++++++++--- dhall-bash-simple.nix | 16 ++++++++-------- dhall-json-simple.nix | 16 ++++++++-------- dhall-simple.nix | 17 +++++++++-------- shell.nix | 9 +++++---- 5 files changed, 39 insertions(+), 31 deletions(-) diff --git a/default.nix b/default.nix index 4c012a5..1787154 100644 --- a/default.nix +++ b/default.nix @@ -1,9 +1,15 @@ { pkgs ? import {} }: { - 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; + }; } diff --git a/dhall-bash-simple.nix b/dhall-bash-simple.nix index 40cf5d9..dd81bbf 100644 --- a/dhall-bash-simple.nix +++ b/dhall-bash-simple.nix @@ -4,14 +4,14 @@ pkgs.stdenv.mkDerivation rec { name = "dhall-bash-simple"; 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"; - } - 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"; - }; + then pkgs.fetchurl { + 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.26.0/dhall-bash-1.0.23-x86_64-linux.tar.bz2"; + sha256 = "1viq504bg5s9as984f93isakhzrb4nxg43s9y63jfhb17xf9rb3b"; + }; installPhase = '' mkdir -p $out/bin diff --git a/dhall-json-simple.nix b/dhall-json-simple.nix index 983d25a..29d10f0 100644 --- a/dhall-json-simple.nix +++ b/dhall-json-simple.nix @@ -4,14 +4,14 @@ pkgs.stdenv.mkDerivation rec { name = "dhall-json-simple"; 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"; - } - 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"; - }; + then pkgs.fetchurl { + 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.26.0/dhall-json-1.4.1-x86_64-linux.tar.bz2"; + sha256 = "0hv5x8ps0z74acsh91ivlg5vw7r0c8p0g92ca1mxm7m4p4vf936k"; + }; installPhase = '' mkdir -p $out/bin diff --git a/dhall-simple.nix b/dhall-simple.nix index 34ddef4..eebe200 100644 --- a/dhall-simple.nix +++ b/dhall-simple.nix @@ -2,15 +2,16 @@ 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"; - } - 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"; - }; + then pkgs.fetchurl { + 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.26.0/dhall-1.26.0-x86_64-linux.tar.bz2"; + sha256 = "0q6zdkf1grzj1hblx1ngdfss41bisl7a3fz9xl9zz229s7n5grq5"; + }; installPhase = '' mkdir -p $out/bin diff --git a/shell.nix b/shell.nix index ac130d6..cb227f2 100644 --- a/shell.nix +++ b/shell.nix @@ -1,8 +1,9 @@ let pkgs = import {}; + default = import ./default.nix {}; + in - pkgs.mkShell { - buildInputs = - builtins.attrValues default; - } +pkgs.mkShell { + buildInputs = builtins.attrValues default; +}