From dc1ae6f18d719fba92123d33b1d30bcadc2b31cb Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 24 Jun 2017 01:51:00 +0200 Subject: [PATCH] erlang: use R18 for packages that don't work with R19 --- pkgs/top-level/all-packages.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b99290127f30..509907455612 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6001,7 +6001,9 @@ with pkgs; inherit (beam.packages.erlang) rebar rebar3-open rebar3 hexRegistrySnapshot fetchHex beamPackages - hex2nix cuter relxExe; + hex2nix cuter; + + inherit (beam.packages.erlangR18) relxExe; groovy = callPackage ../development/interpreters/groovy { }; @@ -11460,7 +11462,9 @@ with pkgs; xwayland = callPackage ../servers/x11/xorg/xwayland.nix { }; - yaws = callPackage ../servers/http/yaws { }; + yaws = callPackage ../servers/http/yaws { + erlang = erlangR18; + }; zabbix = recurseIntoAttrs (callPackages ../servers/monitoring/zabbix {}); @@ -16423,7 +16427,9 @@ with pkgs; winswitch = callPackage ../tools/X11/winswitch { }; - wings = callPackage ../applications/graphics/wings { }; + wings = callPackage ../applications/graphics/wings { + erlang = erlangR18; + }; wireguard = callPackage ../os-specific/linux/wireguard { };