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
base: 0fa0ce28af86
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: b4a2ed8e48b6
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 8, 2018

  1. erlang: disable parallel building 

    This fixes build errors like

 GEN    asn1ct_eval_ext.erl
{"init terminating in do_boot",{undef,[{asn1ct_func,start_link,[],[]},{prepare_templates,gen_asn1ct_eval,1,[{file,"prepare_templates.erl"},{line,58}]},{init,start_em,1,[]},{init,do_boot,3,[]}]}}
init terminating in do_boot ({undef,[{asn1ct_func,start_link,[],[]},{prepare_templates,gen_asn1ct_eval,1,[{_},{_}]},{init,start_em,1,[]},{init,do_boot,3,[]}]})

that occur on some machines but not others.
    @ivan
    ivan committed Dec 8, 2018
    Copy the full SHA
    82e5590 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #51644 from ivan/erlang-disable-parallel-building 

    erlang: disable parallel building
    @Mic92
    Mic92 committed Dec 8, 2018
    Copy the full SHA
    b4a2ed8 View commit details
    Browse the repository at this point in the history