diff options
Diffstat (limited to 'gnu/packages')
-rw-r--r-- | gnu/packages/admin.scm | 8 | ||||
-rw-r--r-- | gnu/packages/astronomy.scm | 4 | ||||
-rw-r--r-- | gnu/packages/emulators.scm | 43 | ||||
-rw-r--r-- | gnu/packages/fonts.scm | 48 | ||||
-rw-r--r-- | gnu/packages/fpga.scm | 6 | ||||
-rw-r--r-- | gnu/packages/golang-web.scm | 95 | ||||
-rw-r--r-- | gnu/packages/golang-xyz.scm | 82 | ||||
-rw-r--r-- | gnu/packages/hardware.scm | 89 | ||||
-rw-r--r-- | gnu/packages/librewolf.scm | 12 | ||||
-rw-r--r-- | gnu/packages/lxde.scm | 298 | ||||
-rw-r--r-- | gnu/packages/maths.scm | 4 | ||||
-rw-r--r-- | gnu/packages/networking.scm | 36 | ||||
-rw-r--r-- | gnu/packages/patches/lxsession-potfiles-ignore.patch | 15 | ||||
-rw-r--r-- | gnu/packages/pep.scm | 342 | ||||
-rw-r--r-- | gnu/packages/prolog.scm | 4 | ||||
-rw-r--r-- | gnu/packages/radio.scm | 2 |
16 files changed, 552 insertions, 536 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index e429a67173..231a948ed0 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -217,14 +217,14 @@ (define-public aide (package (name "aide") - (version "0.19.1") + (version "0.19.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/aide/aide/releases/download/v" version "/aide-" version ".tar.gz")) (sha256 - (base32 "0lhbx7ilwzpfl77vi7b6cklhgzk1iwyfp4fvvgvlmmq30igvzy3d")))) + (base32 "1i3lbsw1mhsnq54bx48zikdiph1ihxn021ca7kmys4b1yh2jnxi3")))) (build-system gnu-build-system) (arguments (list #:configure-flags #~(list "--with-posix-acl" @@ -2922,7 +2922,7 @@ system is under heavy load.") (define-public stress-ng (package (name "stress-ng") - (version "0.18.04") + (version "0.19.03") (source (origin (method git-fetch) @@ -2931,7 +2931,7 @@ system is under heavy load.") (commit (string-append "V" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "100w4qkrzpg7jjl4dw0c376xi811qnjmlbffiy43i945f9vl3dc7")))) + (base32 "1phrmjvvjn55pyfljfkk604d8q8wn17l416v91hskj98v7b7yhck")))) (build-system gnu-build-system) (arguments ;; XXX The test suite seems to cause instability on the VisionFive 2 diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 5e5120ee92..7085fde1cf 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -279,7 +279,7 @@ wide set of telescopes.") (define-public astroterm (package (name "astroterm") - (version "1.0.8") + (version "1.0.9") (source (origin (method git-fetch) @@ -288,7 +288,7 @@ wide set of telescopes.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "10y776rh6ww1zjk96cd497ipbr54q0wdd1g7ybsrffdbrzc6l8jx")))) + (base32 "03vrprrahhfp7jbl1apmpxmv05fb8lw469fnsnq7sajdhc3waifx")))) (build-system meson-build-system) (arguments (list diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index f86fcedd56..0ac1cb974d 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2025 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2025 Andrew Wong <wongandj@icloud.comg> ;;; Copyright © 2025 Anderson Torres <anderson.torres.8519@gmail.com> +;;; Copyright © 2025 Laura Kirsch <laurakirsch240406@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -4713,3 +4714,45 @@ information. Useful for cross-architecture tools (such as @code{python-pyvex}). (synopsis "8051/8052 emulator with curses-based UI") (description "emu8051 is a simulator of the 8051/8052 microcontrollers.") (license license:expat)))) + +(define-public fceux + (package + (name "fceux") + (version "2.6.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TASEmulators/fceux") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "02s5qmxdxpsa71977z9bs5vfhnszn5nr5hk05wns8cm9nshbg7as")) + (modules '((guix build utils))) + (snippet #~(map delete-file-recursively + (list "output/lua5.1.dll" "output/lua51.dll" + "src/drivers/win" "fceux-server" "vc"))))) + (build-system cmake-build-system) + (arguments + (list + ;; No test suite. + #:tests? #f)) + (inputs (list qtbase-5 + zlib + minizip + sdl2 + lua-5.1 + libx264 + x265 + ffmpeg + libxkbcommon + libarchive)) + (native-inputs (list pkg-config)) + (synopsis "NES/Famicom emulator") + (description + "FCEUX is a Nintendo Entertainment System (NES), Famicom, Famicom Disk +System (FDS), and Dendy emulator. It supports NTSC (USA/JPN), PAL (European), +and NTSC-PAL Hybrid modes. It also offers tools for debugging, rom-hacking, +map making, Tool-assisted movies, and Lua scripting.") + (home-page "https://fceux.com/web/home.html") + (license license:gpl2+))) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 993d56713b..a206016453 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -2722,6 +2722,54 @@ software vendors in the late 1980s.") in the late 1980s.") (license license:public-domain))) +(define-public font-apl386 + ;; Neither releases nor tags + (let ((commit "c5bca014b6610ee170985c3ce32a8bb14dbd7b94") + (revision "1")) + (package + (name "font-apl386") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/abrudz/APL386") + (commit commit))) + (file-name (git-file-name name revision)) + (sha256 + (base32 "0z7kpqgfrb053rajnr08n02rdwg5w1aynxj13ys93j0k3xvv5a75")))) + (build-system font-build-system) + (synopsis "Font suitable for APL programming language") + (description + "APL386 is an evolution of Adrian Smith's APL385 font with a fun, +whimsical look, inspired by Comic Sans Serif.") + (home-page "https://abrudz.github.io/APL386/") + (license license:unlicense)))) + +(define-public font-bqn386 + ;; Neither releases nor tags + (let ((commit "4d8b9f668ba76a15ca9cd44d9bfedaf95a4c0d96") + (revision "1")) + (package + (name "font-bqn386") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dzaima/BQN386") + (commit commit))) + (file-name (git-file-name name revision)) + (sha256 + (base32 "1l2ycjs85vps7sy5yg19mq1xdnfv4lx3skw921yw1rhx9xdvhrgc")))) + (build-system font-build-system) + (synopsis "Font suitable for APL and BQN programming languages") + (description + "BQN386 is an extension of APL386 font. This font keeps regular APL +characters mostly intact.") + (home-page "https://dzaima.github.io/BQN386/") + (license license:unlicense)))) + (define-public font-aporetic (package (name "font-aporetic") diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 95a5e57a06..377aeeb251 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -147,15 +147,15 @@ formal verification. This is the Yosyshq fork of ABC.") (define-public apycula (package (name "apycula") - (version "0.22") + (version "0.23") ;; The pypi tar.gz file includes the necessary .pickle files, not available ;; in the home-page repository. (source (origin (method url-fetch) - (uri (pypi-uri "Apycula" version)) + (uri (pypi-uri "apycula" version)) (sha256 - (base32 "15xwmi6z2p7jz17l5bqs511yh8jis1dacqc8fypx49jysl7h0apd")))) + (base32 "1kk9hi8zhdp1am5vj716lwlmrs31lxrwhdbbc4qsad470dcjqs57")))) (build-system pyproject-build-system) (arguments (list #:tests? #f)) ;requires Gowin EDA tools (inputs (list python-crc)) diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 5f35bcabac..e797dba593 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -453,7 +453,7 @@ handlers.") (define-public go-github-com-alexliesenfeld-health (package (name "go-github-com-alexliesenfeld-health") - (version "0.8.0") + (version "0.8.1") (source (origin (method git-fetch) @@ -462,7 +462,7 @@ handlers.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1fchlvxwidsscskwq07vhxfwcn5wbigbizi51619l8gg09mr158q")))) + (base32 "19p0rs1dmvf3cnylyykmmnma2g5x2vy8gasr2rjl28ma58w6l0d3")))) (build-system go-build-system) (arguments (list @@ -1571,7 +1571,7 @@ and reduce scope of key compromise. (define-public go-github-com-caddyserver-zerossl (package (name "go-github-com-caddyserver-zerossl") - (version "0.1.0") + (version "0.1.3") (source (origin (method git-fetch) @@ -1580,7 +1580,7 @@ and reduce scope of key compromise. (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0hr2kdabhm35hz5krp7m3g6wxvyb9xlqgmy3krf4wwb3yabsqp1m")))) + (base32 "16mrlmsl3ajdrn2qsdq51k79z3fi8v8j82r2c6xyj7mp2yr979h6")))) (build-system go-build-system) (arguments (list @@ -8723,7 +8723,7 @@ to @url{https://www.rfc-editor.org/rfc/rfc3550, RFC 3550}, (define-public go-github-com-pion-rtp (package (name "go-github-com-pion-rtp") - (version "1.8.11") + (version "1.8.21") (source (origin (method git-fetch) @@ -8732,11 +8732,13 @@ to @url{https://www.rfc-editor.org/rfc/rfc3550, RFC 3550}, (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1a4fj31j7glhfsnxxwm8r72l6capz9mh8kfr340659ahgiijdkcg")))) + (base32 "1hc5cdxgf0m44awvzzaby3hrlnhjbxjivl6981069xwgxspqakhm")))) (build-system go-build-system) (arguments (list #:import-path "github.com/pion/rtp")) + (native-inputs + (list go-github-com-stretchr-testify)) (propagated-inputs (list go-github-com-pion-randutil)) (home-page "https://github.com/pion/rtp") @@ -8838,7 +8840,7 @@ Protocol,SCTP} as specified in (package (inherit go-github-com-pion-srtp-v2) (name "go-github-com-pion-srtp-v3") - (version "3.0.4") + (version "3.0.7") (source (origin (method git-fetch) @@ -8847,7 +8849,7 @@ Protocol,SCTP} as specified in (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "03343fsgrawfy9plsl7y5022ygjln3jvsn3im5xl1qwnc68rb1a2")))) + (base32 "0l8y01ci5fsx8b6ajn9cvs45hqpz838x0jnyyj1p2z714nw9jh61")))) (arguments (list #:import-path "github.com/pion/srtp/v3")) @@ -10203,7 +10205,7 @@ Supports S3 and STS.") (define-public go-github-com-sourcegraph-jsonrpc2 (package (name "go-github-com-sourcegraph-jsonrpc2") - (version "0.2.0") + (version "0.2.1") (home-page "https://github.com/sourcegraph/jsonrpc2") (source (origin @@ -10213,7 +10215,7 @@ Supports S3 and STS.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1id35b4mhif9gy1b70mv0x7xkmpm2p8xydix8six10yjyhvm1wjh")))) + (base32 "0nxiq8da4x4sipjkap50cfzjg9b8vqm45w65hbjywwj6q73jl54a")))) (build-system go-build-system) (arguments '(#:import-path "github.com/sourcegraph/jsonrpc2")) @@ -10501,6 +10503,52 @@ runtime. It has zero dependencies, and doesn't rely on CGO. This means you can run applications in other languages and still keep cross compilation.") (license license:asl2.0))) +(define-public go-github-com-things-go-go-socks5 + (package + (name "go-github-com-things-go-go-socks5") + (version "0.0.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/things-go/go-socks5") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0r7v1bpja4j8q9bjh124w8l5m29vwnpaq0flm97izvzw4pcyxybf")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/things-go/go-socks5")) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-golang-org-x-net)) + (home-page "https://github.com/things-go/go-socks5") + (synopsis "SOCKS5 with full TCP/UDP and IPv4/IPv6 support in Golang") + (description + "This package implements a @url{http://en.wikipedia.org/wiki/SOCKS, +SOCKS5}. SOCKS (Secure Sockets) is used to route traffic between a client and +server through an intermediate proxy layer. This can be used to bypass +firewalls or NATs. + +Features: +@itemize +@item support socks5 server +@item support TCP/UDP and IPv4/IPv6 +@item unit tests +@item \"No Auth\" mode +@item user/password authentication optional user addr limit +@item support for the CONNECT command +@item support for the ASSOCIATE command +@item rules to do granular filtering of commands +@item custom DNS resolution +@item custom goroutine pool +@item buffer pool design and optional custom buffer pool +@item custom logger +@end itemize") + (license license:expat))) + (define-public go-github-com-tj-go-elastic (package (name "go-github-com-tj-go-elastic") @@ -12706,7 +12754,7 @@ the standard @code{context} package to store request-scoped values.") (define-public go-golang-zx2c4-com-wireguard (package (name "go-golang-zx2c4-com-wireguard") - (version "0.0.0-20231211153847-12269c276173") + (version "0.0.0-20250521234502-f333402bd9cb") (source (origin (method git-fetch) @@ -12718,33 +12766,16 @@ the standard @code{context} package to store request-scoped values.") (commit (go-version->git-ref version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1fbc6m0ahifhrd6jdrpdxi8l3b2slpp8fmv20kpq2yzz19vzzgkf")))) + (base32 "1h4rmdvssk939gk31f0sfwa1yaks72zk8rkcs7fj3qcvl8sgq6hr")))) (build-system go-build-system) (arguments (list - #:import-path "golang.zx2c4.com/wireguard" - #:phases - #~(modify-phases %standard-phases - ;; XXX: Workaround for go-build-system's lack of Go modules - ;; support. - (replace 'check - (lambda* (#:key tests? import-path #:allow-other-keys) - (when tests? - (with-directory-excursion (string-append "src/" import-path) - (invoke "go" "test" "-v" - ;; "./tune/..." ; Requires gvisor.dev/gvisor, not packed yet - "./" - "./conn/..." - "./device/..." - "./ipc/..." - "./ratelimiter/..." - "./replay/..." - "./rwcancel/..." - "./tai64n/...")))))))) + #:import-path "golang.zx2c4.com/wireguard")) (propagated-inputs (list go-golang-org-x-crypto go-golang-org-x-net - go-golang-org-x-sys)) + go-golang-org-x-sys + go-gvisor-dev-gvisor)) (home-page "https://git.zx2c4.com/wireguard") (synopsis "Implementation of WireGuard in Go") (description "This package is a Go Implementation of WireGuard.") diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 8f5201824d..73c4b4cd3d 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -1013,6 +1013,32 @@ Distance}.") http://tartarus.org/~martin/PorterStemmer/index.html.") (license license:expat))) +(define-public go-github-com-akamensky-argparse + (package + (name "go-github-com-akamensky-argparse") + (version "1.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/akamensky/argparse") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1m7rzrfwyrwxbbry5ppds2b3c5gdslpakvjhsh6i8mhdfhywd8wc")))) + (build-system go-build-system) + (arguments + (list + ;; Panic: unexpected call to os.Exit(0) during test. + #:test-flags #~(list "-skip" "TestUsageString") + #:import-path "github.com/akamensky/argparse")) + (home-page "https://github.com/akamensky/argparse") + (synopsis "Argparse for golang") + (description + "This package implements a flexible and configurable option for command +line arguments parsing.") + (license license:expat))) + (define-public go-github-com-alecaivazis-survey-v2 (package (name "go-github-com-alecaivazis-survey-v2") @@ -12372,6 +12398,35 @@ representation suitable for computing diffs.") @end itemize") (license license:expat))) +(define-public go-github-com-landlock-lsm-go-landlock + (package + (name "go-github-com-landlock-lsm-go-landlock") + (version "0.0.0-20250303204525-1544bccde3a3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/landlock-lsm/go-landlock") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00qis8gg2ajyph9jyrjghm6cn0h22pwjwdp6qa22ji6jslgnm02n")))) + (build-system go-build-system) + (arguments + (list + #:skip-build? #t + #:import-path "github.com/landlock-lsm/go-landlock")) + (propagated-inputs + (list go-golang-org-x-sys + go-kernel-org-pub-linux-libs-security-libcap-psx)) + (home-page "https://landlock.io/") + (synopsis "Golang library for the Linux Landlock sandboxing feature") + (description + "This package implements a restriction for the current processes' ability +to use files, using Linux 5.13's +@url{https://docs.kernel.org/security/landlock.html, Landlock} feature.") + (license license:expat))) + (define-public go-github-com-lann-builder (package (name "go-github-com-lann-builder") @@ -22672,6 +22727,33 @@ kubernetes-independent packages supplementing the @url{https://pkg.go.dev/std#stdlib,Go standard libs}.") (license license:asl2.0))) +(define-public go-kernel-org-pub-linux-libs-security-libcap-psx + (package + (name "go-kernel-org-pub-linux-libs-security-libcap-psx") + (version "1.2.76") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.kernel.org/pub/scm/libs/libcap/libcap.git") + (commit (go-version->git-ref version + #:subdir "psx")))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0va0bkq5kxf0ccsdpw598vsmk4kdzhaafjvym0g5b2n49c5sn59b")))) + (build-system go-build-system) + (arguments + (list + #:import-path "kernel.org/pub/linux/libs/security/libcap/psx" + #:unpack-path "kernel.org/pub/linux/libs/security/libcap")) + ;; Redirects from <https://kernel.org/pub/linux/libs/security/libcap> + (home-page "https://sites.google.com/site/fullycapable") + (synopsis "API for invoking Linux system calls in Golang") + (description + "This package provides a support for system calls that are run +simultaneously on all threads under Linux.") + (license license:gpl2))) + (define-public go-maunium-net-go-mauflag (package (name "go-maunium-net-go-mauflag") diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 421993d12c..4f3d493dda 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -74,6 +74,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages lxqt) + #:use-module (gnu packages man) #:use-module (gnu packages messaging) #:use-module (gnu packages mtools) #:use-module (gnu packages package-management) @@ -212,6 +213,94 @@ Notable features include: @end itemize") (license (list license:bsd-0 license:gpl3+)))) +(define-public deskflow + (package + (name "deskflow") + (version "1.23.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/deskflow/deskflow") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wgj0sjnxkfplpq05q2lqgag29l7bf4cqdw0xmr89ayrh1nyjxa1")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags + #~(list "-DCMAKE_SKIP_RPATH=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-files + (lambda _ + (substitute* "deploy/linux/deploy.cmake" + (("message.FATAL_ERROR.*os-release.*") + "set(RELEASE_FILE_CONTENTS \"\")\n")) + (substitute* "src/lib/deskflow/unix/AppUtilUnix.cpp" + (("/usr/share/X11/xkb/rules/evdev.xml") + (string-append #$(this-package-input "xkeyboard-config") + "/share/X11/xkb/rules/evdev.xml"))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "QT_QPA_PLATFORM" "offscreen") + ;; From the project GitHub actions: "Integration tests are + ;; flakey by nature, make them optional". See: + ;; <.github/workflows/continuous-integration.yml>. + (invoke "./bin/legacytests")))) + (add-after 'install 'wrap-executable + (lambda _ + (let ((qtbase #$(this-package-input "qtbase"))) + (wrap-program (string-append #$output "/bin/deskflow") + `("QT_QPA_PLATFORM_PLUGIN_PATH" ":" = + (,(string-append qtbase "/lib/qt6/plugins/platforms")))))))))) + (native-inputs + (list doxygen + googletest + sysprof + vulkan-headers + coreutils + help2man + pkg-config)) + (inputs + (list bash-minimal + cli11 + gdk-pixbuf + libei + libportal + libx11 + libxi + libxinerama + libxkbcommon + libxkbfile + libxrandr + libxtst + libsm + libice + openssl + pugixml + python + qtbase + qtsvg + qttranslations + qttools + qtwayland + tomlplusplus + wayland + wayland-protocols + xkeyboard-config)) + (home-page "https://deskflow.org/") + (synopsis "Share a single keyboard and mouse between multiple computers") + (description + "Deskflow is a keyboard and mouse sharing app. Use the keyboard, +mouse,or trackpad of one computer to control nearby computers, and work +seamlessly between them. It's like a software KVM (but without the video). +TLS encryption is enabled by default. It supports Wayland clipboard +sharing.") + (license license:gpl2))) + (define-public hw-probe (package (name "hw-probe") diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm index 2b7a36290a..c26ccde598 100644 --- a/gnu/packages/librewolf.scm +++ b/gnu/packages/librewolf.scm @@ -116,14 +116,14 @@ (define computed-origin-method (@@ (guix packages) computed-origin-method)) (define firefox-l10n - (let ((commit "93aea9134e458a78257e4164832e4871d1e425d8")) + (let ((commit "2962877b9abd5bfa1e24e5bbc1e16e47e12d6760")) (origin (method git-fetch) (uri (git-reference (url "https://github.com/mozilla-l10n/firefox-l10n.git") (commit commit))) (file-name (git-file-name "firefox-l10n" commit)) - (sha256 (base32 "1bpn8jp477lzcnba4s23dy0dqr64ll2qvkaj45aa5j40nrz7qfwk"))))) + (sha256 (base32 "1gaxbjjm0d4k4wgl64mwcxy2hx1vdq1dbmvjacg2fqxpnb62481x"))))) (define* (make-librewolf-source #:key version firefox-hash librewolf-hash l10n) (let* ((ff-src (firefox-source-origin @@ -220,17 +220,17 @@ ;; It's used for cache validation and therefore can lead to strange bugs. ;; ex: date '+%Y%m%d%H%M%S' ;; or: (format-time-string "%Y%m%d%H%M%S") -(define %librewolf-build-id "20250823164949") +(define %librewolf-build-id "20250829153926") (define-public librewolf (package (name "librewolf") - (version "142.0-1") + (version "142.0.1-1") (source (make-librewolf-source #:version version - #:firefox-hash "03sblq1l5hjlwgqh1vyshrw1161cs5amlx7kjqzmjv1v1zqy2218" - #:librewolf-hash "1yk7cyqwr264968dyl7v92jn25giaawg5i2zla89177iw32zvfgx" + #:firefox-hash "1h0hx0jxwy4rshdq6s5l5hbj8gyhn2zssisr59skwf63si7b9bdh" + #:librewolf-hash "1myzm6jblnrw1vdf5xlynbfr6a9swwcaws689az7xgq6s6n0rc3y" #:l10n firefox-l10n)) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 30437ae565..4623871309 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net> ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2025 John Khoo <johnkhootf@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -47,6 +48,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages lsof) #:use-module (gnu packages openbox) + #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages text-editors) @@ -66,22 +68,42 @@ #:use-module (guix packages) #:use-module (guix utils)) +(define delete-generated-c-files + ;; Remove C files generated by Vala so we can build from source. + '(let* ((c->vala + (lambda (file) + (string-append (string-drop-right file 2) + ".vala"))) + (generated-c-file? + (lambda (file stat) + (and (string-suffix? ".c" file) + (file-exists? (c->vala file)))))) + (for-each delete-file + (find-files "." generated-c-file?)))) + (define-public libfm (package (name "libfm") - (version "1.3.2") + (version "1.4.0") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/pcmanfm/" - "PCManFM%20%2B%20Libfm%20%28tarball%20release" - "%29/LibFM/" name "-" version ".tar.xz")) - (sha256 - (base32 - "1rfira3lx8v6scz1aq69925j4vslpp36bmgrrzcfby2c60q2c155")))) + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/libfm") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gxg09lcacy7dh5pg1bm3rw11jffg7y59j0cb2cfsrgf0g5bjsvn")) + (modules '((guix build utils))) + (snippet delete-generated-c-files))) (build-system gnu-build-system) (arguments (list #:configure-flags #~(list "--with-gtk=3"))) (inputs (list glib gtk+)) (native-inputs (list intltool + which + automake + autoconf + gtk-doc `(,glib "bin") ; for gtester libtool menu-cache @@ -97,8 +119,9 @@ Glib/GIO giving a higher-level API.") (package (inherit libfm) (name "libfm-extra") (arguments '(#:configure-flags '("--with-extra-only"))) - (inputs (list glib)) - (native-inputs (list intltool libtool pkg-config)) + (inputs (list glib libexif)) + (native-inputs + (list autoconf automake gtk-doc intltool libtool pkg-config which)) (synopsis "File management support (extra library)") (description "This package contains a stand-alone library which extends the libFM file management library."))) @@ -106,18 +129,20 @@ libFM file management library."))) (define-public lxappearance (package (name "lxappearance") - (version "0.6.3") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/lxde/" - "LXAppearance/lxappearance-" version ".tar.xz")) + (version "0.6.4") + (source (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/lxappearance") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj")))) + (base32 "1cia6mkb3fqy3rgfprlmq0ajh15cnazdwdkv4zd19klrh4jzg4xp")))) (build-system gnu-build-system) (arguments (list #:configure-flags #~(list "--enable-gtk3"))) (inputs (list gtk+)) - (native-inputs (list intltool pkg-config)) + (native-inputs (list automake autoconf intltool pkg-config)) (synopsis "LXDE GTK+ theme switcher") (description "LXAppearance is a desktop-independent GTK+ theme switcher able to change themes, icons, and fonts used by GTK+ applications.") @@ -127,16 +152,16 @@ able to change themes, icons, and fonts used by GTK+ applications.") (define-public lxrandr (package (name "lxrandr") - (version "0.3.2") + (version "0.3.3") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/lxde/LXRandR" - "%20%28monitor%20config%20tool%29/LXRandR%20" - (version-major+minor version) ".x/" - "lxrandr-" version ".tar.xz")) - (sha256 - (base32 - "04n3vgh3ix12p8jfs4w0dyfq3anbjy33h7g53wbbqqc0f74xyplb")))) + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/lxrandr") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vh5r6bwafh9mq7syhdw1f2ahwvibq2wdc1ij84hbaa5bnyjfr8h")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--enable-gtk3") @@ -150,7 +175,7 @@ able to change themes, icons, and fonts used by GTK+ applications.") (("(\"|')xrandr\"" _ match) (string-append match (which "xrandr") "\"")))))))) (inputs (list gtk+ xrandr)) - (native-inputs (list intltool pkg-config)) + (native-inputs (list automake autoconf intltool pkg-config)) (synopsis "LXDE monitor configuration tool") (description "LXRandR is a very basic monitor configuration tool. It relies on the X11 resize-and-rotate (RandR) extension but doesn't aim to be a @@ -163,20 +188,20 @@ or external monitor.") (define-public lxtask (package (name "lxtask") - (version "0.1.10") + (version "0.1.12") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/lxde/LXTask" - "%20%28task%20manager%29/LXTask%20" - (version-major+minor version) ".x/" - "lxtask-" version ".tar.xz")) - (sha256 - (base32 - "0b2fxg8jjjpk219gh7qa18g45365598nd2bq7rrq0bdvqjdxy5i2")))) + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/lxtask") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "11vcl0k2yhx59599fdk8gv5jh2gsgh7rmp2syybk3vpmby6p93h4")))) (build-system gnu-build-system) (arguments (list #:configure-flags #~(list "--enable-gtk3"))) (inputs (list gtk+)) - (native-inputs (list intltool pkg-config)) + (native-inputs (list automake autoconf intltool pkg-config)) (synopsis "LXDE task manager") (description "LXTask is a lightweight task manager derived from Xfce task manager with all dependencies on Xfce removed. LXTask is based on the GTK+ @@ -187,19 +212,20 @@ toolkit. It allows users to monitor and control of running processes.") (define-public lxterminal (package (name "lxterminal") - (version "0.3.2") + (version "0.4.1") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/lxde/LXTerminal" - "%20%28terminal%20emulator%29/LXTerminal%20" - version "/" name "-" version ".tar.xz")) - (sha256 - (base32 - "1124pghrhnx6q4391ri8nvi6bsmvbj1dx81an08mird8jf2b2rii")))) + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/lxterminal") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "159p34caid7ca679ly1lhvw4qclqh23ddsiphlw9yn0h9v8s2dd0")))) (build-system gnu-build-system) (arguments (list #:configure-flags #~(list "--enable-gtk3"))) (inputs (list gtk+ vte/gtk+-3)) - (native-inputs (list intltool pkg-config)) + (native-inputs (list automake autoconf intltool pkg-config)) (synopsis "LXDE terminal emulator") (description "LXTerminal is a VTE-based terminal emulator. It supports multiple tabs and has only minimal dependencies thus being completely @@ -211,19 +237,19 @@ performance, all instances of the terminal are sharing a single process.") (define-public menu-cache (package (name "menu-cache") - (version "1.1.0") + (version "1.1.1") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/lxde/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1iry4zlpppww8qai2cw4zid4081hh7fz8nzsp5lqyffbkm2yn0pd")))) + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/menu-cache") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0qhc72xinxmd68nfrph9jfwymkw9x71drgksz2r2k5nzv9p7cnp5")))) (build-system gnu-build-system) - (inputs `(("glib" ,glib) - ("libfm" ,libfm-extra))) - (native-inputs (list pkg-config)) + (inputs (list glib libfm-extra)) + (native-inputs (list automake autoconf libtool gtk-doc pkg-config)) (arguments `(#:configure-flags '("CFLAGS=-fcommon"))) (synopsis "LXDE implementation of the freedesktop menu's cache") @@ -235,20 +261,22 @@ speed up the access to freedesktop.org defined application menus.") (define-public pcmanfm (package (name "pcmanfm") - (version "1.3.2") + (version "1.4.0") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/pcmanfm/" - "PCManFM%20%2B%20Libfm%20%28tarball%20release" - "%29/PCManFM/pcmanfm-" version ".tar.xz")) + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/pcmanfm") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1xqc2k2jh165mm81xg0ghxx0ml1s3rhh4ndvbzkcri4kfhj7pjql")))) + "0dkl12a6x9w3ka4g2qx0ssxdv7v432xar6v2gddzbzsxg4546hp2")))) (build-system gnu-build-system) (arguments (list #:configure-flags #~(list "--with-gtk=3"))) (inputs (list gtk+ gvfs ;for trash and mount support libfm libx11)) - (native-inputs (list intltool libtool pkg-config)) + (native-inputs (list intltool automake autoconf libtool pkg-config)) (propagated-inputs (list lxmenu-data)) ;for "Open With..." application list (synopsis "LXDE file manager") @@ -417,19 +445,19 @@ customizable menu system, and Bash integration.") (define-public lxmenu-data (package (name "lxmenu-data") - (version "0.1.5") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge//lxde/" - "lxmenu-data%20%28desktop%20menu%29/" - name "-" version ".tar.xz")) + (version "0.1.6") + (source (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/lxmenu-data") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "1f5sh2dvb3pdnjlcsyzq9543ck2jsqizkx3204cr22zm5s6j3qwz")))) + (base32 "1abicrm66pn4vphlwx0rg2q3wvjmzijf0vgpml1vr3zkp7xm01z5")))) (build-system gnu-build-system) (native-inputs - (list pkg-config intltool)) + (list glib automake autoconf pkg-config intltool)) (synopsis "Freedesktop.org desktop menus for LXDE") (description "Lxmenu-data provides files required to build freedesktop.org @@ -440,19 +468,19 @@ menu spec-compliant desktop menus for LXDE.") (define-public lxde-icon-theme (package (name "lxde-icon-theme") - (version "0.5.1") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/lxde/LXDE%20Icon%20Theme/" - "lxde-icon-theme-" version "/" - name "-" version ".tar.xz")) + (version "0.5.2") + (source (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/lxde-icon-theme") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0v4i6x86fr2hbx4fb2si7y2qzmj7h6hcjwaifnin18r8kwwvgl73")))) + (base32 "0sv3pzvxs1gxa7dpqs7zls3wc7kj9x8w99i4h56mdsc6vz61y3mp")))) (build-system gnu-build-system) (native-inputs - (list pkg-config)) + (list automake autoconf pkg-config)) (synopsis "LXDE default icon theme based on nuoveXT2") (description "Lxde-icon-theme provides an default icon theme for LXDE.") @@ -462,17 +490,16 @@ menu spec-compliant desktop menus for LXDE.") (define-public lxde-common (package (name "lxde-common") - (version "0.99.2") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/lxde/" - "lxde-common%20%28default%20config%29/" - "lxde-common%20" (version-major+minor version) "/" - name "-" version ".tar.xz")) + (version "0.99.3") + (source (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/lxde-common") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0mj84fa3f4ak1jjslrwc2q3ci9zxrxpciggviza9bjb0168brn8w")))) + (base32 "0py5dazjmz7yh5p0zv7psgsx4291cg21h5kw6ww5bzvr34kpbnwc")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -486,7 +513,7 @@ menu spec-compliant desktop menus for LXDE.") "/bin/lxsession"))) #t)))))) (native-inputs - (list pkg-config intltool lxmenu-data lxde-icon-theme)) + (list automake autoconf pkg-config intltool lxmenu-data lxde-icon-theme)) (inputs (list lxsession ;; ("lxlock" ,lxlock) ;for 'lxde-screenlock.desktop' @@ -500,22 +527,22 @@ menu spec-compliant desktop menus for LXDE.") (define-public lxinput (package (name "lxinput") - (version "0.3.5") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/lxde/" - "LXInput%20%28Kbd%20and%20amp_%20mouse%20config%29/" - "LXInput%200.3.x/" name "-" version ".tar.xz")) + (version "0.3.6") + (source (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/lxinput") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "123f3yn4rp1w5b3n5aj3ad9snkxab29qkrs7bcvf5bx4cn57g3sf")))) + (base32 "13xqxwsb00h20yg514pjmdlvmfqv029nwdy70aaqn0r0jz670sm7")))) (build-system gnu-build-system) (arguments (list #:configure-flags #~(list "--enable-gtk3"))) (inputs (list gtk+)) (native-inputs - (list pkg-config intltool)) + (list automake autoconf pkg-config intltool)) (synopsis "Tool for mouse and keyboard configuration in LXDE") (description "Lxinput provides a small program to configure keyboard and mouse @@ -526,41 +553,24 @@ in LXDE.") (define-public lxsession (package (name "lxsession") - (version "0.5.5") + (version "0.5.6") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/lxde/" - "LXSession%20%28session%20manager%29/" - "LXSession%200.5.x/" - "lxsession-" version ".tar.xz")) + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/lxsession") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0imv9nysip1j9lrb2z96kl05isjgp312323wnnd5b59h0ff0sgp4")) + (base32 "0mgykzhd5n11mfcbpaqb841f4jwy1yhmd1xn49dxc2hci8bx26fx")) + ;; Fix https://github.com/lxde/lxsession/issues/42 + (patches (search-patches "lxsession-potfiles-ignore.patch")) (modules '((guix build utils))) - (snippet - ;; Remove C files generated by Vala so we can build from source. - '(let* ((c->vala - (lambda (file) - (string-append (string-drop-right file 2) - ".vala"))) - (generated-c-file? - (lambda (file stat) - (and (string-suffix? ".c" file) - (file-exists? (c->vala file)))))) - (for-each delete-file - (find-files "." generated-c-file?)))))) + (snippet delete-generated-c-files))) (build-system gnu-build-system) (arguments - `(#:configure-flags (list "--enable-gtk3" - ;; Fix build with GCC 14. - "CFLAGS=-Wno-error=incompatible-pointer-types") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'rm-stamp - (lambda _ - (for-each delete-file (find-files "." "\\.stamp$")) - ;; Force regeneration of configure script. - (delete-file "configure")))))) + `(#:configure-flags (list "--enable-gtk3"))) (inputs (list gtk+ polkit)) @@ -581,16 +591,17 @@ in LXDE.") (define-public lxpanel (package (name "lxpanel") - (version "0.10.1") + (version "0.11.1") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/lxde/" - "LXPanel%20%28desktop%20panel%29/" - "LXPanel%200.10.x/lxpanel-" - version ".tar.xz")) + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/lxpanel") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1s0y8jjkw6qz0r8l90618b8xly0c8g906kah7b162sz3sxbqyc8y")))) + (base32 "1xqhxcwhx2qlgsri10gwldb0xz9ajsc3iqnn8d53bjb4yh0vk5wf")))) (build-system gnu-build-system) (arguments (list @@ -619,6 +630,9 @@ in LXDE.") wireless-tools)) (native-inputs (list docbook-xml + libtool + automake + autoconf gettext-minimal intltool pkg-config)) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 813c019c58..f9f268c8be 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -8506,7 +8506,7 @@ operations.") (define-public bitwuzla (package (name "bitwuzla") - (version "0.7.0") + (version "0.8.2") (source (origin (method git-fetch) @@ -8515,7 +8515,7 @@ operations.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1fpd1kgb5xdbcjiqbbc6j0b8g2ly9bp9m3la78fiayl4qlmsvh2b")))) + (base32 "0nakqz29cfkn91yvx1xzsk50rlqbiihslflbjanv4lflcl2zx6mz")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Dtesting=enabled" "-Ddefault_library=shared" diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 82b67d3e4b..7eaffc8e06 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -5247,3 +5247,39 @@ recording packets that are dropped by the kernel. It provides the commands Protocol. RDAP is modern a replacement for WHOIS, which provides domain name and IP address registration information in JSON format over HTTP.") (license license:expat))) + +(define-public wireproxy + (package + (name "wireproxy") + (version "1.0.10") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyvl/wireproxy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ypk9migx1l7xwcxr542pcdy8q2bm33wp03bqzgav0hp1fsrmi8p")))) + (build-system go-build-system) + (arguments + (list + #:install-source? #f + #:import-path "github.com/pufferffish/wireproxy/cmd/wireproxy" + #:unpack-path "github.com/pufferffish/wireproxy" + #:test-subdirs #~(list "../../..."))) ;to test the whole module + (native-inputs + (list go-github-com-akamensky-argparse + go-github-com-go-ini-ini + go-github-com-landlock-lsm-go-landlock + go-github-com-makenowjust-heredoc-v2 + go-github-com-things-go-go-socks5 + go-golang-org-x-net + go-golang-zx2c4-com-wireguard + go-suah-dev-protect)) + (home-page "https://github.com/whyvl/wireproxy") + (synopsis "Wireguard client that exposes itself as a socks5 proxy") + (description + "wireproxy is a completely userspace application that connects to a +wireguard peer, and exposes a socks5/http proxy or tunnels on the machine.") + (license license:isc))) diff --git a/gnu/packages/patches/lxsession-potfiles-ignore.patch b/gnu/packages/patches/lxsession-potfiles-ignore.patch new file mode 100644 index 0000000000..ddf45cf506 --- /dev/null +++ b/gnu/packages/patches/lxsession-potfiles-ignore.patch @@ -0,0 +1,15 @@ +diff --git a/po/POTFILES.skip b/po/POTFILES.skip +index 353b0ec..adbe1d6 100644 +--- a/po/POTFILES.skip ++++ b/po/POTFILES.skip +@@ -1,7 +1,10 @@ + # Autogenerated files with translatable strings. + lxsession-default-apps/main.c + lxsession-default-apps/combobox.c ++lxpolkit/main.c ++lxsession/app.c + # This is a source file for configure, output will be translated instead. + data/lxpolkit.desktop.in.in + # bug of intltool with automake 1.15 + sub/data/lxpolkit.desktop.in ++data/lxpolkit.desktop.in diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm deleted file mode 100644 index 2385d74e0d..0000000000 --- a/gnu/packages/pep.scm +++ /dev/null @@ -1,342 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2020, 2021 Hartmut Goebel <h.goebel@crazy-compilers.com> -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. - -(define-module (gnu packages pep) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix git-download) - #:use-module (guix build-system gnu) - #:use-module (guix build-system python) - #:use-module (guix build-system pyproject) - #:use-module (gnu packages) - #:use-module (gnu packages base) - #:use-module (gnu packages boost) - #:use-module (gnu packages check) - #:use-module (gnu packages documentation) - #:use-module (gnu packages graphviz) - #:use-module (gnu packages java) - #:use-module (gnu packages linux) - #:use-module (gnu packages mail) ; for libetpan - #:use-module (gnu packages nettle) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages python-build) - #:use-module (gnu packages python-xyz) - #:use-module (gnu packages sequoia) - #:use-module (gnu packages sqlite) - #:use-module (gnu packages tls) - #:use-module (gnu packages xml)) - -(define-public yml2 - (package - (name "yml2") - (version "2.7.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitea.pep.foundation/fdik/yml2") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0fm1x1fv4lwcpbn59s55idzf7x173n59xpz8rlrxalmi6gvsjijr")))) - (build-system pyproject-build-system) - (arguments - (list - ;; XXX: There is no testing framework, only a samples directory. - #:tests? #f)) - (native-inputs (list python-setuptools python-wheel)) - (propagated-inputs (list python-lxml)) - (home-page "https://fdik.org/yml/") - (synopsis "Use a Domain Specific Language for XML without defining -a grammar") - (description - "The YML compiler is a small Python script. It provides the command line -front end yml2c. As default, it compiles your script and outputs to stdout, -that usually is the terminal. Your shell provides options to redirect the -output into a pipe or a file.") - (license license:gpl2))) - -(define fdik-libetpan - ;; pEp Engine requires libetpan with a set of patches that have not been - ;; upstreamed yet. - (let ((commit "0b80c39dd1504462ba3a39dc53db7c960c3a63f3") ; 2020-11-27 - (checksum "0gv3ivaziadybjlf6rfpv1j5z5418243v5cvl4swlxd2njsh7gjk") - (revision "6")) - (package - (inherit libetpan) - (name "fdik-libetpan") - (version (string-append "1.6-" revision "." (string-take commit 8))) - (source - (origin - (inherit (package-source libetpan)) - (method git-fetch) - (uri (git-reference - (url "https://gitea.pep.foundation/pEp.foundation/libetpan") - (commit commit))) - (file-name (string-append name "-" version)) - (sha256 (base32 checksum))))))) - -(define-public pep-engine - (package - (name "pep-engine") - (version "2.1.34") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitea.pep.foundation/pEp.foundation/pEpEngine") - (commit (string-append "Release_" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "00q96y9j985qfa382acsz02i0zf6ayq2gmg8z70jzl04isg1h3cn")))) - (build-system gnu-build-system) - (arguments - '(#:parallel-build? #f - #:make-flags '("NDEBUG=1") ; release build - #:phases - (modify-phases %standard-phases - (replace 'configure - ;; pEpEngine does not use autotools and configure, - ;; but a local.conf. We need to tweak the values there. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (yml2 (assoc-ref inputs "yml2"))) - (with-output-to-file "local.conf" - (lambda () - (format #t " -PREFIX=~a -PER_MACHINE_DIRECTORY=${PREFIX}/share/pEp -SYSTEM_DB=~a/share/pEp/system.db -ASN1C=~a -YML2_PATH=~a -OPENPGP=SEQUOIA -" - out out (which "asn1c") - (string-append yml2 "/bin")))) - #t))) - (delete 'check) - (add-after 'install 'install-db - (lambda _ - (invoke "make" "-C" "db" "install")))))) - (native-inputs - (list asn1c ; >= 0.9.27 - pkg-config yml2)) - (inputs - (list fdik-libetpan - nettle - openssl - sequoia - sqlite - `(,util-linux "lib"))) ;; uuid.h - (home-page "https://pep.foundation/") - (synopsis "Library for automatic key management and encryption of -messages") - (description "The p≡p engine is the core part of p≡p (pretty Easy -privacy).") - (license ;; code: GPL 3, docs: CC-BY-SA - (list license:gpl3 license:cc-by-sa3.0)))) - -(define-public libpepadapter - (package - (name "libpepadapter") - (version "2.1.21") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitea.pep.foundation/pEp.foundation/libpEpAdapter") - (commit (string-append "Release_" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "09ljj3x09y99wc47n063hpn62zi8cdvdha82rnaypvirrlga6a5w")))) - (build-system gnu-build-system) - (arguments - '(#:test-target "test" - #:tests? #f ;; building the tests fails - #:make-flags '("NDEBUG=1") ; release build - #:phases - (modify-phases %standard-phases - (replace 'configure - ;; libpEpAdapter does not use autotools and configure, - ;; but a local.conf. We need to tweak the values there. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (engine (assoc-ref inputs "pep-engine"))) - (with-output-to-file "local.conf" - (lambda _ - (format #t " -PREFIX=~a -ENGINE_LIB_PATH=~a/lib -ENGINE_INC_PATH=~a/include -" out engine engine)))) - #t))))) - (inputs - (list pep-engine)) - (home-page "https://pep.foundation/") - (synopsis "Library for building p≡p adapters") - (description "This C++ library provides common structures used in p≡p -(pretty Easy privacy) adapters.") - (license license:bsd-3))) - -(define-public python-pep-adapter - (package - (name "python-pep-adapter") - (version "2.1.3") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitea.pep.foundation/pEp.foundation/pEpPythonAdapter") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0ssz21p1k7xx3snmd4g3ggzq565rlzdmp90l2mph6yfp1y65p39s")))) - (build-system python-build-system) - (arguments - `(;; Adding configure-flags does not work, running `build_ext` - ;; with these flags, neither does adding the options to - ;; `setup.cfg`: Either `build` or `install` fails (since - ;; flags are given or missing), or "command 'BuildExtCommand' - ;; has no such option 'pep_engine" - ;; '(#:configure-flags - ;; (list (string-append "--with-pEp-engine=" - ;; (assoc-ref inputs "pEpEngine")) - ;; (string-append "--with-pEp-libadapter=" - ;; (assoc-ref inputs "libpEpAdapter")) - ;; ;;(string-append "--boost=" - ;; (assoc-ref inputs "boost")) not supported - ;; (string-append "--with-asn1c-share=" - ;; (assoc-ref inputs "asn1c") "/share")) - #:phases - (modify-phases %standard-phases - (add-before 'build 'fix-setup.py - (lambda _ - (substitute* "setup.py" - (("^(\\s+SYS_INCLUDES = )\\['/usr.*" _ a) - (string-append a "os.getenv('CPATH', '').split(os.pathsep)\n")) - (("^(\\s+SYS_LIB_PREFIXES = )\\['/usr.*" _ a) - (string-append a "os.getenv('LIBRARY_PATH', '').split(os.pathsep)\n")) - (("^(\\s+SYS_SHARES = )\\['/usr.*" _ a) - (string-append a "['" (assoc-ref %build-inputs "asn1c") "/share']\n"))) - #t)) - (add-before 'build 'remove-wheel-requirement - ;; we dont't build a wheel - (lambda _ - (substitute* "setup.cfg" - ((" wheel *>= [0-9.]*") "")) - (substitute* "pyproject.toml" - (("\"wheel *>=.*\"") "")) - #t))))) - (native-inputs - (list python-pytest python-pytest-forked)) - (inputs - (list boost libpepadapter pep-engine python-setuptools-scm - `(,util-linux "lib"))) ;; uuid.h - (home-page "https://pep.foundation/") - (synopsis "Python adapter for p≡p (pretty Easy Privacy)") - (description "The p≡p Python adapter is an adaptor interface to the p≡p -(pretty Easy privacy) engine.") - (license license:gpl3))) - -(define-public java-pep-adapter - (package - (name "java-pep-adapter") - (version "2.1.23") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitea.pep.foundation/pEp.foundation/pEpJNIAdapter") - (commit (string-append "Release_" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1sw3a5ggxcrkghvpp0a6h2lz461x55ldgfw5y4pw7c3gk5wynvjk")))) - (build-system gnu-build-system) - (outputs '("out" "doc")) - (arguments - `(#:test-target "test" - #:make-flags '("NDEBUG=1" "all" "doc") ; release build - #:phases - (modify-phases %standard-phases - (add-before 'configure 'pin-shared-lib-path - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "src/java/foundation/pEp/jniadapter/AbstractEngine.java" - (("System.loadLibrary\\(\"pEpJNI\"\\);") - (string-append "System.load(\"" - (assoc-ref outputs "out") - "/lib/libpEpJNI.so" "\");"))) - #t)) - (replace 'configure - ;; pEpJNIAdapter does not use autotools and configure, - ;; but a local.conf. We need to tweak the values there. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (engine (assoc-ref inputs "pep-engine")) - (libadapter (assoc-ref inputs "libpepadapter")) - (openjdk (assoc-ref inputs "openjdk"))) - (with-output-to-file "local.conf" - (lambda _ - (format #t " -PREFIX=~a -ENGINE_LIB_PATH=~a/lib -ENGINE_INC_PATH=~a/include -AD_LIB_PATH=~a/lib -AD_INC_PATH=~a/include -YML2_PROC=~a -JAVA_HOME=~a -" - out engine engine libadapter libadapter - (which "yml2proc") openjdk))) - (substitute* "src/Makefile" ;; suppress some warnings - (("^\\s+OLD_JAVA=") " xxx_OLD_JAVA=")) - #t))) - (add-before 'build 'build-codegen - ;; run codegen first to allow parallel build of other parts - (lambda _ - (invoke "make" "-C" "src" "create-dirs" "codegen"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (libout (string-append out "/lib/")) - (javaout (string-append out "/share/java/"))) - (install-file "dist/libpEpJNI.a" libout) - (install-file "dist/libpEpJNI.so" libout) - (install-file "dist/pEp.jar" javaout) - #t))) - (add-after 'install 'install-docs - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "doc")) - (docout (string-append out "/share/doc/pEp-JNI-adapter")) - (cxxout (string-append docout "/cxx")) - (javaout (string-append docout "/java"))) - (mkdir-p cxxout) - (mkdir-p javaout) - (copy-recursively "doc/doxygen/cxx/html" cxxout) - (copy-recursively "doc/doxygen/java/html" javaout) - #t)))))) - (native-inputs - (list doxygen graphviz - `(,openjdk9 "jdk") which yml2)) - (inputs - (list libpepadapter pep-engine - `(,util-linux "lib"))) ;; uuid.h - (home-page "https://pep.foundation/") - (synopsis "Java adapter for p≡p (pretty Easy Privacy)") - (description "The p≡p JNI adapter is a Java adapter interface to the p≡p -(pretty Easy privacy) engine.") - (license license:gpl3))) diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index 3b526cc7d0..4ef7656a04 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -185,7 +185,7 @@ it.") (define-public trealla (package (name "trealla") - (version "2.82.23") + (version "2.82.25") (source (origin (method git-fetch) @@ -194,7 +194,7 @@ it.") (url "https://github.com/trealla-prolog/trealla") (commit (string-append "v" version)))) (sha256 - (base32 "0qsbgn8lq827z5d3a8dwrmbzk3z0kgvcp4wxqsizhplspsy1d7w1")) + (base32 "0mq1yf5sxzvi9rkw1vwmyh0a9yv8rhqy8z0wd5k748ymvjfhi6g2")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 3a1cb48412..7dc4f65db7 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -973,7 +973,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") qwt sdl soapysdr - spdlog + spdlog-1.15 volk zeromq)) (arguments |