mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-05-04 12:01:41 +02:00
testing/nix: upgrade to 2.19.1
* bootstrap script was removed upstream (https://github.com/NixOS/nix/pull/9131) * fix-docs-build.patch was rebased
This commit is contained in:
Sören Tempel
Sören Tempel
parent
5a037a88f4
commit
aea42aea7e
@ -2,8 +2,8 @@
|
||||
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
|
||||
# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
|
||||
pkgname=nix
|
||||
pkgver=2.18.1
|
||||
pkgrel=2
|
||||
pkgver=2.19.1
|
||||
pkgrel=0
|
||||
pkgdesc="The purely functional package manager"
|
||||
url="https://nixos.org/nix/"
|
||||
arch="x86 x86_64 aarch64" # supported platforms
|
||||
@ -75,8 +75,7 @@ esac
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
|
||||
./bootstrap.sh
|
||||
autoreconf -vfi
|
||||
}
|
||||
|
||||
build() {
|
||||
@ -160,10 +159,10 @@ manual() {
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
4d36faf63666e5ec117b9daa6006414cb6f48439ee82687563af3eebc1a414eae17250e3550c347f88f8f720bbbc812c251bacb5e4542ae1905b458bcd9a5ae3 nix-2.18.1.tar.gz
|
||||
0d0be96eef7aa3ea0b620eceea16090a61b9ed4238dcba06f8a355b6562700bb47579a9f0962519cd25e9221c08c6d04a2fe16ef9c167d9f3012dda45a05a058 nix-2.19.1.tar.gz
|
||||
f6a8d67003a6f0cd54dc4dc26051e9f3d18d9c1c1d66c99324e3db017891a6fdd88d7be53de05ab21fa8f7635164a093069416a89cf322ea6f6888df066ea60b README.alpine
|
||||
ad02313f026fe3286c7c2271f26bf074ba2966c12777d7109275555f1a616bf0f99c8f5e45a57161f383091867f1dfd4d84cfae7a6d8a075312608456975dc81 nix-remote.sh
|
||||
9e4568db987fbae5097f7bb086e8ad51742c2d229703104fb7e6f240ffb0ca72e57dc305fb238bcee4ec8002d780007af60f241b1f32b6aa413dd579d9c59e75 nix-daemon.initd
|
||||
0d9214f27492b24f7b637efea38ddeec12b5db82ec39e6bbd84d0f080f6c03a9264a3e9a9b38fab904551bdddc8d067ddd96940f780bd2d8cfcee0fd3e586644 fix-docs-build.patch
|
||||
af36a3dc1da8bf812bc129979ca949f17028ba15a71f154567bab8dd02baffde6962e43a6ede0c452390d18051b5027b11c0c232963ac0216323fb5246c5d309 fix-docs-build.patch
|
||||
4bf84827e2757a23680d4f3ad118d92d15010801343083dd362d291672a357d566a94f518afc36265628baaea2a0b1e4d87d33e53ba71e3c3ec7545fac66613e no-linkcheck.patch
|
||||
"
|
||||
|
||||
@ -21,31 +21,31 @@ the executable in the build tree.
|
||||
|
||||
diff --git a/doc/manual/local.mk b/doc/manual/local.mk
|
||||
index abdfd6a62..dea46f36c 100644
|
||||
--- a/doc/manual/local.mk
|
||||
+++ b/doc/manual/local.mk
|
||||
--- a/doc/manual/local.mk 2023-11-23 20:23:13.029266813 +0100
|
||||
+++ b/doc/manual/local.mk 2023-11-23 20:24:03.749401922 +0100
|
||||
@@ -32,7 +32,7 @@ dummy-env = env -i \
|
||||
NIX_STATE_DIR=/dummy \
|
||||
NIX_CONFIG='cores = 0'
|
||||
|
||||
-nix-eval = $(dummy-env) $(bindir)/nix eval --experimental-features nix-command -I nix/corepkgs=corepkgs --store dummy:// --impure --raw
|
||||
+nix-eval = $(dummy-env) $(nix_DIR)/nix eval --experimental-features nix-command -I nix/corepkgs=corepkgs --store dummy:// --impure --raw
|
||||
-nix-eval = $(dummy-env) $(bindir)/nix eval --experimental-features nix-command -I nix=doc/manual --store dummy:// --impure --raw
|
||||
+nix-eval = $(dummy-env) $(nix_DIR)/nix eval --experimental-features nix-command -I nix=doc/manual --store dummy:// --impure --raw
|
||||
|
||||
# re-implement mdBook's include directive to make it usable for terminal output and for proper @docroot@ substitution
|
||||
define process-includes
|
||||
@@ -96,52 +96,52 @@ $(d)/src/SUMMARY.md: $(d)/src/SUMMARY.md.in $(d)/src/command-ref/new-cli $(d)/sr
|
||||
@@ -96,52 +96,52 @@ $(d)/src/SUMMARY.md: $(d)/src/SUMMARY.md
|
||||
@cp $< $@
|
||||
@$(call process-includes,$@,$@)
|
||||
|
||||
-$(d)/src/command-ref/new-cli: $(d)/nix.json $(d)/utils.nix $(d)/generate-manpage.nix $(bindir)/nix
|
||||
+$(d)/src/command-ref/new-cli: $(d)/nix.json $(d)/utils.nix $(d)/generate-manpage.nix $(nix_DIR)/nix
|
||||
-$(d)/src/command-ref/new-cli: $(d)/nix.json $(d)/utils.nix $(d)/generate-manpage.nix $(d)/generate-settings.nix $(d)/generate-store-info.nix $(bindir)/nix
|
||||
+$(d)/src/command-ref/new-cli: $(d)/nix.json $(d)/utils.nix $(d)/generate-manpage.nix $(d)/generate-settings.nix $(d)/generate-store-info.nix $(nix_DIR)/nix
|
||||
@rm -rf $@ $@.tmp
|
||||
$(trace-gen) $(nix-eval) --write-to $@.tmp --expr 'import doc/manual/generate-manpage.nix (builtins.readFile $<)'
|
||||
$(trace-gen) $(nix-eval) --write-to $@.tmp --expr 'import doc/manual/generate-manpage.nix true (builtins.readFile $<)'
|
||||
@mv $@.tmp $@
|
||||
|
||||
-$(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/utils.nix $(d)/src/command-ref/conf-file-prefix.md $(d)/src/command-ref/experimental-features-shortlist.md $(bindir)/nix
|
||||
+$(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/utils.nix $(d)/src/command-ref/conf-file-prefix.md $(d)/src/command-ref/experimental-features-shortlist.md $(nix_DIR)/nix
|
||||
-$(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/utils.nix $(d)/generate-settings.nix $(d)/src/command-ref/conf-file-prefix.md $(d)/src/command-ref/experimental-features-shortlist.md $(bindir)/nix
|
||||
+$(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/utils.nix $(d)/generate-settings.nix $(d)/src/command-ref/conf-file-prefix.md $(d)/src/command-ref/experimental-features-shortlist.md $(nix_DIR)/nix
|
||||
@cat doc/manual/src/command-ref/conf-file-prefix.md > $@.tmp
|
||||
$(trace-gen) $(nix-eval) --expr '(import doc/manual/utils.nix).showSettings { useAnchors = true; } (builtins.fromJSON (builtins.readFile $<))' >> $@.tmp;
|
||||
$(trace-gen) $(nix-eval) --expr 'import doc/manual/generate-settings.nix { prefix = "conf"; } (builtins.fromJSON (builtins.readFile $<))' >> $@.tmp;
|
||||
@mv $@.tmp $@
|
||||
|
||||
-$(d)/nix.json: $(bindir)/nix
|
||||
@ -73,9 +73,9 @@ index abdfd6a62..dea46f36c 100644
|
||||
@mv $@.tmp $@
|
||||
|
||||
-$(d)/xp-features.json: $(bindir)/nix
|
||||
- $(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(bindir)/nix __dump-xp-features > $@.tmp
|
||||
- $(trace-gen) $(dummy-env) $(bindir)/nix __dump-xp-features > $@.tmp
|
||||
+$(d)/xp-features.json: $(nix_DIR)/nix
|
||||
+ $(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(nix_DIR)/nix __dump-xp-features > $@.tmp
|
||||
+ $(trace-gen) $(dummy-env) $(nix_DIR)/nix __dump-xp-features > $@.tmp
|
||||
@mv $@.tmp $@
|
||||
|
||||
-$(d)/src/language/builtins.md: $(d)/language.json $(d)/generate-builtins.nix $(d)/src/language/builtins-prefix.md $(bindir)/nix
|
||||
@ -93,9 +93,9 @@ index abdfd6a62..dea46f36c 100644
|
||||
@mv $@.tmp $@
|
||||
|
||||
-$(d)/language.json: $(bindir)/nix
|
||||
- $(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(bindir)/nix __dump-language > $@.tmp
|
||||
- $(trace-gen) $(dummy-env) $(bindir)/nix __dump-language > $@.tmp
|
||||
+$(d)/language.json: $(nix_DIR)/nix
|
||||
+ $(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(nix_DIR)/nix __dump-language > $@.tmp
|
||||
+ $(trace-gen) $(dummy-env) $(nix_DIR)/nix __dump-language > $@.tmp
|
||||
@mv $@.tmp $@
|
||||
|
||||
# Generate the HTML manual.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user