summary refs log tree commit diff
path: root/pkgs/development/interpreters/elixir/default.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2014-01-04 12:45:06 +0100
committerVladimír Čunát <vcunat@gmail.com>2014-01-04 18:34:53 +0100
commit9443129b08b37a6f4267d257cd8d42dd92a2539c (patch)
treeaec261361299cc2d85827dbcf5d03b594ae85e28 /pkgs/development/interpreters/elixir/default.nix
parentf78534ca0f8ec63d79370eb2367605579efba088 (diff)
parentf6d51f7717cffd8b220ce02498db8b8359b5964c (diff)
downloadnixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar
nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.gz
nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.bz2
nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.lz
nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.xz
nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.zst
nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.zip
Merge master into stdenv-updates
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
Diffstat (limited to 'pkgs/development/interpreters/elixir/default.nix')
-rw-r--r--pkgs/development/interpreters/elixir/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index 6bdf31bf6c96..5f1749f33c9e 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils }:
 
 let
-  version = "0.11.2";
+  version = "0.12.0";
 in
 stdenv.mkDerivation {
   name = "elixir-${version}";
 
   src = fetchurl {
     url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz";
-    sha256 = "0rgx33q013c5y2jjwd4l93pzd3v3fha8xdsrhpl9c9wb7yprjc5x";
+    sha256 = "0cir2y36zljwphiqyz8xmq7qq0f094jmfy3qwk3wdm05c05nqnc8";
   };
 
   buildInputs = [ erlang rebar makeWrapper ];