nix: Updated for version 2.3.9

This commit is contained in:
Eugen Wissner 2020-12-01 19:12:25 +01:00
parent c764566f46
commit f5aaf1a0a7
4 changed files with 5 additions and 66 deletions

View File

@ -1,42 +0,0 @@
From d5c7efae3833b4c8d0012c5f9816ae4b6c28a3e7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 6 Aug 2020 11:40:41 +0200
Subject: [PATCH] repl.cc: Check for HAVE_BOEHMGC
Fixes #3906.
(cherry picked from commit 59067f0f587f75908c4f990bcbab29340c7f7652)
---
src/nix/repl.cc | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/nix/repl.cc b/src/nix/repl.cc
index 04bc82cc0..0b696a340 100644
--- a/src/nix/repl.cc
+++ b/src/nix/repl.cc
@@ -31,8 +31,10 @@ extern "C" {
#include "command.hh"
#include "finally.hh"
+#if HAVE_BOEHMGC
#define GC_INCLUDE_NEW
#include <gc/gc_cpp.h>
+#endif
namespace nix {
@@ -44,7 +46,10 @@ namespace nix {
#define ESC_CYA "\033[36m"
#define ESC_END "\033[0m"
-struct NixRepl : gc
+struct NixRepl
+ #if HAVE_BOEHMGC
+ : gc
+ #endif
{
string curDir;
EvalState state;
--
2.28.0

View File

@ -1,17 +0,0 @@
Subject: Append CPPFLAGS to GLOBAL_*FLAGS, copy LDFLAGS into GLOBAL_LDFLAGS
Author: Kai Harries <kai.harries@gmail.com>
I (thk@) am not sure what this patch is needed for. I guess so that Debian
specific build options are respected?
--- a/Makefile
+++ b/Makefile
@@ -19,4 +19,8 @@ GLOBAL_CXXFLAGS += -g -Wall -include config.h
-include Makefile.config
+GLOBAL_CFLAGS += $(CPPFLAGS)
+GLOBAL_CXXFLAGS += $(CPPFLAGS)
+GLOBAL_LDFLAGS += $(LDFLAGS)
+
include mk/lib.mk

View File

@ -3,6 +3,7 @@
# Slackware build script for nix
# Copyright 2015 Pragmatic Cypher <slackbuilds@server.ky>
# Copyright 2020 Eugen Wissner, Dachau, Germany
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@ -23,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=nix
VERSION=${VERSION:-2.0.2}
VERSION=${VERSION:-2.3.9}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@ -69,9 +70,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
patch -p1 -i $CWD/fix-Makefile.patch
patch -p1 -i $CWD/0001-repl.cc-Check-for-HAVE_BOEHMGC.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \

View File

@ -1,8 +1,8 @@
PRGNAM="nix"
VERSION="2.0.2"
VERSION="2.3.9"
HOMEPAGE="http://nixos.org/nix"
DOWNLOAD="http://nixos.org/releases/nix/nix-2.0.2/nix-2.0.2.tar.xz"
MD5SUM="1cd8ce214c1fd2792e445692c756f63e"
DOWNLOAD="http://nixos.org/releases/nix/nix-2.3.9/nix-2.3.9.tar.xz"
MD5SUM="1b8b35a2c7870b320598bb7179e8fb13"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libsodium libseccomp"