GNU bug report logs - #63893
[PATCH v3 2/2] gnu: nix: Update to 2.16.1

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 63893 in the body.
You can then email your comments to 63893 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Zhu Zihao <all_but_last <at> 163.com>
To: guix-patches <at> gnu.org
Subject: [PATCH]: gnu: nix: Update to 2.16.0.
Date: Mon, 05 Jun 2023 00:29:51 +0800

[Message part 1 (text/plain, inline)]

This is a series of patch update nix to 2.16.0.
-- 
Retrieve my PGP public key:

  gpg --recv-keys B3EBC086AB0EBC0F45E0B4D433DB374BCEE4D9DC

Zihao

[signature.asc (application/pgp-signature, inline)]

Message #8 received at 63893 <at> debbugs.gnu.org (full text, mbox):

From: Zhu Zihao <all_but_last <at> 163.com>
To: 63893 <at> debbugs.gnu.org
Cc: Zhu Zihao <all_but_last <at> 163.com>
Subject: [PATCH 3/3] gnu: nix: Use HTTPS for package source.
Date: Mon,  5 Jun 2023 00:34:34 +0800

* gnu/packages/package-management.scm (nix)[source]: Use HTTPS.
---
 gnu/packages/package-management.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 238914a955..9c51c3275d 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -736,7 +736,7 @@ (define-public nix
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "http://github.com/NixOS/nix")
+             (url "https://github.com/NixOS/nix")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-- 
2.40.1

Message #11 received at 63893 <at> debbugs.gnu.org (full text, mbox):

From: Zhu Zihao <all_but_last <at> 163.com>
To: 63893 <at> debbugs.gnu.org
Subject: Re: bug#63893: Acknowledgement ([PATCH]: gnu: nix: Update to 2.16.0.)
Date: Mon, 05 Jun 2023 00:37:59 +0800

[Message part 1 (text/plain, inline)]

This patch should close https://issues.guix.gnu.org/63546
-- 
Retrieve my PGP public key:

  gpg --recv-keys B3EBC086AB0EBC0F45E0B4D433DB374BCEE4D9DC

Zihao

[signature.asc (application/pgp-signature, inline)]

Message #14 received at 63893 <at> debbugs.gnu.org (full text, mbox):

From: Zhu Zihao <all_but_last <at> 163.com>
To: 63893 <at> debbugs.gnu.org
Cc: Zhu Zihao <all_but_last <at> 163.com>
Subject: [PATCH 1/3] gnu: Add rapidcheck.
Date: Mon,  5 Jun 2023 00:41:53 +0800

* gnu/packages/check.scm (rapidcheck): New variable.
---
 gnu/packages/check.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 87728fefa3..470d8c52fa 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -43,6 +43,7 @@
 ;;; Copyright © 2022 jgart <jgart <at> dismail.de>
 ;;; Copyright © 2023 Luis Felipe López Acevedo <luis.felipe.la <at> protonmail.com>
 ;;; Copyright © 2023 Timo Wilken <guix <at> twilken.net>
+;;; Copyright © 2023 Zhu Zihao <all_but_last <at> 163.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3198,6 +3199,46 @@ (define-public libfaketime
 provides a simple way to achieve this.")
     (license license:gpl2)))
 
