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

nix: update to 1.11.4.

Browse source
This commit is contained in:
Christian Neukirchen 2016-09-28 16:45:14 +02:00
parent f2e98d434a
commit 78f5ea2a67
2 changed files with 7 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
srcpkgs/nix/patches/musl.patch
View file

@ -1,39 +1,10 @@
--- configure.ac.orig 2015-12-19 21:05:08.254461650 +0100
+++ configure.ac 2015-12-19 21:06:23.959218929 +0100
@@ -54,8 +54,6 @@ if test "$sys_name" = sunos; then
fi
-CFLAGS=
-CXXFLAGS=
AC_PROG_CC
AC_PROG_CXX
@@ -96,7 +94,7 @@ AC_CHECK_FUNCS([lutimes])
# Check for sched_setaffinity.
-AC_CHECK_FUNCS([sched_setaffinity])
+AC_CHECK_FUNCS([sched_setaffinity sched_getcpu])
# Check whether the store optimiser can optimise symlinks.
--- src/libutil/affinity.cc.orig 2015-12-19 21:10:00.175521237 +0100 --- src/libutil/affinity.cc.orig 2015-12-19 21:10:00.175521237 +0100
+++ src/libutil/affinity.cc 2015-12-19 21:10:19.551719833 +0100 +++ src/libutil/affinity.cc 2015-12-19 21:10:19.551719833 +0100
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
#include "affinity.hh" #include "affinity.hh"
#if HAVE_SCHED_H #if __linux__
+#include <string.h> +#include <string.h>
#include <sched.h> #include <sched.h>
#endif #endif
@@ -32,7 +33,7 @@ void setAffinityTo(int cpu)
int lockToCurrentCPU()
{
-#if HAVE_SCHED_SETAFFINITY
+#if HAVE_SCHED_GETCPU
int cpu = sched_getcpu();
if (cpu != -1) setAffinityTo(cpu);
return cpu;

12
srcpkgs/nix/template
View file

@ -1,14 +1,15 @@
# Template file for 'nix' # Template file for 'nix'
pkgname=nix pkgname=nix
version=1.10 version=1.11.4
revision=6 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" configure_args="--localstatedir=/nix/var"
depends="curl perl-WWW-Curl perl-DBD-SQLite" depends="curl perl-WWW-Curl perl-DBD-SQLite"
hostmakedepends="automake libtool pkg-config flex ${depends}" hostmakedepends="automake libtool pkg-config flex ${depends}"
# Extra run-time dependencies. # Extra run-time dependencies.
makedepends="bzip2-devel libressl-devel sqlite-devel gc-devel libcurl-devel" makedepends="bzip2-devel gc-devel libcurl-devel liblzma-devel libressl-devel
libsodium-devel pkg-config sqlite-devel"
# Default configuration file. # Default configuration file.
conf_files="/etc/nix/nix.conf" conf_files="/etc/nix/nix.conf"
# Create required build users/groups. # Create required build users/groups.
@ -35,12 +36,11 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="LGPL-2.1" license="LGPL-2.1"
homepage="http://nixos.org/nix/" homepage="http://nixos.org/nix/"
distfiles="http://nixos.org/releases/nix/nix-${version}/nix-${version}.tar.xz" distfiles="http://nixos.org/releases/nix/nix-${version}/nix-${version}.tar.xz"
checksum=5612ca7a549dd1ee20b208123e041aaa95a414a0e8f650ea88c672dc023d10f6 checksum=937779ed2efaa3dec210250635401980acb99a6fea6d7374fbaea78231b36d34
pre_configure() { pre_configure() {
sed -i '/CFLAGS=/d;/CXXFLAGS=/d' configure.ac 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() {
vmkdir etc/nix vmkdir etc/nix