diff options
133 files changed, 5802 insertions, 4322 deletions
diff --git a/config-daemon.ac b/config-daemon.ac index 9188f93bda..9854f1d694 100644 --- a/config-daemon.ac +++ b/config-daemon.ac @@ -106,12 +106,13 @@ if test "x$guix_build_daemon" = "xyes"; then dnl Determine the appropriate default list of substitute URLs (GnuTLS dnl is required so we can default to 'https'.) - guix_substitute_urls="https://bordeaux.guix.gnu.org https://ci.guix.gnu.org" + GUIX_SUBSTITUTE_URLS="https://bordeaux.guix.gnu.org https://ci.guix.gnu.org" AC_MSG_CHECKING([for default substitute URLs]) - AC_MSG_RESULT([$guix_substitute_urls]) + AC_MSG_RESULT([$GUIX_SUBSTITUTE_URLS]) + AC_SUBST([GUIX_SUBSTITUTE_URLS]) - AC_DEFINE_UNQUOTED([GUIX_SUBSTITUTE_URLS], ["$guix_substitute_urls"], + AC_DEFINE_UNQUOTED([GUIX_SUBSTITUTE_URLS], ["$GUIX_SUBSTITUTE_URLS"], [Default list of substitute URLs used by 'guix-daemon'.]) dnl Check for Guile-SSH, which is required by 'guix offload'. diff --git a/doc/contributing.texi b/doc/contributing.texi index 938c8bfdb1..73f7addbef 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -411,6 +411,20 @@ computationally intensive or rather cheap, depending on whether substitutes are available for their dependencies (@pxref{Substitutes}). Some of them require a lot of storage space to hold VM images. +If you encounter an error like: + +@example +Compiling Scheme modules... +ice-9/eval.scm:142:16: In procedure compile-top-call: +error: all-system-tests: unbound variable +hint: Did you forget `(use-modules (gnu tests))'? +@end example + +@noindent +there may be inconsistencies in the work tree from previous builds. To +resolve this, try running @command{make clean-go} followed by +@command{make}. + Again in case of test failures, please send @email{bug-guix@@gnu.org} all the details. @@ -2372,17 +2386,18 @@ branch deleted. @subsubsection Web interface +@cindex mumi, web interface for issues A web interface (actually @emph{two} web interfaces!) are available to browse issues: @itemize @item -@url{https://issues.guix.gnu.org} provides a pleasant -interface@footnote{The web interface at -@url{https://issues.guix.gnu.org} is powered by Mumi, a nice piece of -software written in Guile, and you can help! See -@url{https://git.savannah.gnu.org/cgit/guix/mumi.git}.} to browse -bug reports and patches, and to participate in discussions; +@url{https://issues.guix.gnu.org} provides a pleasant interface powered +by mumi@footnote{Mumi is a nice piece of software written in Guile, and +you can help! See +@url{https://git.savannah.gnu.org/cgit/guix/mumi.git}.} to browse bug +reports and patches, and to participate in discussions; mumi also has a +command-line interface as we will see below; @item @url{https://bugs.gnu.org/guix} lists bug reports; @item @@ -2393,9 +2408,9 @@ To view discussions related to issue number @var{n}, go to @indicateurl{https://issues.guix.gnu.org/@var{n}} or @indicateurl{https://bugs.gnu.org/@var{n}}. -@subsubsection Command-line interface +@subsubsection Command-Line Interface -@cindex mumi CLI +@cindex mumi command-line interface @cindex mumi am @cindex mumi compose @cindex mumi send-email @@ -2528,7 +2543,7 @@ so by sending the first patch, polling the server for a response, and then sending the remaining patches. This polling can unfortunately take a few minutes. So, please be patient. -@subsubsection Emacs interface +@subsubsection Emacs Interface If you use Emacs, you may find it more convenient to interact with issues using @file{debbugs.el}, which you can install with: @@ -2769,9 +2784,12 @@ git config user.signingkey CABBA6EA1DC0FF33 To check that commits are signed with correct key, use: @example -make authenticate +guix git authenticate @end example +@xref{Building from Git} for running the first authentication of a Guix +checkout. + To avoid accidentally pushing unsigned or signed with the wrong key commits to Savannah, make sure to configure Git according to @xref{Configuring Git}. @@ -2946,7 +2964,7 @@ account the submitter's motivation for doing things in a certain way. @cindex Reviewed-by, git trailer When you deem the proposed change adequate and ready for inclusion within Guix, the following well understood/codified -@samp{Reviewed-by:@tie{}Your@tie{}Name<your-email@@example.com>} +@samp{Reviewed-by:@tie{}Your@tie{}Name@tie{}<your-email@@example.com>} @footnote{The @samp{Reviewed-by} Git trailer is used by other projects such as Linux, and is understood by third-party tools such as the @samp{b4 am} sub-command, which is able to retrieve the complete @@ -2958,7 +2976,8 @@ looks good to you: @itemize @item If the @emph{whole} series (containing multiple commits) looks good to -you, reply with @samp{Reviewed-by:@tie{}Your@tie{}Name<your-email@@example.com>} +you, reply with +@samp{Reviewed-by:@tie{}Your@tie{}Name@tie{}<your-email@@example.com>} to the cover page if it has one, or to the last patch of the series otherwise, adding another @samp{(for the whole series)} comment on the line below to explicit this fact. @@ -2966,8 +2985,8 @@ line below to explicit this fact. @item If you instead want to mark a @emph{single commit} as reviewed (but not the whole series), simply reply with -@samp{Reviewed-by:@tie{}Your@tie{}Name<your-email@@example.com>} to that -commit message. +@samp{Reviewed-by:@tie{}Your@tie{}Name@tie{}<your-email@@example.com>} +to that commit message. @end itemize If you are not a committer, you can help others find a @emph{series} you diff --git a/doc/guix.texi b/doc/guix.texi index 0102fd0fad..6770c9d664 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -2403,21 +2403,12 @@ the Cryptsetup/LUKS utilities to do that (see @inlinefmtifelse{html, @uref{https://linux.die.net/man/8/cryptsetup, @code{man cryptsetup}}, @code{man cryptsetup}} for more information). -@quotation Warning -While efforts are in progress to extend support to LUKS2, please note -that Guix only supports devices of type LUKS1 at the moment. You can -verify that your existing LUKS device is of the right type by running -@command{cryptsetup luksDump @var{device}}. Alternatively, you can -create a new LUKS1 device with @command{cryptsetup luksFormat --type -luks1 @var{device}}. -@end quotation - Assuming you want to store the root partition on @file{/dev/sda2}, the -command sequence to format it as a LUKS1 partition would be along these +command sequence to format it as a LUKS partition would be along these lines: @example -cryptsetup luksFormat --type luks1 /dev/sda2 +cryptsetup luksFormat /dev/sda2 cryptsetup open /dev/sda2 my-partition mkfs.ext4 -L my-root /dev/mapper/my-partition @end example @@ -19079,6 +19070,10 @@ symlink: (extra-special-file "/usr/bin/env" (file-append coreutils "/bin/env")) @end lisp + +This procedure is meant for @code{/bin/sh}, @code{/usr/bin/env} and +similar targets. In particular, use for targets under @code{/etc} might +not work as expected if the target is managed by Guix in other ways. @end deffn @defvar host-name-service-type @@ -19684,7 +19679,7 @@ might want to turn it off for instance in a virtual machine that does not need it and where the extra boot time is a problem. @anchor{guix-configuration-channels} -@item @code{channels} (default: @code{%default-channels}) +@item @code{channels} (default: @code{#f}) List of channels to be specified in @file{/etc/guix/channels.scm}, which is what @command{guix pull} uses by default (@pxref{Invoking guix pull}). @@ -21016,24 +21011,27 @@ the user mode network stack,,, qemu, QEMU Documentation}). @cindex DHCP, networking service @defvar dhcp-client-service-type -This is the type of services that run @var{dhcp}, a Dynamic Host Configuration -Protocol (DHCP) client. +This is the type of services that run @var{dhclient}, the ISC Dynamic +Host Configuration Protocol (DHCP) client. @end defvar @deftp {Data Type} dhcp-client-configuration -Data type representing the configuration of the DHCP client service. +Data type representing the configuration of the ISC DHCP client service. @table @asis @item @code{package} (default: @code{isc-dhcp}) -DHCP client package to use. +The ISC DHCP client package to use. @item @code{interfaces} (default: @code{'all}) -Either @code{'all} or the list of interface names that the DHCP client -should listen on---e.g., @code{'("eno1")}. +Either @code{'all} or the list of interface names that the ISC DHCP +client should listen on---e.g., @code{'("eno1")}. + +When set to @code{'all}, the ISC DHCP client listens on all the +available non-loopback interfaces that can be activated. Otherwise the +ISC DHCP client listens only on the specified interfaces. -When set to @code{'all}, the DHCP client listens on all the available -non-loopback interfaces that can be activated. Otherwise the DHCP -client listens only on the specified interfaces. +@item @code{config-file} (default: @code{#f}) +The configuration file for the ISC DHCP client. @item @code{shepherd-requirement} (default: @code{'()}) @itemx @code{shepherd-provision} (default: @code{'(networking)}) @@ -21044,7 +21042,7 @@ networks. Likewise, @code{shepherd-provision} is a list of Shepherd service names (symbols) provided by this service. You might want to change the -default value if you intend to run several DHCP clients, only one of +default value if you intend to run several ISC DHCP clients, only one of which provides the @code{networking} Shepherd service. @end table @end deftp @@ -28248,23 +28246,195 @@ Mailutils Manual}, for details. @cindex CardDAV @defvar radicale-service-type -This is the type of the @uref{https://radicale.org, Radicale} CalDAV/CardDAV -server whose value should be a @code{radicale-configuration}. +This is the type of the @uref{https://radicale.org, Radicale} +CalDAV/CardDAV server whose value should be a +@code{radicale-configuration}. The default configuration matches the +@uref{https://radicale.org/v3.html#configuration, upstream +documentation}. @end defvar @deftp {Data Type} radicale-configuration Data type representing the configuration of @command{radicale}. +Available @code{radicale-configuration} fields are: @table @asis -@item @code{package} (default: @code{radicale}) -The package that provides @command{radicale}. +@item @code{package} (default: @code{radicale}) (type: package) +Package that provides @command{radicale}. -@item @code{config-file} (default: @code{%default-radicale-config-file}) -File-like object of the configuration file to use, by default it will listen -on TCP port 5232 of @code{localhost} and use the @code{htpasswd} file at -@file{/var/lib/radicale/users} with no (@code{plain}) encryption. +@item @code{auth} (default: @code{'()}) (type: radicale-auth-configuration) +Configuration for auth-related variables. + +@deftp {Data Type} radicale-auth-configuration +Data type representing the @code{auth} section of a @command{radicale} +configuration file. Available @code{radicale-auth-configuration} fields +are: + +@table @asis +@item @code{type} (default: @code{'none}) (type: symbol) +The method to verify usernames and passwords. Options are @code{none}, +@code{htpasswd}, @code{remote-user}, and @code{http-x-remote-user}. +This value is tied to @code{htpasswd-filename} and +@code{htpasswd-encryption}. + +@item @code{htpasswd-filename} (default: @code{"/etc/radicale/users"}) (type: file-name) +Path to the htpasswd file. Use htpasswd or similar to generate this +file. + +@item @code{htpasswd-encryption} (default: @code{'md5}) (type: symbol) +Encryption method used in the htpasswd file. Options are @code{plain}, +@code{bcrypt}, and @code{md5}. + +@item @code{delay} (default: @code{1}) (type: non-negative-integer) +Average delay after failed login attempts in seconds. + +@item @code{realm} (default: @code{"Radicale - Password Required"}) (type: string) +Message displayed in the client when a password is needed. + +@end table + +@end deftp + +@item @code{encoding} (default: @code{'()}) (type: radicale-encoding-configuration) +Configuration for encoding-related variables. + +@deftp {Data Type} radicale-encoding-configuration +Data type representing the @code{encoding} section of a +@command{radicale} configuration file. Available +@code{radicale-encoding-configuration} fields are: + +@table @asis +@item @code{request} (default: @code{'utf-8}) (type: symbol) +Encoding for responding requests. + +@item @code{stock} (default: @code{'utf-8}) (type: symbol) +Encoding for storing local collections. + +@end table + +@end deftp + +@item @code{headers-file} (default: none) (type: file-like) +Custom HTTP headers. + +@item @code{logging} (default: @code{'()}) (type: radicale-logging-configuration) +Configuration for logging-related variables. + +@deftp {Data Type} radicale-logging-configuration +Data type representing the @code{logging} section of a +@command{radicale} configuration file. Available +@code{radicale-logging-configuration} fields are: + +@table @asis +@item @code{level} (default: @code{'warning}) (type: symbol) +Set the logging level. One of @code{debug}, @code{info}, +@code{warning}, @code{error}, or @code{critical}. + +@item @code{mask-passwords?} (default: @code{#t}) (type: boolean) +Whether to include passwords in logs. + +@end table + +@end deftp + +@item @code{rights} (default: @code{'()}) (type: radicale-rights-configuration) +Configuration for rights-related variables. This should be a +@code{radicale-rights-configuration}. + +@deftp {Data Type} radicale-rights-configuration +Data type representing the @code{rights} section of a @command{radicale} +configuration file. Available @code{radicale-rights-configuration} +fields are: + +@table @asis +@item @code{type} (default: @code{'owner-only}) (type: symbol) +Backend used to check collection access rights. The recommended backend +is @code{owner-only}. If access to calendars and address books outside +the home directory of users is granted, clients won't detect these +collections and will not show them to the user. Choosing any other +method is only useful if you access calendars and address books directly +via URL. Options are @code{authenticate}, @code{owner-only}, +@code{owner-write}, and @code{from-file}. + +@item @code{file} (default: @code{""}) (type: file-name) +File for the rights backend @code{from-file}. @end table + +@end deftp + +@item @code{server} (default: @code{'()}) (type: radicale-server-configuration) +Configuration for server-related variables. Ignored if WSGI is used. + +@deftp {Data Type} radicale-server-configuration +Data type representing the @code{server} section of a @command{radicale} +configuration file. Available @code{radicale-server-configuration} +fields are: + +@table @asis +@item @code{hosts} (default: @code{(list "localhost:5232")}) (type: list-of-ip-addresses) +List of IP addresses that the server will bind to. + +@item @code{max-connections} (default: @code{8}) (type: non-negative-integer) +Maximum number of parallel connections. Set to 0 to disable the limit. + +@item @code{max-content-length} (default: @code{100000000}) (type: non-negative-integer) +Maximum size of the request body in bytes. + +@item @code{timeout} (default: @code{30}) (type: non-negative-integer) +Socket timeout in seconds. + +@item @code{ssl?} (default: @code{#f}) (type: boolean) +Whether to enable transport layer encryption. + +@item @code{certificate} (default: @code{"/etc/ssl/radicale.cert.pem"}) (type: file-name) +Path of the SSL certificate. + +@item @code{key} (default: @code{"/etc/ssl/radicale.key.pem"}) (type: file-name) +Path to the private key for SSL. Only effective if @code{ssl?} is +@code{#t}. + +@item @code{certificate-authority} (default: @code{""}) (type: file-name) +Path to CA certificate for validating client certificates. This can be +used to secure TCP traffic between Radicale and a reverse proxy. If you +want to authenticate users with client-side certificates, you also have +to write an authentication plugin that extracts the username from the +certificate. + +@end table + +@end deftp + +@item @code{storage} (default: @code{'()}) (type: radicale-storage-configuration) +Configuration for storage-related variables. + +@deftp {Data Type} radicale-storage-configuration +Data type representing the @code{storage} section of a +@command{radicale} configuration file. Available +@code{radicale-storage-configuration} fields are: + +@table @asis +@item @code{type} (default: @code{'multifilesystem}) (type: symbol) +Backend used to store data. Options are @code{multifilesystem} and +@code{multifilesystem-nolock}. + +@item @code{filesystem-folder} (default: @code{"/var/lib/radicale/collections"}) (type: file-name) +Folder for storing local collections. Created if not present. + +@item @code{max-sync-token-age} (default: @code{2592000}) (type: non-negative-integer) +Delete sync-tokens that are older than the specified time in seconds. + +@item @code{hook} (default: @code{""}) (type: string) +Command run after changes to storage. + +@end table + +@end deftp + +@item @code{web-interface?} (default: @code{#t}) (type: boolean) +Whether to use Radicale's built-in web interface. + +@end table + @end deftp @subsubheading Rspamd Service @@ -31907,8 +32077,17 @@ configuration. Values may themselves be association lists. @end lisp @item @code{extra-content} (default: @code{""}) -Extra content for the @code{http} block. Should be string or a string -valued G-expression. +Additional content to be appended to the @code{http} block. Can either +be a value that can be lowered into a string or a list of such values. +In the former case, it is inserted directly. In the latter, it is +prefixed with indentation and suffixed with a newline. Nested lists are +flattened into one line. + +@lisp +(extra-content "include /etc/nginx/custom-config.conf;") +(extra-content `("include /etc/nginx/custom-config.conf;" + ("include " ,%custom-config.conf ";"))) +@end lisp @end table @end deftp @@ -31961,7 +32140,9 @@ you don't have a key or you don't want to use HTTPS. Whether the server should add its configuration to response. @item @code{raw-content} (default: @code{'()}) -A list of raw lines added to the server block. +A list of strings or file-like objects to be appended to the server +block. Each item is prefixed with indentation and suffixed with a new +line. Nested lists are flattened. @end table @end deftp @@ -31998,11 +32179,13 @@ URI which this location block matches. @anchor{nginx-location-configuration body} @item @code{body} -Body of the location block, specified as a list of strings. This can contain -many -configuration directives. For example, to pass requests to a upstream -server group defined using an @code{nginx-upstream-configuration} block, -the following directive would be specified in the body @samp{(list "proxy_pass +Body of the location block, specified as a list of strings or file-like +objects. Each item is prefixed with indentation and suffixed with a new +line. Nested lists are flattened. + +For example, to pass requests to a upstream server group defined using +an @code{nginx-upstream-configuration} block, the following directive +would be specified in the body @samp{(list "proxy_pass http://upstream-name;")}. @end table @@ -39654,7 +39837,7 @@ This service can be extended by other services to add additional home environments, as in this example: @lisp -(simple-service 'my-extra-home home-service-type +(simple-service 'my-extra-home guix-home-service-type `(("bob" ,my-extra-home)))) @end lisp @end defvar @@ -43909,7 +44092,7 @@ Services,,, shepherd, The GNU Shepherd Manual}, for details. When true, this is the delay in seconds before restarting a failed service. -@item @code{start} +@item @code{start} (default: @code{#~(const #t)}) @itemx @code{stop} (default: @code{#~(const #f)}) The @code{start} and @code{stop} fields refer to the Shepherd's facilities to start and stop processes (@pxref{Service De- and @@ -43928,6 +44111,30 @@ This is a list of @code{shepherd-action} objects (see below) defining herd @var{action} @var{service} [@var{arguments}@dots{}] @end example +@item @code{free-form} (default: @code{#f}) +When set, this field replaces the @code{start}, @code{stop}, and +@code{actions} fields. It is meant to be used when the service +definition comes from some other source, typically the service +collection provided by the Shepherd proper (@pxref{Service Collection,,, +shepherd, The GNU Shepherd Manual}). + +@cindex REPL service, for shepherd +For example, the snippet below defines a service for the Shepherd's +built-in @acronym{REPL, read-eval-print loop} service (@pxref{REPL +Service,,, shepherd, The GNU Shepherd Manual}): + +@lisp +(shepherd-service + (provision '(repl)) + (modules '((shepherd service repl))) + (free-form #~(repl-service))) +@end lisp + +In this case, the service object is returned by the @code{repl-service} +procedure of the Shepherd, so all the @code{free-form} G-expression does +is call that procedure. Note that the @code{provision} field must be +consistent with the actual service provision. + @item @code{auto-start?} (default: @code{#t}) Whether this service should be started automatically by the Shepherd. If it is @code{#f} the service has to be started manually with @code{herd start}. diff --git a/etc/guix-daemon.conf.in b/etc/guix-daemon.conf.in index fb681d1f80..aa368d6272 100644 --- a/etc/guix-daemon.conf.in +++ b/etc/guix-daemon.conf.in @@ -7,4 +7,4 @@ start on runlevel [2345] stop on runlevel [016] -exec @localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon --build-users-group=guixbuild --discover=no +exec @localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon --build-users-group=guixbuild --discover=no --substitute-urls='@GUIX_SUBSTITUTE_URLS@' diff --git a/etc/guix-daemon.service.in b/etc/guix-daemon.service.in index 5e75379b5e..5c43d9b7f1 100644 --- a/etc/guix-daemon.service.in +++ b/etc/guix-daemon.service.in @@ -7,7 +7,8 @@ Description=Build daemon for GNU Guix [Service] ExecStart=@localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon \ - --build-users-group=guixbuild --discover=no + --build-users-group=guixbuild --discover=no \ + --substitute-urls='@GUIX_SUBSTITUTE_URLS@' Environment='GUIX_LOCPATH=@localstatedir@/guix/profiles/per-user/root/guix-profile/lib/locale' LC_ALL=en_US.utf8 StandardOutput=journal StandardError=journal diff --git a/etc/init.d/guix-daemon.in b/etc/init.d/guix-daemon.in index b7d4bb72bb..913210a543 100644 --- a/etc/init.d/guix-daemon.in +++ b/etc/init.d/guix-daemon.in @@ -36,7 +36,9 @@ start) -E LC_ALL=en_US.utf8 \ -p "/var/run/guix-daemon.pid" \ @localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon \ - --build-users-group=guixbuild --discover=no + --build-users-group=guixbuild --discover=no \ + --substitute-urls='@GUIX_SUBSTITUTE_URLS@' + fi ;; stop) diff --git a/etc/news.scm b/etc/news.scm index a92ce97185..40fbec8c07 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -23,6 +23,7 @@ ;; Copyright © 2024 Hilton Chain <hako@ultrarare.space> ;; Copyright © 2024 Liliana Marie Prikler <liliana.prikler@gmail.com> ;; Copyright © 2024 Vivien Kraus <vivien@planete-kraus.eu> +;; Copyright © 2024 Guillaume Le Vaillant <glv@posteo.net> ;; ;; Copying and distribution of this file, with or without modification, are ;; permitted in any medium without royalty provided the copyright notice and @@ -31,6 +32,20 @@ (channel-news (version 0) + (entry (commit "a46908620fac09bd8ccd0f587a27e86035d3b1d7") + (title + (en "@code{stumpwm:lib} removed") + (fr "@code{stumpwm:lib} supprimé")) + (body + (en "The @code{lib} output of the @code{stumpwm} package has been +removed. If you have some personal package definitions depending on +@code{stumpwm:lib}, they should be updated to depend on @code{stumpwm} +instead.") + (fr "La sortie @code{lib} du paquet @code{stumpwm} a été supprimée. +Si vous avez des définitions de paquets personnels dépendantes de +@code{stumpwm:lib}, elle doivent être modifiées pour dépendre de +@code{stumpwm} à la place."))) + (entry (commit "6fad0fd1c32db2cb25447b694f08d5c7836536ad") (title (en "Linux-libre 6.8 removed due to end of upstream support") diff --git a/gnu/local.mk b/gnu/local.mk index cdf203777f..7528a6bfee 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1013,7 +1013,6 @@ dist_patch_DATA = \ %D%/packages/patches/bloomberg-bde-cmake-module-path.patch \ %D%/packages/patches/bloomberg-bde-tools-fix-install-path.patch \ %D%/packages/patches/boolector-find-googletest.patch \ - %D%/packages/patches/bpftrace-disable-bfd-disasm.patch \ %D%/packages/patches/breezy-fix-gio.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/bubblewrap-fix-locale-in-tests.patch \ @@ -1081,6 +1080,7 @@ dist_patch_DATA = \ %D%/packages/patches/converseen-hide-updates-checks.patch \ %D%/packages/patches/converseen-hide-non-free-pointers.patch \ %D%/packages/patches/cool-retro-term-wctype.patch \ + %D%/packages/patches/coq-autosubst-1.8-remove-deprecated-files.patch \ %D%/packages/patches/coreutils-gnulib-tests.patch \ %D%/packages/patches/cppcheck-disable-char-signedness-test.patch \ %D%/packages/patches/cppdap-add-CPPDAP_USE_EXTERNAL_GTEST_PACKAGE.patch\ @@ -1173,7 +1173,6 @@ dist_patch_DATA = \ %D%/packages/patches/ergodox-firmware-fix-json-target.patch \ %D%/packages/patches/ergodox-firmware-fix-numpad.patch \ %D%/packages/patches/erlang-man-path.patch \ - %D%/packages/patches/esmini-no-clutter-log.patch \ %D%/packages/patches/esmini-use-pkgconfig.patch \ %D%/packages/patches/esmtp-add-lesmtp.patch \ %D%/packages/patches/eudev-rules-directory.patch \ @@ -1227,6 +1226,7 @@ dist_patch_DATA = \ %D%/packages/patches/firebird-riscv64-support-pt2.patch \ %D%/packages/patches/flann-cmake-3.11.patch \ %D%/packages/patches/flatpak-fix-path.patch \ + %D%/packages/patches/flatpak-fix-fonts-icons.patch \ %D%/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch \ %D%/packages/patches/fluxbox-1.3.7-no-dynamic-cursor.patch \ %D%/packages/patches/fluxbox-1.3.7-gcc.patch \ @@ -1242,6 +1242,7 @@ dist_patch_DATA = \ %D%/packages/patches/fpc-reproducibility.patch \ %D%/packages/patches/fpc-glibc-2.34-compat.patch \ %D%/packages/patches/fpm-newer-clamp-fix.patch \ + %D%/packages/patches/freecad-vtk-9.3.patch \ %D%/packages/patches/freedink-engine-fix-sdl-hints.patch \ %D%/packages/patches/freeimage-libtiff-compat.patch \ %D%/packages/patches/freeimage-unbundle.patch \ @@ -1329,12 +1330,15 @@ dist_patch_DATA = \ %D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/gettext-libunicode-update.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ + %D%/packages/patches/ghc-9.2-cabal-support-package-path.patch \ %D%/packages/patches/ghc-9.2-glibc-2.33-link-order.patch \ %D%/packages/patches/ghc-9.2-grep-warnings.patch \ %D%/packages/patches/ghc-testsuite-dlopen-pie.patch \ %D%/packages/patches/ghc-testsuite-grep-compat.patch \ + %D%/packages/patches/ghc-aeson-encodeDouble.patch \ %D%/packages/patches/ghc-basement-fix-32bit.patch \ %D%/packages/patches/ghc-bytestring-handle-ghc9.patch \ + %D%/packages/patches/ghc-clock-realfrag.patch \ %D%/packages/patches/ghc-language-haskell-extract-ghc-8.10.patch \ %D%/packages/patches/ghc-memory-fix-32bit.patch \ %D%/packages/patches/ghc-persistent-fix-32bit.patch \ @@ -1395,6 +1399,7 @@ dist_patch_DATA = \ %D%/packages/patches/gnome-settings-daemon-gc.patch \ %D%/packages/patches/gnome-session-support-elogind.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ + %D%/packages/patches/gnulib-bootstrap.patch \ %D%/packages/patches/gnumach-support-noide.patch \ %D%/packages/patches/gnupg-default-pinentry.patch \ %D%/packages/patches/gnupg-1-build-with-gcc10.patch \ @@ -1426,7 +1431,6 @@ dist_patch_DATA = \ %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \ %D%/packages/patches/grub-efi-fat-serial-number.patch \ %D%/packages/patches/grub-setup-root.patch \ - %D%/packages/patches/grub-ignore-metadata-csum-seed.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-2.2-skip-oom-test.patch \ %D%/packages/patches/guile-2.2-skip-so-test.patch \ @@ -1663,6 +1667,7 @@ dist_patch_DATA = \ %D%/packages/patches/libvdpau-va-gl-unbundle.patch \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \ %D%/packages/patches/libvpx-CVE-2023-5217.patch \ + %D%/packages/patches/libvpx-CVE-2023-44488.patch \ %D%/packages/patches/libxml2-xpath0-Add-option-xpath0.patch \ %D%/packages/patches/libwpd-gcc-compat.patch \ %D%/packages/patches/libxslt-generated-ids.patch \ diff --git a/gnu/packages/abiword.scm b/gnu/packages/abiword.scm index 1635ed54fd..d3b08323f7 100644 --- a/gnu/packages/abiword.scm +++ b/gnu/packages/abiword.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> +;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix gexp) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages boost) @@ -53,7 +55,9 @@ (origin (method url-fetch) (uri - (string-append "https://www.abisource.com/downloads/abiword/" version + ;; XXX: The main site <https://www.abisource.com/> is down. Only a (partial) + ;; mirror is available at <http://www.nl.abisource.com/>. + (string-append "http://www.nl.abisource.com/downloads/abiword/" version "/source/abiword-" version ".tar.gz")) (sha256 (base32 "1d1179pnslijpjhz1q155fsc828rrlqf7lsn2inqsl3hk5z28mqj")) @@ -62,35 +66,35 @@ (build-system glib-or-gtk-build-system) (arguments ;; NOTE: rsvg is disabled, since Abiword - `(#:configure-flags ;; supports it directly, and its BS is broken. - (list ;; wmf was removed from Guix for security. - "--enable-clipart" ;; TODO: The following plugins have unresolved - "--enable-templates" ;; dependencies: aiksaurus, grammar, wpg, gda, - (string-append ;; wordperfect, psion, mathview. - "--enable-plugins=" - "applix " "babelfish " "bmp " "clarisworks " "collab " "command " - "docbook " "eml " "epub " "freetranslation " "garble " "gdict " - "gimp " "goffice " "google " "hancom " "hrtext " "iscii " "kword " - "latex " "loadbindings " "mht " "mif " "mswrite " "opendocument " - "openwriter " "openxml " "opml " "ots " "paint " "passepartout " - "pdb " "pdf " "presentation " "s5 " "sdw " "t602 " "urldict " - "wikipedia " "wml " "xslfo") - "--enable-introspection" - (string-append "--with-gir-dir=" - (assoc-ref %outputs "out") - "/share/gir-1.0") - (string-append "--with-typelib-dir=" - (assoc-ref %outputs "out") - "/lib/girepository-1.0")) - ;; tests fail with: Gtk-CRITICAL **: gtk_settings_get_for_screen: - ;; assertion 'GDK_IS_SCREEN (screen)' failed - ;; GLib-GObject-CRITICAL **: g_object_get_qdata: - ;; assertion 'G_IS_OBJECT (object)' failed - ;; Manually starting the X server before the test phase did not help - ;; the tests to pass. - #:tests? #f - #:make-flags - (list "gtk_update_icon_cache=true"))) + (list #:configure-flags ;; supports it directly, and its BS is broken. + #~(list ;; wmf was removed from Guix for security. + "--enable-clipart" ;; TODO: The following plugins have unresolved + "--enable-templates" ;; dependencies: aiksaurus, grammar, wpg, gda, + (string-append ;; wordperfect, psion, mathview. + "--enable-plugins=" + "applix " "babelfish " "bmp " "clarisworks " "collab " "command " + "docbook " "eml " "epub " "freetranslation " "garble " "gdict " + "gimp " "goffice " "google " "hancom " "hrtext " "iscii " "kword " + "latex " "loadbindings " "mht " "mif " "mswrite " "opendocument " + "openwriter " "openxml " "opml " "ots " "paint " "passepartout " + "pdb " "pdf " "presentation " "s5 " "sdw " "t602 " "urldict " + "wikipedia " "wml " "xslfo") + "--enable-introspection" + (string-append "--with-gir-dir=" + #$output + "/share/gir-1.0") + (string-append "--with-typelib-dir=" + #$output + "/lib/girepository-1.0")) + ;; tests fail with: Gtk-CRITICAL **: gtk_settings_get_for_screen: + ;; assertion 'GDK_IS_SCREEN (screen)' failed + ;; GLib-GObject-CRITICAL **: g_object_get_qdata: + ;; assertion 'G_IS_OBJECT (object)' failed + ;; Manually starting the X server before the test phase did not help + ;; the tests to pass. + #:tests? #f + #:make-flags + #~(list "gtk_update_icon_cache=true"))) (inputs (list boost enchant @@ -120,7 +124,7 @@ libtool pkg-config python-wrapper)) - (home-page "https://www.abisource.com/") + (home-page "http://www.nl.abisource.com/") (synopsis "Word processing program") ;; HACKERS: The comment below is here so that it shows up early in the diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 212c2b3715..1060b3c794 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -392,14 +392,14 @@ interface and is based on GNU Guile.") (define-public shepherd-0.10 (package (inherit shepherd-0.9) - (version "0.10.4") + (version "0.10.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/shepherd/shepherd-" version ".tar.gz")) (sha256 (base32 - "0206r2l914qjahzd1qill57r1qcg1x8faj0f6qv3x42wqx6x28ky")))) + "0k40n9qm5r5rqf94isa1857ghd4329zc5rjf3ll2572gpiw3ij4x")))) (native-inputs (modify-inputs (package-native-inputs shepherd-0.9) (replace "guile-fibers" ;; Work around @@ -1918,7 +1918,7 @@ realms/domains like Active Directory or IPA.") (define-public rename (package (name "rename") - (version "1.10") + (version "2.02") (source (origin (method url-fetch) (uri (string-append @@ -1926,7 +1926,7 @@ realms/domains like Active Directory or IPA.") version ".tar.gz")) (sha256 (base32 - "137m8s06r4n038ivlr5r1d9a7q9l7shmwpvnyx053r9ndhvbnkh5")))) + "1pr0qmsb9gb5xqwpicabnr5jcxdbbvz1mgdqw3d3d0dn12060ysk")))) (build-system perl-build-system) (arguments `(#:phases @@ -2812,7 +2812,7 @@ various ways that may be running with too much privilege.") (define-public smartmontools (package (name "smartmontools") - (version "7.3") + (version "7.4") (source (origin (method url-fetch) (uri (string-append @@ -2820,7 +2820,7 @@ various ways that may be running with too much privilege.") version "/smartmontools-" version ".tar.gz")) (sha256 (base32 - "0ax2wf5j8k2fbm85s0rbj9sajn5q3j2a2k22wyqcyn0cin0ghi55")))) + "0gcrzcb4g7f994n6nws26g6x15yjija1gyzd359sjv7r3xj1z9p9")))) (build-system gnu-build-system) (arguments (list #:make-flags diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index daeeafd603..b7ccb153d3 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -5,14 +5,13 @@ ;;; Copyright © 2016, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com> -;;; Copyright © 2019 Andy Tai <atai@atai.org> +;;; Copyright © 2019, 2022, 2024 Andy Tai <atai@atai.org> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Christine Lemmer-Webber <cwebber@dustycloud.org> ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com> ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2022 Felix Gruber <felgru@posteo.net> -;;; Copyright © 2022 Andy Tai <atai@atai.org> ;;; Copyright © 2023 Simon South <simon@simonsouth.net> ;;; Copyright © 2023 B. Wilson <elaexuotee@wilsonb.com> ;;; @@ -357,7 +356,7 @@ runtime") (define-public rgbds (package (name "rgbds") - (version "0.5.2") + (version "0.7.0") (source (origin (method git-fetch) (uri (git-reference @@ -366,7 +365,7 @@ runtime") (file-name (git-file-name name version)) (sha256 (base32 - "13zy05xzh2yxyvzf78a5h59pabwrfr6qs5m453pfbdyd3msg2s7w")))) + "1gy75q0ikx0ki1wsrq97hxj9dw9436fcys2w91ipm90pbhk4ljva")))) (build-system gnu-build-system) (arguments `(#:phases @@ -646,6 +645,44 @@ SSE4.2) intrinsic functions as defined in corresponding x86 compilers headers files.") (license license:bsd-2)))) +(define-public cpu-features + (package + (name "cpu-features") + (version "0.9.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/cpu_features") + (commit (string-append "v" version)))) + (sha256 + (base32 "0297li3408zm1dqnibaasrb51vs7n7iscnxsji3b78g0pir7jwxr")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:configure-flags + #~(list "-DBUILD_TESTING=off" ;; XXX: insists on using bundled googletest + "-DBUILD_SHARED_LIBS=ON"))) + (home-page "https://github.com/google/cpu_features") + (synopsis "Cross platform C99 library to get cpu features at runtime") + (description + "Cpu_features is a cross-platform C library to retrieve CPU features +(such as available instructions) at runtime, and supports these CPU architectures +@itemize +@item x86-64 +@item AArch64 +@item ARM +@item MIPS +@item POWER +@item RISC-V +@item LoongArch +@item S390x +@end itemize") + (license license:asl2.0))) + + (define-public blinkenlights (package (name "blinkenlights") diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index fcb3ceed8a..ebc1af7b75 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2964,13 +2964,13 @@ cross-platform audio input/output stream library.") (define-public python-pulsectl (package (name "python-pulsectl") - (version "22.3.2") + (version "24.4.0") (source (origin (method url-fetch) (uri (pypi-uri "pulsectl" version)) (sha256 (base32 - "115ha1cwpd2r84ssnxdbr59hgs0jbx0lz3xpqli64kmxxqf4w5yc")))) + "0r9igs365cqgrn1m55a8qjz0hc446nwjm3p3i9kphbj5gl7dazk9")))) (build-system python-build-system) (inputs (list pulseaudio)) (arguments diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index bbe5b8cf57..66c5b7d237 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net> ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net> -;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2021, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 zamfofex <zamfofex@twdb.moe> ;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com> ;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz> @@ -46,8 +46,10 @@ #:use-module (gnu packages acl) #:use-module (gnu packages algebra) #:use-module (gnu packages attr) + #:use-module (gnu packages autotools) #:use-module (gnu packages bash) #:use-module (gnu packages bison) + #:use-module (gnu packages build-tools) #:use-module (gnu packages gcc) #:use-module (gnu packages guile) #:use-module (gnu packages multiprecision) @@ -261,35 +263,83 @@ standard utility.") (license gpl3+) (home-page "https://www.gnu.org/software/tar/"))) -(define-public patch - (package - (name "patch") - (version "2.7.6") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/patch/patch-" - version ".tar.xz")) - (sha256 - (base32 - "1zfqy4rdcy279vwn2z1kbv19dcfw25d2aqy9nzvdkq5bjzd0nqdc")) - (patches (search-patches "patch-hurd-path-max.patch")))) - (build-system gnu-build-system) - (arguments - ;; Work around a cross-compilation bug whereby libpatch.a would provide - ;; '__mktime_internal', which conflicts with the one in libc.a. - (if (%current-target-system) - `(#:configure-flags '("gl_cv_func_working_mktime=yes")) - '())) - (native-inputs (list ed)) - (synopsis "Apply differences to originals, with optional backups") - (description - "Patch is a program that applies changes to files based on differences +;;; TODO: Replace/merge with 'patch' on core-updates. +(define-public patch/pinned + (hidden-package + (package + (name "patch") + (version "2.7.6") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/patch/patch-" + version ".tar.xz")) + (sha256 + (base32 + "1zfqy4rdcy279vwn2z1kbv19dcfw25d2aqy9nzvdkq5bjzd0nqdc")) + (patches (search-patches "patch-hurd-path-max.patch")))) + (build-system gnu-build-system) + (arguments + ;; Work around a cross-compilation bug whereby libpatch.a would provide + ;; '__mktime_internal', which conflicts with the one in libc.a. + (if (%current-target-system) + `(#:configure-flags '("gl_cv_func_working_mktime=yes")) + '())) + (native-inputs (list ed)) + (synopsis "Apply differences to originals, with optional backups") + (description + "Patch is a program that applies changes to files based on differences laid out as by the program \"diff\". The changes may be applied to one or more files depending on the contents of the diff file. It accepts several different diff formats. It may also be used to revert previously applied differences.") - (license gpl3+) - (home-page "https://savannah.gnu.org/projects/patch/"))) + (license gpl3+) + (home-page "https://savannah.gnu.org/projects/patch/")))) + +(define-public patch + ;; The latest release is from 2018, and lacks multiple security related + ;; patches. Since Fedora carries 23 patches, simply use the latest commit + ;; until a proper release is made. + (let ((revision "0") + (commit "f144b35425d9d7732ea5485034c1a6b7a106ab92") + (base patch/pinned)) + (package + (inherit base) + (name "patch") + (version (git-version "2.7.6" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/patch.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1bk38169c0xh01b0q0zmnrjqz8k9byz3arp4q7q66sn6xwf94nvz")) + (patches (search-patches "patch-hurd-path-max.patch")))) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (add-after 'unpack 'copy-gnulib-sources + (lambda _ + ;; XXX: We copy the source instead of using 'gnulib' as a + ;; native input to avoid introducing a dependency cycle. + (copy-recursively #+gnulib "gnulib") + (setenv "GNULIB_SRCDIR" + (string-append (getcwd) "/gnulib/src/gnulib")))) + (add-after 'copy-gnulib-sources 'update-bootstrap-script + (lambda _ + (copy-file "gnulib/src/gnulib/build-aux/bootstrap" + "bootstrap"))) + (add-after 'unpack 'patch-configure.ac + (lambda _ + (substitute* "configure.ac" + ;; The gnulib-provided git-version-gen script has a plain + ;; shebang of #!/bin/sh; avoid using it. + (("build-aux/git-version-gen" all) + (string-append "sh " all))))))))) + (native-inputs (list autoconf automake bison ed)) + (properties '())))) (define-public diffutils (package diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 24d7c0843d..bfc70c5d3d 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -79,14 +79,14 @@ (define-public fio (package (name "fio") - (version "3.36") + (version "3.37") (source (origin (method url-fetch) (uri (string-append "https://brick.kernel.dk/snaps/" "fio-" version ".tar.bz2")) (sha256 (base32 - "0ppg2rn57diz2mvbbps4cjxd903zn380hdkdsrbzal4l513w32h0")))) + "09w35mpkrlxjy506bhifq7akc7mid9q92jkqgqwgf1ya95jzvw48")))) (build-system gnu-build-system) (arguments (list #:modules diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index cdda029809..8e497f1199 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13915,6 +13915,50 @@ for analyzing gene-level association tests in meta-analyses for binary trait.") (license license:gpl3))) +(define-public r-rnacrosslinkoo + (let ((commit "a317e0fa6ddf34c309529d57390769e2b2b5bfb7") + (revision "1")) + (package + (name "r-rnacrosslinkoo") + (version (git-version "0.1.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cran/rnaCrosslinkOO") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0csv9924z0ish960k034qzv3gxh1yabnxni8hsrn5j6xl1r3cdpl")))) + (properties `((upstream-name . "rnaCrosslinkOO"))) + (build-system r-build-system) + (propagated-inputs (list r-classdiscovery + r-doparallel + r-foreach + r-genomicranges + r-ggplot2 + r-ggrepel + r-heatmap3 + r-igraph + r-iranges + r-mass + r-mixtools + r-patchwork + r-r4rna + r-rcolorbrewer + r-reshape2 + r-rrna + r-s4vectors + r-seqinr + r-tidyverse + r-topdom)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/cran/rnaCrosslinkOO") + (synopsis "Analysis of RNA crosslinking data") + (description + "The package is ideal for analyzing RNA structure and chemical probing data.") + (license license:gpl3)))) + (define-public r-rnaseqdtu (let ((commit "5bee1e769d2e1dc6a3f1cecb78078050eeb5b9ac") (revision "1")) @@ -14133,6 +14177,58 @@ an important subset of samtools functionality, including view, index, sort, markdup, and depth.") (license license:gpl2+))) +(define-public r-rphyloxml + (let ((commit "a30e39249239b2de01d6964ae2a2205a6c48b475") + (revision "1")) + (package + (name "r-rphyloxml") + (version (git-version "0.0-9000" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/USCbiostats/rphyloxml") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15ijzqvjxx6vqyqlg5asdbqlhw1g0ix6palf1rism3si0qapddgw")) + (snippet + '(delete-file "docs/jquery.sticky-kit.min.js")))) + (properties `((upstream-name . "rphyloxml"))) + (build-system r-build-system) + (arguments + (list + #:modules + '((guix build r-build-system) + (guix build minify-build-system) + (guix build utils)) + #:imported-modules + `(,@%r-build-system-modules (guix build minify-build-system)) + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'process-javascript + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "inst/" + (minify (assoc-ref inputs "js-jquery-sticky-kit") + #:target "docs/jquery.sticky-kit.min.js"))))))) + (propagated-inputs (list r-ape r-xml2)) + (native-inputs + `(("esbuild" ,esbuild) + ("js-jquery-sticky-kit" + ,(origin + (method url-fetch) + (uri "https://raw.githubusercontent.com/leafo/sticky-kit/\ +v1.1.2/jquery.sticky-kit.js") + (sha256 + (base32 + "17c3a1hqc3ybwj7hpw8prazajp2x98aq7nyfn71h6lzjvblq297g")))))) + (home-page "https://github.com/USCbiostats/rphyloxml") + (synopsis "Read and write phyloXML files in R") + (description + "The package reads phylogenetic data in the @code{phyloXML} format. +It also includes functions for writing data in this format.") + (license license:expat)))) + (define-public ritornello (package (name "ritornello") diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index f37344c25b..503c7d4a19 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013-2019, 2021, 2023 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013-2019, 2021, 2023-2024 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> @@ -104,161 +104,164 @@ (define-public grub (package (name "grub") - (version "2.06") + (version "2.12") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/grub/grub-" version ".tar.xz")) (sha256 (base32 - "1qbycnxkx07arj9f2nlsi9kp0dyldspbv07ysdyd34qvz55a97mp")) + "1ahgzvvvwdxx7rl08pv5dyqlgp76jxz0q2cflxvsdsn4yy8p7jgk")) (patches (search-patches "grub-efi-fat-serial-number.patch" - "grub-setup-root.patch" - "grub-ignore-metadata-csum-seed.patch")) + "grub-setup-root.patch")) (modules '((guix build utils))) (snippet - '(begin - ;; Adjust QEMU invocation to not use a deprecated device - ;; name that was removed in QEMU 6.0. Remove for >2.06. - (substitute* "tests/ahci_test.in" - (("ide-drive") - "ide-hd")))))) + #~(begin + ;; Add file missing from the release tarball. + (call-with-output-file "grub-core/extra_deps.lst" + (lambda (port) + (display "depends bli part_gpt\n" port))) + + ;; Use exit code 77, not 99, to tell Automake that a test + ;; is skipped. + (substitute* (find-files "tests" "\\.in$") + (("exit 99") "exit 77")))))) (build-system gnu-build-system) (arguments - `(#:configure-flags - ;; Counterintuitively, this *disables* a spurious Python dependency by - ;; calling the ‘true’ binary instead. Python is only needed during - ;; bootstrapping (for genptl.py), not when building from a release. - (list "PYTHON=true") - ;; Grub fails to load modules stripped with --strip-unneeded. - #:strip-flags '("--strip-debug" "--enable-deterministic-archives") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-stuff - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (substitute* "grub-core/Makefile.in" - (("/bin/sh") (which "sh"))) - - ;; Give the absolute file name of 'mdadm', used to determine the - ;; root file system when it's a RAID device. Failing to do that, - ;; 'grub-probe' silently fails if 'mdadm' is not in $PATH. - (when (assoc-ref inputs "mdadm") - (substitute* "grub-core/osdep/linux/getroot.c" - (("argv\\[0\\] = \"mdadm\"") - (string-append "argv[0] = \"" - (assoc-ref inputs "mdadm") - "/sbin/mdadm\"")))) - - ;; Make the font visible. - (copy-file (assoc-ref (or native-inputs inputs) - "unifont") - "unifont.bdf.gz") - (system* "gunzip" "unifont.bdf.gz") - - ;; Give the absolute file name of 'ckbcomp'. - (substitute* "util/grub-kbdcomp.in" - (("^ckbcomp ") - (string-append - (search-input-file inputs "/bin/ckbcomp") - " "))))) - (add-after 'unpack 'set-freetype-variables - ;; These variables need to be set to the native versions of the - ;; dependencies because they are used to build programs which are - ;; executed during build time. - (lambda* (#:key native-inputs #:allow-other-keys) - (when (assoc-ref native-inputs "freetype") - (let ((freetype (assoc-ref native-inputs "freetype"))) - (setenv "BUILD_FREETYPE_LIBS" - (string-append "-L" freetype - "/lib -lfreetype")) - (setenv "BUILD_FREETYPE_CFLAGS" - (string-append "-I" freetype - "/include/freetype2")))))) - (add-before 'check 'disable-flaky-test - (lambda _ - ;; This test is unreliable. For more information, see: - ;; <https://bugs.gnu.org/26936>. - (substitute* "Makefile.in" - (("grub_cmd_date grub_cmd_set_date grub_cmd_sleep") - "grub_cmd_date grub_cmd_sleep")))) - (add-before 'check 'disable-pixel-perfect-test - (lambda _ - ;; This test compares many screenshots rendered with an older - ;; Unifont (9.0.06) than that packaged in Guix. - (substitute* "Makefile.in" - (("test_unset grub_func_test") - "test_unset"))))) - ;; Disable tests on ARM and AARCH64 platforms or when cross-compiling. - #:tests? ,(not (or (any (cute string-prefix? <> (or (%current-target-system) - (%current-system))) - '("arm" "aarch64")) - (%current-target-system))))) + (list #:configure-flags + ;; Counterintuitively, this *disables* a spurious Python dependency by + ;; calling the ‘true’ binary instead. Python is only needed during + ;; bootstrapping (for genptl.py), not when building from a release. + #~(list "PYTHON=true") + + ;; GRUB fails to load modules stripped with --strip-unneeded. + #:strip-flags + #~(list "--strip-debug" "--enable-deterministic-archives") + + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-stuff + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (substitute* "grub-core/Makefile.in" + (("/bin/sh") (which "sh"))) + + ;; Give the absolute file name of 'mdadm', used to determine the + ;; root file system when it's a RAID device. Failing to do that, + ;; 'grub-probe' silently fails if 'mdadm' is not in $PATH. + (let ((mdadm (false-if-exception + (search-input-file inputs "/sbin/mdadm")))) + (when mdadm + (substitute* "grub-core/osdep/linux/getroot.c" + (("argv\\[0\\] = \"mdadm\"") + (string-append "argv[0] = \"" mdadm "/sbin/mdadm\""))))) + + ;; Make the font visible. + (copy-file #+unifont "unifont.bdf.gz") + (system* "gunzip" "unifont.bdf.gz") + + ;; Give the absolute file name of 'ckbcomp'. + (substitute* "util/grub-kbdcomp.in" + (("^ckbcomp ") + (string-append + (search-input-file inputs "/bin/ckbcomp") + " "))))) + (add-after 'unpack 'set-freetype-variables + ;; These variables need to be set to the native versions of the + ;; dependencies because they are used to build programs which are + ;; executed during build time. + (lambda* (#:key native-inputs #:allow-other-keys) + (when (assoc-ref native-inputs "freetype") + (let ((freetype (assoc-ref native-inputs "freetype"))) + (setenv "BUILD_FREETYPE_LIBS" + (string-append "-L" freetype + "/lib -lfreetype")) + (setenv "BUILD_FREETYPE_CFLAGS" + (string-append "-I" freetype + "/include/freetype2")))))) + (add-before 'check 'disable-flaky-test + (lambda _ + ;; This test is unreliable. For more information, see: + ;; <https://bugs.gnu.org/26936>. + (substitute* "Makefile.in" + (("grub_cmd_date grub_cmd_set_date grub_cmd_sleep") + "grub_cmd_date grub_cmd_sleep")))) + (add-before 'check 'disable-pixel-perfect-test + (lambda _ + ;; This test compares many screenshots rendered with an older + ;; Unifont (9.0.06) than that packaged in Guix. + (substitute* "Makefile.in" + (("test_unset grub_func_test") + "test_unset"))))) + + ;; Disable tests on ARM and AARCH64 platforms or when cross-compiling. + #:tests? (not (or (any (cute string-prefix? <> (%current-system)) + '("arm" "aarch64")) + (%current-target-system))))) (inputs - `(("gettext" ,gettext-minimal) - - ;; Depend on LVM2 for libdevmapper, used by 'grub-probe' and - ;; 'grub-install' to recognize mapped devices (LUKS, etc.) - ,@(if (member (or (%current-target-system) - (%current-system)) - (package-supported-systems lvm2)) - `(("lvm2" ,lvm2)) - '()) - - ;; Depend on mdadm, which is invoked by 'grub-probe' and 'grub-install' - ;; to determine whether the root file system is RAID. - ,@(if (member (or (%current-target-system) - (%current-system)) - (package-supported-systems mdadm)) - `(("mdadm" ,mdadm)) - '()) - - ;; Console-setup's ckbcomp is invoked by grub-kbdcomp. It is required - ;; for generating alternative keyboard layouts. - ("console-setup" ,console-setup) - - ;; Needed for ‘grub-mount’, the only reliable way to tell whether a given - ;; file system will be readable by GRUB without rebooting. - ,@(if (member (or (%current-target-system) - (%current-system)) - (package-supported-systems fuse-2)) - `(("fuse" ,fuse-2)) - '()) - - ("freetype" ,freetype) - ;; ("libusb" ,libusb) - ("ncurses" ,ncurses))) + (append (list gettext-minimal freetype ncurses + + ;; Console-setup's ckbcomp is invoked by grub-kbdcomp. It + ;; is required for generating alternative keyboard layouts. + console-setup) + + ;; Depend on LVM2 for libdevmapper, used by 'grub-probe' and + ;; 'grub-install' to recognize mapped devices (LUKS, etc.) + (if (member (or (%current-target-system) + (%current-system)) + (package-supported-systems lvm2)) + (list lvm2) + '()) + + ;; Depend on mdadm, which is invoked by 'grub-probe' and + ;; 'grub-install' to determine whether the root file system is + ;; RAID. + (if (member (or (%current-target-system) + (%current-system)) + (package-supported-systems mdadm)) + (list mdadm) + '()) + + ;; Needed for ‘grub-mount’, the only reliable way to tell whether + ;; a given file system will be readable by GRUB without + ;; rebooting. + (if (member (or (%current-target-system) + (%current-system)) + (package-supported-systems fuse-2)) + (list fuse-2) + '()))) (native-inputs - `(("pkg-config" ,pkg-config) - ("unifont" ,unifont) - ("bison" ,bison) - ("flex" ,flex) - ("texinfo" ,texinfo) - ("help2man" ,help2man) - ("freetype" ,freetype) ;native version needed for build-grub-mkfont - - ;; XXX: When building GRUB 2.02 on 32-bit x86, we need a binutils - ;; capable of assembling 64-bit instructions. However, our default - ;; binutils on 32-bit x86 is not 64-bit capable. - ,@(if (string-match "^i[3456]86-" (%current-system)) - (let ((binutils (package/inherit - binutils - (name "binutils-i386") - (arguments - (substitute-keyword-arguments (package-arguments binutils) - ((#:configure-flags flags ''()) - `(cons "--enable-64-bit-bfd" ,flags))))))) - `(("ld-wrapper" ,(make-ld-wrapper "ld-wrapper-i386" - #:binutils binutils)) - ("binutils" ,binutils))) - '()) - - ;; Dependencies for the test suite. The "real" QEMU is needed here, - ;; because several targets are used. - ("parted" ,parted) - ,@(if (member (%current-system) (package-supported-systems qemu-minimal)) - `(("qemu" ,qemu-minimal)) - '()) - ("xorriso" ,xorriso))) + (append (list pkg-config + bison + flex + texinfo + help2man + freetype ;native version needed for build-grub-mkfont + + ;; Dependencies of the test suite. + parted + xorriso) + + ;; For the test suite, the "real" QEMU is needed because several + ;; targets are used. + (if (member (%current-system) (package-supported-systems qemu-minimal)) + (list qemu-minimal) + '()) + + ;; XXX: When building GRUB 2.02 on 32-bit x86, we need a binutils + ;; capable of assembling 64-bit instructions. However, our default + ;; binutils on 32-bit x86 is not 64-bit capable. + (if (string-match "^i[3456]86-" (%current-system)) + (let ((binutils (package/inherit + binutils + (name "binutils-i386") + (arguments + (substitute-keyword-arguments (package-arguments binutils) + ((#:configure-flags flags ''()) + `(cons "--enable-64-bit-bfd" ,flags))))))) + (list (make-ld-wrapper "ld-wrapper-i386" + #:binutils binutils) + binutils)) + '()))) (home-page "https://www.gnu.org/software/grub/") (synopsis "GRand Unified Boot loader") (description @@ -283,24 +286,21 @@ menu to select one of the installed operating systems.") (delete "help2man" "texinfo" "parted" "qemu" "xorriso"))) (arguments (substitute-keyword-arguments (package-arguments grub) - ((#:configure-flags _ ''()) - '(list "PYTHON=true")) + ((#:configure-flags _ #~'()) + #~(list "PYTHON=true")) ((#:tests? _ #t) #f) - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (replace 'patch-stuff - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (substitute* "grub-core/Makefile.in" - (("/bin/sh") (which "sh"))) - - ;; Make the font visible. - (copy-file (assoc-ref (or native-inputs inputs) - "unifont") - "unifont.bdf.gz") - (system* "gunzip" "unifont.bdf.gz") - - #t)))))))) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (replace 'patch-stuff + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (substitute* "grub-core/Makefile.in" + (("/bin/sh") + (which "sh"))) + + ;; Make the font visible. + (copy-file #+unifont "unifont.bdf.gz") + (system* "gunzip" "unifont.bdf.gz"))))))))) (define-public grub-coreboot (package @@ -308,64 +308,62 @@ menu to select one of the installed operating systems.") (name "grub-coreboot") (synopsis "GRand Unified Boot loader (Coreboot payload version)") (arguments - `(,@(substitute-keyword-arguments (package-arguments grub) - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (add-before 'check 'disable-broken-tests - (lambda _ - (setenv "DISABLE_HARD_ERRORS" "1") - (setenv - "XFAIL_TESTS" - (string-join - ;; TODO: All the tests below use grub shell - ;; (tests/util/grub-shell.in), and here grub-shell uses - ;; QEMU and a Coreboot image to run the tests. Since we - ;; don't have a Coreboot package in Guix yet these tests - ;; are disabled. See the Guix bug #64667 for more details - ;; (https://debbugs.gnu.org/cgi/bugreport.cgi?bug=64667). - (list - "pata_test" - "ahci_test" - "uhci_test" - "ehci_test" - "example_grub_script_test" - "ohci_test" - "grub_script_eval" - "grub_script_echo1" - "grub_script_test" - "grub_script_leading_whitespace" - "grub_script_echo_keywords" - "grub_script_vars1" - "grub_script_for1" - "grub_script_while1" - "grub_script_if" - "grub_script_comments" - "grub_script_functions" - "grub_script_continue" - "grub_script_break" - "grub_script_shift" - "grub_script_blockarg" - "grub_script_return" - "grub_script_setparams" - "grub_cmd_date" - "grub_cmd_sleep" - "grub_cmd_regexp" - "grub_script_not" - "grub_cmd_echo" - "grub_script_expansion" - "grub_script_gettext" - "grub_script_escape_comma" - "help_test" - "grub_script_strcmp" - "test_sha512sum" - "grub_cmd_tr" - "test_unset" - "file_filter_test") - " ")))))) - ((#:configure-flags flags - ''()) - `(cons* "--with-platform=coreboot" - ,flags))))))) + (substitute-keyword-arguments (package-arguments grub) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-before 'check 'disable-broken-tests + (lambda _ + (setenv "DISABLE_HARD_ERRORS" "1") + (setenv "XFAIL_TESTS" + (string-join + ;; TODO: All the tests below use grub shell + ;; (tests/util/grub-shell.in), and here grub-shell uses + ;; QEMU and a Coreboot image to run the tests. Since we + ;; don't have a Coreboot package in Guix yet these tests + ;; are disabled. See the Guix bug #64667 for more details + ;; (https://debbugs.gnu.org/cgi/bugreport.cgi?bug=64667). + (list "pata_test" + "ahci_test" + "uhci_test" + "ehci_test" + "example_grub_script_test" + "ohci_test" + "grub_script_eval" + "grub_script_echo1" + "grub_script_test" + "grub_script_leading_whitespace" + "grub_script_echo_keywords" + "grub_script_vars1" + "grub_script_for1" + "grub_script_while1" + "grub_script_if" + "grub_script_comments" + "grub_script_functions" + "grub_script_continue" + "grub_script_break" + "grub_script_shift" + "grub_script_blockarg" + "grub_script_return" + "grub_script_setparams" + "grub_cmd_date" + "grub_cmd_set_date" + "grub_cmd_sleep" + "grub_cmd_regexp" + "grub_cmd_test" + "grub_script_not" + "grub_cmd_echo" + "grub_script_expansion" + "grub_script_gettext" + "grub_script_escape_comma" + "help_test" + "grub_script_strcmp" + "test_sha512sum" + "grub_cmd_tr" + "test_unset" + "file_filter_test") + " ")))))) + ((#:configure-flags flags #~'()) + #~(cons* "--with-platform=coreboot" #$flags)))))) (define-public grub-efi (package @@ -380,39 +378,38 @@ menu to select one of the installed operating systems.") (modify-inputs (package-native-inputs grub) (delete "parted" "qemu" "xorriso"))) (arguments - `(;; TODO: Tests need a UEFI firmware for qemu. There is one at - ;; https://github.com/tianocore/edk2/tree/master/OvmfPkg . - ;; Search for 'OVMF' in "tests/util/grub-shell.in". - ,@(substitute-keyword-arguments (package-arguments grub) - ((#:tests? _ #f) #f) - ((#:configure-flags flags ''()) - `(cons* "--with-platform=efi" - ,@(if (string-prefix? "x86_64" - (or (%current-target-system) - (%current-system))) - '("--enable-stack-protector") ; EFI-only for now - '()) - ,flags)) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'patch-stuff 'use-absolute-efibootmgr-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "grub-core/osdep/unix/platform.c" - (("efibootmgr") - (search-input-file inputs - "/sbin/efibootmgr"))))) - (add-after 'patch-stuff 'use-absolute-mtools-path - (lambda* (#:key inputs #:allow-other-keys) - (let ((mtools (assoc-ref inputs "mtools"))) - (substitute* "util/grub-mkrescue.c" - (("\"mformat\"") - (string-append "\"" mtools - "/bin/mformat\""))) - (substitute* "util/grub-mkrescue.c" - (("\"mcopy\"") - (string-append "\"" mtools - "/bin/mcopy\""))) - #t)))))))))) + ;; TODO: Tests need a UEFI firmware for qemu. There is one at + ;; https://github.com/tianocore/edk2/tree/master/OvmfPkg . + ;; Search for 'OVMF' in "tests/util/grub-shell.in". + (substitute-keyword-arguments (package-arguments grub) + ((#:tests? _ #f) #f) + ((#:configure-flags flags #~'()) + #~(cons* "--with-platform=efi" + #$@(if (string-prefix? "x86_64" + (or (%current-target-system) + (%current-system))) + #~("--enable-stack-protector") ;EFI-only for now + #~()) + #$flags)) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'patch-stuff 'use-absolute-efibootmgr-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "grub-core/osdep/unix/platform.c" + (("efibootmgr") + (search-input-file inputs "/sbin/efibootmgr"))))) + (add-after 'patch-stuff 'use-absolute-mtools-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "util/grub-mkrescue.c" + (("\"mformat\"") + (string-append "\"" + (search-input-file inputs "/bin/mformat") + "\""))) + (substitute* "util/grub-mkrescue.c" + (("\"mcopy\"") + (string-append "\"" + (search-input-file inputs "/bin/mcopy") + "\""))))))))))) (define-public grub-efi32 (package @@ -420,17 +417,19 @@ menu to select one of the installed operating systems.") (name "grub-efi32") (synopsis "GRand Unified Boot loader (UEFI 32bit version)") (arguments - `(,@(substitute-keyword-arguments (package-arguments grub-efi) - ((#:configure-flags flags ''()) - `(cons* - ,@(cond ((target-x86?) '("--target=i386")) - ((target-aarch64?) - (list "--target=arm" - (string-append "TARGET_CC=" - (cc-for-target "arm-linux-gnueabihf")))) - ((target-arm?) '("--target=arm")) - (else '())) - ,flags))))) + (substitute-keyword-arguments (package-arguments grub-efi) + ((#:configure-flags flags #~'()) + #~(cons* #$@(cond ((target-x86?) + #~("--target=i386")) + ((target-aarch64?) + #~("--target=arm" + (string-append "TARGET_CC=" + #$(cc-for-target + "arm-linux-gnueabihf")))) + ((target-arm?) + #~("--target=arm")) + (else #~())) + #$flags)))) (native-inputs (if (target-aarch64?) (modify-inputs (package-native-inputs grub-efi) @@ -454,24 +453,26 @@ menu to select one of the installed operating systems.") (prepend grub))) (arguments (substitute-keyword-arguments (package-arguments grub-efi) - ((#:modules modules `((guix build utils) (guix build gnu-build-system))) + ((#:modules modules `((guix build utils) + (guix build gnu-build-system))) `((ice-9 ftw) ,@modules)) ((#:phases phases) - `(modify-phases ,phases - (add-after 'install 'install-non-efi - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((input-dir (search-input-directory inputs - "/lib/grub")) - (output-dir (string-append (assoc-ref outputs "out") - "/lib/grub"))) - (for-each - (lambda (basename) - (if (not (or (string-prefix? "." basename) - (file-exists? (string-append output-dir "/" basename)))) - (symlink (string-append input-dir "/" basename) - (string-append output-dir "/" basename)))) - (scandir input-dir)) - #t))))))))) + #~(modify-phases #$phases + (add-after 'install 'install-non-efi + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((input-dir (search-input-directory inputs "/lib/grub")) + (output-dir (string-append (assoc-ref outputs "out") + "/lib/grub"))) + (for-each (lambda (basename) + (unless (or (string-prefix? "." basename) + (file-exists? (string-append + output-dir "/" + basename))) + (symlink (string-append input-dir "/" + basename) + (string-append output-dir "/" + basename)))) + (scandir input-dir))))))))))) (define-public (make-grub-efi-netboot name subdir) "Make a grub-efi-netboot package named NAME, which will be able to boot over diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 35b16f0045..c0cba8076f 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020, 2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2021 qblade <qblade@protonmail.com> -;;; Copyright © 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2021, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022, 2023 Juliana Sims <juli@incana.org> ;;; ;;; This file is part of GNU Guix. @@ -853,12 +853,15 @@ Makefiles, JSON Compilation Database, and experimentally Ninja.") ;; FIXME: tests/uniname/HangulSyllableNames.txt ;; seems like a UCD file but it is not distributed ;; with UCD. - "tests/uniwbrk/WordBreakTest.txt"))))))) + "tests/uniwbrk/WordBreakTest.txt"))))) + (patches (search-patches "gnulib-bootstrap.patch")))) (build-system copy-build-system) (arguments (list #:install-plan #~'(("./gnulib-tool" "bin/") + ("./gnulib-tool.py" "bin/") + ("./gnulib-tool.sh" "bin/") ("." "src/gnulib" #:exclude-regexp ("\\.git.*"))) #:modules '((ice-9 match) (guix build utils) @@ -866,6 +869,13 @@ Makefiles, JSON Compilation Database, and experimentally Ninja.") ((guix build gnu-build-system) #:prefix gnu:)) #:phases #~(modify-phases %standard-phases + ;; Since this package is intended to be used in source form, it + ;; should not retain references to tools (with the exception for the + ;; commands we install, which should be wrapper for proper + ;; execution). + (delete 'patch-source-shebangs) + (delete 'patch-generated-file-shebangs) + (delete 'patch-usr-bin-file) (add-before 'install 'check (assoc-ref gnu:%standard-phases 'check)) (add-before 'check 'fix-tests @@ -889,8 +899,10 @@ Makefiles, JSON Compilation Database, and experimentally Ninja.") sc_Wundef_boolean \\ sc_copyright_check \\ sc_file_system \\ + sc_error_message_warn_fatal \\ sc_indent \\ sc_keep_gnulib_texi_files_mostly_ascii \\ + sc_prefer_angle_bracket_headers \\ sc_prohibit_assert_without_use \\ sc_prohibit_close_stream_without_use \\ sc_prohibit_defined_have_decl_tests \\ @@ -899,15 +911,22 @@ Makefiles, JSON Compilation Database, and experimentally Ninja.") sc_prohibit_intprops_without_use \\ sc_prohibit_openat_without_use \\ sc_prohibit_test_minus_ao \\ - sc_unportable_grep_q")) + sc_readme_link_copying \\ + sc_readme_link_install \\ + sc_unportable_grep_q \\ + sc_unsigned_char \\ + sc_unsigned_int \\ + sc_unsigned_long \\ + sc_unsigned_short")) (substitute* "Makefile" - (("sc_check_(sym_list|copyright)" rule) + (("sc_check_(sym_list|copyright|config_h_reminder)" rule) (string-append "disabled_check_" rule)) (("sc_cpp_indent_check") "disabled_cpp_indent_check") (("sc_prefer_ac_check_funcs_once") "disabled_prefer_ac_check_funcs_once") - (("sc_prohibit_(AC_LIBOBJ_in_m4|leading_TABs)" rule) + (("sc_prohibit_(AC_LIBOBJ_in_m4|leading_TABs\ +|sc_omitted_at)" rule) (string-append "disabled_prohibit_" rule))))) (add-before 'check 'regenerate-unicode (lambda* (#:key inputs #:allow-other-keys) @@ -939,7 +958,8 @@ Makefiles, JSON Compilation Database, and experimentally Ninja.") (sha256 (base32 "0k6wyijyzdl5g3nibcwfm898kfydx1pqaz28v7fdvnzdvd5fz7lh")))) - (find-ucd-files "EastAsianWidth.txt" + (find-ucd-files "BidiMirroring.txt" + "EastAsianWidth.txt" "LineBreak.txt" "auxiliary/WordBreakProperty.txt" "auxiliary/GraphemeBreakProperty.txt" @@ -962,22 +982,9 @@ Makefiles, JSON Compilation Database, and experimentally Ninja.") ("NormalizationTest.txt" . "uninorm") ("auxiliary/GraphemeBreakTest.txt" . "unigbrk") ("auxiliary/WordBreakTest.txt" . "uniwbrk"))) - (delete-file "gen-uni-tables")))) - (add-after 'install 'restore-shebangs - (lambda _ - (substitute* (find-files - (string-append #$output "/src/gnulib") - (lambda (fname stat) - (and (not (string-suffix? "/lib/javaversion.class" fname)) - (not (string-suffix? ".mo" fname))))) - (("^#! ?(.*)/bin/sh" _ prefix) - "#!/bin/sh") - (("^#! ?(.*)/bin/python3" _ prefix) - "#!/usr/bin/env python3") - (("^#! ?(.*)/bin/([a-zA-Z0-9-]+)" _ prefix program) - (string-append "#!/usr/bin/" program)))))))) + (delete-file "gen-uni-tables"))))))) (inputs - (list bash-minimal)) ;shebang for gnulib-tool + (list bash-minimal)) ;shebang for gnulib-tool (native-inputs (list bash-minimal python perl clisp @@ -1005,9 +1012,9 @@ maintenance-related files, for convenience.") (define-public gnulib (gnulib-checkout - #:version "2022-12-31" - #:commit "875461ffdf58ac04677957b4ae4160465b83b940" - #:hash (base32 "0bf7a6wdns9c5wwv60qfcn9llg0j6jz5ryd2qgsqqx2i6xkmp77c"))) + #:version "2024-05-30" + #:commit "ac4b301ae15223c98b51cd5a0eda2e2cf57c817b" + #:hash (base32 "0f4w56fc97clg13mmdghx84dh9xqmaqr3j672ppfh3h66gmmmvzs"))) (define-public pdpmake (package diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index fafa5d3f33..550a5d0f1d 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -75,6 +75,7 @@ #:use-module (gnu packages bash) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages glib) @@ -85,6 +86,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) + #:use-module (gnu packages maths) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -93,6 +95,7 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages python-science) + #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages time) #:use-module (gnu packages xml) @@ -986,6 +989,35 @@ macros for defining tests, grouping them into suites, and providing a test runner. It is quite unopinionated with most of its features being optional.") (license license:isc))) +(define-public klee + (package + (name "klee") + (version "3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/klee/klee") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1nma6dqi8chjb97llsa8mzyskgsg4dx56lm8j514j5wmr8vkafz6")))) + (arguments + (list + #:configure-flags + #~(list (string-append "-DLLVMCC=" + (search-input-file %build-inputs "/bin/clang")) + (string-append "-DLLVMCXX=" + (search-input-file %build-inputs "/bin/clang++"))))) + (native-inputs (list clang-13 llvm-13 python-lit)) + (inputs (list gperftools sqlite z3)) + (build-system cmake-build-system) + (home-page "https://klee-se.org/") + (synopsis "Symbolic execution engine") + (description "KLEE is a symbolic virtual machine built on top of the LLVM +compiler infrastructure.") + (license license:bsd-3))) + (define-public cpputest (package (name "cpputest") @@ -1031,8 +1063,8 @@ but it works for any C/C++ project.") go-github-com-mattn-go-colorable go-github-com-mattn-go-runewidth go-github-com-robfig-cron - go-golang.org-x-sync-errgroup - go-golang.org-x-sync-semaphore + go-golang-org-x-sync + go-golang-org-x-sync go-gopkg-in-yaml-v3)) (native-inputs (list go-github-com-google-go-cmp-cmp)) (home-page "https://rhysd.github.io/actionlint/") diff --git a/gnu/packages/clifm.scm b/gnu/packages/clifm.scm index 24530ada77..03b7692358 100644 --- a/gnu/packages/clifm.scm +++ b/gnu/packages/clifm.scm @@ -30,7 +30,7 @@ (define-public clifm (package (name "clifm") - (version "1.18") + (version "1.19") (source (origin (method git-fetch) @@ -39,7 +39,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1r83wx6nxsdycnj56h9s32mraisjx1w0rsnmj9xw2nf249j8c05n")))) + (base32 "062z3ic2knsrnj9bm5hh5ah47x18zpqdpvv4az88hyvrasy49p20")))) (build-system gnu-build-system) (arguments `(#:make-flags (list (string-append "CC=" diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index d6ac8178f3..44edf43db5 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2023 Fries <fries1234@protonmail.com> ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com> +;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -823,14 +824,14 @@ Objective@tie{}C, D, Java, Pawn, and Vala). Features: (define-public astyle (package (name "astyle") - (version "3.4.8") + (version "3.5") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/astyle/astyle/astyle%20" - version "/astyle_" version "_linux.tar.gz")) + version "/astyle-" version ".tar.bz2")) (sha256 - (base32 "1ms54wcs7hg1bsywqwf2lhdfizgbk7qxc9ghasxk8i99jvwlrk6b")))) + (base32 "0g4jyp47iz97ld9ac4wb5k59j4cs8dbw4dp8f32bwqx8pyvirz6y")))) (build-system gnu-build-system) (arguments (list @@ -839,11 +840,13 @@ Objective@tie{}C, D, Java, Pawn, and Vala). Features: #~(list (string-append "prefix=" #$output) "INSTALL=install" "release" "shared") - #:modules '((guix build gnu-build-system) ;FIXME use %default-modules - (guix build utils) - (ice-9 regex)) #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-makefile + (lambda _ + (substitute* "build/gcc/Makefile" + (("CBASEFLAGS = -Wall -Wextra -fno-rtti -fno-exceptions -std=c\\+\\+11") + "CBASEFLAGS = -Wall -Wextra -fno-rtti -fno-exceptions -std=c++17")))) (replace 'configure (lambda _ (chdir "build/gcc"))) @@ -852,12 +855,6 @@ Objective@tie{}C, D, Java, Pawn, and Vala). Features: ;; Libraries and headers aren't installed by default. (let ((include (string-append #$output "/include")) (lib (string-append #$output "/lib"))) - (define (link.so file strip-pattern) - (symlink - (basename file) - (regexp-substitute #f - (string-match strip-pattern file) - 'pre))) (mkdir-p include) (copy-file "../../src/astyle.h" (string-append include "/astyle.h")) @@ -865,12 +862,7 @@ Objective@tie{}C, D, Java, Pawn, and Vala). Features: (for-each (lambda (l) (copy-file l (string-append lib "/" (basename l)))) - (find-files "bin" "^lib.*\\.so")) - (for-each - (lambda (file) - (link.so file "(\\.[0-9]+){3}$") ;.so - (link.so file "(\\.[0-9]+){2}$")) ;.so.3 - (find-files lib "lib.*\\.so\\..*")))))))) + (find-files "bin" "^lib.*\\.so")))))))) (home-page "https://astyle.sourceforge.net/") (synopsis "Source code indenter, formatter, and beautifier") (description diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index b4d236c35b..0433059493 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -878,7 +878,7 @@ MesCC-Tools), and finally M2-Planet.") (define patch-mesboot ;; The initial patch. (package - (inherit patch) + (inherit patch/pinned) (name "patch-mesboot") (version "2.5.9") (source (origin @@ -2167,8 +2167,8 @@ exec " gcc "/bin/" program (define patch-boot0 (package - (inherit patch) - (source (bootstrap-origin (package-source patch))) + (inherit patch/pinned) + (source (bootstrap-origin (package-source patch/pinned))) (name "patch-boot0") (native-inputs '()) (inputs @@ -3482,7 +3482,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ("bzip2" ,bzip2) ("file" ,file) ("diffutils" ,diffutils) - ("patch" ,patch) + ("patch" ,patch/pinned) ("findutils" ,findutils) ("gawk" ,gawk))) ("sed" ,sed-final) diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm index de27f50e0c..818a80b94e 100644 --- a/gnu/packages/configuration-management.scm +++ b/gnu/packages/configuration-management.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> +;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,6 +20,7 @@ (define-module (gnu packages configuration-management) #:use-module (gnu packages) #:use-module (guix build-system go) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) @@ -45,41 +47,42 @@ "0ildvlq7v8vnw74y4fgnv3hpq49bpl6zh1wmakfh46crwg7ffmjb")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/twpayne/chezmoi" - #:install-source? #f - #:phases - (modify-phases %standard-phases - ;; Remove test script which expect additional user's programs available - ;; in the PATH. The testdata directory is removed in the latest version - ;; (2.46.1) of the program. - (add-after 'unpack 'remove-failing-test-scripts - (lambda* (#:key import-path #:allow-other-keys) - (for-each (lambda (f) - (delete-file (string-append "src/" import-path "/testdata/scripts/" f))) - '("bitwarden.txt" - "cd.txt" - "cd_unix.txt" - "completion.txt" - "diff.txt" - "edit.txt" - "editconfig.txt" - "git.txt" - "gopass.txt" - "keepassxc.txt" - "lastpass.txt" - "onepassword.txt" - "pass.txt" - "runscriptdir_unix.txt" - "script_unix.txt" - "secretgeneric.txt" - "secretgopass.txt" - "secretkeepassxc.txt" - "secretlastpass.txt" - "secretonepassword.txt" - "secretpass.txt"))))))) + (list + #:go go-1.21 + #:import-path "github.com/twpayne/chezmoi" + #:install-source? #f + #:phases + #~(modify-phases %standard-phases + ;; Remove test script which expect additional user's programs available + ;; in the PATH. The testdata directory is removed in the latest version + ;; (2.46.1) of the program. + (add-after 'unpack 'remove-failing-test-scripts + (lambda* (#:key import-path #:allow-other-keys) + (for-each (lambda (f) + (delete-file (string-append "src/" import-path "/testdata/scripts/" f))) + '("bitwarden.txt" + "cd.txt" + "cd_unix.txt" + "completion.txt" + "diff.txt" + "edit.txt" + "editconfig.txt" + "git.txt" + "gopass.txt" + "keepassxc.txt" + "lastpass.txt" + "onepassword.txt" + "pass.txt" + "runscriptdir_unix.txt" + "script_unix.txt" + "secretgeneric.txt" + "secretgopass.txt" + "secretkeepassxc.txt" + "secretlastpass.txt" + "secretonepassword.txt" + "secretpass.txt"))))))) (native-inputs - (list go-etcd-io-bbolt - go-github-com-alecthomas-chroma + (list go-github-com-alecthomas-chroma go-github-com-aymerick-douceur go-github-com-bmatcuk-doublestar-v2 go-github-com-charmbracelet-glamour @@ -92,19 +95,12 @@ go-github-com-google-go-querystring go-github-com-google-goterm go-github-com-google-renameio - go-github-com-google-uuid go-github-com-gorilla-css - go-github-com-huandu-xstrings - go-github-com-imdario-mergo go-github-com-lucasb-eyer-go-colorful - go-github-com-masterminds-goutils - go-github-com-masterminds-semver - go-github-com-masterminds-sprig + go-github-com-masterminds-sprig-v3 go-github-com-mattn-go-isatty go-github-com-mattn-go-runewidth go-github-com-microcosm-cc-bluemonday - go-github-com-mitchellh-copystructure - go-github-com-mitchellh-reflectwalk go-github-com-muesli-reflow-ansi go-github-com-muesli-reflow-indent go-github-com-muesli-reflow-padding @@ -124,7 +120,7 @@ go-github-com-yuin-goldmark go-github-com-zalando-go-keyring go-github-go-git - go-golang-org-x-crypto + go-go-etcd-io-bbolt go-golang-org-x-net go-golang-org-x-oauth2 go-golang-org-x-term diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index f0c09bdef9..4857426613 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -129,14 +129,14 @@ It is developed using Objective Caml and Camlp5.") (list lablgtk3 ocaml-lablgtk3-sourceview3)))) (define-public proof-general - ;; The latest release is from 2016 and there has been more than 450 commits + ;; The latest release is from 2022 and there has been more than 100 commits ;; since then. - ;; Commit from 2021-11-25. - (let ((commit "1b1083e86e0cddc20ff2f1a6b25c7a7eee2edf02") + ;; Commit from 2024-04-29. + (let ((commit "cb23709ad0c9a9ca0ee48b3ee73c29caea243b98") (revision "1")) (package (name "proof-general") - (version (git-version "4.4" revision commit)) + (version (git-version "4.5" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -145,7 +145,7 @@ It is developed using Objective Caml and Camlp5.") (file-name (git-file-name name version)) (sha256 (base32 - "1pnysczhscapgwmvf6ix7f31lf3hnh8h977bfll1m7jlxl9b9c0j")))) + "1spd8rz95s1x91i4lbbb6zabb8014fihx6ai6pgad1nwyr0y9bir")))) (build-system gnu-build-system) (native-inputs `(("emacs" ,emacs-minimal) @@ -170,6 +170,12 @@ It is developed using Objective Caml and Camlp5.") (substitute* "Makefile" (("\\(setq byte-compile-error-on-warn t\\)") "(setq byte-compile-error-on-warn nil)")))) + (add-after 'unpack 'modify-readme-name + ;; The README file is called "README.md", but the Make variable + ;; "DOC_FILES" still refers to "README". + (lambda _ + (substitute* "Makefile" + (("README") "README.md")))) (add-after 'unpack 'patch-hardcoded-paths (lambda _ (substitute* "Makefile" @@ -528,7 +534,9 @@ Coq proof assistant.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0qk72r6cqxwhqqkl2kmryhw365w3l2016qii1q1sk3md7zq46jcz")))) + (base32 "0qk72r6cqxwhqqkl2kmryhw365w3l2016qii1q1sk3md7zq46jcz")) + (patches + (search-patches "coq-autosubst-1.8-remove-deprecated-files.patch")))) (build-system gnu-build-system) (arguments `(#:tests? #f diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 85e0fa98f9..f42996d044 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1749,6 +1749,23 @@ Functions include searching for people, searching by DOI, or searching by Orcid ID.") (license license:expat))) +(define-public r-rrna + (package + (name "r-rrna") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "RRNA" version)) + (sha256 + (base32 "0bgsakpz1wr3wr6c5xa7wx2xmzs3xzkscrgwn6dc7f93kpq1j17p")))) + (properties `((upstream-name . "RRNA"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/package=RRNA") + (synopsis "Secondary structure plotting for RNA") + (description "This package facilitates RNA secondary structure plotting.") + (license license:gpl3))) + (define-public r-ruv (package (name "r-ruv") @@ -31108,6 +31125,30 @@ and multivariate regression), and analysis of variance tolerance intervals. Visualizations are also available for most of these settings.") (license license:gpl2+))) +(define-public r-topdom + (package + (name "r-topdom") + (version "0.10.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "TopDom" version)) + (sha256 + (base32 "1rryfnwvdlpdrjgs6sciy91cxfp4jykll0swclasydjvj4n642i6")))) + (properties `((upstream-name . "TopDom"))) + (build-system r-build-system) + (propagated-inputs (list r-ggplot2 r-matrixstats r-reshape2 r-tibble)) + (home-page "https://github.com/HenrikBengtsson/TopDom") + (synopsis "Efficient method for identifying genomic topological domains") + (description + "This method identifies topological domains in genomes from Hi-C sequence +data. The authors published an implementation of their method as an R script. +This package originates from those original @code{TopDom} R scripts and +provides help pages adopted from the original @code{TopDom} PDF documentation. +It also provides a small number of bug fixes to the original code.") + ;; Either version of the GPL + (license (list license:gpl2 license:gpl3)))) + ;; Keep this in sync with the liblantern package. (define-public r-torch (package diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f6e608d99a..d9926701f5 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -527,14 +527,14 @@ mapping from string keys to string values.") (define-public memcached (package (name "memcached") - (version "1.6.21") + (version "1.6.28") (source (origin (method url-fetch) (uri (string-append "https://memcached.org/files/memcached-" version ".tar.gz")) (sha256 - (base32 "1vm27la2yanjhwwdwabci4c21yv9hy5iqas47kcxaza1zh79i267")))) + (base32 "0ma8qn97hng8vp52s3906g9id75yicf96950hm40zn47k1z2vl5i")))) (build-system gnu-build-system) (inputs (list libevent cyrus-sasl)) @@ -3032,34 +3032,6 @@ on another machine, accessed via TCP/IP.") (home-page "https://pqxx.org/") (license license:bsd-3))) -(define-public go-go-etcd-io-bbolt - (package - (name "go-go-etcd-io-bbolt") - (version "1.3.6") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/etcd-io/bbolt") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0pj5245d417za41j6p09fmkbv05797vykr1bi9a6rnwddh1dbs8d")))) - (build-system go-build-system) - (arguments - `(#:import-path "go.etcd.io/bbolt" - ;; Extending the test timeout to 30 minutes still times out on aarch64. - #:tests? ,(not target-arm?))) - (propagated-inputs - (list go-golang-org-x-sys)) - (home-page "https://go.etcd.io/bbolt") - (synopsis "Embedded key/value database for Go") - (description "Bolt is a pure Go key/value store inspired by Howard Chu's -LMDB project. The goal of the project is to provide a simple, fast, and -reliable database for projects that don't require a full database server such as -Postgres or MySQL.") - (license license:expat))) - (define-public python-peewee (package (name "python-peewee") @@ -3643,6 +3615,53 @@ designed for efficient and high-performing database access, adapted into a simple and Pythonic domain language.") (license license:x11))) +(define-public python-sqlalchemy-2 + (package + (name "python-sqlalchemy") + (version "2.0.27") + (source + (origin + (method url-fetch) + (uri (pypi-uri "SQLAlchemy" version)) + (sha256 + (base32 "1y1l4lwhvgs7ivwhcp4vljjdsaha77x9859kz65virhzlxlyv9l6")))) + (build-system pyproject-build-system) + (native-inputs (list python-pytest)) + (propagated-inputs (list python-typing-extensions)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-tests + (lambda _ + ;; Remove expensive tests. + (for-each delete-file + '("test/ext/mypy/test_mypy_plugin_py3k.py" + "test/typing/test_mypy.py" + "test/aaa_profiling/test_memusage.py")) + (substitute* "test/engine/test_pool.py" + ;; Disable a test that fails randomly. + (("def test_recycle_pool_no_race") + "def _test_recycle_pool_no_race")))) + ;; According to the pyproject.toml, greenlet is optional. + (add-after 'unpack 'remove-dependency-on-greenlet + (lambda _ + (substitute* "setup.cfg" + (("greenlet != 0.4.17") + "#greenlet != 0.4.17")) + (substitute* "PKG-INFO" + (("Requires-Dist: greenlet") + "#Requires-Dist: greenlet"))))))) + (home-page "https://www.sqlalchemy.org") + (synopsis "SQL toolkit and object relational mapper") + (description + "SQLAlchemy is the Python SQL toolkit and @acronym{ORM, Object Relational Mapper} +that gives application developers the full power and flexibility of SQL. It provides +a full suite of well known enterprise-level persistence patterns, designed for +efficient and high-performing database access, adapted into a simple and Pythonic +domain language.") + (license license:expat))) + (define-public python-sqlalchemy-stubs (package (name "python-sqlalchemy-stubs") @@ -3882,7 +3901,7 @@ PickleShare.") (define-public python-apsw (package (name "python-apsw") - (version "3.45.1.0") + (version "3.46.0.0") ;; The compressed release has fetching functionality disabled. (source (origin @@ -3892,7 +3911,7 @@ PickleShare.") version "/apsw-" version ".zip")) (sha256 (base32 - "1vfrzb414pbh5k0cgcqkp039jvla2galapn4a551zgh8xi70bnrp")))) + "10yfbasi4mq63g0svyl1h49ylwn9znjylq78id16dzxzk9q9ipdx")))) (build-system pyproject-build-system) (native-inputs (list unzip)) diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 3ff8fa5b65..6a6437ff0c 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -69,7 +69,7 @@ (define-public sddm (package (name "sddm") - (version "0.20.0") + (version "0.21.0") (source (origin (method git-fetch) (uri (git-reference @@ -78,7 +78,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1450zv03d3mbid27986p4mdshw9qf3ar8crl4idybf7khxgan22y")))) + "0mxrh0z9x4r4bli25g746n66adwnf3r42lzq0yssc50v9y7fc1a1")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config qttools-5)) @@ -105,6 +105,8 @@ #~(list "-DENABLE_WAYLAND=ON" "-DENABLE_PAM=ON" + ;; PAM is configured by pam service. + "-DINSTALL_PAM_CONFIGURATION=OFF" ;; Both flags are required for elogind support. "-DNO_SYSTEMD=ON" "-DUSE_ELOGIND=ON" diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 68fc5b9d1d..6d0c6a6dca 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -337,14 +337,14 @@ and BOOTP/TFTP for network booting of diskless machines.") ;; When updating, check whether isc-dhcp's bundled copy should be as well. ;; The BIND release notes are available here: ;; https://www.isc.org/bind/ - (version "9.19.21") + (version "9.19.24") (source (origin (method url-fetch) (uri (string-append "https://ftp.isc.org/isc/bind9/" version "/bind-" version ".tar.xz")) (sha256 - (base32 "133f1aq8acaz9z03cl0gcrj4pq0hqm6c3sm4hz67d37phndsjs1b")))) + (base32 "171668qgjvf257m3r04lxmbsiz9lnn57djnlmn8plh1lj77fw3nh")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs @@ -1228,35 +1228,41 @@ and TCP-capable recursive DNS server for finding domains on the internet.") (define-public openresolv (package (name "openresolv") - (version "3.12.0") - (source (origin - (method url-fetch) - (uri (string-append "https://roy.marples.name/downloads/openresolv/" - "openresolv-" version ".tar.xz")) - (sha256 - (base32 - "15qvp5va2yrqpz0ba54clvn8cbc66v4sl7k3bi9ji8jpx040bcs2")) - (patches - (search-patches "openresolv-restartcmd-guix.patch")))) + (version "3.13.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/NetworkConfiguration/openresolv") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "03m8n0j0kxxm5kpl66gz4lxr1qqgrp8zlkaq9j8fz27fih0g75xf")) + (patches + (search-patches "openresolv-restartcmd-guix.patch")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; No test suite - #:configure-flags - (list (string-append "--sysconfdir=/etc")) - #:make-flags - (list (string-append "SYSCONFDIR=/" (assoc-ref %outputs "out") "/etc")) - #:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (coreutils (assoc-ref inputs "coreutils-minimal"))) - (substitute* (string-append out "/sbin/resolvconf") - (("RESOLVCONF=\"\\$0\"") - (format #f "\ -RESOLVCONF=\"$0\" -PATH=~a/bin:$PATH" - coreutils))))))))) + (list #:tests? #f ; No test suite + + #:configure-flags + #~(list (string-append "--prefix=" #$output:out) + "--sysconfdir=/etc" + "--rundir=/run") + + #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "install" + (string-append "SYSCONFDIR=" #$output "/etc") + make-flags))) + (add-after 'install 'wrap-program + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (string-append #$output "/sbin/resolvconf") + (("RESOLVCONF=\"\\$0\"") + (format #f "RESOLVCONF=\"$0\"\nPATH=~a/bin:$PATH" + (assoc-ref inputs "coreutils-minimal"))))))))) (inputs (list coreutils-minimal)) (home-page "https://roy.marples.name/projects/openresolv/") diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index b18de182fe..c033486c6a 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -547,6 +547,7 @@ runcexecutor/executor.go" ;; Our LD doesn't like the statically linked relocatable things ;; that go produces, so install the dynamic version of ;; dockerd instead. + (setenv "BUILDFLAGS" "-trimpath") (invoke "hack/make.sh" "dynbinary"))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) @@ -570,9 +571,7 @@ runcexecutor/executor.go" (install-file "bundles/dynbinary-daemon/dockerd" out-bin) (install-file (string-append "bundles/dynbinary-daemon/dockerd-" (getenv "VERSION")) - out-bin)))) - (add-after 'install 'remove-go-references - (assoc-ref go:%standard-phases 'remove-go-references))))) + out-bin))))))) (inputs (list btrfs-progs containerd ; for containerd-shim diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d000e7fd02..618b505f2f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -97,7 +97,7 @@ ;;; Copyright © 2021, 2022 Stefan Reichör <stefan@xsteve.at> ;;; Copyright © 2021, 2022, 2023 Simon Tournier <zimon.toutoune@gmail.com> ;;; Copyright © 2021 Eugene Klimov <lipklim@mailbox.org> -;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2021, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 David Dashyan <mail@davie.li> ;;; Copyright © 2021 Dhruvin Gandhi <contact@dhruvin.dev> ;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org> @@ -141,6 +141,7 @@ ;;; Copyright © 2024 Ilya Chernyshov <ichernyshovvv@gmail.com> ;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu> ;;; Copyright © 2024 Noé Lopez <noelopez@free.fr> +;;; Copyright © 2024 gemmaro <gemmaro.dev@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -519,7 +520,7 @@ e.g. emacs-geiser-guile for Guile.") (define-public emacs-gptel (package (name "emacs-gptel") - (version "0.8.6") + (version "0.9.0") (source (origin (method git-fetch) (uri (git-reference @@ -528,7 +529,7 @@ e.g. emacs-geiser-guile for Guile.") (file-name (git-file-name name version)) (sha256 (base32 - "1k3mq0xjxdbwbhssd16yh6hfg3jpm9qqx4q4jc2igisjja75nmrv")))) + "0q99lms7dwfa5w48mykynyjs1wv4qjnlhf7qd816j6lvxkd40pi4")))) (build-system emacs-build-system) (arguments (list @@ -1485,7 +1486,7 @@ configuration files, such as @file{.gitattributes}, @file{.gitignore}, and (define-public emacs-with-editor (package (name "emacs-with-editor") - (version "3.3.2") + (version "3.3.4") (source (origin (method git-fetch) @@ -1494,7 +1495,7 @@ configuration files, such as @file{.gitattributes}, @file{.gitignore}, and (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1wzzymlka4f798m75kizjh1yvnh49y8m029c7p5pg7gbv6d0wd8a")))) + (base32 "1jnjd2pzx03vzimsfdcaa3d11fiqiv6hi5nrk6wj2m9qz8alnj2b")))) (build-system emacs-build-system) (arguments (list @@ -1915,7 +1916,7 @@ files left by ArchLinux's pacman.") (define-public emacs-minions (package (name "emacs-minions") - (version "1.0.0") + (version "1.0.1") (source (origin (method git-fetch) @@ -1924,7 +1925,7 @@ files left by ArchLinux's pacman.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ralw9znj749ii046l0dfa3aacm05g1ix59rfsjafhky8fiwz37m")))) + (base32 "1m51amzflq3l8x02azwjri721zf6aj0q4sld266j7fcyp24wwk1g")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat emacs-dash)) @@ -1945,10 +1946,10 @@ Alternatively the menu can be bound globally, for example: (license license:gpl3+))) (define-public emacs-nano-modeline - (let ((commit "a18780c277838983932623870752f0adddef0345")) ;version bump + (let ((commit "04676d57a1e602123a593836745a744d1b2028fb")) ;version bump (package (name "emacs-nano-modeline") - (version "1.0.1") + (version "1.1.0") (source (origin (method git-fetch) (uri (git-reference @@ -1957,7 +1958,7 @@ Alternatively the menu can be bound globally, for example: (file-name (git-file-name name version)) (sha256 (base32 - "017vxz96fh26jb2xj7jnz8w580knvybcdr4xjad4xs72l2lrkj37")))) + "1q10zd8aiq5xm7p4sm1mrfmw0sfgfyznyk4lvh2rl9pqh9kh700a")))) (build-system emacs-build-system) (home-page "https://github.com/rougier/nano-modeline") (synopsis "Emacs minor mode controlling mode line") @@ -1969,7 +1970,7 @@ displayed at the bottom or at the top.") (define-public emacs-moody (package (name "emacs-moody") - (version "1.0.0") + (version "1.1.0") (source (origin (method git-fetch) @@ -1978,7 +1979,7 @@ displayed at the bottom or at the top.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "03rg1f8lnxc16cipadaxgvl9cdxlihn64xbww35n8cbkhgmmir5z")))) + (base32 "1pj1gpwmwl5affnvwb8ckx4xl9vm7xs8bn1xncsr0m8aamv2rh03")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) @@ -3829,7 +3830,7 @@ code completion and project management support.") (define-public emacs-auto-compile (package (name "emacs-auto-compile") - (version "2.0.1") + (version "2.0.2") (source (origin (method git-fetch) (uri (git-reference @@ -3838,7 +3839,7 @@ code completion and project management support.") (file-name (git-file-name name version)) (sha256 (base32 - "05nphhbf5nzghi5pi35hhbnal66wi7qmflllf72i5x668whc0aq1")))) + "1a7b0k0znlqxc47plp7ydm0qs3ql29fk0rzg13jg23n8g1sjhsnl")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat emacs-packed)) (home-page "https://github.com/emacscollective/auto-compile") @@ -5006,7 +5007,7 @@ that the binary uses instead of the actual binary contents.") (define-public emacs-ellama (package (name "emacs-ellama") - (version "0.9.10") + (version "0.9.11") (source (origin (method git-fetch) (uri (git-reference @@ -5014,7 +5015,7 @@ that the binary uses instead of the actual binary contents.") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "08kfa89m2mz6j5wfc73bwid2384v4kf944q1qymkjg3r53i1a9c7")))) + "18wxp7shzqhi7paqidv8j80fsiikvsckzm02cwhqy8fyyypv9pdc")))) (build-system emacs-build-system) (propagated-inputs (list emacs-dash emacs-llm emacs-spinner)) (home-page "https://github.com/s-kostyaev/ellama") @@ -7464,16 +7465,16 @@ Lisp.") (define-public emacs-paren-face (package (name "emacs-paren-face") - (version "1.1.0") + (version "1.1.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/tarsius/paren-face") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ma2sxhds4b73zap8kyphbng7a77fsbwrzlybar11if4asd1dfba")))) + (base32 "16rq4q4irzdxcnyhqbjcg7sy2n54wmbp9awn0dbz4w0yif80374v")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) @@ -9201,7 +9202,7 @@ src blocks.") (define-public emacs-ol-notmuch (package (name "emacs-ol-notmuch") - (version "2.0.1") + (version "2.0.2") (source (origin (method git-fetch) @@ -9210,7 +9211,7 @@ src blocks.") (commit (string-append "v" version)))) (sha256 (base32 - "1rlpl3kb709q5brkjrrpirdnhvyh447q93li9lgfz67yya29rfqd")) + "1hqppr7z3b9wwlsh5ahv3n3snqll6ipdczk47g72bihzjvg9fxyn")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (propagated-inputs @@ -10520,7 +10521,7 @@ in HTML mode.") ;; Update together with sbcl-slime-swank. (package (name "emacs-slime") - (version "2.29.1") + (version "2.30") (source (origin (method git-fetch) @@ -10529,7 +10530,7 @@ in HTML mode.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1fcasqsdfwsphkfx1vd3r5mr89vgvzb9g2dbw82mc9lijg1mr1ki")))) + (base32 "1z9mi663cs5gks1fz5yy9dycx47sbs6fdr47z05yc1nl8znqib99")))) (build-system emacs-build-system) (arguments (list @@ -11058,7 +11059,7 @@ sgml/html integration, and indentation (working with sgml).") (define-public emacs-jinx (package (name "emacs-jinx") - (version "1.7") + (version "1.8") (source (origin (method git-fetch) @@ -11068,7 +11069,7 @@ sgml/html integration, and indentation (working with sgml).") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "04f9yd710rrn1v5b44jaackrnc7f6ywy4r5j5ig12gkddbx3r29i")))) + (base32 "0sdirjxi5gsmc1vbmkj494s54zcmf6xrl6lrdqjnqmlbgq8517nw")))) (build-system emacs-build-system) (arguments (list @@ -12740,7 +12741,7 @@ between symbols.") (define-public emacs-hl-todo (package (name "emacs-hl-todo") - (version "3.6.0") + (version "3.7.0") (source (origin (method git-fetch) (uri (git-reference @@ -12749,7 +12750,7 @@ between symbols.") (file-name (git-file-name name version)) (sha256 (base32 - "1rq16zrdmq9j2jrsg136r5qbqvsgd2bkgpb2wmxca91kfx86r2qq")))) + "0am37ndwz8gkfs0d1va86q84yjdvvf0wag8fns3q87i5yhssi7vp")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) @@ -17139,7 +17140,7 @@ passive voice.") (define-public emacs-org (package (name "emacs-org") - (version "9.7.4") + (version "9.7.6") (source (origin (method git-fetch) @@ -17148,7 +17149,7 @@ passive voice.") (commit (string-append "release_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "00crs2q4yvmv2jgzmcfyl2g6m7g42zpggyssmcj8anwrsp748z9b")))) + (base32 "0n3lnccd011njmy6srpjran2pi2frc3vq1cx11cqzd5p5961v7mj")))) (build-system emacs-build-system) (arguments (list @@ -17889,44 +17890,45 @@ using a convenient notation.") license:fdl1.3+)))) ;GFDLv1.3+ for the manual (define-public emacs-beframe - (package - (name "emacs-beframe") - (version "1.1.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/protesilaos/beframe") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "03b5yb2vxcfg2ihiqkl3434rhwn51mr312kzcfhvr4xshgp2g0q5")))) - (build-system emacs-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-after 'install 'makeinfo - (lambda _ - (invoke "emacs" - "--batch" - "--eval=(require 'ox-texinfo)" - "--eval=(find-file \"README.org\")" - "--eval=(org-texinfo-export-to-info)") - (install-file "beframe.info" - (string-append #$output "/share/info"))))))) - (native-inputs - (list texinfo)) - (home-page "https://protesilaos.com/emacs/beframe") - (synopsis "Isolate Emacs buffers per frame") - (description - "Beframe enables a frame-oriented Emacs workflow where each frame has + (let ((commit "c3f4583b0767e7f8c38c83ed29af40af8ba3bdfa")) ;version bump + (package + (name "emacs-beframe") + (version "1.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/protesilaos/beframe") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1j9v85wxahnm2h828c8dbjm0f81j9pxlf54dgcw443cl0kwcda9c")))) + (build-system emacs-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'makeinfo + (lambda _ + (invoke "emacs" + "--batch" + "--eval=(require 'ox-texinfo)" + "--eval=(find-file \"README.org\")" + "--eval=(org-texinfo-export-to-info)") + (install-file "beframe.info" + (string-append #$output "/share/info"))))))) + (native-inputs + (list texinfo)) + (home-page "https://protesilaos.com/emacs/beframe") + (synopsis "Isolate Emacs buffers per frame") + (description + "Beframe enables a frame-oriented Emacs workflow where each frame has access to the list of buffers visited therein. In the interest of brevity, we call buffers that belong to frames ``beframed''. Producing multiple frames does not generate multiple buffer lists. There still is only one global list of buffers. Beframing them simply filters the list.") - (license (list license:gpl3+ - license:fdl1.3+)))) ; GFDLv1.3+ for the manual + (license (list license:gpl3+ + license:fdl1.3+))))) ; GFDLv1.3+ for the manual (define-public emacs-gn-mode (package @@ -23168,7 +23170,7 @@ match and total match information in the mode-line in various search modes.") (define-public emacs-pg (package (name "emacs-pg") - (version "0.35") + (version "0.36") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/emarsden/pg-el") @@ -23176,7 +23178,7 @@ match and total match information in the mode-line in various search modes.") (file-name (git-file-name name version)) (sha256 (base32 - "1ksr1crjl27s481xyr22wlj7i0ss3k5hp68zlzz2cfrl0a5fdsmv")))) + "17ymqf6jf359l3hrl4ayqj8bfskhdh282j230bxqc3ihf5vkzl77")))) (build-system emacs-build-system) (propagated-inputs (list emacs-peg)) (home-page "https://github.com/emarsden/pg-el") @@ -23930,7 +23932,7 @@ interactive commands and functions, such as @code{completing-read}.") (define-public emacs-org-ql (package (name "emacs-org-ql") - (version "0.8.6") + (version "0.8.7") (source (origin (method git-fetch) (uri (git-reference @@ -23938,7 +23940,7 @@ interactive commands and functions, such as @code{completing-read}.") (commit (string-append "v" version)))) (sha256 (base32 - "0425r0qjl83d1zq2z9myish3iqa6pc9ml2jlwmffjnj5gm3vgfsj")) + "0smk5affzlf0i4m10kx8mcffpysd61pjm4zidz2qdv5vsg3j9z50")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (arguments @@ -28258,7 +28260,7 @@ accept and reject GitHub pull requests.") (define-public emacs-deadgrep (package (name "emacs-deadgrep") - (version "0.12") + (version "0.13") (source (origin (method git-fetch) @@ -28268,7 +28270,7 @@ accept and reject GitHub pull requests.") (file-name (git-file-name name version)) (sha256 (base32 - "0bwf8gsqw7hsmacqd34piwgv066ijfclmxaigkvhvpac0lpsmi79")))) + "1ry9qvvxwhh3gkb0kkwiwpx37jpdzgky1h2zkwpzjpkv5jm022dr")))) (build-system emacs-build-system) (arguments (list @@ -30752,7 +30754,7 @@ interface to attach and interact with the processes.") (define-public emacs-dtrt-indent (package (name "emacs-dtrt-indent") - (version "1.17") + (version "1.18") (source (origin (method git-fetch) (uri (git-reference @@ -30761,7 +30763,7 @@ interface to attach and interact with the processes.") (file-name (git-file-name name version)) (sha256 (base32 - "0mjdqzl5mbasix8awav2qp9367waycmbcjy07s53nhv2xpqam9la")))) + "1sw0wabk68ixqip7kmkdvhw9rxz266cj8rs4hz3zlbcf7q6pjq6r")))) (build-system emacs-build-system) (home-page "https://github.com/jscheid/dtrt-indent") (synopsis "Minor mode that guesses the indentation offset") @@ -31717,7 +31719,7 @@ given search terms.") (define-public emacs-notmuch-maildir (package (name "emacs-notmuch-maildir") - (version "0.2.2") + (version "0.2.3") (source (origin (method git-fetch) @@ -31726,7 +31728,7 @@ given search terms.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "09f5g2xll2wh9jkd8crgngnbhxxkiy1rqsjg5g4c0i3hdyk4c3s5")))) + (base32 "00b0jzb6k629bwnrci36wmi2s48cddqva3v8b0bwz2ik43ba8d0n")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat emacs-notmuch)) @@ -31763,7 +31765,7 @@ as Emacs Lisp.") (define-public emacs-transient (package (name "emacs-transient") - (version "0.7.0") + (version "0.7.2") (source (origin (method git-fetch) (uri (git-reference @@ -31772,7 +31774,7 @@ as Emacs Lisp.") (file-name (git-file-name name version)) (sha256 (base32 - "1hkb10b3d76cm0gqcyhi4dyzjdx4fbblx0qcv9nb7xlnwwgm2y80")))) + "0fkgl374jxar2fhpjn4j67r7qc71xlg15r968lk1bny3aj3wf989")))) (build-system emacs-build-system) (arguments `(#:tests? #f ;no test suite @@ -33002,7 +33004,7 @@ all of your projects, then override or add variables on a per-project basis.") (define-public emacs-casual-dired (package (name "emacs-casual-dired") - (version "1.3.0") + (version "1.5.0") (source (origin (method git-fetch) @@ -33011,7 +33013,7 @@ all of your projects, then override or add variables on a per-project basis.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1lhdsnbw6b38gy8v6cvv0mcl4rhzfqccls507n81zrip7h78yij9")))) + (base32 "17a2jgm01hjhq1nkx50bm5qakb0inf0x6vry57n33jq4ay1kfnfq")))) (build-system emacs-build-system) (arguments (list @@ -33019,12 +33021,44 @@ all of your projects, then override or add variables on a per-project basis.") #~(modify-phases %standard-phases (add-after 'unpack 'chdir (lambda _ (chdir "lisp")))))) + (propagated-inputs (list emacs-casual-lib)) (home-page "https://github.com/kickingvegas/casual-dired") (synopsis "Transient-based porcelain for dired") (description "Casual Dired is an opinionated Transient-based porcelain for Emacs Dired.") (license license:gpl3+))) +(define-public emacs-casual-lib + (package + (name "emacs-casual-lib") + (version "1.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kickingvegas/casual-lib") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0dn6jz8bbz17326g0jd1hvz80xxmbl7dwifb2nnw7nl6q6adbkmf")))) + (build-system emacs-build-system) + (arguments + (list #:tests? #t + #:test-command #~(list "make" "tests") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'move-source-files + (lambda _ + (let ((el-files (find-files "./lisp" ".*\\.el$"))) + (for-each (lambda (f) (copy-file f (basename f))) + el-files))))))) + (native-inputs (list python-minimal)) + (home-page "https://github.com/kickingvegas/casual-lib") + (synopsis "Library package for the Emacs Casual porcelains") + (description + "Casual Lib is a library package used to support the Casual porcelains.") + (license license:gpl3+))) + (define-public emacs-calibredb (package (name "emacs-calibredb") @@ -36606,7 +36640,7 @@ launching other commands/applications from within Emacs, similar to the (define-public emacs-no-littering (package (name "emacs-no-littering") - (version "1.5.0") + (version "1.7.0") (source (origin (method git-fetch) @@ -36615,7 +36649,7 @@ launching other commands/applications from within Emacs, similar to the (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "14f07irjbk3akc07a0y5awyflmhsxvj8gg67y81zp90danjkgvvr")))) + (base32 "062fdryl8yhk6qcj1x98qa732d9lfn8x9dsa25ss11c5x3sywjv4")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) @@ -37016,46 +37050,43 @@ a @samp{date} keywords, and optionally, a @samp{filetags} keyword.") (license license:bsd-3))) (define-public emacs-ddskk - ;; XXX: Upstream adds code names to their release tags, so version and code - ;; name below need to be updated together. - (let ((version "17.1") - (code-name "Neppu")) + (let ((commit "8c47f46e38a29a0f3eabcd524268d20573102467") + (revision "0")) (package (name "emacs-ddskk") - (version version) + (version (git-version "17.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/skk-dev/ddskk") - (commit (string-append "ddskk-" version "_" code-name)))) + (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0xm53rybxki2784gyjkafg6956viyhhcq51kbmnrwc6aw3yzh7aw")))) + (base32 "0vfdbab3ncns8wwrna8h6y2w0grkphzr9s65sgxq98lpqmxbbr72")))) (build-system gnu-build-system) (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build emacs-utils)) - #:test-target "test" - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (make-file-writable "SKK-MK") - (emacs-substitute-variables "SKK-MK" - ("PREFIX" (assoc-ref outputs "out")) - ("LISPDIR" '(expand-file-name "/share/emacs/site-lisp" PREFIX)) - ("SKK_PREFIX" "") - ("SKK_INFODIR" '(expand-file-name "info" PREFIX))) - (for-each make-file-writable (find-files "./doc")) - #t)) - (add-after 'unpack 'fix-test - (lambda _ - (substitute* "Makefile" - (("/bin/rm") (which "rm")))))))) + (list #:modules '((guix build gnu-build-system) + (guix build utils) + (guix build emacs-utils)) + #:imported-modules `(,@%gnu-build-system-modules + (guix build emacs-utils)) + #:test-target "test" + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda _ + (emacs-substitute-variables "SKK-MK" + ("PREFIX" #$output) + ("LISPDIR" '(expand-file-name "/share/emacs/site-lisp" PREFIX)) + ("SKK_PREFIX" "") + ("SKK_INFODIR" '(expand-file-name "info" PREFIX))))) + (add-after 'unpack 'fix-test + (lambda _ + (substitute* "Makefile" + (("/bin/rm") (which "rm"))) + (substitute* "nicola/Makefile" + (("/bin/rm") (which "rm")))))))) (native-inputs (list emacs-minimal ruby)) (home-page "https://github.com/skk-dev/ddskk") @@ -37072,25 +37103,23 @@ conversion program}, a Japanese input method on Emacs.") (propagated-inputs (list emacs-ddskk)) (arguments - `(#:make-flags - (let ((out (assoc-ref %outputs "out"))) - (append - (list (string-append "PREFIX=" out) - (string-append "LISPDIR=" out "/share/emacs/site-lisp")))) - #:tests? #f ; no tests in this subtree - ,@(substitute-keyword-arguments (package-arguments emacs-ddskk) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'chdir - (lambda _ - (chdir "nicola") - #t)) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (make-file-writable "NICOLA-DDSKK-CFG") - (emacs-substitute-sexps "NICOLA-DDSKK-CFG" - ("setq NICOLA-DDSKK_PREFIX" "")) - #t))))))) + (append + (list #:make-flags + #~(append + (list (string-append "PREFIX=" #$output) + (string-append "LISPDIR=" #$output "/share/emacs/site-lisp"))) + ;; no tests in this subtree + #:tests? #f) + (substitute-keyword-arguments (package-arguments emacs-ddskk) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'fix-test 'chdir + (lambda _ + (chdir "nicola"))) + (replace 'configure + (lambda _ + (emacs-substitute-sexps "NICOLA-DDSKK-CFG" + ("setq NICOLA-DDSKK_PREFIX" ""))))))))) (synopsis "Nicola layout for Daredevil SKK") (description "Daredevil SKK is a version of @acronym{SKK, Simple Kana to Kanji @@ -37891,16 +37920,16 @@ displayed for sharing.") (define-public emacs-orglink (package (name "emacs-orglink") - (version "1.2.2") + (version "1.2.3") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/tarsius/orglink") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0jkk6jiqmsns1pb0almaihyz6c3lim0r6l4x75qp7448p46q2him")))) + (base32 "00lxfn78768kwp1sxcafzpycarqi7a9zsy4p22cjbp9vi6l8qx7j")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) @@ -39618,27 +39647,25 @@ by leveraging @code{emacs-consult} APIs.") (license license:expat))) (define-public emacs-context-transient - (let ((commit "16b8e16645ebcdc44d2777ba16ac85e1d3ee468b") - (revision "0")) - (package - (name "emacs-context-transient") - (version (git-version "1.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/licht1stein/context-transient.el") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "147yv3ih9il6a4k2cw1kcqgdpls83jf7aspjf8km650ry0apycc6")))) - (build-system emacs-build-system) - (home-page "https://github.com/licht1stein/context-transient.el") - (synopsis "Context specific transients") - (description "This package makes it easy to define and call + (package + (name "emacs-context-transient") + (version "1.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/licht1stein/context-transient.el") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1slj9js7c4cggdidr7miri9gf9xm7ij4hmd7y99km7bqmg57837l")))) + (build-system emacs-build-system) + (home-page "https://github.com/licht1stein/context-transient.el") + (synopsis "Context specific transients") + (description "This package makes it easy to define and call context-specific @code{emacs-transient} menus for current project, git repo, buffer or any other condition.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-purs-mode ;; XXX: Upstream set no tag nor any Version keyword. Using 0 as the base diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 411bea3ab6..6557180139 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com> ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2023 Declan Tsien <declantsien@riseup.net> -;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -101,6 +101,7 @@ (package (name "emacs-minimal") (version "29.3") + (replacement emacs-minimal/fixed) (source (origin (method url-fetch) (uri (string-append "mirror://gnu/emacs/emacs-" @@ -334,6 +335,18 @@ languages.") (files '("lib/tree-sitter"))))) (properties `((upstream-name . "emacs"))))) +(define emacs-minimal/fixed + (package + (inherit emacs-minimal) + (version "29.4") + (source + (origin (inherit (package-source emacs-minimal)) + (uri (string-append "mirror://gnu/emacs/emacs-" + version ".tar.xz")) + (sha256 + (base32 + "0dd2mh6maa7dc5f49qdzj7bi4hda4wfm1cvvgq560djcz537k2ds")))))) + (define-public emacs-no-x (package/inherit emacs-minimal (name "emacs-no-x") diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 84441181c7..4471de9040 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -792,7 +792,7 @@ and Game Boy Color games.") (define-public sameboy (package (name "sameboy") - (version "0.16.2") + (version "0.16.3") (source (origin (method git-fetch) @@ -801,7 +801,7 @@ and Game Boy Color games.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ckx5dm57h7ncvfqqqb2mdl5dcmhkardcn78zv965h6w1yxg0ii8")))) + (base32 "1jdjg59vzzkbi3c3qaxpsxqx955sb86cd3kcypb0nhjxbnwac1di")))) (build-system gnu-build-system) (native-inputs (list rgbds pkg-config)) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index e518d24fa2..fcb73eab12 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2783,7 +2783,9 @@ comments."))) (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0s720q6vxlh78jzahqp69nl8wagb42l05dym5aqhfnr31dx666hc")))) + (base32 "0s720q6vxlh78jzahqp69nl8wagb42l05dym5aqhfnr31dx666hc")) + ;; https://github.com/FreeCAD/FreeCAD/pull/11496 + (patches (search-patches "freecad-vtk-9.3.patch")))) (build-system qt-build-system) (native-inputs (list doxygen diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 184a0d8e65..aff95d48a1 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com> ;;; Copyright © 2022 dan <i@dan.games> ;;; Copyright © 2023 John Kehayias <john.kehayias@protonmail.com> +;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1927,7 +1928,7 @@ games.") (define-public godot-lts (package (name "godot") - (version "3.4.2") + (version "3.5.3") (source (origin (method git-fetch) (uri (git-reference @@ -1936,7 +1937,7 @@ games.") (file-name (git-file-name name version)) (sha256 (base32 - "1bm9yl995chvx6jwkdia12yjrgwcpzb1r9bmj606q8z264aw2ma5")) + "0zibc6am9axbbm8l57jf2d324a2m44pf6ncp2i4h1b219jjq89l6")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) @@ -1948,7 +1949,6 @@ games.") (with-directory-excursion "thirdparty" (let* ((preserved-files '("README.md" - "assimp" "certs" "cvtt" "embree" @@ -1966,105 +1966,109 @@ games.") "oidn" "pvrtccompressor" "recastnavigation" + "rvo2" "squish" "stb_rect_pack" "tinyexr" "vhacd" "xatlas"))) (for-each delete-file-recursively - (lset-difference string=? - (scandir ".") - (cons* "." ".." preserved-files))))))))) + (lset-difference + string=? + (scandir ".") + (cons* "." ".." preserved-files))))))))) (build-system scons-build-system) (arguments - `(#:scons ,scons-python2 - #:scons-flags (list "platform=x11" "target=release_debug" - ;; Avoid using many of the bundled libs. - ;; Note: These options can be found in the SConstruct file. - "builtin_bullet=no" - "builtin_freetype=no" - "builtin_glew=no" - "builtin_libmpdec=no" - "builtin_libogg=no" - "builtin_libpng=no" - "builtin_libtheora=no" - "builtin_libvorbis=no" - "builtin_libvpx=no" - "builtin_libwebp=no" - "builtin_mbedtls=no" - "builtin_opus=no" - "builtin_pcre2=no" - "builtin_wslay=no" - "builtin_zlib=no" - "builtin_zstd=no") - #:tests? #f ; There are no tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'scons-use-env - (lambda _ - ;; Scons does not use the environment variables by default, - ;; but this substitution makes it do so. - (substitute* "SConstruct" - (("env_base = Environment\\(tools=custom_tools\\)") - (string-append - "env_base = Environment(tools=custom_tools)\n" - "env_base = Environment(ENV=os.environ)"))))) - ;; Build headless tools, used for packaging games without depending on X. - (add-after 'build 'build-headless - (lambda* (#:key scons-flags #:allow-other-keys) - (apply invoke "scons" - `(,(string-append "-j" (number->string (parallel-job-count))) - "platform=server" ,@(delete "platform=x11" scons-flags))))) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (headless (assoc-ref outputs "headless")) - (zenity (assoc-ref inputs "zenity"))) - ;; Strip build info from filenames. - (with-directory-excursion "bin" - (for-each - (lambda (file) - (let ((dest (car (string-split (basename file) #\.)))) - (rename-file file dest))) - (find-files "." "godot.*\\.x11\\.opt\\.tools.*")) - (install-file "godot" (string-append out "/bin")) - (install-file "godot_server" (string-append headless "/bin"))) - ;; Tell the editor where to find zenity for OS.alert(). - (wrap-program (string-append out "/bin/godot") - `("PATH" ":" prefix (,(string-append zenity "/bin"))))))) - (add-after 'install 'wrap - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; FIXME: Mesa tries to dlopen libudev.so.0 and fails. Pending a - ;; fix of the mesa package we wrap the pcb executable such that - ;; Mesa can find libudev.so.0 through LD_LIBRARY_PATH. - ;; also append ld path for pulseaudio and alsa-lib - (let* ((out (assoc-ref outputs "out")) - (udev_path (string-append (assoc-ref inputs "eudev") "/lib")) - (pulseaudio_path (string-append (assoc-ref inputs "pulseaudio") "/lib")) - (alas_lib_path (string-append (assoc-ref inputs "alsa-lib") "/lib"))) - (wrap-program (string-append out "/bin/godot") - `("LD_LIBRARY_PATH" ":" prefix (,udev_path ,pulseaudio_path ,alas_lib_path)))))) - (add-after 'install 'install-godot-desktop - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (applications (string-append out "/share/applications")) - (icons (string-append out "/share/icons/hicolor"))) - (mkdir-p applications) - (copy-file "misc/dist/linux/org.godotengine.Godot.desktop" - (string-append applications "/godot.desktop")) - (for-each (lambda (icon dest) - (mkdir-p (dirname dest)) - (copy-file icon dest)) - '("icon.png" "icon.svg") - `(,(string-append icons "/256x256/apps/godot.png") - ,(string-append icons "/scalable/apps/godot.svg"))))))))) + (list + ;; Avoid using many of the bundled libs. + ;; Note: These options can be found in the SConstruct file. + #:scons-flags #~(list "platform=x11" "target=release_debug" + "builtin_bullet=no" + "builtin_freetype=no" + "builtin_glew=no" + "builtin_libmpdec=no" + "builtin_libogg=no" + "builtin_libpng=no" + "builtin_libtheora=no" + "builtin_libvorbis=no" + "builtin_libvpx=no" + "builtin_libwebp=no" + "builtin_mbedtls=no" + "builtin_opus=no" + "builtin_pcre2=no" + "builtin_wslay=no" + "builtin_zlib=no" + "builtin_zstd=no") + #:tests? #f ; There are no tests + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'scons-use-env + (lambda _ + ;; Scons does not use the environment variables by default, + ;; but this substitution makes it do so. + (substitute* "SConstruct" + (("env_base = Environment\\(tools=custom_tools\\)") + (string-append + "env_base = Environment(tools=custom_tools)\n" + "env_base = Environment(ENV=os.environ)"))))) + ;; Build headless tools, to package games without depending on X. + (add-after 'build 'build-headless + (lambda* (#:key scons-flags #:allow-other-keys) + (apply invoke "scons" + `(,(string-append + "-j" (number->string (parallel-job-count))) + "platform=server" + ,@(delete "platform=x11" scons-flags))))) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (headless (assoc-ref outputs "headless")) + (zenity (assoc-ref inputs "zenity"))) + ;; Strip build info from filenames. + (with-directory-excursion "bin" + (for-each + (lambda (file) + (let ((dest (car (string-split (basename file) #\.)))) + (rename-file file dest))) + (find-files "." "godot.*\\.x11\\.opt\\.tools.*")) + (install-file "godot" (string-append out "/bin")) + (install-file "godot_server" + (string-append headless "/bin"))) + ;; Tell the editor where to find zenity for OS.alert(). + (wrap-program (string-append out "/bin/godot") + `("PATH" ":" prefix (,(string-append zenity "/bin"))))))) + (add-after 'install 'wrap-ld-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (pulseaudio_path (string-append + (assoc-ref inputs "pulseaudio") "/lib")) + (alas_lib_path (string-append + (assoc-ref inputs "alsa-lib") "/lib"))) + (wrap-program (string-append out "/bin/godot") + `("LD_LIBRARY_PATH" ":" prefix + (,pulseaudio_path ,alas_lib_path)))))) + (add-after 'install 'install-godot-desktop + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (applications (string-append out "/share/applications")) + (icons (string-append out "/share/icons/hicolor"))) + (mkdir-p applications) + (copy-file "misc/dist/linux/org.godotengine.Godot.desktop" + (string-append applications "/godot.desktop")) + (for-each (lambda (icon dest) + (mkdir-p (dirname dest)) + (copy-file icon dest)) + '("icon.png" "icon.svg") + `(,(string-append icons "/256x256/apps/godot.png") + ,(string-append icons + "/scalable/apps/godot.svg"))))))))) (outputs '("out" "headless")) (native-inputs (list pkg-config)) (inputs (list alsa-lib bullet - freetype + freetype-with-brotli glew glu libtheora @@ -2081,7 +2085,7 @@ games.") opusfile pcre2 pulseaudio - eudev ; FIXME: required by mesa + eudev wslay zenity `(,zstd "lib"))) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ea4b5831b1..b2d050d626 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7492,7 +7492,7 @@ at their peak of economic growth and military prowess. (define-public open-adventure (package (name "open-adventure") - (version "1.18") + (version "1.19") (source (origin (method git-fetch) @@ -7501,7 +7501,7 @@ at their peak of economic growth and military prowess. (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1zl72lsp443aryzmwzh5w4j439jgf5njvh9xig6vjvmzhfcjkk9q")))) + (base32 "19nspsvkzh3xw70mwlvralfr2ia7a8knd9s7x7abmjvk8p5rx468")))) (build-system gnu-build-system) (arguments (list @@ -7667,32 +7667,30 @@ abilities and powers.") (define-public quakespasm (package (name "quakespasm") - (version "0.93.2") + (version "0.96.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/quakespasm/Source/quakespasm-" - version ".tgz")) + version ".tar.gz")) (sha256 - (base32 "0qm0j5drybvvq8xadfyppkpk3rxqsxbywzm6iwsjwdf0iia3gss5")))) - (arguments - `(#:tests? #f - #:make-flags '("CC=gcc" - "MP3LIB=mpg123" - "USE_CODEC_FLAC=1" - "USE_CODEC_MIKMOD=1" - "USE_SDL2=1" - "-CQuake") - #:phases (modify-phases %standard-phases - (delete 'configure) - (add-after 'unpack 'fix-makefile-paths - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/bin")) - (substitute* "Quake/Makefile" - (("/usr/local/games") - (string-append out "/bin"))) - #t)))))) + (base32 "0hr58w1d2yw82vm9lkln05z6d4sjlcr6grxhf6sqdqwyfy9nv1mw")))) + (arguments + (list #:tests? #f + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + "MP3LIB=mpg123" + "USE_CODEC_FLAC=1" + "USE_CODEC_MIKMOD=1" + "USE_SDL2=1" + "-CQuake") + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'fix-makefile-paths + (lambda _ + (mkdir-p (string-append #$output "/bin")) + (substitute* "Quake/Makefile" + (("/usr/local/games") + (string-append #$output "/bin")))))))) (build-system gnu-build-system) (inputs (list libmikmod libvorbis diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 69e7b58677..1146939408 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2375,15 +2375,15 @@ associated with an address.") (define-public python-maxminddb (package (name "python-maxminddb") - (version "2.2.0") + (version "2.6.2") (source (origin (method url-fetch) (uri (pypi-uri "maxminddb" version)) (sha256 (base32 - "1rc4a403r3b4vhmhb03gidd0fmsbvfpbf3qfcw25h4db9zn0fxz3")))) - (build-system python-build-system) + "0r7jcqzr3hy9jims0ygjdhndysbs02hsaybx9f4vq2k2w8r2v13x")))) + (build-system pyproject-build-system) (arguments `(#:tests? #f)) ;; Tests require a copy of the maxmind database (inputs @@ -2398,19 +2398,21 @@ MaxMind DB files.") (define-public python-geoip2 (package (name "python-geoip2") - (version "2.9.0") + (version "4.8.0") (source (origin (method url-fetch) (uri (pypi-uri "geoip2" version)) (sha256 (base32 - "1w7cay5q6zawjzivqbwz5cqx1qbdjw6kbriccb7l46p7b39fkzzp")))) - (build-system python-build-system) + "0ddcm6a0f5xr66r84hpn6jr6b7hl77axb0d41qj285ylny0c376x")))) + (build-system pyproject-build-system) (arguments `(#:tests? #f)) ;; Tests require a copy of the maxmind database (inputs - (list python-maxminddb python-requests)) + (list python-maxminddb + python-requests + python-aiohttp)) (home-page "https://www.maxmind.com/") (synopsis "MaxMind GeoIP2 API") (description "Provides an API for the GeoIP2 web services and databases. diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e910e125d2..b4caaf29a7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8826,7 +8826,7 @@ to virtual private networks (VPNs) via Fortinet SSLVPN.") (define-public network-manager-applet (package (name "network-manager-applet") - (version "1.34.0") + (version "1.36.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/network-manager-applet/" @@ -8834,7 +8834,7 @@ to virtual private networks (VPNs) via Fortinet SSLVPN.") "network-manager-applet-" version ".tar.xz")) (sha256 (base32 - "1a55mf4ww06lqacs6zndp29ayyby5f8rgg1lp341y5kb1x3qwdmb")))) + "0lz2lxj5xy65l7qcn3df83spkxxqk2sjmys7bi4f3bx3gr408ix8")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index ae166c2507..cf731f3fcc 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -192,7 +192,7 @@ authentication and support for SSL3 and TLS.") (define-public gnunet (package (name "gnunet") - (version "0.21.1") + (version "0.21.2") (source (origin (method url-fetch) @@ -200,7 +200,7 @@ authentication and support for SSL3 and TLS.") ".tar.gz")) (sha256 (base32 - "0p3q9590bm0d6q6p17jcbq2yiciqmvk5ys6pwdrp4257mhz8prlk")))) + "18czv9yxxmaf7y061ngzwcc9rxwrwdy372wb52ns52wviqk528wc")))) (build-system gnu-build-system) (inputs (list bluez diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm index e13ce3afa8..086dbaeb17 100644 --- a/gnu/packages/golang-build.scm +++ b/gnu/packages/golang-build.scm @@ -79,7 +79,7 @@ (define-public go-golang-org-x-crypto (package (name "go-golang-org-x-crypto") - (version "0.4.0") + (version "0.14.0") (source (origin (method git-fetch) @@ -89,7 +89,7 @@ (file-name (string-append "go.googlesource.com-crypto-" version "-checkout")) (sha256 - (base32 "13i0yz4hvc4qdr438nmzilvl5ns73v3910bakcddny3jbzq72i2m")))) + (base32 "08124qkp0l0blq6rw68llfbf84kp99255q0yvxyv27c05b0wkh66")))) (build-system go-build-system) (arguments '(#:import-path "golang.org/x/crypto" @@ -100,7 +100,10 @@ ;; Source-only package (delete 'build)))) (propagated-inputs - (list go-golang-org-x-sys)) + (list go-golang-org-x-net + go-golang-org-x-sys + go-golang-org-x-term + go-golang-org-x-text)) (home-page "https://go.googlesource.com/crypto/") (synopsis "Supplementary cryptographic libraries in Go") (description "This package provides supplementary cryptographic libraries @@ -238,6 +241,8 @@ loading algorithms.") #~(modify-phases %standard-phases ;; Source-only package (delete 'build)))) + (propagated-inputs + (list go-golang-org-x-sys go-golang-org-x-term go-golang-org-x-text)) (home-page "https://go.googlesource.com/net") (synopsis "Go supplemental networking libraries") (description "This package provides supplemental Go networking libraries.") @@ -262,116 +267,80 @@ loading algorithms.") (sha256 (base32 "17zhim2m0r8nyy18g2lsawxm4rawix2qbjyn80x9vc6jc8fv05m9"))))))) -(define-public go-golang-org-x-net-html +(define-public go-golang-org-x-sync (package - (inherit go-golang-org-x-net) - (name "go-golang-org-x-net-html") + (name "go-golang-org-x-sync") + (version "0.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/sync") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03yq3pnjwqxqy1cvbkaa39ca2b9cli1k5wnz76l3a65n9fafai6q")))) + (build-system go-build-system) (arguments - '(#:import-path "golang.org/x/net/html" - #:unpack-path "golang.org/x/net")) - (propagated-inputs (list go-golang-org-x-text)) - (home-page "https://godoc.org/golang.org/x/net/html") - (synopsis "HTML5-compliant tokenizer and parser") + (list + #:import-path "golang.org/x/sync" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (home-page "https://go.googlesource.com/sync/") + (synopsis "Additional Go concurrency primitives") (description - "This package provides an HTML5-compliant tokenizer and parser."))) - -(define-public go-golang-org-x-sync - (let ((commit "8fcdb60fdcc0539c5e357b2308249e4e752147f1") - (revision "1")) - (package - (name "go-golang-org-x-sync") - (version (git-version "0.1.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/sync") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "07qrhni6f5hh5p95k1yk6s4wsj341q663irvx6rllrxfsymj6a0z")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/sync" - #:tests? #f - ;; Source-only package - #:phases (modify-phases %standard-phases - (delete 'build)))) - (home-page "https://go.googlesource.com/sync/") - (synopsis "Additional Go concurrency primitives") - (description "This package provides Go concurrency primitives in -addition to the ones provided by the language and “sync” and “sync/atomic” -packages.") - (license license:bsd-3)))) - -(define-public go-golang.org-x-sync-errgroup - (let ((commit "cd5d95a43a6e21273425c7ae415d3df9ea832eeb") - (revision "0")) - (package - (name "go-golang.org-x-sync-errgroup") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/sync") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds")))) - (build-system go-build-system) - (arguments - '(#:import-path "golang.org/x/sync/errgroup" - #:unpack-path "golang.org/x/sync")) - (home-page "https://godoc.org/golang.org/x/sync/errgroup") - (synopsis "Synchronization, error propagation, and Context cancellation -for groups of goroutines working on subtasks of a common task") - (description "This package provides synchronization, error -propagation, and Context cancellation for groups of goroutines working on -subtasks of a common task.") - (license license:bsd-3)))) + "This package provides Go concurrency primitives in addition to the ones +provided by the language and @code{sync} and @code{sync/atomic} packages. +The package provides several Golang submodules: +@itemize +@item @code{errgroup} - synchronization, error propagation, and Context +cancelation for groups of goroutines working on subtasks of a common task +@item @code{semaphore} - a weighted semaphore implementation +@item @code{singleflight} - a duplicate function call suppression mechanism +@item @code{syncmap} - a concurrent map implementation +@end itemize") + (license license:bsd-3))) -(define-public go-golang.org-x-sync-semaphore +(define-public go-golang-org-x-sys (package - (inherit go-golang.org-x-sync-errgroup) - (name "go-golang.org-x-sync-semaphore") + (name "go-golang-org-x-sys") + (version "0.21.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/sys") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "000fcyi863sbmamdn3cwfv3s3z9ls5l34xnjavcbgjs591ghki8y")))) + (build-system go-build-system) (arguments - '(#:import-path "golang.org/x/sync/semaphore" - #:unpack-path "golang.org/x/sync")) - (home-page "https://godoc.org/golang.org/x/sync/semaphore") - (synopsis "Weighted semaphore implementation in Go") - (description "Weighted semaphore implementation in Go."))) - -(define-public go-golang-org-x-sys - (let ((commit "ca59edaa5a761e1d0ea91d6c07b063f85ef24f78") - (revision "0")) - (package - (name "go-golang-org-x-sys") - (version (git-version "0.8.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/sys") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1p81niiin8dwyrjl2xsc95136w3vdw4kmj0w3mlh0vh5v134s4xq")))) - (build-system go-build-system) - (arguments - (list - #:import-path "golang.org/x/sys" - ;; Source-only package - #:tests? #f - #:phases - #~(modify-phases %standard-phases - ;; Source-only package - (delete 'build)))) - (home-page "https://go.googlesource.com/sys") - (synopsis "Go support for low-level system interaction") - (description "This package provides supplemental libraries offering Go + (list + #:import-path "golang.org/x/sys" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (home-page "https://go.googlesource.com/sys") + (synopsis "Go support for low-level system interaction") + (description "This package provides supplemental libraries offering Go support for low-level interaction with the operating system.") - (license license:bsd-3)))) + (license license:bsd-3))) (define-public go-golang-org-x-term (package diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 1caf1e6069..dd0b71ff13 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -1,9 +1,9 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2017, 2019 Leo Famulari <leo@famulari.name> ;;; Copyright © 2018 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> ;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com> -;;; Copyright © 2019 Leo Famulari <leo@famulari.name> ;;; Copyright © 2019 Vagrant Cascadian <vagrant@debian.org> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz> @@ -657,7 +657,7 @@ Gomega matcher library.") #:go go-1.21 #:import-path "github.com/onsi/gomega")) (propagated-inputs - (list go-github-com-golang-protobuf-proto + (list go-github-com-golang-protobuf go-golang-org-x-net go-golang-org-x-sys go-golang-org-x-text @@ -732,6 +732,57 @@ Go application.") original value once the test has been run.") (license license:expat))) +(define-public go-github-com-petermattis-goid + (let ((commit "bb94eb51e7a772d09cef11768f3248ac25adf9f9") + (revision "2")) + (package + (name "go-github-com-petermattis-goid") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/petermattis/goid") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0hr94frr0rhac4mb9r7ixdgr6hm63rxh6z43rhn2wn7fdy8csw11")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/petermattis/goid")) + (home-page "https://github.com/petermattis/goid") + (synopsis "Identify the running goroutine") + (description + "This package offers a method of programmatically retrieving the +current goroutine's ID.") + (license license:asl2.0)))) + +(define-public go-github-com-sasha-s-go-deadlock + (package + (name "go-github-com-sasha-s-go-deadlock") + (version "0.3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sasha-s/go-deadlock") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0arb35idnyz4n118xz7p2snazqi35gk1975h1xfk0y4riiks58yz")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/sasha-s/go-deadlock")) + (propagated-inputs + (list go-github-com-petermattis-goid)) + (home-page "https://github.com/sasha-s/go-deadlock") + (synopsis "Deadlock detection in go") + (description + "This package provides tools for detecting deadlocks at run-time in Go.") + (license license:asl2.0))) + (define-public go-github-com-stretchr-testify (package (name "go-github-com-stretchr-testify") @@ -905,6 +956,37 @@ makes extraction of setup/teardown behavior (as well as invoking the system under test) much simpler.") (license license:expat))) +(define-public go-go-etcd-io-gofail + (package + (name "go-go-etcd-io-gofail") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/etcd-io/gofail") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0jh0qjgfb2irshwj7an3lj0w9bv6c5gbnkdhisgpdr7x7hk682m1")))) + (build-system go-build-system) + (arguments + (list + #:import-path "go.etcd.io/gofail" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-examples + (lambda* (#:key import-path #:allow-other-keys) + (delete-file-recursively + (string-append "src/" import-path "/examples"))))))) + (native-inputs (list go-github-com-stretchr-testify)) + (home-page "https://pkg.go.dev/go.etcd.io/gofail") + (synopsis "Failpoints for go") + (description + "This package provides an implementation of +@url{http://www.freebsd.org/cgi/man.cgi?query=fail,failpoints} for Golang.") + (license license:asl2.0))) + (define-public go-golang-org-sql-mock (let ((commit "e98392b8111b45f8126e00af035a0dd95dc12e8b") (version "1.3.3") diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm index f40664d8f7..ddeb65a967 100644 --- a/gnu/packages/golang-compression.scm +++ b/gnu/packages/golang-compression.scm @@ -168,9 +168,9 @@ library. This is beneficial for large amounts of data, say more than 1MB at a time, as otherwise the internal gzip library will likely be faster.") (license (list license:bsd-3 license:expat)))) -(define-public go-github-com-nwaples-rardecode-v2 +(define-public go-github-com-nwaples-rardecode (package - (name "go-github-com-nwaples-rardecode-v2") + (name "go-github-com-nwaples-rardecode") (version "2.0.0-beta.2") (source (origin diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index baf68b7089..ddeb79badf 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -1,9 +1,10 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2017-2020 Leo Famulari <leo@famulari.name> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Vagrant Cascadian <vagrant@debian.org> -;;; Copyright © 2019, 2020 Leo Famulari <leo@famulari.name> ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> +;;; Copyright © 2020, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2021 Collin J. Doering <collin@rekahsoft.ca> ;;; Copyright © 2021 LibreMiami <packaging-guix@libremiami.org> @@ -11,16 +12,15 @@ ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev> ;;; Copyright © 2021 Vagrant Cascadian <vagrant@debian.org> ;;; Copyright © 2022 (unmatched-parenthesis <paren@disroot.org> -;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2022, 2023 Nicolas Graves <ngraves@ngraves.fr> -;;; Copyright © 2023, 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; Copyright © 2023 Benjamin <benjamin@uvy.fr> ;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com> ;;; Copyright © 2023 Jack Hill <jackhill@jackhill.us> -;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com> +;;; Copyright © 2023, 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; Copyright © 2024 Jesse Eisses <jesse@eisses.email> +;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -321,6 +321,42 @@ the Ristretto prime-order group built from Edwards25519.") xxHash algorithm (XXH64).") (license license:expat))) +(define-public go-github-com-chmduquesne-rollinghash + (let ((commit "9a5199be7309f50c496efc87d29bd08788605ae7") + (revision "1")) + (package + (name "go-github-com-chmduquesne-rollinghash") + (version (git-version "4.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/chmduquesne/rollinghash") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gkdgsgrmwagwyp4lmd4k11mbwi8f1yw9c9rhnkmav87gy1k84jr")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/chmduquesne/rollinghash/" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Run all tests, 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" "./...")))))))) + (propagated-inputs + (list go-code-cloudfoundry-org-bytefmt)) + (home-page "https://github.com/chmduquesne/rollinghash") + (synopsis "Rolling hashes in Go") + (description + "This package provides a Go implementation of several rolling hashes.") + (license license:expat)))) + (define-public go-github-com-cloudflare-circl (package (name "go-github-com-cloudflare-circl") @@ -454,6 +490,30 @@ providing bidirectional mapping values to their names, plus enum convenience for values.") (license license:bsd-3))) +(define-public go-github-com-go-asn1-ber-asn1-ber + (package + (name "go-github-com-go-asn1-ber-asn1-ber") + (version "1.5.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-asn1-ber/asn1-ber") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xa1s1q2is9fr02pvrc9sq8zfq9ba6gk64yg1ncglppp30f50q52")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/go-asn1-ber/asn1-ber")) + (home-page "https://github.com/go-asn1-ber/asn1-ber") + (synopsis "ASN.1 BER encoding and decoding in Go") + (description + "This package provides @acronym{Abstract Syntax Notation One, ASN.1} BER +encoding and decoding in the Go language.") + (license license:expat))) + (define-public go-github-com-golang-jwt-jwt (package (name "go-github-com-golang-jwt-jwt") diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index e4db17b4dc..e64f20801c 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -190,6 +190,44 @@ result and details about the health status of each component.") the parse trees produced by the html package.") (license license:bsd-2))) +(define-public go-github-com-audriusbutkevicius-pfilter + (package + (name "go-github-com-audriusbutkevicius-pfilter") + (version "0.0.11") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AudriusButkevicius/pfilter") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03kwi1hnhcz9qdblmhpaqg2063k2ch29hc5dr8cl2z7q5rp81m9i")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.21 + #:import-path "github.com/AudriusButkevicius/pfilter" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-failing-tests + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each delete-file + ;; Remove tests requiring setting up local + ;; connection. + (list "quic_test.go")))))))) + (propagated-inputs + (list go-github-com-pkg-errors + go-github-com-quic-go-quic-go + go-golang-org-x-net)) + (home-page "https://github.com/AudriusButkevicius/pfilter") + (synopsis "Filter packets into multiple virtual connections") + (description + "Pfilter is a Go package for filtering packets into multiple virtual +connections from a single physical connection.") + (license license:expat))) + (define-public go-github-com-aws-sdk (package (name "go-github-com-aws-sdk") @@ -399,6 +437,34 @@ for Go") (description "This package provides a CSS parser and inliner.") (license license:expat))) +(define-public go-github-com-azure-go-ntlmssp + (package + (name "go-github-com-azure-go-ntlmssp") + (version "0.0.0-20221128193559-754e69321358") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Azure/go-ntlmssp") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dg20fwylf5lpsc5fgnnzw7jxz0885bg97lla1b5wrlhjas6lidn")))) + (build-system go-build-system) + (arguments + (list + ;; See <https://github.com/Azure/go-ntlmssp/issues/40>. + #:tests? #f + #:import-path "github.com/Azure/go-ntlmssp")) + (propagated-inputs + (list go-golang-org-x-crypto)) + (home-page "https://github.com/Azure/go-ntlmssp") + (synopsis "NTLM negotiation in Go") + (description + "This package provides @acronym{NT (New Technology) LAN +Manager,NTLM}/Negotiate authentication over HTTP.") + (license license:expat))) + (define-public go-github-com-bep-golibsass (package (name "go-github-com-bep-golibsass") @@ -456,6 +522,30 @@ for Go") "This package provides SCSS compiler support for Go applications.") (license license:expat))) +(define-public go-github-com-ccding-go-stun + (package + (name "go-github-com-ccding-go-stun") + (version "0.1.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ccding/go-stun") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wjhckyg42kp04njhj7gni84cyk0s7m17n13kqf6r7mjzx8a83pw")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/ccding/go-stun")) + (home-page "https://github.com/ccding/go-stun") + (synopsis "STUN client implementation") + (description + "Go-stun is a go implementation of the STUN client (RFC 3489 +and RFC 5389).") + (license license:asl2.0))) + (define-public go-github-com-cenkalti-backoff-v4 (package (name "go-github-com-cenkalti-backoff-v4") @@ -723,6 +813,44 @@ Signing and Encryption set of standards. This includes support for JSON Web Encryption, JSON Web Signature, and JSON Web Token standards.") (license license:asl2.0))) +(define-public go-github-com-go-ldap-ldap + (package + (name "go-github-com-go-ldap-ldap") + (version "3.4.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-ldap/ldap") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fbmhlc8ss5vn6zz0iiifvy4pm0mwaf13qpz70k83mmnv9vrv16x")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/go-ldap/ldap/v3" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-failing-tests + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each delete-file + ;; FAIL <...> LDAP Result Code 200 "Network Error": + ;; dial tcp: lookup ldap.itd.umich.edu on <...> + (list "ldap_test.go")))))))) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-github-com-azure-go-ntlmssp + go-github-com-go-asn1-ber-asn1-ber + go-github-com-google-uuid)) + (home-page "https://github.com/go-ldap/ldap") + (synopsis "LDAP v3 functionality for Go") + (description "This package provides basic LDAP v3 functionality in the Go +language.") + (license license:expat))) + (define-public go-github-com-go-telegram-bot-api-telegram-bot-api (package (name "go-github-com-go-telegram-bot-api-telegram-bot-api") @@ -791,7 +919,7 @@ Encryption, JSON Web Signature, and JSON Web Token standards.") (arguments (list #:import-path "github.com/golang/groupcache")) (propagated-inputs - (list go-github-com-golang-protobuf-proto)) + (list go-github-com-golang-protobuf)) (home-page "https://github.com/golang/groupcache") (synopsis "Groupcache is a caching and cache-filling library") (description @@ -905,7 +1033,7 @@ language.") (define-public go-github-com-gorilla-csrf (package (name "go-github-com-gorilla-csrf") - (version "1.7.0") + (version "1.7.2") (source (origin (method git-fetch) @@ -914,13 +1042,14 @@ language.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0iryq0z48yi7crfbd8jxyn7lh1gsglpiglvjgnf23bz6xfisssav")))) + (base32 "01d56sr9yggn6gs4lf5bnj15q6bkwvsim8kzj8m4arv1ccj7918j")))) (build-system go-build-system) - (propagated-inputs - `(("github.com/gorilla/securecookie" ,go-github-com-gorilla-securecookie) - ("github.com/pkg/errors" ,go-github-com-pkg-errors))) (arguments - '(#:import-path "github.com/gorilla/csrf")) + (list + #:import-path "github.com/gorilla/csrf")) + (propagated-inputs + (list go-github-com-gorilla-securecookie + go-github-com-pkg-errors)) (home-page "https://github.com/gorilla/csrf") (synopsis "Cross Site Request Forgery (CSRF) prevention middleware") (description @@ -1150,6 +1279,35 @@ used like a user interface for humans, to read and edit before passing the JSON data to the machine.") (license license:expat))) +(define-public go-github-com-jackpal-gateway + (package + (name "go-github-com-jackpal-gateway") + (version "1.0.15") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jackpal/gateway") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dlspnbdz63b3kpavibd2764hdy53mx1v3vrqi721dsjy77r9ig3")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.21 + #:import-path "github.com/jackpal/gateway")) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-golang-org-x-net)) + (home-page "https://github.com/jackpal/gateway") + (synopsis "Discover the address of a LAN gateway") + (description + "@code{gateway} is a Go library for discovering the IP address of the +default LAN gateway.") + (license license:bsd-3))) + (define-public go-github-com-jackpal-go-nat-pmp (package (name "go-github-com-jackpal-go-nat-pmp") @@ -1363,6 +1521,60 @@ jsoniter and variable type declarations (if any). jsoniter interfaces gives router.") (license license:bsd-3))) +(define-public go-github-com-makeworld-the-better-one-go-gemini + (package + (name "go-github-com-makeworld-the-better-one-go-gemini") + (version "0.13.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/makew0rld/go-gemini") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "196rxfg7w8s3zn87gra1mxh1l8iav6kdmg909gkbnc9cxip65zc0")))) + (build-system go-build-system) + (propagated-inputs + (list go-github-com-google-go-cmp-cmp + go-golang-org-x-net + go-golang-org-x-text)) + (arguments + (list + #:import-path "github.com/makeworld-the-better-one/go-gemini")) + (home-page "https://github.com/makew0rld/go-gemini") + (synopsis "Client/server library for the Gemini protocol, in Go") + (description + "@code{go-gemini} is a library that provides an easy interface to create +clients that speak the Gemini protocol.") + (license license:isc))) + +(define-public go-github-com-makeworld-the-better-one-go-gemini-socks5 + (package + (name "go-github-com-makeworld-the-better-one-go-gemini-socks5") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/makew0rld/go-gemini-socks5") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0r8iljs12nhyn3nk5dzsji9hi88fivashbrcb5d42x5rvzry15px")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/makeworld-the-better-one/go-gemini-socks5")) + (propagated-inputs + (list go-golang-org-x-net)) + (home-page "https://github.com/makeworld-the-better-one/go-gemini-socks5") + (synopsis "SOCKS5 proxy for go-gemini") + (description + "This package provides SOCKS5 proxy for +@@url{https://github.com/makeworld-the-better-one/go-gemini,go-gemini}.") + (license license:expat))) + (define-public go-github-com-microcosm-cc-bluemonday (package (name "go-github-com-microcosm-cc-bluemonday") @@ -1617,6 +1829,80 @@ which produce colorized output using github.com/fatih/color.") (description "OpenTracing-Go is a Go implementation of the OpenTracing API.") (license license:asl2.0))) +(define-public go-github-com-oschwald-geoip2-golang + (package + (name "go-github-com-oschwald-geoip2-golang") + (version "1.11.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/oschwald/geoip2-golang") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0670cv1b9c2p0lx63rlwl7kplbvzr79apbw13109v0pv4qlapmhx")))) + (build-system go-build-system) + (arguments + (list + #:tests? #f ; Requires some unpackaged software and test data + #:go go-1.21 + #:import-path "github.com/oschwald/geoip2-golang")) + (propagated-inputs + (list go-github-com-oschwald-maxminddb-golang)) + (home-page "https://github.com/oschwald/geoip2-golang") + (synopsis "MaxMind GeoIP2 reader") + (description + "This package provides a library for reading MaxMind GeoLite2 and GeoIP2 +databases in Go.") + (license license:isc))) + +(define-public go-github-com-oschwald-maxminddb-golang + (package + (name "go-github-com-oschwald-maxminddb-golang") + (version "1.13.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/oschwald/maxminddb-golang") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1p0c10r6850znvarc9h3y0jlwika9qmq0ys7rmg2aj8x2cffz3z6")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.21 + #:import-path "github.com/oschwald/maxminddb-golang" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Remove most of the tests requiring test-data from submodule + ;; <https://github.com/maxmind/MaxMind-DB>, there is a documented + ;; process on how to generate it, consider to pack and activate + ;; tests in the next update cycle. + (add-after 'unpack 'remove-failing-tests + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each delete-file + (list "decoder_test.go" + "deserializer_test.go" + "example_test.go" + "reader_test.go" + "traverse_test.go" + "verifier_test.go")))))))) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-golang-org-x-sys)) + (home-page "https://github.com/oschwald/maxminddb-golang") + (synopsis "MaxMind DB Reader for Go") + (description + "This is a Go reader for the MaxMind DB format. Although this can be +used to read GeoLite2 and GeoIP2 databases, @code{geoip2} provides a +higher-level API for doing so.") + (license license:isc))) + (define-public go-github-com-pion-dtls (package (name "go-github-com-pion-dtls") diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 67994cec51..dafa4b2904 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -522,6 +522,35 @@ optimized for sparse nodes of @url{http://en.wikipedia.org/wiki/Radix_tree,radix tree}.") (license license:expat))) +(define-public go-github-com-audriusbutkevicius-recli + (package + (name "go-github-com-audriusbutkevicius-recli") + (version "0.0.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AudriusButkevicius/recli") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0mxrpn8p6ylf5qjzsqrk96nky5vgagjkkpd5jwpm6sa977qb0v3i")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/AudriusButkevicius/recli")) + (native-inputs + (list go-github-com-pkg-errors + go-github-com-urfave-cli)) + (home-page "https://github.com/AudriusButkevicius/recli") + (synopsis "Reflection-based CLI generator") + (description + "For a given struct, @code{recli} builds a set of @code{urfave/cli} +commands which allows you to modify it from the command line. It is useful +for generating command line clients for your application configuration that is +stored in a Go struct.") + (license license:mpl2.0))) + (define-public go-github-com-benbjohnson-clock (package (name "go-github-com-benbjohnson-clock") @@ -745,6 +774,33 @@ indicator to any terminal application.") similar to Go's standard library @code{json} and @code{xml} package.") (license license:expat))) +;; XXX: This repository has been archived by the owner on Feb 21, 2018. It is +;; now read-only. +(define-public go-github-com-calmh-xdr + (package + (name "go-github-com-calmh-xdr") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/calmh/xdr") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "072wqdncz3nd4a3zkhvzzx1y3in1lm29wfvl0d8wrnqs5pyqh0mh")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/calmh/xdr")) + (home-page "https://github.com/calmh/xdr") + (synopsis "XDR marshalling and unmarshalling") + (description + "XDR is an External Data Representation (XDR) +marshalling and unmarshalling library in Go. It uses code generation and not +reflection.") + (license license:expat))) + (define-public go-github-com-cheggaaa-pb (package (name "go-github-com-cheggaaa-pb") @@ -1011,6 +1067,30 @@ submodules: metrics to Graphite.") (license license:bsd-2))) +(define-public go-github-com-d4l3k-messagediff + (package + (name "go-github-com-d4l3k-messagediff") + (version "1.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/d4l3k/messagediff") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "104hl8x57ciaz7mzafg1vp9qggxcyfm8hsv9bmlihbz9ml3nyr8v")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/d4l3k/messagediff")) + (home-page "https://github.com/d4l3k/messagediff") + (synopsis "Diff arbitrary Go structs") + (description + "Messagediff is a library for calculating diffs of arbitrary +structs in the Go programming language.") + (license license:expat))) + (define-public go-github-com-danwakefield-fnmatch (let ((commit "cbb64ac3d964b81592e64f957ad53df015803288") (revision "0")) @@ -1160,6 +1240,29 @@ atimes for files.") mtime,ctime and btime for files.") (license license:expat))) +(define-public go-github-com-dlclark-regexp2 + (package + (name "go-github-com-dlclark-regexp2") + (version "1.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dlclark/regexp2") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1irfv89b7lfkn7k3zgx610ssil6k61qs1wjj31kvqpxb3pdx4kry")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/dlclark/regexp2")) + (home-page "https://github.com/dlclark/regexp2/") + (synopsis "Full featured regular expressions for Go") + (description + "Regexp2 is a feature-rich RegExp engine for Go.") + (license license:expat))) + (define-public go-github-com-docopt-docopt-go (let ((commit "ee0de3bc6815ee19d4a46c7eb90f829db0e014b1") (revision "0")) @@ -1300,30 +1403,33 @@ Alphanum Algorithm} developed by Dave Koelle in Go.") defined output to the standard output.") (license license:expat))) -(define-public go-github-com-k0kubun-go-ansi - (package - (name "go-github-com-k0kubun-go-ansi") - (version "0.0.0-20180517002512-3bf9e2903213") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/k0kubun/go-ansi") - (commit (go-version->git-ref version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "117afax4l268rbswf02icbgxncmd1pk2abkz7cv26iyszi8l26dq")))) - (build-system go-build-system) - (arguments - (list - #:import-path "github.com/k0kubun/go-ansi")) - (home-page "https://github.com/k0kubun/go-ansi") - (synopsis "Windows-portable ANSI escape sequence utility for Golang") - (description - "This library converts ANSI escape sequences to Windows API calls on -Windows environment. You can easily use this feature by replacing fmt with -ansi.") - (license license:expat))) +;; XXX: This repository has been archived by the owner on Nov 9, 2017. It is +;; now read-only. +(define-public go-github-com-flynn-archive-go-shlex + (let ((commit "3f9db97f856818214da2e1057f8ad84803971cff") + (revision "0")) + (package + (name "go-github-com-flynn-archive-go-shlex") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/flynn-archive/go-shlex") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/flynn-archive/go-shlex")) + (synopsis "Go lexer") + (description + "Shlex is a simple lexer for go that supports shell-style +quoting, commenting, and escaping.") + (home-page "https://github.com/flynn-archive/go-shlex") + (license license:asl2.0)))) (define-public go-github-com-gabriel-vasile-mimetype (package @@ -1787,6 +1893,34 @@ expressing configuration which is easy for both humans and machines to read.") @end itemize") (license license:bsd-3))) +(define-public go-github-com-ianlancetaylor-demangle + ;; No release, see <https://github.com/ianlancetaylor/demangle/issues/21>. + (package + (name "go-github-com-ianlancetaylor-demangle") + (version "0.0.0-20230524184225-eabc099b10ab") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ianlancetaylor/demangle") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1pvlg1adp50hnw8dz7il473xb197ixirg26cy5hj3ngb4qlajwvc")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/ianlancetaylor/demangle")) + (home-page "https://github.com/ianlancetaylor/demangle") + (synopsis "Symbol name demangler written in Go") + (description + "This package defines functions that demangle GCC/LLVM C++ and Rust +symbol names. This package recognizes names that were mangled according to +the C++ ABI defined at https://codesourcery.com/cxx-abi/ and the +@url{https://rust-lang.github.io/rfcs/2603-rust-symbol-name-mangling-v0.html,Rust +ABI}.") + (license license:bsd-3))) + (define-public go-github-com-jbenet-go-random (package (name "go-github-com-jbenet-go-random") @@ -1939,33 +2073,30 @@ storing only one copy of each unique string in memory. All functions may be called concurrently with themselves and each other.") (license license:expat))) -(define-public go-github-com-ianlancetaylor-demangle - ;; No release, see <https://github.com/ianlancetaylor/demangle/issues/21>. +(define-public go-github-com-k0kubun-go-ansi (package - (name "go-github-com-ianlancetaylor-demangle") - (version "0.0.0-20230524184225-eabc099b10ab") + (name "go-github-com-k0kubun-go-ansi") + (version "0.0.0-20180517002512-3bf9e2903213") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ianlancetaylor/demangle") + (url "https://github.com/k0kubun/go-ansi") (commit (go-version->git-ref version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1pvlg1adp50hnw8dz7il473xb197ixirg26cy5hj3ngb4qlajwvc")))) + (base32 "117afax4l268rbswf02icbgxncmd1pk2abkz7cv26iyszi8l26dq")))) (build-system go-build-system) (arguments (list - #:import-path "github.com/ianlancetaylor/demangle")) - (home-page "https://github.com/ianlancetaylor/demangle") - (synopsis "Symbol name demangler written in Go") + #:import-path "github.com/k0kubun/go-ansi")) + (home-page "https://github.com/k0kubun/go-ansi") + (synopsis "Windows-portable ANSI escape sequence utility for Golang") (description - "This package defines functions that demangle GCC/LLVM C++ and Rust -symbol names. This package recognizes names that were mangled according to -the C++ ABI defined at https://codesourcery.com/cxx-abi/ and the -@url{https://rust-lang.github.io/rfcs/2603-rust-symbol-name-mangling-v0.html,Rust -ABI}.") - (license license:bsd-3))) + "This library converts ANSI escape sequences to Windows API calls on +Windows environment. You can easily use this feature by replacing fmt with +ansi.") + (license license:expat))) (define-public go-github-com-k0kubun-pp (package @@ -2044,6 +2175,51 @@ word-splitting rules.") (home-page "https://github.com/kballard/go-shellquote") (license license:expat)))) +(define-public go-github-com-klauspost-cpuid + (package + (name "go-github-com-klauspost-cpuid") + (version "1.2.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/klauspost/cpuid") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1s510210wdj5dkamii1qrk7v87k4qpdcrrjzflp5ha9iscw6b06l")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/klauspost/cpuid")) + (home-page "https://github.com/klauspost/cpuid") + (synopsis "CPU feature identification for Go") + (description + "@code{cpuid} provides information about the CPU running the current +program. CPU features are detected on startup, and kept for fast access +through the life of the application. Currently x86 / x64 (AMD64) is +supported, and no external C (cgo) code is used, which should make the library +very eas to use.") + (license license:expat))) + +(define-public go-github-com-klauspost-cpuid-v2 + (package + (inherit go-github-com-klauspost-cpuid ) + (name "go-github-com-klauspost-cpuid-v2") + (version "2.2.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/klauspost/cpuid") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fys5v9vslar483arj7wy4id5kg1c7vqv4437kgjnwvki69j9mxf")))) + (arguments + (list + #:import-path "github.com/klauspost/cpuid/v2")))) + (define-public go-github-com-lestrrat-go-envload (package (name "go-github-com-lestrrat-go-envload") @@ -2235,6 +2411,83 @@ implementing features like: @end itemize") (license license:expat)))) +(define-public go-github-com-masterminds-semver-v3 + (package + (name "go-github-com-masterminds-semver-v3") + (version "3.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Masterminds/semver") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1h4c647dgq6k5q78j3m98ccdrzd7kbcq4ahdy25j72rbxjmci8al")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.21 + #:import-path "github.com/Masterminds/semver/v3")) + (native-inputs + (list go-github-com-stretchr-testify-next)) + (home-page "https://github.com/Masterminds/semver/") + (synopsis "@code{semver} helps to work with semantic versions") + (description + "The semver package provides the ability to work with +semantic versions. Specifically it provides the ability to: +@itemize +@item Parse semantic versions +@item Sort semantic versions +@item Check if a semantic version fits within a set of constraints +@item Optionally work with a @code{v} prefix +@end itemize") + (license license:expat))) + +(define-public go-github-com-masterminds-sprig-v3 + (package + (name "go-github-com-masterminds-sprig-v3") + (version "3.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Masterminds/sprig") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wwi8n2adjc5jlga25lqq0hrz4jcgd5vpll68y2dfji034caaq18")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/Masterminds/sprig/v3" + #:phases + #~(modify-phases %standard-phases + ;; Tests tries to reach Google: + ;; tpl := `{{"www.google.com" | getHostByName}}` + (add-after 'unpack 'remove-network-tests + (lambda* (#:key import-path #:allow-other-keys) + (delete-file + (string-append "src/" import-path "/network_test.go"))))))) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-github-com-google-uuid + go-github-com-huandu-xstrings + go-github-com-imdario-mergo + go-github-com-masterminds-goutils + go-github-com-masterminds-semver-v3 + go-github-com-mitchellh-copystructure + go-github-com-mitchellh-reflectwalk + go-github-com-spf13-cast + go-golang-org-x-crypto)) + (home-page "https://github.com/Masterminds/sprig/") + (synopsis "Template functions for Go templates") + (description + "Sprig is a library that provides more than 100 commonly used template +functions.") + (license license:expat))) + (define-public go-github-com-matryer-try (package (name "go-github-com-matryer-try") @@ -2449,6 +2702,45 @@ the @code{cpan} module @code{Parse::CommandLine}.") other directories. It is optimized for filewalking.") (license license:expat))) +(define-public go-github-com-matttproud-golang-protobuf-extensions-v2 + (package + (name "go-github-com-matttproud-golang-protobuf-extensions-v2") + (version "2.0.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/matttproud/golang_protobuf_extensions") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0jw4vjycwx0a82yvixmp25805krdyqd960y8lnyggllb6br0vh41")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/matttproud/golang_protobuf_extensions/v2" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Activate when go-build-system supports submodules. + (delete 'build) + ;; XXX: Replace when go-build-system supports nested path. + (replace 'check + (lambda* (#:key import-path tests? #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (propagated-inputs + (list go-github-com-golang-protobuf + go-google-golang-org-protobuf)) + (home-page "https://github.com/matttproud/golang_protobuf_extensions") + (synopsis "Streaming Protocol Buffers in Go") + (description + "This package provides various Protocol Buffer extensions for the Go +language, namely support for record length-delimited message streaming.") + (license license:asl2.0))) + (define-public go-github-com-mgutz-ansi (let ((commit "9520e82c474b0a04dd04f8a40959027271bab992") (revision "0")) @@ -2507,6 +2799,29 @@ Domain Name Service}. The API follows the less-is-more principle, by presenting a small interface.") (license license:bsd-3))) +(define-public go-github-com-mitchellh-colorstring + (package + (name "go-github-com-mitchellh-colorstring") + (version "0.0.0-20190213212951-d06e56a500db") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mitchellh/colorstring") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1d2mi5ziszfzdgaz8dg4b6sxa63nw1jnsvffacqxky6yz9m623kn")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/mitchellh/colorstring")) + (home-page "https://github.com/mitchellh/colorstring") + (synopsis "Functions to colorize strings for terminal output") + (description + "Colorstring provides functions for colorizing strings for terminal output.") + (license license:expat))) + (define-public go-github-com-modern-go-concurrent (package (name "go-github-com-modern-go-concurrent") @@ -2605,6 +2920,60 @@ command line flags, config files, and default struct values.") @url{https://github.com/judwhite/go-svc/raw/master/svc/svc_windows_test.go,here}.") (license license:expat)))) +(define-public go-github-com-msteinert-pam + (package + (name "go-github-com-msteinert-pam") + (version "1.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/msteinert/pam") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qnr0zxyxny85andq3cbj90clmz2609j8z9mp0zvdyxiwryfhyhj")))) + (build-system go-build-system) + (arguments + (list + ;; To run the full suite, the tests must be run as the root user. + #:tests? #f + #:go go-1.20 + #:import-path "github.com/msteinert/pam")) + (propagated-inputs + (list go-golang-org-x-term + ;; For header files, otherwise it needs to be added as an input in + ;; final package to prevent build failure: + ;; ../../../github.com/msteinert/pam/transaction.go:7:10: fatal + ;; error: security/pam_appl.h: No such file or directory + linux-pam)) + (home-page "https://github.com/msteinert/pam") + (synopsis "Golang wrapper module for the PAM API") + (description + "This package provides a wrapper for the @acronym{Pluggable +Authentication Modules, PAM} application API.") + (license license:bsd-2))) + +(define-public go-github-com-msteinert-pam-v2 + (package + (inherit go-github-com-msteinert-pam) + (name "go-github-com-msteinert-pam-v2") + (version "2.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/msteinert/pam") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1h02dcx00vgcsxgl5sly82dbixk8cimjb10q5p405bf4fz8z7q6k")))) + (arguments + (substitute-keyword-arguments + (package-arguments go-github-com-msteinert-pam) + ((#:import-path _ "github.com/msteinert/pam") + "github.com/msteinert/pam/v2"))))) + (define-public go-github-com-multiformats-go-base32 (package (name "go-github-com-multiformats-go-base32") @@ -2691,60 +3060,6 @@ command line flags, config files, and default struct values.") multibase} (self identifying base encodings) in Go.") (license license:expat))) -(define-public go-github-com-msteinert-pam - (package - (name "go-github-com-msteinert-pam") - (version "1.2.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/msteinert/pam") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1qnr0zxyxny85andq3cbj90clmz2609j8z9mp0zvdyxiwryfhyhj")))) - (build-system go-build-system) - (arguments - (list - ;; To run the full suite, the tests must be run as the root user. - #:tests? #f - #:go go-1.20 - #:import-path "github.com/msteinert/pam")) - (propagated-inputs - (list go-golang-org-x-term - ;; For header files, otherwise it needs to be added as an input in - ;; final package to prevent build failure: - ;; ../../../github.com/msteinert/pam/transaction.go:7:10: fatal - ;; error: security/pam_appl.h: No such file or directory - linux-pam)) - (home-page "https://github.com/msteinert/pam") - (synopsis "Golang wrapper module for the PAM API") - (description - "This package provides a wrapper for the @acronym{Pluggable -Authentication Modules, PAM} application API.") - (license license:bsd-2))) - -(define-public go-github-com-msteinert-pam-v2 - (package - (inherit go-github-com-msteinert-pam) - (name "go-github-com-msteinert-pam-v2") - (version "2.0.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/msteinert/pam") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1h02dcx00vgcsxgl5sly82dbixk8cimjb10q5p405bf4fz8z7q6k")))) - (arguments - (substitute-keyword-arguments - (package-arguments go-github-com-msteinert-pam) - ((#:import-path _ "github.com/msteinert/pam") - "github.com/msteinert/pam/v2"))))) - (define-public go-github-com-multiformats-go-multicodec (package (name "go-github-com-multiformats-go-multicodec") @@ -3137,7 +3452,7 @@ Pion}.") ;; Source-only package (delete 'build)))) (propagated-inputs - (list go-github-com-golang-protobuf-proto)) + (list go-github-com-golang-protobuf)) (synopsis "Data model artifacts for Prometheus") (description "This package provides data model artifacts for Prometheus.") (home-page "https://github.com/prometheus/client_model") @@ -3473,6 +3788,51 @@ well as a program to generate applications and command files.") storage system.") (license license:bsd-2))) +(define-public go-github-com-thejerf-suture + (package + (name "go-github-com-thejerf-suture") + (version "3.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/thejerf/suture") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "166hbjc1gn7skvq9vcp5h1xkavw9zw6dwx63vhih8fzm3nbbp0ic")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/thejerf/suture")) + (home-page "https://github.com/thejerf/suture") + (synopsis "Supervisor trees for Go") + (description "Suture provides Erlang-ish supervisor trees for Go. +\"Supervisor trees\" -> \"sutree\" -> \"suture\" -> holds your code together +when it's trying to die. + +It is intended to deal gracefully with the real failure cases that can occur +with supervision trees (such as burning all your CPU time endlessly restarting +dead services), while also making no unnecessary demands on the \"service\" +code, and providing hooks to perform adequate logging with in a production +environment") + (license license:expat))) + +(define-public go-github-com-thejerf-suture-v4 + (package + (inherit go-github-com-thejerf-suture) + (name "go-github-com-thejerf-suture-v4") + (version "4.0.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/thejerf/suture") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15qi7v2a1kbf70yi3w6y26wbwj0sm8hv9f6xjrb4rl6nv9l8j88c")))))) + (define-public go-github-com-tidwall-gjson (package (name "go-github-com-tidwall-gjson") @@ -3680,6 +4040,34 @@ supported by the time package @end itemize") (license license:expat))) +(define-public go-github-com-vitrun-qart + (let ((commit "bf64b92db6b05651d6c25a3dabf2d543b360c0aa") + (revision "0")) + (package + (name "go-github-com-vitrun-qart") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vitrun/qart") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xk7qki703xmay9ghi3kq2bjf1iw9dz8wik55739d6i7sn77vvkc")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/vitrun/qart")) + (home-page "https://github.com/vitrun/qart") + (synopsis "Create QR codes with an embedded image") + (description + "This package provides a library for embedding human-meaningful +graphics in QR codes. However, instead of scribbling on redundant pieces and +relying on error correction to preserve the meaning, @code{qart} engineers the +encoded values to create the picture in a code with no inherent errors.") + (license license:bsd-3)))) + (define-public go-github-com-vividcortex-ewma (package (name "go-github-com-vividcortex-ewma") @@ -3756,6 +4144,34 @@ string. The string can be a string retorned for @code{time.Duration} or a similar string with weeks or days too.") (license license:bsd-3))) +(define-public go-go-etcd-io-bbolt + (package + (name "go-go-etcd-io-bbolt") + (version "1.3.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/etcd-io/bbolt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0pj5245d417za41j6p09fmkbv05797vykr1bi9a6rnwddh1dbs8d")))) + (build-system go-build-system) + (arguments + `(#:import-path "go.etcd.io/bbolt" + ;; Extending the test timeout to 30 minutes still times out on aarch64. + #:tests? ,(not target-arm?))) + (propagated-inputs + (list go-golang-org-x-sys)) + (home-page "https://go.etcd.io/bbolt") + (synopsis "Embedded key/value database for Go") + (description "Bolt is a pure Go key/value store inspired by Howard Chu's +LMDB project. The goal of the project is to provide a simple, fast, and +reliable database for projects that don't require a full database server such as +Postgres or MySQL.") + (license license:expat))) + (define-public go-go-uber-org-atomic (package (name "go-go-uber-org-atomic") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index ceaae9ebb7..d9145e9ac4 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org> ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> -;;; Copyright © 2018, 2019, 2020, 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com> +;;; Copyright © 2018, 2019, 2020, 2023, 2024 Katherine Cox-Buday <cox.katherine.e@gmail.com> ;;; Copyright © 2019 Giovanni Biscuolo <g@xelera.eu> ;;; Copyright © 2019, 2020 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019, 2020, 2021 Arun Isaac <arunisaac@systemreboot.net> @@ -45,6 +45,7 @@ ;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com> ;;; Copyright © 2024 Greg Hogan <code@greghogan.com> +;;; Copyright © 2024 Brennan Vincent <brennan@umanwizard.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -97,7 +98,6 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages ruby) - #:use-module (gnu packages syncthing) #:use-module (gnu packages terminals) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) @@ -266,11 +266,11 @@ in the style of communicating sequential processes (@dfn{CSP}).") (supported-systems '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux")) (license license:bsd-3))) -(define-public go-1.14 +(define-public go-1.16 (package (inherit go-1.4) (name "go") - (version "1.14.15") + (version "1.16.15") (source (origin (method git-fetch) @@ -280,63 +280,39 @@ in the style of communicating sequential processes (@dfn{CSP}).") (file-name (git-file-name name version)) (sha256 (base32 - "1crh90qkvhlx23hwsi4wxy3l3h8973lr18135y6h1nnzzwr3n3ps")))) - (arguments - (substitute-keyword-arguments (package-arguments go-1.4) - ((#:system system) - (if (string-prefix? "aarch64-linux" (or (%current-system) - (%current-target-system))) - "aarch64-linux" - system)) + "0vlk0r4600ah9fg5apdd93g7i369k0rkzcgn7cs8h6qq2k6hpxjl")))) + (arguments + (substitute-keyword-arguments + (strip-keyword-arguments '(#:tests? #:system) (package-arguments go-1.4)) ((#:phases phases) `(modify-phases ,phases + (add-after 'unpack 'remove-unused-sourcecode-generators + (lambda _ + ;; Prevent perl from inclusion in closure through unused files + (for-each delete-file (find-files "src" "\\.pl$")))) (replace 'prebuild (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib")) - (ld (string-append (assoc-ref inputs "libc") "/lib")) - (loader (car (append (find-files ld "^ld-linux.+") - (find-files ld "^ld(64)?\\.so.+")))) (net-base (assoc-ref inputs "net-base")) (tzdata-path - (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) - (output (assoc-ref outputs "out"))) + (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))) ;; Having the patch in the 'patches' field of <origin> breaks ;; the 'TestServeContent' test due to the fact that ;; timestamps are reset. Thus, apply it from here. (invoke "patch" "-p2" "--force" "-i" (assoc-ref inputs "go-skip-gc-test.patch")) - - ;; A side effect of these test scripts is testing - ;; cgo. Attempts at using cgo flags and directives with these - ;; scripts as specified here (https://golang.org/cmd/cgo/) - ;; have not worked. The tests continue to state that they can - ;; not find object files/headers despite being present. - (for-each - delete-file - '("cmd/go/testdata/script/mod_case_cgo.txt" - "cmd/go/testdata/script/list_find.txt" - "cmd/go/testdata/script/list_compiled_imports.txt" - "cmd/go/testdata/script/cgo_syso_issue29253.txt" - "cmd/go/testdata/script/cover_cgo.txt" - "cmd/go/testdata/script/cover_cgo_xtest.txt" - "cmd/go/testdata/script/cover_cgo_extra_test.txt" - "cmd/go/testdata/script/cover_cgo_extra_file.txt" - "cmd/go/testdata/script/cgo_path_space.txt" - "cmd/go/testdata/script/ldflag.txt" - "cmd/go/testdata/script/cgo_path.txt")) + (invoke "patch" "-p2" "--force" "-i" + (assoc-ref inputs "go-fix-script-tests.patch")) (for-each make-file-writable (find-files ".")) (substitute* "os/os_test.go" (("/usr/bin") (getcwd)) - (("/bin/pwd") (which "pwd")) (("/bin/sh") (which "sh"))) - ;; Backport fix for go-1.14 with GCC 9+ - ;; https://github.com/golang/go/issues/39157 - (substitute* "cmd/go/note_test.go" - (("cannot find 'ld'") "cannot find [‘']ld[’']")) + (substitute* "cmd/go/testdata/script/cgo_path_space.txt" + (("/bin/sh") (which "sh"))) ;; Add libgcc to runpath (substitute* "cmd/link/internal/ld/lib.go" @@ -344,7 +320,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (substitute* "cmd/go/internal/work/gccgo.go" (("cgoldflags := \\[\\]string\\{\\}") (string-append "cgoldflags := []string{" - "\"-rpath=" gcclib "\"" + "\"-Wl,-rpath=" gcclib "\"" "}")) (("\"-lgcc_s\", ") (string-append @@ -413,28 +389,42 @@ in the style of communicating sequential processes (@dfn{CSP}).") (substitute* "net/port_unix.go" (("/etc/services") (string-append net-base "/etc/services"))) (substitute* "time/zoneinfo_unix.go" - (("/usr/share/zoneinfo/") tzdata-path)) - (substitute* (find-files "cmd" "\\.go") - (("/lib(64)?/ld-linux.*\\.so\\.[0-9]") loader)) - #t))) + (("/usr/share/zoneinfo/") tzdata-path))))) (add-before 'build 'set-bootstrap-variables (lambda* (#:key outputs inputs #:allow-other-keys) ;; Tell the build system where to find the bootstrap Go. (let ((go (assoc-ref inputs "go"))) (setenv "GOROOT_BOOTSTRAP" go) - (setenv "GOGC" "400") - #t))) + (setenv "GOGC" "400")))) (replace 'build - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda* (#:key inputs outputs (parallel-build? #t) + #:allow-other-keys) ;; FIXME: Some of the .a files are not bit-reproducible. - (let* ((output (assoc-ref outputs "out"))) + ;; (Is this still true?) + (let* ((njobs (if parallel-build? (parallel-job-count) 1)) + (output (assoc-ref outputs "out")) + (loader (string-append (assoc-ref inputs "libc") + ,(glibc-dynamic-linker)))) (setenv "CC" (which "gcc")) + (setenv "GO_LDSO" loader) (setenv "GOOS" "linux") (setenv "GOROOT" (dirname (getcwd))) (setenv "GOROOT_FINAL" output) (setenv "GOCACHE" "/tmp/go-cache") - (setenv "CGO_ENABLED" "1") - (invoke "sh" "all.bash")))) + (setenv "GOMAXPROCS" (number->string njobs)) + (invoke "sh" "make.bash" "--no-banner")))) + (replace 'check + (lambda* (#:key target (tests? (not target)) (parallel-tests? #t) + #:allow-other-keys) + (let* ((njobs (if parallel-tests? (parallel-job-count) 1))) + (when tests? + (setenv "GOMAXPROCS" (number->string njobs)) + (invoke "sh" "run.bash" "--no-rebuild"))))) + (add-before 'install 'unpatch-perl-shebangs + (lambda _ + ;; Rewrite references to perl input in test scripts + (substitute* "net/http/cgi/testdata/test.cgi" + (("^#!.*") "#!/usr/bin/env perl\n")))) (replace 'install ;; TODO: Most of this could be factorized with Go 1.4. (lambda* (#:key outputs #:allow-other-keys) @@ -468,8 +458,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") '("README.md" "CONTRIBUTORS" "AUTHORS" "PATENTS" "LICENSE" "VERSION" "CONTRIBUTING.md" "robots.txt")) - (copy-recursively "../" output) - #t))))))) + (copy-recursively "../" output)))))))) (native-inputs `(,@(if (member (%current-system) (package-supported-systems go-1.4)) `(("go" ,go-1.4)) @@ -479,167 +468,11 @@ in the style of communicating sequential processes (@dfn{CSP}).") ((or "armhf-linux" "aarch64-linux") `(("gold" ,binutils-gold))) (_ `())) + ("go-fix-script-tests.patch" ,(search-patch "go-fix-script-tests.patch")) ,@(package-native-inputs go-1.4))) (supported-systems (fold delete %supported-systems (list "powerpc-linux" "i586-gnu"))))) -(define-public go-1.16 - (package - (inherit go-1.14) - (name "go") - (version "1.16.15") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/golang/go") - (commit (string-append "go" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0vlk0r4600ah9fg5apdd93g7i369k0rkzcgn7cs8h6qq2k6hpxjl")))) - (arguments - (substitute-keyword-arguments - (strip-keyword-arguments '(#:tests?) (package-arguments go-1.14)) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'remove-unused-sourcecode-generators - (lambda _ - ;; Prevent perl from inclusion in closure through unused files - (for-each delete-file (find-files "src" "\\.pl$")))) - (replace 'prebuild - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib")) - (net-base (assoc-ref inputs "net-base")) - (tzdata-path - (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))) - - ;; Having the patch in the 'patches' field of <origin> breaks - ;; the 'TestServeContent' test due to the fact that - ;; timestamps are reset. Thus, apply it from here. - (invoke "patch" "-p2" "--force" "-i" - (assoc-ref inputs "go-skip-gc-test.patch")) - (invoke "patch" "-p2" "--force" "-i" - (assoc-ref inputs "go-fix-script-tests.patch")) - - (for-each make-file-writable (find-files ".")) - - (substitute* "os/os_test.go" - (("/usr/bin") (getcwd)) - (("/bin/sh") (which "sh"))) - - (substitute* "cmd/go/testdata/script/cgo_path_space.txt" - (("/bin/sh") (which "sh"))) - - ;; Add libgcc to runpath - (substitute* "cmd/link/internal/ld/lib.go" - (("!rpath.set") "true")) - (substitute* "cmd/go/internal/work/gccgo.go" - (("cgoldflags := \\[\\]string\\{\\}") - (string-append "cgoldflags := []string{" - "\"-Wl,-rpath=" gcclib "\"" - "}")) - (("\"-lgcc_s\", ") - (string-append - "\"-Wl,-rpath=" gcclib "\", \"-lgcc_s\", "))) - (substitute* "cmd/go/internal/work/gc.go" - (("ldflags = setextld\\(ldflags, compiler\\)") - (string-append - "ldflags = setextld(ldflags, compiler)\n" - "ldflags = append(ldflags, \"-r\")\n" - "ldflags = append(ldflags, \"" gcclib "\")\n"))) - - ;; Disable failing tests: these tests attempt to access - ;; commands or network resources which are neither available - ;; nor necessary for the build to succeed. - (for-each - (match-lambda - ((file regex) - (substitute* file - ((regex all before test_name) - (string-append before "Disabled" test_name))))) - '(("net/net_test.go" "(.+)(TestShutdownUnix.+)") - ("net/dial_test.go" "(.+)(TestDialTimeout.+)") - ("net/cgo_unix_test.go" "(.+)(TestCgoLookupPort.+)") - ("net/cgo_unix_test.go" "(.+)(TestCgoLookupPortWithCancel.+)") - ;; 127.0.0.1 doesn't exist - ("net/cgo_unix_test.go" "(.+)(TestCgoLookupPTR.+)") - ;; 127.0.0.1 doesn't exist - ("net/cgo_unix_test.go" "(.+)(TestCgoLookupPTRWithCancel.+)") - ;; /etc/services doesn't exist - ("net/parse_test.go" "(.+)(TestReadLine.+)") - ("os/os_test.go" "(.+)(TestHostname.+)") - ;; The user's directory doesn't exist - ("os/os_test.go" "(.+)(TestUserHomeDir.+)") - ("time/format_test.go" "(.+)(TestParseInSydney.+)") - ("time/format_test.go" "(.+)(TestParseInLocation.+)") - ("os/exec/exec_test.go" "(.+)(TestEcho.+)") - ("os/exec/exec_test.go" "(.+)(TestCommandRelativeName.+)") - ("os/exec/exec_test.go" "(.+)(TestCatStdin.+)") - ("os/exec/exec_test.go" "(.+)(TestCatGoodAndBadFile.+)") - ("os/exec/exec_test.go" "(.+)(TestExitStatus.+)") - ("os/exec/exec_test.go" "(.+)(TestPipes.+)") - ("os/exec/exec_test.go" "(.+)(TestStdinClose.+)") - ("os/exec/exec_test.go" "(.+)(TestIgnorePipeErrorOnSuccess.+)") - ("syscall/syscall_unix_test.go" "(.+)(TestPassFD\\(.+)") - ("os/exec/exec_test.go" "(.+)(TestExtraFiles/areturn.+)") - ("cmd/go/go_test.go" "(.+)(TestCoverageWithCgo.+)") - ("cmd/go/go_test.go" "(.+)(TestTwoPkgConfigs.+)") - ("os/exec/exec_test.go" "(.+)(TestOutputStderrCapture.+)") - ("os/exec/exec_test.go" "(.+)(TestExtraFiles.+)") - ("os/exec/exec_test.go" "(.+)(TestExtraFilesRace.+)") - ("net/lookup_test.go" "(.+)(TestLookupPort.+)") - ("syscall/exec_linux_test.go" - "(.+)(TestCloneNEWUSERAndRemapNoRootDisableSetgroups.+)"))) - - ;; These tests fail on aarch64-linux - (substitute* "cmd/dist/test.go" - (("t.registerHostTest\\(\"testsanitizers/msan.*") "")) - - ;; fix shebang for testar script - ;; note the target script is generated at build time. - (substitute* "../misc/cgo/testcarchive/carchive_test.go" - (("#!/usr/bin/env") (string-append "#!" (which "env")))) - - (substitute* "net/lookup_unix.go" - (("/etc/protocols") (string-append net-base "/etc/protocols"))) - (substitute* "net/port_unix.go" - (("/etc/services") (string-append net-base "/etc/services"))) - (substitute* "time/zoneinfo_unix.go" - (("/usr/share/zoneinfo/") tzdata-path))))) - (replace 'build - (lambda* (#:key inputs outputs (parallel-build? #t) - #:allow-other-keys) - ;; FIXME: Some of the .a files are not bit-reproducible. - ;; (Is this still true?) - (let* ((njobs (if parallel-build? (parallel-job-count) 1)) - (output (assoc-ref outputs "out")) - (loader (string-append (assoc-ref inputs "libc") - ,(glibc-dynamic-linker)))) - (setenv "CC" (which "gcc")) - (setenv "GO_LDSO" loader) - (setenv "GOOS" "linux") - (setenv "GOROOT" (dirname (getcwd))) - (setenv "GOROOT_FINAL" output) - (setenv "GOCACHE" "/tmp/go-cache") - (setenv "GOMAXPROCS" (number->string njobs)) - (invoke "sh" "make.bash" "--no-banner")))) - (replace 'check - (lambda* (#:key target (tests? (not target)) (parallel-tests? #t) - #:allow-other-keys) - (let* ((njobs (if parallel-tests? (parallel-job-count) 1))) - (when tests? - (setenv "GOMAXPROCS" (number->string njobs)) - (invoke "sh" "run.bash" "--no-rebuild"))))) - (add-before 'install 'unpatch-perl-shebangs - (lambda _ - ;; Rewrite references to perl input in test scripts - (substitute* "net/http/cgi/testdata/test.cgi" - (("^#!.*") "#!/usr/bin/env perl\n")))))))) - (native-inputs - `(("go-fix-script-tests.patch" ,(search-patch "go-fix-script-tests.patch")) - ,@(package-native-inputs go-1.14))))) - ;; https://github.com/golang/go/wiki/MinimumRequirements#microarchitecture-support (define %go-1.17-arm-micro-architectures (list "armv5" "armv6" "armv7")) @@ -1114,6 +947,44 @@ in the style of communicating sequential processes (@dfn{CSP}).") ("api" "share/go/api" ,tests) ("test" "share/go/test" ,tests)))))))))))) +(define-public go-1.22 + (package + (inherit go-1.21) + (name "go") + (version "1.22.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/golang/go") + (commit (string-append "go" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0p6v5dl4mzlrma6v1a26d8zr4csq5mm10d9sdhl3kn9d22vphql1")))) + (arguments + (substitute-keyword-arguments (package-arguments go-1.21) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'unpatch-perl-shebangs + (lambda _ + ;; Avoid inclusion of perl in closure by rewriting references + ;; to perl input in sourcecode generators and test scripts + (substitute* (find-files "src" "\\.pl$") + (("^#!.*") + "#!/usr/bin/env perl\n")))) + (add-after 'unpack 'remove-flakey-thread-sanitizer-tests + (lambda _ + ;; These tests have been identified as flakey: + ;; https://github.com/golang/go/issues/66427 + (substitute* "src/cmd/cgo/internal/testsanitizers/tsan_test.go" + ((".*tsan1[34].*") "")))))))) + (native-inputs + ;; Go 1.22 and later requires Go 1.20 (min. 1.20.6, which we don't have) + ;; as the bootstrap toolchain. + (alist-replace "go" + (list go-1.21) + (package-native-inputs go-1.21))))) + (define-public go go-1.17) (define make-go-std @@ -1150,13 +1021,13 @@ in the style of communicating sequential processes (@dfn{CSP}).") (export make-go-std) ;; Make those public so they have a corresponding Cuirass job. -(define-public go-std-1.14 (make-go-std go-1.14)) (define-public go-std-1.16 (make-go-std go-1.16)) (define-public go-std-1.17 (make-go-std go-1.17)) (define-public go-std-1.18 (make-go-std go-1.18)) (define-public go-std-1.19 (make-go-std go-1.19)) (define-public go-std-1.20 (make-go-std go-1.20)) (define-public go-std-1.21 (make-go-std go-1.21)) +(define-public go-std-1.22 (make-go-std go-1.22)) (define-public go-0xacab-org-leap-shapeshifter (let ((commit "0aa6226582efb8e563540ec1d3c5cfcd19200474") @@ -6335,7 +6206,7 @@ test when a comparison fails.") '(#:import-path "gotest.tools/gotestsum")) (native-inputs (list go-github-com-fatih-color - go-golang.org-x-sync-errgroup + go-golang-org-x-sync go-github-com-pkg-errors go-github-com-sirupsen-logrus go-github-com-spf13-pflag @@ -6357,25 +6228,34 @@ test results.") (home-page "https://github.com/gotestyourself/gotestsum") (license license:asl2.0))) -(define-public go-github-com-golang-protobuf-proto +(define-public go-github-com-golang-protobuf (package - (name "go-github-com-golang-protobuf-proto") - (version "1.3.1") + (name "go-github-com-golang-protobuf") + (version "1.5.3") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/golang/protobuf") - (commit (string-append "v" version)))) + (url "https://github.com/golang/protobuf") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl")))) + "03f1w2cd4s8a3xhl61x7yjx81kbzlrjpvnnwmbhqnz814yi7h43i")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/golang/protobuf/proto" - #:unpack-path "github.com/golang/protobuf" - ;; Requires unpackaged golang.org/x/sync/errgroup - #:tests? #f)) + (list #:import-path "github.com/golang/protobuf" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (propagated-inputs + (list go-google-golang-org-protobuf)) (synopsis "Go support for Protocol Buffers") (description "This package provides Go support for the Protocol Buffers data serialization format.") @@ -6385,7 +6265,7 @@ data serialization format.") (define-public go-google-golang-org-protobuf (package (name "go-google-golang-org-protobuf") - (version "1.28.0") + (version "1.31.0") (source (origin (method git-fetch) (uri (git-reference @@ -6394,16 +6274,22 @@ data serialization format.") (file-name (git-file-name name version)) (sha256 (base32 - "1nzcc4qc00afi24nb7nlnwyzvvr6b8s8qdrn1sw085nygh2y2x8r")))) + "1xf18kzz96hgfy1vlbnydrizzpxkqj2iamfdbj3dx5a1zz5mi8n0")))) (build-system go-build-system) (arguments - (list #:import-path "google.golang.org/protobuf" - #:tests? #f ; source-only package - #:phases #~(modify-phases %standard-phases - ;; source-only package - (delete 'build)))) - (propagated-inputs (list go-github-com-google-go-cmp-cmp - go-github-com-golang-protobuf-proto)) + (list #:go go-1.21 + #:import-path "google.golang.org/protobuf" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (propagated-inputs (list go-github-com-google-go-cmp-cmp)) (home-page "https://google.golang.org/protobuf") (synopsis "Go library for Protocol Buffers") (description @@ -6603,31 +6489,6 @@ characters with their ASCII approximations.") (description "Go library that pluralizes and singularizes English nouns.") (license license:bsd-2)))) -(define-public go-github-com-klauspost-cpuid - (package - (name "go-github-com-klauspost-cpuid") - (version "1.2.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/klauspost/cpuid") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1s510210wdj5dkamii1qrk7v87k4qpdcrrjzflp5ha9iscw6b06l")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/klauspost/cpuid")) - (home-page "https://github.com/klauspost/cpuid") - (synopsis "CPU feature identification for Go") - (description "@code{cpuid} provides information about the CPU running the -current program. CPU features are detected on startup, and kept for fast access -through the life of the application. Currently x86 / x64 (AMD64) is supported, -and no external C (cgo) code is used, which should make the library very eas -to use.") - (license license:expat))) - (define-public go-github-com-surge-glog (let ((commit "2578deb2b95c665e6b1ebabf304ce2085c9e1985") (revision "1")) @@ -6704,34 +6565,6 @@ various ways. It is a Go implementation of some string manipulation libraries of Java Apache Commons.") (license license:asl2.0))) -(define-public go-github-com-masterminds-semver - (package - (name "go-github-com-masterminds-semver") - (version "3.1.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Masterminds/semver") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1g1wizfdy29d02l9dh8gsb029yr4m4swp13swf0pnh9ryh5f1msz")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/Masterminds/semver")) - (home-page "https://github.com/Masterminds/semver/") - (synopsis "@code{semver} helps to work with semantic versions") - (description "The semver package provides the ability to work with -semantic versions. Specifically it provides the ability to: -@itemize -@item Parse semantic versions -@item Sort semantic versions -@item Check if a semantic version fits within a set of constraints -@item Optionally work with a @code{v} prefix -@end itemize\n") - (license license:expat))) - (define-public go-github-com-huandu-xstrings (package (name "go-github-com-huandu-xstrings") @@ -6804,40 +6637,6 @@ maps (because they are not addressable using Go reflection).") (native-inputs (list go-gopkg-in-yaml-v3)))) -(define-public go-github-com-masterminds-sprig - (package - (name "go-github-com-masterminds-sprig") - (version "3.1.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Masterminds/sprig") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0wwi8n2adjc5jlga25lqq0hrz4jcgd5vpll68y2dfji034caaq18")))) - (build-system go-build-system) - (arguments - `(#:tests? #f ;network tests only - #:import-path "github.com/Masterminds/sprig")) - (native-inputs - (list go-github-com-masterminds-goutils - go-github-com-masterminds-semver - go-github-com-google-uuid - go-github-com-huandu-xstrings - go-github-com-imdario-mergo - go-github-com-mitchellh-reflectwalk - go-github-com-mitchellh-copystructure - go-github-com-spf13-cast - go-golang-org-x-crypto - go-github-com-stretchr-testify)) - (home-page "https://github.com/Masterminds/sprig/") - (synopsis "Template functions for Go templates") - (description "Sprig is a library that provides more than 100 commonly used -template functions.") - (license license:expat))) - (define-public go-github-com-bmatcuk-doublestar (package (name "go-github-com-bmatcuk-doublestar") @@ -6889,26 +6688,23 @@ matching and globbing with support for \"doublestar\" patterns.") #:unpack-path "github.com/bmatcuk/doublestar/v2" #:import-path "github.com/bmatcuk/doublestar/v2")))) -(define-public go-github-com-dlclark-regexp2 +(define-public go-github-com-bmatcuk-doublestar-v4 (package - (name "go-github-com-dlclark-regexp2") - (version "1.4.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dlclark/regexp2") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1irfv89b7lfkn7k3zgx610ssil6k61qs1wjj31kvqpxb3pdx4kry")))) - (build-system go-build-system) + (inherit go-github-com-bmatcuk-doublestar) + (name "go-github-com-bmatcuk-doublestar-v4") + (version "4.6.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bmatcuk/doublestar") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12rf4a9isgg2nh927gikgbmyaynaqp4kjahgscb4qnr04m3vpr41")))) (arguments - `(#:import-path "github.com/dlclark/regexp2")) - (home-page "https://github.com/dlclark/regexp2/") - (synopsis "Full featured regular expressions for Go") - (description "Regexp2 is a feature-rich RegExp engine for Go.") - (license license:expat))) + (list + #:import-path "github.com/bmatcuk/doublestar/v4")))) (define-public go-github-com-alecthomas-colour (package @@ -7801,8 +7597,8 @@ formatting information, rather than the current locale name.") ;; Source-only package (delete 'build)))) (propagated-inputs - (list go-github-com-golang-protobuf-proto - go-github-com-matttproud-golang-protobuf-extensions-pbutil + (list go-github-com-golang-protobuf + go-github-com-matttproud-golang-protobuf-extensions-v2 go-github-com-prometheus-client-model)) (synopsis "Prometheus metrics") (description "This package provides tools for reading and writing @@ -7829,7 +7625,7 @@ Prometheus metrics.") ;; The tests require Go modules, which are not yet supported in Guix's ;; Go build system. #:tests? #f)) - (propagated-inputs (list go-golang.org-x-sync-errgroup)) + (propagated-inputs (list go-golang-org-x-sync)) (synopsis "Go library for reading @file{/proc}") (description "The @code{procfs} Go package provides functions to retrieve system, kernel, and process metrics from the @file{/proc} pseudo file system.") @@ -7859,7 +7655,7 @@ system, kernel, and process metrics from the @file{/proc} pseudo file system.") (delete 'build)))) (propagated-inputs (list go-github-com-beorn7-perks-quantile - go-github-com-golang-protobuf-proto + go-github-com-golang-protobuf go-github-com-prometheus-client-model go-github-com-prometheus-common go-github-com-prometheus-procfs @@ -7927,29 +7723,6 @@ losing type information. The primary intended use is for implementing configuration languages, but other uses may be possible too.") (license license:expat))) -(define-public go-etcd-io-bbolt - (package - (name "go-etcd-io-bbolt") - (version "1.3.6") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/etcd-io/bbolt") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0pj5245d417za41j6p09fmkbv05797vykr1bi9a6rnwddh1dbs8d")))) - (build-system go-build-system) - (arguments - `(#:import-path "go.etcd.io/bbolt")) - (propagated-inputs - (list go-golang-org-x-sys)) - (home-page "https://pkg.go.dev/go.etcd.io/bbolt/") - (synopsis "Low-level key/value store in Go") - (description "This package implements a low-level key/value store in Go.") - (license license:expat))) - (define-public go-github-com-rogpeppe-go-internal (package (name "go-github-com-rogpeppe-go-internal") @@ -9122,28 +8895,6 @@ kubernetes-sigs/yaml is a permanent fork of @url{https://github.com/ghodss/yaml,ghodss/yaml}.") (license (list license:expat license:bsd-3)))) -(define-public go-github-com-mitchellh-colorstring - (package - (name "go-github-com-mitchellh-colorstring") - (version "0.0.0-20190213212951-d06e56a500db") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mitchellh/colorstring") - (commit (go-version->git-ref version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1d2mi5ziszfzdgaz8dg4b6sxa63nw1jnsvffacqxky6yz9m623kn")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/mitchellh/colorstring")) - (home-page "https://github.com/mitchellh/colorstring") - (synopsis "Functions to colorize strings for terminal output") - (description - "Colorstring provides functions for colorizing strings for terminal output.") - (license license:expat))) - (define-public go-github-com-google-go-jsonnet (package (name "go-github-com-google-go-jsonnet") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 1c78a969f6..56763cd835 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2904,7 +2904,7 @@ user interaction (e.g. measuring distances).") (define-public volctl (package (name "volctl") - (version "0.9.3") + (version "0.9.4") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/buzz/volctl") @@ -2912,7 +2912,7 @@ user interaction (e.g. measuring distances).") (file-name (git-file-name name version)) (sha256 (base32 - "0fz80w3ywq54jn4v31frfdj01s5g9lz6v9cd7hpg3kirca0zisln")))) + "0anrwz8rvbliskmcgpw2zabgjj5c72hpi7cf0jg05vvmlpnbsd4g")))) (build-system python-build-system) (arguments `(#:phases diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 94417079c7..5ef51e27a9 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2290,7 +2290,7 @@ user which package sets would they like to install from it.") (define-public guile-wisp (package (name "guile-wisp") - (version "1.0.7") + (version "1.0.12") (source (origin (method hg-fetch) (uri (hg-reference @@ -2299,7 +2299,7 @@ user which package sets would they like to install from it.") (file-name (git-file-name name version)) (sha256 (base32 - "0fxngiy8dmryh3gx4g1q7nnamc4dpszjh130g6d0pmi12ycxd2y9")))) + "0m5ssl4ngk2jl1zk0fnsss0asyvwanjaa5rrcksldqnh2ikcr4bm")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 5447ecec1e..6f6ac3fd08 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -190,13 +190,13 @@ framework}.") (define-public ghc-tasty-hspec (package (name "ghc-tasty-hspec") - (version "1.2.0.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "tasty-hspec" version)) - (sha256 - (base32 - "0ibl2xi6mmqad2mriz67nb7pjwwvjik385amp24j9kc7a7zkx091")))) + (version "1.2.0.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "tasty-hspec" version)) + (sha256 + (base32 "0cfcpi25jmnmzfzsx364qsj68q6gyph5z112kl8ja222hnhhr2n2")))) (build-system haskell-build-system) (properties '((upstream-name . "tasty-hspec"))) (inputs (list ghc-hspec @@ -206,9 +206,6 @@ framework}.") ghc-tasty-smallcheck ghc-tasty-quickcheck ghc-tagged)) - (arguments - `(#:cabal-revision ("1" - "0a6r4gzxzp6n90z0nif7ha7p7am57hs48i54i2y4z9kgjv6lnvll"))) (home-page "https://github.com/mitchellwrosen/tasty-hspec") (synopsis "Hspec support for the Tasty test framework") (description @@ -365,13 +362,13 @@ development.") (define-public ghc-quickcheck-instances (package (name "ghc-quickcheck-instances") - (version "0.3.28") - (source (origin - (method url-fetch) - (uri (hackage-uri "quickcheck-instances" version)) - (sha256 - (base32 - "1jycijv7gaj6qrkp219nllrdv9zd0ifp0mb0rch430fm95xin4f4")))) + (version "0.3.29.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "quickcheck-instances" version)) + (sha256 + (base32 "0jx2wfy7y5dr14s9i457g2aah4isjxry4mlbqhj7vlav6ib84gdj")))) (build-system haskell-build-system) (properties '((upstream-name . "quickcheck-instances"))) (inputs (list ghc-quickcheck @@ -392,7 +389,11 @@ development.") ghc-unordered-containers ghc-uuid-types ghc-vector + ghc-data-array-byte ghc-text-short)) + (arguments + `(#:cabal-revision ("2" + "118xy4z4dy4bpkzsp98daiv3l4n5j7ph9my0saca7cqjybqwkcip"))) (home-page "https://github.com/haskellari/qc-instances") (synopsis "Common quickcheck instances") (description "This package provides QuickCheck instances for types @@ -445,14 +446,13 @@ use HUnit assertions as QuickCheck properties.") (define-public ghc-quickcheck (package (name "ghc-quickcheck") - (version "2.14.2") + (version "2.14.3") (source (origin (method url-fetch) (uri (hackage-uri "QuickCheck" version)) (sha256 - (base32 - "1wrnrm9sq4s0bly0q58y80g4153q45iglqa34xsi2q3bd62nqyyq")))) + (base32 "0085lwy14r7hk7ibmv8d7d54ja9zin0ijf0b27xai898dfrj43sw")))) (build-system haskell-build-system) (properties '((upstream-name . "QuickCheck"))) (inputs @@ -755,18 +755,18 @@ Haskell, inspired by the Ruby library RSpec.") (package (name "ghc-hspec-contrib") (version "0.5.1.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "hspec-contrib" version)) - (sha256 - (base32 - "1nyb5n2jiq920yyf3flzyxrs5xpfyppl3jn18zhviyysjjk5drpx")))) + (source + (origin + (method url-fetch) + (uri (hackage-uri "hspec-contrib" version)) + (sha256 + (base32 "1nyb5n2jiq920yyf3flzyxrs5xpfyppl3jn18zhviyysjjk5drpx")))) (build-system haskell-build-system) (properties '((upstream-name . "hspec-contrib"))) - (inputs (list ghc-hunit ghc-hspec-core)) + (inputs (list ghc-hunit ghc-call-stack ghc-hspec-core)) (native-inputs (list ghc-quickcheck ghc-hspec hspec-discover)) - (arguments (list #:tests? #f)) ; Tests fail to compile. - (home-page "http://hspec.github.io/") + (arguments (list #:tests? #f)) ; Fail to build. + (home-page "https://hspec.github.io/") (synopsis "Contributed functionality for Hspec") (description "This package provides contributed Hspec extensions.") (license license:expat))) diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 7e1935ece3..83ba8bc10b 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -324,17 +324,19 @@ elsewhere.") (define-public ghc-digest (package (name "ghc-digest") - (version "0.0.1.4") - (source (origin - (method url-fetch) - (uri (hackage-uri "digest" version)) - (sha256 - (base32 - "05pc5l4bwddszc6vy1hazwi1dnrxg323521gdkis9cvh7zs2a4gr")))) + (version "0.0.1.7") + (source + (origin + (method url-fetch) + (uri (hackage-uri "digest" version)) + (sha256 + (base32 "02jzw0bsng87y1n2kgpy7vb30lvqsnpbfd8dpg4hmvbg9s06qgdj")))) (build-system haskell-build-system) (properties '((upstream-name . "digest"))) (arguments - `(#:extra-directories ("zlib"))) + `(#:extra-directories ("zlib") + #:cabal-revision ("1" + "0wh34kyag2vhwvsdwv8qmvm13gy32nc94yfyqfdnl67nyc2sx8wl"))) (inputs (list zlib)) (native-inputs (list pkg-config)) (home-page "http://hackage.haskell.org/package/digest") @@ -722,13 +724,13 @@ extensions.") (define-public ghc-hsopenssl (package (name "ghc-hsopenssl") - (version "0.11.7.4") - (source (origin - (method url-fetch) - (uri (hackage-uri "HsOpenSSL" version)) - (sha256 - (base32 - "0zxcfa8b0ng97v53vb8fvg2gss89b28xiz83rx38a0h4lsxpn2xf")))) + (version "0.11.7.5") + (source + (origin + (method url-fetch) + (uri (hackage-uri "HsOpenSSL" version)) + (sha256 + (base32 "0y0l5nb0jsc8lm12w66a2n7nwcrgjxy1q2xdy8a788695az5xy71")))) (build-system haskell-build-system) (properties '((upstream-name . "HsOpenSSL"))) (inputs (list ghc-network openssl)) diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 75b84b10a7..0aaa609e42 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -72,29 +72,22 @@ for screen-scraping.") (define-public ghc-cookie (package (name "ghc-cookie") - (version "0.4.5") + (version "0.4.6") (source (origin (method url-fetch) (uri (hackage-uri "cookie" version)) (sha256 - (base32 - "10rmdasb7mypbwxdj2mhr810vqhkakpik7hyd8fvj60hng8r8zvh")))) + (base32 "1ajbcsk4k0jc6v2fqn36scs6l8wa6fq46gd54pak75rbqdbajhcc")))) (build-system haskell-build-system) (properties '((upstream-name . "cookie"))) - (inputs - (list ghc-old-locale - ghc-blaze-builder - ghc-data-default-class - ghc-hunit - ghc-quickcheck - ghc-tasty - ghc-tasty-hunit - ghc-tasty-quickcheck)) + (inputs (list ghc-data-default-class)) + (native-inputs (list ghc-hunit ghc-quickcheck ghc-tasty ghc-tasty-hunit + ghc-tasty-quickcheck)) (home-page "https://github.com/snoyberg/cookie") (synopsis "HTTP cookie parsing and rendering") (description "HTTP cookie parsing and rendering library for Haskell.") - (license license:bsd-3))) + (license license:expat))) (define-public ghc-curl (package @@ -363,58 +356,54 @@ and HPACK. Currently HTTP/2 16 framing and HPACK 10 is supported.") (define-public ghc-http-conduit (package - (name "ghc-http-conduit") - (version "2.3.8") + (name "ghc-http-conduit") + (version "2.3.8.1") (source (origin (method url-fetch) (uri (hackage-uri "http-conduit" version)) (sha256 - (base32 - "1bj24phbcb7s3k6v48l5gk82m3m23j8zy9l7c5ccxp3ghn9z5gng")))) + (base32 "11zf4hyw8f1gpj0w1cmgc9g62xwy2v4hhzqazdsla4q49iqbzxgd")))) (build-system haskell-build-system) (properties '((upstream-name . "http-conduit"))) - ;; FIXME: `httpLbs TLS` in test-suite `test` fails with - ;; ConnectionFailure getProtocolByName: does not exist (no such protocol - ;; name: tcp) - (arguments `(#:tests? #f)) - (inputs - (list ghc-aeson - ghc-resourcet - ghc-conduit - ghc-conduit-extra - ghc-http-types - ghc-lifted-base - ghc-http-client - ghc-http-client-tls - ghc-monad-control - ghc-exceptions - ghc-unliftio)) - (native-inputs - (list ghc-hunit - ghc-hspec - ghc-data-default-class - ghc-connection - ghc-warp-tls - ghc-blaze-builder - ghc-conduit - ghc-utf8-string - ghc-case-insensitive - ghc-lifted-base - ghc-network - ghc-wai - ghc-warp - ghc-wai-conduit - ghc-http-types - ghc-cookie - ghc-conduit-extra - ghc-streaming-commons - ghc-aeson - ghc-temporary - ghc-resourcet)) - (home-page "https://hackage.haskell.org/package/http-conduit") + (inputs (list ghc-attoparsec + ghc-resourcet + ghc-conduit + ghc-conduit-extra + ghc-http-types + ghc-http-client + ghc-http-client-tls + ghc-unliftio-core + ghc-aeson)) + (native-inputs (list ghc-hunit + ghc-hspec + ghc-data-default-class + ghc-warp-tls + ghc-tls + ghc-blaze-builder + ghc-utf8-string + ghc-case-insensitive + ghc-unliftio + ghc-wai + ghc-warp + ghc-wai-conduit + ghc-cookie + ghc-streaming-commons + ghc-temporary + ghc-network)) + (arguments + `(#:cabal-revision ("1" + "1wvr0v948s5fmlf47r4pqjan355x6v65rm7dz7y65ngj10xwk5f9") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "http-conduit.cabal" + ((", network") ", network\n , connection\n"))))))) + (home-page "https://github.com/snoyberg/http-client") (synopsis "HTTP/HTTPS client with conduit interface") - (description "This library uses attoparsec for parsing the actual + (description + "This library uses attoparsec for parsing the actual contents of the HTTP connection. It also provides higher-level functions which allow you to avoid direct usage of conduits.") (license license:bsd-3))) @@ -781,18 +770,21 @@ See also: (define-public ghc-xss-sanitize (package (name "ghc-xss-sanitize") - (version "0.3.7.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "xss-sanitize" version)) - (sha256 - (base32 - "1lmmyh28mb1k44m63m7qx6iy4x2fgqq5srmky47dsm0fby9iag1h")))) + (version "0.3.7.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "xss-sanitize" version)) + (sha256 + (base32 "0in9kn51i2ddh5c8scyf9l8zi6zxidwznn34qwj02nglw5dpzfqv")))) (build-system haskell-build-system) (properties '((upstream-name . "xss-sanitize"))) (inputs (list ghc-attoparsec ghc-css-text ghc-network-uri ghc-tagsoup ghc-utf8-string)) (native-inputs (list ghc-hunit ghc-hspec)) + (arguments + `(#:cabal-revision ("1" + "1l8y52nja9a2iyxawm3vp23jcs46ziwx0yj2w46drb7knaa306d0"))) (home-page "https://github.com/yesodweb/haskell-xss-sanitize#readme") (synopsis "Sanitize untrusted HTML to prevent XSS attacks") (description @@ -930,7 +922,8 @@ entity decoding bugfixes applied.") (uri (hackage-uri "aeson" version)) (sha256 (base32 - "09dk0j33n262dm75vff3y3i9fm6lh06dyqswwv7a6kvnhhmhlxhr")))) + "09dk0j33n262dm75vff3y3i9fm6lh06dyqswwv7a6kvnhhmhlxhr")) + (patches (search-patches "ghc-aeson-encodeDouble.patch")))) (build-system haskell-build-system) (properties '((upstream-name . "aeson"))) (inputs (list ghc-base-compat-batteries @@ -1196,13 +1189,13 @@ avoid any issues with characters.") (define-public ghc-yesod-core (package (name "ghc-yesod-core") - (version "1.6.24.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "yesod-core" version)) - (sha256 - (base32 - "19ilgm73108ki1hvqc86kir0yrx36vp9g45na6g8dmfsvk9izr10")))) + (version "1.6.24.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "yesod-core" version)) + (sha256 + (base32 "0cql4gk83ya0lyv0nyrp387nljpab4dwwy288rzp8klq9z5r2a7j")))) (build-system haskell-build-system) (properties '((upstream-name . "yesod-core"))) (inputs (list ghc-aeson @@ -1241,9 +1234,6 @@ avoid any issues with characters.") ghc-hspec-expectations ghc-network ghc-streaming-commons)) - (arguments - `(#:cabal-revision ("1" - "1406s7is60ji6nn3h1mafkdh7729ipq3i06cqsq77hz2ilj264jl"))) (home-page "http://www.yesodweb.com/") (synopsis "Core package for the Yesod web framework") (description @@ -1282,13 +1272,13 @@ from Yesod.") (define-public ghc-yesod-form (package (name "ghc-yesod-form") - (version "1.7.3") - (source (origin - (method url-fetch) - (uri (hackage-uri "yesod-form" version)) - (sha256 - (base32 - "10y3mfh96sicqyzngvl7f4wrjgkvl3znqnh71s8gx1vf7158sjww")))) + (version "1.7.4") + (source + (origin + (method url-fetch) + (uri (hackage-uri "yesod-form" version)) + (sha256 + (base32 "012w6pq0zznwqn19nx5h30rmd7dazcd0d75a6426d7brxvf9vn98")))) (build-system haskell-build-system) (properties '((upstream-name . "yesod-form"))) (inputs (list ghc-aeson @@ -2156,13 +2146,13 @@ aims to be compliant with @url{https://www.w3.org/TR/cors}.") (define-public ghc-network-run (package (name "ghc-network-run") - (version "0.2.4") + (version "0.2.5") (source - (origin - (method url-fetch) - (uri (hackage-uri "network-run" version)) - (sha256 - (base32 "0w3dmwk03j4n01xkiq8m4sqa27bskh239mpw7m4ihjmkxqcwc5gl")))) + (origin + (method url-fetch) + (uri (hackage-uri "network-run" version)) + (sha256 + (base32 "08662w7ja9w4a4fwikaawxnxcszkd0mdmaajmshas2dd25xyikwi")))) (build-system haskell-build-system) (properties '((upstream-name . "network-run"))) (inputs (list ghc-network)) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index b5943f2f47..fa423ae2ca 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -150,22 +150,19 @@ module for more details.") (define-public ghc-active (package (name "ghc-active") - (version "0.2.0.16") - (source (origin - (method url-fetch) - (uri (hackage-uri "active" version)) - (sha256 - (base32 - "1fz2rsyk41p9f9avlmn9lrdmii5alv88lkw677mw8q6mzyxpw67i")))) + (version "0.2.0.18") + (source + (origin + (method url-fetch) + (uri (hackage-uri "active" version)) + (sha256 + (base32 "1fn3cyf43x18p2phs8bhacbp8zl8aifrh7ndzs0qi6n6g9sw95qn")))) (build-system haskell-build-system) (properties '((upstream-name . "active"))) (inputs (list ghc-vector ghc-semigroups ghc-semigroupoids ghc-lens ghc-linear)) (native-inputs (list ghc-quickcheck)) - (arguments - `(#:cabal-revision ("1" - "0cyfwrr5c14f5rgrf8dv7i8qsrnmnzigw0xp6l88kfxd61zhk4n8"))) - (home-page "http://hackage.haskell.org/package/active") + (home-page "https://hackage.haskell.org/package/active") (synopsis "Abstractions for animation") (description "This package defines an @code{Active} abstraction for @@ -198,7 +195,7 @@ diagrams framework}.") ghc-transformers-compat ghc-void)) (native-inputs (list ghc-generic-deriving ghc-hspec hspec-discover)) - (home-page "http://github.com/ekmett/adjunctions/") + (home-page "https://github.com/ekmett/adjunctions/") (synopsis "Adjunctions and representable functors") (description "This library provides adjunctions and representable functors for Haskell.") @@ -299,13 +296,13 @@ systems.") (define-public ghc-alex (package (name "ghc-alex") - (version "3.2.7.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "alex" version)) - (sha256 - (base32 - "1v0vm1l4xvybzwj1p6j5j58yiw5nhbnx7yxjnpyjy6wggsig3llv")))) + (version "3.2.7.4") + (source + (origin + (method url-fetch) + (uri (hackage-uri "alex" version)) + (sha256 + (base32 "0vr2jmh7qba9c5lrd969p0qqdc9mi22cw5axsyikm200x80zl4wa")))) (build-system haskell-build-system) (properties '((upstream-name . "alex"))) (home-page "http://www.haskell.org/alex/") @@ -699,7 +696,7 @@ Web Services.") (native-inputs (list ghc-hunit ghc-quickcheck ghc-test-framework ghc-test-framework-hunit ghc-test-framework-quickcheck2)) - (home-page "http://github.com/haskell/base16-bytestring") + (home-page "https://github.com/haskell/base16-bytestring") (synopsis "Fast base16 (hex) encoding and decoding for ByteStrings") (description "This package provides a Haskell library for working with base16-encoded @@ -739,7 +736,7 @@ Haskell @code{ByteString}s.") "1gah466nd6hkj716gwljfh0g270iaqy2rq2a1vw3di2s7a4dqam6")))) (build-system haskell-build-system) (properties '((upstream-name . "base-compat"))) - (home-page "http://hackage.haskell.org/package/base-compat") + (home-page "https://hackage.haskell.org/package/base-compat") (synopsis "Haskell compiler compatibility library") (description "This library provides functions available in later versions @@ -761,7 +758,7 @@ pragmas in your code.") (properties '((upstream-name . "base-compat-batteries"))) (inputs (list ghc-base-compat)) (native-inputs (list ghc-hspec ghc-quickcheck hspec-discover)) - (home-page "http://hackage.haskell.org/package/base-compat-batteries") + (home-page "https://hackage.haskell.org/package/base-compat-batteries") (synopsis "base-compat with extra batteries") (description "This library provides functions available in later @@ -775,14 +772,13 @@ than @code{base-compat}, which has no dependencies.") (define-public ghc-basement (package (name "ghc-basement") - (version "0.0.15") - (source (origin - (method url-fetch) - (uri (hackage-uri "basement" version)) - (sha256 - (base32 - "1d2xj5dmjps7nc7rwp5s0kyjcg9v8xfql6ik4yk1d3affnvazhjn")) - (patches (search-patches "ghc-basement-fix-32bit.patch")))) + (version "0.0.16") + (source + (origin + (method url-fetch) + (uri (hackage-uri "basement" version)) + (sha256 + (base32 "00332i4n98gh06x8ii4p8mhjpq0ch1bdan9hxmdblxpgk8j7xdvz")))) (build-system haskell-build-system) (properties '((upstream-name . "basement"))) (home-page "https://github.com/haskell-foundation/foundation#readme") @@ -795,13 +791,13 @@ packages.") (define-public ghc-base-orphans (package (name "ghc-base-orphans") - (version "0.8.7") - (source (origin - (method url-fetch) - (uri (hackage-uri "base-orphans" version)) - (sha256 - (base32 - "0iz4v4h2ydncdwfqzs8fd2qwl38dx0n94w5iymw2g4xy1mzxd3w8")))) + (version "0.8.8.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "base-orphans" version)) + (sha256 + (base32 "14jhh848q3451hqi4knslc7nnvw9dn77vawnhp4qs4l4703fgjk1")))) (build-system haskell-build-system) (properties '((upstream-name . "base-orphans"))) (native-inputs (list ghc-quickcheck ghc-hspec hspec-discover)) @@ -940,18 +936,18 @@ storing and transmitting loosely structured data.") (define-public ghc-bifunctors (package (name "ghc-bifunctors") - (version "5.5.14") - (source (origin - (method url-fetch) - (uri (hackage-uri "bifunctors" version)) - (sha256 - (base32 - "0r4jd4s66xvnx0bk75rz0cwnf6cr0lgx3dxrqdv3ppkwqk81c0ak")))) + (version "5.5.15") + (source + (origin + (method url-fetch) + (uri (hackage-uri "bifunctors" version)) + (sha256 + (base32 "1dz3v6qdilm6z9vl25xrma2if6i151v6rmgnvd461parsd89sdfn")))) (build-system haskell-build-system) (properties '((upstream-name . "bifunctors"))) (inputs (list ghc-base-orphans ghc-comonad ghc-th-abstraction ghc-tagged)) (native-inputs (list ghc-hspec ghc-quickcheck ghc-transformers-compat hspec-discover)) - (home-page "http://github.com/ekmett/bifunctors/") + (home-page "https://github.com/ekmett/bifunctors/") (synopsis "Bifunctors for Haskell") (description "This package provides bifunctors for Haskell.") (license license:bsd-3))) @@ -1238,13 +1234,13 @@ Compatibility package for older packages.") (define-public ghc-bytestring-lexing (package (name "ghc-bytestring-lexing") - (version "0.5.0.9") - (source (origin - (method url-fetch) - (uri (hackage-uri "bytestring-lexing" version)) - (sha256 - (base32 - "14nx7sfs75g57mlfiwgzm5sc3wm4va58zryjp27m5lmfdp30873c")))) + (version "0.5.0.10") + (source + (origin + (method url-fetch) + (uri (hackage-uri "bytestring-lexing" version)) + (sha256 + (base32 "0mvqiss323vwvgqx2pv8cww1mkx29hpi094ff54hx545mmvhwb16")))) (build-system haskell-build-system) (properties '((upstream-name . "bytestring-lexing"))) (native-inputs (list ghc-tasty ghc-tasty-smallcheck ghc-tasty-quickcheck)) @@ -1340,19 +1336,20 @@ imported with the correct Haskell types.") (define-public ghc-cairo (package (name "ghc-cairo") - (version "0.13.8.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "cairo" version)) - (sha256 - (base32 - "1sq2imy359vnbny610n7655a4z5a8fgdxanys4f5nw84246hc2yl")))) + (version "0.13.10.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "cairo" version)) + (sha256 + (base32 "16dwjqg8gqk2dzp3qpcvhwdgn16rxxasll8qs2fl2gf84z41h0mf")))) (build-system haskell-build-system) (properties '((upstream-name . "cairo"))) (inputs (list ghc-utf8-string cairo)) (native-inputs (list ghc-gtk2hs-buildtools pkg-config)) (arguments - `(#:extra-directories ("cairo"))) + `(#:cabal-revision ("2" + "1irj5yrz74j6wypni9pk9mbd7v2mzcy3ndyl7irada8szgdl3kkv"))) (home-page "https://projects.haskell.org/gtk2hs/") (synopsis "Haskell bindings to the Cairo vector graphics library") (description @@ -1519,13 +1516,13 @@ provides for better error messages at the expense of some speed.") (define-public ghc-cborg (package (name "ghc-cborg") - (version "0.2.8.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "cborg" version)) - (sha256 - (base32 - "07mh5bk61k5dz2x5g7fqw2cv7bjzs7v65yxvzkq7mdbkq8kwhn9f")))) + (version "0.2.9.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "cborg" version)) + (sha256 + (base32 "1apwdb0y08l3mbxb6pb006355nnn1lag035dvm006v7h4cbqvd6w")))) (build-system haskell-build-system) (properties '((upstream-name . "cborg"))) (inputs (list ghc-half ghc-primitive)) @@ -1542,7 +1539,7 @@ provides for better error messages at the expense of some speed.") ghc-vector)) (arguments `(#:cabal-revision ("1" - "13m2shrlpvg5s9d40a2463mmckzg50y8jb47zfd6i1rg6q3q6xx6"))) + "0fissmr1a82ij6l4wmmr1bzn08myikwyak27mmn6kqgpihgl8fws"))) (home-page "https://hackage.haskell.org/package/cborg") (synopsis "Concise Binary Object Representation") (description @@ -1681,7 +1678,7 @@ parser isolation, and labeled blocks for better error messages.") (build-system haskell-build-system) (properties '((upstream-name . "charset"))) (inputs (list ghc-unordered-containers ghc-semigroups)) - (home-page "http://github.com/ekmett/charset") + (home-page "https://github.com/ekmett/charset") (synopsis "Fast unicode character sets for Haskell") (description "This package provides fast unicode character sets for Haskell, based on complemented PATRICIA tries.") @@ -1756,7 +1753,7 @@ backend for the Charts library.") (build-system haskell-build-system) (properties '((upstream-name . "ChasingBottoms"))) (inputs (list ghc-quickcheck ghc-random ghc-syb)) - (home-page "http://hackage.haskell.org/package/ChasingBottoms") + (home-page "https://hackage.haskell.org/package/ChasingBottoms") (synopsis "Testing of partial and infinite values in Haskell") (description "This is a library for testing code involving bottoms or infinite values. @@ -1911,7 +1908,8 @@ classy-prelude.") (uri (hackage-uri "clock" version)) (sha256 (base32 - "1l850pf1dxjf3i15wc47d64gzkpzgvw0bq13fd8zvklq9kdyap44")))) + "1l850pf1dxjf3i15wc47d64gzkpzgvw0bq13fd8zvklq9kdyap44")) + (patches (search-patches "ghc-clock-realfrag.patch")))) (build-system haskell-build-system) (properties '((upstream-name . "clock"))) (native-inputs (list ghc-tasty ghc-tasty-quickcheck)) @@ -1982,19 +1980,17 @@ of the C library.") (define-public ghc-cmdargs (package (name "ghc-cmdargs") - (version "0.10.21") + (version "0.10.22") (source (origin (method url-fetch) (uri (hackage-uri "cmdargs" version)) (sha256 - (base32 - "0xfabq187n1vqrnnm4ciprpl0dcjq97rksyjnpcniwva9rffmn7p")))) + (base32 "1vwvdszal6clkvsqd1amcap8wy3cp19x8qmhgc1i7kwmhxzjxcdq")))) (build-system haskell-build-system) (properties '((upstream-name . "cmdargs"))) - (outputs '("out" "doc")) - (home-page - "http://community.haskell.org/~ndm/cmdargs/") + (inputs (list ghc-semigroups)) + (home-page "https://github.com/ndmitchell/cmdargs#readme") (synopsis "Command line argument processing") (description "This library provides an easy way to define command line parsers.") @@ -2158,17 +2154,17 @@ Python.") (define-public ghc-concurrent-output (package (name "ghc-concurrent-output") - (version "1.10.16") - (source (origin - (method url-fetch) - (uri (hackage-uri "concurrent-output" version)) - (sha256 - (base32 - "0l4k0bkq5bddqraf14g3ngyzwff17f3ngg4axlilcl3zf3c4bamh")))) + (version "1.10.18") + (source + (origin + (method url-fetch) + (uri (hackage-uri "concurrent-output" version)) + (sha256 + (base32 "1nxc7wl37hsyz8axzy99gy40qsa6065z6m9a9pfjkgfq4s4k7a5p")))) (build-system haskell-build-system) (properties '((upstream-name . "concurrent-output"))) (inputs (list ghc-async ghc-ansi-terminal ghc-terminal-size)) - (home-page "http://hackage.haskell.org/package/concurrent-output") + (home-page "https://hackage.haskell.org/package/concurrent-output") (synopsis "Ungarble output from several threads or commands") (description "Lets multiple threads and external processes concurrently output to the @@ -2182,30 +2178,23 @@ concurrent threads. Can be used for progress displays etc.") (define-public ghc-conduit (package (name "ghc-conduit") - (version "1.3.1.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "conduit" version)) - (sha256 - (base32 - "18izjgff4pmrknc8py06yvg3g6x27nx0rzmlwjxcflwm5v4szpw4")))) + (version "1.3.5") + (source + (origin + (method url-fetch) + (uri (hackage-uri "conduit" version)) + (sha256 + (base32 "0bbq3hr0y4hyia8dbqibfpg5q5zr2ici5hngv38y6hycxvhd7c1b")))) (build-system haskell-build-system) (properties '((upstream-name . "conduit"))) - (outputs '("out" "doc")) - (inputs - (list ghc-exceptions - ghc-lifted-base - ghc-mono-traversable - ghc-mmorph - ghc-resourcet - ghc-silently - ghc-transformers-base - ghc-unliftio - ghc-unliftio-core - ghc-vector - ghc-void)) - (native-inputs - (list ghc-quickcheck ghc-hspec ghc-safe ghc-split)) + (inputs (list ghc-resourcet ghc-primitive ghc-unliftio-core + ghc-mono-traversable ghc-vector)) + (native-inputs (list ghc-hspec + ghc-quickcheck + ghc-safe + ghc-split + ghc-silently + ghc-unliftio)) (home-page "https://github.com/snoyberg/conduit") (synopsis "Streaming data library") (description @@ -2313,7 +2302,7 @@ as well as a convenient Conduit module.") ghc-typed-process hspec-discover)) (native-inputs (list ghc-hspec ghc-quickcheck ghc-transformers-base)) - (home-page "http://github.com/snoyberg/conduit") + (home-page "https://github.com/snoyberg/conduit") (synopsis "Conduit adapters for common libraries") (description "The @code{conduit} package itself maintains relative small dependencies. @@ -2511,7 +2500,7 @@ the choice of SSL/TLS, and SOCKS.") (inputs (list ghc-hashable ghc-transformers-compat ghc-type-equality ghc-semigroups-bootstrap)) (native-inputs (list ghc-hspec hspec-discover)) - (home-page "http://github.com/ekmett/constraints/") + (home-page "https://github.com/ekmett/constraints/") (synopsis "Constraint manipulation") (description "GHC 7.4 gave us the ability to talk about @code{ConstraintKinds}. @@ -2522,19 +2511,19 @@ a vocabulary for working with them.") (define-public ghc-constraints-extras (package (name "ghc-constraints-extras") - (version "0.4.0.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "constraints-extras" version)) - (sha256 - (base32 - "1irf4kd7a5h1glczbc73c3590m58azn4s68nfrjfg1h96i7mjfgn")))) + (version "0.3.2.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "constraints-extras" version)) + (sha256 + (base32 "0w2wwqsgxqkn8byivrgcsi6fh1kxbivqarmdnpxyh1a1cg373xfp")))) (build-system haskell-build-system) (properties '((upstream-name . "constraints-extras"))) (inputs (list ghc-constraints ghc-aeson)) (arguments `(#:cabal-revision ("1" - "1fdabah3ilq9yf94916ml3c3rxgcgab1jhzl4mk1zgzsw78j53qf"))) + "1smha6ljia9bfgdy1h0lkgi9464rwa9lnw7rqfi1c23pzyiw13lh"))) (home-page "https://github.com/obsidiansystems/constraints-extras") (synopsis "Utility package for constraints") (description @@ -2623,7 +2612,7 @@ Free Monads, MPC'08} (properties '((upstream-name . "convertible"))) (inputs (list ghc-old-time)) (native-inputs (list ghc-quickcheck)) - (home-page "http://hackage.haskell.org/package/convertible") + (home-page "https://hackage.haskell.org/package/convertible") (synopsis "Typeclasses and instances for converting between types") (description "This package provides a typeclass with a single function that is @@ -2666,16 +2655,19 @@ lingua franca for spreadsheets, and for certain web services.") (define-public ghc-data-accessor (package (name "ghc-data-accessor") - (version "0.2.3") + (version "0.2.3.1") (source (origin (method url-fetch) (uri (hackage-uri "data-accessor" version)) (sha256 - (base32 "0f1yvvzr24qgrx6k2g101s7vp012802iw6kli903n28nig93yn0x")))) + (base32 "14ap1lxizxkgphl4kg8lr3ny9lblx1k6hm8i9nm7l43yla8cg8q6")))) (build-system haskell-build-system) (properties '((upstream-name . "data-accessor"))) - (home-page "https://wiki.haskell.org/Record_access") + (arguments + `(#:cabal-revision ("1" + "1v16s3d1kwlx9vzf6agacr2rfamnhyl7fgd81arznka51v3my2fs"))) + (home-page "https://www.haskell.org/haskellwiki/Record_access") (synopsis "Haskell utilities for accessing and manipulating fields of records") (description "This package provides Haskell modules for accessing and @@ -2685,17 +2677,17 @@ manipulating fields of records.") (define-public ghc-data-accessor-transformers (package (name "ghc-data-accessor-transformers") - (version "0.2.1.7") + (version "0.2.1.8") (source (origin (method url-fetch) (uri (hackage-uri "data-accessor-transformers" version)) (sha256 - (base32 "0yp030vafbpddl27m606aibbbr5ar5j5bsv4bksscz3cq4yq5j10")))) + (base32 "1m18bdhddi4l7ijd1mighjbjdw5qkznsgrqb8532cv9al55r9y83")))) (build-system haskell-build-system) (properties '((upstream-name . "data-accessor-transformers"))) (inputs (list ghc-data-accessor)) - (home-page "https://wiki.haskell.org/Record_access") + (home-page "https://www.haskell.org/haskellwiki/Record_access") (synopsis "Use Accessor to access state in transformers State monad") (description "This package provides Haskell modules to allow use of Accessor to access state in transformers State monad.") @@ -2917,13 +2909,13 @@ It includes hashing functions for all basic Haskell98 types.") (define-public ghc-dbus (package (name "ghc-dbus") - (version "1.2.27") - (source (origin - (method url-fetch) - (uri (hackage-uri "dbus" version)) - (sha256 - (base32 - "0lkk9hd78h2ilvi0bj5jqq5q5lwyxzdlknwvckhwyxnlf3y6dz8z")))) + (version "1.2.29") + (source + (origin + (method url-fetch) + (uri (hackage-uri "dbus" version)) + (sha256 + (base32 "0c2c2lfckhzgf9n5hf2w39ryyb2q0wxsymrxr54y4j95353wdsn2")))) (build-system haskell-build-system) (properties '((upstream-name . "dbus"))) (inputs (list ghc-cereal @@ -3038,13 +3030,13 @@ related modules split from the statistics library.") (define-public ghc-diagrams-core (package (name "ghc-diagrams-core") - (version "1.5.0.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "diagrams-core" version)) - (sha256 - (base32 - "1gv1p5hrxi3hks0nb4l38gdgfq9bh9d86b6dxcyzqxrwxbxk1khn")))) + (version "1.5.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "diagrams-core" version)) + (sha256 + (base32 "08bmb2r4gf7arc0wasxla6w1qpgrgrhcs24bb7sv2qgiyb6c22j6")))) (build-system haskell-build-system) (properties '((upstream-name . "diagrams-core"))) (inputs (list ghc-unordered-containers @@ -3056,9 +3048,6 @@ related modules split from the statistics library.") ghc-adjunctions ghc-distributive ghc-profunctors)) - (arguments - `(#:cabal-revision ("1" - "1gahbyv00xyr4pcmpq4g95jyh7844fp8z0g9l2ybifv4s73vdrym"))) (home-page "https://diagrams.github.io") (synopsis "Core libraries for diagrams embedded domain-specific language") (description @@ -3214,7 +3203,7 @@ members are shared.") (properties '((upstream-name . "Diff"))) (native-inputs (list ghc-quickcheck ghc-test-framework ghc-test-framework-quickcheck2)) - (home-page "http://hackage.haskell.org/package/Diff") + (home-page "https://hackage.haskell.org/package/Diff") (synopsis "O(ND) diff algorithm in Haskell") (description "This package provides an implementation of the standard diff algorithm, @@ -3407,7 +3396,7 @@ between double precision floating point and text.") (properties '((upstream-name . "dual-tree"))) (inputs (list ghc-semigroups ghc-monoid-extras)) (native-inputs (list ghc-quickcheck ghc-testing-feat)) - (home-page "http://hackage.haskell.org/package/dual-tree") + (home-page "https://hackage.haskell.org/package/dual-tree") (synopsis "Rose trees with cached and accumulating monoidal annotations") (description "Rose (@math{n}-ary) trees with both upwards- (i.e. @@ -3420,18 +3409,17 @@ diagrams framework}, but potentially has other applications as well.") (define-public ghc-easy-file (package (name "ghc-easy-file") - (version "0.2.2") + (version "0.2.5") (source (origin (method url-fetch) (uri (hackage-uri "easy-file" version)) (sha256 - (base32 - "0zmlcz723051qpn8l8vi51c5rx1blwrw4094jcshkmj8p9r2xxaj")))) + (base32 "1fzj9x9br57rcik3dvwxqb5mqy524g6xg2d670l6dcrv9f8s03zf")))) (build-system haskell-build-system) (properties '((upstream-name . "easy-file"))) - (home-page - "https://github.com/kazu-yamamoto/easy-file") + (native-inputs (list ghc-tasty ghc-tasty-hunit)) + (home-page "https://github.com/kazu-yamamoto/easy-file") (synopsis "File handling library for Haskell") (description "This library provides file handling utilities for Haskell.") (license license:bsd-3))) @@ -3557,7 +3545,7 @@ but is otherwise agnostic to: (inputs (list ghc-bifunctors ghc-profunctors ghc-semigroupoids)) (native-inputs (list ghc-test-framework ghc-test-framework-quickcheck2 ghc-quickcheck)) - (home-page "http://github.com/ekmett/either/") + (home-page "https://github.com/ekmett/either/") (synopsis "Provides an either monad transformer for Haskell") (description "This Haskell package provides an either monad transformer.") (license license:bsd-3))) @@ -3707,13 +3695,13 @@ directly uses the type system, rather than out-of-band exceptions.") (define-public ghc-esqueleto (package (name "ghc-esqueleto") - (version "3.5.8.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "esqueleto" version)) - (sha256 - (base32 - "0k7h2hbxv14x0kq9w2wi83h0swzlri99ic9rj76540l39yqwjc5v")))) + (version "3.5.10.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "esqueleto" version)) + (sha256 + (base32 "0nbb6l4q22y8rwcjsrwqri3ndjn4rslpnglj3nkh00rixdm9jhsr")))) (build-system haskell-build-system) (properties '((upstream-name . "esqueleto"))) (inputs (list ghc-aeson @@ -3725,9 +3713,7 @@ directly uses the type system, rather than out-of-band exceptions.") ghc-resourcet ghc-tagged ghc-unliftio - ghc-unordered-containers - openssl - zlib)) + ghc-unordered-containers)) (native-inputs (list ghc-hspec ghc-hspec-core ghc-mysql @@ -3770,7 +3756,7 @@ generated SQL and optimize it for your backend.") (arguments `(#:cabal-revision ("1" "1v6my8bnhjhw7k3v2q9iwjpz9lj5g6ilvlzdq6svcabxahmzbr2c"))) - (home-page "http://hackage.haskell.org/package/ghc-exactprint") + (home-page "https://hackage.haskell.org/package/ghc-exactprint") (synopsis "ExactPrint for GHC") (description "Using the API Annotations available from GHC 7.10.2, this library @@ -3848,13 +3834,13 @@ versions of GHC (i.e., < 6.10).") (define-public ghc-extra (package (name "ghc-extra") - (version "1.7.12") - (source (origin - (method url-fetch) - (uri (hackage-uri "extra" version)) - (sha256 - (base32 - "0g5h8fp0nq4k9asiknw0bhvb10zpfnsixfp0n3xz0rc83pnajwg5")))) + (version "1.7.13") + (source + (origin + (method url-fetch) + (uri (hackage-uri "extra" version)) + (sha256 + (base32 "0rvvbix6dh6nwg0c2vdfvnkmkgzjrrwpnbz0magn9r3c66qcbsmx")))) (build-system haskell-build-system) (properties '((upstream-name . "extra"))) (inputs (list ghc-clock)) @@ -3896,18 +3882,18 @@ when used with GHC versions which already provide the (define-public ghc-fast-logger (package (name "ghc-fast-logger") - (version "3.1.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "fast-logger" version)) - (sha256 - (base32 - "1rx866swvqq7lzngv4bx7qinnwmm3aa2la8caljvbfbi0xz6wps3")))) + (version "3.1.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "fast-logger" version)) + (sha256 + (base32 "1l0h4ddb17xm6qkjhn5gqyfz18szyqcq9wqq92fc24sp2zbd7rv5")))) (build-system haskell-build-system) (properties '((upstream-name . "fast-logger"))) (inputs (list ghc-auto-update ghc-easy-file ghc-unix-time ghc-unix-compat - ghc-bytestring-builder hspec-discover)) - (native-inputs (list ghc-hspec)) + ghc-bytestring-builder)) + (native-inputs (list ghc-hspec hspec-discover)) (home-page "https://github.com/kazu-yamamoto/logger") (synopsis "Fast logging system") (description "This library provides a fast logging system for Haskell.") @@ -4098,7 +4084,7 @@ file contents, and more.") (lambda _ (substitute* "filepath-bytestring.cabal" (("filepath >= 1\\.4\\.2 && <= 1\\.4\\.2\\.1") "filepath"))))))) - (home-page "http://hackage.haskell.org/package/filepath-bytestring") + (home-page "https://hackage.haskell.org/package/filepath-bytestring") (synopsis "Library for manipulating RawFilePaths in a cross-platform way") (description "This package provides a drop-in replacement for the standard @@ -4143,7 +4129,7 @@ an executable.") (native-inputs (list ghc-hunit ghc-quickcheck ghc-test-framework ghc-test-framework-hunit ghc-test-framework-quickcheck2)) - (home-page "http://hackage.haskell.org/package/fingertree") + (home-page "https://hackage.haskell.org/package/fingertree") (synopsis "Generic finger-tree structure") (description "This library provides finger trees, a general sequence @@ -4219,13 +4205,13 @@ completely unverified though.") (define-public ghc-foldl (package (name "ghc-foldl") - (version "1.4.13") - (source (origin - (method url-fetch) - (uri (hackage-uri "foldl" version)) - (sha256 - (base32 - "14vlhgf40qmwkznwza37z4www3q1v5acsx4nw5vmg25wdnc8ibfw")))) + (version "1.4.14") + (source + (origin + (method url-fetch) + (uri (hackage-uri "foldl" version)) + (sha256 + (base32 "0ihfari2d8czfxfxv5svczpq1cvi3qi55mxphjjqlnabxa76y1cc")))) (build-system haskell-build-system) (properties '((upstream-name . "foldl"))) (inputs (list ghc-random @@ -4239,7 +4225,10 @@ completely unverified though.") ghc-comonad ghc-semigroups)) (native-inputs (list ghc-doctest)) - (home-page "http://hackage.haskell.org/package/foldl") + (arguments + `(#:cabal-revision ("2" + "1a7g9j8ds4zrpdx9qrqzbz3clhz1caky9znb8yzfsc7xcnbbgqpn"))) + (home-page "https://hackage.haskell.org/package/foldl") (synopsis "Composable, streaming, and efficient left folds for Haskell") (description "This Haskell library provides strict left folds that stream @@ -4251,13 +4240,13 @@ and are often as efficient as hand-written folds.") (define-public ghc-foundation (package (name "ghc-foundation") - (version "0.0.29") - (source (origin - (method url-fetch) - (uri (hackage-uri "foundation" version)) - (sha256 - (base32 - "1hbkh6a3g6wsj2z48pjimd7djkm82mdxfwc24bnmmzag8amrp0rl")))) + (version "0.0.30") + (source + (origin + (method url-fetch) + (uri (hackage-uri "foundation" version)) + (sha256 + (base32 "11hdqd01ggdr7fjw3w00giay06bzz97qqiiq60vi1l1dzz1wrwzn")))) (build-system haskell-build-system) (properties '((upstream-name . "foundation"))) (inputs (list ghc-basement)) @@ -4301,7 +4290,7 @@ Foundation has the following goals: ghc-th-abstraction ghc-transformers-base ghc-profunctors)) - (home-page "http://github.com/ekmett/free/") + (home-page "https://github.com/ekmett/free/") (synopsis "Unrestricted monads for Haskell") (description "This library provides free monads, which are useful for many @@ -4344,13 +4333,13 @@ specific Windows, Mac, and Linux file system event notification.") (define-public ghc-generic-deriving (package (name "ghc-generic-deriving") - (version "1.14.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "generic-deriving" version)) - (sha256 - (base32 - "0bxacg6b1vz135x93vf7jk6129m08hdyj7426ymaylfl2w8kapi6")))) + (version "1.14.4") + (source + (origin + (method url-fetch) + (uri (hackage-uri "generic-deriving" version)) + (sha256 + (base32 "0p0rv3z6icjw7f05arq6aqs6bx249544l0h2hvzwxm0yr6r8farp")))) (build-system haskell-build-system) (properties '((upstream-name . "generic-deriving"))) (inputs (list ghc-th-abstraction)) @@ -4400,20 +4389,17 @@ and @code{withBaseCase}) or implicitly (@code{genericArbitrary'}).") (define-public ghc-generics-sop (package (name "ghc-generics-sop") - (version "0.5.1.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "generics-sop" version)) - (sha256 - (base32 - "098blydb7c7wg77dn658r0zb1z20vfkar1him1rqlq0da90437b3")))) + (version "0.5.1.3") + (source + (origin + (method url-fetch) + (uri (hackage-uri "generics-sop" version)) + (sha256 + (base32 "01xgd5b4na6xz2bw117hw37k3iqfk3mabi4aadkzs527rawwg77c")))) (build-system haskell-build-system) (properties '((upstream-name . "generics-sop"))) (inputs (list ghc-sop-core ghc-th-abstraction)) - (arguments - `(#:cabal-revision ("1" - "1s8bx25yrjqy1cj9y1s1m8a8qlby9dxjzin16yymz7g39fqcqxz8"))) - (home-page "http://hackage.haskell.org/package/generics-sop") + (home-page "https://hackage.haskell.org/package/generics-sop") (synopsis "Generic Programming using True Sums of Products for Haskell") (description "This Haskell package supports the definition of generic @@ -4467,21 +4453,18 @@ properties for functions operating on them.") (define-public ghc-getopt-generics (package (name "ghc-getopt-generics") - (version "0.13.0.4") + (version "0.13.1.0") (source (origin (method url-fetch) (uri (hackage-uri "getopt-generics" version)) (sha256 - (base32 - "1rszkcn1rg38wf35538ljk5bbqjc57y9sb3a0al7qxm82gy8yigr")))) + (base32 "00xswyi9y49qab2fpkdx7isx40kfa93p3gfransivzgg9m3si37d")))) (build-system haskell-build-system) (properties '((upstream-name . "getopt-generics"))) - (inputs - (list ghc-base-compat ghc-base-orphans ghc-generics-sop ghc-tagged)) - (native-inputs - (list ghc-quickcheck ghc-hspec ghc-safe ghc-silently hspec-discover)) - (home-page "https://github.com/soenkehahn/getopt-generics") + (inputs (list ghc-base-compat ghc-base-orphans ghc-generics-sop ghc-tagged)) + (native-inputs (list ghc-quickcheck ghc-hspec ghc-safe ghc-silently hspec-discover)) + (home-page "https://github.com/soenkehahn/getopt-generics#readme") (synopsis "Create command line interfaces with ease") (description "This library provides tools to create command line interfaces with ease.") @@ -4666,17 +4649,20 @@ monoid with invertibility.") (define-public ghc-gtk2hs-buildtools (package (name "ghc-gtk2hs-buildtools") - (version "0.13.8.3") - (source (origin - (method url-fetch) - (uri (hackage-uri "gtk2hs-buildtools" version)) - (sha256 - (base32 - "0fcm0v32hm9j908nyziia16ahb181y9hqppsy18clx2prvj480rv")))) + (version "0.13.10.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "gtk2hs-buildtools" version)) + (sha256 + (base32 "0ww53n596h39smwf1k0wfk5k0s56n8mkapa8b0q9v9d9bpllgfyw")))) (build-system haskell-build-system) (properties '((upstream-name . "gtk2hs-buildtools"))) (inputs (list ghc-random ghc-hashtables)) (native-inputs (list ghc-alex ghc-happy)) + (arguments + `(#:cabal-revision ("1" + "16ckrhii6pbd64mgrm4s4x7vzd800w8g6x18rvij2cfm784yz6by"))) (home-page "https://projects.haskell.org/gtk2hs/") (synopsis "Tools to build the Gtk2Hs suite of user interface libraries") (description @@ -4722,7 +4708,7 @@ tools are not needed to actually run Gtk2Hs programs.") (synopsis "Hackage security library") (description "This Hackage security library provides both server and -client utilities for securing @uref{http://hackage.haskell.org/, the +client utilities for securing @uref{httsp://hackage.haskell.org/, the Hackage package server}. It is based on @uref{http://theupdateframework.com/, The Update Framework}, a set of recommendations developed by security researchers at various universities @@ -4892,52 +4878,46 @@ computation library for Haskell.") (define-public ghc-happy (package (name "ghc-happy") - (version "1.20.0") + (version "1.20.1.1") (source (origin (method url-fetch) (uri (hackage-uri "happy" version)) (sha256 - (base32 - "1346r2x5ravs5fqma65bzjragqbb2g6v41wz9maknwm2jf7kl79v")))) + (base32 "06w8g3lfk2ynrfhqznhp1mnp8a5b64lj6qviixpndzf5lv2psklb")))) (build-system haskell-build-system) (properties '((upstream-name . "happy"))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'skip-test-issue93 - (lambda _ - ;; Tests run out of memory on a system with 2GB of available RAM, - ;; in 'issue93.a.hs' and 'issue93.n.hs'. - (substitute* "tests/Makefile" - ((" issue93.y ") " ")) - #t))))) - (home-page "https://hackage.haskell.org/package/happy") + (home-page "https://www.haskell.org/happy/") (synopsis "Parser generator for Haskell") - (description "Happy is a parser generator for Haskell. Given a grammar + (description + "Happy is a parser generator for Haskell. Given a grammar specification in BNF, Happy generates Haskell code to parse the grammar. Happy works in a similar way to the yacc tool for C.") - (license license:bsd-3))) + (license license:bsd-2))) (define-public ghc-hashable (package (name "ghc-hashable") - (version "1.4.1.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "hashable" version)) - (sha256 - (base32 - "11sycr73821amdz8g0k8c97igi4z7f9xdvgaxlkxhsp6h310bcz1")))) + (version "1.4.2.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "hashable" version)) + (sha256 + (base32 "1y73606pcrs7zi6f4f07a5rkhc6620n1bx0adpa6j7xqhbm00h0v")))) (build-system haskell-build-system) (properties '((upstream-name . "hashable"))) + (inputs (list ghc-data-array-byte)) (native-inputs (list ghc-hunit ghc-quickcheck ghc-random ghc-test-framework ghc-test-framework-hunit ghc-test-framework-quickcheck2)) - (home-page "http://github.com/haskell-unordered-containers/hashable") + (arguments + `(#:cabal-revision ("1" + "12nmnmm2kyjalkvmz0l1l895ikc938lwppx8iykxnhamblrr4msq"))) + (home-page "https://github.com/haskell-unordered-containers/hashable") (synopsis "Class for types that can be converted to a hash value") (description "This package defines a class, @code{Hashable}, for types that can be @@ -4975,7 +4955,7 @@ combine hash values.") ghc-test-framework ghc-test-framework-quickcheck2 ghc-test-framework-hunit)) - (home-page "http://github.com/gregorycollins/hashtables") + (home-page "https://github.com/gregorycollins/hashtables") (synopsis "Haskell Mutable hash tables in the ST monad") (description "This package provides a Haskell library including a @@ -4987,22 +4967,22 @@ a set of wrappers to use the hash tables in the IO monad.") (define-public ghc-haskeline (package (name "ghc-haskeline") - (version "0.8.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "haskeline" version)) - (sha256 - (base32 - "1pr7zik1138cj0463867i1qqb2bgsq716mryap18jx7zb9f1b7gc")))) + (version "0.8.2.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "haskeline" version)) + (sha256 + (base32 "1zs0rlhd7lzp5g4kp7v5ca7cdwan7w4bx3jh5q2ri950svr2k1x0")))) (build-system haskell-build-system) (properties '((upstream-name . "haskeline"))) (native-inputs (list ghc-hunit which)) (arguments (list + #:cabal-revision '("1" + "1vmsi909jaykpaqfssnv92lzr1n2gy34s07lsh29p75187ps6gny") #:tests? #f ; Cannot run binary haskeline-examples-Test, which is just ; built, even with PATH and LD_LIBRARY_PATH set. - #:cabal-revision - '("3" "101qavk0fmc4c6qa307kswz3345psskxqyxhk6hmykynjm05jjrv") #:phases #~(modify-phases %standard-phases (add-before 'configure 'patch-which @@ -5054,7 +5034,7 @@ Haskeline runs both on POSIX-compatible systems and on Windows.") (arguments `(#:cabal-revision ("1" "0dfjzq0sxxcalqxygp2svx4890qx8b4amad0xldwy1f4xrp3lsnb"))) - (home-page "http://hackage.haskell.org/package/haskell-src") + (home-page "https://hackage.haskell.org/package/haskell-src") (synopsis "Support for manipulating Haskell source code") (description "The @code{haskell-src} package provides support for manipulating Haskell @@ -5116,18 +5096,18 @@ patterns as per the HaRP extension as well as HSX-style embedded XML syntax.") (define-public ghc-haskell-src-meta (package (name "ghc-haskell-src-meta") - (version "0.8.11") - (source (origin - (method url-fetch) - (uri (hackage-uri "haskell-src-meta" version)) - (sha256 - (base32 - "1wks0xb7ah2gj9n0ffbcaskjihy45l99qkf2h9k13cyfvqkzp9rw")))) + (version "0.8.12") + (source + (origin + (method url-fetch) + (uri (hackage-uri "haskell-src-meta" version)) + (sha256 + (base32 "12dsv49rzhayp8cvkqkilammq4a6d4nrb2bd2w98ivzzrbkijy02")))) (build-system haskell-build-system) (properties '((upstream-name . "haskell-src-meta"))) (inputs (list ghc-haskell-src-exts ghc-syb ghc-th-orphans)) (native-inputs (list ghc-hunit ghc-tasty ghc-tasty-hunit)) - (home-page "http://hackage.haskell.org/package/haskell-src-meta") + (home-page "https://hackage.haskell.org/package/haskell-src-meta") (synopsis "Parse source to template-haskell abstract syntax") (description "This package provides tools to parse Haskell sources to the template-haskell abstract syntax.") @@ -5486,13 +5466,13 @@ representations of current time.") (define-public ghc-hpack (package (name "ghc-hpack") - (version "0.35.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "hpack" version)) - (sha256 - (base32 - "1hpc6bwx94v943p73l12nnncbs656f2fn7q3hb4qs13xrxygzl4g")))) + (version "0.35.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "hpack" version)) + (sha256 + (base32 "1v4h5dkbfwx8wlmbaq76av22ald9iyk80k8k7pz808nw30yh3dq3")))) (build-system haskell-build-system) (properties '((upstream-name . "hpack"))) (inputs (list ghc-glob @@ -5514,6 +5494,9 @@ representations of current time.") ghc-mockery ghc-temporary hspec-discover)) + (arguments + `(#:cabal-revision ("2" + "0vwxfg5ixlr18q8gb1x8vz3grp339cbnhm51hfp7rk6vc0bd61k5"))) (home-page "https://github.com/sol/hpack#readme") (synopsis "Tools for an alternative Haskell package format") (description @@ -5653,13 +5636,13 @@ described in @url{https://www.lua.org/}.") (define-public ghc-hslua-module-system (package (name "ghc-hslua-module-system") - (version "1.0.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "hslua-module-system" version)) - (sha256 - (base32 - "0lacf9jzd53r75dk5nvkx0nwgiakpkingjnz58bhjfnvi81r6ddn")))) + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (hackage-uri "hslua-module-system" version)) + (sha256 + (base32 "08rajlihgsg843sgvlvh7qx43s5yiqqccvnxa336hw06ppfycyf9")))) (build-system haskell-build-system) (properties '((upstream-name . "hslua-module-system"))) (inputs (list ghc-hslua-core ghc-hslua-packaging ghc-hslua-marshalling @@ -5678,13 +5661,13 @@ already been loaded before the loader can be added.") (define-public ghc-hslua-module-text (package (name "ghc-hslua-module-text") - (version "1.0.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "hslua-module-text" version)) - (sha256 - (base32 - "0xq5ndgjhs37d73s8lvm0pndwjpj2pqb67pr0ckjap8yzhjna7fq")))) + (version "1.0.3.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "hslua-module-text" version)) + (sha256 + (base32 "025n8vmaq22bl1x60hpg57ih44g6z71jc1qnlxfsi06hram1wcqc")))) (build-system haskell-build-system) (properties '((upstream-name . "hslua-module-text"))) (inputs (list ghc-hslua-core ghc-hslua-packaging ghc-hslua-marshalling)) @@ -5770,7 +5753,7 @@ for user-defined custom schemas). (arguments `(#:cabal-revision ("6" "0q4rhz81r5v0z1mn7x9q0ldbfv1a2cp3dpw8s2j96halsq34l4zl"))) - (home-page "http://github.com/fizruk/http-api-data") + (home-page "https://github.com/fizruk/http-api-data") (synopsis "Convert to/from HTTP API data like URL pieces, headers and query parameters") (description "This Haskell package defines typeclasses used for converting @@ -5890,13 +5873,13 @@ read and write configuration files in the simple INI format.") (define-public ghc-inline-c (package (name "ghc-inline-c") - (version "0.9.1.6") - (source (origin - (method url-fetch) - (uri (hackage-uri "inline-c" version)) - (sha256 - (base32 - "06az494fp2nh6fnibq28yw8jsrpj4jq1swyx53a328qv04cbhrym")))) + (version "0.9.1.8") + (source + (origin + (method url-fetch) + (uri (hackage-uri "inline-c" version)) + (sha256 + (base32 "1qa1rspwyac0f68g7qll17a0wc2a4qrr9fkfarpymfhm7gxzf947")))) (build-system haskell-build-system) (properties '((upstream-name . "inline-c"))) (inputs (list ghc-ansi-wl-pprint ghc-hashable ghc-parsers @@ -5907,7 +5890,7 @@ read and write configuration files in the simple INI format.") ghc-raw-strings-qq ghc-regex-posix ghc-split)) - (home-page "http://hackage.haskell.org/package/inline-c") + (home-page "https://hackage.haskell.org/package/inline-c") (synopsis "Write Haskell source files including C code inline") (description "inline-c lets you seamlessly call C libraries and embed high-performance @@ -5930,7 +5913,7 @@ minimal overhead. No FFI required.") (properties '((upstream-name . "inline-c-cpp"))) (inputs (list ghc-inline-c ghc-safe-exceptions)) (native-inputs (list ghc-hspec ghc-vector)) - (home-page "http://hackage.haskell.org/package/inline-c-cpp") + (home-page "https://hackage.haskell.org/package/inline-c-cpp") (synopsis "Lets you embed C++ code into Haskell") (description "This package provides utilities to inline C++ code into Haskell using @@ -6006,18 +5989,17 @@ Haskell.") (define-public ghc-intervalmap (package (name "ghc-intervalmap") - (version "0.6.1.2") + (version "0.6.2.1") (source (origin (method url-fetch) (uri (hackage-uri "IntervalMap" version)) (sha256 - (base32 - "03smzhwk1zf5na544b0azp49j4gvafqsih9ggwf6yng38yhixwld")))) + (base32 "17v9q1vnm3pzrr5xhv8xvxqh27facwwfladrr10l57fzibp82265")))) (build-system haskell-build-system) (properties '((upstream-name . "IntervalMap"))) - (native-inputs - (list ghc-quickcheck)) + (native-inputs (list ghc-quickcheck ghc-quickcheck ghc-quickcheck + ghc-quickcheck)) (home-page "https://www.chr-breitkopf.de/comp/IntervalMap") (synopsis "Containers for intervals, with efficient search") (description @@ -6052,13 +6034,13 @@ which represets a closed, convex set of floating point values.") (define-public ghc-invariant (package (name "ghc-invariant") - (version "0.6") - (source (origin - (method url-fetch) - (uri (hackage-uri "invariant" version)) - (sha256 - (base32 - "07ffgcfpacsdihcmcmx2m1gp8czlg28657bxncxjykjiiiwjlaxm")))) + (version "0.6.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "invariant" version)) + (sha256 + (base32 "1w6ln343d72hx8q4i7h1ca7gfqyb79ghc3q2fxp9qkjmwsnr8wpv")))) (build-system haskell-build-system) (properties '((upstream-name . "invariant"))) (inputs (list ghc-bifunctors @@ -6071,9 +6053,6 @@ which represets a closed, convex set of floating point values.") ghc-transformers-compat ghc-unordered-containers)) (native-inputs (list ghc-hspec ghc-quickcheck hspec-discover)) - (arguments - `(#:cabal-revision ("1" - "0551ll1swnrmq09j89jqnxl4qnirbbpdpsdym23adaf36qdd7v37"))) (home-page "https://github.com/nfrisby/invariant-functors") (synopsis "Haskell98 invariant functors") (description @@ -6102,7 +6081,7 @@ functors). For more information, see Edward Kmett's article ghc-test-framework ghc-test-framework-hunit ghc-test-framework-quickcheck2)) - (home-page "http://hackage.haskell.org/package/io-streams") + (home-page "https://hackage.haskell.org/package/io-streams") (synopsis "Simple and composable stream I/O") (description "This library contains simple and easy-to-use primitives for I/O using streams.") @@ -6179,7 +6158,7 @@ removed. Both IPv4 and IPv6 are supported.") (arguments `(#:cabal-revision ("1" "0fl9x5amq0g5dg57dcgc0g4ir0r1fdbx06aldsqdwzdc9zs97v6k"))) - (home-page "http://hackage.haskell.org/package/ipynb") + (home-page "https://hackage.haskell.org/package/ipynb") (synopsis "Data structure for working with Jupyter notebooks") (description "This library defines a data structure for representing @@ -6304,7 +6283,7 @@ TIFF and GIF formats.") ghc-semigroupoids ghc-tagged ghc-transformers-compat)) - (home-page "http://github.com/ekmett/kan-extensions/") + (home-page "https://github.com/ekmett/kan-extensions/") (synopsis "Kan extensions library") (description "This library provides Kan extensions, Kan lifts, various @@ -6314,17 +6293,18 @@ forms of the Yoneda lemma, and (co)density (co)monads for Haskell.") (define-public ghc-language-c (package (name "ghc-language-c") - (version "0.9.1") + (version "0.9.2") (source (origin (method url-fetch) (uri (hackage-uri "language-c" version)) (sha256 - (base32 - "0g5djsnzzmi1d1ndcmmrmwz4xnv1m3w009d6kx9jz9jxxdk9adcl")))) + (base32 "1cvcxwnbg71xijadr4aqzwxaw29fxj5z2gpnz3lp5pqnv8phscdj")))) (build-system haskell-build-system) (properties '((upstream-name . "language-c"))) - (inputs (list ghc-syb)) + (arguments + `(#:cabal-revision ("1" + "03qfp9mf4yrdw3m6sab3np7wjaigg5p3xiiirxin8ihsnnx4rv5l"))) (native-inputs (list ghc-happy ghc-alex)) (home-page "https://visq.github.io/language-c/") @@ -6442,7 +6422,7 @@ with @code{wc} (for a web service).") (arguments `(#:cabal-revision ("1" "19z3k7ikpfa96b86yabxghfqpnq9d0ayy4gdlvci3ycvws0s8cy6"))) - (home-page "http://github.com/ekmett/lens/") + (home-page "https://github.com/ekmett/lens/") (synopsis "Lenses, Folds and Traversals") (description "This library provides @code{Control.Lens}. The combinators @@ -6601,17 +6581,17 @@ Music Player Daemon.") (define-public ghc-lib-parser (package (name "ghc-lib-parser") - (version "9.2.5.20221107") - (source (origin - (method url-fetch) - (uri (hackage-uri "ghc-lib-parser" version)) - (sha256 - (base32 - "1xh8rm5lwbh96g4v34whkcbb1yjsyvx3rwwycj30lrglhqk7f4c4")))) + (version "9.2.7.20230228") + (source + (origin + (method url-fetch) + (uri (hackage-uri "ghc-lib-parser" version)) + (sha256 + (base32 "1bny37dny7jv37mpynp3zwdlp8993xikc1c4p6h5f2zwjb7nx2ny")))) (build-system haskell-build-system) (properties '((upstream-name . "ghc-lib-parser"))) - (outputs '("out" "doc")) ; documentation is 39M - (native-inputs (list ghc-alex ghc-happy)) + (inputs (list ghc-alex)) + (native-inputs (list ghc-happy)) (home-page "https://github.com/digital-asset/ghc-lib") (synopsis "The GHC API, decoupled from GHC versions") (description @@ -6679,13 +6659,13 @@ LibYAML C library.") (define-public ghc-lifted-async (package (name "ghc-lifted-async") - (version "0.10.2.3") - (source (origin - (method url-fetch) - (uri (hackage-uri "lifted-async" version)) - (sha256 - (base32 - "1kq96cp9czf358gykai2vcmynnd7zivqja4pb3f8bif9ypln9vai")))) + (version "0.10.2.4") + (source + (origin + (method url-fetch) + (uri (hackage-uri "lifted-async" version)) + (sha256 + (base32 "0pdy7q508n7gvy338xsv9a8fg7saksi8qb9av6j3a37l2pp4vvcv")))) (build-system haskell-build-system) (properties '((upstream-name . "lifted-async"))) (inputs (list ghc-async ghc-lifted-base ghc-transformers-base @@ -6697,6 +6677,9 @@ LibYAML C library.") ghc-tasty-th ghc-tasty-hunit ghc-tasty-th)) + (arguments + `(#:cabal-revision ("2" + "0bg2qmg6lav4zizki1cvqpvd3wqjhfjff7zz17wg5hzlm5318gky"))) (home-page "https://github.com/maoe/lifted-async") (synopsis "Run lifted IO operations asynchronously and wait for their results") @@ -6762,7 +6745,7 @@ Kaseorg.") ghc-void)) (native-inputs (list ghc-simple-reflect ghc-test-framework ghc-test-framework-hunit ghc-hunit)) - (home-page "http://github.com/ekmett/linear/") + (home-page "https://github.com/ekmett/linear/") (synopsis "Linear algebra library for Haskell") (description "This package provides types and combinators for linear algebra on free @@ -6783,7 +6766,7 @@ vector spaces.") (properties '((upstream-name . "ListLike"))) (inputs (list ghc-vector ghc-dlist ghc-fmlist ghc-utf8-string)) (native-inputs (list ghc-hunit ghc-quickcheck ghc-random)) - (home-page "http://github.com/ddssff/listlike") + (home-page "https://github.com/ddssff/listlike") (synopsis "Generic support for list-like structures") (description "The ListLike module provides a common interface to the @@ -6853,20 +6836,20 @@ online}.") (define-public ghc-lucid (package (name "ghc-lucid") - (version "2.11.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "lucid" version)) - (sha256 - (base32 - "13krwrvv0w24rnl7pc7qhv18c6030fkxpx7sxkffdm8sr9173xfw")))) + (version "2.11.20230408") + (source + (origin + (method url-fetch) + (uri (hackage-uri "lucid" version)) + (sha256 + (base32 "07a41xkql96hkp9jawlaxn0lflvjf8a2djb45k3b3ig9zs82j48g")))) (build-system haskell-build-system) (properties '((upstream-name . "lucid"))) (inputs (list ghc-blaze-builder ghc-hashable ghc-mmorph)) (native-inputs (list ghc-hunit ghc-hspec ghc-bifunctors)) (arguments `(#:cabal-revision ("1" - "0wipmh3xcs00x8lbq5j780rdc2klfj67nzni21qc1pdbhr2whn9d"))) + "1gb3b79xf4jp0xvk2anlvpvac6gqcfpffylkwki19lrx6jbd8fqs"))) (home-page "https://github.com/chrisdone/lucid") (synopsis "Haskell DSL for rendering HTML") (description @@ -6885,17 +6868,20 @@ Same combinator can be used for attributes and elements (define-public ghc-lzma (package (name "ghc-lzma") - (version "0.0.0.4") - (source (origin - (method url-fetch) - (uri (hackage-uri "lzma" version)) - (sha256 - (base32 - "0fy11i7fanrsbh8w7cclwx0i6csn5df6vl38dh2112aqw6n7h382")))) + (version "0.0.1.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "lzma" version)) + (sha256 + (base32 "0knz0d6456zf6wbqifzcsw2xvdgaqnig2zn96kav7aqn5i4nfbvj")))) (build-system haskell-build-system) (properties '((upstream-name . "lzma"))) (native-inputs (list ghc-hunit ghc-quickcheck ghc-tasty ghc-tasty-hunit - ghc-tasty-quickcheck)) + ghc-tasty-quickcheck pkg-config)) + (arguments + `(#:cabal-revision ("1" + "0k1f4qy46m4z9phbifasi4x6sjcld2zr45hsawbyb0az9y8p2vnd"))) (home-page "https://github.com/hvr/lzma") (synopsis "LZMA/XZ compression and decompression") (description @@ -6923,7 +6909,7 @@ monadic incremental interface is provided as well.") ghc-test-framework-quickcheck2 ghc-hunit ghc-quickcheck)) - (home-page "http://github.com/alphaHeavy/lzma-conduit") + (home-page "https://github.com/alphaHeavy/lzma-conduit") (synopsis "Conduit interface for lzma/xz compression") (description "This package provides a @code{Conduit} interface for the LZMA @@ -6954,18 +6940,15 @@ than its name.") (define-public ghc-managed (package (name "ghc-managed") - (version "1.0.9") - (source (origin - (method url-fetch) - (uri (hackage-uri "managed" version)) - (sha256 - (base32 - "0vx8aim8bcyyvxxnmi1xkbl3kwrvskjn99z3y8h458g7nsinsisd")))) + (version "1.0.10") + (source + (origin + (method url-fetch) + (uri (hackage-uri "managed" version)) + (sha256 + (base32 "0ngpk6zkpnc9hl9a46pgkc8ii4d7y06xci52birc5vy1a2fwl8is")))) (build-system haskell-build-system) (properties '((upstream-name . "managed"))) - (arguments - `(#:cabal-revision ("3" - "017h9533j7rlxlsf65ynxpva59yr0qwrdmvhp7if141i98ld4664"))) (home-page "https://hackage.haskell.org/package/managed") (synopsis "Monad for managed values") (description @@ -7179,13 +7162,13 @@ microlens.") (build-system haskell-build-system) (properties '((upstream-name . "microlens-ghc"))) (inputs (list ghc-microlens)) - (home-page "http://github.com/monadfix/microlens") + (home-page "https://github.com/monadfix/microlens") (synopsis "Use @code{microlens} with GHC libraries like @code{array}") (description "This library provides everything that @code{microlens} provides plus instances to make @code{each}, @code{at}, and @code{ix} usable with arrays, @code{ByteString}, and containers. This package is -a part of the @uref{http://hackage.haskell.org/package/microlens, +a part of the @uref{httsp://hackage.haskell.org/package/microlens, microlens} family; see the readme @uref{https://github.com/aelve/microlens#readme, on Github}.") (license license:bsd-3))) @@ -7203,13 +7186,13 @@ microlens} family; see the readme (build-system haskell-build-system) (properties '((upstream-name . "microlens-mtl"))) (inputs (list ghc-microlens ghc-transformers-compat)) - (home-page "http://github.com/monadfix/microlens") + (home-page "https://github.com/monadfix/microlens") (synopsis "@code{microlens} support for Reader/Writer/State from mtl") (description "This package contains functions (like @code{view} or @code{+=}) which work on @code{MonadReader}, @code{MonadWriter}, and @code{MonadState} from the mtl package. This package is a part of the -@uref{http://hackage.haskell.org/package/microlens, microlens} family; see the +@uref{httsp://hackage.haskell.org/package/microlens, microlens} family; see the readme @uref{https://github.com/aelve/microlens#readme, on Github}.") (license license:bsd-3))) @@ -7232,42 +7215,42 @@ readme @uref{https://github.com/aelve/microlens#readme, on Github}.") ghc-microlens-th ghc-unordered-containers ghc-vector)) - (home-page "http://github.com/monadfix/microlens") + (home-page "https://github.com/monadfix/microlens") (synopsis "Feature-complete microlens") (description "This package exports a module which is the recommended starting point -for using @uref{http://hackage.haskell.org/package/microlens, microlens} if +for using @uref{httsp://hackage.haskell.org/package/microlens, microlens} if you aren't trying to keep your dependencies minimal. By importing @code{Lens.Micro.Platform} you get all functions and instances from -@uref{http://hackage.haskell.org/package/microlens, microlens}, -@uref{http://hackage.haskell.org/package/microlens-th, microlens-th}, -@uref{http://hackage.haskell.org/package/microlens-mtl, microlens-mtl}, -@uref{http://hackage.haskell.org/package/microlens-ghc, microlens-ghc}, as +@uref{httsp://hackage.haskell.org/package/microlens, microlens}, +@uref{httsp://hackage.haskell.org/package/microlens-th, microlens-th}, +@uref{httsp://hackage.haskell.org/package/microlens-mtl, microlens-mtl}, +@uref{httsp://hackage.haskell.org/package/microlens-ghc, microlens-ghc}, as well as instances for @code{Vector}, @code{Text}, and @code{HashMap}. The minor and major versions of @code{microlens-platform} are incremented whenever the minor and major versions of any other @code{microlens} package are incremented, so you can depend on the exact version of @code{microlens-platform} without specifying the version of @code{microlens} you need. This package is a part of the -@uref{http://hackage.haskell.org/package/microlens, microlens} family; see the +@uref{httsp://hackage.haskell.org/package/microlens, microlens} family; see the readme @uref{https://github.com/aelve/microlens#readme, on Github}.") (license license:bsd-3))) (define-public ghc-microlens-th (package (name "ghc-microlens-th") - (version "0.4.3.11") - (source (origin - (method url-fetch) - (uri (hackage-uri "microlens-th" version)) - (sha256 - (base32 - "1vjjaclfxr0kvlpmj8zh7f6ci4n4b8vynqd67zszx42al7gal6pj")))) + (version "0.4.3.13") + (source + (origin + (method url-fetch) + (uri (hackage-uri "microlens-th" version)) + (sha256 + (base32 "1g41wb61k2l99xxy23yp2zqk0wanskgdypbjhib71ji0y1dcsfz7")))) (build-system haskell-build-system) (properties '((upstream-name . "microlens-th"))) (inputs (list ghc-microlens ghc-th-abstraction)) (native-inputs (list ghc-tagged)) - (home-page "http://github.com/monadfix/microlens") + (home-page "https://github.com/stevenfontanella/microlens") (synopsis "Automatic generation of record lenses for @code{ghc-microlens}") (description @@ -7299,7 +7282,7 @@ used both from lens and microlens).") (arguments `(#:cabal-revision ("2" "11d922r06p00gcgzhb29hhjkq8ajy1xbqdiwdpbmhp2ar7fw7g9l"))) - (home-page "http://hackage.haskell.org/package/MissingH") + (home-page "https://hackage.haskell.org/package/MissingH") (synopsis "Large utility library") (description "MissingH is a library of all sorts of utility functions for Haskell @@ -7344,7 +7327,7 @@ do on-demand loading.") (arguments `(#:cabal-revision ("3" "1582vcpjiyimb1vwnhgq8gp805iziwa8sivv2frir0cgq4z236yz"))) - (home-page "http://hackage.haskell.org/package/mmorph") + (home-page "https://hackage.haskell.org/package/mmorph") (synopsis "Monad morphisms") (description "This library provides monad morphism utilities, most commonly used for @@ -7409,13 +7392,13 @@ a subset of @code{MonadBase} into which generic control operations such as (define-public ghc-monad-logger (package (name "ghc-monad-logger") - (version "0.3.37") - (source (origin - (method url-fetch) - (uri (hackage-uri "monad-logger" version)) - (sha256 - (base32 - "1z275a428zcj73zz0cpfha2adwiwqqqp7klx3kbd3i9rl20xa106")))) + (version "0.3.40") + (source + (origin + (method url-fetch) + (uri (hackage-uri "monad-logger" version)) + (sha256 + (base32 "1aff4ks9615x51841l8g906702xk2g3pn4n5x9ndxppnrxkqdvfb")))) (build-system haskell-build-system) (properties '((upstream-name . "monad-logger"))) (inputs (list ghc-conduit @@ -7429,9 +7412,6 @@ a subset of @code{MonadBase} into which generic control operations such as ghc-transformers-base ghc-transformers-compat ghc-unliftio-core)) - (arguments - `(#:cabal-revision ("3" - "1dzkw08b4ijacdw0vcfxlr13rd819x2yj7b6sr9jrrwicd45zm1z"))) (home-page "https://github.com/snoyberg/monad-logger#readme") (synopsis "Provides a class of monads which can log messages for Haskell") (description @@ -7603,7 +7583,7 @@ data structures as non-empty.") (build-system haskell-build-system) (properties '((upstream-name . "monoid-extras"))) (inputs (list ghc-groups ghc-semigroupoids)) - (home-page "http://hackage.haskell.org/package/monoid-extras") + (home-page "https://hackage.haskell.org/package/monoid-extras") (synopsis "Various extra monoid-related definitions and utilities") (description "This package provides various extra monoid-related @@ -7677,7 +7657,7 @@ the top of your file to get all of the ExceptT instances in scope.") "145z91zkx8jdd3y181pi8z9imqjgpk99cl55pbda4fl201hasbz9")))) (build-system haskell-build-system) (properties '((upstream-name . "murmur-hash"))) - (home-page "http://github.com/nominolo/murmur-hash") + (home-page "https://github.com/nominolo/murmur-hash") (synopsis "MurmurHash2 implementation for Haskell") (description "This package provides an implementation of MurmurHash2, a good, fast, @@ -7789,17 +7769,19 @@ ncurses.") (define-public ghc-network (package (name "ghc-network") - (version "3.1.2.7") - (source (origin - (method url-fetch) - (uri (hackage-uri "network" version)) - (sha256 - (base32 - "119xqsyj44ix0z79mzfpww0cd9936bki1xa7cwykvbx1y7z20xkz")))) + (version "3.1.4.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "network" version)) + (sha256 + (base32 "13hmp4va00ydpzbnwjzgf5wd5iy7373j0f7baxrj1ncmmjps4lml")))) (build-system haskell-build-system) (properties '((upstream-name . "network"))) - (native-inputs (list ghc-hunit ghc-temporary ghc-hspec ghc-quickcheck - ghc-doctest hspec-discover)) + (native-inputs (list ghc-hunit ghc-temporary ghc-hspec ghc-quickcheck hspec-discover)) + (arguments + `(#:cabal-revision ("1" + "1vwxy5zj4bizgg2g0hk3dy52kjh5d7lzn33lphmvbbs36aqcslp1"))) (home-page "https://github.com/haskell/network") (synopsis "Low-level networking interface") (description "This package provides a low-level networking interface.") @@ -7862,7 +7844,7 @@ byte order.") "015lm3b8n8sb16qsffjxz1jvijyy0z600ch0sm8h6a685wqqhbcv")))) (build-system haskell-build-system) (properties '((upstream-name . "network-info"))) - (home-page "http://github.com/jacobstanley/network-info") + (home-page "https://github.com/jacobstanley/network-info") (synopsis "Access the local computer's basic network configuration") (description "This Haskell library provides simple read-only access to the @@ -7937,7 +7919,7 @@ sending UDP datagrams over multicast (class D) addresses.") (arguments `(#:cabal-revision ("1" "0xgc7sxs1p3qibgwbikjdrhn47j7m4gk5x1wrv9hncks6hd6hsyf"))) - (home-page "http://github.com/sjakobi/newtype-generics") + (home-page "https://github.com/sjakobi/newtype-generics") (synopsis "Typeclass and set of functions for working with newtypes") (description "The @code{Newtype} typeclass represents the packing and @@ -8177,17 +8159,20 @@ found at runtime, a userError is thrown.") (define-public ghc-operational (package (name "ghc-operational") - (version "0.2.4.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "operational" version)) - (sha256 - (base32 - "0aa1pxymvkhbs0x03ikfiap2skzyf2z7307kz5adkmb3qmykcqa2")))) + (version "0.2.4.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "operational" version)) + (sha256 + (base32 "1dx6vpmg21fskxyz12ba26hffk25b2qk9sznqfczgaamn6rahzc5")))) (build-system haskell-build-system) (properties '((upstream-name . "operational"))) (inputs (list ghc-random)) - (home-page "http://wiki.haskell.org/Operational") + (arguments + `(#:cabal-revision ("1" + "0hdqwjm1jp6f8n8qglg9ylz07sbhrc7cm4kvcglymi2s4i9mdsai"))) + (home-page "https://github.com/HeinrichApfelmus/operational") (synopsis "Implementation of difficult monads made easy with operational semantics") (description @@ -8279,17 +8264,20 @@ easily work with command-line options.") (define-public ghc-optparse-applicative (package (name "ghc-optparse-applicative") - (version "0.17.0.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "optparse-applicative" version)) - (sha256 - (base32 - "097p1bkvw9r3rvcr65w53yw14drb0s46ldkkl1jbmq5g7m6jwnw2")))) + (version "0.17.1.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "optparse-applicative" version)) + (sha256 + (base32 "1vx5w03vvfr3hdk79lvl34x8bxj5xbx0xh53mmnmxi9r05scnyfi")))) (build-system haskell-build-system) (properties '((upstream-name . "optparse-applicative"))) (inputs (list ghc-transformers-compat ghc-ansi-wl-pprint)) (native-inputs (list ghc-quickcheck)) + (arguments + `(#:cabal-revision ("1" + "1mhyjlmb1hylmhv77w6gq663drpyiqd09w1x1vy4d63lr46mypyb"))) (home-page "https://github.com/pcapriotti/optparse-applicative") (synopsis "Utilities and combinators for parsing command line options") (description "This package provides utilities and combinators for parsing @@ -8371,13 +8359,13 @@ require aeson (define-public ghc-text-icu (package (name "ghc-text-icu") - (version "0.8.0.4") + (version "0.8.0.2") (source (origin (method url-fetch) (uri (hackage-uri "text-icu" version)) (sha256 - (base32 "1yj0jdjrsx12sy6lj1gizb2ys5likp9rcv8ryc6sjf2dw74097rd")))) + (base32 "0frxrsj580ipgb3pdvw1msdz8d63j02vvrqhzjja3ixlq24am69d")))) (build-system haskell-build-system) (properties '((upstream-name . "text-icu"))) (inputs (list icu4c)) @@ -8387,6 +8375,7 @@ require aeson ghc-test-framework ghc-test-framework-hunit ghc-test-framework-quickcheck2 + ghc-semigroups pkg-config)) (home-page "https://github.com/haskell/text-icu") (synopsis "Bindings to the ICU library") @@ -8425,7 +8414,7 @@ formatting.") (arguments `(#:cabal-revision ("1" "0gmmwwchy9312kz8kr5jhiamqrnjqxdqg1wkrww4289yfj1p7dzb"))) - (home-page "http://hackage.haskell.org/package/text-short") + (home-page "https://hackage.haskell.org/package/text-short") (synopsis "Memory-efficient representation of Unicode text strings") (description "This package provides the @code{ShortText} type which @@ -8468,21 +8457,18 @@ Implementations using both of these examples are provided.") (define-public ghc-doclayout (package (name "ghc-doclayout") - (version "0.4") - (source (origin - (method url-fetch) - (uri (hackage-uri "doclayout" version)) - (sha256 - (base32 - "18xkzywfw0hl3hgbq9z36hs040vb0iz9yygx33cybxfi4i0dwbkx")))) + (version "0.4.0.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "doclayout" version)) + (sha256 + (base32 "02xkf2shcrb897yrh9i6ch9qi4gm42avya4znsjxgpxb85fm3lzp")))) (build-system haskell-build-system) (properties '((upstream-name . "doclayout"))) (inputs (list ghc-emojis ghc-safe)) (native-inputs (list ghc-tasty ghc-tasty-golden ghc-tasty-hunit ghc-tasty-quickcheck)) - (arguments - `(#:cabal-revision ("1" - "0djwb7nrdablc0iy1qakrxpd4m7nn0w94vhb78il3jhjbj2ji179"))) (home-page "https://github.com/jgm/doclayout") (synopsis "Pretty-printing library for laying out text documents") (description @@ -8749,7 +8735,7 @@ combinators.") ghc-attoparsec ghc-semigroups)) (native-inputs (list ghc-quickcheck ghc-quickcheck-instances)) - (home-page "http://github.com/ekmett/parsers/") + (home-page "https://github.com/ekmett/parsers/") (synopsis "Parsing combinators") (description "This library provides convenient combinators for working @@ -8779,7 +8765,7 @@ the parsers provided by @code{parsec}, @code{attoparsec} and @code{base}'s ghc-genvalidity-hspec ghc-hspec ghc-validity)) - (home-page "http://hackage.haskell.org/package/path") + (home-page "https://hackage.haskell.org/package/path") (synopsis "Support for well-typed paths") (description "This package introduces a type for paths upholding useful invariants.") @@ -8914,7 +8900,7 @@ syntax and semantics as Perl 5.") (arguments `(#:cabal-revision ("3" "0wl22dnz6ld300cg6id3lw991bp8kdfi8h0nbv37vn79i1zdcj5n"))) - (home-page "http://hackage.haskell.org/package/peano") + (home-page "https://hackage.haskell.org/package/peano") (synopsis "Peano numbers") (description "Provides an efficient Haskell implementation of Peano numbers") @@ -8968,13 +8954,13 @@ storage systems like PostgreSQL, SQLite, and MariaDB in a type-safe way.") (define-public ghc-persistent-sqlite (package (name "ghc-persistent-sqlite") - (version "2.13.1.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "persistent-sqlite" version)) - (sha256 - (base32 - "1z8650nv10f6yldn9sihk54c7mlcnkxwaj956igvs6q3x3s8aa1b")))) + (version "2.13.1.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "persistent-sqlite" version)) + (sha256 + (base32 "0a7s0znm4580spgadiqy14dhvm2kzbh6v3kc4px41yyk8br6vnpj")))) (build-system haskell-build-system) (properties '((upstream-name . "persistent-sqlite"))) (inputs (list ghc-persistent @@ -8995,6 +8981,7 @@ storage systems like PostgreSQL, SQLite, and MariaDB in a type-safe way.") ghc-system-fileio ghc-system-filepath ghc-temporary)) + (arguments (list #:tests? #f)) ; ghc-persistent-test is too old. (home-page "http://www.yesodweb.com/book/persistent") (synopsis "Backend for the persistent library using sqlite3") (description @@ -9451,7 +9438,7 @@ of the @code{primitive} library before @code{primitive-0.7.0.0}.") (home-page "https://github.com/seereason/process-extras") (synopsis "Extra tools for managing processes") (description "This package extends -@url{http://hackage.haskell.org/package/process}. It allows you to read +@url{httsp://hackage.haskell.org/package/process}. It allows you to read process input and output as ByteStrings or Text, or write your own ProcessOutput instance. It also provides lazy process input and output, and a ProcessMaker class for more flexibility in the process creation @@ -9497,7 +9484,7 @@ API.") "1cbccbvrx73drr1jf3yyw0rp1mcfv3jc1rvdcby5xxx4ja543fjs")))) (build-system haskell-build-system) (properties '((upstream-name . "indexed-profunctors"))) - (home-page "http://hackage.haskell.org/package/indexed-profunctors") + (home-page "https://hackage.haskell.org/package/indexed-profunctors") (synopsis "Utilities for indexed profunctors") (description "This package contains basic definitions related to indexed profunctors. These @@ -9539,17 +9526,20 @@ the ideal templating system.") (define-public ghc-protolude (package (name "ghc-protolude") - (version "0.3.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "protolude" version)) - (sha256 - (base32 - "0i53yxg44nrz0czwr8cqhw1fdapz9db8kfnqz9a3lmj5skrikh3y")))) + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (hackage-uri "protolude" version)) + (sha256 + (base32 "0ihsjx48p9dgsp0i0l73h16mycnba40hyh7412jv3xz9qz9dwfbc")))) (build-system haskell-build-system) (properties '((upstream-name . "protolude"))) (inputs (list ghc-async ghc-hashable ghc-mtl-compat ghc-transformers-compat)) + (arguments + `(#:cabal-revision ("2" + "0f949f93wml7h7na9d1n9lvignwphxr2r18jwmpy33g0dxgn21h1"))) (home-page "https://github.com/sdiehl/protolude") (synopsis "Sensible set of defaults for writing custom Preludes") (description @@ -9603,7 +9593,7 @@ keys, in linear time.") ghc-tasty-hunit ghc-tasty-quickcheck ghc-tagged)) - (home-page "http://hackage.haskell.org/package/psqueues") + (home-page "https://hackage.haskell.org/package/psqueues") (synopsis "Pure priority search queues") (description "The psqueues package provides @@ -9698,7 +9688,7 @@ usable.") ; ghc-tasty-hunit ; ghc-tasty ; ghc-tasty-inspection-testing)) - (home-page "http://hackage.haskell.org/package/random") + (home-page "https://hackage.haskell.org/package/random") (synopsis "Random number library") (description "This package provides a basic random number generation @@ -9839,7 +9829,7 @@ the community, with the missing features being added with pull-requests.") (arguments `(#:cabal-revision ("2" "1ji6rp0f857d0vp2kjqcck7avrjgqvqjgwnhdcxs3zbjkwpqyhfb"))) - (home-page "http://github.com/ekmett/reducers/") + (home-page "https://github.com/ekmett/reducers/") (synopsis "Semigroups, specialized containers and a general map/reduce framework") (description "This library provides various semigroups, specialized @@ -9870,23 +9860,25 @@ specify refactorings without depending on GHC.") (define-public ghc-reflection (package (name "ghc-reflection") - (version "2.1.6") + (version "2.1.7") (source (origin (method url-fetch) (uri (hackage-uri "reflection" version)) (sha256 - (base32 - "1kd6dgnp99dzbkxdnj01g81j03v7zq5cwg0sf19rlcmvgs8i8gmz")))) + (base32 "1z8mwkqb0ljxpc45hkj0jiyhjfl1frpxqhdnp0xm6w98n2l1ifvc")))) (build-system haskell-build-system) (properties '((upstream-name . "reflection"))) (inputs (list ghc-tagged)) - (native-inputs - (list ghc-hspec ghc-quickcheck hspec-discover)) + (native-inputs (list ghc-hspec ghc-quickcheck hspec-discover)) + (arguments + `(#:cabal-revision ("1" + "011s5ci385yccv576d1mh0n7v5k2pbmqkx1swlb5sq1sk3qb7dgj"))) (home-page "https://github.com/ekmett/reflection") (synopsis "Reify arbitrary terms into types that can be reflected back into terms") - (description "This package addresses the 'configuration problem' which is + (description + "This package addresses the 'configuration problem' which is propagating configurations that are available at run-time, allowing multiple configurations to coexist without resorting to mutable global variables or @code{System.IO.Unsafe.unsafePerformIO}.") @@ -10169,17 +10161,20 @@ Haskell library @code{regex-base}.") (define-public ghc-regex-tdfa (package (name "ghc-regex-tdfa") - (version "1.3.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "regex-tdfa" version)) - (sha256 - (base32 - "1lfzhir5zbgga44zhr4qvc2xc9pa9lslv12c8lwqqw80bzfdfq16")))) + (version "1.3.2.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "regex-tdfa" version)) + (sha256 + (base32 "15c2gc7c0y2xv9sm586jvys2kx1dc18lzfvjzad5mm2d4yszi2sw")))) (build-system haskell-build-system) (properties '((upstream-name . "regex-tdfa"))) (inputs (list ghc-regex-base)) (native-inputs (list ghc-utf8-string ghc-doctest-parallel)) + (arguments + `(#:cabal-revision ("1" + "1005mqjhq2blz8kqxmk84xajyqd85n91j9nraw6jrwfv11vxfvxa"))) (home-page "https://wiki.haskell.org/Regular_expressions") (synopsis "POSIX extended regular expressions in Haskell") (description @@ -10301,7 +10296,7 @@ connections.") (properties '((upstream-name . "resourcet"))) (inputs (list ghc-unliftio-core ghc-primitive)) (native-inputs (list ghc-hspec)) - (home-page "http://github.com/snoyberg/conduit") + (home-page "https://github.com/snoyberg/conduit") (synopsis "Deterministic allocation and freeing of scarce resources") (description "ResourceT is a monad transformer which creates a region of code where you can safely allocate resources.") @@ -10310,19 +10305,19 @@ code where you can safely allocate resources.") (define-public ghc-retry (package (name "ghc-retry") - (version "0.9.3.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "retry" version)) - (sha256 - (base32 - "1kafm17xk6hylr0lwa98wxjcx7z3rgnqi4fzxcks7dy9dz5ms7n1")))) + (version "0.9.3.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "retry" version)) + (sha256 + (base32 "1mky1dfllmx6dr1gayf636n3z5xrfmam3rhs5vx7c3wj9c8kabk2")))) (build-system haskell-build-system) (properties '((upstream-name . "retry"))) (inputs (list ghc-random ghc-mtl-compat ghc-unliftio-core)) (native-inputs (list ghc-hunit ghc-tasty ghc-tasty-hunit ghc-tasty-hedgehog ghc-hedgehog)) - (home-page "http://github.com/Soostone/retry") + (home-page "https://github.com/Soostone/retry") (synopsis "Retry combinators for monadic actions that may fail") (description "This package exposes combinators that can wrap @@ -10641,22 +10636,21 @@ award winning Linux port of \"Civilization: Call To Power.\"") (define-public ghc-sdl2 (package (name "ghc-sdl2") - (version "2.5.4.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "sdl2" version)) - (sha256 - (base32 - "1g35phifz49kxk48s8jmgglxhxl79cbzc1cg2qlgk0vdpxpin8ym")))) + (version "2.5.5.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "sdl2" version)) + (sha256 + (base32 "1kai6mmnwz9qq7q5y8c7wmcdf9qc5m167dzy3brj11jjds4smz93")))) (build-system haskell-build-system) (properties '((upstream-name . "sdl2"))) (inputs (list ghc-statevar ghc-vector ghc-linear sdl2)) (native-inputs (list ghc-weigh pkg-config)) (arguments - `(#:tests? #f ; Needs a graphics card. - #:cabal-revision ("2" - "1yxzq4gb6ig3d94lc76i5d50fa0j1fxr1wdlmgwhkvlfd4xnh6sg"))) - (home-page "http://hackage.haskell.org/package/sdl2") + `(#:cabal-revision ("1" + "0r0lzn3hyjvzwqsrqprdzb2c167g7ip2cf07jvm1h5b53qc2a4cx"))) + (home-page "https://hackage.haskell.org/package/sdl2") (synopsis "High- and low-level bindings to the SDL library") (description "This package contains bindings to the SDL 2 library, in both high- and @@ -10683,7 +10677,7 @@ programming.") (properties '((upstream-name . "sdl2-image"))) (inputs (list ghc-sdl2 sdl2-image)) (native-inputs (list pkg-config)) - (home-page "http://hackage.haskell.org/package/sdl2-image") + (home-page "https://hackage.haskell.org/package/sdl2-image") (synopsis "Bindings to SDL2_image") (description "This package provides Haskell bindings to @code{SDL2_image}.") @@ -10704,7 +10698,7 @@ programming.") (inputs (list ghc-data-default-class ghc-lifted-base ghc-monad-control ghc-sdl2 ghc-vector sdl2-mixer)) (native-inputs (list pkg-config)) - (home-page "http://hackage.haskell.org/package/sdl2-mixer") + (home-page "https://hackage.haskell.org/package/sdl2-mixer") (synopsis "Bindings to SDL2 mixer") (description "This package provides Haskell bindings to @code{SDL2_mixer}.") @@ -10724,7 +10718,7 @@ programming.") (properties '((upstream-name . "sdl2-ttf"))) (inputs (list ghc-sdl2 ghc-th-abstraction sdl2-ttf)) (native-inputs (list pkg-config)) - (home-page "http://hackage.haskell.org/package/sdl2-ttf") + (home-page "https://hackage.haskell.org/package/sdl2-ttf") (synopsis "Bindings to SDL2_ttf") (description "This package provides Haskell bindings to SDL2_ttf C++ library.") @@ -10744,7 +10738,7 @@ library.") (properties '((upstream-name . "sdl2-gfx"))) (inputs (list ghc-lifted-base ghc-monad-control ghc-sdl2 ghc-vector sdl2-gfx)) (native-inputs (list pkg-config)) - (home-page "http://hackage.haskell.org/package/sdl2-gfx") + (home-page "https://hackage.haskell.org/package/sdl2-gfx") (synopsis "Haskell bindings to SDL2_gfx") (description "This package provides Haskell bindings to the SDL2_gfx graphics @@ -10883,7 +10877,7 @@ class, forming lattice-like structure.") ghc-tagged ghc-hashable ghc-unordered-containers)) - (home-page "http://github.com/ekmett/semigroupoids") + (home-page "https://github.com/ekmett/semigroupoids") (synopsis "Semigroupoids operations for Haskell") (description "This library provides a wide array of (semi)groupoids and @@ -10910,7 +10904,7 @@ just a @code{Semigroup} are added.") (properties '((upstream-name . "semigroups"))) (inputs (list ghc-nats ghc-tagged ghc-hashable ghc-unordered-containers ghc-transformers-compat)) - (home-page "http://github.com/ekmett/semigroups/") + (home-page "https://github.com/ekmett/semigroups/") (synopsis "Semigroup operations for Haskell") (description "This package provides semigroups for Haskell. In @@ -11080,13 +11074,13 @@ interpolates variables according to the type being inserted.") (define-public ghc-shelly (package (name "ghc-shelly") - (version "1.10.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "shelly" version)) - (sha256 - (base32 - "0hgzh0rrhipir8378civ5mwvkvcsd063jm2pyx8dqngdynph0h65")))) + (version "1.10.0.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "shelly" version)) + (sha256 + (base32 "0nm3yg6mhgxj670xn18v4zvzzqxqv9b1r6psdmsppgqny1szqm3x")))) (build-system haskell-build-system) (properties '((upstream-name . "shelly"))) (inputs (list ghc-async @@ -11097,10 +11091,7 @@ interpolates variables according to the type being inserted.") ghc-transformers-base ghc-unix-compat)) (native-inputs (list ghc-hspec ghc-hspec-contrib ghc-hunit)) - (arguments - `(#:cabal-revision ("1" - "07c1rjwvg2ldam6yaksvrr9f703b7d1rcw0482ns5yi2f7y1kczp"))) - (home-page "https://github.com/yesodweb/Shelly.hs") + (home-page "https://github.com/gregwebs/Shelly.hs") (synopsis "Shell-like (systems) programming in Haskell") (description "Shelly provides convenient systems programming in Haskell, similar in @@ -11162,21 +11153,19 @@ them.") (define-public ghc-simple-sendfile (package (name "ghc-simple-sendfile") - (version "0.2.30") + (version "0.2.31") (source (origin (method url-fetch) (uri (hackage-uri "simple-sendfile" version)) (sha256 - (base32 - "112j0qfsjazf9wg1zywf7hjybgsiywk9wkm27yi8xzv27hmlv1mn")))) + (base32 "0q65dnvmwwcvpzhg3963s7yy404h4yrjgxvdbjy0grrs1qi6w1v6")))) (build-system haskell-build-system) (properties '((upstream-name . "simple-sendfile"))) - (inputs - (list ghc-conduit ghc-conduit-extra ghc-network ghc-resourcet)) - (native-inputs - (list ghc-hspec hspec-discover)) - (home-page "https://github.com/kazu-yamamoto/simple-sendfile") + (inputs (list ghc-network)) + (native-inputs (list ghc-hunit ghc-conduit ghc-conduit-extra ghc-resourcet + ghc-hspec hspec-discover)) + (home-page "https://hackage.haskell.org/package/simple-sendfile") (synopsis "Cross platform library for the sendfile system call") (description "This library tries to call minimum system calls which are the bottleneck of web servers.") @@ -11195,7 +11184,7 @@ are the bottleneck of web servers.") (build-system haskell-build-system) (properties '((upstream-name . "size-based"))) (inputs (list ghc-dictionary-sharing ghc-testing-type-modifiers)) - (home-page "http://hackage.haskell.org/package/size-based") + (home-page "https://hackage.haskell.org/package/size-based") (synopsis "Sized functors for size-based enumerations") (description "This library provides a framework for size-based enumerations.") @@ -11204,42 +11193,39 @@ enumerations.") (define-public ghc-skylighting-core (package (name "ghc-skylighting-core") - (version "0.13.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "skylighting-core" version)) - (sha256 - (base32 - "0iwzfgynj3l8rnvvrl4kg0i1n31rz15da8cf1943gw1vcfh6w585")))) + (version "0.13.2.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "skylighting-core" version)) + (sha256 + (base32 "1ib59w12f7mlh10nwj7404jv8x7z2r58g8a9ndr6ag8pxnf81054")))) (build-system haskell-build-system) (properties '((upstream-name . "skylighting-core"))) - (inputs - (list ghc-aeson - ghc-ansi-terminal - ghc-attoparsec - ghc-base64-bytestring - ghc-blaze-html - ghc-case-insensitive - ghc-colour - ghc-safe - ghc-utf8-string - ghc-xml-conduit)) - (native-inputs - (list ghc-diff - ghc-pretty-show - ghc-quickcheck - ghc-tasty - ghc-tasty-golden - ghc-tasty-hunit - ghc-tasty-quickcheck)) + (inputs (list ghc-aeson + ghc-case-insensitive + ghc-attoparsec + ghc-utf8-string + ghc-xml-conduit + ghc-safe + ghc-base64-bytestring + ghc-colour)) + (native-inputs (list ghc-tasty + ghc-tasty-golden + ghc-tasty-hunit + ghc-tasty-quickcheck + ghc-quickcheck + ghc-diff + ghc-pretty-show)) (home-page "https://github.com/jgm/skylighting") (synopsis "Syntax highlighting library") - (description "Skylighting is a syntax highlighting library with support + (description + "Skylighting is a syntax highlighting library with support for over one hundred languages. It derives its tokenizers from XML syntax definitions used by KDE's @code{KSyntaxHighlighting} framework, so any syntax supported by that framework can be added. An optional command-line program is provided. Skylighting is intended to be the successor to highlighting-kate.") - (license license:gpl2))) + (license license:bsd-3))) (define-public ghc-skylighting-format-blaze-html (package @@ -11283,13 +11269,13 @@ macros.") (define-public ghc-skylighting-format-context (package (name "ghc-skylighting-format-context") - (version "0.1.0.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "skylighting-format-context" version)) - (sha256 - (base32 - "1d4nf16wl2l4r627qnph09x21xwcq03r7bznqm08d4di1z241xv0")))) + (version "0.1.0.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "skylighting-format-context" version)) + (sha256 + (base32 "1gc8pjbhd1npka22m5m7s5333jcqxskgzmqj17m95dl97phi6hh0")))) (build-system haskell-build-system) (properties '((upstream-name . "skylighting-format-context"))) (inputs (list ghc-skylighting-core)) @@ -11323,13 +11309,13 @@ colored text.") (define-public ghc-skylighting (package (name "ghc-skylighting") - (version "0.13.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "skylighting" version)) - (sha256 - (base32 - "0dh4k39ddqca5px2d06ni8n9x3mifvkwd5i16077l472dwjcs879")))) + (version "0.13.2.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "skylighting" version)) + (sha256 + (base32 "0lq68cavdp73praa2h8cclgnrh53fqg9x4r6q3fsvnr8lbcb4x7h")))) (build-system haskell-build-system) (properties '((upstream-name . "skylighting"))) (inputs (list ghc-skylighting-core @@ -11354,22 +11340,20 @@ syntax modules based on the KDE XML definitions provided by the (define-public ghc-smallcheck (package (name "ghc-smallcheck") - (version "1.2.1") + (version "1.2.1.1") (source (origin (method url-fetch) (uri (hackage-uri "smallcheck" version)) (sha256 - (base32 - "0sf87zjlrgjw7q6a0499g2ywx66zvpv6rg6953fjc18fnl8rs7z4")))) + (base32 "07zyb3hnq242mdwak5briqc48wakp9pjsfizl78l06070i824hz0")))) (build-system haskell-build-system) (properties '((upstream-name . "smallcheck"))) - (inputs - (list ghc-logict)) - (home-page - "https://github.com/feuerbach/smallcheck") + (inputs (list ghc-logict ghc-semigroups ghc-nats ghc-void)) + (home-page "https://github.com/Bodigrim/smallcheck") (synopsis "Property-based testing library") - (description "SmallCheck is a testing library that verifies + (description + "SmallCheck is a testing library that verifies properties for all test cases up to some depth. The test cases are generated automatically by SmallCheck.") (license license:bsd-3))) @@ -11409,7 +11393,7 @@ automatically by SmallCheck.") (arguments `(#:cabal-revision ("1" "1p6zyqja021gyndskn1qnj29glqr0hldyhxplnpxz06hz4xqwngz"))) - (home-page "http://hackage.haskell.org/package/sop-core") + (home-page "https://hackage.haskell.org/package/sop-core") (synopsis "True Sums of Products") (description "This package provides an implementation of @@ -11459,7 +11443,7 @@ used for example by QuickCheck, see quickcheck-special." ) (build-system haskell-build-system) (properties '((upstream-name . "split"))) (native-inputs (list ghc-quickcheck)) - (home-page "http://hackage.haskell.org/package/split") + (home-page "https://hackage.haskell.org/package/split") (synopsis "Combinator library for splitting lists") (description "This package provides a collection of Haskell functions for @@ -11496,7 +11480,7 @@ mainstream languages.") `(#:tests? #f ; Missing library testu01. #:cabal-revision ("1" "1iqlg2d4mybqwzwp67c5a1yxzd47cbp4f7mrpa6d0ckypis2akl0"))) - (home-page "http://hackage.haskell.org/package/splitmix") + (home-page "https://hackage.haskell.org/package/splitmix") (synopsis "Fast and splittable pseudorandom number generator") (description "This package provides a Pure Haskell implementation of the @@ -11572,13 +11556,13 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") (define-public ghc-statistics (package (name "ghc-statistics") - (version "0.16.1.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "statistics" version)) - (sha256 - (base32 - "15yr0w25dqaqz16635qxkxvr6nj6mkjj9pl7wzw5yr3pn84xjryq")))) + (version "0.16.2.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "statistics" version)) + (sha256 + (base32 "1gsql118657j74v7r3yidzymzjvlcjvvs1pd37dg2lrz3xndyddk")))) (build-system haskell-build-system) (properties '((upstream-name . "statistics"))) (inputs (list ghc-math-functions @@ -11601,6 +11585,7 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") ghc-tasty-hunit ghc-tasty-quickcheck ghc-tasty-expected-failure)) + (arguments (list #:tests? #f)) ;; Fail. (home-page "https://github.com/haskell/statistics") (synopsis "Haskell library of statistical types, data, and functions") (description @@ -11629,19 +11614,19 @@ and regression and autocorrelation analysis. (define-public ghc-stm-chans (package (name "ghc-stm-chans") - (version "3.0.0.6") + (version "3.0.0.9") (source (origin (method url-fetch) (uri (hackage-uri "stm-chans" version)) (sha256 - (base32 - "04hafqjq8ngvhcavkfx88a0zky8yc7i18q2n9ajav03kns1kwvpa")))) + (base32 "0p9jq5fq3g77kf2kq807zrwqpw0z9a6zhw57h21wk4yb6zshs1ks")))) (build-system haskell-build-system) (properties '((upstream-name . "stm-chans"))) - (home-page "https://hackage.haskell.org/package/stm-chans") + (home-page "https://wrengr.org/software/hackage.html") (synopsis "Additional types of channels for ghc-stm") - (description "This Haskell package offers a collection of channel types, + (description + "This Haskell package offers a collection of channel types, similar to @code{Control.Concurrent.STM.@{TChan,TQueue@}} but with additional features.") (license license:bsd-3))) @@ -11687,23 +11672,21 @@ source and a sink.") (define-public ghc-stmonadtrans (package (name "ghc-stmonadtrans") - (version "0.4.6") + (version "0.4.7") (source (origin (method url-fetch) (uri (hackage-uri "STMonadTrans" version)) (sha256 - (base32 "0rvhh0hhwz601ibpzisry7xf3j61r5sxfgp47imaa37i5bvrlynb")))) + (base32 "1x83f48wbzx6rzbls6h8walfayzdv4j3j1mqbk8lfnkdqff9ri5d")))) (build-system haskell-build-system) (properties '((upstream-name . "STMonadTrans"))) - (arguments `(#:tests? #f)) ; TODO: Loops. (inputs (list ghc-fail)) -; (native-inputs -; `(("ghc-tasty" ,ghc-tasty) -; ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) -; ("ghc-tasty-hunit" ,ghc-tasty-hunit) -; ("ghc-stmonadtrans" ,ghc-stmonadtrans))) - (home-page "https://hackage.haskell.org/package/STMonadTrans") + (native-inputs (list ghc-tasty ghc-tasty-quickcheck ghc-tasty-hunit)) + (arguments + `(#:cabal-revision ("1" + "01zfv7jdqf8wfmgxx2gdb1nik93iqvkmblrd18py5hy5mpbxp9dy"))) + (home-page "https://github.com/josefs/STMonadTrans") (synopsis "Monad transformer version of the ST monad") (description "This package provides a monad transformer version of the @code{ST} monad @@ -11734,13 +11717,13 @@ and Fortran complex data types.") (define-public ghc-storable-record (package (name "ghc-storable-record") - (version "0.0.6") - (source (origin - (method url-fetch) - (uri (hackage-uri "storable-record" version)) - (sha256 - (base32 - "1d4c1ccbrpq8rnacsjib9nmxhgxk9yb1zxx1nvfavhqhv8nwq2fd")))) + (version "0.0.7") + (source + (origin + (method url-fetch) + (uri (hackage-uri "storable-record" version)) + (sha256 + (base32 "1c1f58v13nxpq2ix30d2kpvsamk44apl6ms1a2pq54fkjk44didy")))) (build-system haskell-build-system) (properties '((upstream-name . "storable-record"))) (inputs (list ghc-quickcheck ghc-semigroups ghc-utility-ht @@ -11818,35 +11801,36 @@ arrays with a list interface, a chunky lazy list interface with variable chunk size and an interface for write access via the ST monad. This is much like bytestring and binary but can be used for every @code{Foreign.Storable.Storable} type. See also -@url{http://hackage.haskell.org/package/vector}, a library with a +@url{https://hackage.haskell.org/package/vector}, a library with a similar intention. This library does not do advanced fusion optimization, since especially for lazy vectors this would either be incorrect or not applicable. See -@url{http://hackage.haskell.org/package/storablevector-streamfusion} for +@url{httsp://hackage.haskell.org/package/storablevector-streamfusion} for a library that provides fusion with lazy lists.") (license license:bsd-3))) (define-public ghc-streaming-commons (package (name "ghc-streaming-commons") - (version "0.2.2.5") + (version "0.2.2.6") (source (origin (method url-fetch) (uri (hackage-uri "streaming-commons" version)) (sha256 - (base32 - "0157xjz8nhr65y9rm7rdf3pnjlrsgaqam7qfg7nqq91bvfdq2l6a")))) + (base32 "0ydzkx00akxf2kw5ifdmfia2if5iqa3fhbw15ckgdc1fi259b001")))) (build-system haskell-build-system) (properties '((upstream-name . "streaming-commons"))) - (inputs - (list ghc-async ghc-blaze-builder ghc-network ghc-random ghc-zlib)) - (native-inputs - (list ghc-quickcheck ghc-hspec hspec-discover)) - (home-page "https://hackage.haskell.org/package/streaming-commons") + (inputs (list ghc-async ghc-network ghc-random ghc-zlib)) + (native-inputs (list ghc-hspec ghc-quickcheck hspec-discover)) + (arguments + `(#:cabal-revision ("1" + "0jz2g82kzdiy6qwqx6a21y412v71hwnmzmai0gdiprylxyczpinm"))) + (home-page "https://github.com/fpco/streaming-commons") (synopsis "Conduit and pipes needed by some streaming data libraries") - (description "This package provides low-dependency functionality commonly + (description + "This package provides low-dependency functionality commonly needed by various Haskell streaming data libraries, such as @code{conduit} and @code{pipe}s.") (license license:expat))) @@ -11971,13 +11955,13 @@ building Scalable Vector Graphics (SVG).") (define-public ghc-syb (package (name "ghc-syb") - (version "0.7.2.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "syb" version)) - (sha256 - (base32 - "1qxjjndfwz2vvpz9707banmcn6jl2v6w6zp401zxaj327fccchw1")))) + (version "0.7.2.3") + (source + (origin + (method url-fetch) + (uri (hackage-uri "syb" version)) + (sha256 + (base32 "06nrr3x9zgk0ml7xckx04hr46lr15w3p8mrdrgcw8ix92spjvdyh")))) (build-system haskell-build-system) (properties '((upstream-name . "syb"))) (native-inputs (list ghc-tasty ghc-tasty-hunit)) @@ -12290,16 +12274,16 @@ This is a better maintained fork of the \"temporary\" package.") (define-public ghc-terminal-size (package (name "ghc-terminal-size") - (version "0.3.3") - (source (origin - (method url-fetch) - (uri (hackage-uri "terminal-size" version)) - (sha256 - (base32 - "1hv0r8gr1ms258rrz602gd5kziykkxw5zlnnzz5f42r0ly7lq5wc")))) + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (hackage-uri "terminal-size" version)) + (sha256 + (base32 "0jbznrlf95lc6ajhh26h1qgcmbr3bj753i8jlkrsrnkcjbb71w5h")))) (build-system haskell-build-system) (properties '((upstream-name . "terminal-size"))) - (home-page "http://hackage.haskell.org/package/terminal-size") + (home-page "https://hackage.haskell.org/package/terminal-size") (synopsis "Get terminal window height and width") (description "Get terminal window height and width without ncurses dependency.") @@ -12308,18 +12292,18 @@ dependency.") (define-public ghc-texmath (package (name "ghc-texmath") - (version "0.12.5.4") - (source (origin - (method url-fetch) - (uri (hackage-uri "texmath" version)) - (sha256 - (base32 - "1dn88s352y641c1vlj5j5mqwhnz6r1algkd7mx83y3fr0wp3nhlq")))) + (version "0.12.5.5") + (source + (origin + (method url-fetch) + (uri (hackage-uri "texmath" version)) + (sha256 + (base32 "0hm88495sql6dz10hkrhfdnzfpgaa8zcy00v3irkzibq886nbcva")))) (build-system haskell-build-system) (properties '((upstream-name . "texmath"))) (inputs (list ghc-syb ghc-xml ghc-pandoc-types ghc-split)) (native-inputs (list ghc-pretty-show ghc-tasty ghc-tasty-golden ghc-tagged)) - (home-page "http://github.com/jgm/texmath") + (home-page "https://github.com/jgm/texmath") (synopsis "Conversion between formats used to represent mathematics") (description "The texmath library provides functions to read and write TeX math, @@ -12385,23 +12369,20 @@ upgraded. Consider yourself warned!") (define-public ghc-text-metrics (package (name "ghc-text-metrics") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri (hackage-uri "text-metrics" version)) (sha256 - (base32 - "17bp1lnbkqr5ykrcd6v5sqv0fhljck7hky8zrrpw7rlkb1f3sdc2")))) + (base32 "0vl3vnm7xhy2zwcx1m293gp64q5sxfa3vmzdaqnqmjgby6l31mxx")))) (build-system haskell-build-system) (properties '((upstream-name . "text-metrics"))) - (inputs - (list ghc-vector)) - (native-inputs - (list ghc-quickcheck ghc-hspec)) + (inputs (list ghc-vector)) + (native-inputs (list ghc-quickcheck ghc-hspec)) (arguments - `(#:cabal-revision - ("4" "017drxq9x56b345d8w5m8xdsi1zzs0z16pbdx8j35cd1lsnh3kf1"))) + `(#:cabal-revision ("3" + "1hdxv7jka6x7d621cxn4r802w4rip45calmvjrb8aar34dshkg4q"))) (home-page "https://github.com/mrkkrp/text-metrics") (synopsis "Calculate various string metrics efficiently") (description "This library provides tools to calculate various @@ -12456,16 +12437,19 @@ Template Haskell.") (define-public ghc-th-expand-syns (package (name "ghc-th-expand-syns") - (version "0.4.10.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "th-expand-syns" version)) - (sha256 - (base32 - "044h1hv4b0ihpwr9wndj55fa843cbzqp1difgj9wyy3mw925higm")))) + (version "0.4.11.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "th-expand-syns" version)) + (sha256 + (base32 "1l7pkc16vnjgiam31745av14j7ngnr5mqmgp77xwd3h7fg75kkca")))) (build-system haskell-build-system) (properties '((upstream-name . "th-expand-syns"))) (inputs (list ghc-syb ghc-th-abstraction)) + (arguments + `(#:cabal-revision ("4" + "0vjznxgzzvlr39hq0pqvachaihsbp0m2fwrii89rjzhx0mlfy4l7"))) (home-page "https://github.com/DanielSchuessler/th-expand-syns") (synopsis "Expands type synonyms in Template Haskell ASTs") (description @@ -12476,21 +12460,17 @@ Template Haskell.") (define-public ghc-th-lift (package (name "ghc-th-lift") - (version "0.8.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "th-lift" version)) - (sha256 - (base32 - "1r2wrnrn6qwy6ysyfnlqn6xbfckw0b22h8n00pk67bhhg81jfn9s")))) + (version "0.8.3") + (source + (origin + (method url-fetch) + (uri (hackage-uri "th-lift" version)) + (sha256 + (base32 "0xbbii04c60l6v6fnd50lldhpsg1ba03j1ff9bmyzpp7z3sppm95")))) (build-system haskell-build-system) (properties '((upstream-name . "th-lift"))) - (inputs - (list ghc-th-abstraction)) - (arguments - `(#:cabal-revision ("2" - "1s95i774zy3q8yzk18ygdzhzky6wfcr7g55hd2g8h8lc05xzcdgi"))) - (home-page "https://github.com/mboes/th-lift") + (inputs (list ghc-th-abstraction)) + (home-page "https://github.com/RyanGlScott/th-lift") (synopsis "Derive Template Haskell's Lift class for datatypes") (description "This is a Haskell library to derive Template Haskell's Lift class for @@ -12511,7 +12491,7 @@ datatypes.") (properties '((upstream-name . "th-lift-instances"))) (inputs (list ghc-vector ghc-th-lift)) (native-inputs (list ghc-quickcheck)) - (home-page "http://github.com/bennofs/th-lift-instances/") + (home-page "https://github.com/bennofs/th-lift-instances/") (synopsis "Lift instances for template-haskell for common data types") (description "Most data types in the Haskell platform do not have Lift @@ -12534,7 +12514,7 @@ instances. This package provides orphan instances for @code{containers}, (inputs (list ghc-th-compat ghc-th-lift ghc-th-reify-many ghc-generic-deriving ghc-th-lift-instances)) (native-inputs (list ghc-hspec)) - (home-page "http://hackage.haskell.org/package/th-orphans") + (home-page "https://hackage.haskell.org/package/th-orphans") (synopsis "Orphan instances for TH datatypes") (description "This package provides orphan instances for Template Haskell datatypes. In particular, @@ -12753,7 +12733,7 @@ used CPU time of monadic computation with an IO base.") (arguments `(#:cabal-revision ("1" "1ak05p8z1q2nispv1xw32j7lhfmf3sfj2ibjrxpm347s37fmxnwc"))) - (home-page "http://projects.haskell.org/time-ng/") + (home-page "https://projects.haskell.org/time-ng/") (synopsis "Enhanced timezone handling for Time") (description "This package endows @code{Data.Time}, from the time package, with several @@ -12774,7 +12754,7 @@ create timezone series, see the ghc-timezone-olson package.") (build-system haskell-build-system) (properties '((upstream-name . "timezone-olson"))) (inputs (list ghc-timezone-series ghc-extensible-exceptions)) - (home-page "http://projects.haskell.org/time-ng/") + (home-page "https://projects.haskell.org/time-ng/") (synopsis "Parser and renderer for binary Olson timezone files") (description "A parser and renderer for binary Olson timezone files whose format @@ -12819,17 +12799,16 @@ man pages with practical examples.") (define-public ghc-torrent (package (name "ghc-torrent") - (version "10000.1.1") + (version "10000.1.3") (source (origin (method url-fetch) (uri (hackage-uri "torrent" version)) (sha256 - (base32 "0m7s0q7f8c7glxzqhf2j86ch5xhk6jnzwwsa4mkywag22119c290")))) + (base32 "1pp9qfpai7v8vlylw4zfgmnbznwjldqlbl3p6awlhzkpszvqzgny")))) (build-system haskell-build-system) (properties '((upstream-name . "torrent"))) - (inputs - (list ghc-bencode ghc-syb)) + (inputs (list ghc-bencode ghc-syb)) (home-page "https://hackage.haskell.org/package/torrent") (synopsis "BitTorrent file parser and generator") (description "This library provides support for parsing and generating @@ -12911,7 +12890,7 @@ compatibility to run on old versions of the platform.") (build-system haskell-build-system) (properties '((upstream-name . "transformers-compat"))) (inputs (list ghc-generic-deriving)) - (home-page "http://github.com/ekmett/transformers-compat/") + (home-page "https://github.com/ekmett/transformers-compat/") (synopsis "Small compatibility shim between transformers 0.3 and 0.4") (description "This package includes backported versions of types that were @@ -12934,7 +12913,7 @@ but also need those types.") (properties '((upstream-name . "exception-transformers"))) (inputs (list ghc-fail ghc-transformers-compat)) (native-inputs (list ghc-hunit ghc-test-framework ghc-test-framework-hunit)) - (home-page "http://hackage.haskell.org/package/exception-transformers") + (home-page "https://hackage.haskell.org/package/exception-transformers") (synopsis "Type classes and monads for unchecked extensible exceptions") (description "This package provides type classes, a monad and a monad transformer that support @@ -13015,7 +12994,7 @@ compute the difference between arbitrary abstract datatypes (ADTs) using (arguments `(#:cabal-revision ("1" "0a7cfbd04w3zbm234mmpib9mxar46ra5xvb62gcnbmixr7b343j9"))) - (home-page "http://github.com/ekmett/trifecta/") + (home-page "https://github.com/ekmett/trifecta/") (synopsis "Parser combinator library with convenient diagnostics") (description "Trifecta is a modern parser combinator library for Haskell, with slicing and Clang-style colored diagnostics.") @@ -13097,13 +13076,13 @@ similar functionality.") (define-public ghc-typed-process (package (name "ghc-typed-process") - (version "0.2.10.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "typed-process" version)) - (sha256 - (base32 - "17h9jl7gi26v3cxb4jdcksbp755sqqp8w7303q8x8r36rmf8fdp4")))) + (version "0.2.11.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "typed-process" version)) + (sha256 + (base32 "09gnj7m3jcl145fhslwzd30kwwc6hvdmqa4yr4smzn3m0ra5k34l")))) (build-system haskell-build-system) (properties '((upstream-name . "typed-process"))) (inputs (list ghc-async ghc-unliftio-core)) @@ -13156,7 +13135,7 @@ function.") (properties '((upstream-name . "unagi-chan"))) (inputs (list ghc-atomic-primops ghc-primitive)) (arguments (list #:tests? #f)) ; counter is atomic... test: Counter broken: expecting 10000000 got 9999996 - (home-page "http://hackage.haskell.org/package/unagi-chan") + (home-page "https://hackage.haskell.org/package/unagi-chan") (synopsis "Fast concurrent queues with a Chan-like API, and more") (description "This library provides implementations of concurrent FIFO queues (for @@ -13209,17 +13188,17 @@ handled safely, this is what you're left with.") (define-public ghc-unicode-data (package (name "ghc-unicode-data") - (version "0.4.0.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "unicode-data" version)) - (sha256 - (base32 - "1030n3h11hk1rbq0fdbpry3aclz6yz8bki2abjvbwh0rh2kdx99p")))) + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "unicode-data" version)) + (sha256 + (base32 "0q2wygqg0z9b22gzi083cxm73a8iz14zqvdsjmix9i57jxa827xy")))) (build-system haskell-build-system) (properties '((upstream-name . "unicode-data"))) - (native-inputs (list ghc-hspec)) - (home-page "http://github.com/composewell/unicode-data") + (native-inputs (list ghc-hspec hspec-discover)) + (home-page "https://github.com/composewell/unicode-data") (synopsis "Access Unicode Character Database (UCD)") (description "This package provides Haskell APIs to efficiently access the @@ -13245,7 +13224,7 @@ are generated programmatically from the UCD files.") (arguments `(#:cabal-revision ("2" "1imm3svpz2shilj2kmmmcyy5yd4c1mpmz5v1gvjrr98hrab2i9x7"))) - (home-page "http://github.com/composewell/unicode-transforms") + (home-page "https://github.com/composewell/unicode-transforms") (synopsis "Unicode normalization") (description "This library provides tools for fast Unicode 12.1.0 @@ -13313,7 +13292,7 @@ work, but is substantially simpler and faster.") (arguments `(#:cabal-revision ("2" "0mik6xb1jdmb2jlxlmzf0517mxfj0c1j2i4r6h5212m4q6znqqcm"))) - (home-page "http://github.com/jacobstanley/unix-compat") + (home-page "https://github.com/jacobstanley/unix-compat") (synopsis "Portable POSIX-compatibility layer") (description "This package provides portable implementations of parts of the unix @@ -13324,19 +13303,18 @@ isn't available, portable implementations are used.") (define-public ghc-unix-time (package (name "ghc-unix-time") - (version "0.4.8") - (source (origin - (method url-fetch) - (uri (hackage-uri "unix-time" version)) - (sha256 - (base32 - "0hz8mi08kg84hiqnch5ycscgqmjyn1mnl5ih1bsrclyb3fhvdppy")))) + (version "0.4.9") + (source + (origin + (method url-fetch) + (uri (hackage-uri "unix-time" version)) + (sha256 + (base32 "024bmjy16mwdyf4rkyy6l2s63ym5gg04vxdk5ylml1hfhva381s9")))) (build-system haskell-build-system) (properties '((upstream-name . "unix-time"))) (inputs (list ghc-old-time)) - (native-inputs (list ghc-doctest ghc-old-locale ghc-quickcheck ghc-hspec - hspec-discover)) - (home-page "http://hackage.haskell.org/package/unix-time") + (native-inputs (list ghc-old-locale ghc-quickcheck ghc-hspec hspec-discover)) + (home-page "https://hackage.haskell.org/package/unix-time") (synopsis "Unix time parser/formatter and utilities") (description "This library provides fast parsing and formatting utilities for Unix time in Haskell.") @@ -13345,13 +13323,13 @@ for Unix time in Haskell.") (define-public ghc-unliftio (package (name "ghc-unliftio") - (version "0.2.23.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "unliftio" version)) - (sha256 - (base32 - "1zg4ddi4z85550abw9ijycbbjg8ddig7r0vcma8ik03dxzga71id")))) + (version "0.2.25.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "unliftio" version)) + (sha256 + (base32 "0aqiia15p5y0jddk6fsb00das035f8x5cpkzrmc9x3z7j4ia51gv")))) (build-system haskell-build-system) (properties '((upstream-name . "unliftio"))) (inputs (list ghc-async ghc-safe-exceptions ghc-unliftio-core ghc-nats)) @@ -13368,23 +13346,23 @@ working with it.") (define-public ghc-unliftio-core (package (name "ghc-unliftio-core") - (version "0.2.0.1") + (version "0.2.1.0") (source (origin (method url-fetch) (uri (hackage-uri "unliftio-core" version)) (sha256 - (base32 - "16i97jax8rys57l0g0qswfwxh1cl5bgw2lw525rm6bzajw90v7wi")))) + (base32 "1qz3gxcq1x8fjgq6fqsnws5vgkgbjcx332p3hldxdnaninx4qf4r")))) (build-system haskell-build-system) (properties '((upstream-name . "unliftio-core"))) (arguments - `(#:cabal-revision - ("2" "1xx9nmxxg87nhwxgbmmw0xbrppnjc23ppyryar04i3njyg9wvazr"))) + `(#:cabal-revision ("4" + "0ah7x2k1p5d43iwr2xr12z5fk5jdxb9l7jjd73cr0lwbhmpp78pn"))) (home-page "https://github.com/fpco/unliftio/tree/master/unliftio-core#readme") (synopsis "The MonadUnliftIO typeclass for unlifting monads to IO") - (description "This Haskell package provides the core @code{MonadUnliftIO} + (description + "This Haskell package provides the core @code{MonadUnliftIO} typeclass, instances for base and transformers, and basic utility functions.") (license license:expat))) @@ -13444,7 +13422,7 @@ and high speed.") "1bmafx363gfsd9wwrf3xyrw9mnw6anmc1zdfv0p8597y4lxxach7")))) (build-system haskell-build-system) (properties '((upstream-name . "commutative-semigroups"))) - (home-page "http://hackage.haskell.org/package/commutative-semigroups") + (home-page "https://hackage.haskell.org/package/commutative-semigroups") (synopsis "Commutative semigroups") (description "This package provides a commutative semigroup is a semigroup where the order of @@ -13608,18 +13586,21 @@ UTF8 without truncation.") (define-public ghc-utility-ht (package (name "ghc-utility-ht") - (version "0.0.16") - (home-page "https://hackage.haskell.org/package/utility-ht") + (version "0.0.17") (source (origin (method url-fetch) (uri (hackage-uri "utility-ht" version)) (sha256 - (base32 "10dvmfhhhj5w4wz5drhvs6i0yv35kbbcbzhy6ci34r3ppcik5rdw")))) + (base32 "164sy6vdq5vspvfcj59hsmynn97x0wimw4xa5jyzkl4b0vp8lhb2")))) (build-system haskell-build-system) (properties '((upstream-name . "utility-ht"))) - (native-inputs - (list ghc-quickcheck ghc-doctest-exitcode-stdio ghc-doctest-lib)) + (native-inputs (list ghc-quickcheck ghc-doctest-exitcode-stdio + ghc-doctest-lib)) + (arguments + `(#:cabal-revision ("1" + "11i3n06rg580c87br6ic3m75bd83p9incz1nmkkqrawpr7s2fk5f"))) + (home-page "https://hackage.haskell.org/package/utility-ht") (synopsis "Haskell helper functions for Lists, Maybes, Tuples, Functions") (description "This package includes Hakell modules providing various helper functions for Lists, Maybes, Tuples, Functions.") @@ -13959,45 +13940,40 @@ given term should not exist.") (define-public ghc-vty (package - (name "ghc-vty") - (version "5.35.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "vty" version)) - (sha256 - (base32 "062dpz8fxrnggzpl041zpbph0xj56jki98ajm2s78dldg5vy0c9k")))) - (build-system haskell-build-system) - (native-inputs - (list ghc-hunit - ghc-quickcheck - ghc-quickcheck-assertions - ghc-random - ghc-smallcheck - ghc-string-qq - ghc-test-framework - ghc-test-framework-smallcheck - ghc-test-framework-hunit)) - (inputs - (list ghc-ansi-terminal - ghc-blaze-builder - ghc-hashable - ghc-microlens - ghc-microlens-mtl - ghc-microlens-th - ghc-parallel - ghc-utf8-string - ghc-vector)) - (arguments - `(#:cabal-revision ("1" - "1zqcvgqhcij92241g20zn3c3a4033biid3f3cqg05q1ygrmznxb5"))) - (properties '((upstream-name . "vty"))) - (home-page "https://github.com/jtdaugherty/vty") - (synopsis "Simple terminal UI library") - (description - "vty is a terminal GUI library in the niche of ncurses, intended to be easy + (name "ghc-vty") + (version "5.37") + (source + (origin + (method url-fetch) + (uri (hackage-uri "vty" version)) + (sha256 + (base32 "1w6dc25npvlaflxcyzdssnymgi7x03zkwg7swyjw6cjjfdmkgqb7")))) + (build-system haskell-build-system) + (properties '((upstream-name . "vty"))) + (inputs (list ghc-blaze-builder + ghc-microlens + ghc-microlens-mtl + ghc-microlens-th + ghc-hashable + ghc-parallel + ghc-utf8-string + ghc-vector + ghc-ansi-terminal)) + (native-inputs (list ghc-hunit + ghc-quickcheck + ghc-quickcheck-assertions + ghc-random + ghc-smallcheck + ghc-string-qq + ghc-test-framework + ghc-test-framework-hunit + ghc-test-framework-smallcheck)) + (home-page "https://github.com/jtdaugherty/vty") + (synopsis "Simple terminal UI library") + (description + "vty is a terminal GUI library in the niche of ncurses, intended to be easy to use and to provide good support for common terminal types.") - (license license:bsd-3))) + (license license:bsd-3))) (define-public ghc-wave (package @@ -14168,7 +14144,7 @@ modernized interface.") (build-system haskell-build-system) (properties '((upstream-name . "wl-pprint-text"))) (inputs (list ghc-base-compat)) - (home-page "http://hackage.haskell.org/package/wl-pprint-text") + (home-page "https://hackage.haskell.org/package/wl-pprint-text") (synopsis "Wadler/Leijen Pretty Printer for Text values") (description "A clone of wl-pprint for use with the text library.") (license license:bsd-3))) @@ -14274,7 +14250,7 @@ bindings are a direct translation of the C bindings.") `(#:extra-directories ("libx11" "libxft" "xorgproto"))) (inputs (list ghc-x11 ghc-utf8-string libx11 libxft xorgproto)) (native-inputs (list pkg-config)) - (home-page "http://hackage.haskell.org/package/X11-xft") + (home-page "https://hackage.haskell.org/package/X11-xft") (synopsis "Bindings to Xft") (description "Bindings to the Xft, X Free Type interface library, and some Xrender @@ -14320,39 +14296,24 @@ parts.") (define-public ghc-xml-conduit (package (name "ghc-xml-conduit") - (version "1.9.1.1") + (version "1.9.1.2") (source (origin (method url-fetch) (uri (hackage-uri "xml-conduit" version)) (sha256 - (base32 - "1zzh7xnmbm68dab1vqsjkr6ghxqgnla5nik4amrwlmhbdih1gcdx")))) + (base32 "1pa8arh2s7ql61pap9599j9ll94rb4j70c11vpgqymm01gx4d6wm")))) (build-system haskell-build-system) (properties '((upstream-name . "xml-conduit"))) - (inputs - (list ghc-conduit - ghc-conduit-extra - ghc-resourcet - ghc-xml-types - ghc-attoparsec - ghc-data-default-class - ghc-blaze-markup - ghc-blaze-html)) - (native-inputs (list ghc-hspec ghc-hunit ghc-doctest hspec-discover)) - (arguments - `(#:cabal-revision ("2" - "0m6sknp9xxz8a3dhvyfpyjvxp8ph511w19j4vj1qsd6hl2pazjy6") - #:tests? #f ; Depend on non-existent doctest API. - #:phases - (modify-phases %standard-phases - ;; Tries to use non-existent doctest API. - (add-after 'unpack 'disable-doctest - (lambda _ - (with-output-to-file "Setup.hs" - (lambda _ - (display - "import Distribution.Simple\nmain = defaultMain\n")))))))) + (inputs (list ghc-conduit + ghc-conduit-extra + ghc-resourcet + ghc-xml-types + ghc-attoparsec + ghc-data-default-class + ghc-blaze-markup + ghc-blaze-html)) + (native-inputs (list ghc-hspec ghc-hunit ghc-doctest ghc-cabal-doctest)) (home-page "https://github.com/snoyberg/xml") (synopsis "Utilities for dealing with XML with the conduit package") (description @@ -14403,13 +14364,13 @@ code via quasi-quoting built on top of @code{ghc-shakespeare}.") (define-public ghc-yaml (package (name "ghc-yaml") - (version "0.11.8.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "yaml" version)) - (sha256 - (base32 - "1s0arllihjjqp65jbc8c1w5106i2infppsirvbsifpmpkf14w6pn")))) + (version "0.11.11.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "yaml" version)) + (sha256 + (base32 "0j7xa3bgznaj35x3x184c0dy6hjflxkdwp3iprfnhmz2ds2dr790")))) (build-system haskell-build-system) (properties '((upstream-name . "yaml"))) (inputs (list ghc-aeson @@ -14429,8 +14390,8 @@ code via quasi-quoting built on top of @code{ghc-shakespeare}.") ghc-temporary hspec-discover)) (arguments - `(#:cabal-revision ("2" - "1dix5jm3d380vjr9l6wqz54zk883kilk8rijlvjp6b13mjxwcj1l"))) + `(#:cabal-revision ("1" + "1pqiq7x2ccjjx4ibf6l1fgvc673k2ny9cwh9061mf9pn5qhg51n5"))) (home-page "https://github.com/snoyberg/yaml#readme") (synopsis "Parsing and rendering YAML documents") (description @@ -14440,13 +14401,13 @@ code via quasi-quoting built on top of @code{ghc-shakespeare}.") (define-public ghc-zip-archive (package (name "ghc-zip-archive") - (version "0.4.2.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "zip-archive" version)) - (sha256 - (base32 - "02b76hm76gqallij70z77xz1y981ig4biklzm0wgxran8d06n0d4")))) + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (hackage-uri "zip-archive" version)) + (sha256 + (base32 "01ax0idyvggizbdbg38nynmm5dk53apsjbj2xaq8v11ry6h0y1b8")))) (build-system haskell-build-system) (properties '((upstream-name . "zip-archive"))) (inputs (list ghc-zlib ghc-digest)) @@ -14461,7 +14422,7 @@ code via quasi-quoting built on top of @code{ghc-shakespeare}.") (path (getenv "PATH"))) (setenv "PATH" (string-append unzip "/bin:" which "/bin:" path)) #t)))))) - (home-page "http://github.com/jgm/zip-archive") + (home-page "https://github.com/jgm/zip-archive") (synopsis "Zip archive library for Haskell") (description "The zip-archive library provides functions for creating, @@ -14484,7 +14445,7 @@ modifying, and extracting files from zip archives in Haskell.") `(#:extra-directories ("zlib"))) (inputs (list zlib)) (native-inputs (list ghc-quickcheck ghc-tasty ghc-tasty-quickcheck)) - (home-page "http://hackage.haskell.org/package/zlib") + (home-page "https://hackage.haskell.org/package/zlib") (synopsis "Compression and decompression in the gzip and zlib formats") (description "This package provides a pure interface for compressing and decompressing @@ -14548,20 +14509,17 @@ compression ratios.") (define-public ghc-indexed-traversable (package (name "ghc-indexed-traversable") - (version "0.1.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "indexed-traversable" version)) - (sha256 - (base32 - "13b91rkhs6wcshaz3dwx6x3xjpw5z5bm2riwp78zxccqf7p5hs2i")))) + (version "0.1.2.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "indexed-traversable" version)) + (sha256 + (base32 "1926yzk0gc2vd6p12addj70fnh57504xl29yzvbcgssx5084r1gy")))) (build-system haskell-build-system) (properties '((upstream-name . "indexed-traversable"))) (inputs (list ghc-generic-deriving)) - (arguments - `(#:cabal-revision ("2" - "0l2k9jrmixkkf7qzzq0bqgvk6axaqi9sxxkpb4dgj8frmc4bg8aj"))) - (home-page "http://hackage.haskell.org/package/indexed-traversable") + (home-page "https://hackage.haskell.org/package/indexed-traversable") (synopsis "Indexed Functor, Foldable, and Traversable typeclasses") (description "This Haskell package provides three useful generalizations: @@ -14663,7 +14621,7 @@ on selective functors} for more details.") (arguments `(#:cabal-revision ("2" "1sb7ii9mhx77rhviqbmdc5r6wlimkmadxi1pyk7k3imdqcdzgjlp"))) - (home-page "http://github.com/ekmett/keys/") + (home-page "https://github.com/ekmett/keys/") (synopsis "Keyed functors and containers") (description "This package provides a bunch of ad hoc classes for accessing parts of @@ -14693,7 +14651,7 @@ dependencies.") ghc-transformers-compat ghc-hashable ghc-unordered-containers)) - (home-page "http://github.com/ekmett/pointed/") + (home-page "https://github.com/ekmett/pointed/") (synopsis "Pointed and copointed data types") (description "This Haskell library provides pointed and copointed data types.") @@ -14702,23 +14660,21 @@ dependencies.") (define-public ghc-vector-instances (package (name "ghc-vector-instances") - (version "3.4") + (version "3.4.2") (source (origin (method url-fetch) (uri (hackage-uri "vector-instances" version)) (sha256 - (base32 "10akvpa5w9bp0d8hflab63r9laa9gy2hv167smhjsdzq1kplc0hv")))) + (base32 "0rynfy4agx66mwslj50bfqdyrylr2zba3r6dg5yqykpnfxp2vn9l")))) (build-system haskell-build-system) (properties '((upstream-name . "vector-instances"))) - (inputs - (list ghc-vector - ghc-semigroupoids - ghc-semigroups - ghc-comonad - ghc-pointed - ghc-keys - ghc-hashable)) + (inputs (list ghc-vector + ghc-semigroupoids + ghc-comonad + ghc-pointed + ghc-keys + ghc-hashable)) (home-page "https://github.com/ekmett/vector-instances") (synopsis "Orphan instances for @code{Data.Vector}") (description @@ -14834,13 +14790,13 @@ it.") (define-public ghc-unicode-collation (package (name "ghc-unicode-collation") - (version "0.1.3.3") - (source (origin - (method url-fetch) - (uri (hackage-uri "unicode-collation" version)) - (sha256 - (base32 - "0imcdsk0qqwj31zwgpick4s2nbxlyxwa64lq6r212jd0y0hrrvvl")))) + (version "0.1.3.4") + (source + (origin + (method url-fetch) + (uri (hackage-uri "unicode-collation" version)) + (sha256 + (base32 "0afllqpds1ak3gailsn18r7pjdp1mqycdpwwcfifvmk9nadvx3dh")))) (build-system haskell-build-system) (properties '((upstream-name . "unicode-collation"))) (inputs (list ghc-th-lift-instances)) @@ -14859,13 +14815,13 @@ provided.") (define-public ghc-citeproc (package (name "ghc-citeproc") - (version "0.8.0.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "citeproc" version)) - (sha256 - (base32 - "1rja6vdggmh7d40gsg2xfs9md6m1zbfddpsd27a15qyqb3530jzw")))) + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "citeproc" version)) + (sha256 + (base32 "003488k6ckfknh62lkxy07w72h95jcdx20kfc1njrxrqijyknlik")))) (build-system haskell-build-system) (properties '((upstream-name . "citeproc"))) (inputs (list ghc-safe @@ -14883,7 +14839,7 @@ provided.") ghc-base-compat ghc-aeson-pretty)) (native-inputs (list ghc-timeit ghc-diff)) - (home-page "http://hackage.haskell.org/package/citeproc") + (home-page "https://hackage.haskell.org/package/citeproc") (synopsis "Generate citations and bibliography from CSL styles") (description "@code{ghc-citeproc} parses @acronym{Citation Style Language, CSL} style files @@ -14927,13 +14883,13 @@ varies linearly with input length.") (define-public ghc-commonmark-extensions (package (name "ghc-commonmark-extensions") - (version "0.2.3.3") - (source (origin - (method url-fetch) - (uri (hackage-uri "commonmark-extensions" version)) - (sha256 - (base32 - "009yrsb2xxna73q6nnijfx5ngffaz369mildvqvn91qbrkrzq7pl")))) + (version "0.2.3.4") + (source + (origin + (method url-fetch) + (uri (hackage-uri "commonmark-extensions" version)) + (sha256 + (base32 "0pk6ckpb01pr9i2xyx2bm1sbkzbxy5vfy8l67pca1y0i0glyz150")))) (build-system haskell-build-system) (properties '((upstream-name . "commonmark-extensions"))) (inputs (list ghc-network-uri ghc-commonmark ghc-emojis)) @@ -14949,13 +14905,13 @@ footnotes, math, and more.") (define-public ghc-commonmark-pandoc (package (name "ghc-commonmark-pandoc") - (version "0.2.1.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "commonmark-pandoc" version)) - (sha256 - (base32 - "1dpi8zvjshab96w56qfqcys9h09f46lld8sc9q4xzb0y1p6lwmap")))) + (version "0.2.1.3") + (source + (origin + (method url-fetch) + (uri (hackage-uri "commonmark-pandoc" version)) + (sha256 + (base32 "08bzi6q3jma7xy1ygbpj8li06zwsykmmgl01i4qmp6i9fj8czbbp")))) (build-system haskell-build-system) (properties '((upstream-name . "commonmark-pandoc"))) (inputs (list ghc-commonmark ghc-commonmark-extensions ghc-pandoc-types)) @@ -15044,21 +15000,25 @@ information.") (define-public ghc-binary-orphans (package (name "ghc-binary-orphans") - (version "1.0.3") - (source (origin - (method url-fetch) - (uri (hackage-uri "binary-orphans" version)) - (sha256 - (base32 - "0b302hhjaybwbnpzrd8qmdp24g2xj2svib34zfxqqxg67j159rg2")))) + (version "1.0.4.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "binary-orphans" version)) + (sha256 + (base32 "1lphlb7nar3d9db87wl0sh6srx03dad2ssxqak8bn9bdr2dphnsz")))) (build-system haskell-build-system) (properties '((upstream-name . "binary-orphans"))) + (inputs (list ghc-data-array-byte)) (native-inputs (list ghc-onetuple ghc-quickcheck ghc-quickcheck-instances ghc-tagged ghc-tasty ghc-tasty-quickcheck)) + (arguments + `(#:cabal-revision ("3" + "085flwx82nvvyb479jma9j62q8i9sbz65rarsqhasgz4vczxqawx"))) (home-page "https://hackage.haskell.org/package/binary-orphans") (synopsis "Compatibility package for binary") (description "This package provides instances defined in later versions of @@ -15091,17 +15051,17 @@ of Netlink families.") (define-public ghc-doctest-driver-gen (package (name "ghc-doctest-driver-gen") - (version "0.3.0.6") - (source (origin - (method url-fetch) - (uri (hackage-uri "doctest-driver-gen" version)) - (sha256 - (base32 - "0a4jdg4mzhdgfal7jp60yrlv63iv7d8f7nxc9aqvrl93mairny8l")))) + (version "0.3.0.7") + (source + (origin + (method url-fetch) + (uri (hackage-uri "doctest-driver-gen" version)) + (sha256 + (base32 "0xxfp1x92qi8p5xkhyymylm8m3s56c7ivc82mv13sw14msds8miq")))) (build-system haskell-build-system) (properties '((upstream-name . "doctest-driver-gen"))) (native-inputs (list ghc-doctest)) - (arguments (list #:tests? #f)) ;; XXX: doctest-driver-gen: error while loading shared libraries: libHSdoctest-driver-gen-0.3.0.6-3WJHXaMfGwJFKjjgcmC868-ghc9.2.5.so: cannot open shared object file: No such file or directory + (arguments (list #:tests? #f)) ; Test executable fails to run. (home-page "https://github.com/Hexirp/doctest-driver-gen#readme") (synopsis "Generate driver file for Doctest's Cabal integration") (description @@ -15112,13 +15072,13 @@ lets you automatically generate driver file for Doctest's Cabal integration.") (define-public ghc-template-haskell-compat-v0208 (package (name "ghc-template-haskell-compat-v0208") - (version "0.1.9.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "template-haskell-compat-v0208" version)) - (sha256 - (base32 - "1z87rla4vcbghdrvjkay59b686f0by02102vwrcayn4vbwzn4am1")))) + (version "0.1.9.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "template-haskell-compat-v0208" version)) + (sha256 + (base32 "1sfp8bzkxqbk7cjc70sz51mm2mcq9lz6cqk9pch8g3qgcscf02f0")))) (build-system haskell-build-system) (properties '((upstream-name . "template-haskell-compat-v0208"))) (home-page @@ -15162,21 +15122,19 @@ built.") (define-public ghc-blaze-textual (package (name "ghc-blaze-textual") - (version "0.2.2.1") + (version "0.2.3.1") (source (origin (method url-fetch) (uri (hackage-uri "blaze-textual" version)) (sha256 - (base32 "0zjnwnjpcpnnm0815h9ngr3a3iy0szsnb3nrcavkbx4905s9k4bs")))) + (base32 "1chpaynfqiykqdk4jrmwxczj01wph8qfb411600l0gj3g34wlanx")))) (build-system haskell-build-system) (properties '((upstream-name . "blaze-textual"))) - (inputs - (list ghc-blaze-builder ghc-old-locale ghc-vector)) - (native-inputs - (list ghc-quickcheck ghc-double-conversion ghc-test-framework - ghc-test-framework-quickcheck2)) - (home-page "https://github.com/bos/blaze-textual") + (inputs (list ghc-blaze-builder ghc-old-locale ghc-vector)) + (native-inputs (list ghc-quickcheck ghc-double-conversion + ghc-test-framework ghc-test-framework-quickcheck2)) + (home-page "https://github.com/swamp-agr/blaze-textual") (synopsis "Fast rendering of common datatypes") (description "@code{ghc-blaze-textual} is a fast Haskell library for rendering common @@ -15244,13 +15202,13 @@ Language} for @code{ghc-persistent}.") (define-public ghc-persistent-mysql (package (name "ghc-persistent-mysql") - (version "2.13.1.3") - (source (origin - (method url-fetch) - (uri (hackage-uri "persistent-mysql" version)) - (sha256 - (base32 - "0fm6agqwawwraw6l6kxm8lq40pm5pnjg093f574a7sdf648q21yc")))) + (version "2.13.1.4") + (source + (origin + (method url-fetch) + (uri (hackage-uri "persistent-mysql" version)) + (sha256 + (base32 "10i8x5byqjqgqmjwfjj56dgjhnkv7wf4bg1pad9dd1ld3crlaf8d")))) (build-system haskell-build-system) (properties '((upstream-name . "persistent-mysql"))) (inputs (list ghc-persistent @@ -15262,8 +15220,7 @@ Language} for @code{ghc-persistent}.") ghc-mysql-simple ghc-resourcet ghc-resource-pool - ghc-unliftio-core - openssl)) + ghc-unliftio-core)) (native-inputs (list ghc-fast-logger ghc-hspec ghc-http-api-data @@ -15273,7 +15230,7 @@ Language} for @code{ghc-persistent}.") ghc-persistent-test ghc-quickcheck ghc-quickcheck-instances)) - (arguments (list #:tests? #f)) ; Fails to connect to server. + (arguments (list #:tests? #f)) ; Tests fail to build. (home-page "http://www.yesodweb.com/book/persistent") (synopsis "Backend for the @code{ghc-persistent} library using MySQL database server") @@ -15331,19 +15288,19 @@ string types into values of other string types.") (define-public ghc-postgresql-libpq (package (name "ghc-postgresql-libpq") - (version "0.9.4.3") + (version "0.9.5.0") (source (origin (method url-fetch) (uri (hackage-uri "postgresql-libpq" version)) (sha256 - (base32 "1gfnhc5pibn7zmifdf2g0c112xrpzsk756ln2kjzqljkspf4dqp3")))) + (base32 "0w2l687r9z92snvd0cjyv3dxghgr5alyw0vc2c6bp2600pc2nnfi")))) (build-system haskell-build-system) (properties '((upstream-name . "postgresql-libpq"))) + (native-inputs (list postgresql)) (arguments - `(#:cabal-revision ("3" - "02cj493a2qxl5hddiq0579079s398hdqqy164pig6d61nl7q66cs"))) - (inputs (list postgresql)) + `(#:cabal-revision ("1" + "02g69cm1nqvvakyjs7ps2q9nkl4vpcdcxl41s7hzpy3vjhyar036"))) (home-page "https://github.com/haskellari/postgresql-libpq") (synopsis "Low-level bindings to @code{libpq}") (description @@ -15400,13 +15357,13 @@ server and to receive the results of these queries.") (define-public ghc-persistent-postgresql (package (name "ghc-persistent-postgresql") - (version "2.13.5.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "persistent-postgresql" version)) - (sha256 - (base32 - "1q9hy49nfrb3azgz5rjz235d7scy27l5axkih7crskaa04hf4k8d")))) + (version "2.13.5.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "persistent-postgresql" version)) + (sha256 + (base32 "0p8hikvynl6yfdv030pk6vpczpw52ys8m4vba1qb9h2w1vkr4a3i")))) (build-system haskell-build-system) (properties '((upstream-name . "persistent-postgresql"))) (inputs (list ghc-persistent @@ -15436,7 +15393,10 @@ server and to receive the results of these queries.") ghc-http-api-data ghc-unordered-containers ghc-vector)) - (arguments (list #:tests? #f)) ; Fails to connect to server. + (arguments + `(#:cabal-revision ("1" + "1qbd3s0nyii6s69jvn8bw9hmxrqs41wimy9jn6j359w4rl1xslqc") + #:tests? #f)) ; Tests fail to build. (home-page "http://www.yesodweb.com/book/persistent") (synopsis "Backend for the @code{ghc-persistent library} using Postgresql") (description @@ -15467,18 +15427,17 @@ using the @code{ghc-postgresql-simple} package.") (define-public ghc-filelock (package (name "ghc-filelock") - (version "0.1.1.5") + (version "0.1.1.6") (source (origin (method url-fetch) (uri (hackage-uri "filelock" version)) (sha256 - (base32 "06a44i7a956d7xkk2na4090xj2a7b7a228pk4spmccs4x20ymssh")))) + (base32 "122v6nv13rgi7nprdcpz8zc534i85yz6lshx0jx5mfqjam4zcx5g")))) (build-system haskell-build-system) (properties '((upstream-name . "filelock"))) - (native-inputs - (list ghc-async ghc-async)) - (home-page "https://github.com/takano-akio/filelock") + (native-inputs (list ghc-async)) + (home-page "https://github.com/haskell-pkg-janitors/filelock") (synopsis "Portable interface to file locking") (description "This package provides an interface to file locking functionalities.") @@ -15501,7 +15460,7 @@ using the @code{ghc-postgresql-simple} package.") (arguments `(#:cabal-revision ("5" "06v8vkn58d67yx4v59rhvxpc0sjrpi6k8krvjrvbyl0fn0v0jd14"))) - (home-page "http://hackage.haskell.org/package/HsYAML-aeson") + (home-page "https://hackage.haskell.org/package/HsYAML-aeson") (synopsis "JSON to YAML adapter") (description "The @uref{https://yaml.org/spec/1.2/spec.html, YAML 1.2} format provides @@ -15654,18 +15613,18 @@ pages.") (define-public ghc-breakpoint (package (name "ghc-breakpoint") - (version "0.1.2.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "breakpoint" version)) - (sha256 - (base32 - "1hk9mjijxvqjzcfqllzi53rmxiyggbxash05jbb742wrq832h2xw")))) + (version "0.1.2.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "breakpoint" version)) + (sha256 + (base32 "1bj3bccmrk5c7zxb29rwzz39l0ph6qk0crw1vdhhsrcybmdc96h5")))) (build-system haskell-build-system) (properties '((upstream-name . "breakpoint"))) (inputs (list ghc-pretty-simple ghc-ansi-terminal)) (native-inputs (list ghc-tasty ghc-tasty-hunit)) - (home-page "http://hackage.haskell.org/package/breakpoint") + (home-page "https://hackage.haskell.org/package/breakpoint") (synopsis "Set breakpoints using a GHC plugin") (description "This package provides a plugin that allows you to set breakpoints for debugging @@ -15715,7 +15674,7 @@ purposes. See the (properties '((upstream-name . "git-lfs"))) (inputs (list ghc-http-client ghc-http-types ghc-aeson ghc-network-uri ghc-case-insensitive)) - (home-page "http://hackage.haskell.org/package/git-lfs") + (home-page "https://hackage.haskell.org/package/git-lfs") (synopsis "git-lfs protocol") (description "An implementation of the git-lfs protocol.") (license license:agpl3))) @@ -15735,7 +15694,7 @@ purposes. See the (inputs (list ghc-vector)) ;(native-inputs (list ghc-hedgehog ghc-random ghc-tasty ghc-tasty-hedgehog)) (arguments (list #:tests? #f)) ; Fail to compile. - (home-page "http://hackage.haskell.org/package/nothunks") + (home-page "https://hackage.haskell.org/package/nothunks") (synopsis "Examine values for unexpected thunks") (description "Long lived application data typically should not contain any thunks. This @@ -15797,7 +15756,7 @@ comfortably.") (arguments `(#:cabal-revision ("3" "0g4siv8s6dlrdsivap2qy6ig08y5bjbs93jk192zmgkp8iscncpw"))) - (home-page "http://hackage.haskell.org/package/OneTuple") + (home-page "https://hackage.haskell.org/package/OneTuple") (synopsis "Singleton Tuple") (description "This package is a compatibility package for a singleton data type . > data Solo @@ -15808,21 +15767,24 @@ a = Solo a . Note: it's not a @@newtype@@ . @@Solo@@ is available in (define-public ghc-indexed-traversable-instances (package (name "ghc-indexed-traversable-instances") - (version "0.1.1.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "indexed-traversable-instances" version)) - (sha256 - (base32 - "1c60vhf47y8ln33scyvwiffg24dvhm4aavya624vbqjr7l3fapl9")))) + (version "0.1.1.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "indexed-traversable-instances" version)) + (sha256 + (base32 "0jippsyqg8ss61z5vc6vfjmlrirwc69kr4azs5s9z0fcbj4lx6qg")))) (build-system haskell-build-system) (properties '((upstream-name . "indexed-traversable-instances"))) (inputs (list ghc-indexed-traversable ghc-onetuple ghc-tagged ghc-unordered-containers ghc-vector)) (native-inputs (list ghc-quickcheck ghc-quickcheck-instances ghc-tasty ghc-tasty-quickcheck)) + (arguments + `(#:cabal-revision ("2" + "0yrww1y9zrnqwymik9kkdqkx81n3jhr0kq27lpvy1gp297hy7m80"))) (home-page - "http://hackage.haskell.org/package/indexed-traversable-instances") + "https://hackage.haskell.org/package/indexed-traversable-instances") (synopsis "More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex") (description @@ -15927,29 +15889,21 @@ Documentation is at (define-public ghc-pcg-random (package (name "ghc-pcg-random") - (version "0.1.3.7") - (source (origin - (method url-fetch) - (uri (hackage-uri "pcg-random" version)) - (sha256 - (base32 - "1l6jq5nvmg1ygk7i7g50s47p6qkh74p9avl1wbcxdl5m85lc5j76")))) + (version "0.1.4.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "pcg-random" version)) + (sha256 + (base32 "09hnckb3xzb3spn79jvqlsbg05zm9r1l3dqq44ka07ik4zbagjbf")))) (build-system haskell-build-system) (properties '((upstream-name . "pcg-random"))) (inputs (list ghc-primitive ghc-random ghc-entropy)) - (native-inputs (list ghc-doctest)) + (native-inputs (list ghc-doctest ghc-cabal-doctest)) (arguments - `(#:tests? #f ; Could not find module ‘Build_doctests’ - #:phases - (modify-phases %standard-phases - ;; Tries to use non-existent doctest API. - (add-after 'unpack 'disable-doctest - (lambda _ - (with-output-to-file "Setup.hs" - (lambda _ - (display - "import Distribution.Simple\nmain = defaultMain\n")))))))) - (home-page "http://github.com/cchalmers/pcg-random") + `(#:cabal-revision ("1" + "1f8h0lv34cmqaxccg2yf6q4s8r5g2s8q8s9kql212iggd2l3vv77"))) + (home-page "https://github.com/cchalmers/pcg-random") (synopsis "Haskell bindings to the PCG random number generator.") (description "PCG is a family of simple fast space-efficient statistically good algorithms for @@ -16040,7 +15994,7 @@ benchmarks](https://hackage.haskell.org/package/random-bytestring-0.1.3.2/src/be "18w1dasny6xffbjlvmz9861l2xbkqlg2w5qxz9kw6frgfl2rg11n")))) (build-system haskell-build-system) (properties '((upstream-name . "ordered-containers"))) - (home-page "http://hackage.haskell.org/package/ordered-containers") + (home-page "https://hackage.haskell.org/package/ordered-containers") (synopsis "Set- and Map-like types that remember the order elements were inserted") (description "") @@ -16124,13 +16078,13 @@ embeddable scripting language <https://lua.org Lua>.") (define-public ghc-lua-arbitrary (package (name "ghc-lua-arbitrary") - (version "1.0.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "lua-arbitrary" version)) - (sha256 - (base32 - "01g2pkvy7yhcrk8p1d9xzmqv279ldgy9z5aa6xj5msbxrpxvbpma")))) + (version "1.0.1.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "lua-arbitrary" version)) + (sha256 + (base32 "0kbvcgi54ycl8zfdkc80ap5yhz0dml9bjdgmzx9l9m4rkhyi9xnm")))) (build-system haskell-build-system) (properties '((upstream-name . "lua-arbitrary"))) (inputs (list ghc-lua ghc-quickcheck)) @@ -16247,13 +16201,13 @@ as a way to specfiy column alignments.") (define-public ghc-lpeg (package (name "ghc-lpeg") - (version "1.0.3") - (source (origin - (method url-fetch) - (uri (hackage-uri "lpeg" version)) - (sha256 - (base32 - "19vvsvdw8l2zjwdcypnzw12vc9ycix92mkd6g3f6kx1i364z9hg1")))) + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (hackage-uri "lpeg" version)) + (sha256 + (base32 "1fsl43m4p1h40npwd51qn2vafzjwyvs5yb5159l37w95l8hlf214")))) (build-system haskell-build-system) (properties '((upstream-name . "lpeg"))) (inputs (list ghc-lua)) @@ -16305,7 +16259,7 @@ Lua tables, but are augmented with convenience functions.") (properties '((upstream-name . "should-not-typecheck"))) (inputs (list ghc-hunit)) (native-inputs (list ghc-hspec ghc-hspec-expectations)) - (home-page "http://github.com/CRogers/should-not-typecheck") + (home-page "https://github.com/CRogers/should-not-typecheck") (synopsis "A HUnit/hspec assertion library to verify that an expression does not typecheck") (description @@ -16482,19 +16436,19 @@ CHANGELOG>") (define-public ghc-boring (package (name "ghc-boring") - (version "0.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "boring" version)) - (sha256 - (base32 - "0d2cm9ra69cvaxs5x3lr2rfv7xx6xrbpb3dbcpyd8m77cqxm7b0b")))) + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "boring" version)) + (sha256 + (base32 "0m1imbkvwfjz7cz7ibksiz63fyfmaq42f6x059sch2nmz7qdvzxi")))) (build-system haskell-build-system) (properties '((upstream-name . "boring"))) (inputs (list ghc-tagged)) (arguments - `(#:cabal-revision ("2" - "04pn94i3mysi7px93k86sf29vw99sf38sl4n0gy2nma0iqsik828"))) + `(#:cabal-revision ("1" + "0jrfhidd91k0bkb98qm8nvv9wizqa906mgr8qjkhxc4d7vcnc9cy"))) (home-page "https://github.com/phadej/boring") (synopsis "Boring and Absurd types") (description @@ -16631,7 +16585,7 @@ scripting language <https://lua.org Lua>.") (properties '((upstream-name . "recv"))) (inputs (list ghc-network)) (native-inputs (list ghc-hspec hspec-discover)) - (home-page "http://github.com/yesodweb/wai") + (home-page "https://github.com/yesodweb/wai") (synopsis "Efficient netowrk recv") (description "Network recv based on buffer pools") (license license:bsd-3))) @@ -16639,18 +16593,21 @@ scripting language <https://lua.org Lua>.") (define-public ghc-glib (package (name "ghc-glib") - (version "0.13.8.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "glib" version)) - (sha256 - (base32 - "09qamkxkpx2paazbh8x225wvwgzgpp0g0a3s708n96q76b4bvd46")))) + (version "0.13.10.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "glib" version)) + (sha256 + (base32 "149y33ddv8vkvak0042ismiwh6lgc706n3n3bvnmrgw67fmi57m1")))) (build-system haskell-build-system) (properties '((upstream-name . "glib"))) (inputs (list ghc-utf8-string glib)) (native-inputs (list ghc-gtk2hs-buildtools pkg-config)) - (home-page "https://github.com/gtk2hs/gtk2hs") + (arguments + `(#:cabal-revision ("2" + "19zg675zvyi87415yyfyl1s7i65rz8hx8hw4scxwalcq50axj99s"))) + (home-page "https://projects.haskell.org/gtk2hs/") (synopsis "GLib bindings for for Gtk2Hs") (description "GLib is a collection of C data structures and utility functions for the GObject @@ -16662,18 +16619,21 @@ support the packages that wrap libraries that are themselves based on GLib.") (define-public ghc-pango (package (name "ghc-pango") - (version "0.13.8.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "pango" version)) - (sha256 - (base32 - "1mndcb904vlkqpbmj5np9lxqw2qw3pzawvrgbsbxa9xjayh0ylw5")))) + (version "0.13.10.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "pango" version)) + (sha256 + (base32 "0qdk18vj07qivyyd0limjprni77q2xvydx748lsxsrw2ws8hb1ax")))) (build-system haskell-build-system) (properties '((upstream-name . "pango"))) (inputs (list ghc-glib ghc-cairo pango)) (native-inputs (list ghc-gtk2hs-buildtools pkg-config)) - (home-page "https://hackage.haskell.org/package/pango") + (arguments + `(#:cabal-revision ("2" + "064bpj5mmxc31snkfysb9c52v1695kxyqbj617m933mgjrw13q91"))) + (home-page "https://projects.haskell.org/gtk2hs/") (synopsis "Haskell bindings to the Pango text rendering engine") (description "This package provides a wrapper around the Pango C library that allows @@ -16685,13 +16645,13 @@ on-screen.") (define-public ghc-monoidal-containers (package (name "ghc-monoidal-containers") - (version "0.6.3.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "monoidal-containers" version)) - (sha256 - (base32 - "0m41z50r3jvr8vvfry99kamb2h3knm0g7bqfwspchmhwsgqqczh4")))) + (version "0.6.4.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "monoidal-containers" version)) + (sha256 + (base32 "09sg4gsrvgnsy12819sps2l0j97baanbsq2w1pvypnrkanzrw083")))) (build-system haskell-build-system) (properties '((upstream-name . "monoidal-containers"))) (inputs (list ghc-aeson @@ -16702,7 +16662,10 @@ on-screen.") ghc-witherable ghc-semialign ghc-these)) - (home-page "http://github.com/bgamari/monoidal-containers") + (arguments + `(#:cabal-revision ("3" + "0ip71g8nd07vinwlynhbq0iaxmzzwjz9gx15k1d9p7llv961rc74"))) + (home-page "https://github.com/bgamari/monoidal-containers") (synopsis "Containers with monoidal accumulation") (description "Containers with merging via monoidal accumulation. The Monoid instances @@ -16728,7 +16691,7 @@ type's mappend'.") (arguments `(#:cabal-revision ("3" "0yll88ydchd2gqcvdk28fchf2vygpd42ky2bigg4ga08jan2nacx"))) - (home-page "http://hackage.haskell.org/package/newtype") + (home-page "https://hackage.haskell.org/package/newtype") (synopsis "Typeclass and set of functions for working with newtypes") (description "Per Conor McBride, the Newtype typeclass represents the packing and unpacking of @@ -16837,7 +16800,7 @@ such as ala'.") (build-system haskell-build-system) (properties '((upstream-name . "random-shuffle"))) (inputs (list ghc-random ghc-monadrandom)) - (home-page "http://hackage.haskell.org/package/random-shuffle") + (home-page "https://hackage.haskell.org/package/random-shuffle") (synopsis "Random shuffle implementation") (description "Random shuffle implementation, on immutable lists. Based on @@ -16848,20 +16811,20 @@ implementation by Oleg Kiselyov}.") (define-public ghc-deriving-aeson (package (name "ghc-deriving-aeson") - (version "0.2.8") - (source (origin - (method url-fetch) - (uri (hackage-uri "deriving-aeson" version)) - (sha256 - (base32 - "0f59ar4cax7g0h6wrk8ckni7i4gw5wls5ybzbrji2a0qpd7q5lrd")))) + (version "0.2.9") + (source + (origin + (method url-fetch) + (uri (hackage-uri "deriving-aeson" version)) + (sha256 + (base32 "0cqq4ri9dgqkdh9wybf3wf5zxb9nihql591bk1lacnzdyxfrgcn0")))) (build-system haskell-build-system) (properties '((upstream-name . "deriving-aeson"))) (inputs (list ghc-aeson)) (arguments `(#:cabal-revision ("1" - "0pwx7lmdhpipg9ksqkz6xpjzh1aw2hip8y3jsk20ndl4wdzvxak5"))) - (home-page "http://hackage.haskell.org/package/deriving-aeson") + "14iqkk7vs0lb0sgq159z0xw95pa87r60i1f4m17gfh2gbbddcywm"))) + (home-page "https://hackage.haskell.org/package/deriving-aeson") (synopsis "Type driven generic aeson instance customisation") (description "This package provides a newtype wrapper with FromJSON/ToJSON instances @@ -16979,7 +16942,7 @@ provided from returning something else.") "0isilgcbw12zyh8s2liaj5r9r5m3yg1xskyhag6f36qi60y29hx5")))) (build-system haskell-build-system) (properties '((upstream-name . "ref-tf"))) - (home-page "http://hackage.haskell.org/package/ref-tf") + (home-page "https://hackage.haskell.org/package/ref-tf") (synopsis "Type class for monads with references using type families") (description "This package contains a @code{MonadRef} type class that abstracts over @@ -16987,6 +16950,33 @@ the details of manipulating references, allowing one to write code that can operate in either the @code{ST} monad or the @code{IO} monad.") (license license:bsd-3))) +(define-public ghc-data-array-byte + (package + (name "ghc-data-array-byte") + (version "0.1.0.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "data-array-byte" version)) + (sha256 + (base32 "002n0af7q08q3fmgsc5b47s1clirxy0lrqglwxzhabg0nfhfrdhv")))) + (build-system haskell-build-system) + (properties '((upstream-name . "data-array-byte"))) + ;(native-inputs (list ghc-quickcheck-classes-base ghc-tasty + ; ghc-tasty-quickcheck)) + (arguments + `(#:tests? #f ; Avoid dependency cycle. + #:cabal-revision ("3" + "136rjhg0m49d2l8z7kp46hc8q7bkipvkwnn40nv8kqkpvrgrg8d4"))) + (home-page "https://github.com/Bodigrim/data-array-byte") + (synopsis "Compatibility layer for Data.Array.Byte") + (description + "Compatibility layer for +@url{https://hackage.haskell.org/package/base/docs/Data-Array-Byte.html,Data.Array.Byte} +providing boxed wrappers for @code{ByteArray} and +@code{MutableByteArray} and relevant instances for GHC < 9.4.") + (license license:bsd-3))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6d8675d37e..57696aeead 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1436,15 +1436,16 @@ interactive environment for the functional language Haskell.") (package (inherit base) (name "ghc") - (version "9.2.5") + (version "9.2.8") (source (origin (method url-fetch) (uri (string-append "https://www.haskell.org/ghc/dist/" version "/ghc-" version "-src.tar.xz")) (sha256 (base32 - "07028i0hm74svvq9b3jpkczaj6lsdgn3hgr4wa7diqiq3dypj1h6")) - (patches (search-patches "ghc-9.2-glibc-2.33-link-order.patch")))) + "18b7ln4gx2vy62jpv3z5slv3zfxmxnmkgajznks15zglddwd24sz")) + (patches (search-patches "ghc-9.2-glibc-2.33-link-order.patch" + "ghc-9.2-cabal-support-package-path.patch")))) (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases '%standard-phases) @@ -1474,7 +1475,7 @@ interactive environment for the functional language Haskell.") version "/ghc-" version "-testsuite.tar.xz")) (sha256 (base32 - "19ha0hidrijawy53vm2r0sgml5zkl8126mqy7p0pyacmw3k7913l")) + "0cmmwhcwv9fjzvmgjj85d354858qqbmqfzaz5160xqj4yl9zk225")) (patches (search-patches "ghc-9.2-grep-warnings.patch")))) ,@(filter (match-lambda (("ghc-bootstrap" . _) #f) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index c821279bd3..a2775b2f84 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -81,6 +81,7 @@ (define-public ibus-minimal (package (name "ibus") + (replacement ibus-minimal/fixed) (version "1.5.27") (source (origin (method url-fetch) @@ -279,6 +280,23 @@ may also simplify input method development.") (package-native-search-paths ibus-minimal))) (properties (alist-delete 'hidden? (package-properties ibus-minimal))))) +(define-public ibus-minimal/fixed + ;; Fixes <https://github.com/ibus/ibus/issues/2476>. + ;; Ungraft on gnome-team, core-updates or a dedicated ungrafing branch. + (package + (inherit ibus-minimal) + (version "1.5.29") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/ibus/ibus/" + "releases/download/" + version "/ibus-" version ".tar.gz")) + (sha256 + (base32 + "0vjybn3xq5sz616fdy21f5c4b4ajrj4wmfnbjqz6584xw887yiaa")))) + (inputs (modify-inputs (package-inputs ibus-minimal) + (prepend libdbusmenu))))) + (define-public ibus-libpinyin (package (name "ibus-libpinyin") diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 7c9d12557e..65fe793f2d 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -309,7 +309,7 @@ many popular formats.") (define-public vtk (package (name "vtk") - (version "9.2.2") + (version "9.3.0") (source (origin (method url-fetch) (uri (string-append "https://vtk.org/files/release/" @@ -317,7 +317,7 @@ many popular formats.") "/VTK-" version ".tar.gz")) (sha256 (base32 - "0x8h2bwxq2870067j7wqd0qym87pa3inkbri93zrdb0zwwmhlnqw")) + "1s8vd34nhrgnw1bf9zhfn062d53fwq3csjfwvm7lxcr5a8lvkizx")) (modules '((guix build utils))) (snippet '(begin @@ -388,6 +388,7 @@ many popular formats.") ;; Do not retain a reference to GCC. (substitute* (choose + "Common/Core/vtkBuild.h.in" ;dummy >=v9.3 "Common/Core/vtkConfigureDeprecated.h.in" ;v9.x "Common/Core/vtkConfigure.h.in") ;v7.x (("@CMAKE_CXX_COMPILER@") "c++"))))) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 8f3c00dd8a..7cfea42938 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -121,6 +121,10 @@ (list #:phases #~(modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "glirc.cabal" + (("vty\\s+>=5.35\\s+&&\\s+<5.36") "vty")))) (add-after 'install 'install-extra-documentation (lambda _ (install-file "glirc.1" @@ -362,14 +366,14 @@ Conferencing} and @acronym{ICB, Internet Citizen's Band}.") (define-public weechat (package (name "weechat") - (version "4.3.0") + (version "4.3.3") (source (origin (method url-fetch) (uri (string-append "https://weechat.org/files/src/weechat-" version ".tar.xz")) (sha256 (base32 - "0bc6jvvsprrpnr0bjfi6z0h0z3x0dkq5h38y9nipg7zny85zky9n")))) + "1n2y20mv7nj4n71qmzvnr87qxh4zkv8acihw23d5p29kx9ndp1sm")))) (build-system cmake-build-system) (outputs '("out" "doc")) (native-inputs diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 49fc2761d6..a2414161da 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1682,7 +1682,7 @@ blacklisted.certs.pem" (("^#!.*") "#! java BlockedCertsConverter SHA-256\n")))))))))) ;;; Convenience alias to point to the latest version of OpenJDK. -(define-public openjdk openjdk19) +(define-public openjdk openjdk21) ;; This version of JBR is here in order to be able to build custom diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index fc2e5b15a6..93bc3b220a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -190,6 +190,7 @@ #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) #:use-module (gnu packages video) + #:use-module (gnu packages vim) #:use-module (gnu packages vulkan) #:use-module (gnu packages web) #:use-module (gnu packages xiph) @@ -511,7 +512,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-6.9-version "6.9.5") +(define-public linux-libre-6.9-version "6.9.6") (define-public linux-libre-6.9-gnu-revision "gnu") (define deblob-scripts-6.9 (linux-libre-deblob-scripts @@ -521,7 +522,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0b8hsr0s4f3hps27bmd5qj1yknhd73q4zplr4v3lmq7sr57mgly6"))) (define-public linux-libre-6.9-pristine-source (let ((version linux-libre-6.9-version) - (hash (base32 "1ccm5w2x3faln5d0jj954xf99x7hn74ihk5zv6di99h3a2mv87x5"))) + (hash (base32 "0jvbv5g9xx76a4ni0b66gzj5i2y77gpmfdg0mdsg564rp3i6chsx"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.9))) @@ -531,7 +532,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; Here are the support timelines: ;; <https://www.kernel.org/category/releases.html> -(define-public linux-libre-6.6-version "6.6.34") +(define-public linux-libre-6.6-version "6.6.35") (define-public linux-libre-6.6-gnu-revision "gnu") (define deblob-scripts-6.6 (linux-libre-deblob-scripts @@ -541,12 +542,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "05ypqx1sz54yhb8jyxphvg5pwgb2cnzb4zqqaiyyywpqsrnya9kq"))) (define-public linux-libre-6.6-pristine-source (let ((version linux-libre-6.6-version) - (hash (base32 "180v8q5376gl6zmjd54qcb1wpmz7cq299bdbhmz738rsb67yrq64"))) + (hash (base32 "17nxymy3r9q45cfzc9rqp937m37zr1b8fjn1m0x0dv8jhxrfxqzw"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.6))) -(define-public linux-libre-6.1-version "6.1.94") +(define-public linux-libre-6.1-version "6.1.95") (define-public linux-libre-6.1-gnu-revision "gnu") (define deblob-scripts-6.1 (linux-libre-deblob-scripts @@ -556,7 +557,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0nq8b6rnn031wl0qz7ahyfs3hcb0qsr7hzdmxi2g33ycsm9955lk"))) (define-public linux-libre-6.1-pristine-source (let ((version linux-libre-6.1-version) - (hash (base32 "0sakp5k4q2xfd3la7j8s2rcbvndh6fdqgzz5ivyqf0df4anp3siq"))) + (hash (base32 "1gfz2j6iixbr0dfkb8jkwnb4gicrm5rc5lsa24wmyrkm3nmg0q19"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.1))) @@ -576,7 +577,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.219") +(define-public linux-libre-5.10-version "5.10.220") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -586,7 +587,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "12csh2zyjrqzgqcv799gv8h4xaw1irxh2zqddn4jqp5p7psx4j5k"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "0c6dhi6w8likvyyzw7wj2fqhz8nhv760kkic8bk66r1prhakzdwk"))) + (hash (base32 "16z1xqm7djm8pl15s5wvgc4pwq81gydcf00jpxfplw794kwszhvw"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) @@ -10021,7 +10022,7 @@ headers.") (define-public bcc (package (name "bcc") - (version "0.24.0") + (version "0.30.0") (source (origin (method git-fetch) @@ -10031,63 +10032,54 @@ headers.") (file-name (git-file-name name version)) (sha256 (base32 - "1i6xikkxf2nasfkqa91hjzdq0a88mgyzrvia4fi2i2v1d8pbmnp4")))) + "0b5la0yn6x6ll73drnrm5v5yibbrzkvl86hqivkrmnpgy8cqn0cy")))) (build-system cmake-build-system) (native-inputs - (list bison flex)) + (list bison + flex + (@ (gnu packages compression) zip))) (inputs - `(("clang-toolchain" ,clang-toolchain-9) - ("libbpf" ,(package-source libbpf)) - ;; LibElf required but libelf does not contain - ;; archives, only object files. - ;; https://github.com/iovisor/bcc/issues/504 - ("elfutils" ,elfutils) - ("luajit" ,luajit) - ("python-wrapper" ,python-wrapper))) - (arguments - `(;; Tests all require root permissions and a "standard" file hierarchy. - #:tests? #f - #:configure-flags - (let ((revision ,version)) - `(,(string-append "-DREVISION=" revision))) - #:phases - (modify-phases %standard-phases - ;; FIXME: Use "-DCMAKE_USE_LIBBPF_PACKAGE=ON". - (add-after 'unpack 'copy-libbpf - (lambda* (#:key inputs #:allow-other-keys) - (delete-file-recursively "src/cc/libbpf") - (copy-recursively - (assoc-ref inputs "libbpf") "src/cc/libbpf"))) - (add-after 'copy-libbpf 'substitute-libbc - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "src/python/bcc/libbcc.py" - (("(libbcc\\.so.*)\\b" _ libbcc) - (string-append - (assoc-ref outputs "out") "/lib/" libbcc))))) - (add-after 'install 'wrap-tools - (lambda* (#:key outputs #:allow-other-keys) - (use-modules (ice-9 textual-ports)) - (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib")) - (tools (string-append out "/share/bcc/tools")) - (python-executable? - (lambda (filename _) - (call-with-input-file filename - (lambda (port) - (string-contains (get-line port) - "/bin/python")))))) - (for-each - (lambda (python-executable) - (format #t "Wrapping: ~A.~%" python-executable) - (wrap-program python-executable - `("GUIX_PYTHONPATH" ":" prefix - (,(string-append lib - "/python" - ,(version-major+minor - (package-version python)) - "/site-packages"))))) - (find-files tools python-executable?)) - #t)))))) + (list bash-minimal ;for wrap-program + clang-15 + elfutils + luajit + libbpf + python-wrapper)) + (arguments + (list + ;; Tests all require root permissions and a "standard" file hierarchy. + #:tests? #f + #:configure-flags #~(list (string-append "-DREVISION=" #$version) + "-DCMAKE_USE_LIBBPF_PACKAGE=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'substitute-libbc + (lambda _ + (substitute* "src/python/bcc/libbcc.py" + (("(libbcc\\.so.*)\\b" _ libbcc) + (string-append #$output "/lib/" libbcc))))) + (add-after 'install 'wrap-tools + (lambda _ + (use-modules (ice-9 textual-ports)) + (let* ((out #$output) + (lib (string-append out "/lib")) + (tools (string-append out "/share/bcc/tools")) + (python-executable? + (lambda (filename _) + (call-with-input-file filename + (lambda (port) + (string-contains (get-line port) + "/bin/python")))))) + (for-each (lambda (python-executable) + (format #t "Wrapping: ~A.~%" python-executable) + (wrap-program python-executable + `("GUIX_PYTHONPATH" ":" prefix + (,(string-append lib + "/python" + #$(version-major+minor + (package-version python)) + "/site-packages"))))) + (find-files tools python-executable?)))))))) (home-page "https://github.com/iovisor/bcc") (synopsis "Tools for BPF on Linux") (description @@ -10139,30 +10131,37 @@ modification of BPF objects on the system.") (define-public bpftrace (package (name "bpftrace") - (version "0.18.1") + (version "0.21.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/iovisor/bpftrace") + (url "https://github.com/bpftrace/bpftrace") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0j8ba2j98d3j8lilgx3z2n162r26ryg7zw5ldwd9m36xnjp40347")) - (patches (search-patches "bpftrace-disable-bfd-disasm.patch")))) + (base32 "06yg3w80kdq0i003w2gvn0czbh8z9d3rfgmglp37dkir7g3dc6iz")))) (build-system cmake-build-system) - (native-inputs - (list bison flex)) - (inputs - (list bcc clang-toolchain-9 elfutils libbpf cereal)) - (arguments - `(#:tests? #f ;Tests require googletest sources. - #:configure-flags - '("-DBUILD_TESTING=OFF" - ;; FIXME: libbfd misses some link dependencies, when fixed, remove - ;; the associated patch. - "-DHAVE_BFD_DISASM=OFF"))) - (home-page "https://github.com/iovisor/bpftrace") + (arguments (list #:configure-flags #~(list "-DBUILD_TESTING=ON") + ;; Only run the unit tests suite, as the other ones + ;; (runtime_tests, tools-parsing-test) require to run as + ;; 'root'. + #:test-target "bpftrace_test" + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda _ + (with-directory-excursion "tests" + (substitute* (find-files ".") + (("/bin/sh") + (which "sh"))) + (substitute* '("child.cpp" + "runtime/call" + "procmon.cpp") + (("/bin/ls") + (which "ls"))))))))) + (native-inputs (list bison dwarves flex googletest xxd)) + (inputs (list bcc clang-15 elfutils libbpf libiberty cereal)) + (home-page "https://github.com/bpftrace/bpftrace") (synopsis "High-level tracing language for Linux eBPF") (description "bpftrace is a high-level tracing language for Linux enhanced Berkeley diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 2a1687be40..841418d6bf 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2977,8 +2977,8 @@ definition objects.") (sbcl-package->ecl-package sbcl-cesdi)) (define-public sbcl-cf - (let ((commit "0186b2aa93bba6b89773c655c5d59c01f0c5bc8c") - (revision "4")) + (let ((commit "dc5d98ffacafd4ff40c3df27488754585c585c94") + (revision "5")) (package (name "sbcl-cf") (version (git-version "1.0" revision commit)) @@ -2990,7 +2990,7 @@ definition objects.") (commit commit))) (file-name (git-file-name "cl-cf" version)) (sha256 - (base32 "1s8066wynz4fh3m68psmvl9pniqrh6pfpl0w2s9qxbahqwjapn6k")))) + (base32 "00hqbxrxpymrxpk3yi1igkbd9wryd8fz7wdvkjblq3ivx01fbwa1")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-fiveam)) (synopsis "Continued fractions library") @@ -15654,44 +15654,30 @@ of the files and the line numbers where they were found.") (sbcl-package->ecl-package sbcl-formgrep)) (define-public sbcl-fset - (let ((commit "a75a4ec713277780d9e15bfaa486b56949142d35") - (revision "1")) - (package - (name "sbcl-fset") - (version (git-version "1.3.3" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/slburson/fset") - (commit commit))) - (file-name (git-file-name "cl-fset" version)) - (sha256 - (base32 "0bah0z8zrcykvnbi2wcdlbx902r818xg5dvd3384wf75kr2ccxvv")) - (snippet '(begin - ;; Remove obsolete copy of system definition. - (delete-file "Code/fset.asd"))))) - (build-system asdf-build-system/sbcl) - (inputs - (list sbcl-misc-extensions sbcl-mt19937 sbcl-named-readtables)) - (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'fix-build - (lambda _ - ;; Fix for SBCL > 2.4.4 - (substitute* "Code/port.lisp" - (("sb-ext::once-only") - "sb-int:once-only"))))))) - (synopsis "Functional set-theoretic collections library") - (description - "FSet is a functional set-theoretic collections library for Common Lisp. + (package + (name "sbcl-fset") + (version "1.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/slburson/fset") + (commit (string-append "v" version)))) + (file-name (git-file-name "cl-fset" version)) + (sha256 + (base32 "16a3g9av8rvhvnhv5vfq2shim7b7i062wzyz6xwjk9sp9q9bqlva")))) + (build-system asdf-build-system/sbcl) + (inputs + (list sbcl-misc-extensions sbcl-mt19937 sbcl-named-readtables)) + (synopsis "Functional set-theoretic collections library") + (description + "FSet is a functional set-theoretic collections library for Common Lisp. Functional means that all update operations return a new collection rather than modifying an existing one in place. Set-theoretic means that collections may be nested arbitrarily with no additional programmer effort; for instance, sets may contain sets, maps may be keyed by sets, etc.") - (home-page "https://common-lisp.net/project/fset/Site/index.html") - (license license:llgpl)))) + (home-page "https://common-lisp.net/project/fset/Site/index.html") + (license license:llgpl))) (define-public cl-fset (sbcl-package->cl-source-package sbcl-fset)) @@ -20574,7 +20560,12 @@ like Ruby's ActiveRecord. (sbcl-package->cl-source-package sbcl-mito)) (define-public ecl-mito - (sbcl-package->ecl-package sbcl-mito)) + (let ((pkg (sbcl-package->ecl-package sbcl-mito))) + (package + (inherit pkg) + (arguments + ;; FIXME: Tests never end. + '(#:tests? #f))))) (define-public sbcl-mk-string-metrics (package @@ -26424,7 +26415,7 @@ the Processing language and shares some of the API.") ;; Update together with emacs-slime. (package (name "sbcl-slime-swank") - (version "2.29.1") + (version "2.30") (source (origin (file-name (git-file-name "cl-slime-swank" version)) @@ -26433,7 +26424,7 @@ the Processing language and shares some of the API.") (url "https://github.com/slime/slime/") (commit (string-append "v" version)))) (sha256 - (base32 "1fcasqsdfwsphkfx1vd3r5mr89vgvzb9g2dbw82mc9lijg1mr1ki")) + (base32 "1z9mi663cs5gks1fz5yy9dycx47sbs6fdr47z05yc1nl8znqib99")) (modules '((guix build utils))) (snippet ;; The doc folder drags `gawk' into the closure. Doc is already @@ -28582,8 +28573,8 @@ even by adding additional statistical @code{compute}ations.") (sbcl-package->ecl-package sbcl-trivial-channels)) (define-public sbcl-trivial-clipboard - (let ((commit "aee67d6132a46237f61d508ae4bd9ff44032566d") - (revision "7")) + (let ((commit "50b3d3a25717ac78fb1f0517635c3cb1c31c7667") + (revision "8")) (package (name "sbcl-trivial-clipboard") (version (git-version "0.0.0" revision commit)) @@ -28595,7 +28586,7 @@ even by adding additional statistical @code{compute}ations.") (commit commit))) (file-name (git-file-name "cl-trivial-clipboard" version)) (sha256 - (base32 "029qmx523xfk54p99ndgbmdd20s5i32mzpf77xymngrn4c33v9jk")))) + (base32 "1agj4nvw4qq7k4vp64y15gq5h5g22zasys48c2bvzqjr0n9d4lj1")))) (build-system asdf-build-system/sbcl) (inputs ;; Pick xsel instead of xclip because its closure size is slightly diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index d4ad7fd495..1b985362b1 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -382,7 +382,7 @@ interface.") (build-system trivial-build-system) (native-inputs `(("config-patch" ,@(search-patches "cl-asdf-config-directories.patch")) - ("patch" ,patch))) + ("patch" ,patch/pinned))) (arguments `(#:modules ((guix build utils) (guix build lisp-utils)) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index dc04905992..e87b88c1e3 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -550,7 +550,7 @@ output), and Binutils.") ("15.0.7" . "12sggw15sxq1krh1mfk3c1f07h895jlxbcifpwk3pznh4m1rjfy2") ("16.0.6" . "0jxmapg7shwkl88m4mqgfjv4ziqdmnppxhjz6vz51ycp2x4nmjky") ("17.0.6" . "1a7rq3rgw5vxm8y39fyzr4kv7w97lli4a0c1qrkchwk8p0n07hgh") - ("18.1.6" . "14p7f82x5qp1dv0y4d6pz42z0dsmpxz393prhi2acbzk5hksz9mb"))) + ("18.1.8" . "1l9wm0g9jrpdf309kxjx7xrzf13h81kz8bbp0md14nrz38qll9la"))) (define %llvm-patches '(("14.0.6" . ("clang-14.0-libc-search-path.patch")) @@ -558,7 +558,7 @@ output), and Binutils.") ("16.0.6" . ("clang-16.0-libc-search-path.patch")) ("17.0.6" . ("clang-17.0-libc-search-path.patch" "clang-17.0-link-dsymutil-latomic.patch")) - ("18.1.6" . ("clang-18.0-libc-search-path.patch" + ("18.1.8" . ("clang-18.0-libc-search-path.patch" "clang-17.0-link-dsymutil-latomic.patch")))) (define (llvm-monorepo version) @@ -1387,7 +1387,15 @@ Library.") (package (inherit llvm-15) (version "16.0.6") - (source (llvm-monorepo version)))) + (source (llvm-monorepo version)) + (arguments + (substitute-keyword-arguments (package-arguments llvm-15) + ;; The build daemon goes OOM on i686-linux on this phase. + ((#:phases phases #~'%standard-phases) + (if (target-x86-32?) + #~(modify-phases #$phases + (delete 'make-dynamic-linker-cache)) + phases)))))) (define-public clang-runtime-16 (clang-runtime-from-llvm llvm-16)) @@ -1454,7 +1462,7 @@ Library.") (define-public llvm-18 (package (inherit llvm-15) - (version "18.1.6") + (version "18.1.8") (source (llvm-monorepo version)))) (define-public clang-runtime-18 @@ -1470,7 +1478,7 @@ Library.") (package-version llvm-18))) (sha256 (base32 - "0kknfygvc0iq9jzsaacrw4gnmdd756aprf8lpr53gdsmdpn351yp"))))) + "1wd7y1a0db4y51swlq6dmm9hrv8pvmv158yi9f10dlayv7y7g275"))))) (define-public libomp-18 (package diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index fe2135a22d..de6d21e7cc 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1975,7 +1975,7 @@ delivery.") (define-public exim (package (name "exim") - (version "4.96.1") + (version "4.97.1") (source (origin (method url-fetch) @@ -1989,7 +1989,7 @@ delivery.") (string-append "https://ftp.exim.org/pub/exim/exim4/old/" file-name)))) (sha256 - (base32 "0g83cxkq3znh5b3r2a3990qxysw7d2l71jwcxaxzvq8pqdahgb4k")))) + (base32 "1afzxyffjqm2xm5v6b731hbfm1fi4q35ja45a29kaycsa1bj0y5x")))) (build-system gnu-build-system) (arguments (list #:phases @@ -2042,6 +2042,12 @@ delivery.") (substitute* "scripts/Configure-config.h" (("\\| /bin/sh") "| sh")) (patch-shebang "scripts/Configure-eximon"))) + (add-before 'build 'fix-perl-file-names + (lambda _ + (substitute* (list "Local/Makefile" + "OS/Makefile-Default") + (("PERL_COMMAND=/usr/bin/perl") + (string-append "PERL_COMMAND=" #$perl "/bin/perl"))))) (add-before 'build 'build-reproducibly (lambda _ ;; The ‘compilation number’ increments on every build in the @@ -2066,6 +2072,7 @@ delivery.") libxaw libxt perl + perl-file-fcntllock xz)) (home-page "https://www.exim.org/") (synopsis diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 02d8c704d8..de8e886485 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3021,7 +3021,7 @@ can solve two kinds of problems: (define-public octave-cli (package (name "octave-cli") - (version "9.1.0") + (version "9.2.0") (source (origin (method url-fetch) @@ -3029,7 +3029,7 @@ can solve two kinds of problems: version ".tar.xz")) (sha256 (base32 - "0jqk3amfkqzn1c5rzb9gm3v7r2y5xcgx6cgi4r5w8mpa9814nrgd")))) + "01sqfqrglzkjp20sg45fjd43hbjj069a1gn0r8sv01ciazxplh91")))) (build-system gnu-build-system) (inputs (list alsa-lib @@ -9534,23 +9534,34 @@ of C, Java, or Ada programs.") (define-public frama-c (package (name "frama-c") - (version "28.1") + (version "29.0") (source (origin (method url-fetch) (uri (string-append "https://frama-c.com/download/frama-c-" - version "-Nickel.tar.gz")) + version "-Copper.tar.gz")) (sha256 (base32 - "14zmwghwhcryvri7k91vc1yampvxvhg36vwjxf64d8kx7dsbq802")))) + "14vlvynp3yfmnkixm676c1ip0jlkiqjzmrp9f9c990zzs2wb7yyj")))) (build-system dune-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'build 'set-env - (lambda _ - (setenv "CC" "gcc")))))) + (list #:phases + #~(modify-phases %standard-phases + (add-before 'build 'set-env + (lambda _ + (setenv "CC" "gcc"))) + (add-after 'install 'wrap-programs + (lambda _ + (let ((ocamlpath + `(,(string-append #$output "/lib/ocaml/site-lib") + ,@(search-path-as-string->list + (getenv "OCAMLPATH"))))) + (for-each + (lambda (program) + (wrap-program (string-append #$output "/bin/" program) + `("OCAMLPATH" ":" prefix ,ocamlpath))) + '("frama-c" "frama-c-gui")))))))) (inputs - (list gmp zlib)) + (list bash-minimal gmp zlib)) (propagated-inputs (list graphviz lablgtk3 diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index e14536b957..9c62dac07c 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -3300,39 +3300,11 @@ designed for experienced users.") (sha256 (base32 "0939fiy7z53izznfhlr7c6vaskbmkbj3ncb09fzx5dmz9cjngy80")))) - ;; Using the go-build-system results in the same error message - ;; than in the bug 1551[1]. So we fix it by running go build - ;; manually in the git repository as-is as this is the solution - ;; given to that bug by the matterbridge developers. - ;; [1]https://github.com/42wim/matterbridge/issues/1551 - (build-system gnu-build-system) + (build-system go-build-system) (arguments - `(#:phases (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda* (#:key outputs #:allow-other-keys) - (setenv "GOCACHE" - (string-append (getcwd) "/go-build")) - (setenv "GOBIN" - (string-append (assoc-ref outputs "out") "/bin")) - (invoke "go" "build" "-v" "-x"))) - (replace 'check - (lambda* (#:key outputs tests? #:allow-other-keys) - (when tests? - (setenv "GOCACHE" - (string-append (getcwd) "/go-build")) - (setenv "GOBIN" - (string-append (assoc-ref outputs "out") - "/bin")) - (invoke "go" "test" "-v" "-x")))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (setenv "GOCACHE" - (string-append (getcwd) "/go-build")) - (setenv "GOBIN" - (string-append (assoc-ref outputs "out") "/bin")) - (invoke "go" "install" "-v" "-x")))))) - (native-inputs (list go)) + (list + #:go go-1.21 + #:import-path "github.com/42wim/matterbridge")) (synopsis "Bridge together various messaging networks and protocols") (description "Relays messages between different channels from various diff --git a/gnu/packages/mold.scm b/gnu/packages/mold.scm index 8625efff27..a229d3dcb7 100644 --- a/gnu/packages/mold.scm +++ b/gnu/packages/mold.scm @@ -35,7 +35,7 @@ (define-public mold (package (name "mold") - (version "2.4.0") + (version "2.32.1") (source (origin (method git-fetch) @@ -44,7 +44,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0rqw7p61qijxhbfm887xbh8idbp5w30axvwgmm68s03xirnr7ymr")) + (base32 "1raddkjazb05bkqv7n3k97k0hk2wgvl03hpbx3xq8gpg1rbviam4")) (modules '((guix build utils))) (snippet #~(begin diff --git a/gnu/packages/mtools.scm b/gnu/packages/mtools.scm index 3174e3852a..92706083b4 100644 --- a/gnu/packages/mtools.scm +++ b/gnu/packages/mtools.scm @@ -29,14 +29,14 @@ (define-public mtools (package (name "mtools") - (version "4.0.42") + (version "4.0.44") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mtools/mtools-" version ".tar.bz2")) (sha256 (base32 - "05fg5i8da5jdym3cq2939j7n3fqw4cz2riy1yci6pbw29pgdzgv4")) + "1f6x3srkssjcnrmd9hkladc8nzkwq9rqkiy15r5ksg2k4bq4vp1p")) (patches (search-patches "mtools-mformat-uninitialized.patch")))) (build-system gnu-build-system) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index c12bb843fe..540908fc8e 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5633,7 +5633,7 @@ specification and header.") (define-public rosegarden (package (name "rosegarden") - (version "23.12") + (version "24.06") (source (origin (method url-fetch) @@ -5641,7 +5641,7 @@ specification and header.") (version-major+minor version) "/" "rosegarden-" version ".tar.xz")) (sha256 - (base32 "0clkzrs931dypvqcn5hzx2v3bq9gc439g71phahgwkh4c1jfcmrz")))) + (base32 "09www13ndba14krzycwm44qgcy7j11wa6a6xiqh6i2hjghlx8v46")))) (build-system cmake-build-system) (arguments (list diff --git a/gnu/packages/musl.scm b/gnu/packages/musl.scm index 60fcbce150..f5963928bc 100644 --- a/gnu/packages/musl.scm +++ b/gnu/packages/musl.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2016 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018–2020, 2022 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2024 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,9 +22,11 @@ (define-module (gnu packages musl) #:use-module (guix download) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix build-system gnu) #:use-module ((guix licenses) #:prefix license:) - #:use-module (gnu packages)) + #:use-module (gnu packages) + #:use-module (gnu packages bash)) (define-public musl (package @@ -38,9 +41,11 @@ "1r3mgky9d19b2285s274qxzlgs7sncx8plm01vd691sdx2xii8d9")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; musl has no tests - #:configure-flags - (list "--disable-gcc-wrapper"))) + (list #:tests? #f ; musl has no tests + #:configure-flags + #~(list "--enable-wrapper=all" + (string-append "--syslibdir=" #$output "/lib")))) + (inputs (list bash-minimal)) (synopsis "Small C standard library") (description "musl is a simple and lightweight C standard library. It strives to be correct in the sense of standards-conformance and safety.") diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index e3bed39f70..c94f772b74 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4581,7 +4581,7 @@ network.") (define-public ngtcp2 (package (name "ngtcp2") - (version "1.5.0") + (version "1.6.0") (source (origin (method url-fetch) @@ -4589,7 +4589,7 @@ network.") "releases/download/v" version "/" "ngtcp2-" version ".tar.xz")) (sha256 - (base32 "0zw5vd1yjfh9j4gl3ixisp495fp9g7qxn1kxkc1dc4v3ps63ch1a")))) + (base32 "0fh2c0iafjihvg7cb2kkhxzs0gvlz4phczqil61ckhk9sd15lmrf")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ef092d8e41..1204c78883 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1503,7 +1503,7 @@ software engineering.") (define-public unison (package (name "unison") - (version "2.53.3") + (version "2.53.5") (source (origin (method git-fetch) (uri (git-reference @@ -1512,7 +1512,7 @@ software engineering.") (file-name (git-file-name name version)) (sha256 (base32 - "05ihxk1yynw08586i06w19xab9r24h9hr6v9bknqm98qrlshm92w")))) + "1fy4c1wb6xn9gxdabs25yajbzik3amifyr7nzd4d9vn6r3gll9sw")))) (build-system dune-build-system) (propagated-inputs (list lablgtk3 zlib)) (native-inputs (list ghostscript (texlive-updmap.cfg '()) hevea lynx which)) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 2eb50f6765..40747686c4 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2023 jgart <jgart@dismail.de> ;;; Copyright © 2023 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de> ;;; Copyright © 2024 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -177,8 +178,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.4.0") - (commit "b345a5e17f60e1cf700980e608a5b33e51062978") - (revision 21)) + (commit "1a34b9b725e731a6d5f602d104f09a1c68afa6a4") + (revision 22)) (package (name "guix") @@ -194,7 +195,7 @@ (commit commit))) (sha256 (base32 - "0gddkkcnkn9j86imp07lpi83r9j96mssgsr59w356hnxkb0npdaz")) + "0fz7n9pl0g3cw3zvx9m5c51ly5m9ga71v85mf4jqp7x8j5g21lhy")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -490,8 +491,10 @@ $(prefix)/etc/openrc\n"))) ("automake" ,automake) ("gettext" ,gettext-minimal) ("texinfo" ,texinfo) - ("graphviz" ,graphviz-minimal) + ("graphviz" ,graphviz) ;non-minimal for PDF support ("font-ghostscript" ,font-ghostscript) ;fonts for 'dot' + ("imagemagick" ,imagemagick) ;for 'make dist' + ("perl" ,perl) ;for 'make dist' ("help2man" ,help2man) ("po4a" ,po4a-minimal))) (inputs @@ -1545,8 +1548,8 @@ environments.") "0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc"))))))) (define-public guix-build-coordinator - (let ((commit "4ccfaffc1965cb4ed060bbd82a425026ab3bb36e") - (revision "107")) + (let ((commit "406db8a8db53731de432c452902a098915e876c2") + (revision "109")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1557,7 +1560,7 @@ environments.") (commit commit))) (sha256 (base32 - "17s8xql655x4rszv8ig6ql0x3qnw5q9mas0q1bnizayh9vdivlf6")) + "0yi3xji5qm6r5h6nmfbxqgaipp4al08h2mn6sci85ikm80vvy66a")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -1803,8 +1806,8 @@ in an isolated environment, in separate namespaces.") (license license:gpl3+))) (define-public nar-herder - (let ((commit "91348bd774aa4f1f2d789025728c323dcde7b466") - (revision "36")) + (let ((commit "82f9371c714f14ca59efb8d67b20e9c85b5c86d1") + (revision "37")) (package (name "nar-herder") (version (git-version "0" revision commit)) @@ -1815,7 +1818,7 @@ in an isolated environment, in separate namespaces.") (commit commit))) (sha256 (base32 - "10n49vlbsa4vh99h7j7z6g5qryj75ci55l3igj8jd24ccqdwrp6d")) + "0907hrb02qfa0xvkgzap7bwlx0w9ywfcfr6iw41w4rxarf7xkjlg")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -2041,7 +2044,8 @@ the boot loader configuration.") (sha256 (base32 "0ij93vl9skcfdfgkmgd80q0q4c6q39dss4rds7phxizqqsr3d3sk")) (patches - (search-patches "flatpak-fix-path.patch" + (search-patches "flatpak-fix-fonts-icons.patch" + "flatpak-fix-path.patch" "flatpak-unset-gdk-pixbuf-for-sandbox.patch")))) ;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing GIO to diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 84436eaeac..fc21bab7d4 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -66,14 +66,14 @@ (define-public parallel (package (name "parallel") - (version "20240522") + (version "20240622") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 "0a396j54857hqqbbskpyh31km7nzly67w3jhkpq2agmz66nrzvb7")) + (base32 "1m9qpx6c7b62s1kjp6aj0qfnj3fw2pl72q32bdykqi5x0z4i1qip")) (snippet '(begin (use-modules (guix build utils)) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 12688c9a63..499c8b8312 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -40,6 +40,7 @@ ;;; Copyright © 2022 Nicolas Graves <ngraves@ngraves.fr> ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com> ;;; Copyright © 2023 Christian Miller <christian.miller@dadoes.de> +;;; Copyright © 2024 John Kehayias <john.kehayias@protonmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -906,35 +907,64 @@ encryption.") (license license:gpl3+))) (define-public rofi-pass - (package - (name "rofi-pass") - (version "2.0.2") - (source - (origin - (method url-fetch) - (uri - (string-append "https://raw.githubusercontent.com/carnager/rofi-pass/" - version "/rofi-pass")) - (sha256 - (base32 "0msldkndqp40nx1s5s7ggcr97ir4nshpmnyzvj5hqw1l7m3gvw6j")) - (file-name name))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((source (string-append (assoc-ref %build-inputs "source"))) - (script "rofi-pass") - (out (assoc-ref %outputs "out"))) - (copy-file source script) - (chmod script #o555) - (install-file script (string-append out "/bin")))))) - (propagated-inputs - (list password-store rofi xdotool)) - (home-page "https://github.com/carnager/rofi-pass") - (synopsis "Rofi frontend for password-store") - (description "Rofi-pass provides a way to manipulate information stored + ;; No release in over 5 years with recent commits adding features like + ;; Wayland support. + (let ((commit "8aa6b9293a8f0af267425326fa966966ca42085e") + (revision "0")) + (package + (name "rofi-pass") + (version (git-version "2.0.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/carnager/rofi-pass") + (commit commit))) + (sha256 + (base32 + "0axz4ijp6fay6f2yn1cg6223l89jkg8wnxslbk1g5jpli0njxw43")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ; no tests + #:make-flags #~(list (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-etc-path + (lambda _ + (substitute* "Makefile" + (("\\$\\(DESTDIR\\)/etc") + (string-append #$output "/etc"))) + (substitute* "rofi-pass" + (("/etc") + (string-append #$output "/etc"))))) + (delete 'configure) ; no configure + (delete 'build) ; no build + (add-after 'install 'wrap-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((bin (string-append #$output "/bin"))) + (for-each + (lambda (script) + (wrap-program (string-append bin "/" script) + (list "PATH" 'prefix + (map + (lambda (binary) + (dirname (search-input-file + inputs + (string-append "bin/" binary)))) + '("pass" "pwgen" "rofi" + "xclip" "xdotool" "xset"))))) + (list "addpass" "rofi-pass")))))))) + (inputs (list bash-minimal ;for wrap-program + password-store + pwgen + rofi + xclip + xdotool + xset)) + (home-page "https://github.com/carnager/rofi-pass") + (synopsis "Rofi frontend for password-store") + (description "Rofi-pass provides a way to manipulate information stored using password-store through rofi interface: @enumerate @item open URLs of entries with hotkey; @@ -944,7 +974,54 @@ using password-store through rofi interface: @item auto-typing of more than one field, using the autotype entry; @item bookmarks mode (open stored URLs in browser, default: Alt+x). @end enumerate") - (license license:gpl3))) + (license license:gpl3)))) + +(define-public rofi-pass-wayland + (package + (inherit rofi-pass) + (name "rofi-pass-wayland") + (arguments + (substitute-keyword-arguments (package-arguments rofi-pass) + ((#:phases phases) + #~(modify-phases #$phases + ;; Set the clipboard and backend tools to ones for Wayland in the + ;; default configuration file. + (add-after 'fix-etc-path 'set-wayland-defaults + (lambda _ + (substitute* "config.example" + ;; Note the typo in current configuration. + (("#clibpoard_backend=xclip") + "clipboard_backend=wl-clipboard") + (("#backend=xdotool") + "backend=wtype")) + (substitute* "rofi-pass" + (("/etc") + (string-append #$output "/etc"))))) + ;; Use Wayland related tools instead. + (replace 'wrap-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((bin (string-append #$output "/bin"))) + (for-each + (lambda (script) + (wrap-program (string-append bin "/" script) + (list "PATH" 'prefix + (map + (lambda (binary) + (dirname (search-input-file + inputs + (string-append "bin/" binary)))) + ;; wl-copy for wl-clipboard. + '("pass" "pwgen" "rofi" "wl-copy" "wtype"))))) + (list "addpass" "rofi-pass"))))))))) + (inputs + (modify-inputs (package-inputs rofi-pass) + (replace "rofi" rofi-wayland) + (replace "xclip" wl-clipboard) + (replace "xdotool" wtype) + (delete "xset"))) + (description (string-append + (package-description rofi-pass) + "\nThis package provides Wayland support by default.")))) (define-public tessen (package diff --git a/gnu/packages/patches/bpftrace-disable-bfd-disasm.patch b/gnu/packages/patches/bpftrace-disable-bfd-disasm.patch deleted file mode 100644 index 8565d8d851..0000000000 --- a/gnu/packages/patches/bpftrace-disable-bfd-disasm.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e89a6a9..a594786 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -126,10 +126,6 @@ find_package(LibBpf) - find_package(LibBfd) - find_package(LibOpcodes) - --if(${LIBBFD_FOUND} AND ${LIBOPCODES_FOUND}) -- set(HAVE_BFD_DISASM TRUE) --endif() -- - include(CheckIncludeFile) - check_include_file("sys/sdt.h" HAVE_SYSTEMTAP_SYS_SDT_H) - diff --git a/gnu/packages/patches/coq-autosubst-1.8-remove-deprecated-files.patch b/gnu/packages/patches/coq-autosubst-1.8-remove-deprecated-files.patch new file mode 100644 index 0000000000..cc76672798 --- /dev/null +++ b/gnu/packages/patches/coq-autosubst-1.8-remove-deprecated-files.patch @@ -0,0 +1,43 @@ +This patch compatibility problems with Coq 8.19. + +It was taken from the master branch of coq-autosubst as there is only +this change since version 1.8 of autosubst and they haven't released a +newer version yet. + +To recreate this patch: + +wget https://github.com/coq-community/autosubst/commit/97eea491813b691c6187d53d92ae6020874a82a3.patch \ + -O coq-autosubst-1.8-remove-deprecated-files.patch + +From 97eea491813b691c6187d53d92ae6020874a82a3 Mon Sep 17 00:00:00 2001 +From: Pierre Rousselin <rousselin@math.univ-paris13.fr> +Date: Sun, 15 Oct 2023 14:34:31 +0200 +Subject: [PATCH] Remove deprecated files in Coq.Arith + +This is necessary for Coq/Coq:#18164 +--- + theories/Autosubst_Basics.v | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/theories/Autosubst_Basics.v b/theories/Autosubst_Basics.v +index 477c87c..1940c3b 100644 +--- a/theories/Autosubst_Basics.v ++++ b/theories/Autosubst_Basics.v +@@ -5,7 +5,7 @@ + *) + + Require Import Coq.Program.Tactics. +-Require Import Coq.Arith.Plus List FunctionalExtensionality. ++Require Import Coq.Arith.PeanoNat List FunctionalExtensionality. + + (** Annotate "a" with additional information. *) + Definition annot {A B} (a : A) (b : B) : A := a. +@@ -240,7 +240,7 @@ Lemma plusSn n m : S n + m = S (n + m). reflexivity. Qed. + Lemma plusnS n m : n + S m = S (n + m). symmetry. apply plus_n_Sm. Qed. + Lemma plusOn n : O + n = n. reflexivity. Qed. + Lemma plusnO n : n + O = n. symmetry. apply plus_n_O. Qed. +-Lemma plusA n m k : n + (m + k) = (n + m) + k. apply plus_assoc. Qed. ++Lemma plusA n m k : n + (m + k) = (n + m) + k. apply Nat.add_assoc. Qed. + + Lemma scons_eta f n : f n .: (+S n) >>> f = (+n) >>> f. + Proof. diff --git a/gnu/packages/patches/esmini-no-clutter-log.patch b/gnu/packages/patches/esmini-no-clutter-log.patch deleted file mode 100644 index 0920244f78..0000000000 --- a/gnu/packages/patches/esmini-no-clutter-log.patch +++ /dev/null @@ -1,30 +0,0 @@ -Don't clutter /tmp with logs. - ---- - EnvironmentSimulator/Modules/CommonMini/CommonMini.cpp | 10 ++-------- - 1 file changed, 2 insertions(+), 8 deletions(-) - -diff --git a/EnvironmentSimulator/Modules/CommonMini/CommonMini.cpp b/EnvironmentSimulator/Modules/CommonMini/CommonMini.cpp -index 56c655dc..2750f5a6 100644 ---- a/EnvironmentSimulator/Modules/CommonMini/CommonMini.cpp -+++ b/EnvironmentSimulator/Modules/CommonMini/CommonMini.cpp -@@ -1013,14 +1013,8 @@ void Logger::OpenLogfile(std::string filename) - file_.open(filename.c_str()); - if (file_.fail()) - { -- const char* filename_tmp = std::tmpnam(NULL); -- printf("Cannot open log file: %s in working directory. Trying system tmp-file: %s\n", -- SE_Env::Inst().GetLogFilePath().c_str(), filename_tmp); -- file_.open(filename_tmp); -- if (file_.fail()) -- { -- printf("Also failed to open log file: %s. Continue without logfile, still logging to console.\n", filename_tmp); -- } -+ printf("Cannot open log file: %s in working directory. Continuing without logfile, still logging to console.\n", -+ filename.c_str()); - } - } - #endif --- -2.38.1 - diff --git a/gnu/packages/patches/esmini-use-pkgconfig.patch b/gnu/packages/patches/esmini-use-pkgconfig.patch index 73e1b50015..7f7dafbc55 100644 --- a/gnu/packages/patches/esmini-use-pkgconfig.patch +++ b/gnu/packages/patches/esmini-use-pkgconfig.patch @@ -1,461 +1,153 @@ Find dependencies via pkg-config. --- - CMakeLists.txt | 16 +- - .../Applications/esmini-dyn/CMakeLists.txt | 5 +- - .../Applications/esmini/CMakeLists.txt | 1 + - EnvironmentSimulator/CMakeLists.txt | 296 +----------------- - .../Modules/Controllers/ControllerSumo.cpp | 1 - - .../Modules/RoadManager/CMakeLists.txt | 8 +- - .../Modules/ScenarioEngine/CMakeLists.txt | 15 +- - 7 files changed, 23 insertions(+), 319 deletions(-) + CMakeLists.txt | 72 +++---------------- + .../Applications/esmini/main.cpp | 2 + + EnvironmentSimulator/CMakeLists.txt | 3 - + .../Modules/Controllers/ControllerSumo.cpp | 1 - + .../Modules/RoadManager/CMakeLists.txt | 7 +- + .../Modules/ScenarioEngine/CMakeLists.txt | 17 +---- + 6 files changed, 16 insertions(+), 86 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 156d9448..10ec48f9 100644 +index aec4cf55..c9689b44 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -8,6 +8,7 @@ else() - cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) +@@ -13,6 +13,8 @@ else() + FATAL_ERROR) endif() +include(FindPkgConfig) ++ + # ############################# Project generate options ########################################################### - project (EnvironmentSimulator) - -@@ -33,15 +34,10 @@ else () - set (LINUX false) - endif () + project( +@@ -138,75 +140,26 @@ set_special_build_flags() + include(${CMAKE_CURRENT_SOURCE_DIR}/support/cmake/utils/get_subdirectories.cmake) + include(${CMAKE_CURRENT_SOURCE_DIR}/support/cmake/utils/set_folder.cmake) --if (LINUX OR APPLE OR MINGW OR MSVC) -- set(INSTALL_DIRECTORY "${CMAKE_HOME_DIRECTORY}/bin") --else () -- message(FATAL_ERROR "Unrecognized platform therefore there isn't an installation directory. Stopping the cmake process.") --endif () +-# ############################### Downloading cloud packages ######################################################### - - set(INSTALL_DIRECTORY_CODE_EXAMPLES "${CMAKE_HOME_DIRECTORY}/code-examples-bin") - --set(PUGIXML_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/externals/pugixml") -+find_package(pugixml) -+ - set(EXPR_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/externals/expr") - if(MSVC) - set(DIRENT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/externals/dirent/win") -@@ -61,10 +57,14 @@ set(ENABLE_SANITIZERS False CACHE BOOL "Enable sanitizers (Only valid for Linux +-include(${CMAKE_CURRENT_SOURCE_DIR}/support/cmake/cloud/set_cloud_links.cmake) +-set_cloud_links() +- +-include(${CMAKE_CURRENT_SOURCE_DIR}/support/cmake/cloud/download.cmake) +- +-message(STATUS "Downloading dependencies...") +- +-download( +- osg +- ${EXTERNALS_OSG_PATH} +- ${EXTERNALS_OSG_OS_SPECIFIC_PATH} +- "${OSG_PACKAGE_URL}") +- +-download( +- osi +- ${EXTERNALS_OSI_PATH} +- ${EXTERNALS_OSI_OS_SPECIFIC_PATH} +- "${OSI_PACKAGE_URL}") +- +-download( +- sumo +- ${EXTERNALS_SUMO_PATH} +- ${EXTERNALS_SUMO_OS_SPECIFIC_PATH} +- "${SUMO_PACKAGE_URL}") +- +-download( +- implot +- ${EXTERNALS_IMPLOT_PATH} +- ${EXTERNALS_IMPLOT_OS_SPECIFIC_PATH} +- "${IMPLOT_PACKAGE_URL}") +- +-download( +- models +- ${RESOURCES_PATH} +- ${MODELS_PATH} +- "${MODELS_PACKAGE_URL}") +- +-if(NOT +- (APPLE +- OR MINGW)) +- download( +- googletest +- ${EXTERNALS_GOOGLETEST_PATH} +- ${EXTERNALS_GOOGLETEST_OS_SPECIFIC_PATH} +- ${GTEST_PACKAGE_URL}) +-endif() +- + # ############################### Loading external packages ########################################################## + if(USE_GTEST) +- include(${CMAKE_CURRENT_SOURCE_DIR}/support/cmake/external/gtest.cmake) +- set_gtest_libs() ++ find_package(GTest REQUIRED) + endif() - if (USE_OSG) + if(USE_OSG) +- include(${CMAKE_CURRENT_SOURCE_DIR}/support/cmake/external/osg.cmake) +- set_osg_libs() + pkg_check_modules(OSG REQUIRED openscenegraph osgdb_jpeg osgdb_osg + osgdb_serializers_osg + osgdb_serializers_osgsim) - add_definitions(-D_USE_OSG) - endif (USE_OSG) - - if (USE_OSI) -+ find_package(open_simulation_interface REQUIRED) - add_definitions(-D_USE_OSI) - endif (USE_OSI) + endif() -@@ -73,6 +73,7 @@ if (USE_SUMO) - endif (USE_SUMO) + if(USE_OSI) +- include(${CMAKE_CURRENT_SOURCE_DIR}/support/cmake/external/osi.cmake) +- set_osi_libs() ++ find_package(open_simulation_interface REQUIRED) ++ set(EXTERNALS_OSI_INCLUDES "${OPEN_SIMULATION_INTERFACE_INCLUDE_DIRS}") ++ set(OSI_LIBRARIES open_simulation_interface::open_simulation_interface) + endif() - if (USE_GTEST) -+ find_package(GTest REQUIRED) - add_definitions(-D_USE_GTEST) - endif (USE_GTEST) + if(USE_SUMO) +- include(${CMAKE_CURRENT_SOURCE_DIR}/support/cmake/external/sumo.cmake) +- set_sumo_libs() ++ set ( SUMO_LIBRARIES sumocpp tracicpp ) + endif() -@@ -90,5 +91,4 @@ if( NOT EXISTS "test/OSC-ALKS-scenarios/.git" ) + if(USE_IMPLOT) +@@ -229,10 +182,7 @@ if(NOT endif() # Add variables to global scope, e.g. when esmini is used as submodule --set(PUGIXML_INCLUDE_DIR ${PUGIXML_INCLUDE_DIR} CACHE INTERNAL "") - set(EXPR_INCLUDE_DIR ${EXPR_INCLUDE_DIR} CACHE INTERNAL "") -diff --git a/EnvironmentSimulator/Applications/esmini-dyn/CMakeLists.txt b/EnvironmentSimulator/Applications/esmini-dyn/CMakeLists.txt -index 83d89420..e15062d3 100644 ---- a/EnvironmentSimulator/Applications/esmini-dyn/CMakeLists.txt -+++ b/EnvironmentSimulator/Applications/esmini-dyn/CMakeLists.txt -@@ -1,7 +1,7 @@ - - include_directories ( - ${SCENARIOENGINE_DLL_INCLUDE_DIR} -- ${COMMON_MINI_INCLUDE_DIR} -+ ${COMMON_MINI_INCLUDE_DIR} - ${OSI_INCLUDE_DIR} - ) - -@@ -19,11 +19,12 @@ link_directories( ${OSI_DIR}/lib ) - add_executable ( ${TARGET} ${SOURCES} ${INCLUDES} ) - - --target_link_libraries ( -+target_link_libraries ( - ${TARGET} - esminiLib - CommonMini - ${TIME_LIB} -+ pugixml::pugixml - project_options - ) - -diff --git a/EnvironmentSimulator/Applications/esmini/CMakeLists.txt b/EnvironmentSimulator/Applications/esmini/CMakeLists.txt -index 6890c26a..a088ebdc 100644 ---- a/EnvironmentSimulator/Applications/esmini/CMakeLists.txt -+++ b/EnvironmentSimulator/Applications/esmini/CMakeLists.txt -@@ -44,6 +44,7 @@ target_link_libraries ( - ${sumo_libs} - ${TIME_LIB} - ${SOCK_LIB} -+ pugixml::pugixml - project_options - ) +-set(EXTERNALS_PUGIXML_PATH +- ${EXTERNALS_PUGIXML_PATH} +- CACHE INTERNAL +- "") ++find_package(pugixml) + set(EXTERNALS_EXPR_PATH + ${EXTERNALS_EXPR_PATH} + CACHE INTERNAL +diff --git a/EnvironmentSimulator/Applications/esmini/main.cpp b/EnvironmentSimulator/Applications/esmini/main.cpp +index 84f38c7f..943c42c8 100644 +--- a/EnvironmentSimulator/Applications/esmini/main.cpp ++++ b/EnvironmentSimulator/Applications/esmini/main.cpp +@@ -13,7 +13,9 @@ + #include "playerbase.hpp" + #include "CommonMini.cpp" + #include "OSCParameterDistribution.hpp" ++#if _USE_IMPLOT + #include "Plot.hpp" ++#endif + #include <osgViewer/ViewerEventHandlers> + #include <signal.h> diff --git a/EnvironmentSimulator/CMakeLists.txt b/EnvironmentSimulator/CMakeLists.txt -index 157e8fe0..e771231a 100644 +index 87e1dd98..3db513a0 100644 --- a/EnvironmentSimulator/CMakeLists.txt +++ b/EnvironmentSimulator/CMakeLists.txt -@@ -1,7 +1,3 @@ -- --set ( FILE_STORAGE "esmini" ) # "dropbox", "google", "esmini" (limited GB/Day) --set ( MODEL_STORAGE "esmini" ) # "dropbox", "google", "esmini" (limited GB/Day) -- - set ( VIEWER_BASE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Modules/ViewerBase" ) - set ( PLAYER_BASE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Modules/PlayerBase" ) - set ( ROADMANAGER_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Modules/RoadManager" ) -@@ -17,88 +13,12 @@ set ( CONTROLLERS_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Modules/Controllers") - - # OpenSceneGraph package adapted for this project - set ( OSG_VERSION "osg161" ) --set ( OSG_BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../externals/OpenSceneGraph" ) --set ( OSI_BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../externals/OSI" ) --set ( SUMO_BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../externals/SUMO" ) - - # GoogleTest package - set ( GTEST_VERSION "1.10.1" ) --set ( GTEST_BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../externals/googletest" ) - - set( CMAKE_VERBOSE_MAKEFILE true ) - --if ( ${FILE_STORAGE} STREQUAL "dropbox" ) -- if (APPLE) -- set ( OSG_PACKAGE_URL https://www.dropbox.com/s/d0czj6b89p9jyvv/OpenSceneGraph_mac.7z?dl=1 ) -- set ( OSI_PACKAGE_URL https://www.dropbox.com/s/m62v19gp0m73dte/osi_mac.7z?dl=1 ) -- set ( SUMO_PACKAGE_URL https://www.dropbox.com/s/0x8kwztk7nmacs1/sumo_mac.7z?dl=1 ) -- elseif (LINUX) -- set ( OSG_PACKAGE_URL https://www.dropbox.com/s/4ug0gmkgdavzyb4/osg_linux_glibc_2_31_gcc_7_5_0.7z?dl=1 ) -- set ( OSI_PACKAGE_URL https://dl.dropboxusercontent.com/s/kwtdg0c1c8pawa1/osi_linux.7z?dl=1 ) -- set ( SUMO_PACKAGE_URL https://dl.dropboxusercontent.com/s/gfwtqd3gf76f86a/sumo_linux.7z?dl=1 ) -- set ( GTEST_PACKAGE_URL https://dl.dropboxusercontent.com/s/si7jsjjsy5bpoym/googletest_linux.7z?dl=1 ) -- elseif (MSVC) -- set ( OSG_PACKAGE_URL https://dl.dropboxusercontent.com/s/e95hnoo782p40uc/OpenSceneGraph_v10.7z?dl=1 ) -- set ( OSI_PACKAGE_URL https://dl.dropboxusercontent.com/s/an58ckp2qfx5069/osi_v10.7z?dl=1 ) -- set ( SUMO_PACKAGE_URL https://dl.dropboxusercontent.com/s/5jtpnnd61wonxuh/sumo_v10.7z?dl=1 ) -- set ( GTEST_PACKAGE_URL https://dl.dropboxusercontent.com/s/aaiehwzc6woqbc6/googletest_v10.7z?dl=1 ) -- elseif (MINGW) -- message("MinGW, enforcing slimmed esmini") -- else () -- message ("Unsupported configuration") -- endif () --elseif ( ${FILE_STORAGE} STREQUAL "google" ) -- if (APPLE) -- set ( OSG_PACKAGE_URL https://drive.google.com/u/1/uc?id=1mfn_vrcXBoFBekR_t8RXTWB4sD59JD7p&export=download ) -- set ( OSI_PACKAGE_URL https://drive.google.com/u/1/uc?id=1UVzO8cPQaDU9KVn9v2v8Suj0uUw1dzYI&export=download ) -- set ( SUMO_PACKAGE_URL https://drive.google.com/u/1/uc?id=1FAve0-MlJPv6lUZy0HvriZI7xstLAzvX&export=download ) -- elseif (LINUX) -- set ( OSG_PACKAGE_URL https://drive.google.com/u/1/uc?id=1Ya1bLp_0-qqlhs67WAwbGW7l37wqP3o2&export=download ) -- set ( OSI_PACKAGE_URL https://drive.google.com/u/1/uc?id=1Q8O9YciIC0BPEszIKtQ2UW9KcVRZS4iB&export=download ) -- set ( SUMO_PACKAGE_URL https://drive.google.com/u/1/uc?id=1m4znxNIXapP0D-l21oIm2l7L5ti-JbZH&export=download ) -- set ( GTEST_PACKAGE_URL https://drive.google.com/u/1/uc?id=1Hyr9eJX2GmgpYwZhx14xOoXlZ2j-FY_p&export=download ) -- elseif (MSVC) -- set ( OSG_PACKAGE_URL https://drive.google.com/u/1/uc?id=1RTag0aUn_pJPK697j0-E72ABW10wZvOm&export=download ) -- set ( OSI_PACKAGE_URL https://drive.google.com/u/1/uc?id=1pcQcVHUESOk2Wmi-zUA7uzdxxE6iwRJx&export=download ) -- set ( SUMO_PACKAGE_URL https://drive.google.com/u/1/uc?id=18PhbSLyvs0IGWTAY3YBoYzpVnMFPbOuR&export=download ) -- set ( GTEST_PACKAGE_URL https://drive.google.com/u/1/uc?id=1So-3gtrmEdW9RhEvVQisj1QFksHM_otU&export=download ) -- elseif (MINGW) -- message("MinGW, enforcing slimmed esmini") -- else () -- message ("Unsupported configuration") -- endif () --elseif ( ${FILE_STORAGE} STREQUAL "esmini" ) -- if (APPLE) -- set ( OSG_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/OpenSceneGraph_mac.7z ) -- set ( OSI_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/osi_mac.7z ) -- set ( SUMO_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/sumo_mac.7z ) -- elseif (LINUX) -- set ( OSG_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/osg_linux_glibc_2_31_gcc_7_5_0.7z ) -- set ( OSI_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/osi_linux.7z ) -- set ( SUMO_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/sumo_linux.7z ) -- set ( GTEST_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/googletest_linux.7z ) -- elseif (MSVC) -- set ( OSG_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/OpenSceneGraph_v10.7z ) -- set ( OSI_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/osi_v10.7z ) -- set ( SUMO_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/sumo_v10.7z ) -- set ( GTEST_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/googletest_v10.7z ) -- elseif (MINGW) -- message("MinGW, enforcing slimmed esmini") -- else () -- message ("Unsupported configuration") -- endif () --else () -- Message("Unknown storage type: " ${FILE_STORAGE}) --endif() -- --if ( ${MODEL_STORAGE} STREQUAL "dropbox" ) -- set ( MODELS_PACKAGE_URL https://dl.dropboxusercontent.com/s/5gk8bvgzqiaaoco/models.7z?dl=0 ) --elseif ( ${MODEL_STORAGE} STREQUAL "google" ) -- set ( MODELS_PACKAGE_URL https://drive.google.com/u/1/uc?id=1c3cqRzwY41gWXbg0rmugQkL5I_5L6DH_&export=download ) --elseif ( ${MODEL_STORAGE} STREQUAL "esmini" ) -- set ( MODELS_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD779364751/models/models.7z ) --endif() -- - if (APPLE) - set ( EXT_DIR_NAME "mac" ) - set ( TIME_LIB "" ) -@@ -127,21 +47,8 @@ set ( OSI_DIR "${OSI_BASE_DIR}/${EXT_DIR_NAME}" ) - set ( SUMO_DIR "${SUMO_BASE_DIR}/${EXT_DIR_NAME}" ) - set ( GTEST_DIR "${GTEST_BASE_DIR}/${EXT_DIR_NAME}" ) - --set ( OSG_INCLUDE_DIR -- "${OSG_DIR}/build/include" -- "${OSG_DIR}/include" --) --set ( OSG_LIBRARIES_PATH -- "${OSG_DIR}/lib" -- "${OSG_DIR}/lib/osgPlugins-3.6.5" --) -- - set ( OSI_INCLUDE_DIR "${OSI_DIR}/include" ) --if (DYN_PROTOBUF) -- set ( OSI_LIBRARIES_PATH "${OSI_DIR}/lib-dyn" ) --else () -- set ( OSI_LIBRARIES_PATH "${OSI_DIR}/lib" ) --endif (DYN_PROTOBUF) -+set ( OSI_LIBRARIES_PATH "${OSI_DIR}/lib" ) - - set ( SUMO_INCLUDE_DIR "${SUMO_DIR}/include" ) - set ( SUMO_LIBRARIES_PATH "${SUMO_DIR}/lib" ) -@@ -153,74 +60,6 @@ link_directories(${OSG_LIBRARIES_PATH} ${OSI_LIBRARIES_PATH} ${SUMO_LIBRARIES_PA - - if(APPLE) - SET(CMAKE_CXX_FLAGS "${CXX_STD_FLAG} -std=c++14 -pthread -fPIC -flto -DGL_SILENCE_DEPRECATION -Wl,-dead_strip") -- -- set ( OSG_LIBRARIES -- osg -- osgViewer -- osgDB -- osgdb_serializers_osgsim -- osgdb_serializers_osg -- osgGA -- osgText -- osgSim -- osgdb_osg -- osgdb_jpeg -- osgUtil -- osgAnimation -- osg -- OpenThreads -- jpeg -- "-framework OpenGL" -- "-framework Cocoa" -- dl -- z -- ) -- -- if (DYN_PROTOBUF) -- set ( OSI_LIBRARIES -- open_simulation_interface -- protobuf -- ) -- else () -- set ( OSI_LIBRARIES -- open_simulation_interface_pic -- protobuf -- ) -- endif (DYN_PROTOBUF) -- -- -- set ( SUMO_LIBRARIES -- optimized libsumostatic debug libsumostaticd -- optimized netload debug netloadd -- optimized traciserver debug traciserverd -- optimized libsumostatic debug libsumostaticd -- optimized utils_vehicle debug utils_vehicled -- optimized utils_distribution debug utils_distributiond -- optimized utils_shapes debug utils_shapesd -- optimized utils_options debug utils_optionsd -- optimized utils_xml debug utils_xmld -- optimized utils_geom debug utils_geomd -- optimized utils_common debug utils_commond -- optimized utils_iodevices debug utils_iodevicesd -- optimized utils_traction_wire debug utils_traction_wired -- optimized utils_emissions debug utils_emissionsd -- optimized microsim_engine debug microsim_engined -- optimized microsim_lcmodels debug microsim_lcmodelsd -- optimized microsim_devices debug microsim_devicesd -- optimized microsim_trigger debug microsim_triggerd -- optimized microsim_output debug microsim_outputd -- optimized microsim_transportables debug microsim_transportablesd -- optimized microsim_actions debug microsim_actionsd -- optimized microsim_traffic_lights debug microsim_traffic_lightsd -- optimized microsim debug microsimd -- optimized mesosim debug mesosimd -- optimized foreign_phemlight debug foreign_phemlightd -- optimized foreign_tcpip debug foreign_tcpipd -- optimized microsim_cfmodels debug microsim_cfmodelsd -- optimized zlibstatic debug zlibstaticd -- optimized xerces-c_3 debug xerces-c_3D -- "-framework CoreServices" -- ) - - elseif(LINUX) - -@@ -251,82 +90,8 @@ elseif(LINUX) - SET(CMAKE_CXX_FLAGS "${CXX_STD_FLAG} -pthread -fPIC -Wl,-strip-all") - endif() - -- set ( OSG_LIBRARIES -- optimized osg debug osgd -- optimized osgViewer debug osgViewerd -- optimized osgDB debug osgDBd -- optimized osgdb_serializers_osgsim debug osgdb_serializers_osgsimd -- optimized osgdb_serializers_osg debug osgdb_serializers_osgd -- optimized osgGA debug osgGAd -- optimized osgText debug osgTextd -- optimized osgSim debug osgSimd -- optimized osgdb_osg debug osgdb_osgd -- optimized osgdb_jpeg debug osgdb_jpegd -- optimized osgUtil debug osgUtild -- optimized osgAnimation debug osgAnimationd -- optimized osg debug osgd -- optimized OpenThreads debug OpenThreadsd -- optimized jpeg debug jpegd -- -- GL -- X11 -- Xrandr -- dl -- z -- Xinerama -- fontconfig -- ) -- -- if (DYN_PROTOBUF) -- set ( OSI_LIBRARIES -- optimized open_simulation_interface debug open_simulation_interfaced -- optimized protobuf debug protobufd -- ) -- else () -- set ( OSI_LIBRARIES -- optimized open_simulation_interface_pic debug open_simulation_interface_picd -- optimized protobuf debug protobufd -- ) -- endif (DYN_PROTOBUF) -- -- set ( SUMO_LIBRARIES -- optimized libsumostatic debug libsumostaticd -- optimized netload debug netloadd -- optimized traciserver debug traciserverd -- optimized libsumostatic debug libsumostaticd -- optimized utils_vehicle debug utils_vehicled -- optimized utils_distribution debug utils_distributiond -- optimized utils_shapes debug utils_shapesd -- optimized utils_options debug utils_optionsd -- optimized utils_xml debug utils_xmld -- optimized utils_geom debug utils_geomd -- optimized utils_common debug utils_commond -- optimized utils_iodevices debug utils_iodevicesd -- optimized utils_traction_wire debug utils_traction_wired -- optimized utils_emissions debug utils_emissionsd -- optimized microsim_engine debug microsim_engined -- optimized microsim_lcmodels debug microsim_lcmodelsd -- optimized microsim_devices debug microsim_devicesd -- optimized microsim_trigger debug microsim_triggerd -- optimized microsim_output debug microsim_outputd -- optimized microsim_transportables debug microsim_transportablesd -- optimized microsim_actions debug microsim_actionsd -- optimized microsim_traffic_lights debug microsim_traffic_lightsd -- optimized microsim debug microsimd -- optimized mesosim debug mesosimd -- optimized foreign_phemlight debug foreign_phemlightd -- optimized foreign_tcpip debug foreign_tcpipd -- optimized microsim_cfmodels debug microsim_cfmodelsd -- optimized zlibstatic debug zlibstaticd -- optimized xerces-c_3 debug xerces-c_3D -- ) -- -- set (GTEST_LIBRARIES -- optimized gmock debug gmockd -- optimized gmock_main debug gmock_maind -- optimized gtest debug gtestd -- optimized gtest_main debug gtest_maind -- ) -+ set ( OSI_LIBRARIES open_simulation_interface::open_simulation_interface ) -+ set ( SUMO_LIBRARIES sumocpp tracicpp ) - - elseif(MSVC) - -@@ -510,61 +275,6 @@ FOREACH(subdir ${SUBDIRS}) - endif () - ENDFOREACH() - -- --# --# Download library and content binary packets --# -- --function (download_and_extract url target_folder target_filename) -- message (STATUS "downloading ${target_filename} ...") -- file (DOWNLOAD ${url} ${target_folder}/${target_filename} STATUS DOWNLOAD_STATUS) -- -- if(DOWNLOAD_STATUS AND NOT DOWNLOAD_STATUS EQUAL 0) -- message(FATAL_ERROR "FAILED to download ${target_filename} (Status: ${DOWNLOAD_STATUS})") -- endif() -- -- execute_process (COMMAND sleep 1) # allow for file to be completely flushed -- -- message (STATUS "extracting ${target_filename} ... ") -- execute_process (COMMAND ${CMAKE_COMMAND} -E tar xfz ${target_filename} WORKING_DIRECTORY ${target_folder} RESULT_VARIABLE STATUS) -- -- if(STATUS AND NOT STATUS EQUAL 0) -- message(FATAL_ERROR "FAILED to unpack ${target_filename}") -- endif() -- -- file (REMOVE ${target_folder}/${target_filename}) --endfunction (download_and_extract) -- --# download OpenSceneGraph --set ( OSG_PACKAGE_FILENAME "osg.7z" ) --if (DEFINED OSG_DIR AND (FORCE_DOWNLOAD_BINARIES OR NOT EXISTS ${OSG_DIR} )) -- download_and_extract( ${OSG_PACKAGE_URL} ${OSG_BASE_DIR} ${OSG_PACKAGE_FILENAME} ) --endif() -- --# download OSI --set ( OSI_PACKAGE_FILENAME "osi.7z" ) --if (DEFINED OSI_DIR AND (FORCE_DOWNLOAD_BINARIES OR NOT EXISTS ${OSI_DIR} )) -- download_and_extract( ${OSI_PACKAGE_URL} ${OSI_BASE_DIR} ${OSI_PACKAGE_FILENAME} ) --endif() -- --# download SUMO --set ( SUMO_PACKAGE_FILENAME "sumo.7z" ) --if (DEFINED SUMO_DIR AND (FORCE_DOWNLOAD_BINARIES OR NOT EXISTS ${SUMO_DIR} )) -- download_and_extract( ${SUMO_PACKAGE_URL} ${SUMO_BASE_DIR} ${SUMO_PACKAGE_FILENAME} ) --endif() -- --# download googletest --if(NOT (APPLE OR MINGW)) # not available for Mac yet -- set ( GTEST_PACKAGE_FILENAME "googletest.7z" ) -- if (DEFINED GTEST_DIR AND (FORCE_DOWNLOAD_BINARIES OR NOT EXISTS ${GTEST_DIR} )) -- download_and_extract( ${GTEST_PACKAGE_URL} ${GTEST_BASE_DIR} ${GTEST_PACKAGE_FILENAME} ) -- endif() --endif() -- --if (DEFINED MODELS_DIR AND (FORCE_DOWNLOAD_BINARIES OR NOT EXISTS ${MODELS_DIR} )) -- download_and_extract(${MODELS_PACKAGE_URL} ${MODELS_BASE_DIR} ${MODELS_PACKAGE_FILENAME}) --endif() -- - add_subdirectory(Applications/odrplot) - add_subdirectory(Applications/replayer) - +@@ -57,9 +57,6 @@ set_folder( + set_folder( + ScenarioEngine + ${ModulesFolder}) +-set_folder( +- Externals +- ${ModulesFolder}) + set_folder( + RoadManager + ${ModulesFolder}) diff --git a/EnvironmentSimulator/Modules/Controllers/ControllerSumo.cpp b/EnvironmentSimulator/Modules/Controllers/ControllerSumo.cpp -index 4c701d94..cb5de5bb 100644 +index 92b40c90..764d2d3b 100644 --- a/EnvironmentSimulator/Modules/Controllers/ControllerSumo.cpp +++ b/EnvironmentSimulator/Modules/Controllers/ControllerSumo.cpp @@ -16,7 +16,6 @@ @@ -467,75 +159,95 @@ index 4c701d94..cb5de5bb 100644 #include <libsumo/Vehicle.h> #include <libsumo/TraCIDefs.h> diff --git a/EnvironmentSimulator/Modules/RoadManager/CMakeLists.txt b/EnvironmentSimulator/Modules/RoadManager/CMakeLists.txt -index e4fad5f1..32d7a79c 100644 +index afb77338..b8beba48 100644 --- a/EnvironmentSimulator/Modules/RoadManager/CMakeLists.txt +++ b/EnvironmentSimulator/Modules/RoadManager/CMakeLists.txt -@@ -2,7 +2,7 @@ - include_directories ( - ${PUGIXML_INCLUDE_DIR} - ${COMMON_MINI_INCLUDE_DIR} -- ${ROADMANAGER_INCLUDE_DIR} -+ ${ROADMANAGER_INCLUDE_DIR} +@@ -20,9 +20,6 @@ set(SOURCES + odrSpiral.cpp + LaneIndependentRouter.cpp) + +-set(SRC_ADDITIONAL +- ${EXTERNALS_PUGIXML_PATH}/pugixml.cpp) +- + source_group( + "External Libraries" + FILES ${SRC_ADDITIONAL}) +@@ -44,6 +41,7 @@ add_library( + target_link_libraries( + ${TARGET} + PRIVATE CommonMini ++ pugixml + # project_options ) - set ( SOURCES -@@ -11,8 +11,6 @@ set ( SOURCES - LaneIndependentRouter.cpp - ) - --set ( SRC_ADDITIONAL ../../../externals/pugixml/pugixml.cpp) -- - SOURCE_GROUP("External Libraries" FILES ${SRC_ADDITIONAL}) +@@ -54,8 +52,7 @@ target_include_directories( + target_include_directories( + ${TARGET} + SYSTEM +- PUBLIC ${EXTERNALS_PUGIXML_PATH} +- ${ROAD_MANAGER_PATH}) ++ PUBLIC ${ROAD_MANAGER_PATH}) - set ( INCLUDES -@@ -25,6 +23,6 @@ if(MSVC) - add_definitions("/wd4482") - endif() - --add_library ( RoadManager STATIC ${SOURCES} ${SRC_ADDITIONAL} ${INCLUDES} ) -+add_library ( RoadManager STATIC ${SOURCES} ${INCLUDES} ) - --target_link_libraries ( RoadManager CommonMini project_options) -\ No newline at end of file -+target_link_libraries ( RoadManager CommonMini pugixml::pugixml project_options) + disable_static_analysis(${TARGET}) + disable_iwyu(${TARGET}) diff --git a/EnvironmentSimulator/Modules/ScenarioEngine/CMakeLists.txt b/EnvironmentSimulator/Modules/ScenarioEngine/CMakeLists.txt -index aec86ad6..86da77c1 100644 +index 5089dfc1..4b95a071 100644 --- a/EnvironmentSimulator/Modules/ScenarioEngine/CMakeLists.txt +++ b/EnvironmentSimulator/Modules/ScenarioEngine/CMakeLists.txt -@@ -5,7 +5,7 @@ include_directories ( - ${ROADMANAGER_INCLUDE_DIR} - ${COMMON_MINI_INCLUDE_DIR} - ${CONTROLLERS_INCLUDE_DIR} -- ${REPLAY_INCLUDE_DIR} -+ ${REPLAY_INCLUDE_DIR} - ${RDB_INCLUDE_DIR} - ${OSI_INCLUDE_DIR} - ${SUMO_INCLUDE_DIR} -@@ -20,20 +20,15 @@ if (NOT USE_OSI) - list(REMOVE_ITEM SRC_SOURCEFILES "${CMAKE_CURRENT_LIST_DIR}/SourceFiles/OSIReporter.cpp") - endif (NOT USE_OSI) - --set ( SRC_ADDITIONAL ../../../externals/pugixml/pugixml.cpp ) -- - SOURCE_GROUP(OSCTypeDefs FILES ${SRC_OSCTYPEDEFS}) - SOURCE_GROUP("Source Files" FILES ${SRC_SOURCEFILES}) - SOURCE_GROUP("External Libraries" FILES ${SRC_ADDITIONAL}) - --add_library ( ScenarioEngine STATIC -- ${SRC_OSCTYPEDEFS} -- ${SRC_SOURCEFILES} -- ${SRC_ADDITIONAL} -+add_library ( ScenarioEngine STATIC -+ ${SRC_OSCTYPEDEFS} -+ ${SRC_SOURCEFILES} - ) - - add_definitions(-D_CRT_SECURE_NO_WARNINGS) - --target_link_libraries(ScenarioEngine PRIVATE project_options) -- -- -+target_link_libraries(ScenarioEngine PRIVATE pugixml::pugixml project_options) +@@ -3,9 +3,6 @@ + set(TARGET + ScenarioEngine) + +-set(EXTERNAL_TARGET +- Externals) +- + # ############################### Loading desired rules ############################################################## + + include(${CMAKE_SOURCE_DIR}/support/cmake/rule/disable_static_analysis.cmake) +@@ -40,26 +37,15 @@ endif( + NOT + USE_OSI) + +-set(SRC_ADDITIONAL +- ${EXTERNALS_PUGIXML_PATH}/pugixml.cpp) +- + source_group( + OSCTypeDefs + FILES ${SRC_OSCTYPEDEFS}) + source_group( + "Source Files" + FILES ${SRC_SOURCEFILES}) +-source_group( +- "External Libraries" +- FILES ${SRC_ADDITIONAL}) + + # ############################### Creating library ################################################################### + +-add_library( +- ${EXTERNAL_TARGET} +- STATIC +- ${SRC_ADDITIONAL}) +- + add_library( + ${TARGET} + STATIC +@@ -68,7 +54,7 @@ add_library( + + target_link_libraries( + ${TARGET} +- PRIVATE project_options) ++ PRIVATE project_options pugixml) + + target_include_directories( + ${TARGET} +@@ -84,7 +70,6 @@ target_include_directories( + PUBLIC ${ROAD_MANAGER_PATH} + ${EXTERNALS_OSI_INCLUDES} + ${EXTERNALS_SUMO_INCLUDES} +- ${EXTERNALS_PUGIXML_PATH} + ${EXTERNALS_EXPR_PATH}) + + target_link_libraries( -- -2.38.1 +2.45.1 diff --git a/gnu/packages/patches/flatpak-fix-fonts-icons.patch b/gnu/packages/patches/flatpak-fix-fonts-icons.patch new file mode 100644 index 0000000000..5b9d855b2e --- /dev/null +++ b/gnu/packages/patches/flatpak-fix-fonts-icons.patch @@ -0,0 +1,89 @@ +modify from https://github.com/NixOS/nixpkgs/pull/262462 + +diff --git a/common/flatpak-run.c b/common/flatpak-run.c +index 94ad013..5c9f55e 100644 +--- a/common/flatpak-run.c ++++ b/common/flatpak-run.c +@@ -871,6 +871,49 @@ out: + return res; + } + ++static void ++get_gnu_closure (GHashTable *closure, const gchar *source_path) ++{ ++ if (g_file_test (source_path, G_FILE_TEST_IS_SYMLINK)) ++ { ++ g_autofree gchar *path = g_malloc(PATH_MAX); ++ realpath(source_path, path); ++ if (g_str_has_prefix(path, "/gnu/store/")) ++ { ++ *strchr(path + strlen("/gnu/store/"), '/') = 0; ++ g_hash_table_add(closure, g_steal_pointer (&path)); ++ } ++ } ++ else if (g_file_test (source_path, G_FILE_TEST_IS_DIR)) ++ { ++ g_autoptr(GDir) dir = g_dir_open(source_path, 0, NULL); ++ const gchar *file_name; ++ while ((file_name = g_dir_read_name(dir))) ++ { ++ g_autofree gchar *path = g_build_filename (source_path, file_name, NULL); ++ get_gnu_closure (closure, path); ++ } ++ } ++} ++ ++static void ++add_gnu_store_symlink_targets (FlatpakBwrap *bwrap, const gchar *source_path) ++{ ++ GHashTable *closure = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); ++ ++ get_gnu_closure(closure, source_path); ++ ++ GHashTableIter iter; ++ gpointer path; ++ g_hash_table_iter_init(&iter, closure); ++ while (g_hash_table_iter_next(&iter, &path, NULL)) ++ { ++ flatpak_bwrap_add_args (bwrap, "--ro-bind", path, path, NULL); ++ } ++ ++ g_hash_table_destroy(closure); ++} ++ + static void + add_font_path_args (FlatpakBwrap *bwrap) + { +@@ -898,6 +946,18 @@ add_font_path_args (FlatpakBwrap *bwrap) + "\t<remap-dir as-path=\"%s\">/run/host/fonts</remap-dir>\n", + SYSTEM_FONTS_DIR); + } ++ else if (g_file_test ("/run/current-system/profile/share/fonts", G_FILE_TEST_EXISTS)) ++ { ++ add_gnu_store_symlink_targets (bwrap, "/run/current-system/profile/share/fonts"); ++ flatpak_bwrap_add_args (bwrap, ++ "--ro-bind", ++ "/run/current-system/profile/share/fonts", ++ "/run/host/fonts", ++ NULL); ++ g_string_append_printf (xml_snippet, ++ "\t<remap-dir as-path=\"%s\">/run/host/fonts</remap-dir>\n", ++ "/run/current-system/profile/share/fonts"); ++ } + + if (g_file_test ("/usr/local/share/fonts", G_FILE_TEST_EXISTS)) + { +@@ -998,6 +1058,13 @@ add_icon_path_args (FlatpakBwrap *bwrap) + "--ro-bind", "/usr/share/icons", "/run/host/share/icons", + NULL); + } ++ else if (g_file_test ("/run/current-system/profile/share/icons", G_FILE_TEST_IS_DIR)) ++ { ++ add_gnu_store_symlink_targets (bwrap, "/run/current-system/profile/share/icons"); ++ flatpak_bwrap_add_args (bwrap, ++ "--ro-bind", "/run/current-system/profile/share/icons", "/run/host/share/icons", ++ NULL); ++ } + + user_icons_path = g_build_filename (g_get_user_data_dir (), "icons", NULL); + user_icons = g_file_new_for_path (user_icons_path); diff --git a/gnu/packages/patches/freecad-vtk-9.3.patch b/gnu/packages/patches/freecad-vtk-9.3.patch new file mode 100644 index 0000000000..af9d654046 --- /dev/null +++ b/gnu/packages/patches/freecad-vtk-9.3.patch @@ -0,0 +1,43 @@ +From d0fb2b8b29fe0428d9dd8aa790b0d6e45c8a9516 Mon Sep 17 00:00:00 2001 +From: Adrian Insaurralde Avalos <adrianinsaval@gmail.com> +Date: Wed, 22 Nov 2023 16:42:06 -0300 +Subject: [PATCH] 3rdPart/salomesmesh - fix for vtk 9.3 compatibility + +minimum required version is 7.1 +--- + src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx | 4 ---- + src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp | 5 +++++ + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx +index 7f89573efd0d..47a52fe585fe 100644 +--- a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx ++++ b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx +@@ -39,10 +39,6 @@ + #define SMDS_EXPORT + #endif + +-#ifdef VTK_HAS_MTIME_TYPE + #define VTK_MTIME_TYPE vtkMTimeType +-#else +-#define VTK_MTIME_TYPE unsigned long +-#endif + + #endif +diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp +index 7e3de0070a02..e9895d615717 100644 +--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp ++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp +@@ -1026,7 +1026,12 @@ void SMDS_UnstructuredGrid::BuildLinks() + GetLinks()->Allocate(this->GetNumberOfPoints()); + GetLinks()->Register(this); + //FIXME: vtk9 ++ #if VTK_VERSION_NUMBER < VTK_VERSION_CHECK(9,3,0) + GetLinks()->BuildLinks(this); ++ #else ++ GetLinks()->SetDataSet(this); ++ GetLinks()->BuildLinks(); ++ #endif + GetLinks()->Delete(); + #else + this->Links = SMDS_CellLinks::New();
\ No newline at end of file diff --git a/gnu/packages/patches/ghc-9.2-cabal-support-package-path.patch b/gnu/packages/patches/ghc-9.2-cabal-support-package-path.patch new file mode 100644 index 0000000000..9e4c405c50 --- /dev/null +++ b/gnu/packages/patches/ghc-9.2-cabal-support-package-path.patch @@ -0,0 +1,67 @@ +Without this patch, Cabal terminates if GHC_PACKAGE_PATH is set. This is +an annoyance with Guix as it makes heavy use of GHC_PACKAGE_PATH to have +GHC pickup Haskell package installed via Guix. Therefore, Cabal does +presently not work by default in environments created by Guix. This is +a workaround which makes Cabal respect GHC_PACKAGE_PATH. + +Taken from https://github.com/haskell/cabal/issues/3728 + +diff -upr a/libraries/Cabal/Cabal/src/Distribution/Simple/GHC.hs b/libraries/Cabal/Cabal/src/Distribution/Simple/GHC.hs +--- a/libraries/Cabal/Cabal/src/Distribution/Simple/GHC.hs 2022-11-06 20:41:17.000000000 +0100 ++++ b/libraries/Cabal/Cabal/src/Distribution/Simple/GHC.hs 2023-12-18 14:34:15.148911717 +0100 +@@ -71,6 +71,7 @@ module Distribution.Simple.GHC ( + ) where + + import Prelude () ++import Distribution.Compat.Environment (lookupEnv) + import Distribution.Compat.Prelude + + import qualified Distribution.Simple.GHC.Internal as Internal +@@ -117,7 +118,7 @@ import System.Directory + , canonicalizePath, removeFile, renameFile, getDirectoryContents ) + import System.FilePath ( (</>), (<.>), takeExtension + , takeDirectory, replaceExtension +- ,isRelative ) ++ , isRelative, searchPathSeparator ) + import qualified System.Info + #ifndef mingw32_HOST_OS + import System.Posix (createSymbolicLink) +@@ -333,9 +334,11 @@ getInstalledPackages :: Verbosity -> Com + -> ProgramDb + -> IO InstalledPackageIndex + getInstalledPackages verbosity comp packagedbs progdb = do +- checkPackageDbEnvVar verbosity + checkPackageDbStack verbosity comp packagedbs +- pkgss <- getInstalledPackages' verbosity packagedbs progdb ++ envPackageDBs <- ++ maybe [] (map SpecificPackageDB . unintersperse searchPathSeparator) ++ <$> lookupEnv "GHC_PACKAGE_PATH" ++ pkgss <- getInstalledPackages' verbosity (envPackageDBs ++ packagedbs) progdb + index <- toPackageIndex verbosity pkgss progdb + return $! hackRtsPackage index + +@@ -405,10 +408,6 @@ getUserPackageDB _verbosity ghcProg plat + packageConfFileName = "package.conf.d" + ghcVersion = fromMaybe (error "GHC.getUserPackageDB: no ghc version") $ programVersion ghcProg + +-checkPackageDbEnvVar :: Verbosity -> IO () +-checkPackageDbEnvVar verbosity = +- Internal.checkPackageDbEnvVar verbosity "GHC" "GHC_PACKAGE_PATH" +- + checkPackageDbStack :: Verbosity -> Compiler -> PackageDBStack -> IO () + checkPackageDbStack verbosity comp = + if flagPackageConf implInfo +@@ -461,8 +460,11 @@ getInstalledPackagesMonitorFiles :: Verb + -> ProgramDb + -> [PackageDB] + -> IO [FilePath] +-getInstalledPackagesMonitorFiles verbosity platform progdb = +- traverse getPackageDBPath ++getInstalledPackagesMonitorFiles verbosity platform progdb packageDBs = do ++ envPackageDBs <- ++ maybe [] (map SpecificPackageDB . unintersperse searchPathSeparator) ++ <$> lookupEnv "GHC_PACKAGE_PATH" ++ traverse getPackageDBPath (envPackageDBs ++ packageDBs) + where + getPackageDBPath :: PackageDB -> IO FilePath + getPackageDBPath GlobalPackageDB = diff --git a/gnu/packages/patches/ghc-aeson-encodeDouble.patch b/gnu/packages/patches/ghc-aeson-encodeDouble.patch new file mode 100644 index 0000000000..11ad425eae --- /dev/null +++ b/gnu/packages/patches/ghc-aeson-encodeDouble.patch @@ -0,0 +1,25 @@ +From 58766a1916b4980792763bab74f0c86e2a7ebf20 Mon Sep 17 00:00:00 2001 +From: Oleg Grenrus <oleg.grenrus@iki.fi> +Date: Thu, 1 Jun 2023 22:58:28 +0300 +Subject: [PATCH] QC-2.14.3 Double generators generates infinite number too + +--- + tests/PropUtils.hs | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/tests/PropUtils.hs b/tests/PropUtils.hs +index 3c449029a..43de85d7f 100644 +--- a/tests/PropUtils.hs ++++ b/tests/PropUtils.hs +@@ -51,8 +51,9 @@ import qualified Data.Aeson.Decoding as Dec + + encodeDouble :: Double -> Double -> Property + encodeDouble num denom +- | isInfinite d || isNaN d = encode d === "null" +- | otherwise = (read . L.unpack . encode) d === d ++ | isNaN d = encode d === "null" ++ | isInfinite d = if d > 0 then encode d === "\"+inf\"" else encode d === "\"-inf\"" ++ | otherwise = (read . L.unpack . encode) d === d + where d = num / denom + + encodeInteger :: Integer -> Property diff --git a/gnu/packages/patches/ghc-clock-realfrag.patch b/gnu/packages/patches/ghc-clock-realfrag.patch new file mode 100644 index 0000000000..0f7bb0542a --- /dev/null +++ b/gnu/packages/patches/ghc-clock-realfrag.patch @@ -0,0 +1,22 @@ +From 8372e801ef062223756db69818a7b60cfd9bb066 Mon Sep 17 00:00:00 2001 +From: amesgen <amesgen@amesgen.de> +Date: Tue, 8 Aug 2023 23:36:45 +0200 +Subject: [PATCH] Fix `RealFrac Seconds` instance + +--- + System/Clock/Seconds.hs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/System/Clock/Seconds.hs b/System/Clock/Seconds.hs +index a9a1c78..f7457cb 100644 +--- a/System/Clock/Seconds.hs ++++ b/System/Clock/Seconds.hs +@@ -50,7 +50,7 @@ instance Fractional Seconds where + + instance RealFrac Seconds where + properFraction (Seconds (TimeSpec s ns)) +- | s >= 0 = (fromIntegral s, Seconds $ TimeSpec 0 ns) ++ | s >= 0 || ns == 0 = (fromIntegral s, Seconds $ TimeSpec 0 ns) + | otherwise = (fromIntegral (s+1), Seconds $ TimeSpec (-1) ns) + + -- | The 'getTime' function shall return the current value for the diff --git a/gnu/packages/patches/gnulib-bootstrap.patch b/gnu/packages/patches/gnulib-bootstrap.patch new file mode 100644 index 0000000000..c0c9a5e732 --- /dev/null +++ b/gnu/packages/patches/gnulib-bootstrap.patch @@ -0,0 +1,75 @@ +From adbf7ce2c2b03ce5ee25d4c68f9bb247b0dcbc2b Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer <maxim.cournoyer@gmail.com> +Date: Thu, 30 May 2024 14:48:04 -0400 +Subject: [PATCH] bootstrap: Use gnulib-tool from PATH if available. + +Some distributions such as GNU Guix include in their package for +gnulib a 'gnulib-tool' command under their $bindir +prefix (e.g. '/bin') for users to use, along the unmodified full +sources. The idea is that any wrapping or distribution modifications +for the *execution* of the script at run time is done on these +commands, while the rest of the source should be in their +pristine (unmodified) version. Adjust the 'gnulib-tool' discovery +mechanism to support such installation layout. + +* build-aux/bootstrap (autogen) <gnulib_tool>: Prefer to use from +PATH, else from $GNULIB_SRCDIR/../../bin/gnulib-tool, else from +$GNULIB_SRCDIR/gnulib-tool. +* gnulib-tool.sh (func_gnulib_dir): Honor GNULIB_SRCDIR to locate +gnulib's main directory. +--- + build-aux/bootstrap | 11 +++++++++-- + gnulib-tool.sh | 6 +++++- + 2 files changed, 14 insertions(+), 3 deletions(-) + +diff --git a/build-aux/bootstrap b/build-aux/bootstrap +index 6295b8a128..06271eea8b 100755 +--- a/build-aux/bootstrap ++++ b/build-aux/bootstrap +@@ -3,7 +3,7 @@ + + # Bootstrap this package from checked-out sources. + +-scriptversion=2024-04-13.15; # UTC ++scriptversion=2024-05-30.20; # UTC + + # Copyright (C) 2003-2024 Free Software Foundation, Inc. + # +@@ -1164,7 +1164,14 @@ autogen() + fi + + if $use_gnulib; then +- gnulib_tool=$GNULIB_SRCDIR/gnulib-tool ++ gnulib_tool=$(command -v gnulib-tool) ++ if test -x "$gnulib_tool"; then ++ : # done ++ elif test -x $GNULIB_SRCDIR/../../bin/gnulib-tool; then ++ gnulib_tool=$GNULIB_SRCDIR/../../bin/gnulib-tool ++ else ++ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool ++ fi + <$gnulib_tool || return + fi + +diff --git a/gnulib-tool.sh b/gnulib-tool.sh +index 12f0b82461..0aefbe2b2b 100755 +--- a/gnulib-tool.sh ++++ b/gnulib-tool.sh +@@ -518,7 +518,11 @@ func_gnulib_dir () + * ) self_abspathname=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`/"$linkval" ;; + esac + done +- gnulib_dir=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'` ++ if test -n "$GNULIB_SRCDIR"; then ++ gnulib_dir=$GNULIB_SRCDIR ++ else ++ gnulib_dir=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'` ++ fi + } + + # func_tmpdir + +base-commit: ac4b301ae15223c98b51cd5a0eda2e2cf57c817b +-- +2.41.0 + diff --git a/gnu/packages/patches/grub-ignore-metadata-csum-seed.patch b/gnu/packages/patches/grub-ignore-metadata-csum-seed.patch deleted file mode 100644 index cd9b897aa6..0000000000 --- a/gnu/packages/patches/grub-ignore-metadata-csum-seed.patch +++ /dev/null @@ -1,54 +0,0 @@ -commit 7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763 -Author: Javier Martinez Canillas <javierm@redhat.com> -Date: Fri Jun 11 21:36:16 2021 +0200 - - fs/ext2: Ignore checksum seed incompat feature - - This incompat feature is used to denote that the filesystem stored its - metadata checksum seed in the superblock. This is used to allow tune2fs - changing the UUID on a mounted metdata_csum filesystem without having - to rewrite all the disk metadata. However, the GRUB doesn't use the - metadata checksum at all. So, it can just ignore this feature if it - is enabled. This is consistent with the GRUB filesystem code in general - which just does a best effort to access the filesystem's data. - - The checksum seed incompat feature has to be removed from the ignore - list if the support for metadata checksum verification is added to the - GRUB ext2 driver later. - - Suggested-by: Eric Sandeen <esandeen@redhat.com> - Suggested-by: Lukas Czerner <lczerner@redhat.com> - Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> - Reviewed-by: Lukas Czerner <lczerner@redhat.com> - Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> - -diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c -index e7dd78e66..4953a1591 100644 ---- a/grub-core/fs/ext2.c -+++ b/grub-core/fs/ext2.c -@@ -103,6 +103,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); - #define EXT4_FEATURE_INCOMPAT_64BIT 0x0080 - #define EXT4_FEATURE_INCOMPAT_MMP 0x0100 - #define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200 -+#define EXT4_FEATURE_INCOMPAT_CSUM_SEED 0x2000 - #define EXT4_FEATURE_INCOMPAT_ENCRYPT 0x10000 - - /* The set of back-incompatible features this driver DOES support. Add (OR) -@@ -123,10 +124,15 @@ GRUB_MOD_LICENSE ("GPLv3+"); - * mmp: Not really back-incompatible - was added as such to - * avoid multiple read-write mounts. Safe to ignore for this - * RO driver. -+ * checksum seed: Not really back-incompatible - was added to allow tools -+ * such as tune2fs to change the UUID on a mounted metadata -+ * checksummed filesystem. Safe to ignore for now since the -+ * driver doesn't support checksum verification. However, it -+ * has to be removed from this list if the support is added later. - */ - #define EXT2_DRIVER_IGNORED_INCOMPAT ( EXT3_FEATURE_INCOMPAT_RECOVER \ -- | EXT4_FEATURE_INCOMPAT_MMP) -- -+ | EXT4_FEATURE_INCOMPAT_MMP \ -+ | EXT4_FEATURE_INCOMPAT_CSUM_SEED) - - #define EXT3_JOURNAL_MAGIC_NUMBER 0xc03b3998U - diff --git a/gnu/packages/patches/libvpx-CVE-2023-44488.patch b/gnu/packages/patches/libvpx-CVE-2023-44488.patch new file mode 100644 index 0000000000..4ebb034eb4 --- /dev/null +++ b/gnu/packages/patches/libvpx-CVE-2023-44488.patch @@ -0,0 +1,107 @@ +From the upstream repo, can be removed after 1.14.1 +https://github.com/webmproject/libvpx/commit/df9fd9d5b7325060b2b921558a1eb20ca7880937.patch +https://www.openwall.com/lists/oss-security/2023/09/30/4 + +The test change didn't apply so it was removed from the patch + +From df9fd9d5b7325060b2b921558a1eb20ca7880937 Mon Sep 17 00:00:00 2001 +From: Jerome Jiang <jianj@google.com> +Date: Thu, 30 Jun 2022 13:48:56 -0400 +Subject: [PATCH] Fix bug with smaller width bigger size + +Fixed previous patch that clusterfuzz failed on. + +Local fuzzing passing overnight. + +Bug: webm:1642 +Change-Id: If0e08e72abd2e042efe4dcfac21e4cc51afdfdb9 +(cherry picked from commit 263682c9a29395055f3b3afe2d97be1828a6223f) +--- + test/resize_test.cc | 11 +++-------- + vp9/common/vp9_alloccommon.c | 13 ++++++------- + vp9/encoder/vp9_encoder.c | 27 +++++++++++++++++++++++++-- + 3 files changed, 34 insertions(+), 17 deletions(-) + +diff --git a/vp9/common/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c +index e53883f621d..9e73e40ea09 100644 +--- a/vp9/common/vp9_alloccommon.c ++++ b/vp9/common/vp9_alloccommon.c +@@ -135,13 +135,6 @@ int vp9_alloc_context_buffers(VP9_COMMON *cm, int width, int height) { + cm->free_mi(cm); + if (cm->alloc_mi(cm, new_mi_size)) goto fail; + } +- +- if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) { +- // Create the segmentation map structure and set to 0. +- free_seg_map(cm); +- if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail; +- } +- + if (cm->above_context_alloc_cols < cm->mi_cols) { + vpx_free(cm->above_context); + cm->above_context = (ENTROPY_CONTEXT *)vpx_calloc( +@@ -156,6 +149,12 @@ int vp9_alloc_context_buffers(VP9_COMMON *cm, int width, int height) { + cm->above_context_alloc_cols = cm->mi_cols; + } + ++ if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) { ++ // Create the segmentation map structure and set to 0. ++ free_seg_map(cm); ++ if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail; ++ } ++ + if (vp9_alloc_loop_filter(cm)) goto fail; + + return 0; +diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c +index b66fdc0bca3..e3850775455 100644 +--- a/vp9/encoder/vp9_encoder.c ++++ b/vp9/encoder/vp9_encoder.c +@@ -1973,6 +1973,17 @@ static void alloc_copy_partition_data(VP9_COMP *cpi) { + } + } + ++static void free_copy_partition_data(VP9_COMP *cpi) { ++ vpx_free(cpi->prev_partition); ++ cpi->prev_partition = NULL; ++ vpx_free(cpi->prev_segment_id); ++ cpi->prev_segment_id = NULL; ++ vpx_free(cpi->prev_variance_low); ++ cpi->prev_variance_low = NULL; ++ vpx_free(cpi->copied_frame_cnt); ++ cpi->copied_frame_cnt = NULL; ++} ++ + void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) { + VP9_COMMON *const cm = &cpi->common; + RATE_CONTROL *const rc = &cpi->rc; +@@ -2052,6 +2063,8 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) { + new_mi_size = cm->mi_stride * calc_mi_size(cm->mi_rows); + if (cm->mi_alloc_size < new_mi_size) { + vp9_free_context_buffers(cm); ++ vp9_free_pc_tree(&cpi->td); ++ vpx_free(cpi->mbmi_ext_base); + alloc_compressor_data(cpi); + realloc_segmentation_maps(cpi); + cpi->initial_width = cpi->initial_height = 0; +@@ -2070,8 +2083,18 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) { + update_frame_size(cpi); + + if (last_w != cpi->oxcf.width || last_h != cpi->oxcf.height) { +- memset(cpi->consec_zero_mv, 0, +- cm->mi_rows * cm->mi_cols * sizeof(*cpi->consec_zero_mv)); ++ vpx_free(cpi->consec_zero_mv); ++ CHECK_MEM_ERROR( ++ cm, cpi->consec_zero_mv, ++ vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(*cpi->consec_zero_mv))); ++ ++ vpx_free(cpi->skin_map); ++ CHECK_MEM_ERROR( ++ cm, cpi->skin_map, ++ vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(cpi->skin_map[0]))); ++ ++ free_copy_partition_data(cpi); ++ alloc_copy_partition_data(cpi); + if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ) + vp9_cyclic_refresh_reset_resize(cpi); + rc->rc_1_frame = 0; diff --git a/gnu/packages/patches/openresolv-restartcmd-guix.patch b/gnu/packages/patches/openresolv-restartcmd-guix.patch index ad70ebd6f2..29a91fe595 100644 --- a/gnu/packages/patches/openresolv-restartcmd-guix.patch +++ b/gnu/packages/patches/openresolv-restartcmd-guix.patch @@ -1,4 +1,4 @@ -From 7f0ce36828ec1e130bee857b8236ca091e4d8a2c Mon Sep 17 00:00:00 2001 +From 439266671bbd790b3cb339c157c87db382e85c96 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire <brice@waegenei.re> Date: Sat, 9 May 2020 15:52:06 +0200 Subject: [PATCH] Add RESTARTCMD for Guix System. @@ -12,13 +12,13 @@ to do it on Guix System by using shepherd. 1 file changed, 7 insertions(+) diff --git a/resolvconf.in b/resolvconf.in -index 3cad04d..5ef5294 100644 +index aa77ffe..921882e 100644 --- a/resolvconf.in +++ b/resolvconf.in -@@ -369,6 +369,13 @@ detect_init() - then - /etc/rc.d/$1 restart +@@ -375,6 +375,13 @@ detect_init() fi' + elif [ -d /etc/dinit.d ] && command -v dinitctl >/dev/null 2>&1; then + RESTARTCMD='dinitctl --quiet restart --ignore-unstarted $1' + elif [ -e /gnu/store ] && [ -e /run/current-system/profile ]; then + # Guix System + RESTARTCMD=' @@ -30,5 +30,5 @@ index 3cad04d..5ef5294 100644 for x in /etc/init.d/rc.d /etc/rc.d /etc/init.d; do [ -d $x ] || continue -- -2.26.0 +2.41.0 diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 5d6675b7e2..e69721ef10 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -818,14 +818,14 @@ a complete panorama and stitch any series of overlapping pictures.") (define-public rawtherapee (package (name "rawtherapee") - (version "5.9") + (version "5.10") (source (origin (method url-fetch) (uri (string-append "https://rawtherapee.com/shared/source/" "rawtherapee-" version ".tar.xz")) (sha256 (base32 - "08s81mxnrj183bss2rb0hac1qyn7bmcnk3x2ymg1cp0q5322ibwf")))) + "1nnjxc6xyfn1biys5hynsd21rny5r7zl5qvr2hhlmfjdslybb6d7")))) (build-system cmake-build-system) (arguments (list @@ -848,6 +848,7 @@ a complete panorama and stitch any series of overlapping pictures.") (list pkg-config)) (inputs (list expat + exiv2 fftwf glib glibmm diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 72201770c7..e5e766f576 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -62,7 +62,7 @@ (define-public php (package (name "php") - (version "8.3.6") + (version "8.3.8") (home-page "https://www.php.net/") (source (origin (method url-fetch) @@ -70,7 +70,7 @@ "php-" version ".tar.xz")) (sha256 (base32 - "1bjygxjaqmvccyk4ic3lrca5j34f0pjb6f1ldmi9gbr345mkij2k")) + "1mxqbfp1jlrqc72wym798wyi6nckbc0cjl6kpg147yc6c6smi8xf")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index c7d4b15c4a..59901caa47 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -67,14 +67,14 @@ (define-public asymptote (package (name "asymptote") - (version "2.89") + (version "2.90") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/asymptote/" version "/asymptote-" version ".src.tgz")) (sha256 - (base32 "0nvzlnabxjn74ybv3jns9vsr33prlvlg3i20hskz31agxss64kpn")) + (base32 "0h3kf0jajn67izpg6h1bi50qrsdslr7mnacp4j7lmx4bh3xmcscc")) (modules '((guix build utils))) (snippet ;; Remove bundled RapidJSON. @@ -108,7 +108,8 @@ texlive-ocgx2 texlive-parskip texlive-pdftexcmds - texlive-texinfo)))) + texlive-texinfo + texlive-type1cm)))) (inputs (list bash-minimal eigen diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index 79658208e5..a5e68964f9 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -180,7 +180,7 @@ it.") (define-public trealla (package (name "trealla") - (version "2.52.35") + (version "2.53.10") (source (origin (method git-fetch) @@ -189,7 +189,7 @@ it.") (url "https://github.com/trealla-prolog/trealla") (commit (string-append "v" version)))) (sha256 - (base32 "1qak8jj57kvy1v4gy19cvq6yxzn67md54d1qc3a95aihnsk0mz8j")) + (base32 "15lbzbqsam4832jnynsj7ksn17xrwqwdhs66ajpi4jf8hy4bqh15")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs diff --git a/gnu/packages/purescript.scm b/gnu/packages/purescript.scm index ef58ecbf82..245d6ca79c 100644 --- a/gnu/packages/purescript.scm +++ b/gnu/packages/purescript.scm @@ -109,7 +109,8 @@ (lambda _ (substitute* "purescript.cabal" (("\\b(language-javascript|process)\\s+[^,]+" all dep) - dep)))) + dep) + (("happy:happy ==1.20.0") "happy:happy")))) (add-after 'register 'remove-libraries (lambda _ (delete-file-recursively diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 1890042420..fb83031094 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -2310,6 +2310,35 @@ execution of a test suite. It will also store a history of all test runs to help in debugging failures and optimizing the scheduler to improve speed.") (license license:asl2.0))) +(define-public python-pytest-subprocess + (package + (name "python-pytest-subprocess") + (version "1.5.0") + (source + (origin + (method git-fetch) ;no tests in PyPI archive + (uri (git-reference + (url "https://github.com/aklajnert/pytest-subprocess") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "103nxv37sjvxlwmw87hxsrphkxkryv4dgb65kjjfr4722r37vmxv")))) + (build-system pyproject-build-system) + (native-inputs (list python-anyio + python-coverage + python-docutils + python-nox + python-pygments + python-pytest + python-pytest-asyncio + python-pytest-rerunfailures)) + (home-page "https://github.com/aklajnert/pytest-subprocess") + (synopsis "Fake subprocess for Pytest") + (description + "This package provides a plugin to fake subprocess for Pytest.") + (license license:expat))) + ;; This is only used by python-sanic (define-public python-pytest-sanic (package diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 58b7f3b3ee..82089da775 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -1495,6 +1495,32 @@ evaluating arrays of polynomials based on @code{numpy.ndarray objects}.") (supported-systems '("x86_64-linux" "aarch64-linux" "powerpc64le-linux")) (license license:bsd-2))) +(define-public python-spin + (package + (name "python-spin") + (version "0.8") + (source + (origin + (method url-fetch) + (uri (pypi-uri "spin" version)) + (sha256 + (base32 "0ff48nagfaai3j26g1db4zq2bwdv6kj5l7xhcs2l9kzg7qzrmhr7")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-click python-colorama python-tomli)) + (native-inputs (list python-pytest)) + (home-page "https://github.com/scientific-python/spin") + (synopsis "Developer tool for scientific Python libraries") + (description "@code{spin} is a simple interface for common development +tasks. It comes with a few common build commands out the box, but can +easily be customized per project. + +The impetus behind developing the tool was the mass migration of scientific +Python libraries (SciPy, scikit-image, and NumPy, etc.) to Meson, after +distutils was deprecated. When many of the build and installation commands +changed, it made sense to abstract away the nuisance of having to re-learn +them.") + (license license:bsd-3))) + (define-public python-baycomp (package (name "python-baycomp") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9ad89b8c32..ff507e1855 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -32301,6 +32301,106 @@ a console. It provides a collection of ‘print’ functions that allow you to cleanly print different types of messages.") (license license:gpl3+))) +(define-public python-userpath + (package + (name "python-userpath") + (version "1.9.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "userpath" version)) + (sha256 + (base32 "05fqxzdi27vqm5lywxs6bm2j4d8k91fx2ihqhg65g4h6mf6jhlkc")))) + (build-system pyproject-build-system) + (arguments + ;; See https://github.com/ofek/userpath/issues/43. + ;; In Guix, tests try to find the temporary build directory in PATH, but + ;; only the store output is present. + (list #:tests? #f)) + (native-inputs (list python-hatchling python-pytest)) + (propagated-inputs (list python-click)) + (home-page "https://github.com/ofek/userpath") + (synopsis "Add locations to the user's PATH") + (description "This package provides a tool for modifying a user's PATH.") + (license license:expat))) + +(define-public hatch + (package + (name "hatch") + (version "1.7.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "hatch" version)) + (sha256 + (base32 "0ipvj1pxdb6wb1sblh22h9gnh6byjnwcl7hfcnk88dmkslgp1z3s")) + (modules '((guix build utils))) + (snippet '(substitute* "pyproject.toml" + ;; We have virtualenv 20.3.1. + (("virtualenv>=20.16.2") + "virtualenv>=20.3.1"))))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + ;; XXX: tests below fail due to zipfile reporting incorrect zip dates. + #~(list "-k" + (string-append + "not " + (string-join + (list "test_default" + "test_explicit_path" + "test_editable_default" + "test_editable_default_dependencies" + "test_editable_default_force_include" + "test_editable_default_force_include_option" + "test_editable_exact" + "test_editable_exact_extra_dependencies" + "test_editable_exact_force_include" + "test_editable_exact_force_include_option" + "test_editable_exact_force_include_build_data_precedence" + "test_editable_pth") + " and not "))) + #:phases #~(modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + (setenv "HOME" "/tmp")))))) + (native-inputs (list git-minimal + python-pytest + python-pytest-mock + python-pytest-xdist)) + (propagated-inputs (list python-click + python-hatchling + python-httpx + python-hyperlink + python-keyring + python-packaging + python-pexpect + python-platformdirs + python-pyperclip + python-rich + python-shellingham + python-tomli-w + python-tomlkit + python-userpath + python-virtualenv)) + (home-page "https://hatch.pypa.io/latest/") + (synopsis "Python project management") + (description "Hatch is a modern, extensible Python project manager. + +Features + +@itemize +@item Standardized build system with reproducible builds by default +@item Robust environment management with support for custom scripts +@item Configurable Python distribution management +@item Easy publishing to PyPI or other indexes +@item Version management +@item Configurable project generation with sane defaults +@item Responsive CLI, ~2-3x faster than equivalent tools +@end itemize") + (license license:expat))) + (define-public python-nestedtext (package (name "python-nestedtext") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 1416c3a36c..1074c29063 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -5416,6 +5416,7 @@ including @i{fix-its} for automatic refactoring.") (sha256 (base32 "1lgk547pvg31zzqra7gn9gsszm5wrwxiw06crbr5n2kqfavk9r22")))) + (outputs '("out" "debug")) (build-system qt-build-system) (arguments (list diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 56e674a8ed..db8b2c9de6 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2022 Ryan Tolboom <ryan@using.tech> ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2024 Andy Tai <atai@atai.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,6 +41,7 @@ #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages algebra) + #:use-module (gnu packages assembly) #:use-module (gnu packages astronomy) #:use-module (gnu packages audio) #:use-module (gnu packages avahi) @@ -793,7 +795,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") (define-public gnuradio (package (name "gnuradio") - (version "3.10.8.0") + (version "3.10.10.0") (source (origin (method git-fetch) @@ -802,7 +804,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "11p08qrbfh5dz6l5n4c2g8c2gv1qq8aiydq91ryzfzgp49r0j6p0")))) + (base32 "1jq94nycccpgw2cc39hgixjq7cqdw836bnz0fvmynfg3f22mcid4")))) (build-system cmake-build-system) (native-inputs (list doxygen @@ -3043,10 +3045,43 @@ protocol investigation with native support for many common Software Defined Radios.") (license license:gpl3+))) +(define-public volk-gnsssdr + (package + (name "volk-gnsssdr") + (version "0.0.19") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gnss-sdr/gnss-sdr") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0l1hqfqh8ffgy6nxqdk390vmnmhv66x7m8323mz2izczqc5acy1p")))) + (build-system cmake-build-system) + (native-inputs (list python python-mako)) + (inputs (list cpu-features)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr")))))) + (home-page "https://github.com/gnss-sdr/gnss-sdr/blob/main/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/") + (synopsis "Extra VOLK kernels for GNSS-SDR") + (description + "This library contains VOLK kernels of hand-written SIMD code for +different mathematical operations used by GNSS-SDR, mainly with 8-bit and +16-bit real and complex data types, offering a platform/architecture agnostic +version that will run in all machines, plus other versions for different SIMD +instruction sets.") + (license license:gpl3+))) + (define-public gnss-sdr (package (name "gnss-sdr") - (version "0.0.17") + (version "0.0.19") (source (origin (method git-fetch) @@ -3055,7 +3090,7 @@ Radios.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0kxn98vmrsd2a157cf3hsmivi6p4k4a3907j5w8hmcs0nn92786i")))) + (base32 "0l1hqfqh8ffgy6nxqdk390vmnmhv66x7m8323mz2izczqc5acy1p")))) (build-system cmake-build-system) (native-inputs `(("googletest-source" ,(package-source googletest)) @@ -3066,11 +3101,14 @@ Radios.") (inputs (list armadillo boost + cpu-features fmt gflags glog gmp gnuradio + gnuplot + gnutls gr-osmosdr libpcap log4cpp @@ -3080,11 +3118,14 @@ Radios.") protobuf pugixml spdlog - volk)) + volk + volk-gnsssdr)) (arguments `(#:configure-flags (list "-DENABLE_GENERIC_ARCH=ON" "-DENABLE_OSMOSDR=ON" + + "-DENABLE_UNIT_TESTING=FALSE" ; many tests needing data download "-DBLA_VENDOR=OpenBLAS" (string-append "-DGFLAGS_ROOT=" (assoc-ref %build-inputs "gflags")) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 60aa9b1ea0..a385344473 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -948,6 +948,69 @@ safety and thread safety guarantees.") (inherit (package-source base-rust)) (patches '())))))) +(define-public rust-1.76 + (let ((base-rust (rust-bootstrapped-package rust-1.75 "1.76.0" + "08f06shp6l72qrv5fwg1is7yzr6kwj8av0l9h5k243bz781zyp4y"))) + (package + (inherit base-rust) + ;; Need llvm >= 16.0 + (inputs (modify-inputs (package-inputs base-rust) + (replace "llvm" llvm-17)))))) + +(define-public rust-1.77 + (let ((base-rust (rust-bootstrapped-package rust-1.76 "1.77.0" + "11rda8d8qj24a5mkjzj1x6x9pkvaq0zlhkgdp5b39zj5m0gwsv0d"))) + (package + (inherit base-rust) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'configure 'no-optimized-compiler-builtins + (lambda _ + ;; Pre-1.77, the behavior was equivalent to this flag being + ;; "false" if the llvm-project submodule wasn't checked out. + ;; + ;; Now there's an explicit check, so the build fails if we don't + ;; manually disable this (given that we don't have the submodule checked out). + ;; Thus making the build behave the same as it did in 1.76 and earlier. + ;; + ;; TODO - make the build system depend on system llvm for this, so we + ;; can get the performance benefits of setting this to true? + (substitute* "config.toml" + (("\\[build\\]") + "[build]\noptimized-compiler-builtins = false"))))))))))) + +(define-public rust-1.78 + (rust-bootstrapped-package + rust-1.77 "1.78.0" "1afmj5g3bz7439w4i8zjhd68zvh0gqg7ymr8h5rz49ybllilhm7z")) + +(define-public rust-1.79 + (let ((base-rust (rust-bootstrapped-package rust-1.78 "1.79.0" + "1h282jb1yxc69999w4nhvqb08rw2jy32i9njdjqrz78zglycybhp"))) + (package + (inherit base-rust) + (source + (origin + (inherit (package-source base-rust)) + (snippet + '(begin + (for-each delete-file-recursively + '("src/llvm-project" + "vendor/jemalloc-sys-0.5.4+5.3.0-patched/jemalloc" + "vendor/openssl-src-111.28.1+1.1.1w/openssl" + "vendor/tikv-jemalloc-sys-0.5.4+5.3.0-patched/jemalloc")) + ;; Remove vendored dynamically linked libraries. + ;; find . -not -type d -executable -exec file {} \+ | grep ELF + ;; Also remove the bundled (mostly Windows) libraries. + (for-each delete-file + (find-files "vendor" "\\.(a|dll|exe|lib)$")) + ;; Adjust vendored dependency to explicitly use rustix with libc backend. + (substitute* '("vendor/tempfile-3.7.1/Cargo.toml" + "vendor/tempfile-3.10.1/Cargo.toml") + (("features = \\[\"fs\"" all) + (string-append all ", \"use-libc\"")))))))))) + (define (make-ignore-test-list strs) "Function to make creating a list to ignore tests a bit easier." (map (lambda (str) diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index e26c8a5429..38d5cb7d50 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -106,7 +106,7 @@ WSD and eSCL.") (define-public sane-backends-minimal (package (name "sane-backends-minimal") - (version "1.2.1") + (version "1.3.1") (source (origin (method git-fetch) (uri (git-reference @@ -114,7 +114,7 @@ WSD and eSCL.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1dyipgfn8b8g38iqipy9y1p32p8xyf5sllh4dzhpx54schc4j3hm")) + (base32 "1fb6shx9bz0svcyasmyqs93rbbwq7kzg6l0h1zh3kjvcwhchyv72")) (modules '((guix build utils))) (snippet ;; Generated HTML files and udev rules normally embed a diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 47754800f9..927e10bbfe 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -1085,7 +1085,7 @@ The core is 12 builtin special forms and 33 builtin functions.") (define-public gauche (package (name "gauche") - (version "0.9.12") + (version "0.9.15") (home-page "https://practical-scheme.net/gauche/index.html") (source (origin @@ -1095,7 +1095,7 @@ The core is 12 builtin special forms and 33 builtin functions.") (string-replace-substring version "." "_") "/Gauche-" version ".tgz")) (sha256 - (base32 "05xnym1phg8i14bacip5d0d3v0gc1nn5mgayd5hnda873f969bml")))) + (base32 "10zpbbikkcpdzk6c52wkckiyhn7nhnqjv2djdzyjr0n8qxxy4hrn")))) (build-system gnu-build-system) (inputs (list libatomic-ops slib zlib)) @@ -1116,24 +1116,20 @@ The core is 12 builtin special forms and 33 builtin functions.") "ext/tls/test.scm" "lib/gauche/package/util.scm" "libsrc/gauche/process.scm") - (("/bin/sh") (which "sh"))) - #t)) + (("/bin/sh") (which "sh"))))) (add-after 'build 'build-doc (lambda _ (with-directory-excursion "doc" - (invoke "make" "info")) - #t)) + (invoke "make" "info")))) (add-before 'check 'patch-network-tests ;; Remove net checks. (lambda _ (delete-file "test/net.scm") - (invoke "touch" "test/net.scm") - #t)) + (invoke "touch" "test/net.scm"))) (add-after 'install 'install-docs (lambda _ (with-directory-excursion "doc" - (invoke "make" "install")) - #t))))) + (invoke "make" "install"))))))) (synopsis "Scheme scripting engine") (description "Gauche is a R7RS Scheme scripting engine aiming at being a handy tool that helps programmers and system administrators to write small to diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 939febd4e3..da2957fe7a 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -355,7 +355,7 @@ website for more information about Yubico and the YubiKey.") (define-public opensc (package (name "opensc") - (version "0.25.0") + (version "0.25.1") (source (origin (method url-fetch) (uri (string-append @@ -363,23 +363,22 @@ website for more information about Yubico and the YubiKey.") version "/opensc-" version ".tar.gz")) (sha256 (base32 - "0bv2sq3k8bl712yi1gi7f8km8g2x09is8ynnr5x3g2jh59pbdmz6")))) + "0yxk97aj29pybvya6r9ix9xh00hdzcfrc2lcns4vb3kwpplamjr3")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - ;; By setting an absolute path here, we arrange for OpenSC to - ;; successfully dlopen libpcsclite.so.1 by default. The user can - ;; still override this if they want to, by specifying a custom OpenSC - ;; configuration file at runtime. - (add-after 'unpack 'set-default-libpcsclite.so.1-path - (lambda* (#:key inputs #:allow-other-keys) - (let ((libpcsclite (search-input-file inputs - "/lib/libpcsclite.so.1"))) - (substitute* "configure" - (("DEFAULT_PCSC_PROVIDER=\"libpcsclite\\.so\\.1\"") - (string-append - "DEFAULT_PCSC_PROVIDER=\"" libpcsclite "\""))))))))) + (list + #:phases + #~(modify-phases %standard-phases + ;; By setting an absolute path here, we arrange for OpenSC to + ;; successfully dlopen libpcsclite.so.1 by default. The user can + ;; still override this if they want to, by specifying a custom OpenSC + ;; configuration file at runtime. + (add-after 'unpack 'set-default-libpcsclite.so.1-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((libpcsclite (search-input-file inputs "/lib/libpcsclite.so.1"))) + (substitute* "configure" + (("DEFAULT_PCSC_PROVIDER=\"libpcsclite\\.so\\.1\"") + (string-append "DEFAULT_PCSC_PROVIDER=\"" libpcsclite "\""))))))))) (inputs (list readline openssl-1.1 pcsc-lite ccid)) (native-inputs diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index be8d9bdc25..a6a8bb0cd1 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -912,3 +912,30 @@ with Guix Home: \"source \" liquidprompt \"/share/liquidprompt/themes/powerline/powerline.theme\")))))) @end example\n") (license license:agpl3+))) + +(define-public fzf-tab + (package + (name "fzf-tab") + (version "1.1.2") + (home-page "https://github.com/Aloxaf/fzf-tab") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Aloxaf/fzf-tab") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "061jjpgghn8d5q2m2cd2qdjwbz38qrcarldj16xvxbid4c137zs2")))) + (build-system copy-build-system) + (arguments + '(#:install-plan '(("lib" "/share/zsh/plugins/fzf-tab/") + ("modules" "/share/zsh/plugins/fzf-tab/") + ("fzf-tab.plugin.zsh" "/share/zsh/plugins/fzf-tab/") + ("fzf-tab.zsh" "/share/zsh/plugins/fzf-tab/") + ("README.md" "/share/doc/fzf-tab/")))) + (synopsis "Replace the zsh default completion menu with fzf") + (description + "The fzf-tab package replaces the default completion menu of the zsh +shell with fzf, enabling fuzzy finding and multi-selection.") + (license license:expat))) diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index d5fc1e3d17..4fa2e93d81 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -495,15 +495,14 @@ functions in virtual scenarios.") (define-public esmini (package (name "esmini") - (version "2.27.1") + (version "2.37.11") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/esmini/esmini") (commit (string-append "v" version)))) (file-name (git-file-name name version)) - (patches (search-patches "esmini-use-pkgconfig.patch" - "esmini-no-clutter-log.patch")) + (patches (search-patches "esmini-use-pkgconfig.patch")) (modules '((guix build utils) (ice-9 ftw))) (snippet #~(with-directory-excursion "externals" @@ -513,29 +512,21 @@ functions in virtual scenarios.") (scandir ".")))) (sha256 (base32 - "07ccydz7kxy5jc52f8fmxg4nkr1spshfnpzcv0wgd5lqz9ghjahz")))) + "07pwa34nf0b4ihb9fn1pvfi0b39hd8r630nfa6v3a17dsy66a730")))) (build-system cmake-build-system) (arguments (list - #:configure-flags #~(list "-DDYN_PROTOBUF=TRUE") + #:configure-flags + #~(list "-DDYN_PROTOBUF=TRUE" + ;; Missing implot package + "-DUSE_IMPLOT=FALSE") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-cmake (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("\\$\\{CMAKE_HOME_DIRECTORY\\}/bin") - (string-append (assoc-ref outputs "out") "/bin"))) - (substitute* "EnvironmentSimulator/CMakeLists.txt" - (("\\$\\{OSI_DIR\\}/(include|lib)(-dyn)?" all what) - (search-input-directory - inputs - (string-append what "/osi" - #$(version-major - (package-version - (this-package-input - "open-simulation-interface")))))) - (("\\$\\{SUMO_BASE_DIR\\}/\\$\\{EXT_DIR_NAME\\}") - #$(this-package-input "sumo"))))) + (substitute* "support/cmake/common/locations.cmake" + (("\\$\\{CMAKE_SOURCE_DIR\\}/bin") + (string-append (assoc-ref outputs "out") "/bin"))))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (with-directory-excursion "EnvironmentSimulator/Unittest/" @@ -549,7 +540,7 @@ functions in virtual scenarios.") (lambda (f) (rename-file f (string-append out "/lib/" (basename f)))) - (find-files "." "\\.so$"))))))))) + (find-files "." "\\.(a|so)$"))))))))) (inputs (list mesa openscenegraph `(,openscenegraph "pluginlib") open-simulation-interface diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index c51837d410..dd21db0921 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -116,10 +116,10 @@ is in the public domain.") (define-public sqlite-next (package (inherit sqlite) - (version "3.45.1") + (version "3.46.0") (source (origin (method url-fetch) (uri (sqlite-uri version 2024)) (sha256 (base32 - "02lssjiwyvsrr80rp62n0msds0f7hq5y4lbni74k4nbs3f22g76d")))))) + "0zbs853s8ly693qdg0l7vs4shwn3plmvdczr2s478wsj6dxnm3kg")))))) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 7269e91ec0..ea8249869d 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -213,326 +213,6 @@ notification area icon for Syncthing. Supported Syncthing features: (define-public qsyncthingtray (deprecated-package "qsyncthingtray" syncthing-gtk)) -(define-public go-github-com-audriusbutkevicius-recli - (package - (name "go-github-com-audriusbutkevicius-recli") - (version "0.0.5") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/AudriusButkevicius/recli") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1m1xna1kb78pkmr1lfmvvnpk9j7c4x71j3a7c6vj7zpzc4srpsmf")))) - (build-system go-build-system) - (inputs - (list go-github-com-pkg-errors go-github-com-urfave-cli)) - (arguments - `(#:import-path "github.com/AudriusButkevicius/recli")) - (synopsis "Reflection-based CLI generator") - (description "For a given struct, @code{recli} builds a set of -@code{urfave/cli} commands which allows you to modify it from the command line. -It is useful for generating command line clients for your application -configuration that is stored in a Go struct.") - (home-page "https://github.com/AudriusButkevicius/recli") - (license mpl2.0))) - -(define-public go-github-com-bkaradzic-go-lz4 - (let ((commit "7224d8d8f27ef618c0a95f1ae69dbb0488abc33a") - (revision "0")) - (package - (name "go-github-com-bkaradzic-go-lz4") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/bkaradzic/go-lz4") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "10lmya17vdqg2pvqni0p73iahni48s1v11ya9a0hcz4jh5vw4dkb")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/bkaradzic/go-lz4")) - (synopsis "LZ4 compression algorithm") - (description "This package provides @code{go-lz4}, a Go implementation of -the LZ4 compression algorithm.") - (home-page "https://github.com/bkaradzic/go-lz4") - (license bsd-2)))) - -(define-public go-github-com-calmh-du - (package - (name "go-github-com-calmh-du") - (version "1.0.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/calmh/du") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0qb3a6y3p9nkyn3s66k6zcm16y8n8578qh23ddj14cxf2scrr2n2")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/calmh/du")) - (synopsis "Get total and available disk space of a given volume") - (description "This is a Go implementation of `du`. It provides disk usage -information, such as how much storage space is available, free, and used.") - (home-page "https://github.com/calmh/du") - (license public-domain))) - -(define-public go-github-com-calmh-xdr - (package - (name "go-github-com-calmh-xdr") - (version "1.1.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/calmh/xdr") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "072wqdncz3nd4a3zkhvzzx1y3in1lm29wfvl0d8wrnqs5pyqh0mh")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/calmh/xdr")) - (synopsis "XDR marshalling and unmarshalling") - (description "XDR is an External Data Representation (XDR) -marshalling and unmarshalling library in Go. It uses code generation and not -reflection.") - (home-page "https://github.com/calmh/xdr") - (license expat))) - -(define-public go-github-com-d4l3k-messagediff - (package - (name "go-github-com-d4l3k-messagediff") - (version "1.2.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/d4l3k/messagediff") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "104hl8x57ciaz7mzafg1vp9qggxcyfm8hsv9bmlihbz9ml3nyr8v")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/d4l3k/messagediff")) - (synopsis "Diff arbitrary Go structs") - (description "Messagediff is a library for calculating diffs of arbitrary -structs in the Go programming language.") - (home-page "https://github.com/d4l3k/messagediff") - (license expat))) - -(define-public go-github-com-jackpal-gateway - (package - (name "go-github-com-jackpal-gateway") - (version "1.0.6") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jackpal/gateway") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1yms2dw4dnz4cvj9vhwh6193d50jhvn5awsp2g3a4lcc3sjrgd6m")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/jackpal/gateway")) - (synopsis "Discover the address of a LAN gateway") - (description "@code{gateway} is a Go library for discovering the IP -address of the default LAN gateway.") - (home-page "https://github.com/jackpal/gateway") - (license bsd-3))) - -(define-public go-github-com-oschwald-geoip2-golang - (package - (name "go-github-com-oschwald-geoip2-golang") - (version "1.4.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/oschwald/geoip2-golang") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1jj4rbdpy87rbl79czg5hs5dyn6xlbnk0bnvyzi71dsxan57nixw")))) - (build-system go-build-system) - (propagated-inputs - (list go-github-com-oschwald-maxminddb-golang go-golang-org-x-sys)) - (arguments - `(#:import-path "github.com/oschwald/geoip2-golang" - #:tests? #f)) ; Requires some unpackaged software and test data - (synopsis "MaxMind GeoIP2 reader") - (description "This package provides a library for reading MaxMind -GeoLite2 and GeoIP2 databases in Go.") - (home-page "https://github.com/oschwald/geoip2-golang") - (license isc))) - -(define-public go-github-com-oschwald-maxminddb-golang - (package - (name "go-github-com-oschwald-maxminddb-golang") - (version "1.4.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/oschwald/maxminddb-golang") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "100wd5qv00pkcm6cb8c4x5gavc9jnn7drh6xrqh85hzci4rils66")))) - (build-system go-build-system) - (propagated-inputs - (list go-golang-org-x-sys)) - (arguments - `(#:import-path "github.com/oschwald/maxminddb-golang" - #:tests? #f)) ; Requires some unpackaged software and test data - (synopsis "MaxMind DB Reader for Go") - (description "This is a Go reader for the MaxMind DB format. Although -this can be used to read GeoLite2 and GeoIP2 databases, @code{geoip2} provides a -higher-level API for doing so.") - (home-page "https://github.com/oschwald/maxminddb-golang") - (license isc))) - -(define-public go-github-com-sasha-s-go-deadlock - (package - (name "go-github-com-sasha-s-go-deadlock") - (version "0.2.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/sasha-s/go-deadlock") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "13p7b7pakd9k1c2k0fs1hfim3c8mivz679977ai6zb01s4aw7gyg")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/sasha-s/go-deadlock")) - (propagated-inputs - (list go-github-com-petermattis-goid)) - (synopsis "Deadlock detection in go") - (description "This package provides tools for detecting deadlocks at -run-time in Go.") - (home-page "https://github.com/sasha-s/go-deadlock") - (license asl2.0))) - -(define-public go-github-com-thejerf-suture - (package - (name "go-github-com-thejerf-suture") - (version "3.0.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/thejerf/suture") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "03bdrl78jfwk0kw40lj63ga9cxhgccgss8yi9lp5j0m0ml7921gh")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/thejerf/suture")) - (synopsis "Supervisor trees for Go") - (description "Suture provides Erlang-ish supervisor trees for Go. -\"Supervisor trees\" -> \"sutree\" -> \"suture\" -> holds your code together -when it's trying to die. - -It is intended to deal gracefully with the real failure cases that can occur -with supervision trees (such as burning all your CPU time endlessly restarting -dead services), while also making no unnecessary demands on the \"service\" -code, and providing hooks to perform adequate logging with in a production -environment") - (home-page "https://github.com/thejerf/suture") - (license expat))) - -(define-public go-github-com-vitrun-qart - (let ((commit "bf64b92db6b05651d6c25a3dabf2d543b360c0aa") - (revision "0")) - (package - (name "go-github-com-vitrun-qart") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/vitrun/qart") - (commit commit))) - (file-name (string-append "go-github-com-vitrun-qart-" - version "-checkout")) - (sha256 - (base32 - "1xk7qki703xmay9ghi3kq2bjf1iw9dz8wik55739d6i7sn77vvkc")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/vitrun/qart")) - (synopsis "Create QR codes with an embedded image") - (description "This package provides a library for embedding -human-meaningful graphics in QR codes. However, instead of scribbling on -redundant pieces and relying on error correction to preserve the meaning, -@code{qart} engineers the encoded values to create the picture in a code with no -inherent errors.") - (home-page "https://github.com/vitrun/qart") - (license bsd-3)))) - -(define-public go-github-com-chmduquesne-rollinghash - (let ((commit "a60f8e7142b536ea61bb5d84014171189eeaaa81") - (revision "0")) - (package - (name "go-github-com-chmduquesne-rollinghash") - (version (git-version "4.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/chmduquesne/rollinghash") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0fpaqq4zb0wikgbhn7vwqqj1h865f5xy195vkhivsp922p7qwsjr")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/chmduquesne/rollinghash/")) - (synopsis "Rolling hashes in Go") - (description "This package provides a Go implementation of several rolling -hashes.") - (home-page "https://github.com/chmduquesne/rollinghash") - (license expat)))) - -(define-public go-github-com-petermattis-goid - (let ((commit "b0b1615b78e5ee59739545bb38426383b2cda4c9") - (revision "1")) - (package - (name "go-github-com-petermattis-goid") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/petermattis/goid") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0ghfxn045r0bbn2vszw897lxzmhnm4k59aypjvpxl0pbzsw9ab2c")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/petermattis/goid")) - (synopsis "Identify the running goroutine") - (description "This package offers a method of programmatically retrieving -the current goroutine's ID.") - (home-page "https://github.com/petermattis/goid") - (license asl2.0)))) - (define-public go-github-com-syncthing-notify (let ((commit "69c7a957d3e261f9744f46b3dd4d608d8480ad90") (revision "5")) @@ -558,175 +238,3 @@ the current goroutine's ID.") notification library in Go.") (home-page "https://github.com/syncthing/notify") (license expat)))) - -(define-public go-github-com-matttproud-golang-protobuf-extensions-pbutil - (package - (name "go-github-com-matttproud-golang-protobuf-extensions-pbutil") - (version "2.0.0") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/matttproud/golang_protobuf_extensions") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0jw4vjycwx0a82yvixmp25805krdyqd960y8lnyggllb6br0vh41")))) - (build-system go-build-system) - (arguments - (list - #:import-path "github.com/matttproud/golang_protobuf_extensions/v2/pbutil" - #:unpack-path "github.com/matttproud/golang_protobuf_extensions/v2")) - (propagated-inputs - (list go-github-com-golang-protobuf-proto - go-google-golang-org-protobuf)) - (synopsis "Streaming Protocol Buffers in Go") - (description "This package provides various Protocol Buffer -extensions for the Go language, namely support for record length-delimited -message streaming.") - (home-page "https://github.com/matttproud/golang_protobuf_extensions") - (license asl2.0))) - -(define-public go-github-com-go-asn1-ber-asn1-ber - (package - (name "go-github-com-go-asn1-ber-asn1-ber") - (version "1.5.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/go-asn1-ber/asn1-ber") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "15ygmfmdwwjda9xdq58rx6gnmsfc14m1qqhcj7cn7rm0mx4wk2vb")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/go-asn1-ber/asn1-ber")) - (synopsis "ASN.1 BER encoding and decoding in Go") - (description "This package provides ASN.1 BER encoding and decoding in the -Go language.") - (home-page "https://github.com/go-asn1-ber/asn1-ber") - (license expat))) - -(define-public go-github-com-go-ldap-ldap - (package - (name "go-github-com-go-ldap-ldap") - (version "3.4.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/go-ldap/ldap") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1xf2jrwhgr06jy4liba48hrz4b7j27r7m9dnl7fj95vazsx2n5br")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/go-ldap/ldap/v3" - #:tests? #f)) ; test suite requires internet access - (propagated-inputs - (list go-github-com-go-asn1-ber-asn1-ber - go-github-com-azure-go-ntlmssp)) - (home-page "https://github.com/go-ldap/ldap") - (synopsis "LDAP v3 functionality for Go") - (description "This package provides basic LDAP v3 functionality in the Go -language.") - (license expat))) - -(define-public go-github-com-azure-go-ntlmssp - (package - (name "go-github-com-azure-go-ntlmssp") - (version "0.0.0-20211209120228-48547f28849e") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Azure/go-ntlmssp") - (commit (go-version->git-ref version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0im28kp9p6ncdmh7qq5qwl85nmiwmp8jka2qgrjiqzc5n36q56np")))) - (build-system go-build-system) - (arguments '(#:import-path "github.com/Azure/go-ntlmssp")) - (propagated-inputs - (list go-golang-org-x-crypto)) - (home-page "https://github.com/Azure/go-ntlmssp") - (synopsis "NTLM negotiation in Go") - (description - "This package provides NTLM/Negotiate authentication over HTTP.") - (license expat))) - -(define-public go-github-com-flynn-archive-go-shlex - (let ((commit "3f9db97f856818214da2e1057f8ad84803971cff") - (revision "0")) - (package - (name "go-github-com-flynn-archive-go-shlex") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/flynn-archive/go-shlex") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/flynn-archive/go-shlex")) - (synopsis "Go lexer") - (description "Shlex is a simple lexer for go that supports shell-style -quoting, commenting, and escaping.") - (home-page "https://github.com/flynn-archive/go-shlex") - (license asl2.0)))) - -(define-public go-github-com-audriusbutkevicius-pfilter - (package - (name "go-github-com-audriusbutkevicius-pfilter") - (version "0.0.5") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/AudriusButkevicius/pfilter") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0xzhwyd0w21bhvzl5pinn22hp0y6h44rh3s2ppql69rafc6zd3c6")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/AudriusButkevicius/pfilter")) - (synopsis "Filter packets into multiple virtual connections") - (description "Pfilter is a Go package for filtering packets into multiple -virtual connections from a single physical connection.") - (home-page "https://github.com/AudriusButkevicius/pfilter") - (license expat))) - -(define-public go-github-com-ccding-go-stun - (let ((commit "be486d185f3dfcb2dbf8429332da50a0da7f95a6") - (revision "2")) - (package - (name "go-github-com-ccding-go-stun") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ccding/go-stun") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1gr0rw1c1y7wh6913lyn5k4ig023by27i36bly6am8dwgrgp34ww")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/ccding/go-stun")) - (synopsis "STUN client implementation") - (description "Go-stun is a go implementation of the STUN client (RFC 3489 -and RFC 5389).") - (home-page "https://github.com/ccding/go-stun") - (license asl2.0)))) diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm index 96df50d747..b665195740 100644 --- a/gnu/packages/task-management.scm +++ b/gnu/packages/task-management.scm @@ -290,8 +290,8 @@ time to a logfile.") (replace 'build (lambda* (#:key import-path #:allow-other-keys) (with-directory-excursion (string-append "src/" import-path) - (invoke "go" "build" "-o" "dstask" "cmd/dstask/main.go") - (invoke "go" "build" "-o" "dstask-import" + (invoke "go" "build" "-trimpath" "-o" "dstask" "cmd/dstask/main.go") + (invoke "go" "build" "-trimpath" "-o" "dstask-import" "cmd/dstask-import/main.go")))) (replace 'install (lambda* (#:key import-path outputs #:allow-other-keys) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 3ab79837e0..c227ff53dc 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1039,7 +1039,7 @@ programmer to write text-based user interfaces.") go-github-com-gdamore-tcell go-github-com-rivo-uniseg go-github-com-saracen-walker - go-golang.org-x-sync-errgroup + go-golang-org-x-sync go-golang-org-x-term go-golang-org-x-crypto)) (home-page "https://github.com/junegunn/fzf") diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index c1956d3602..b6eb48785d 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -216,7 +216,7 @@ based command language.") (define-public kakoune (package (name "kakoune") - (version "2024.05.09") + (version "2024.05.18") (source (origin (method url-fetch) @@ -224,7 +224,7 @@ based command language.") "releases/download/v" version "/" "kakoune-" version ".tar.bz2")) (sha256 - (base32 "0ad22syhsd921rnfpmkvyh37am3ni443g1f3jc2hqndgsggvv411")))) + (base32 "1ymr1jpdnd5wj6npzi8bgfd30d0j885sfnhl236rn7fjc4pars6s")))) (build-system gnu-build-system) (arguments `(#:make-flags diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index b58038dcc2..0d704faed9 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -1471,7 +1471,7 @@ of a Unix terminal to HTML code.") go-github-com-spf13-afero go-github-com-urfave-cli go-github-com-yuin-goldmark - go-golang-org-x-net-html + go-golang-org-x-net go-gopkg-in-ini-v1 go-gopkg-in-yaml-v2)) (home-page "https://github.com/errata-ai/vale") diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index 4d53d3fd76..3d01346c8c 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -42,6 +42,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages assembly) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages browser-extensions) #:use-module (gnu packages compression) #:use-module (gnu packages cups) @@ -148,18 +149,18 @@ ("02ifa94jfii5f166rwdvv8si3bazm4bcf4qhi59c8f1hxbavb52h" "081aeb1aa308" "zh-CN") ("0qx9sh56pqc2x5qrh386cp1fi1gidhcmxxpvqkg9nh2jbizahznr" "9015a180602e" "zh-TW"))) -;; We copy the official build id, which can be found there: -;; https://aus1.torproject.org/torbrowser/update_3/release/. -(define %torbrowser-build-date "20240510150000") +;; We copy the official build id, which is defined at +;; tor-browser-build/rbm.conf (browser_release_date). +(define %torbrowser-build-date "20240510190000") ;; To find the last version, look at https://www.torproject.org/download/. -(define %torbrowser-version "13.0.15") +(define %torbrowser-version "13.0.16") ;; To find the last Firefox version, browse ;; https://archive.torproject.org/tor-package-archive/torbrowser/<%torbrowser-version> ;; There should be only one archive that starts with ;; "src-firefox-tor-browser-". -(define %torbrowser-firefox-version "115.11.0esr-13.0-1-build2") +(define %torbrowser-firefox-version "115.12.0esr-13.0-1-build1") ;; See tor-browser-build/projects/translation/config. (define torbrowser-translation-base @@ -167,11 +168,11 @@ (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "a28a8b2cb9e207d12fca11181818c0a0694b56af"))) + (commit "f28525699864f4e3d764c354130bd898ce5b20aa"))) (file-name "translation-base-browser") (sha256 (base32 - "159wza7mvz53bjvdj8nnipz9ya5150pymjz5x3jz2qpkz8ansxws")))) + "1vf6nl7fdmlmg2gskf3w1xlsgcm0pxi54z2daz5nwr6q9gyi0lkf")))) ;; See tor-browser-build/projects/translation/config. (define torbrowser-translation-specific @@ -179,11 +180,11 @@ (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "e03ffdea5b74ad280616dccd21744cba7b2d4565"))) + (commit "b5d79336411e5a59c4861341ef9aa7353e0bcad9"))) (file-name "translation-tor-browser") (sha256 (base32 - "0d8f9p36wfxbwhiprj6wrzjs4nz8mbaqnqz48rl57x5b82achjd0")))) + "0ahz69pxhgik7ynmdkbnx7v5l2v392i6dswjz057g4hwnd7d34fb")))) (define torbrowser-assets ;; This is a prebuilt Torbrowser from which we take the assets we need. @@ -199,7 +200,7 @@ version "/tor-browser-linux-x86_64-" version ".tar.xz")) (sha256 (base32 - "1rd4m8bg359yj2w5dfvmnnjgr79bx1cc9bkziwzxnyz5zjn0arkv")))) + "1kffam66bsaahzx212hw9lb03jwfr24hivzg067iyzilsldpc9c1")))) (arguments (list #:install-plan @@ -237,12 +238,13 @@ Browser.") ".tar.xz")) (sha256 (base32 - "0z2sz42jjfcd99zmysvz9k03zk9nccygba53rvkhbskcvil5zgjd")))) + "1b70zyjyai6kk4y1kkl8jvrs56gg7z31kkad6bmdpd8jw4n71grx")))) (build-system mozilla-build-system) (inputs (list go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird tor-client alsa-lib + bash-minimal ;for wrap-program bzip2 cups dbus-glib @@ -857,41 +859,41 @@ attacks on the privacy of Tor users.") (mozilla-locales ;; sha256 changeset locale ;;--------------------------------------------------------------------------- - ("14wnjv13alaj04pd8i8ysillbr3ic2jqa867rbj5ncz8h4hxxfxc" "4c7e24ef78bd" "ar") - ("0is7qbykv2pj0z9ll9r35vwjp0x29vmfr10yjl3s0amfaqzjqpqc" "0a0b774407cc" "da") - ("0yq7m4v7d7ayg90m66j73mflrnp709qw9n7skhpsl9h1wbhrd7q7" "633986260777" "de") - ("018qi9zn24kzfcidsj9lbqfg5n97r295yr8fs953nyfdbim9jsfv" "accf5e4506c0" "es-ES") - ("11prhmh2cp95dpv6z0k479mb11zbfm541bvigs3gnkh3nazjvc8q" "37aa71d77cb6" "fa") - ("1lv9l98q88ixb0ph970yzphahgzbl97x0w069bkxa54kblkv1ch1" "dc40a4fd5d0e" "fi") - ("0wx4k7mwhvpv5w0wa4y5pca2q3jac62jv804nxqnfwh1bvi90wv0" "415c1f0e84bd" "fr") - ("1n7l5idw9399n8ih1r1d6m8vzpzhwmnxmr9i7jvygkdc8d6adp1k" "07d5e1ff5f9b" "it") - ("1w6nw9cd92p1ndy82wwlq9xizyq3i8rq0nj7118gbxbx368mk2kj" "e6f9db9ce3e6" "ja") - ("116a8s0k2yvijy7qf0xpqm5w66gdzs32jhc06364sdar5v34lyhh" "805b85981696" "ko") - ("0kk3cjlpghbi7j3ndb2s0c7g838fzd2mpzg01bp0cra8lzd0n2ac" "4ab6f0d05aa6" "my") - ("1i3r2ici95mazw07m2mrf192fc6bfa3x6j3c2pcc1zg7z9srihgh" "561b0cd86ec1" "nb-NO") - ("1c0m8jhn52h1dif5bswrdwrlzppgga01y61wlii4aaaw15imd6yd" "2a55df0cc389" "nl") - ("1gssvg306b80drp7kvc35kvcxwldb5sga0bapaxhv362irq1nya8" "a64a7dab01c4" "pl") - ("1dzh13x85a7src8szbrq5pjmrbak4isln9xdwjk7a1yq4g9h7jgs" "33bf2a9f4c49" "pt-BR") - ("09x2jirf04kgc118a70z0xrb3msbm7vr4f41ig4xrwf2s5b816r3" "528b76d6aaca" "ru") - ("1cyimbd42aaq2amyhdbbx26jwsns77lsfl8g9a70bsjlpwzwzryg" "cc8e8962e59c" "sv-SE") - ("03mqrvcal7i172gf9239q9fnynfp5kg9b3r1w8gr9iz7rkr22gw5" "d361502c559e" "th") - ("12srgqkqwaidcwbz0y7zr59165f7aq5k5s3b81ql7ixdbwia91pm" "f6173aca4762" "tr") - ("1dl2dpif4wwrlpx7zkz5qf8kk4vhxyf63016xcfpbhxizqqwc1ki" "df2d025ed631" "zh-CN") - ("1c63ngff9lsc1x3pi6lnkyxw19gdc65yc67p7alzvrka3cv292ia" "11f8d68148a4" "zh-TW"))) + ("1218mldjxybhgzdi0myzkwjr2fgnysl71pl847kr7wyn1j8wk3a5" "c25d00080479" "ar") + ("1kzx94n36c5vv954j7w65djvb37c178zazy25b35l71q2rvhmlhj" "2197a99c9a08" "da") + ("13h7hk11bbd0yq8gqdv7ndbizkgwlm3ybz225l3x2b5cnyjxyg14" "b7a533e5edc9" "de") + ("0mdr5b6pqxjmg9c8064x3hpf53h6w9j8ghl32655sx9jh4v3ykza" "beff1baac7c5" "es-ES") + ("1pnyg09j6r15w8m62lwj89x6rz4br877z60p8s1hlrb9hj2s3vdx" "ebe0b60b0b36" "fa") + ("067r505626cvlrsalnndf2ykz3nnkiy0b8yaxzf1rracpzmp0hni" "d5ae6a933d71" "fi") + ("0026zzjv2bqc8sg06yvyd0mhny6mwwvhpvzjrhv2fi5v4wkxapdj" "496c2eb73b82" "fr") + ("03fbp4vgkwyimfmbm4n8blx1m16yhms2wm8j4wlx2h3cpxp5r71k" "91951e37e2b8" "it") + ("0ncm531d7ih7phcn9d83zwq0dfphvmzg3gmhqmrrkkbydi1g3pbb" "895dcf8bb524" "ja") + ("14rc9mr4ngxdzwpjagzhz47jazgp1a6vwb0vbwj31yxv9iwkrgzi" "6ef881aff44b" "ko") + ("0h7dlnawm5mbcx4qdlz5c7n4axz2dpa677v13ljdgm2b5w76msmq" "5c1480ccc040" "my") + ("1b12azc1n8j1i2l20v66r74q79zqjvc5sf9pd8rmj3xd0fkxzdp2" "fc1896a0a24d" "nb-NO") + ("1fh4dhlb6hynlpb2997gssv9v8zk5b7qrw0sclggczb5pcpjk6wc" "7e6da4f01bdb" "nl") + ("1w8x3jjrd28f6g6ywwxldizpiipfkr63dzqd74kjpg24s2lqzp80" "e86a451a9cb5" "pl") + ("1v3v4n82sn7a4h2d9n653fmgc31mikacf59lvdj6gbwvzpjb5yfa" "94c3dbb67a5d" "pt-BR") + ("1fxgh7nfxpg2zknvfff8igq9q1vm5n4q033v7lm2c0xn3dbl8m28" "402b2ecbf04d" "ru") + ("1nllh3ax323sxwhj7xvwvbfnh4179332pcmpfyybw1vaid3nr39k" "bb2d5d96d69e" "sv-SE") + ("136m68fd0641k3qqmsw6zp016cvvd0sipsyv6rx2b9nli56agz57" "0e6c56bf2ac9" "th") + ("0q8p8bwq8an65yfdwzm4dhl6km68r83bv5i17kay2gak8msxxhsb" "91e611ae3f19" "tr") + ("02ifa94jfii5f166rwdvv8si3bazm4bcf4qhi59c8f1hxbavb52h" "081aeb1aa308" "zh-CN") + ("0qx9sh56pqc2x5qrh386cp1fi1gidhcmxxpvqkg9nh2jbizahznr" "9015a180602e" "zh-TW"))) ;; We copy the official build id, which can be found there: ;; https://cdn.mullvad.net/browser/update_responses/update_1/release. -(define %mullvadbrowser-build-date "20240408204645") +(define %mullvadbrowser-build-date "20240510190000") ;; To find the last version, look at ;; https://mullvad.net/en/download/browser/linux. -(define %mullvadbrowser-version "13.0.14") +(define %mullvadbrowser-version "13.0.16") ;; To find the last Firefox version, browse ;; https://archive.torproject.org/tor-package-archive/mullvadbrowser/<%mullvadbrowser-version> ;; There should be only one archive that starts with ;; "src-firefox-mullvad-browser-". -(define %mullvadbrowser-firefox-version "115.10.0esr-13.0-1-build1") +(define %mullvadbrowser-firefox-version "115.12.0esr-13.0-1-build1") ;; See tor-browser-build/projects/translation/config. (define mullvadbrowser-translation-base @@ -899,11 +901,11 @@ attacks on the privacy of Tor users.") (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "d31e6b16c372e2eb235c4f2b0eae0b573a5515ba"))) + (commit "f28525699864f4e3d764c354130bd898ce5b20aa"))) (file-name "translation-base-browser") (sha256 (base32 - "0pyd49v0ivxbw2lbzi5vz9kl78i972p2kcaaahympaf6x5i0q1xd")))) + "1vf6nl7fdmlmg2gskf3w1xlsgcm0pxi54z2daz5nwr6q9gyi0lkf")))) ;; See tor-browser-build/projects/translation/config. (define mullvadbrowser-translation-specific @@ -911,11 +913,11 @@ attacks on the privacy of Tor users.") (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "c5361cb496ae7e047fd9226139537f1fcfc7938d"))) + (commit "bff8092bbe5ae93b2c162ade300d739b2cd9e92d"))) (file-name "translation-mullvad-browser") (sha256 (base32 - "0kxna8hcn6xyj9mq0k8pzmj0xh6drq6fs69vjhk31g9wjjm99hss")))) + "0742ylhz80445a28ssp2hpshy0dvr12h2c1mcv5pjdipzcwhgil8")))) (define mullvadbrowser-assets ;; This is a prebuilt Mullvad Browser from which we take the assets we need. @@ -931,7 +933,7 @@ attacks on the privacy of Tor users.") version "/mullvad-browser-linux-x86_64-" version ".tar.xz")) (sha256 (base32 - "1qq1bmknnq9ycfqgslwpwdflpzdl8sl3a4bgx0i817m3myvdkdyg")))) + "1bpchiz12zjyrzpgyk71naf1jdf3msjcjwggb1mziyawc6pyxj7v")))) (arguments (list #:install-plan @@ -974,7 +976,7 @@ Mullvad Browser.") %mullvadbrowser-firefox-version ".tar.xz")) (sha256 (base32 - "07lwjl8569ck0fm3fq0hsh1zd65zph06vpfm4r8mjzqpn7bcny75")))) + "1xs4qwa3c6nfq6cj5q6asfrzki4brafg65g6hbn0fc9qqcmrhkv5")))) (arguments (substitute-keyword-arguments (package-arguments mullvadbrowser-base) ((#:phases phases) diff --git a/gnu/packages/unicode.scm b/gnu/packages/unicode.scm index 23f08a2aab..fe188ed71d 100644 --- a/gnu/packages/unicode.scm +++ b/gnu/packages/unicode.scm @@ -77,14 +77,14 @@ renderer.") (define-public ucd (package (name "ucd") - (version "15.0.0") + (version "15.1.0") (source (origin (method url-fetch/zipbomb) (uri (string-append "https://www.unicode.org/Public/zipped/" version "/UCD.zip")) (sha256 - (base32 "133inqn33hcfvylmps63yjr6rrqrfq6x7a5hr5fd51z6yc0f9gaz")))) + (base32 "0xv10nkvg6451415imvb0qx72ljp0hv9f8h1sl6509ir0lync76b")))) (build-system copy-build-system) (arguments '(#:install-plan diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index 400e6656d1..6592f2fe7f 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -137,7 +137,7 @@ and others.") (define-public readymedia (package (name "readymedia") - (version "1.3.1") + (version "1.3.3") (source (origin (method git-fetch) @@ -147,7 +147,7 @@ and others.") "v" (string-replace-substring version "." "_"))))) (file-name (git-file-name name version)) (sha256 - (base32 "09fg3697wshg0j46mi3bp2i6ypiqm39vmzx52bci8r6j07yz7fwx")))) + (base32 "1al04jx72bxwqch1nv9lx536mb6pvj7pgnqzy6lm32q6xa114yr2")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-os-name=Linux") ; uname -s diff --git a/gnu/packages/uucp.scm b/gnu/packages/uucp.scm index 8e47834fef..d8eb17111d 100644 --- a/gnu/packages/uucp.scm +++ b/gnu/packages/uucp.scm @@ -116,6 +116,7 @@ between computers.") (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) + (setenv "GO_LDFLAGS" "-trimpath") ;; Set configuration path. (setenv "CFGPATH" "/etc/nncp.hjson") ;; Set output directories. @@ -142,9 +143,7 @@ between computers.") (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - (invoke "contrib/do" "-c" "test")))) - (add-after 'install 'remove-go-references - (assoc-ref go:%standard-phases 'remove-go-references))))) + (invoke "contrib/do" "-c" "test"))))))) (inputs (list go-github-com-davecgh-go-xdr go-github-com-dustin-go-humanize diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 8c9b41384c..29401f87ff 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -242,14 +242,14 @@ Python 3.3 and later, rather than on Python 2.") (define-public git (package (name "git") - (version "2.45.1") + (version "2.45.2") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "1gqj5xrlmzs4amrj7xgxx7qpqj8br8f6bk4bzcnf4yk2iq538kg6")))) + "1nws1vjgj54sv32wxl1h3n1jkcpabqv7a605hhafsby0n5zfigsi")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -269,7 +269,7 @@ Python 3.3 and later, rather than on Python 2.") version ".tar.xz")) (sha256 (base32 - "1w6r2liifafsxydmc48p578z7z70ys0spm6qp5ygdd0l26mxf8p6")))) + "1pqrp46kwbxycqld39027ph1cvkq9am156y3sswn6w2khsg30f09")))) ;; For subtree documentation. ("asciidoc" ,asciidoc) ("docbook2x" ,docbook2x) @@ -2369,14 +2369,14 @@ following features: (define-public subversion (package (name "subversion") - (version "1.14.2") + (version "1.14.3") (source (origin (method url-fetch) (uri (string-append "mirror://apache/subversion/" "subversion-" version ".tar.bz2")) (sha256 (base32 - "0a6csc84hfymm8b5cnvq1n1p3rjjf33qy0z7y1k8lwkm1f6hw4y9")))) + "0h54l4p2dlk1rm4zm428hi6ij6xpqxqlqmvkhmz5yhq9392zv7ll")))) (build-system gnu-build-system) (arguments (list @@ -3505,7 +3505,7 @@ will reconstruct the object along its delta-base chain and return it.") go-github-com-xeipuuv-gojsonreference go-github-com-xeipuuv-gojsonpointer go-golang-org-x-net - go-golang.org-x-sync-semaphore + go-golang-org-x-sync go-github-com-ssgelm-cookiejarparser go-github-com-rubyist-tracerx go-github-com-olekukonko-ts @@ -3849,8 +3849,8 @@ If several repos are related, it helps to see their status together.") go-github-com-motemen-go-colorine go-github-com-saracen-walker go-github-com-urfave-cli-v2 - go-golang-org-x-net-html - go-golang.org-x-sync-errgroup)) + go-golang-org-x-net + go-golang-org-x-sync)) (synopsis "Manage remote repository clones") (description "@code{ghq} provides a way to organize remote repository clones, like diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 77cdfe9078..411ad4c2bf 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2962,7 +2962,8 @@ To load this plugin, specify the following option when starting mpv: (origin (inherit (package-source libvpx)) (patches (search-patches "libvpx-CVE-2016-2818.patch" - "libvpx-CVE-2023-5217.patch")))))) + "libvpx-CVE-2023-5217.patch" + "libvpx-CVE-2023-44488.patch")))))) (define-public orfondl (package diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 16c2b75510..4ff9676e79 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -2319,6 +2319,7 @@ Open Container Initiative (OCI) image layout and its tagged images.") #~(list (string-append "CC=" #$(cc-for-target)) "PREFIX=" (string-append "DESTDIR=" #$output) + "GOGCFLAGS=-trimpath" (string-append "GOMD2MAN=" #$go-github-com-go-md2man "/bin/go-md2man")) #:tests? #f ; The tests require Docker @@ -2357,9 +2358,7 @@ Open Container Initiative (OCI) image layout and its tagged images.") (wrap-program (string-append #$output "/bin/skopeo") `("PATH" suffix ;; We need at least newuidmap, newgidmap and mount. - ("/run/setuid-programs"))))) - (add-after 'install 'remove-go-references - (@@ (guix build go-build-system) remove-go-references))))) + ("/run/setuid-programs")))))))) (home-page "https://github.com/containers/skopeo") (synopsis "Interact with container images and container image registries") (description diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b9991bb9c1..90f7330f2b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -510,14 +510,14 @@ the same, being completely separated from the Internet.") ;; Track the ‘mainline’ branch. Upstream considers it more reliable than ;; ’stable’ and recommends that “in general you deploy the NGINX mainline ;; branch at all times” (https://www.nginx.com/blog/nginx-1-6-1-7-released/) - (version "1.23.3") + (version "1.27.0") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (sha256 (base32 - "0m5s8a04jlpv6qhk09sfqbj4rxj38g6923w12j5y3ymrvf3mgjvm")))) + "170ja338zh7wdyva34cr7f3wfq59434sssn51d5jvakyz0y0w8xp")))) (build-system gnu-build-system) (inputs (list libxml2 libxslt openssl pcre zlib)) (arguments @@ -607,9 +607,9 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.") (define-public nginx-documentation ;; This documentation should be relevant for the current nginx package. - (let ((version "1.23.3") - (revision 2916) - (changeset "178f55cf631a")) + (let ((version "1.27.0") + (revision 3081) + (changeset "1b23e39a3b94")) (package (name "nginx-documentation") (version (simple-format #f "~A-~A-~A" version revision changeset)) @@ -621,7 +621,7 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.") (file-name (string-append name "-" version)) (sha256 (base32 - "0b03dnniwm3p3gd76vqs6lj2z4blqmb7y4lhn9vg7xjz0yqgzvn2")))) + "0xnfda8xh8mv00fsycqbwicm8bb7rsvdqmmwv0h372kiwxnazjkh")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no test suite @@ -631,7 +631,7 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.") (replace 'build (lambda* (#:key outputs #:allow-other-keys) (let ((output (assoc-ref outputs "out"))) - (substitute* "umasked.sh" + (substitute* "tools/umasked.sh" ((" /bin/sh") (string-append " " (which "sh")))) ;; The documentation includes a banner, which makes sense on ;; the NGinx website, but doesn't make much sense when @@ -733,6 +733,7 @@ ngx_http_accept_language_module~%") "--with-http_v2_module" "--with-pcre-jit" "--with-debug" + "--with-compat" ;; Even when not cross-building, we pass the ;; --crossbuild option to avoid customizing for the ;; kernel version on the build machine. @@ -5181,8 +5182,8 @@ Cloud.") (license license:expat))) (define-public guix-data-service - (let ((commit "d74422c2686890c7df26dd52104d65bfd042e7bd") - (revision "50")) + (let ((commit "b5fbde5ac832e34987a05b1445c1c465c19d5340") + (revision "52")) (package (name "guix-data-service") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -5194,7 +5195,7 @@ Cloud.") (file-name (git-file-name name version)) (sha256 (base32 - "06np60hd0vlwbhkh8x9drnzndykykgxw4f7qmgnp8p3rxrzh8y9g")))) + "1dp26bj14jaac9f5332pd6hasm3wr1hg9wrbjm9m8wb7cdll9h2p")))) (build-system gnu-build-system) (arguments (list @@ -8229,6 +8230,37 @@ in Perl but is not nearly as capable as @code{HTML::Tidy}.") @end itemize") (license license:bsd-2)))) +(define-public gemget + (package + (name "gemget") + (version "1.9.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/makew0rld/gemget") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03x9apk73lwyafc4fd2vs033z7vcpk4k0jf97452l7pnlx2v57rz")))) + (build-system go-build-system) + (native-inputs + (list go-github-com-dustin-go-humanize + go-github-com-makeworld-the-better-one-go-gemini + go-github-com-makeworld-the-better-one-go-gemini-socks5 + go-github-com-schollz-progressbar-v3 + go-github-com-spf13-pflag)) + (arguments + (list + #:install-source? #f + #:import-path "github.com/makeworld-the-better-one/gemget")) + (home-page "https://github.com/makew0rld/gemget") + (synopsis "Command line downloader for the Gemini protocol") + (description + "Gemget is a command line downloader for the Gemini protocol. +It works well with streams and can print headers for debugging as well.") + (license license:expat))) + (define-public geomyidae (package (name "geomyidae") diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index a4a06c495a..35520ee03b 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -44,6 +44,7 @@ #:use-module (gnu packages cups) #:use-module (gnu packages databases) #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages flex) #:use-module (gnu packages image) #:use-module (gnu packages gettext) @@ -69,6 +70,7 @@ #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages vulkan) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (ice-9 match) @@ -191,11 +193,13 @@ integrate Windows applications into your desktop.") libxi libxext libxcursor + libxkbcommon libxrender libxrandr libxinerama libxxf86vm libxcomposite + mesa mit-krb5 openal pulseaudio @@ -203,7 +207,9 @@ integrate Windows applications into your desktop.") unixodbc v4l-utils vkd3d - vulkan-loader)) + vulkan-loader + wayland + wayland-protocols)) (arguments (substitute-keyword-arguments (package-arguments wine-minimal) ((#:phases phases) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index ad9d814401..505ce09c1a 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -72,6 +72,7 @@ ;;; Copyright © 2024 Erik Eduardo Alonso Hernández <erik@erikeduardo.xyz> ;;; Copyright © 2024 James Smith <jsubuntuxp@disroot.org> ;;; Copyright © 2024 bigbug <bigbookofbug@proton.me> +;;; Copyright © 2024 dan <i@dan.games> ;;; ;;; This file is part of GNU Guix. ;;; @@ -800,7 +801,7 @@ desktop environment.") (define-public icewm (package (name "icewm") - (version "3.5.0") + (version "3.5.1") (source (origin (method url-fetch) (uri (string-append @@ -808,7 +809,7 @@ desktop environment.") version "/icewm-" version ".tar.lz")) (sha256 (base32 - "0j6drgc4r2ji5plg65h855xpysmbdxlbyrz9q3jl13vnm2sccp9y")))) + "0fjxpc46nlv91ijbxkyk33rlwbg2gd9xkr2mikimrba07zahfns5")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) (inputs (list fontconfig @@ -859,37 +860,17 @@ manager and a system tray.") (define-public xmonad (package (name "xmonad") - (version "0.17.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "xmonad" version)) - (sha256 - (base32 - "1apqwyqmc51gamfgsvlanzqqig9qvjss89ibcamhnha1gs1k4jl8")) - (patches (search-patches "xmonad-dynamic-linking.patch")))) + (version "0.17.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "xmonad" version)) + (sha256 + (base32 "19qz9a23377nzc0qq8nca45s745mfncd4i2vwba14gi7ipipfcil")))) (build-system haskell-build-system) (properties '((upstream-name . "xmonad"))) (inputs (list ghc-x11 ghc-data-default-class ghc-setlocale)) (native-inputs (list ghc-quickcheck ghc-quickcheck-classes)) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-after 'install 'install-xsession - (lambda _ - (let ((xsessions (string-append #$output "/share/xsessions"))) - (mkdir-p xsessions) - (call-with-output-file (string-append xsessions - "/xmonad.desktop") - (lambda (port) - (format port "~ - [Desktop Entry]~@ - Name=~a~@ - Comment=xmonad window manager~@ - Exec=~a/bin/xmonad~@ - Type=Application~%" #$name #$output))))))) - #:cabal-revision '("2" - "1rgwrnyb7kijzl2mqm8ks2nydh37q5vkbg4400rg9n6x13w2r9b3"))) (home-page "http://xmonad.org") (synopsis "Tiling window manager") (description @@ -949,7 +930,11 @@ tiled on several screens.") (add-before 'build 'patch-test-shebang (lambda* (#:key inputs #:allow-other-keys) (substitute* "test/Xmobar/Plugins/Monitors/AlsaSpec.hs" - (("/bin/bash") (which "bash")))))))) + (("/bin/bash") (which "bash"))))) + (add-before 'build 'patch-cairo-path + (lambda _ + (substitute* "src/Xmobar/X11/CairoSurface.hsc" + (("cairo/cairo-xlib.h") "cairo-xlib.h"))))))) (home-page "https://xmobar.org") (synopsis "Haskell library for minimalistic text based status bars") (description @@ -2219,7 +2204,7 @@ compository, supporting the following featuers: (define-public waybar (package (name "waybar") - (version "0.10.2") + (version "0.10.3") (source (origin (method git-fetch) @@ -2228,7 +2213,7 @@ compository, supporting the following featuers: (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0h8anmzhbimgdjnbg79al32d5acbfyrh3sf8wcsbx1296qpd6af6")))) + (base32 "04xd61ycn1nisq1s5ch14zkbsjcfcy6n29nkjn68s2ribmws0iid")))) (build-system meson-build-system) (arguments (list #:configure-flags #~(list "--wrap-mode=nodownload"))) @@ -2425,7 +2410,6 @@ wlr-output-management-unstable-v1 protocol.") (list sbcl-alexandria sbcl-cl-ppcre sbcl-clx)) - (outputs '("out" "lib")) (arguments (list #:phases @@ -2438,12 +2422,12 @@ wlr-output-management-unstable-v1 protocol.") (add-after 'create-asdf-configuration 'build-program (lambda* (#:key outputs #:allow-other-keys) (build-program - (string-append (assoc-ref outputs "out") "/bin/stumpwm") + (string-append #$output "/bin/stumpwm") outputs #:entry-program '((stumpwm:stumpwm) 0)))) (add-after 'build-program 'create-desktop-file (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) + (let* ((out #$output) (xsessions (string-append out "/share/xsessions"))) (mkdir-p xsessions) (call-with-output-file @@ -2460,7 +2444,7 @@ wlr-output-management-unstable-v1 protocol.") out)))))) (add-after 'install 'install-manual (lambda* (#:key (make-flags '()) outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) + (let* ((out #$output) (info (string-append out "/share/info"))) (invoke "./autogen.sh") (invoke "sh" "./configure" "SHELL=sh") @@ -2468,8 +2452,7 @@ wlr-output-management-unstable-v1 protocol.") (install-file "stumpwm.info" info)))) (add-after 'install-manual 'remove-temporary-cache (lambda* (#:key outputs #:allow-other-keys) - (delete-file-recursively (string-append (assoc-ref outputs "lib") - "/.cache"))))))) + (delete-file-recursively (string-append #$output "/.cache"))))))) (synopsis "Window manager written in Common Lisp") (description "Stumpwm is a window manager written entirely in Common Lisp. @@ -2489,10 +2472,8 @@ productive, customizable lisp based systems.") (package (inherit stumpwm) (name "stumpwm-with-slynk") - (outputs '("out")) (inputs - `(("stumpwm" ,stumpwm "lib") - ("slynk" ,sbcl-slynk))) + (list sbcl-slynk stumpwm)) (arguments (substitute-keyword-arguments (package-arguments stumpwm) ((#:phases phases) @@ -2507,8 +2488,7 @@ productive, customizable lisp based systems.") #:dependencies '("stumpwm" "slynk") #:dependency-prefixes (map (lambda (input) (assoc-ref inputs input)) - '("stumpwm" "slynk"))) - #t))) + '("stumpwm" "sbcl-slynk")))))) (delete 'copy-source) (delete 'build) (delete 'check) @@ -2532,7 +2512,7 @@ productive, customizable lisp based systems.") (base32 "1g8h2vd5qsmaiz6ixlx9ykrv6a08izmkf0js18fvljvznpyhsznz")))) (build-system asdf-build-system/sbcl) (inputs - `(("stumpwm" ,stumpwm "lib"))) + (list stumpwm)) (home-page "https://github.com/stumpwm/stumpwm-contrib") (synopsis "StumpWM extra modules") (description "This package provides extra modules for StumpWM.") @@ -2577,7 +2557,7 @@ productive, customizable lisp based systems.") (sha256 (base32 "0djcrr16bx40l7b60d4j507vk5l42fdgmjpgrnk86z1ba8wlqim8")))) - (inputs (list pamixer `(,stumpwm "lib"))) + (inputs (list pamixer stumpwm)) (build-system asdf-build-system/sbcl) (arguments (list #:asd-systems ''("pamixer") @@ -2619,8 +2599,7 @@ mouse control mode for StumpWM.") (inherit stumpwm-contrib) (name "sbcl-stumpwm-ttf-fonts") (inputs - `(("stumpwm" ,stumpwm "lib") - ("clx-truetype" ,sbcl-clx-truetype))) + (list sbcl-clx-truetype stumpwm)) (arguments '(#:asd-systems '("ttf-fonts") #:tests? #f @@ -2732,9 +2711,7 @@ between windows.") (modify-phases %standard-phases (add-after 'unpack 'chdir (lambda _ (chdir "modeline/stumptray") #t))))) (inputs - `(("stumpwm" ,stumpwm "lib") - ("xembed" ,sbcl-clx-xembed) - ("alexandria" ,sbcl-alexandria))) + (list sbcl-alexandria sbcl-clx-xembed stumpwm)) (home-page "https://github.com/stumpwm/stumpwm-contrib/tree/master/modeline/stumptray") (synopsis "Modeline support for stumptray connectivity") @@ -2809,9 +2786,7 @@ layouts in StumpWM.") (add-after 'unpack 'chdir (lambda _ (chdir "modeline/disk") #t))))) (inputs - `(("stumpwm" ,stumpwm "lib") - ("cl-diskspace" ,sbcl-cl-diskspace) - ("cl-mount-info" ,sbcl-cl-mount-info))) + (list sbcl-cl-diskspace sbcl-cl-mount-info stumpwm)) (home-page "https://github.com/stumpwm/stumpwm-contrib") (synopsis "StumpWM modeline support to show disk usage") (description "StumpWM modeline support to show disk usage") @@ -2859,8 +2834,7 @@ one in Emacs.") (inherit stumpwm-contrib) (name "sbcl-stumpwm-screenshot") (inputs - `(("stumpwm" ,stumpwm "lib") - ("zpng" ,sbcl-zpng))) + (list sbcl-zpng stumpwm)) (arguments '(#:asd-systems '("screenshot") #:tests? #f @@ -2909,7 +2883,7 @@ modeline.") (list sbcl-bordeaux-threads sbcl-dbus sbcl-xml-emitter - (list stumpwm "lib"))) + stumpwm)) (arguments '(#:asd-systems '("notify") #:phases @@ -2929,8 +2903,7 @@ by default.") (name "sbcl-stumpwm-battery-portable") (build-system asdf-build-system/sbcl) (inputs - (list sbcl-cl-ppcre - (list stumpwm "lib"))) + (list sbcl-cl-ppcre stumpwm)) (arguments '(#:asd-systems '("battery-portable") #:phases @@ -3838,6 +3811,38 @@ notable features include: It is inspired by dwm and xmonad.") (license license:expat)))) +(define-public wbg + ;; This commit fixes a build error: https://codeberg.org/dnkl/wbg/issues/11 + (let ((commit "dd36cce8c47bb0e17a789cf2bd95a51e29b59e78") + (revision "0")) + (package + (name "wbg") + (version (git-version "1.2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/dnkl/wbg") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0nsb8w3myprhnwr59i6g4nwkc8fx67d40l70svjmwfmhpqy6zc18")))) + (build-system meson-build-system) + (arguments + (list + #:build-type "release" + #:configure-flags #~(list "-Dpng=enabled" + "-Djpeg=enabled" + "-Dwebp=enabled"))) + (native-inputs (list pkg-config tllist wayland-protocols)) + (inputs (list libjpeg-turbo libpng libwebp pixman wayland)) + (home-page "https://codeberg.org/dnkl/wbg") + (synopsis "Wallpaper application for Wayland compositors") + (description + "wbg is a super simple wallpaper application for Wayland compositors +implementing the layer-shell protocol.") + (license license:expat)))) + (define-public wsbg (let ((commit "15b0d0f6910ea97b9bcc471695fac07270955dd2") (revision "0") diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 1e5bae27b5..973e962fb1 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -66,7 +66,7 @@ (define-public wxwidgets (package (name "wxwidgets") - (version "3.2.4") + (version "3.2.5") (source (origin (method url-fetch) @@ -74,7 +74,7 @@ "releases/download/v" version "/wxWidgets-" version ".tar.bz2")) (sha256 - (base32 "0ghkr8wahnw44c6p7zzvc696gmrqc7pxp2bkrcpazdbdf6my2h06")) + (base32 "0lbb3hnprkral29cdik9y2xhjfkf4b4qy905lyv1krg2scx6mn0a")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-26))) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index bd58269e72..9e1e9fbc6f 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -62,6 +62,7 @@ ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space> ;;; Copyright © 2022 Mehmet Tekman <mtekman89@gmail.com> ;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com> +;;; Copyright © 2024 Igor Goryachev <igor@goryachev.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -3804,3 +3805,50 @@ on the screen and which then writes out the necessary C code for it.") and works under both Xorg and Wayland (via @code{libinput}), inspired by @code{python-screenkey}.") (license license:asl2.0))) + +(define-public xxkb + (package + (name "xxkb") + (version "1.11.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/xxkb/" + name "-" version "-src.tar.gz")) + (sha256 + (base32 + "0hl1i38z9xnbgfjkaz04vv1n8xbgfg88g5z8fyzyb2hxv2z37anf")))) + (build-system gnu-build-system) + (inputs (list libx11 + libxext + libxt + libxpm)) + (native-inputs + (list imake)) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((imake (assoc-ref inputs "imake")) + (out (assoc-ref outputs "out"))) + (invoke "xmkmf") + (substitute* "Makefile" + ((imake) out) + (("(MANPATH = )[[:graph:]]*" _ front) + (string-append front out "/share/man")) + (("XAPPLOADDIR = /etc/X11/app-defaults") + (string-append "XAPPLOADDIR = " out "/lib/X11/app-defaults")) + (("ETCX11DIR = /etc/X11") + (string-append "ETCX11DIR = " out "/etc/X11"))) + #t)))))) + (home-page "https://xxkb.sourceforge.net/") + (synopsis "Keyboard layout indicator and switcher") + (description + "The xxkb program is a keyboard layout switcher and indicator. Unlike +the programs that reload keyboard maps and use their own hot-keys, xxkb is +a simple GUI for XKB (X KeyBoard extension) and just sends commands to and +accepts events from XKB. That means that it will work with the existing +setup of your X Server without any modifications.") + (license license:artistic2.0))) diff --git a/gnu/services/audio.scm b/gnu/services/audio.scm index ae991ced4d..5d2cd56a17 100644 --- a/gnu/services/audio.scm +++ b/gnu/services/audio.scm @@ -251,16 +251,14 @@ user-group instead~%")) (configuration-field-error #f 'group value)))) (define (mpd-log-file-sanitizer value) - (match value - (%unset-value - ;; XXX: While leaving the 'sys_log' option out of the mpd.conf file is - ;; supposed to cause logging to happen via systemd (elogind provides a - ;; compatible interface), this doesn't work (nothing gets logged); use - ;; syslog instead. - "syslog") - ((? string?) - value) - (_ (configuration-field-error #f 'log-file value)))) + ;; XXX: While leaving the 'sys_log' option out of the mpd.conf file is + ;; supposed to cause logging to happen via systemd (elogind provides a + ;; compatible interface), this doesn't work (nothing gets logged); use + ;; syslog instead. + (let ((value (maybe-value value "syslog"))) + (if (string? value) + value + (configuration-field-error #f 'log-file value)))) ;;; diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 2d6b0f00e0..4b5b103cc3 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -448,7 +448,11 @@ upon boot." ;; Make sure PID 1 doesn't keep TARGET busy. (chdir "/") - (umount #$target) + #$(if (file-system-mount-may-fail? file-system) + #~(catch 'system-error + (lambda () (umount #$target)) + (const #f)) + #~(umount #$target)) #f)) ;; We need additional modules. @@ -1855,7 +1859,7 @@ archive' public keys, with GUIX." (generate-substitute-key? guix-configuration-generate-substitute-key? (default #t)) ;Boolean (channels guix-configuration-channels ;file-like - (default %default-channels)) + (default #f)) (chroot-directories guix-configuration-chroot-directories ;list of file-like/strings (default '())) (max-silent-time guix-configuration-max-silent-time ;integer diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index afe1bb6016..9b4bfd360f 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de> ;;; Copyright © 2023 Thomas Ieong <th.ieong@free.fr> ;;; Copyright © 2023 Saku Laesvuori <saku@laesvuori.fi> +;;; Copyright © 2024 Juliana Sims <juli@incana.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,10 +39,12 @@ #:use-module (gnu packages dav) #:use-module (gnu packages tls) #:use-module (guix deprecation) + #:use-module ((guix diagnostics) #:select (source-properties->location)) #:use-module (guix modules) #:use-module (guix records) #:use-module (guix packages) #:use-module (guix gexp) + #:use-module (ice-9 curried-definitions) #:use-module (ice-9 match) #:use-module (ice-9 format) #:use-module (srfi srfi-1) @@ -79,10 +82,21 @@ imap4d-service-type %default-imap4d-config-file + radicale-auth-configuration + radicale-auth-configuration? + radicale-encoding-configuration + radicale-encoding-configuration? + radicale-logging-configuration + radicale-logging-configuration? + radicale-rights-configuration + radicale-rights-configuration? + radicale-server-configuration + radicale-server-configuration? + radicale-storage-configuration + radicale-storage-configuration? radicale-configuration radicale-configuration? radicale-service-type - %default-radicale-config-file rspamd-configuration rspamd-service-type @@ -1929,23 +1943,258 @@ exim_group = exim ;;; Radicale. ;;; -(define-record-type* <radicale-configuration> - radicale-configuration make-radicale-configuration - radicale-configuration? - (package radicale-configuration-package - (default radicale)) - (config-file radicale-configuration-config-file - (default %default-radicale-config-file))) +;; Maybe types -(define %default-radicale-config-file - (plain-file "radicale.conf" " -[auth] -type = htpasswd -htpasswd_filename = /var/lib/radicale/users -htpasswd_encryption = plain +(define (comma-separated-ip-list? lst) + (every (lambda (s) + (or (string-prefix? "localhost" s) + ((@@ (gnu services vpn) ipv4-address?) s) + ((@@ (gnu services vpn) ipv6-address?) s))) + lst)) -[server] -hosts = localhost:5232")) +(define-maybe boolean (prefix radicale-)) +(define-maybe comma-separated-ip-list (prefix radicale-)) +(define-maybe file-name (prefix radicale-)) +(define-maybe non-negative-integer (prefix radicale-)) +(define-maybe string (prefix radicale-)) +(define-maybe symbol (prefix radicale-)) + +;; Serializers and sanitizers + +(define (radicale-serialize-field field-name value) + ;; XXX We quote the un-gexp form here because otherwise symbol-literals are + ;; treated as variables. We can get away with this because all of our other + ;; field value types are primitives by the time they get here so are printed + ;; the same whether or not they are quoted. + #~(format #f "~a = ~a\n" #$(uglify-field-name field-name) '#$value)) + +(define (radicale-serialize-boolean field-name value?) + (radicale-serialize-field field-name (if value? "True" "False"))) + +(define (radicale-serialize-comma-separated-ip-list field-name value) + (radicale-serialize-field field-name (string-join value ", "))) + +(define radicale-serialize-file-name radicale-serialize-field) + +(define radicale-serialize-non-negative-integer radicale-serialize-field) + +(define radicale-serialize-string radicale-serialize-field) + +(define radicale-serialize-symbol radicale-serialize-field) + +(define ((sanitize-delimited-symbols syms location field) value) + (cond + ((not (maybe-value-set? value)) + value) + ((member value syms) + (string->symbol (uglify-field-name value))) + (else + (configuration-field-error (source-properties->location location) + field + value)))) + +;; Section configuration types + +(define-configuration radicale-auth-configuration + (type + maybe-symbol + "The method to verify usernames and passwords. Options are @code{none}, +@code{htpasswd}, @code{remote-user}, and @code{http-x-remote-user}. + +This value is tied to @code{htpasswd-filename} and @code{htpasswd-encryption}." + (sanitizer + (sanitize-delimited-symbols '(none htpasswd remote-user http-x-remote-user) + (current-source-location) + 'type))) + (htpasswd-filename + maybe-file-name + "Path to the htpasswd file. Use htpasswd or similar to generate this file.") + (htpasswd-encryption + maybe-symbol + "Encryption method used in the htpasswd file. Options are @code{plain}, +@code{bcrypt}, and @code{md5}." + (sanitizer + (sanitize-delimited-symbols '(plain bcrypt md5) + (current-source-location) + 'htpasswd-encryption))) + (delay + maybe-non-negative-integer + "Average delay after failed login attempts in seconds.") + (realm + maybe-string + "Message displayed in the client when a password is needed.") + (prefix radicale-)) + +(define-configuration radicale-encoding-configuration + (request + maybe-symbol + "Encoding for responding requests.") + (stock + maybe-symbol + "Encoding for storing local collections.") + (prefix radicale-)) + +(define-configuration radicale-logging-configuration + (level + maybe-symbol + "Set the logging level. One of @code{debug}, @code{info}, @code{warning}, +@code{error}, or @code{critical}." + (sanitizer (sanitize-delimited-symbols '(debug info warning error critical) + (current-source-location) + 'level))) + (mask-passwords? + maybe-boolean + "Whether to include passwords in logs.") + (prefix radicale-)) + +(define-configuration radicale-rights-configuration + (type + maybe-symbol + "Backend used to check collection access rights. The recommended backend is +@code{owner-only}. If access to calendars and address books outside the home +directory of users is granted, clients won't detect these collections and will +not show them to the user. Choosing any other method is only useful if you +access calendars and address books directly via URL. Options are +@code{authenticate}, @code{owner-only}, @code{owner-write}, and +@code{from-file}." + (sanitizer + (sanitize-delimited-symbols '(authenticate owner-only owner-write from-file) + (current-source-location) + 'type))) + (file + maybe-file-name + "File for the rights backend @code{from-file}.") + (prefix radicale-)) + +(define-configuration radicale-server-configuration + (hosts + maybe-comma-separated-ip-list + "List of IP addresses that the server will bind to.") + (max-connections + maybe-non-negative-integer + "Maximum number of parallel connections. Set to 0 to disable the limit.") + (max-content-length + maybe-non-negative-integer + "Maximum size of the request body in byetes.") + (timeout + maybe-non-negative-integer + "Socket timeout in seconds.") + (ssl? + maybe-boolean + "Whether to enable transport layer encryption.") + (certificate + maybe-file-name + "Path of the SSL certificate.") + (key + maybe-file-name + "Path to the private key for SSL. Only effective if @code{ssl?} is +@code{#t}.") + (certificate-authority + maybe-file-name + "Path to CA certificate for validating client certificates. This can be used +to secure TCP traffic between Radicale and a reverse proxy. If you want to +authenticate users with client-side certificates, you also have to write an +authentication plugin that extracts the username from the certificate.") + (prefix radicale-)) + +(define-configuration radicale-storage-configuration + (type + maybe-symbol + "Backend used to store data. Options are @code{multifilesystem} and +@code{multifilesystem-nolock}." + (sanitizer + (sanitize-delimited-symbols '(multifilesystem multifilesystem-nolock) + (current-source-location) + 'type))) + (filesystem-folder + maybe-file-name + "Folder for storing local collections. Created if not present.") + (max-sync-token-age + maybe-non-negative-integer + "Delete sync-tokens that are older than the specified time in seconds.") + (hook + maybe-string + "Command run after changes to storage.") + (prefix radicale-)) + +;; Helpers for using section configurations in the main configuration + +;; XXX These indirections are necessary to avoid creating semantic ambiguity +(define auth-config? radicale-auth-configuration?) +(define encoding-config? radicale-encoding-configuration?) +(define headers-file? file-like?) +(define logging-config? radicale-logging-configuration?) +(define rights-config? radicale-rights-configuration?) +(define server-config? radicale-server-configuration?) +(define storage-config? radicale-storage-configuration?) + +(define-maybe auth-config) +(define-maybe encoding-config) +(define-maybe headers-file) +(define-maybe logging-config) +(define-maybe rights-config) +(define-maybe server-config) +(define-maybe storage-config) + +(define ((serialize-radicale-section fields) name cfg) + #~(format #f "[~a]\n~a\n" '#$name #$(serialize-configuration cfg fields))) + +(define serialize-auth-config + (serialize-radicale-section radicale-auth-configuration-fields)) +(define serialize-encoding-config + (serialize-radicale-section radicale-encoding-configuration-fields)) +(define serialize-logging-config + (serialize-radicale-section radicale-logging-configuration-fields)) +(define serialize-rights-config + (serialize-radicale-section radicale-rights-configuration-fields)) +(define serialize-server-config + (serialize-radicale-section radicale-server-configuration-fields)) +(define serialize-storage-config + (serialize-radicale-section radicale-storage-configuration-fields)) + +(define (serialize-radicale-configuration cfg) + (mixed-text-file + "radicale.conf" + (serialize-configuration cfg radicale-configuration-fields))) + +(define-configuration radicale-configuration + ;; Only fields whose default value does not match upstream are not maybe-types + (package + (file-like radicale) + "Package that provides @command{radicale}.") + (auth + maybe-auth-config + "Configuration for auth-related variables.") + (encoding + maybe-encoding-config + "Configuration for encoding-related variables.") + (headers-file + maybe-headers-file + "Custom HTTP headers." + (serializer + (lambda (field-name value) + #~(begin + (use-modules (ice-9 rdelim)) + (format #f "[headers]\n~a\n\n" + (with-input-from-file #$value read-string)))))) + (logging + maybe-logging-config + "Configuration for logging-related variables.") + (rights + maybe-rights-config + "Configuration for rights-related variables.") + (server + maybe-server-config + "Configuration for server-related variables. Ignored if WSGI is used.") + (storage + maybe-storage-config + "Configuration for storage-related variables.") + (web-interface? + maybe-boolean + "Whether to use Radicale's built-in web interface." + (serializer + (lambda (_ use?) + #~(format #f "[web]\ntype = ~a\n\n" #$(if use? "internal" "none")))))) (define %radicale-accounts (list (user-group @@ -1959,43 +2208,88 @@ hosts = localhost:5232")) (home-directory "/var/empty") (shell (file-append shadow "/sbin/nologin"))))) -(define radicale-shepherd-service - (match-lambda - (($ <radicale-configuration> package config-file) - (list (shepherd-service - (provision '(radicale)) - (documentation "Run the radicale daemon.") - (requirement '(networking)) - (start #~(make-forkexec-constructor - (list #$(file-append package "/bin/radicale") - "-C" #$config-file) - #:user "radicale" - #:group "radicale")) - (stop #~(make-kill-destructor))))))) +(define (radicale-shepherd-service cfg) + (list (shepherd-service + (provision '(radicale)) + (documentation "Run the radicale daemon.") + (requirement '(networking)) + (start #~(make-forkexec-constructor + (list #$(file-append (radicale-configuration-package cfg) + "/bin/radicale") + "-C" #$(serialize-radicale-configuration cfg)) + #:user "radicale" + #:group "radicale")) + (stop #~(make-kill-destructor))))) (define radicale-activation (match-lambda - (($ <radicale-configuration> package config-file) + (($ <radicale-configuration> _ auth-config _ _ _ _ _ storage-config _) + ;; Get values for the collections directory + ;; See https://radicale.org/v3.html#running-as-a-service + (define filesystem-folder-val + (if (maybe-value-set? storage-config) + (radicale-storage-configuration-filesystem-folder storage-config) + storage-config)) + (define collections-dir + (if (maybe-value-set? filesystem-folder-val) + filesystem-folder-val + "/var/lib/radicale/collections")) + (define collections-parent-dir (dirname collections-dir)) + ;; Get values for the password file directory + (define auth-value-set? (maybe-value-set? auth-config)) + ;; If auth's type is 'none or unset, that means there is no authentication + ;; and we don't need to setup files for it + (define auth? + (and auth-value-set? + (not (eq? (radicale-auth-configuration-type auth-config) 'none)))) + (define password-file-val + (if auth-value-set? + (radicale-auth-configuration-htpasswd-filename auth-config) + auth-config)) + (define password-file-dir + (if (maybe-value-set? password-file-val) + (dirname password-file-val) + "/etc/radicale")) (with-imported-modules '((guix build utils)) #~(begin (use-modules (guix build utils)) - (let ((uid (passwd:uid (getpw "radicale"))) - (gid (group:gid (getgr "radicale")))) - (mkdir-p "/var/lib/radicale/collections") - (chown "/var/lib/radicale" uid gid) - (chown "/var/lib/radicale/collections" uid gid) - (chmod "/var/lib/radicale" #o700))))))) + (let ((user (getpwnam "radicale"))) + ;; Collections directory perms + (mkdir-p/perms #$collections-dir user #o700) + ;; Password file perms + (when #$auth? + ;; In theory, the password file and thus this directory should already + ;; exist because the user has to make them by hand + (mkdir-p/perms #$password-file-dir user #o700)))))))) (define radicale-service-type (service-type (name 'radicale) - (description "Run radicale, a small CalDAV and CardDAV server.") + (description "Run Radicale, a small CalDAV and CardDAV server.") (extensions (list (service-extension shepherd-root-service-type radicale-shepherd-service) (service-extension account-service-type (const %radicale-accounts)) (service-extension activation-service-type radicale-activation))) (default-value (radicale-configuration)))) +(define (generate-radicale-documentation) + (generate-documentation + `((radicale-configuration + ,radicale-configuration-fields + (auth radicale-auth-configuration) + (encoding radicale-encoding-configuration) + (logging radicale-logging-configuration) + (rights radicale-rights-configuration) + (server radicale-server-configuration) + (storage radicale-storage-configuration)) + (radicale-auth-configuration ,radicale-auth-configuration-fields) + (radicale-encoding-configuration ,radicale-encoding-configuration-fields) + (radicale-logging-configuration ,radicale-logging-configuration-fields) + (radicale-rights-configuration ,radicale-rights-configuration-fields) + (radicale-server-configuration ,radicale-server-configuration-fields) + (radicale-storage-configuration ,radicale-storage-configuration-fields)) + 'radicale-configuration)) + ;;; ;;; Rspamd. ;;; diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 378e117a86..12d8934e43 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -91,6 +91,7 @@ dhcp-client-configuration? dhcp-client-configuration-package dhcp-client-configuration-interfaces + dhcp-client-configuration-config-file dhcp-client-configuration-shepherd-provision dhcp-client-configuration-shepherd-requirement @@ -319,6 +320,8 @@ (default '())) (shepherd-provision dhcp-client-configuration-shepherd-provision (default '(networking))) + (config-file dhcp-client-configuration-config-file + (default #f)) (interfaces dhcp-client-configuration-interfaces (default 'all))) ;'all | list of strings @@ -329,6 +332,7 @@ (requirement (dhcp-client-configuration-shepherd-requirement config)) (provision (dhcp-client-configuration-shepherd-provision config)) (interfaces (dhcp-client-configuration-interfaces config)) + (config-file (dhcp-client-configuration-config-file config)) (pid-file "/var/run/dhclient.pid")) (list (shepherd-service (documentation "Set up networking via DHCP.") @@ -364,6 +368,11 @@ (_ #~'#$interfaces)))) + (define config-file-args + (if #$config-file + (list "-cf" #$config-file) + '())) + (false-if-exception (delete-file #$pid-file)) (let ((pid (fork+exec-command ;; By default dhclient uses a @@ -371,8 +380,10 @@ ;; DDNS, which is incompatable with ;; non-ISC DHCP servers; thus, pass '-I'. ;; <https://kb.isc.org/docs/aa-01091>. - (cons* dhclient "-nw" "-I" - "-pf" #$pid-file ifaces)))) + `(,dhclient "-nw" "-I" + "-pf" ,#$pid-file + ,@config-file-args + ,@ifaces)))) (and (zero? (cdr (waitpid pid))) (read-pid-file #$pid-file))))) (stop #~(make-kill-destructor)))))) diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index ccc8e61a33..05534ab317 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -60,6 +60,7 @@ shepherd-service-respawn? shepherd-service-start shepherd-service-stop + shepherd-service-free-form shepherd-service-auto-start? shepherd-service-modules @@ -217,7 +218,10 @@ DEFAULT is given, use it as the service's default value." (default #f)) (respawn-delay shepherd-service-respawn-delay (default #f)) - (start shepherd-service-start) ;g-expression (procedure) + (free-form shepherd-service-free-form ;#f | g-expression (service) + (default #f)) + (start shepherd-service-start ;g-expression (procedure) + (default #~(const #t))) (stop shepherd-service-stop ;g-expression (procedure) (default #~(const #f))) (actions shepherd-service-actions ;list of <shepherd-action> @@ -298,8 +302,8 @@ stored." provisions) ".scm"))) -(define (shepherd-service-file service) - "Return a file defining SERVICE." +(define (shepherd-service-file/regular service) + "Return a file defining SERVICE, a service whose 'free-form' field is #f." (scheme-file (shepherd-service-file-name service) (with-imported-modules %default-imported-modules #~(begin @@ -332,6 +336,21 @@ stored." #~(#$name #$doc #$proc))) (shepherd-service-actions service)))))))) +(define (shepherd-service-file/free-form service) + "Return a file defining SERVICE, a service whose 'free-form' field is set." + (scheme-file (shepherd-service-file-name service) + (with-imported-modules %default-imported-modules + #~(begin + (use-modules #$@(shepherd-service-modules service)) + + #$(shepherd-service-free-form service))))) + +(define (shepherd-service-file service) + "Return a file defining SERVICE." + (if (shepherd-service-free-form service) + (shepherd-service-file/free-form service) + (shepherd-service-file/regular service))) + (define (scm->go file shepherd) "Compile FILE, which contains code to be loaded by shepherd's config file, and return the resulting '.go' file. SHEPHERD is used as shepherd package." diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 406117c457..ee3499e5cd 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -771,7 +771,14 @@ of index files." "\n" (map emit-nginx-upstream-config upstream-blocks) (map emit-nginx-server-config server-blocks) - extra-content + (match extra-content + ((? list? extra-content) + (map (lambda (line) + `(" " ,line "\n")) + extra-content)) + ;; XXX: For compatibility strings and gexp's are inserted + ;; directly. + (_ extra-content)) "\n}\n")))) (define %nginx-accounts diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm index 978aed0fc1..dc5d65436e 100644 --- a/guix/build-system/qt.scm +++ b/guix/build-system/qt.scm @@ -130,7 +130,7 @@ (build-type "RelWithDebInfo") (tests? #t) (test-target "test") - (parallel-build? #t) (parallel-tests? #f) + (parallel-build? #t) (parallel-tests? #t) (validate-runpath? #t) (patch-shebangs? #t) (strip-binaries? #t) diff --git a/guix/build/go-build-system.scm b/guix/build/go-build-system.scm index 7f25e05d0d..d95262bd6c 100644 --- a/guix/build/go-build-system.scm +++ b/guix/build/go-build-system.scm @@ -4,8 +4,10 @@ ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> -;;; Copyright © 2020, 2021 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2020, 2021, 2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev> +;;; Copyright © 2024 Ekaitz Zarraga <ekaitz@elenq.tech> +;;; Copyright © 2024 Picnoir <picnoir@alternativebit.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -90,7 +92,6 @@ ;; * Use Go modules [4] ;; * Re-use compiled packages [5] ;; * Avoid the go-inputs hack -;; * Stop needing remove-go-references (-trimpath ? ) ;; * Remove module packages, only offering the full Git repos? This is ;; more idiomatic, I think, because Go downloads Git repos, not modules. ;; What are the trade-offs? @@ -227,9 +228,10 @@ unpacking." (when (string-null? import-path) (display "WARNING: The Go import path is unset.\n")) - (when (string-null? unpack-path) - (set! unpack-path import-path)) - (let ((dest (string-append (getenv "GOPATH") "/src/" unpack-path))) + (let ((dest (string-append (getenv "GOPATH") "/src/" + (if (string-null? unpack-path) + import-path + unpack-path)))) (mkdir-p dest) (if (file-is-directory? source) (copy-recursively source dest #:keep-mtime? #t) @@ -265,6 +267,7 @@ unpacking." ;; Respectively, strip the symbol table and debug ;; information, and the DWARF symbol table. "-ldflags=-s -w" + "-trimpath" `(,@build-flags ,import-path))) (lambda (key . args) (display (string-append "Building '" import-path "' failed.\n" @@ -304,58 +307,6 @@ the standard install-license-files phase to first enter the correct directory." unpack-path)) (apply (assoc-ref gnu:%standard-phases 'install-license-files) args))) -(define* (remove-store-reference file file-name - #:optional (store (%store-directory))) - "Remove from FILE occurrences of FILE-NAME in STORE; return #t when FILE-NAME -is encountered in FILE, #f otherwise. This implementation reads FILE one byte at -a time, which is slow. Instead, we should use the Boyer-Moore string search -algorithm; there is an example in (guix build grafts)." - (define pattern - (string-take file-name - (+ 34 (string-length (%store-directory))))) - - (with-fluids ((%default-port-encoding #f)) - (with-atomic-file-replacement file - (lambda (in out) - ;; We cannot use `regexp-exec' here because it cannot deal with - ;; strings containing NUL characters. - (format #t "removing references to `~a' from `~a'...~%" file-name file) - (setvbuf in 'block 65536) - (setvbuf out 'block 65536) - (fold-port-matches (lambda (match result) - (put-bytevector out (string->utf8 store)) - (put-u8 out (char->integer #\/)) - (put-bytevector out - (string->utf8 - "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-")) - #t) - #f - pattern - in - (lambda (char result) - (put-u8 out (char->integer char)) - result)))))) - -(define* (remove-go-references #:key allow-go-reference? - inputs outputs #:allow-other-keys) - "Remove any references to the Go compiler from the compiled Go executable -files in OUTPUTS." -;; We remove this spurious reference to save bandwidth when installing Go -;; executables. It would be better to not embed the reference in the first -;; place, but I'm not sure how to do that. The subject was discussed at: -;; <https://lists.gnu.org/archive/html/guix-devel/2017-10/msg00207.html> - (if allow-go-reference? - #t - (let ((go (assoc-ref inputs "go")) - (bin "/bin")) - (for-each (lambda (output) - (when (file-exists? (string-append (cdr output) - bin)) - (for-each (lambda (file) - (remove-store-reference file go)) - (find-files (string-append (cdr output) bin))))) - outputs) - #t))) (define %standard-phases (modify-phases gnu:%standard-phases @@ -367,8 +318,7 @@ files in OUTPUTS." (replace 'build build) (replace 'check check) (replace 'install install) - (replace 'install-license-files install-license-files) - (add-after 'install 'remove-go-references remove-go-references))) + (replace 'install-license-files install-license-files))) (define* (go-build #:key inputs (phases %standard-phases) #:allow-other-keys #:rest args) diff --git a/guix/import/stackage.scm b/guix/import/stackage.scm index f801835b33..61012bed28 100644 --- a/guix/import/stackage.scm +++ b/guix/import/stackage.scm @@ -50,7 +50,7 @@ (make-parameter "https://www.stackage.org")) ;; Latest LTS version compatible with current GHC. -(define %default-lts-version "20.5") +(define %default-lts-version "20.26") (define-json-mapping <stackage-lts> make-stackage-lts stackage-lts? diff --git a/guix/lint.scm b/guix/lint.scm index 68d532968d..7612832a5a 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -1971,10 +1971,6 @@ them for PACKAGE." (description "Validate package descriptions") (check check-description-style)) (lint-checker - (name 'synopsis) - (description "Validate package synopses") - (check check-synopsis-style)) - (lint-checker (name 'inputs-should-be-native) (description "Identify inputs that should be native inputs") (check check-inputs-should-be-native)) @@ -2038,7 +2034,10 @@ or a list thereof") (define %network-dependent-checkers (list - + (lint-checker + (name 'synopsis) + (description "Validate package synopses") + (check check-synopsis-style)) (lint-checker (name 'gnu-description) (description "Validate synopsis & description of GNU packages") diff --git a/guix/packages.scm b/guix/packages.scm index abe89cdb07..f3a9a61785 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -899,7 +899,7 @@ identifiers. The result is inferred from the file names of patches." ("gzip" ,(ref '(gnu packages compression) 'gzip)) ("lzip" ,(ref '(gnu packages compression) 'lzip)) ("unzip" ,(ref '(gnu packages compression) 'unzip)) - ("patch" ,(ref '(gnu packages base) 'patch)) + ("patch" ,(ref '(gnu packages base) 'patch/pinned)) ("locales" ,(parameterize ((%current-target-system #f) (%current-system system)) diff --git a/guix/store.scm b/guix/store.scm index 58ddaa8d15..4070b686cb 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -524,50 +524,45 @@ non-blocking." (errno (system-error-errno args))))) (loop rest))))))))) -(define* (connect-to-daemon uri #:key non-blocking?) - "Connect to the daemon at URI, a string that may be an actual URI or a file -name, and return an input/output port. If NON-BLOCKING?, use a non-blocking -socket when using the file, unix or guix URI schemes. +(define* (connect-to-daemon uri-or-filename #:key non-blocking?) + "Connect to the daemon at URI-OR-FILENAME and return an input/output port. +If NON-BLOCKING?, use a non-blocking socket when using the file, unix or guix +URI schemes. This is a low-level procedure that does not perform the initial handshake with the daemon. Use 'open-connection' for that." (define (not-supported) (raise (condition (&store-connection-error - (file uri) + (file uri-or-filename) (errno ENOTSUP))))) - (define connect - (match (string->uri uri) - (#f ;URI is a file name - open-unix-domain-socket) - ((? uri? uri) - (match (uri-scheme uri) - ((or #f 'file 'unix) - (lambda (_) - (open-unix-domain-socket (uri-path uri) - #:non-blocking? non-blocking?))) - ('guix - (lambda (_) - (open-inet-socket (uri-host uri) - (or (uri-port uri) %default-guix-port) - #:non-blocking? non-blocking?))) - ((? symbol? scheme) - ;; Try to dynamically load a module for SCHEME. - ;; XXX: Errors are swallowed. - (match (false-if-exception - (resolve-interface `(guix store ,scheme))) - ((? module? module) - (match (false-if-exception - (module-ref module 'connect-to-daemon)) - ((? procedure? connect) - (lambda (_) - (connect uri))) - (x (not-supported)))) - (#f (not-supported)))) - (x - (not-supported)))))) - - (connect uri)) + (match (string->uri uri-or-filename) + (#f ;URI is a file name + (open-unix-domain-socket uri-or-filename + #:non-blocking? non-blocking?)) + ((? uri? uri) + (match (uri-scheme uri) + ((or #f 'file 'unix) + (open-unix-domain-socket (uri-path uri) + #:non-blocking? non-blocking?)) + ('guix + (open-inet-socket (uri-host uri) + (or (uri-port uri) %default-guix-port) + #:non-blocking? non-blocking?)) + ((? symbol? scheme) + ;; Try to dynamically load a module for SCHEME. + ;; XXX: Errors are swallowed. + (match (false-if-exception + (resolve-interface `(guix store ,scheme))) + ((? module? module) + (match (false-if-exception + (module-ref module 'connect-to-daemon)) + ((? procedure? connect) + (connect uri)) + (x (not-supported)))) + (#f (not-supported)))) + (x + (not-supported)))))) (define* (open-connection #:optional (uri (%daemon-socket-uri)) #:key port (reserve-space? #t) cpu-affinity diff --git a/guix/swh.scm b/guix/swh.scm index f602cd89d1..fd17b04b75 100644 --- a/guix/swh.scm +++ b/guix/swh.scm @@ -165,10 +165,16 @@ (define url (string-append root (string-join rest "/" 'prefix))) - ;; Ensure there's a trailing slash or we get a redirect. - (if (string-suffix? "/" url) - url - (string-append url "/"))) + (define (contains-parameters? url) + (match (string-rindex url #\/) + (#f #f) + (offset (string-index (string-drop url (+ 1 offset)) #\?)))) + + ;; Ensure there's a trailing slash or we get a redirect. Don't do that if + ;; URL contains parameters. + (cond ((string-suffix? "/" url) url) + ((contains-parameters? url) url) + (else (string-append url "/")))) ;; XXX: Work around a bug in Guile 3.0.2 where #:verify-certificate? would ;; be ignored (<https://bugs.gnu.org/40486>). @@ -460,8 +466,11 @@ FALSE-IF-404? is true, return #f upon 404 responses." "Return the external ID record for ID, a bytevector, of the given TYPE (currently one of: \"bzr-nodeid\", \"hg-nodeid\", \"nar-sha256\", \"checksum-sha512\")." + ;; Specify "extid_version=1" as explained in + ;; <https://gitlab.softwareheritage.org/swh/meta/-/issues/5093>. (call (swh-url "/api/1/extid" type - (string-append "hex:" (bytevector->base16-string id))) + (string-append "hex:" (bytevector->base16-string id) + "/?extid_version=1")) json->external-id)) (define* (lookup-directory-by-nar-hash hash #:optional (algorithm 'sha256)) diff --git a/manifest.scm b/manifest.scm index 2bc225ead7..7e4d82c3a5 100644 --- a/manifest.scm +++ b/manifest.scm @@ -22,18 +22,19 @@ ;; ;; or something like ;; -;; guix shell --pure git git:send-email openssh - -(use-modules (guix profiles) - (gnu packages gnupg) - (gnu packages perl) - (gnu packages package-management)) +;; guix shell --pure -m manifest.scm hello ... (concatenate-manifests - (list (package->development-manifest guix) - - ;; Extra packages used by make dist. - (packages->manifest (list perl)) - + (list (package->development-manifest (specification->package "guix")) ;; Extra packages used by unit tests. - (packages->manifest (list gnupg)))) + (specifications->manifest (list "gnupg")) + + ;; Useful extras for patches submission. + (specifications->manifest + (list "b4" + "git" + "git:send-email" + "mumi" + "nss-certs" + "openssl" ;required if using 'smtpEncryption = tls' + "patman")))) diff --git a/nix/local.mk b/nix/local.mk index 44a26dd2c8..8a2b2b88e8 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2012-2016, 2018-2020, 2024 Ludovic Courtès <ludo@gnu.org> # Copyright © 2016 Mathieu Lirzin <mthl@gnu.org> # Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> # @@ -166,8 +166,9 @@ etc/%.mount: etc/%.mount.in \ etc/guix-%.service: etc/guix-%.service.in \ $(top_builddir)/config.status $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \ - $(SED) -e 's|@''localstatedir''@|$(localstatedir)|' < \ - "$<" > "$@.tmp"; \ + $(SED) -e 's|@''localstatedir''@|$(localstatedir)|' \ + -e 's|@''GUIX_SUBSTITUTE_URLS''@|$(GUIX_SUBSTITUTE_URLS)|' \ + < "$<" > "$@.tmp"; \ mv "$@.tmp" "$@" # The service script for sysvinit. @@ -177,8 +178,9 @@ nodist_sysvinitservice_DATA = etc/init.d/guix-daemon etc/init.d/guix-daemon: etc/init.d/guix-daemon.in \ $(top_builddir)/config.status $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \ - $(SED) -e 's|@''localstatedir''@|$(localstatedir)|' < \ - "$<" > "$@.tmp"; \ + $(SED) -e 's|@''localstatedir''@|$(localstatedir)|' \ + -e 's|@''GUIX_SUBSTITUTE_URLS''@|$(GUIX_SUBSTITUTE_URLS)|' \ + < "$<" > "$@.tmp"; \ mv "$@.tmp" "$@" # The service script for openrc. @@ -199,8 +201,9 @@ nodist_upstartjob_DATA = etc/guix-daemon.conf etc/guix-publish.conf etc/guix-%.conf: etc/guix-%.conf.in \ $(top_builddir)/config.status $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \ - $(SED) -e 's|@''localstatedir''@|$(localstatedir)|' < \ - "$<" > "$@.tmp"; \ + $(SED) -e 's|@''localstatedir''@|$(localstatedir)|' \ + -e 's|@''GUIX_SUBSTITUTE_URLS''@|$(GUIX_SUBSTITUTE_URLS)|' \ + < "$<" > "$@.tmp"; \ mv "$@.tmp" "$@" CLEANFILES += \ |