+(define-public rapidcheck
+  (let ((commit "a5724ea5b0b00147109b0605c377f1e54c353ba2")
+        (revision "0"))
+    (package
+      (name "rapidcheck")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri
+          (git-reference
+           (url "https://github.com/emil-e/rapidcheck")
+           (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0f2dmsym8ibnwkaidxmgp73mg0sdniwsyn6ppskh74246h29bbcy"))))
+      (arguments
+       (list
+        #:tests? #f                     ;require fetching submodules
+        #:configure-flags #~(list "-DCMAKE_POSITION_INDEPENDENT_CODE=ON")
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'install 'install-extra-headers
+              (lambda _
+                (with-directory-excursion "../source/extras"
+                  (for-each
+                   (lambda (dir)
+                     (let ((dir (string-append dir "/include/rapidcheck/"))
+                           (dest (string-append #$output
+                                                "/include/rapidcheck")))
+                       (copy-recursively dir dest)))
+                   '("boost" "boost_test" "catch" "gmock" "gtest"))))))))
+      (build-system cmake-build-system)
+      (home-page "https://github.com/emil-e/rapidcheck")
+      (synopsis "Property based testing framework for C++")
+      (description "Rapidcheck is a property based testing framework for C++.
+It works by generating random data to try and find a case breaks your given
+pre-condition.")
+      (license license:bsd-2))))
+
 (define-public umockdev
   (package
     (name "umockdev")

base-commit: ae04b3996be99c89142866afdbba5151099b2064
-- 
2.40.1

Message #17 received at 63893 <at> debbugs.gnu.org (full text, mbox):

From: Zhu Zihao <all_but_last <at> 163.com>
To: 63893 <at> debbugs.gnu.org
Cc: Zhu Zihao <all_but_last <at> 163.com>
Subject: [PATCH 2/3] gnu: nix: Update to 2.16.0.
Date: Mon,  5 Jun 2023 00:43:46 +0800

* gnu/packages/package-management.scm (nix): Update to 2.16.0.
[inputs]: Add nlohmann-json.
[native-inputs]: Add rapidcheck.
[arguments]<#:phases>: In phase "check", change the value of environment
variable  "NIX_STORE" to "/nix/store" temporarily.

* gnu/packages/patches/nix-dont-build-html-doc.diff: Update.
---
 gnu/packages/package-management.scm           | 25 +++++++++++---
 .../patches/nix-dont-build-html-doc.diff      | 33 ++++++++++++++-----
 2 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index a856ff2726..238914a955 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -20,7 +20,7 @@
 ;;; Copyright © 2021 Ivan Gankevich <i.gankevich <at> spbu.ru>
 ;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
 ;;; Copyright © 2021 John Kehayias <john.kehayias <at> protonmail.com>
-;;; Copyright © 2022 Zhu Zihao <all_but_last <at> 163.com>
+;;; Copyright © 2022, 2023 Zhu Zihao <all_but_last <at> 163.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -56,6 +56,7 @@ (define-module (gnu packages package-management)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages cpio)
+  #:use-module (gnu packages cpp)
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
@@ -730,7 +731,7 @@ (define-public guix-modules
 (define-public nix
   (package
     (name "nix")
-    (version "2.5.1")
+    (version "2.16.0")
     (source
      (origin
        (method git-fetch)
@@ -739,7 +740,7 @@ (define-public nix
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1m8rmv8i6lg83pmalvjlq1fn8mcghn3ngjv3kw1kqsa45ymj5sqq"))
+        (base32 "0jizpci4zspqpqqy3n780m4wh8dzhfywaiz953xv70c7in810dra"))
        (patches
         (search-patches "nix-dont-build-html-doc.diff"))))
     (build-system gnu-build-system)
@@ -756,7 +757,19 @@ (define-public nix
                 (apply invoke "make" "install"
                        (string-append "sysconfdir=" etc)
                        (string-append "profiledir=" etc "/profile.d")
-                       make-flags)))))))
+                       make-flags))))
+          (replace 'check
+            (lambda args
+              ;; Some test expect environment variable NIX_STORE to be
+              ;; "/nix/store"
+              (let ((original-NIX_STORE (getenv "NIX_STORE")))
+                (dynamic-wind
+                  (lambda ()
+                    (setenv "NIX_STORE" "/nix/store"))
+                  (lambda ()
+                    (apply (assoc-ref %standard-phases 'check) args))
+                  (lambda ()
+                    (setenv "NIX_STORE" original-NIX_STORE)))))))))
     (native-inputs
      (list autoconf
            autoconf-archive
@@ -766,7 +779,8 @@ (define-public nix
            googletest
            jq
            libtool
-           pkg-config))
+           pkg-config
+           rapidcheck))
     (inputs
      (append (list boost
                    brotli
@@ -778,6 +792,7 @@ (define-public nix
                    libseccomp
                    libsodium
                    lowdown
+                   nlohmann-json
                    openssl
                    sqlite
                    xz
diff --git a/gnu/packages/patches/nix-dont-build-html-doc.diff b/gnu/packages/patches/nix-dont-build-html-doc.diff
index 79142bc215..2eb45117b0 100644
--- a/gnu/packages/patches/nix-dont-build-html-doc.diff
+++ b/gnu/packages/patches/nix-dont-build-html-doc.diff
@@ -3,24 +3,41 @@ We can't simply disable it because we need manpages.
 
 Author: Zhu Zihao <all_but_last <at> 163.com>
 
-diff --git a/doc/manual/local.mk b/doc/manual/local.mk
-index e43d9f2fb..c323d1847 100644
 --- a/doc/manual/local.mk
 +++ b/doc/manual/local.mk
-@@ -69,8 +69,6 @@ $(d)/builtins.json: $(bindir)/nix
+@@ -138,11 +138,6 @@
  	$(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(bindir)/nix __dump-builtins > $@.tmp
  	@mv $@.tmp $@
  
 -# Generate the HTML manual.
+-.PHONY: manual-html
+-manual-html: $(docdir)/manual/index.html
 -install: $(docdir)/manual/index.html
- 
+-
  # Generate 'nix' manpages.
  install: $(mandir)/man1/nix3-manpages
-@@ -94,7 +92,5 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli
+ man: doc/manual/generated/man1/nix3-manpages
+@@ -167,23 +162,4 @@
  	done
  	@touch $@
  
--$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/custom.css $(d)/src/SUMMARY.md $(d)/src/command-ref/new-cli $(d)/src/command-ref/conf-file.md $(d)/src/expressions/builtins.md $(call rwildcard, $(d)/src, *.md)
--	$(trace-gen) RUST_LOG=warn mdbook build doc/manual -d $(DESTDIR)$(docdir)/manual
- 
+-$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/anchors.jq $(d)/custom.css $(d)/src/SUMMARY.md $(d)/src/command-ref/new-cli $(d)/src/contributing/experimental-feature-descriptions.md $(d)/src/command-ref/conf-file.md $(d)/src/language/builtins.md
+-	$(trace-gen) \
+-		tmp="$$(mktemp -d)"; \
+-		cp -r doc/manual "$$tmp"; \
+-		find "$$tmp" -name '*.md' | while read -r file; do \
+-			$(call process-includes,$$file,$$file); \
+-		done; \
+-		find "$$tmp" -name '*.md' | while read -r file; do \
+-			docroot="$$(realpath --relative-to="$$(dirname "$$file")" $$tmp/manual/src)"; \
+-			sed -i "s,@docroot@,$$docroot,g" "$$file"; \
+-		done; \
+-		set -euo pipefail; \
+-		RUST_LOG=warn mdbook build "$$tmp/manual" -d $(DESTDIR)$(docdir)/manual.tmp 2>&1 \
+-			| { grep -Fv "because fragment resolution isn't implemented" || :; }; \
+-		rm -rf "$$tmp/manual"
+-	@rm -rf $(DESTDIR)$(docdir)/manual
+-	@mv $(DESTDIR)$(docdir)/manual.tmp/html $(DESTDIR)$(docdir)/manual
+-	@rm -rf $(DESTDIR)$(docdir)/manual.tmp
+-
  endif
-- 
2.40.1

Message #29 received at 63893 <at> debbugs.gnu.org (full text, mbox):

From: jgart <jgart <at> dismail.de>
To: 63893 <at> debbugs.gnu.org
Cc: jgart <jgart <at> dismail.de>, Zhu Zihao <all_but_last <at> 163.com>
Subject: [PATCH v2 1/2] gnu: Add rapidcheck.
Date: Sun, 11 Jun 2023 09:11:10 -0500

* gnu/packages/check.scm (rapidcheck): New variable.
---
 gnu/packages/check.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 87728fefa3..470d8c52fa 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -43,6 +43,7 @@
 ;;; Copyright © 2022 jgart <jgart <at> dismail.de>
 ;;; Copyright © 2023 Luis Felipe López Acevedo <luis.felipe.la <at> protonmail.com>
 ;;; Copyright © 2023 Timo Wilken <guix <at> twilken.net>
+;;; Copyright © 2023 Zhu Zihao <all_but_last <at> 163.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3198,6 +3199,46 @@ (define-public libfaketime
 provides a simple way to achieve this.")
     (license license:gpl2)))
 
+(define-public rapidcheck
+  (let ((commit "a5724ea5b0b00147109b0605c377f1e54c353ba2")
+        (revision "0"))
+    (package
+      (name "rapidcheck")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri
+          (git-reference
+           (url "https://github.com/emil-e/rapidcheck")
+           (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0f2dmsym8ibnwkaidxmgp73mg0sdniwsyn6ppskh74246h29bbcy"))))
+      (arguments
+       (list
+        #:tests? #f                     ;require fetching submodules
+        #:configure-flags #~(list "-DCMAKE_POSITION_INDEPENDENT_CODE=ON")
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'install 'install-extra-headers
+              (lambda _
+                (with-directory-excursion "../source/extras"
+                  (for-each
+                   (lambda (dir)
+                     (let ((dir (string-append dir "/include/rapidcheck/"))
+                           (dest (string-append #$output
+                                                "/include/rapidcheck")))
+                       (copy-recursively dir dest)))
+                   '("boost" "boost_test" "catch" "gmock" "gtest"))))))))
+      (build-system cmake-build-system)
+      (home-page "https://github.com/emil-e/rapidcheck")
+      (synopsis "Property based testing framework for C++")
+      (description "Rapidcheck is a property based testing framework for C++.
+It works by generating random data to try and find a case breaks your given
+pre-condition.")
+      (license license:bsd-2))))
+
 (define-public umockdev
   (package
     (name "umockdev")

base-commit: 6fe9a004dba2d4ddf69ff6f1714af15ffaa7e62a
-- 
2.40.1

Message #32 received at 63893 <at> debbugs.gnu.org (full text, mbox):

From: jgart <jgart <at> dismail.de>
To: 63893 <at> debbugs.gnu.org
Cc: jgart <jgart <at> dismail.de>, Zhu Zihao <all_but_last <at> 163.com>
Subject: [PATCH v2 2/2] gnu: nix: Update to 2.16.1.
Date: Sun, 11 Jun 2023 09:11:11 -0500

* gnu/packages/package-management.scm (nix): Update to 2.16.1.
[source]: Use HTTPS for package source.
[inputs]: Add nlohmann-json.
[native-inputs]: Add rapidcheck.
[arguments]<#:phases>: In phase "check", change the value of environment
variable  "NIX_STORE" to "/nix/store" temporarily.

* gnu/packages/patches/nix-dont-build-html-doc.diff: Update.

Co-authored-by: jgart <jgart <at> dismail.de>
---

Hi Zhu,

Here's a v2 updating your patchset to use nix at 2.16.1. I also squashed
the commit that uses HTTPS in the source field.

all best,

jgart

 gnu/packages/package-management.scm           | 27 +++++++++++----
 .../patches/nix-dont-build-html-doc.diff      | 33 ++++++++++++++-----
 2 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 4791880375..1dedfe5600 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -20,7 +20,7 @@
 ;;; Copyright © 2021 Ivan Gankevich <i.gankevich <at> spbu.ru>
 ;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
 ;;; Copyright © 2021 John Kehayias <john.kehayias <at> protonmail.com>
-;;; Copyright © 2022 Zhu Zihao <all_but_last <at> 163.com>
+;;; Copyright © 2022, 2023 Zhu Zihao <all_but_last <at> 163.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -56,6 +56,7 @@ (define-module (gnu packages package-management)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages cpio)
+  #:use-module (gnu packages cpp)
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
@@ -731,16 +732,16 @@ (define-public guix-modules
 (define-public nix
   (package
     (name "nix")
-    (version "2.5.1")
+    (version "2.16.0")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "http://github.com/NixOS/nix")
+             (url "https://github.com/NixOS/nix")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1m8rmv8i6lg83pmalvjlq1fn8mcghn3ngjv3kw1kqsa45ymj5sqq"))
+        (base32 "0jizpci4zspqpqqy3n780m4wh8dzhfywaiz953xv70c7in810dra"))
        (patches
         (search-patches "nix-dont-build-html-doc.diff"))))
     (build-system gnu-build-system)
@@ -757,7 +758,19 @@ (define-public nix
                 (apply invoke "make" "install"
                        (string-append "sysconfdir=" etc)
                        (string-append "profiledir=" etc "/profile.d")
-                       make-flags)))))))
+                       make-flags))))
+          (replace 'check
+            (lambda args
+              ;; Some test expect environment variable NIX_STORE to be
+              ;; "/nix/store"
+              (let ((original-NIX_STORE (getenv "NIX_STORE")))
+                (dynamic-wind
+                  (lambda ()
+                    (setenv "NIX_STORE" "/nix/store"))
+                  (lambda ()
+                    (apply (assoc-ref %standard-phases 'check) args))
+                  (lambda ()
+                    (setenv "NIX_STORE" original-NIX_STORE)))))))))
     (native-inputs
      (list autoconf
            autoconf-archive
@@ -767,7 +780,8 @@ (define-public nix
            googletest
            jq
            libtool
-           pkg-config))
+           pkg-config
+           rapidcheck))
     (inputs
      (append (list boost
                    brotli
@@ -779,6 +793,7 @@ (define-public nix
                    libseccomp
                    libsodium
                    lowdown
+                   nlohmann-json
                    openssl
                    sqlite
                    xz
diff --git a/gnu/packages/patches/nix-dont-build-html-doc.diff b/gnu/packages/patches/nix-dont-build-html-doc.diff
index 79142bc215..2eb45117b0 100644
--- a/gnu/packages/patches/nix-dont-build-html-doc.diff
+++ b/gnu/packages/patches/nix-dont-build-html-doc.diff
@@ -3,24 +3,41 @@ We can't simply disable it because we need manpages.
 
 Author: Zhu Zihao <all_but_last <at> 163.com>
 
-diff --git a/doc/manual/local.mk b/doc/manual/local.mk
-index e43d9f2fb..c323d1847 100644
 --- a/doc/manual/local.mk
 +++ b/doc/manual/local.mk
-@@ -69,8 +69,6 @@ $(d)/builtins.json: $(bindir)/nix
+@@ -138,11 +138,6 @@
  	$(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(bindir)/nix __dump-builtins > $@.tmp
  	@mv $@.tmp $@
  
 -# Generate the HTML manual.
+-.PHONY: manual-html
+-manual-html: $(docdir)/manual/index.html
 -install: $(docdir)/manual/index.html
- 
+-
  # Generate 'nix' manpages.
  install: $(mandir)/man1/nix3-manpages
-@@ -94,7 +92,5 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli
+ man: doc/manual/generated/man1/nix3-manpages
+@@ -167,23 +162,4 @@
  	done
  	@touch $@
  
--$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/custom.css $(d)/src/SUMMARY.md $(d)/src/command-ref/new-cli $(d)/src/command-ref/conf-file.md $(d)/src/expressions/builtins.md $(call rwildcard, $(d)/src, *.md)
--	$(trace-gen) RUST_LOG=warn mdbook build doc/manual -d $(DESTDIR)$(docdir)/manual
- 
+-$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/anchors.jq $(d)/custom.css $(d)/src/SUMMARY.md $(d)/src/command-ref/new-cli $(d)/src/contributing/experimental-feature-descriptions.md $(d)/src/command-ref/conf-file.md $(d)/src/language/builtins.md
+-	$(trace-gen) \
+-		tmp="$$(mktemp -d)"; \
+-		cp -r doc/manual "$$tmp"; \
+-		find "$$tmp" -name '*.md' | while read -r file; do \
+-			$(call process-includes,$$file,$$file); \
+-		done; \
+-		find "$$tmp" -name '*.md' | while read -r file; do \
+-			docroot="$$(realpath --relative-to="$$(dirname "$$file")" $$tmp/manual/src)"; \
+-			sed -i "s,@docroot@,$$docroot,g" "$$file"; \
+-		done; \
+-		set -euo pipefail; \
+-		RUST_LOG=warn mdbook build "$$tmp/manual" -d $(DESTDIR)$(docdir)/manual.tmp 2>&1 \
+-			| { grep -Fv "because fragment resolution isn't implemented" || :; }; \
+-		rm -rf "$$tmp/manual"
+-	@rm -rf $(DESTDIR)$(docdir)/manual
+-	@mv $(DESTDIR)$(docdir)/manual.tmp/html $(DESTDIR)$(docdir)/manual
+-	@rm -rf $(DESTDIR)$(docdir)/manual.tmp
+-
  endif
-- 
2.40.1

Message #35 received at 63893 <at> debbugs.gnu.org (full text, mbox):

From: jgart <jgart <at> dismail.de>
To: 63893 <at> debbugs.gnu.org
Cc: jgart <jgart <at> dismail.de>, Zhu Zihao <all_but_last <at> 163.com>
Subject: [PATCH v3 1/2] gnu: Add rapidcheck.
Date: Sun, 11 Jun 2023 09:29:25 -0500

* gnu/packages/check.scm (rapidcheck): New variable.
---
 gnu/packages/check.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 87728fefa3..470d8c52fa 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -43,6 +43,7 @@
 ;;; Copyright © 2022 jgart <jgart <at> dismail.de>
 ;;; Copyright © 2023 Luis Felipe López Acevedo <luis.felipe.la <at> protonmail.com>
 ;;; Copyright © 2023 Timo Wilken <guix <at> twilken.net>
+;;; Copyright © 2023 Zhu Zihao <all_but_last <at> 163.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3198,6 +3199,46 @@ (define-public libfaketime
 provides a simple way to achieve this.")
     (license license:gpl2)))
 
+(define-public rapidcheck
+  (let ((commit "a5724ea5b0b00147109b0605c377f1e54c353ba2")
+        (revision "0"))
+    (package
+      (name "rapidcheck")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri
+          (git-reference
+           (url "https://github.com/emil-e/rapidcheck")
+           (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0f2dmsym8ibnwkaidxmgp73mg0sdniwsyn6ppskh74246h29bbcy"))))
+      (arguments
+       (list
+        #:tests? #f                     ;require fetching submodules
+        #:configure-flags #~(list "-DCMAKE_POSITION_INDEPENDENT_CODE=ON")
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'install 'install-extra-headers
+              (lambda _
+                (with-directory-excursion "../source/extras"
+                  (for-each
+                   (lambda (dir)
+                     (let ((dir (string-append dir "/include/rapidcheck/"))
+                           (dest (string-append #$output
+                                                "/include/rapidcheck")))
+                       (copy-recursively dir dest)))
+                   '("boost" "boost_test" "catch" "gmock" "gtest"))))))))
+      (build-system cmake-build-system)
+      (home-page "https://github.com/emil-e/rapidcheck")
+      (synopsis "Property based testing framework for C++")
+      (description "Rapidcheck is a property based testing framework for C++.
+It works by generating random data to try and find a case breaks your given
+pre-condition.")
+      (license license:bsd-2))))
+
 (define-public umockdev
   (package
     (name "umockdev")

base-commit: 6fe9a004dba2d4ddf69ff6f1714af15ffaa7e62a
-- 
2.40.1

Message #38 received at 63893 <at> debbugs.gnu.org (full text, mbox):

From: jgart <jgart <at> dismail.de>
To: 63893 <at> debbugs.gnu.org
Cc: jgart <jgart <at> dismail.de>, Zhu Zihao <all_but_last <at> 163.com>
Subject: [PATCH v3 2/2] gnu: nix: Update to 2.16.1.
Date: Sun, 11 Jun 2023 09:29:26 -0500

* gnu/packages/package-management.scm (nix): Update to 2.16.1.
[source]: Use HTTPS for package source.
[inputs]: Add nlohmann-json.
[native-inputs]: Add rapidcheck.
[arguments]<#:phases>: In phase "check", change the value of environment
variable  "NIX_STORE" to "/nix/store" temporarily.

* gnu/packages/patches/nix-dont-build-html-doc.diff: Update.

Co-authored-by: jgart <jgart <at> dismail.de>
---

Oops v3, forgot to add in the actual changes that were in the staging area ;()

 gnu/packages/package-management.scm           | 28 ++++++++++++----
 .../patches/nix-dont-build-html-doc.diff      | 33 ++++++++++++++-----
 2 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 4791880375..bd989405c2 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -20,7 +20,8 @@
 ;;; Copyright © 2021 Ivan Gankevich <i.gankevich <at> spbu.ru>
 ;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
 ;;; Copyright © 2021 John Kehayias <john.kehayias <at> protonmail.com>
-;;; Copyright © 2022 Zhu Zihao <all_but_last <at> 163.com>
+;;; Copyright © 2022, 2023 Zhu Zihao <all_but_last <at> 163.com>
+;;; Copyright © 2023 jgart <jgart <at> dismail.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -56,6 +57,7 @@ (define-module (gnu packages package-management)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages cpio)
+  #:use-module (gnu packages cpp)
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
@@ -731,16 +733,16 @@ (define-public guix-modules
 (define-public nix
   (package
     (name "nix")
-    (version "2.5.1")
+    (version "2.16.1")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "http://github.com/NixOS/nix")
+             (url "https://github.com/NixOS/nix")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1m8rmv8i6lg83pmalvjlq1fn8mcghn3ngjv3kw1kqsa45ymj5sqq"))
+        (base32 "1rca8ljd33dmvh9bqk6sy1zxk97aawcr6k1f7hlm4d1cd9mrcw7x"))
        (patches
         (search-patches "nix-dont-build-html-doc.diff"))))
     (build-system gnu-build-system)
@@ -757,7 +759,19 @@ (define-public nix
                 (apply invoke "make" "install"
                        (string-append "sysconfdir=" etc)
                        (string-append "profiledir=" etc "/profile.d")
-                       make-flags)))))))
+                       make-flags))))
+          (replace 'check
+            (lambda args
+              ;; Some test expect environment variable NIX_STORE to be
+              ;; "/nix/store"
+              (let ((original-NIX_STORE (getenv "NIX_STORE")))
+                (dynamic-wind
+                  (lambda ()
+                    (setenv "NIX_STORE" "/nix/store"))
+                  (lambda ()
+                    (apply (assoc-ref %standard-phases 'check) args))
+                  (lambda ()
+                    (setenv "NIX_STORE" original-NIX_STORE)))))))))
     (native-inputs
      (list autoconf
            autoconf-archive
@@ -767,7 +781,8 @@ (define-public nix
            googletest
            jq
            libtool
-           pkg-config))
+           pkg-config
+           rapidcheck))
     (inputs
      (append (list boost
                    brotli
@@ -779,6 +794,7 @@ (define-public nix
                    libseccomp
                    libsodium
                    lowdown
+                   nlohmann-json
                    openssl
                    sqlite
                    xz
diff --git a/gnu/packages/patches/nix-dont-build-html-doc.diff b/gnu/packages/patches/nix-dont-build-html-doc.diff
index 79142bc215..2eb45117b0 100644
--- a/gnu/packages/patches/nix-dont-build-html-doc.diff
+++ b/gnu/packages/patches/nix-dont-build-html-doc.diff
@@ -3,24 +3,41 @@ We can't simply disable it because we need manpages.
 
 Author: Zhu Zihao <all_but_last <at> 163.com>
 
-diff --git a/doc/manual/local.mk b/doc/manual/local.mk
-index e43d9f2fb..c323d1847 100644
 --- a/doc/manual/local.mk
 +++ b/doc/manual/local.mk
-@@ -69,8 +69,6 @@ $(d)/builtins.json: $(bindir)/nix
+@@ -138,11 +138,6 @@
  	$(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(bindir)/nix __dump-builtins > $@.tmp
  	@mv $@.tmp $@
  
 -# Generate the HTML manual.
+-.PHONY: manual-html
+-manual-html: $(docdir)/manual/index.html
 -install: $(docdir)/manual/index.html
- 
+-
  # Generate 'nix' manpages.
  install: $(mandir)/man1/nix3-manpages
-@@ -94,7 +92,5 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli
+ man: doc/manual/generated/man1/nix3-manpages
+@@ -167,23 +162,4 @@
  	done
  	@touch $@
  
--$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/custom.css $(d)/src/SUMMARY.md $(d)/src/command-ref/new-cli $(d)/src/command-ref/conf-file.md $(d)/src/expressions/builtins.md $(call rwildcard, $(d)/src, *.md)
--	$(trace-gen) RUST_LOG=warn mdbook build doc/manual -d $(DESTDIR)$(docdir)/manual
- 
+-$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/anchors.jq $(d)/custom.css $(d)/src/SUMMARY.md $(d)/src/command-ref/new-cli $(d)/src/contributing/experimental-feature-descriptions.md $(d)/src/command-ref/conf-file.md $(d)/src/language/builtins.md
+-	$(trace-gen) \
+-		tmp="$$(mktemp -d)"; \
+-		cp -r doc/manual "$$tmp"; \
+-		find "$$tmp" -name '*.md' | while read -r file; do \
+-			$(call process-includes,$$file,$$file); \
+-		done; \
+-		find "$$tmp" -name '*.md' | while read -r file; do \
+-			docroot="$$(realpath --relative-to="$$(dirname "$$file")" $$tmp/manual/src)"; \
+-			sed -i "s,@docroot@,$$docroot,g" "$$file"; \
+-		done; \
+-		set -euo pipefail; \
+-		RUST_LOG=warn mdbook build "$$tmp/manual" -d $(DESTDIR)$(docdir)/manual.tmp 2>&1 \
+-			| { grep -Fv "because fragment resolution isn't implemented" || :; }; \
+-		rm -rf "$$tmp/manual"
+-	@rm -rf $(DESTDIR)$(docdir)/manual
+-	@mv $(DESTDIR)$(docdir)/manual.tmp/html $(DESTDIR)$(docdir)/manual
+-	@rm -rf $(DESTDIR)$(docdir)/manual.tmp
+-
  endif
-- 
2.40.1

Message #41 received at 63893 <at> debbugs.gnu.org (full text, mbox):

From: Zhu Zihao <all_but_last <at> 163.com>
To: jgart <jgart <at> dismail.de>
Cc: 63893 <at> debbugs.gnu.org
Subject: Re: [PATCH v2 2/2] gnu: nix: Update to 2.16.1.
Date: Tue, 13 Jun 2023 17:17:50 +0800

[Message part 1 (text/plain, inline)]

jgart <jgart <at> dismail.de> writes:

LGTM, thanks a lot!

-- 
Retrieve my PGP public key:

  gpg --recv-keys B3EBC086AB0EBC0F45E0B4D433DB374BCEE4D9DC

Zihao

[signature.asc (application/pgp-signature, inline)]

Message #44 received at 63893 <at> debbugs.gnu.org (full text, mbox):

From: Zhu Zihao <all_but_last <at> 163.com>
To: jgart <jgart <at> dismail.de>
Cc: 63893 <at> debbugs.gnu.org
Subject: Re: [PATCH v3 2/2] gnu: nix: Update to 2.16.1.
Date: Mon, 19 Jun 2023 23:47:40 +0800

[Message part 1 (text/plain, inline)]

Hi, jgart!

I think the patch (includes your modification) is quite good for daily
usage, and I don't meet any bugs. Can you help commit these changes? Thanks!

-- 
Retrieve my PGP public key:

  gpg --recv-keys B3EBC086AB0EBC0F45E0B4D433DB374BCEE4D9DC

Zihao

[signature.asc (application/pgp-signature, inline)]

Message #47 received at 63893 <at> debbugs.gnu.org (full text, mbox):

From: "jgart" <jgart <at> dismail.de>
Cc: control <at> debbugs.gnu.org, 63893 <at> debbugs.gnu.org
Subject: Re: [PATCH v3 2/2] gnu: nix: Update to 2.16.1.
Date: Sat, 24 Jun 2023 17:12:29 +0000

retitle 63893 [PATCH v3 2/2] gnu: nix: Update to 2.16.1

Message #52 received at 63893 <at> debbugs.gnu.org (full text, mbox):

From: "jgart" <jgart <at> dismail.de>
To: "Zhu Zihao" <all_but_last <at> 163.com>
Cc: Sergey Trofimov <sarg <at> sarg.org.ru>, 63893 <at> debbugs.gnu.org
Subject: Re: [PATCH v3 2/2] gnu: nix: Update to 2.16.1.
Date: Sat, 24 Jun 2023 17:20:27 +0000

Hi Trofi,

If you find the time, would you be able to help review this patch series?

I saw that you've done a fare amount of work on guix/nix packaging in nix-guix-gentoo and could use your expertise in this area for reviewing this patch set:

https://github.com/trofi/nix-guix-gentoo

Feel free to send a v4 patch and add yourself as co-author if you'd like to help directly.

Also, feel free to ignore if you don't have the time to review this one or help out on it.

I could particular use some guidance on enabling the tests for rapidcheck. My cmake knowledge is very fresh.

all best,

jgart

Message #57 received at 63893 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: jgart <jgart <at> dismail.de>
Cc: 63893 <at> debbugs.gnu.org, Zhu Zihao <all_but_last <at> 163.com>
Subject: Re: [PATCH v3 2/2] gnu: nix: Update to 2.16.1.
Date: Sat, 24 Jun 2023 21:34:12 +0200

Hi jgart,

I'm not that trofi you're referencing to. You could find the right 
email in their github profile.

"jgart" <jgart <at> dismail.de> writes:

> Hi Trofi,
>
> If you find the time, would you be able to help review this 
> patch series?
>
> I saw that you've done a fare amount of work on guix/nix 
> packaging in
> nix-guix-gentoo and could use your expertise in this area for 
> reviewing this
> patch set:
>
> https://github.com/trofi/nix-guix-gentoo

Message #60 received at 63893 <at> debbugs.gnu.org (full text, mbox):

From: "jgart" <jgart <at> dismail.de>
To: "Sergey Trofimov" <sarg <at> sarg.org.ru>
Cc: 63893 <at> debbugs.gnu.org, Zhu Zihao <all_but_last <at> 163.com>
Subject: Re: [PATCH v3 2/2] gnu: nix: Update to 2.16.1.
Date: Sun, 25 Jun 2023 03:01:00 +0000

hi Sergey,

Oh funny, ok, thanks for letting me know ;()

Message #63 received at 63893 <at> debbugs.gnu.org (full text, mbox):

From: "jgart" <jgart <at> dismail.de>
To: slyich <at> gmail.com
Cc: 63893 <at> debbugs.gnu.org
Subject: gnu: nix: Update to 2.16.1
Date: Mon, 26 Jun 2023 21:41:21 +0000

Hi Trofi,

I saw that you've done a fare amount of work on guix/nix packaging in nix-guix-gentoo and could use your expertise in this area for reviewing this patch set:

https://github.com/trofi/nix-guix-gentoo

If you find the time, would you be able to help review this patch series? It would be much appreciated.

Feel free to send a v4 patch and add yourself as co-author if you'd like to help directly.

Also, feel free to ignore if you don't have the time to review this one or help out on it.

I could particular use some guidance on enabling the tests for rapidcheck. My cmake knowledge is very fresh.

all best,

jgart

https://whereis.みんな/

Message #66 received at 63893 <at> debbugs.gnu.org (full text, mbox):

From: Sergei Trofimovich <slyich <at> gmail.com>
To: "jgart" <jgart <at> dismail.de>
Cc: 63893 <at> debbugs.gnu.org
Subject: Re: gnu: nix: Update to 2.16.1
Date: Mon, 26 Jun 2023 23:16:08 +0100

On Mon, 26 Jun 2023 21:41:21 +0000
"jgart" <jgart <at> dismail.de> wrote:

> Hi Trofi,
> 
> I saw that you've done a fare amount of work on guix/nix packaging in nix-guix-gentoo and could use your expertise in this area for reviewing this patch set:
> 
> https://github.com/trofi/nix-guix-gentoo
> 
> If you find the time, would you be able to help review this patch series? It would be much appreciated.
> 
> Feel free to send a v4 patch and add yourself as co-author if you'd like to help directly.
> 
> Also, feel free to ignore if you don't have the time to review this one or help out on it.
> 
> I could particular use some guidance on enabling the tests for rapidcheck. My cmake knowledge is very fresh.
> 
> all best,
> 
> jgart
> 
> https://whereis.みんな/


Hi Jorge!

I guess you mean this series:

    https://issues.guix.gnu.org/63893
    https://mail.gnu.org/archive/html/guix-patches/2023-06/msg00525.html

Those look good to me. I did not runtime-test it though.

Note: I don't have push access to `guix` repository and I don't use
`guix` on a daily basis. I mainly maintain `guix` install on top of
gentoo as defined in

   https://github.com/trofi/nix-guix-gentoo

I suggest runtime-testing it as well locally: try to install `nix` and
run a few commands like `nix-channel --update` / `nix-shell -p re2c`
just to make sure daemon is configured correctly.

Hope that helps.

Good luck!

-- 

  Sergei

Message #69 received at 63893 <at> debbugs.gnu.org (full text, mbox):

From: "jgart" <jgart <at> dismail.de>
To: "Sergei Trofimovich" <slyich <at> gmail.com>
Cc: 63893 <at> debbugs.gnu.org
Subject: Re: gnu: nix: Update to 2.16.1
Date: Tue, 27 Jun 2023 06:03:03 +0000

> Those look good to me. I did not runtime-test it though.

Hi Sergei,

Thanks for the message.

Are you running the tests successfully for rapidcheck in your ebuild version? 

I don't know portage, unfortunately.

We'd like to get the tests running and passing for rapidcheck but they are currently disabled because we are not sure how to run the test suite for rapidcheck.

Have you had any success running the tests for rapidcheck?

all best,

jgart (Jorge)

Message #72 received at 63893 <at> debbugs.gnu.org (full text, mbox):

From: Sergei Trofimovich <slyich <at> gmail.com>
To: "jgart" <jgart <at> dismail.de>
Cc: 63893 <at> debbugs.gnu.org
Subject: Re: gnu: nix: Update to 2.16.1
Date: Tue, 27 Jun 2023 08:05:42 +0100

On Tue, 27 Jun 2023 06:03:03 +0000
"jgart" <jgart <at> dismail.de> wrote:

> > Those look good to me. I did not runtime-test it though.  
> 
> Hi Sergei,
> 
> Thanks for the message.
> 
> Are you running the tests successfully for rapidcheck in your ebuild version? 

I do not enable `rapidcheck` tests. At least in theory enabling tests
via `-DRC_ENABLE_TESTS=ON` should be enough. In practice
`ext/CMakeLists.txt` implies a certain layout of `check2`, `gtest` and
`boost` dependencies checked out locally:

  git submodule:

    if (RC_ENABLE_TESTS OR RC_ENABLE_CATCH)
      add_subdirectory(catch)
    endif()

  another git submodule:

    if ((RC_ENABLE_GMOCK OR RC_ENABLE_GTEST) AND RC_ENABLE_TESTS)
      # On Windows, gmock/gtest defaults to static CRT which is not compatible
      # with the way RapidCheck is currently built
      set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
      add_subdirectory(googletest)
    endif()

  ad-hoc checkout with a stand alone script:

    if (RC_ENABLE_BOOST AND RC_ENABLE_TESTS)
      if (NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/boost")
        execute_process(
          COMMAND "sh" "get_boost.sh"
          WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}")
      endif()
      add_library(boost INTERFACE)
      target_include_directories(boost INTERFACE boost)
    endif()

I did not try to satisfy these requirements. Ideally upstream should be
fixed to use already installed libraries. But I'm not very well versed
in `cmake` to propose such a change just yet.

> I don't know portage, unfortunately.
> 
> We'd like to get the tests running and passing for rapidcheck but they are currently disabled because we are not sure how to run the test suite for rapidcheck.
> 
> Have you had any success running the tests for rapidcheck?
> 
> all best,
> 
> jgart (Jorge)

-- 

  Sergei

Message #77 received at 63893-done <at> debbugs.gnu.org (full text, mbox):

From: "jgart" <jgart <at> dismail.de>
To: 63893-done <at> debbugs.gnu.org, "Zhu Zihao" <all_but_last <at> 163.com>
Cc: control <at> debbugs.gnu.org
Subject: Re: [PATCH v3 2/2] gnu: nix: Update to 2.16.1
Date: Wed, 12 Jul 2023 04:00:33 +0000

Hi Zhu,

Thanks for the contribution. APPLIED. Sorry for the delay.

I tested this patch series in the following Guix container:

(use-modules (gnu))
(use-package-modules certs package-management)
(use-service-modules nix)

(define %simple-os
  (operating-system
    (host-name "komputilo")
    (timezone "Europe/Berlin")
    (locale "en_US.UTF-8")
    (bootloader (bootloader-configuration
                 (bootloader grub-bootloader)
                 (targets '("/dev/sdX"))))
    (file-systems (cons (file-system
                          (device (file-system-label "my-root"))
                          (mount-point "/")
                          (type "ext4"))
                        %base-file-systems))
    (firmware '())
    (packages (cons nss-certs %base-packages))
    (users (cons (user-account
                  (name "alice")
                  (comment "Bob's sister")
                  (group "users")
                  (supplementary-groups '("wheel" "audio" "video")))
                 %base-user-accounts))))

(define-syntax-rule (simple-operating-system user-services ...)
  "Return an operating system that includes USER-SERVICES in addition to
%BASE-SERVICES."
  (operating-system (inherit %simple-os)
                    (services (cons* user-services ... %base-services))))

(simple-operating-system (service nix-service-type))


Session:

root <at> komputilo /# nnn
bash: nnn: command not found
root <at> komputilo /# ls .
./  ../ 
root <at> komputilo /# ls -a
./  ../  bin/  dev/  etc/  gnu/  home/	nix/  proc/  root/  run/  tmp/	usr/  var/
root <at> komputilo /# cd root
root <at> komputilo /root# ls
root <at> komputilo /root# ls -a
./  ../  .Xdefaults  .bash_profile  .bashrc  .cache/  .config/	.guile	.nix-channels  .nix-defexpr/  .nix-profile  .zprofile
root <at> komputilo /root# ls .nix-profile
bin  manifest.nix  share
root <at> komputilo /root# ls .nix-profile/bin/
nnn
root <at> komputilo /root# .nix-profile/bin/nnn   
set HOME
root <at> komputilo /root# ./.nix-profile/bin/nnn
set HOME
root <at> komputilo /root# export HOME=/home/root
root <at> komputilo /root# ./.nix-profile/bin/nnn
root <at> komputilo /root# nix-env -q
WARNING: terminal is not fully functional
Press RETURN to continue 
nnn-4.8
root <at> komputilo /root# nix-env --version
nix-env (Nix) 2.16.1

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.