From c0bc18bf2f76a4e1f6e748e06e4faa4c9a232eed Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Sat, 1 Apr 2023 20:31:59 -0400 Subject: [PATCH 1/2] lua: split manual into separate output Also, make sure that "doc" outputs of different versions of lua are co-installable, so user can install multiple manuals and read them side-by-side. --- pkgs/development/interpreters/lua-5/interpreter.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index 4d05a2490e9e..0746554fdbf5 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -41,6 +41,7 @@ in stdenv.mkDerivation rec { pname = "lua"; inherit version; + outputs = [ "out" "doc" ]; src = fetchurl { url = "https://www.lua.org/ftp/${pname}-${version}.tar.gz"; @@ -132,6 +133,9 @@ stdenv.mkDerivation rec { ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua-${luaversion}.pc" ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${luaversion}.pc" ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${lib.replaceStrings [ "." ] [ "" ] luaversion}.pc" + + # Make documentation outputs of different versions co-installable. + mv $out/share/doc/lua $out/share/doc/lua-$version ''; # copied from python From 496a143d847070dbda8d4233759401f841c5e4ce Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Tue, 6 Jun 2023 11:27:43 +0000 Subject: [PATCH 2/2] Update pkgs/development/interpreters/lua-5/interpreter.nix Co-authored-by: Sandro --- pkgs/development/interpreters/lua-5/interpreter.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index 0746554fdbf5..0dfb5808eac3 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${lib.replaceStrings [ "." ] [ "" ] luaversion}.pc" # Make documentation outputs of different versions co-installable. - mv $out/share/doc/lua $out/share/doc/lua-$version + mv $out/share/doc/lua $out/share/doc/lua-${version} ''; # copied from python