git: 1f95bd627f73 - main - sysutils/nix: Update to 2.32.4

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Ashish SHUKLA <ashish_at_FreeBSD.org>
Date: Tue, 09 Dec 2025 14:40:52 UTC
The branch main has been updated by ashish:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1f95bd627f73bbe7b1ec05ef92aed84400ee8c61

commit 1f95bd627f73bbe7b1ec05ef92aed84400ee8c61
Author:     Ashish SHUKLA <ashish@FreeBSD.org>
AuthorDate: 2025-12-09 14:37:29 +0000
Commit:     Ashish SHUKLA <ashish@FreeBSD.org>
CommitDate: 2025-12-09 14:37:29 +0000

    sysutils/nix: Update to 2.32.4
    
    Many thanks to eduardo@ for help finding the upstream fix for
    fixing with mdbook 0.5.1
    
    PR:             291079
---
 sysutils/nix/Makefile  |  6 +++-
 sysutils/nix/distinfo  |  8 +++--
 sysutils/nix/pkg-plist | 93 ++++++++++++++++++++++++--------------------------
 3 files changed, 54 insertions(+), 53 deletions(-)

diff --git a/sysutils/nix/Makefile b/sysutils/nix/Makefile
index 65a25b8e7e85..4e188a36fa32 100644
--- a/sysutils/nix/Makefile
+++ b/sysutils/nix/Makefile
@@ -1,7 +1,10 @@
 PORTNAME=	nix
-DISTVERSION=	2.32.1
+DISTVERSION=	2.32.4
 CATEGORIES=	sysutils
 
+PATCH_SITES=	https://github.com/NixOS/nix/commit/2636f50dd41fe357ec64430aeeb772328ab2d7cb.patch?dummy=/
+PATCHFILES=	nix-fix-build-with-mdbook-update.patch:-p1
+
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Purely functional package manager
 WWW=		https://nixos.org/nix/
@@ -38,6 +41,7 @@ MESON_ARGS=	-Dbenchmarks=false \
 		-Dbindings=false \
 		-Dunit-tests=false
 LDFLAGS+=	-L${LOCALBASE}/lib
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 SUB_FILES=	pkg-message
 
diff --git a/sysutils/nix/distinfo b/sysutils/nix/distinfo
index 444d5c9f6c19..fb39a467a4ab 100644
--- a/sysutils/nix/distinfo
+++ b/sysutils/nix/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1761053753
-SHA256 (NixOS-nix-2.32.1_GH0.tar.gz) = 879e05682a35aefe7fc8c570475ce8deb93e0324ac3d6cccadd060de2b481947
-SIZE (NixOS-nix-2.32.1_GH0.tar.gz) = 1950308
+TIMESTAMP = 1764968570
+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
diff --git a/sysutils/nix/pkg-plist b/sysutils/nix/pkg-plist
index 8918a4baed7d..fb6fd05691c7 100644
--- a/sysutils/nix/pkg-plist
+++ b/sysutils/nix/pkg-plist
@@ -270,31 +270,31 @@ include/nix_api_util.h
 include/nix_api_util_internal.h
 include/nix_api_value.h
 lib/libnixcmd.so
-lib/libnixcmd.so.2.32.1
+lib/libnixcmd.so.%%PORTVERSION%%
 lib/libnixexpr.so
-lib/libnixexpr.so.2.32.1
+lib/libnixexpr.so.%%PORTVERSION%%
 lib/libnixexprc.so
-lib/libnixexprc.so.2.32.1
+lib/libnixexprc.so.%%PORTVERSION%%
 lib/libnixfetchers.so
-lib/libnixfetchers.so.2.32.1
+lib/libnixfetchers.so.%%PORTVERSION%%
 lib/libnixfetchersc.so
-lib/libnixfetchersc.so.2.32.1
+lib/libnixfetchersc.so.%%PORTVERSION%%
 lib/libnixflake.so
-lib/libnixflake.so.2.32.1
+lib/libnixflake.so.%%PORTVERSION%%
 lib/libnixflakec.so
-lib/libnixflakec.so.2.32.1
+lib/libnixflakec.so.%%PORTVERSION%%
 lib/libnixmain.so
