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: 104c3db65940
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8ff396ae97ca
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 11, 2017

  1. erlangR19: 19.1.6 -> 19.2 

    Include sw_vers patch as discussed on #21775.
    @yurrriq
    yurrriq committed Jan 11, 2017
    Copy the full SHA
    ad3e589 View commit details

  2. Merge pull request #21775 from yurrriq/update/pkgs/development/interp… 

    …reters/erlang/R19

erlangR19: 19.1.6 -> 19.2
    @LnL7
    LnL7 authored Jan 11, 2017
    Copy the full SHA
    8ff396a View commit details
Showing with 7 additions and 2 deletions.
  1. +7 −2 pkgs/development/interpreters/erlang/R19.nix
9 changes: 7 additions & 2 deletions pkgs/development/interpreters/erlang/R19.nix
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}"
+ "${optionalString javacSupport "-javac"}";
version = "19.1.6";
version = "19.2";

# Minor OTP releases are not always released as tarbals at
# http://erlang.org/download/ So we have to download from
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
owner = "erlang";
repo = "otp";
rev = "OTP-${version}";
sha256 = "120dqi8h2fwqfmh9g2nmkf153zlglzw9kkddz57xqvqq5arcs72y";
sha256 = "06pr4ydrqpp1skx85zjb1an4kvzv6vacb771vy71k54j7w6lh9hk";
};

buildInputs =
@@ -43,6 +43,11 @@ stdenv.mkDerivation rec {

debugInfo = enableDebugInfo;

prePatch = ''
substituteInPlace configure.in \
--replace '`sw_vers -productVersion`' '10.10'
'';

preConfigure = ''
./otp_build autoconf
'';