Package: guix-patches;
Reported by: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es>
Date: Sun, 10 Dec 2023 20:20:02 UTC
Severity: normal
Tags: patch
Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 67755 in the body.
You can then email your comments to 67755 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Sun, 10 Dec 2023 20:20:02 GMT) Full text and rfc822 format available.Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es>:guix-patches <at> gnu.org.
(Sun, 10 Dec 2023 20:20:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> To: guix-patches <at> gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH] gnu: Add imhex. Date: Sun, 10 Dec 2023 21:06:44 +0100
* gnu/packages/hexedit.scm (imhex): New variable.
Change-Id: Iac50937ceecf617ebadf4b81d3321a262e28090b
---
Hello.
This package adds ImHex using specifically commit
`ef7898ea8d83d0e3f4897c221f8595112aad9f2d`. This is done since from commit
`eae3cd99eef6202d772e3d2d43298449b7a36233` [1], the offline build enabled with
`-DIMHEX_OFFLINE_BUILD=ON` avoids running networking tests during the check
phase.
Thanks,
Sergio.
[1]: https://github.com/WerWolv/ImHex/commit/eae3cd99eef6202d772e3d2d43298449b7a36233
gnu/packages/hexedit.scm | 65 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 65 insertions(+)
diff --git a/gnu/packages/hexedit.scm b/gnu/packages/hexedit.scm
index 79c14a2996..b1cb006de3 100644
--- a/gnu/packages/hexedit.scm
+++ b/gnu/packages/hexedit.scm
@@ -21,14 +21,26 @@
(define-module (gnu packages hexedit)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages compression)
#:use-module (gnu packages man)
#:use-module (gnu packages ncurses)
+ #:use-module (gnu packages gl)
+ #:use-module (gnu packages tls)
+ #:use-module (gnu packages gcc)
+ #:use-module (gnu packages glib)
+ #:use-module (gnu packages curl)
+ #:use-module (gnu packages ruby)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages fontutils)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages engineering)
#:use-module (guix download)
#:use-module (guix git-download)
+ #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu))
(define-public hexedit
@@ -93,6 +105,59 @@ (define-public ht
(home-page "https://hte.sourceforge.net/")
(license license:gpl2)))
+(define-public imhex
+ (let ((revision "0")
+ (commit "ef7898ea8d83d0e3f4897c221f8595112aad9f2d"))
+ (package
+ (name "imhex")
+ (version (git-version "1.31.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/WerWolv/ImHex")
+ (commit commit)
+ (recursive? #t)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0mqx9g3hzap1grav0n2fi54ph63kb9b0hx70zxkknq5rqp6mpy5m"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:configure-flags ''("-DIMHEX_OFFLINE_BUILD=ON"
+ "-DCMAKE_BUILD_TYPE=Release"
+ "-DCMAKE_BUILD_TYPE=Release")
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-gsettings
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "main/gui/source/window/linux_window.cpp"
+ (("dbus-send")
+ (search-input-file inputs "/bin/dbus-send")))))
+ (add-before 'check 'build-tests
+ (lambda _
+ (invoke "make" "unit_tests"))))))
+ (native-inputs (list gcc-13
+ pkg-config
+ python
+ python-wrapper
+ ruby
+ mbedtls-apache))
+ (inputs (list freetype
+ libglvnd
+ dbus
+ curl
+ glfw
+ dbus))
+ (home-page "https://github.com/WerWolv/ImHex")
+ (synopsis "Hex Editor to display, decode and analyze binary data")
+ (description
+ "Hex editor with many advanced features that can often only be
+found in paid applications. Such features are a completely custom binary
+template and pattern language to decode and highlight structures in the data, a
+graphical node-based data processor to pre-process values before they're
+displayed, a disassembler, diffing support, bookmarks and much much more.")
+ (license license:gpl2))))
+
(define-public bvi
(package
(name "bvi")
base-commit: 63e06f30ce20fa846a7e2e814976fefcd9eda7d3
--
2.41.0
sergio.pastorperez <at> outlook.es, guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Sat, 29 Jun 2024 12:27:02 GMT) Full text and rfc822 format available.Message #8 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v2] gnu: Add imhex. Date: Sat, 29 Jun 2024 14:15:39 +0200
* gnu/packages/hexedit.scm (imhex): New variable.
Change-Id: Iac50937ceecf617ebadf4b81d3321a262e28090b
---
Hello!
I'm updating this patch since ImHex has been updated a few times since.
You will notice that the ImHex repository contains a few submodules, many of the
submodules are libraries which do not include a cmake 'Findxxx.cmake'. For some
libraries, the build system provides the appropriate file, but not for all. We
decided not to un-bundle the libraries for now, the maintainers will consider
adding the appropriate files in the future. Once that's done, we can update the
package and un-bundle the libraries.
gnu/packages/hexedit.scm | 98 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 98 insertions(+)
diff --git a/gnu/packages/hexedit.scm b/gnu/packages/hexedit.scm
index 668699a28c..e730d160a6 100644
--- a/gnu/packages/hexedit.scm
+++ b/gnu/packages/hexedit.scm
@@ -22,14 +22,30 @@
(define-module (gnu packages hexedit)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages compression)
#:use-module (gnu packages man)
#:use-module (gnu packages ncurses)
+ #:use-module (gnu packages gl)
+ #:use-module (gnu packages tls)
+ #:use-module (gnu packages gcc)
+ #:use-module (gnu packages cpp)
+ #:use-module (gnu packages llvm)
+ #:use-module (gnu packages glib)
+ #:use-module (gnu packages curl)
+ #:use-module (gnu packages ruby)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages backup)
+ #:use-module (gnu packages fontutils)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages engineering)
+ #:use-module (gnu packages pretty-print)
#:use-module (guix download)
#:use-module (guix git-download)
+ #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu))
(define-public hexedit
@@ -94,6 +110,88 @@ (define-public ht
(home-page "https://hte.sourceforge.net/")
(license license:gpl2)))
+(define-public imhex
+ (package
+ (name "imhex")
+ (version "1.35.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/WerWolv/ImHex")
+ (commit (string-append "v" version))
+ (recursive? #t)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1789hkqh78sg4cic09yq46bsy2vpk5y56b8g4q0r60si5y2vc9lh"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ ;; NOTE: there is an issue with the way the test library is linked with
+ ;; the output binaries. Tests are intrusive and should not be shipped
+ ;; with the release, when the issue is fixed we could add a phase which
+ ;; builds the package with the tests and runs the testsuite and a second
+ ;; build phase which prepares the output binary.
+ #:configure-flags ''("-DIMHEX_OFFLINE_BUILD=ON"
+ "-DIMHEX_ENABLE_UNIT_TESTS=ON"
+ ;; NOTE: required for the `validate-runpath' phase.
+ ;; If OFF the pluggings won't be able to find
+ ;; `libimhex.so'
+ "-DIMHEX_PLUGIN_ADD_INSTALL_PREFIX_TO_RPATH=ON"
+
+ ;; TODO: remove unneeded submodules.
+ "-DUSE_SYSTEM_NLOHMANN_JSON=ON"
+ "-DUSE_SYSTEM_CAPSTONE=ON"
+ "-DUSE_SYSTEM_CLI11=ON"
+ "-DUSE_SYSTEM_LLVM=ON"
+ "-DUSE_SYSTEM_FMT=ON"
+
+ ;; TODO: package them.
+ "-DUSE_SYSTEM_MINIAUDIO=OFF"
+ "-DUSE_SYSTEM_LUNASVG=OFF"
+ "-DUSE_SYSTEM_JTHREAD=OFF"
+ "-DUSE_SYSTEM_BOOST=OFF"
+ "-DUSE_SYSTEM_EDLIB=OFF"
+ "-DUSE_SYSTEM_YARA=OFF"
+ "-DUSE_SYSTEM_NFD=OFF")
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-gsettings
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "main/gui/source/window/linux_window.cpp"
+ (("dbus-send")
+ (search-input-file inputs "/bin/dbus-send")))))
+ (add-before 'check 'build-tests
+ (lambda _
+ (invoke "make" "unit_tests"))))))
+ (native-inputs (list gcc-13
+ pkg-config
+ python
+ python-wrapper
+ ruby
+ mbedtls-apache
+
+ ;; Third party submodules
+ nlohmann-json
+ capstone
+ llvm-17
+ cli11
+ fmt))
+ (inputs (list freetype
+ libarchive
+ mesa
+ dbus
+ curl
+ glfw
+ dbus))
+ (home-page "https://github.com/WerWolv/ImHex")
+ (synopsis "Hex Editor to display, decode and analyze binary data")
+ (description "Hex editor with many advanced features that can often only
+be found in paid applications. Such features are a completely custom binary
+template and pattern language to decode and highlight structures in the data,
+a graphical node-based data processor to pre-process values before they're
+displayed, a disassembler, diffing support, bookmarks and much much more.")
+ (license license:gpl2)))
+
(define-public bvi
(package
(name "bvi")
base-commit: d601e953a463669a775ce17138e2b0f0c2e73ad9
--
2.45.1
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Sun, 30 Jun 2024 20:34:01 GMT) Full text and rfc822 format available.Message #11 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: jgart <jgart <at> dismail.de> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: Re: [PATCH] gnu: Add imhex. Date: Sun, 30 Jun 2024 15:33:12 -0500
Hi Sergio, It looks like this patch still needs some work from the TODO comments. Are you planning on resolving those TODO items soonish? If you'd like to make this package easily available to others before its ready for upstream I would recommend creating a channel for it. all the best, jgart
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Mon, 01 Jul 2024 17:03:01 GMT) Full text and rfc822 format available.Message #14 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> To: jgart <jgart <at> dismail.de>, 67755 <at> debbugs.gnu.org Subject: Re: [PATCH] gnu: Add imhex. Date: Mon, 01 Jul 2024 19:02:25 +0200
Hi! Thanks for taking a look. jgart <jgart <at> dismail.de> writes: > Are you planning on resolving those TODO items soonish? This is what I was explaining on the version 2 of the patch. It's not something that should be fixed at the package level. I've discussed it with the maintainers, until they don't implement a proper way of externalizing the handling of libraries we should be using the submodules. Having said that, I think the package is ready, is there any reason why you don't find it adequate, aside from the bundled libraries? We can remove the comments if that's what worries you. As a side note, I tried to un-bundle the libraries and the amount of patching that it requires is unreasonable, every library requires it's own CMAKE find file, which is responsibility of the software developers. This is why I say that this should be done upstream. I suggest to merge it as it is and I will update the package definition once ImHex properly supports using system libraries. I don't think the maintainers have this on their priority list so I don't know how long it could take. I will send a v3 of this patch without the comments and without the redundant flags. > If you'd like to make this package easily available to others before its > ready for upstream I would recommend creating a channel for it. I have it already available on my channel. Thanks for your time! Have a good evening, Sergio.
sergio.pastorperez <at> outlook.es, jgart <at> dismail.de, guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Mon, 01 Jul 2024 17:05:02 GMT) Full text and rfc822 format available.Message #17 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v3] gnu: Add imhex. Date: Mon, 1 Jul 2024 18:55:59 +0200
* gnu/packages/hexedit.scm (imhex): New variable.
Change-Id: Iac50937ceecf617ebadf4b81d3321a262e28090b
---
Updated patch without the TODO comments and the redundant flags.
gnu/packages/hexedit.scm | 87 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 87 insertions(+)
diff --git a/gnu/packages/hexedit.scm b/gnu/packages/hexedit.scm
index 668699a28c..f5689fd1df 100644
--- a/gnu/packages/hexedit.scm
+++ b/gnu/packages/hexedit.scm
@@ -22,14 +22,30 @@
(define-module (gnu packages hexedit)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages compression)
#:use-module (gnu packages man)
#:use-module (gnu packages ncurses)
+ #:use-module (gnu packages gl)
+ #:use-module (gnu packages tls)
+ #:use-module (gnu packages gcc)
+ #:use-module (gnu packages cpp)
+ #:use-module (gnu packages llvm)
+ #:use-module (gnu packages glib)
+ #:use-module (gnu packages curl)
+ #:use-module (gnu packages ruby)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages backup)
+ #:use-module (gnu packages fontutils)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages engineering)
+ #:use-module (gnu packages pretty-print)
#:use-module (guix download)
#:use-module (guix git-download)
+ #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu))
(define-public hexedit
@@ -94,6 +110,77 @@ (define-public ht
(home-page "https://hte.sourceforge.net/")
(license license:gpl2)))
+(define-public imhex
+ (package
+ (name "imhex")
+ (version "1.35.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/WerWolv/ImHex")
+ (commit (string-append "v" version))
+ (recursive? #t)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1789hkqh78sg4cic09yq46bsy2vpk5y56b8g4q0r60si5y2vc9lh"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ ;; NOTE: there is an issue with the way the test library is linked with
+ ;; the output binaries. Tests are intrusive and should not be shipped
+ ;; with the release, when the issue is fixed we could add a phase which
+ ;; builds the package with the tests and runs the testsuite and a second
+ ;; build phase which prepares the output binary.
+ #:configure-flags ''("-DIMHEX_OFFLINE_BUILD=ON"
+ "-DIMHEX_ENABLE_UNIT_TESTS=ON"
+ ;; NOTE: required for the `validate-runpath' phase.
+ ;; If OFF, the pluggings won't be able to find
+ ;; `libimhex.so'
+ "-DIMHEX_PLUGIN_ADD_INSTALL_PREFIX_TO_RPATH=ON"
+ "-DUSE_SYSTEM_NLOHMANN_JSON=ON"
+ "-DUSE_SYSTEM_CAPSTONE=ON"
+ "-DUSE_SYSTEM_CLI11=ON"
+ "-DUSE_SYSTEM_LLVM=ON"
+ "-DUSE_SYSTEM_FMT=ON")
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-gsettings
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "main/gui/source/window/linux_window.cpp"
+ (("dbus-send")
+ (search-input-file inputs "/bin/dbus-send")))))
+ (add-before 'check 'build-tests
+ (lambda _
+ (invoke "make" "unit_tests"))))))
+ (native-inputs (list gcc-13
+ pkg-config
+ python
+ python-wrapper
+ ruby
+ mbedtls-apache
+
+ ;; Third party submodules
+ nlohmann-json
+ capstone
+ llvm-17
+ cli11
+ fmt))
+ (inputs (list freetype
+ libarchive
+ mesa
+ dbus
+ curl
+ glfw
+ dbus))
+ (home-page "https://github.com/WerWolv/ImHex")
+ (synopsis "Hex Editor to display, decode and analyze binary data")
+ (description "Hex editor with many advanced features that can often only
+be found in paid applications. Such features are a completely custom binary
+template and pattern language to decode and highlight structures in the data,
+a graphical node-based data processor to pre-process values before they're
+displayed, a disassembler, diffing support, bookmarks and much much more.")
+ (license license:gpl2)))
+
(define-public bvi
(package
(name "bvi")
base-commit: d601e953a463669a775ce17138e2b0f0c2e73ad9
--
2.45.1
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Mon, 26 Aug 2024 21:53:02 GMT) Full text and rfc822 format available.Message #20 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> To: jgart <jgart <at> dismail.de>, 67755 <at> debbugs.gnu.org Subject: Re: [PATCH] gnu: Add imhex. Date: Mon, 26 Aug 2024 23:51:17 +0200
jgart <jgart <at> dismail.de> writes: > Hi Sergio, > > It looks like this patch still needs some work from the TODO comments. > > Are you planning on resolving those TODO items soonish? Hi! I went ahead and unbundled all I could from the package. There are still some vendored libraries that I think it's unreasonable to pacakge in Guix, since they won't be useful for other packages. I added multiple comments explaining why certain libraries remain bundled in the package. You will see that, although I made Guix packages for most libraries so they can be used by other users, for others I had to deploy their source code in-tree. This is due to ImHex not supporting unbundling them. After some discussions with the maintainers, the effort required to refactor the build system to support a more modular compilation, is out of the scope of the protect; the changes you see in the following patches is the best I could do with a reasonable amount of effort. I hope this brings the package up to Guix's standards and allows us to merge it. Good night, Sergio.
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Mon, 26 Aug 2024 22:06:01 GMT) Full text and rfc822 format available.Message #23 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v4 2/8] gnu: Add jthread. Date: Tue, 27 Aug 2024 00:01:04 +0200
* gnu/packages/cpp.scm (jthread): New variable.
Change-Id: I163ab0f8dbd9bc5ed0250612938f82926b07bc92
---
gnu/packages/cpp.scm | 93 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 93 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 708487ca97..49520d1ece 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -111,6 +111,7 @@ (define-module (gnu packages cpp)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages tls)
+ #:use-module (gnu packages tex)
#:use-module (gnu packages web)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
@@ -913,6 +914,98 @@ (define-public nlohmann-json
(define-public json-modern-cxx
(deprecated-package "json-modern-cxx" nlohmann-json))
+(define-public jthread
+ (let ((commit "0fa8d394254886c555d6faccd0a3de819b7d47f8")
+ (revision "0"))
+ (package
+ (name "jthread")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/josuttis/jthread")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "11cq4zh7pv86c62ah5im00gxr4cw6d396dp9117z8s271j4lrp6f"))
+ (snippet
+ ;; NOTE: remove precompiled PDFs.
+ #~(begin
+ (use-modules (guix build utils))
+ (for-each (lambda (file)
+ (delete-file file))
+ (find-files "." ".pdf"))
+ (delete-file-recursively "doc")))))
+ (outputs '("out" "doc"))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:phases #~(modify-phases %standard-phases
+ (delete 'configure)
+ (delete 'build)
+ (add-after 'unpack 'cd-and-generate-makefile
+ (lambda _
+ (call-with-output-file "source/Makefile.h"
+ (lambda (port)
+ ;; GCC 2.95 fails to deal with anonymous unions in glibc's
+ ;; 'struct_rusage.h', so skip that.
+ (display "CXX17 := c++ -std=c++17 -pthread\n"
+ port)))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "make" "-C" "source"))))
+ (add-after 'check 'build-docs
+ (lambda _
+ (with-directory-excursion "tex"
+ ;; NOTE: remove strict versioning.
+ (substitute* "styles.tex"
+ (("lst <at> CheckVersion\\{1.6\\}")
+ "lst <at> CheckVersion{1.9}"))
+ (invoke "pdflatex" "std")
+ (invoke "pdflatex" "std")))) ;Rerun to update references.
+ (replace 'install
+ (lambda _
+ (for-each (lambda (file)
+ (install-file file
+ (string-append #$output
+ "/include")))
+ '("source/condition_variable_any2.hpp"
+ "source/stop_token.hpp"
+ "source/jthread.hpp"))))
+ (add-after 'install 'install-doc
+ (lambda _
+ (let ((out (string-append #$output:doc "/share/doc/")))
+ (mkdir-p out)
+ (copy-file "tex/std.pdf"
+ (string-append out
+ #$name "-"
+ #$version ".pdf"))))))))
+ (native-inputs (list perl
+ (texlive-updmap.cfg (list texlive-ulem
+ texlive-rsfs
+ texlive-memoir
+ texlive-substr
+ texlive-xcolor
+ texlive-isodate
+ texlive-caption
+ texlive-relsize
+ texlive-extract
+ texlive-xkeyval
+ texlive-jknapltx
+ texlive-enumitem
+ texlive-etoolbox
+ texlive-listings
+ texlive-microtype
+ texlive-underscore))))
+ (home-page "https://github.com/josuttis/jthread")
+ (synopsis "C++ class for a joining and cooperative interruptible thread")
+ (description
+ "C++ class for a joining and cooperative interruptible thread
+(std::jthread) with stop_token helper.")
+ (license license:cc-by4.0))))
+
(define-public tomlplusplus
(package
(name "tomlplusplus")
--
2.45.2
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Mon, 26 Aug 2024 22:06:02 GMT) Full text and rfc822 format available.Message #26 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v4 3/8] gnu: Add lunasvg. Date: Tue, 27 Aug 2024 00:01:05 +0200
* gnu/packages/cpp.scm (lunasvg): New variable.
Change-Id: I77b7943e26e4e676a1575e3e33305f6f4476b401
---
gnu/packages/cpp.scm | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 49520d1ece..ec5156b1fa 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -467,6 +467,27 @@ (define-public libzen
operating system functions.")
(license license:zlib)))
+(define-public lunasvg
+ (package
+ (name "lunasvg")
+ (version "2.4.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sammycage/lunasvg")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0s81phhi0q1mkzhx9fxgvv71s21yv50r01gi3bdwxzb3xrhj3yjk"))))
+ (build-system cmake-build-system)
+ (arguments
+ '(#:tests? #f)) ; No tests.
+ (home-page "https://github.com/sammycage/lunasvg")
+ (synopsis "Standalone SVG rendering library in C++")
+ (description "Standalone SVG rendering library in C++.")
+ (license license:expat)))
+
(define-public rttr
(package
(name "rttr")
--
2.45.2
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Mon, 26 Aug 2024 22:06:02 GMT) Full text and rfc822 format available.Message #29 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v4 4/8] gnu: Add miniaudio. Date: Tue, 27 Aug 2024 00:01:06 +0200
* gnu/packages/cpp.scm (miniaudio): New variable.
Change-Id: I27b74793dd7b80af4437e0a1b997cc87fe8822e5
---
gnu/packages/cpp.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index ec5156b1fa..dd6488ccd1 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1685,6 +1685,57 @@ (define (make-static-abseil-cpp version)
#~(cons* "-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
(delete "-DBUILD_SHARED_LIBS=ON" #$flags)))))))))
+(define-public miniaudio
+ (package
+ (name "miniaudio")
+ (version "0.11.21")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mackron/miniaudio")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0hlqp44ifi3vswvfpqljj89321y6yz3zq6rng51wfq8p4n9k5qhh"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:phases #~(modify-phases %standard-phases
+ (delete 'build)
+ (delete 'configure)
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (with-directory-excursion "tests/_build"
+ (mkdir "bin")
+ (invoke "gcc"
+ "../test_automated/ma_test_automated.c"
+ "-o"
+ "bin/test_automated"
+ "-ldl"
+ "-lm"
+ "-lpthread"
+ "-Wall"
+ "-Wextra"
+ "-Wpedantic"
+ "-std=c89")
+ (invoke "./bin/test_automated")))))
+ (replace 'install
+ (lambda _
+ (install-file "miniaudio.h"
+ (string-append #$output "/include"))
+ (copy-recursively "extras"
+ (string-append #$output
+ "/include/extras/")))))))
+ (home-page "https://miniaud.io")
+ (synopsis "Audio playback and capture library for C and C++")
+ (description
+ "@code{miniaudio} is an audio playback and capture library for C and C++.
+It's made up of a single source file, has no external dependencies and is
+released into the public domain.")
+ (license license:expat)))
+
(define-public abseil-cpp-cxxstd17
(abseil-cpp-for-c++-standard abseil-cpp 17)) ;XXX: the default with GCC 11?
--
2.45.2
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Mon, 26 Aug 2024 22:06:03 GMT) Full text and rfc822 format available.Message #32 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v4 5/8] gnu: Add nativefiledialog-extended. Date: Tue, 27 Aug 2024 00:01:07 +0200
* gnu/packages/cpp.scm (nativefiledialog-extended): New variable.
Change-Id: I89ed4554db3ec8075bbb7d50bbfb4b99cae81a27
---
gnu/packages/cpp.scm | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index dd6488ccd1..184d3a889c 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -3325,6 +3325,31 @@ (define-public mpark-variant
based on the implementation of std::variant in libc++.")
(license license:boost1.0)))
+(define-public nativefiledialog-extended
+ (package
+ (name "nativefiledialog-extended")
+ (version "1.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/btzy/nativefiledialog-extended")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "15l0jy3v4p6rgg9dk8zr80lqp51s32ii62cm4s90400ragdgh10v"))))
+ (build-system cmake-build-system)
+ (arguments
+ '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
+ (native-inputs (list pkg-config))
+ (inputs (list gtk+))
+ (home-page "https://github.com/btzy/nativefiledialog-extended")
+ (synopsis "Native file dialog library with C and C++ bindings")
+ (description
+ "Cross platform (Windows, Mac, Linux) native file dialog
+library with C and C++ bindings, based on mlabbe/nativefiledialog.")
+ (license license:zlib)))
+
(define-public tsl-hopscotch-map
(package
(name "tsl-hopscotch-map")
--
2.45.2
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Mon, 26 Aug 2024 22:06:03 GMT) Full text and rfc822 format available.Message #35 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v4 6/8] gnu: Add xdgpp. Date: Tue, 27 Aug 2024 00:01:08 +0200
* gnu/packages/cpp.scm (xdgpp): New variable.
Change-Id: Ia11c0926e5b7f6e60c5dd48e8973cfd6391b1469
---
gnu/packages/cpp.scm | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 184d3a889c..6030963a3b 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -619,6 +619,39 @@ (define-public dashel
combination of these streams.")
(license license:bsd-3)))
+(define-public xdgpp
+ (let ((commit "f01f810714443d0f10c333d4d1d9c0383be41375")
+ (revision "0"))
+ (package
+ (name "xdgpp")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.sr.ht/~danyspin97/xdgpp")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1w8da10whrhc7j82jf90814m3blabkl9s0kg8hv8h2fj5y3ji7hw"))))
+ (build-system gnu-build-system)
+ (native-inputs (list catch2))
+ (arguments
+ (list
+ #:test-target "test"
+ #:phases #~(modify-phases %standard-phases
+ (delete 'configure)
+ (replace 'install
+ (lambda _
+ (install-file "xdg.hpp"
+ (string-append #$output "/include")))))))
+ (home-page "https://git.sr.ht/~danyspin97/xdgpp")
+ (synopsis
+ "C++17 header-only implementation of the XDG Base Directory Specification")
+ (description
+ "C++17 header-only implementation of the XDG Base Directory Specification.")
+ (license license:expat))))
+
(define-public xsimd
(package
(name "xsimd")
--
2.45.2
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Mon, 26 Aug 2024 22:06:04 GMT) Full text and rfc822 format available.Message #38 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v4 7/8] gnu: Add imhex-pattern-language. Date: Tue, 27 Aug 2024 00:01:09 +0200
* gnu/packages/hexedit.scm (imhex-pattern-language): New variable.
Change-Id: I641bebed0bea9b2c8aca87f54d0fb457064a07d7
---
gnu/packages/hexedit.scm | 74 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 73 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/hexedit.scm b/gnu/packages/hexedit.scm
index 668699a28c..e5f58fcce0 100644
--- a/gnu/packages/hexedit.scm
+++ b/gnu/packages/hexedit.scm
@@ -22,15 +22,20 @@
(define-module (gnu packages hexedit)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages compression)
#:use-module (gnu packages man)
+ #:use-module (gnu packages cpp)
+ #:use-module (gnu packages gcc)
+ #:use-module (gnu packages python)
#:use-module (gnu packages ncurses)
#:use-module (guix download)
#:use-module (guix git-download)
- #:use-module (guix build-system gnu))
+ #:use-module (guix build-system gnu)
+ #:use-module (guix build-system cmake))
(define-public hexedit
(package
@@ -94,6 +99,73 @@ (define-public ht
(home-page "https://hte.sourceforge.net/")
(license license:gpl2)))
+;; NOTE: `imhex-pattern-language' should improve it's build system to be used
+;; easily outside of ImHex. It should update it's shared library install target
+;; to deploy the header files and it should create the pertinent
+;; 'libpl-config.cmake' and 'libpl-config-version.cmake' files.
+(define-public imhex-pattern-language
+ (package
+ (name "imhex-pattern-language")
+ (version "1.35.4")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/WerWolv/PatternLanguage")
+ (commit (string-append "ImHex-v" version))
+ (recursive? #t)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0riphslp3rca6z6f5zfvsisdh94apijfi03s7yap1vjnf6i93pks"))
+ (snippet
+ #~(begin
+ (use-modules (guix build utils))
+ ;; NOTE: the `throwing-ptr' hasn't been updated in 6 years and
+ ;; the testsuite expects to use an outdated version of Conan,
+ ;; since this library if not interesting to have it in Guix
+ ;; it will remain bundled.
+ ;; NOTE: `libwolf' does not have an install target. Until the
+ ;; maintainers create one, it will be bundled.
+ (with-directory-excursion "external"
+ (for-each (lambda (path)
+ (delete-file-recursively path))
+ '("nlohmann_json" "cli11")))))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:configure-flags
+ ''("-DLIBPL_SHARED_LIBRARY=ON"
+ "-DLIBPL_ENABLE_TESTS=ON"
+
+ "-DUSE_SYSTEM_NLOHMANN_JSON=ON"
+ "-DUSE_SYSTEM_CLI11=ON"
+ ;; NOTE: the `fmt' package is vendored since it needs
+ ;; a specific commit. Until there is a compatible
+ ;; release, there is no interest in creating a Guix
+ ;; package for it.
+ "-DUSE_SYSTEM_FMT=OFF")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-rel-paths
+ (lambda _
+ (substitute* "tests/include/test_patterns/test_pattern_format.hpp"
+ (("../tests/files/export/")
+ "../source/tests/files/export/"))))
+ (add-after 'build 'build-tests
+ (lambda _
+ (invoke "make" "pattern_language_tests" "plcli")))
+ (add-before 'check 'plcli-integration-tests
+ (lambda _
+ (with-directory-excursion "../source"
+ (invoke "python3"
+ "tests/integration/integration.py"
+ "../build/cli/plcli")))))))
+ (native-inputs (list cli11 gcc-14 nlohmann-json python))
+ (home-page "https://imhex.werwolv.net")
+ (synopsis "The Pattern Language used by the ImHex Hex Editor")
+ (description "The Pattern Language used by the ImHex Hex Editor.")
+ (license license:lgpl2.1)))
+
(define-public bvi
(package
(name "bvi")
--
2.45.2
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Mon, 26 Aug 2024 22:06:04 GMT) Full text and rfc822 format available.Message #41 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v4 8/8] gnu: Add imhex. Date: Tue, 27 Aug 2024 00:01:10 +0200
* gnu/packages/hexedit.scm (imhex): New variable.
Change-Id: I114d3a6c0dae32ea434a77a6bd88b8ff6870b70c
---
gnu/packages/hexedit.scm | 151 +++++++++++++++++++++++++++++++++++++++
1 file changed, 151 insertions(+)
diff --git a/gnu/packages/hexedit.scm b/gnu/packages/hexedit.scm
index e5f58fcce0..0eb551b54e 100644
--- a/gnu/packages/hexedit.scm
+++ b/gnu/packages/hexedit.scm
@@ -27,11 +27,24 @@ (define-module (gnu packages hexedit)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages gl)
#:use-module (gnu packages man)
#:use-module (gnu packages cpp)
#:use-module (gnu packages gcc)
+ #:use-module (gnu packages tls)
+ #:use-module (gnu packages curl)
+ #:use-module (gnu packages llvm)
+ #:use-module (gnu packages ruby)
+ #:use-module (gnu packages glib)
+ #:use-module (gnu packages boost)
+ #:use-module (gnu packages backup)
#:use-module (gnu packages python)
+ #:use-module (gnu packages libffi)
#:use-module (gnu packages ncurses)
+ #:use-module (gnu packages fontutils)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages engineering)
+ #:use-module (gnu packages pretty-print)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
@@ -166,6 +179,144 @@ (define-public imhex-pattern-language
(description "The Pattern Language used by the ImHex Hex Editor.")
(license license:lgpl2.1)))
+(define-public imhex
+ (package
+ (name "imhex")
+ (version "1.35.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/WerWolv/ImHex")
+ (commit (string-append "v" version))
+ (recursive? #t)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0gi5772w0fzgr1w403ckq2mkwiyvcxv08frs2fjr2hlc8hb6c2p9"))
+ (snippet
+ #~(begin
+ (use-modules (guix build utils))
+ (define (delete-files-from-list-recursively . args)
+ (for-each (lambda (path)
+ (delete-file-recursively path))
+ args))
+
+ (define (replace-files-from-list-recursively lst)
+ (for-each
+ (lambda (elt)
+ (delete-file-recursively (cdr elt))
+ (copy-recursively (car elt) (cdr elt)))
+ lst))
+
+ ;; NOTE: `libwolf' does not have an install target. Until the
+ ;; maintainers create one, it will remain bundled.
+ ;; NOTE: `libromfs' it's meant to be bundled and cannot be compiled
+ ;; independently. Until the maintainers support building it
+ ;; independently, it will remain bundled.
+ ;; NOTE: `imhex-pattern-language' it's meant to be bundled and
+ ;; cannot be linked independently. Until the maintainers support
+ ;; linking it independently, it's source will be replaced in-tree.
+ (replace-files-from-list-recursively
+ `((#$(package-source imhex-pattern-language)
+ . "lib/external/pattern_language")))
+ ;; NOTE: `hashlibplus' has been left as a submodule since it's a fork
+ ;; which only makes sense within ImHex.
+ (with-directory-excursion "lib/third_party"
+ (delete-files-from-list-recursively
+ "nlohmann_json" "capstone" "llvm-demangle" "fmt" "nativefiledialog"
+ ;; NOTE: for versions above c++20 it is not required.
+ "jthread/jthread")
+ (replace-files-from-list-recursively
+ `((#$(package-source lunasvg) . "lunasvg")
+ (#$(package-source xdgpp) . "xdgpp")
+ (#$(file-append miniaudio "/include/miniaudio.h")
+ . "miniaudio/include/miniaudio.h"))))))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ ;; NOTE: there is an issue with the way the test library is linked with
+ ;; the output binaries. Tests are intrusive and should not be shipped
+ ;; with the release, when the issue is fixed we could add a phase which
+ ;; builds the package with the tests and runs the testsuite and a second
+ ;; build phase which prepares the output binary.
+ #:configure-flags
+ ''("-DIMHEX_OFFLINE_BUILD=ON"
+ "-DIMHEX_ENABLE_UNIT_TESTS=ON"
+ ;; NOTE: required for the `validate-runpath' phase.
+ ;; If OFF, the pluggings won't be able to find `libimhex.so'.
+ "-DIMHEX_PLUGIN_ADD_INSTALL_PREFIX_TO_RPATH=ON"
+
+ "-DUSE_SYSTEM_NLOHMANN_JSON=ON"
+ "-DUSE_SYSTEM_CAPSTONE=ON"
+ "-DUSE_SYSTEM_CLI11=ON"
+ "-DUSE_SYSTEM_LLVM=ON"
+ "-DUSE_SYSTEM_FMT=ON"
+
+ "-DUSE_SYSTEM_BOOST=ON"
+ "-DUSE_SYSTEM_EDLIB=ON"
+ "-DUSE_SYSTEM_NFD=ON"
+
+ ;; NOTE: the build system doesn't correctly support
+ ;; locating these system libraries. Until fixed
+ ;; upstream, drop the sources where they are
+ ;; expected, this is done in the `<origin>' snippet.
+ "-DUSE_SYSTEM_MINIAUDIO=OFF"
+ "-DUSE_SYSTEM_LUNASVG=OFF"
+
+ ;; TODO: package them.
+ "-DUSE_SYSTEM_YARA=OFF")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda _
+ (substitute* "main/gui/source/window/linux_window.cpp"
+ (("dbus-send")
+ #$(file-append dbus "/bin/dbus-send")))
+ (substitute* "cmake/build_helpers.cmake"
+ (("boost REQUIRED")
+ "Boost COMPONENTS regex REQUIRED")
+ (("boost::regex")
+ "Boost::regex"))
+ (substitute* "lib/libimhex/CMakeLists.txt"
+ (("boost")
+ "Boost"))))
+ (add-before 'check 'build-tests
+ (lambda _
+ (invoke "make" "unit_tests"))))))
+ (native-inputs
+ (list cli11
+ nlohmann-json
+ pkg-config
+ python
+ python-wrapper
+ ruby
+ gcc-14))
+ (inputs
+ (list boost
+ capstone
+ curl
+ edlib
+ fmt
+ glfw
+ libarchive
+ libffi
+ llvm-17
+ mbedtls
+ mesa
+ nativefiledialog-extended
+ xz
+ zlib
+ freetype))
+ (home-page "https://imhex.werwolv.net")
+ (synopsis "Hex Editor to display, decode and analyze binary data")
+ (description "@command{imhex} is a hex editor with many advanced features
+that can often only be found in paid applications. Such features are a
+completely custom binary template and pattern language to decode and highlight
+structures in the data, a graphical node-based data processor to pre-process
+values before they're displayed, a disassembler, diffing support, bookmarks
+and much much more.")
+ (license license:gpl2)))
+
(define-public bvi
(package
(name "bvi")
--
2.45.2
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Mon, 26 Aug 2024 22:06:05 GMT) Full text and rfc822 format available.Message #44 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v4 1/8] gnu: Add edlib. Date: Tue, 27 Aug 2024 00:01:03 +0200
* gnu/packages/cpp.scm (edlib): New variable.
Change-Id: Ia38b1d92d64134f638b13d9afb981f44a374a10e
---
gnu/packages/cpp.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 7dca7a2d02..708487ca97 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -390,6 +390,28 @@ (define-public c2ffi
various formats, including @code{json}.")
(license license:gpl2+)))
+(define-public edlib
+ (package
+ (name "edlib")
+ (version "1.2.7")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Martinsos/edlib")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0ibpxs3r8ii2s3g7kdbyr8brg6ha5l0fb21idw8531gx9v2qzh4v"))))
+ (build-system cmake-build-system)
+ (arguments
+ '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
+ (home-page "https://github.com/Martinsos/edlib")
+ (synopsis "Lightweight C/C++ library for sequence alignment")
+ (description "Lightweight, C/C++ (& Python) library for sequence alignment
+using edit (Levenshtein) distance with a focus on speed.")
+ (license license:expat)))
+
(define-public expected-lite
(package
(name "expected-lite")
base-commit: 732dac4ce0de75ba0ffd79558e876815b273c925
--
2.45.2
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Mon, 26 Aug 2024 22:34:02 GMT) Full text and rfc822 format available.Message #47 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> To: jgart <jgart <at> dismail.de>, 67755 <at> debbugs.gnu.org Subject: Re: [PATCH] gnu: Add imhex. Date: Tue, 27 Aug 2024 00:32:01 +0200
Hello, again. I forgot to add the Copyright line in the files where I added new packages. If this patch series gets merged and maintainers find it appropriate, please add it for me in the pertinent commit: --8<---------------cut here---------------start------------->8--- ;;; Copyright © 2024 Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> --8<---------------cut here---------------end--------------->8--- Thanks! Sergio.
sergio.pastorperez <at> outlook.es, jgart <at> dismail.de, code <at> greghogan.com, guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Tue, 11 Mar 2025 19:18:02 GMT) Full text and rfc822 format available.Message #50 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> gmail.com> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v5 1/9] gnu: Add edlib. Date: Tue, 11 Mar 2025 20:15:17 +0100
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es>
* gnu/packages/cpp.scm (edlib): New variable.
Change-Id: Ia38b1d92d64134f638b13d9afb981f44a374a10e
---
gnu/packages/cpp.scm | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 8d482d1fbd..338455b9fb 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -43,7 +43,8 @@
;;; Copyright © 2024 Peepo Froggings <peepofroggings <at> tutanota.de>
;;; Copyright © 2024 Jakob Kirsch <jakob.kirsch <at> web.de>
;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus <at> gmail.com>
-
+;;; Copyright © 2025 Sergio Pastor Pérez <sergio.pastorperez <at> gmail.com>
+;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
@@ -468,6 +469,28 @@ (define-public c2ffi
various formats, including @code{json}.")
(license license:gpl2+)))
+(define-public edlib
+ (package
+ (name "edlib")
+ (version "1.2.7")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Martinsos/edlib")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0ibpxs3r8ii2s3g7kdbyr8brg6ha5l0fb21idw8531gx9v2qzh4v"))))
+ (build-system cmake-build-system)
+ (arguments
+ '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
+ (home-page "https://github.com/Martinsos/edlib")
+ (synopsis "Lightweight C/C++ library for sequence alignment")
+ (description "Lightweight, C/C++ (& Python) library for sequence alignment
+using edit (Levenshtein) distance with a focus on speed.")
+ (license license:expat)))
+
(define-public expected-lite
(package
(name "expected-lite")
base-commit: 3bf7a0e8c431abfcba51806ee2a3eea9e0865472
--
2.48.1
sergio.pastorperez <at> outlook.es, jgart <at> dismail.de, code <at> greghogan.com, guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Tue, 11 Mar 2025 19:18:02 GMT) Full text and rfc822 format available.Message #53 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> gmail.com> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v5 2/9] gnu: Add jthread. Date: Tue, 11 Mar 2025 20:15:18 +0100
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es>
* gnu/packages/cpp.scm (jthread): New variable.
Change-Id: I163ab0f8dbd9bc5ed0250612938f82926b07bc92
---
gnu/packages/cpp.scm | 95 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 95 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 338455b9fb..e0c6be7905 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -118,6 +118,7 @@ (define-module (gnu packages cpp)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages tls)
+ #:use-module (gnu packages tex)
#:use-module (gnu packages web)
#:use-module (gnu packages webkit)
#:use-module (gnu packages xdisorg)
@@ -1145,6 +1146,100 @@ (define-public nlohmann-json
(define-public json-modern-cxx
(deprecated-package "json-modern-cxx" nlohmann-json))
+(define-public jthread
+ (let ((commit "0fa8d394254886c555d6faccd0a3de819b7d47f8")
+ (revision "0"))
+ (package
+ (name "jthread")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/josuttis/jthread")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "11cq4zh7pv86c62ah5im00gxr4cw6d396dp9117z8s271j4lrp6f"))
+ (snippet
+ ;; NOTE: remove precompiled PDFs.
+ #~(begin
+ (use-modules (guix build utils))
+ (for-each (lambda (file)
+ (delete-file file))
+ (find-files "." ".pdf"))
+ (delete-file-recursively "doc")))))
+ (outputs '("out" "doc"))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ (delete 'build)
+ (add-after 'unpack 'cd-and-generate-makefile
+ (lambda _
+ (call-with-output-file "source/Makefile.h"
+ (lambda (port)
+ ;; GCC 2.95 fails to deal with anonymous unions in glibc's
+ ;; 'struct_rusage.h', so skip that.
+ (display "CXX17 := c++ -std=c++17 -pthread\n" port)))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "make" "-C" "source"))))
+ (add-after 'check 'build-docs
+ (lambda _
+ (with-directory-excursion "tex"
+ ;; NOTE: remove strict versioning.
+ (substitute* "styles.tex"
+ (("lst <at> CheckVersion\\{1.6\\}")
+ "lst <at> CheckVersion{1.10}"))
+ (invoke "pdflatex" "std")
+ (invoke "pdflatex" "std")))) ;Rerun to update references.
+ (replace 'install
+ (lambda _
+ (for-each (lambda (file)
+ (install-file file
+ (string-append #$output "/include")))
+ '("source/condition_variable_any2.hpp"
+ "source/stop_token.hpp" "source/jthread.hpp"))))
+ (add-after 'install 'install-doc
+ (lambda _
+ (let ((out (string-append #$output:doc "/share/doc/")))
+ (mkdir-p out)
+ (copy-file "tex/std.pdf"
+ (string-append out
+ #$name "-"
+ #$version ".pdf"))))))))
+ (native-inputs
+ (list perl
+ (texlive-updmap.cfg
+ (list texlive-ulem
+ texlive-rsfs
+ texlive-memoir
+ texlive-substr
+ texlive-xcolor
+ texlive-isodate
+ texlive-caption
+ texlive-relsize
+ texlive-extract
+ texlive-xpatch
+ texlive-xkeyval
+ texlive-jknapltx
+ texlive-booktabs
+ texlive-enumitem
+ texlive-etoolbox
+ texlive-listings
+ texlive-microtype
+ texlive-underscore))))
+ (home-page "https://github.com/josuttis/jthread")
+ (synopsis "C++ class for a joining and cooperative interruptible thread")
+ (description
+ "C++ class for a joining and cooperative interruptible thread
+(std::jthread) with stop_token helper.")
+ (license license:cc-by4.0))))
+
(define-public tomlplusplus
(package
(name "tomlplusplus")
--
2.48.1
sergio.pastorperez <at> outlook.es, jgart <at> dismail.de, code <at> greghogan.com, guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Tue, 11 Mar 2025 19:18:03 GMT) Full text and rfc822 format available.Message #56 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> gmail.com> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> gmail.com> Subject: [PATCH v5 3/9] gnu: Add plutovg. Date: Tue, 11 Mar 2025 20:15:19 +0100
* gnu/packages/cpp.scm (plutovg): New variable.
Change-Id: I23d615af1545b79f07a64902c472e6a2e081af5a
---
gnu/packages/cpp.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index e0c6be7905..530111da4d 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -614,6 +614,28 @@ (define-public rct
(license (list license:expat ; cJSON
license:bsd-4))))) ; everything else (LICENSE.txt)
+(define-public plutovg
+ (package
+ (name "plutovg")
+ (version "0.0.13")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sammycage/plutovg")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0y2w0qhs89bnh440z1xj65vg4c71rlwinxgs3p8bvh2fmbi7lqff"))))
+ (build-system cmake-build-system)
+ (arguments
+ '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")
+ #:tests? #f)) ;No tests.
+ (home-page "https://github.com/sammycage/plutovg")
+ (synopsis "Tiny 2D vector graphics library in C")
+ (description "PlutoVG is a standalone 2D vector graphics library in C.")
+ (license license:expat)))
+
(define-public pystring
(package
(name "pystring")
--
2.48.1
sergio.pastorperez <at> outlook.es, jgart <at> dismail.de, code <at> greghogan.com, guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Tue, 11 Mar 2025 19:18:03 GMT) Full text and rfc822 format available.Message #59 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> gmail.com> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v5 4/9] gnu: Add lunasvg. Date: Tue, 11 Mar 2025 20:15:20 +0100
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es>
* gnu/packages/cpp.scm (lunasvg): New variable.
Change-Id: I77b7943e26e4e676a1575e3e33305f6f4476b401
---
gnu/packages/cpp.scm | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 530111da4d..252e809a10 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -546,6 +546,32 @@ (define-public libzen
operating system functions.")
(license license:zlib)))
+(define-public lunasvg
+ (package
+ (name "lunasvg")
+ (version "3.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sammycage/lunasvg")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "14ppk3k6sdbf3lwhv2gjqy32vwa7ck9jcj9xfk0fxwfqbvbp6608"))))
+ (build-system cmake-build-system)
+ (inputs (list plutovg))
+ (arguments
+ '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")
+ #:tests? #f)) ;No tests.
+ (home-page "https://github.com/sammycage/lunasvg")
+ (synopsis "SVG rendering and manipulation library in C++")
+ (description
+ "LunaSVG is an SVG rendering library in C++, designed to be
+lightweight and portable, offering efficient rendering and manipulation of
+Scalable Vector Graphics (SVG) files.")
+ (license license:expat)))
+
(define-public rttr
(package
(name "rttr")
--
2.48.1
sergio.pastorperez <at> outlook.es, jgart <at> dismail.de, code <at> greghogan.com, guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Tue, 11 Mar 2025 19:18:04 GMT) Full text and rfc822 format available.Message #62 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> gmail.com> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v5 5/9] gnu: Add miniaudio. Date: Tue, 11 Mar 2025 20:15:21 +0100
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es>
* gnu/packages/cpp.scm (miniaudio): New variable.
Change-Id: I27b74793dd7b80af4437e0a1b997cc87fe8822e5
---
gnu/packages/cpp.scm | 60 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 60 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 252e809a10..a4083604c1 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1957,6 +1957,66 @@ (define (make-static-abseil-cpp version)
#~(cons* "-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
(delete "-DBUILD_SHARED_LIBS=ON" #$flags)))))))))
+(define-public miniaudio
+ (package
+ (name "miniaudio")
+ (version "0.11.22")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mackron/miniaudio")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1pjaiq71x24n9983vkhjxrsbraa24053h727db22b1rb2xyfrzm3"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'build)
+ (delete 'configure)
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (with-directory-excursion "tests/_build"
+ (let ((tests '("conversion" "filtering" "generation")))
+ (mkdir "bin")
+ ;; Compile tests
+ (for-each (lambda (test)
+ (invoke "gcc"
+ (string-append "../" test "/" test
+ ".c")
+ "-o"
+ (string-append "bin/" test)
+ "-ldl"
+ "-lm"
+ "-lpthread"
+ "-Wall"
+ "-Wextra"
+ "-Wpedantic")
+ (let ((bin (string-append "./bin/" test)))
+ (if (string= test "filtering")
+ ;; NOTE: the 'filtering' test
+ ;; requires an input file.
+ (invoke bin bin)
+ (invoke bin))))
+ tests))))))
+ (replace 'install
+ (lambda _
+ (install-file "miniaudio.h"
+ (string-append #$output "/include"))
+ (copy-recursively "extras"
+ (string-append #$output
+ "/include/extras/")))))))
+ (home-page "https://miniaud.io")
+ (synopsis "Audio playback and capture library for C and C++")
+ (description
+ "Miniaudio is an audio playback and capture library for C and C++. It is
+made up of a single source file and has no external dependencies.")
+ (license license:expat)))
+
(define-public abseil-cpp-cxxstd17
(abseil-cpp-for-c++-standard abseil-cpp 17)) ;XXX: the default with GCC 11?
--
2.48.1
sergio.pastorperez <at> outlook.es, jgart <at> dismail.de, code <at> greghogan.com, guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Tue, 11 Mar 2025 19:18:04 GMT) Full text and rfc822 format available.Message #65 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> gmail.com> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v5 6/9] gnu: Add nativefiledialog-extended. Date: Tue, 11 Mar 2025 20:15:22 +0100
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es>
* gnu/packages/cpp.scm (nativefiledialog-extended): New variable.
Change-Id: I89ed4554db3ec8075bbb7d50bbfb4b99cae81a27
---
gnu/packages/cpp.scm | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index a4083604c1..ff4f7f3f9d 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -3691,6 +3691,31 @@ (define-public mpark-variant
based on the implementation of std::variant in libc++.")
(license license:boost1.0)))
+(define-public nativefiledialog-extended
+ (package
+ (name "nativefiledialog-extended")
+ (version "1.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/btzy/nativefiledialog-extended")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "15l0jy3v4p6rgg9dk8zr80lqp51s32ii62cm4s90400ragdgh10v"))))
+ (build-system cmake-build-system)
+ (arguments
+ '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
+ (native-inputs (list pkg-config))
+ (inputs (list gtk+))
+ (home-page "https://github.com/btzy/nativefiledialog-extended")
+ (synopsis "Native file dialog library with C and C++ bindings")
+ (description
+ "Cross platform (Windows, Mac, Linux) native file dialog
+library with C and C++ bindings, based on mlabbe/nativefiledialog.")
+ (license license:zlib)))
+
(define-public tsl-hopscotch-map
(package
(name "tsl-hopscotch-map")
--
2.48.1
sergio.pastorperez <at> outlook.es, jgart <at> dismail.de, code <at> greghogan.com, guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Tue, 11 Mar 2025 19:18:05 GMT) Full text and rfc822 format available.Message #68 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> gmail.com> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v5 7/9] gnu: Add xdgpp. Date: Tue, 11 Mar 2025 20:15:23 +0100
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es>
* gnu/packages/cpp.scm (xdgpp): New variable.
Change-Id: Ia11c0926e5b7f6e60c5dd48e8973cfd6391b1469
---
gnu/packages/cpp.scm | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index ff4f7f3f9d..3c1097ae74 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -748,6 +748,40 @@ (define-public debug-assert
enabled in different parts of your code.")
(license license:zlib)))
+(define-public xdgpp
+ (let ((commit "f01f810714443d0f10c333d4d1d9c0383be41375")
+ (revision "0"))
+ (package
+ (name "xdgpp")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.sr.ht/~danyspin97/xdgpp")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1w8da10whrhc7j82jf90814m3blabkl9s0kg8hv8h2fj5y3ji7hw"))))
+ (build-system gnu-build-system)
+ (native-inputs (list catch2))
+ (arguments
+ (list
+ #:test-target "test"
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ (replace 'install
+ (lambda _
+ (install-file "xdg.hpp"
+ (string-append #$output "/include")))))))
+ (home-page "https://git.sr.ht/~danyspin97/xdgpp")
+ (synopsis
+ "C++17 header-only implementation of the XDG Base Directory Specification")
+ (description
+ "C++17 header-only implementation of the XDG Base Directory Specification.")
+ (license license:expat))))
+
(define-public xsimd
(package
(name "xsimd")
--
2.48.1
sergio.pastorperez <at> outlook.es, jgart <at> dismail.de, guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Tue, 11 Mar 2025 19:18:05 GMT) Full text and rfc822 format available.Message #71 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> gmail.com> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v5 8/9] gnu: Add imhex-pattern-language. Date: Tue, 11 Mar 2025 20:15:24 +0100
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es>
* gnu/packages/hexedit.scm (imhex-pattern-language): New variable.
Change-Id: I641bebed0bea9b2c8aca87f54d0fb457064a07d7
---
gnu/packages/hexedit.scm | 74 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 73 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/hexedit.scm b/gnu/packages/hexedit.scm
index 15bf7db877..2eab13e239 100644
--- a/gnu/packages/hexedit.scm
+++ b/gnu/packages/hexedit.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2018, 2020, 2022 Tobias Geerinckx-Rice <me <at> tobias.gr>
;;; Copyright © 2020 Jakub Kądziołka <kuba <at> kadziolka.net>
;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom <at> gmail.com>
+;;; Copyright © 2025 Sergio Pastor Pérez <sergio.pastorperez <at> gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -22,17 +23,22 @@
(define-module (gnu packages hexedit)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages compression)
#:use-module (gnu packages man)
+ #:use-module (gnu packages cpp)
+ #:use-module (gnu packages gcc)
+ #:use-module (gnu packages python)
#:use-module (gnu packages ncurses)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix gexp)
#:use-module (guix utils)
- #:use-module (guix build-system gnu))
+ #:use-module (guix build-system gnu)
+ #:use-module (guix build-system cmake))
(define-public hexedit
(package
@@ -137,6 +143,72 @@ (define-public ht
(home-page "https://hte.sourceforge.net/")
(license license:gpl2)))
+;; NOTE: `imhex-pattern-language' should improve it's build system to be used
+;; easily outside of ImHex. It should update it's shared library install
+;; target to deploy the header files and it should create the pertinent
+;; 'libpl-config.cmake' and 'libpl-config-version.cmake' files.
+(define-public imhex-pattern-language
+ (package
+ (name "imhex-pattern-language")
+ (version "1.37.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/WerWolv/PatternLanguage")
+ (commit (string-append "ImHex-v" version))
+ (recursive? #t)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "13mlbclg2r3axv6vz4dsyry5azc6xavcbdkvwan6zyaq9ngk7r3r"))
+ (snippet #~(begin
+ (use-modules (guix build utils))
+ (define (delete-files-from-list-recursively . args)
+ (for-each (lambda (path)
+ (delete-file-recursively path)) args))
+ ;; NOTE: the `throwing-ptr' hasn't been updated in 6 years
+ ;; and the testsuite expects to use an outdated version of
+ ;; Conan, since this library if not interesting to have it
+ ;; in Guix it will remain bundled.
+ ;; NOTE: `libwolf' does not have an install target. Until
+ ;; the maintainers create one, it will be bundled.
+ (with-directory-excursion "external"
+ (delete-files-from-list-recursively "nlohmann_json"
+ "cli11"))))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:configure-flags ''("-DLIBPL_SHARED_LIBRARY=ON"
+ "-DLIBPL_ENABLE_TESTS=ON"
+
+ "-DUSE_SYSTEM_NLOHMANN_JSON=ON"
+ "-DUSE_SYSTEM_CLI11=ON"
+ ;; NOTE: the `fmt' package is vendored since it
+ ;; needs a specific commit. Until there is a
+ ;; compatible release, there is no interest in
+ ;; creating a Guix package for it.
+ "-DUSE_SYSTEM_FMT=OFF")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-rel-paths
+ (lambda _
+ (substitute* "tests/include/test_patterns/test_pattern_format.hpp"
+ (("../tests/files/export/")
+ "../source/tests/files/export/"))))
+ (add-after 'build 'build-tests
+ (lambda _
+ (invoke "make" "pattern_language_tests" "plcli")))
+ (add-before 'check 'plcli-integration-tests
+ (lambda _
+ (with-directory-excursion "../source"
+ (invoke "python3" "tests/integration/integration.py"
+ "../build/cli/plcli")))))))
+ (native-inputs (list cli11 gcc-14 nlohmann-json python))
+ (home-page "https://imhex.werwolv.net")
+ (synopsis "The Pattern Language used by the ImHex Hex Editor")
+ (description "The Pattern Language used by the ImHex Hex Editor.")
+ (license license:lgpl2.1)))
+
(define-public bvi
(package
(name "bvi")
--
2.48.1
sergio.pastorperez <at> outlook.es, jgart <at> dismail.de, guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Tue, 11 Mar 2025 19:19:02 GMT) Full text and rfc822 format available.Message #74 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> gmail.com> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v5 9/9] gnu: Add imhex. Date: Tue, 11 Mar 2025 20:15:25 +0100
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es>
* gnu/packages/hexedit.scm (imhex): New variable.
Change-Id: I114d3a6c0dae32ea434a77a6bd88b8ff6870b70c
---
gnu/packages/hexedit.scm | 169 +++++++++++++++++++++++++++++++++++++++
1 file changed, 169 insertions(+)
diff --git a/gnu/packages/hexedit.scm b/gnu/packages/hexedit.scm
index 2eab13e239..e9b9698c22 100644
--- a/gnu/packages/hexedit.scm
+++ b/gnu/packages/hexedit.scm
@@ -28,11 +28,25 @@ (define-module (gnu packages hexedit)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages gl)
#:use-module (gnu packages man)
#:use-module (gnu packages cpp)
#:use-module (gnu packages gcc)
+ #:use-module (gnu packages tls)
+ #:use-module (gnu packages curl)
+ #:use-module (gnu packages llvm)
+ #:use-module (gnu packages ruby)
+ #:use-module (gnu packages glib)
+ #:use-module (gnu packages boost)
+ #:use-module (gnu packages backup)
#:use-module (gnu packages python)
+ #:use-module (gnu packages libffi)
#:use-module (gnu packages ncurses)
+ #:use-module (gnu packages antivirus)
+ #:use-module (gnu packages fontutils)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages engineering)
+ #:use-module (gnu packages pretty-print)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix gexp)
@@ -209,6 +223,161 @@ (define-public imhex-pattern-language
(description "The Pattern Language used by the ImHex Hex Editor.")
(license license:lgpl2.1)))
+(define-public imhex
+ ;; NOTE: imhex-patterns does not support using `imhex-pattern-language'
+ ;; system package. Until it does, there is no point in making it a package.
+ (let ((version "1.37.4"))
+ (define-public imhex-patterns
+ (let ((name "imhex-patterns"))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/WerWolv/ImHex-Patterns")
+ (commit (string-append "ImHex-v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0m9g93fzmj2rsgaq25y4mmfigjh1xxyh41zjs6lp5ydsl5hhrn6q")))))
+ (package
+ (name "imhex")
+ (version version)
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/WerWolv/ImHex")
+ (commit (string-append "v" version))
+ (recursive? #t)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0l3fpizkz2ykdirbn9alddnnsg75w6kwpp92nvmird13l80z1sdr"))
+ (snippet
+ #~(begin
+ (use-modules (guix build utils))
+ (define (delete-files-from-list-recursively . args)
+ (for-each (lambda (path)
+ (delete-file-recursively path))
+ args))
+
+ (define (replace-files-from-list-recursively lst)
+ (for-each
+ (lambda (elt)
+ (delete-file-recursively (cdr elt))
+ (copy-recursively (car elt) (cdr elt)))
+ lst))
+
+ ;; NOTE: `libwolf' does not have an install target. Until the
+ ;; maintainers create one, it will remain bundled.
+ ;; NOTE: `libromfs' it's meant to be bundled and cannot be
+ ;; compiled independently. Until the maintainers support
+ ;; building it independently, it will remain bundled.
+ ;; NOTE: `imhex-pattern-language' it's meant to be bundled and
+ ;; cannot be linked independently. Until the maintainers support
+ ;; linking it independently, it's source will be replaced
+ ;; in-tree.
+ (replace-files-from-list-recursively
+ `((#$(package-source imhex-pattern-language)
+ . "lib/external/pattern_language")))
+ ;; NOTE: `hashlibplus' has been left as a submodule since it's a
+ ;; fork which only makes sense within ImHex.
+ (with-directory-excursion "lib/third_party"
+ (delete-files-from-list-recursively
+ "nlohmann_json" "capstone" "llvm-demangle"
+ "fmt" "nativefiledialog"
+ ;; NOTE: for versions above c++20 it is not required.
+ "jthread/jthread")
+ (replace-files-from-list-recursively
+ `((#$(package-source xdgpp) . "xdgpp")
+ (#$(file-append miniaudio "/include/miniaudio.h")
+ . "miniaudio/include/miniaudio.h"))))
+
+ ;; Drop `imhex-patters' in the source tree.
+ (copy-recursively #$imhex-patterns "ImHex-Patterns")))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ ;; NOTE: there is an issue with the way the test library is linked
+ ;; with the output binaries. Tests are intrusive and should not be
+ ;; shipped with the release, when the issue is fixed we could add a
+ ;; phase which builds the package with the tests and runs the
+ ;; testsuite and a second build phase which prepares the output
+ ;; binary.
+ #:configure-flags
+ ''("-DIMHEX_ENABLE_UNIT_TESTS=ON"
+ "-DIMHEX_OFFLINE_BUILD=ON"
+ ;; NOTE: required for the `validate-runpath' phase.
+ ;; If OFF, the pluggings won't be able to find `libimhex.so'.
+ "-DIMHEX_PLUGIN_ADD_INSTALL_PREFIX_TO_RPATH=ON"
+
+ "-DUSE_SYSTEM_NLOHMANN_JSON=ON"
+ "-DUSE_SYSTEM_CAPSTONE=ON"
+ "-DUSE_SYSTEM_LUNASVG=ON"
+ "-DUSE_SYSTEM_CLI11=ON"
+ "-DUSE_SYSTEM_BOOST=ON"
+ "-DUSE_SYSTEM_EDLIB=ON"
+ "-DUSE_SYSTEM_YARA=ON"
+ "-DUSE_SYSTEM_LLVM=ON"
+ "-DUSE_SYSTEM_FMT=ON"
+ "-DUSE_SYSTEM_NFD=ON"
+
+ ;; NOTE: the build system doesn't correctly support
+ ;; locating these system libraries. Until fixed
+ ;; upstream, drop the sources where they are
+ ;; expected, this is done in the `<origin>' snippet.
+ "-DUSE_SYSTEM_MINIAUDIO=OFF")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda _
+ (substitute* "main/gui/source/window/linux_window.cpp"
+ (("dbus-send")
+ #$(file-append dbus "/bin/dbus-send")))
+ (substitute* "cmake/build_helpers.cmake"
+ (("Boost REQUIRED")
+ "Boost COMPONENTS regex REQUIRED"))))
+ (add-before 'check 'build-tests
+ (lambda _
+ (invoke "make" "unit_tests"))))))
+ (native-inputs
+ (list cli11
+ nlohmann-json
+ pkg-config
+ python
+ python-wrapper
+ ruby
+ gcc-14))
+ (inputs
+ (list yara
+ boost
+ capstone
+ curl
+ edlib
+ fmt
+ glfw
+ libarchive
+ libffi
+ llvm-17
+ lunasvg
+ plutovg
+ mbedtls
+ mesa
+ nativefiledialog-extended
+ xz
+ fontconfig
+ lz4
+ `(,zstd "lib")
+ zlib
+ freetype))
+ (home-page "https://imhex.werwolv.net")
+ (synopsis "Hex Editor to display, decode and analyze binary data")
+ (description "ImHex is a hex editor with many advanced features that can
+often only be found in paid applications. Such features are a completely
+custom binary template and pattern language to decode and highlight structures
+in the data, a graphical node-based data processor to pre-process values
+before they're displayed, a disassembler, diffing support, bookmarks and much
+much more.")
+ (license license:gpl2))))
+
(define-public bvi
(package
(name "bvi")
--
2.48.1
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Thu, 13 Mar 2025 03:42:01 GMT) Full text and rfc822 format available.Message #77 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Divya Ranjan <divya <at> subvertising.org> To: Sergio Pastor Pérez <sergio.pastorperez <at> gmail.com> Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es>, Cayetano Santos <cstanosb <at> inventati.org>, jgart <jgart <at> dismail.de>, 67755 <at> debbugs.gnu.org, Maxim Cournoyer <maxim.cournoyer <at> gmail.com> Subject: Re: [bug#67755] [PATCH v5 9/9] gnu: Add imhex. Date: Thu, 13 Mar 2025 03:40:59 +0000
Hello Sergio, thank you for tenaciously working on this series and revising it. v5 seems to build fine, and =guix lint= doesn’t complain either. I do see that for each package =guix style= tries to reindent the package definitions. But since this series has already been long enough, what I recommend is that the committers do a round of =guix style= before applying each patch. I’ll CC members of the electronics-team. Reviewed-by: Divya Ranjan Pattanaik <divya <at> subvertising.org> (for the whole series) -- Divya Ranjan, Philosophy, Mathematics, Libre Software. PGP Fingerprint: F0B3 1A69 8006 8FB8 096A 2F12 B245 10C6 108C 8D4A
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Thu, 13 Mar 2025 15:35:02 GMT) Full text and rfc822 format available.Message #80 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> gmail.com> To: Divya Ranjan <divya <at> subvertising.org> Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es>, jgart <jgart <at> dismail.de>, 67755 <at> debbugs.gnu.org, Maxim Cournoyer <maxim.cournoyer <at> gmail.com>, Cayetano Santos <csantosb <at> inventati.org> Subject: Re: [bug#67755] [PATCH v5 9/9] gnu: Add imhex. Date: Thu, 13 Mar 2025 16:34:41 +0100
Hello, Divyá. Divya Ranjan <divya <at> subvertising.org> writes: > [...] I do see that for each package =guix style= tries to reindent the package definitions. [...] I'm aware of those, I decided not to follow the `guix style' for some of them because it hindered readability. The commiter can decide if it is appropriate to style all the packages but I think they will prefer to leve them as they are, anyways `guix style' is not applied on every definition in Guix. Thanks for the review!
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Wed, 19 Mar 2025 17:03:03 GMT) Full text and rfc822 format available.Message #83 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: "Sergio Pastor Pérez" <liliana.prikler <at> gmail.com> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v6 1/8] gnu: Add jthread. Date: Wed, 19 Mar 2025 18:00:06 +0100
* gnu/packages/cpp.scm (jthread): New variable.
Change-Id: I163ab0f8dbd9bc5ed0250612938f82926b07bc92
---
Note: this package appears unused in the rest of the series.
gnu/packages/cpp.scm | 95 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 95 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 595ec82ccae..9673d607db1 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -118,6 +118,7 @@ (define-module (gnu packages cpp)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages tls)
+ #:use-module (gnu packages tex)
#:use-module (gnu packages web)
#:use-module (gnu packages webkit)
#:use-module (gnu packages xdisorg)
@@ -1146,6 +1147,100 @@ (define-public nlohmann-json
(define-public json-modern-cxx
(deprecated-package "json-modern-cxx" nlohmann-json))
+(define-public jthread
+ (let ((commit "0fa8d394254886c555d6faccd0a3de819b7d47f8")
+ (revision "0"))
+ (package
+ (name "jthread")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/josuttis/jthread")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "11cq4zh7pv86c62ah5im00gxr4cw6d396dp9117z8s271j4lrp6f"))
+ (snippet
+ ;; NOTE: remove precompiled PDFs.
+ #~(begin
+ (use-modules (guix build utils))
+ (for-each (lambda (file)
+ (delete-file file))
+ (find-files "." ".pdf"))
+ (delete-file-recursively "doc")))))
+ (outputs '("out" "doc"))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ (delete 'build)
+ (add-after 'unpack 'cd-and-generate-makefile
+ (lambda _
+ (call-with-output-file "source/Makefile.h"
+ (lambda (port)
+ ;; GCC 2.95 fails to deal with anonymous unions in glibc's
+ ;; 'struct_rusage.h', so skip that.
+ (display "CXX17 := c++ -std=c++17 -pthread\n" port)))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "make" "-C" "source"))))
+ (add-after 'check 'build-docs
+ (lambda _
+ (with-directory-excursion "tex"
+ ;; NOTE: remove strict versioning.
+ (substitute* "styles.tex"
+ (("lst <at> CheckVersion\\{1.6\\}")
+ "lst <at> CheckVersion{1.10}"))
+ (invoke "pdflatex" "std")
+ (invoke "pdflatex" "std")))) ;Rerun to update references.
+ (replace 'install
+ (lambda _
+ (for-each (lambda (file)
+ (install-file file
+ (string-append #$output "/include")))
+ '("source/condition_variable_any2.hpp"
+ "source/stop_token.hpp" "source/jthread.hpp"))))
+ (add-after 'install 'install-doc
+ (lambda _
+ (let ((out (string-append #$output:doc "/share/doc/")))
+ (mkdir-p out)
+ (copy-file "tex/std.pdf"
+ (string-append out
+ #$name "-"
+ #$version ".pdf"))))))))
+ (native-inputs
+ (list perl
+ (texlive-updmap.cfg
+ (list texlive-ulem
+ texlive-rsfs
+ texlive-memoir
+ texlive-substr
+ texlive-xcolor
+ texlive-isodate
+ texlive-caption
+ texlive-relsize
+ texlive-extract
+ texlive-xpatch
+ texlive-xkeyval
+ texlive-jknapltx
+ texlive-booktabs
+ texlive-enumitem
+ texlive-etoolbox
+ texlive-listings
+ texlive-microtype
+ texlive-underscore))))
+ (home-page "https://github.com/josuttis/jthread")
+ (synopsis "C++ class for a joining and cooperative interruptible thread")
+ (description
+ "This package provides a reference implementation of @code{std::jthread},
+a cooperatively interruptible thread that is joined upon destruction.")
+ (license license:cc-by4.0))))
+
(define-public tomlplusplus
(package
(name "tomlplusplus")
--
2.48.1
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Wed, 19 Mar 2025 17:03:04 GMT) Full text and rfc822 format available.Message #86 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v6 0/8] gnu: Add imhex Date: Wed, 19 Mar 2025 18:00:00 +0100
Hi Sergio, I was made aware of your series. Unfortunately, I changed more during the review process than I'd have liked, so I will be resending this as v6. Please review the changes and my notes closely. I will wait a week as outlined in the Commit Policy before pushing. Cheers Sergio Pastor Pérez (8): gnu: Add jthread. gnu: Add plutovg. gnu: Add lunasvg. gnu: Add miniaudio. gnu: Add nativefiledialog-extended. gnu: Add xdgpp. gnu: Add imhex-pattern-language. gnu: Add imhex. gnu/packages/cpp.scm | 264 +++++++++++++++++++++++++++++++++++++++ gnu/packages/hexedit.scm | 248 +++++++++++++++++++++++++++++++++++- 2 files changed, 511 insertions(+), 1 deletion(-) base-commit: df799a61ef73451e587cb81942c7bfcbbade9e7e -- 2.48.1
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Wed, 19 Mar 2025 17:03:05 GMT) Full text and rfc822 format available.Message #89 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: "Sergio Pastor Pérez" <liliana.prikler <at> gmail.com> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v6 2/8] gnu: Add plutovg. Date: Wed, 19 Mar 2025 18:00:07 +0100
* gnu/packages/cpp.scm (plutovg): New variable.
Change-Id: I23d615af1545b79f07a64902c472e6a2e081af5a
---
gnu/packages/cpp.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 9673d607db1..d4cf4a68ac8 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -615,6 +615,28 @@ (define-public rct
(license (list license:expat ; cJSON
license:bsd-4))))) ; everything else (LICENSE.txt)
+(define-public plutovg
+ (package
+ (name "plutovg")
+ (version "0.0.13")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sammycage/plutovg")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0y2w0qhs89bnh440z1xj65vg4c71rlwinxgs3p8bvh2fmbi7lqff"))))
+ (build-system cmake-build-system)
+ (arguments
+ '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")
+ #:tests? #f)) ;No tests.
+ (home-page "https://github.com/sammycage/plutovg")
+ (synopsis "Tiny 2D vector graphics library in C")
+ (description "PlutoVG is a standalone 2D vector graphics library in C.")
+ (license license:expat)))
+
(define-public pystring
(package
(name "pystring")
--
2.48.1
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Wed, 19 Mar 2025 17:04:01 GMT) Full text and rfc822 format available.Message #92 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: "Sergio Pastor Pérez" <liliana.prikler <at> gmail.com> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v6 3/8] gnu: Add lunasvg. Date: Wed, 19 Mar 2025 18:00:07 +0100
* gnu/packages/cpp.scm (lunasvg): New variable.
Change-Id: I77b7943e26e4e676a1575e3e33305f6f4476b401
---
gnu/packages/cpp.scm | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index d4cf4a68ac8..48780b22af7 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -547,6 +547,32 @@ (define-public libzen
operating system functions.")
(license license:zlib)))
+(define-public lunasvg
+ (package
+ (name "lunasvg")
+ (version "3.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sammycage/lunasvg")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "14ppk3k6sdbf3lwhv2gjqy32vwa7ck9jcj9xfk0fxwfqbvbp6608"))))
+ (build-system cmake-build-system)
+ (inputs (list plutovg))
+ (arguments
+ '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")
+ #:tests? #f)) ;No tests.
+ (home-page "https://github.com/sammycage/lunasvg")
+ (synopsis "SVG rendering and manipulation library in C++")
+ (description
+ "LunaSVG is an SVG rendering library in C++, designed to be
+lightweight and portable, offering efficient rendering and manipulation of
+Scalable Vector Graphics (SVG) files.")
+ (license license:expat)))
+
(define-public rttr
(package
(name "rttr")
--
2.48.1
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Wed, 19 Mar 2025 17:04:02 GMT) Full text and rfc822 format available.Message #95 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: "Sergio Pastor Pérez" <liliana.prikler <at> gmail.com> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v6 4/8] gnu: Add miniaudio. Date: Wed, 19 Mar 2025 18:00:07 +0100
* gnu/packages/cpp.scm (miniaudio): New variable.
Change-Id: I27b74793dd7b80af4437e0a1b997cc87fe8822e5
---
gnu/packages/cpp.scm | 60 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 60 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 48780b22af7..4bf0e7f63fa 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1958,6 +1958,66 @@ (define (make-static-abseil-cpp version)
#~(cons* "-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
(delete "-DBUILD_SHARED_LIBS=ON" #$flags)))))))))
+(define-public miniaudio
+ (package
+ (name "miniaudio")
+ (version "0.11.22")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mackron/miniaudio")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1pjaiq71x24n9983vkhjxrsbraa24053h727db22b1rb2xyfrzm3"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'build)
+ (delete 'configure)
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (with-directory-excursion "tests/_build"
+ (let ((tests '("conversion" "filtering" "generation")))
+ (mkdir "bin")
+ ;; Compile tests
+ (for-each (lambda (test)
+ (invoke "gcc"
+ (string-append "../" test "/" test
+ ".c")
+ "-o"
+ (string-append "bin/" test)
+ "-ldl"
+ "-lm"
+ "-lpthread"
+ "-Wall"
+ "-Wextra"
+ "-Wpedantic")
+ (let ((bin (string-append "./bin/" test)))
+ (if (string= test "filtering")
+ ;; NOTE: the 'filtering' test
+ ;; requires an input file.
+ (invoke bin bin)
+ (invoke bin))))
+ tests))))))
+ (replace 'install
+ (lambda _
+ (install-file "miniaudio.h"
+ (string-append #$output "/include"))
+ (copy-recursively "extras"
+ (string-append #$output
+ "/include/extras/")))))))
+ (home-page "https://miniaud.io")
+ (synopsis "Audio playback and capture library for C and C++")
+ (description
+ "Miniaudio is an audio playback and capture library for C and C++. It is
+made up of a single source file and has no external dependencies.")
+ (license license:expat)))
+
(define-public abseil-cpp-cxxstd17
(abseil-cpp-for-c++-standard abseil-cpp 17)) ;XXX: the default with GCC 11?
--
2.48.1
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Wed, 19 Mar 2025 17:04:02 GMT) Full text and rfc822 format available.Message #98 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: "Sergio Pastor Pérez" <liliana.prikler <at> gmail.com> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v6 5/8] gnu: Add nativefiledialog-extended. Date: Wed, 19 Mar 2025 18:00:07 +0100
* gnu/packages/cpp.scm (nativefiledialog-extended): New variable.
Change-Id: I89ed4554db3ec8075bbb7d50bbfb4b99cae81a27
---
gnu/packages/cpp.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 4bf0e7f63fa..afc3c6a3947 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -3692,6 +3692,33 @@ (define-public mpark-variant
based on the implementation of std::variant in libc++.")
(license license:boost1.0)))
+(define-public nativefiledialog-extended
+ (package
+ (name "nativefiledialog-extended")
+ (version "1.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/btzy/nativefiledialog-extended")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "15l0jy3v4p6rgg9dk8zr80lqp51s32ii62cm4s90400ragdgh10v"))))
+ (build-system cmake-build-system)
+ (arguments
+ '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
+ (native-inputs (list pkg-config))
+ (inputs (list gtk+))
+ (home-page "https://github.com/btzy/nativefiledialog-extended")
+ (synopsis "Native file dialog library with C and C++ bindings")
+ (description
+ "This package provides a library that portably invokes native file open,
+folder select and file save dialogs. It allows the specification of a default
+file name and location, as well as filters with friendly names (such as
+\"source files\" or \"image files\") where supported.")
+ (license license:zlib)))
+
(define-public tsl-hopscotch-map
(package
(name "tsl-hopscotch-map")
--
2.48.1
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Wed, 19 Mar 2025 17:04:03 GMT) Full text and rfc822 format available.Message #101 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: "Sergio Pastor Pérez" <liliana.prikler <at> gmail.com> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v6 6/8] gnu: Add xdgpp. Date: Wed, 19 Mar 2025 18:00:07 +0100
* gnu/packages/cpp.scm (xdgpp): New variable.
Change-Id: Ia11c0926e5b7f6e60c5dd48e8973cfd6391b1469
---
gnu/packages/cpp.scm | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index afc3c6a3947..9e5292411ef 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -749,6 +749,40 @@ (define-public debug-assert
enabled in different parts of your code.")
(license license:zlib)))
+(define-public xdgpp
+ (let ((commit "f01f810714443d0f10c333d4d1d9c0383be41375")
+ (revision "0"))
+ (package
+ (name "xdgpp")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.sr.ht/~danyspin97/xdgpp")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1w8da10whrhc7j82jf90814m3blabkl9s0kg8hv8h2fj5y3ji7hw"))))
+ (build-system gnu-build-system)
+ (native-inputs (list catch2))
+ (arguments
+ (list
+ #:test-target "test"
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ (replace 'install
+ (lambda _
+ (install-file "xdg.hpp"
+ (string-append #$output "/include")))))))
+ (home-page "https://git.sr.ht/~danyspin97/xdgpp")
+ (synopsis "C++17 implementation of the XDG Base Directory Specification")
+ (description
+ "This package provides a header-only library to retrieve the file names
+of XDG base directories, such as XDG_CONFIG_HOME.")
+ (license license:expat))))
+
(define-public xsimd
(package
(name "xsimd")
--
2.48.1
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Wed, 19 Mar 2025 17:04:04 GMT) Full text and rfc822 format available.Message #104 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: "Sergio Pastor Pérez" <liliana.prikler <at> gmail.com> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v6 8/8] gnu: Add imhex. Date: Wed, 19 Mar 2025 18:00:08 +0100
* gnu/packages/hexedit.scm (make-imhex-patterns, imhex): New variables.
Change-Id: I114d3a6c0dae32ea434a77a6bd88b8ff6870b70c
---
Changes from v5:
* Outlined make-imhex-patterns.
* Use keep lists rather than delete lists.
* Unbundle jthread.
I haven't sorted the inputs yet, but IMHO they should be sorted.
Same goes for the #:use-module lines, which would require sorting in an
extra commit.
Would you like to explain this note?
+ ;; NOTE: there is an issue with the way the test library is linked
+ ;; with the output binaries. Tests are intrusive and should not be
+ ;; shipped with the release, when the issue is fixed we could add a
+ ;; phase which builds the package with the tests and runs the
+ ;; testsuite and a second build phase which prepares the output
+ ;; binary.
IMHO it is the build system that should separate test-only code from installed
code.
gnu/packages/hexedit.scm | 177 +++++++++++++++++++++++++++++++++++++++
1 file changed, 177 insertions(+)
diff --git a/gnu/packages/hexedit.scm b/gnu/packages/hexedit.scm
index ed30e882847..0ab684ded1b 100644
--- a/gnu/packages/hexedit.scm
+++ b/gnu/packages/hexedit.scm
@@ -28,11 +28,24 @@ (define-module (gnu packages hexedit)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages gl)
#:use-module (gnu packages man)
#:use-module (gnu packages cpp)
#:use-module (gnu packages gcc)
+ #:use-module (gnu packages tls)
+ #:use-module (gnu packages curl)
+ #:use-module (gnu packages llvm)
+ #:use-module (gnu packages ruby)
+ #:use-module (gnu packages glib)
+ #:use-module (gnu packages boost)
+ #:use-module (gnu packages backup)
#:use-module (gnu packages python)
+ #:use-module (gnu packages libffi)
#:use-module (gnu packages ncurses)
+ #:use-module (gnu packages antivirus)
+ #:use-module (gnu packages fontutils)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages engineering)
#:use-module (gnu packages pretty-print)
#:use-module (guix download)
#:use-module (guix git-download)
@@ -206,6 +219,170 @@ (define-public imhex-pattern-language
for specifying patterns in the ImHex Hex Editor.")
(license license:lgpl2.1)))
+;; imhex-patterns can not currently be built by imhex-pattern-language alone,
+;; see above for a rationale. Thus, we only return an origin.
+(define (make-imhex-patterns version sha256-hash)
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/WerWolv/ImHex-Patterns")
+ (commit (string-append "ImHex-v" version))))
+ (file-name (git-file-name "imhex-patterns" version))
+ (sha256 sha256-hash)))
+
+(define-public imhex
+ (let* ((version "1.37.4")
+ (imhex-patterns
+ (make-imhex-patterns
+ version
+ (base32 "0m9g93fzmj2rsgaq25y4mmfigjh1xxyh41zjs6lp5ydsl5hhrn6q"))))
+ (package
+ (name "imhex")
+ (version version)
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/WerWolv/ImHex")
+ (commit (string-append "v" version))
+ (recursive? #t)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0l3fpizkz2ykdirbn9alddnnsg75w6kwpp92nvmird13l80z1sdr"))
+ (modules '((guix build utils) (ice-9 ftw) (ice-9 match)))
+ (snippet
+ #~(begin
+ ;; XXX: imhex-pattern-language is missing the necessary packaging
+ ;; structure to be linked independently. See the comment on its
+ ;; package.
+ (copy-recursively #$imhex-pattern-language
+ "lib/external/pattern_language")
+ ;; Drop `imhex-patterns' in the source tree.
+ (copy-recursively #$imhex-patterns "ImHex-Patterns")
+
+ ;; NOTE: `libwolv' does not have an install target. Until the
+ ;; maintainers create one, it will remain bundled.
+ ;; NOTE: `libromfs' it's meant to be bundled and cannot be
+ ;; compiled independently. Until the maintainers support
+ ;; building it independently, it will remain bundled.
+ ;; NOTE: `hashlibplus' has been left as a submodule since it's a
+ ;; fork which only makes sense within ImHex.
+ ;; XXX: `imgui' is a fork with several experimental features.
+ ;; Unbundle once they're upstreamed.
+ (with-directory-excursion "lib/third_party"
+ (for-each
+ (lambda (dir)
+ (unless (member dir '("." ".."
+ "HashLibPlus" "libwolv" "libromfs"
+ "imgui"
+ ;; Needs source to include miniaudio.h
+ "miniaudio"
+ "microtar")) ; XXX: unbundle
+ (delete-file-recursively dir)))
+ (scandir "."))
+
+ ;; Force use of system miniaudio.
+ (delete-file "miniaudio/include/miniaudio.h")
+
+ (for-each
+ (match-lambda
+ ((src . dst) (copy-recursively src dst)))
+ `((#$(package-source xdgpp) . "xdgpp"))))
+
+ ;; Adjust CMake build scripts accordingly.
+ (substitute* "cmake/build_helpers.cmake"
+ (("add_subdirectory\\(\\$\\{THIRD_PARTY_.*\\}/jthread .*\\)")
+ "")
+ (("set\\(JTHREAD_LIBRARIES .*\\)") ""))
+
+ ;; Update sources.
+ (substitute* (append (find-files "lib/libimhex" "\\.[ch](pp)?")
+ (find-files "main" "\\.[ch](pp)?")
+ (find-files "plugins" "\\.[ch](pp)?"))
+ (("#include <jthread\\.hpp>") ""))
+ (substitute* "plugins/ui/source/ui/menu_items.cpp"
+ (("\\.\\./\\.\\./\\.\\./\\.\\./lib/libimhex/include/")
+ ""))))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ ;; NOTE: there is an issue with the way the test library is linked
+ ;; with the output binaries. Tests are intrusive and should not be
+ ;; shipped with the release, when the issue is fixed we could add a
+ ;; phase which builds the package with the tests and runs the
+ ;; testsuite and a second build phase which prepares the output
+ ;; binary.
+ #:configure-flags
+ ''("-DIMHEX_ENABLE_UNIT_TESTS=ON"
+ "-DIMHEX_OFFLINE_BUILD=ON"
+ ;; NOTE: required for the `validate-runpath' phase.
+ ;; If OFF, the pluggings won't be able to find `libimhex.so'.
+ "-DIMHEX_PLUGIN_ADD_INSTALL_PREFIX_TO_RPATH=ON"
+
+ "-DUSE_SYSTEM_NLOHMANN_JSON=ON"
+ "-DUSE_SYSTEM_CAPSTONE=ON"
+ "-DUSE_SYSTEM_LUNASVG=ON"
+ "-DUSE_SYSTEM_CLI11=ON"
+ "-DUSE_SYSTEM_BOOST=ON"
+ "-DUSE_SYSTEM_EDLIB=ON"
+ "-DUSE_SYSTEM_YARA=ON"
+ "-DUSE_SYSTEM_LLVM=ON"
+ "-DUSE_SYSTEM_FMT=ON"
+ "-DUSE_SYSTEM_NFD=ON")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda _
+ (substitute* "main/gui/source/window/linux_window.cpp"
+ (("dbus-send")
+ #$(file-append dbus "/bin/dbus-send")))
+ (substitute* "cmake/build_helpers.cmake"
+ (("Boost REQUIRED")
+ "Boost COMPONENTS regex REQUIRED"))))
+ (add-before 'check 'build-tests
+ (lambda _
+ (invoke "make" "unit_tests"))))))
+ (native-inputs
+ (list cli11
+ nlohmann-json
+ pkg-config
+ python
+ python-wrapper
+ ruby
+ gcc-14))
+ (inputs
+ (list yara
+ boost
+ capstone
+ curl
+ edlib
+ fmt
+ glfw
+ libarchive
+ libffi
+ llvm-17
+ lunasvg
+ plutovg
+ mbedtls
+ mesa
+ miniaudio
+ nativefiledialog-extended
+ xz
+ fontconfig
+ lz4
+ `(,zstd "lib")
+ zlib
+ freetype))
+ (home-page "https://imhex.werwolv.net")
+ (synopsis "Hex Editor to display, decode and analyze binary data")
+ (description "ImHex is a hex editor with many advanced features that can
+often only be found in paid applications. Such features are a completely
+custom binary template and pattern language to decode and highlight structures
+in the data, a graphical node-based data processor to pre-process values
+before they're displayed, a disassembler, diffing support, bookmarks and much
+much more.")
+ (license license:gpl2))))
+
(define-public bvi
(package
(name "bvi")
--
2.48.1
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Wed, 19 Mar 2025 17:04:04 GMT) Full text and rfc822 format available.Message #107 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: "Sergio Pastor Pérez" <liliana.prikler <at> gmail.com> To: 67755 <at> debbugs.gnu.org Cc: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> Subject: [PATCH v6 7/8] gnu: Add imhex-pattern-language. Date: Wed, 19 Mar 2025 18:00:08 +0100
* gnu/packages/hexedit.scm (imhex-pattern-language): New variable.
Change-Id: I641bebed0bea9b2c8aca87f54d0fb457064a07d7
---
Changes from v5:
* Use system fmt (fmt-11).
* Use a keep list rather than a delete list.
I think the header-only libraries should be provided as regular inputs,
but haven't done that yet.
gnu/packages/hexedit.scm | 71 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 70 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/hexedit.scm b/gnu/packages/hexedit.scm
index 15bf7db8773..ed30e882847 100644
--- a/gnu/packages/hexedit.scm
+++ b/gnu/packages/hexedit.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2018, 2020, 2022 Tobias Geerinckx-Rice <me <at> tobias.gr>
;;; Copyright © 2020 Jakub Kądziołka <kuba <at> kadziolka.net>
;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom <at> gmail.com>
+;;; Copyright © 2025 Sergio Pastor Pérez <sergio.pastorperez <at> gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -22,17 +23,23 @@
(define-module (gnu packages hexedit)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages compression)
#:use-module (gnu packages man)
+ #:use-module (gnu packages cpp)
+ #:use-module (gnu packages gcc)
+ #:use-module (gnu packages python)
#:use-module (gnu packages ncurses)
+ #:use-module (gnu packages pretty-print)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix gexp)
#:use-module (guix utils)
- #:use-module (guix build-system gnu))
+ #:use-module (guix build-system gnu)
+ #:use-module (guix build-system cmake))
(define-public hexedit
(package
@@ -137,6 +144,68 @@ (define-public ht
(home-page "https://hte.sourceforge.net/")
(license license:gpl2)))
+;; NOTE: The install target of imhex-pattern-language falls short in a few areas
+;; that make this package difficult to use outside of ImHex. Neither header
+;; files nor package information (using e.g. pkg-config or CMake files) are
+;; currently available.
+(define-public imhex-pattern-language
+ (package
+ (name "imhex-pattern-language")
+ (version "1.37.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/WerWolv/PatternLanguage")
+ (commit (string-append "ImHex-v" version))
+ (recursive? #t)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "13mlbclg2r3axv6vz4dsyry5azc6xavcbdkvwan6zyaq9ngk7r3r"))
+ (modules '((guix build utils) (ice-9 ftw)))
+ (snippet #~(begin
+ ;; NOTE: the `throwing-ptr' hasn't been updated in 6 years
+ ;; and the testsuite expects to use an outdated version of
+ ;; Conan, since this library if not interesting to have it
+ ;; in Guix it will remain bundled.
+ ;; NOTE: `libwolf' does not have an install target. Until
+ ;; the maintainers create one, it will be bundled.
+ (with-directory-excursion "external"
+ (for-each
+ (lambda (dir)
+ (unless (member dir '("." ".." "libwolv" "throwing_ptr"))
+ (delete-file-recursively dir)))
+ (scandir ".")))))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:configure-flags ''("-DLIBPL_SHARED_LIBRARY=ON"
+ "-DLIBPL_ENABLE_TESTS=ON"
+ "-DUSE_SYSTEM_NLOHMANN_JSON=ON"
+ "-DUSE_SYSTEM_CLI11=ON"
+ "-DUSE_SYSTEM_FMT=ON")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-rel-paths
+ (lambda _
+ (substitute* "tests/include/test_patterns/test_pattern_format.hpp"
+ (("../tests/files/export/")
+ "../source/tests/files/export/"))))
+ (add-after 'build 'build-tests
+ (lambda _
+ (invoke "make" "pattern_language_tests" "plcli")))
+ (add-before 'check 'plcli-integration-tests
+ (lambda _
+ (with-directory-excursion "../source"
+ (invoke "python3" "tests/integration/integration.py"
+ "../build/cli/plcli")))))))
+ (native-inputs (list cli11 gcc-14 fmt-11 nlohmann-json python))
+ (home-page "https://imhex.werwolv.net")
+ (synopsis "Pattern language used by the ImHex Hex Editor")
+ (description "This package provides a C-like domain-specific language used
+for specifying patterns in the ImHex Hex Editor.")
+ (license license:lgpl2.1)))
+
(define-public bvi
(package
(name "bvi")
--
2.48.1
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Wed, 19 Mar 2025 19:45:01 GMT) Full text and rfc822 format available.Message #110 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>, 67755 <at> debbugs.gnu.org Subject: Re: [PATCH v6 0/8] gnu: Add imhex Date: Wed, 19 Mar 2025 20:43:57 +0100
Hello! On 3/19/25 18:00, Liliana Marie Prikler wrote: > I was made aware of your series. Unfortunately, I changed more during > the review process than I'd have liked, so I will be resending this as > v6. Please review the changes and my notes closely. I will wait a > week as outlined in the Commit Policy before pushing. Thanks you so much for taking the time to review it!
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Wed, 19 Mar 2025 19:53:02 GMT) Full text and rfc822 format available.Message #113 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> To: Sergio Pastor Pérez <liliana.prikler <at> gmail.com>, 67755 <at> debbugs.gnu.org Subject: Re: [PATCH v6 1/8] gnu: Add jthread. Date: Wed, 19 Mar 2025 20:52:19 +0100
On 3/19/25 18:00, Sergio Pastor Pérez wrote: > Note: this package appears unused in the rest of the series. My bad, it should be unbundled. I see that you took care of it. Thanks.
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Wed, 19 Mar 2025 20:16:02 GMT) Full text and rfc822 format available.Message #116 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> To: Sergio Pastor Pérez <liliana.prikler <at> gmail.com>, 67755 <at> debbugs.gnu.org Subject: Re: [PATCH v6 8/8] gnu: Add imhex. Date: Wed, 19 Mar 2025 21:14:53 +0100
On 3/19/25 18:00, Sergio Pastor Pérez wrote: > Changes from v5: > * Outlined make-imhex-patterns. Looks good. > * Use keep lists rather than delete lists. That's fine by me. > * Unbundle jthread. Thanks again for taking care of this. > I haven't sorted the inputs yet, but IMHO they should be sorted. > Same goes for the #:use-module lines, which would require sorting in an > extra commit. Yes. I think they should be sorted too, my bad. > Would you like to explain this note? > + ;; NOTE: there is an issue with the way the test library is linked > + ;; with the output binaries. Tests are intrusive and should not be > + ;; shipped with the release, when the issue is fixed we could add a > + ;; phase which builds the package with the tests and runs the > + ;; testsuite and a second build phase which prepares the output > + ;; binary. > IMHO it is the build system that should separate test-only code from installed > code. I added this note after the developers told me that, for the release build, we should not chose the cmake build type that includes the some extra teststing, because they affect the ImHex binary, I'm not sure if it was instrumentation code or something else that could hinder performance. To be honest, it's been a year since I made this note, so I don't remember the name of the `#:build-type` that we should not use. I think, the default one that the `cmake-build-system` chooses is fine, `RelWithDebInfo`. > +(define-public imhex > [...] > + (inputs > + (list yara > + boost > + capstone > + curl > + edlib I think this last patch series you've sent, v6, is missing the `edlib` patch so this won't build. Could you make sure before pushing that the `edlib` patch has been applied? Thanks for the efforts! Best regards, Sergio.
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Wed, 19 Mar 2025 20:26:01 GMT) Full text and rfc822 format available.Message #119 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es> To: Sergio Pastor Pérez <liliana.prikler <at> gmail.com>, 67755 <at> debbugs.gnu.org Subject: Re: [PATCH v6 7/8] gnu: Add imhex-pattern-language. Date: Wed, 19 Mar 2025 21:25:45 +0100
On 3/19/25 18:00, Sergio Pastor Pérez wrote: > * gnu/packages/hexedit.scm (imhex-pattern-language): New variable. > > Change-Id: I641bebed0bea9b2c8aca87f54d0fb457064a07d7 > --- > Changes from v5: > * Use system fmt (fmt-11). This is fine. > * Use a keep list rather than a delete list. Looks good to me. > I think the header-only libraries should be provided as regular inputs, > but haven't done that yet. As you think goes more inline with Guix philosophy. > +(define-public imhex-pattern-language > [...] > + (snippet #~(begin > + ;; NOTE: the `throwing-ptr' hasn't been updated in 6 years > + ;; and the testsuite expects to use an outdated version of I wrote bad english here: > + ;; Conan, since this library if not interesting to have it > + ;; in Guix it will remain bundled. It should probably be: `since this library is not interesting for Guix, it will remain bundled.` Thanks for your work! Best regards, Sergio.
guix-patches <at> gnu.org:bug#67755; Package guix-patches.
(Wed, 19 Mar 2025 20:59:02 GMT) Full text and rfc822 format available.Message #122 received at 67755 <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es>, 67755 <at> debbugs.gnu.org Subject: Re: [PATCH v6 8/8] gnu: Add imhex. Date: Wed, 19 Mar 2025 21:58:37 +0100
Am Mittwoch, dem 19.03.2025 um 21:14 +0100 schrieb Sergio Pastor Pérez: > I think this last patch series you've sent, v6, is missing the > `edlib` patch so this won't build. Could you make sure before pushing > that the `edlib` patch has been applied? Oh, yeah, that's my bad, having used HEAD~8 instead of HEAD~9. Cheers
Liliana Marie Prikler <liliana.prikler <at> gmail.com>:Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es>:Message #127 received at 67755-done <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: Sergio Pastor Pérez <sergio.pastorperez <at> outlook.es>, 67755-done <at> debbugs.gnu.org Subject: Re: [PATCH v6 7/8] gnu: Add imhex-pattern-language. Date: Wed, 26 Mar 2025 22:58:15 +0100
Am Mittwoch, dem 19.03.2025 um 21:25 +0100 schrieb Sergio Pastor Pérez: > On 3/19/25 18:00, Sergio Pastor Pérez wrote: > > * gnu/packages/hexedit.scm (imhex-pattern-language): New variable. > > > > Change-Id: I641bebed0bea9b2c8aca87f54d0fb457064a07d7 > > --- > > Changes from v5: > > * Use system fmt (fmt-11). > > This is fine. > > > * Use a keep list rather than a delete list. > > Looks good to me. > > > I think the header-only libraries should be provided as regular > > inputs, > > but haven't done that yet. > > As you think goes more inline with Guix philosophy. > > > +(define-public imhex-pattern-language > > [...] > > + (snippet #~(begin > > + ;; NOTE: the `throwing-ptr' hasn't been > > updated in 6 years > > + ;; and the testsuite expects to use an > > outdated version of > > I wrote bad english here: > > + ;; Conan, since this library if not > > interesting to have it > > + ;; in Guix it will remain bundled. > > It should probably be: > `since this library is not interesting for Guix, it will remain > bundled.` Pushed, sadly without the above changes. I'll mark this as done and maybe come back later to add the cosmetics. Cheers
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org.
(Thu, 24 Apr 2025 11:26:22 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.