-lib/libnixmain.so.2.32.1
+lib/libnixmain.so.%%PORTVERSION%%
 lib/libnixmainc.so
-lib/libnixmainc.so.2.32.1
+lib/libnixmainc.so.%%PORTVERSION%%
 lib/libnixstore.so
-lib/libnixstore.so.2.32.1
+lib/libnixstore.so.%%PORTVERSION%%
 lib/libnixstorec.so
-lib/libnixstorec.so.2.32.1
+lib/libnixstorec.so.%%PORTVERSION%%
 lib/libnixutil.so
-lib/libnixutil.so.2.32.1
+lib/libnixutil.so.%%PORTVERSION%%
 lib/libnixutilc.so
-lib/libnixutilc.so.2.32.1
+lib/libnixutilc.so.%%PORTVERSION%%
 libdata/pkgconfig/nix-cmd.pc
 libdata/pkgconfig/nix-expr-c.pc
 libdata/pkgconfig/nix-expr.pc
@@ -316,13 +316,6 @@ share/zsh/site-functions/_nix
 share/zsh/site-functions/run-help-nix
 %%PORTDOCS%%%%DOCSDIR%%/manual/.nojekyll
 %%PORTDOCS%%%%DOCSDIR%%/manual/404.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/FontAwesome/css/font-awesome.css
-%%PORTDOCS%%%%DOCSDIR%%/manual/FontAwesome/fonts/FontAwesome.ttf
-%%PORTDOCS%%%%DOCSDIR%%/manual/FontAwesome/fonts/fontawesome-webfont.eot
-%%PORTDOCS%%%%DOCSDIR%%/manual/FontAwesome/fonts/fontawesome-webfont.svg
-%%PORTDOCS%%%%DOCSDIR%%/manual/FontAwesome/fonts/fontawesome-webfont.ttf
-%%PORTDOCS%%%%DOCSDIR%%/manual/FontAwesome/fonts/fontawesome-webfont.woff
-%%PORTDOCS%%%%DOCSDIR%%/manual/FontAwesome/fonts/fontawesome-webfont.woff2
 %%PORTDOCS%%%%DOCSDIR%%/manual/SUMMARY.md.in
 %%PORTDOCS%%%%DOCSDIR%%/manual/_redirects
 %%PORTDOCS%%%%DOCSDIR%%/manual/advanced-topics/cores-vs-jobs.html
@@ -332,10 +325,10 @@ share/zsh/site-functions/run-help-nix
 %%PORTDOCS%%%%DOCSDIR%%/manual/advanced-topics/index.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/advanced-topics/post-build-hook.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/architecture/architecture.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ayu-highlight.css
-%%PORTDOCS%%%%DOCSDIR%%/manual/book.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/ayu-highlight-3fdfc3ac.css
+%%PORTDOCS%%%%DOCSDIR%%/manual/book-a0b12cfe.js
 %%PORTDOCS%%%%DOCSDIR%%/manual/c-api.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/clipboard.min.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/clipboard-1626706a.min.js
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/conf-file.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/env-common.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/experimental-commands.html
@@ -487,11 +480,11 @@ share/zsh/site-functions/run-help-nix
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/opt-common.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/utilities.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/xp-features.json
-%%PORTDOCS%%%%DOCSDIR%%/manual/css/chrome.css
-%%PORTDOCS%%%%DOCSDIR%%/manual/css/general.css
-%%PORTDOCS%%%%DOCSDIR%%/manual/css/print.css
-%%PORTDOCS%%%%DOCSDIR%%/manual/css/variables.css
-%%PORTDOCS%%%%DOCSDIR%%/manual/custom.css
+%%PORTDOCS%%%%DOCSDIR%%/manual/css/chrome-ae938929.css
+%%PORTDOCS%%%%DOCSDIR%%/manual/css/general-2459343d.css
+%%PORTDOCS%%%%DOCSDIR%%/manual/css/print-9e4910d8.css
+%%PORTDOCS%%%%DOCSDIR%%/manual/css/variables-8adf115d.css
+%%PORTDOCS%%%%DOCSDIR%%/manual/custom-80d08c7f.css
 %%PORTDOCS%%%%DOCSDIR%%/manual/development/benchmarking.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/development/building.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/development/cli-guideline.html
