From 480a086ebe8f87fcc496ab8be81a9ee188149237 Mon Sep 17 00:00:00 2001 From: Urs Schulz Date: Sun, 8 May 2022 14:26:54 +0200 Subject: [PATCH] nix: update to 2.8.0. --- srcpkgs/nix/template | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index 6e481b3760a..9afcb75a7a6 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -1,22 +1,28 @@ # Template file for 'nix' pkgname=nix -version=2.3.12 +version=2.8.0 revision=1 build_style=gnu-configure # Use /nix/var as suggested by the official Manual. configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh" -hostmakedepends="curl pkg-config flex tar xz" +hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook" makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel liblzma-devel openssl-devel libsodium-devel sqlite-devel - libseccomp-devel editline-devel" + libseccomp-devel editline-devel jq-devel libarchive-devel libcpuid-devel + gtest-devel lowdown-devel json-c++" depends="curl tar xz" short_desc="Purely functional package manager" maintainer="Juan RP " license="LGPL-2.1-or-later" homepage="https://nixos.org/nix/" changelog="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/manual/#sec-relnotes" -distfiles="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.xz" -checksum=213a7d49c461079b32361e4d008d248d7f68e34d2cc9347f3a8ff9029f9afb5d +distfiles="https://github.com/NixOS/nix/archive/refs/tags/${version}.tar.gz" +checksum=91a7f2bcdde3263927d842f04a345ed77319148c700e2c8be01498724e6808c0 +disable_parallel_build=yes + +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + makedepends+=" musl-legacy-compat" +fi CXXFLAGS="-Wno-deprecated-declarations" @@ -47,13 +53,7 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then fi pre_configure() { - if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - echo "libexpr_LDFLAGS += -latomic" >> src/libexpr/local.mk - echo "libutil_LDFLAGS += -latomic" >> src/libutil/local.mk - echo "libstore_LDFLAGS += -latomic" >> src/libstore/local.mk - fi - sed -i '/^CFLAGS=/d;/^CXXFLAGS=/d' configure - echo "GLOBAL_LDFLAGS += $LDFLAGS" >>mk/lib.mk + ./bootstrap.sh } post_install() {