Merge 9726bd3404 into 89b2739164

pkgs/applications/gis/qgis/default.nix

@@ -24,7 +24,7 @@ symlinkJoin {
   inherit (qgis-unwrapped) version src;
   pname = "qgis";
 
-  paths = [ qgis-unwrapped ];
+  paths = qgis-unwrapped.all;
 
   nativeBuildInputs = [
     makeWrapper
@@ -53,5 +53,5 @@ symlinkJoin {
     ];
   };
 
-  meta = qgis-unwrapped.meta;
+  meta = builtins.removeAttrs qgis-unwrapped.meta [ "outputsToInstall" ];
 }

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";

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

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: ''

pkgs/applications/science/math/R/default.nix

@@ -59,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   outputs = [
     "out"
+    "man"
     "tex"
   ];
 

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 {

pkgs/development/python-modules/prompt-toolkit/default.nix

@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   pytestCheckHook,
   setuptools,
   wcwidth,
@@ -12,10 +12,11 @@ buildPythonPackage rec {
   version = "3.0.52";
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "prompt_toolkit";
-    inherit version;
-    hash = "sha256-KM3hkpKcjnMh3oXeHdvnNvE3UUiwLy4X7dhABCsb6FU=";
+  src = fetchFromGitHub {
+    owner = "prompt-toolkit";
+    repo = "python-prompt-toolkit";
+    tag = version;
+    hash = "sha256-ggCy7xTvOkjy6DgsO/rPNtQiAQ4FjsK4ShrvkIHioNQ=";
   };
 
   postPatch = ''
@@ -47,8 +48,8 @@ buildPythonPackage rec {
       with a nice interactive Python shell (called ptpython) built on top.
     '';
     homepage = "https://github.com/jonathanslenders/python-prompt-toolkit";
-    changelog = "https://github.com/prompt-toolkit/python-prompt-toolkit/blob/${version}/CHANGELOG";
+    changelog = "https://github.com/prompt-toolkit/python-prompt-toolkit/releases/tag/${src.tag}";
     license = licenses.bsd3;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ sarahec ];
   };
 }

pkgs/development/r-modules/wrapper.nix

@@ -12,7 +12,10 @@ symlinkJoin {
   allowSubstitutes = false;
 
   buildInputs = [ R ] ++ recommendedPackages ++ packages;
-  paths = [ R ];
+  paths = [
+    R
+    R.man
+  ];
 
   nativeBuildInputs = [ makeWrapper ];
 
@@ -29,7 +32,7 @@ symlinkJoin {
   # Make the list of recommended R packages accessible to other packages such as rpy2
   passthru = { inherit recommendedPackages; };
 
-  meta = R.meta // {
+  meta = (builtins.removeAttrs R.meta [ "outputsToInstall" ]) // {
     # To prevent builds on hydra
     hydraPlatforms = [ ];
     # prefer wrapper over the package

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";

pkgs/misc/lilypond/with-fonts.nix

@@ -7,7 +7,7 @@
 }:
 
 lib.appendToName "with-fonts" (symlinkJoin {
-  inherit (lilypond) meta name version;
+  inherit (lilypond) name version;
 
   paths = [ lilypond ] ++ openlilylib-fonts.all;
 
@@ -18,4 +18,6 @@ lib.appendToName "with-fonts" (symlinkJoin {
         wrapProgram "$p" --set LILYPOND_DATADIR "$out/share/lilypond/${lilypond.version}"
     done
   '';
+
+  meta = builtins.removeAttrs lilypond.meta [ "outputsToInstall" ];
 })