mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
3997afd38f
@ -12586,6 +12586,12 @@
|
||||
githubId = 2486026;
|
||||
name = "Luca Fulchir";
|
||||
};
|
||||
lukts30 = {
|
||||
email = "llukas21307@gmail.com";
|
||||
github = "lukts30";
|
||||
githubId = 24390575;
|
||||
name = "lukts30";
|
||||
};
|
||||
luleyleo = {
|
||||
email = "git@leopoldluley.de";
|
||||
github = "luleyleo";
|
||||
|
||||
@ -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 ];
|
||||
|
||||
@ -26,13 +26,13 @@ let
|
||||
in
|
||||
buildNpmPackage' rec {
|
||||
pname = "bruno";
|
||||
version = "1.30.1";
|
||||
version = "1.32.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usebruno";
|
||||
repo = "bruno";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9dH79ytqkZcdgUMbTa32VHKr2dHiNsJu6GawDtRsJx0=";
|
||||
hash = "sha256-n/3zNS3aME7ZSoJ7TQ7gqVod469g7PGTsLcdNIwB09Y=";
|
||||
|
||||
postFetch = ''
|
||||
${lib.getExe npm-lockfile-fix} $out/package-lock.json
|
||||
|
||||
@ -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
|
||||
|
||||
@ -39,6 +39,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags = [
|
||||
(if x11Support then "--enable-x11" else "--disable-x11")
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Suppresses a build failure building Cocoa support due to accessing private ivar `_running`,
|
||||
# which no longer available.
|
||||
(lib.enableFeature false "cocoa")
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING";
|
||||
|
||||
@ -1,16 +1,24 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, bash-completion
|
||||
, pkg-config
|
||||
, perl
|
||||
, buildPythonBindings ? false, python3
|
||||
, libxml2
|
||||
, fuse
|
||||
, fuse3
|
||||
, gnutls
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
bash-completion,
|
||||
pkg-config,
|
||||
perl,
|
||||
buildPythonBindings ? false,
|
||||
buildOcamlBindings ? false,
|
||||
ocamlPackages,
|
||||
python3,
|
||||
libxml2,
|
||||
fuse,
|
||||
fuse3,
|
||||
gnutls,
|
||||
autoreconfHook,
|
||||
}:
|
||||
|
||||
lib.throwIf (buildOcamlBindings && !lib.versionAtLeast ocamlPackages.ocaml.version "4.05")
|
||||
"OCaml binding are not available for OCaml < 4.05"
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libnbd";
|
||||
version = "1.20.2";
|
||||
@ -20,12 +28,21 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-7DgviwGPPLccTPvomyH+0CMknXmR2wENsxpXD97OP84=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
bash-completion
|
||||
pkg-config
|
||||
perl
|
||||
]
|
||||
++ lib.optionals buildPythonBindings [ python3 ];
|
||||
nativeBuildInputs =
|
||||
[
|
||||
bash-completion
|
||||
pkg-config
|
||||
perl
|
||||
autoreconfHook
|
||||
]
|
||||
++ lib.optionals buildPythonBindings [ python3 ]
|
||||
++ lib.optionals buildOcamlBindings (
|
||||
with ocamlPackages;
|
||||
[
|
||||
findlib
|
||||
ocaml
|
||||
]
|
||||
);
|
||||
|
||||
buildInputs = [
|
||||
fuse
|
||||
@ -34,7 +51,14 @@ stdenv.mkDerivation rec {
|
||||
libxml2
|
||||
];
|
||||
|
||||
configureFlags = lib.optionals buildPythonBindings [ "--with-python-installdir=${placeholder "out"}/${python3.sitePackages}" ];
|
||||
postPatch = lib.optionalString buildOcamlBindings ''
|
||||
substituteInPlace ocaml/Makefile.am \
|
||||
--replace-fail '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib'
|
||||
'';
|
||||
|
||||
configureFlags = lib.optionals buildPythonBindings [
|
||||
"--with-python-installdir=${placeholder "out"}/${python3.sitePackages}"
|
||||
];
|
||||
|
||||
installFlags = [ "bashcompdir=$(out)/share/bash-completion/completions" ];
|
||||
|
||||
@ -63,10 +87,13 @@ stdenv.mkDerivation rec {
|
||||
- Shell (nbdsh) for command line and scripting.
|
||||
'';
|
||||
license = with licenses; lgpl21Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres humancalico ];
|
||||
maintainers = with maintainers; [
|
||||
AndersonTorres
|
||||
humancalico
|
||||
];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
# TODO: package the 1.6-stable version too
|
||||
# TODO: git version needs ocaml
|
||||
# TODO: bindings for go and ocaml
|
||||
# TODO: bindings for go
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
}:
|
||||
picom.overrideAttrs (previousAttrs: {
|
||||
pname = "picom-pijulius";
|
||||
version = "8.2-unstable-2024-09-27";
|
||||
version = "8.2-unstable-2024-10-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pijulius";
|
||||
repo = "picom";
|
||||
rev = "d1d5a32d9ac125e1db1c2235834060fd0535b262";
|
||||
hash = "sha256-1ycxVHaWpqGD1GuWQ8dpKrbmSSSQS8CoaY56wM18bWk=";
|
||||
rev = "9977760e5ace3b17453e3cd89d14bc0f8de5b5f9";
|
||||
hash = "sha256-lqmZqEmD/+qZg+8UOOGJB6L0FdUuZFN5qBdL593RC/A=";
|
||||
};
|
||||
|
||||
buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ pcre ];
|
||||
|
||||
@ -20,13 +20,13 @@ let
|
||||
in
|
||||
stdenv'.mkDerivation (finalAttrs: {
|
||||
pname = "renovate";
|
||||
version = "38.93.1";
|
||||
version = "38.105.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "renovatebot";
|
||||
repo = "renovate";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-4NvFS4WWdV3Csuv28/wq6EvB+in5bo1N4Fn602bi4rE=";
|
||||
hash = "sha256-gF8bxzNF1AUJJDxFdNfa+sr/TP0S4uLCXyu3tjRuBjc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -43,7 +43,7 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-cjk7PS4DUAgmg+mLUaWJFTjQv2GcPdr1VchNRjJgqsk=";
|
||||
hash = "sha256-zTbwivYqNeArgwA6tePe2vExKoT/iLV3TS5ag8PlRgQ=";
|
||||
};
|
||||
|
||||
env.COREPACK_ENABLE_STRICT = 0;
|
||||
|
||||
30
pkgs/by-name/rh/rhsrvany/package.nix
Normal file
30
pkgs/by-name/rh/rhsrvany/package.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rhsrvany";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rwmjones";
|
||||
repo = "rhsrvany";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-eeEiAdm7NO5fFYKtHQbeBq4RhP8Xwgw2p2Wkm+n0EWM=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
meta = {
|
||||
description = "Free equivalent of Windows \"srvany\" program for turning any Windows program or script into a service";
|
||||
homepage = "https://github.com/rwmjones/rhsrvany";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [ lukts30 ];
|
||||
platforms = lib.platforms.windows;
|
||||
};
|
||||
})
|
||||
@ -2,7 +2,6 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
pkg-config,
|
||||
protobuf,
|
||||
bzip2,
|
||||
@ -26,7 +25,7 @@ let
|
||||
# See upstream issue for rocksdb 9.X support
|
||||
# https://github.com/stalwartlabs/mail-server/issues/407
|
||||
rocksdb = rocksdb_8_11;
|
||||
version = "0.10.2";
|
||||
version = "0.10.3";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "stalwart-mail";
|
||||
@ -36,11 +35,11 @@ rustPlatform.buildRustPackage {
|
||||
owner = "stalwartlabs";
|
||||
repo = "mail-server";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-wH26uwaYzfqiamiJ/oosVEiTfCOItwVGbHdRh6Ykpgk=";
|
||||
hash = "sha256-xpNSMZWWiFU6OOooAD7ENzOggqYHdU88baPsXnovpXU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1AFDyZpkcvFzWBczMAPfajmhBmVl4ou4JdKnrK2KlQI=";
|
||||
cargoHash = "sha256-qiKfHrxQ4TSSomDLlPJ2+GOEri/ZuMCvUNdxRVoplgg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@ -142,6 +141,8 @@ rustPlatform.buildRustPackage {
|
||||
# Failed to read system DNS config: io error: No such file or directory (os error 2)
|
||||
"--skip=smtp::inbound::auth::auth"
|
||||
# Failed to read system DNS config: io error: No such file or directory (os error 2)
|
||||
"--skip=smtp::inbound::antispam::antispam"
|
||||
# Failed to read system DNS config: io error: No such file or directory (os error 2)
|
||||
"--skip=smtp::inbound::vrfy::vrfy_expn"
|
||||
];
|
||||
|
||||
@ -149,7 +150,7 @@ rustPlatform.buildRustPackage {
|
||||
|
||||
passthru = {
|
||||
webadmin = callPackage ./webadmin.nix { };
|
||||
update-script = nix-update-script { };
|
||||
updateScript = nix-update-script { };
|
||||
tests.stalwart-mail = nixosTests.stalwart-mail;
|
||||
};
|
||||
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
trunk-ng,
|
||||
tailwindcss,
|
||||
fetchNpmDeps,
|
||||
nix-update-script,
|
||||
nodejs,
|
||||
npmHooks,
|
||||
llvmPackages,
|
||||
@ -15,13 +16,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "webadmin";
|
||||
version = "0.1.15";
|
||||
version = "0.1.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stalwartlabs";
|
||||
repo = "webadmin";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-YglpdxZT5CyFLla6uXTKPtq9EbA9SEQacyR9KNToYT0=";
|
||||
hash = "sha256-kMfdCb2dwoVd9G1uZw2wcfaAAPt6obFfWQbbXG/MDB4=";
|
||||
};
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
@ -30,7 +31,7 @@ rustPlatform.buildRustPackage rec {
|
||||
hash = "sha256-na1HEueX8w7kuDp8LEtJ0nD1Yv39cyk6sEMpS1zix2s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-piZ+oLL8FqS8Ishi7byYfdedkszreGuxI56pTLcYXn4=";
|
||||
cargoHash = "sha256-0Urr0MsmenFqg25lZAzg7LgJ/NkZHINoOWtPad7G6GE=";
|
||||
|
||||
postPatch = ''
|
||||
# Using local tailwindcss for compilation
|
||||
@ -60,6 +61,10 @@ rustPlatform.buildRustPackage rec {
|
||||
zip -r $out/webadmin.zip *
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Secure & modern all-in-one mail server Stalwart (webadmin module)";
|
||||
homepage = "https://github.com/stalwartlabs/webadmin";
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langgraph-checkpoint-postgres";
|
||||
version = "1.0.6";
|
||||
version = "2.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "langchain-ai";
|
||||
repo = "langgraph";
|
||||
rev = "refs/tags/checkpointpostgres==${version}";
|
||||
hash = "sha256-F9sgZQQBFs5hDUsaR5BI9ERve9L8LTUvEKOgyz5ioqY=";
|
||||
hash = "sha256-piBWr6F1YWML9D8+Bk4KvReQJhgb1Z7Xf5q8bcVUeEQ=";
|
||||
};
|
||||
|
||||
postgresqlTestSetupPost = ''
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langgraph-checkpoint-sqlite";
|
||||
version = "1.0.3";
|
||||
version = "2.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "langchain-ai";
|
||||
repo = "langgraph";
|
||||
rev = "refs/tags/checkpointsqlite==${version}";
|
||||
hash = "sha256-/pHJtK691anqn2It4ZstCGXJS0JGtdKZvqS9f3ly+FQ=";
|
||||
hash = "sha256-aG7kHdlOkrjfYcdDWwCum0mQvWNMlF2CcEDlkzbv4Zw=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/checkpoint-sqlite";
|
||||
|
||||
@ -5,15 +5,17 @@
|
||||
fetchFromGitHub,
|
||||
langchain-core,
|
||||
langgraph-sdk,
|
||||
msgpack,
|
||||
poetry-core,
|
||||
pytest-asyncio,
|
||||
pytest-mock,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langgraph-checkpoint";
|
||||
version = "1.0.9";
|
||||
version = "2.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -22,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "langchain-ai";
|
||||
repo = "langgraph";
|
||||
rev = "refs/tags/checkpoint==${version}";
|
||||
hash = "sha256-3gm+L67pPAKpY1kqnX1lPnca40KoBVZdRZ1Cy6D0dzU=";
|
||||
hash = "sha256-LBIQyDWKmT89OgYUk3LFIZ5VDXX9KQXFkR9A8XHOCBQ=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/checkpoint";
|
||||
@ -31,11 +33,16 @@ buildPythonPackage rec {
|
||||
|
||||
dependencies = [ langchain-core ];
|
||||
|
||||
propagatedBuildInputs = [ msgpack ];
|
||||
|
||||
pythonRelaxDeps = [ "msgpack" ]; # Can drop after msgpack 1.0.10 lands in nixpkgs
|
||||
|
||||
pythonImportsCheck = [ "langgraph.checkpoint" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
dataclasses-json
|
||||
pytest-asyncio
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
||||
@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langgraph-sdk";
|
||||
version = "0.1.30";
|
||||
version = "0.1.32";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langgraph";
|
||||
rev = "refs/tags/sdk==${version}";
|
||||
hash = "sha256-gI12XuxFplqIKVlVjeO60YxT7WG/SSsZ0aWfjg5bHIs=";
|
||||
hash = "sha256-qOxtrRbdK0M4aFWJX0SFn7U27rvAyqu53iCbYZX3s8A=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/sdk-py";
|
||||
|
||||
@ -36,14 +36,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langgraph";
|
||||
version = "0.2.21";
|
||||
version = "0.2.34";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langgraph";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-1Ch2V85omAKnXK9rMihNtyjIoOvmVUm8Dbdo5GBoik4=";
|
||||
hash = "sha256-5Suyj6pEslgR383MkYGGz7IC2A0A++02YooZmi8YtyM=";
|
||||
};
|
||||
|
||||
postgresqlTestSetupPost = ''
|
||||
@ -88,7 +88,10 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_doesnt_warn_valid_schema" # test is flaky due to pydantic error on the exception
|
||||
# test is flaky due to pydantic error on the exception
|
||||
"test_doesnt_warn_valid_schema"
|
||||
"test_tool_node_inject_store"
|
||||
|
||||
# Disabling tests that requires to create new random databases
|
||||
"test_cancel_graph_astream"
|
||||
"test_cancel_graph_astream_events_v2"
|
||||
|
||||
@ -69,11 +69,11 @@ rec {
|
||||
# Vulkan developer beta driver
|
||||
# See here for more information: https://developer.nvidia.com/vulkan-driver
|
||||
vulkan_beta = generic rec {
|
||||
version = "550.40.75";
|
||||
version = "550.40.76";
|
||||
persistencedVersion = "550.54.14";
|
||||
settingsVersion = "550.54.14";
|
||||
sha256_64bit = "sha256-Bgze1hx2gTKhchNHNVTnPnGOqpUe5UjNXJW5tVFi0wE=";
|
||||
openSha256 = "sha256-NnJ3AxLWg90WjoZ81vzjII/UT2RaERF4IEZp5bRgElk=";
|
||||
sha256_64bit = "sha256-dgeK0gIOrCvt7Au8sihBVjNwqAIhBjLK/X1q5hG5F8k=";
|
||||
openSha256 = "sha256-VU0awnFnFbM7MUcKiHCQ+fHhnrL/kZom4ymRX3qeuKk=";
|
||||
settingsSha256 = "sha256-m2rNASJp0i0Ez2OuqL+JpgEF0Yd8sYVCyrOoo/ln2a4=";
|
||||
persistencedSha256 = "sha256-XaPN8jVTjdag9frLPgBtqvO/goB5zxeGzaTU0CdL6C4=";
|
||||
url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux";
|
||||
|
||||
@ -21,9 +21,8 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ libpng perl ];
|
||||
propagatedBuildInputs = [ perlPackages.LWP ];
|
||||
|
||||
# Fixes a build failure on aarch64-darwin. Define for all Darwin targets for when x86_64-darwin
|
||||
# upgrades to a newer SDK.
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DTARGET_OS_IPHONE=0";
|
||||
# Fixes build failures on Darwin. These should be defined in `TargetConditional.h`, but it’s failing anyway.
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DTARGET_OS_IPHONE=0 -DTARGET_OS_EMBEDDED=0";
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs extresso/extresso
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -2,12 +2,13 @@
|
||||
, fetchpatch
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
, enableStatic ? stdenv.hostPlatform.isStatic
|
||||
, enableDarwinSandbox ? true
|
||||
# for passthru.tests
|
||||
, nix
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lowdown";
|
||||
pname = "lowdown${lib.optionalString (stdenv.hostPlatform.isDarwin && !enableDarwinSandbox) "-unsandboxed"}";
|
||||
version = "1.1.0";
|
||||
|
||||
outputs = [ "out" "lib" "dev" "man" ];
|
||||
@ -54,7 +55,9 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ which dieHook ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ];
|
||||
|
||||
preConfigure = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
|
||||
# The Darwin sandbox calls fail inside Nix builds, presumably due to
|
||||
# being nested inside another sandbox.
|
||||
preConfigure = lib.optionalString (stdenv.hostPlatform.isDarwin && !enableDarwinSandbox) ''
|
||||
echo 'HAVE_SANDBOX_INIT=0' > configure.local
|
||||
'';
|
||||
|
||||
@ -103,7 +106,8 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
|
||||
installCheckPhase = lib.optionalString (!stdenv.hostPlatform.isDarwin || !enableDarwinSandbox) ''
|
||||
runHook preInstallCheck
|
||||
echo '# TEST' > test.md
|
||||
$out/bin/lowdown test.md
|
||||
|
||||
@ -5422,6 +5422,11 @@ with pkgs;
|
||||
|
||||
lowdown = callPackage ../tools/typesetting/lowdown { };
|
||||
|
||||
# Less secure variant of lowdown for use inside Nix builds.
|
||||
lowdown-unsandboxed = lowdown.override {
|
||||
enableDarwinSandbox = false;
|
||||
};
|
||||
|
||||
numatop = callPackage ../os-specific/linux/numatop { };
|
||||
|
||||
numworks-udev-rules = callPackage ../os-specific/linux/numworks-udev-rules { };
|
||||
|
||||
@ -1229,6 +1229,11 @@ let
|
||||
|
||||
### N ###
|
||||
|
||||
nbd = pkgs.libnbd.override {
|
||||
ocamlPackages = self;
|
||||
buildOcamlBindings = true;
|
||||
};
|
||||
|
||||
netchannel = callPackage ../development/ocaml-modules/netchannel { };
|
||||
|
||||
ninja_utils = callPackage ../development/ocaml-modules/ninja_utils { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user