summary refs log tree commit diff
path: root/pkgs/development/interpreters
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2014-08-21 15:09:31 +0200
committerVladimír Čunát <vcunat@gmail.com>2014-08-21 15:09:31 +0200
commitd4e9fd2a906b5227ae51a522a0708a0b6884ed1c (patch)
treeca6bb53bb064b71b5ad9bf94dbcc27c47c2d652c /pkgs/development/interpreters
parent5c53f22492511d1d8de46ecd8f11fca20f1287fd (diff)
parent2d03fbf75202272f37bf648d06922c2c624f126a (diff)
downloadnixpkgs-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar
nixpkgs-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.gz
nixpkgs-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.bz2
nixpkgs-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.lz
nixpkgs-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.xz
nixpkgs-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.zst
nixpkgs-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.zip
Merge recent master into staging
Hydra: ?compare=1148749

Conflicts (easy):
	nixos/modules/virtualisation/containers.nix
Diffstat (limited to 'pkgs/development/interpreters')
-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 00fe490d494..59629eb2f59 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.13.3";
+  version = "0.15.1";
 in
 stdenv.mkDerivation {
   name = "elixir-${version}";
 
   src = fetchurl {
     url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz";
-    sha256 = "17nb8qfyjc67g62x10l2gq0z1501xa4wry906br0w2rm8bf4j8rf";
+    sha256 = "8e608abf90a6e9a25ef5fb7e45dfd04e2cb7e1fecb4ac260bf6652885a7f0c50";
   };
 
   buildInputs = [ erlang rebar makeWrapper ];