* Re: [PR PATCH] [Updated] nix: update to 2.8.0.
2022-05-08 12:32 [PR PATCH] Nix faulesocke
@ 2022-05-08 12:35 ` faulesocke
2022-05-08 12:52 ` faulesocke
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: faulesocke @ 2022-05-08 12:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1102 bytes --]
There is an updated pull request by faulesocke against master on the void-packages repository
https://github.com/faulesocke/void-packages nix
https://github.com/void-linux/void-packages/pull/37040
nix: update to 2.8.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/37040.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nix-37040.patch --]
[-- Type: text/x-diff, Size: 7072 bytes --]
From f5953ed1b354c02c7b880a36251d6f633ae8cf34 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Wed, 16 Feb 2022 16:58:21 +0100
Subject: [PATCH 1/3] lowdown: add shared library
---
common/shlibs | 1 +
srcpkgs/lowdown/patches/shared.patch | 43 ++++++++++++++++++++++++++++
srcpkgs/lowdown/template | 6 +++-
3 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/lowdown/patches/shared.patch
diff --git a/common/shlibs b/common/shlibs
index 784375c7c9aa..677f7cc0a53b 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.9.2_2
diff --git a/srcpkgs/lowdown/patches/shared.patch b/srcpkgs/lowdown/patches/shared.patch
new file mode 100644
index 000000000000..acbe304aed93
--- /dev/null
+++ b/srcpkgs/lowdown/patches/shared.patch
@@ -0,0 +1,43 @@
+diff --git a/Makefile b/Makefile
+Stolen from nixpkgs
+https://github.com/obsidiansystems/nixpkgs/blob/0ceadf99f221cf461efa9edb34424ff6ad375119/pkgs/tools/typesetting/lowdown/shared.patch
+(modified)
+index 955f737..2c9532c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -80,7 +80,7 @@ REGRESS_ARGS += "--parse-no-autolink"
+ REGRESS_ARGS += "--parse-no-cmark"
+ REGRESS_ARGS += "--parse-no-deflists"
+
+-all: lowdown lowdown-diff lowdown.pc
++all: lowdown lowdown-diff liblowdown.so lowdown.pc
+
+ www: $(HTMLS) $(PDFS) $(THUMBS) lowdown.tar.gz lowdown.tar.gz.sha512
+
+@@ -101,6 +101,9 @@ lowdown-diff: lowdown
+ liblowdown.a: $(OBJS) $(COMPAT_OBJS)
+ $(AR) rs $@ $(OBJS) $(COMPAT_OBJS)
+
++liblowdown.so: $(OBJS) $(COMPAT_OBJS)
++ $(CC) -shared -o $@ $(OBJS) $(COMPAT_OBJS) $(LDFLAGS)
++
+ install: all
+ mkdir -p $(DESTDIR)$(BINDIR)
+ mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
+@@ -111,7 +114,8 @@ install: all
+ $(INSTALL_DATA) lowdown.pc $(DESTDIR)$(LIBDIR)/pkgconfig
+ $(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)
+ $(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR)
+ $(INSTALL_LIB) liblowdown.a $(DESTDIR)$(LIBDIR)
++ $(INSTALL_LIB) liblowdown.so $(DESTDIR)$(LIBDIR)
+ $(INSTALL_DATA) lowdown.h $(DESTDIR)$(INCLUDEDIR)
+ for f in $(MANS) ; do \
+ name=`basename $$f .html` ; \
+@@ -199,7 +202,8 @@ main.o: lowdown.h
+
+ clean:
+ rm -f $(OBJS) $(COMPAT_OBJS) main.o
+ rm -f lowdown lowdown-diff liblowdown.a lowdown.pc
++ rm -f lowdown lowdown-diff liblowdown.so lowdown.pc
+ rm -f index.xml diff.xml diff.diff.xml README.xml lowdown.tar.gz.sha512 lowdown.tar.gz
+ rm -f $(PDFS) $(HTMLS) $(THUMBS)
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index c76c46601e44..5f69caa0588c 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,7 +1,7 @@
# Template file for 'lowdown'
pkgname=lowdown
version=0.9.2
-revision=1
+revision=2
build_style=configure
configure_args="PREFIX=/usr MANDIR=/usr/share/man"
make_check_target="regress"
@@ -13,6 +13,10 @@ 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
+shlib_provides="liblowdown.so"
+
+CFLAGS+=" -fPIE -fPIC"
+LDFLAGS+=" -pie"
post_install() {
vlicense LICENSE.md
From 52c5ff3ded82129f8546778baca2c00997111fa7 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Sun, 8 May 2022 13:57:09 +0200
Subject: [PATCH 2/3] New package: nlohmann-json-3.10.5
---
srcpkgs/nlohmann-json/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/nlohmann-json/template
diff --git a/srcpkgs/nlohmann-json/template b/srcpkgs/nlohmann-json/template
new file mode 100644
index 000000000000..43b9105ebec3
--- /dev/null
+++ b/srcpkgs/nlohmann-json/template
@@ -0,0 +1,20 @@
+# Template file for 'nlohmann-json'
+pkgname=nlohmann-json
+version=3.10.5
+revision=1
+wrksrc="json-${version}"
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=None -DJSON_MultipleHeaders=ON"
+short_desc="JSON for Modern C++"
+maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
+license="MIT"
+homepage="https://github.com/nlohmann/json"
+#changelog=""
+distfiles="https://github.com/nlohmann/json/archive/refs/tags/v${version}.tar.gz"
+checksum=5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4
+
+
+post_install() {
+ vdoc "README.md"
+ vlicense "LICENSE.MIT"
+}
From 86edbe59a6e380b5ed03cb56b5d21681864be3d9 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Sun, 8 May 2022 14:26:54 +0200
Subject: [PATCH 3/3] nix: update to 2.8.0.
---
srcpkgs/nix/template | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 6e481b3760af..e370a27d0cee 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,22 +1,23 @@
# 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 nlohmann-json"
depends="curl tar xz"
short_desc="Purely functional package manager"
maintainer="Juan RP <xtraeme@gmail.com>"
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
CXXFLAGS="-Wno-deprecated-declarations"
@@ -47,13 +48,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() {
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: nix: update to 2.8.0.
2022-05-08 12:32 [PR PATCH] Nix faulesocke
2022-05-08 12:35 ` [PR PATCH] [Updated] nix: update to 2.8.0 faulesocke
@ 2022-05-08 12:52 ` faulesocke
2022-05-08 13:12 ` [PR PATCH] [Updated] " faulesocke
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: faulesocke @ 2022-05-08 12:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 253 bytes --]
New comment by faulesocke on void-packages repository
https://github.com/void-linux/void-packages/pull/37040#issuecomment-1120413492
Comment:
Tests for nlohmann-json are failing because they are trying to download test data... how can I disable them?
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] nix: update to 2.8.0.
2022-05-08 12:32 [PR PATCH] Nix faulesocke
2022-05-08 12:35 ` [PR PATCH] [Updated] nix: update to 2.8.0 faulesocke
2022-05-08 12:52 ` faulesocke
@ 2022-05-08 13:12 ` faulesocke
2022-05-08 17:47 ` faulesocke
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: faulesocke @ 2022-05-08 13:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1102 bytes --]
There is an updated pull request by faulesocke against master on the void-packages repository
https://github.com/faulesocke/void-packages nix
https://github.com/void-linux/void-packages/pull/37040
nix: update to 2.8.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/37040.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nix-37040.patch --]
[-- Type: text/x-diff, Size: 7124 bytes --]
From f5953ed1b354c02c7b880a36251d6f633ae8cf34 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Wed, 16 Feb 2022 16:58:21 +0100
Subject: [PATCH 1/3] lowdown: add shared library
---
common/shlibs | 1 +
srcpkgs/lowdown/patches/shared.patch | 43 ++++++++++++++++++++++++++++
srcpkgs/lowdown/template | 6 +++-
3 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/lowdown/patches/shared.patch
diff --git a/common/shlibs b/common/shlibs
index 784375c7c9aa..677f7cc0a53b 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.9.2_2
diff --git a/srcpkgs/lowdown/patches/shared.patch b/srcpkgs/lowdown/patches/shared.patch
new file mode 100644
index 000000000000..acbe304aed93
--- /dev/null
+++ b/srcpkgs/lowdown/patches/shared.patch
@@ -0,0 +1,43 @@
+diff --git a/Makefile b/Makefile
+Stolen from nixpkgs
+https://github.com/obsidiansystems/nixpkgs/blob/0ceadf99f221cf461efa9edb34424ff6ad375119/pkgs/tools/typesetting/lowdown/shared.patch
+(modified)
+index 955f737..2c9532c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -80,7 +80,7 @@ REGRESS_ARGS += "--parse-no-autolink"
+ REGRESS_ARGS += "--parse-no-cmark"
+ REGRESS_ARGS += "--parse-no-deflists"
+
+-all: lowdown lowdown-diff lowdown.pc
++all: lowdown lowdown-diff liblowdown.so lowdown.pc
+
+ www: $(HTMLS) $(PDFS) $(THUMBS) lowdown.tar.gz lowdown.tar.gz.sha512
+
+@@ -101,6 +101,9 @@ lowdown-diff: lowdown
+ liblowdown.a: $(OBJS) $(COMPAT_OBJS)
+ $(AR) rs $@ $(OBJS) $(COMPAT_OBJS)
+
++liblowdown.so: $(OBJS) $(COMPAT_OBJS)
++ $(CC) -shared -o $@ $(OBJS) $(COMPAT_OBJS) $(LDFLAGS)
++
+ install: all
+ mkdir -p $(DESTDIR)$(BINDIR)
+ mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
+@@ -111,7 +114,8 @@ install: all
+ $(INSTALL_DATA) lowdown.pc $(DESTDIR)$(LIBDIR)/pkgconfig
+ $(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)
+ $(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR)
+ $(INSTALL_LIB) liblowdown.a $(DESTDIR)$(LIBDIR)
++ $(INSTALL_LIB) liblowdown.so $(DESTDIR)$(LIBDIR)
+ $(INSTALL_DATA) lowdown.h $(DESTDIR)$(INCLUDEDIR)
+ for f in $(MANS) ; do \
+ name=`basename $$f .html` ; \
+@@ -199,7 +202,8 @@ main.o: lowdown.h
+
+ clean:
+ rm -f $(OBJS) $(COMPAT_OBJS) main.o
+ rm -f lowdown lowdown-diff liblowdown.a lowdown.pc
++ rm -f lowdown lowdown-diff liblowdown.so lowdown.pc
+ rm -f index.xml diff.xml diff.diff.xml README.xml lowdown.tar.gz.sha512 lowdown.tar.gz
+ rm -f $(PDFS) $(HTMLS) $(THUMBS)
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index c76c46601e44..5f69caa0588c 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,7 +1,7 @@
# Template file for 'lowdown'
pkgname=lowdown
version=0.9.2
-revision=1
+revision=2
build_style=configure
configure_args="PREFIX=/usr MANDIR=/usr/share/man"
make_check_target="regress"
@@ -13,6 +13,10 @@ 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
+shlib_provides="liblowdown.so"
+
+CFLAGS+=" -fPIE -fPIC"
+LDFLAGS+=" -pie"
post_install() {
vlicense LICENSE.md
From 3bf81cfbd8e1eeb3157f4a7fa0ea82cc71592f7d Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Sun, 8 May 2022 13:57:09 +0200
Subject: [PATCH 2/3] New package: nlohmann-json-3.10.5
---
srcpkgs/nlohmann-json/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/nlohmann-json/template
diff --git a/srcpkgs/nlohmann-json/template b/srcpkgs/nlohmann-json/template
new file mode 100644
index 000000000000..a2eee0eddd8b
--- /dev/null
+++ b/srcpkgs/nlohmann-json/template
@@ -0,0 +1,22 @@
+# Template file for 'nlohmann-json'
+pkgname=nlohmann-json
+version=3.10.5
+revision=1
+wrksrc="json-${version}"
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=None -DJSON_MultipleHeaders=ON"
+short_desc="JSON for Modern C++"
+maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
+license="MIT"
+homepage="https://github.com/nlohmann/json"
+#changelog=""
+distfiles="https://github.com/nlohmann/json/archive/refs/tags/v${version}.tar.gz"
+checksum=5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4
+# tests try to download test data
+make_check=no
+
+
+post_install() {
+ vdoc "README.md"
+ vlicense "LICENSE.MIT"
+}
From 49d09cac6f4e99a5dd2f0c1d32fbdca34ca3a36d Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Sun, 8 May 2022 14:26:54 +0200
Subject: [PATCH 3/3] nix: update to 2.8.0.
---
srcpkgs/nix/template | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 6e481b3760af..e370a27d0cee 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,22 +1,23 @@
# 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 nlohmann-json"
depends="curl tar xz"
short_desc="Purely functional package manager"
maintainer="Juan RP <xtraeme@gmail.com>"
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
CXXFLAGS="-Wno-deprecated-declarations"
@@ -47,13 +48,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() {
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] nix: update to 2.8.0.
2022-05-08 12:32 [PR PATCH] Nix faulesocke
` (2 preceding siblings ...)
2022-05-08 13:12 ` [PR PATCH] [Updated] " faulesocke
@ 2022-05-08 17:47 ` faulesocke
2022-05-08 19:50 ` faulesocke
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: faulesocke @ 2022-05-08 17:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1102 bytes --]
There is an updated pull request by faulesocke against master on the void-packages repository
https://github.com/faulesocke/void-packages nix
https://github.com/void-linux/void-packages/pull/37040
nix: update to 2.8.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/37040.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nix-37040.patch --]
[-- Type: text/x-diff, Size: 5358 bytes --]
From 4fb3522f0e261a0d19983d7e195f5983cf96978a Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
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 88672d57fba946684b396eb5bfba301ebe3e6036 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Sun, 8 May 2022 13:57:09 +0200
Subject: [PATCH 2/3] New package: nlohmann-json-3.10.5
---
srcpkgs/nlohmann-json/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/nlohmann-json/template
diff --git a/srcpkgs/nlohmann-json/template b/srcpkgs/nlohmann-json/template
new file mode 100644
index 000000000000..23a7dfc897a8
--- /dev/null
+++ b/srcpkgs/nlohmann-json/template
@@ -0,0 +1,22 @@
+# Template file for 'nlohmann-json'
+pkgname=nlohmann-json
+version=3.10.5
+revision=1
+wrksrc="json-${version}"
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=None -DJSON_MultipleHeaders=ON"
+short_desc="JSON for Modern C++"
+maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
+license="MIT"
+homepage="https://github.com/nlohmann/json"
+#changelog=""
+distfiles="https://github.com/nlohmann/json/archive/refs/tags/v${version}.tar.gz"
+checksum=5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4
+# tests only work in git repository
+make_check=no
+
+
+post_install() {
+ vdoc "README.md"
+ vlicense "LICENSE.MIT"
+}
From 79d9217c60d1f0be1d1c576ae73d8e4e92af0d75 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Sun, 8 May 2022 14:26:54 +0200
Subject: [PATCH 3/3] nix: update to 2.8.0.
---
srcpkgs/nix/template | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 6e481b3760af..e370a27d0cee 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,22 +1,23 @@
# 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 nlohmann-json"
depends="curl tar xz"
short_desc="Purely functional package manager"
maintainer="Juan RP <xtraeme@gmail.com>"
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
CXXFLAGS="-Wno-deprecated-declarations"
@@ -47,13 +48,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() {
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] nix: update to 2.8.0.
2022-05-08 12:32 [PR PATCH] Nix faulesocke
` (3 preceding siblings ...)
2022-05-08 17:47 ` faulesocke
@ 2022-05-08 19:50 ` faulesocke
2022-05-08 20:44 ` faulesocke
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: faulesocke @ 2022-05-08 19:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1102 bytes --]
There is an updated pull request by faulesocke against master on the void-packages repository
https://github.com/faulesocke/void-packages nix
https://github.com/void-linux/void-packages/pull/37040
nix: update to 2.8.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/37040.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nix-37040.patch --]
[-- Type: text/x-diff, Size: 5387 bytes --]
From 4fb3522f0e261a0d19983d7e195f5983cf96978a Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
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 88672d57fba946684b396eb5bfba301ebe3e6036 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Sun, 8 May 2022 13:57:09 +0200
Subject: [PATCH 2/3] New package: nlohmann-json-3.10.5
---
srcpkgs/nlohmann-json/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/nlohmann-json/template
diff --git a/srcpkgs/nlohmann-json/template b/srcpkgs/nlohmann-json/template
new file mode 100644
index 000000000000..23a7dfc897a8
--- /dev/null
+++ b/srcpkgs/nlohmann-json/template
@@ -0,0 +1,22 @@
+# Template file for 'nlohmann-json'
+pkgname=nlohmann-json
+version=3.10.5
+revision=1
+wrksrc="json-${version}"
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=None -DJSON_MultipleHeaders=ON"
+short_desc="JSON for Modern C++"
+maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
+license="MIT"
+homepage="https://github.com/nlohmann/json"
+#changelog=""
+distfiles="https://github.com/nlohmann/json/archive/refs/tags/v${version}.tar.gz"
+checksum=5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4
+# tests only work in git repository
+make_check=no
+
+
+post_install() {
+ vdoc "README.md"
+ vlicense "LICENSE.MIT"
+}
From a5b49150977eee7dde6f16343a25480094d2a1e0 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Sun, 8 May 2022 14:26:54 +0200
Subject: [PATCH 3/3] nix: update to 2.8.0.
---
srcpkgs/nix/template | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 6e481b3760af..ab088daaf47a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,22 +1,24 @@
# 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 nlohmann-json"
depends="curl tar xz"
short_desc="Purely functional package manager"
maintainer="Juan RP <xtraeme@gmail.com>"
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
CXXFLAGS="-Wno-deprecated-declarations"
@@ -47,13 +49,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() {
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] nix: update to 2.8.0.
2022-05-08 12:32 [PR PATCH] Nix faulesocke
` (4 preceding siblings ...)
2022-05-08 19:50 ` faulesocke
@ 2022-05-08 20:44 ` faulesocke
2022-05-08 20:54 ` faulesocke
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: faulesocke @ 2022-05-08 20:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1102 bytes --]
There is an updated pull request by faulesocke against master on the void-packages repository
https://github.com/faulesocke/void-packages nix
https://github.com/void-linux/void-packages/pull/37040
nix: update to 2.8.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/37040.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nix-37040.patch --]
[-- Type: text/x-diff, Size: 5308 bytes --]
From 4fb3522f0e261a0d19983d7e195f5983cf96978a Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
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 bd398f900e0dc8444e01d2f63ee94eae4e37541d Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Sun, 8 May 2022 22:42:27 +0200
Subject: [PATCH 2/3] json-c++: update to 3.10.5.
---
srcpkgs/json-c++/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/json-c++/template b/srcpkgs/json-c++/template
index 97f0457e88ee..a6fc8719ac88 100644
--- a/srcpkgs/json-c++/template
+++ b/srcpkgs/json-c++/template
@@ -1,6 +1,6 @@
# Template file for 'json-c++'
pkgname=json-c++
-version=3.9.1
+version=3.10.5
revision=2
wrksrc="json-${version}"
build_style=cmake
@@ -11,12 +11,14 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
license="MIT"
homepage="https://github.com/nlohmann/json"
distfiles="https://github.com/nlohmann/json/archive/v${version}.tar.gz"
-checksum=4cf0df69731494668bdd6460ed8cb269b68de9c19ad8c27abc24cd72605b2d5b
+checksum=5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4
+
if [ -z "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTING=OFF"
fi
post_install() {
+ vdoc README.md
vlicense LICENSE.MIT
}
From b16851bf97c8d0e6ccfbc233ee8a424b01c5ad0e Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Sun, 8 May 2022 14:26:54 +0200
Subject: [PATCH 3/3] nix: update to 2.8.0.
---
srcpkgs/nix/template | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 6e481b3760af..64445bbd2ad3 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,22 +1,24 @@
# 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 <xtraeme@gmail.com>"
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
CXXFLAGS="-Wno-deprecated-declarations"
@@ -47,13 +49,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() {
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] nix: update to 2.8.0.
2022-05-08 12:32 [PR PATCH] Nix faulesocke
` (5 preceding siblings ...)
2022-05-08 20:44 ` faulesocke
@ 2022-05-08 20:54 ` faulesocke
2022-05-08 22:13 ` faulesocke
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: faulesocke @ 2022-05-08 20:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1102 bytes --]
There is an updated pull request by faulesocke against master on the void-packages repository
https://github.com/faulesocke/void-packages nix
https://github.com/void-linux/void-packages/pull/37040
nix: update to 2.8.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/37040.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nix-37040.patch --]
[-- Type: text/x-diff, Size: 5366 bytes --]
From 4fb3522f0e261a0d19983d7e195f5983cf96978a Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
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 e13ff3804c55843f0041fcc44153c8aef405a97f Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Sun, 8 May 2022 22:42:27 +0200
Subject: [PATCH 2/3] json-c++: update to 3.10.5.
---
srcpkgs/json-c++/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/json-c++/template b/srcpkgs/json-c++/template
index 97f0457e88ee..6beff486900e 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,14 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
license="MIT"
homepage="https://github.com/nlohmann/json"
distfiles="https://github.com/nlohmann/json/archive/v${version}.tar.gz"
-checksum=4cf0df69731494668bdd6460ed8cb269b68de9c19ad8c27abc24cd72605b2d5b
+checksum=5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4
+
if [ -z "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTING=OFF"
fi
post_install() {
+ vdoc README.md
vlicense LICENSE.MIT
}
From ad59f7340a9dec3232d54425cf5437834816aa70 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Sun, 8 May 2022 14:26:54 +0200
Subject: [PATCH 3/3] nix: update to 2.8.0.
---
srcpkgs/nix/template | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 6e481b3760af..64445bbd2ad3 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,22 +1,24 @@
# 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 <xtraeme@gmail.com>"
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
CXXFLAGS="-Wno-deprecated-declarations"
@@ -47,13 +49,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() {
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] nix: update to 2.8.0.
2022-05-08 12:32 [PR PATCH] Nix faulesocke
` (6 preceding siblings ...)
2022-05-08 20:54 ` faulesocke
@ 2022-05-08 22:13 ` faulesocke
2022-05-08 23:10 ` faulesocke
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: faulesocke @ 2022-05-08 22:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1102 bytes --]
There is an updated pull request by faulesocke against master on the void-packages repository
https://github.com/faulesocke/void-packages nix
https://github.com/void-linux/void-packages/pull/37040
nix: update to 2.8.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/37040.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nix-37040.patch --]
[-- Type: text/x-diff, Size: 5421 bytes --]
From 4fb3522f0e261a0d19983d7e195f5983cf96978a Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
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 <voidpkgs@ursschulz.de>
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 <ericonr@disroot.org>"
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 7e21a033ed46dff381882ac8b4b1d82028bdda6c Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Sun, 8 May 2022 14:26:54 +0200
Subject: [PATCH 3/3] nix: update to 2.8.0.
---
srcpkgs/nix/template | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 6e481b3760af..64445bbd2ad3 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,22 +1,24 @@
# 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 <xtraeme@gmail.com>"
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
CXXFLAGS="-Wno-deprecated-declarations"
@@ -47,13 +49,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() {
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] nix: update to 2.8.0.
2022-05-08 12:32 [PR PATCH] Nix faulesocke
` (7 preceding siblings ...)
2022-05-08 22:13 ` faulesocke
@ 2022-05-08 23:10 ` faulesocke
2022-05-09 15:28 ` faulesocke
2022-05-17 7:52 ` [PR PATCH] [Merged]: " the-maldridge
10 siblings, 0 replies; 12+ messages in thread
From: faulesocke @ 2022-05-08 23:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1102 bytes --]
There is an updated pull request by faulesocke against master on the void-packages repository
https://github.com/faulesocke/void-packages nix
https://github.com/void-linux/void-packages/pull/37040
nix: update to 2.8.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/37040.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nix-37040.patch --]
[-- Type: text/x-diff, Size: 5511 bytes --]
From 4fb3522f0e261a0d19983d7e195f5983cf96978a Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
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 <voidpkgs@ursschulz.de>
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 <ericonr@disroot.org>"
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 <voidpkgs@ursschulz.de>
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 <xtraeme@gmail.com>"
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() {
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] nix: update to 2.8.0.
2022-05-08 12:32 [PR PATCH] Nix faulesocke
` (8 preceding siblings ...)
2022-05-08 23:10 ` faulesocke
@ 2022-05-09 15:28 ` faulesocke
2022-05-17 7:52 ` [PR PATCH] [Merged]: " the-maldridge
10 siblings, 0 replies; 12+ messages in thread
From: faulesocke @ 2022-05-09 15:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1102 bytes --]
There is an updated pull request by faulesocke against master on the void-packages repository
https://github.com/faulesocke/void-packages nix
https://github.com/void-linux/void-packages/pull/37040
nix: update to 2.8.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/37040.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nix-37040.patch --]
[-- Type: text/x-diff, Size: 5119 bytes --]
From 6940a6ac3b31b8c2f9ea58cd0be629abba205d7a Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
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 | 6 ++++--
2 files changed, 5 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..3ead485924ff 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,8 @@ 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"
post_install() {
vlicense LICENSE.md
From 5fd25a2e941a5b15ef55ffeb0ad8f536dd069390 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
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 <ericonr@disroot.org>"
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 a9e8ae8fae374398dc46c6bbb65caaaea7dac9a8 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Sun, 8 May 2022 14:26:54 +0200
Subject: [PATCH 3/3] nix: update to 2.8.0.
---
srcpkgs/nix/template | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 6e481b3760af..9afcb75a7a6e 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 <xtraeme@gmail.com>"
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,7 @@ 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
}
post_install() {
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Merged]: nix: update to 2.8.0.
2022-05-08 12:32 [PR PATCH] Nix faulesocke
` (9 preceding siblings ...)
2022-05-09 15:28 ` faulesocke
@ 2022-05-17 7:52 ` the-maldridge
10 siblings, 0 replies; 12+ messages in thread
From: the-maldridge @ 2022-05-17 7:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 944 bytes --]
There's a merged pull request on the void-packages repository
nix: update to 2.8.0.
https://github.com/void-linux/void-packages/pull/37040
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
^ permalink raw reply [flat|nested] 12+ messages in thread