summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorArseniy Seroka <jagajaga@users.noreply.github.com>2016-01-12 20:07:49 +0300
committerArseniy Seroka <jagajaga@users.noreply.github.com>2016-01-12 20:07:49 +0300
commit28bd6a0e22a5f616932123e96884e00861ca9214 (patch)
tree081de71a783d90cfa346f0e45f2d6db7b026a418 /pkgs
parenteda93bb51fe37e27b6932086f3d3a2a35c0d697a (diff)
parent9c2da8a2969ff2284d875f67380c4536cda37cda (diff)
downloadnixpkgs-28bd6a0e22a5f616932123e96884e00861ca9214.tar
nixpkgs-28bd6a0e22a5f616932123e96884e00861ca9214.tar.gz
nixpkgs-28bd6a0e22a5f616932123e96884e00861ca9214.tar.bz2
nixpkgs-28bd6a0e22a5f616932123e96884e00861ca9214.tar.lz
nixpkgs-28bd6a0e22a5f616932123e96884e00861ca9214.tar.xz
nixpkgs-28bd6a0e22a5f616932123e96884e00861ca9214.tar.zst
nixpkgs-28bd6a0e22a5f616932123e96884e00861ca9214.zip
Merge pull request #12334 from couchemar/elixir-1.2.0
elixir: 1.1.1 -> 1.2.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/interpreters/elixir/default.nix15
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index 380da51da77..642bde39e7e 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -1,18 +1,21 @@
 { stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils, curl, bash }:
 
-let
-  version = "1.1.1";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "elixir-${version}";
+  version = "1.2.0";
 
   src = fetchurl {
     url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz";
-    sha256 = "0shh5brhcrvbvhl4bw0fs2y5llw7i97khkkglygx30ncvd7nwz9v";
+    sha256 = "0s3j7ra9gb2p3dwgfxghvc9mkv6ffgvz27aj5wgwk0xq2d9fws4z";
   };
 
   buildInputs = [ erlang rebar makeWrapper ];
 
+  # Elixir expects that UTF-8 locale to be set (see https://github.com/elixir-lang/elixir/issues/3548).
+  # In other cases there is warnings during compilation.
+  LANG = "en_US.UTF-8";
+  LC_TYPE = "en_US.UTF-8";
+
   preBuild = ''
     # The build process uses ./rebar. Link it to the nixpkgs rebar
     rm -v rebar
@@ -52,6 +55,6 @@ stdenv.mkDerivation {
 
     license = licenses.epl10;
     platforms = platforms.unix;
-    maintainers = [ maintainers.the-kenny maintainers.havvy ];
+    maintainers = with maintainers; [ the-kenny havvy couchemar ];
   };
 }