From b370a686cac3d414fbfa3246a74069e4d7fc39d2 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 6 Oct 2024 21:02:23 +0100 Subject: [PATCH] treewide: use lowdown-unsandboxed where appropriate --- pkgs/applications/blockchains/clightning/default.nix | 4 ++-- pkgs/by-name/ce/certspotter/package.nix | 4 ++-- pkgs/tools/package-management/lix/common.nix | 3 ++- pkgs/tools/package-management/nix/common.nix | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index 9f84685e8c10..6ed103a4b287 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -8,7 +8,7 @@ , automake , gettext , libtool -, lowdown +, lowdown-unsandboxed , protobuf , unzip , which @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # when building on darwin we need cctools to provide the correct libtool # as libwally-core detects the host as darwin and tries to add the -static # option to libtool, also we have to add the modified gsed package. - nativeBuildInputs = [ autoconf autogen automake gettext libtool lowdown protobuf py3 unzip which ] + nativeBuildInputs = [ autoconf autogen automake gettext libtool lowdown-unsandboxed protobuf py3 unzip which ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.autoSignDarwinBinariesHook ]; buildInputs = [ gmp libsodium sqlite zlib jq ]; diff --git a/pkgs/by-name/ce/certspotter/package.nix b/pkgs/by-name/ce/certspotter/package.nix index e40c58061849..72cb1e54c0b8 100644 --- a/pkgs/by-name/ce/certspotter/package.nix +++ b/pkgs/by-name/ce/certspotter/package.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , buildGoModule -, lowdown +, lowdown-unsandboxed }: buildGoModule rec { @@ -19,7 +19,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - nativeBuildInputs = [ lowdown ]; + nativeBuildInputs = [ lowdown-unsandboxed ]; postInstall = '' cd man diff --git a/pkgs/tools/package-management/lix/common.nix b/pkgs/tools/package-management/lix/common.nix index dd1580bc4336..521c27b7e7bc 100644 --- a/pkgs/tools/package-management/lix/common.nix +++ b/pkgs/tools/package-management/lix/common.nix @@ -39,6 +39,7 @@ assert (hash == null) -> (src != null); libcpuid, libsodium, lowdown, + lowdown-unsandboxed, lsof, mercurial, mdbook, @@ -119,7 +120,7 @@ stdenv.mkDerivation { ] ++ lib.optionals isLegacyParser [ bison ] ++ lib.optionals enableDocumentation [ - (lib.getBin lowdown) + (lib.getBin lowdown-unsandboxed) mdbook mdbook-linkcheck doxygen diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index c26cb410399d..4d04cbb6274d 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -59,6 +59,7 @@ in , libxml2 , libxslt , lowdown +, lowdown-unsandboxed , toml11 , man , mdbook @@ -122,7 +123,7 @@ self = stdenv.mkDerivation { docbook_xsl_ns docbook5 ] ++ lib.optionals (enableDocumentation && atLeast24) [ - (lib.getBin lowdown) + (lib.getBin lowdown-unsandboxed) mdbook ] ++ lib.optionals (atLeast213 && enableDocumentation) [ mdbook-linkcheck