diff options
Diffstat (limited to 'gnu/packages')
52 files changed, 1257 insertions, 1244 deletions
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index f9bc43f952..c884c1561c 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -1358,7 +1358,23 @@ mounted via FUSE.") #:tests? #f ; no tests provided upstream #:phases ;; There is no configure step. - #~(modify-phases %standard-phases (delete 'configure)))) + #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'patch-calloc-order + ;; As of the 1.1.5 release, the calloc argument order is + ;; wrong, and GCC 14 recognises this. We correct it here. + ;; When updating this package, remove these patches + ;; (fixed in master). + (lambda _ + (substitute* "backed_block.cpp" + (("calloc[(]sizeof[(]struct backed_block_list[)], 1[)]") + "calloc(1, sizeof(struct backed_block_list))")) + (substitute* "simg2simg.cpp" + (("calloc[(]sizeof[(]struct sparse_file[*][)], files[)]") + "calloc(files, sizeof(struct sparse_file*))")) + (substitute* "sparse.cpp" + (("calloc[(]sizeof[(]struct sparse_file[)], 1[)]") + "calloc(1, sizeof(struct sparse_file))"))))))) (inputs (list zlib)) (home-page "https://github.com/anestisb/android-simg2img") (synopsis "Convert Android sparse images to raw ext4 images") diff --git a/gnu/packages/apl.scm b/gnu/packages/apl.scm index 5d159a90ef..3312ce2fb5 100644 --- a/gnu/packages/apl.scm +++ b/gnu/packages/apl.scm @@ -28,12 +28,10 @@ #:use-module (guix svn-download) #:use-module (guix gexp) #:use-module (guix packages) - #:use-module (guix build-system font) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (gnu packages bash) #:use-module (gnu packages compression) - #:use-module (gnu packages fontutils) #:use-module (gnu packages gettext) #:use-module (gnu packages java) #:use-module (gnu packages maths) @@ -86,86 +84,6 @@ an implementation of the ISO standard 13751.") (license license:gpl3+)))) -(define-public font-apl2741-unicode - (let ((commit "1e11efae38e5095bfe49a786b111d563e83dad03")) - (package - (name "font-apl2741-unicode") - (version "1668049300") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/abrudz/APL2741.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0i1yk1x99lr2swlbq9r7dny5w70zwiwi8lpfcw4n7k7pfbw0xh7y")))) - (build-system trivial-build-system) - (native-inputs (list fontforge)) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let* ((source (assoc-ref %build-inputs "source")) - (out (assoc-ref %outputs "out")) - (dest (string-append out "/share/fonts/truetype")) - (fontforge (string-append - (assoc-ref %build-inputs "fontforge") - "/bin/fontforge"))) - (mkdir-p dest) - (invoke fontforge "-lang=ff" "-c" "Open($1); Generate($2)" - (string-append source "/APL2741.sfd") - (string-append dest "/APL2741.ttf")))))) - (synopsis "APL2741 Unicode font") - (home-page "https://abrudz.github.io/APL2741/") - (description "APL font based on Adrian Smith's IBM Selectric APL2741 -golf-ball font. It supports most special characters used by popular APL -implementations, some additional mathematical and typographical symbols, -single line drawing characters, as well as the full Unicode APL range, -including both uppercase and lowercase underscored alphabets, as-of-yet unused -symbols, and almost all Latin-1 accented letters.") - (license license:unlicense)))) - -(define-public font-apl333 - (package - (name "font-apl333") - ;; Version number as for apl-385, last modified 2013-04-20. - (version "20130420") - (source - (origin - (method url-fetch) - (uri (string-append "https://apl385.com/fonts/" "apl333.zip")) - (sha256 - (base32 "0yn0ha7d14vp4ma3lxbc9kpyrn20m7brjisr6w55c9mi24w9v3a5")))) - (build-system font-build-system) - (home-page "https://apl385.com/fonts/index.htm") - (synopsis "Variable-width APL font inspired by Comic Sans Serif") - (description - "Variable-width version of Adrian Smith's APL385 font developed with APL -software vendors in the late 1980s.") - (license license:public-domain))) - -(define-public font-apl385 - (package - (name "font-apl385") - ;; No version number or release, unzipping source and checking file times - ;; shows the font file was last modified on 2016-08-21. - (version "20160821") - (source - (origin - (method url-fetch) - (uri (string-append "https://apl385.com/fonts/" "apl385.zip")) - (sha256 - (base32 "132qfsnx0v6qf8x8iy3flivv449nz42nnpkwjysmz65w6wqxpk1g")))) - (build-system font-build-system) - (home-page "https://apl385.com/fonts/index.htm") - (synopsis "Monospaced APL font inspired by Comic Sans Serif") - (description - "Adrian Smith's monospaced APL font developed with APL software vendors -in the late 1980s.") - (license license:public-domain))) - (define-public dzaima-apl (package (name "dzaima-apl") diff --git a/gnu/packages/apple.scm b/gnu/packages/apple.scm deleted file mode 100644 index b59eee1802..0000000000 --- a/gnu/packages/apple.scm +++ /dev/null @@ -1,59 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2022 B. Wilson <elaexuotee@wilsonb.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 apple) - #:use-module (gnu packages bison) - #:use-module (guix build-system gnu) - #:use-module (guix packages) - #:use-module (guix git-download) - #:use-module ((guix licenses) #:prefix license:)) - -(define-public apple-bash - (package - (name "apple-bash") - (version "125") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/apple-oss-distributions/bash.git") - (commit (string-append "bash-" version)))) - (sha256 - (base32 "1d4s1z57yiyhgb6i22kb9al31j1fv9a4rp1bb747ny6grdvc4919")) - (file-name (git-file-name name version)))) - (build-system gnu-build-system) - (native-inputs (list bison)) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-before 'configure 'pre-configure - (lambda _ - ;; An XCode project wraps the actual bash source. - (chdir "bash-3.2") - ;; The xlocale.h header was removed in glibc 2.26. - (substitute* "lib/glob/smatch.c" - (("xlocale.h") "locale.h")) - ;; EBADEXEC is XNU-specific. - (substitute* "execute_cmd.c" - (("EBADEXEC") "ENOEXEC"))))))) - (home-page "https://github.com/apple-oss-distributions/bash/") - (synopsis "Bash used on Apple macOS systems") - (description - "This is the version of Bash, forked from GNU Bash 3.2, released on Apple -macOS systems.") - (license license:gpl2+))) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index c4b721c9f5..94d49e1458 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -2154,3 +2154,103 @@ the features of iPXE without the hassle of reflashing.") "-o" (string-append firmware "/efi-" name ".rom"))))) '#$roms))))))))))) + +(define-public refind + (package + (name "refind") + (version "0.14.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/refind/" version + "/refind-src-" version ".tar.gz")) + (sha256 + (base32 + "1w682p0j59apjcy26xzzhv70fyd8nqjs47i8cz2qcsx71pl3rngp")) + (snippet + #~(begin + (use-modules (guix build utils)) + (delete-file-recursively + "refind/tools_x64/gptsync_x64.efi"))))) + (build-system gnu-build-system) + (outputs '("out" "doc")) + (native-inputs + (list binutils)) + (inputs + (list gnu-efi)) + (arguments + (list #:tests? #f ; no tests + #:make-flags + #~(list ;; Make build reproducible. + ;; Also disables secure boot anti-rollback protection. + ;; Otherwise, "objcopy --add-section" would change the + ;; timestamp inside the EFI file. + "OMIT_SBAT=1" + (string-append "AR=" #$(ar-for-target)) + (string-append "CC=" #$(cc-for-target)) + (string-append "LD=" #$(ld-for-target)) + (string-append "EFIINC=" (assoc-ref %build-inputs "gnu-efi") + "/include/efi") + (string-append "GNUEFILIB=" (assoc-ref %build-inputs "gnu-efi") + "/lib") + (string-append "EFILIB=" (assoc-ref %build-inputs "gnu-efi") + "/lib") + (string-append "EFICRT0=" (assoc-ref %build-inputs "gnu-efi") + "/lib") + (string-append "OBJCOPY=" (assoc-ref %build-inputs "binutils") + "/bin/objcopy")) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'build 'build-fs + (lambda* (#:key inputs make-flags #:allow-other-keys) + (apply invoke "make" "fs" make-flags))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out-sbin (string-append #$output "/sbin")) + (out-share + (string-append #$output "/share/refind-" + #$version)) + (out-share-refind + (string-append out-share "/refind"))) + (mkdir-p out-share) + (copy-recursively "banners" + (string-append out-share "/banners")) + (copy-recursively "fonts" + (string-append out-share "/fonts")) + (for-each (lambda (name) + (copy-recursively name + (string-append + out-share-refind "/" + name))) + (find-files "." "^drivers_" #:directories? #t)) + (copy-recursively "icons" + (string-append out-share-refind "/icons")) + ;(copy-recursively "keys" "/etc/refind.d") + (install-file "mkrlconf" out-sbin) + (install-file "mvrefind" out-sbin) + (install-file "refind-sb-healthcheck" out-sbin) + (install-file "refind-install" out-share) + (install-file "refind-mkdefault" out-sbin) + (install-file "refind.conf-sample" out-share-refind) + (for-each + (lambda (name) + (install-file name + (string-append #$output "/share/man/man8"))) + (find-files "docs/man" "[.]8$")) + (for-each (lambda (f) + (install-file f out-share-refind)) + (find-files "refind" "refind.*\\.efi$"))))) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out-doc + (string-append #$output:doc "/share/doc/refind-" + #$version))) + (copy-recursively "docs/refind" + (string-append out-doc "/refind")) + (copy-recursively "docs/Styles" + (string-append out-doc "/Styles")))))))) + (synopsis "rEFInd boot manager") + (description "This package provides a boot manager that is an EFI +program.") + (home-page "https://www.rodsbooks.com/refind/") + (license license:gpl3+))) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 7d081e3e3f..d508f37730 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -15,7 +15,6 @@ ;;; Copyright © 2020, 2021, 2023 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2021 lu hui <luhuins@163.com> -;;; Copyright © 2021, 2022 Foo Chuan Wei <chuanwei.foo@hotmail.com> ;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2023 Fries <fries1234@protonmail.com> ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> @@ -950,88 +949,6 @@ extensions over the standard utility.") (properties '((lint-hidden-cves . ("CVE-2023-40305" "CVE-2024-0911"))))))) -(define-public cdecl - (package - (name "cdecl") - (version "2.5") - (source - (origin - (method url-fetch) - (uri (string-append "https://www.ibiblio.org/pub/linux/devel/lang/c/cdecl-" - version ".tar.gz")) - (sha256 - (base32 "0dm98bp186r4cihli6fmcwzjaadgwl1z3b0zdxfik8h7hkqawk5p")))) - (build-system gnu-build-system) - (arguments - `(#:make-flags - ,#~(list "LIBS=-lreadline" - (string-append "BINDIR=" #$output "/bin") - (string-append "MANDIR=" #$output "/share/man/man1")) - #:phases - (modify-phases %standard-phases - (delete 'configure) ; No configure script. - (add-after 'unpack 'fix-build - (lambda _ - (substitute* "Makefile" - (("lex cdlex.l") - "flex cdlex.l")) - (substitute* "cdecl.c" - ;; Fix "error: conflicting types for ‘getline’". - (("char \\* getline\\(\\)") - "char * our_getline(void)") - (("char \\* getline \\(\\)") - "char * our_getline(void)") - (("line = getline\\(\\)") - "line = our_getline()") - ;; Fix "error: conflicting types for ‘getopt’". - (("int getopt\\(int,char \\*\\*,char \\*\\);") - "") - ;; Fix invalid use of "restrict" as a variable name. - (("i, j, restrict") - "i, j, restriction") - (("restrict =") - "restriction =") - ;; Fix "warning: implicit declaration of function ‘add_history’". - (("# include <readline/readline.h>" all) - (string-append all "\n# include <readline/history.h>")) - ;; Fix "warning: implicit declaration of function ‘dotmpfile_from_string’". - (("void setprogname\\(char \\*\\);" all) - (string-append all "\nint dotmpfile_from_string(char *);")) - ;; Fix "warning: implicit declaration of function ‘completion_matches’". - (("matches = completion_matches\\(text, command_completion\\);") - "matches = rl_completion_matches(text, command_completion);") - (("char \\* command_completion\\(char \\*, int\\);") - "char * command_completion(const char *, int);") - (("char \\* command_completion\\(char \\*text, int flag\\)") - "char * command_completion(const char *text, int flag)") - ;; Fix "warning: ‘CPPFunction’ is deprecated". - (("rl_attempted_completion_function = \\(CPPFunction \\*\\)attempt_completion;") - "rl_attempted_completion_function = (rl_completion_func_t *)attempt_completion;") - ;; Fix "warning: ‘Function’ is deprecated". - (("rl_completion_entry_function = \\(Function \\*\\)keyword_completion;") - "rl_completion_entry_function = (rl_compentry_func_t *)keyword_completion;")) - ;; Fix typo in man page. - (substitute* "cdecl.1" - (("<storage>\t::= auto \\| extern \\| register \\| auto") - "<storage>\t::= auto | extern | register | static")))) - (add-before 'install 'create-directories - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (man (string-append out "/share/man/man1"))) - (mkdir-p bin) - (mkdir-p man))))) - #:tests? #f)) ; No "check" target. - (native-inputs (list bison flex)) - (inputs (list readline)) - (home-page "https://www.ibiblio.org/pub/linux/devel/lang/c/") - (synopsis "Turn English phrases into C or C++ declarations and vice versa") - (description "@code{cdecl} is a program that turns English-like phrases into C -declarations. It can also translate C into pseudo-English. It also handles -type casts and C++. It has command-line editing and history with the GNU -Readline library.") - (license license:public-domain))) - (define-public sourcetrail (package (name "sourcetrail") diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 96f3298026..302c6482ea 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -773,7 +773,7 @@ error reporting, better tracing, profiling, and a debugger.") (define-public rr (package (name "rr") - (version "5.8.0") + (version "5.9.0") (source (origin (method git-fetch) (uri (git-reference @@ -781,7 +781,7 @@ error reporting, better tracing, profiling, and a debugger.") (commit version))) (sha256 (base32 - "16w6vvvgww4i2f0jk5zlrr6606fj8kps21fnw0pshyw88l141rqn")) + "18bahi9b7pz8s7vq8r52fg4pdnj62ymx4yyqjkiwnxlp06pdgqd3")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments @@ -795,6 +795,7 @@ error reporting, better tracing, profiling, and a debugger.") (string-append "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath=" (assoc-ref %build-inputs "capnproto") "/lib,-rpath=" (assoc-ref %build-inputs "zlib") + "/lib,-rpath=" (assoc-ref %build-inputs "zstd") "/lib") ,@(if (and (not (%current-target-system)) (member (%current-system) @@ -818,9 +819,14 @@ error reporting, better tracing, profiling, and a debugger.") (setenv "HOME" (getcwd)) #t))))) (native-inputs - (list pkg-config ninja which)) + (list lldb pkg-config which)) (inputs - (list gdb capnproto python python-pexpect zlib)) + (list gdb + capnproto + python + python-pexpect + zlib + `(,zstd "lib"))) ;; List of supported systems according to 'src/preload/raw_syscall.S'. (supported-systems '("x86_64-linux" "i686-linux" "aarch64-linux")) diff --git a/gnu/packages/dezyne.scm b/gnu/packages/dezyne.scm index 25429e6ab4..52bc0ada28 100644 --- a/gnu/packages/dezyne.scm +++ b/gnu/packages/dezyne.scm @@ -34,14 +34,14 @@ (define-public dezyne (package (name "dezyne") - (version "2.18.3") + (version "2.18.4") (source (origin (method url-fetch) (uri (string-append "https://dezyne.org/download/dezyne/" name "-" version ".tar.gz")) (sha256 - (base32 "1c4bi3gpl2fi6pk8z9gmrspg2ad7flkgqjs18bnczswii47yg2s8")))) + (base32 "0392p1601czz6yvlxd2b8phhmy35b62i4m1jgpfldzl6d18f7adr")))) (inputs (list bash-minimal boost guile-3.0 diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index a5b371a099..a9b1f9d565 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -267,7 +267,7 @@ install.") (define-public reprotest (package (name "reprotest") - (version "0.7.29") + (version "0.7.30") (source (origin (method git-fetch) @@ -276,7 +276,7 @@ install.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "17n7pdqil3jmpwcshr6dm5qsbpim3847smgxa82wy33kl2bz1ai8")))) + (base32 "013mqbbh6dcia2i4qdi4270lcgzr0k879phsaydf9b5ng9fkdajl")))) (build-system pyproject-build-system) (arguments (list diff --git a/gnu/packages/direct-connect.scm b/gnu/packages/direct-connect.scm deleted file mode 100644 index 8c816ce714..0000000000 --- a/gnu/packages/direct-connect.scm +++ /dev/null @@ -1,87 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> -;;; Copyright © 2022 Tobias Geerinckx-Rice <me@tobias.gr> -;;; -;;; 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 direct-connect) - #:use-module (guix build-system scons) - #:use-module (guix deprecation) - #:use-module (guix gexp) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (gnu packages) - #:use-module (gnu packages boost) - #:use-module (gnu packages build-tools) - #:use-module (gnu packages compression) - #:use-module (gnu packages gettext) - #:use-module (gnu packages gnome) - #:use-module (gnu packages gtk) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages tls) - #:use-module (gnu packages version-control)) - -;; TODO Remove on the next python-team iteration. -;; Unmaintained for 14 years, tried updating it here: -;; https://lists.sr.ht/~ngraves/devel/patches/60080 -;; but it's too hard for most likely no users. -;; If you use this package, let python-team know or try to fix it. -(define-deprecated/public linuxdcpp #f - (package - (name "linuxdcpp") - (version "1.1.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://launchpad.net/linuxdcpp/1.1/1.1.0/+download/linuxdcpp-" - version ".tar.bz2")) - (sha256 - (base32 "12i92hirmwryl1qy0n3jfrpziwzb82f61xca9jcjwyilx502f0b6")) - (patches (search-patches "linuxdcpp-openssl-1.1.patch")) - (modules '((guix build utils))) - (snippet - #~(begin - (substitute* "SConstruct" - ;; This compares single char[]acters in the version string, and - ;; broke when GCC went into double digits. - (("conf.CheckCXXVersion\\([^\\)]*\\)") - "True") - ;; Not all valid C++98 code is valid C++14 (and higher) code. - (("'-D_REENTRANT'" match) - (string-append match ", '-std=gnu++98'"))))))) - (build-system scons-build-system) - (arguments - `(#:scons ,scons-python2 - #:scons-flags (list (string-append "PREFIX=" %output)) - #:tests? #f)) ; no tests - (inputs - (list boost - bzip2 - gtk+-2 - libglade - libnotify - openssl)) - (native-inputs - (list bazaar gettext-minimal pkg-config)) - (home-page "https://launchpad.net/linuxdcpp/") - (synopsis "Direct Connect client") - (description "LinuxDC++ is a Direct Connect (DC) client. Direct Connect -is a peer-to-peer file-sharing protocol. Clients connect to a central hub -where they can chat or share files with one another. Users can view other -users' list of shared files or search the hub for files.") - (license license:gpl2+))) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index cd1d0c0d9a..098f109cc0 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2022 Pradana Aumars <paumars@courrier.dev> ;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; Copyright © 2025 Vinicius Monego <monego@posteo.net> +;;; Copyright © 2025 jgart <jgart@dismail.de> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1925,6 +1926,35 @@ image files already supported by it.") variables to configure your Django application.") (license license:expat))) +(define-public python-django-widget-tweaks + (package + (name "python-django-widget-tweaks") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "django-widget-tweaks" version)) + (sha256 + (base32 "1ir9qrygb0bsi53sqxs7052i5gpbzz3h8j3m5j94x6dv3rl8088w")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "django" "test" + "--settings=tests.settings"))))))) + (native-inputs (list python-setuptools python-wheel)) + (propagated-inputs (list python-django)) + (home-page "https://github.com/jazzband/django-widget-tweaks") + (synopsis "Tweak the form field rendering in Django templates") + (description + "This package provides a way to tweak the form field rendering in +templates and not in python-level form definitions.") + (license license:expat))) + (define-public python-django-cleanup (package (name "python-django-cleanup") diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 7c20450b5f..f07586f711 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -216,39 +216,40 @@ to take care of the OS-specific details when writing software that uses serial p (file-name (git-file-name name version)))) (outputs '("out" "doc")) (arguments - `(#:tests? #f ; tests need USB access - #:phases - (modify-phases %standard-phases - (add-before 'configure 'change-udev-group - (lambda _ - (substitute* (find-files "contrib" "\\.rules$") - (("plugdev") "dialout")))) - (add-after 'build 'build-doc - (lambda _ - (invoke "doxygen"))) - (add-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (copy-recursively "doxy/html-api" - (string-append (assoc-ref outputs "doc") - "/share/doc/libsigrok")))) - (add-after 'install-doc 'install-udev-rules - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (rules (string-append out "/lib/udev/rules.d/"))) - (for-each (lambda (file) - (install-file file rules)) - (find-files "contrib" "\\.rules$"))))) - (add-after 'install-udev-rules 'install-fw - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((fx2lafw (assoc-ref inputs "sigrok-firmware-fx2lafw")) - (out (assoc-ref outputs "out")) - (dir-suffix "/share/sigrok-firmware/") - (input-dir (string-append fx2lafw dir-suffix)) - (output-dir (string-append out dir-suffix))) - (for-each - (lambda (file) - (install-file file output-dir)) - (find-files input-dir ".")))))))) + (list + #:tests? #f ; tests need USB access + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'change-udev-group + (lambda _ + (substitute* (find-files "contrib" "\\.rules$") + (("plugdev") "dialout")))) + (add-after 'build 'build-doc + (lambda _ + (invoke "doxygen"))) + (add-after 'install 'install-doc + (lambda _ + (copy-recursively + "doxy/html-api" + (string-append #$output:doc "/share/doc/libsigrok")))) + (add-after 'install-doc 'install-udev-rules + (lambda _ + (for-each + (lambda (file) + (install-file + file + (string-append #$output "/lib/udev/rules.d/"))) + (find-files "contrib" "\\.rules$")))) + (add-after 'install-udev-rules 'install-fw + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((fx2lafw (assoc-ref inputs "sigrok-firmware-fx2lafw")) + (dir-suffix "/share/sigrok-firmware/") + (input-dir (string-append fx2lafw dir-suffix)) + (output-dir (string-append #$output dir-suffix))) + (for-each + (lambda (file) + (install-file file output-dir)) + (find-files input-dir ".")))))))) (native-inputs (list autoconf automake doxygen graphviz libtool sigrok-firmware-fx2lafw pkg-config)) @@ -289,18 +290,18 @@ supported devices, as well as input/output file format support.") "11l8vnf2khqbaqas7cfnq3f8q5w7am6nbkkd5mqj5kpb3ya2avb9")))) (outputs '("out" "doc")) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'build 'build-doc - (lambda _ - (invoke "doxygen") - #t)) - (add-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (copy-recursively "doxy/html-api" - (string-append (assoc-ref outputs "doc") - "/share/doc/libsigrokdecode")) - #t))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'build 'build-doc + (lambda _ + (invoke "doxygen"))) + (add-after 'install 'install-doc + (lambda _ + (copy-recursively + "doxy/html-api" + (string-append #$output:doc + "/share/doc/libsigrokdecode"))))))) (native-inputs (list check doxygen graphviz pkg-config automake autoconf libtool)) ;; libsigrokdecode.pc lists "python" in Requires.private, and "glib" in @@ -644,28 +645,29 @@ formats.") (package (name "pulseview") (version "0.4.2") - (source (origin - (method url-fetch) - (uri (string-append - "https://sigrok.org/download/source/pulseview/pulseview-" - version ".tar.gz")) - (sha256 - (base32 - "1jxbpz1h3m1mgrxw74rnihj8vawgqdpf6c33cqqbyd8v7rxgfhph")) - (patches (search-patches "pulseview-qt515-compat.patch" - "pulseview-glib-2.68.patch")))) + (source + (origin + (method url-fetch) + (uri (string-append + "https://sigrok.org/download/source/pulseview/pulseview-" + version ".tar.gz")) + (sha256 + (base32 + "1jxbpz1h3m1mgrxw74rnihj8vawgqdpf6c33cqqbyd8v7rxgfhph")) + (patches (search-patches "pulseview-qt515-compat.patch" + "pulseview-glib-2.68.patch")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ;format_time_minutes_test is failing - #:phases - (modify-phases %standard-phases - (add-after 'install 'remove-empty-doc-directory - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (with-directory-excursion (string-append out "/share") - ;; Use RMDIR to never risk silently deleting files. - (rmdir "doc/pulseview") - (rmdir "doc")))))))) + (list + #:tests? #f ;format_time_minutes_test is failing + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'remove-empty-doc-directory + (lambda _ + (with-directory-excursion (string-append #$output "/share") + ;; Use RMDIR to never risk silently deleting files. + (rmdir "doc/pulseview") + (rmdir "doc"))))))) (native-inputs (list pkg-config qttools-5)) (inputs @@ -678,8 +680,8 @@ formats.") qtsvg-5)) (home-page "https://www.sigrok.org/wiki/PulseView") (synopsis "Qt based logic analyzer, oscilloscope and MSO GUI for sigrok") - (description "PulseView is a Qt based logic analyzer, oscilloscope and MSO GUI -for sigrok.") + (description "PulseView is a Qt based logic analyzer, oscilloscope and MSO +GUI for sigrok.") (license license:gpl3+))) (define-public python-cocotb diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2d0563fe3d..ef7ab1855c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -30623,6 +30623,30 @@ When @code{gac-automatically-push-p} is non-nil, it also tries to push to the current upstream.") (license license:gpl3+))) +(define-public emacs-ultra-scroll + (package + (name "emacs-ultra-scroll") + (version "0.4.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jdtsmith/ultra-scroll") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0k1xqkxq89mz8dvzbfpks3jnrcmbd0hcz8a0hib1m3ka55hpczqz")))) + (build-system emacs-build-system) + (arguments (list #:tests? #f)) ;no tests + (home-page "https://github.com/jdtsmith/ultra-scroll") + (synopsis "Scroll Emacs like lightning") + (description + "@code{ultra-scroll} is a smooth-scrolling package for Emacs. It +provides highly optimized, pixel-precise smooth-scrolling which can readily +keep up with the very high event rates of modern track-pads and high-precision +wheel mice.") + (license license:gpl3+))) + (define-public emacs-smooth-scroll (package (name "emacs-smooth-scroll") diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index e274a41ada..f86fcedd56 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -4380,17 +4380,21 @@ on a Commodore C64, C128 etc.") ;; (("add_subdirectory\\(core/deps/Vulkan-Headers\\)") ;; "find_package(VulkanHeaders)")) (with-directory-excursion "core/deps" - (for-each delete-file-recursively - '("SDL" - "Spout" - "Syphon" - ;; TODO: Uncomment after our vulkan-headers - ;; are update to 1.3.261.0 or newer. - ;;"Vulkan-Headers" - "breakpad" - "discord-rpc" - "libzip" - "oboe"))))))) + (for-each + delete-file-recursively + '("SDL" + "Spout" + "Syphon" + ;; TODO: Uncomment after our vulkan-headers + ;; are update to 1.3.261.0 or newer. + ;;"Vulkan-Headers" + "breakpad" + "discord-rpc" + ;; XXX: The libretro build requires the bundled + ;; libzip, which it uses to produce a + ;; static library. + ;;"libzip" + "oboe"))))))) (build-system cmake-build-system) (arguments (list @@ -4432,6 +4436,13 @@ on a Commodore C64, C128 etc.") and Atomiswave emulator derived from reicast.") (license license:gpl2+)))) +(define-public libretro-flycast + (package/inherit flycast + (name "libretro-flycast") + (arguments (substitute-keyword-arguments (package-arguments flycast) + ((#:configure-flags flags) + #~(cons "-DLIBRETRO=ON" #$flags)))))) + (define-public freedisksysrom ;; There is no release; use the latest commit. (let ((commit "0d5f95f109bb3aadf2bb9510bfda13879bbd5266") diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index aa21eec21d..1cbd256871 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3505,7 +3505,7 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly workbench.") (define-public freecad (package (name "freecad") - (version "1.0.1") + (version "1.0.2") (source (origin (method git-fetch) @@ -3514,7 +3514,7 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly workbench.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0p3pa4w1xj7sgqk9vxdri8l3hbx0a8iz2pwn8gwjqlhc62z4hrg8")) + (base32 "1zyz473fzrz9h073wp4k65qq4bkhqsp245nsv6nv186sl78l99xa")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index dd1402a37e..b990338d78 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -845,7 +845,7 @@ blockchain.") ;; the system's dynamically linked library. (package (name "monero") - (version "0.18.4.1") + (version "0.18.4.2") (source (origin (method git-fetch) @@ -863,7 +863,7 @@ blockchain.") delete-file-recursively '("external/miniupnp" "external/rapidjson")))) (sha256 - (base32 "0k4z01l8dvnazh650yarwn6ja1wrxcqq4g7302xw0dhw7h1qvy1j")))) + (base32 "1285kigw9j633ghvp4apld9ddrvw7hjgjv23yabjvl7l2gc6hlv6")))) (build-system cmake-build-system) (native-inputs (list doxygen @@ -950,7 +950,7 @@ the Monero command line client and daemon.") (define-public monero-gui (package (name "monero-gui") - (version "0.18.4.1") + (version "0.18.4.2") (source (origin (method git-fetch) @@ -966,7 +966,7 @@ the Monero command line client and daemon.") ;; See the 'extract-monero-sources' phase. (delete-file-recursively "monero"))) (sha256 - (base32 "1r2cfzh4lc94mb7fqa8f41613msnsyy5kz6mzcr4npjpm8bxqs8k")))) + (base32 "0sa90shh82k6pzj1xr1f6x13q1q4mif4v00zahq96i7iglqpn4b6")))) (build-system qt-build-system) (native-inputs `(,@(package-native-inputs monero) @@ -2530,7 +2530,7 @@ and manipulation.") (define-public xmrig (package (name "xmrig") - (version "6.22.2") + (version "6.24.0") (source (origin (method git-fetch) @@ -2538,7 +2538,7 @@ and manipulation.") (url "https://github.com/xmrig/xmrig") (commit (string-append "v" version)))) (file-name (git-file-name name version)) - (sha256 (base32 "0dis9v8xykiqqzcib22djgmzyvx71akjs25aqvxjjzl1n8cm4npz")) + (sha256 (base32 "10q91sh29hlb7yd4lkfjsrk16qgb2j1z19ac77c9y7ccfci97f01")) (modules '((guix build utils))) (snippet ;; TODO: Try to use system libraries instead of bundled ones in @@ -2587,7 +2587,7 @@ mining.") (define-public p2pool (package (name "p2pool") - (version "4.9") + (version "4.9.1") (source (origin (method git-fetch) @@ -2596,7 +2596,7 @@ mining.") (commit (string-append "v" version)) (recursive? #t))) (file-name (git-file-name name version)) - (sha256 (base32 "0898a823mi38z6dwdm6crb2l98rv79sznmqwa0ss96xggvk12nlw")) + (sha256 (base32 "0zdsp6pb4rlbdqanx94rw1rii5jih1szf4rl3nf8fldvjkwkydlf")) (modules '((guix build utils))) (snippet #~(for-each delete-file-recursively diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 68229aab85..51c724eb74 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -663,7 +663,7 @@ executing in M-mode.") (define-public seabios (package (name "seabios") - (version "1.16.2") + (version "1.17.0") (source (origin (method git-fetch) @@ -672,7 +672,7 @@ executing in M-mode.") (commit (string-append "rel-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1mal2zqn4ppxdjxddrxcphm6z9n8n4rw97xl2hldd7spw57nwq97")) + (base32 "0v4rsv2mh6rmb9n2fc1df439z16qgmnkbv0vb5ylmpqzqfbjjd3q")) (modules '((guix build utils))) (snippet #~(begin @@ -703,12 +703,6 @@ executing in M-mode.") ;; If we use (cc-for-target) then we have the system prefix ;; twice or we might have the wrong prefix. (setenv "CC" "gcc"))) - (add-before 'build 'build-description-tables - (lambda _ - ;; Regenerate the ACPI description tables. - (invoke "make" "iasl") - ;; Clear temporary files added by the iasl target. - (invoke "make" "clean"))) (replace 'install (lambda _ (install-file "out/bios.bin" diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index c21d7c183d..993d56713b 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -2642,6 +2642,86 @@ programming. Iosevka is completely generated from its source code.") (sha256 (base32 "08ijx9rbcx95yiaiwv6k25xmsi24rdy50mkmmaw94mmwv22mxdra")))))) +(define-public font-apl2741-unicode + (let ((commit "1e11efae38e5095bfe49a786b111d563e83dad03")) + (package + (name "font-apl2741-unicode") + (version "1668049300") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/abrudz/APL2741.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0i1yk1x99lr2swlbq9r7dny5w70zwiwi8lpfcw4n7k7pfbw0xh7y")))) + (build-system trivial-build-system) + (native-inputs (list fontforge)) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((source (assoc-ref %build-inputs "source")) + (out (assoc-ref %outputs "out")) + (dest (string-append out "/share/fonts/truetype")) + (fontforge (string-append + (assoc-ref %build-inputs "fontforge") + "/bin/fontforge"))) + (mkdir-p dest) + (invoke fontforge "-lang=ff" "-c" "Open($1); Generate($2)" + (string-append source "/APL2741.sfd") + (string-append dest "/APL2741.ttf")))))) + (synopsis "APL2741 Unicode font") + (home-page "https://abrudz.github.io/APL2741/") + (description "APL font based on Adrian Smith's IBM Selectric APL2741 +golf-ball font. It supports most special characters used by popular APL +implementations, some additional mathematical and typographical symbols, +single line drawing characters, as well as the full Unicode APL range, +including both uppercase and lowercase underscored alphabets, as-of-yet unused +symbols, and almost all Latin-1 accented letters.") + (license license:unlicense)))) + +(define-public font-apl333 + (package + (name "font-apl333") + ;; Version number as for apl-385, last modified 2013-04-20. + (version "20130420") + (source + (origin + (method url-fetch) + (uri (string-append "https://apl385.com/fonts/" "apl333.zip")) + (sha256 + (base32 "0yn0ha7d14vp4ma3lxbc9kpyrn20m7brjisr6w55c9mi24w9v3a5")))) + (build-system font-build-system) + (home-page "https://apl385.com/fonts/index.htm") + (synopsis "Variable-width APL font inspired by Comic Sans Serif") + (description + "Variable-width version of Adrian Smith's APL385 font developed with APL +software vendors in the late 1980s.") + (license license:public-domain))) + +(define-public font-apl385 + (package + (name "font-apl385") + ;; No version number or release, unzipping source and checking file times + ;; shows the font file was last modified on 2016-08-21. + (version "20160821") + (source + (origin + (method url-fetch) + (uri (string-append "https://apl385.com/fonts/" "apl385.zip")) + (sha256 + (base32 "132qfsnx0v6qf8x8iy3flivv449nz42nnpkwjysmz65w6wqxpk1g")))) + (build-system font-build-system) + (home-page "https://apl385.com/fonts/index.htm") + (synopsis "Monospaced APL font inspired by Comic Sans Serif") + (description + "Adrian Smith's monospaced APL font developed with APL software vendors +in the late 1980s.") + (license license:public-domain))) + (define-public font-aporetic (package (name "font-aporetic") diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index ff3bbe52f0..95a5e57a06 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -795,61 +795,66 @@ using different abstraction levels.") (list perl python systemc)) (build-system gnu-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'bootstrap - (lambda _ (invoke "autoconf"))) - (add-after 'unpack 'adjust-source - (lambda _ - (substitute* "bin/verilator" - (("/bin/echo") "echo")))) - (add-before 'check 'disable-gdb-safe-path - (lambda _ - (setenv "HOME" (getcwd)) - (mkdir-p (string-append (getcwd) "/.config/gdb")) - (with-output-to-file (string-append (getcwd) "/.config/gdb/gdbinit") - (lambda () - (display "set auto-load safe-path /")))))) - #:test-target "test")) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'bootstrap + (lambda _ (invoke "autoconf"))) + (add-after 'unpack 'adjust-source + (lambda _ + (substitute* "bin/verilator" + (("/bin/echo") "echo")))) + (add-before 'check 'disable-gdb-safe-path + (lambda _ + (setenv "HOME" (getcwd)) + (mkdir-p (string-append (getcwd) "/.config/gdb")) + (with-output-to-file + (string-append (getcwd) "/.config/gdb/gdbinit") + (lambda () + (display "set auto-load safe-path /")))))) + #:test-target "test")) (home-page "https://www.veripool.org/verilator/") (synopsis "Verilog/SystemVerilog simulator") (description - "Verilator transforms the specified Verilog or SystemVerilog code by reading it, -performing lint checks, and optionally inserting assertion checks and -coverage-analysis points. It outputs single- or multi-threaded @file{.cpp} -and @file{.h} files.") + "Verilator transforms the specified Verilog or SystemVerilog code by +reading it, performing lint checks, and optionally inserting assertion checks +and coverage-analysis points. It outputs single- or multi-threaded +@file{.cpp} and @file{.h} files.") (license license:lgpl3))) (define-public fftgen - (let ((commit "1d75a992efd0528edea128a903aafdabe133cb08") ;no releases - (revision "0")) + (let ((commit "3378b77d83a98b06184656a5cb9b54e50dfe4485") ;no releases + (revision "1")) (package (name "fftgen") (version (git-version "0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ZipCPU/dblclockfft") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0qq874yalzpjdwnxhc5df8a0ifywv29wcncb09945x56xplvkcmd")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ZipCPU/dblclockfft") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rvln871wjkbbqnv88jnx328xlhn5sgbr8fglk3ajnd9rwgiq3jg")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;no tests - #:make-flags '("CFLAGS=-g -O2") ;default flags lack -O2 - #:phases (modify-phases %standard-phases - (delete 'configure) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") - "/bin"))) - (install-file "sw/fftgen" bin))))))) + (list + #:test-target "bench-test" + #:make-flags #~(list "CFLAGS=-g -O2") ;default flags lack -O2 + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda _ + (install-file "sw/fftgen" + (string-append #$output "/bin"))))))) + (native-inputs (list bc fftw python-minimal verilator which)) (synopsis "Generic pipelined FFT core generator") (description "fftgen produces @acronym{FFT, fast-Fourier transforms} hardware designs in Verilog.") - (home-page "https://zipcpu.com/") + (home-page "https://github.com/ZipCPU/zipcpu/") (license license:lgpl3+)))) (define-public openfpgaloader @@ -921,7 +926,7 @@ to @samp{info \"(guix) Base Services\"} for examples.") #:test-flags #~(list "test_all.py"))) (native-inputs (list python-pytest python-setuptools python-wheel)) (propagated-inputs (list python-networkx python-six)) - (home-page "https://gitlab.com/ohwr/project/hdl-make/") + (home-page "https://ohwr.gitlab.io/project/hdl-make/") (synopsis "Generate multi-purpose makefiles for HDL projects") (description "Hdlmake helps manage and share @acronym{HDL, hardware description diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 0d3d663ab8..d8ec14af1c 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -12476,80 +12476,6 @@ game.") ;thanks to Debian for description computer opponents or against real players online.") (license license:agpl3+))) -(define-public xblackjack - (package - (name "xblackjack") - (version "2.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://www.ibiblio.org/pub/X11/contrib/games/" - "xblackjack-" version ".tar.gz")) - (sha256 - (base32 "05h93rya7zwnx2l58f0a7wkjadymkj4y77clcr2hryhrhhy1vwjx")))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((imake (assoc-ref inputs "imake")) - (out (assoc-ref outputs "out"))) - (substitute* "Imakefile" - (("EXTRA_LIBRARIES = -lXm \\$\\(DEPLIBS\\) -lbsd") - "EXTRA_LIBRARIES = -lXm -lXt -lXmu -lXext -lX11") - (("^#define NonStandardInstallTargets NO") - "#define NonStandardInstallTargets YES") - (("BINDIR = /usr/local/bin") - (string-append "BINDIR = " out "/bin")) - (("MANDIR = /usr/local/man/cat1") - (string-append "MANDIR = " out "/share/man/man1")) - (("XAPPLOADDIR = /usr/local/lib/app-defaults") - (string-append "XAPPLOADDIR = " out "/lib/X11/app-defaults"))) - - (invoke "xmkmf") ; Generate Makefile. - (substitute* "Makefile" - ((imake) out) - (("ETCX11DIR = /etc/X11") - (string-append "ETCX11DIR = " out "/etc/X11")) - ;; Fix incorrect argument given to gcc. Error message: - ;; "gcc: error: DefaultGcc2AMD64Opt: No such file or directory" - (("CDEBUGFLAGS = [^\n]*") "")) - - ;; Fix header paths. - (substitute* '("Draw.c" - "Strategy.c") - (("^#include <X11/Xm/Xm.h>") - "#include <Xm/Xm.h>")) - (substitute* "Strategy.c" - (("^#include <X11/Xm/Label.h>") - "#include <Xm/Label.h>")) - - ;; Fix compilation errors. - (substitute* "Table.c" - (("/\\* focus_moved_proc \\*/\tXtInheritFocusMovedProc,") "") - (("_XmMoveObject\\(\\(RectObj\\) w, rx, ry\\);") - "_XmMoveObject(w, rx, ry);") - (("_XmResizeObject\\(\\(RectObj\\) managed->locs[i].w, nw, nh,") - "_XmResizeObject(managed->locs[i].w, nw, nh,"))))) - (add-after 'install 'install-man-pages - (lambda _ - (invoke "make" "install.man")))) - #:tests? #f)) ; No check target. - (inputs - (list lesstif libx11 libxext libxmu libxt)) - (native-inputs - (list imake)) - (home-page "https://www.ibiblio.org/pub/X11/contrib/games/") - (synopsis "X11/Motif blackjack game") - (description - "Xblackjack is a MOTIF/OLIT based tool constructed to get you ready for -the casino. It was inspired by a book called \"Beat the Dealer\" by Edward -O. Thorp, Ph.D. of UCLA. A number of important statistics are maintained -for display, and used by the program to implement Thorp's \"Complete Point -System\" (high-low system).") - (license (license:x11-style "" "See file headers.")))) - (define-public xevil ;; This game is old. Use a maintained fork that builds with modern toolchains ;; on modern, 64-bit hardware. diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 4a0fa38f0c..2a662752ba 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -349,7 +349,9 @@ buffers.") (version-major+minor version) "/gimp-" version ".tar.bz2")) (sha256 - (base32 "0vl57w9w31cgz6nbkpqfycsnwi5qym87jw31hvz3320wq7p4ba2h")))) + (base32 "0vl57w9w31cgz6nbkpqfycsnwi5qym87jw31hvz3320wq7p4ba2h")) + (patches (search-patches "gimp-fix-tiff-load.patch" + "gimp-fix-metadata-editor.patch")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 9 MiB of gtk-doc HTML diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 5a1f654652..43a1fdca22 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -297,7 +297,7 @@ to @code{cabal repl}).") (define-public git-annex (package (name "git-annex") - (version "10.20250630") + (version "10.20250721") (source (origin ;; hackage release doesn't include everything needed for extra bits. @@ -307,7 +307,7 @@ to @code{cabal repl}).") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1livig1x1a929qagisjx33pzmgv38d6fzf11bmy2jfpgvvlk9mfx")))) + (base32 "1a2g4z9fl90kyl7k6clmc61ma2njnljr4na6jbf04m43qnnr9s5a")))) (build-system haskell-build-system) (properties '((upstream-name . "git-annex"))) (arguments diff --git a/gnu/packages/lesstif.scm b/gnu/packages/lesstif.scm index 2c435d999b..f0ef220742 100644 --- a/gnu/packages/lesstif.scm +++ b/gnu/packages/lesstif.scm @@ -32,29 +32,6 @@ #:use-module (gnu packages xorg)) -(define-public lesstif - (package - (name "lesstif") - (version "0.95.2") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://sourceforge/lesstif/lesstif/" version - "/lesstif-" version ".tar.bz2")) - (sha256 - (base32 - "1qzpxjjf7ri1jzv71mvq5m9g8hfaj5yzwp30rwxlm6n2b24a6jpb")))) - (build-system gnu-build-system) - (propagated-inputs - (list printproto)) - (inputs - (list libxext libxt)) - (home-page "https://lesstif.sourceforge.net/") - (synopsis "Clone of the Motif toolkit for the X window system") - (description "Clone of the Motif toolkit for the X window system.") - (license license:gpl2+))) ; some files are lgpl2.1+ or x11 - (define-public motif ;; This commit is from February 2023 and v2.3.8 from 2017. (let ((commit "0f556b0873c72ba1152a12fd54c3198ee039e413") diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm index 28c61faf82..2b7a36290a 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 "25c14798b15f9933b6c1e2bc655030842b6e0edd")) + (let ((commit "93aea9134e458a78257e4164832e4871d1e425d8")) (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 "06iymygkf94s04ixvk1mlis9p5lmypx5k8pmrd3z3jddpmawk0r1"))))) + (sha256 (base32 "1bpn8jp477lzcnba4s23dy0dqr64ll2qvkaj45aa5j40nrz7qfwk"))))) (define* (make-librewolf-source #:key version firefox-hash librewolf-hash l10n) (let* ((ff-src (firefox-source-origin @@ -193,10 +193,20 @@ "librewolf-compare-paths.patch" "librewolf-use-system-wide-dir.patch" "librewolf-add-store-to-rdd-allowlist.patch")) - ;; XXX: 75 Mo (800+ Mo uncompressed) of unused tests. - ;; Removing it makes it possible to compile on some systems. + ;; Slim down the tarball by removing unbundled libraries and 75 Mo (800+ + ;; Mo uncompressed) of unused tests. + ;; TODO: Unbundle security/nss and media/libpng. (modules '((guix build utils))) - (snippet #~(delete-file-recursively "testing/web-platform"))))) + (snippet + #~(for-each delete-file-recursively + '("testing/web-platform" + "gfx/cairo/libpixman" + "js/src/ctypes/libffi" + "ipc/chromium/src/third_party/libevent" + "media/libvpx" + "docs/nspr" + "media/libwebp" + "modules/zlib")))))) ;;; Define the versions of rust needed to build firefox, trying to match ;;; upstream. See table at [0], `Uses' column for the specific version. @@ -210,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 "20250727200313") +(define %librewolf-build-id "20250823164949") (define-public librewolf (package (name "librewolf") - (version "141.0-1") + (version "142.0-1") (source (make-librewolf-source #:version version - #:firefox-hash "1j1m6niw47xi6aj9rlcny8jhqkppjvg22cq7mikim93wpf22m640" - #:librewolf-hash "18k3d09dr6jkhr6g8z8c3aa7jj0ynjalkmvc3nj7wd98mgvky2xj" + #:firefox-hash "03sblq1l5hjlwgqh1vyshrw1161cs5amlx7kjqzmjv1v1zqy2218" + #:librewolf-hash "1yk7cyqwr264968dyl7v92jn25giaawg5i2zla89177iw32zvfgx" #:l10n firefox-l10n)) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ed8789be0e..9f6dcc69f3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -514,7 +514,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-6.15-version "6.15.10") +(define-public linux-libre-6.15-version "6.15.11") (define-public linux-libre-6.15-gnu-revision "gnu") (define deblob-scripts-6.15 (linux-libre-deblob-scripts @@ -524,7 +524,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0301x3n5qbg8xm48pxq1dhrq0vkr61bqdcyaz0mbckrg20kw6m67"))) (define-public linux-libre-6.15-pristine-source (let ((version linux-libre-6.15-version) - (hash (base32 "01pxk3cnil1wbysp4s6ybh5djskxzf9llmk1qy7zfr2l4mwnbkd4"))) + (hash (base32 "14sxwrvw9p4ybizb8ky1rgahc62q0aw5qkmzqp3cpnavqfgldaw9"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.15))) @@ -533,7 +533,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; Here are the support timelines: ;; <https://www.kernel.org/category/releases.html> -(define-public linux-libre-6.12-version "6.12.42") +(define-public linux-libre-6.12-version "6.12.43") (define-public linux-libre-6.12-gnu-revision "gnu") (define deblob-scripts-6.12 (linux-libre-deblob-scripts @@ -543,7 +543,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1yl447396g454116j8v17wsqg5i0gyb2rrxvaygw6xdkbwrrj28j"))) (define-public linux-libre-6.12-pristine-source (let ((version linux-libre-6.12-version) - (hash (base32 "1yy17c06sn6l0skz8n1kxqhzldgwxxd0xhs11fd3086d56554128"))) + (hash (base32 "1vmxywg11z946i806sg7rk7jr9px87spmwwbzjxpps2nsjybpjqg"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.12))) @@ -3063,7 +3063,7 @@ deviation, and minimum and maximum values. It can show a nice histogram too.") ;; FIXME: For now we cannot reliably run tests on GNU/Hurd: ;; <https://bugs.gnu.org/47791>. #:tests? (and (not (%current-target-system)) - (not (string-suffix? "-gnu" (%current-system)))) + (not (system-hurd?))) #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 7a748e2bad..a87634eb83 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1384,7 +1384,14 @@ Library.") "-DBUILD_SHARED_LIBS:BOOL=TRUE" "-DLLVM_VERSION_SUFFIX=")))) (properties `((hidden? . #t) - ,@(package-properties llvm-19))))) + ,@(package-properties llvm-19))) + (home-page "https://github.com/ROCm/llvm-project") + (synopsis + (string-append (package-synopsis llvm-14) " (AMD fork)")) + (description + (string-append (package-description llvm-14) " + +This AMD fork includes AMD-specific additions.")))) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 7fb07cab0c..bfdbafa1bb 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -1309,104 +1309,6 @@ multiple local rocks trees.") (define-public luarocks (make-luarocks "luarocks" lua)) -(define-public emilua - (package - (name "emilua") - (version "0.4.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/emilua/emilua.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1dwag2pyqc0g86rris4w4fzafmz9a6kiqd47vdq7hl3a1lyi74mx")))) - (build-system meson-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/emilua_gperf.awk" - (("/usr/bin/env") (which "env"))) - (substitute* "src/system.cpp" - (("P_PIDFD") "P_PID")) - - (copy-recursively - (assoc-ref inputs "emilua-http") - "emilua-http") - (copy-recursively - (assoc-ref inputs "trial-protocol") - "trial-protocol") - - (with-directory-excursion "subprojects" - (symlink "../emilua-http" "emilua-http") - (copy-file "packagefiles/emilua-http/meson.build" - "emilua-http/meson.build") - (symlink "../trial-protocol" "trial-protocol") - (copy-file "packagefiles/trial.protocol/meson.build" - "trial-protocol/meson.build"))))) - #:configure-flags - #~(list "-Denable_http=true" - "-Denable_file_io=true" - "-Denable_io_uring=true" - ;; TODO: Linux namespaces are disabled for now due to conflict - ;; with some packages in guix. - "-Denable_linux_namespaces=false" - "-Denable_manpages=false" - "-Dversion_suffix=-guix1"))) - (native-inputs - (list luajit-lua52-openresty - re2c - gperf - xxd - pkg-config)) - (inputs - `(("emilua-http" - ,(origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/BoostGSoC14/boost.http") - (commit "93ae527c89ffc517862e1f5f54c8a257278f1195"))) - (sha256 - (base32 - "0jm7fw0cjd3s9zkkvyh6mcj6z32hcy7l9bszv74l92qk15ivvp9h")))) - ("trial-protocol" - ,(origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/breese/trial.protocol") - (commit "79149f604a49b8dfec57857ca28aaf508069b669"))) - (sha256 - (base32 - "0k42i5b4v3zz5x0r3dssiymgmn2x8zg4fzdksya9aggxgigippsx")))) - ("boost" ,boost) - ("boost-static" ,boost-static) - ("fmt" ,fmt-8) - ("gcc" ,gcc-12) - ("luajit-lua52-openresty" ,luajit-lua52-openresty) - ("ncurses" ,ncurses) - ("serd" ,serd) - ("sord" ,sord) - ("libcap" ,libcap) - ("liburing" ,liburing) - ("openssl" ,openssl))) - (native-search-paths - (list - (search-path-specification - (variable "EMILUA_PATH") - (files - (list (string-append "lib/emilua-" (version-major+minor version))))))) - (home-page "https://gitlab.com/emilua/emilua") - (synopsis "Lua execution engine") - (description - "Emilua is a LuaJIT-based Lua execution engine that supports async IO, -fibers and actor-inspired threading. The experimental builtin HTTP module is -enabled.") - (license license:boost1.0))) - (define-public fennel (package (name "fennel") diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 2662235679..634a2f5849 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -103,7 +103,7 @@ to statistics about the system on which it's run.") (define-public lxqt-build-tools (package (name "lxqt-build-tools") - (version "2.1.0") + (version "2.2.1") (source (origin (method url-fetch) @@ -111,7 +111,7 @@ to statistics about the system on which it's run.") "/download/" version "/lxqt-build-tools-" version ".tar.xz")) (sha256 - (base32 "1ycfzl8sfa2d1bnlyj6b3726mfb6kpj5768fhpw1ypkgjclvcn14")))) + (base32 "0brkiq62cv5rp2knq3dbdzh4cv6l670x1bfxq1537k2mdcpdzp0k")))) (build-system cmake-build-system) (arguments (list @@ -151,7 +151,7 @@ itself as well as other components maintained by the LXQt project.") (define-public libqtxdg (package (name "libqtxdg") - (version "4.1.0") + (version "4.2.0") (source (origin (method url-fetch) @@ -159,7 +159,7 @@ itself as well as other components maintained by the LXQt project.") "https://github.com/lxqt/libqtxdg/releases/download/" version "/libqtxdg-" version ".tar.xz")) (sha256 - (base32 "02c8irxyra0kfm7k1jkcxinfipib3w9jn2lk91hnl6jnv6bx6106")))) + (base32 "0ap81y7sbqwcdfsdlyxihs12chfv332fgg6y0sl6zmjhhlhk1m55")))) (build-system cmake-build-system) (arguments '(#:configure-flags @@ -188,7 +188,7 @@ in Qt.") (define-public qtxdg-tools (package (name "qtxdg-tools") - (version "4.1.0") + (version "4.2.0") (source (origin (method url-fetch) @@ -196,7 +196,7 @@ in Qt.") "https://github.com/lxqt/qtxdg-tools/releases/download/" version "/qtxdg-tools-" version ".tar.xz")) (sha256 - (base32 "1dk6m6gyarnhjw42hdf2bpkfcdpb98dy28l2nmpj46h985v9pmfv")))) + (base32 "1bv3immy1idp7jc0csnjkiw8vvqkr8g84hnnvl6k8297g4vnwfjh")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no tests (propagated-inputs (list libqtxdg)) @@ -211,7 +211,7 @@ applications.") (define-public liblxqt (package (name "liblxqt") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) @@ -219,7 +219,7 @@ applications.") "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1q1wn53rsy6bagngj1k53sipmbga3pbwk446kd1m6prwz1i0p0hh")))) + (base32 "1j0918fyka0kxwsn3mgnjnfc8cvdp6dsgg0i40877ysry0dqp2aa")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no tests @@ -277,14 +277,14 @@ and memory usage or network traffic.") (define-public lxqt-about (package (name "lxqt-about") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0js94q82rpaqkdg6vl3p4w4kw091dp6wixgkw5dbvqsnaw2v8nd0")))) + (base32 "0vypdk0nf2rr7riv8xp7wy1x9694i73rgk0dj9x39gh53jm4xjy5")))) (build-system cmake-build-system) (inputs (list liblxqt)) @@ -307,14 +307,14 @@ LXQt and the system it's running on.") (define-public lxqt-admin (package (name "lxqt-admin") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "047m08hhl8ykk2n2zr0h38f0ynq6b81v80hqrfhqfik3c20895ss")))) + (base32 "03gkb7gwq0gy9ihvawn38i36nkfmwyslf8wmbp4ssj129i94sphq")))) (build-system cmake-build-system) (inputs (list liblxqt polkit-qt6)) @@ -340,14 +340,14 @@ the operating system LXQt is running on.") (define-public lxqt-menu-data (package (name "lxqt-menu-data") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1d7asl9zmz9vsnf0sv6ynnhcnz6f1aw56giilwsw8vy12driilnj")))) + (base32 "0nw9mr4p5ri3bk43xd871g3ni9irf6rrk8rz4d8ra9wd7bz2d855")))) (build-system cmake-build-system) (arguments (list #:tests? #f)) ;no tests @@ -364,14 +364,14 @@ LXQt Panel, Configuration Center and PCManFM-Qt/libfm-qt.") (define-public lxqt-config (package (name "lxqt-config") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "03bq440npq3l4ssx7l1a15962q1jylfzdldfr66dm5nkjgvvv0gs")))) + (base32 "07ik1ycldpin21v4b29a95zb14q1s4bfbmlvyvw50r0mx0whnysj")))) (build-system cmake-build-system) (inputs (list eudev @@ -409,7 +409,7 @@ configuration of both LXQt and the underlying operating system.") (define-public lxqt-globalkeys (package (name "lxqt-globalkeys") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) @@ -417,7 +417,7 @@ configuration of both LXQt and the underlying operating system.") "releases/download/" version "/" "lxqt-globalkeys-" version ".tar.xz")) (sha256 - (base32 "0x18jkis3avl7928584sgl6c3fk1xm2qgpksxcy2qsk2ab25dk3h")))) + (base32 "16lpz4wm6iz065drmgfgfjxkd0gc5g1wqisqcgs6iff0skpdzkv6")))) (build-system cmake-build-system) (inputs (list liblxqt)) @@ -434,14 +434,14 @@ as a whole and are not limited to distinct applications.") (define-public lxqt-notificationd (package (name "lxqt-notificationd") - (version "2.1.1") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0n7hbvqx8csd9pprwqrh3nfbdqfj6i5hznjyxfn1ll5h3szaq5vy")))) + (base32 "1i3rly1jk3kgzl0gscsygfqr8g6147r7031j41qgdrf2w5nby8s2")))) (build-system cmake-build-system) (inputs (list kwindowsystem layer-shell-qt liblxqt libqtxdg)) @@ -457,14 +457,14 @@ according to the Desktop Notifications Specification.") (define-public lxqt-openssh-askpass (package (name "lxqt-openssh-askpass") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1inkicq0p5pxqpw9k13vx421fvpgmkn2lsskvlzqy1nnab3ilaf5")))) + (base32 "0g3gkfgyk7jgghslabmhlqwzafsd9i8c0sppb5hb4qllg916cadv")))) (build-system cmake-build-system) (inputs (list liblxqt)) @@ -480,14 +480,14 @@ of other programs.") (define-public libdbusmenu-lxqt (package (name "libdbusmenu-lxqt") - (version "0.2.0") + (version "0.3.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0knq04si5dzcml35hj29fkp806rrr7gnviqci1diw1k9gxyaf8lc")))) + (base32 "1y9z4iwpl5kqdn36y2d1dligsv84a79piw2b6jxb17sd796x385d")))) (build-system cmake-build-system) (arguments (list @@ -505,14 +505,14 @@ possible for applications to export and import their menus over DBus.") (define-public lxqt-panel (package (name "lxqt-panel") - (version "2.1.4") + (version "2.2.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1rhm57nnwr0mhii2r40gmawllj4cza9qb25qykkn236jfgpbilgz")))) + (base32 "0s8rva0prz1mkccp5yanrm0gg63cn95pzv2fixdp26489rx0w5ax")))) (build-system cmake-build-system) (inputs (list alsa-lib @@ -562,14 +562,14 @@ possible for applications to export and import their menus over DBus.") (define-public lxqt-policykit (package (name "lxqt-policykit") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0h0hi7aimjhc6rn4w8wz3kmvpkx7g6bf9i1fclan7j7ic80cf160")))) + (base32 "07lsfnpix9lr4nqlwipld2d02030921ssk6w77iqa81zy1c2v1yr")))) (build-system cmake-build-system) (inputs (list liblxqt polkit polkit-qt6)) @@ -585,14 +585,14 @@ LXQt.") (define-public lxqt-powermanagement (package (name "lxqt-powermanagement") - (version "2.1.0") + (version "2.2.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0pyzd7pw3mpp0f5193a8fg1bvixwabrapnpqy2q2a707j664mqhj")))) + (base32 "1pds86s72ckkvk886ncajnl7q11814w94dfmbblmml2dmfxyhkbx")))) (build-system cmake-build-system) (inputs (list kidletime @@ -612,14 +612,14 @@ when laptop batteries are low on power.") (define-public lxqt-qtplugin (package (name "lxqt-qtplugin") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0giql40mnl100zhqcyxi1vxsfyvx5hvi9zibjh5krr6nwrwwflhb")))) + (base32 "1w05710c9f3vzi9rsnyqiivxg1skirgrqk1dwxcw1gd4w01hyfp0")))) (build-system cmake-build-system) (inputs (list libdbusmenu-lxqt @@ -646,14 +646,14 @@ Qt with LXQt.") (define-public lxqt-runner (package (name "lxqt-runner") - (version "2.1.1") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0pmviizv7cxiqn2868bmbwgqrakmp4fv6a1wzbal0gndgc14yxmw")))) + (base32 "1478hsi662s6cw83im710slm6mfq9vn10lq98yqrakmwr6salp71")))) (build-system cmake-build-system) (inputs (list kwindowsystem @@ -674,14 +674,14 @@ allows for launching applications or shutting down the system.") (define-public lxqt-session (package (name "lxqt-session") - (version "2.1.1") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "06f8kfy859ri2wbjpz7yx69jw0gfxm80f46729lcl2vd23a0qari")))) + (base32 "12l9sch1lsxpj14ibrjsyv40nrgrdqhkhpzi24sm1bqnnl9jdg17")))) (build-system cmake-build-system) (inputs (list bash-minimal @@ -731,14 +731,14 @@ for the LXQt desktop environment.") (define-public lxqt-sudo (package (name "lxqt-sudo") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "17bk4bcvm919q7h63q2sdnzwwbqjpk98kb5ij14rqs9v2psbqfks")))) + (base32 "14fg8mxbkdi8sp8rdxy2zqwfgmzxrmj1xnq3h25pqnc61qf12y4f")))) (build-system cmake-build-system) (inputs (list liblxqt sudo)) @@ -755,14 +755,14 @@ permissions of other users including root.") (define-public lxqt-themes (package (name "lxqt-themes") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1b0gpmw6capkccysnvjj20j8l2p7hjkkpby72n9y982kb8f11l6d")))) + (base32 "1wplp817pacq18x67vrqjdnaa1hn4fx2zn1clc85bjh8mpcaiicj")))) (build-system cmake-build-system) (native-inputs (list lxqt-build-tools)) @@ -781,14 +781,14 @@ for LXQt.") (define-public libfm-qt (package (name "libfm-qt") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1mr93by010scy06kmpgmsvkabg7zn1f0mm9i7grm17mfv3hkx85z")))) + (base32 "1a8k8df38mf9bcdr6a44vjz15p84v3l33af485zlyhngrxpsi2jd")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no tests @@ -809,14 +809,14 @@ components to build desktop file managers which belongs to LXDE.") (define-public pcmanfm-qt (package (name "pcmanfm-qt") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0kvbw1slbcism42rqn09h1q3dirq44g8h3azg1vc86zs3mbqcd76")))) + (base32 "13xyl7xvv8qy35gfmjbq6ahqzq7xjn7j6336njhsvj82ipxfmvm5")))) (build-system cmake-build-system) (arguments (list @@ -846,14 +846,14 @@ LXDE.") (define-public lximage-qt (package (name "lximage-qt") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1z7nyx5w9hvrz9zfil6sbpm61h47iap85p1bvwjvg863bqq01xpv")))) + (base32 "1slriyvf0zz6mn5ldcd2v3i2yf0skmdf3hki9q8h2aby7bpvybnc")))) (build-system cmake-build-system) (inputs (list libexif libfm-qt qtsvg)) @@ -926,14 +926,14 @@ window manager OpenBox.") (define-public pavucontrol-qt (package (name "pavucontrol-qt") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1gvb73xxyv7avqx9wk8lvcfisbfdxcr6rc8ncnv35cn09f5gqg3c")))) + (base32 "1sdf221hq6z0haairwb4n29v7pjzgzf355r3m0iks0y1d9117lpi")))) (build-system cmake-build-system) (inputs (list glib qtbase pulseaudio)) @@ -950,14 +950,14 @@ window manager OpenBox.") (define-public qps (package (name "qps") - (version "2.10.0") + (version "2.11.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "05ncgfiqqs53k4wx62845krd7qi26im5pa2xq1kxh8wlng44gjjf")))) + (base32 "0dk4rs2i5qxl1plnis9y2bjm148vlzb43ny29kaa5rkrv3lnq354")))) (build-system cmake-build-system) (inputs (list liblxqt)) @@ -974,14 +974,14 @@ processes currently in existence, much like code{top} or code{ps}.") (define-public qtermwidget (package (name "qtermwidget") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0jwfpv9dwifkjgzy2fiffkvj0dd3aw4rf95fnnrhvqcdlg1v5v16")))) + (base32 "1s8w4s7wi7sv6vx8njlcvzmywyrkz4v4jmj3cbvsymfgg6xgnkxs")))) (build-system cmake-build-system) (inputs (list qtbase utf8proc)) @@ -997,14 +997,14 @@ processes currently in existence, much like code{top} or code{ps}.") (define-public qterminal (package (name "qterminal") - (version "2.1.0") + (version "2.2.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0g11n43msp0dwl68nf5wdh6kwi48xqc43pl9bpg4wsdw8n37hpm6")))) + (base32 "1lpm1065wj61x6w1w7zgy0b7g62c9gbg6v17l0vlgbxv10s8rlqc")))) (build-system cmake-build-system) (inputs (list layer-shell-qt qtbase qtermwidget)) @@ -1021,19 +1021,24 @@ QTermWidget.") (define-public screengrab (package (name "screengrab") - (version "2.9.0") + (version "3.0.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/screengrab/releases/download/" version "/screengrab-" version ".tar.xz")) (sha256 - (base32 "1c7nyz1sjk30qpm00jzz9vq54jm6dyqfajjiwsqlp5hvx9gfgg17")))) + (base32 "1ryfdh7rkdrf9lf7j0p3zapw80hvpg0k6hb8r84yp5c5d0l09b9h")))) (build-system cmake-build-system) (inputs - (list kwindowsystem libqtxdg qtbase)) + (list kwindowsystem + layer-shell-qt + libpng + libqtxdg + qtwayland + wayland)) (native-inputs - (list pkg-config perl qttools)) + (list lxqt-build-tools)) (arguments '(#:tests? #f)) ; no tests (home-page "https://lxqt-project.org") @@ -1046,14 +1051,14 @@ easily publishing them on internet image hosting services.") (define-public lxqt-archiver (package (name "lxqt-archiver") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1ir6dc45qp4g6iv57nyn9z1bh06ih9cm8gmgw646370m1jvh06k9")))) + (base32 "1iisk5mb4xxdjimlh8inr182a1vpy8zk5qis9v3p5p73d49i5r2k")))) (build-system cmake-build-system) (inputs (list glib json-glib libfm-qt qtbase)) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 119fc5988a..f9b0c3b2f4 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -1555,6 +1555,18 @@ MATE Desktop to monitor your system resources and usage.") (base32 "1s2ac2p5smiwr7lf4snciyb9waclychjmzrw32f2qspdm381s2im")))) (build-system glib-or-gtk-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'enable-autostart-for-xfce + (lambda _ + ;; We also use mate-polkit in Xfce. + (substitute* (string-append + #$output + "/etc/xdg/autostart/" + "polkit-mate-authentication-agent-1.desktop") + (("OnlyShowIn=MATE;") "OnlyShowIn=MATE;XFCE;"))))))) (native-inputs (list gettext-minimal gtk-doc/stable intltool libtool pkg-config)) (inputs @@ -1571,24 +1583,6 @@ MATE Desktop to monitor your system resources and usage.") used to bring up authentication dialogs.") (license license:lgpl2.1))) -(define-public mate-polkit-for-xfce - (package/inherit mate-polkit - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'patch-desktop - (lambda* (#:key outputs #:allow-other-keys) - (let* ((common (string-append - (assoc-ref outputs "out") "/etc/xdg/autostart/" - "polkit-mate-authentication-agent-")) - (old (string-append common "1.desktop")) - (new (string-append common "for-xfce-1.desktop"))) - (substitute* old (("MATE;") "XFCE;")) - ;; To avoid a conflict if both MATE and XFCE are installed. - (rename-file old new))))))) - (properties `((hidden? . #t))))) - - (define-public mozo (package (name "mozo") @@ -1638,19 +1632,8 @@ menu specification.") (version (package-version mate-desktop)) (source #f) (build-system trivial-build-system) - (arguments - `(#:modules ((guix build union)) - #:builder - (begin - (use-modules (ice-9 match) - (guix build union)) - (match %build-inputs - (((names . directories) ...) - (union-build (assoc-ref %outputs "out") - directories) - #t))))) - (native-inputs (list desktop-file-utils)) - (inputs + (arguments '(#:builder (mkdir %output))) + (propagated-inputs ;; TODO: Add more packages (append (if (or (%current-target-system) (supported-package? gnome-keyring)) @@ -1662,9 +1645,11 @@ menu specification.") dbus dconf dconf-editor + desktop-file-utils engrampa eom font-abattis-cantarell + font-dejavu ;default font glib-networking gvfs hicolor-icon-theme @@ -1698,9 +1683,6 @@ menu specification.") shared-mime-info yelp zenity))) - (propagated-inputs - ;; Default font that applications such as IceCat require. - (list font-dejavu)) (synopsis "The MATE desktop environment") (home-page "https://mate-desktop.org/") (description diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 299ee0d55c..9c09350c21 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -3539,71 +3539,6 @@ a persistent connection to an IRC server, acting as a proxy and buffer for a number of clients.") (license license:gpl3+))) -(define-public weechat-matrix - (package - (name "weechat-matrix") - (version "0.3.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/poljar/weechat-matrix") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1iv55n4k05139f7jzkhczgw4qp6qwilrvfsy3c6v2m1kxffj12d3")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'build) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((weechat-python (string-append (assoc-ref outputs "out") - "/share/weechat/python"))) - ;; Avoid circular import by renaming the matrix module to - ;; weechat_matrix. - (substitute* (cons "main.py" - (append (find-files "matrix") - (find-files "tests"))) - (("from matrix") "from weechat_matrix") - (("import matrix") "import weechat_matrix")) - ;; Install python modules. - (invoke "make" "install-lib" - (string-append "INSTALLDIR=" - (site-packages inputs outputs) - "/weechat_matrix")) - ;; Extend PYTHONPATH to find installed python modules. - (add-installed-pythonpath inputs outputs) - ;; Augment sys.path so that dependencies are found. - (substitute* "main.py" - (("import os\n" all) - (apply string-append - all - "import sys\n" - (map (lambda (path) - (string-append "sys.path.append('" path "')\n")) - (string-split (getenv "GUIX_PYTHONPATH") #\:))))) - ;; Install script. - (mkdir-p weechat-python) - (copy-file "main.py" - (string-append weechat-python "/matrix.py"))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest"))))))) - (inputs - (list python-matrix-nio python-pygments python-pyopenssl - python-webcolors)) - (native-inputs - (list python-pytest)) - (home-page "https://github.com/poljar/weechat-matrix") - (synopsis "Weechat Matrix protocol script") - (description "@code{weechat-matrix} is a Python plugin for Weechat that lets -Weechat communicate over the Matrix protocol.") - (license license:isc))) - (define-public weechat-wee-slack (package (name "weechat-wee-slack") diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index f815d2342c..aa047a392a 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -158,7 +158,7 @@ bind processes, and much more.") (define-public hwloc-2 (package (inherit hwloc-1) - (version "2.12.1") + (version "2.12.2") (source (origin (method url-fetch) (uri (string-append "https://download.open-mpi.org/release/hwloc/v" @@ -166,7 +166,7 @@ bind processes, and much more.") "/hwloc-" version ".tar.bz2")) (sha256 (base32 - "0sy63p99bz9xyaz1501mwv8i3qa1v1zwa7gynadry9c6pcl07a9q")))) + "182v0n2mpnbvdsw0gjnbmaj027k2jxmw7yphi89i9dgb1zbn2gjn")))) (native-inputs (modify-inputs (package-native-inputs hwloc-1) (append bash))) ;for completion tests diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 9b770d6442..86187dc3c0 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -903,18 +903,34 @@ many input formats and provides a customisable Vi-style user interface.") (define-public denemo (package (name "denemo") - (version "2.6.0") + (version "2.6.44") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/denemo/denemo-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "git://git.git.savannah.gnu.org/denemo") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0pdmjij2635jbw2a24ivk1y4w0z58jbmq9vnz3qrfzw4d469grab")))) + (base32 + "1vpaiw34f0h0z01r40ln00494l4dwmyc4cy00hz2xggp6pa4abqy")))) (build-system gnu-build-system) (arguments (list + #:configure-flags + #~(list (string-append + "CFLAGS=" + (string-join (list "-Wno-error=incompatible-pointer-types" + "-Wno-error=implicit-function-declaration") + " "))) #:phases #~(modify-phases %standard-phases + (add-before 'bootstrap 'patch-autogen + (lambda _ + (substitute* "autogen.sh" + (("/usr/share/aclocal") + (string-append #$(this-package-native-input "automake") + "/share/aclocal"))))) (replace 'check (lambda* (#:key inputs tests? #:allow-other-keys) ;; Tests require to write $HOME. @@ -938,8 +954,10 @@ many input formats and provides a customisable Vi-style user interface.") lilypond "\");"))))))))) (native-inputs - (list diffutils - `(,glib "bin") ; for gtester + (list autoconf + automake + diffutils + `(,glib "bin") ; for gtester gtk-doc/stable intltool libtool @@ -953,7 +971,7 @@ many input formats and provides a customisable Vi-style user interface.") glib gtk+ gtksourceview-3 - guile-2.0 + guile-3.0 (librsvg-for-system) libsndfile libxml2 diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 707c439055..847d663360 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -291,63 +291,24 @@ This package tracks the Extended Support Release (ESR) channel.") (package (inherit nss) (name "nss-rapid") - (version "3.113") - (source (origin - (inherit (package-source nss)) - (uri (let ((version-with-underscores - (string-join (string-split version #\.) "_"))) - (string-append - "https://ftp.mozilla.org/pub/mozilla.org/security/nss/" - "releases/NSS_" version-with-underscores "_RTM/src/" - "nss-" version ".tar.gz"))) - (sha256 - (base32 - "03qwl3ps3xgc9pkc07qrsa4vd2r57mjwicv3gb483gfk2ashdvxc")) - (patches - (remove (cut string-suffix? "nss-disable-broken-tests.patch" <>) - (origin-patches (package-source nss)))))) - (arguments - (substitute-keyword-arguments (package-arguments nss) - ((#:phases phases) - #~(modify-phases #$phases - (add-after 'unpack 'neutralize-network-test - ;; Test tries to resolve `wrong.host.badssl.com' which fails due - ;; to no networking in the build environment. - ;; Behavior changed as of 3.110. - (lambda _ - (substitute* "nss/tests/ssl/ssl.sh" - ((" ssl_policy_pkix_ocsp" all) - (string-append "#" all))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (if tests? - (begin - ;; Use 127.0.0.1 instead of $HOST.$DOMSUF as HOSTADDR for - ;; testing. The latter requires a working DNS or /etc/hosts. - (setenv "DOMSUF" "localdomain") - (setenv "USE_IP" "TRUE") - (setenv "IP_ADDRESS" "127.0.0.1") + (version "3.115") + (source + (origin + (inherit (package-source nss)) + (uri (let ((version-with-underscores + (string-join (string-split version #\.) "_"))) + (string-append + "https://ftp.mozilla.org/pub/mozilla.org/security/nss/" + "releases/NSS_" version-with-underscores "_RTM/src/" + "nss-" version ".tar.gz"))) + (sha256 + (base32 "1av1g18dkx86zxvpr34j5mx976mgsk002khlb40k4ydx6gxlfamc")) + (patches + (search-patches "nss-3.56-pkgconfig.patch" + "nss-getcwd-nonnull.patch" + "nss-increase-test-timeout.patch" + "nss-3.115-disable-pkix-ocsp-tests.patch")))) - ;; This specific test is looking at performance "now - ;; verify that we can quickly dump a database", and - ;; we're not testing performance here (especially - ;; since we're using faketime), so raise the - ;; threshold - (substitute* "nss/tests/dbtests/dbtests.sh" - ((" -lt 5") " -lt 50")) - - ;; Since the test suite is very lengthy, run the test - ;; suite once, not thrice as done by default, by - ;; selecting only the 'standard' cycle. - (setenv "NSS_CYCLES" "standard") - - ;; The "PayPalEE.cert" certificate expires every six months, - ;; leading to test failures: - ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>. To - ;; work around that, set the time to roughly the release date. - (invoke #$(if (target-64bit?) "faketime" "datefudge") - "2025-06-19" "./nss/tests/all.sh")) - (format #t "test suite not run~%")))))))) (synopsis "Network Security Services (Rapid Release)") (description "Network Security Services (@dfn{NSS}) is a set of libraries designed to diff --git a/gnu/packages/patches/gimp-fix-metadata-editor.patch b/gnu/packages/patches/gimp-fix-metadata-editor.patch new file mode 100644 index 0000000000..848227ff4b --- /dev/null +++ b/gnu/packages/patches/gimp-fix-metadata-editor.patch @@ -0,0 +1,25 @@ +From 51311f913d9f417d121f59b83d560c7b4b853d1c Mon Sep 17 00:00:00 2001 +From: Simon Budig <simon@budig.de> +Date: Sat, 20 May 2023 22:25:40 +0200 +Subject: [PATCH] metadata: shut up a weird warning + +--- + plug-ins/metadata/metadata-editor.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plug-ins/metadata/metadata-editor.c b/plug-ins/metadata/metadata-editor.c +index a3992e40ddc..5bf6ef709f1 100644 +--- a/plug-ins/metadata/metadata-editor.c ++++ b/plug-ins/metadata/metadata-editor.c +@@ -2846,7 +2846,7 @@ metadata_dialog_editor_set_metadata (GExiv2Metadata *metadata, + } + else + { +- if (! g_strv_contains (values, equiv_values[evi])) ++ if (! g_strv_contains ((const gchar * const *) values, equiv_values[evi])) + { + gchar *tmpvalue; + +-- +GitLab + diff --git a/gnu/packages/patches/gimp-fix-tiff-load.patch b/gnu/packages/patches/gimp-fix-tiff-load.patch new file mode 100644 index 0000000000..ba12d0892f --- /dev/null +++ b/gnu/packages/patches/gimp-fix-tiff-load.patch @@ -0,0 +1,25 @@ +From a2458f1528e5733574bb26ff5452b1329116e6db Mon Sep 17 00:00:00 2001 +From: Simon Budig <simon@budig.de> +Date: Sat, 20 May 2023 18:40:41 +0200 +Subject: [PATCH] file-tiff-load: fix mismatching variable type + +--- + plug-ins/file-tiff/file-tiff-load.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/plug-ins/file-tiff/file-tiff-load.c b/plug-ins/file-tiff/file-tiff-load.c +index 0aafbaec5fd..a26e7af2752 100644 +--- a/plug-ins/file-tiff/file-tiff-load.c ++++ b/plug-ins/file-tiff/file-tiff-load.c +@@ -1297,8 +1297,8 @@ load_image (GFile *file, + + /* any resolution info in the file? */ + { +- gfloat xres = 72.0; +- gfloat yres = 72.0; ++ gdouble xres = 72.0; ++ gdouble yres = 72.0; + gushort read_unit; + GimpUnit unit = GIMP_UNIT_PIXEL; /* invalid unit */ + + diff --git a/gnu/packages/patches/linuxdcpp-openssl-1.1.patch b/gnu/packages/patches/linuxdcpp-openssl-1.1.patch deleted file mode 100644 index 6f9912afd8..0000000000 --- a/gnu/packages/patches/linuxdcpp-openssl-1.1.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/dcpp/CryptoManager.cpp.orig 2011-04-17 17:57:09 UTC -+++ b/dcpp/CryptoManager.cpp -@@ -107,12 +107,20 @@ CryptoManager::CryptoManager() - }; - - if(dh) { -- dh->p = BN_bin2bn(dh4096_p, sizeof(dh4096_p), 0); -- dh->g = BN_bin2bn(dh4096_g, sizeof(dh4096_g), 0); -+ BIGNUM *p, *g; - -- if (!dh->p || !dh->g) { -+ p = BN_bin2bn(dh4096_p, sizeof(dh4096_p), 0); -+ g = BN_bin2bn(dh4096_g, sizeof(dh4096_g), 0); -+ -+ if (!p || !g) { - dh.reset(); - } else { -+#if OPENSSL_VERSION_NUMBER < 0x10100005L -+ dh->p = p; -+ dh->g = g; -+#else -+ DH_set0_pqg(dh, p, NULL, g); -+#endif - SSL_CTX_set_options(serverContext, SSL_OP_SINGLE_DH_USE); - SSL_CTX_set_options(serverVerContext, SSL_OP_SINGLE_DH_USE); - SSL_CTX_set_tmp_dh(serverContext, (DH*)dh); diff --git a/gnu/packages/patches/nss-3.115-disable-broken-tests.patch b/gnu/packages/patches/nss-3.115-disable-broken-tests.patch new file mode 100644 index 0000000000..2cb3a6be7b --- /dev/null +++ b/gnu/packages/patches/nss-3.115-disable-broken-tests.patch @@ -0,0 +1,34 @@ +These tests are broken in 3.101.3. + +See https://bugzilla.mozilla.org/show_bug.cgi?id=1964304 + +--- nss-3.113.orig/nss/tests/tools/tools.sh 2025-08-25 16:49:02.402086648 -0700 ++++ nss-3.113/nss/tests/tools/tools.sh 2025-08-25 16:49:23.677993887 -0700 +@@ -550,27 +550,6 @@ + html_msg $ret 0 "Importing private key pbmac1 hmac-sha-512 from PKCS#12 file" + check_tmpfile + +- echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-iter.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' -I" +- ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-iter.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' -I 2>&1 +- ret=$? +- html_msg $ret 19 "Fail to list private key with bad iterator" +- check_tmpfile +- +- echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-salt.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' -I" +- ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-salt.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' -I 2>&1 +- ret=$? +- echo "Fail to list private key with bad salt val=$ret" +- html_msg $ret 19 "Fail to import private key with bad salt" +- check_tmpfile +- +- echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-no-length.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' -I " +- ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-no-length.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' -I 2>&1 +- ret=$? +- echo "Fail to import private key with no length val=$ret" +- html_msg $ret 19 "Fail to import private key with no length" +- check_tmpfile +-} +- + ############################## tools_p12 ############################### + # local shell function to test basic functionality of pk12util + ######################################################################## diff --git a/gnu/packages/patches/nss-3.115-disable-pkix-ocsp-tests.patch b/gnu/packages/patches/nss-3.115-disable-pkix-ocsp-tests.patch new file mode 100644 index 0000000000..d8e489883c --- /dev/null +++ b/gnu/packages/patches/nss-3.115-disable-pkix-ocsp-tests.patch @@ -0,0 +1,13 @@ +These tests require network. + +diff -x .svn -x .git -urN nss-3.113.orig/nss/tests/ssl/ssl.sh nss-3.113/nss/tests/ssl/ssl.sh +--- nss-3.113.orig/nss/tests/ssl/ssl.sh 2025-08-25 16:49:02.398086665 -0700 ++++ nss-3.113/nss/tests/ssl/ssl.sh 2025-08-26 15:46:11.718401605 -0700 +@@ -1600,7 +1600,6 @@ + if using_sql ; then + ssl_policy_listsuites + ssl_policy_selfserv +- ssl_policy_pkix_ocsp + ssl_policy + fi + ;;
\ No newline at end of file diff --git a/gnu/packages/patches/zig-0.15-fix-runpath.patch b/gnu/packages/patches/zig-0.15-fix-runpath.patch new file mode 100644 index 0000000000..7216c97b57 --- /dev/null +++ b/gnu/packages/patches/zig-0.15-fix-runpath.patch @@ -0,0 +1,122 @@ +From d35c341322f6e84607350058007bd5be3d1d294a Mon Sep 17 00:00:00 2001 +From: Hilton Chain <hako@ultrarare.space> +Date: Fri, 29 Nov 2024 14:13:46 +0800 +Subject: [PATCH] Fix RUNPATH issue. + +Add needed libraries and libc to RUNPATH when CROSS_LIBRARY_PATH or LIBRARY_PATH +is set. +--- + lib/std/Build/Step/Compile.zig | 2 ++ + src/link/Elf.zig | 7 +++++++ + src/link/Lld.zig | 7 +++++++ + src/main.zig | 34 +++++++++++++++++++++++++++++++++- + 4 files changed, 49 insertions(+), 1 deletion(-) + +diff --git a/lib/std/Build/Step/Compile.zig b/lib/std/Build/Step/Compile.zig +index 79d3694c02..7f6bddbea6 100644 +--- a/lib/std/Build/Step/Compile.zig ++++ b/lib/std/Build/Step/Compile.zig +@@ -794,6 +794,8 @@ fn runPkgConfig(compile: *Compile, lib_name: []const u8) !PkgConfigResult { + try zig_cflags.append(arg); + } else if (mem.startsWith(u8, arg, wl_rpath_prefix)) { + try zig_cflags.appendSlice(&[_][]const u8{ "-rpath", arg[wl_rpath_prefix.len..] }); ++ } else if (mem.startsWith(u8, arg, "-Wl,-rpath=")) { ++ try zig_libs.appendSlice(&[_][]const u8{ "-L", arg["-Wl,-rpath=".len..] }); + } else if (b.debug_pkg_config) { + return compile.step.fail("unknown pkg-config flag '{s}'", .{arg}); + } +diff --git a/src/link/Elf.zig b/src/link/Elf.zig +index 99d0ad71b0..8017f4c088 100644 +--- a/src/link/Elf.zig ++++ b/src/link/Elf.zig +@@ -988,6 +988,13 @@ fn dumpArgvInit(self: *Elf, arena: Allocator) !void { + try argv.appendSlice(gpa, &.{ "-rpath", rpath }); + } + ++ if (std.zig.system.NativePaths.isGuix(arena) and comp.config.link_libc and comp.config.link_mode == .dynamic) { ++ if (self.base.comp.libc_installation) |libc_installation| { ++ try argv.append(gpa, "-rpath"); ++ try argv.append(gpa, libc_installation.crt_dir.?); ++ } ++ } ++ + try argv.appendSlice(gpa, &.{ + "-z", + try std.fmt.allocPrint(arena, "stack-size={d}", .{self.base.stack_size}), +diff --git a/src/link/Lld.zig b/src/link/Lld.zig +index 48872f7077..814f661692 100644 +--- a/src/link/Lld.zig ++++ b/src/link/Lld.zig +@@ -1071,6 +1071,13 @@ fn elfLink(lld: *Lld, arena: Allocator) !void { + } + } + ++ if (std.zig.system.NativePaths.isGuix(arena) and comp.config.link_libc and link_mode == .dynamic) { ++ if (comp.libc_installation) |libc_installation| { ++ try argv.append("-rpath"); ++ try argv.append(libc_installation.crt_dir.?); ++ } ++ } ++ + if (have_dynamic_linker and + (comp.config.link_libc or comp.root_mod.resolved_target.is_explicit_dynamic_linker)) + { +diff --git a/src/main.zig b/src/main.zig +index 02b1b8f84b..ddc4ae8014 100644 +--- a/src/main.zig ++++ b/src/main.zig +@@ -3910,7 +3910,7 @@ fn createModule( + create_module.want_native_include_dirs = true; + } + +- if (create_module.each_lib_rpath orelse resolved_target.is_native_os) { ++ if (create_module.each_lib_rpath orelse false) { + try create_module.rpath_list.ensureUnusedCapacity(arena, create_module.lib_directories.items.len); + for (create_module.lib_directories.items) |lib_directory| { + create_module.rpath_list.appendAssumeCapacity(lib_directory.path.?); +@@ -3982,6 +3982,28 @@ fn createModule( + else => {}, + }; + ++ if (std.zig.system.NativePaths.isGuix(arena)) { ++ for (create_module.link_inputs.items) |link_input| { ++ if (link_input.path()) |lib| { ++ const lib_name = lib.sub_path; ++ if (Compilation.classifyFileExt(lib_name) == .shared_library) { ++ if (fs.path.isAbsolute(lib_name)) { ++ const lib_dir_path = fs.path.dirname(lib_name).?; ++ try create_module.rpath_list.append(arena, lib_dir_path); ++ continue; ++ } ++ for (create_module.lib_directories.items) |lib_dir| { ++ const lib_dir_path = lib_dir.path.?; ++ if (try libPathExists(arena, lib_dir_path, lib_name)) { ++ try create_module.rpath_list.append(arena, lib_dir_path); ++ break; ++ } ++ } ++ } ++ } ++ } ++ } ++ + create_module.resolved_options = Compilation.Config.resolve(create_module.opts) catch |err| switch (err) { + error.WasiExecModelRequiresWasi => fatal("only WASI OS targets support execution model", .{}), + error.SharedMemoryIsWasmOnly => fatal("only WebAssembly CPU targets support shared memory", .{}), +@@ -7633,3 +7655,13 @@ fn addLibDirectoryWarn2( + .path = path, + }); + } ++ ++fn libPathExists(arena: Allocator, lib_dir_path: []const u8, lib_name: []const u8) !bool { ++ const lib_path = try std.fmt.allocPrint(arena, "{s}{s}{s}", .{ ++ lib_dir_path, ++ fs.path.sep_str, ++ lib_name, ++ }); ++ fs.cwd().access(lib_path, .{}) catch return false; ++ return true; ++} +-- +2.50.1 + diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 4c18dad6ed..b590e3a624 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -324,19 +324,19 @@ information.") (define-public flyer-composer (package (name "flyer-composer") - (version "1.0rc2") + (version "1.0") (source (origin (method url-fetch) - (uri (pypi-uri "flyer-composer" version)) + (uri (pypi-uri "flyer_composer" version)) (sha256 - (base32 "17igqb5dlcgcq4nimjw6cf9qgz6a728zdx1d0rr90r2z0llcchsv")))) - (build-system python-build-system) + (base32 "1874vmz606155w9xm3r4q9xziva1mai1kyqhjg5hnndpwl09xgv5")))) + (build-system pyproject-build-system) (arguments `(#:tests? #f ;; TODO #:phases (modify-phases %standard-phases - (add-after 'install 'wrap-executable + (add-after 'wrap 'wrap-gui (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (qtbase (assoc-ref inputs "qtbase")) @@ -346,12 +346,9 @@ information.") (,(string-append qtbase "/lib/qt5/plugins"))) `("QT_QPA_PLATFORM_PLUGIN_PATH" ":" = (,(string-append qtbase "/lib/qt5/plugins/platforms")))))))))) - (inputs - (list bash-minimal - python-poppler-qt5 - python-pypdf2 - python-pyqt - qtbase-5)) + (native-inputs (list python-setuptools python-wheel)) + (propagated-inputs (list python-pypdf)) + (inputs (list bash-minimal python-poppler-qt5 python-pyqt qtbase-5)) (home-page "http://crazy-compilers.com/flyer-composer") (synopsis "Rearrange PDF pages to print as flyers on one sheet") (description "@command{flyer-composer} can be used to prepare one- or @@ -379,8 +376,7 @@ This package contains both the command line tool and the gui too.") (substitute* "setup.cfg" (("^\\s+flyer-composer-gui\\s*=.*") "")) #t))))) - (inputs - `(("python-pypdf2" ,python-pypdf2))) + (inputs (list)) ; clear the gui inputs (description "@command{flyer-composer} can be used to prepare one- or two-sided flyers for printing on one sheet of paper. @@ -1466,7 +1462,7 @@ converter using the Poppler and Cairo libraries.") (define-public python-pypdf (package (name "python-pypdf") - (version "5.1.0") + (version "6.0.0") (source (origin (method git-fetch) @@ -1475,7 +1471,7 @@ converter using the Poppler and Cairo libraries.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0dl3nmvsk43s2v6a5cwwvfwpyvhsl9wcrdnqbzjsp50zqibi23pz")))) + (base32 "0p0650ya5f84d7khf34an9qpyww6yxnsdhgbppxfy3bg3qkx3s7g")))) (build-system pyproject-build-system) (arguments (list @@ -1491,6 +1487,7 @@ converter using the Poppler and Cairo libraries.") " and not ")))) (native-inputs (list python-flit + python-flit-core-next python-pytest python-pytest-socket python-pytest-timeout @@ -1606,18 +1603,18 @@ PDF Arranger was formerly known as PDF-Shuffler.") (define-public pdfposter (package (name "pdfposter") - (version "0.7.post1") - (source (origin - (method url-fetch) - (uri (pypi-uri "pdftools.pdfposter" version)) - (sha256 - (base32 - "0c1avpbr9q53yzq5ar2x485rmp9d0l3z27aham32bg7gplzd7w0j")))) - (build-system python-build-system) + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pdfposter" version)) + (sha256 + (base32 "0vhg43svzxr6ppcy888xg1hzjqfxbx5cc4qi77n4pvrqfan19633")))) + (build-system pyproject-build-system) (arguments - `(#:tests? #f)) ; test-suite not included in source archive - (inputs - (list python-pypdf2)) + `(#:tests? #f)) ;test-suite not included in source archive + (native-inputs (list python-setuptools python-wheel)) + (inputs (list python-pypdf)) (home-page "https://pythonhosted.org/pdftools.pdfposter/") (synopsis "Scale and tile PDF images/pages to print on multiple pages") (description "@command{pdfposter} can be used to create a large poster by diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 98192f34ea..c91e92fca2 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -570,7 +570,7 @@ photographic equipment.") (define-public darktable (package (name "darktable") - (version "5.2.0") + (version "5.2.1") (source (origin (method url-fetch) @@ -578,7 +578,7 @@ photographic equipment.") "https://github.com/darktable-org/darktable/releases/" "download/release-" version "/darktable-" version ".tar.xz")) (sha256 - (base32 "1imyk611wz0zxp03w91lhsxkj5hqgi0apx5bqj2q84gpdva6r92k")))) + (base32 "04gfcislcq2wymfqcir5bpwqfarcz5gynkn3ajyffj9rx6damw82")))) (build-system cmake-build-system) (arguments (list diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index ef2022415e..3b526cc7d0 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2021, 2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> -;;; Copyright © 2024 jgart <jgart@dismail.de> +;;; Copyright © 2024-2025 jgart <jgart@dismail.de> ;;; ;;; This file is part of GNU Guix. ;;; @@ -185,7 +185,7 @@ it.") (define-public trealla (package (name "trealla") - (version "2.82.20") + (version "2.82.23") (source (origin (method git-fetch) @@ -194,7 +194,7 @@ it.") (url "https://github.com/trealla-prolog/trealla") (commit (string-append "v" version)))) (sha256 - (base32 "1gm4lasn3hrbqzkqscd94arkq0wqcs87r80lipc325yi0zm047s9")) + (base32 "0qsbgn8lq827z5d3a8dwrmbzk3z0kgvcp4wxqsizhplspsy1d7w1")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index b5ad5e7519..d3b31b05c7 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2020, 2023 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org> -;;; Copyright © 2018, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2018, 2021-2023, 2025 Maxim Cournoyer <maxim@guixotic.coop> ;;; Copyright © 2019 Vagrant Cascadian <vagrant@debian.org> ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020, 2021, 2022, 2023 Ricardo Wurmus <rekado@elephly.net> @@ -252,6 +252,20 @@ Included are implementations of: @end enumerate\n") (license license:psfl))) +(define-public python-typing-extensions-next + (package + (inherit python-typing-extensions) + (version "4.15.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "typing_extensions" version)) + (sha256 + (base32 "0rhlhs28jndgp9fghdhidn6g7xiwx8vvihxbxhlgl4ncfg8lishc")))) + (native-inputs + (modify-inputs (package-native-inputs python-typing-extensions) + (replace "python-flit-core" python-flit-core-next))))) + ;;; ;;; Python builder packages. diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f5bcb2e798..0fd1276fa5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2701,24 +2701,27 @@ Java objects.") (define-public python-pymdown-extensions (package (name "python-pymdown-extensions") - (version "8.1.1") + (version "10.16.1") (source (origin - (method url-fetch) - (uri - (pypi-uri "pymdown-extensions" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/facelessuser/pymdown-extensions") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0d8pdndrl1kj105lq7r6kw2dnhcvll6h2qs07w71mcpi7gx728v3")))) - (build-system python-build-system) - ;; FIXME: "AssertionError: False is not true" + (base32 "0r36nk1ppq1wrgb1lcy9asp9872xr0gbhxrjw7dpa8lp6m7nqb9k")))) + (build-system pyproject-build-system) + ;; XXX: A lot of HTML tests fail with negligible discrepancies. (arguments - `(#:tests? #f)) - (propagated-inputs - (list python-markdown)) + (list #:tests? #f)) + (native-inputs (list python-hatchling python-pytest python-pyyaml)) + (propagated-inputs (list python-markdown)) (home-page "https://github.com/facelessuser/pymdown-extensions") (synopsis "Extension pack for Python Markdown") - (description "PyMdown Extensions is a collection of extensions for Python -Markdown. All extensions are found under the module namespace of pymdownx.") + (description + "PyMdown Extensions is a collection of extensions for Python Markdown. +All extensions are found under the module namespace of pymdownx.") (license license:expat))) (define-public python-plotext @@ -7635,29 +7638,30 @@ memory usage and transliteration quality.") (license license:expat))) (define-public python-pymsgbox - (package - (name "python-pymsgbox") - (version "1.0.6") - (source - (origin - (method git-fetch) - (uri (git-reference - ;; LICENSE.txt is not present on pypi - (url "https://github.com/asweigart/PyMsgBox") - (commit "55926b55f46caa969c5ddb87990ebea2737bd66f"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0zy7rjfpwlrd8b64j7jk2lb8m2npc21rnpwakpfvwgl4nxdy80rg")))) - (arguments - ;; Circular dependency to run tests: - ;; Tests need pyautogui, which depends on pymsgbox. - '(#:tests? #f)) - (build-system python-build-system) - (home-page "https://github.com/asweigart/PyMsgBox") - (synopsis "Python module for JavaScript-like message boxes") - (description - "PyMsgBox is a simple, cross-platform, pure Python module for + (let ((commit "944b7cdc67058d005ce5fd011c66f2d87d25aba0") + (revision "1")) + (package + (name "python-pymsgbox") + (version (git-version "1.0.6" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/asweigart/PyMsgBox") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1bhipfvnc06l8hiadk302v74yin38nwz1r47njliwk8kz103yl3g")))) + (build-system pyproject-build-system) + (arguments + ;; Circular dependency to run tests: + ;; Tests need pyautogui, which depends on pymsgbox. + '(#:tests? #f)) + (native-inputs (list python-setuptools python-wheel)) + (home-page "https://github.com/asweigart/PyMsgBox") + (synopsis "Python module for JavaScript-like message boxes") + (description + "PyMsgBox is a simple, cross-platform, pure Python module for JavaScript-like message boxes. Types of dialog boxes include: @enumerate @item alert @@ -7666,7 +7670,7 @@ JavaScript-like message boxes. Types of dialog boxes include: @item password @end enumerate ") - (license license:bsd-3))) + (license license:bsd-3)))) (define-public python-pympler (package @@ -8960,7 +8964,7 @@ ecosystem, but can naturally be used also by other projects.") (define-public python-robotframework (package (name "python-robotframework") - (version "7.2.2") + (version "7.3.2") (source (origin (method git-fetch) ; no tests in the PyPI archive @@ -8969,7 +8973,7 @@ ecosystem, but can naturally be used also by other projects.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1a34dv5gpaiqbddblfnirp1ja2a1069n9nifasn4g26kcj69fpra")))) + (base32 "0azis3dj7lfiwrr5gr1gr78z5m05vvl8n20rw3bz93s05z94h5i7")))) (outputs '("out" "doc")) (build-system pyproject-build-system) (arguments @@ -9009,6 +9013,7 @@ ecosystem, but can naturally be used also by other projects.") python-jsonschema python-pygments python-rellu + python-typing-extensions-next python-setuptools `(,python "tk") ;used when building the HTML doc python-wheel)) @@ -9621,22 +9626,9 @@ errors when data is invalid.") (list #:test-flags #~(list "--ignore=tests/test_docs.py" ; no pytest_examples - ;; These tests include hashes that keep changing depending on - ;; package versions. - "--ignore=tests/benchmarks/test_north_star.py" + "--ignore-glob=tests/benchmarks/*" ;; Unimportant difference in one test's error message. - "--ignore=tests/test_networks.py") - #:phases - #~(modify-phases %standard-phases - (add-before 'check 'pre-check - (lambda _ - ;; Remove the addopts from pyproject.toml, it breaks the 'check - ;; phase. - (substitute* "pyproject.toml" - (("'--benchmark") "#'--benchmark") - ;; Do not fail on deprecation warnings. - (("ignore:path is deprecated.*:DeprecationWarning:") - "ignore::DeprecationWarning"))))))) + "--ignore=tests/test_networks.py"))) (native-inputs (list tzdata-for-tests python-dirty-equals @@ -13038,7 +13030,6 @@ data, and scientific formats.") (build-system pyproject-build-system) (native-inputs (list pkg-config - python-pyperf python-pytest python-setuptools python-wheel)) @@ -17577,38 +17568,35 @@ reading and writing MessagePack data.") #t)))))))) (define-public python-openstep-plist - (package - (name "python-openstep-plist") - (version "0.3.0") - (home-page "https://github.com/fonttools/openstep-plist") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1rxjgzh0p069ncsr2986rn32vhdqyq35irbqg2559jh18456mkca")))) - (build-system python-build-system) - (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'pretend-version - (lambda _ - (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" - #$(package-version this-package)))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-vv"))))))) - (native-inputs - (list python-cython python-pytest python-setuptools-scm)) - (synopsis "OpenStep plist parser and writer") - (description - "This package provides a parser for the \"old style\" OpenStep property + (package + (name "python-openstep-plist") + (version "0.3.0") + (home-page "https://github.com/fonttools/openstep-plist") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1rxjgzh0p069ncsr2986rn32vhdqyq35irbqg2559jh18456mkca")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'pretend-version + (lambda _ + (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" + #$(package-version this-package))))))) + (native-inputs (list python-cython python-pytest python-setuptools-scm + python-setuptools python-wheel)) + (synopsis "OpenStep plist parser and writer") + (description + "This package provides a parser for the \"old style\" OpenStep property list format (also known as ASCII plist), written in Cython.") - (license license:expat))) + (license license:expat))) (define-public python-wrapt (package @@ -17720,25 +17708,15 @@ Unicode-aware. It is not intended as an end-user tool.") (uri (pypi-uri "xlwt" version)) (sha256 (base32 "123c2pdamshkq75wwvck8fq0cjq1843xd3x9qaiz2a4vg9qi56f5")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "GUIX_PYTHONPATH" - (string-append (getcwd) "/build/lib:" - (getenv "GUIX_PYTHONPATH"))) - (invoke "nosetests" "-v"))))))) - (native-inputs - `(("nose" ,python-nose))) + (build-system pyproject-build-system) + (native-inputs (list python-pytest python-setuptools python-wheel)) (home-page "https://www.python-excel.org/") (synopsis "Library for creating spreadsheet Excel files") - (description "@code{xlwt} is a library for writing data and formatting -information to older Excel files (i.e. .xls). The package itself is pure -Python with no dependencies on modules or packages outside the standard Python -distribution. It is not intended as an end-user tool.") + (description + "@code{xlwt} is a library for writing data and formatting information to +older Excel files (i.e. .xls). The package itself is pure Python with no +dependencies on modules or packages outside the standard Python distribution. +It is not intended as an end-user tool.") (license license:bsd-3))) (define-public python-immutables @@ -20712,17 +20690,39 @@ library as well as on the command line.") (version "1.7.0") (source (origin - (method url-fetch) - (uri (pypi-uri "plumbum" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/tomerfiliba/plumbum") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "1kidj821k79dw064rlxh84xamb9h79ychg3pgj81jlvm5hs48xri")))) - (build-system python-build-system) + (base32 "1vlaiz4bwgrcay51knj6a20lh3lwihjqxhxhdk6nqkn9ijg0hc81")))) + (build-system pyproject-build-system) (arguments - `(#:tests? #f)) ;no tests + (list + #:test-flags + #~(list "--ignore=tests/test_remote.py" + "--ignore=tests/test_putty.py" + "--ignore=tests/test_sudo.py" + "-k" + (string-join (list "not test_home" + "test_iter_lines_error" + "test_quoting" + "test_copy_move_delete") + " and not ")) + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'set-version + (lambda _ + (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version)))))) (native-inputs - ;; XXX: Not actually used since there are no tests but required for - ;; build. - (list python-pytest)) + (list procps + python-psutil + python-pytest + python-pytest-cov + python-setuptools + python-setuptools-scm + python-wheel)) (home-page "https://plumbum.readthedocs.io") (synopsis "Python shell combinators library") (description @@ -38126,12 +38126,13 @@ collection.") (uri (pypi-uri "types-toml" version)) (sha256 (base32 "10400bd3yv6rjfnq8galskkbpqz1sfx9sfgr5qwvw04270x4cjgr")))) - (build-system python-build-system) + (build-system pyproject-build-system) + (native-inputs (list python-setuptools python-wheel)) (home-page "https://github.com/python/typeshed") (synopsis "Typing stubs for TOML") - (description "This package contains typing stubs for TOML, a very small -subset the Python stubs contained in the complete @code{typeshed} -collection.") + (description + "This package contains typing stubs for TOML, a very small subset the +Python stubs contained in the complete @code{typeshed} collection.") (license license:asl2.0))) (define-public python-types-ujson @@ -38382,32 +38383,18 @@ easy to write code that's correct across platforms and Pythons.") (uri (pypi-uri "pyperf" version)) (sha256 (base32 "189qf9wdbig0fk4n3bavx8acgdbay5lllfvw48jvbfaafb7y5hja")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-tests - (lambda _ - ;; Some of these tests fail with: - ;; - ;; ModuleNotFoundError: No module named 'pyperf' - ;; - ;; even when calling ‘add-installed-pythonpath’ in the ‘check’ - ;; phase. - (delete-file "pyperf/tests/test_examples.py"))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; From tox.ini's ‘testenv.commands’. - (invoke "python" "-bb" "-Wd" - "-m" "unittest" "discover" - "-s" "pyperf/tests/" "-v"))))))) - (native-inputs - (list python-psutil)) + (list + #:test-flags + #~(list "--ignore=pyperf/tests/test_examples.py"))) + (native-inputs (list python-psutil python-pytest python-setuptools + python-wheel)) (home-page "https://github.com/psf/pyperf") (synopsis "Toolkit for running Python benchmarks") - (description "The Python @code{pyperf} module is a toolkit for writing, -running and analyzing benchmarks. It features a simple API that can: + (description + "The Python @code{pyperf} module is a toolkit for writing, running and +analyzing benchmarks. It features a simple API that can: @itemize @item automatically calibrate a benchmark for a time budget; @@ -38850,68 +38837,86 @@ nested data structures in Python like lists and dictionaries.") (license license:expat))) (define-public python-murmurhash3 - (package - (name "python-murmurhash3") - (version "2.3.5") - (source (origin - (method url-fetch) - (uri (pypi-uri "murmurhash3" version)) - (sha256 - (base32 - "1gdzys1212dx70byz07ipknbw1awbqskh6aznlkm85js8b8qfczm")))) - (build-system python-build-system) - (native-inputs (list python-cython python-pytest)) - (inputs (list python)) - (arguments - (list #:modules - '((ice-9 ftw) (ice-9 match) - (guix build utils) - (guix build python-build-system)) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'set-source-file-times-to-1980 - (lambda _ - (let ((circa-1980 (* 10 366 24 60 60))) - (ftw "." - (lambda (file stat flag) - (utime file circa-1980 circa-1980) #t)))))))) - (home-page "https://github.com/veegee/mmh3") - (synopsis "Python wrapper for MurmurHash (MurmurHash3)") - (description - "@code{murmurhash3} is a Python library for MurmurHash (MurmurHash3), a set + (let ((commit "01f1128a2c5ea08e6dc33515e140bedd68393a2d") + (revision "0")) + (package + (name "python-murmurhash3") + (version (git-version "2.3.5" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/veegee/mmh3") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zpk51ms1bvzg52zc9s9az71bgw2kgxidjcc1xib7y9r7dl7vczz")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-package + (lambda _ + (substitute* "mmh3module.cpp" + (("#include <stdio\\.h>") + "#define PY_SSIZE_T_CLEAN\n#include <stdio.h>"))))))) + (native-inputs + (list python-cython python-pytest python-setuptools python-wheel)) + (home-page "https://github.com/veegee/mmh3") + (synopsis "Python wrapper for MurmurHash (MurmurHash3)") + (description + "@code{murmurhash3} is a Python library for MurmurHash (MurmurHash3), a set of fast and robust hash functions. This library is a Python extension module written in C.") - (license license:public-domain))) + (license license:public-domain)))) (define-public python-murmurhash (package (name "python-murmurhash") (version "1.0.7") - (source (origin - (method url-fetch) - (uri (pypi-uri "murmurhash" version)) - (sha256 - (base32 - "0vwkn98c703nvsigl2nz99rax2pafkx3djjfkgc49jiipmp3j2k3")))) - (build-system python-build-system) - (native-inputs (list python-cython python-pytest)) - (inputs (list python python-murmurhash3)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/explosion/murmurhash") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0p8afy51nfvswl2fcimy5vc584zv89349rq12ymbcpp06yidzdfh")))) + (build-system pyproject-build-system) (arguments - (list #:modules - '((ice-9 ftw) (ice-9 match) - (guix build utils) - (guix build python-build-system)) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'set-source-file-times-to-1980 - (lambda _ - (let ((circa-1980 (* 10 366 24 60 60))) - (ftw "." - (lambda (file stat flag) - (utime file circa-1980 circa-1980) #t)))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'fix-installation + (lambda* (#:key inputs outputs #:allow-other-keys) + (with-directory-excursion + (string-append (site-packages inputs outputs) "/murmurhash") + (delete-file-recursively "tests") + (delete-file "mrmr.pyx") + (for-each + (lambda (file) + (chmod file #o555)) + (find-files "." "\\.so$"))))) + ;; XXX: Otherwise ModuleNotFoundError, and --pyargs doesn't seem + ;; to fix the issue. + (replace 'check + (lambda args + (copy-recursively "murmurhash/tests" "tests") + (delete-file-recursively "murmurhash") + (with-directory-excursion "tests" + (apply (assoc-ref %standard-phases 'check) args))))))) + (native-inputs + (list python-cython + python-murmurhash3 + python-pytest + python-setuptools + python-wheel)) (home-page "https://github.com/explosion/murmurhash") (synopsis "Cython bindings for MurmurHash2") - (description "This package provides Cython bindings for MurmurHash2.") + (description + "This package provides Cython bindings for MurmurHash2.") (license license:expat))) ;; Scooby requires for its test suite a ‘pyvips’ package that is missing its diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b55488b1f5..97da50e5cd 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1476,20 +1476,9 @@ data types.") ;; Current major version. (define-public python python-3) -;; Minimal variants of Python, mostly used to break the cycle between Tk and +;; Minimal variant of Python, mostly used to break the cycle between Tk and ;; Python (Tk -> libxcb -> Python.) -(define-public python2-minimal - (package/inherit python-2 - (name "python2-minimal") - (outputs '("out")) - - ;; Keep zlib, which is used by 'pip' (via the 'zipimport' module), which - ;; is invoked upon 'make install'. 'pip' also expects 'ctypes' and thus - ;; libffi. Expat is needed for XML support which is expected by a lot - ;; of libraries out there. - (inputs (list expat libffi zlib)))) - (define-public python-minimal (package/inherit python (name "python-minimal") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 34265cac0e..6632902b16 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -779,6 +779,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (patches (search-patches "qtbase-moc-ignore-gcc-macro.patch" "qtbase-absolute-runpath.patch" + "qtbase-fix-thread-test.patch" "qtbase-qmake-use-libname.patch" "qtbase-qmlimportscanner-qml-import-path.patch" "qtbase-qmake-fix-includedir.patch")))) @@ -899,16 +900,6 @@ tst_qt_cmake_create.cpp" "dirs.append(\"" #$(this-package-input "shared-mime-info") "/share/mime" "\");\n" all))))) - #$@(if (target-aarch64?) - ;; backport of 2bce75a6b53cccbf9c813581b64eea87f3ab55fc, - ;; which makes flaky tst_qthread less flaky. - #~((add-after 'patch-more-paths 'patch-aarch64-tests - (lambda _ - (invoke - "patch" "-p1" "-i" - #$(local-file - (search-patch "qtbase-fix-thread-test.patch")))))) - #~()) (delete 'do-not-capture-python) ;move after patch-source-shebangs (add-after 'patch-source-shebangs 'do-not-capture-python (lambda _ diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index ff66647bc1..73ce62b6cc 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -606,32 +606,26 @@ the complexity of that interface. Parallel support depends on the (define-public python-fenics-ufl (package (name "python-fenics-ufl") - (version "2019.1.0") + (version "2025.1.0") (source - (origin - (method url-fetch) - (uri (pypi-uri "fenics-ufl" version)) - (sha256 - (base32 - "10dz8x3lm68x2w3kkqcjask38h0zkhhak26jdbkppr8g9y8wny7p")))) - (build-system python-build-system) - (inputs - (list python-numpy)) - (native-inputs - (list python-pytest)) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "py.test" "test")))))) - (home-page "https://bitbucket.org/fenics-project/ufl/") + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fenics/ufl") + (commit version))) + (file-name (git-file-name name version)) + (sha256 (base32 "1ybf6l2nn4ni4a77ad1f36nhd7ddcbbvyc5frdggsmcjdmds9bf3")))) + (build-system pyproject-build-system) + (inputs (list python-numpy)) + (native-inputs (list python-pytest python-setuptools python-wheel)) + (home-page "https://github.com/fenics/ufl") (synopsis "Unified language for form-compilers") - (description "The Unified Form Language (UFL) is a domain specific -language for declaration of finite element discretizations of -variational forms. More precisely, it defines a flexible interface -for choosing finite element spaces and defining expressions for weak -forms in a notation close to mathematical notation. + (description + "The Unified Form Language (UFL) is a domain specific language for +declaration of finite element discretizations of variational forms. More +precisely, it defines a flexible interface for choosing finite element spaces +and defining expressions for weak forms in a notation close to mathematical +notation. UFL is part of the FEniCS Project.") (license license:lgpl3+))) diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index c2cdbd8a03..1b6a38928a 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -486,29 +486,3 @@ additional options for controlling the SSL session.") . "https://core.tcl-lang.org/tcltls/wiki/Download") (upstream-name . "tcltls"))) (license license:public-domain))) - -(define-public go-github.com-nsf-gothic - (let ((commit "97dfcc195b9de36c911a69a6ec2b5b2659c05652") - (revision "0")) - (package - (name "go-github.com-nsf-gothic") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/nsf/gothic") - (commit commit))) - (sha256 - (base32 - "1lrhbml6r4sh22rrn3m9bck70pv0g0c1diprg7cil90x0jidxczr")) - (file-name (git-file-name name version)))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/nsf/gothic")) - (propagated-inputs - (list tk tcl)) - (home-page "https://github.com/nsf/gothic") - (synopsis "Tcl/Tk Go bindings") - (description "Gothic contains Go bindings for Tcl/Tk. The package contains -only one type and one function that can be used to create a Tk interpreter.") - (license license:expat)))) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index d3e4be0894..ed26e63315 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -333,11 +333,11 @@ required structures.") ;; url-fetch is used here to avoid a circular dependency with ;; git-download, see https://issues.guix.gnu.org/63331 (method url-fetch) - (uri (string-append "mirror://gnu/gnutls/guile-gnutls-" - version ".tar.gz")) + (uri (string-append "mirror://gnu/gnutls/guile-gnutls-v" + version "-src.tar.gz")) (sha256 (base32 - "0azgp79a4hgmbg2p2ghd1x2zav8894m9ch3i4hbvq8dlxvrnf06c")))) + "0kqngyx4520gjk49l6whjd2ss994kaj9rm78lli6p3q6xry0945i")))) (build-system gnu-build-system) (outputs '("out" "debug")) (arguments @@ -354,6 +354,7 @@ required structures.") "$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions")))) (native-inputs (list libtool + autoconf automake pkg-config texinfo gnutls @@ -1132,30 +1133,6 @@ ACME server (such as Let's Encrypt) implemented as a relatively simple Bash script.") (license license:expat))) -(define-public go-github-com-certifi-gocertifi - (let ((commit "a5e0173ced670013bfb649c7e806bc9529c986ec") - (revision "1")) - (package - (name "go-github-com-certifi-gocertifi") - (version (git-version "2018.01.18" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/certifi/gocertifi") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1n9drccl3q1rr8wg3nf60slkf1lgsmz5ahifrglbdrc6har3rryj")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/certifi/gocertifi")) - (synopsis "X.509 TLS root certificate bundle for Go") - (description "This package is a Go language X.509 TLS root certificate bundle, -derived from Mozilla's collection.") - (home-page "https://certifi.io") - (license license:mpl2.0)))) - (define-public s2n (package (name "s2n") diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index bc217146eb..0f1c7509a7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -9754,6 +9754,21 @@ for ZIM files.") It contains the code shared by all Kiwix ports.") (license license:gpl3))) +(define-public kiwix-lib-13 + (package + (inherit kiwix-lib) + (name "kiwix-lib") + (version "13.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kiwix/kiwix-lib/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mgzmqar70rj83x27a4zh7qr6yl5pi95g6i3fvvxysdjy76v18qc")))))) + (define-public kiwix-desktop (package (name "kiwix-desktop") @@ -9824,7 +9839,7 @@ offline (such as Wikipedia), without any access to Internet.") (inputs (list curl icu4c - kiwix-lib + kiwix-lib-13 libmicrohttpd libzim pugixml diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index c5fd41269e..bc361dbe53 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1360,7 +1360,7 @@ for and start applications.") font-dejavu ;default font greybird-gtk-theme hicolor-icon-theme - mate-polkit-for-xfce + mate-polkit mousepad ristretto shared-mime-info diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 08703b370c..6ba3c5b8ca 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2644,7 +2644,7 @@ It is used to control the pointer with a joystick device.") "0mvwxrnkq0lzhjr894p420zxffdn34nc2scinmp7qd1hikr51kkp")))) (build-system gnu-build-system) ;; Linux is no longer supported since 2.0.0, use libinput or evdev instead. - (supported-systems '("i586-gnu" "x86_64-gnu")) + (supported-systems %hurd-systems) (inputs (list xorg-server)) (native-inputs (list pkg-config)) (home-page "https://www.x.org/wiki/") diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm index 6b3f66095c..82484d652d 100644 --- a/gnu/packages/zig.scm +++ b/gnu/packages/zig.scm @@ -1890,4 +1890,186 @@ toolchain. Among other features it provides (properties `((max-silent-time . 9600) ,@(clang-compiler-cpu-architectures "19"))))) + +;;; +;;; Bootstrap path for Zig 0.15. +;;; + +(define zig-0.14.0-687 + (let ((commit "cc047fdd959edb260f7a6e305ccad53f185ece66") + (revision "687") + (base zig-0.14)) + (package + (inherit base) + (name "zig") + (version (git-version "0.14.0" revision commit)) + (source (zig-source + version commit + "0wjswx1cvql8pxpdrglr3h24v5rffnq3llr0f08hj8g959f6ffvs")) + ;; zig2 + (arguments (package-arguments zig-0.10.0-851)) + (inputs + (modify-inputs (package-inputs base) + (replace "clang" clang-20) + (replace "lld" lld-20))) + (native-inputs + (modify-inputs (package-native-inputs base) + (replace "llvm" llvm-20) + (replace "zig" `(,base "zig1")))) + (properties `((max-silent-time . 9600) + ,@(clang-compiler-cpu-architectures "20")))))) + +(define zig-0.14.0-877 + (let ((commit "0adcfd60f4fcfd01c74a6477cbcef187ce06f533") + (revision "877") + (base zig-0.14.0-687)) + (package + (inherit base) + (name "zig") + (version (git-version "0.14.0" revision commit)) + (source (zig-source + version commit + "1yyar3cms02kzf4z20sbw09awqvz0kbm9fx8g0kgb8hp1f4blf3d")) + ;; zig1 + (arguments (package-arguments zig-0.10.0-747)) + (native-inputs + (modify-inputs (package-native-inputs base) + (replace "zig" `(,base "out"))))))) + +(define zig-0.14.0-930 + (let ((commit "40d11cc25a469dc6bb0f9fbba4d05e7210a23b3f") + (revision "930") + (base zig-0.14.0-877)) + (package + (inherit base) + (name "zig") + (version (git-version "0.14.0" revision commit)) + (source (zig-source + version commit + "06x6zi8hcl04gmql96vyms0zch94xi1all5s1kjsnbifixd99bgy")) + ;; zig2 + (arguments (package-arguments zig-0.10.0-851)) + (native-inputs + (modify-inputs (package-native-inputs base) + (replace "zig" `(,base "zig1"))))))) + +(define zig-0.14.0-934 + (let ((commit "4ba0e7d424a7c0af55c8085c659e9205560d3095") + (revision "934") + (base zig-0.14.0-930)) + (package + (inherit base) + (name "zig") + (version (git-version "0.14.0" revision commit)) + (source (zig-source + version commit + "17zaw7bk6wli6wpsr5zlpn1b39818h034l5bpnsxfslqqg09rsd8")) + ;; zig1 + (arguments (package-arguments zig-0.10.0-747)) + (native-inputs + (modify-inputs (package-native-inputs base) + (replace "zig" `(,base "out"))))))) + +(define zig-0.14.0-1091 + (let ((commit "87ce83d5a5854b63b7cef5c6209742ee1a524107") + (revision "1091") + (base zig-0.14.0-934)) + (package + (inherit base) + (name "zig") + (version (git-version "0.14.0" revision commit)) + (source (zig-source + version commit + "18irwcr63l1hf2g7vv9qajgllsp7qwzsv5ijm9x8l51agm6harf4")) + ;; zig2 + (arguments (package-arguments zig-0.10.0-851)) + (native-inputs + (modify-inputs (package-native-inputs base) + (replace "zig" `(,base "zig1"))))))) + +(define zig-0.14.0-1197 + (let ((commit "a023b9b22b6593ebd5a86736a4a9955840d1bfa1") + (revision "1197") + (base zig-0.14.0-1091)) + (package + (inherit base) + (name "zig") + (version (git-version "0.14.0" revision commit)) + (source (zig-source + version commit + "08c1m6kwq7cqg5s6j0ypp8ygvxj21da5is0w7y17sw27fjqrlhgr")) + ;; zig1 + (arguments (package-arguments zig-0.10.0-747)) + (native-inputs + (modify-inputs (package-native-inputs base) + (replace "zig" `(,base "out"))))))) + +(define zig-0.15-libc-abi-tools + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ziglang/libc-abi-tools") + (commit "21993a6036cc165485b20229589340dff9d4fc3c"))) + (file-name "libc-abi-tools") + (sha256 + (base32 "0miwb0zfgfmm4bh2bs7982wpk0wp5vj2mz10x9c3m8fw7zzcyvbh")) + (modules '((guix build utils))) + (snippet + #~(substitute* "netbsd/consolidate.zig" + ((".write_buffer = buffer") ".write_buffer = &buffer"))))) + +(define-public zig-0.15 + (package + (inherit zig-0.14) + (name "zig") + (version "0.15.1") + (source + (origin + (inherit (zig-source + version version + "1cp18plf0x5wip4rnxiqavaqnqxnqzhipb34in6zd3y7wihwjmj4")) + (patches + (search-patches + "zig-0.14-use-baseline-cpu-by-default.patch" + "zig-0.14-use-system-paths.patch" + "zig-0.15-fix-runpath.patch")))) + (arguments + (substitute-keyword-arguments (package-arguments zig-0.14) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (delete 'install-glibc-abilists) + ;; TODO: Remove newly-added abilists files in zig-source. + (add-before 'check 'install-abilists + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (mkdir-p "/tmp/libc-abi-tools") + (with-directory-excursion "/tmp/libc-abi-tools" + (copy-recursively + (dirname (search-input-file + (or native-inputs inputs) "list.zig")) + ".") + (for-each make-file-writable (find-files ".")) + (for-each + (lambda (libc) + (with-directory-excursion libc + (invoke (string-append #$output "/bin/zig") + "run" "consolidate.zig") + (install-file + "abilists" + (string-append #$output "/lib/zig/libc/" libc)))) + '("freebsd" + "glibc" + "netbsd"))))))))) + (inputs + (modify-inputs (package-inputs zig-0.14) + (replace "clang" clang-20) + (replace "lld" lld-20))) + (native-inputs + (modify-inputs (package-native-inputs zig-0.14) + (delete "glibc-abi-tool") + (prepend zig-0.15-libc-abi-tools) + (replace "llvm" llvm-20) + (replace "zig" `(,zig-0.14.0-1197 "zig1")))) + (properties `((max-silent-time . 9600) + ,@(clang-compiler-cpu-architectures "20"))))) + (define-public zig zig-0.13) |