summary refs log tree commit diff
path: root/pkgs/tools/nix/nixdoc
diff options
context:
space:
mode:
authorSilvan Mosberger <silvan.mosberger@tweag.io>2022-12-23 20:57:19 +0100
committerSilvan Mosberger <silvan.mosberger@tweag.io>2022-12-23 21:10:16 +0100
commitb3792b44c55ce58147055e553cd45f1f04ca3e51 (patch)
treeda87227ff1c866dc2011fe93312644c094ae5e5f /pkgs/tools/nix/nixdoc
parent26d95bda2fabb127d13e4346db6fa241d5cb2da9 (diff)
downloadnixpkgs-b3792b44c55ce58147055e553cd45f1f04ca3e51.tar
nixpkgs-b3792b44c55ce58147055e553cd45f1f04ca3e51.tar.gz
nixpkgs-b3792b44c55ce58147055e553cd45f1f04ca3e51.tar.bz2
nixpkgs-b3792b44c55ce58147055e553cd45f1f04ca3e51.tar.lz
nixpkgs-b3792b44c55ce58147055e553cd45f1f04ca3e51.tar.xz
nixpkgs-b3792b44c55ce58147055e553cd45f1f04ca3e51.tar.zst
nixpkgs-b3792b44c55ce58147055e553cd45f1f04ca3e51.zip
lib: correctly render docs for nested identifiers
Applies https://github.com/nix-community/nixdoc/pull/27 and fixes up the
location information rendering, allowing lib functions to be nested in
further scopes

Needed for later commits
Diffstat (limited to 'pkgs/tools/nix/nixdoc')
-rw-r--r--pkgs/tools/nix/nixdoc/default.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix
index 945809e7a76..be485f90655 100644
--- a/pkgs/tools/nix/nixdoc/default.nix
+++ b/pkgs/tools/nix/nixdoc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, darwin }:
 
 rustPlatform.buildRustPackage rec {
   pname = "nixdoc";
@@ -11,6 +11,14 @@ rustPlatform.buildRustPackage rec {
     sha256 = "14d4dq06jdqazxvv7fq5872zy0capxyb0fdkp8qg06gxl1iw201s";
   };
 
+  patches = [
+    # Support nested identifiers https://github.com/nix-community/nixdoc/pull/27
+    (fetchpatch {
+      url = "https://github.com/nix-community/nixdoc/pull/27/commits/ea542735bf675fe2ccd37edaffb9138d1a8c1b7e.patch";
+      sha256 = "1fmz44jv2r9qsnjxvkkjfb0safy69l4x4vx1g5gisrp8nwdn94rj";
+    })
+  ];
+
   buildInputs =  lib.optionals stdenv.isDarwin [ darwin.Security ];
 
   cargoSha256 = "1nv6g8rmjjbwqmjkrpqncypqvx5c7xp2zlx5h6rw2j9d1wlys0v5";