From c78768e154c880add599fe81fc71598b4a40f268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 8 Nov 2025 23:42:09 +0100 Subject: [PATCH 1/5] qgis: add man output --- pkgs/applications/gis/qgis/default.nix | 8 ++++---- pkgs/applications/gis/qgis/unwrapped.nix | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 74d5d6f732ce..fffd5ddd398d 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -14,14 +14,12 @@ }: let qgis-unwrapped = libsForQt5.callPackage ./unwrapped.nix { - withGrass = withGrass; - withServer = withServer; - withWebKit = withWebKit; + inherit withGrass withServer withWebKit; }; in symlinkJoin { - inherit (qgis-unwrapped) version src; + inherit (qgis-unwrapped) version outputs src; pname = "qgis"; paths = [ qgis-unwrapped ]; @@ -42,6 +40,8 @@ symlinkJoin { --prefix PATH : $program_PATH \ --set PYTHONPATH $program_PYTHONPATH done + + ln -s ${qgis-unwrapped.man} $man ''; passthru = { diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index c102d9c23356..972e647da523 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -84,6 +84,10 @@ in mkDerivation rec { version = "3.44.3"; pname = "qgis-unwrapped"; + outputs = [ + "out" + "man" + ]; src = fetchFromGitHub { owner = "qgis"; @@ -180,7 +184,7 @@ mkDerivation rec { dontWrapGApps = true; # wrapper params passed below postFixup = lib.optionalString withGrass '' - # GRASS has to be availble on the command line even though we baked in + # GRASS has to be available on the command line even though we baked in # the path at build time using GRASS_PREFIX. # Using wrapGAppsHook also prevents file dialogs from crashing the program # on non-NixOS. From e9efeac16ca11eabff1f69eb196beff4f0d72dc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 8 Nov 2025 23:42:27 +0100 Subject: [PATCH 2/5] gnuradio: add man output --- pkgs/applications/radio/gnuradio/shared.nix | 4 ++++ pkgs/applications/radio/gnuradio/wrapper.nix | 16 +++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix index 3eac7df05476..a5722c9058ee 100644 --- a/pkgs/applications/radio/gnuradio/shared.nix +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -27,6 +27,10 @@ let cross = stdenv.hostPlatform != stdenv.buildPlatform; in { + outputs = [ + "out" + "man" + ]; src = if overrideSrc != { } then overrideSrc diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index 59e7dd7fa5d5..f7b96b1c1b95 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -79,7 +79,7 @@ let pythonEnv = unwrapped.python.withPackages (ps: pythonPkgs); pname = unwrapped.pname + "-wrapped"; - inherit (unwrapped) version; + inherit (unwrapped) outputs version; makeWrapperArgs = builtins.concatStringsSep " " ( [ ] @@ -214,15 +214,21 @@ let self = if doWrap then stdenv.mkDerivation { - inherit pname version passthru; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ + inherit + pname + outputs + version + passthru + ; + nativeBuildInputs = [ + makeWrapper xorg.lndir ]; buildCommand = '' mkdir $out cd $out - lndir -silent ${unwrapped} + lndir -silent ${unwrapped.out} + lndir -silent ${unwrapped.man} ${lib.optionalString (extraPackages != [ ]) ( builtins.concatStringsSep "\n" ( map (pkg: '' From aa2285398433f652305ec2dee6573ab0ca8c2dc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 8 Nov 2025 23:42:33 +0100 Subject: [PATCH 3/5] R: add man output --- pkgs/applications/science/math/R/default.nix | 1 + pkgs/development/r-modules/wrapper.nix | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index b39a005bfbd1..e306c33223ee 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" + "man" "tex" ]; diff --git a/pkgs/development/r-modules/wrapper.nix b/pkgs/development/r-modules/wrapper.nix index 8d7445a50e97..e1b96aecfe28 100644 --- a/pkgs/development/r-modules/wrapper.nix +++ b/pkgs/development/r-modules/wrapper.nix @@ -11,6 +11,11 @@ symlinkJoin { preferLocalBuild = true; allowSubstitutes = false; + outputs = [ + "out" + "man" + ]; + buildInputs = [ R ] ++ recommendedPackages ++ packages; paths = [ R ]; @@ -24,6 +29,8 @@ symlinkJoin { makeWrapper "${R}/bin/$exe" "$out/bin/$exe" \ --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" done + + ln -s ${R.man} $man ''; # Make the list of recommended R packages accessible to other packages such as rpy2 From d343dbf7c42dc463a86541d626163370930e4e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 8 Nov 2025 23:42:39 +0100 Subject: [PATCH 4/5] python313Packages.ipython: add man output --- pkgs/development/python-modules/ipython/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index bd0bd4544c10..2f846a81ae1d 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -37,6 +37,10 @@ buildPythonPackage rec { pname = "ipython"; version = "9.5.0"; + outputs = [ + "out" + "man" + ]; pyproject = true; src = fetchPypi { From 041e76d21e8cbb85abecfdcc625199802c10caa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 8 Nov 2025 23:42:44 +0100 Subject: [PATCH 5/5] lilypond: add man output --- pkgs/misc/lilypond/default.nix | 4 ++++ pkgs/misc/lilypond/with-fonts.nix | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 733aa6288957..9bd6351bd2b1 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -45,6 +45,10 @@ stdenv.mkDerivation rec { pname = "lilypond"; version = "2.24.4"; + outputs = [ + "out" + "man" + ]; src = fetchzip { url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix index ed2917b369a6..95bb75318e05 100644 --- a/pkgs/misc/lilypond/with-fonts.nix +++ b/pkgs/misc/lilypond/with-fonts.nix @@ -7,7 +7,12 @@ }: lib.appendToName "with-fonts" (symlinkJoin { - inherit (lilypond) meta name version; + inherit (lilypond) + pname + outputs + version + meta + ; paths = [ lilypond ] ++ openlilylib-fonts.all; @@ -15,7 +20,9 @@ lib.appendToName "with-fonts" (symlinkJoin { postBuild = '' for p in $out/bin/*; do - wrapProgram "$p" --set LILYPOND_DATADIR "$out/share/lilypond/${lilypond.version}" + wrapProgram "$p" --set LILYPOND_DATADIR "$out/share/lilypond/${lilypond.version}" done + + ln -s ${lilypond.man} $man ''; })