Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ba3ab41a6a4a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4c013a91f013
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Jul 25, 2017

  1. elixir: 1.5.0-rc.2 -> 1.5.0

    @ankhers
    ankhers committed Jul 25, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    mcollina Matteo Collina
    GPG key ID: 818674489FBC127E
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b770953 View commit details

  2. Merge pull request #27640 from ankhers/update_elixir_rc 

    elixir: 1.5.0-rc.2 -> 1.5.0
    @LnL7
    LnL7 authored Jul 25, 2017
    Copy the full SHA
    4c013a9 View commit details
Showing with 6 additions and 6 deletions.
  1. +2 −2 pkgs/development/beam-modules/default.nix
  2. +2 −2 pkgs/development/interpreters/elixir/1.5.nix
  3. +1 −1 pkgs/top-level/all-packages.nix
  4. +1 −1 pkgs/top-level/beam-packages.nix
4 changes: 2 additions & 2 deletions pkgs/development/beam-modules/default.nix
View file
Original file line number Diff line number Diff line change
@@ -37,9 +37,9 @@ let
buildMix = callPackage ./build-mix.nix {};

# BEAM-based languages.
elixir = elixir_1_4;
elixir = elixir_1_5;

elixir_1_5_rc = lib.callElixir ../interpreters/elixir/1.5.nix {
elixir_1_5 = lib.callElixir ../interpreters/elixir/1.5.nix {
inherit rebar erlang;
debugInfo = true;
};
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/elixir/1.5.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ mkDerivation }:

mkDerivation rec {
version = "1.5.0-rc.2";
sha256 = "0wfxsfz1qbb6iapg8j1qskva6j4mccxqvv79xbz08fzzb6n1wvxa";
version = "1.5.0";
sha256 = "1y8c0s0wfgv444vhpnz9v8z8rc39kqhzzzkzqjxsh576vd868pbz";
minimumOTPVersion = "18";
}
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -6095,7 +6095,7 @@ with pkgs;

inherit (beam.interpreters)
erlang erlang_odbc erlang_javac erlang_odbc_javac
elixir elixir_1_5_rc elixir_1_4 elixir_1_3
elixir elixir_1_5 elixir_1_4 elixir_1_3
lfe lfe_1_2
erlangR16 erlangR16_odbc
erlang_basho_R16B02 erlang_basho_R16B02_odbc
2 changes: 1 addition & 1 deletion pkgs/top-level/beam-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -56,7 +56,7 @@ rec {
# Other Beam languages. These are built with `beam.interpreters.erlang`. To
# access for example elixir built with different version of Erlang, use
# `beam.packages.erlangR19.elixir`.
inherit (packages.erlang) elixir elixir_1_5_rc elixir_1_4 elixir_1_3;
inherit (packages.erlang) elixir elixir_1_5 elixir_1_4 elixir_1_3;

inherit (packages.erlang) lfe lfe_1_2;
};