erlang_28: 28.0-rc1 -> 28.0-rc2, erlang: stop building web docs (#391632)

authored by

Yt and committed by
GitHub
570a9565 ce7a2ae6

+11 -57
+2 -2
pkgs/development/interpreters/erlang/28.nix
··· 1 1 { mkDerivation }: 2 2 3 3 mkDerivation { 4 - version = "28.0-rc1"; 5 - sha256 = "sha256-fjje31F5YW5rzetb2r4fkESwKt9N+WOH3yrqETUjJzg="; 4 + version = "28.0-rc2"; 5 + sha256 = "sha256-ENarmypS1rs6gG7e0/WOC9p/jabwrjbj/u1rFeWDHck="; 6 6 }
+7 -38
pkgs/development/interpreters/erlang/generic-builder.nix
··· 12 12 openssl, 13 13 perl, 14 14 runtimeShell, 15 - autoconf, 16 15 openjdk11 ? null, # javacSupport 17 16 unixODBC ? null, # odbcSupport 18 17 libGL ? null, 19 18 libGLU ? null, 20 19 wxGTK ? null, 21 20 xorg ? null, 22 - ex_doc ? null, 23 21 parallelBuild ? false, 24 22 systemd, 25 23 wxSupport ? true, 26 - ex_docSupport ? false, 27 24 systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, # systemd support in epmd 28 25 # updateScript deps 29 26 writeScript, ··· 76 73 installPhase ? "", 77 74 preInstall ? "", 78 75 postInstall ? "", 79 - installTargets ? 80 - if ((lib.versionOlder version "27.0") || ex_docSupport) then 81 - [ 82 - "install" 83 - "install-docs" 84 - ] 85 - else 86 - [ "install" ], 87 76 checkPhase ? "", 88 77 preCheck ? "", 89 78 postCheck ? "", ··· 104 93 105 94 assert odbcSupport -> unixODBC != null; 106 95 assert javacSupport -> openjdk11 != null; 107 - assert ex_docSupport -> ex_doc != null; 108 96 109 97 let 110 98 inherit (lib) ··· 132 120 LANG = "C.UTF-8"; 133 121 134 122 nativeBuildInputs = [ 135 - autoconf 136 123 makeWrapper 137 124 perl 138 125 gnum4 ··· 140 127 libxml2 141 128 ]; 142 129 143 - env = lib.optionalAttrs ((lib.versionAtLeast "28.0-rc1" version) && ex_docSupport) { 144 - # erlang-28.0-rc> warning: jinterface.html redirects to ../lib/jinterface/doc/html/index.html, which does not exist 145 - # erlang-28.0-rc> 146 - # erlang-28.0-rc> warning: odbc.html redirects to ../lib/odbc/doc/html/index.html, which does not exist 147 - EX_DOC_WARNINGS_AS_ERRORS = "false"; 130 + env = { 131 + # only build shell/IDE docs and man pages 132 + DOC_TARGETS = "chunks man"; 148 133 }; 149 134 150 135 buildInputs = ··· 174 159 --replace-fail '"sh ' '"${runtimeShell} ' 175 160 ''; 176 161 177 - # For OTP 27+ we need ex_doc to build the documentation 178 - # When ex_docSupport is enabled, grab the raw ex_doc executable from the ex_doc 179 - # derivation. Next, patch the first line to use the escript that will be 180 - # built during the build phase of this derivation. Finally, building the 181 - # documentation requires the erlang-logo.png asset. 182 - preConfigure = 183 - '' 184 - ./otp_build autoconf 185 - '' 186 - + optionalString ex_docSupport '' 187 - mkdir -p $out/bin 188 - cp ${ex_doc}/bin/.ex_doc-wrapped $out/bin/ex_doc 189 - sed -i "1 s:^.*$:#!$out/bin/escript:" $out/bin/ex_doc 190 - export EX_DOC=$out/bin/ex_doc 191 - 192 - mkdir -p $out/lib/erlang/system/doc/assets 193 - cp $src/system/doc/assets/erlang-logo.png $out/lib/erlang/system/doc/assets 194 - ''; 195 - 196 162 configureFlags = 197 163 [ "--with-ssl=${lib.getOutput "out" opensslPackage}" ] 198 164 ++ [ "--with-ssl-incl=${lib.getDev opensslPackage}" ] # This flag was introduced in R24 ··· 211 177 212 178 # install-docs will generate and install manpages and html docs 213 179 # (PDFs are generated only when fop is available). 180 + installTargets = [ 181 + "install" 182 + "install-docs" 183 + ]; 214 184 215 185 postInstall = '' 216 186 ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call ··· 295 265 // optionalAttrs (preCheck != "") { inherit preCheck; } 296 266 // optionalAttrs (postCheck != "") { inherit postCheck; } 297 267 // optionalAttrs (installPhase != "") { inherit installPhase; } 298 - // optionalAttrs (installTargets != [ ]) { inherit installTargets; } 299 268 // optionalAttrs (preInstall != "") { inherit preInstall; } 300 269 // optionalAttrs (fixupPhase != "") { inherit fixupPhase; } 301 270 // optionalAttrs (preFixup != "") { inherit preFixup; }
-6
pkgs/top-level/all-packages.nix
··· 6904 6904 wxSupport = false; 6905 6905 systemdSupport = false; 6906 6906 }; 6907 - beam_nodocs = callPackage ./beam-packages.nix { 6908 - beam = beam_nodocs; 6909 - wxSupport = false; 6910 - systemdSupport = false; 6911 - ex_docSupport = false; 6912 - }; 6913 6907 6914 6908 inherit (beam.interpreters) 6915 6909 erlang erlang_28 erlang_27 erlang_26 erlang_25
+2 -11
pkgs/top-level/beam-packages.nix
··· 1 1 { 2 2 lib, 3 3 beam, 4 - beam_nodocs, 5 4 callPackage, 6 5 wxGTK32, 7 - buildPackages, 8 6 stdenv, 9 - ex_docSupport ? true, 10 7 wxSupport ? true, 11 8 systemd, 12 9 systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, ··· 34 31 erlang_28 = self.beamLib.callErlang ../development/interpreters/erlang/28.nix { 35 32 wxGTK = wxGTK32; 36 33 parallelBuild = true; 37 - # ex_doc failing to build with erlang 28 38 - inherit (beam_nodocs.packages.erlang_27) ex_doc; 39 - inherit ex_docSupport wxSupport systemdSupport; 34 + inherit wxSupport systemdSupport; 40 35 }; 41 36 42 37 erlang_27 = self.beamLib.callErlang ../development/interpreters/erlang/27.nix { 43 38 wxGTK = wxGTK32; 44 39 parallelBuild = true; 45 - autoconf = buildPackages.autoconf269; 46 - inherit (beam_nodocs.packages.erlang_27) ex_doc; 47 - inherit ex_docSupport wxSupport systemdSupport; 40 + inherit wxSupport systemdSupport; 48 41 }; 49 42 50 43 erlang_26 = self.beamLib.callErlang ../development/interpreters/erlang/26.nix { 51 44 wxGTK = wxGTK32; 52 45 parallelBuild = true; 53 - autoconf = buildPackages.autoconf269; 54 46 inherit wxSupport systemdSupport; 55 47 }; 56 48 57 49 erlang_25 = self.beamLib.callErlang ../development/interpreters/erlang/25.nix { 58 50 wxGTK = wxGTK32; 59 51 parallelBuild = true; 60 - autoconf = buildPackages.autoconf269; 61 52 inherit wxSupport systemdSupport; 62 53 }; 63 54