diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-05-07 12:01:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-07 12:01:16 +0000 |
| commit | 30144b9efd8abb47423c6ae94e810f821b834acd (patch) | |
| tree | 67325b54beed30febbfc75bd9dc7385bc4565e7f /pkgs/os-specific | |
| parent | 58ecfa299759c68ad1c50d2122080f12a7ebbafd (diff) | |
| parent | 4a5f70933fde466bb3bfb37846ee0642488513c9 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/htmldocs.nix | 18 | ||||
| -rwxr-xr-x | pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 2 |
2 files changed, 15 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/htmldocs.nix b/pkgs/os-specific/linux/kernel/htmldocs.nix index dad377db06abb..eb22645d2e9e7 100644 --- a/pkgs/os-specific/linux/kernel/htmldocs.nix +++ b/pkgs/os-specific/linux/kernel/htmldocs.nix @@ -6,8 +6,8 @@ , makeFontsConf , perl , python3 -, sphinx , which +, fetchpatch }: stdenv.mkDerivation { @@ -15,6 +15,16 @@ stdenv.mkDerivation { inherit (linux_latest) version src; + patches = [ + # docutils 0.21 has removed nodes.reprunicode + # fixes the `AttributeError` thrown when building docs. + (fetchpatch { + name = "docutils_fix.patch"; + url = "https://lore.kernel.org/linux-doc/faf5fa45-2a9d-4573-9d2e-3930bdc1ed65@gmail.com/raw"; + hash = "sha256-JuV1B/8iDysbH0tl+wr/rdXvoC34uUq25ejMFmD0hio="; + }) + ]; + postPatch = '' patchShebangs \ Documentation/sphinx/parse-headers.pl \ @@ -48,11 +58,11 @@ stdenv.mkDerivation { cp -r Documentation/* $out/share/doc/linux-doc/ ''; - meta = with lib; { + meta = { description = "Linux kernel html documentation"; homepage = "https://www.kernel.org/doc/htmldocs/"; - platforms = platforms.linux; + platforms = lib.platforms.linux; inherit (linux_latest.meta) license; - maintainers = with maintainers; [ ]; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index f3ee49a8c395f..fb7c8b2322a7a 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -391,7 +391,7 @@ if [[ -n $flake ]]; then flakeAttr="${BASH_REMATCH[2]}" fi if [[ -z $flakeAttr ]]; then - read -r hostname < /proc/sys/kernel/hostname + hostname="$(targetHostCmd cat /proc/sys/kernel/hostname)" if [[ -z $hostname ]]; then hostname=default fi |