@@ -503,28 +496,30 @@ share/zsh/site-functions/run-help-nix
 %%PORTDOCS%%%%DOCSDIR%%/manual/development/index.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/development/json-guideline.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/development/testing.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/elasticlunr.min.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/elasticlunr-ef4e11c1.min.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/favicon-8114d1fc.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/favicon-de23e50b.svg
 %%PORTDOCS%%%%DOCSDIR%%/manual/favicon.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/favicon.svg
 %%PORTDOCS%%%%DOCSDIR%%/manual/figures/user-environments.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/figures/user-environments.sxd
 %%PORTDOCS%%%%DOCSDIR%%/manual/fonts/OPEN-SANS-LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/manual/fonts/SOURCE-CODE-PRO-LICENSE.txt
-%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/fonts.css
-%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-300.woff2
-%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-300italic.woff2
-%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-600.woff2
-%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-600italic.woff2
-%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-700.woff2
-%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-700italic.woff2
-%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-800.woff2
-%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-800italic.woff2
-%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-italic.woff2
-%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-regular.woff2
-%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/source-code-pro-v11-all-charsets-500.woff2
+%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/fonts-9644e21d.css
+%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-300-7736aa35.woff2
+%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-300italic-2c7b95c0.woff2
+%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-600-486c6759.woff2
+%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-600italic-1a3e8659.woff2
+%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-700-c22fe8c7.woff2
+%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-700italic-238ae959.woff2
+%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-800-3d2c812a.woff2
+%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-800italic-ba1521ec.woff2
+%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-italic-6c9463f7.woff2
+%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-regular-2e3b1d34.woff2
+%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/source-code-pro-v11-all-charsets-500-2bdd9410.woff2
 %%PORTDOCS%%%%DOCSDIR%%/manual/glossary.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/highlight.css
-%%PORTDOCS%%%%DOCSDIR%%/manual/highlight.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/highlight-493f70e1.css
+%%PORTDOCS%%%%DOCSDIR%%/manual/highlight-862e895d.js
 %%PORTDOCS%%%%DOCSDIR%%/manual/index.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/installation/building-source.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/installation/env-variables.html
@@ -557,7 +552,7 @@ share/zsh/site-functions/run-help-nix
 %%PORTDOCS%%%%DOCSDIR%%/manual/language/syntax.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/language/types.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/language/variables.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/mark.min.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/mark-09e88c2c.min.js
 %%PORTDOCS%%%%DOCSDIR%%/manual/package-management/binary-cache-substituter.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/package-management/garbage-collection.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/package-management/garbage-collector-roots.html
@@ -575,7 +570,7 @@ share/zsh/site-functions/run-help-nix
 %%PORTDOCS%%%%DOCSDIR%%/manual/protocols/store-path.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/protocols/tarball-fetcher.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/quick-start.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/redirects.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/redirects-4afb32ee.js
 %%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/index.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-0.10.1.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-0.10.html
@@ -642,8 +637,8 @@ share/zsh/site-functions/run-help-nix
 %%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.8.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.9.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-next.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/searcher.js
-%%PORTDOCS%%%%DOCSDIR%%/manual/searchindex.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/searcher-c2a407aa.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/searchindex-4c88e1df.js
 %%PORTDOCS%%%%DOCSDIR%%/manual/store/building.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/store/derivation/index.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/store/derivation/outputs/content-address.html
@@ -668,8 +663,8 @@ share/zsh/site-functions/run-help-nix
 %%PORTDOCS%%%%DOCSDIR%%/manual/store/types/s3-binary-cache-store.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/store/types/ssh-store.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/toc.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/toc.js
-%%PORTDOCS%%%%DOCSDIR%%/manual/tomorrow-night.css
+%%PORTDOCS%%%%DOCSDIR%%/manual/toc-72f89b39.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/tomorrow-night-4c0ae647.css
 %%PORTDOCS%%share/man/man1/nix-build.1.gz
 %%PORTDOCS%%share/man/man1/nix-channel.1.gz
 %%PORTDOCS%%share/man/man1/nix-collect-garbage.1.gz