From 4fb3522f0e261a0d19983d7e195f5983cf96978a Mon Sep 17 00:00:00 2001 From: Urs Schulz Date: Wed, 16 Feb 2022 16:58:21 +0100 Subject: [PATCH 1/3] lowdown: update to 0.11.2. --- common/shlibs | 1 + srcpkgs/lowdown/template | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/common/shlibs b/common/shlibs index 784375c7c9aa..7befa59fd6f8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4169,3 +4169,4 @@ libMatrix.so root-6.24.06_1 libThread.so root-6.24.06_1 libTMVA.so root-6.24.06_1 libMathCore.so root-6.24.06_1 +liblowdown.so lowdown-0.11.2_1 diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template index c76c46601e44..930de8c5d2ea 100644 --- a/srcpkgs/lowdown/template +++ b/srcpkgs/lowdown/template @@ -1,9 +1,10 @@ # Template file for 'lowdown' pkgname=lowdown -version=0.9.2 +version=0.11.2 revision=1 build_style=configure configure_args="PREFIX=/usr MANDIR=/usr/share/man" +make_install_target="install install_shared install_static" make_check_target="regress" hostmakedepends="which" short_desc="Simple markdown translator" @@ -12,7 +13,11 @@ license="ISC" homepage="https://kristaps.bsd.lv/lowdown/" changelog="https://kristaps.bsd.lv/lowdown/archive.html" distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz" -checksum=5c355d1db2071916b1ad6e789208de664be3781bd17dd8b6b09b1707a283a988 +checksum=6e5cfec293afc24968c0ddd8deb4f57389adba6a8b7bcb221d34c1a44aeef3eb +shlib_provides="liblowdown.so" + +CFLAGS+=" -fPIE -fPIC" +LDFLAGS+=" -pie" post_install() { vlicense LICENSE.md From 8a6743922347a61582f8296e33cda767aeb596ef Mon Sep 17 00:00:00 2001 From: Urs Schulz Date: Sun, 8 May 2022 22:42:27 +0200 Subject: [PATCH 2/3] json-c++: update to 3.10.5. --- srcpkgs/json-c++/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/json-c++/template b/srcpkgs/json-c++/template index 97f0457e88ee..018ef8e1ff74 100644 --- a/srcpkgs/json-c++/template +++ b/srcpkgs/json-c++/template @@ -1,7 +1,7 @@ # Template file for 'json-c++' pkgname=json-c++ -version=3.9.1 -revision=2 +version=3.10.5 +revision=1 wrksrc="json-${version}" build_style=cmake configure_args="-DJSON_MultipleHeaders=ON" @@ -11,12 +11,12 @@ maintainer="Érico Nogueira " license="MIT" homepage="https://github.com/nlohmann/json" distfiles="https://github.com/nlohmann/json/archive/v${version}.tar.gz" -checksum=4cf0df69731494668bdd6460ed8cb269b68de9c19ad8c27abc24cd72605b2d5b +checksum=5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4 +# tests only work in git repository +make_check=no -if [ -z "$XBPS_CHECK_PKGS" ]; then - configure_args+=" -DBUILD_TESTING=OFF" -fi post_install() { + vdoc README.md vlicense LICENSE.MIT } From 191b47ee66387cb2e43ea318ee0f703e400668cb Mon Sep 17 00:00:00 2001 From: Urs Schulz Date: Sun, 8 May 2022 14:26:54 +0200 Subject: [PATCH 3/3] nix: update to 2.8.0. --- srcpkgs/nix/template | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index 6e481b3760af..230e05a488d6 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,14 @@ 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 + #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 } post_install() {