moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

nix: update to 2.3.1

Browse source 
Update to 2.3.1 and unmark broken on arm*

Signed-off-by: Nathan Owens <ndowens04@gmail.com>
This commit is contained in:
Nathan Owens 2019-12-15 22:29:53 -06:00 • committed by Helmut Pozimski
parent c2cd77656e
commit 90e12b599b
1 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
srcpkgs/nix/template
View file

@ -1,11 +1,11 @@
# Template file for 'nix' # Template file for 'nix'
pkgname=nix pkgname=nix
version=2.2.2 version=2.3.1
revision=4 revision=1
build_style=gnu-configure build_style=gnu-configure
# Use /nix/var as suggested by the official Manual. # Use /nix/var as suggested by the official Manual.
configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh" configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
hostmakedepends="autoconf automake curl libtool pkg-config flex" hostmakedepends="curl pkg-config flex"
makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
liblzma-devel libressl-devel libsodium-devel pkg-config sqlite-devel liblzma-devel libressl-devel libsodium-devel pkg-config sqlite-devel
libseccomp-devel editline-devel" libseccomp-devel editline-devel"
@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
homepage="https://nixos.org/nix/" homepage="https://nixos.org/nix/"
changelog="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/manual/#sec-relnotes" changelog="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/manual/#sec-relnotes"
distfiles="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.xz" distfiles="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.xz"
checksum=f80a1b4f9837a8d33209f0b7769d5038335459ff4303eccf3e9217a9eca8594c checksum=bb6578e9f20eebab6d78469ecc59c450ac54f276e5a86a882015d98fecb1bc7b
# Default configuration file. # Default configuration file.
conf_files="/etc/nix/nix.conf" conf_files="/etc/nix/nix.conf"
@ -40,12 +40,6 @@ make_dirs="
/nix/var/nix/db 0755 root root /nix/var/nix/db 0755 root root
/nix/store 1775 root nixbld" /nix/store 1775 root nixbld"
case "${XBPS_TARGET_MACHINE}" in
armv[56]*)
broken="Not supported upstream (for now at least)";
;;
esac
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
ppc64*) ;; ppc64*) ;;
armv6*|ppc*) _need_libatomic=yes;; armv6*|ppc*) _need_libatomic=yes;;
@ -63,7 +57,6 @@ pre_configure() {
fi fi
sed -i '/^CFLAGS=/d;/^CXXFLAGS=/d' configure sed -i '/^CFLAGS=/d;/^CXXFLAGS=/d' configure
echo "GLOBAL_LDFLAGS += $LDFLAGS" >>mk/lib.mk echo "GLOBAL_LDFLAGS += $LDFLAGS" >>mk/lib.mk
autoreconf -fi
} }
post_install() { post_install() {