diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-20 17:46:09 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-20 17:46:09 +0200 |
| commit | 7a4209c3561213cfb182ce93707a14f9715238eb (patch) | |
| tree | e78812ee0449d9e4a32d190a701e2e90849f0d42 /pkgs/development/interpreters | |
| parent | 5f8a330d40008ec6457f96a07cdebe95deb1bdaf (diff) | |
| parent | ea1afcd9f468f9f8813dba93d167bf2e558c797a (diff) | |
| download | nixlib-7a4209c3561213cfb182ce93707a14f9715238eb.tar nixlib-7a4209c3561213cfb182ce93707a14f9715238eb.tar.gz nixlib-7a4209c3561213cfb182ce93707a14f9715238eb.tar.bz2 nixlib-7a4209c3561213cfb182ce93707a14f9715238eb.tar.lz nixlib-7a4209c3561213cfb182ce93707a14f9715238eb.tar.xz nixlib-7a4209c3561213cfb182ce93707a14f9715238eb.tar.zst nixlib-7a4209c3561213cfb182ce93707a14f9715238eb.zip | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/elixir/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/wrapper.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 0a8d41ed9094..6999ee07e3d0 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "elixir-${version}"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "elixir"; rev = "v${version}"; - sha256 = "0dib7j81vgbi0npn13jj19rbrsn66cr0rm05hnhkqz6dixz96xcy"; + sha256 = "1l4ff3awil1nzrgd4pv4bx6n9ml83ci4czplv03yfz18q7jbipq2"; }; buildInputs = [ erlang rebar makeWrapper ]; diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index ba39965cb351..b4bd532dc1d9 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -8,7 +8,7 @@ let recursivePthLoader = import ../../python-modules/recursive-pth-loader/default.nix { stdenv = stdenv; python = python; }; env = ( let - paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ [ python recursivePthLoader ]; + paths = stdenv.lib.closePropagation (extraLibs ++ [ python recursivePthLoader ] ) ; in buildEnv { name = "${python.name}-env"; |