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: cb0851d5fa27
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b0b5911fc14b
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Jun 23, 2017

  1. erlangR20: init

    Matthew Daiter committed Jun 23, 2017
    Copy the full SHA
    d79b476 View commit details

  2. Merge pull request #26764 from mdaiter/erlangR20 

    erlangR20: init
    @LnL7
    LnL7 authored Jun 23, 2017
    Copy the full SHA
    b0b5911 View commit details
Showing with 20 additions and 1 deletion.
  1. +10 −0 pkgs/development/interpreters/erlang/R20.nix
  2. +2 −1 pkgs/top-level/all-packages.nix
  3. +8 −0 pkgs/top-level/beam-packages.nix
10 changes: 10 additions & 0 deletions pkgs/development/interpreters/erlang/R20.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{ mkDerivation, fetchurl }:

mkDerivation rec {
version = "20.0";
sha256 = "12dbay254ivnakwknjn5h55wndb0a0wqx55p156h8hwjhykj2kn0";

prePatch = ''
substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'
'';
}
3 changes: 2 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -5995,7 +5995,8 @@ with pkgs;
erlang_basho_R16B02 erlang_basho_R16B02_odbc
erlangR17 erlangR17_odbc erlangR17_javac erlangR17_odbc_javac
erlangR18 erlangR18_odbc erlangR18_javac erlangR18_odbc_javac
erlangR19 erlangR19_odbc erlangR19_javac erlangR19_odbc_javac;
erlangR19 erlangR19_odbc erlangR19_javac erlangR19_odbc_javac
erlangR20;

inherit (beam.packages.erlang)
rebar rebar3-open rebar3
8 changes: 8 additions & 0 deletions pkgs/top-level/beam-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -37,6 +37,14 @@ rec {
erlangR19_odbc_javac = erlangR19.override {
javacSupport = true; odbcSupport = true;
};
erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix {
wxGTK = wxGTK30;
};
erlangR20_odbc = erlangR20.override { odbcSupport = true; };
erlangR20_javac = erlangR20.override { javacSupport = true; };
erlangR20_odbc_javac = erlangR20.override {
javacSupport = true; odbcSupport = true;
};

# Bash fork, using custom builder.
erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-8-basho.nix {