diff --git a/sysutils/nix/Makefile b/sysutils/nix/Makefile index e301276f2779..5f76187cef4d 100644 --- a/sysutils/nix/Makefile +++ b/sysutils/nix/Makefile @@ -1,94 +1,96 @@ PORTNAME= nix DISTVERSION= 2.32.4 PORTREVISION= 2 CATEGORIES= sysutils -PATCH_SITES= https://github.com/NixOS/nix/commit/2636f50dd41fe357ec64430aeeb772328ab2d7cb.patch?dummy=/ -PATCHFILES= nix-fix-build-with-mdbook-update.patch:-p1 +PATCH_SITES= https://github.com/NixOS/nix/commit/ +PATCHFILES= 2636f50dd41fe357ec64430aeeb772328ab2d7cb.patch:-p1 # nix-fix-build-with-mdbook-update.patch +PATCHFILES+= 342faaa1fa0aa3accc3027081b66c7c2ca36670b.patch:-p1 # fix build fix lowdown 3 + MAINTAINER= ashish@FreeBSD.org COMMENT= Purely functional package manager WWW= https://nixos.org/nix/ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= bash:shells/bash \ jq:textproc/jq \ nlohmann-json>=3.9:devel/nlohmann-json \ toml11>=0:devel/toml11 LIB_DEPENDS= libaws-cpp-sdk-core.so:devel/aws-sdk-cpp \ libaws-crt-cpp.so:devel/aws-crt-cpp \ libblake3.so:devel/libblake3 \ libboost_context.so:devel/boost-libs \ libbrotlienc.so:archivers/brotli \ libcpuid.so:sysutils/libcpuid \ libcurl.so:ftp/curl \ libeditline.so:devel/editline \ libgc-threaded.so:devel/boehm-gc-threaded \ libgit2.so:devel/libgit2 \ liblowdown.so:textproc/lowdown \ libsodium.so:security/libsodium USES= bison cmake:indirect compiler:c++23-lang cpe libarchive localbase \ meson ninja pkgconfig sqlite:3 ssl USE_GITHUB= yes GH_ACCOUNT= NixOS USE_LDCONFIG= yes CPE_VENDOR= nix_project MESON_ARGS= -Dbenchmarks=false \ -Dbindings=false \ -Dunit-tests=false LDFLAGS+= -L${LOCALBASE}/lib # file names are platform-dependent! PORTDOCS= manual PLIST_SUB= PORTVERSION=${PORTVERSION} SUB_FILES= pkg-message GROUPS= nixbld OPTIONS_DEFINE= DOCS DOCS_USES= python:build DOCS_MESON_TRUE= doc-gen DOCS_BUILD_DEPENDS= mdbook-linkcheck>=0:textproc/mdbook-linkcheck \ mdbook>=0:textproc/mdbook \ rsync:net/rsync _STRIP_TARGETS= bin/nix bin/nix-build bin/nix-channel bin/nix-collect-garbage \ bin/nix-copy-closure bin/nix-daemon bin/nix-env \ bin/nix-instantiate bin/nix-prefetch-url bin/nix-store \ lib/libnixexpr.so lib/libnixmain.so lib/libnixstore.so \ lib/libnixutil.so lib/libnixcmd.so lib/libnixfetchers.so post-patch: ${REINPLACE_CMD} -e "/seccomp-sandboxing/s/,$$/, value : 'disabled',/" \ ${WRKSRC}/src/libstore/meson.options ${REINPLACE_CMD} -e "/^bdw_gc/s/'bdw-gc'/'bdw-gc-threaded'/" \ ${WRKSRC}/src/libexpr/meson.build ${FIND} ${WRKSRC} -type f -name meson.build | \ ${XARGS} ${GREP} -E -R -l 'Werror=(suggest-override|undef)|/dummy' | \ ${XARGS} ${REINPLACE_CMD} -E -e '/Werror=(suggest-override|undef)/d' \ -e 's,/dummy,/tmp/dummy,g' post-patch-DOCS-on: ${REINPLACE_CMD} -E -e '/(internal|external)-api-docs/d' \ ${WRKSRC}/meson.build ${FIND} ${WRKSRC} -type f -name 'book.toml.in' | ${XARGS} \ ${REINPLACE_CMD} -e "s,'python3','${PYTHON_CMD}'," \ -e 's,"python3 ,"${PYTHON_CMD} ,' \ ${WRKSRC}/src/nix-manual/meson.build post-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${FILESDIR}/add-nixbld-users ${STAGEDIR}${DATADIR} @${RM} ${STAGEDIR}${PREFIX}/libexec/nix/build-remote @${RLN} ${STAGEDIR}${PREFIX}/bin/nix ${STAGEDIR}${PREFIX}/libexec/nix/build-remote @cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} ${_STRIP_TARGETS} .include diff --git a/sysutils/nix/distinfo b/sysutils/nix/distinfo index fb39a467a4ab..ab3c6279f8bb 100644 --- a/sysutils/nix/distinfo +++ b/sysutils/nix/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1764968570 +TIMESTAMP = 1776063685 SHA256 (NixOS-nix-2.32.4_GH0.tar.gz) = b3a63dab4fc3c89a1a746c6debdef1675ed27530969459e5beb8ce6b3c0d9099 SIZE (NixOS-nix-2.32.4_GH0.tar.gz) = 1954164 -SHA256 (nix-fix-build-with-mdbook-update.patch) = 68a63748895487adf283767cd2fd21bd6ec8b5d59a2d77a9255c8c3157997ccb -SIZE (nix-fix-build-with-mdbook-update.patch) = 3658 +SHA256 (2636f50dd41fe357ec64430aeeb772328ab2d7cb.patch) = 6199fa6ac6731f6cd0a780e7629e30e94d29f726cf103e9ab1ad29592fc74535 +SIZE (2636f50dd41fe357ec64430aeeb772328ab2d7cb.patch) = 3666 +SHA256 (342faaa1fa0aa3accc3027081b66c7c2ca36670b.patch) = b8365748355ecd43aa02e4c3628ef84eb8af77292364301ca71f523232cdc37f +SIZE (342faaa1fa0aa3accc3027081b66c7c2ca36670b.patch) = 1480