doc: cleanup (#400164) (c4170d9f) · Commits · nix / nixpkgs

doc/build-helpers/images/appimagetools.section.md

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ let
		version = "0.6.30";

		src = fetchurl {
		url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${pname}-v${version}.AppImage";
		url = "https://github.com/nukeop/nuclear/releases/download/v${version}/nuclear-v${version}.AppImage";
		hash = "sha256-he1uGC1M/nFcKpMM9JKY4oeexJcnzV0ZRxhTjtJz6xw=";
		};
		in

+8 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,8 @@ stdenvNoCC.mkDerivation (
		'';

		buildPhase = ''
		runHook preBuild

		substituteInPlace ./languages-frameworks/python.section.md \
		--subst-var-by python-interpreter-table "$(<"${pythonInterpreterTable}")"

		@@ -84,9 +86,13 @@ stdenvNoCC.mkDerivation (
		--section-toc-depth 1 \
		manual.md \
		out/index.html

		runHook postBuild
		'';

		installPhase = ''
		runHook preInstall

		dest="$out/share/doc/nixpkgs"
		mkdir -p "$(dirname "$dest")"
		mv out "$dest"
		@@ -97,6 +103,8 @@ stdenvNoCC.mkDerivation (
		mkdir -p $out/nix-support/
		echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products
		echo "doc manual $dest nixpkgs-manual.epub" >> $out/nix-support/hydra-build-products

		runHook postInstall
		'';

		passthru = {

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,8 +27,8 @@ let
		} ":";
		};

		# the INI file can now be given as plain old nix values
		in
		# the INI file can now be given as plain old nix values
		customToINI {
		main = {
		pushinfo = true;

+5 −5

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ In Nixpkgs, `cargo-tauri.hook` overrides the default build and install phases.
		wrapGAppsHook4,
		}:

		rustPlatform.buildRustPackage rec {
		rustPlatform.buildRustPackage (finalAttrs: {
		# ...

		useFetchCargoVendor = true;
		@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {

		# Assuming our app's frontend uses `npm` as a package manager
		npmDeps = fetchNpmDeps {
		name = "${pname}-npm-deps-${version}";
		name = "${finalAttrs.pname}-npm-deps-${finalAttrs.version}";
		inherit src;
		hash = "...";
		};
		@@ -62,7 +62,7 @@ rustPlatform.buildRustPackage rec {
		buildAndTestSubdir = cargoRoot;

		# ...
		}
		})
		```

		## Variables controlling cargo-tauri {#tauri-hook-variables-controlling}

+4 −0