aboutsummaryrefslogtreecommitdiffstats
path: root/testing/nix
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2019-04-01 16:50:29 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2019-04-02 10:31:57 +0000
commitaf111af1010abe9c5bf089e0a3952259554d2c3f (patch)
tree0514c8026d4aa9d500589cd2ea1bdbae13296da9 /testing/nix
parent2e5aa1b5d8ebb524594a33cc820d6fa94ef4c76a (diff)
downloadaports-af111af1010abe9c5bf089e0a3952259554d2c3f.tar.bz2
aports-af111af1010abe9c5bf089e0a3952259554d2c3f.tar.xz
testing/nix: rebuild against boost 1.69
Diffstat (limited to 'testing/nix')
-rw-r--r--testing/nix/APKBUILD4
-rw-r--r--testing/nix/libboost_context-mt.patch14
2 files changed, 1 insertions, 17 deletions
diff --git a/testing/nix/APKBUILD b/testing/nix/APKBUILD
index 33e3091224..7aa76700ee 100644
--- a/testing/nix/APKBUILD
+++ b/testing/nix/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=nix
pkgver=2.1.3
-pkgrel=1
+pkgrel=2
pkgdesc="The purely functional package manager"
url="https://nixos.org/nix/"
arch="x86 x86_64 aarch64" # supported platforms
@@ -27,7 +27,6 @@ pkggroups="nix nixbld"
install="$pkgname.pre-install"
subpackages="$pkgname-dev $pkgname-openrc $pkgname-doc"
source="https://nixos.org/releases/nix/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz
- libboost_context-mt.patch
nix-daemon.initd
nix-profile.sh
"
@@ -96,6 +95,5 @@ package() {
}
sha512sums="d22718d23d8960dac7d07739835caa8183f573b303d77613e77314d873c1fe6da1cb0ed78337fe3219a94675307b23132a62ae7d9aa5354707e58400f403524b nix-2.1.3.tar.xz
-2d6d8441861abca66b28083c356618e2dc60acb9a5be675f32be90204743e780f60427b8375aa5ba234f6f604f6b2569922cb400a1a989a37d950580d2151a6f libboost_context-mt.patch
9e4568db987fbae5097f7bb086e8ad51742c2d229703104fb7e6f240ffb0ca72e57dc305fb238bcee4ec8002d780007af60f241b1f32b6aa413dd579d9c59e75 nix-daemon.initd
0fb5b9ff2f593dca22251b342494ea0b61380d8f905d85855282d259c112aa2a918d9785aa08f847c693a939ebae9fbefcd4e417ad93283a142e066105cc87b5 nix-profile.sh"
diff --git a/testing/nix/libboost_context-mt.patch b/testing/nix/libboost_context-mt.patch
deleted file mode 100644
index 02326b2e1e..0000000000
--- a/testing/nix/libboost_context-mt.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-We don't have libboost_context.so, just libboost_context-mt.so (-mt stands
-for multithreading).
-
---- a/src/libutil/local.mk
-+++ b/src/libutil/local.mk
-@@ -6,7 +6,7 @@
-
- libutil_SOURCES := $(wildcard $(d)/*.cc)
-
--libutil_LDFLAGS = $(LIBLZMA_LIBS) -lbz2 -pthread $(OPENSSL_LIBS) $(LIBBROTLI_LIBS) -lboost_context
-+libutil_LDFLAGS = $(LIBLZMA_LIBS) -lbz2 -pthread $(OPENSSL_LIBS) $(LIBBROTLI_LIBS) -lboost_context-mt
-
- libutil_LIBS = libformat
-