diff options
52 files changed, 1233 insertions, 917 deletions
diff --git a/doc/contributing.texi b/doc/contributing.texi index 0f04ef7870..4aa8d34fe5 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -3369,7 +3369,13 @@ it), it may be removed after a @b{one-month review period} of the patch removing it (this applies even when the removal has additional motivations such as security problems affecting the package). -If it has many dependent packages---as is the case for example with +@quotation Note +Learn about pending package removals by checking +@uref{https://codeberg.org/guix/guix/issues?labels=445131, issues and +pull requests with the @samp{deprecation} label}. +@end quotation + +If the package has many dependent packages---as is the case for example with Python version@tie{}2---the relevant team must propose a deprecation removal agenda and seek consensus with other packagers for @b{at least one month}. It may also invite feedback from the broader user diff --git a/doc/guix.texi b/doc/guix.texi index f3f3fe2129..100a7ed8b6 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -37878,9 +37878,13 @@ Owner of the @code{cuirass} process. @item @code{group} (default: @code{"cuirass"}) Owner's group of the @code{cuirass} process. -@item @code{interval} (default: @code{60}) +@item @code{interval} (default: @code{300}) Number of seconds between the poll of the repositories followed by the -Cuirass jobs. +Cuirass jobs, by default. + +Note that individual jobset specifications may override this in their +@code{period} field; the value specified here is only used for +specifications that use the default @code{period} value, which is zero. @item @code{ttl} (default: @code{2592000}) Duration to keep build results' GC roots alive, in seconds. @@ -40572,6 +40576,10 @@ permissive OpenSSH secure shell daemon listening on port 2222 @item @code{qemu} (default: @code{qemu-minimal}) The QEMU package to use. +@item @code{type} (default: @code{'hurd-qcow2}) +The image type name. Use @code{'hurd-qcow2} for a 32-bit image or +@code{'hurd64-qcow2} for a 64-bit image. + @item @code{image} (default: @var{hurd-vm-disk-image}) The image object representing the disk image of this virtual machine (@pxref{System Images}). diff --git a/etc/guix-daemon.service.in b/etc/guix-daemon.service.in index 6e534771c6..88929fa904 100644 --- a/etc/guix-daemon.service.in +++ b/etc/guix-daemon.service.in @@ -24,6 +24,10 @@ BindPaths=@storedir@ # Disable host file system mount propagation to keep service view of the # store read-write after 'gnu-store.mount' makes it read-only system-wide. MountFlags=private +# Mitigate race condition between guix-daemon and 'gnu-store.mount'. +# Dependent units will only start after daemon binary is started AND THUS +# the mount point is acquired in a private namespace. +Type=exec # Provide the CAP_CHOWN capability so that guix-daemon can create and chown # /var/guix/profiles/per-user/$USER and also chown failed build directories diff --git a/gnu/local.mk b/gnu/local.mk index 1041186575..1acb49af74 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -537,7 +537,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/pcre.scm \ %D%/packages/pdf.scm \ %D%/packages/pem.scm \ - %D%/packages/pep.scm \ %D%/packages/perl.scm \ %D%/packages/perl-check.scm \ %D%/packages/perl-compression.scm \ @@ -1439,6 +1438,8 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ + %D%/packages/patches/gimp-fix-metadata-editor.patch \ + %D%/packages/patches/gimp-fix-tiff-load.patch \ %D%/packages/patches/git-filter-repo-generate-doc.patch \ %D%/packages/patches/gklib-suitesparse.patch \ %D%/packages/patches/glib-appinfo-watch.patch \ @@ -1834,6 +1835,7 @@ dist_patch_DATA = \ %D%/packages/patches/lugaru-fix-sound.patch \ %D%/packages/patches/luit-posix.patch \ %D%/packages/patches/lxc-no-static-bin.patch \ + %D%/packages/patches/lxsession-potfiles-ignore.patch \ %D%/packages/patches/mactelnet-remove-init.patch \ %D%/packages/patches/mailutils-variable-lookup.patch \ %D%/packages/patches/mandoc-support-zstd-compression.patch \ @@ -1939,6 +1941,9 @@ dist_patch_DATA = \ %D%/packages/patches/nss-getcwd-nonnull.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-3.56-pkgconfig.patch \ + %D%/packages/patches/nss-disable-broken-tests.patch \ + %D%/packages/patches/nss-3.115-disable-broken-tests.patch \ + %D%/packages/patches/nss-3.115-disable-pkix-ocsp-tests.patch \ %D%/packages/patches/ntp-fix-dereferencing-the-wrong-variable.patch \ %D%/packages/patches/nvi-assume-preserve-path.patch \ %D%/packages/patches/nvi-dbpagesize-binpower.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2e10b5bdc0..02b35ae48b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -217,14 +217,14 @@ (define-public aide (package (name "aide") - (version "0.19.1") + (version "0.19.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/aide/aide/releases/download/v" version "/aide-" version ".tar.gz")) (sha256 - (base32 "0lhbx7ilwzpfl77vi7b6cklhgzk1iwyfp4fvvgvlmmq30igvzy3d")))) + (base32 "1i3lbsw1mhsnq54bx48zikdiph1ihxn021ca7kmys4b1yh2jnxi3")))) (build-system gnu-build-system) (arguments (list #:configure-flags #~(list "--with-posix-acl" @@ -575,7 +575,7 @@ interface and is based on GNU Guile.") (if (or (target-arm?) (target-riscv64?)) guile-fibers-1.1 - guile-fibers)))) + guile-fibers-1.3)))) ;pinned version to avoid rebuilds (inputs (modify-inputs (package-inputs shepherd-0.9) (replace "guile-fibers" (this-package-native-input "guile-fibers")))))) @@ -2922,7 +2922,7 @@ system is under heavy load.") (define-public stress-ng (package (name "stress-ng") - (version "0.18.04") + (version "0.19.03") (source (origin (method git-fetch) @@ -2931,7 +2931,7 @@ system is under heavy load.") (commit (string-append "V" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "100w4qkrzpg7jjl4dw0c376xi811qnjmlbffiy43i945f9vl3dc7")))) + (base32 "1phrmjvvjn55pyfljfkk604d8q8wn17l416v91hskj98v7b7yhck")))) (build-system gnu-build-system) (arguments ;; XXX The test suite seems to cause instability on the VisionFive 2 @@ -4639,7 +4639,7 @@ information tool.") (define-public fastfetch (package (name "fastfetch") - (version "2.50.2") + (version "2.51.1") (source (origin (method git-fetch) @@ -4648,7 +4648,7 @@ information tool.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "17pasb0cckp9pjjcmfi07lfmsg5wf59gynxq7m5w57jlzq10k3vm")) + (base32 "1c5z1mgpgm8nzxkdjfh0412zdnv1f8i1vvic2h5v99f9cmdjwr25")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "src/3rdparty"))))) @@ -4666,15 +4666,7 @@ information tool.") "/share/hwdata/pci.ids") (string-append "-DCUSTOM_AMDGPU_IDS_PATH=" #$(this-package-input "libdrm") - "/share/libdrm/amdgpu.ids")) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'fix-yyjson - (lambda _ - ;; workaround for https://github.com/fastfetch-cli/fastfetch/pull/1904 - (substitute* "src/util/FFstrbuf.h" - (("\"3rdparty/yyjson/yyjson.h\"") - "<yyjson.h>"))))))) + "/share/libdrm/amdgpu.ids")))) (inputs (list dbus glib hwdata 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/astronomy.scm b/gnu/packages/astronomy.scm index 5e5120ee92..7085fde1cf 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -279,7 +279,7 @@ wide set of telescopes.") (define-public astroterm (package (name "astroterm") - (version "1.0.8") + (version "1.0.9") (source (origin (method git-fetch) @@ -288,7 +288,7 @@ wide set of telescopes.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "10y776rh6ww1zjk96cd497ipbr54q0wdd1g7ybsrffdbrzc6l8jx")))) + (base32 "03vrprrahhfp7jbl1apmpxmv05fb8lw469fnsnq7sajdhc3waifx")))) (build-system meson-build-system) (arguments (list diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1b381f1bb8..a7135759f9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7162,7 +7162,7 @@ bases are detected.") (define-public trinityrnaseq (package (name "trinityrnaseq") - (version "2.13.2") + (version "2.15.2") (source (origin (method git-fetch) (uri (git-reference @@ -7172,7 +7172,7 @@ bases are detected.") (file-name (git-file-name name version)) (sha256 (base32 - "1qszrxqbx4q5pavpgm4rkrh1z1v1mf7qx83vv3fnlqdmncnsf1gv")))) + "06qvxy6wvvjpn1mkg8m78syyn98xj76569gpl2jbc9q036i56kh8")))) (build-system gnu-build-system) (arguments (list 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/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/emulators.scm b/gnu/packages/emulators.scm index f86fcedd56..0ac1cb974d 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2025 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2025 Andrew Wong <wongandj@icloud.comg> ;;; Copyright © 2025 Anderson Torres <anderson.torres.8519@gmail.com> +;;; Copyright © 2025 Laura Kirsch <laurakirsch240406@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -4713,3 +4714,45 @@ information. Useful for cross-architecture tools (such as @code{python-pyvex}). (synopsis "8051/8052 emulator with curses-based UI") (description "emu8051 is a simulator of the 8051/8052 microcontrollers.") (license license:expat)))) + +(define-public fceux + (package + (name "fceux") + (version "2.6.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TASEmulators/fceux") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "02s5qmxdxpsa71977z9bs5vfhnszn5nr5hk05wns8cm9nshbg7as")) + (modules '((guix build utils))) + (snippet #~(map delete-file-recursively + (list "output/lua5.1.dll" "output/lua51.dll" + "src/drivers/win" "fceux-server" "vc"))))) + (build-system cmake-build-system) + (arguments + (list + ;; No test suite. + #:tests? #f)) + (inputs (list qtbase-5 + zlib + minizip + sdl2 + lua-5.1 + libx264 + x265 + ffmpeg + libxkbcommon + libarchive)) + (native-inputs (list pkg-config)) + (synopsis "NES/Famicom emulator") + (description + "FCEUX is a Nintendo Entertainment System (NES), Famicom, Famicom Disk +System (FDS), and Dendy emulator. It supports NTSC (USA/JPN), PAL (European), +and NTSC-PAL Hybrid modes. It also offers tools for debugging, rom-hacking, +map making, Tool-assisted movies, and Lua scripting.") + (home-page "https://fceux.com/web/home.html") + (license license:gpl2+))) diff --git a/gnu/packages/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/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 993d56713b..a206016453 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -2722,6 +2722,54 @@ software vendors in the late 1980s.") in the late 1980s.") (license license:public-domain))) +(define-public font-apl386 + ;; Neither releases nor tags + (let ((commit "c5bca014b6610ee170985c3ce32a8bb14dbd7b94") + (revision "1")) + (package + (name "font-apl386") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/abrudz/APL386") + (commit commit))) + (file-name (git-file-name name revision)) + (sha256 + (base32 "0z7kpqgfrb053rajnr08n02rdwg5w1aynxj13ys93j0k3xvv5a75")))) + (build-system font-build-system) + (synopsis "Font suitable for APL programming language") + (description + "APL386 is an evolution of Adrian Smith's APL385 font with a fun, +whimsical look, inspired by Comic Sans Serif.") + (home-page "https://abrudz.github.io/APL386/") + (license license:unlicense)))) + +(define-public font-bqn386 + ;; Neither releases nor tags + (let ((commit "4d8b9f668ba76a15ca9cd44d9bfedaf95a4c0d96") + (revision "1")) + (package + (name "font-bqn386") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dzaima/BQN386") + (commit commit))) + (file-name (git-file-name name revision)) + (sha256 + (base32 "1l2ycjs85vps7sy5yg19mq1xdnfv4lx3skw921yw1rhx9xdvhrgc")))) + (build-system font-build-system) + (synopsis "Font suitable for APL and BQN programming languages") + (description + "BQN386 is an extension of APL386 font. This font keeps regular APL +characters mostly intact.") + (home-page "https://dzaima.github.io/BQN386/") + (license license:unlicense)))) + (define-public font-aporetic (package (name "font-aporetic") diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index ff3bbe52f0..377aeeb251 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -147,15 +147,15 @@ formal verification. This is the Yosyshq fork of ABC.") (define-public apycula (package (name "apycula") - (version "0.22") + (version "0.23") ;; The pypi tar.gz file includes the necessary .pickle files, not available ;; in the home-page repository. (source (origin (method url-fetch) - (uri (pypi-uri "Apycula" version)) + (uri (pypi-uri "apycula" version)) (sha256 - (base32 "15xwmi6z2p7jz17l5bqs511yh8jis1dacqc8fypx49jysl7h0apd")))) + (base32 "1kk9hi8zhdp1am5vj716lwlmrs31lxrwhdbbc4qsad470dcjqs57")))) (build-system pyproject-build-system) (arguments (list #:tests? #f)) ;requires Gowin EDA tools (inputs (list python-crc)) @@ -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/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/golang-web.scm b/gnu/packages/golang-web.scm index 5f35bcabac..e797dba593 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -453,7 +453,7 @@ handlers.") (define-public go-github-com-alexliesenfeld-health (package (name "go-github-com-alexliesenfeld-health") - (version "0.8.0") + (version "0.8.1") (source (origin (method git-fetch) @@ -462,7 +462,7 @@ handlers.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1fchlvxwidsscskwq07vhxfwcn5wbigbizi51619l8gg09mr158q")))) + (base32 "19p0rs1dmvf3cnylyykmmnma2g5x2vy8gasr2rjl28ma58w6l0d3")))) (build-system go-build-system) (arguments (list @@ -1571,7 +1571,7 @@ and reduce scope of key compromise. (define-public go-github-com-caddyserver-zerossl (package (name "go-github-com-caddyserver-zerossl") - (version "0.1.0") + (version "0.1.3") (source (origin (method git-fetch) @@ -1580,7 +1580,7 @@ and reduce scope of key compromise. (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0hr2kdabhm35hz5krp7m3g6wxvyb9xlqgmy3krf4wwb3yabsqp1m")))) + (base32 "16mrlmsl3ajdrn2qsdq51k79z3fi8v8j82r2c6xyj7mp2yr979h6")))) (build-system go-build-system) (arguments (list @@ -8723,7 +8723,7 @@ to @url{https://www.rfc-editor.org/rfc/rfc3550, RFC 3550}, (define-public go-github-com-pion-rtp (package (name "go-github-com-pion-rtp") - (version "1.8.11") + (version "1.8.21") (source (origin (method git-fetch) @@ -8732,11 +8732,13 @@ to @url{https://www.rfc-editor.org/rfc/rfc3550, RFC 3550}, (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1a4fj31j7glhfsnxxwm8r72l6capz9mh8kfr340659ahgiijdkcg")))) + (base32 "1hc5cdxgf0m44awvzzaby3hrlnhjbxjivl6981069xwgxspqakhm")))) (build-system go-build-system) (arguments (list #:import-path "github.com/pion/rtp")) + (native-inputs + (list go-github-com-stretchr-testify)) (propagated-inputs (list go-github-com-pion-randutil)) (home-page "https://github.com/pion/rtp") @@ -8838,7 +8840,7 @@ Protocol,SCTP} as specified in (package (inherit go-github-com-pion-srtp-v2) (name "go-github-com-pion-srtp-v3") - (version "3.0.4") + (version "3.0.7") (source (origin (method git-fetch) @@ -8847,7 +8849,7 @@ Protocol,SCTP} as specified in (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "03343fsgrawfy9plsl7y5022ygjln3jvsn3im5xl1qwnc68rb1a2")))) + (base32 "0l8y01ci5fsx8b6ajn9cvs45hqpz838x0jnyyj1p2z714nw9jh61")))) (arguments (list #:import-path "github.com/pion/srtp/v3")) @@ -10203,7 +10205,7 @@ Supports S3 and STS.") (define-public go-github-com-sourcegraph-jsonrpc2 (package (name "go-github-com-sourcegraph-jsonrpc2") - (version "0.2.0") + (version "0.2.1") (home-page "https://github.com/sourcegraph/jsonrpc2") (source (origin @@ -10213,7 +10215,7 @@ Supports S3 and STS.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1id35b4mhif9gy1b70mv0x7xkmpm2p8xydix8six10yjyhvm1wjh")))) + (base32 "0nxiq8da4x4sipjkap50cfzjg9b8vqm45w65hbjywwj6q73jl54a")))) (build-system go-build-system) (arguments '(#:import-path "github.com/sourcegraph/jsonrpc2")) @@ -10501,6 +10503,52 @@ runtime. It has zero dependencies, and doesn't rely on CGO. This means you can run applications in other languages and still keep cross compilation.") (license license:asl2.0))) +(define-public go-github-com-things-go-go-socks5 + (package + (name "go-github-com-things-go-go-socks5") + (version "0.0.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/things-go/go-socks5") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0r7v1bpja4j8q9bjh124w8l5m29vwnpaq0flm97izvzw4pcyxybf")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/things-go/go-socks5")) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-golang-org-x-net)) + (home-page "https://github.com/things-go/go-socks5") + (synopsis "SOCKS5 with full TCP/UDP and IPv4/IPv6 support in Golang") + (description + "This package implements a @url{http://en.wikipedia.org/wiki/SOCKS, +SOCKS5}. SOCKS (Secure Sockets) is used to route traffic between a client and +server through an intermediate proxy layer. This can be used to bypass +firewalls or NATs. + +Features: +@itemize +@item support socks5 server +@item support TCP/UDP and IPv4/IPv6 +@item unit tests +@item \"No Auth\" mode +@item user/password authentication optional user addr limit +@item support for the CONNECT command +@item support for the ASSOCIATE command +@item rules to do granular filtering of commands +@item custom DNS resolution +@item custom goroutine pool +@item buffer pool design and optional custom buffer pool +@item custom logger +@end itemize") + (license license:expat))) + (define-public go-github-com-tj-go-elastic (package (name "go-github-com-tj-go-elastic") @@ -12706,7 +12754,7 @@ the standard @code{context} package to store request-scoped values.") (define-public go-golang-zx2c4-com-wireguard (package (name "go-golang-zx2c4-com-wireguard") - (version "0.0.0-20231211153847-12269c276173") + (version "0.0.0-20250521234502-f333402bd9cb") (source (origin (method git-fetch) @@ -12718,33 +12766,16 @@ the standard @code{context} package to store request-scoped values.") (commit (go-version->git-ref version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1fbc6m0ahifhrd6jdrpdxi8l3b2slpp8fmv20kpq2yzz19vzzgkf")))) + (base32 "1h4rmdvssk939gk31f0sfwa1yaks72zk8rkcs7fj3qcvl8sgq6hr")))) (build-system go-build-system) (arguments (list - #:import-path "golang.zx2c4.com/wireguard" - #:phases - #~(modify-phases %standard-phases - ;; XXX: Workaround for go-build-system's lack of Go modules - ;; support. - (replace 'check - (lambda* (#:key tests? import-path #:allow-other-keys) - (when tests? - (with-directory-excursion (string-append "src/" import-path) - (invoke "go" "test" "-v" - ;; "./tune/..." ; Requires gvisor.dev/gvisor, not packed yet - "./" - "./conn/..." - "./device/..." - "./ipc/..." - "./ratelimiter/..." - "./replay/..." - "./rwcancel/..." - "./tai64n/...")))))))) + #:import-path "golang.zx2c4.com/wireguard")) (propagated-inputs (list go-golang-org-x-crypto go-golang-org-x-net - go-golang-org-x-sys)) + go-golang-org-x-sys + go-gvisor-dev-gvisor)) (home-page "https://git.zx2c4.com/wireguard") (synopsis "Implementation of WireGuard in Go") (description "This package is a Go Implementation of WireGuard.") diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 8f5201824d..73c4b4cd3d 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -1013,6 +1013,32 @@ Distance}.") http://tartarus.org/~martin/PorterStemmer/index.html.") (license license:expat))) +(define-public go-github-com-akamensky-argparse + (package + (name "go-github-com-akamensky-argparse") + (version "1.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/akamensky/argparse") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1m7rzrfwyrwxbbry5ppds2b3c5gdslpakvjhsh6i8mhdfhywd8wc")))) + (build-system go-build-system) + (arguments + (list + ;; Panic: unexpected call to os.Exit(0) during test. + #:test-flags #~(list "-skip" "TestUsageString") + #:import-path "github.com/akamensky/argparse")) + (home-page "https://github.com/akamensky/argparse") + (synopsis "Argparse for golang") + (description + "This package implements a flexible and configurable option for command +line arguments parsing.") + (license license:expat))) + (define-public go-github-com-alecaivazis-survey-v2 (package (name "go-github-com-alecaivazis-survey-v2") @@ -12372,6 +12398,35 @@ representation suitable for computing diffs.") @end itemize") (license license:expat))) +(define-public go-github-com-landlock-lsm-go-landlock + (package + (name "go-github-com-landlock-lsm-go-landlock") + (version "0.0.0-20250303204525-1544bccde3a3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/landlock-lsm/go-landlock") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00qis8gg2ajyph9jyrjghm6cn0h22pwjwdp6qa22ji6jslgnm02n")))) + (build-system go-build-system) + (arguments + (list + #:skip-build? #t + #:import-path "github.com/landlock-lsm/go-landlock")) + (propagated-inputs + (list go-golang-org-x-sys + go-kernel-org-pub-linux-libs-security-libcap-psx)) + (home-page "https://landlock.io/") + (synopsis "Golang library for the Linux Landlock sandboxing feature") + (description + "This package implements a restriction for the current processes' ability +to use files, using Linux 5.13's +@url{https://docs.kernel.org/security/landlock.html, Landlock} feature.") + (license license:expat))) + (define-public go-github-com-lann-builder (package (name "go-github-com-lann-builder") @@ -22672,6 +22727,33 @@ kubernetes-independent packages supplementing the @url{https://pkg.go.dev/std#stdlib,Go standard libs}.") (license license:asl2.0))) +(define-public go-kernel-org-pub-linux-libs-security-libcap-psx + (package + (name "go-kernel-org-pub-linux-libs-security-libcap-psx") + (version "1.2.76") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.kernel.org/pub/scm/libs/libcap/libcap.git") + (commit (go-version->git-ref version + #:subdir "psx")))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0va0bkq5kxf0ccsdpw598vsmk4kdzhaafjvym0g5b2n49c5sn59b")))) + (build-system go-build-system) + (arguments + (list + #:import-path "kernel.org/pub/linux/libs/security/libcap/psx" + #:unpack-path "kernel.org/pub/linux/libs/security/libcap")) + ;; Redirects from <https://kernel.org/pub/linux/libs/security/libcap> + (home-page "https://sites.google.com/site/fullycapable") + (synopsis "API for invoking Linux system calls in Golang") + (description + "This package provides a support for system calls that are run +simultaneously on all threads under Linux.") + (license license:gpl2))) + (define-public go-maunium-net-go-mauflag (package (name "go-maunium-net-go-mauflag") diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 1a7edd1e51..aaa8d4638a 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1063,14 +1063,15 @@ tables.") (replace "guile-lib" guile2.2-lib) (replace "guile-smc" guile2.2-smc))))) -(define-public guile-fibers +(define-public guile-fibers-1.3 (package (name "guile-fibers") (version "1.3.1") + (home-page "https://codeberg.org/fibers/fibers") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wingo/fibers") + (url home-page) (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -1137,11 +1138,23 @@ communication between fibers. Note that Fibers makes use of some Guile 2.1/2.2-specific features and is not available for Guile 2.0.") - (home-page "https://github.com/wingo/fibers") (properties '((upstream-name . "fibers"))) (license license:lgpl3+))) -(define-public guile-fibers-1.3 guile-fibers) +(define-public guile-fibers-1.4 + (package + (inherit guile-fibers-1.3) + (name "guile-fibers") + (version "1.4.0") + (source + (origin (inherit (package-source guile-fibers-1.3)) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ryp04w6ghgdfhlv9hkwl00iv6nwnw2hj2pywlxvpp92pyxhkwpi")) + (patches '()))))) + +(define-public guile-fibers guile-fibers-1.4) (define-public guile-fibers-1.1 (package diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 421993d12c..4f3d493dda 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -74,6 +74,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages lxqt) + #:use-module (gnu packages man) #:use-module (gnu packages messaging) #:use-module (gnu packages mtools) #:use-module (gnu packages package-management) @@ -212,6 +213,94 @@ Notable features include: @end itemize") (license (list license:bsd-0 license:gpl3+)))) +(define-public deskflow + (package + (name "deskflow") + (version "1.23.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/deskflow/deskflow") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wgj0sjnxkfplpq05q2lqgag29l7bf4cqdw0xmr89ayrh1nyjxa1")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags + #~(list "-DCMAKE_SKIP_RPATH=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-files + (lambda _ + (substitute* "deploy/linux/deploy.cmake" + (("message.FATAL_ERROR.*os-release.*") + "set(RELEASE_FILE_CONTENTS \"\")\n")) + (substitute* "src/lib/deskflow/unix/AppUtilUnix.cpp" + (("/usr/share/X11/xkb/rules/evdev.xml") + (string-append #$(this-package-input "xkeyboard-config") + "/share/X11/xkb/rules/evdev.xml"))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "QT_QPA_PLATFORM" "offscreen") + ;; From the project GitHub actions: "Integration tests are + ;; flakey by nature, make them optional". See: + ;; <.github/workflows/continuous-integration.yml>. + (invoke "./bin/legacytests")))) + (add-after 'install 'wrap-executable + (lambda _ + (let ((qtbase #$(this-package-input "qtbase"))) + (wrap-program (string-append #$output "/bin/deskflow") + `("QT_QPA_PLATFORM_PLUGIN_PATH" ":" = + (,(string-append qtbase "/lib/qt6/plugins/platforms")))))))))) + (native-inputs + (list doxygen + googletest + sysprof + vulkan-headers + coreutils + help2man + pkg-config)) + (inputs + (list bash-minimal + cli11 + gdk-pixbuf + libei + libportal + libx11 + libxi + libxinerama + libxkbcommon + libxkbfile + libxrandr + libxtst + libsm + libice + openssl + pugixml + python + qtbase + qtsvg + qttranslations + qttools + qtwayland + tomlplusplus + wayland + wayland-protocols + xkeyboard-config)) + (home-page "https://deskflow.org/") + (synopsis "Share a single keyboard and mouse between multiple computers") + (description + "Deskflow is a keyboard and mouse sharing app. Use the keyboard, +mouse,or trackpad of one computer to control nearby computers, and work +seamlessly between them. It's like a software KVM (but without the video). +TLS encryption is enabled by default. It supports Wayland clipboard +sharing.") + (license license:gpl2))) + (define-public hw-probe (package (name "hw-probe") diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm index 28c61faf82..c26ccde598 100644 --- a/gnu/packages/librewolf.scm +++ b/gnu/packages/librewolf.scm @@ -116,14 +116,14 @@ (define computed-origin-method (@@ (guix packages) computed-origin-method)) (define firefox-l10n - (let ((commit "25c14798b15f9933b6c1e2bc655030842b6e0edd")) + (let ((commit "2962877b9abd5bfa1e24e5bbc1e16e47e12d6760")) (origin (method git-fetch) (uri (git-reference (url "https://github.com/mozilla-l10n/firefox-l10n.git") (commit commit))) (file-name (git-file-name "firefox-l10n" commit)) - (sha256 (base32 "06iymygkf94s04ixvk1mlis9p5lmypx5k8pmrd3z3jddpmawk0r1"))))) + (sha256 (base32 "1gaxbjjm0d4k4wgl64mwcxy2hx1vdq1dbmvjacg2fqxpnb62481x"))))) (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 "20250829153926") (define-public librewolf (package (name "librewolf") - (version "141.0-1") + (version "142.0.1-1") (source (make-librewolf-source #:version version - #:firefox-hash "1j1m6niw47xi6aj9rlcny8jhqkppjvg22cq7mikim93wpf22m640" - #:librewolf-hash "18k3d09dr6jkhr6g8z8c3aa7jj0ynjalkmvc3nj7wd98mgvky2xj" + #:firefox-hash "1h0hx0jxwy4rshdq6s5l5hbj8gyhn2zssisr59skwf63si7b9bdh" + #:librewolf-hash "1myzm6jblnrw1vdf5xlynbfr6a9swwcaws689az7xgq6s6n0rc3y" #:l10n firefox-l10n)) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8300054355..9637fa53ba 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -83,6 +83,7 @@ ;;; Copyright © 2024 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2024, 2025 Ashish SHUKLA <ashish.is@lostca.se> ;;; Copyright © 2025 Nigko Yerden <nigko.yerden@gmail.com> +;;; Copyright © 2025 Mathieu Laparie <mlaparie@disr.it> ;;; ;;; This file is part of GNU Guix. ;;; @@ -2348,7 +2349,7 @@ and the notification, WiFi, and Bluetooth LED.") (define-public tuxedo-keyboard (package (name "tuxedo-keyboard") - (version "4.14.2") + (version "4.15.4") (source (origin (method git-fetch) @@ -2357,21 +2358,23 @@ and the notification, WiFi, and Bluetooth LED.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0b7qivyd8r58cq84q11b2z919px5p9k5zbinm6ahj07w0lsq2j7b")))) + (base32 "0mimgcbp57gp3smd439g8040sl80qqnfzmh2vhs2qv1kwyxs75sq")))) (build-system linux-module-build-system) (arguments (list #:tests? #f)) ; no test suite + ;; This package fails to build on aarch64, and the manufacturer only sells + ;; machines based on Intel-compatible processors. For more information, see + ;; <https://codeberg.org/guix/guix/pulls/1795>. + (supported-systems '("i686-linux" "x86_64-linux")) (home-page "https://gitlab.com/tuxedocomputers/development/packages/tuxedo-drivers") (synopsis "Linux kernel modules to control keyboard on most Tuxedo computers") (description "This package provides the @code{tuxedo_keyboard}, @code{tuxedo_io}, @code{clevo_wmi} @acronym{WMI, Windows Management Engine} and the @code{clevo_acpi} @acronym{ACPI, Advanced Configuration and Power Interface} -kernel modules to control the keyboard on most Tuxedo computers. Only white -backlight only models are currently not supported. The @code{tuxedo_io} -module is also needed for the @code{tuxedo-control-center} (short tcc) -package.") - (license license:gpl3+))) +kernel modules to control the keyboard on most Tuxedo computers. The @code{tuxedo_io} +module is also needed for the @code{tuxedo-control-center} (short tcc) package.") + (license license:gpl2+))) (define-public evdi (package @@ -3063,7 +3066,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 @@ -12194,6 +12197,36 @@ virtual server table in the Linux kernel. The Linux Virtual Server can be used to build scalable network services based on a cluster of two or more nodes.") (license license:gpl2+))) +(define-public ryzenadj + (package + (name "ryzenadj") + (version "0.17.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/flygoat/ryzenadj/archive/refs/tags/" + "v" version ".tar.gz")) + (sha256 + (base32 "0i2x6kbn2ix52vjz1mmh0c0g3w0k4sn0lq68wbsk0pgndzcck2l4")) + (modules '((guix build utils))) + (snippet + '(begin (delete-file-recursively "win32") + #t)))) + (build-system cmake-build-system) + (inputs (list pciutils)) + (arguments + (list #:tests? #f ; No test suite + #:phases #~(modify-phases %standard-phases + (add-before 'install 'build + (lambda _ + (invoke "cmake" "-DCMAKE_BUILD_TYPE=Release" ".")))))) + (home-page "https://github.com/flygoat/ryzenadj") + (synopsis "Power management tool for AMD Ryzen APUs") + (description + "@command{ryzenadj} is an utility to adjust power management settings for +AMD Ryzen mobile processors. You will need to ensure it can access /dev/mem, +for instance by using the \"iomem=relaxed\" kernel argument.") + (license license:lgpl3))) + (define-public ryzen-smu (package (name "ryzen-smu") diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 1a4fa92789..f0c5a99edf 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -27494,6 +27494,39 @@ internbombing, excessive input and macro characters.") (define-public ecl-safe-read (sbcl-package->ecl-package sbcl-safe-read)) +(define-public sbcl-salmagundi + (let ((commit "aa231f6043111ec5dbeb06feab732efb7d59c959") + (revision "0")) + (package + (name "sbcl-salmagundi") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/s-expressionists/Salmagundi") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1i0hknnd555ih509kvna2xdirfxyy05wr2bp628997rnj8drlsnx")))) + (build-system asdf-build-system/sbcl) + (inputs (list sbcl-trivial-package-locks)) + (home-page "https://github.com/s-expressionists/Salmagundi") + (synopsis "Implementation of Common Lisp hash tables") + (description "This library contains code that implements Common Lisp +hash tables.") + (license license:bsd-2)))) + +(define-public cl-salmagundi + (sbcl-package->cl-source-package sbcl-salmagundi)) + +(define-public ecl-salmagundi + (sbcl-package->ecl-package sbcl-salmagundi)) + +(define-public clasp-salmagundi + (sbcl-package->clasp-package sbcl-salmagundi)) + (define-public sbcl-salza2 (package (name "sbcl-salza2") @@ -31694,6 +31727,39 @@ in DEFPACKAGE.") (define-public ecl-trivial-package-local-nicknames (sbcl-package->ecl-package sbcl-trivial-package-local-nicknames)) +(define-public sbcl-trivial-package-locks + (let ((commit "ca2e2b17124c7898942894383002313cea59486d") + (revision "0")) + (package + (name "sbcl-trivial-package-locks") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/yitzchak/trivial-package-locks") + (commit commit))) + (file-name (git-file-name "cl-trivial-package-locks" commit)) + (sha256 + (base32 "0kbyrkd7a9apyq83bl96jspjggjsswxh93111wrmpvhbnm2vll60")))) + (build-system asdf-build-system/sbcl) + (native-inputs (list sbcl-parachute)) + (home-page "https://github.com/yitzchak/trivial-package-locks") + (synopsis "Standard interface to the various package lock implementations") + (description + "This package provides a standard interface to the various package lock +implementations of Common Lisp.") + (license license:expat)))) + +(define-public cl-trivial-package-locks + (sbcl-package->cl-source-package sbcl-trivial-package-locks)) + +(define-public ecl-trivial-package-locks + (sbcl-package->ecl-package sbcl-trivial-package-locks)) + +(define-public clasp-trivial-package-locks + (sbcl-package->clasp-package sbcl-trivial-package-locks)) + (define-public sbcl-trivial-raw-io (let ((commit "b1a3c876305baa0dead419841de7b3e433a75867") (revision "1")) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 30437ae565..4623871309 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net> ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2025 John Khoo <johnkhootf@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -47,6 +48,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages lsof) #:use-module (gnu packages openbox) + #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages text-editors) @@ -66,22 +68,42 @@ #:use-module (guix packages) #:use-module (guix utils)) +(define delete-generated-c-files + ;; Remove C files generated by Vala so we can build from source. + '(let* ((c->vala + (lambda (file) + (string-append (string-drop-right file 2) + ".vala"))) + (generated-c-file? + (lambda (file stat) + (and (string-suffix? ".c" file) + (file-exists? (c->vala file)))))) + (for-each delete-file + (find-files "." generated-c-file?)))) + (define-public libfm (package (name "libfm") - (version "1.3.2") + (version "1.4.0") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/pcmanfm/" - "PCManFM%20%2B%20Libfm%20%28tarball%20release" - "%29/LibFM/" name "-" version ".tar.xz")) - (sha256 - (base32 - "1rfira3lx8v6scz1aq69925j4vslpp36bmgrrzcfby2c60q2c155")))) + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/libfm") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gxg09lcacy7dh5pg1bm3rw11jffg7y59j0cb2cfsrgf0g5bjsvn")) + (modules '((guix build utils))) + (snippet delete-generated-c-files))) (build-system gnu-build-system) (arguments (list #:configure-flags #~(list "--with-gtk=3"))) (inputs (list glib gtk+)) (native-inputs (list intltool + which + automake + autoconf + gtk-doc `(,glib "bin") ; for gtester libtool menu-cache @@ -97,8 +119,9 @@ Glib/GIO giving a higher-level API.") (package (inherit libfm) (name "libfm-extra") (arguments '(#:configure-flags '("--with-extra-only"))) - (inputs (list glib)) - (native-inputs (list intltool libtool pkg-config)) + (inputs (list glib libexif)) + (native-inputs + (list autoconf automake gtk-doc intltool libtool pkg-config which)) (synopsis "File management support (extra library)") (description "This package contains a stand-alone library which extends the libFM file management library."))) @@ -106,18 +129,20 @@ libFM file management library."))) (define-public lxappearance (package (name "lxappearance") - (version "0.6.3") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/lxde/" - "LXAppearance/lxappearance-" version ".tar.xz")) + (version "0.6.4") + (source (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/lxappearance") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj")))) + (base32 "1cia6mkb3fqy3rgfprlmq0ajh15cnazdwdkv4zd19klrh4jzg4xp")))) (build-system gnu-build-system) (arguments (list #:configure-flags #~(list "--enable-gtk3"))) (inputs (list gtk+)) - (native-inputs (list intltool pkg-config)) + (native-inputs (list automake autoconf intltool pkg-config)) (synopsis "LXDE GTK+ theme switcher") (description "LXAppearance is a desktop-independent GTK+ theme switcher able to change themes, icons, and fonts used by GTK+ applications.") @@ -127,16 +152,16 @@ able to change themes, icons, and fonts used by GTK+ applications.") (define-public lxrandr (package (name "lxrandr") - (version "0.3.2") + (version "0.3.3") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/lxde/LXRandR" - "%20%28monitor%20config%20tool%29/LXRandR%20" - (version-major+minor version) ".x/" - "lxrandr-" version ".tar.xz")) - (sha256 - (base32 - "04n3vgh3ix12p8jfs4w0dyfq3anbjy33h7g53wbbqqc0f74xyplb")))) + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/lxrandr") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vh5r6bwafh9mq7syhdw1f2ahwvibq2wdc1ij84hbaa5bnyjfr8h")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--enable-gtk3") @@ -150,7 +175,7 @@ able to change themes, icons, and fonts used by GTK+ applications.") (("(\"|')xrandr\"" _ match) (string-append match (which "xrandr") "\"")))))))) (inputs (list gtk+ xrandr)) - (native-inputs (list intltool pkg-config)) + (native-inputs (list automake autoconf intltool pkg-config)) (synopsis "LXDE monitor configuration tool") (description "LXRandR is a very basic monitor configuration tool. It relies on the X11 resize-and-rotate (RandR) extension but doesn't aim to be a @@ -163,20 +188,20 @@ or external monitor.") (define-public lxtask (package (name "lxtask") - (version "0.1.10") + (version "0.1.12") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/lxde/LXTask" - "%20%28task%20manager%29/LXTask%20" - (version-major+minor version) ".x/" - "lxtask-" version ".tar.xz")) - (sha256 - (base32 - "0b2fxg8jjjpk219gh7qa18g45365598nd2bq7rrq0bdvqjdxy5i2")))) + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/lxtask") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "11vcl0k2yhx59599fdk8gv5jh2gsgh7rmp2syybk3vpmby6p93h4")))) (build-system gnu-build-system) (arguments (list #:configure-flags #~(list "--enable-gtk3"))) (inputs (list gtk+)) - (native-inputs (list intltool pkg-config)) + (native-inputs (list automake autoconf intltool pkg-config)) (synopsis "LXDE task manager") (description "LXTask is a lightweight task manager derived from Xfce task manager with all dependencies on Xfce removed. LXTask is based on the GTK+ @@ -187,19 +212,20 @@ toolkit. It allows users to monitor and control of running processes.") (define-public lxterminal (package (name "lxterminal") - (version "0.3.2") + (version "0.4.1") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/lxde/LXTerminal" - "%20%28terminal%20emulator%29/LXTerminal%20" - version "/" name "-" version ".tar.xz")) - (sha256 - (base32 - "1124pghrhnx6q4391ri8nvi6bsmvbj1dx81an08mird8jf2b2rii")))) + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/lxterminal") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "159p34caid7ca679ly1lhvw4qclqh23ddsiphlw9yn0h9v8s2dd0")))) (build-system gnu-build-system) (arguments (list #:configure-flags #~(list "--enable-gtk3"))) (inputs (list gtk+ vte/gtk+-3)) - (native-inputs (list intltool pkg-config)) + (native-inputs (list automake autoconf intltool pkg-config)) (synopsis "LXDE terminal emulator") (description "LXTerminal is a VTE-based terminal emulator. It supports multiple tabs and has only minimal dependencies thus being completely @@ -211,19 +237,19 @@ performance, all instances of the terminal are sharing a single process.") (define-public menu-cache (package (name "menu-cache") - (version "1.1.0") + (version "1.1.1") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/lxde/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1iry4zlpppww8qai2cw4zid4081hh7fz8nzsp5lqyffbkm2yn0pd")))) + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/menu-cache") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0qhc72xinxmd68nfrph9jfwymkw9x71drgksz2r2k5nzv9p7cnp5")))) (build-system gnu-build-system) - (inputs `(("glib" ,glib) - ("libfm" ,libfm-extra))) - (native-inputs (list pkg-config)) + (inputs (list glib libfm-extra)) + (native-inputs (list automake autoconf libtool gtk-doc pkg-config)) (arguments `(#:configure-flags '("CFLAGS=-fcommon"))) (synopsis "LXDE implementation of the freedesktop menu's cache") @@ -235,20 +261,22 @@ speed up the access to freedesktop.org defined application menus.") (define-public pcmanfm (package (name "pcmanfm") - (version "1.3.2") + (version "1.4.0") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/pcmanfm/" - "PCManFM%20%2B%20Libfm%20%28tarball%20release" - "%29/PCManFM/pcmanfm-" version ".tar.xz")) + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/pcmanfm") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1xqc2k2jh165mm81xg0ghxx0ml1s3rhh4ndvbzkcri4kfhj7pjql")))) + "0dkl12a6x9w3ka4g2qx0ssxdv7v432xar6v2gddzbzsxg4546hp2")))) (build-system gnu-build-system) (arguments (list #:configure-flags #~(list "--with-gtk=3"))) (inputs (list gtk+ gvfs ;for trash and mount support libfm libx11)) - (native-inputs (list intltool libtool pkg-config)) + (native-inputs (list intltool automake autoconf libtool pkg-config)) (propagated-inputs (list lxmenu-data)) ;for "Open With..." application list (synopsis "LXDE file manager") @@ -417,19 +445,19 @@ customizable menu system, and Bash integration.") (define-public lxmenu-data (package (name "lxmenu-data") - (version "0.1.5") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge//lxde/" - "lxmenu-data%20%28desktop%20menu%29/" - name "-" version ".tar.xz")) + (version "0.1.6") + (source (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/lxmenu-data") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "1f5sh2dvb3pdnjlcsyzq9543ck2jsqizkx3204cr22zm5s6j3qwz")))) + (base32 "1abicrm66pn4vphlwx0rg2q3wvjmzijf0vgpml1vr3zkp7xm01z5")))) (build-system gnu-build-system) (native-inputs - (list pkg-config intltool)) + (list glib automake autoconf pkg-config intltool)) (synopsis "Freedesktop.org desktop menus for LXDE") (description "Lxmenu-data provides files required to build freedesktop.org @@ -440,19 +468,19 @@ menu spec-compliant desktop menus for LXDE.") (define-public lxde-icon-theme (package (name "lxde-icon-theme") - (version "0.5.1") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/lxde/LXDE%20Icon%20Theme/" - "lxde-icon-theme-" version "/" - name "-" version ".tar.xz")) + (version "0.5.2") + (source (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/lxde-icon-theme") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0v4i6x86fr2hbx4fb2si7y2qzmj7h6hcjwaifnin18r8kwwvgl73")))) + (base32 "0sv3pzvxs1gxa7dpqs7zls3wc7kj9x8w99i4h56mdsc6vz61y3mp")))) (build-system gnu-build-system) (native-inputs - (list pkg-config)) + (list automake autoconf pkg-config)) (synopsis "LXDE default icon theme based on nuoveXT2") (description "Lxde-icon-theme provides an default icon theme for LXDE.") @@ -462,17 +490,16 @@ menu spec-compliant desktop menus for LXDE.") (define-public lxde-common (package (name "lxde-common") - (version "0.99.2") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/lxde/" - "lxde-common%20%28default%20config%29/" - "lxde-common%20" (version-major+minor version) "/" - name "-" version ".tar.xz")) + (version "0.99.3") + (source (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/lxde-common") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0mj84fa3f4ak1jjslrwc2q3ci9zxrxpciggviza9bjb0168brn8w")))) + (base32 "0py5dazjmz7yh5p0zv7psgsx4291cg21h5kw6ww5bzvr34kpbnwc")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -486,7 +513,7 @@ menu spec-compliant desktop menus for LXDE.") "/bin/lxsession"))) #t)))))) (native-inputs - (list pkg-config intltool lxmenu-data lxde-icon-theme)) + (list automake autoconf pkg-config intltool lxmenu-data lxde-icon-theme)) (inputs (list lxsession ;; ("lxlock" ,lxlock) ;for 'lxde-screenlock.desktop' @@ -500,22 +527,22 @@ menu spec-compliant desktop menus for LXDE.") (define-public lxinput (package (name "lxinput") - (version "0.3.5") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/lxde/" - "LXInput%20%28Kbd%20and%20amp_%20mouse%20config%29/" - "LXInput%200.3.x/" name "-" version ".tar.xz")) + (version "0.3.6") + (source (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/lxinput") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "123f3yn4rp1w5b3n5aj3ad9snkxab29qkrs7bcvf5bx4cn57g3sf")))) + (base32 "13xqxwsb00h20yg514pjmdlvmfqv029nwdy70aaqn0r0jz670sm7")))) (build-system gnu-build-system) (arguments (list #:configure-flags #~(list "--enable-gtk3"))) (inputs (list gtk+)) (native-inputs - (list pkg-config intltool)) + (list automake autoconf pkg-config intltool)) (synopsis "Tool for mouse and keyboard configuration in LXDE") (description "Lxinput provides a small program to configure keyboard and mouse @@ -526,41 +553,24 @@ in LXDE.") (define-public lxsession (package (name "lxsession") - (version "0.5.5") + (version "0.5.6") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/lxde/" - "LXSession%20%28session%20manager%29/" - "LXSession%200.5.x/" - "lxsession-" version ".tar.xz")) + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/lxsession") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0imv9nysip1j9lrb2z96kl05isjgp312323wnnd5b59h0ff0sgp4")) + (base32 "0mgykzhd5n11mfcbpaqb841f4jwy1yhmd1xn49dxc2hci8bx26fx")) + ;; Fix https://github.com/lxde/lxsession/issues/42 + (patches (search-patches "lxsession-potfiles-ignore.patch")) (modules '((guix build utils))) - (snippet - ;; Remove C files generated by Vala so we can build from source. - '(let* ((c->vala - (lambda (file) - (string-append (string-drop-right file 2) - ".vala"))) - (generated-c-file? - (lambda (file stat) - (and (string-suffix? ".c" file) - (file-exists? (c->vala file)))))) - (for-each delete-file - (find-files "." generated-c-file?)))))) + (snippet delete-generated-c-files))) (build-system gnu-build-system) (arguments - `(#:configure-flags (list "--enable-gtk3" - ;; Fix build with GCC 14. - "CFLAGS=-Wno-error=incompatible-pointer-types") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'rm-stamp - (lambda _ - (for-each delete-file (find-files "." "\\.stamp$")) - ;; Force regeneration of configure script. - (delete-file "configure")))))) + `(#:configure-flags (list "--enable-gtk3"))) (inputs (list gtk+ polkit)) @@ -581,16 +591,17 @@ in LXDE.") (define-public lxpanel (package (name "lxpanel") - (version "0.10.1") + (version "0.11.1") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/lxde/" - "LXPanel%20%28desktop%20panel%29/" - "LXPanel%200.10.x/lxpanel-" - version ".tar.xz")) + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lxde/lxpanel") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1s0y8jjkw6qz0r8l90618b8xly0c8g906kah7b162sz3sxbqyc8y")))) + (base32 "1xqhxcwhx2qlgsri10gwldb0xz9ajsc3iqnn8d53bjb4yh0vk5wf")))) (build-system gnu-build-system) (arguments (list @@ -619,6 +630,9 @@ in LXDE.") wireless-tools)) (native-inputs (list docbook-xml + libtool + automake + autoconf gettext-minimal intltool pkg-config)) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index f57160e21f..d4b8903009 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -3893,7 +3893,6 @@ advanced research.") (build-system cmake-build-system) (arguments (list - #:tests? #false ;tests are not building now #:build-type "Release" #:modules '((ice-9 match) (guix build utils) @@ -3909,6 +3908,7 @@ advanced research.") "-DTFLITE_ENABLE_GPU=ON" "-DTFLITE_ENABLE_RUY=ON" + "-DTFLITE_ENABLE_XNNPACK=ON" ;; TODO: turn on Farmhash ;;"-DSYSTEM_FARMHASH=ON" @@ -3926,11 +3926,6 @@ advanced research.") (string-append "-Druy_DIR=" #$(this-package-input "ruy") "/lib/cmake/ruy") - ;; TODO: The build system attempts to build xnnpack from source. We - ;; would like to use our xnnpack package here, but this requires more - ;; work. - "-DTFLITE_ENABLE_XNNPACK=OFF" - ;; Don't fetch the sources. We have these already "-Dgemmlowp_POPULATED=TRUE" "-Degl_headers_POPULATED=TRUE" @@ -3942,6 +3937,7 @@ advanced research.") "-Dgoogle_benchmark_POPULATED=TRUE" "-Dnsync_POPULATED=TRUE" "-Dre2_POPULATED=TRUE" + "-Dxnnpack_POPULATED=TRUE" "-DFFT2D_SOURCE_DIR=/tmp/fft2d" "-DFARMHASH_SOURCE_DIR=/tmp/farmhash" @@ -4031,7 +4027,7 @@ advanced research.") ("python" ,python) ("ruy" ,ruy) ("re2" ,re2) - ;;("xnnpack" ,xnnpack) ; TODO: use Guix's copy of xnnpack + ("xnnpack" ,xnnpack) ("vulkan-headers" ,vulkan-headers))) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 813c019c58..f9f268c8be 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -8506,7 +8506,7 @@ operations.") (define-public bitwuzla (package (name "bitwuzla") - (version "0.7.0") + (version "0.8.2") (source (origin (method git-fetch) @@ -8515,7 +8515,7 @@ operations.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1fpd1kgb5xdbcjiqbbc6j0b8g2ly9bp9m3la78fiayl4qlmsvh2b")))) + (base32 "0nakqz29cfkn91yvx1xzsk50rlqbiihslflbjanv4lflcl2zx6mz")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Dtesting=enabled" "-Ddefault_library=shared" diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index aa047a392a..30d0eac330 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -731,57 +731,66 @@ programmable API.") (define (make-scorep mpi) (package (name (string-append "scorep-" (package-name mpi))) - (version "3.1") + (version "9.0") (source (origin - (method url-fetch) - (uri (string-append - "http://www.vi-hps.org/upload/packages/scorep/scorep-" - version ".tar.gz")) - (sha256 - (base32 - "0h45357djna4dn9jyxx0n36fhhms3jrf22988m9agz1aw2jfivs9")) - (modules '((guix build utils))) - (snippet - ;; Remove bundled software. - '(begin - (for-each delete-file-recursively - '("vendor/opari2" "vendor/cube")) - #t)))) + (method url-fetch) + (uri (string-append + "https://perftools.pages.jsc.fz-juelich.de/cicd/scorep/tags/" + "scorep-" version "/scorep-" version ".tar.gz")) + (sha256 + (base32 + "15q93rc8wblbzqgh99rqzyq6fdp88mi6yziww05c6cbgrjs5s2jx")) + (modules '((guix build utils))) + (snippet + ;; Remove bundled software. + '(begin + (for-each delete-file-recursively + '("vendor/otf2" "vendor/opari2" + "vendor/cubelib" "vendor/cubew")))))) (build-system gnu-build-system) (inputs - `(("mpi" ,mpi) - ("papi" ,papi) - ("opari2" ,opari2) - ("libunwind" ,libunwind) - ("otf2" ,otf2) - ("cubelib" ,cube "lib") ;for lib, include - ("openmpi" ,openmpi) - ("zlib" ,zlib))) + (list mpi + papi + opari2 + libunwind + otf2 + cubelib + cubew + gotcha + libbfd + libiberty + openmpi + zlib)) (native-inputs - (list gfortran - flex - cube ;for cube-config - bison - python - doxygen - which)) + (list gfortran + flex + bison + python + doxygen + which)) (arguments - `(#:configure-flags - (list "--enable-shared" "--disable-static" - (string-append "--with-opari2=" - (assoc-ref %build-inputs "opari2")) - (string-append "--with-cube=" - (assoc-ref %build-inputs "cube"))) - #:parallel-tests? #f - #:make-flags '("V=1") - #:phases - (modify-phases %standard-phases - (add-after 'install 'licence - (lambda* (#:key outputs #:allow-other-keys) - (let ((doc (string-append (assoc-ref outputs "out") - "/share/doc/scorep"))) - (install-file "COPYING" doc) - #t)))))) + (list + #:configure-flags + #~(list "--enable-shared" "--disable-static" + "MPI_LIBS=-lmpi" "SHMEM_LIBS=-loshmem" + (string-append "--with-cubelib=" + #$(this-package-input "cubelib")) + (string-append "--with-cubew=" + #$(this-package-input "cubew")) + (string-append "--with-libbfd=" + #$(this-package-input "libbfd")) + (string-append "--with-otf2=" + #$(this-package-input "otf2")) + (string-append "--with-opari2=" + #$(this-package-input "opari2"))) + #:parallel-tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'licence + (lambda* (#:key outputs #:allow-other-keys) + (let ((doc (string-append (assoc-ref outputs "out") + "/share/doc/scorep"))) + (install-file "COPYING" doc))))))) (home-page "https://www.vi-hps.org/projects/score-p/") (synopsis "Performance measurement infrastructure for parallel code") (description diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 82b67d3e4b..7eaffc8e06 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -5247,3 +5247,39 @@ recording packets that are dropped by the kernel. It provides the commands Protocol. RDAP is modern a replacement for WHOIS, which provides domain name and IP address registration information in JSON format over HTTP.") (license license:expat))) + +(define-public wireproxy + (package + (name "wireproxy") + (version "1.0.10") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyvl/wireproxy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ypk9migx1l7xwcxr542pcdy8q2bm33wp03bqzgav0hp1fsrmi8p")))) + (build-system go-build-system) + (arguments + (list + #:install-source? #f + #:import-path "github.com/pufferffish/wireproxy/cmd/wireproxy" + #:unpack-path "github.com/pufferffish/wireproxy" + #:test-subdirs #~(list "../../..."))) ;to test the whole module + (native-inputs + (list go-github-com-akamensky-argparse + go-github-com-go-ini-ini + go-github-com-landlock-lsm-go-landlock + go-github-com-makenowjust-heredoc-v2 + go-github-com-things-go-go-socks5 + go-golang-org-x-net + go-golang-zx2c4-com-wireguard + go-suah-dev-protect)) + (home-page "https://github.com/whyvl/wireproxy") + (synopsis "Wireguard client that exposes itself as a socks5 proxy") + (description + "wireproxy is a completely userspace application that connects to a +wireguard peer, and exposes a socks5/http proxy or tunnels on the machine.") + (license license:isc))) diff --git a/gnu/packages/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/package-management.scm b/gnu/packages/package-management.scm index d032002464..c64be84092 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -183,8 +183,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.4.0") - (commit "826e305fde3687573a7e1449ce91e82836696ce6") - (revision 41)) + (commit "06f79dc2bd44ca292dade633d344c3f70749b9e7") + (revision 42)) (package (name "guix") @@ -200,7 +200,7 @@ (commit commit))) (sha256 (base32 - "17j1gq50pni96vxs45swf3awxgfscfyapfra0szjwji56cyfmhf5")) + "0arafqa05vbjqbxpyfxfbzzs44hipkdag94wd8qv5pzf6wns4g7r")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments 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/lxsession-potfiles-ignore.patch b/gnu/packages/patches/lxsession-potfiles-ignore.patch new file mode 100644 index 0000000000..ddf45cf506 --- /dev/null +++ b/gnu/packages/patches/lxsession-potfiles-ignore.patch @@ -0,0 +1,15 @@ +diff --git a/po/POTFILES.skip b/po/POTFILES.skip +index 353b0ec..adbe1d6 100644 +--- a/po/POTFILES.skip ++++ b/po/POTFILES.skip +@@ -1,7 +1,10 @@ + # Autogenerated files with translatable strings. + lxsession-default-apps/main.c + lxsession-default-apps/combobox.c ++lxpolkit/main.c ++lxsession/app.c + # This is a source file for configure, output will be translated instead. + data/lxpolkit.desktop.in.in + # bug of intltool with automake 1.15 + sub/data/lxpolkit.desktop.in ++data/lxpolkit.desktop.in diff --git a/gnu/packages/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/pep.scm b/gnu/packages/pep.scm deleted file mode 100644 index 2385d74e0d..0000000000 --- a/gnu/packages/pep.scm +++ /dev/null @@ -1,342 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2020, 2021 Hartmut Goebel <h.goebel@crazy-compilers.com> -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. - -(define-module (gnu packages pep) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix git-download) - #:use-module (guix build-system gnu) - #:use-module (guix build-system python) - #:use-module (guix build-system pyproject) - #:use-module (gnu packages) - #:use-module (gnu packages base) - #:use-module (gnu packages boost) - #:use-module (gnu packages check) - #:use-module (gnu packages documentation) - #:use-module (gnu packages graphviz) - #:use-module (gnu packages java) - #:use-module (gnu packages linux) - #:use-module (gnu packages mail) ; for libetpan - #:use-module (gnu packages nettle) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages python-build) - #:use-module (gnu packages python-xyz) - #:use-module (gnu packages sequoia) - #:use-module (gnu packages sqlite) - #:use-module (gnu packages tls) - #:use-module (gnu packages xml)) - -(define-public yml2 - (package - (name "yml2") - (version "2.7.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitea.pep.foundation/fdik/yml2") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0fm1x1fv4lwcpbn59s55idzf7x173n59xpz8rlrxalmi6gvsjijr")))) - (build-system pyproject-build-system) - (arguments - (list - ;; XXX: There is no testing framework, only a samples directory. - #:tests? #f)) - (native-inputs (list python-setuptools python-wheel)) - (propagated-inputs (list python-lxml)) - (home-page "https://fdik.org/yml/") - (synopsis "Use a Domain Specific Language for XML without defining -a grammar") - (description - "The YML compiler is a small Python script. It provides the command line -front end yml2c. As default, it compiles your script and outputs to stdout, -that usually is the terminal. Your shell provides options to redirect the -output into a pipe or a file.") - (license license:gpl2))) - -(define fdik-libetpan - ;; pEp Engine requires libetpan with a set of patches that have not been - ;; upstreamed yet. - (let ((commit "0b80c39dd1504462ba3a39dc53db7c960c3a63f3") ; 2020-11-27 - (checksum "0gv3ivaziadybjlf6rfpv1j5z5418243v5cvl4swlxd2njsh7gjk") - (revision "6")) - (package - (inherit libetpan) - (name "fdik-libetpan") - (version (string-append "1.6-" revision "." (string-take commit 8))) - (source - (origin - (inherit (package-source libetpan)) - (method git-fetch) - (uri (git-reference - (url "https://gitea.pep.foundation/pEp.foundation/libetpan") - (commit commit))) - (file-name (string-append name "-" version)) - (sha256 (base32 checksum))))))) - -(define-public pep-engine - (package - (name "pep-engine") - (version "2.1.34") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitea.pep.foundation/pEp.foundation/pEpEngine") - (commit (string-append "Release_" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "00q96y9j985qfa382acsz02i0zf6ayq2gmg8z70jzl04isg1h3cn")))) - (build-system gnu-build-system) - (arguments - '(#:parallel-build? #f - #:make-flags '("NDEBUG=1") ; release build - #:phases - (modify-phases %standard-phases - (replace 'configure - ;; pEpEngine does not use autotools and configure, - ;; but a local.conf. We need to tweak the values there. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (yml2 (assoc-ref inputs "yml2"))) - (with-output-to-file "local.conf" - (lambda () - (format #t " -PREFIX=~a -PER_MACHINE_DIRECTORY=${PREFIX}/share/pEp -SYSTEM_DB=~a/share/pEp/system.db -ASN1C=~a -YML2_PATH=~a -OPENPGP=SEQUOIA -" - out out (which "asn1c") - (string-append yml2 "/bin")))) - #t))) - (delete 'check) - (add-after 'install 'install-db - (lambda _ - (invoke "make" "-C" "db" "install")))))) - (native-inputs - (list asn1c ; >= 0.9.27 - pkg-config yml2)) - (inputs - (list fdik-libetpan - nettle - openssl - sequoia - sqlite - `(,util-linux "lib"))) ;; uuid.h - (home-page "https://pep.foundation/") - (synopsis "Library for automatic key management and encryption of -messages") - (description "The p≡p engine is the core part of p≡p (pretty Easy -privacy).") - (license ;; code: GPL 3, docs: CC-BY-SA - (list license:gpl3 license:cc-by-sa3.0)))) - -(define-public libpepadapter - (package - (name "libpepadapter") - (version "2.1.21") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitea.pep.foundation/pEp.foundation/libpEpAdapter") - (commit (string-append "Release_" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "09ljj3x09y99wc47n063hpn62zi8cdvdha82rnaypvirrlga6a5w")))) - (build-system gnu-build-system) - (arguments - '(#:test-target "test" - #:tests? #f ;; building the tests fails - #:make-flags '("NDEBUG=1") ; release build - #:phases - (modify-phases %standard-phases - (replace 'configure - ;; libpEpAdapter does not use autotools and configure, - ;; but a local.conf. We need to tweak the values there. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (engine (assoc-ref inputs "pep-engine"))) - (with-output-to-file "local.conf" - (lambda _ - (format #t " -PREFIX=~a -ENGINE_LIB_PATH=~a/lib -ENGINE_INC_PATH=~a/include -" out engine engine)))) - #t))))) - (inputs - (list pep-engine)) - (home-page "https://pep.foundation/") - (synopsis "Library for building p≡p adapters") - (description "This C++ library provides common structures used in p≡p -(pretty Easy privacy) adapters.") - (license license:bsd-3))) - -(define-public python-pep-adapter - (package - (name "python-pep-adapter") - (version "2.1.3") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitea.pep.foundation/pEp.foundation/pEpPythonAdapter") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0ssz21p1k7xx3snmd4g3ggzq565rlzdmp90l2mph6yfp1y65p39s")))) - (build-system python-build-system) - (arguments - `(;; Adding configure-flags does not work, running `build_ext` - ;; with these flags, neither does adding the options to - ;; `setup.cfg`: Either `build` or `install` fails (since - ;; flags are given or missing), or "command 'BuildExtCommand' - ;; has no such option 'pep_engine" - ;; '(#:configure-flags - ;; (list (string-append "--with-pEp-engine=" - ;; (assoc-ref inputs "pEpEngine")) - ;; (string-append "--with-pEp-libadapter=" - ;; (assoc-ref inputs "libpEpAdapter")) - ;; ;;(string-append "--boost=" - ;; (assoc-ref inputs "boost")) not supported - ;; (string-append "--with-asn1c-share=" - ;; (assoc-ref inputs "asn1c") "/share")) - #:phases - (modify-phases %standard-phases - (add-before 'build 'fix-setup.py - (lambda _ - (substitute* "setup.py" - (("^(\\s+SYS_INCLUDES = )\\['/usr.*" _ a) - (string-append a "os.getenv('CPATH', '').split(os.pathsep)\n")) - (("^(\\s+SYS_LIB_PREFIXES = )\\['/usr.*" _ a) - (string-append a "os.getenv('LIBRARY_PATH', '').split(os.pathsep)\n")) - (("^(\\s+SYS_SHARES = )\\['/usr.*" _ a) - (string-append a "['" (assoc-ref %build-inputs "asn1c") "/share']\n"))) - #t)) - (add-before 'build 'remove-wheel-requirement - ;; we dont't build a wheel - (lambda _ - (substitute* "setup.cfg" - ((" wheel *>= [0-9.]*") "")) - (substitute* "pyproject.toml" - (("\"wheel *>=.*\"") "")) - #t))))) - (native-inputs - (list python-pytest python-pytest-forked)) - (inputs - (list boost libpepadapter pep-engine python-setuptools-scm - `(,util-linux "lib"))) ;; uuid.h - (home-page "https://pep.foundation/") - (synopsis "Python adapter for p≡p (pretty Easy Privacy)") - (description "The p≡p Python adapter is an adaptor interface to the p≡p -(pretty Easy privacy) engine.") - (license license:gpl3))) - -(define-public java-pep-adapter - (package - (name "java-pep-adapter") - (version "2.1.23") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitea.pep.foundation/pEp.foundation/pEpJNIAdapter") - (commit (string-append "Release_" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1sw3a5ggxcrkghvpp0a6h2lz461x55ldgfw5y4pw7c3gk5wynvjk")))) - (build-system gnu-build-system) - (outputs '("out" "doc")) - (arguments - `(#:test-target "test" - #:make-flags '("NDEBUG=1" "all" "doc") ; release build - #:phases - (modify-phases %standard-phases - (add-before 'configure 'pin-shared-lib-path - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "src/java/foundation/pEp/jniadapter/AbstractEngine.java" - (("System.loadLibrary\\(\"pEpJNI\"\\);") - (string-append "System.load(\"" - (assoc-ref outputs "out") - "/lib/libpEpJNI.so" "\");"))) - #t)) - (replace 'configure - ;; pEpJNIAdapter does not use autotools and configure, - ;; but a local.conf. We need to tweak the values there. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (engine (assoc-ref inputs "pep-engine")) - (libadapter (assoc-ref inputs "libpepadapter")) - (openjdk (assoc-ref inputs "openjdk"))) - (with-output-to-file "local.conf" - (lambda _ - (format #t " -PREFIX=~a -ENGINE_LIB_PATH=~a/lib -ENGINE_INC_PATH=~a/include -AD_LIB_PATH=~a/lib -AD_INC_PATH=~a/include -YML2_PROC=~a -JAVA_HOME=~a -" - out engine engine libadapter libadapter - (which "yml2proc") openjdk))) - (substitute* "src/Makefile" ;; suppress some warnings - (("^\\s+OLD_JAVA=") " xxx_OLD_JAVA=")) - #t))) - (add-before 'build 'build-codegen - ;; run codegen first to allow parallel build of other parts - (lambda _ - (invoke "make" "-C" "src" "create-dirs" "codegen"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (libout (string-append out "/lib/")) - (javaout (string-append out "/share/java/"))) - (install-file "dist/libpEpJNI.a" libout) - (install-file "dist/libpEpJNI.so" libout) - (install-file "dist/pEp.jar" javaout) - #t))) - (add-after 'install 'install-docs - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "doc")) - (docout (string-append out "/share/doc/pEp-JNI-adapter")) - (cxxout (string-append docout "/cxx")) - (javaout (string-append docout "/java"))) - (mkdir-p cxxout) - (mkdir-p javaout) - (copy-recursively "doc/doxygen/cxx/html" cxxout) - (copy-recursively "doc/doxygen/java/html" javaout) - #t)))))) - (native-inputs - (list doxygen graphviz - `(,openjdk9 "jdk") which yml2)) - (inputs - (list libpepadapter pep-engine - `(,util-linux "lib"))) ;; uuid.h - (home-page "https://pep.foundation/") - (synopsis "Java adapter for p≡p (pretty Easy Privacy)") - (description "The p≡p JNI adapter is a Java adapter interface to the p≡p -(pretty Easy privacy) engine.") - (license license:gpl3))) diff --git a/gnu/packages/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 2fe1a7cae5..4ef7656a04 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.22") + (version "2.82.25") (source (origin (method git-fetch) @@ -194,7 +194,7 @@ it.") (url "https://github.com/trealla-prolog/trealla") (commit (string-append "v" version)))) (sha256 - (base32 "05lqh1y0qbdlxjcqwwn72dbjmsy7p3xq8rawm9y7yb638ci3rxwx")) + (base32 "0mq1yf5sxzvi9rkw1vwmyh0a9yv8rhqy8z0wd5k748ymvjfhi6g2")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs 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/radio.scm b/gnu/packages/radio.scm index 3a1cb48412..7dc4f65db7 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -973,7 +973,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") qwt sdl soapysdr - spdlog + spdlog-1.15 volk zeromq)) (arguments diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index a41c445e5b..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 diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0f1c7509a7..4b89c2cd4f 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -8983,7 +8983,7 @@ It does not support server push.") (define-public hpcguix-web (package (name "hpcguix-web") - (version "0.4.2") + (version "0.4.3") (source (origin (method git-fetch) (uri (git-reference @@ -8992,7 +8992,7 @@ It does not support server push.") (file-name (git-file-name name version)) (sha256 (base32 - "09xfyyz3004qcfjjlg903gnsb9wsrrdk7gw7xawsvw58l6vrialb")))) + "1mcy4p5pw623gmwcx5jpry27njqyq1fp74wpq1c34s06gkhdarji")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) 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/services/cuirass.scm b/gnu/services/cuirass.scm index 87faf9255b..581166cc49 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -100,7 +100,7 @@ (group cuirass-configuration-group ;string (default "cuirass")) (interval cuirass-configuration-interval ;integer (seconds) - (default 60)) + (default 300)) (ttl cuirass-configuration-ttl ;integer (default 2592000)) (build-expiry cuirass-configuration-build-expiry diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm index 14007e740d..3f7218f421 100644 --- a/gnu/services/virtualization.scm +++ b/gnu/services/virtualization.scm @@ -61,6 +61,7 @@ #:use-module (guix packages) #:use-module (guix records) #:use-module (guix store) + #:use-module (guix ui) #:use-module (guix utils) #:autoload (guix self) (make-config.scm) #:autoload (guix platform) (platform-system) @@ -83,6 +84,7 @@ hurd-vm-configuration? hurd-vm-configuration-os hurd-vm-configuration-qemu + hurd-vm-configuration-type hurd-vm-configuration-image hurd-vm-configuration-disk-size hurd-vm-configuration-memory-size @@ -1782,6 +1784,11 @@ preventing password-based authentication as 'root'." (inherit config) (authorize-key? #f)))))))) +(define (sanitize-hurd-vm-configuration-type value) + (unless (memq value '(hurd-qcow2 hurd64-qcow2)) + (leave (G_ "hurd-vm: '~a' is not a valid type~%") value)) + value) + (define-record-type* <hurd-vm-configuration> hurd-vm-configuration make-hurd-vm-configuration hurd-vm-configuration? @@ -1789,6 +1796,9 @@ preventing password-based authentication as 'root'." (default %hurd-vm-operating-system)) (qemu hurd-vm-configuration-qemu ;file-like (default qemu-minimal)) + (type hurd-vm-configuration-type ;symbol + (default 'hurd-qcow2) + (sanitize sanitize-hurd-vm-configuration-type)) (image hurd-vm-configuration-image ;<image> (thunked) (default (hurd-vm-disk-image this-record))) @@ -1825,7 +1835,8 @@ is added to the OS specified in CONFIG." (let* ((os (transform (hurd-vm-configuration-os config))) (disk-size (hurd-vm-configuration-disk-size config)) - (type (lookup-image-type-by-name 'hurd-qcow2)) + (type (lookup-image-type-by-name + (hurd-vm-configuration-type config))) (os->image (image-type-constructor type))) (image (inherit (os->image os)) (size disk-size)))) diff --git a/gnu/system/images/hurd.scm b/gnu/system/images/hurd.scm index 67815aeb9b..0aba57d2f3 100644 --- a/gnu/system/images/hurd.scm +++ b/gnu/system/images/hurd.scm @@ -40,7 +40,7 @@ hurd64-barebones-os hurd64-disk-image - hurd6-image-type + hurd64-image-type hurd64-qcow2-image-type hurd64-barebones-disk-image hurd64-barebones-qcow2-image)) diff --git a/gnu/tests/virtualization.scm b/gnu/tests/virtualization.scm index c55a944845..a882d70e14 100644 --- a/gnu/tests/virtualization.scm +++ b/gnu/tests/virtualization.scm @@ -27,6 +27,7 @@ #:use-module (gnu system) #:use-module (gnu system accounts) #:use-module (gnu system file-systems) + #:use-module (gnu system hurd) #:use-module (gnu system image) #:use-module (gnu system images hurd) #:use-module ((gnu system shadow) #:select (%base-user-accounts)) @@ -45,6 +46,7 @@ #:export (%test-libvirt %test-qemu-guest-agent %test-childhurd + %test-childhurd64 %test-build-vm)) @@ -277,6 +279,22 @@ (password "")) ;empty password %base-user-accounts)))))))) +(define %childhurd64-os + (simple-operating-system + (service dhcpcd-service-type) + (service hurd-vm-service-type + (hurd-vm-configuration + (type 'hurd64-qcow2) + (os (operating-system + (inherit %hurd-vm-operating-system) + (kernel %hurd64-default-operating-system-kernel) + (kernel-arguments '("noide")) ;use rumpdisk + (users (cons (user-account + (name "test") + (group "users") + (password "")) ;empty password + %base-user-accounts)))))))) + (define* (run-command-over-ssh command #:key (port 10022) (user "test")) "Return a program that runs COMMAND over SSH and prints the result on standard @@ -307,7 +325,7 @@ output." (program-file "run-command-over-ssh" run)) -(define (run-childhurd-test) +(define (run-childhurd-test childhurd-os) (define (import-module? module) ;; This module is optional and depends on Guile-Gcrypt, do skip it. (and (guix-module-name? module) @@ -315,7 +333,7 @@ output." (define os (marionette-operating-system - %childhurd-os + childhurd-os #:imported-modules (source-module-closure '((gnu services herd) (guix combinators) @@ -454,7 +472,15 @@ output." (description "Connect to the GNU/Hurd virtual machine service, aka. a childhurd, making sure that the childhurd boots and runs its SSH server.") - (value (run-childhurd-test)))) + (value (run-childhurd-test %childhurd-os)))) + +(define %test-childhurd64 + (system-test + (name "childhurd64") + (description + "Connect to the 64-bit GNU/Hurd virtual machine service, aka. a childhurd, + making sure that the childhurd boots and runs its SSH server.") + (value (run-childhurd-test %childhurd64-os)))) ;;; diff --git a/po/packages/POTFILES.in b/po/packages/POTFILES.in index b3d2eac14a..12bda0342b 100644 --- a/po/packages/POTFILES.in +++ b/po/packages/POTFILES.in @@ -296,7 +296,6 @@ gnu/packages/patchutils.scm gnu/packages/patool.scm gnu/packages/pdf.scm gnu/packages/pem.scm -gnu/packages/pep.scm gnu/packages/perl-check.scm gnu/packages/perl-maths.scm gnu/packages/perl-web.scm |