forked from tribes/guix
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 nckx
|
9ea6ba31b9 |
@@ -28,13 +28,7 @@ Tick a box by changing it from [ ] to [x].
|
||||
- [ ] i586-gnu
|
||||
|
||||
- Package **update**
|
||||
- Closure size increase.
|
||||
```console
|
||||
$ guix size PACKAGE | tail -n1 # before
|
||||
total: ...
|
||||
$ ./pre-inst-env guix size PACKAGE | tail -n1 # after
|
||||
total: ...
|
||||
```
|
||||
- Closure size increase after update (`./pre-inst-env guix size PACKAGE`).
|
||||
- Build status of direct dependents (`./pre-inst-env guix build -k -P1 PACKAGE ...`):
|
||||
```text
|
||||
|
||||
|
||||
@@ -23,8 +23,6 @@
|
||||
(name "cbaines"))
|
||||
("3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5"
|
||||
(name "civodul"))
|
||||
("838A FE0D 55DC 074E 360F 943A 84B6 9CE6 F3F6 B767"
|
||||
(name "cnx"))
|
||||
("CCB8 1842 F9D7 058E CD67 377A BF5C DF4D F6BF 6682"
|
||||
(name "csantosb"))
|
||||
("510A 8628 E2A7 7678 8F8C 709C 4BC0 2592 5FF8 F4D3"
|
||||
|
||||
+1
-1
@@ -239,7 +239,6 @@ tests/guix-home\.sh @guix/home
|
||||
tests/home-import\.scm @guix/home
|
||||
tests/home-services\.scm @guix/home
|
||||
|
||||
gnu/packages/fabric-management\.scm @guix/hpc
|
||||
gnu/packages/mpi\.scm @guix/hpc
|
||||
gnu/packages/oneapi\.scm @guix/hpc
|
||||
gnu/packages/opencl\.scm @guix/hpc
|
||||
@@ -348,6 +347,7 @@ guix/scripts/import/pypi\.scm @guix/python
|
||||
tests/import/pypi\.scm @guix/python
|
||||
tests/toml\.scm @guix/python
|
||||
|
||||
gnu/ci\.scm @guix/qa-packages
|
||||
gnu/packages/benchmark\.scm @guix/qa-packages
|
||||
gnu/packages/check\.scm @guix/qa-packages
|
||||
gnu/packages/ci\.scm @guix/qa-packages
|
||||
|
||||
@@ -17,7 +17,6 @@ Please send Guix bug reports to bug-guix@gnu.org.
|
||||
* Changes in 1.6.0 (since 1.5.0)
|
||||
** Distribution
|
||||
*** GNOME updated to version 48
|
||||
*** New service for Fossil SCM
|
||||
|
||||
* Changes in 1.5.0 (since 1.4.0)
|
||||
** Package management
|
||||
|
||||
+11
-436
@@ -2658,11 +2658,9 @@ bootloaders.
|
||||
|
||||
Once you are done partitioning the target hard disk drive, you have to
|
||||
create a file system on the relevant partition(s)@footnote{Currently
|
||||
Guix System supports only ext4, btrfs, bcachefs, JFS, F2FS, and XFS
|
||||
file systems. In particular, code that reads file system UUIDs and
|
||||
labels works only for these file system types. For bcachefs, also add
|
||||
the @code{bcachefs-linux-module} to your @code{operating-system}'s
|
||||
@code{initrd-modules}.}. For the ESP, if you have one and assuming it is
|
||||
Guix System only supports ext4, btrfs, JFS, F2FS, and XFS file systems. In
|
||||
particular, code that reads file system UUIDs and labels only works for these
|
||||
file system types.}. For the ESP, if you have one and assuming it is
|
||||
@file{/dev/sda1}, run:
|
||||
|
||||
@example
|
||||
@@ -27017,32 +27015,6 @@ Deprecated option.
|
||||
@end deftp
|
||||
|
||||
|
||||
@c %end of fragment
|
||||
|
||||
@defvar gardenhostd-service-type
|
||||
Type for the service that runs gardenhostd, a partial implementation of
|
||||
the systemd-hostnamed daemon. It provides the org.freedesktop.hostname1
|
||||
D-Bus interface, which helps applications like gnome-control-center
|
||||
retrieve and modify the system’s hostname, as well as set a pretty
|
||||
hostname for display.
|
||||
|
||||
The value for this service is a @code{<gardenhostd-configuration>} object.
|
||||
@end defvar
|
||||
|
||||
@c %start of fragment
|
||||
|
||||
@deftp {Data Type} gardenhostd-configuration
|
||||
Available @code{gardenhostd-configuration} fields are:
|
||||
|
||||
@table @asis
|
||||
@item @code{gardenhostd} (default: @code{gardenhostd}) (type: package)
|
||||
The gardenhostd package to use.
|
||||
|
||||
@end table
|
||||
|
||||
@end deftp
|
||||
|
||||
|
||||
@c %end of fragment
|
||||
|
||||
@defvar accountsservice-service-type
|
||||
@@ -34134,300 +34106,6 @@ Zabbix server port.
|
||||
|
||||
@c %end of fragment
|
||||
|
||||
@subsubheading collectd Service
|
||||
@cindex collectd
|
||||
collectd is a daemon which collects, stores, transports, and visualizes
|
||||
system and application performance metrics in a variety of ways.
|
||||
|
||||
@defvar collectd-service-type
|
||||
This is the service type for the @uref{https://collectd.org/, collectd}
|
||||
service. Its value must be a @code{collectd-configuration} record:
|
||||
|
||||
@lisp
|
||||
(service collectd-service-type
|
||||
(collectd-configuration
|
||||
(plugins
|
||||
(list
|
||||
(collectd-plugin-generic
|
||||
(name "cpu")
|
||||
(options '((ReportByCpu . #t)
|
||||
(ReportByState . #t)
|
||||
(ValuesPercentage . #t))))))))
|
||||
@end lisp
|
||||
|
||||
The service may be extended to add new plugins:
|
||||
|
||||
@lisp
|
||||
(simple-service 'collectd-memory
|
||||
collectd-service-type
|
||||
(list
|
||||
(collectd-plugin-generic
|
||||
(name "memory")
|
||||
(options '((ValuesAbsolute . #t)
|
||||
(ValusPercentage . #t))))))
|
||||
@end lisp
|
||||
@end defvar
|
||||
|
||||
|
||||
@c %start of fragment
|
||||
|
||||
@deftp {Data Type} collectd-configuration
|
||||
Available @code{collectd-configuration} fields are:
|
||||
|
||||
@table @asis
|
||||
@item @code{collectd} (default: @code{collectd}) (type: package)
|
||||
The collectd package to use.
|
||||
|
||||
@item @code{base-directory} (default: @code{"/var/lib/collectd"}) (type: string)
|
||||
Sets the base directory. This is the directory beneath which all
|
||||
@acronym{RRD,round-robin database} files are created. Possibly more
|
||||
subdirectories are created. This is also the working directory for
|
||||
collectd.
|
||||
|
||||
@item @code{auto-load-plugins?} (default: @code{#f}) (type: boolean)
|
||||
When set to @code{#f}, plugins must be loaded explicitly, by setting the
|
||||
@code{load-plugin?} field of each plugin configuration to @code{#t}. If
|
||||
a @code{<Plugin ...>} block is encountered and no configuration handling
|
||||
callback for this plugin has been registered, a warning is logged and
|
||||
the block is ignored.
|
||||
|
||||
When set to @code{#t}, each @code{<Plugin ...>} block acts as if it was
|
||||
immediately preceded by a @code{LoadPlugin} statement. @code{LoadPlugin}
|
||||
statements are still required for plugins that don't provide any
|
||||
configuration, e.g. the @code{Load} plugin.
|
||||
|
||||
@item @code{collect-internal-stats?} (default: @code{#f}) (type: boolean)
|
||||
When @code{#t}, various statistics about the collectd daemon will be
|
||||
collected, with "collectd" as the plugin name.
|
||||
|
||||
@item @code{type-databases} (type: list-of-file-likes)
|
||||
One or more files that contain the data-set descriptions. See
|
||||
@code{types.db(5)} for a description of the format of these files.
|
||||
|
||||
@item @code{interval} (default: @code{60}) (type: maybe-seconds)
|
||||
Configures the interval in which to query the read plugins. Smaller
|
||||
values lead to a higher system load produced by collectd, while higher
|
||||
values lead to more coarse statistics. Warning: You should set this
|
||||
once and then never touch it again. If you do, you will have to delete
|
||||
all your RRD files or know some serious RRDtool magic! (Assuming you're
|
||||
using the RRDtool or RRDCacheD plugin.)
|
||||
|
||||
@item @code{max-read-interval} (default: @code{86400}) (type: seconds)
|
||||
A read plugin doubles the interval between queries after each failed
|
||||
attempt to get data. This options limits the maximum value of the
|
||||
interval.
|
||||
|
||||
@item @code{timeout} (type: maybe-integer)
|
||||
Consider a value list "missing" when no update has been read or received
|
||||
for @code{Iterations} iterations. By default, collectd considers a
|
||||
value list missing when no update has been received for twice the update
|
||||
interval. Since this setting uses iterations, the maximum allowed time
|
||||
without update depends on the @code{Interval} information contained in
|
||||
each value list. This is used in the @code{Threshold} configuration to
|
||||
dispatch notifications about missing values, see
|
||||
@code{collectd-threshold(5)} for details.
|
||||
|
||||
@item @code{read-threads} (default: @code{5}) (type: integer)
|
||||
Number of threads to start for reading plugins. You may want to
|
||||
increase this if you have more than five plugins that take a long time
|
||||
to read. Mostly those are plugins that do network-IO. Setting this to
|
||||
a value higher than the number of registered read callbacks is not
|
||||
recommended.
|
||||
|
||||
@item @code{write-threads} (default: @code{5}) (type: integer)
|
||||
Number of threads to start for dispatching value lists to write plugins.
|
||||
You may want to increase this if you have more than five plugins that
|
||||
may take relatively long to write to.
|
||||
|
||||
@item @code{write-queue-limit-high} (type: maybe-integer)
|
||||
Metrics are read by the read threads and then put into a queue to be
|
||||
handled by the write threads. If one of the write plugins is slow (e.g.
|
||||
network timeouts, I/O saturation of the disk) this queue will grow. In
|
||||
order to avoid running into memory issues in such a case, you can limit
|
||||
the size of this queue. If there are @code{write-queue-limit-high}
|
||||
metrics in the queue, any new metrics will be dropped. If the number of
|
||||
metrics currently in the queue is between @code{write-queue-limit-low}
|
||||
and @code{write-queue-limit-high}, the metric is dropped with a
|
||||
probability that is proportional to the number of metrics in the queue
|
||||
(i.e. it increases linearly until it reaches 100%).
|
||||
|
||||
@item @code{write-queue-limit-low} (type: maybe-integer)
|
||||
If there are less than @code{write-queue-limit-low} metrics in the
|
||||
queue, all new metrics will be enqueued. If
|
||||
@code{write-queue-limit-high} is set to non-zero and
|
||||
@code{write-queue-limit-low} is unset, the latter will default to half
|
||||
of @code{write-queue-limit-high}.
|
||||
|
||||
@item @code{host-name} (type: maybe-string)
|
||||
Sets the hostname that identifies a host. If you omit this setting, the
|
||||
hostname will be determined using the @code{gethostname(2)} system call.
|
||||
|
||||
@item @code{fully-qualified-domain-name-lookup?} (default: @code{#t}) (type: boolean)
|
||||
If @code{host-name} is determined automatically, this setting controls
|
||||
whether or not the daemon should try to figure out the
|
||||
@acronym{FQDN,fully qualified domain name}. This is done using a lookup
|
||||
of the name returned by @code{gethostname(2)}.
|
||||
|
||||
@item @code{plugins} (default: @code{()}) (type: list-of-collectd-plugins)
|
||||
Configurations for collectd plugins.
|
||||
|
||||
@end table
|
||||
|
||||
@end deftp
|
||||
|
||||
|
||||
@c %end of fragment
|
||||
|
||||
@c %start of fragment
|
||||
|
||||
@deftp {Data Type} collectd-plugin-generic
|
||||
|
||||
The @code{collectd-plugin-generic} record can represent most collectd
|
||||
plugins.
|
||||
|
||||
This example configuration will enable the CPU usage reporting plugin.
|
||||
See the @code{collectd.conf(5)} man page for a list of plugins and their
|
||||
options.
|
||||
|
||||
@lisp
|
||||
(collectd-plugin-generic
|
||||
(name "cpu")
|
||||
(options '((ReportByCpu . #t)
|
||||
(ReportByState . #t)
|
||||
(ValuesPercentage . #t))))
|
||||
@end lisp
|
||||
|
||||
Available @code{collectd-plugin-generic} fields are:
|
||||
|
||||
@table @asis
|
||||
@item @code{load-plugin?} (default: @code{#t}) (type: boolean)
|
||||
When @code{#t}, include a @code{LoadPlugin} directive in the
|
||||
configuration. This interacts with @code{auto-load-plugins?} in
|
||||
@code{collectd-configuration}; if @code{auto-load-plugins?} is
|
||||
@code{#f}, all plugins should set this to @code{#t}.
|
||||
|
||||
@item @code{name} (type: string)
|
||||
The name of the plugin to configure.
|
||||
|
||||
@item @code{options} (default: @code{()}) (type: plugin-options)
|
||||
Configuration options for the plugin, as an alist. See
|
||||
@code{collect.conf(5)} for the available plugin options.
|
||||
|
||||
@end table
|
||||
|
||||
@end deftp
|
||||
|
||||
|
||||
@c %end of fragment
|
||||
|
||||
|
||||
|
||||
@c %start of fragment
|
||||
|
||||
@deftp {Data Type} collectd-plugin-python
|
||||
|
||||
The @code{collectd-plugin-python} configuration record holds
|
||||
configuration for collectd plugins written in Python. See the
|
||||
@code{collectd-python(5)} man page for more information on Python
|
||||
support in collectd.
|
||||
|
||||
Guix packages listed in the @code{packages} field will be added to the
|
||||
profile used to run collectd. This example configuration will load a
|
||||
Python plugin named @code{myplugin}, whose code is in the
|
||||
@code{python-myplugin} Guix package.
|
||||
|
||||
@lisp
|
||||
(collectd-plugin-python
|
||||
(packages (list python-myplugin))
|
||||
(module "myplugin")
|
||||
(module-options '((SomeOption . "hi")
|
||||
(AnotherOption . 123))))
|
||||
@end lisp
|
||||
|
||||
The @code{module-paths} field will emit verbatim @code{ModulePath}
|
||||
lines, for plugins not packaged for Guix. This example configuration
|
||||
loads the @code{gpio} plugin from
|
||||
@code{/home/user/projects/collectd-gpio/gpio}.
|
||||
|
||||
@lisp
|
||||
(collectd-plugin-python
|
||||
(module-paths
|
||||
(list
|
||||
"/home/user/projects/collectd-gpio/gpio"))
|
||||
(module "gpio")
|
||||
(module-options '((MonitorGPIOs 1 2 3 4))))
|
||||
@end lisp
|
||||
|
||||
The two mechanisms may be combined: a Guix-packaged Python library may
|
||||
be used by unpackaged plugin code. This example loads a
|
||||
@code{mongometrics} plugin from
|
||||
@code{/opt/collectd-mongodb/mongometrics}, and also makes the
|
||||
@code{python-pymongo} Python package available for it to use.
|
||||
|
||||
@lisp
|
||||
(collectd-plugin-python
|
||||
(packages (list python-pymongo))
|
||||
(module-paths
|
||||
(list
|
||||
"/opt/collectd-mongodb/mongometrics"))
|
||||
(module "mongometrics")
|
||||
(module-options '((Host . "localhost"))))
|
||||
@end lisp
|
||||
|
||||
Available @code{collectd-plugin-python} fields are:
|
||||
|
||||
@table @asis
|
||||
@item @code{load-plugin?} (default: @code{#t}) (type: boolean)
|
||||
When @code{#t}, include a @code{LoadPlugin} directive in the
|
||||
configuration. This interacts with @code{auto-load-plugins?} in
|
||||
@code{collectd-configuration}; if @code{collectd-configuration}'s
|
||||
@code{auto-load-plugins?} is @code{#f}, all plugins should set this to
|
||||
@code{#t}.
|
||||
|
||||
@item @code{type-databases} (default: @code{()}) (type: list-of-file-likes)
|
||||
One or more files that contain the data-set descriptions. See
|
||||
@code{types.db(5)} for a description of the format of these files.
|
||||
|
||||
@item @code{packages} (default: @code{()}) (type: list-of-packages)
|
||||
Packages to make available to the Python plugin. These can be
|
||||
dependencies of the plugin code, or may contain the plugin.
|
||||
|
||||
@item @code{module-paths} (default: @code{()}) (type: list-of-string)
|
||||
Entries to prepend to @code{sys.path}.
|
||||
|
||||
@item @code{log-traces?} (default: @code{#f}) (type: boolean)
|
||||
If a Python script throws an exception it will be logged by collectd
|
||||
with the name of the exception and the message. If you set this option
|
||||
to true it will also log the full stacktrace just like the default
|
||||
output of an interactive Python interpreter. This does not apply to the
|
||||
@code{CollectError} exception, which will never log a stacktrace. This
|
||||
should probably be set to false most of the time but is very useful for
|
||||
development and debugging of new modules.
|
||||
|
||||
@item @code{interactive?} (default: @code{#f}) (type: boolean)
|
||||
This option will cause the module to launch an interactive Python
|
||||
interpreter that reads from and writes to the terminal. Note that
|
||||
collectd will terminate right after starting up if you try to run it as
|
||||
a daemon while this option is enabled so make sure to start collectd
|
||||
with the @code{-f} option. See the @code{collectd-python(5)} man page
|
||||
for more information on this option.
|
||||
|
||||
@item @code{module} (type: string)
|
||||
The name of the Python module to import into the collectd Python
|
||||
process. The module must be available in @code{packages} or
|
||||
@code{module-paths}, and register a MPD callback.
|
||||
|
||||
@item @code{module-options} (default: @code{()}) (type: alist)
|
||||
Configuration options for the module.
|
||||
|
||||
@end table
|
||||
|
||||
@end deftp
|
||||
|
||||
|
||||
@c %end of fragment
|
||||
|
||||
|
||||
@node Kerberos Services
|
||||
@subsection Kerberos Services
|
||||
@cindex Kerberos
|
||||
@@ -36215,75 +35893,6 @@ The port on which to connect to the database.
|
||||
@end table
|
||||
@end deftp
|
||||
|
||||
@subsubheading sogogi
|
||||
|
||||
@cindex sogogi, WebDAV Server
|
||||
@uref{https://codeberg.org/emersion/sogogi, sogogi} is a
|
||||
server for the
|
||||
@uref{https://www.rfc-editor.org/rfc/rfc4918, WebDAV} protocol.
|
||||
|
||||
@defvar sogogi-service-type
|
||||
This is the service type for sogogi. Its value must be a
|
||||
@code{sogogi-configuration} object as in this example:
|
||||
|
||||
@lisp
|
||||
(service sogogi-service-type
|
||||
(sogogi-configuration
|
||||
(listen ":8080")
|
||||
(location
|
||||
(list
|
||||
(sogogi-location
|
||||
(path "/")
|
||||
(dir "/srv/http/")
|
||||
(grant '("all ro")))))))
|
||||
@end lisp
|
||||
@end defvar
|
||||
|
||||
@deftp {Data Type} sogogi-configuration
|
||||
Available @code{sogogi-configuration} fields are:
|
||||
|
||||
@table @asis
|
||||
@item @code{listen} (default: @code{"localhost:8080"}) (type: string)
|
||||
Listening address.
|
||||
|
||||
@item @code{location} (default: @code{()}) (type: list-of-sogogi-location)
|
||||
Local directories to expose via a HTTP path
|
||||
|
||||
@item @code{user} (default: @code{()}) (type: list-of-sogogi-user)
|
||||
Users with access to the location.
|
||||
|
||||
@end table
|
||||
@end deftp
|
||||
|
||||
@deftp {Data Type} sogogi-location
|
||||
Available @code{sogogi-location} fields are:
|
||||
|
||||
@table @asis
|
||||
@item @code{path} (type: string)
|
||||
HTTP path at which the directory will be exposed.
|
||||
|
||||
@item @code{dir} (type: string)
|
||||
Path to local directory to serve.
|
||||
|
||||
@item @code{grant} (type: maybe-list-of-strings)
|
||||
Grant remote users access to the directory.
|
||||
|
||||
@end table
|
||||
@end deftp
|
||||
|
||||
@deftp {Data Type} sogogi-user
|
||||
Available @code{sogogi-user} fields are:
|
||||
|
||||
@table @asis
|
||||
@item @code{name} (type: maybe-string)
|
||||
Name of the user.
|
||||
|
||||
@item @code{password} (type: maybe-string)
|
||||
Password of the user.
|
||||
|
||||
@end table
|
||||
@end deftp
|
||||
|
||||
@subsubheading Mumi
|
||||
|
||||
@cindex Mumi, Debbugs Web interface
|
||||
@@ -36589,14 +36198,13 @@ in @code{Nginx}. It is used to generate cat avatar from a seed, for instance
|
||||
the hash of a user's email address.
|
||||
|
||||
@deffn {Procedure} cat-avatar-generator-service @
|
||||
[#:cache-dir "/var/cache/cat-avatar-generator/"] @
|
||||
[#:cache-dir "/var/cache/cat-avatar-generator"] @
|
||||
[#:package cat-avatar-generator] @
|
||||
[#:configuration (nginx-server-configuration)]
|
||||
Returns an nginx-server-configuration that inherits @code{configuration}. It
|
||||
extends the nginx configuration to add a server block that serves @code{package},
|
||||
a version of cat-avatar-generator. During execution, cat-avatar-generator will
|
||||
be able to use @code{cache-dir} as its cache directory, which must end
|
||||
with a slash, be created manually, and be writable by php-fpm.
|
||||
be able to use @code{cache-dir} as its cache directory.
|
||||
@end deffn
|
||||
|
||||
A simple setup for cat-avatar-generator can look like this:
|
||||
@@ -44272,11 +43880,10 @@ behind a reverse proxy and serve repositories from a custom location.
|
||||
(service fossil-service-type
|
||||
(fossil-configuration
|
||||
(repository "/srv/museum")
|
||||
(list-repositories? #t)
|
||||
(repo-list? #t)
|
||||
(base-url "https://museum.example")
|
||||
(compress? #f)
|
||||
(https? #t)
|
||||
(socket-file "/var/run/fossil.sock")))
|
||||
(socket-file "/var/run/fossil.sock")
|
||||
(compress? #f)))
|
||||
@end lisp
|
||||
|
||||
@deftp {Data Type} fossil-configuration
|
||||
@@ -48422,10 +48029,9 @@ A string denoting the name service (@pxref{Services in the NSS
|
||||
configuration,,, libc, The GNU C Library Reference Manual}).
|
||||
|
||||
Note that name services listed here must be visible to nscd. This is
|
||||
achieved by providing the list of packages implementing the needed
|
||||
services via the @code{name-services} field of the
|
||||
@code{nscd-configuration} record to be used with the @code{nscd-service-type}
|
||||
service (@pxref{Base Services, @code{nscd-configuration}}).
|
||||
achieved by passing the @code{#:name-services} argument to
|
||||
@code{nscd-service} the list of packages providing the needed name
|
||||
services (@pxref{Base Services, @code{nscd-service}}).
|
||||
|
||||
@item reaction
|
||||
An action specified using the @code{lookup-specification} macro
|
||||
@@ -54207,7 +53813,6 @@ an example of a service and its configuration that you could add to the
|
||||
@subsection Media Home Services
|
||||
|
||||
@cindex kodi
|
||||
|
||||
The @uref{https://kodi.tv, Kodi media center} can be run as a daemon on
|
||||
a media server. With the @code{(gnu home services kodi)} service, you
|
||||
can configure Kodi to run upon login.
|
||||
@@ -55131,36 +54736,6 @@ mouse bindings.
|
||||
@end table
|
||||
@end deftp
|
||||
|
||||
@cindex jellyfin
|
||||
|
||||
The @code{home-jellyfin-mpv-shim-service-type} in the @code{(gnu home
|
||||
services media)} module runs a cast client for the
|
||||
@uref{https://jellyfin.org/, Jellyfin} media system.
|
||||
|
||||
To enable, add this to your home services:
|
||||
|
||||
@lisp
|
||||
(service home-jellyfin-mpv-shim-service-type)
|
||||
@end lisp
|
||||
|
||||
The service starts only if @code{jellyfin-mpv-shim} has been configured
|
||||
with a remote server and credentials. This must be done manually, by
|
||||
launching @code{jellyfin-mpv-shim}. After configuring the server, the
|
||||
service will start automatically when you log in.
|
||||
|
||||
@defvar home-jellyfin-mpv-shim-service-type
|
||||
Type of the service which launches Jellyfin MPV Shim.
|
||||
@end defvar
|
||||
|
||||
@deftp {Data Type} home-jellyfin-mpv-shim-configuration
|
||||
Available @code{home-jellyfin-mpv-shim-configuration} fields are:
|
||||
|
||||
@table @asis
|
||||
@item @code{package} (default: @code{jellyfin-mpv-shim}) (type: package)
|
||||
The Jellyfin MPV Shim package to use.
|
||||
@end table
|
||||
@end deftp
|
||||
|
||||
@node Networking Home Services
|
||||
@subsection Networking Home Services
|
||||
|
||||
|
||||
+2
-38
@@ -46,8 +46,7 @@
|
||||
(entry (commit "a7c8e68dc51144a6d3981b770aca9c4897fc7c0c")
|
||||
(title
|
||||
(en "Records can refer to inherited values of thunked fields")
|
||||
(de "Vererbung in Verbundsobjekten erlaubt Verweise auf geerbte Werte verzögert ausgewerteter Felder")
|
||||
(pt "Registros podem referir-se a valores herdados de campos ainda não evaluados (thunks)"))
|
||||
(de "Vererbung in Verbundsobjekten erlaubt Verweise auf geerbte Werte verzögert ausgewerteter Felder"))
|
||||
(body
|
||||
(en "A new feature has been added to records—the facility used when
|
||||
defining packages, services, operating systems, and many other things—that,
|
||||
@@ -115,42 +114,7 @@ Verbundstypen aus, die mit @code{define-record-type*} erstellt wurden:
|
||||
und so weiter.
|
||||
|
||||
Hinweis: das ist eine inkompatible Änderung. Die neu eingeführte Bindung –
|
||||
@code{inputs} im obigen Beispiel – kann gleichnamige Bindungen überschatten.")
|
||||
(pt "Um novo recurso foi adicionado aos registros - a ferramenta
|
||||
usada quando se definem pacotes, serviços, sistemas operacionais, e muitas
|
||||
outras coisas - que, quando herdados de outro registro, te permitem referir
|
||||
aos valores de campos herdados. Durante a definição de variantes de pacotes,
|
||||
você pode encontrar este padrão:
|
||||
|
||||
@lisp
|
||||
(package
|
||||
(inherit gdb)
|
||||
(inputs (modify-inputs (package-inputs gdb)
|
||||
(delete \"guile\"))))
|
||||
@end lisp
|
||||
|
||||
Agora isto pode ser escrito desta forma:
|
||||
|
||||
@lisp
|
||||
(package
|
||||
(inherit gdb)
|
||||
(inputs (modify-inputs inputs ;<- Note a modificação
|
||||
(delete \"guile\"))))
|
||||
@end lisp
|
||||
|
||||
Dentro do corpo de @code{inputs}, o identificador @code{inputs} agora está
|
||||
atrelado ao @dfn{valor herdado} - id est, ap valor que este campo herda de
|
||||
@code{gdb}. O mesmo mecanismo pode ser empregado ao modificar outros campos
|
||||
da entrada ou ao campo @code{arguments}. É menos verboso mas também
|
||||
@uref{https://issues.guix.gnu.org/50335, é mais preciso}.
|
||||
|
||||
Esta mudança se aplica aos campos \"thunk-ados\" de todos os tipos de registro
|
||||
produzidos por @code{define-record-type*}: @code{package}, @code{origin},
|
||||
@code{operating-system}, @code{home-environment}, e assim por diante.
|
||||
|
||||
Note que esta é uma modificação incompatível: as ligações introduzidas
|
||||
recentemente - @code{inputs} no exemplo acima - podem sombrear ligações de
|
||||
mesmo nome.")))
|
||||
@code{inputs} im obigen Beispiel – kann gleichnamige Bindungen überschatten.")))
|
||||
|
||||
(entry (commit "b52ce9041ad58aeababd2d50d3e72bc23dffff60")
|
||||
(title
|
||||
|
||||
+3
-3
@@ -786,8 +786,7 @@ the haskell-build-system."
|
||||
(team 'hpc
|
||||
#:name "High-performance computing team"
|
||||
#:description "High-performance computing (HPC) related packages."
|
||||
#:scope (list "gnu/packages/fabric-management.scm"
|
||||
"gnu/packages/mpi.scm"
|
||||
#:scope (list "gnu/packages/mpi.scm"
|
||||
"gnu/packages/oneapi.scm"
|
||||
"gnu/packages/opencl.scm"
|
||||
"gnu/packages/parallel.scm"
|
||||
@@ -992,7 +991,8 @@ perl-build-system as well as the rakudo-build-system."
|
||||
#:description
|
||||
"Quality assurance software (CI/CD, testing, analysis;
|
||||
no direct relation to Guix's QA)."
|
||||
#:scope (list "gnu/packages/benchmark.scm"
|
||||
#:scope (list "gnu/ci.scm"
|
||||
"gnu/packages/benchmark.scm"
|
||||
"gnu/packages/check.scm"
|
||||
"gnu/packages/ci.scm"
|
||||
"gnu/packages/code.scm"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014-2018, 2020-2022, 2026 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2014-2018, 2020-2022 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
|
||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
|
||||
@@ -1220,16 +1220,15 @@ file name or an nfs-root containing ':/')."
|
||||
(sleep 1)
|
||||
(loop (+ 1 count))))))))
|
||||
|
||||
(define (device-exists? device)
|
||||
(and (file-exists? device)
|
||||
device))
|
||||
|
||||
(match spec
|
||||
((? string?)
|
||||
(if (string-prefix? "/dev/" spec)
|
||||
(if (or (string-contains spec ":/") ;nfs
|
||||
(and (>= (string-length spec) 2)
|
||||
(equal? (string-take spec 2) "//")) ;cifs
|
||||
(string=? spec "none"))
|
||||
spec ; do not resolve NFS / CIFS / tmpfs devices
|
||||
;; Nothing to do, but wait until SPEC shows up.
|
||||
(resolve device-exists? spec identity)
|
||||
spec)) ; do not resolve NFS / CIFS / tmpfs devices
|
||||
(resolve identity spec identity)))
|
||||
((? file-system-label?)
|
||||
;; Resolve the label.
|
||||
(resolve find-partition-by-label
|
||||
@@ -1455,14 +1454,9 @@ corresponds to the symbols listed in FLAGS."
|
||||
(raise c)))
|
||||
((system-error? c)
|
||||
(format (current-error-port)
|
||||
"could not mount partition '~a': ~a~%"
|
||||
"could not mount partition ~a: ~a~%"
|
||||
(file-system-device fs)
|
||||
(string-trim-both
|
||||
(call-with-output-string
|
||||
(lambda (port)
|
||||
(print-exception port #f
|
||||
(exception-kind c)
|
||||
(exception-args c))))))
|
||||
(exception-message c))
|
||||
(unless (file-system-mount-may-fail? fs)
|
||||
(raise c))))
|
||||
(let* ((type (file-system-type fs))
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2024, 2025 Ian Eure <ian@retrospec.tv>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@@ -20,20 +19,14 @@
|
||||
(define-module (gnu home services media)
|
||||
#:use-module (srfi srfi-26)
|
||||
#:use-module (gnu home services)
|
||||
#:use-module (gnu home services desktop)
|
||||
#:use-module (gnu home services shepherd)
|
||||
#:use-module (gnu packages kodi)
|
||||
#:use-module (gnu packages video)
|
||||
#:use-module (gnu services configuration)
|
||||
#:use-module (gnu services shepherd)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix records)
|
||||
#:use-module (guix gexp)
|
||||
#:export (home-kodi-configuration
|
||||
home-kodi-service-type
|
||||
|
||||
home-jellyfin-mpv-shim-configuration
|
||||
home-jellyfin-mpv-shim-service-type))
|
||||
home-kodi-service-type))
|
||||
|
||||
|
||||
;;;
|
||||
@@ -73,40 +66,3 @@
|
||||
(description
|
||||
"Install and configure the Kodi media center so that it runs as a Shepherd
|
||||
service.")))
|
||||
|
||||
(define-configuration home-jellyfin-mpv-shim-configuration
|
||||
(package
|
||||
(file-like jellyfin-mpv-shim)
|
||||
"The Jellyfin MPV Shim package to use"))
|
||||
|
||||
(define (jellyfin-mpv-shim-shepherd-service config)
|
||||
(list (shepherd-service
|
||||
(documentation "Jellyfin MPV Shim.")
|
||||
(provision '(jellyfin-mpv-shim jellyfin-client))
|
||||
|
||||
;; Depend on 'x11-display', which sets 'DISPLAY' if an X11 server is
|
||||
;; available, and fails to start otherwise.
|
||||
(requirement '(x11-display))
|
||||
|
||||
(modules '((srfi srfi-1)
|
||||
(srfi srfi-26)
|
||||
(srfi srfi-98)))
|
||||
(start
|
||||
#~(make-forkexec-constructor
|
||||
(list
|
||||
#$(file-append
|
||||
(home-jellyfin-mpv-shim-configuration-package config)
|
||||
"/bin/jellyfin-mpv-shim"))))
|
||||
(stop #~(make-kill-destructor)))))
|
||||
|
||||
(define-public home-jellyfin-mpv-shim-service-type
|
||||
(service-type
|
||||
(name 'home-jellyfin-mpv-shim)
|
||||
(extensions (list (service-extension home-shepherd-service-type
|
||||
jellyfin-mpv-shim-shepherd-service)
|
||||
;; Ensure 'home-x11-service-type' is instantiated so we
|
||||
;; can depend on the Shepherd 'x11-display' service.
|
||||
(service-extension home-x11-service-type
|
||||
(const #t))))
|
||||
(default-value (home-jellyfin-mpv-shim-configuration))
|
||||
(description "Run Jellyfin MPV Shim.")))
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
(define-module (gnu home services niri)
|
||||
#:use-module (gnu home services)
|
||||
#:use-module (gnu home services shepherd)
|
||||
#:use-module (gnu home services desktop)
|
||||
#:use-module (gnu packages bash)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
#:use-module (gnu packages glib)
|
||||
@@ -41,15 +40,14 @@
|
||||
|
||||
(define (home-niri-shepherd-service config)
|
||||
"Return a shepherd service that runs Niri, a scrollable tiling Wayland
|
||||
compositor. The service starts Niri with appropriate environment variables
|
||||
set for a Wayland desktop session."
|
||||
compositor. The service starts Niri in a DBus session with appropriate
|
||||
environment variables set for a Wayland desktop session."
|
||||
(list (shepherd-service
|
||||
(documentation "Run Niri scrollable tiling Wayland compositor.")
|
||||
(provision '(niri))
|
||||
(requirement '(dbus))
|
||||
(start #~(make-forkexec-constructor
|
||||
(list #$(file-append bash "/bin/bash") "-l"
|
||||
"-c" "exec niri --session")
|
||||
"-c" "exec dbus-run-session niri --session")
|
||||
#:environment-variables
|
||||
(append (list #$@(niri-configuration-environment-variables config))
|
||||
'("DESKTOP_SESSION=niri"
|
||||
@@ -68,8 +66,6 @@ set for a Wayland desktop session."
|
||||
(extensions
|
||||
(list (service-extension home-shepherd-service-type
|
||||
home-niri-shepherd-service)
|
||||
(service-extension home-dbus-service-type
|
||||
(const '()))
|
||||
(service-extension home-profile-service-type
|
||||
(lambda (config)
|
||||
(list dbus
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2023, 2026 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2023 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2023 Brian Cully <bjc@spork.org>
|
||||
;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;;
|
||||
@@ -193,10 +193,8 @@ PulseAudio clients to use PipeWire transparently.")
|
||||
load-module module-null-sink \
|
||||
sink_name=rtp sink_properties=\"device.description='RTP network output'\"\n"
|
||||
sock)
|
||||
;; Use a fixed sample rate to match what the receiving
|
||||
;; end is likely to expect.
|
||||
(display (string-append "\
|
||||
load-module module-rtp-send source=rtp.monitor rate=44100"
|
||||
load-module module-rtp-send source=rtp.monitor"
|
||||
(if destination-ip
|
||||
(string-append
|
||||
" destination_ip="
|
||||
|
||||
+5
-7
@@ -1498,6 +1498,7 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/glibc-hurd-2.41-symlink.patch \
|
||||
%D%/packages/patches/glibc-hurd-xstate.patch \
|
||||
%D%/packages/patches/glibc-hurd64-gcc-14.2-tls-bug.patch \
|
||||
%D%/packages/patches/glibc-hurd64-intr-msg-clobber.patch \
|
||||
%D%/packages/patches/glibc-ldd-powerpc.patch \
|
||||
%D%/packages/patches/glibc-ldd-x86_64.patch \
|
||||
%D%/packages/patches/glibc-locales.patch \
|
||||
@@ -1578,9 +1579,7 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch \
|
||||
%D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \
|
||||
%D%/packages/patches/gtk-doc-respect-xml-catalog.patch \
|
||||
%D%/packages/patches/gtk-doc-mkhtml-test-fix.patch \
|
||||
%D%/packages/patches/gtk4-demo-reproducible.patch \
|
||||
%D%/packages/patches/gtk4-needs-udmabuf.patch \
|
||||
%D%/packages/patches/gtk-doc-mkhtml-test-fix.patch \
|
||||
%D%/packages/patches/gtk4-respect-GUIX_GTK4_PATH.patch \
|
||||
%D%/packages/patches/gtkglext-disable-disable-deprecated.patch \
|
||||
%D%/packages/patches/gtksourceview-2-add-default-directory.patch \
|
||||
@@ -1756,7 +1755,6 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch\
|
||||
%D%/packages/patches/laby-make-install.patch \
|
||||
%D%/packages/patches/laby-use-tmpdir-from-runtime.patch \
|
||||
%D%/packages/patches/ldc-i686-int128-alignment.patch \
|
||||
%D%/packages/patches/ldns-drill-examples.patch \
|
||||
%D%/packages/patches/leela-zero-gtest.patch \
|
||||
%D%/packages/patches/less-hurd-path-max.patch \
|
||||
@@ -1859,6 +1857,7 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/lirc-reproducible-build.patch \
|
||||
%D%/packages/patches/llvm-13-gcc-14.patch \
|
||||
%D%/packages/patches/lm-sensors-hwmon-attrs.patch \
|
||||
%D%/packages/patches/lsof-compat-linux-6.9.patch \
|
||||
%D%/packages/patches/lsof-fatal-test-failures.patch \
|
||||
%D%/packages/patches/lua-CVE-2014-5461.patch \
|
||||
%D%/packages/patches/lua-pkgconfig.patch \
|
||||
@@ -1978,13 +1977,13 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/netsurf-y2038-tests.patch \
|
||||
%D%/packages/patches/netsurf-longer-test-timeout.patch \
|
||||
%D%/packages/patches/nhc98-c-update.patch \
|
||||
%D%/packages/patches/nheko-0-12-1-fix-rendering-replies.patch \
|
||||
%D%/packages/patches/nix-dont-build-html-doc.diff \
|
||||
%D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch \
|
||||
%D%/packages/patches/network-manager-plugin-ownership.patch \
|
||||
%D%/packages/patches/network-manager-plugin-path.patch \
|
||||
%D%/packages/patches/newlib-getentropy.patch \
|
||||
%D%/packages/patches/nginx-socket-cloexec.patch \
|
||||
%D%/packages/patches/nickle-man-release-date.patch \
|
||||
%D%/packages/patches/nlopt_CMake-Assume-working-c-compiler-597.patch \
|
||||
%D%/packages/patches/nnpack-system-libraries.patch \
|
||||
%D%/packages/patches/nsis-env-passthru.patch \
|
||||
@@ -2087,9 +2086,9 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/podofo-gcc-14.patch \
|
||||
%D%/packages/patches/pokerth-boost.patch \
|
||||
%D%/packages/patches/pounce-readable-checks.patch \
|
||||
%D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \
|
||||
%D%/packages/patches/procps-strtod-test.patch \
|
||||
%D%/packages/patches/prusa-slicer-add-cmake-module.patch \
|
||||
%D%/packages/patches/prusa-wxwidgets-makefile-fix.patch \
|
||||
%D%/packages/patches/pthreadpool-system-libraries.patch \
|
||||
%D%/packages/patches/python-3.11-fix-tests.patch \
|
||||
%D%/packages/patches/python-3.12-fix-tests.patch \
|
||||
@@ -2471,7 +2470,6 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/t4k-common-libpng16.patch \
|
||||
%D%/packages/patches/tao-add-missing-headers.patch \
|
||||
%D%/packages/patches/tao-fix-parser-types.patch \
|
||||
%D%/packages/patches/tao-synth-include-string-you-use.patch \
|
||||
%D%/packages/patches/tar-remove-wholesparse-check.patch \
|
||||
%D%/packages/patches/tar-skip-unreliable-tests.patch \
|
||||
%D%/packages/patches/taskwarrior-link-taskchampion-cpp-with-sqlite3.patch \
|
||||
|
||||
+2
-3
@@ -518,9 +518,8 @@ return its return value."
|
||||
(location->string (package-location pkg))))
|
||||
(match (package-superseded pkg)
|
||||
((? package? new)
|
||||
(unless (assoc-ref (package-properties pkg) 'supress-supersession-info?)
|
||||
(info (G_ "package '~a' has been superseded by '~a'~%")
|
||||
(package-name pkg) (package-name new)))
|
||||
(info (G_ "package '~a' has been superseded by '~a'~%")
|
||||
(package-name pkg) (package-name new))
|
||||
new)
|
||||
(#f
|
||||
pkg)))
|
||||
|
||||
+67
-64
@@ -4988,16 +4988,16 @@ Python loading in HPC environments.")
|
||||
(let ((real-name "inxi"))
|
||||
(package
|
||||
(name "inxi-minimal")
|
||||
(version "3.3.40-1")
|
||||
(version "3.3.31-2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://codeberg.org/smxi/inxi")
|
||||
(url "https://github.com/smxi/inxi")
|
||||
(commit version)))
|
||||
(file-name (git-file-name real-name version))
|
||||
(sha256
|
||||
(base32 "0ivj0dcx7d2hmmkhyql156sb08385rzw640z9kyq4cv1n8ndz58s"))))
|
||||
(base32 "1fca5minalpmizbxh5kmjiv8xrl7k6g91zn8d84fxmbhsk8vn3kk"))))
|
||||
(build-system trivial-build-system)
|
||||
(inputs
|
||||
(list bash-minimal
|
||||
@@ -5023,8 +5023,8 @@ Python loading in HPC environments.")
|
||||
(copy-recursively (assoc-ref %build-inputs "source")
|
||||
,(string-append real-name "-" version))
|
||||
(with-directory-excursion ,(string-append real-name "-" version)
|
||||
(patch-shebang "inxi" (list (dirname (search-input-file
|
||||
%build-inputs "bin/perl"))))
|
||||
(with-fluids ((%default-port-encoding #f))
|
||||
(substitute* "inxi" (("/usr/bin/env perl") (which "perl"))))
|
||||
(let ((bin (string-append %output "/bin")))
|
||||
(install-file "inxi" bin)
|
||||
(wrap-program (string-append bin "/inxi")
|
||||
@@ -5039,8 +5039,7 @@ Python loading in HPC environments.")
|
||||
((member name '("util-linux"))
|
||||
(string-append (store-append "/bin") ":"
|
||||
(store-append "/sbin")))
|
||||
((member name '("dmidecode" "iproute2" "lvm2"
|
||||
"mdadm"))
|
||||
((member name '("dmidecode" "iproute2"))
|
||||
(store-append "/sbin"))
|
||||
(else (store-append "/bin")))))))
|
||||
%build-inputs)))
|
||||
@@ -5068,7 +5067,6 @@ support forum. It runs with the @code{/exec} command in most IRC clients.")
|
||||
(name "inxi")
|
||||
(inputs
|
||||
`(("dmidecode" ,dmidecode)
|
||||
("eudev" ,eudev)
|
||||
("file" ,file)
|
||||
("bind:utils" ,isc-bind "utils") ; dig
|
||||
("gzip" ,gzip)
|
||||
@@ -5094,14 +5092,11 @@ support forum. It runs with the @code{/exec} command in most IRC clients.")
|
||||
("perl-time-hires" ,perl-time-hires)
|
||||
("lvm2" ,lvm2) ; lvs
|
||||
("mdadm" ,mdadm)
|
||||
("wayland-utils" ,wayland-utils)
|
||||
;; TODO: Add more inputs:
|
||||
;; ipmi-sensors
|
||||
;; hddtemp
|
||||
;; perl-xml-dumper
|
||||
;; ipmitool
|
||||
;; wlr-randr
|
||||
;; vulkan-tools
|
||||
,@(package-inputs inxi-minimal)))))
|
||||
|
||||
(define-public pscircle
|
||||
@@ -5607,61 +5602,69 @@ representation to stdout.")
|
||||
(define-public hosts
|
||||
(package
|
||||
(name "hosts")
|
||||
(version "3.6.5")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/xwmx/hosts")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1kzd4lxlflam87dhbx1jx7bj6v6sa4f2024mfxj2768kp9qapraj"))))
|
||||
(build-system copy-build-system)
|
||||
(native-inputs
|
||||
(list bats)) ;for tests
|
||||
(version "3.6.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/xwmx/hosts")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1ni4z89kxzgwm26hhx908g04f2h0fypy7lgfa0rvsz8d0wslgcsn"))))
|
||||
(build-system trivial-build-system)
|
||||
(inputs
|
||||
(list gawk
|
||||
bash-minimal
|
||||
coreutils
|
||||
diffutils
|
||||
grep
|
||||
ncurses ;for tput
|
||||
sed))
|
||||
`(("bats" ,bats) ;for test
|
||||
("awk" ,gawk)
|
||||
("bash" ,bash)
|
||||
("coreutils" ,coreutils)
|
||||
("diffutils" ,diffutils)
|
||||
("grep" ,grep)
|
||||
("ncurses" ,ncurses) ;tput
|
||||
("sed" ,sed)))
|
||||
(arguments
|
||||
(list
|
||||
#:install-plan
|
||||
#~'(("hosts" "bin/hosts")
|
||||
("etc/hosts-completion.bash" "/etc/bash_completion.d/hosts")
|
||||
("etc/hosts-completion.zsh" "/share/zsh/site-functions/_hosts")
|
||||
("README.md"
|
||||
#$(string-append "/share/doc/" name "-" version "/README.md")))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-hosts
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "test/test_helper.bash"
|
||||
(("export _HOSTS=.*")
|
||||
(string-append "export _HOSTS=" #$output "/bin/hosts")))
|
||||
(substitute* (cons* "hosts"
|
||||
;; *.bash and *.bats.
|
||||
(find-files "test" "\\.bat?sh?.*$"))
|
||||
(("\\btput\\b") (search-input-file inputs "bin/tput"))
|
||||
(("\\bsed\\b") (search-input-file inputs "bin/sed"))
|
||||
(("\\bawk\\b") (search-input-file inputs "bin/awk"))
|
||||
(("\\bgrep\\b") (search-input-file inputs "bin/grep"))
|
||||
(("\\bdiff\\b") (search-input-file inputs "bin/diff"))
|
||||
(("\\bcp\\b") (search-input-file inputs "bin/cp"))
|
||||
(("\\bchmod\\b") (search-input-file inputs "bin/chmod")))))
|
||||
(add-after 'install 'check
|
||||
(lambda* (#:key tests? inputs #:allow-other-keys)
|
||||
(if tests?
|
||||
(begin
|
||||
(delete-file "hosts") ;Ensure installed hosts is checked.
|
||||
(setenv "PATH" "") ;Ensure substitutions were correct.
|
||||
(setenv "TERM" "linux") ;Set to tty for test.
|
||||
(invoke (search-input-file inputs "/bin/bats")
|
||||
"test"))))))))
|
||||
`(#:modules ((guix build utils))
|
||||
#:builder
|
||||
(begin
|
||||
(use-modules (guix build utils))
|
||||
;; copy source
|
||||
(copy-recursively (assoc-ref %build-inputs "source") ".")
|
||||
;; patch-shebang phase
|
||||
(setenv "PATH"
|
||||
(string-append (assoc-ref %build-inputs "bash") "/bin"
|
||||
":" (assoc-ref %build-inputs "awk") "/bin"
|
||||
":" (assoc-ref %build-inputs "coreutils") "/bin"
|
||||
":" (assoc-ref %build-inputs "diffutils") "/bin"
|
||||
":" (assoc-ref %build-inputs "grep") "/bin"
|
||||
":" (assoc-ref %build-inputs "ncurses") "/bin"
|
||||
":" (assoc-ref %build-inputs "sed") "/bin"
|
||||
":" "/run/privileged/bin"
|
||||
":" (getenv "PATH")))
|
||||
(substitute* "hosts"
|
||||
(("#!/usr/bin/env bash")
|
||||
(string-append "#!" (which "bash")
|
||||
"\nPATH=" (getenv "PATH"))))
|
||||
;; check phase
|
||||
(setenv "TERM" "linux") ;set to tty for test
|
||||
(invoke (search-input-file %build-inputs "/bin/bats")
|
||||
"test")
|
||||
;; install phase
|
||||
(install-file "hosts" (string-append %output "/bin"))
|
||||
(let ((bash-completion
|
||||
(string-append %output "/etc/bash_completion.d")))
|
||||
(mkdir-p bash-completion)
|
||||
(copy-file "etc/hosts-completion.bash"
|
||||
(string-append bash-completion "/hosts")))
|
||||
(let ((zsh-completion
|
||||
(string-append %output "/share/zsh/site-functions")))
|
||||
(mkdir-p zsh-completion)
|
||||
(copy-file "etc/hosts-completion.zsh"
|
||||
(string-append zsh-completion "/_hosts")))
|
||||
(let ((doc (string-append %output "/share/doc/" ,name "-" ,version)))
|
||||
(mkdir-p doc)
|
||||
(install-file "LICENSE" doc)
|
||||
(install-file "README.md" doc))
|
||||
#t)))
|
||||
(home-page "https://github.com/xwmx/hosts/")
|
||||
(synopsis "Script for editing a foreign distro's @file{/etc/hosts} file")
|
||||
(description "Hosts is a command line program for managing
|
||||
|
||||
+30
-33
@@ -4,7 +4,6 @@
|
||||
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2019, 2021 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2026 Anderson Torres <anderson.torres.8519@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@@ -22,51 +21,49 @@
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages adns)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (gnu packages m4)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix licenses)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix utils))
|
||||
#:use-module (gnu packages m4)
|
||||
#:use-module (gnu packages pkg-config))
|
||||
|
||||
(define-public adns
|
||||
(package
|
||||
(name "adns")
|
||||
(version "1.6.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "git://git.chiark.greenend.org.uk/~ianmdlvl/adns.git")
|
||||
(commit (string-append "adns-" version))))
|
||||
(sha256
|
||||
(base32
|
||||
"0ln3l5j7wb1xazrzl76p9xar52p6l2k1cwy7jazxw1acl71k9h5n"))))
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (list (string-append "mirror://gnu/adns/adns-"
|
||||
version ".tar.gz")
|
||||
(string-append
|
||||
"https://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-"
|
||||
version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"1k81sjf0yzv6xj35vcxp0ccajxrhhmyly7a57xlbs1kmkdwb6f3i"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
;; INFO: Tests expect real name resolution to work.
|
||||
#:tests? #f
|
||||
#:configure-flags
|
||||
#~(list
|
||||
;; Make sure the programs under bin/ find libadns.so.
|
||||
(string-append "LDFLAGS=-Wl,-rpath -Wl,"
|
||||
#$output:out
|
||||
"/lib"))))
|
||||
;; Make sure the programs under bin/ fine libadns.so.
|
||||
'(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath -Wl,"
|
||||
(assoc-ref %outputs "out")
|
||||
"/lib"))
|
||||
|
||||
;; XXX: Tests expect real name resolution to work.
|
||||
#:tests? #f))
|
||||
(native-inputs
|
||||
(list m4))
|
||||
(home-page "https://www.gnu.org/software/adns/")
|
||||
(synopsis "Asynchronous DNS client library and utilities")
|
||||
(description
|
||||
"GNU adns is a C library that provides easy-to-use @acronym{DNS, Domain
|
||||
Name System} resolution functionality. The library is asynchronous, allowing
|
||||
several concurrent calls. The package also includes several command-line
|
||||
utilities for use in scripts.")
|
||||
(license license:gpl3+)))
|
||||
"GNU adns is a C library that provides easy-to-use DNS resolution
|
||||
functionality. The library is asynchronous, allowing several concurrent
|
||||
calls. The package also includes several command-line utilities for use in
|
||||
scripts.")
|
||||
(license gpl3+)))
|
||||
|
||||
(define-public c-ares
|
||||
(package
|
||||
@@ -149,7 +146,7 @@ asynchronously. It is intended for applications which need to perform DNS
|
||||
queries without blocking, or need to perform multiple DNS queries in parallel.
|
||||
The primary examples of such applications are servers which communicate with
|
||||
multiple clients and programs with graphical user interfaces.")
|
||||
(license (license:x11-style "https://c-ares.haxx.se/license.html"))))
|
||||
(license (x11-style "https://c-ares.haxx.se/license.html"))))
|
||||
|
||||
(define-public c-ares-for-node-lts
|
||||
(hidden-package c-ares))
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2022, 2023, 2024, 2025 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2013, 2015, 2017, 2018, 2021 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016-2026 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2016-2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2014, 2018 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2016, 2018, 2019, 2021, 2023 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2017, 2020-2022 Efraim Flashner <efraim@flashner.co.il>
|
||||
@@ -406,7 +406,7 @@ precision.")
|
||||
(define-public giac
|
||||
(package
|
||||
(name "giac")
|
||||
(version "2.0.0-21")
|
||||
(version "2.0.0-10")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@@ -418,7 +418,7 @@ precision.")
|
||||
"https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/"
|
||||
"stable/main/source/giac_" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1j6bip76hhqvycapf7xy26y0b8g5zzx4gwkfsr7bf6m2h71a2zry"))))
|
||||
(base32 "1lzb0jjmkg5ml1qfl0m00qqng4sxgfqwrbq10gpkp4b301k2ckv1"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
||||
+218
-371
File diff suppressed because it is too large
Load Diff
+6
-59
@@ -42,7 +42,7 @@
|
||||
;;; Copyright © 2022 Andy Tai <atai@atai.org>
|
||||
;;; Copyright © 2023 Sergiu Ivanov <sivanov@colimite.fr>
|
||||
;;; Copyright © 2023 David Thompson <dthompson2@worcester.edu>
|
||||
;;; Copyright © 2023, 2025-2026 Sharlatan Hellseher <sharlatanus@gmail.com>
|
||||
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
|
||||
;;; Copyright © 2023 Gabriel Wicki <gabriel@erlikon.ch>
|
||||
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
|
||||
;;; Copyright © 2023 Parnikkapore <poomklao@yahoo.com>
|
||||
@@ -2316,13 +2316,13 @@ object library.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1jds2l3cb96b02jxd7lmrjjl9s7mylnrvg6fpw0j8c141bk8vyg3"))
|
||||
(patches
|
||||
(search-patches "tao-synth-include-string-you-use.patch"))))
|
||||
"1jds2l3cb96b02jxd7lmrjjl9s7mylnrvg6fpw0j8c141bk8vyg3"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments (list #:tests? #false)) ;there are no tests
|
||||
(inputs
|
||||
(list glfw freeglut))
|
||||
(native-inputs
|
||||
(list gcc-7))
|
||||
(home-page "https://github.com/lucasw/tao_synth")
|
||||
(synopsis "Sound synthesis with physical models")
|
||||
(description "Tao is a software package for sound synthesis using physical
|
||||
@@ -6358,59 +6358,6 @@ It is currently fairly complete for PCM devices, and has some support for
|
||||
mixers.")
|
||||
(license license:psfl)))
|
||||
|
||||
(define-public python-pyo
|
||||
(package
|
||||
(name "python-pyo")
|
||||
(version "1.0.6")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/belangeo/pyo")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1igz75kv94dav28rzz19gckgfgdli05q5ghadlvm03ia7xd9l5zm"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
;; TODO: collecting ... Fatal Python error: Segmentation fault
|
||||
#:tests? #f
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-before 'sanity-check 'set-HOME
|
||||
(lambda _
|
||||
(setenv "HOME" "/tmp"))))))
|
||||
(native-inputs
|
||||
(list python-pytest
|
||||
python-setuptools))
|
||||
(inputs
|
||||
(list liblo
|
||||
libsndfile
|
||||
portaudio
|
||||
portmidi))
|
||||
(propagated-inputs
|
||||
(list python-wxpython))
|
||||
(home-page "https://github.com/belangeo/pyo")
|
||||
(synopsis "Python module to build digital signal processing program")
|
||||
(description
|
||||
"pyo is a Python module containing classes for a wide variety of audio
|
||||
signal processing types.
|
||||
|
||||
With pyo, user will be able to include signal processing chains directly in
|
||||
Python scripts or projects, and to manipulate them in real time through the
|
||||
interpreter. Tools in pyo module offer primitives, like mathematical
|
||||
operations on audio signal, basic signal processing (filters, delays,
|
||||
synthesis generators, etc.), but also complex algorithms to create sound
|
||||
granulation and others creative audio manipulations.
|
||||
|
||||
pyo supports OSC protocol (Open Sound Control), to ease communications between
|
||||
softwares, and MIDI protocol, for generating sound events and controlling
|
||||
process parameters. pyo allows creation of sophisticated signal processing
|
||||
chains with all the benefits of a mature, and widely used, general programming
|
||||
language.")
|
||||
(license license:lgpl3+)))
|
||||
|
||||
(define-public ldacbt
|
||||
(package
|
||||
(name "ldacbt")
|
||||
@@ -8173,7 +8120,7 @@ and DSD streams.")
|
||||
(define-public qpwgraph
|
||||
(package
|
||||
(name "qpwgraph")
|
||||
(version "1.0.0")
|
||||
(version "0.9.9")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@@ -8182,7 +8129,7 @@ and DSD streams.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0l3fflfpwkqy4iif8ifzzr3yy39ahzqdixx5g3rhj3zzbaysj73h"))))
|
||||
"03001pvcbvr206k00751232gm50x1icf086z8c5hiakl2ym79gwl"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f)) ; no tests
|
||||
|
||||
+85
-78
@@ -77,8 +77,6 @@
|
||||
#:use-module (gnu packages gnupg)
|
||||
#:use-module (gnu packages golang)
|
||||
#:use-module (gnu packages golang-build)
|
||||
#:use-module (gnu packages golang-check)
|
||||
#:use-module (gnu packages golang-compression)
|
||||
#:use-module (gnu packages golang-crypto)
|
||||
#:use-module (gnu packages golang-web)
|
||||
#:use-module (gnu packages golang-xyz)
|
||||
@@ -893,85 +891,94 @@ is like a time machine for your data.")
|
||||
(define-public restic
|
||||
(package
|
||||
(name "restic")
|
||||
(version "0.17.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/restic/restic")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1wsgq7f0bfi0i5iiwcc3hlf2lhxcnz3zfs8p8bc6l913r9hvyg1x"))))
|
||||
(version "0.9.6")
|
||||
;; TODO Try packaging the bundled / vendored dependencies in the 'vendor/'
|
||||
;; directory.
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/restic/restic/releases/download/"
|
||||
"v" version "/restic-" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1zmh42aah32ah8w5n6ilz9bci0y2xrf8p7qshy3yf1lzm5gnbj0w"))
|
||||
(patches
|
||||
(search-patches "restic-0.9.6-fix-tests-for-go1.15.patch"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:go go-1.25
|
||||
#:install-source? #f
|
||||
#:import-path "github.com/restic/restic/cmd/restic"
|
||||
#:unpack-path "github.com/restic/restic"
|
||||
#:embed-files #~(list "children" "nodes" "text")
|
||||
#:test-flags
|
||||
;; Python is required.
|
||||
#~(list "-skip" "TestStdinFromCommand|TestStdinFromCommandNoOutput")
|
||||
#:test-subdirs #~(list "../../...")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'install 'install-docs
|
||||
(lambda* (#:key import-path #:allow-other-keys)
|
||||
(with-directory-excursion (string-append "src/" import-path)
|
||||
(let* ((man "/share/man")
|
||||
(man-section (string-append man "/man")))
|
||||
;; Install all the man pages to "out".
|
||||
(for-each
|
||||
(lambda (file)
|
||||
(install-file file
|
||||
(string-append #$output man-section
|
||||
(string-take-right file 1))))
|
||||
(find-files "doc/man" "\\.[1-9]"))))))
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
(setenv "RESTIC_TEST_FUSE" "0"))))))
|
||||
(native-inputs
|
||||
(list go-cloud-google-com-go-storage
|
||||
go-github-com-anacrolix-fuse
|
||||
go-github-com-azure-azure-sdk-for-go-sdk-azcore
|
||||
go-github-com-azure-azure-sdk-for-go-sdk-azidentity
|
||||
go-github-com-azure-azure-sdk-for-go-sdk-storage-azblob
|
||||
go-github-com-backblaze-blazer
|
||||
go-github-com-cenkalti-backoff-v4
|
||||
go-github-com-cespare-xxhash-v2
|
||||
go-github-com-elithrar-simple-scrypt
|
||||
;; go-github-com-go-ole-go-ole ;windows only
|
||||
go-github-com-google-go-cmp
|
||||
go-github-com-hashicorp-golang-lru-v2
|
||||
go-github-com-klauspost-compress
|
||||
go-github-com-minio-minio-go-v7
|
||||
go-github-com-minio-sha256-simd
|
||||
go-github-com-ncw-swift-v2
|
||||
go-github-com-peterbourgon-unixtransport
|
||||
go-github-com-pkg-errors
|
||||
go-github-com-pkg-profile
|
||||
go-github-com-pkg-sftp
|
||||
go-github-com-pkg-xattr
|
||||
go-github-com-restic-chunker
|
||||
go-github-com-spf13-cobra
|
||||
go-github-com-spf13-pflag
|
||||
go-go-uber-org-automaxprocs
|
||||
go-golang-org-x-crypto
|
||||
go-golang-org-x-net
|
||||
go-golang-org-x-oauth2
|
||||
go-golang-org-x-sync
|
||||
go-golang-org-x-sys
|
||||
go-golang-org-x-term
|
||||
go-golang-org-x-text
|
||||
go-golang-org-x-time
|
||||
go-google-golang-org-api
|
||||
`(;; XXX: Tests failed on a newer version of Golang, newer version of
|
||||
;; restic does not provide vendor folder any longer which means - a
|
||||
;; long way of packaging missing inputs.
|
||||
#:go ,go-1.17
|
||||
#:import-path "github.com/restic/restic"
|
||||
;; We don't need to install the source code for end-user applications.
|
||||
#:install-source? #f
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'build
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(with-directory-excursion "src/github.com/restic/restic"
|
||||
;; Disable 'restic self-update'. It makes little sense in Guix.
|
||||
(substitute* "build.go" (("selfupdate") ""))
|
||||
(setenv "HOME" (getcwd)) ; for $HOME/.cache/go-build
|
||||
(invoke "go" "run" "build.go"))))
|
||||
|
||||
;; XXX: These packages have to be bootstrapped to break cycle with
|
||||
;; go-google-golang-org-grpc.
|
||||
go-github-com-envoyproxy-go-control-plane
|
||||
go-github-com-envoyproxy-go-control-plane-envoy))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(with-directory-excursion "src/github.com/restic/restic"
|
||||
;; Disable FUSE tests.
|
||||
(setenv "RESTIC_TEST_FUSE" "0")
|
||||
(invoke "go" "run" "build.go" "--test")))))
|
||||
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(src "src/github.com/restic/restic"))
|
||||
(install-file (string-append src "/restic")
|
||||
(string-append out "/bin"))
|
||||
#t)))
|
||||
|
||||
(add-after 'install 'install-docs
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(man "/share/man")
|
||||
(man-section (string-append man "/man"))
|
||||
(src "src/github.com/restic/restic/doc/man/"))
|
||||
;; Install all the man pages to "out".
|
||||
(for-each
|
||||
(lambda (file)
|
||||
(install-file file
|
||||
(string-append out man-section
|
||||
(string-take-right file 1))))
|
||||
(find-files src "\\.[1-9]"))
|
||||
#t)))
|
||||
|
||||
(add-after 'install-docs 'install-shell-completion
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin"))
|
||||
(etc (string-append out "/etc"))
|
||||
(share (string-append out "/share")))
|
||||
(for-each
|
||||
(lambda (shell)
|
||||
(let* ((shell-name (symbol->string shell))
|
||||
(dir (string-append "etc/completion/" shell-name)))
|
||||
(mkdir-p dir)
|
||||
(invoke (string-append bin "/restic") "generate"
|
||||
(string-append "--" shell-name "-completion")
|
||||
(string-append dir "/"
|
||||
(case shell
|
||||
((bash) "restic")
|
||||
((zsh) "_restic"))))))
|
||||
'(bash zsh))
|
||||
(with-directory-excursion "etc/completion"
|
||||
(install-file "bash/restic"
|
||||
(string-append etc "/bash_completion.d"))
|
||||
(install-file "zsh/_restic"
|
||||
(string-append share "/zsh/site-functions")))
|
||||
#t))))))
|
||||
(home-page "https://restic.net/")
|
||||
(synopsis "Backup program with multiple revisions, encryption and more")
|
||||
(description "Restic is a program that does backups right and was designed
|
||||
|
||||
+25
-4
@@ -910,7 +910,6 @@ the store.")
|
||||
"glibc-2.40-dl-cache.patch"
|
||||
"glibc-2.37-versioned-locpath.patch"
|
||||
;; "glibc-allow-kernel-2.6.32.patch"
|
||||
"glibc-guix-locpath.patch"
|
||||
"glibc-reinstate-prlimit64-fallback.patch"
|
||||
"glibc-supported-locales.patch"
|
||||
"glibc-2.37-hurd-clock_t_centiseconds.patch"
|
||||
@@ -919,11 +918,10 @@ the store.")
|
||||
"glibc-hurd-gettyent.patch"
|
||||
"glibc-hurd-getauxval.patch"
|
||||
"glibc-hurd-pthread_setcancelstate.patch"
|
||||
"glibc-hurd-signal-fpe-exception.patch"
|
||||
"glibc-hurd-xstate.patch"
|
||||
"glibc-hurd-2.41-pthread-once.patch"
|
||||
"glibc-hurd-2.41-pthread-sigmask.patch"
|
||||
"glibc-hurd-2.41-symlink.patch"
|
||||
"glibc-hurd64-intr-msg-clobber.patch"
|
||||
"glibc-hurd64-gcc-14.2-tls-bug.patch"))
|
||||
|
||||
(define-public glibc
|
||||
@@ -942,6 +940,7 @@ the store.")
|
||||
(properties `((lint-hidden-cve . ("CVE-2024-2961"
|
||||
"CVE-2024-33601" "CVE-2024-33602"
|
||||
"CVE-2024-33600" "CVE-2024-33599"))))
|
||||
(replacement glibc/fixed)
|
||||
(build-system gnu-build-system)
|
||||
|
||||
;; Glibc's <limits.h> refers to <linux/limit.h>, for instance, so glibc
|
||||
@@ -1219,6 +1218,17 @@ with the Linux kernel.")
|
||||
(license lgpl2.0+)
|
||||
(home-page "https://www.gnu.org/software/libc/")))
|
||||
|
||||
(define glibc/fixed
|
||||
(package
|
||||
(inherit glibc)
|
||||
(name "glibc")
|
||||
(source (origin
|
||||
(inherit (package-source glibc))
|
||||
;; XXX: When ungrafting, add the included patch to
|
||||
;; %glibc-patches.
|
||||
(patches (cons (search-patch "glibc-guix-locpath.patch")
|
||||
(origin-patches (package-source glibc))))))))
|
||||
|
||||
;; Define a variation of glibc which uses the default /etc/ld.so.cache, useful
|
||||
;; in FHS containers.
|
||||
(define-public glibc-for-fhs
|
||||
@@ -1545,7 +1555,18 @@ variety of options. It is an alternative to the shell \"type\" built-in
|
||||
command.")
|
||||
(license gpl3+))) ; some files are under GPLv2+
|
||||
|
||||
(define-public glibc/hurd glibc)
|
||||
(define-public glibc/hurd
|
||||
(hidden-package
|
||||
(package/inherit glibc
|
||||
(source
|
||||
(origin
|
||||
(inherit (package-source glibc))
|
||||
(patches
|
||||
(append (map search-patch
|
||||
(delete "glibc-hurd64-intr-msg-clobber.patch" %glibc-patches))
|
||||
(search-patches
|
||||
"glibc-hurd-signal-fpe-exception.patch"
|
||||
"glibc-hurd-xstate.patch"))))))))
|
||||
|
||||
(define-public glibc/hurd-headers
|
||||
(package/inherit glibc/hurd
|
||||
|
||||
+137
-117
@@ -3436,14 +3436,14 @@ the @code{HorvathMethylChip40} (Mammal40) array.")
|
||||
(define-public r-systempiperdata
|
||||
(package
|
||||
(name "r-systempiperdata")
|
||||
(version "2.14.6")
|
||||
(version "2.14.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "systemPipeRdata" version
|
||||
'experiment))
|
||||
(sha256
|
||||
(base32 "1j7h40hcm0gyahmlilvlb83ddmwrarqn319qwpnrgwcji8fm92jd"))))
|
||||
(base32 "1yrq1vyc0pmp3iv621cvdsavlarcca3z4bbxfzbg0ny3fyqp67pb"))))
|
||||
(properties `((upstream-name . "systemPipeRdata")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs (list r-biocgenerics r-biostrings r-jsonlite r-remotes))
|
||||
@@ -4552,9 +4552,15 @@ these biases and construct statistically consistent estimators.")
|
||||
(build-system r-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:skipped-tests
|
||||
;; This test needs Internet access.
|
||||
'(("test-examples.R" ".*find_taxonomy\\(\\) is working.*"))))
|
||||
#:phases
|
||||
'(modify-phases %standard-phases
|
||||
(add-after 'unpack 'skip-bad-tests
|
||||
(lambda _
|
||||
;; This test needs Internet access.
|
||||
(with-directory-excursion "tests/testthat"
|
||||
(substitute* "test-examples.R"
|
||||
((".*find_taxonomy\\(\\) is working.*" m)
|
||||
(string-append m "skip('guix')\n")))))))))
|
||||
(propagated-inputs
|
||||
(list r-ape
|
||||
r-assertthat
|
||||
@@ -4605,13 +4611,13 @@ to understand their data better and discover new insights.")
|
||||
(define-public r-anndatar
|
||||
(package
|
||||
(name "r-anndatar")
|
||||
(version "1.0.2")
|
||||
(version "1.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "anndataR" version))
|
||||
(sha256
|
||||
(base32 "1gn1yyfs08a77zrl4cidahxim3kgcvpbsrgfxxnhhrka57xcylld"))))
|
||||
(base32 "1vi9aqgdjy0nlbsk7628sz12jsxd9bfb79yxhh0ngijpxj9sxd4p"))))
|
||||
(properties `((upstream-name . "anndataR")))
|
||||
(build-system r-build-system)
|
||||
(arguments
|
||||
@@ -4664,13 +4670,14 @@ directly access various slots (e.g. X, obs, var), or convert the data into
|
||||
(build-system r-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:test-directory "inst/unitTests"
|
||||
;; These tests require internet access.
|
||||
#:skipped-tests
|
||||
'("test_recipe.R"
|
||||
"test_webAccessFunctions.R")
|
||||
#:phases
|
||||
'(modify-phases %standard-phases
|
||||
(add-after 'unpack 'delete-bad-tests
|
||||
(lambda _
|
||||
;; These tests require internet access.
|
||||
(for-each delete-file
|
||||
'("inst/unitTests/test_recipe.R"
|
||||
"inst/unitTests/test_webAccessFunctions.R"))))
|
||||
(add-before 'install 'set-home
|
||||
(lambda _ (setenv "HOME" "/tmp"))))))
|
||||
(propagated-inputs
|
||||
@@ -5237,13 +5244,13 @@ structures: @code{ExpressionSet}, @code{AffyBatch}, @code{NChannelSet}.")
|
||||
(define-public r-arrayqualitymetrics
|
||||
(package
|
||||
(name "r-arrayqualitymetrics")
|
||||
(version "3.66.0")
|
||||
(version "3.64.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "arrayQualityMetrics" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0y9k81vwqq74zfdrc2hvx7mg0l7572hvrsby00m20z034j7f9pmi"))))
|
||||
"1kz2d40wx2ksy9dz1z3wylcj7y7ad9z8xphsnz39j02m4g5mbvlp"))))
|
||||
(properties
|
||||
'((upstream-name . "arrayQualityMetrics")
|
||||
;; We don't need these.
|
||||
@@ -5265,7 +5272,7 @@ structures: @code{ExpressionSet}, @code{AffyBatch}, @code{NChannelSet}.")
|
||||
r-svglite
|
||||
r-vsn
|
||||
r-xml))
|
||||
(native-inputs (list r-biocstyle r-knitr))
|
||||
(native-inputs (list r-knitr))
|
||||
(home-page "https://bioconductor.org/packages/arrayQualityMetrics")
|
||||
(synopsis "Quality metrics report for microarray data sets")
|
||||
(description
|
||||
@@ -6103,8 +6110,10 @@ retrieval analyses, or similar technologies.")
|
||||
(build-system r-build-system)
|
||||
(arguments
|
||||
(list
|
||||
;; This requires internet access.
|
||||
#:skipped-tests '("test-download.R")))
|
||||
#:phases
|
||||
'(modify-phases %standard-phases
|
||||
(add-after 'unpack 'disable-bad-tests
|
||||
(lambda _ (delete-file "tests/testthat/test-download.R"))))))
|
||||
(propagated-inputs (list cmake r-dir-expiry))
|
||||
(native-inputs (list r-knitr r-testthat))
|
||||
(home-page "https://github.com/LTLA/biocmake")
|
||||
@@ -6412,6 +6421,17 @@ objects.")
|
||||
(base32 "189akh4lpbp0dzgflb3nb3vi94bhmsj7qkcl597dnnzxqz00hsb2"))))
|
||||
(properties `((upstream-name . "CoreGx")))
|
||||
(build-system r-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
'(modify-phases %standard-phases
|
||||
(add-after 'unpack 'disable-bad-tests
|
||||
(lambda _
|
||||
;; It is unclear why 3 tests fail.
|
||||
(with-directory-excursion "tests/testthat"
|
||||
(substitute* "test-LongTable-utils.R"
|
||||
((".*doesn't miss assay observations.*" m)
|
||||
(string-append m "skip('guix')\n")))))))))
|
||||
(propagated-inputs
|
||||
(list r-bench
|
||||
r-biobase
|
||||
@@ -7880,13 +7900,13 @@ Kallisto, Salmon, StringTie, Cufflinks/Cuffdiff etc.")
|
||||
(define-public r-isva
|
||||
(package
|
||||
(name "r-isva")
|
||||
(version "1.10")
|
||||
(version "1.9")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "isva" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1im1bwbf6l88m4bwwwr0z2x8bvw927s3fqbwc06s5240wc8syjpl"))))
|
||||
"05qx9q0kg4ma23v4abhihw0vz017nq6hv2jzsiqx4d20ngh1dl4z"))))
|
||||
(properties `((upstream-name . "isva")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs (list r-fastica r-jade r-qvalue))
|
||||
@@ -8653,13 +8673,13 @@ on Bioconductor or which replace R functions.")
|
||||
(define-public r-biomart
|
||||
(package
|
||||
(name "r-biomart")
|
||||
(version "2.66.2")
|
||||
(version "2.66.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "biomaRt" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1awsfklcs35vrmjkc12bk5ys9w7ib0799i3d0k138y44a0837pph"))))
|
||||
"1cmzay4z9s183dc001rxfa81ql67la9y8m0p0wsn2iwzxzx94n8g"))))
|
||||
(properties
|
||||
`((upstream-name . "biomaRt")))
|
||||
(build-system r-build-system)
|
||||
@@ -10317,13 +10337,13 @@ Enrichment Analysis} (GSEA).")
|
||||
(define-public r-gsva
|
||||
(package
|
||||
(name "r-gsva")
|
||||
(version "2.4.8")
|
||||
(version "2.4.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "GSVA" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0p9awi85dbmmyplhdfz0in4nhaavb58gpf48kqyp30rcc3v5a8h0"))))
|
||||
"08i2s5zlm75mr7zl357cic2zxcy7aqqfv67xb0w67n48cw016ri6"))))
|
||||
(properties `((upstream-name . "GSVA")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs (list r-biobase
|
||||
@@ -10718,54 +10738,6 @@ nucleotide sequence analysis. The package is primarily useful to developers
|
||||
of other R packages who wish to make use of HTSlib.")
|
||||
(license license:lgpl2.0+)))
|
||||
|
||||
(define-public r-rliger
|
||||
(package
|
||||
(name "r-rliger")
|
||||
(version "2.2.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/welch-lab/liger")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1w849km9b347m56qwr5lr6ymdk7wv22hr224riscm0zrnx402yb3"))))
|
||||
(properties `((upstream-name . "rliger")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs (list r-cli
|
||||
r-delayedarray
|
||||
r-dplyr
|
||||
r-ggplot2
|
||||
r-hdf5array
|
||||
r-hdf5r
|
||||
r-leidenalg
|
||||
r-lifecycle
|
||||
r-magrittr
|
||||
r-matrix
|
||||
r-patchwork
|
||||
r-rann
|
||||
r-rcpp
|
||||
r-rcpparmadillo
|
||||
r-rcppplanc
|
||||
r-rcppprogress
|
||||
r-rlang
|
||||
r-s4vectors
|
||||
r-scales
|
||||
r-uwot))
|
||||
(native-inputs
|
||||
(list r-circlize r-complexheatmap r-knitr r-testthat r-viridis))
|
||||
(home-page "https://github.com/welch-lab/liger")
|
||||
(synopsis "Linked inference of genomic experimental relationships")
|
||||
(description
|
||||
"LIGER is a package for integrating and analyzing multiple single-cell
|
||||
datasets. It relies on integrative non-negative matrix factorization to
|
||||
identify shared and dataset-specific factors.")
|
||||
(license license:gpl3)))
|
||||
|
||||
(define-deprecated-package r-liger
|
||||
r-rliger)
|
||||
|
||||
(define-public r-rnbeads
|
||||
(package
|
||||
(name "r-rnbeads")
|
||||
@@ -11145,13 +11117,13 @@ different technologies, including microarrays, RNA-seq, and quantitative PCR.")
|
||||
(define-public r-maaslin2
|
||||
(package
|
||||
(name "r-maaslin2")
|
||||
(version "1.24.1")
|
||||
(version "1.22.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "Maaslin2" version))
|
||||
(sha256
|
||||
(base32 "0z8vfx6db6xfvqdhg6n8jx3fmgwvq22facsacq6ym867kw2jafiz"))))
|
||||
(base32 "10hdjhi1ykk513hzvs0bi6avzghqmkqns8knhz3ycv7bj3ynp70x"))))
|
||||
(properties `((upstream-name . "Maaslin2")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
@@ -11339,6 +11311,17 @@ high distances can be flagged as potentially low-quality.")
|
||||
;; Avoid dependency cycle.
|
||||
(updater-ignored-native-inputs . ("r-spectra"))))
|
||||
(build-system r-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
'(modify-phases %standard-phases
|
||||
;; This test uses a deprecated procedure that has since been removed
|
||||
;; from testthat.
|
||||
(add-after 'unpack 'testthat-compatibility
|
||||
(lambda _
|
||||
(substitute* "tests/testthat/test_zzz.R"
|
||||
((".*.onLoad works.*" m)
|
||||
(string-append m "skip('guix')\n"))))))))
|
||||
(propagated-inputs (list r-biocparallel r-mscoreutils))
|
||||
(native-inputs (list r-callr r-knitr r-microbenchmark r-robustbase
|
||||
r-testthat))
|
||||
@@ -11545,13 +11528,13 @@ time-series data (including a graphical user interface).")
|
||||
(define-public r-mmuphin
|
||||
(package
|
||||
(name "r-mmuphin")
|
||||
(version "1.24.0")
|
||||
(version "1.22.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "MMUPHin" version))
|
||||
(sha256
|
||||
(base32 "1zdk9ffa996w4acnhbs7grbji5s3plwhcl6m21yajrlck2i9y3cw"))
|
||||
(base32 "0d8i9b6pjwz409jd46fm1n9h21hzg8zgzpvchywpyc1k896fvz4l"))
|
||||
;; Delete generated files.
|
||||
(snippet
|
||||
'(for-each delete-file
|
||||
@@ -14315,13 +14298,13 @@ level.")
|
||||
(define-public r-tcgautils
|
||||
(package
|
||||
(name "r-tcgautils")
|
||||
(version "1.30.3")
|
||||
(version "1.30.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "TCGAutils" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1nppp70675y3ds76jf61rhfis2lgkxqjhz48b367qa55g3q2ah61"))))
|
||||
"1zwzx7mfp4s0v1rdjsyxj4l9w360g4qm3am8yf5lsd0biciqqh93"))))
|
||||
(properties `((upstream-name . "TCGAutils")))
|
||||
(build-system r-build-system)
|
||||
(arguments
|
||||
@@ -15041,14 +15024,14 @@ unmodeled, or latent sources of noise.")
|
||||
(define-public r-systempiper
|
||||
(package
|
||||
(name "r-systempiper")
|
||||
(version "2.16.4")
|
||||
(version "2.16.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "systemPipeR" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1zrk6ky58f30wvaxph5dc2wr418qfpwc7d8pkxpl5dhb5g7vgn8r"))))
|
||||
"0maixi0hwqzkpiq60hf60x4q3gv3hkvmrqh3ygv0fk63g1k9f6cj"))))
|
||||
(properties `((upstream-name . "systemPipeR")))
|
||||
(build-system r-build-system)
|
||||
;; Tests fail because genWorkenvir fails to set up the environment.
|
||||
@@ -15415,13 +15398,13 @@ molecular functions, respectively, and produces intuitive graphical outputs.")
|
||||
(define-public r-xllim
|
||||
(package
|
||||
(name "r-xllim")
|
||||
(version "2.3.1")
|
||||
(version "2.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "xLLiM" version))
|
||||
(sha256
|
||||
(base32 "1h2z6a3j3yi7rj5lyk7gb1iyp2vf516fgmk7wr333gfkvk522n2r"))))
|
||||
(base32 "08v6acn6vpn8asn61ldqdryjz0xk5zyd2v63aqrc5xximpqwrp7d"))))
|
||||
(properties `((upstream-name . "xLLiM")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs (list r-abind
|
||||
@@ -16321,14 +16304,14 @@ signals directly in the Bruker format.")
|
||||
(define-public r-codedepends
|
||||
(package
|
||||
(name "r-codedepends")
|
||||
(version "0.6.7")
|
||||
(version "0.6.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "CodeDepends" version))
|
||||
(sha256
|
||||
(base32
|
||||
"02sj40qxq5vywgqay9q9vpv3s6j3jjr46kc8q3v1yw2vbsmlvrz0"))))
|
||||
"0msq5ksjqp2pjzl6f1vizw53gdf5lz520bpdr5dbjwz5mc1mp0bz"))))
|
||||
(properties `((upstream-name . "CodeDepends")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
@@ -17399,14 +17382,14 @@ data.")
|
||||
(define-public r-ggtree
|
||||
(package
|
||||
(name "r-ggtree")
|
||||
(version "4.0.5")
|
||||
(version "4.0.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "ggtree" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0w9hqc3m35mrdqy5iwcm201pzpbl8jw6rd3wyzwp6f53wbbm2lbh"))))
|
||||
"1qi5nispv0cirfayijybnn1nr8l6sb2adnic3y37qm3yv91w6s6z"))))
|
||||
(properties `((upstream-name . "ggtree")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
@@ -18720,13 +18703,13 @@ standardization of the analyses and the development of best practices.")
|
||||
(define-public r-microbiomestat
|
||||
(package
|
||||
(name "r-microbiomestat")
|
||||
(version "1.4")
|
||||
(version "1.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "MicrobiomeStat" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0in28lzds3sv1xa25vs8q5mmm1ax78s2axhq7mi23njqip5xmsr1"))))
|
||||
"02xg8l4d0z5wrdrm5dj5a0q51vsbhf3f6z2lk8294c4d85s09dhl"))))
|
||||
(properties
|
||||
'((upstream-name . "MicrobiomeStat")
|
||||
(updater-extra-inputs . ("nlopt"))
|
||||
@@ -18734,21 +18717,23 @@ standardization of the analyses and the development of best practices.")
|
||||
(build-system r-build-system)
|
||||
(inputs (list nlopt))
|
||||
(native-inputs (list pkg-config))
|
||||
(propagated-inputs (list r-bbotk
|
||||
(propagated-inputs (list r-bbmisc
|
||||
r-dplyr
|
||||
r-foreach
|
||||
r-ggplot2
|
||||
r-ggrepel
|
||||
r-lhs
|
||||
r-lmertest
|
||||
r-mass
|
||||
r-matrix
|
||||
r-matrixstats
|
||||
r-mlr3
|
||||
r-mlr3mbo
|
||||
r-mlr
|
||||
r-mlrmbo
|
||||
r-modeest
|
||||
r-paradox
|
||||
r-paramhelpers
|
||||
r-rcpp
|
||||
r-rcpparmadillo
|
||||
r-smoof
|
||||
r-statmod))
|
||||
(home-page "https://cran.r-project.org/package=MicrobiomeStat")
|
||||
(synopsis "Statistical methods for microbiome compositional data")
|
||||
@@ -19652,14 +19637,14 @@ correspondence between different data sources.")
|
||||
(define-public r-enrichplot
|
||||
(package
|
||||
(name "r-enrichplot")
|
||||
(version "1.30.5")
|
||||
(version "1.30.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "enrichplot" version))
|
||||
(sha256
|
||||
(base32
|
||||
"12c6xwp29mmalvxp3asliv2hlha5vv8l37prmmcgpdi4nghfic3b"))))
|
||||
"080q91ll8rvqf93hcmxc7kjbmmihyh0vrpxck2pqrwglbqxm4xll"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
(list r-aplot
|
||||
@@ -22904,14 +22889,14 @@ expression space.")
|
||||
(define-public r-cicero
|
||||
(package
|
||||
(name "r-cicero")
|
||||
(version "1.28.3")
|
||||
(version "1.28.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "cicero" version))
|
||||
(sha256
|
||||
(base32
|
||||
"016wpficnbricf4f7sgq8j53cl178f1332fh9zvlx7q560489zf1"))))
|
||||
"1ibxynw77a8mqv9av7z828wcazjpm4sfp83hd412f2rmgkls895x"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
(list r-assertthat
|
||||
@@ -23543,14 +23528,14 @@ populations, splice site strength, conservation, etc.")
|
||||
(define-public r-variancepartition
|
||||
(package
|
||||
(name "r-variancepartition")
|
||||
(version "1.40.2")
|
||||
(version "1.40.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "variancePartition" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0k2rcgg4ll06b9j7999d4l60wpmi3vnjaqiy5ay8ppd1z0m38ygf"))))
|
||||
"1xqy4jl8im7i4kd4iwn8hvhy172fzsadyn90kprihmvccmpd5cr3"))))
|
||||
(properties
|
||||
'((upstream-name . "variancePartition")
|
||||
(updater-extra-native-inputs . ("r-rfast"))))
|
||||
@@ -23891,26 +23876,30 @@ rate} (FDR).")
|
||||
(define-public r-activedriverwgs
|
||||
(package
|
||||
(name "r-activedriverwgs")
|
||||
(version "1.2.1")
|
||||
(version "1.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "ActiveDriverWGS" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1v6lnzbaksqpc33q3bp4mwij6rrfbqhi5wk1qx32h2wr2hr4208y"))))
|
||||
"0xnplgwxd197a4d422bsxg753q158i12ils16awd1cw30wafdxkk"))))
|
||||
(properties
|
||||
`((upstream-name . "ActiveDriverWGS")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
(list r-biostrings
|
||||
r-bsgenome
|
||||
r-bsgenome-hsapiens-ucsc-hg19
|
||||
r-bsgenome-hsapiens-ucsc-hg38
|
||||
r-bsgenome-mmusculus-ucsc-mm9
|
||||
r-bsgenome-mmusculus-ucsc-mm10
|
||||
r-genomeinfodb
|
||||
r-genomicranges
|
||||
r-iranges
|
||||
r-s4vectors))
|
||||
(native-inputs
|
||||
(list r-bsgenome-hsapiens-ucsc-hg19 r-knitr r-testthat))
|
||||
(list r-knitr r-testthat))
|
||||
(home-page "https://cran.r-project.org/web/packages/ActiveDriverWGS/")
|
||||
(synopsis "Driver discovery tool for cancer whole genomes")
|
||||
(description
|
||||
@@ -24770,13 +24759,13 @@ functionality.")
|
||||
(define-public r-biocviews
|
||||
(package
|
||||
(name "r-biocviews")
|
||||
(version "1.78.1")
|
||||
(version "1.78.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "biocViews" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1qw3xwsffdqfwpmwrpzg8rnjwv9l45lkjz8bf5272hkhgjc7b1a8"))))
|
||||
"1dfsfj4dm9wnh4qr1sqdrwzccl3pgw58j17vr3i1bvxkrq31p1ws"))))
|
||||
(properties
|
||||
`((upstream-name . "biocViews")))
|
||||
(build-system r-build-system)
|
||||
@@ -24889,14 +24878,14 @@ db and resource files to AWS S3 buckets.")
|
||||
(define-public r-multiassayexperiment
|
||||
(package
|
||||
(name "r-multiassayexperiment")
|
||||
(version "1.36.2")
|
||||
(version "1.36.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "MultiAssayExperiment" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0bhr51c58vdfvly0bh3hgr397qkq45yw8221rpr38cah7dbzvrba"))))
|
||||
"09jwnwiq4vx7cmzq5va3rh7npjyhi1p5p344c4n0h9nr55mxzjiw"))))
|
||||
(properties
|
||||
'((upstream-name . "MultiAssayExperiment")
|
||||
(updater-extra-native-inputs
|
||||
@@ -25965,13 +25954,13 @@ provided for direct creation of an in-memory tatami matrix from a HDF5 file.")
|
||||
(define-public r-beadarray
|
||||
(package
|
||||
(name "r-beadarray")
|
||||
(version "2.60.1")
|
||||
(version "2.58.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "beadarray" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1bcirbg10ai6jpa8a5ppq4450r5h2bwizb98qn0z0hmm1mm4ww9r"))))
|
||||
"0m9hmy4xn7q2v4ra95b9h08d0qh5qmjgqmg96vabyv46gn5i7qp4"))))
|
||||
(properties `((upstream-name . "beadarray")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs (list r-annotationdbi
|
||||
@@ -26401,13 +26390,13 @@ of other packages.")
|
||||
(define-public r-scater
|
||||
(package
|
||||
(name "r-scater")
|
||||
(version "1.38.1")
|
||||
(version "1.38.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "scater" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1p8dzjphrcqai1f8wh56jfv377dqzdfnx2sl9sn73axbsr41swa7"))))
|
||||
"1qwygk8fg8nharrkmjs65fcl3lsdi232f2383s5j8vm1qil5gghd"))))
|
||||
(build-system r-build-system)
|
||||
(properties
|
||||
'((updater-extra-native-inputs
|
||||
@@ -26512,13 +26501,13 @@ variable and significantly correlated genes.")
|
||||
(define-public r-sparsearray
|
||||
(package
|
||||
(name "r-sparsearray")
|
||||
(version "1.10.10")
|
||||
(version "1.10.8")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "SparseArray" version))
|
||||
(sha256
|
||||
(base32 "19c1dfa5wizq7k53a43i5dwwaqs44prclxbf1k0i3awx5wz6qlbw"))))
|
||||
(base32 "1bjxljwfrv787ikp61xl29wx3k6624qz75gl1kzfif62vys7vgf0"))))
|
||||
(properties `((upstream-name . "SparseArray")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs (list r-biocgenerics
|
||||
@@ -27172,14 +27161,14 @@ with your data.")
|
||||
(define-public r-gwascat
|
||||
(package
|
||||
(name "r-gwascat")
|
||||
(version "2.42.1")
|
||||
(version "2.42.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "gwascat" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0djrd63nsqpy46acblg5k8pq6ldqccr35r6h0sf4xridpkqm78b1"))))
|
||||
"1v5z4fmwgs3swvpa09y986sracz0nsggq8s9hp1nmwb9a9grw8px"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
(list r-annotationdbi
|
||||
@@ -27194,6 +27183,7 @@ with your data.")
|
||||
r-readr
|
||||
r-s4vectors
|
||||
r-seqinfo
|
||||
r-snpstats
|
||||
r-tibble
|
||||
r-variantannotation))
|
||||
(native-inputs
|
||||
@@ -27654,6 +27644,16 @@ visualizations for publication-quality multi-panel figures.")
|
||||
"1c7vy10ga3cswsqwxljbgqlsjg0d2lx9srfknbjy4fkbyrjci15k"))))
|
||||
(properties `((upstream-name . "ballgown")))
|
||||
(build-system r-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
'(modify-phases %standard-phases
|
||||
;; These deprecated procedures have been removed in testthat.
|
||||
(add-after 'unpack 'testthat-compatibility
|
||||
(lambda _
|
||||
(substitute* "tests/testthat/test-annotation.R"
|
||||
(("is_true\\(\\)") "expect_true")
|
||||
(("is_false\\(\\)") "expect_false")))))))
|
||||
(propagated-inputs
|
||||
(list r-biobase
|
||||
r-genomicranges
|
||||
@@ -28409,18 +28409,28 @@ separate published packages.")
|
||||
(define-public r-biomformat
|
||||
(package
|
||||
(name "r-biomformat")
|
||||
(version "1.38.3")
|
||||
(version "1.38.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "biomformat" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0b0w0mfx448ph8fla3nb4i50mvpnv498kxip7rnh14xwas9rhdd7"))))
|
||||
"1ydcgifdrgg48y7qxg0gw30h332y3yk3k3n17fajkv58mlvyx1yc"))))
|
||||
(properties `((upstream-name . "biomformat")))
|
||||
(build-system r-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
'(modify-phases %standard-phases
|
||||
;; These deprecated procedures have been removed in testthat.
|
||||
(add-after 'unpack 'testthat-compatibility
|
||||
(lambda _
|
||||
(substitute* "tests/testthat/test-IO.R"
|
||||
(("is_true\\(\\)") "expect_true")
|
||||
(("is_false\\(\\)") "expect_false")))))))
|
||||
(propagated-inputs
|
||||
(list r-jsonlite r-matrix r-rhdf5))
|
||||
(list r-jsonlite r-matrix r-plyr r-rhdf5))
|
||||
(native-inputs (list r-knitr r-testthat))
|
||||
(home-page "https://github.com/joey711/biomformat/")
|
||||
(synopsis "Interface package for the BIOM file format")
|
||||
@@ -29178,15 +29188,25 @@ reproducibility.")
|
||||
(define-public r-phyloseq
|
||||
(package
|
||||
(name "r-phyloseq")
|
||||
(version "1.54.2")
|
||||
(version "1.54.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "phyloseq" version))
|
||||
(sha256
|
||||
(base32 "106zwzzwzvb5x0lz9i68wshh2nsa2rf5rmkqjqsvr4smxq6hknlj"))))
|
||||
(base32 "1zivxag6b2bjh32k1mpn7hlvalap97rp90x3cbfynqrk6933f4bq"))))
|
||||
(properties `((upstream-name . "phyloseq")))
|
||||
(build-system r-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
'(modify-phases %standard-phases
|
||||
;; These deprecated procedures have been removed in testthat.
|
||||
(add-after 'unpack 'testthat-compatibility
|
||||
(lambda _
|
||||
(substitute* (find-files "tests/testthat" "\\.R$")
|
||||
(("is_true\\(\\)") "expect_true")
|
||||
(("is_false\\(\\)") "expect_false")))))))
|
||||
(propagated-inputs
|
||||
(list r-ade4
|
||||
r-ape
|
||||
|
||||
@@ -922,10 +922,7 @@ suite native in R.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "12h1di45fg06nhsliii7v0h1z567pkpis1xm4ar1qr8ns1n8iljw"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(delete-file-recursively "r/src/vendor/highway"))))
|
||||
(base32 "12h1di45fg06nhsliii7v0h1z567pkpis1xm4ar1qr8ns1n8iljw"))))
|
||||
(properties `((upstream-name . "BPCells")))
|
||||
(build-system r-build-system)
|
||||
(arguments
|
||||
@@ -933,11 +930,7 @@ suite native in R.")
|
||||
#:phases
|
||||
'(modify-phases %standard-phases
|
||||
(add-after 'unpack 'chdir
|
||||
(lambda _
|
||||
(substitute* "r/configure"
|
||||
(("tools/hwy-test.cpp" m)
|
||||
(string-append m " $HWY_LIBS $HWY_CFLAGS")))
|
||||
(chdir "r"))))))
|
||||
(lambda _ (chdir "r"))))))
|
||||
(propagated-inputs
|
||||
(list r-dplyr
|
||||
r-ggplot2
|
||||
@@ -964,7 +957,7 @@ suite native in R.")
|
||||
r-igraph
|
||||
r-iranges
|
||||
r-matrixstats))
|
||||
(inputs (list hdf5 google-highway zlib))
|
||||
(inputs (list hdf5 zlib))
|
||||
(native-inputs (list pkg-config))
|
||||
(home-page "https://github.com/bnprks/BPCells")
|
||||
(synopsis "Single cell counts matrices to PCA")
|
||||
@@ -7335,7 +7328,7 @@ genome- and pangenome-scale queries using a laptop.")
|
||||
(define-public delly
|
||||
(package
|
||||
(name "delly")
|
||||
(version "1.7.3")
|
||||
(version "0.8.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@@ -7343,7 +7336,7 @@ genome- and pangenome-scale queries using a laptop.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1ri7m7iv3wakm7zdwqdzm5m71y0swad9n78dzrzr9gs3j7j5yxjs"))
|
||||
(base32 "1ibnplgfzj96w8glkx17v7sld3pm402fr5ybmf3h0rlcryabxrqy"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(delete-file-recursively "src/htslib"))))
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
;;; Copyright © 2025 Josep Bigorra <jjbigorra@gmail.com>
|
||||
;;; Copyright © 2025 John Kehayias <john.kehayias@protonmail.com>
|
||||
;;; Copyright © 2026 Nemin <bergengocia@protonmail.com>
|
||||
;;; Copyright © 2026 Nguyễn Gia Phong <cnx@loang.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@@ -101,7 +100,6 @@
|
||||
#:use-module (gnu packages rpc)
|
||||
#:use-module (gnu packages serialization)
|
||||
#:use-module (gnu packages sqlite)
|
||||
#:use-module (gnu packages tcl)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages unicode)
|
||||
#:use-module (gnu packages version-control)
|
||||
@@ -141,48 +139,6 @@ Bourne shell script instead of m4.")
|
||||
(home-page "https://github.com/radareorg/acr")
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public autosetup
|
||||
(package
|
||||
(name "autosetup")
|
||||
(version "0.7.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/msteveb/autosetup")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256 (base32 "002b380073cpxlqziia2gvngywrb37b08p9k0zk9vlxn2p174hc6"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
#~(begin
|
||||
(delete-file "jimsh0.c")
|
||||
(substitute* "Makefile"
|
||||
(("^.*tclsh8\\..*") ;tests run with specific Tcl versions
|
||||
""))))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:test-target "test"
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(delete 'build)
|
||||
(replace 'install
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "sys-find-tclsh"
|
||||
(("jimsh tclsh")
|
||||
(search-input-file inputs "bin/tclsh")))
|
||||
(invoke "tclsh" "autosetup"
|
||||
(string-append "--sysinstall=" #$output)))))))
|
||||
(inputs (list tcl))
|
||||
(home-page "https://msteveb.github.io/autosetup/")
|
||||
(synopsis "Build environment auto-configurator")
|
||||
(description
|
||||
"@command{autosetup} is a tool, similar to @command{autoconf},
|
||||
to configure a build system for the appropriate environment,
|
||||
according to the system capabilities and the user-selected options.")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public bam
|
||||
(package
|
||||
(name "bam")
|
||||
|
||||
@@ -43,7 +43,6 @@
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system glib-or-gtk)
|
||||
#:use-module (guix build-system meson)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (gnu packages)
|
||||
@@ -996,17 +995,18 @@ Supported extensions to ISO 9660 are Rock Ridge, Joliet, AAIP, zisofs.")
|
||||
(define-public libudfread
|
||||
(package
|
||||
(name "libudfread")
|
||||
(version "1.2.0")
|
||||
(version "1.1.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://download.videolan.org/pub/videolan/libudfread/"
|
||||
name "-" version ".tar.xz"))
|
||||
name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"03q5b1wm90vygx4rf4mzzrf0yhvhbvp72nyhv63pgz7v9jypqixv"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs (list pkg-config))
|
||||
"05c943ymw94nzjxf7v102916frqk7icgw4gb244wx23jn8cnz56m"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list automake autoconf libtool pkg-config))
|
||||
(home-page "https://code.videolan.org/videolan/libudfread")
|
||||
(synopsis "C library to read UDF file systems")
|
||||
(description "@code{libudfread} is a C library for reading
|
||||
|
||||
@@ -375,7 +375,7 @@ contents, and discovering ways to shrink the size of Docker/OCI image.")
|
||||
(define-public guix-compose
|
||||
(package
|
||||
(name "guix-compose")
|
||||
(version "0.2.0")
|
||||
(version "0.1.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -384,7 +384,7 @@ contents, and discovering ways to shrink the size of Docker/OCI image.")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1dy48qkz3ifxagijpvwg7rmq7hz3pikhdcfral6djyc9ppmz8mbm"))))
|
||||
(base32 "1ij6rfs5pfykk8c53q029sl2qx3k572dqdfb6pn5s569l6697ci1"))))
|
||||
(build-system guile-build-system)
|
||||
(arguments
|
||||
(list
|
||||
@@ -426,7 +426,7 @@ contents, and discovering ways to shrink the size of Docker/OCI image.")
|
||||
"guile" "-L" "./modules" "-s" "tests/test-compose.scm")))))))
|
||||
(native-inputs (list guile-3.0))
|
||||
;; Avoid setting propagated so that we use the user’s profile.
|
||||
(inputs (list guix guile-dotenv guile-yamlpp))
|
||||
(inputs (list guix guile-yamlpp))
|
||||
(native-search-paths
|
||||
(list $GUIX_EXTENSIONS_PATH))
|
||||
(synopsis "Guix' docker compose compatibility layer")
|
||||
|
||||
+691
-781
File diff suppressed because it is too large
Load Diff
@@ -1688,14 +1688,14 @@ structure. However CryFS is not considered stable yet by the developers.")
|
||||
(define-public b3sum
|
||||
(package
|
||||
(name "b3sum")
|
||||
(version "1.8.4")
|
||||
(version "1.8.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "b3sum" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0pkra5zh680cl9q92hpzmg9flz99b06bhpg7jyhymg1nkm0anw7a"))))
|
||||
(base32 "06qc6iv574km4j1ja4qhxyai680jkll58qzpz4mb79c0rk750dpd"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
(define-public boinc-client
|
||||
(package
|
||||
(name "boinc-client")
|
||||
(version "8.2.9")
|
||||
(version "8.2.8")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@@ -62,7 +62,7 @@
|
||||
(file-name (git-file-name "boinc" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0ik9423ii6kal29jdn907pxy8w86zpi8n158qx1gcsh8lsaif1v5"))))
|
||||
"1ppcf57p6dkv9dv5k90fj3xhbv9di2d3yjkg2flfv5d45s82lay8"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
||||
@@ -709,13 +709,13 @@ your code.")
|
||||
(define-public python-django-filter
|
||||
(package
|
||||
(name "python-django-filter")
|
||||
(version "25.2")
|
||||
(version "25.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "django_filter" version))
|
||||
(sha256
|
||||
(base32
|
||||
"08wgzqirabxzcdhh0wvv45hqr6dqxy3ifm7mjv86hi0zjd59h3kn"))))
|
||||
"0lvi82f3dnj89ip8hry8fq8w7x632r5p84dlr451rnm8izsfxj8y"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
||||
+2
-14
@@ -75,8 +75,7 @@
|
||||
(uri (string-append "https://github.com/ldc-developers/ldc/releases"
|
||||
"/download/v" version "/ldc-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32 "13pkg69wjj4ali4ikijicccpg8y6f2hghhb70z9lrqr2w3pkhqna"))
|
||||
(patches (search-patches "ldc-i686-int128-alignment.patch"))))
|
||||
(base32 "13pkg69wjj4ali4ikijicccpg8y6f2hghhb70z9lrqr2w3pkhqna"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:disallowed-references (,tzdata-for-tests)
|
||||
@@ -373,7 +372,6 @@ integration tests...\n")
|
||||
;; Do not build the shared libphobos2.so library, to avoid
|
||||
;; retaining a reference to gcc:lib.
|
||||
"SHARED=0"
|
||||
"DIFFABLE=1" ;constant timestamp
|
||||
"VERBOSE=1")
|
||||
#:modules
|
||||
`(,@%default-gnu-modules
|
||||
@@ -478,15 +476,6 @@ integration tests...\n")
|
||||
(phase-in-sub-dir 'build "dmd"))
|
||||
(add-after 'build 'build-phobos
|
||||
(phase-in-sub-dir 'build "phobos"))
|
||||
(add-after 'build-phobos 'build-man
|
||||
(lambda* (#:key make-flags #:allow-other-keys)
|
||||
(with-directory-excursion "dmd/compiler/docs"
|
||||
(let ((dmd (or (which "gdmd")
|
||||
(which "dmd"))))
|
||||
((assoc-ref %standard-phases 'build)
|
||||
#:make-flags (cons
|
||||
(string-append "DMD=" dmd)
|
||||
make-flags))))))
|
||||
(replace 'check
|
||||
(phase-in-sub-dir 'check "dmd"))
|
||||
(add-after 'check 'check-phobos
|
||||
@@ -512,7 +501,7 @@ integration tests...\n")
|
||||
(for-each (cut install-file <> lib-lib)
|
||||
(find-files "." "^libdruntime\\.so[.0-9]*$")))
|
||||
(copy-recursively "druntime/import" out-include)
|
||||
(copy-recursively "generated/docs/man" out-man))
|
||||
(copy-recursively "compiler/docs/man" out-man))
|
||||
(with-directory-excursion "phobos"
|
||||
(with-directory-excursion build-sub-dir
|
||||
(install-file "libphobos2.a" out-lib)
|
||||
@@ -687,7 +676,6 @@ needed.")
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(invoke "bin/rdmd" "rdmd_test.d" "bin/rdmd"
|
||||
"-m" (if #$(target-64bit?) "64" "32")
|
||||
"--rdmd-default-compiler" "ldmd2"))))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
|
||||
+24
-26
@@ -295,37 +295,35 @@ prompt the user with the option to go with insecure DNS only.")
|
||||
(define-public dnsmasq
|
||||
(package
|
||||
(name "dnsmasq")
|
||||
(version "2.92")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "http://thekelleys.org.uk/git/dnsmasq.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "055gn5kigz0m9y09vig97s1g257hnlkhw4wv9d9wdficnsxcbwwm"))))
|
||||
(version "2.90")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://www.thekelleys.org.uk/dnsmasq/dnsmasq-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1r09l537vi867hlpv6vl7nvqhscvq1kf04m896bfrgrpv2dk0l4f"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:tests? #f ;no tests
|
||||
#:make-flags
|
||||
#~(list (string-append "PREFIX=" #$output)
|
||||
(string-append "CC=" #$(cc-for-target))
|
||||
(string-append "PKG_CONFIG=" #$(pkg-config-for-target))
|
||||
"COPTS=\"-DHAVE_DBUS\"")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'configure) ;no configure
|
||||
(add-after 'install 'install-dbus
|
||||
(lambda _
|
||||
(install-file "dbus/dnsmasq.conf"
|
||||
(string-append #$output "/etc/dbus-1/system.d")))))))
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(inputs
|
||||
(list dbus))
|
||||
(home-page "https://thekelleys.org.uk/dnsmasq/doc.html")
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(add-after 'install 'install-dbus
|
||||
(lambda _
|
||||
(install-file "dbus/dnsmasq.conf"
|
||||
(string-append %output "/etc/dbus-1/system.d")))))
|
||||
|
||||
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
|
||||
(string-append "CC=" ,(cc-for-target))
|
||||
(string-append "PKG_CONFIG=" ,(pkg-config-for-target))
|
||||
"COPTS=\"-DHAVE_DBUS\"")
|
||||
#:tests? #f)) ; no ‘check’ target
|
||||
(home-page "https://www.thekelleys.org.uk/dnsmasq/doc.html")
|
||||
(synopsis "Small caching DNS proxy and DHCP/TFTP server")
|
||||
(description
|
||||
"Dnsmasq is a light-weight DNS forwarder and DHCP server. It is designed
|
||||
|
||||
@@ -148,13 +148,13 @@ system.")
|
||||
(define-public r-duckdb
|
||||
(package
|
||||
(name "r-duckdb")
|
||||
(version "1.5.1")
|
||||
(version "1.4.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "duckdb" version))
|
||||
(sha256
|
||||
(base32 "177621m08whqqk4yhj3zrr08l3d9hhlqh3gm9jzhi5cplg47cksq"))
|
||||
(base32 "1hch36v3lsymnx30lv3cjy12gs3v3mhd44ha97l7w9mwp9wbzmxl"))
|
||||
;; This package bundles the duckdb sources and builds a custom variant
|
||||
;; of duckdb. I'd be happy to link it with our duckdb library instead,
|
||||
;; but it does not seem possible to do that.
|
||||
@@ -179,12 +179,10 @@ system.")
|
||||
r-dplyr
|
||||
r-remotes
|
||||
r-rlang
|
||||
r-sf
|
||||
r-testthat
|
||||
r-tibble
|
||||
r-vctrs
|
||||
r-withr
|
||||
r-wk
|
||||
tzdata-for-tests))
|
||||
(home-page "https://r.duckdb.org/")
|
||||
(synopsis "DBI package for the DuckDB database management system")
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
;;; Copyright © 2017-2023 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018-2026 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2018-2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2020 Robert Smith <robertsmith@posteo.net>
|
||||
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
|
||||
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
|
||||
@@ -385,7 +385,7 @@ not have any other specialized device.")
|
||||
(define-public openboard
|
||||
(package
|
||||
(name "openboard")
|
||||
(version "1.7.7")
|
||||
(version "1.7.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -394,7 +394,7 @@ not have any other specialized device.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1i27h84p77pl1chw791fjs3vyzsjvsqc9ky2mbw7g8xpzxz1nd9j"))))
|
||||
(base32 "1098pys5p82sx97xrhw54vlkn6jly0rhq8b09grmmx2h4mcpj2i2"))))
|
||||
(build-system qt-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016, 2017, 2018 Theodoros Foradis <theodoros@foradis.org>
|
||||
;;; Copyright © 2018-2021, 2023 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019 Clément Lassieur <clement@lassieur.org>
|
||||
;;; Copyright © 2018-2019 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2017-2018, 2021, 2023-2024 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2021, 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2021-2023, 2025 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2022, 2023, 2025 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2024 Juliana Sims <juli@incana.org>
|
||||
;;; Copyright © 2025, 2026 Cayetano Santos <csantosb@inventati.org>
|
||||
;;; Copyright © 2025-2026 Sharlatan Hellseher <sharlatanus@gmail.com>
|
||||
;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com>
|
||||
;;; Copyright © 2022 Konstantinos Agiannis <agiannis.kon@gmail.com>
|
||||
;;; Copyright © 2015-2025 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2022, 2024, 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
|
||||
;;; Copyright © 2016, 2018 Danny Milosavljevic <dannym@scratchpost.org>
|
||||
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
|
||||
;;; Copyright © 2019 Amin Bandali <bandali@gnu.org>
|
||||
;;; Copyright © 2020-2025 Vinicius Monego <monego@posteo.net>
|
||||
;;; Copyright © 2021 Andrew Miloradovsky <andrew@interpretmath.pw>
|
||||
@@ -24,22 +24,12 @@
|
||||
;;; Copyright © 2022, 2025 Evgeny Pisemsky <mail@pisemsky.site>
|
||||
;;; Copyright © 2025, Ekaitz Zarraga <ekaitz@elenq.tech>
|
||||
;;; Copyright © 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
|
||||
;;; Copyright © 2018, 2020-2023 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2020, 2023 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
|
||||
;;; Copyright © 2025, 2026 Gabriel Wicki <gabriel@erlikon.ch>
|
||||
;;; Copyright © 2026 Thomas Kramer <thomas@f-si.org>
|
||||
;;; Copyright © 2023 pinoaffe <pinoaffe@gmail.com>
|
||||
;;; Copyright © 2018, 2020-2021 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
|
||||
;;; Copyright © 2025 Greg Hogan <code@greghogan.com>
|
||||
;;; Copyright © 2018 Jonathan Brielmaier <jonathan.brielmaier@web.de>
|
||||
;;; Copyright © 2021 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
|
||||
;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
|
||||
;;; Copyright © 2021-2026 Peter Polidoro <peter@polidoro.io>
|
||||
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
|
||||
;;; Copyright © 2025 Thomas Guillermo Albers Raviola <thomas@thomaslabs.org>
|
||||
;;; Copyright © 2019 Vagrant Cascadian <vagrant@debian.org>
|
||||
;;; Copyright © 2018, 2021 Ludovic Courtès <ludo@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@@ -86,7 +76,6 @@
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages cpp)
|
||||
#:use-module (gnu packages curl)
|
||||
#:use-module (gnu packages databases)
|
||||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages elf)
|
||||
#:use-module (gnu packages embedded)
|
||||
@@ -142,7 +131,6 @@
|
||||
#:use-module (gnu packages readline)
|
||||
#:use-module (gnu packages regex)
|
||||
#:use-module (gnu packages ruby)
|
||||
#:use-module (gnu packages ruby-xyz)
|
||||
#:use-module (gnu packages sdl)
|
||||
#:use-module (gnu packages serialization)
|
||||
#:use-module (gnu packages shells)
|
||||
@@ -157,7 +145,6 @@
|
||||
#:use-module (gnu packages toolkits)
|
||||
#:use-module (gnu packages version-control)
|
||||
#:use-module (gnu packages web)
|
||||
#:use-module (gnu packages wxwidgets)
|
||||
#:use-module (gnu packages xdisorg)
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module (gnu packages xorg))
|
||||
@@ -1066,241 +1053,6 @@ It simulates the netlists of the cells with ngspice and writes the
|
||||
characterization result in a liberty library file.")
|
||||
(license license:agpl3+)))
|
||||
|
||||
(define-public kicad
|
||||
(package
|
||||
(name "kicad")
|
||||
(version "10.0.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/kicad/code/kicad.git")
|
||||
(commit version)))
|
||||
(sha256
|
||||
(base32
|
||||
"1470x1276yvd8li3w25zjg73fkpl2qp4dsx7adanafq5c4l47rmc"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:out-of-source? #t
|
||||
#:tests? #f ;no tests
|
||||
#:build-type "Release"
|
||||
#:configure-flags
|
||||
,#~(list (string-append "-DOCC_INCLUDE_DIR="
|
||||
#$(file-append opencascade-occt
|
||||
"/include/opencascade"))
|
||||
;; Guix uses 'wxwidgets-sans-egl' for KiCad because
|
||||
;; wxWidgets' EGL canvas support breaks with glew-2.2.
|
||||
"-DKICAD_WAYLAND=OFF"
|
||||
"-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE"
|
||||
"-DCMAKE_BUILD_TYPE=RelWithDebInfo")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-ngspice-detection
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "eeschema/CMakeLists.txt"
|
||||
(("NGSPICE_DLL_FILE=\"\\$\\{NGSPICE_DLL_FILE\\}\"")
|
||||
(string-append "NGSPICE_DLL_FILE=\"libngspice.so\""))
|
||||
(("NGSPICE_DLL_DIR=\"\\$\\{NGSPICE_DLL_DIR\\}\"")
|
||||
(string-append "NGSPICE_DLL_DIR=\""
|
||||
(dirname
|
||||
(search-input-file inputs
|
||||
"lib/libngspice.so"))
|
||||
"\"")))))
|
||||
(add-after 'install 'wrap-program
|
||||
;; Ensure correct Python at runtime.
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(python (assoc-ref inputs "python"))
|
||||
(file (string-append out "/bin/kicad"))
|
||||
(path (string-append out "/lib/python"
|
||||
,(version-major+minor (package-version
|
||||
python))
|
||||
"/site-packages:"
|
||||
(getenv "GUIX_PYTHONPATH"))))
|
||||
(wrap-program file
|
||||
`("GUIX_PYTHONPATH" ":" prefix
|
||||
(,path))
|
||||
`("PATH" ":" prefix
|
||||
(,(string-append python "/bin:"))))))))))
|
||||
(native-search-paths
|
||||
;; Currently, KiCad environment variables are single-valued
|
||||
;; (see https://gitlab.com/kicad/code/kicad/-/issues/14792).
|
||||
(list (search-path-specification
|
||||
(variable "KICAD") ;to find kicad-doc
|
||||
(files '(""))
|
||||
(separator #f))
|
||||
(search-path-specification
|
||||
(variable "KICAD10_TEMPLATE_DIR")
|
||||
(files '("share/kicad/template"))
|
||||
(separator #f))
|
||||
(search-path-specification
|
||||
(variable "KICAD10_SYMBOL_DIR")
|
||||
(files '("share/kicad/symbols"))
|
||||
(separator #f))
|
||||
(search-path-specification
|
||||
(variable "KICAD10_FOOTPRINT_DIR")
|
||||
(files '("share/kicad/footprints"))
|
||||
(separator #f))
|
||||
(search-path-specification
|
||||
(variable "KICAD10_3DMODEL_DIR")
|
||||
(files '("share/kicad/3dmodels"))
|
||||
(separator #f))
|
||||
(search-path-specification
|
||||
(variable "KICAD_STOCK_DATA_HOME")
|
||||
(files '("share/kicad"))
|
||||
(separator #f))))
|
||||
(native-inputs (list boost
|
||||
desktop-file-utils
|
||||
gettext-minimal
|
||||
pkg-config
|
||||
swig-4.0
|
||||
unixodbc
|
||||
zlib))
|
||||
(inputs (list bash-minimal
|
||||
cairo
|
||||
curl
|
||||
gdk-pixbuf
|
||||
glew
|
||||
glm
|
||||
hicolor-icon-theme
|
||||
gtk+
|
||||
libgit2
|
||||
libngspice
|
||||
libspnav
|
||||
libsecret
|
||||
libsm
|
||||
mesa
|
||||
nng
|
||||
opencascade-occt
|
||||
openssl
|
||||
poppler
|
||||
protobuf
|
||||
python-wrapper
|
||||
python-wxpython
|
||||
wxwidgets-sans-egl
|
||||
(list zstd "lib")))
|
||||
(home-page "https://www.kicad.org/")
|
||||
(synopsis "Electronics Design Automation Suite")
|
||||
(description
|
||||
"Kicad is a program for the formation of printed circuit
|
||||
boards and electrical circuits. The software has a number of programs that
|
||||
perform specific functions, for example, pcbnew (Editing PCB), eeschema (editing
|
||||
electrical diagrams), gerbview (viewing Gerber files) and others.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public kicad-doc
|
||||
(package
|
||||
(name "kicad-doc")
|
||||
(version (package-version kicad))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/kicad/services/kicad-doc.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1k0ayxsy0nnv9qxkii9yrxs7jx9y3wfjpsv5yl9wql3vdg3qay69"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags (list "-DBUILD_FORMATS=html"
|
||||
"-DLANGUAGES=en")
|
||||
#:tests? #f)) ;no test suite
|
||||
(native-inputs (list asciidoc
|
||||
gettext-minimal
|
||||
git-minimal
|
||||
perl
|
||||
perl-unicode-linebreak
|
||||
perl-yaml-tiny
|
||||
po4a
|
||||
ruby-asciidoctor/minimal
|
||||
source-highlight))
|
||||
(home-page "https://kicad.org")
|
||||
(synopsis "KiCad official documentation")
|
||||
(description "This repository contains the official KiCad documentation.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public kicad-symbols
|
||||
(package
|
||||
(name "kicad-symbols")
|
||||
(version (package-version kicad))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/kicad/libraries/kicad-symbols.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0khfnln0f2zsz5hy31nw2rr0nflb2z3s9n9f7g41g03m9l3s43v2"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs (list python-wrapper))
|
||||
(arguments
|
||||
`(#:tests? #f)) ; no tests exist
|
||||
(home-page (package-home-page kicad))
|
||||
(synopsis "Official KiCad schematic symbol libraries")
|
||||
(description "This package contains the official KiCad schematic symbol
|
||||
libraries.")
|
||||
;; TODO: Exception: "To the extent that the creation of electronic designs
|
||||
;; that use 'Licensed Material' can be considered to be 'Adapted Material',
|
||||
;; then the copyright holder waives article 3 of the license with respect to
|
||||
;; these designs and any generated files which use data provided as part of
|
||||
;; the 'Licensed Material'."
|
||||
;; See <https://github.com/KiCad/kicad-symbols/blob/master/LICENSE.md>.
|
||||
(license license:cc-by-sa4.0)))
|
||||
|
||||
(define-public kicad-footprints
|
||||
(package
|
||||
(inherit kicad-symbols)
|
||||
(name "kicad-footprints")
|
||||
(version (package-version kicad))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/kicad/libraries/kicad-footprints.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0ymmd1rzrczpvcqzw1mld9x8xhbka0vvjy3kdqwysg4ri97f5wrm"))))
|
||||
(synopsis "Official KiCad footprint libraries")
|
||||
(description "This package contains the official KiCad footprint libraries.")))
|
||||
|
||||
(define-public kicad-packages3d
|
||||
(package
|
||||
(inherit kicad-symbols)
|
||||
(name "kicad-packages3d")
|
||||
(version (package-version kicad))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/kicad/libraries/kicad-packages3D.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0k91iw661fpzb7saryjxdcdvk1kis7dhbcpzp7xzjk84i4jvxrp5"))))
|
||||
(synopsis "Official KiCad 3D model libraries")
|
||||
(description "This package contains the official KiCad 3D model libraries.")))
|
||||
|
||||
(define-public kicad-templates
|
||||
(package
|
||||
(inherit kicad-symbols)
|
||||
(name "kicad-templates")
|
||||
(version (package-version kicad))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/kicad/libraries/kicad-templates.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0zs29zn8qjgxv0w1vyr8yxmj02m8752zagn4vcraqgik46dwg2id"))))
|
||||
(synopsis "Official KiCad project and worksheet templates")
|
||||
(description "This package contains the official KiCad project and
|
||||
worksheet templates.")))
|
||||
|
||||
(define-public lepton-eda
|
||||
(package
|
||||
(name "lepton-eda")
|
||||
|
||||
+10
-88
@@ -15153,27 +15153,6 @@ exporter already existing in Org mode. It supports the Github flavored
|
||||
markdown features.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-grip-mode
|
||||
(package
|
||||
(name "emacs-grip-mode")
|
||||
(version "2.5.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/seagle0128/grip-mode")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1mrpmzcxgc9hkv55d6kv79f8y6ldqrf5b48f0a4fy30qlgby2wyz"))))
|
||||
(arguments (list #:tests? #f)) ;no tests
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/seagle0128/grip-mode")
|
||||
(synopsis "Instant GitHub-flavored Markdown/Org preview")
|
||||
(description "Instant GitHub-flavored Markdown/Org preview using
|
||||
@code{grip}, @code{mdopen} or @code{go-grip}.")
|
||||
(license license:gpl3)))
|
||||
|
||||
(define-public emacs-2048-game
|
||||
(package
|
||||
(name "emacs-2048-game")
|
||||
@@ -16996,35 +16975,6 @@ called. If there are more, each window will have its first character
|
||||
highlighted. Pressing that character will switch to that window.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-spatial-window
|
||||
(package
|
||||
(name "emacs-spatial-window")
|
||||
(version "0.9.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/lewang/spatial-window")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "19whlw6p2q6ma20ifkr6iyrhj5l99vj1hv06s7j6j6pvgah27lm4"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:test-command
|
||||
#~(list "emacs" "-Q" "-batch" "-L" "."
|
||||
"-l" "spatial-window-geometry-test.el"
|
||||
"-l" "spatial-window-test.el"
|
||||
"-f" "ert-run-tests-batch-and-exit")))
|
||||
(propagated-inputs (list emacs-posframe))
|
||||
(home-page "https://github.com/lewang/spatial-window")
|
||||
(synopsis "Jump to windows by spatial position")
|
||||
(description
|
||||
"Jump to Emacs windows by pressing keys that match their spatial position
|
||||
on your keyboard.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-windsize
|
||||
;; There is no proper release. The base version is extracted from the
|
||||
;; "Version" keyword in the main file.
|
||||
@@ -17771,29 +17721,6 @@ etc), but also compiling languages (C, C++, Go, Java etc) and markup
|
||||
languages.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-quotable
|
||||
(package
|
||||
(name "emacs-quotable")
|
||||
(version "1.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://codeberg.org/coopi/emacs-quotable")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "00359yljynmk6bqifvfrrradm4na9ap76isibi2d6s4i810szixh"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://codeberg.org/coopi/emacs-quotable")
|
||||
(synopsis "Emacs Lisp client for the Quotable API")
|
||||
(description
|
||||
"This package provides a programmatic interface for the
|
||||
@uref{https://github.com/lukePeavey/quotable, Quotable @acronym{API,
|
||||
Application Programming Interface}}, a free and open-source quotations
|
||||
@acronym{API}.")
|
||||
(license license:agpl3+)))
|
||||
|
||||
(define-public emacs-pkg-info
|
||||
(package
|
||||
(name "emacs-pkg-info")
|
||||
@@ -24509,9 +24436,11 @@ conflicts.")
|
||||
(lambda* (#:key inputs native-inputs #:allow-other-keys)
|
||||
(substitute* "xelb-gen"
|
||||
(("/usr/bin/env") (which "env")))
|
||||
(invoke "make"
|
||||
(format #f "PROTO_PATH=~a/share/xcb"
|
||||
#$(this-package-native-input "xcb-proto"))))))))
|
||||
(let ((xcb-proto #$(this-package-native-input "xcb-proto"))
|
||||
(emacs (search-input-file (or native-inputs inputs)
|
||||
"/bin/emacs")))
|
||||
(invoke "make"
|
||||
(format #f "PROTO_PATH=~a/share/xcb" xcb-proto))))))))
|
||||
(native-inputs (list xcb-proto))
|
||||
(propagated-inputs (list emacs-compat))
|
||||
(home-page "https://github.com/emacs-exwm/xelb")
|
||||
@@ -24608,8 +24537,7 @@ of XELB.")
|
||||
(name "emacs-exwm-no-x-toolkit")
|
||||
(synopsis "Emacs X window manager (without an X toolkit)")
|
||||
(propagated-inputs
|
||||
(modify-inputs propagated-inputs
|
||||
(replace "emacs-xelb" emacs-xelb-no-x-toolkit)))
|
||||
(list emacs-xelb-no-x-toolkit))
|
||||
(arguments
|
||||
(substitute-keyword-arguments arguments
|
||||
((#:emacs emacs) `,emacs-no-x-toolkit)))))
|
||||
@@ -28143,7 +28071,7 @@ match and total match information in the mode-line in various search modes.")
|
||||
(define-public emacs-pg
|
||||
(package
|
||||
(name "emacs-pg")
|
||||
(version "0.63")
|
||||
(version "0.62")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference (url "https://github.com/emarsden/pg-el")
|
||||
@@ -28151,7 +28079,7 @@ match and total match information in the mode-line in various search modes.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"19hh45mlb4j6a3ys3wvivj0bm5xy5vjwscnvn68b656b5jk5himh"))))
|
||||
"0fjzrn5b4s00km71ya98vwwfyvd4rvcywxdxqzy5xfrv8crm92w6"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs (list emacs-peg))
|
||||
(home-page "https://github.com/emarsden/pg-el")
|
||||
@@ -28167,7 +28095,7 @@ end users.")
|
||||
(define-public emacs-pgmacs
|
||||
(package
|
||||
(name "emacs-pgmacs")
|
||||
(version "0.30")
|
||||
(version "0.42")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@@ -28176,7 +28104,7 @@ end users.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0f4mbamk2n9l7qwhi2n1kwvng6wa9yp6k2w1qn6yc07pri2mb6yc"))))
|
||||
"0pf8y64hka1fl47dphmh4xgxiwfsd0g4q2fazq5yc48zwr9nsf02"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
(list emacs-pg))
|
||||
@@ -28185,12 +28113,6 @@ end users.")
|
||||
(home-page "https://github.com/emarsden/pgmacs")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-pgmacs-0.42
|
||||
(package
|
||||
(inherit emacs-pgmacs)
|
||||
(version "0.42")
|
||||
(properties `((superseded . ,emacs-pgmacs)))))
|
||||
|
||||
(define-public emacs-finalize
|
||||
(package
|
||||
(name "emacs-finalize")
|
||||
|
||||
@@ -1505,8 +1505,7 @@ hardware. The utility support USB and UART as serial link.")
|
||||
(apply (assoc-ref cargo:%standard-phases phase)
|
||||
#:cargo-target #$(cargo-triplet)
|
||||
args))
|
||||
'(prepare-rust-crates
|
||||
unpack-rust-crates
|
||||
'(unpack-rust-crates
|
||||
configure
|
||||
check-for-pregenerated-files
|
||||
patch-cargo-checksums)))))))
|
||||
|
||||
+3
-243
@@ -6,7 +6,7 @@
|
||||
;;; Copyright © 2015, 2018, 2023 David Thompson <dthompson2@worcester.edu>
|
||||
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
||||
;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017-2024, 2026 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2017-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2017, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
|
||||
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
|
||||
@@ -29,7 +29,6 @@
|
||||
;;; Copyright © 2026 Nikita Alkhovik <forgoty13@gmail.com>
|
||||
;;; Copyright © 2026 Justin Veilleux <terramorpha@cock.li>
|
||||
;;; Copyright © 2026 Spencer King <spencer.king@wustl.edu>
|
||||
;;; Copyright © 2021–2023, 2026 Liliana Marie Prikler <liliana.prikler@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@@ -3247,14 +3246,14 @@ that compiles to WebAssembly.")
|
||||
(define-public scummvm
|
||||
(package
|
||||
(name "scummvm")
|
||||
(version "2026.2.0")
|
||||
(version "2.9.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://downloads.scummvm.org/frs/scummvm/" version
|
||||
"/scummvm-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1wv0z9c4dnjywgla9zhbkgnzahj829ybvcx9jw67hdmagnbys42f"))))
|
||||
(base32 "1qspqawdazsxisxm1lxzgi0i4gx54qd10xyk3nmmirwxz9mg70ka"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
@@ -4716,245 +4715,6 @@ emulator framework based on QEMU.")
|
||||
(sha256
|
||||
(base32 "0mlfs8qfi0clyncfkbxp6in0cpl747510i6bqymwid43xcirbikz"))))))
|
||||
|
||||
(define-public (aemu-postoffice-source commit sha256-hash)
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/Kethen/aemu_postoffice")
|
||||
(commit commit)))
|
||||
(file-name "aemu-postoffice-source")
|
||||
(sha256 sha256-hash)))
|
||||
|
||||
(define-public (libchdr-source commit sha256-hash)
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/rtissera/libchdr")
|
||||
(commit commit)))
|
||||
(file-name "libchdr-source")
|
||||
(sha256 sha256-hash)))
|
||||
|
||||
(define-public (rcheevos-source commit sha256-hash)
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/RetroAchievements/rcheevos/")
|
||||
(commit commit)))
|
||||
(file-name "rcheevos-source")
|
||||
(sha256 sha256-hash)))
|
||||
|
||||
(define-public ppsspp
|
||||
(package
|
||||
(name "ppsspp")
|
||||
(version "1.20.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/hrydgard/ppsspp")
|
||||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32 "186d2jc6h6xmiqnrifq4xcw0g3fv1slcnvs5mzzxcnfk7ljr6r6p"))
|
||||
(file-name (git-file-name name version))
|
||||
(patches
|
||||
(search-patches "ppsspp-disable-upgrade-and-gold.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
`(begin
|
||||
;; The following is quite a heavy-handed way of unbundling PPSSPP.
|
||||
;; There are still a number of external sources, that we don't
|
||||
;; remove here. Some may be packaged, others are not.
|
||||
;; First, we patch existing sources to include the right headers.
|
||||
(substitute* (append (find-files "Common" ".*\\.(h|cpp)")
|
||||
(find-files "Core" ".*\\.(h|cpp)")
|
||||
(find-files "GPU" ".*\\.(h|cpp)")
|
||||
(find-files "SDL" ".*\\.(h|cpp)")
|
||||
(find-files "UI" ".*\\.(h|cpp)"))
|
||||
;; These headers are all hard-coded in the original source.
|
||||
(("ext/cityhash/") "")
|
||||
(("ext/cpu_features/include/") "cpu_features/")
|
||||
(("ext/glslang/glslang/") "glslang/")
|
||||
(("ext/glslang/") "glslang/")
|
||||
(("ext/miniupnp/") "")
|
||||
(("ext/nanosvg/src") "nanosvg")
|
||||
(("ext/rapidjson/include/") "")
|
||||
(("ext/SPIRV-Cross/") "spirv_cross/")
|
||||
(("ext/vulkan/") "vulkan/")
|
||||
(("ext/xxhash.h") "xxhash.h")
|
||||
;; These definitions do not actually exist in the Vulkan headers,
|
||||
;; but PPSSPP defines them in ext/vulkan.
|
||||
(("VK_FORMAT_BEGIN_RANGE") "VK_FORMAT_UNDEFINED")
|
||||
(("VK_FORMAT_END_RANGE") "VK_FORMAT_ASTC_12x12_SRGB_BLOCK"))
|
||||
;; Next, we patch CMakeLists.
|
||||
(substitute* "CMakeLists.txt"
|
||||
;; Drop unnecessary includes and targets.
|
||||
(("include_directories\\(ext/glslang\\)") "")
|
||||
(("target_include_directories\\(.*ext/xxhash\\)") "")
|
||||
(("target_include_directories\\(.*ext/cityhash\\)") "")
|
||||
(("set_target_properties\\(cityhash .*\\)") "")
|
||||
(("target_compile_options\\(cityhash .*\\)") "")
|
||||
;; Fix linking to GLEW.
|
||||
(("TARGET Ext::GLEW") "true")
|
||||
(("target_link_libraries\\((Common|native) Ext::GLEW\\)" all lib)
|
||||
(string-append "find_package(GLEW)\n"
|
||||
"target_link_libraries(" lib " GLEW::GLEW)"))
|
||||
(("Ext::Snappy") "snappy")
|
||||
(("OGLCompiler") "")
|
||||
(("OSDependent") "")
|
||||
;; Don't search for cityhash/xxhash, we already have them.
|
||||
(("add_library\\((city|xx)hash STATIC") "if()\nendif(")
|
||||
(("ext/xxhash\\.[ch]") "")
|
||||
(("ext/cityhash/.*\\.(cpp|h)") "")
|
||||
;; Drop remaining references to GOLD.
|
||||
(("UI/IAPScreen\\.(cpp|h)") "")
|
||||
;; Link all of spirv-cross.
|
||||
(("spirv-cross-glsl" all)
|
||||
(string-append all
|
||||
" spirv-cross-core spirv-cross-cpp"
|
||||
" spirv-cross-reflect spirv-cross-util")))
|
||||
(substitute* "ext/CMakeLists.txt"
|
||||
(("add_subdirectory\\(cmake.*") "")
|
||||
(("add_subdirectory\\(freetype.*") "")
|
||||
(("add_subdirectory\\(glew.*") "")
|
||||
(("add_subdirectory\\(glslang.*") "")
|
||||
(("add_subdirectory\\(snappy.*") "")
|
||||
(("add_subdirectory\\(SPIRV-Cross-build.*") "")
|
||||
(("add_subdirectory\\(zstd.*") ""))
|
||||
;; Finally, we can delete the bundled sources…
|
||||
(for-each delete-file-recursively
|
||||
'("ext/cmake"
|
||||
"ext/glew"
|
||||
"ext/glslang" "ext/glslang-build"
|
||||
"ext/miniupnp" "ext/miniupnp-build"
|
||||
"ext/native"
|
||||
"ext/snappy"
|
||||
"ext/SPIRV-Cross" "ext/SPIRV-Cross-build"
|
||||
"ext/vulkan"
|
||||
"ext/xxhash.c"
|
||||
"ext/xxhash.h"
|
||||
"ext/zlib"
|
||||
"ext/zstd"))
|
||||
;; … as well as the remaining files referencing GOLD.
|
||||
(for-each delete-file
|
||||
'("UI/IAPScreen.cpp"
|
||||
"UI/IAPScreen.h"
|
||||
"ios/IAPManager.mm"
|
||||
"ios/IAPManager.h"))
|
||||
;; Since we are not including git as an input, PPSSPP is confused
|
||||
;; about its version. Let's fix that here.
|
||||
(substitute* "git-version.cmake"
|
||||
(("unknown") ,version))))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:out-of-source? #f
|
||||
#:configure-flags #~(list "-DARMIPS_USE_STD_FILESYSTEM=ON" ; from armips
|
||||
"-DUSE_DISCORD=OFF"
|
||||
"-DUSE_SYSTEM_FFMPEG=ON"
|
||||
"-DUSE_SYSTEM_LIBZIP=ON"
|
||||
"-DUSE_SYSTEM_MINIUPNPC=ON"
|
||||
"-DUSE_SYSTEM_ZSTD=ON"
|
||||
;; for testing
|
||||
"-DUNITTEST=ON" "-DHEADLESS=ON")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'set-paths 'add-sdl-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(setenv "CPLUS_INCLUDE_PATH"
|
||||
(string-append
|
||||
(dirname (search-input-file inputs
|
||||
"include/SDL2/SDL.h"))
|
||||
":"
|
||||
(getenv "CPLUS_INCLUDE_PATH")))))
|
||||
(add-after 'unpack 'add-external-sources
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; TODO: unbundle armips.
|
||||
(copy-recursively #$(package-source armips) "ext/armips")
|
||||
;; XXX: Lua 5.4 is missing lapi.h, so we have to bundle it 😫
|
||||
(with-directory-excursion "ext/lua"
|
||||
(invoke "tar" "xvf" #$(package-source lua-5.4)
|
||||
"--strip-components=2"))
|
||||
(copy-recursively
|
||||
#$(this-package-native-input "aemu-postoffice-source")
|
||||
"ext/aemu_postoffice")
|
||||
;; No public release, leave bundled for now.
|
||||
(copy-recursively
|
||||
#$(this-package-native-input "libchdr-source")
|
||||
"ext/libchdr")
|
||||
;; TODO: Unbundle rcheevos.
|
||||
(copy-recursively
|
||||
#$(this-package-native-input "rcheevos-source")
|
||||
"ext/rcheevos")))
|
||||
(add-after 'unpack 'fix-shader
|
||||
(lambda _
|
||||
(substitute* (find-files "Common/GPU/" "\\.cpp$")
|
||||
(("#include \"glslang/SPIRV/GlslangToSpv\\.h\"" all)
|
||||
(string-append "#include <glslang/Public/ShaderLang.h>\n"
|
||||
all)))))
|
||||
(replace 'install
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin/ppsspp (string-append out "/bin/ppsspp"))
|
||||
(share (string-append out "/share/ppsspp")))
|
||||
(copy-recursively "icons/hicolor"
|
||||
(string-append out "/share/icons/hicolor"))
|
||||
(install-file "PPSSPPSDL" share)
|
||||
(copy-recursively "assets" (string-append share "/assets"))
|
||||
|
||||
(make-desktop-entry-file
|
||||
(string-append out "/share/applications/ppsspp.desktop")
|
||||
#:name "PPSSPP"
|
||||
#:exec (string-append share "/PPSSPPSDL")
|
||||
#:icon "ppsspp")
|
||||
(mkdir-p (string-append out "/bin"))
|
||||
(with-output-to-file bin/ppsspp
|
||||
(lambda ()
|
||||
(format #t "#!~a~%exec ~a/PPSSPPSDL \"$@\""
|
||||
(search-input-file inputs "/bin/bash") share)))
|
||||
(chmod bin/ppsspp #o755)))))))
|
||||
(native-inputs
|
||||
(list pkg-config python
|
||||
(package-source lua-5.4)
|
||||
(aemu-postoffice-source
|
||||
"2026-03-16"
|
||||
(base32 "072w3jf87s8b00kp8nvscrggn1wq7nv37xfm527h2rg2sm57irp3"))
|
||||
(libchdr-source
|
||||
"8bba7745d758627258b315997a860039244cedaf"
|
||||
(base32 "05syp2mk6m9mdvg7qq0wd612apps615x71kv6im9pxd2f76k1wy3"))
|
||||
(rcheevos-source
|
||||
"v12.3.0"
|
||||
(base32 "09h9n7znl2ajkicshv4scawjb9zz3v9aka8986j9sg5y02a4h3wf"))))
|
||||
(inputs (list bash
|
||||
cityhash
|
||||
cpu-features
|
||||
ffmpeg
|
||||
glew
|
||||
glslang
|
||||
libpng
|
||||
libzip
|
||||
;; lua-5.4
|
||||
mesa
|
||||
miniupnpc
|
||||
nanosvg
|
||||
openxr
|
||||
rapidjson
|
||||
sdl2
|
||||
sdl2-ttf
|
||||
snappy
|
||||
spirv-cross
|
||||
vulkan-headers
|
||||
vulkan-loader
|
||||
wayland
|
||||
xxhash
|
||||
zlib
|
||||
`(,zstd "lib")))
|
||||
(home-page "https://www.ppsspp.org/")
|
||||
(synopsis "PSP emulator")
|
||||
(description
|
||||
"PPSSPP is a ``high-level'' emulator simulating the PSP operating
|
||||
system.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public exomizer
|
||||
(package
|
||||
(name "exomizer")
|
||||
|
||||
+239
-11
@@ -135,7 +135,6 @@
|
||||
#:use-module (gnu packages imagemagick)
|
||||
#:use-module (gnu packages javascript)
|
||||
#:use-module (gnu packages jupyter)
|
||||
#:use-module (gnu packages icu4c)
|
||||
#:use-module (gnu packages kde-frameworks)
|
||||
#:use-module (gnu packages libcanberra)
|
||||
#:use-module (gnu packages libevent)
|
||||
@@ -999,6 +998,233 @@ The viewer can be used interactively with a REPL (for example Geiser in
|
||||
Emacs).")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public kicad
|
||||
(package
|
||||
(name "kicad")
|
||||
(version "9.0.8")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/kicad/code/kicad.git")
|
||||
(commit version)))
|
||||
(sha256
|
||||
(base32
|
||||
"1b995p0qb9cjpj0n3x3szbqr6d7fxwmrp2nbx37y7ym2bc1lpxd8"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:out-of-source? #t
|
||||
#:tests? #f ;no tests
|
||||
#:build-type "Release"
|
||||
#:configure-flags
|
||||
,#~(list "-DKICAD_SCRIPTING_PYTHON3=ON"
|
||||
(string-append "-DOCC_INCLUDE_DIR="
|
||||
#$(this-package-input "opencascade-occt")
|
||||
"/include/opencascade")
|
||||
"-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON"
|
||||
"-DKICAD_USE_EGL=OFF"
|
||||
"-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE"
|
||||
"-DCMAKE_BUILD_TYPE=RelWithDebInfo")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-ngspice-detection
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "eeschema/CMakeLists.txt"
|
||||
(("NGSPICE_DLL_FILE=\"\\$\\{NGSPICE_DLL_FILE\\}\"")
|
||||
(string-append "NGSPICE_DLL_FILE=\""
|
||||
(assoc-ref inputs "libngspice")
|
||||
"/lib/libngspice.so\"")))))
|
||||
(add-after 'install 'wrap-program
|
||||
;; Ensure correct Python at runtime.
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(python (assoc-ref inputs "python"))
|
||||
(file (string-append out "/bin/kicad"))
|
||||
(path (string-append out "/lib/python"
|
||||
,(version-major+minor (package-version
|
||||
python))
|
||||
"/site-packages:"
|
||||
(getenv "GUIX_PYTHONPATH"))))
|
||||
(wrap-program file
|
||||
`("GUIX_PYTHONPATH" ":" prefix
|
||||
(,path))
|
||||
`("PATH" ":" prefix
|
||||
(,(string-append python "/bin:"))))))))))
|
||||
(native-search-paths
|
||||
;; Currently, KiCad environment variables are single-valued
|
||||
;; (see https://gitlab.com/kicad/code/kicad/-/issues/14792).
|
||||
(list (search-path-specification
|
||||
(variable "KICAD") ;to find kicad-doc
|
||||
(files '(""))
|
||||
(separator #f))
|
||||
(search-path-specification
|
||||
(variable "KICAD9_TEMPLATE_DIR")
|
||||
(files '("share/kicad/template"))
|
||||
(separator #f))
|
||||
(search-path-specification
|
||||
(variable "KICAD9_SYMBOL_DIR")
|
||||
(files '("share/kicad/symbols"))
|
||||
(separator #f))
|
||||
(search-path-specification
|
||||
(variable "KICAD9_FOOTPRINT_DIR")
|
||||
(files '("share/kicad/footprints"))
|
||||
(separator #f))
|
||||
(search-path-specification
|
||||
(variable "KICAD9_3DMODEL_DIR")
|
||||
(files '("share/kicad/3dmodels"))
|
||||
(separator #f))
|
||||
(search-path-specification
|
||||
(variable "KICAD_STOCK_DATA_HOME")
|
||||
(files '("share/kicad"))
|
||||
(separator #f))))
|
||||
(native-inputs (list boost
|
||||
desktop-file-utils
|
||||
gettext-minimal
|
||||
pkg-config
|
||||
swig-4.0
|
||||
unixodbc
|
||||
zlib))
|
||||
(inputs (list bash-minimal
|
||||
cairo
|
||||
curl
|
||||
glew
|
||||
glm
|
||||
hicolor-icon-theme
|
||||
libngspice
|
||||
libsm
|
||||
libgit2
|
||||
libsecret
|
||||
mesa
|
||||
opencascade-occt
|
||||
openssl
|
||||
python-wrapper
|
||||
gtk+
|
||||
wxwidgets-sans-egl
|
||||
nng
|
||||
python-wxpython
|
||||
protobuf
|
||||
gdk-pixbuf
|
||||
(list zstd "lib")))
|
||||
(home-page "https://www.kicad.org/")
|
||||
(synopsis "Electronics Design Automation Suite")
|
||||
(description
|
||||
"Kicad is a program for the formation of printed circuit
|
||||
boards and electrical circuits. The software has a number of programs that
|
||||
perform specific functions, for example, pcbnew (Editing PCB), eeschema (editing
|
||||
electrical diagrams), gerbview (viewing Gerber files) and others.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public kicad-doc
|
||||
(package
|
||||
(name "kicad-doc")
|
||||
(version (package-version kicad))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/kicad/services/kicad-doc.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"07g80p1igp8j3kh3qpmqd150i9950w1143yhncwik2ypccwjdfjy"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags (list "-DBUILD_FORMATS=html")
|
||||
#:tests? #f)) ;no test suite
|
||||
(native-inputs (list asciidoc
|
||||
gettext-minimal
|
||||
git-minimal
|
||||
perl
|
||||
perl-unicode-linebreak
|
||||
perl-yaml-tiny
|
||||
po4a
|
||||
ruby-asciidoctor/minimal
|
||||
source-highlight))
|
||||
(home-page "https://kicad.org")
|
||||
(synopsis "KiCad official documentation")
|
||||
(description "This repository contains the official KiCad documentation.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public kicad-symbols
|
||||
(package
|
||||
(name "kicad-symbols")
|
||||
(version (package-version kicad))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/kicad/libraries/kicad-symbols.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"08qb4rqxsyhrcvj1k200m2c06jjy7jwjmf9n1qkcm0biqqc5dba4"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ; no tests exist
|
||||
(home-page (package-home-page kicad))
|
||||
(synopsis "Official KiCad schematic symbol libraries")
|
||||
(description "This package contains the official KiCad schematic symbol
|
||||
libraries.")
|
||||
;; TODO: Exception: "To the extent that the creation of electronic designs
|
||||
;; that use 'Licensed Material' can be considered to be 'Adapted Material',
|
||||
;; then the copyright holder waives article 3 of the license with respect to
|
||||
;; these designs and any generated files which use data provided as part of
|
||||
;; the 'Licensed Material'."
|
||||
;; See <https://github.com/KiCad/kicad-symbols/blob/master/LICENSE.md>.
|
||||
(license license:cc-by-sa4.0)))
|
||||
|
||||
(define-public kicad-footprints
|
||||
(package
|
||||
(inherit kicad-symbols)
|
||||
(name "kicad-footprints")
|
||||
(version (package-version kicad))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/kicad/libraries/kicad-footprints.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1w7dkb93s84ymi1syxpzacbmkxlnlh0k4z1c62nabspb901nn524"))))
|
||||
(synopsis "Official KiCad footprint libraries")
|
||||
(description "This package contains the official KiCad footprint libraries.")))
|
||||
|
||||
(define-public kicad-packages3d
|
||||
(package
|
||||
(inherit kicad-symbols)
|
||||
(name "kicad-packages3d")
|
||||
(version (package-version kicad))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/kicad/libraries/kicad-packages3D.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1j26dmgz7xfixlqrzclb1wpc6zkd10n1fq7rmdrgwwx083p3c7a8"))))
|
||||
(synopsis "Official KiCad 3D model libraries")
|
||||
(description "This package contains the official KiCad 3D model libraries.")))
|
||||
|
||||
(define-public kicad-templates
|
||||
(package
|
||||
(inherit kicad-symbols)
|
||||
(name "kicad-templates")
|
||||
(version (package-version kicad))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/kicad/libraries/kicad-templates.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0zs29zn8qjgxv0w1vyr8yxmj02m8752zagn4vcraqgik46dwg2id"))))
|
||||
(synopsis "Official KiCad project and worksheet templates")
|
||||
(description "This package contains the official KiCad project and
|
||||
worksheet templates.")))
|
||||
|
||||
(define-public librseq
|
||||
;; There's no release.
|
||||
(let ((commit "c3ed6b64bbe1944bd8de8b9fde14e7c290f02a90")
|
||||
@@ -2721,17 +2947,16 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly workbench.")
|
||||
(define-public freecad
|
||||
(package
|
||||
(name "freecad")
|
||||
(version "1.1.0")
|
||||
(version "1.0.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/FreeCAD/FreeCAD")
|
||||
(commit version)
|
||||
(recursive? #t))) ;needed for the AddonManager
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "029ndw1dypx0xhs4fyiinf7gpk8am0vm9b24idvdsx9x7ghrqz4j"))
|
||||
(base32 "1zyz473fzrz9h073wp4k65qq4bkhqsp245nsv6nv186sl78l99xa"))
|
||||
(snippet
|
||||
#~(begin
|
||||
(use-modules (guix build utils))
|
||||
@@ -2748,7 +2973,7 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly workbench.")
|
||||
#:configure-flags
|
||||
#~(list
|
||||
"-DBUILD_FLAT_MESH:BOOL=ON"
|
||||
"-DBUILD_ENABLE_CXX_STD:STRING=C++20" ; FreeCAD 1.1 requires C++20
|
||||
"-DBUILD_ENABLE_CXX_STD:STRING=C++17"
|
||||
"-DENABLE_DEVELOPER_TESTS=OFF" ;; see the above: #:tests? comment
|
||||
"-DFREECAD_QT_VERSION=6" ;; Build with Qt6
|
||||
"-DFREECAD_USE_EXTERNAL_ONDSELSOLVER=ON" ;; unbundle ondsel-solver
|
||||
@@ -2770,13 +2995,12 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly workbench.")
|
||||
(list c++-gsl
|
||||
doxygen
|
||||
graphviz
|
||||
pybind11
|
||||
qttools
|
||||
pkg-config
|
||||
swig-4.4))
|
||||
swig-4.0))
|
||||
(inputs
|
||||
(list bash-minimal
|
||||
boost
|
||||
boost-1.83
|
||||
coin3d
|
||||
double-conversion
|
||||
eigen
|
||||
@@ -2786,7 +3010,6 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly workbench.")
|
||||
gl2ps
|
||||
glew
|
||||
hdf5-1.10
|
||||
icu4c
|
||||
jsoncpp
|
||||
libarea
|
||||
libjpeg-turbo
|
||||
@@ -2809,11 +3032,13 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly workbench.")
|
||||
python-ply
|
||||
python-pyside-6
|
||||
python-pyyaml
|
||||
python-shiboken-6
|
||||
python-wrapper
|
||||
qtsvg
|
||||
qtwebchannel
|
||||
qtwebengine
|
||||
qtwayland
|
||||
qtx11extras
|
||||
sqlite
|
||||
onetbb ;same version as opencascade-occt
|
||||
vtk-9.5
|
||||
@@ -3986,10 +4211,13 @@ G-codes to binary and vice versa.")
|
||||
openvdb
|
||||
pango
|
||||
prusa-libbgcode
|
||||
wxwidgets
|
||||
;; XXX: Using Prusa wxWidgets fork as PrusaSlicer segfaults when compiled
|
||||
;; with regular wxwidgets.
|
||||
prusa-wxwidgets
|
||||
qhull
|
||||
onetbb
|
||||
webkitgtk-for-gtk3
|
||||
webkitgtk-with-libsoup2
|
||||
z3
|
||||
zlib))
|
||||
(home-page "https://www.prusa3d.com/prusaslicer/")
|
||||
|
||||
@@ -88,7 +88,6 @@
|
||||
#:use-module (gnu packages golang-build)
|
||||
#:use-module (gnu packages golang-check)
|
||||
#:use-module (gnu packages golang-crypto)
|
||||
#:use-module (gnu packages golang-web)
|
||||
#:use-module (gnu packages golang-xyz)
|
||||
#:use-module (gnu packages guile)
|
||||
#:use-module (gnu packages haskell-xyz)
|
||||
@@ -428,7 +427,7 @@ ones.")
|
||||
(define-public fsarchiver
|
||||
(package
|
||||
(name "fsarchiver")
|
||||
(version "0.8.9")
|
||||
(version "0.8.7")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -438,10 +437,10 @@ ones.")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0wyq140yzhhqzg364ai7m21z2kgvyi6dmqlw5ycblryf0zkvd7vq"))))
|
||||
(base32 "1vy8ay0fn32i298bx9scqghi7xm9z2101zxk5xshbrkl00b2m4nm"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list autoconf-2.72 automake pkg-config))
|
||||
(list autoconf automake pkg-config))
|
||||
(inputs
|
||||
(list bzip2
|
||||
e2fsprogs
|
||||
@@ -762,7 +761,7 @@ from a mounted file system.")
|
||||
;; completions by running a native bcachefs binary at build time.
|
||||
(package
|
||||
(name "bcachefs-tools-minimal")
|
||||
(version "1.37.4")
|
||||
(version "1.35.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -771,7 +770,7 @@ from a mounted file system.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "17041jphzbg0ppxlc1acr3d73zyn02spjvi5my30wak8xh9n6nan"))))
|
||||
(base32 "1jn7fqlvhr0iazfx31wamvmf3qmgrzlf9ghvz8qazk8b6ipv77fn"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
(list
|
||||
@@ -969,13 +968,20 @@ minimal bcachefs-tools package. It is meant to be used in initrds.")
|
||||
(define-public bcachefs-linux-module
|
||||
(package
|
||||
(name "bcachefs-linux-module")
|
||||
(version (package-version bcachefs-tools-minimal))
|
||||
(source (package-source bcachefs-tools-minimal))
|
||||
(version "1.35.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://evilpiepirate.org/git/bcachefs-tools.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1jn7fqlvhr0iazfx31wamvmf3qmgrzlf9ghvz8qazk8b6ipv77fn"))))
|
||||
(build-system linux-module-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:make-flags #~(list "BCACHEFS_DKMS=1")
|
||||
#:tests? #f ;no 'check' target
|
||||
#:tests? #f ;no 'check' target
|
||||
#:source-directory "build/src/fs/bcachefs"
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
@@ -984,14 +990,18 @@ minimal bcachefs-tools package. It is meant to be used in initrds.")
|
||||
(with-output-to-file ".version"
|
||||
(lambda ()
|
||||
(display #$version)))))
|
||||
(add-before 'configure 'prepare-build-directory
|
||||
(lambda* (#:key make-flags #:allow-other-keys)
|
||||
(apply invoke "make" "install_dkms"
|
||||
(string-append "DESTDIR="
|
||||
(getcwd) "/")
|
||||
"DKMSDIR=build/"
|
||||
make-flags))))))
|
||||
(home-page (package-home-page bcachefs-tools-minimal))
|
||||
(add-after 'unpack 'patch-source
|
||||
(lambda _
|
||||
(substitute* "Makefile"
|
||||
;; Remove unnecessary dependencies
|
||||
(("^.*PKG_CONFIG.*$")
|
||||
""))))
|
||||
(add-before 'configure 'prepare-build-dir
|
||||
(lambda _
|
||||
(invoke "make" "install_dkms"
|
||||
(string-append "DESTDIR="
|
||||
(getcwd) "/") "DKMSDIR=build/"))))))
|
||||
(home-page (package-home-page bcachefs-tools-minimal/static))
|
||||
(synopsis "Bcachefs Linux kernel module")
|
||||
(description
|
||||
"This package provides the Linux kernel module for Bcachefs.
|
||||
@@ -2130,75 +2140,6 @@ the XDG directory specification from @file{~/.@var{name}} to
|
||||
@file{~/.config/@var{name}}.")
|
||||
(license license:gpl2+))))
|
||||
|
||||
(define-public s5cmd
|
||||
(package
|
||||
(name "s5cmd")
|
||||
(version "2.3.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/peak/s5cmd")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1y1bwma6f68j00jfdjxvw5flp9l4cdys7dgkrr0yvfz68lk9a17v"))
|
||||
(snippet
|
||||
#~(begin (use-modules (guix build utils))
|
||||
(delete-file-recursively "vendor")))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:install-source? #f
|
||||
#:import-path "github.com/peak/s5cmd/v2"
|
||||
#:test-flags
|
||||
#~(list "-vet=off"
|
||||
;; cp_test.go:74: assertion failed: text/plain; charset=utf-8
|
||||
;; (tc.expectedContentType string) != text/html; charset=utf-8
|
||||
;; (string)
|
||||
"-skip" "TestGuessContentType")
|
||||
#:test-subdirs
|
||||
;; build flag -mod=vendor only valid when using modules
|
||||
;; /<...>/peak/s5cmd/v2/e2e/util_test.go:417 +0x3b9
|
||||
;; /<...>/peak/s5cmd/v2/e2e/main_test.go:12 +0x65
|
||||
#~(list "command/..."
|
||||
"orderedwriter/..."
|
||||
"progressbar/..."
|
||||
"storage/..."
|
||||
"storage/url/..."
|
||||
"strutil/...")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'install 'rename-binaries
|
||||
(lambda _
|
||||
(rename-file
|
||||
(string-append #$output "/bin/v2")
|
||||
(string-append #$output "/bin/s5cmd")))))))
|
||||
(native-inputs
|
||||
(list go-github-com-aws-aws-sdk-go
|
||||
go-github-com-cheggaaa-pb-v3
|
||||
go-github-com-google-go-cmp
|
||||
go-github-com-hashicorp-go-multierror
|
||||
go-github-com-iancoleman-strcase
|
||||
go-github-com-igungor-gofakes3
|
||||
go-github-com-karrick-godirwalk
|
||||
go-github-com-kballard-go-shellquote
|
||||
go-github-com-lanrat-extsort-1.0.2
|
||||
go-github-com-termie-go-shutil
|
||||
go-github-com-urfave-cli-v2
|
||||
go-go-uber-org-mock
|
||||
go-gotest-tools-v3
|
||||
go-honnef-co-go-tools
|
||||
go-mvdan-cc-unparam))
|
||||
(home-page "https://github.com/peak/s5cmd")
|
||||
(synopsis "Parallel S3 and local filesystem execution tool")
|
||||
(description
|
||||
"@code{s5cmd} is a fast S3 and local filesystem execution tool. It comes
|
||||
with support for a multitude of operations including tab completion and
|
||||
wildcard support for files, which can be handy for object storage workflow
|
||||
while working with large number of files.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public squashfuse
|
||||
(package
|
||||
(name "squashfuse")
|
||||
|
||||
@@ -766,7 +766,7 @@ require Coincurve.")
|
||||
(define-public electrum
|
||||
(package
|
||||
(name "electrum")
|
||||
(version "4.7.2")
|
||||
(version "4.7.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -775,7 +775,7 @@ require Coincurve.")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "05y3w9jhpfxd7frzlilqvsfggrgfzcml2spc2qb5xx9j4q62hnmx"))))
|
||||
(base32 "171jbap3khzwkyxg730sasfj01qiip396sgyiwr1i6yq5fxd23pi"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
||||
@@ -3847,7 +3847,7 @@ arrows and custom ligatures for @code{TODO:} and @code{NOTE:}.")
|
||||
(define-public font-monaspace
|
||||
(package
|
||||
(name "font-monaspace")
|
||||
(version "1.400")
|
||||
(version "1.301")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -3857,7 +3857,7 @@ arrows and custom ligatures for @code{TODO:} and @code{NOTE:}.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1rldcci0nh5zqqcmj8mfqsv7c8bqy2nxgfn8gk4zsxvgdbxa79vk"))))
|
||||
"0f6i9v2m7x5zjdfwmcj180nmgxzlnbk2z0x7yv5sbdcrvndz1lzj"))))
|
||||
(build-system font-build-system)
|
||||
(outputs '("out" "ttf" "woff"))
|
||||
(home-page "https://monaspace.githubnext.com")
|
||||
|
||||
@@ -1150,60 +1150,6 @@ GNOME Shell. The @command{localectl} command-line tool allows you to interact
|
||||
with localed. This package is extracted from the broader systemd package.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public gardenhostd
|
||||
(package
|
||||
(name "gardenhostd")
|
||||
(version "1.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://codeberg.org/axtlos/gardenhostd.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1q0pdh0imc2ggb26cddl62hx6fmz6z4hqj2352a4k9wxyn5kfiam"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:imported-modules `(,@%meson-build-system-modules
|
||||
,@%pyproject-build-system-modules)
|
||||
#:modules '(((guix build pyproject-build-system) #:prefix pyproject:)
|
||||
(guix build meson-build-system)
|
||||
(guix build utils))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'install 'remove-extra-files
|
||||
(lambda _
|
||||
(with-directory-excursion #$output
|
||||
(delete-file-recursively "etc/init.d")
|
||||
(rmdir "etc"))))
|
||||
;; See <https://codeberg.org/guix/guix/issues/7579>.
|
||||
(add-after 'install 'wrap-search-paths
|
||||
(lambda _
|
||||
(wrap-program (string-append #$output "/libexec/gardenhostd")
|
||||
`("GUIX_PYTHONPATH" prefix
|
||||
,(map
|
||||
(lambda (package)
|
||||
(string-append
|
||||
package "/lib/python"
|
||||
(pyproject:python-version #$(this-package-input "python"))
|
||||
"/site-packages"))
|
||||
;; Avoids references to meson’s libraries.
|
||||
(list #$(this-package-input "python")
|
||||
#$(this-package-input "python-pygobject"))))))))))
|
||||
(inputs
|
||||
(list bash-minimal
|
||||
python
|
||||
python-pygobject))
|
||||
(home-page "https://codeberg.org/axtlos/gardenhostd")
|
||||
(synopsis "Minimal Python implementation of systemd-hostnamed")
|
||||
(description "This package is a partial implementation of the
|
||||
systemd-hostnamed daemon. It provides the @code{org.freedesktop.hostname1}
|
||||
D-Bus interface, which helps applications like GNOME Settings retrieve and
|
||||
modify the system’s hostname, as well as set a pretty hostname for display.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public packagekit
|
||||
(package
|
||||
(name "packagekit")
|
||||
@@ -1511,7 +1457,7 @@ fullscreen) or other display servers.")
|
||||
(define-public wayland-protocols
|
||||
(package
|
||||
(name "wayland-protocols")
|
||||
(version "1.47")
|
||||
(version "1.45")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@@ -1520,7 +1466,7 @@ fullscreen) or other display servers.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0i30fp6p03qrvv4msm9yj39sk6gmcryp3q6x29v2wycbv27wsgmw"))))
|
||||
"1d2fv41vq75pvgkd3ykjypnp8zv0afv71p36cd91h19lbmwaia8h"))))
|
||||
(build-system meson-build-system)
|
||||
(inputs
|
||||
(list wayland))
|
||||
@@ -2916,7 +2862,7 @@ to the C library @code{uchardet} to increase performance.")
|
||||
(define-public udiskie
|
||||
(package
|
||||
(name "udiskie")
|
||||
(version "2.6.2")
|
||||
(version "2.6.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -2925,7 +2871,7 @@ to the C library @code{uchardet} to increase performance.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0zc23yf2sw1m21xkfbpfjzbp7xykqjwq56fr2nxzlc02n7g6iqgk"))))
|
||||
(base32 "0ngr8sdzd32mxamzfh82ar8m40z52lx91339b7dq3in0cr5r1ynp"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
||||
+43
-73
@@ -30,7 +30,7 @@
|
||||
;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
|
||||
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
|
||||
;;; Copyright © 2017-2026 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2017-2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2018 okapi <okapi@firemail.cc>
|
||||
;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
|
||||
;;; Copyright © 2018 Madalin Ionel-Patrascu <madalinionel.patrascu@mdc-berlin.de>
|
||||
@@ -3964,7 +3964,7 @@ that beneath its ruins lay buried an ancient evil.")
|
||||
(define-public angband
|
||||
(package
|
||||
(name "angband")
|
||||
(version "4.2.6")
|
||||
(version "4.2.5")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -3973,7 +3973,7 @@ that beneath its ruins lay buried an ancient evil.")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0hgzdvlh0j42w4q9kch9xvhnbvcrypac01xhpksw35gj9my887cp"))
|
||||
(base32 "0kg6npbfy42mhggsqvs04khc8198i980z52xm59pws29698qazaw"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; So, some of the sounds/graphics/tilesets are under different
|
||||
@@ -3989,55 +3989,12 @@ that beneath its ruins lay buried an ancient evil.")
|
||||
(substitute* "lib/Makefile"
|
||||
;; And don't try to invoke makefiles in the directories we removed.
|
||||
(("gamedata customize help screens fonts tiles sounds icons user")
|
||||
"gamedata customize help screens user"))
|
||||
;; Remove nonfree .dll files too.
|
||||
(delete-file-recursively "src/win")))))
|
||||
"gamedata customize help screens user"))))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags (list (string-append "--bindir=" %output "/bin"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'fix-infinite-loop-on-sighup
|
||||
;; XXX Release 4.2.6 has a major bug where sending the process a
|
||||
;; SIGHUP when closing the terminal causes it to infinite loop
|
||||
;; waiting for input: https://github.com/angband/angband/issues/6558
|
||||
;; Reevaluate for future versions.
|
||||
(lambda _
|
||||
(substitute* "src/ui-signals.c"
|
||||
(("(SIGHUP, )SIG_IGN" _ first)
|
||||
(string-append first "handle_signal_abort")))))
|
||||
(add-before 'check 'skip-failing-tests
|
||||
(lambda _
|
||||
(let ((to-skip '(;; some of these may be fixable, but most try to
|
||||
;; create a directory in the user's home directory.
|
||||
;; Rather than reading environment variables, they
|
||||
;; lookup the username using getpwnam(3) and manually
|
||||
;; construct the string.
|
||||
;; Generic "Suite died":
|
||||
"game/basic"
|
||||
"game/mage"
|
||||
;; "Cannot create '//.angband/Angband'":
|
||||
"effects/chain"
|
||||
"effects/destruction"
|
||||
"effects/earthquake"
|
||||
"object/info"
|
||||
"object/slays"
|
||||
"player/calc-inventory"
|
||||
"player/combine-pack"
|
||||
"player/digging"
|
||||
"player/inven-carry-num"
|
||||
"player/inven-wield"
|
||||
"player/timed"
|
||||
;; This file likes to read /etc/passwd
|
||||
"z-file/path-normalize")))
|
||||
(substitute* "src/tests/Makefile"
|
||||
(("include \\$\\(SUITES\\)" all)
|
||||
(string-append all "\nTESTPROGS := $(filter-out "
|
||||
(string-join to-skip " ")
|
||||
", $(TESTPROGS))")))))))))
|
||||
(native-inputs (list autoconf
|
||||
automake
|
||||
perl)) ;for tests
|
||||
`(#:tests? #f ; no check target
|
||||
#:configure-flags (list (string-append "--bindir=" %output "/bin"))))
|
||||
(native-inputs (list autoconf automake))
|
||||
(inputs (list ncurses))
|
||||
(home-page "https://rephial.org/")
|
||||
(synopsis "Dungeon exploration roguelike")
|
||||
@@ -4948,7 +4905,7 @@ Protocol).")
|
||||
(define-public extremetuxracer
|
||||
(package
|
||||
(name "extremetuxracer")
|
||||
(version "0.8.4")
|
||||
(version "0.8.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@@ -4956,7 +4913,7 @@ Protocol).")
|
||||
version "/etr-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1rbk8zqfzzk90znf3f5lqqa12j0n6pm2qgwzabzmlnkm1k68acps"))))
|
||||
"0knd22lzhzqih1w92y6m7yxha376c6ydl22wy4xm6jg2x5jlk1qw"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
@@ -8191,7 +8148,7 @@ fish. The whole game is accompanied by quiet, comforting music.")
|
||||
(define-public crawl
|
||||
(package
|
||||
(name "crawl")
|
||||
(version "0.34.1")
|
||||
(version "0.34.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -8200,7 +8157,7 @@ fish. The whole game is accompanied by quiet, comforting music.")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "09x4n4w3rw8sldwprb03yg1igwh4m09iw00g2iq30466jryys6bv"))
|
||||
(base32 "16fsvrzcndrplw8zcn6nh8459x8zl5xdnf9r9hzh4ll2a4w9dkcr"))
|
||||
(patches (search-patches "crawl-upgrade-saves.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
@@ -11355,33 +11312,46 @@ to remap axis and buttons and a way to calibrate joysticks.")
|
||||
(define-public jumpnbump
|
||||
(package
|
||||
(name "jumpnbump")
|
||||
(version "1.70")
|
||||
(version "1.61")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/LibreGames/jumpnbump.git")
|
||||
(commit version)))
|
||||
(url "https://gitlab.com/LibreGames/jumpnbump.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1irpssijxrfrjm023v642dl3aw4ldlv95fh073jlpdpl1mwqz71a"))))
|
||||
"12lwl5sl5n009nb83r8l4lakb9286csqdf1ynpmwwydy17giqsdp"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:make-flags
|
||||
#~(list (string-append "CC=" #$(cc-for-target))
|
||||
(string-append "PREFIX=" #$output)
|
||||
"SYSINSTALL=1")
|
||||
#:tests? #f ;no test
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'configure)))) ;no configure script
|
||||
`(#:make-flags
|
||||
(list "CC=gcc"
|
||||
(string-append "PREFIX=" (assoc-ref %outputs "out")))
|
||||
#:tests? #f ;no test
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; There is no configure script
|
||||
(replace 'configure
|
||||
(lambda _
|
||||
(substitute* "Makefile"
|
||||
(("-funroll-loops")
|
||||
"-funroll-loops -fcommon")
|
||||
(("SDL_CFLAGS =")
|
||||
"SDL_CFLAGS = -fcommon"))))
|
||||
(add-after 'unpack 'fix-sdl-path
|
||||
;; XXX: For some reason, `sdl2-config' reports stand-alone SDL
|
||||
;; directory, not SDL-union provided as an input to the package.
|
||||
;; We force the latter with "--prefix=" option.
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "Makefile"
|
||||
(("sdl2-config" command)
|
||||
(string-append command " --prefix=" (assoc-ref inputs "sdl")))))))))
|
||||
(inputs
|
||||
(list bzip2
|
||||
(sdl-union (list sdl2 sdl2-mixer sdl2-net))
|
||||
zlib))
|
||||
`(("bzip2" ,bzip2)
|
||||
("sdl" ,(sdl-union (list sdl2 sdl2-mixer sdl2-net)))
|
||||
("zlib" ,zlib)))
|
||||
(native-inputs
|
||||
(list gettext-minimal)) ;for msgfmt
|
||||
`(("gettext" ,gettext-minimal))) ;for msgfmt
|
||||
(home-page "https://gitlab.com/LibreGames/jumpnbump")
|
||||
(synopsis "Multiplayer platform game with bunnies")
|
||||
(description "You, as a bunny, have to jump on your opponents to make them
|
||||
@@ -11517,7 +11487,7 @@ player adaptability for character progression.")
|
||||
(define-public li-ri
|
||||
(package
|
||||
(name "li-ri")
|
||||
(version "3.1.6")
|
||||
(version "3.1.5")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@@ -11526,7 +11496,7 @@ player adaptability for character progression.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"09r6l0sbxp3q750kpbrx513yrafmg7a2769j4wgx812lsk92n3hg"))))
|
||||
"1fd5hl9qhgvyix51la8sl34jzk4mcin8sai05gidy2r2grb1dy4s"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list #:tests? #false ;no tests
|
||||
|
||||
@@ -398,8 +398,7 @@ that is extensible via a plugin system.")
|
||||
;; environment, as it could cause Gimp to crash (see
|
||||
;; bug#77921).
|
||||
`("GI_TYPELIB_PATH" prefix
|
||||
(,(getenv "GI_TYPELIB_PATH")
|
||||
,(string-append #$output "/lib/girepository-1.0")))
|
||||
(,(getenv "GI_TYPELIB_PATH")))
|
||||
`("GUIX_PYTHONPATH" prefix
|
||||
(,(getenv "GUIX_PYTHONPATH")))
|
||||
`("GDK_PIXBUF_MODULE_FILE" =
|
||||
|
||||
+86
-98
@@ -5,7 +5,7 @@
|
||||
;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2016 Nikita <nikita@n0.is>
|
||||
;;; Copyright © 2016, 2017, 2018, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2017-2019, 2021, 2023-2026 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017-2019, 2021, 2023-2025 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
|
||||
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
@@ -22,7 +22,7 @@
|
||||
;;; Copyright © 2024 Liliana Marie Prikler <liliana.prikler@gmail.com>
|
||||
;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
|
||||
;;; Copyright © 2024 Arnaud Lechevallier <arnaud.lechevallier@free.fr>
|
||||
;;; Copyright © 2024-2025 Alvin Hsu <aurtzy@gmail.com>
|
||||
;;; Copyright © 2024 aurtzy <aurtzy@gmail.com>
|
||||
;;; Copyright © 2025 Sughosha <sughosha@disroot.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
@@ -43,7 +43,6 @@
|
||||
(define-module (gnu packages gl)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages backup)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages build-tools)
|
||||
#:use-module (gnu packages check)
|
||||
@@ -58,7 +57,6 @@
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages llvm)
|
||||
#:use-module (gnu packages lua)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages python-build)
|
||||
@@ -76,7 +74,6 @@
|
||||
#:use-module (guix hg-download)
|
||||
#:use-module (gnu packages cmake)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system cargo)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system meson)
|
||||
#:use-module (guix build-system python)
|
||||
@@ -244,6 +241,7 @@ generate a GL/GLES/EGL/GLX/WGL loader tailored for specific requirements.")
|
||||
|
||||
(define-public glad
|
||||
(package
|
||||
(inherit glad-0.1)
|
||||
(name "glad")
|
||||
(version "2.0.8")
|
||||
(source (origin
|
||||
@@ -257,26 +255,20 @@ generate a GL/GLES/EGL/GLX/WGL loader tailored for specific requirements.")
|
||||
"0c9cygiq35aiq6bpdvbwqs0wxc2dvxsh4jnx50466savscxalsk9"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'install 'install-cmakelists.txt
|
||||
(lambda _
|
||||
(let ((share (string-append #$output "/share/"
|
||||
#$(package-name this-package))))
|
||||
(install-file "cmake/CMakeLists.txt" share)
|
||||
(install-file "cmake/GladConfig.cmake" share))))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(invoke "xvfb-run" "utility/test.sh")))))))
|
||||
(substitute-keyword-arguments (package-arguments glad-0.1)
|
||||
((#:phases phases '%standard-phases)
|
||||
#~(modify-phases #$phases
|
||||
(replace 'install-cmakelists.txt
|
||||
(lambda _
|
||||
(let ((share (string-append #$output "/share/"
|
||||
#$(package-name this-package))))
|
||||
(install-file "cmake/CMakeLists.txt" share))))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(invoke "xvfb-run" "utility/test.sh"))))))))
|
||||
(native-inputs (list python-setuptools python-wheel xvfb-run-for-tests))
|
||||
(propagated-inputs (list python-jinja2))
|
||||
(home-page "https://github.com/Dav1dde/glad")
|
||||
(synopsis "Multi-language GL/GLES/EGL/GLX/WGL loader generator")
|
||||
(description "Glad uses the official Khronos XML specifications to
|
||||
generate a GL/GLES/EGL/GLX/WGL loader tailored for specific requirements.")
|
||||
(license license:expat)))
|
||||
(propagated-inputs (list python-jinja2))))
|
||||
|
||||
(define-public s2tc
|
||||
(package
|
||||
@@ -324,7 +316,7 @@ also known as DXTn or DXTC) for Mesa.")
|
||||
(define-public mesa
|
||||
(package
|
||||
(name "mesa")
|
||||
(version "26.0.2")
|
||||
(version "25.2.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@@ -333,7 +325,8 @@ also known as DXTn or DXTC) for Mesa.")
|
||||
(string-append "ftp://ftp.freedesktop.org/pub/mesa/"
|
||||
"mesa-" version ".tar.xz")))
|
||||
(sha256
|
||||
(base32 "0ikk7hb60q581i2wb1pasphv7sgqkv74qaw4cdiiq8dy45956gwp"))))
|
||||
(base32
|
||||
"1y5lj9zy2hfvx9ji1rvsjapmzap7mpp5i3pf2yfcpmpica2v5mpj"))))
|
||||
(build-system meson-build-system)
|
||||
(propagated-inputs
|
||||
;; The following are in the Requires.private field of gl.pc.
|
||||
@@ -346,28 +339,17 @@ also known as DXTn or DXTC) for Mesa.")
|
||||
libxxf86vm
|
||||
xorgproto))
|
||||
(inputs
|
||||
(append
|
||||
(list elfutils ;libelf required for r600 when using llvm
|
||||
expat
|
||||
(force libva-without-mesa)
|
||||
libxml2
|
||||
libxrandr
|
||||
libxvmc
|
||||
llvm-for-mesa
|
||||
vulkan-loader
|
||||
wayland
|
||||
wayland-protocols
|
||||
`(,zstd "lib"))
|
||||
;; The freedreno driver wants libarchive and lua.
|
||||
(if (target-arm?)
|
||||
(list libarchive
|
||||
lua-5.4)
|
||||
'())
|
||||
;; Rust isn't needed for all architectures.
|
||||
(if (target-x86-64?)
|
||||
;; NVK dependencies
|
||||
(cargo-inputs 'mesa)
|
||||
'())))
|
||||
(list elfutils ;libelf required for r600 when using llvm
|
||||
expat
|
||||
(force libva-without-mesa)
|
||||
libxml2
|
||||
libxrandr
|
||||
libxvmc
|
||||
llvm-for-mesa
|
||||
vulkan-loader
|
||||
wayland
|
||||
wayland-protocols
|
||||
`(,zstd "lib")))
|
||||
(native-inputs
|
||||
(append
|
||||
(list bison
|
||||
@@ -393,12 +375,13 @@ also known as DXTn or DXTC) for Mesa.")
|
||||
wayland
|
||||
wayland-protocols)
|
||||
'())
|
||||
;; Rust isn't needed for all architectures.
|
||||
(if (target-x86-64?)
|
||||
;; NVK dependencies
|
||||
(list rust
|
||||
rust-bindgen-cli
|
||||
rust-cbindgen)
|
||||
(module-ref (resolve-interface '(gnu packages rust-apps))
|
||||
'rust-bindgen-cli)
|
||||
(module-ref (resolve-interface '(gnu packages rust-apps))
|
||||
'rust-cbindgen-0.26))
|
||||
'())))
|
||||
(outputs '("out" "bin"))
|
||||
(arguments
|
||||
@@ -407,15 +390,15 @@ also known as DXTn or DXTC) for Mesa.")
|
||||
#~(list
|
||||
#$@(cond
|
||||
((target-aarch64?)
|
||||
;; This includes more drivers than "auto": r300, r600
|
||||
'("-Dgallium-drivers=asahi,etnaviv,freedreno,iris,lima,nouveau,\
|
||||
panfrost,r300,r600,svga,softpipe,lima,llvmpipe,tegra,v3d,vc4,virgl,zink"))
|
||||
;; This includes more drivers than "auto": asahi, r300, r600
|
||||
'("-Dgallium-drivers=asahi,etnaviv,freedreno,lima,nouveau,\
|
||||
panfrost,r300,r600,svga,softpipe,llvmpipe,tegra,v3d,vc4,virgl,zink"))
|
||||
((target-arm32?)
|
||||
;; This includes more drivers than "auto": r300, r600
|
||||
'("-Dgallium-drivers=etnaviv,freedreno,iris,lima,nouveau,\
|
||||
panfrost,r300,r600,svga,softpipe,lima,llvmpipe,tegra,v3d,vc4,virgl,zink"))
|
||||
'("-Dgallium-drivers=etnaviv,freedreno,lima,nouveau,\
|
||||
panfrost,r300,r600,svga,softpipe,llvmpipe,tegra,v3d,vc4,virgl,zink"))
|
||||
((or (target-ppc64le?) (target-ppc32?) (target-riscv64?))
|
||||
;; This includes more drivers than "auto": svga
|
||||
;; This include more drivers than "auto": svga
|
||||
'("-Dgallium-drivers=nouveau,r300,r600,radeonsi,svga,softpipe,llvmpipe,virgl,zink"))
|
||||
(else
|
||||
'("-Dgallium-drivers=auto")))
|
||||
@@ -429,23 +412,18 @@ panfrost,r300,r600,svga,softpipe,lima,llvmpipe,tegra,v3d,vc4,virgl,zink"))
|
||||
;; features required by wayland
|
||||
"-Dgles2=enabled"
|
||||
"-Dgbm=enabled"
|
||||
"-Dshared-glapi=enabled"
|
||||
"--wrap-mode=nodownload" ; XXX: disable
|
||||
|
||||
#$@(cond
|
||||
;; Increase the number of vulkan drivers on each architecture:
|
||||
((target-x86-32?)
|
||||
;; TODO: Reenable nouveau/NVK when rust support lands.
|
||||
'("-Dvulkan-drivers=amd,intel,intel_hasvk,swrast,virtio"))
|
||||
((target-x86-64?)
|
||||
'("-Dvulkan-drivers=amd,intel,intel_hasvk,nouveau,swrast,virtio"))
|
||||
((target-arm32?)
|
||||
'("-Dvulkan-drivers=swrast,intel,panfrost,freedreno,virtio"))
|
||||
;; This doesn't include nouveau (which is in "auto") as it needs
|
||||
;; rust.
|
||||
;; TODO: Enable nouveau/NVK.
|
||||
'("-Dvulkan-drivers=intel,intel_hasvk,amd,swrast"))
|
||||
((target-aarch64?)
|
||||
;; This includes more drivers than "auto": amd, broadcom
|
||||
'("-Dvulkan-drivers=swrast,intel,panfrost,freedreno,asahi,amd,broadcom,virtio"))
|
||||
;; The default fallback seems to be amd and swrast.
|
||||
((target-linux?)
|
||||
'("-Dvulkan-drivers=amd,swrast,virtio"))
|
||||
;; This differs from "auto" which only includes swrast and intel
|
||||
'("-Dvulkan-drivers=freedreno,amd,broadcom,swrast,asahi"))
|
||||
(else
|
||||
'("-Dvulkan-drivers=auto")))
|
||||
|
||||
@@ -462,6 +440,9 @@ panfrost,r300,r600,svga,softpipe,lima,llvmpipe,tegra,v3d,vc4,virgl,zink"))
|
||||
;; Also enable the tests.
|
||||
"-Dbuild-tests=true"
|
||||
|
||||
;; Re-enable X11 protocol support for the DRI2 extension.
|
||||
"-Dlegacy-x11=dri2"
|
||||
|
||||
"-Dllvm=enabled") ; default is x86/x86_64 only
|
||||
|
||||
;; XXX: 'debugoptimized' causes LTO link failures on some drivers. The
|
||||
@@ -469,13 +450,9 @@ panfrost,r300,r600,svga,softpipe,lima,llvmpipe,tegra,v3d,vc4,virgl,zink"))
|
||||
#:build-type "release"
|
||||
|
||||
#:modules '((ice-9 match)
|
||||
(ice-9 ftw)
|
||||
(srfi srfi-1)
|
||||
(guix build utils)
|
||||
((guix build cargo-build-system) #:prefix cargo:)
|
||||
(guix build meson-build-system))
|
||||
#:imported-modules (append %cargo-build-system-modules
|
||||
%meson-build-system-modules)
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
#$@(if (%current-target-system)
|
||||
@@ -491,30 +468,6 @@ panfrost,r300,r600,svga,softpipe,lima,llvmpipe,tegra,v3d,vc4,virgl,zink"))
|
||||
(search-input-file
|
||||
native-inputs "/bin/cmake")))))
|
||||
#~())
|
||||
#$@(if (this-package-native-input "rust")
|
||||
#~((add-after 'unpack 'prepare-rust-crates
|
||||
(lambda args
|
||||
(apply (assoc-ref cargo:%standard-phases
|
||||
'prepare-rust-crates)
|
||||
args)
|
||||
;; Use /tmp/rust-crates as the source.
|
||||
(substitute* (find-files "subprojects" "-rs\\.wrap$")
|
||||
(("source_url = (.*)" _ url)
|
||||
(let ((split-url (string-split url #\/)))
|
||||
(string-append
|
||||
"source_url = file:///tmp/rust-crates/rust-"
|
||||
(string-join
|
||||
(string-split (list-ref split-url 6) #\_) "-")
|
||||
"-" (list-ref split-url 7) ".tar.gz\n"))))
|
||||
;; "Download" the packages.
|
||||
(for-each
|
||||
(lambda (wrapper)
|
||||
(invoke "meson" "subprojects" "download"
|
||||
(string-drop-right wrapper 5)))
|
||||
(scandir "subprojects"
|
||||
(lambda (file)
|
||||
(string-suffix? "-rs.wrap" file)))))))
|
||||
#~())
|
||||
(add-after 'unpack 'disable-failing-test
|
||||
(lambda _
|
||||
;; Disable the intel vulkan (anv_state_pool) tests, as they may
|
||||
@@ -557,6 +510,41 @@ panfrost,r300,r600,svga,softpipe,lima,llvmpipe,tegra,v3d,vc4,virgl,zink"))
|
||||
(("'lp_test_arit', ") ""))))
|
||||
(_
|
||||
'((display "No tests to disable on this architecture.\n"))))))
|
||||
#$@(if (target-x86-64?)
|
||||
#~((add-after 'unpack 'patch-subproject-sources
|
||||
(lambda _
|
||||
;; Patch each relevant subproject source URL in wrapfiles to
|
||||
;; use the store, which avoids an attempt to download them
|
||||
;; mid-build.
|
||||
(for-each
|
||||
(match-lambda
|
||||
((name source)
|
||||
(let ((wrap-file (string-append
|
||||
"subprojects/" name ".wrap"))
|
||||
(subproject-dest (string-append
|
||||
"subprojects/" name))
|
||||
(overlay-dir (string-append
|
||||
"subprojects/packagefiles/" name)))
|
||||
(mkdir-p subproject-dest)
|
||||
(invoke "tar" "xf" source "-C" subproject-dest
|
||||
"--strip-components=1")
|
||||
;; Normally when the patch_directory wrap file property
|
||||
;; is specified, meson automatically copies from
|
||||
;; packagefiles, but this is not the case here (only
|
||||
;; happens when downloading source?) so we manually copy
|
||||
;; overlay-dir to subproject-dest.
|
||||
(when (file-exists? overlay-dir)
|
||||
(copy-recursively overlay-dir subproject-dest))
|
||||
(call-with-output-file wrap-file
|
||||
(lambda (port)
|
||||
(format port "[wrap-file]
|
||||
directory = ~a
|
||||
"
|
||||
name))))))
|
||||
'#+(module-ref (resolve-interface
|
||||
'(gnu packages rust-crates))
|
||||
'mesa-cargo-inputs)))))
|
||||
#~())
|
||||
(add-after 'unpack 'set-home-directory
|
||||
;; Build tries to use a shader cache (non-fatal error).
|
||||
(lambda _ (setenv "HOME" "/tmp")))
|
||||
@@ -676,7 +664,7 @@ from software emulation to complete hardware acceleration for modern GPUs.")
|
||||
#~(cons* "-Dgallium-rusticl=true"
|
||||
;; Enable all drivers by default.
|
||||
(string-append "-Dgallium-rusticl-enable-drivers="
|
||||
"asahi,freedreno,radeonsi")
|
||||
"iris,llvmpipe,nouveau,panfrost,radeonsi,r600")
|
||||
#$flags))
|
||||
((#:phases phases)
|
||||
#~(modify-phases #$phases
|
||||
|
||||
@@ -524,8 +524,7 @@ like automatic language detection, text-to-speech and clipboard buttons.")
|
||||
#:vendor-dir "vendor"
|
||||
#:cargo-target #$(cargo-triplet)
|
||||
args))
|
||||
'(prepare-rust-crates
|
||||
unpack-rust-crates
|
||||
'(unpack-rust-crates
|
||||
configure
|
||||
check-for-pregenerated-files
|
||||
patch-cargo-checksums))))))))
|
||||
@@ -596,8 +595,7 @@ Transmission, and can be used to control remote Transmission instances.")
|
||||
#:vendor-dir "vendor"
|
||||
#:cargo-target #$(cargo-triplet)
|
||||
args))
|
||||
'(prepare-rust-crates
|
||||
unpack-rust-crates
|
||||
'(unpack-rust-crates
|
||||
configure
|
||||
check-for-pregenerated-files
|
||||
patch-cargo-checksums)))))))
|
||||
|
||||
@@ -564,7 +564,6 @@ It is written in C using GObject and libsoup.")
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list
|
||||
"CFLAGS=-g -O2 -Wno-error=incompatible-pointer-types"
|
||||
"--disable-static"
|
||||
"--enable-gtk-doc"
|
||||
(string-append "--with-html-dir="
|
||||
@@ -7059,8 +7058,7 @@ runtime image loader executables that are used inside the sandbox.")
|
||||
#:vendor-dir "vendor"
|
||||
#:cargo-target #$(cargo-triplet)
|
||||
args))
|
||||
'(prepare-rust-crates
|
||||
unpack-rust-crates
|
||||
'(unpack-rust-crates
|
||||
configure
|
||||
check-for-pregenerated-files
|
||||
patch-cargo-checksums))))
|
||||
|
||||
@@ -604,7 +604,6 @@ in the case of Firefox, it is browser/locales/all-locales."
|
||||
"zh-CN"
|
||||
"zh-TW"))
|
||||
|
||||
;;; Please keep these versions in sync with icedove.
|
||||
(define %icecat-base-version "140.9.0")
|
||||
(define %icecat-version (string-append %icecat-base-version "-gnu1"))
|
||||
(define %icecat-build-id "20260324000000") ;must be of the form YYYYMMDDhhmmss
|
||||
@@ -1249,29 +1248,24 @@ testing.")
|
||||
(cpe-name . "firefox_esr")
|
||||
(cpe-version . ,(first (string-split version #\-)))))))
|
||||
|
||||
(define %icedove-build-id "20260324000000") ;must be of the form YYYYMMDDhhmmss
|
||||
(define %icedove-build-id "20260224000000") ;must be of the form YYYYMMDDhhmmss
|
||||
;;; See <https://product-details.mozilla.org/1.0/thunderbird_versions.json>
|
||||
;;; for the source of truth regarding Thunderbird releases.
|
||||
;;; Please keep these version numbers in sync with icecat.
|
||||
;;; Please also update thunderbird-comm-source and thunderbird-comm-l10n to
|
||||
;;; the icedove version.
|
||||
(define %icedove-version "140.9.0")
|
||||
(define %icedove-version "140.8.0")
|
||||
|
||||
;; Provides the "comm" folder which is inserted into the icecat source.
|
||||
;; Avoids the duplication of Icecat's source tarball. Pick the changeset that
|
||||
;; matches the most recent tag of the form 'THUNDERBIRD_140_2_0esr_RELEASE'.
|
||||
;; Please also update the commit of thunderbird-comm-l10n to match the
|
||||
;; changeset used by thunderbird-comm-source.
|
||||
(define thunderbird-comm-source
|
||||
(origin
|
||||
(method hg-fetch)
|
||||
(uri (hg-reference
|
||||
(url "https://hg.mozilla.org/releases/comm-esr140")
|
||||
(changeset "8be9f2d3072c225a1e5f153745a18984c2babf8f")))
|
||||
(changeset "aa377fbf351e6b10b053e6afa421755c82d5fcf7")))
|
||||
(file-name (string-append "thunderbird-" %icedove-version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"04j35957x03m5x7mhh8zxa86mwjy0is2vb614sr4inkvvz4rs2hg"))
|
||||
"0595jg1qbwclzi9qssljqkisrm2dn99rzxzaz2mcfi7b1kvbfaki"))
|
||||
(patches (search-patches "icedove-observer-fix.patch"))))
|
||||
|
||||
;;; To regenerate, see the `format-locales' helper defined above.
|
||||
@@ -1348,8 +1342,7 @@ testing.")
|
||||
;; The commit to use can be found in the mail/locales/l10n-changesets.json
|
||||
;; file in Thunderbird's source (e.g.:
|
||||
;; <https://hg-edge.mozilla.org/releases/comm-esr140/file/efb07defaa2d56105675dc1d936af581ebfd8ffa/mail/locales/l10n-changesets.json>)
|
||||
;; where the hash in the URL is the changeset from thunderbird-comm-source.
|
||||
(let* ((commit "7c86eab97e77f00ca7ed8f224d38338a3ed46693")
|
||||
(let* ((commit "b6fd3d6c75ba35d91fe131a654df76ca86f35ac5")
|
||||
(revision "0")
|
||||
(version (git-version %icedove-version revision commit)))
|
||||
(origin
|
||||
@@ -1360,7 +1353,7 @@ testing.")
|
||||
(file-name (git-file-name "thunderbird-l10n" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1navma2gwcgbbiwcwrc5lrx2jk3qmrnrc6i8pvhb8156pz4cg5nd")))))
|
||||
"0n4df6kv70a6mxxsqwc83nhj8vl7acv9bcbf07nkcsjjxh3szvqc")))))
|
||||
|
||||
(define icedove-source
|
||||
(let ((name (string-append "icedove-" %icedove-version)))
|
||||
|
||||
@@ -3342,33 +3342,6 @@ and restore them afterwards.")
|
||||
@url{http://www.freebsd.org/cgi/man.cgi?query=fail,failpoints} for Golang.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public go-go-shabbyrobe-org-gocovmerge
|
||||
(package
|
||||
(name "go-go-shabbyrobe-org-gocovmerge")
|
||||
(version "0.0.0-20230507111327-fa4f82cfbf4d")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.sr.ht/~shabbyrobe/gocovmerge")
|
||||
(commit (go-version->git-ref version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0sbr6i1m5hjbnlfad8cl8w30949r02c66l85hcmyyd9ka30mqr23"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "go.shabbyrobe.org/gocovmerge"))
|
||||
(propagated-inputs
|
||||
(list go-golang-org-x-tools))
|
||||
(home-page "https://go.shabbyrobe.org/gocovmerge")
|
||||
(synopsis "gocovmerge")
|
||||
(description
|
||||
"Package gocovmerge takes the results from multiple @code{go test
|
||||
-coverprofile} runs and merges them into one profile. It is a maintained fork
|
||||
of @url{https://github.com/wadey/gocovmerge}.")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public go-go-simpler-org-sloglint
|
||||
(package
|
||||
(name "go-go-simpler-org-sloglint")
|
||||
|
||||
@@ -1229,36 +1229,6 @@ MetroHash}, a high quality, high performance hash algorithm.")
|
||||
"This package provides a hashing function.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-digitorus-pkcs7
|
||||
(package
|
||||
(name "go-github-com-digitorus-pkcs7")
|
||||
(version "0.0.0-20250730155240-ffadbf3f398c")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/digitorus/pkcs7")
|
||||
(commit (go-version->git-ref version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0snamp6fbg5vir0lsw5wzvyagrdd832lw6k7cnvcahcgp8l084zc"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "github.com/digitorus/pkcs7"))
|
||||
(native-inputs
|
||||
(list openssl))
|
||||
(home-page "https://github.com/digitorus/pkcs7")
|
||||
(synopsis "PKCS#7 implementation for Go")
|
||||
(description
|
||||
"This package implements parsing and generation of some
|
||||
PKCS#7/Cryptographic Message
|
||||
Syntax (@url{https://www.rfc-editor.org/rfc/rfc2315},
|
||||
@url{https://www.rfc-editor.org/rfc/rfc5652, RFC 2315}, RFC 5652) structures
|
||||
for Go applications. It's an alternative fork of deprecated
|
||||
@url{https://github.com/mozilla-services/pkcs7}.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-dvsekhvalnov-jose2go
|
||||
(package
|
||||
(name "go-github-com-dvsekhvalnov-jose2go")
|
||||
|
||||
+67
-556
@@ -382,14 +382,10 @@ devices.")
|
||||
;; - cloud.google.com/go/auth
|
||||
;; - cloud.google.com/go/auth/oauth2adapt
|
||||
;; - cloud.google.com/go/compute/metadata
|
||||
;; - cloud.google.com/go/longrunning
|
||||
;; - cloud.google.com/go/monitoring
|
||||
;; - cloud.google.com/go/storage
|
||||
(for-each delete-file-recursively
|
||||
(list "auth"
|
||||
"compute/metadata"
|
||||
"longrunning"
|
||||
"monitoring"
|
||||
"storage"))))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
@@ -425,12 +421,15 @@ devices.")
|
||||
"internal/tracecontext"
|
||||
"internal/uid"
|
||||
"internal/version"
|
||||
"longrunning"
|
||||
"pubsub/internal/distribution"
|
||||
"pubsub/internal/scheduler"
|
||||
"pubsub/internal/testutil"
|
||||
"pubsub/v2/internal/distribution"
|
||||
"pubsub/v2/internal/scheduler"
|
||||
"pubsub/v2/internal/testutil"
|
||||
"pubsublite/internal/test"
|
||||
"pubsublite/internal/wire"
|
||||
"rpcreplay"
|
||||
"spanner/spansql"
|
||||
"translate")))
|
||||
@@ -457,7 +456,7 @@ Services.")
|
||||
(define-public go-cloud-google-com-go-auth
|
||||
(package
|
||||
(name "go-cloud-google-com-go-auth")
|
||||
(version "0.18.2")
|
||||
(version "0.17.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -467,7 +466,7 @@ Services.")
|
||||
#:subdir "auth"))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1c2i8jhc4rizmwz6716bwxwy04adjmm7k2cigki3m1f00rwblmki"))
|
||||
(base32 "0i18wkz04w9wpckw021nawr82dh92krmcsn471rpjx1jrmgsbi5v"))
|
||||
(modules '((guix build utils)
|
||||
(ice-9 ftw)
|
||||
(srfi srfi-26)))
|
||||
@@ -489,28 +488,25 @@ Services.")
|
||||
#~(list "-skip"
|
||||
(string-join
|
||||
;; These tests all require credentials/tokens
|
||||
(list "TestDownscopedToken"
|
||||
"TestLogDirectPathMisconfigDirectPathNotSet"
|
||||
"TestLogDirectPathMisconfigNotOnGCE"
|
||||
;; Runint OTP instance is required.
|
||||
"TestDial_OpenTelemetry/telemetry_enabled_success"
|
||||
"TestDial_OpenTelemetry/telemetry_enabled_error")
|
||||
"|"))))
|
||||
'("TestGetGRPCTransportConfigAndEndpoint_S2A"
|
||||
"TestGetHTTPTransportConfig_S2A"
|
||||
"TestDownscopedToken"
|
||||
"TestDialTCPUserTimeout"
|
||||
"TestFetchTrustBoundaryData"
|
||||
"TestLogDirectPathMisconfigDirectPathNotSet"
|
||||
"TestLogDirectPathMisconfigNotOnGCE") "|"))))
|
||||
(propagated-inputs
|
||||
(list go-cloud-google-com-go-compute-metadata
|
||||
go-github-com-google-go-cmp
|
||||
go-github-com-google-s2a-go
|
||||
go-github-com-googleapis-enterprise-certificate-proxy
|
||||
go-github-com-googleapis-gax-go-v2
|
||||
go-go-opentelemetry-io-contrib-instrumentation-google-golang-org-grpc-otelgrpc
|
||||
go-go-opentelemetry-io-contrib-instrumentation-net-http-otelhttp
|
||||
go-go-opentelemetry-io-otel
|
||||
go-go-opentelemetry-io-otel-sdk
|
||||
go-go-opentelemetry-io-otel-trace
|
||||
go-golang-org-x-net
|
||||
go-golang-org-x-time
|
||||
(list go-google-golang-org-protobuf
|
||||
go-google-golang-org-grpc
|
||||
go-google-golang-org-protobuf))
|
||||
go-golang-org-x-time
|
||||
go-golang-org-x-net
|
||||
go-go-opentelemetry-io-contrib-instrumentation-net-http-otelhttp
|
||||
go-go-opentelemetry-io-contrib-instrumentation-google-golang-org-grpc-otelgrpc
|
||||
go-github-com-googleapis-gax-go-v2
|
||||
go-github-com-googleapis-enterprise-certificate-proxy
|
||||
go-github-com-google-s2a-go
|
||||
go-github-com-google-go-cmp
|
||||
go-cloud-google-com-go-compute-metadata))
|
||||
(home-page "https://cloud.google.com/go")
|
||||
(synopsis "Google Auth Library for Go")
|
||||
(description
|
||||
@@ -566,7 +562,7 @@ cloud.google.com/go/auth and golang.org/x/oauth2.")
|
||||
(define-public go-cloud-google-com-go-compute-metadata
|
||||
(package
|
||||
(name "go-cloud-google-com-go-compute-metadata")
|
||||
(version "0.9.0")
|
||||
(version "0.8.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -576,7 +572,7 @@ cloud.google.com/go/auth and golang.org/x/oauth2.")
|
||||
#:subdir "compute/metadata"))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1xhiyv3p9kh6qj007yqd8fic2w48ngrff2vwi9i21v82v5zp51gv"))))
|
||||
(base32 "02xl6mnw3i1x8zfafrsl2gr0v5a29nn3aiif6ndzssqr0pqfg5dw"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
@@ -584,8 +580,6 @@ cloud.google.com/go/auth and golang.org/x/oauth2.")
|
||||
#:unpack-path "cloud.google.com/go"))
|
||||
(native-inputs
|
||||
(list go-github-com-google-go-cmp))
|
||||
(propagated-inputs
|
||||
(list go-golang-org-x-sys))
|
||||
(home-page "https://pkg.go.dev/cloud.google.com/go/compute/metadata")
|
||||
(synopsis "Go wrapper for Google Compute Engine metadata service")
|
||||
(description
|
||||
@@ -593,98 +587,6 @@ cloud.google.com/go/auth and golang.org/x/oauth2.")
|
||||
API service accounts for Go.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public go-cloud-google-com-go-longrunning
|
||||
(package
|
||||
(name "go-cloud-google-com-go-longrunning")
|
||||
(version "0.8.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/googleapis/google-cloud-go")
|
||||
(commit (go-version->git-ref version #:subdir "longrunning"))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1ykr9kj0sbb4w0h190lp9gcxppv18dp0d5ak2g93dky8hjyc2wfa"))
|
||||
(modules '((guix build utils)
|
||||
(ice-9 ftw)
|
||||
(srfi srfi-26)))
|
||||
(snippet #~(begin
|
||||
(define (delete-all-but directory . preserve)
|
||||
(with-directory-excursion directory
|
||||
(let* ((pred (negate (cut member <>
|
||||
(cons* "." ".." preserve))))
|
||||
(items (scandir "." pred)))
|
||||
(for-each (cut delete-file-recursively <>) items))))
|
||||
(delete-all-but "." "longrunning")))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "cloud.google.com/go/longrunning"
|
||||
#:unpack-path "cloud.google.com/go"))
|
||||
(propagated-inputs
|
||||
(list go-cloud-google-com-go
|
||||
go-github-com-googleapis-gax-go-v2
|
||||
go-google-golang-org-api
|
||||
go-google-golang-org-genproto
|
||||
go-google-golang-org-genproto-googleapis-api
|
||||
go-google-golang-org-genproto-googleapis-rpc
|
||||
go-google-golang-org-grpc
|
||||
go-google-golang-org-protobuf))
|
||||
(home-page "https://cloud.google.com/go")
|
||||
(synopsis "Helper library for working with long running operations")
|
||||
(description
|
||||
"Package longrunning supports Long Running Operations for the Google
|
||||
Cloud Libraries. See google.golang.org/genproto/googleapis/longrunning for
|
||||
its service definition.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public go-cloud-google-com-go-monitoring
|
||||
(package
|
||||
(name "go-cloud-google-com-go-monitoring")
|
||||
(version "1.24.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/googleapis/google-cloud-go")
|
||||
(commit (go-version->git-ref version #:subdir "monitoring"))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "13rdnpz6jz5242gfx6xv6q66rr7k2sbrf7s507wq09bxvd4g20p0"))
|
||||
(modules '((guix build utils)
|
||||
(ice-9 ftw)
|
||||
(srfi srfi-26)))
|
||||
(snippet
|
||||
#~(begin
|
||||
(define (delete-all-but directory . preserve)
|
||||
(with-directory-excursion directory
|
||||
(let* ((pred (negate (cut member <>
|
||||
(cons* "." ".." preserve))))
|
||||
(items (scandir "." pred)))
|
||||
(for-each (cut delete-file-recursively <>) items))))
|
||||
(delete-all-but "." "monitoring")))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:skip-build? #t
|
||||
#:import-path "cloud.google.com/go/monitoring"
|
||||
#:unpack-path "cloud.google.com/go"))
|
||||
(propagated-inputs
|
||||
(list go-cloud-google-com-go-longrunning
|
||||
go-github-com-googleapis-gax-go-v2
|
||||
go-google-golang-org-api
|
||||
go-google-golang-org-genproto
|
||||
go-google-golang-org-genproto-googleapis-api
|
||||
go-google-golang-org-genproto-googleapis-rpc
|
||||
go-google-golang-org-grpc
|
||||
go-google-golang-org-protobuf))
|
||||
(home-page "https://cloud.google.com/go")
|
||||
(synopsis "Cloud Monitoring API")
|
||||
(description
|
||||
"This package provides a Go Client Library for Cloud Monitoring API.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public go-cloud-google-com-go-storage
|
||||
(package
|
||||
(name "go-cloud-google-com-go-storage")
|
||||
@@ -722,14 +624,14 @@ its service definition.")
|
||||
(list go-github-com-google-go-cmp))
|
||||
(propagated-inputs
|
||||
(list go-cloud-google-com-go
|
||||
go-cloud-google-com-go-auth
|
||||
;; go-cloud-google-com-go-auth
|
||||
;; go-cloud-google-com-go-compute-metadata
|
||||
;; go-cloud-google-com-go-iam
|
||||
go-cloud-google-com-go-longrunning
|
||||
;; go-cloud-google-com-go-longrunning
|
||||
go-github-com-google-uuid
|
||||
go-github-com-googleapis-gax-go-v2
|
||||
go-github-com-googlecloudplatform-opentelemetry-operations-go-exporter-metric
|
||||
go-go-opentelemetry-io-contrib-detectors-gcp
|
||||
;; go-github-com-googlecloudplatform-opentelemetry-operations-go-exporter-metric
|
||||
;; go-go-opentelemetry-io-contrib-detectors-gcp
|
||||
go-go-opentelemetry-io-otel
|
||||
;; go-go-opentelemetry-io-otel-exporters-stdout-stdoutmetric
|
||||
go-go-opentelemetry-io-otel-sdk
|
||||
@@ -987,34 +889,6 @@ Gemini clients and servers.")
|
||||
@url{https://1password.com/, 1Password} API.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-42wim-go-gitter
|
||||
(let ((commit "16aadfbb65c6641501ea8eebb6bcf23b9011912b")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "go-github-com-42wim-go-gitter")
|
||||
(version "0.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/42wim/go-gitter")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "07l07msyackkzvxhc9cljzgh81v5g48crravz29ph516smqj0x6c"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "github.com/42wim/go-gitter"))
|
||||
(propagated-inputs
|
||||
(list go-github-com-mreiferson-go-httpclient
|
||||
go-github-com-mrexodia-wray))
|
||||
(home-page "https://github.com/42wim/go-gitter")
|
||||
(synopsis "Gitter API in Go")
|
||||
(description
|
||||
"This package provides a Gitter API for Golang.")
|
||||
(license license:asl2.0))))
|
||||
|
||||
(define-public go-github-com-42wim-httpsig
|
||||
(package
|
||||
(name "go-github-com-42wim-httpsig")
|
||||
@@ -3432,41 +3306,6 @@ pattern.")
|
||||
@code{net/rpc}.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-cevatbarisyilmaz-ara
|
||||
(package
|
||||
(name "go-github-com-cevatbarisyilmaz-ara")
|
||||
(version "0.0.5")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/cevatbarisyilmaz/ara")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0512nlqqv9bnsplphiw7q9s80icl63wgl88b7m6m4vsvn5ghphc8"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "github.com/cevatbarisyilmaz/ara"
|
||||
#:test-flags
|
||||
;; ialer_test.go:46: lookup google.com on [::1]:53: read udp
|
||||
;; [::1]:39632->[::1]:53: read: connection refused
|
||||
#~(list "-skip" "TestDialer|TestNewCustomResolver")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'remove-examples
|
||||
(lambda* (#:key import-path #:allow-other-keys)
|
||||
(with-directory-excursion (string-append "src/" import-path)
|
||||
(delete-file "example_test.go")))))))
|
||||
(home-page "https://github.com/cevatbarisyilmaz/ara")
|
||||
(synopsis "Dialer with customizable resolver")
|
||||
(description
|
||||
"Package ara provides a dialer with customizable resolver. It can be
|
||||
used with @code{http.Client} and @code{http.Transport} to alter host
|
||||
lookups.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-chris-ramon-douceur
|
||||
(package
|
||||
(name "go-github-com-chris-ramon-douceur")
|
||||
@@ -5340,8 +5179,7 @@ for Go.")
|
||||
(home-page "https://github.com/emersion/go-sasl")
|
||||
(synopsis "SASL library written in Go")
|
||||
(description
|
||||
"This package provides a @acronym{Simple Authentication and Security
|
||||
Layer, SASL} library written in Go.")
|
||||
"This package provides a SASL library written in Go.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-emersion-go-smtp
|
||||
@@ -7489,7 +7327,7 @@ sanitization, to use in various HTML contexts and with various DOM APIs.")
|
||||
(define-public go-github-com-googleapis-enterprise-certificate-proxy
|
||||
(package
|
||||
(name "go-github-com-googleapis-enterprise-certificate-proxy")
|
||||
(version "0.3.14")
|
||||
(version "0.3.7")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -7498,21 +7336,17 @@ sanitization, to use in various HTML contexts and with various DOM APIs.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "16ypygh5jk2ndwkbdai1z23xn872z6fsj1iis28fp6mgw9s89hl8"))))
|
||||
(base32 "1jblnaa4hn9x5gfrsiw007wws7hy4h795xzzrw2bzf297ydrlnyg"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:tests? #f ;; TODO: Tests require additional dependencies
|
||||
#:skip-build? #t
|
||||
#:import-path "github.com/googleapis/enterprise-certificate-proxy"
|
||||
;; TODO: Tests require additional dependencies
|
||||
#:test-subdirs
|
||||
#~(list "client"
|
||||
"client/util"
|
||||
"internal/signer/util")))
|
||||
#:import-path "github.com/googleapis/enterprise-certificate-proxy"))
|
||||
(propagated-inputs
|
||||
(list ;; go-github-com-google-go-pkcs11
|
||||
go-golang-org-x-crypto
|
||||
go-golang-org-x-sys))
|
||||
(list go-golang-org-x-sys go-golang-org-x-crypto
|
||||
;; go-github-com-google-go-pkcs11
|
||||
))
|
||||
(home-page "https://github.com/googleapis/enterprise-certificate-proxy")
|
||||
(synopsis "Google Proxies for Enterprise Certificates (GA)")
|
||||
(description
|
||||
@@ -7529,7 +7363,7 @@ Terraform by using the enterprise certificates feature.")
|
||||
(define-public go-github-com-googleapis-gax-go-v2
|
||||
(package
|
||||
(name "go-github-com-googleapis-gax-go-v2")
|
||||
(version "2.19.0")
|
||||
(version "2.15.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -7538,28 +7372,22 @@ Terraform by using the enterprise certificates feature.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1nd5qv2dhn6xiw27hmxxyan9v3hiwcqpg9cy2q679v6b0vj7ijmj"))))
|
||||
(base32 "0mp07716zjb7q9di6sfglscahrg053lsq3j5w68dknxn1fks5j6f"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:go go-1.25
|
||||
#:tests? #f ;; TODO: Tests require additional dependencies
|
||||
#:skip-build? #t
|
||||
#:import-path "github.com/googleapis/gax-go/v2"
|
||||
#:unpack-path "github.com/googleapis/gax-go"
|
||||
;; TODO: Tests require additional dependencies
|
||||
#:test-subdirs #~(list "internallog" "internallog/grpclog")))
|
||||
(native-inputs
|
||||
(list go-github-com-google-go-cmp))
|
||||
#:unpack-path "github.com/googleapis/gax-go"))
|
||||
(propagated-inputs
|
||||
(list go-go-opentelemetry-io-otel
|
||||
go-go-opentelemetry-io-otel-metric
|
||||
go-go-opentelemetry-io-otel-sdk-metric
|
||||
;; go-google-golang-org-api ;cycles, boostrap is required
|
||||
;; go-google-golang-org-genproto ;cycles, boostrap is required
|
||||
go-google-golang-org-genproto-googleapis-api
|
||||
go-google-golang-org-genproto-googleapis-rpc
|
||||
(list go-google-golang-org-protobuf
|
||||
go-google-golang-org-grpc
|
||||
go-google-golang-org-protobuf))
|
||||
go-google-golang-org-genproto-googleapis-rpc
|
||||
go-google-golang-org-genproto-googleapis-api
|
||||
;; go-google-golang-org-genproto
|
||||
;; go-google-golang-org-api
|
||||
go-github-com-google-go-cmp))
|
||||
(home-page "https://github.com/googleapis/gax-go")
|
||||
(synopsis "Google API Extensions for Go")
|
||||
(description
|
||||
@@ -7567,140 +7395,6 @@ Terraform by using the enterprise certificates feature.")
|
||||
for clients and servers based on @code{gRPC} and Google API conventions.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public go-github-com-googlecloudplatform-opentelemetry-operations-go-detectors-gcp
|
||||
(package
|
||||
(name
|
||||
"go-github-com-googlecloudplatform-opentelemetry-operations-go-detectors-gcp")
|
||||
(version "1.31.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/GoogleCloudPlatform/opentelemetry-operations-go")
|
||||
(commit (go-version->git-ref version #:subdir "detectors/gcp"))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0a2641mgbc2fv8ramifawpxv9rx99wqknv0xqin3wfapsn2vn5i9"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp"
|
||||
#:unpack-path "github.com/GoogleCloudPlatform/opentelemetry-operations-go"))
|
||||
(native-inputs
|
||||
(list go-github-com-stretchr-testify))
|
||||
(propagated-inputs
|
||||
(list go-cloud-google-com-go-compute-metadata))
|
||||
(home-page
|
||||
"https://github.com/GoogleCloudPlatform/opentelemetry-operations-go")
|
||||
(synopsis "GCP Resource detection library")
|
||||
(description
|
||||
"This is a library intended to be used by Upstream @code{OpenTelemetry}
|
||||
resource detectors. It exists within this repository to allow for integration
|
||||
testing of the detection functions in real GCP environments.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public go-github-com-googlecloudplatform-opentelemetry-operations-go-exporter-metric
|
||||
(package
|
||||
(name "go-github-com-googlecloudplatform-opentelemetry-operations-go-exporter-metric")
|
||||
(version "0.55.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/GoogleCloudPlatform/opentelemetry-operations-go")
|
||||
(commit (go-version->git-ref version #:subdir "exporter/metric"))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0a2641mgbc2fv8ramifawpxv9rx99wqknv0xqin3wfapsn2vn5i9"))
|
||||
(modules '((guix build utils)
|
||||
(ice-9 ftw)
|
||||
(srfi srfi-26)))
|
||||
(snippet
|
||||
#~(begin
|
||||
(define (delete-all-but directory . preserve)
|
||||
(with-directory-excursion directory
|
||||
(let* ((pred (negate (cut member <>
|
||||
(cons* "." ".." preserve))))
|
||||
(items (scandir "." pred)))
|
||||
(for-each (cut delete-file-recursively <>) items))))
|
||||
(delete-all-but "exporter" "metric")
|
||||
(delete-all-but "." "exporter")))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:skip-build? #t
|
||||
#:tests? #f ;TODO: more packaging is required
|
||||
#:import-path "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric"
|
||||
#:unpack-path "github.com/GoogleCloudPlatform/opentelemetry-operations-go"))
|
||||
(native-inputs
|
||||
(list go-github-com-stretchr-testify
|
||||
#;go-github-com-googlecloudplatform-opentelemetry-operations-go-internal-cloudmock))
|
||||
(propagated-inputs
|
||||
(list go-cloud-google-com-go-monitoring
|
||||
go-github-com-googleapis-gax-go-v2
|
||||
go-github-com-googlecloudplatform-opentelemetry-operations-go-internal-resourcemapping
|
||||
go-go-opentelemetry-io-otel
|
||||
go-go-opentelemetry-io-otel-metric
|
||||
go-go-opentelemetry-io-otel-sdk
|
||||
go-go-opentelemetry-io-otel-sdk-metric
|
||||
go-go-opentelemetry-io-otel-trace
|
||||
go-golang-org-x-oauth2
|
||||
go-google-golang-org-api
|
||||
go-google-golang-org-genproto-googleapis-api
|
||||
go-google-golang-org-grpc
|
||||
go-google-golang-org-protobuf))
|
||||
(home-page "https://github.com/GoogleCloudPlatform/opentelemetry-operations-go")
|
||||
(synopsis "OpenTelemetry Google Cloud Monitoring Exporter")
|
||||
(description
|
||||
"@code{OpenTelemetry} Google Cloud Monitoring Exporter allows the user to
|
||||
send collected metrics to Google Cloud.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public go-github-com-googlecloudplatform-opentelemetry-operations-go-internal-resourcemapping
|
||||
(package
|
||||
(name "go-github-com-googlecloudplatform-opentelemetry-operations-go-internal-resourcemapping")
|
||||
(version "0.55.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/GoogleCloudPlatform/opentelemetry-operations-go")
|
||||
(commit (go-version->git-ref version
|
||||
#:subdir "internal/resourcemapping"))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0a2641mgbc2fv8ramifawpxv9rx99wqknv0xqin3wfapsn2vn5i9"))
|
||||
(modules '((guix build utils)
|
||||
(ice-9 ftw)
|
||||
(srfi srfi-26)))
|
||||
(snippet
|
||||
#~(begin
|
||||
(define (delete-all-but directory . preserve)
|
||||
(with-directory-excursion directory
|
||||
(let* ((pred (negate (cut member <>
|
||||
(cons* "." ".." preserve))))
|
||||
(items (scandir "." pred)))
|
||||
(for-each (cut delete-file-recursively <>) items))))
|
||||
(delete-all-but "internal" "resourcemapping")
|
||||
(delete-all-but "." "internal")))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path (string-append "github.com/GoogleCloudPlatform/"
|
||||
"opentelemetry-operations-go/"
|
||||
"internal/resourcemapping")
|
||||
#:unpack-path "github.com/GoogleCloudPlatform/opentelemetry-operations-go"))
|
||||
(propagated-inputs
|
||||
(list go-go-opentelemetry-io-otel
|
||||
go-google-golang-org-genproto-googleapis-api))
|
||||
(home-page "https://github.com/GoogleCloudPlatform/opentelemetry-operations-go")
|
||||
(synopsis "OpenTelemetry Google Cloud resource mapping module")
|
||||
;; XXX: Project lacks proper descripton.
|
||||
(description
|
||||
"This package provides an OpenTelemetry Google Cloud resource mapping
|
||||
module.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public go-github-com-gopacket-gopacket
|
||||
(package
|
||||
(name "go-github-com-gopacket-gopacket")
|
||||
@@ -8694,40 +8388,6 @@ protocol) - used to discover UPnP services on a network
|
||||
by the IBM Cloud @code{OpenAPI} SDK Generator (openapi-sdkgen).")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public go-github-com-igungor-gofakes3
|
||||
(package
|
||||
(name "go-github-com-igungor-gofakes3")
|
||||
(version "0.0.18")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/igungor/gofakes3")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "136wvgz8d1982ns3vqqlvk3r7cbns7b0givwcrala562sd87yqka"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "github.com/igungor/gofakes3"))
|
||||
(propagated-inputs
|
||||
(list go-github-com-aws-aws-sdk-go
|
||||
go-github-com-ryszard-goskiplist
|
||||
go-github-com-shabbyrobe-gocovmerge
|
||||
go-github-com-spf13-afero
|
||||
go-go-etcd-io-bbolt
|
||||
go-golang-org-x-tools
|
||||
go-gopkg-in-mgo-v2))
|
||||
(home-page "https://github.com/igungor/gofakes3")
|
||||
(synopsis "Simple fake AWS S3 object storage")
|
||||
(description
|
||||
"AWS S3 fake server and testing library for extensive S3 test integrations.
|
||||
Either by running a test-server, e.g. for testing of AWS Lambda functions
|
||||
accessing S3. Or, to have a simple and convencience S3 mock- and test-server.
|
||||
It's an alternative fork of @url{https://github.com/johannesboyne/gofakes3}.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-inetaf-tcpproxy
|
||||
(package
|
||||
(name "go-github-com-inetaf-tcpproxy")
|
||||
@@ -9242,48 +8902,6 @@ described in @url{https://www.rfc-editor.org/rfc/rfc959,RFC 959}.")
|
||||
transforms one JSON document into another through a JMESPath expression.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public go-github-com-johannesboyne-gofakes3
|
||||
(package
|
||||
(name "go-github-com-johannesboyne-gofakes3")
|
||||
(version "0.0.0-20260208201424-4c385a1f6a73")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/johannesboyne/gofakes3")
|
||||
(commit (go-version->git-ref version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "14h4wrryrn4darp2vg2kyh2rwz0p93y99plv7lyql9i50h351895"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "github.com/johannesboyne/gofakes3"))
|
||||
(native-inputs
|
||||
(list go-github-com-stretchr-testify
|
||||
go-go-shabbyrobe-org-gocovmerge))
|
||||
(propagated-inputs
|
||||
(list go-github-com-aws-aws-sdk-go-v2
|
||||
go-github-com-aws-aws-sdk-go-v2-config
|
||||
go-github-com-aws-aws-sdk-go-v2-credentials
|
||||
go-github-com-aws-aws-sdk-go-v2-feature-s3-manager
|
||||
go-github-com-aws-aws-sdk-go-v2-service-s3
|
||||
go-github-com-aws-smithy-go
|
||||
go-github-com-cevatbarisyilmaz-ara
|
||||
go-github-com-ryszard-goskiplist
|
||||
go-github-com-spf13-afero
|
||||
go-go-etcd-io-bbolt
|
||||
go-golang-org-x-tools
|
||||
go-gopkg-in-mgo-v2))
|
||||
(home-page "https://github.com/johannesboyne/gofakes3")
|
||||
(synopsis "Simple fake AWS S3 object storage")
|
||||
(description
|
||||
"AWS S3 fake server and testing library for extensive S3 test
|
||||
integrations. Either by running a test-server, e.g. for testing of AWS Lambda
|
||||
functions accessing S3. Or, to have a simple and convencience S3 mock- and
|
||||
test-server.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-jsimonetti-rtnetlink
|
||||
(package
|
||||
(name "go-github-com-jsimonetti-rtnetlink")
|
||||
@@ -11841,34 +11459,6 @@ forwarding and DNS resolution across host and VM boundaries.")
|
||||
the standard library.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-mrexodia-wray
|
||||
(package
|
||||
(name "go-github-com-mrexodia-wray")
|
||||
(version "0.0.0-20160318003008-78a2c1f284ff")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mrexodia/wray")
|
||||
(commit (go-version->git-ref version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "13fpq4sav9bb5g4vhq9lygimxzhslfp7nplfd5cyfgcxmckp5yrj"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:tests? #f ;tests are broken
|
||||
#:import-path "github.com/mrexodia/wray"))
|
||||
(native-inputs
|
||||
(list go-github-com-smartystreets-goconvey))
|
||||
(home-page "https://github.com/mrexodia/wray")
|
||||
(synopsis "Faye client for golang")
|
||||
(description
|
||||
"Wray is a client for the @url{http://faye.jcoglan.com/, Faye}
|
||||
publish-subscribe messaging service. It's alternative fork of
|
||||
@url{https://github.com/pythonandchips/wray}.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-muhlemmer-httpforwarded
|
||||
(package
|
||||
(name "go-github-com-muhlemmer-httpforwarded")
|
||||
@@ -17559,51 +17149,6 @@ lists)
|
||||
"Package sdk provides an auto-instrumentable @code{OpenTelemetry} SDK.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public go-go-opentelemetry-io-contrib-detectors-gcp
|
||||
(package
|
||||
(name "go-go-opentelemetry-io-contrib-detectors-gcp")
|
||||
(version "1.42.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/open-telemetry/opentelemetry-go-contrib")
|
||||
(commit (go-version->git-ref version #:subdir "detectors/gcp"))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "18k9pqwzlcjkiz8cy2hgl5jwal10ypj171hra4zsqizbqjivd4lc"))
|
||||
(modules '((guix build utils)
|
||||
(ice-9 ftw)
|
||||
(srfi srfi-26)))
|
||||
(snippet
|
||||
#~(begin
|
||||
(define (delete-all-but directory . preserve)
|
||||
(with-directory-excursion directory
|
||||
(let* ((pred (negate (cut member <>
|
||||
(cons* "." ".." preserve))))
|
||||
(items (scandir "." pred)))
|
||||
(for-each (cut delete-file-recursively <>) items))))
|
||||
(delete-all-but "detectors" "gcp")
|
||||
(delete-all-but "." "detectors")))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:skip-build? #t
|
||||
#:import-path "go.opentelemetry.io/contrib/detectors/gcp"
|
||||
#:unpack-path "go.opentelemetry.io/contrib"))
|
||||
(propagated-inputs
|
||||
(list go-cloud-google-com-go-compute-metadata
|
||||
go-github-com-google-go-cmp
|
||||
go-github-com-googlecloudplatform-opentelemetry-operations-go-detectors-gcp
|
||||
go-github-com-stretchr-testify
|
||||
go-go-opentelemetry-io-otel
|
||||
go-go-opentelemetry-io-otel-sdk))
|
||||
(home-page "https://go.opentelemetry.io/contrib")
|
||||
(synopsis "GCP Resource detector")
|
||||
(description
|
||||
"Package gcp provides a resource detector for GCP Cloud Function.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public go-go-opentelemetry-io-contrib-instrumentation-google-golang-org-grpc-otelgrpc
|
||||
(package
|
||||
(name
|
||||
@@ -18717,7 +18262,7 @@ an alternative fork of @url{https://github.com/mattbaird/jsonpatch}.")
|
||||
(define-public go-google-golang-org-api
|
||||
(package
|
||||
(name "go-google-golang-org-api")
|
||||
(version "0.272.0")
|
||||
(version "0.247.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -18726,7 +18271,7 @@ an alternative fork of @url{https://github.com/mattbaird/jsonpatch}.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1agvmw1sj2xy2p0ig2xdivn8i5pjnw93d2kq4hix7s5ysiswnpw4"))
|
||||
(base32 "19rj4m4qfc6lfik6p562a2nyf9mhmz0nfargpnvkcvdzi0rh350x"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
#~(begin
|
||||
@@ -18744,16 +18289,25 @@ an alternative fork of @url{https://github.com/mattbaird/jsonpatch}.")
|
||||
(list "TestLogDirectPathMisconfigAttrempDirectPathNotSet"
|
||||
"TestLogDirectPathMisconfigNotOnGCE"
|
||||
"TestNewClient"
|
||||
"TestNewTokenSource")
|
||||
"TestNewTokenSource"
|
||||
"TestNewTokenSource_WithCredentialJSON")
|
||||
"|"))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'remove-integration-tests
|
||||
(lambda* (#:key import-path #:allow-other-keys)
|
||||
;; Tests require network access and credential to reach external
|
||||
;; API.
|
||||
(with-directory-excursion (string-append "src/" import-path)
|
||||
(delete-file-recursively "integration-tests")))))))
|
||||
#:test-subdirs
|
||||
;; XXX: Remove when all dependencies are packaged.
|
||||
#~(list "."
|
||||
"google-api-go-generator/..."
|
||||
"googleapi/..."
|
||||
"impersonate/..."
|
||||
"internal/..."
|
||||
"iterator/..."
|
||||
"option/..."
|
||||
"support/bundler/..."
|
||||
"transport"
|
||||
"transport/grpc"
|
||||
"transport/http"
|
||||
"idtoken/..."
|
||||
"transport/grpc/..."
|
||||
"transport/http/...")))
|
||||
(propagated-inputs
|
||||
(list go-cloud-google-com-go-auth
|
||||
go-cloud-google-com-go-auth-oauth2adapt
|
||||
@@ -18769,7 +18323,7 @@ an alternative fork of @url{https://github.com/mattbaird/jsonpatch}.")
|
||||
go-golang-org-x-oauth2
|
||||
go-golang-org-x-sync
|
||||
go-golang-org-x-time
|
||||
go-google-golang-org-genproto-googleapis-bytestream
|
||||
;; go-google-golang-org-genproto-googleapis-bytestream
|
||||
go-google-golang-org-genproto-googleapis-rpc
|
||||
go-google-golang-org-grpc
|
||||
go-google-golang-org-protobuf))
|
||||
@@ -18799,7 +18353,6 @@ an alternative fork of @url{https://github.com/mattbaird/jsonpatch}.")
|
||||
;; Submodules with their own go.mod files and packaged separately:
|
||||
;;
|
||||
(delete-file-recursively "googleapis/api")
|
||||
(delete-file-recursively "googleapis/bytestream")
|
||||
(delete-file-recursively "googleapis/rpc")))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
@@ -18993,48 +18546,6 @@ interacting with Google's @code{gRPC} APIs.")
|
||||
"This package provides an API to interact with @acronym{GCP, Google Cloud Platform}.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public go-google-golang-org-genproto-googleapis-bytestream
|
||||
(package
|
||||
(name "go-google-golang-org-genproto-googleapis-bytestream")
|
||||
(version "0.0.0-20260316180232-0b37fe3546d5")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/googleapis/go-genproto")
|
||||
(commit (go-version->git-ref version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0yvcd9xiyarwmzgl70xqiaxxla3qiys1iysqajwmbrf8k4ghr26p"))
|
||||
(modules '((guix build utils)
|
||||
(ice-9 ftw)
|
||||
(srfi srfi-26)))
|
||||
(snippet
|
||||
#~(begin
|
||||
(define (delete-all-but directory . preserve)
|
||||
(with-directory-excursion directory
|
||||
(let* ((pred (negate (cut member <>
|
||||
(cons* "." ".." preserve))))
|
||||
(items (scandir "." pred)))
|
||||
(for-each (cut delete-file-recursively <>) items))))
|
||||
(delete-all-but "googleapis" "bytestream")
|
||||
(delete-all-but "." "googleapis")))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:go go-1.25
|
||||
#:import-path "google.golang.org/genproto/googleapis/bytestream"
|
||||
#:unpack-path "google.golang.org/genproto"))
|
||||
(propagated-inputs
|
||||
(list go-google-golang-org-grpc
|
||||
go-google-golang-org-protobuf))
|
||||
(home-page "https://google.golang.org/genproto")
|
||||
(synopsis "Bytestream implementation of Google Cloud Platform in Golang")
|
||||
(description
|
||||
"This package provides an Bytestream to interact with @acronym{GCP,
|
||||
Google Cloud Platform}.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public go-google-golang-org-grpc
|
||||
(package
|
||||
(name "go-google-golang-org-grpc")
|
||||
|
||||
@@ -2850,32 +2850,6 @@ Unified Format}.")
|
||||
(description "Package list implements a doubly linked list.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public go-github-com-baozisoftware-qrcode-terminal-go
|
||||
(package
|
||||
(name "go-github-com-baozisoftware-qrcode-terminal-go")
|
||||
(version "0.0.0-20170407111555-c0650d8dff0f")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/Baozisoftware/qrcode-terminal-go")
|
||||
(commit (go-version->git-ref version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "166h9zy9y7ygayhybg7d080hpdcf1mvkf3rwnq5lqg8i3cg71s7b"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "github.com/Baozisoftware/qrcode-terminal-go"))
|
||||
(propagated-inputs
|
||||
(list go-github-com-mattn-go-colorable
|
||||
go-github-com-skip2-go-qrcode))
|
||||
(home-page "https://github.com/Baozisoftware/qrcode-terminal-go")
|
||||
(synopsis "QRCode terminal for Golang")
|
||||
(description
|
||||
"This package implments a QR code generator for terminal for Golang.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public go-github-com-baulk-chardet
|
||||
(package
|
||||
(name "go-github-com-baulk-chardet")
|
||||
@@ -2901,31 +2875,6 @@ Unified Format}.")
|
||||
"The chardet package ports character set detection from ICU to Go.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-benmcclelland-sgio
|
||||
(package
|
||||
(name "go-github-com-benmcclelland-sgio")
|
||||
(version "0.0.0-20250710154739-45e823ff1f46")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/benmcclelland/sgio")
|
||||
(commit (go-version->git-ref version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1bkilgs6ikbgy31m0w2ixhv94mjcbicqnx8kl6mwddhb7qwznki8"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "github.com/benmcclelland/sgio"
|
||||
#:test-flags #~(list "-vet=off")))
|
||||
(home-page "https://github.com/benmcclelland/sgio")
|
||||
(synopsis "SCSI commands using SG_IO ioctl")
|
||||
(description
|
||||
"This package provides support for issuing SCSI commands with SG_IO
|
||||
ioctl.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-beorn7-perks
|
||||
(package
|
||||
(name "go-github-com-beorn7-perks")
|
||||
@@ -8273,43 +8222,6 @@ BIOS (@url{https://en.wikipedia.org/wiki/System_Management_BIOS, SMBIOS}) and
|
||||
Desktop Management Interface (DMI) data and structures.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public go-github-com-digitorus-timestamp
|
||||
(package
|
||||
(name "go-github-com-digitorus-timestamp")
|
||||
(version "0.0.0-20250524132541-c45532741eea")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/digitorus/timestamp")
|
||||
(commit (go-version->git-ref version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1bmnyhmymxhpvmygkcvvm9r2c2909hfrnafd3n19d0rxgl21lvhk"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
#~(begin
|
||||
;; Fix example function name: ExampleCreateRequest_ParseResponse
|
||||
;; implies a method ParseResponse on type CreateRequest, but both
|
||||
;; are standalone functions. Rename to a valid package example.
|
||||
(substitute* "timestamp_example_test.go"
|
||||
(("ExampleCreateRequest_ParseResponse") "Example"))))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "github.com/digitorus/timestamp"
|
||||
;; Skip example test that requires network access to freetsa.org.
|
||||
#:test-flags #~(list "-skip" "Example")))
|
||||
(propagated-inputs
|
||||
(list go-github-com-digitorus-pkcs7))
|
||||
(home-page "https://github.com/digitorus/timestamp")
|
||||
(synopsis "RFC3161 Time-Stamp Protocol implementation for Go")
|
||||
(description
|
||||
"This package implements the Time-Stamp Protocol (TSP) as specified in
|
||||
@url{https://www.rfc-editor.org/rfc/rfc3161, RFC3161} (Internet X.509 Public
|
||||
Key Infrastructure Time-Stamp Protocol).")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public go-github-com-dimchansky-utfbom
|
||||
(package
|
||||
(name "go-github-com-dimchansky-utfbom")
|
||||
@@ -9884,31 +9796,6 @@ quoting, commenting, and escaping.")
|
||||
(home-page "https://github.com/flynn-archive/go-shlex")
|
||||
(license license:asl2.0))))
|
||||
|
||||
(define-public go-github-com-flynn-go-docopt
|
||||
(package
|
||||
(name "go-github-com-flynn-go-docopt")
|
||||
(version "0.0.0-20140912013429-f6dd2ebbb31e")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/flynn/go-docopt")
|
||||
(commit (go-version->git-ref version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "07s8fvnab40mcfmlsgrrddgvrirgm1krb7kaqgipcikjcmj8j6ql"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "github.com/flynn/go-docopt"
|
||||
#:test-subdirs #~(list ".")))
|
||||
(home-page "https://github.com/flynn/go-docopt")
|
||||
(synopsis "Docopt command-line argument parser")
|
||||
(description
|
||||
"Package docopt parses command-line arguments based on a help message.
|
||||
It's an alternative fork of @url{https://github.com/docopt/docopt.go}.")
|
||||
(license license:expat)))
|
||||
|
||||
;; XXX: This project isn't maintained upstream, consider to find alternative
|
||||
;; fork, see <https://github.com/fogleman/gg/issues/185> and remove the
|
||||
;; package when it has no users.
|
||||
@@ -16271,27 +16158,6 @@ in memory. The library operates on channels and uses temporary disk storage
|
||||
to handle datasets larger than available RAM.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
;; For s5cmd@2.3.0, remove when a fresh version is released.
|
||||
(define-public go-github-com-lanrat-extsort-1.0.2
|
||||
(hidden-package
|
||||
(package
|
||||
(inherit go-github-com-lanrat-extsort)
|
||||
(name "go-github-com-lanrat-extsort")
|
||||
(version "1.0.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/lanrat/extsort")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0blsif4qzmmlqxhgc6dyl7rn9zws7mvlc6ckjj43cxlp517ravk8"))))
|
||||
(arguments
|
||||
(list
|
||||
#:tests? #f
|
||||
#:import-path "github.com/lanrat/extsort")))))
|
||||
|
||||
(define-public go-github-com-layeh-gopher-luar
|
||||
(package
|
||||
(name "go-github-com-layeh-gopher-luar")
|
||||
@@ -17558,34 +17424,6 @@ to handle ANSI color escapes on Windows.")
|
||||
whether a file descriptor points to a terminal and the type of the terminal.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-mattn-go-localereader
|
||||
(package
|
||||
(name "go-github-com-mattn-go-localereader")
|
||||
(version "0.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mattn/go-localereader")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0wcgqnpjk0drm7swc0q27j4r5ab63mhz29dgbjdnyn4sw68rqm96"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "github.com/mattn/go-localereader"
|
||||
;; Tests reference NewCodePageDecoder which is only defined in
|
||||
;; localereader_windows.go and doesn't compile on non-Windows.
|
||||
#:tests? #f))
|
||||
(home-page "https://github.com/mattn/go-localereader")
|
||||
(synopsis "CodePage decoder for Windows")
|
||||
(description
|
||||
"This package provides a CodePage decoder for Windows, enabling Go programs
|
||||
to read locale-specific character encodings such as Shift JIS. It handles
|
||||
locale reading differently across Unix and Windows systems.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-mattn-go-pointer
|
||||
(package
|
||||
(name "go-github-com-mattn-go-pointer")
|
||||
@@ -19396,34 +19234,6 @@ Data type that can be converted:
|
||||
@end itemize")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public go-github-com-muhammadmuzzammil1998-jsonc
|
||||
(package
|
||||
(name "go-github-com-muhammadmuzzammil1998-jsonc")
|
||||
(version "1.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/muhammadmuzzammil1998/jsonc")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "037xi03p46hnfwwh5ylnkzm859h9bi3yn451647y4ghzjbwii1g4"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "github.com/muhammadmuzzammil1998/jsonc"))
|
||||
(home-page "https://github.com/muhammadmuzzammil1998/jsonc")
|
||||
(synopsis "JSON with comments parser for Go")
|
||||
(description
|
||||
"JSONC is a superset of JSON which supports comments. JSON formatted
|
||||
files are readable to humans but the lack of comments decreases readability.
|
||||
With JSONC, you can use block (@code{/* */}) and single line (@code{//} or
|
||||
@code{#}) comments to describe functionality. Microsoft VS Code also uses
|
||||
this format in configuration files like @file{settings.json},
|
||||
@file{keybindings.json}, and @file{launch.json}.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-muhlemmer-gu
|
||||
(package
|
||||
(name "go-github-com-muhlemmer-gu")
|
||||
@@ -24997,34 +24807,6 @@ standard library.")
|
||||
"This package provides XOR bitwise code engine.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-termie-go-shutil
|
||||
(package
|
||||
(name "go-github-com-termie-go-shutil")
|
||||
(version "0.0.0-20140729215957-bcacb06fecae")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/termie/go-shutil")
|
||||
(commit (go-version->git-ref version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0xwdx3qiqxm1bmlzqlf1cgdmrkmmahhdm2piikyhw8cbl3wdih82"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "github.com/termie/go-shutil"
|
||||
#:test-flags
|
||||
;; shutil_test.go:101: open test/testfile3: permission denied
|
||||
#~(list "-skip" "TestCopy")))
|
||||
(home-page "https://github.com/termie/go-shutil")
|
||||
(synopsis "Golang port of Python's shutil")
|
||||
(description
|
||||
"This package implements a direct port of a few of the functions from
|
||||
Python's @url{https://docs.python.org/3/library/shutil.html, shutil} package
|
||||
for high-level filesystem operations.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-texttheater-golang-levenshtein
|
||||
(package
|
||||
(name "go-github-com-texttheater-golang-levenshtein")
|
||||
@@ -29569,57 +29351,6 @@ decimal arithmetic.")
|
||||
(description "Go library for ini files")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public go-gopkg-in-mgo-v2
|
||||
;; XXX: Upstream note - UNMAINTAINED
|
||||
;; Suggested alternatives:
|
||||
;; - https://github.com/globalsign/mgo
|
||||
;; Community supported fork of mgo.
|
||||
;; - https://github.com/coreos/bbolt
|
||||
;; Single file in-memory document database for Go.
|
||||
;; - https://github.com/dgraph-io/badger
|
||||
;; Fast in-memory document database for Go.
|
||||
;; - https://github.com/dgraph-io/dgraph
|
||||
;; Distributed graph database on top of Badger.
|
||||
;; - https://github.com/lib/pq
|
||||
;; PostgreSQL driver in pure Go.
|
||||
(package
|
||||
(name "go-gopkg-in-mgo-v2")
|
||||
(version "2016.08.01")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/go-mgo/mgo")
|
||||
(commit (string-append "r" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0rwbi1z63w43b0z9srm8m7iz1fdwx7bq7n2mz862d6liiaqa59jd"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "gopkg.in/mgo.v2"
|
||||
#:test-flags
|
||||
#~(list "-vet=off"
|
||||
;; Panic: runtime error: invalid memory address or nil pointer
|
||||
;; dereference (PC=0x47ADB1)
|
||||
"-skip" "TestAll")
|
||||
#:test-subdirs
|
||||
;; internal/sasl/sasl.go needs <sasl/sasl.h> header.
|
||||
#~(list "internal/json/..."
|
||||
"internal/scram/...")))
|
||||
(native-inputs
|
||||
(list go-gopkg-in-check-v1
|
||||
go-gopkg-in-yaml-v2))
|
||||
(propagated-inputs
|
||||
(list go-gopkg-in-tomb-v2))
|
||||
(home-page "https://labix.org/mgo")
|
||||
(synopsis "Rich MongoDB driver for Go")
|
||||
(description
|
||||
"@command{mgo} (pronounced as mango) is a MongoDB driver for the Go
|
||||
language that implements a rich and well tested selection of features under a
|
||||
very simple API following standard Go idioms.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-gopkg-in-natefinch-lumberjack-v2
|
||||
(package
|
||||
(name "go-gopkg-in-natefinch-lumberjack-v2")
|
||||
@@ -29687,25 +29418,6 @@ very simple API following standard Go idioms.")
|
||||
termination.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public go-gopkg-in-tomb-v2
|
||||
(package
|
||||
(inherit go-gopkg-in-tomb-v1)
|
||||
(name "go-gopkg-in-tomb-v2")
|
||||
(version "2.0.0-20161208151619-d5d1b5820637")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/go-tomb/tomb")
|
||||
(commit (go-version->git-ref version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1sv15sri99szkdz1bkh0ir46w9n8prrwx5hfai13nrhkawfyfy10"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(substitute-keyword-arguments arguments
|
||||
((#:import-path _) "gopkg.in/tomb.v2")))))
|
||||
|
||||
(define-public go-gopkg-in-validator-v2
|
||||
(package
|
||||
(name "go-gopkg-in-validator-v2")
|
||||
|
||||
@@ -2763,7 +2763,7 @@ Some feature highlights:
|
||||
(define-public openxr
|
||||
(package
|
||||
(name "openxr")
|
||||
(version "1.1.57")
|
||||
(version "1.0.26")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -2781,7 +2781,7 @@ Some feature highlights:
|
||||
; ;; Delete bundled jsoncpp.
|
||||
; (delete-file-recursively "src/external/jsoncpp")))
|
||||
(sha256
|
||||
(base32 "1s4cg0cl6cn98d3cvgvwsichic4q3bx34flbdklnzprc18vmaqv7"))))
|
||||
(base32 "0s66xgwkdj5vn05l493hqydrxfpxxidd6mcb8l7l5awhn88cy16f"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ; there are no tests
|
||||
|
||||
+26
-36
@@ -578,10 +578,7 @@ This package provides the core library and elements.")
|
||||
(substitute* "tests/check/meson.build"
|
||||
;; This test causes nondeterministic failures (see:
|
||||
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/895>).
|
||||
((".*'elements/appsrc.c'.*") "")
|
||||
;; This one is flaky (see:
|
||||
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/work_items/5016>).
|
||||
((".*'elements/inputselector.c'.*") ""))
|
||||
((".*'elements/appsrc.c'.*") ""))
|
||||
;; Some other tests fail on other architectures.
|
||||
#$@(cond
|
||||
((target-x86-32?)
|
||||
@@ -769,8 +766,7 @@ model to base your own plug-in on, here it is.")
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:configure-flags #~(list "-Dgpl=enabled"
|
||||
"-Dsctp-internal-usrsctp=disabled"
|
||||
#:configure-flags #~(list "-Dsctp-internal-usrsctp=disabled"
|
||||
;; TODO: Figure out why audiovisualizer test
|
||||
;; fails on riscv64-linux.
|
||||
#$@(if (target-riscv64?)
|
||||
@@ -780,15 +776,6 @@ model to base your own plug-in on, here it is.")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
#$@%common-gstreamer-phases
|
||||
(add-after 'unpack 'patch-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "ext/resindvd/resindvdsrc.c"
|
||||
;; `g_module_open' is a wrapper above dlopen; pass it the
|
||||
;; absolute file name of the library to ensure it is always
|
||||
;; found.
|
||||
(("\"libdvdcss\"")
|
||||
(format #f "~s"
|
||||
(search-input-file inputs "lib/libdvdcss.so"))))))
|
||||
(add-after 'unpack 'adjust-tests
|
||||
(lambda* (#:key native-inputs inputs #:allow-other-keys)
|
||||
(let ((gst-plugins-good (assoc-ref (or native-inputs inputs)
|
||||
@@ -802,18 +789,18 @@ model to base your own plug-in on, here it is.")
|
||||
|
||||
;; The 'elements_shm.test_shm_live' test sometimes times out
|
||||
;; (see:
|
||||
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/790>).
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/790).
|
||||
((".*'elements/shm\\.c'.*") "")
|
||||
|
||||
;; The 'elements_curlhttpsrc' test sometimes times out.
|
||||
((".*'elements/curlhttpsrc\\.c'.*") "")
|
||||
|
||||
;; The 'mxfdemux' test fails for unknown reasons (see:
|
||||
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3921>).
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3921).
|
||||
((".*'elements/mxfdemux.c'.*") "")
|
||||
|
||||
;; Unexpected critical/warning, see
|
||||
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/792>
|
||||
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3000>
|
||||
((".*'elements/netsim\\.c'.*") "")
|
||||
|
||||
;; TODO: Figure out why this test fails on riscv64-linux.
|
||||
@@ -822,19 +809,30 @@ model to base your own plug-in on, here it is.")
|
||||
"'elements/viewfinderbin.c'], true, ],"))
|
||||
'())
|
||||
|
||||
;; This test is flaky.
|
||||
;; This test is flaky on at least some architectures.
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1244
|
||||
(("'elements/camerabin\\.c'\\].*],")
|
||||
"'elements/camerabin.c'], true, ],")
|
||||
#$@(if (member (%current-system)
|
||||
'("aarch64-linux" "riscv64-linux"))
|
||||
`((("'elements/camerabin\\.c'\\].*],")
|
||||
"'elements/camerabin.c'], true, ],"))
|
||||
'())
|
||||
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1412
|
||||
((".*elements/dtls\\.c.*") "")
|
||||
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3921
|
||||
((".*elements/mxfdemux\\.c.*") "")
|
||||
|
||||
;; Unable to create pipeline 'bin.
|
||||
;; ( vulkanupload ! vulkancolorconvert ! vulkandownload )':
|
||||
;; no element "vulkanupload"
|
||||
((".*elements/vkcolorconvert\\.c.*") "")
|
||||
((".*elements/vkupload\\.c.*") "")))))
|
||||
((".*elements/vkupload\\.c.*") ""))
|
||||
(substitute* "tests/check/elements/zxing.c"
|
||||
;; zxing 1.2.0 seemingly changed the type representation of
|
||||
;; the EAN_13 structure; disable it.
|
||||
((".*\"EAN_13\".*")
|
||||
"")))))
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
;; Tests require a running X server.
|
||||
@@ -1004,6 +1002,10 @@ par compared to the rest.")
|
||||
"-Dquinn=disabled" ;test fails
|
||||
"-Dskia=disabled" ;attempts to download binaries
|
||||
"-Dsodium-source=system"
|
||||
;; The 'spotify' option causes the build error: "the trait
|
||||
;; bound `vergen::feature::build::Build:
|
||||
;; vergen_lib::entries::Add` is not satisfied"
|
||||
"-Dspotify=disabled"
|
||||
"-Dtests=enabled"
|
||||
"-Dtracers=disabled" ;test fails
|
||||
"-Dthreadshare=disabled" ;test fails
|
||||
@@ -1039,8 +1041,7 @@ par compared to the rest.")
|
||||
(apply (assoc-ref cargo:%standard-phases phase)
|
||||
#:cargo-target #$(cargo-triplet)
|
||||
args))
|
||||
'(prepare-rust-crates
|
||||
unpack-rust-crates
|
||||
'(unpack-rust-crates
|
||||
configure
|
||||
check-for-pregenerated-files
|
||||
patch-cargo-checksums))))
|
||||
@@ -1060,8 +1061,7 @@ par compared to the rest.")
|
||||
"libgstlewton.so"
|
||||
"libgstrsaudiofx.so"
|
||||
"libgstrsaudioparsers.so"
|
||||
"libgstspeechmatics.so"
|
||||
"libgstspotify.so"))
|
||||
"libgstspeechmatics.so"))
|
||||
(,#$output:net
|
||||
. ("libgstdeepgram.so"
|
||||
"libgsthlsmultivariantsink.so"
|
||||
@@ -1164,19 +1164,9 @@ after their category.")
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
|
||||
#:configure-flags #~(list "-Dgpl=enabled")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
#$@%common-gstreamer-phases
|
||||
(add-after 'unpack 'patch-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "ext/dvdread/dvdreadsrc.c"
|
||||
;; `g_module_open' is a wrapper above dlopen; pass it the
|
||||
;; absolute file name of the library to ensure it is always
|
||||
;; found.
|
||||
(("\"libdvdcss\"")
|
||||
(format #f "~s"
|
||||
(search-input-file inputs "lib/libdvdcss.so"))))))
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
;; Tests require a running X server.
|
||||
|
||||
+8
-15
@@ -1123,7 +1123,7 @@ application suites.")
|
||||
(define-public gtk
|
||||
(package
|
||||
(name "gtk")
|
||||
(version "4.22.1")
|
||||
(version "4.20.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@@ -1131,11 +1131,9 @@ application suites.")
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1z2mkmazc2d51jbg3qwwdycycqiwswm88nhw6bxscz8j86f5lyyd"))
|
||||
(base32 "0ly1gqc6ybxv5f2a9hvjp5k6l9mfzy2yv8iy2xqnr9l8628g4wr8"))
|
||||
(patches
|
||||
(search-patches "gtk4-demo-reproducible.patch"
|
||||
"gtk4-needs-udmabuf.patch"
|
||||
"gtk4-respect-GUIX_GTK4_PATH.patch"))
|
||||
(search-patches "gtk4-respect-GUIX_GTK4_PATH.patch"))
|
||||
(modules '((guix build utils)))))
|
||||
(build-system meson-build-system)
|
||||
(outputs '("out" "bin" "doc"))
|
||||
@@ -1203,9 +1201,6 @@ application suites.")
|
||||
(("[ \t]*'empty-text.node',") "")
|
||||
(("[ \t]*'testswitch.node',") "")
|
||||
(("[ \t]*'widgetfactory.node',") "")
|
||||
;; The gtklistitemmanager test is flaky (see:
|
||||
;; <https://gitlab.gnome.org/GNOME/gtk/-/issues/6547>).
|
||||
((".*'gtklistitemmanager.c',.*") "")
|
||||
;; XXX: Figure out why this fails and report upstream.
|
||||
((".*'memorytexture',.*") "")
|
||||
((".*'yuv-matrix-dmabuf',.*") ""))
|
||||
@@ -1262,10 +1257,8 @@ application suites.")
|
||||
(setenv "XDG_CACHE_HOME" (getcwd))))
|
||||
(add-before 'check 'pre-check
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; Tests require a running X server. The '-noreset' option is
|
||||
;; necessary to avoid spurious "Failed to open display" test
|
||||
;; errors.
|
||||
(system "Xvfb :1 +extension GLX -screen 0 1024x768x24 -noreset &")
|
||||
;; Tests require a running X server.
|
||||
(system "Xvfb :1 +extension GLX &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
;; Tests write to $HOME.
|
||||
(setenv "HOME" (getcwd))
|
||||
@@ -1308,7 +1301,6 @@ application suites.")
|
||||
docbook-xsl
|
||||
gettext-minimal
|
||||
`(,glib "bin")
|
||||
glibc-utf8-locales ;some tests require en_US.UTF-8
|
||||
gobject-introspection ;for building introspection data
|
||||
graphene
|
||||
gtk-doc/stable ;for building documentation
|
||||
@@ -1332,6 +1324,7 @@ application suites.")
|
||||
(inputs
|
||||
(list colord ;for color printing support
|
||||
cups ;for CUPS print-backend
|
||||
ffmpeg ;for ffmpeg media-backend
|
||||
fribidi
|
||||
gi-docgen
|
||||
gstreamer ;for gstreamer media-backend
|
||||
@@ -1375,8 +1368,8 @@ application suites.")
|
||||
(native-search-paths
|
||||
(list
|
||||
(search-path-specification
|
||||
(variable "GUIX_GTK4_PATH")
|
||||
(files '("lib/gtk-4.0")))))
|
||||
(variable "GUIX_GTK4_PATH")
|
||||
(files '("lib/gtk-4.0")))))
|
||||
(search-paths native-search-paths)
|
||||
(home-page "https://www.gtk.org/")
|
||||
(synopsis "Cross-platform widget toolkit")
|
||||
|
||||
@@ -918,7 +918,7 @@ generate API documentation for GNU Guile projects.")
|
||||
(define-public guile-dotenv
|
||||
(package
|
||||
(name "guile-dotenv")
|
||||
(version "0.3.1")
|
||||
(version "0.2.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -927,7 +927,7 @@ generate API documentation for GNU Guile projects.")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0j2m9nnjp7096gdy2b038p7wrx93hgw6i6rfy4gh9hkvk4q43b1m"))))
|
||||
(base32 "1zgc9xwpz6w64rbndvl8c73lsx935byin921209acyw54j52g706"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
@@ -948,6 +948,7 @@ generate API documentation for GNU Guile projects.")
|
||||
pkg-config
|
||||
texinfo))
|
||||
(inputs (list guile-3.0))
|
||||
(propagated-inputs (list nyacc))
|
||||
(synopsis "Read environment variables specifications from @code{.env} files")
|
||||
(description "This package provides a simple Guile interface to @code{.env}
|
||||
(or dotenv) files. It implements parsing of files and setting environment
|
||||
@@ -989,7 +990,8 @@ variables from them.")
|
||||
(assoc-ref inputs input)
|
||||
path))
|
||||
(list "guile-config"
|
||||
"guile-dotenv"))))))
|
||||
"guile-dotenv"
|
||||
"nyacc"))))))
|
||||
(bin (string-append (ungexp output) "/bin/")))
|
||||
(wrap-program (string-append bin "dotenv")
|
||||
(dep-path "GUILE_LOAD_PATH" site)
|
||||
|
||||
@@ -900,7 +900,7 @@ type system, elevating types to first-class status.")
|
||||
(define-public guile-git
|
||||
(package
|
||||
(name "guile-git")
|
||||
(version "0.11.0")
|
||||
(version "0.10.0")
|
||||
(home-page "https://gitlab.com/guile-git/guile-git.git")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
@@ -910,7 +910,7 @@ type system, elevating types to first-class status.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1yjyil6z4k80pjdps8v6h6lxikwxmjxvrslf2jrmq2rrfnajschz"))))
|
||||
"01scznpg7356ygdlgn1f2892bwg6fsvp37hbmsk4gsg0g49aj4la"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags '("GUILE_AUTO_COMPILE=0") ; to prevent guild warnings
|
||||
|
||||
@@ -112,7 +112,6 @@
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system glib-or-gtk)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system go)
|
||||
#:use-module (guix build-system guile)
|
||||
#:use-module (guix build-system meson)
|
||||
#:use-module (guix build-system perl)
|
||||
@@ -311,38 +310,6 @@ sharing.")
|
||||
(define-deprecated-package barrier
|
||||
deskflow)
|
||||
|
||||
(define-public hd-idle
|
||||
(package
|
||||
(name "hd-idle")
|
||||
(version "1.22")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri
|
||||
(git-reference
|
||||
(url "https://github.com/adelolmo/hd-idle")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "12nckzp00b3y91igp8jzlf6as353la6ar8gp6b646kn9gi2hrla3"))
|
||||
(snippet
|
||||
#~(begin
|
||||
(use-modules (guix build utils))
|
||||
(delete-file-recursively "vendor")))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list #:import-path "github.com/adelolmo/hd-idle"
|
||||
#:install-source? #f))
|
||||
(inputs
|
||||
(list go-github-com-benmcclelland-sgio))
|
||||
(home-page "https://github.com/adelolmo/hd-idle")
|
||||
(synopsis "Spin down idle hard disks")
|
||||
(description "@command{hd-idle} is a utility program for spinning down
|
||||
external disks after a period of idle time. Since most USB hard drives do not
|
||||
support setting the idle timer via @command{hdparm}, hd-idle can be used as a
|
||||
workaround.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public hw-probe
|
||||
(package
|
||||
(name "hw-probe")
|
||||
|
||||
@@ -1133,7 +1133,6 @@ IBus-Table on IBus framework:
|
||||
(string-append out "/libexec/ibus-setup-stt")))))))))
|
||||
(inputs
|
||||
(list bash-minimal
|
||||
gst-plugins-good ; for pulsesrc
|
||||
gst-vosk
|
||||
gstreamer
|
||||
gtk
|
||||
|
||||
@@ -96,7 +96,6 @@
|
||||
#:use-module (gnu packages golang-xyz)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages graphics)
|
||||
#:use-module (gnu packages haskell-xyz)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages image-processing)
|
||||
#:use-module (gnu packages imagemagick)
|
||||
@@ -117,7 +116,6 @@
|
||||
#:use-module (gnu packages python-web)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages qt)
|
||||
#:use-module (gnu packages sqlite)
|
||||
#:use-module (gnu packages suckless)
|
||||
#:use-module (gnu packages stb)
|
||||
#:use-module (gnu packages terminals)
|
||||
@@ -249,7 +247,7 @@ YouTube videos without requiring API and opens/downloads them using mpv/ytdl.")
|
||||
(define-public feh
|
||||
(package
|
||||
(name "feh")
|
||||
(version "3.11.3")
|
||||
(version "3.10.3")
|
||||
(home-page "https://feh.finalrewind.org/")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
@@ -257,7 +255,7 @@ YouTube videos without requiring API and opens/downloads them using mpv/ytdl.")
|
||||
name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0qqha3k1pivrw8kr6alk3l92qh75cgynb4vsvg024fa359cs7k7j"))))
|
||||
"1j79850gwrjamgc22cv1hiynia4w5lc8qbhww3qpl8bhjxwy49jl"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:phases
|
||||
@@ -1053,67 +1051,6 @@ synchronization of multiple instances.")
|
||||
(home-page "https://nomacs.org/")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public timg
|
||||
(package
|
||||
(name "timg")
|
||||
(version "1.6.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/hzeller/timg")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0xr3g6my2n9ry5mqiw1qvf7m0lpmj20h2xsnh75653ha83wqxmhm"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Remove bundled sources
|
||||
#~(begin
|
||||
(delete-file-recursively "third_party") #t))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:configure-flags
|
||||
#~'("-Wno-dev" "-DWITH_OPENSLIDE_SUPPORT=ON")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-before 'configure 'fix-stb-path
|
||||
;; This package expects stb-image to be at stb/stb_image.h, but
|
||||
;; Guix puts it at stb_image.h instead
|
||||
(lambda _
|
||||
(substitute* "src/CMakeLists.txt"
|
||||
(("stb/stb")
|
||||
"stb"))
|
||||
(substitute* "src/stb-image-source.cc"
|
||||
(("#include \"stb/stb_image.h\"")
|
||||
"#include \"stb_image.h\"")))))
|
||||
#:tests? #f)) ;No tests
|
||||
(inputs (list cairo
|
||||
ffmpeg
|
||||
graphicsmagick
|
||||
libdeflate
|
||||
libdicom
|
||||
libexif
|
||||
libjpeg-turbo
|
||||
librsvg
|
||||
libsixel
|
||||
libxml2
|
||||
openjpeg
|
||||
openslide
|
||||
poppler
|
||||
qoi
|
||||
sqlite
|
||||
stb-image))
|
||||
(native-inputs (list git pandoc pkg-config))
|
||||
(home-page "https://timg.sh/")
|
||||
(synopsis "Terminal image and video viewer")
|
||||
(description
|
||||
"This package provides a user-friendly terminal image viewer that uses
|
||||
graphic capabilities of terminals (Sixel, Kitty or iterm2), or 24-Bit color
|
||||
capabilities and unicode character blocks if these are not available.")
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public xzgv
|
||||
(package
|
||||
(name "xzgv")
|
||||
|
||||
@@ -74,7 +74,6 @@
|
||||
#:use-module (gnu packages cpp)
|
||||
#:use-module (gnu packages curl)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages datastructures)
|
||||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages fontutils)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
@@ -107,7 +106,6 @@
|
||||
#:use-module (gnu packages qt)
|
||||
#:use-module (gnu packages ragel)
|
||||
#:use-module (gnu packages sphinx)
|
||||
#:use-module (gnu packages sqlite)
|
||||
#:use-module (gnu packages swig)
|
||||
#:use-module (gnu packages textutils)
|
||||
#:use-module (gnu packages video)
|
||||
@@ -247,29 +245,6 @@ code is Valgrind-clean and unit tested.")
|
||||
(home-page "https://sourceforge.net/projects/iqa/")
|
||||
(license license:bsd-4)))
|
||||
|
||||
(define-public libdicom
|
||||
(package
|
||||
(name "libdicom")
|
||||
(version "1.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ImagingDataCommons/libdicom")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0l1z8riv7lrw65nswq8lvyvnxn5vc06gydwc96gj3ywb1gcqv831"))))
|
||||
(build-system meson-build-system)
|
||||
(inputs (list check uthash))
|
||||
(native-inputs (list pkg-config))
|
||||
(home-page "https://github.com/ImagingDataCommons/libdicom")
|
||||
(synopsis "C library for reading DICOM files")
|
||||
(description
|
||||
"This package is a C library and a set of command-line tools for reading
|
||||
DICOM WSI files.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public libpng
|
||||
(package
|
||||
(name "libpng")
|
||||
@@ -1134,41 +1109,6 @@ JPEG 2000 Reference Software.")
|
||||
(home-page "https://github.com/uclouvain/openjpeg")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public openslide
|
||||
(package
|
||||
(name "openslide")
|
||||
(version "4.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/openslide/openslide")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "00gc530g0lxm2lhwq249w97021w1v1y9ybqs2z5l1z922s15rhl2"))))
|
||||
(build-system meson-build-system)
|
||||
(inputs (list cairo
|
||||
gdk-pixbuf
|
||||
glib
|
||||
libdicom
|
||||
libjpeg-turbo
|
||||
libpng
|
||||
libtiff
|
||||
libxml2
|
||||
openjpeg
|
||||
sqlite
|
||||
zlib
|
||||
zstd))
|
||||
(native-inputs (list pkg-config))
|
||||
(home-page "https://openslide.org/")
|
||||
(synopsis "C library for reading slide image files")
|
||||
(description
|
||||
"OpenSlide is a C library for reading whole slide image files (also known
|
||||
as virtual slides). It provides a consistent and simple API for reading files
|
||||
from multiple vendors.")
|
||||
(license license:lgpl2.1)))
|
||||
|
||||
(define-public giflib
|
||||
(package
|
||||
(name "giflib")
|
||||
@@ -2028,34 +1968,6 @@ possible, all formats supported by the PNG standard are represented.")
|
||||
use, copy, modify and distribute these images for any purpose and without fee
|
||||
is hereby granted."))))
|
||||
|
||||
(define-public qoi
|
||||
(let ((commit "6fff9b70dd79b12f808b0acc5cb44fde9998725e")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "qoi")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/phoboslab/qoi")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "078zasncyylgnwx6br82nkjssl82wygz6fh8zm65fbfpadzfa3x7"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:install-plan
|
||||
#~'(("qoi.h" "include/"))
|
||||
#:tests? #f)) ;No tests
|
||||
(home-page "https://qoiformat.org")
|
||||
(synopsis "Library for the QOI image format")
|
||||
(description
|
||||
"This package provides a library for the QOI image format, offering
|
||||
fast, lossless image compression.")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public libjpeg-turbo
|
||||
(package
|
||||
(name "libjpeg-turbo")
|
||||
|
||||
+9
-10
@@ -14,7 +14,7 @@
|
||||
;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
|
||||
;;; Copyright © 2022 jgart <jgart@dismail.de>
|
||||
;;; Copyright © 2023, 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2024-2026 Ashish SHUKLA <ashish.is@lostca.se>
|
||||
;;; Copyright © 2024, 2025 Ashish SHUKLA <ashish.is@lostca.se>
|
||||
;;; Copyright © 2024 Christian Miller <christian.miller@dadoes.de>
|
||||
;;; Copyright © 2024 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2025 Zheng Junjie <z572@z572.online>
|
||||
@@ -348,7 +348,7 @@ Conferencing} and @acronym{ICB, Internet Citizen's Band}.")
|
||||
(define-public weechat
|
||||
(package
|
||||
(name "weechat")
|
||||
(version "4.9.0")
|
||||
(version "4.8.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@@ -357,7 +357,7 @@ Conferencing} and @acronym{ICB, Internet Citizen's Band}.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1pwayhpnyd6nq1sph4hqi43xwqgq6vj6fr8q0xqn0jx5zzjlyx8c"))))
|
||||
"06lmbd27fdj7z7v6m096csswp73354516z64apfyz8lr5kh140wq"))))
|
||||
(build-system cmake-build-system)
|
||||
(outputs '("out" "doc"))
|
||||
(native-inputs
|
||||
@@ -393,13 +393,12 @@ Conferencing} and @acronym{ICB, Internet Citizen's Band}.")
|
||||
#~(modify-phases %standard-phases
|
||||
#$@(if (target-x86?)
|
||||
#~((add-after 'install 'move-doc
|
||||
(lambda _
|
||||
(let ((from (string-append #$output
|
||||
"/share/doc/weechat"))
|
||||
(to (string-append #$output:doc
|
||||
"/share/doc/weechat")))
|
||||
(mkdir-p (string-append #$output:doc
|
||||
"/share/doc"))
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(doc (assoc-ref outputs "doc"))
|
||||
(from (string-append out "/share/doc/weechat"))
|
||||
(to (string-append doc "/share/doc/weechat")))
|
||||
(mkdir-p (string-append doc "/share/doc"))
|
||||
(rename-file from to)))))
|
||||
#~()))))
|
||||
(synopsis "Extensible chat client")
|
||||
|
||||
@@ -1177,7 +1177,6 @@ new Date();"))))
|
||||
fontconfig
|
||||
freetype
|
||||
giflib
|
||||
gtk+
|
||||
lcms
|
||||
elfutils
|
||||
libjpeg-turbo
|
||||
@@ -1548,7 +1547,6 @@ new Date();"))))
|
||||
fontconfig
|
||||
freetype
|
||||
giflib
|
||||
gtk+
|
||||
lcms
|
||||
libjpeg-turbo
|
||||
libpng
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
|
||||
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
|
||||
;;; Copyright © 2023-2026 Sughosha <sughosha@disroot.org>
|
||||
;;; Copyright © 2023-2025 Sughosha <sughosha@disroot.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@@ -70,7 +70,6 @@
|
||||
#:use-module (gnu packages sqlite)
|
||||
#:use-module (gnu packages gcc)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages video)
|
||||
#:use-module (gnu packages wget)
|
||||
#:use-module (gnu packages xdisorg)
|
||||
#:use-module (gnu packages xml))
|
||||
@@ -2105,83 +2104,6 @@ information in non-ASCII character sets.")
|
||||
application \"Parts\" to be embedded as a Kontact component (or plugin).")
|
||||
(license license:lgpl2.0+)))
|
||||
|
||||
(define-public kalarm
|
||||
(package
|
||||
(name "kalarm")
|
||||
(version "25.12.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kalarm-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0g8frgnpzbr2npx7i28271yfcv7yqx4h6bzmkgxip1chhycjwps5"))))
|
||||
(build-system qt-build-system)
|
||||
(arguments
|
||||
(list #:qtbase qtbase
|
||||
;; There are only 2 tests, kadatetimetest and kaeventtest, which
|
||||
;; fail due to be unable to determine system time zone.
|
||||
#:tests? #f
|
||||
#:configure-flags
|
||||
#~(list "-DENABLE_LIBVLC=OFF"))) ;Use only mpv
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools pkg-config))
|
||||
(inputs
|
||||
(list akonadi
|
||||
akonadi-contacts
|
||||
akonadi-mime
|
||||
grantleetheme
|
||||
kauth
|
||||
kcalendarcore
|
||||
kcalutils
|
||||
kcodecs
|
||||
kcompletion
|
||||
kconfig
|
||||
kconfigwidgets
|
||||
kcontacts
|
||||
kcrash
|
||||
kdbusaddons
|
||||
kglobalaccel
|
||||
kguiaddons
|
||||
kholidays
|
||||
ki18n
|
||||
kiconthemes
|
||||
kidentitymanagement
|
||||
kio
|
||||
kitemmodels
|
||||
kitemviews
|
||||
kjobwidgets
|
||||
kmailtransport
|
||||
kmime
|
||||
knotifications
|
||||
knotifyconfig
|
||||
kpimtextedit
|
||||
kservice
|
||||
kstatusnotifieritem
|
||||
ktextaddons
|
||||
ktextwidgets
|
||||
kwidgetsaddons
|
||||
kwindowsystem
|
||||
kxmlgui
|
||||
mpv))
|
||||
(home-page "https://apps.kde.org/kalarm/")
|
||||
(synopsis "Alarm manager for KDE")
|
||||
(description "Kalarm is a personal alarm message, command and email
|
||||
scheduler application for KDE.
|
||||
|
||||
It features:
|
||||
@itemize
|
||||
@item displaying alarms using your own text message, the text generated by a
|
||||
command, or a text or image file,
|
||||
@item audible alarm using a sound file,
|
||||
@item recurring alarm on an hours/minutes, daily, weekly, monthly or annual
|
||||
basis, or set it to trigger every time you log in,
|
||||
@item display alarms color and font customization, and
|
||||
@item support for multiple alarm calendars, which for example enables you to
|
||||
share alarms between a laptop and desktop computer.
|
||||
@end itemize")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public korganizer
|
||||
(package
|
||||
(name "korganizer")
|
||||
|
||||
@@ -2426,7 +2426,6 @@ integration of Qt applications when running on a KDE Plasma workspace.")
|
||||
knotifications
|
||||
kirigami
|
||||
libplasma
|
||||
lz4
|
||||
mobile-broadband-provider-info
|
||||
modemmanager-qt
|
||||
network-manager
|
||||
@@ -2440,7 +2439,6 @@ integration of Qt applications when running on a KDE Plasma workspace.")
|
||||
ksvg
|
||||
qcoro-qt6
|
||||
openconnect
|
||||
qtwebengine
|
||||
qtdeclarative))
|
||||
(synopsis "Plasma applet for managing network connections")
|
||||
(description "This package provides Plasma applet for managing network
|
||||
|
||||
@@ -282,18 +282,16 @@ Random Cage Fighting Birds, Cool Music etc.")
|
||||
(define-public libchewing
|
||||
(package
|
||||
(name "libchewing")
|
||||
(version "0.11.0")
|
||||
(version "0.9.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/chewing/libchewing")
|
||||
(commit (string-append "v" version))
|
||||
;; Also libchewing-data
|
||||
(recursive? #t)))
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "08734i3xyq3wv5vimki7cz438v56ywk3x3assgfjlrngj1ijw0y8"))))
|
||||
(base32 "0gh64wvrk5pn0fhmpvj1j99d5g7f7697rk96zbkc8l72yjr819z5"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list
|
||||
@@ -877,7 +875,7 @@ noun phrases, verb phrases, etc.).")
|
||||
(define-public praat
|
||||
(package
|
||||
(name "praat")
|
||||
(version "6.4.62")
|
||||
(version "6.4.61")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@@ -886,7 +884,7 @@ noun phrases, verb phrases, etc.).")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0jplas35yrhh1csdiw2mim4cgmj5iz5c3b87908smd0r528v75a6"))))
|
||||
"0lxg0h07cgz5fjhpsihvf8dk6g03fp4a7ar8x70pm2s5lbfr1amy"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:make-flags #~(list (string-append "CC="
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
python-wrapper
|
||||
tzdata-for-tests))
|
||||
(inputs
|
||||
(list cadical-2.1 gmp libuv llvm))
|
||||
(list cadical gmp libuv llvm))
|
||||
(arguments
|
||||
(list
|
||||
#:make-flags
|
||||
|
||||
+50
-46
@@ -531,7 +531,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.19-version "6.19.11")
|
||||
(define-public linux-libre-6.19-version "6.19.9")
|
||||
(define-public linux-libre-6.19-gnu-revision "gnu")
|
||||
(define deblob-scripts-6.19
|
||||
(linux-libre-deblob-scripts
|
||||
@@ -541,12 +541,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
||||
(base32 "05jpciyypvmy6byaxjl49b1fvzxcnlhknf0xabrdj5152iznrzkh")))
|
||||
(define-public linux-libre-6.19-pristine-source
|
||||
(let ((version linux-libre-6.19-version)
|
||||
(hash (base32 "16ymkc5r3hw05z7l7ih3qw406qlszz1l7b4g5yz0hv15ddxrs0r0")))
|
||||
(hash (base32 "1gsmklhqpx5k9wca3gr8j439q8khr9byy7ivxqyr9qqjmyinhq61")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-6.19)))
|
||||
|
||||
(define-public linux-libre-6.18-version "6.18.21")
|
||||
(define-public linux-libre-6.18-version "6.18.19")
|
||||
(define-public linux-libre-6.18-gnu-revision "gnu")
|
||||
(define deblob-scripts-6.18
|
||||
(linux-libre-deblob-scripts
|
||||
@@ -556,7 +556,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
||||
(base32 "0qlih8w8wg4v5cwbmd34rbhb6mjgbx69i9rx3s2vxw7h42q9l0ai")))
|
||||
(define-public linux-libre-6.18-pristine-source
|
||||
(let ((version linux-libre-6.18-version)
|
||||
(hash (base32 "0ks735y6jq4yy3jaicjsj4dn4n3kk2skf9dqh9dyifipn57j2f0w")))
|
||||
(hash (base32 "0309xd8ifsy9pa19s8qnsyxkmcqq4z3p16jckjnnhz6h3hkpibza")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-6.18)))
|
||||
@@ -565,47 +565,47 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
||||
;; Here are the support timelines:
|
||||
;; <https://www.kernel.org/category/releases.html>
|
||||
|
||||
(define-public linux-libre-6.12-version "6.12.80")
|
||||
(define-public linux-libre-6.12-version "6.12.77")
|
||||
(define-public linux-libre-6.12-gnu-revision "gnu")
|
||||
(define deblob-scripts-6.12
|
||||
(linux-libre-deblob-scripts
|
||||
linux-libre-6.12-version
|
||||
linux-libre-6.12-gnu-revision
|
||||
(base32 "168aykyvyyp34549hqhlprl0n052q8wdb2y3vyxqw40wpf2vw3ln")
|
||||
(base32 "1x48hpmvajz7v5wn1vdd7l5r14mq4ngzh5npz3pj81z4f1g61i0a")))
|
||||
(base32 "1v6glxf94p9z0yq5m102jwcpyh6anpbp3h8wwff9hxlfy2wdlzzk")))
|
||||
(define-public linux-libre-6.12-pristine-source
|
||||
(let ((version linux-libre-6.12-version)
|
||||
(hash (base32 "0lrylj87bb8ky29pbplpncrfhmgqqbq3d49iqgdwv7p7jvc929f9")))
|
||||
(hash (base32 "0rzz5hdixa5xmr99gja3xr9nxgpmrpxyg4llmvkl3vyawpmkd21m")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-6.12)))
|
||||
|
||||
(define-public linux-libre-6.6-version "6.6.130")
|
||||
(define-public linux-libre-6.6-version "6.6.129")
|
||||
(define-public linux-libre-6.6-gnu-revision "gnu")
|
||||
(define deblob-scripts-6.6
|
||||
(linux-libre-deblob-scripts
|
||||
linux-libre-6.6-version
|
||||
linux-libre-6.6-gnu-revision
|
||||
(base32 "0y3lawljby2rl0mb0yjdyaasci4pl935y8xa0dnmbzff23knkxlw")
|
||||
(base32 "0xp9b2vkrb0g0rn4i33b59rhp4sgh1dbwzk28vwz7kwac6l5rcpi")))
|
||||
(base32 "0z47f6mkllk1fgpq04x73djl5gh3mj50bxj2rpg4jlzm0rcirrag")))
|
||||
(define-public linux-libre-6.6-pristine-source
|
||||
(let ((version linux-libre-6.6-version)
|
||||
(hash (base32 "139480lyi3if8pd2j3yld5a01lk7113kbcn2kxpzyk29p5kslq14")))
|
||||
(hash (base32 "12j42awg44w97zq8fzifpm300jm9q9ya7qkpn7xbnkr2480qz86a")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-6.6)))
|
||||
|
||||
(define-public linux-libre-6.1-version "6.1.167")
|
||||
(define-public linux-libre-6.1-version "6.1.166")
|
||||
(define-public linux-libre-6.1-gnu-revision "gnu")
|
||||
(define deblob-scripts-6.1
|
||||
(linux-libre-deblob-scripts
|
||||
linux-libre-6.1-version
|
||||
linux-libre-6.1-gnu-revision
|
||||
(base32 "10gcbkd5jxfspa712kvb3qmsjgsapd9cz47pmpfk03bbfzf8ydlv")
|
||||
(base32 "1w5pfws6l39dpc3lzazs1n6r4m96f6rdf6vb2scy5fhmrd933ldc")))
|
||||
(base32 "1jiwwl5sgpc16x0v6phbknv94mc46gvwgc2z8s4pdgn4j54yrd8v")))
|
||||
(define-public linux-libre-6.1-pristine-source
|
||||
(let ((version linux-libre-6.1-version)
|
||||
(hash (base32 "1jwqwp2fg3wdsh9w663rbnbv1rvsvksv1pj4bzns8swp0wy0a618")))
|
||||
(hash (base32 "0jcl12gjlfdf9pwqg1m84rzwnrj3grxxgk5blrq8zlaq45sgr3c1")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-6.1)))
|
||||
@@ -2690,7 +2690,7 @@ and should be used with caution, especially on untested models.")
|
||||
(define-public corefreq
|
||||
(package
|
||||
(name "corefreq")
|
||||
(version "2.1.0")
|
||||
(version "1.98.4")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -2699,7 +2699,7 @@ and should be used with caution, especially on untested models.")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "054rnrwvkbfmy2maxjk928fh1p346313ixhkbjwcq7qjz3idjixl"))))
|
||||
(base32 "0mxp5h23y09674syaj5gpdifr53zvgjv7g7hargwg6897883qfln"))))
|
||||
;; The upstream Makefile is now such a proprietary mess that standard builds
|
||||
;; as performed by our linux-module-build-system are more or less impossible
|
||||
;; without heavy patching. However, we still keep it as the main build
|
||||
@@ -2731,12 +2731,14 @@ and should be used with caution, especially on untested models.")
|
||||
(string-append = dir "\n"))
|
||||
(("^([[:space:]]+)(.* modules_install.*)"
|
||||
_ indent command)
|
||||
(string-append indent "echo skipping " command))))))
|
||||
(string-append indent "@echo skipping " command))))))
|
||||
(add-before 'build 'prepare
|
||||
(lambda* (#:key source-directory #:allow-other-keys)
|
||||
(lambda* (#:key source-directory make-flags #:allow-other-keys)
|
||||
;; Lazily fix another mismatch between what the kernel module
|
||||
;; build system expects and what this package provides.
|
||||
(symlink "source/build" source-directory)))
|
||||
(symlink "source/build" source-directory) ;$(BUILD)
|
||||
;; Set up symbolic links inside $(BUILD), for some reason.
|
||||
(apply invoke "make" "prepare" make-flags)))
|
||||
(replace 'build (assoc-ref gnu:%standard-phases 'build))
|
||||
(add-before 'install 'resolve-symlink
|
||||
;; The build system silently fails to install from a symlink.
|
||||
@@ -6019,7 +6021,7 @@ devices that can inject events directly into the input subsystem.")
|
||||
(define-public interception-dual-function-keys
|
||||
(package
|
||||
(name "interception-dual-function-keys")
|
||||
(version "1.5.0")
|
||||
(version "1.4.0")
|
||||
(home-page "https://gitlab.com/interception/linux/plugins/dual-function-keys")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
@@ -6029,7 +6031,7 @@ devices that can inject events directly into the input subsystem.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"17jc02wh45yk427qryb0ydyim16607i31wyghbsahahd6mrh9ylv"))))
|
||||
"0s49vbg3j4rwh78i8rx8qr7myql09p7b3lhrjl0p7dd98xp6ann6"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
(list libevdev yaml-cpp))
|
||||
@@ -11009,28 +11011,30 @@ compatible with Python's ConfigParser style of .INI files, including RFC
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public simpleini
|
||||
(package
|
||||
(name "simpleini")
|
||||
(version "4.25")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/brofield/simpleini")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1v9s0kr5ca1gdbnlkdz7chzypy0wz95f09l0r6jnmff4qy6db56l"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list #:configure-flags #~(list "-DSIMPLEINI_USE_SYSTEM_GTEST=ON")))
|
||||
(native-inputs (list googletest))
|
||||
(home-page "https://github.com/brofield/simpleini")
|
||||
(synopsis "Simple API to read and write INI-style files")
|
||||
(description
|
||||
"SimpleIni provides a simple API to read and write INI-style
|
||||
(let ((commit "6048871ea9ee0ec24be5bd099d161a10567d7dc2")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "simpleini")
|
||||
(version (git-version "4.22" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/brofield/simpleini")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1szaflnrzw1zx9v5g6mbbiaf9wfglp4n4jjq2793k9ryz3qxil9j"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list #:configure-flags #~(list "-DSIMPLEINI_USE_SYSTEM_GTEST=ON")))
|
||||
(native-inputs (list googletest))
|
||||
(home-page "https://github.com/brofield/simpleini")
|
||||
(synopsis "Simple API to read and write INI-style files")
|
||||
(description
|
||||
"SimpleIni provides a simple API to read and write INI-style
|
||||
configuration files. It supports data files in ASCII, MBCS and Unicode.")
|
||||
(license license:expat)))
|
||||
(license license:expat))))
|
||||
|
||||
(define-public xfsprogs
|
||||
(package
|
||||
@@ -11476,7 +11480,7 @@ found in custom keyboard firmware like QMK.")
|
||||
(define-public pipewire
|
||||
(package
|
||||
(name "pipewire")
|
||||
(version "1.6.2")
|
||||
(version "1.5.85")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@@ -11485,7 +11489,7 @@ found in custom keyboard firmware like QMK.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"01jvq9ck8dhkbmw21jw0frgbgvzwfq1dxkvl3zynrj179kpm4v9w"))))
|
||||
"1nd74wjy16bw8ng00acc26rakpqabcq1z64h23w97i18pb7z64xq"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list
|
||||
@@ -11517,7 +11521,7 @@ found in custom keyboard firmware like QMK.")
|
||||
gstreamer
|
||||
jack-2
|
||||
ldacbt
|
||||
libcamera-minimal
|
||||
libcamera
|
||||
libdrm
|
||||
libfdk
|
||||
libfreeaptx
|
||||
@@ -11580,7 +11584,7 @@ of Linux application development.")
|
||||
(define-public wireplumber
|
||||
(package
|
||||
(name "wireplumber")
|
||||
(version "0.5.14")
|
||||
(version "0.5.12")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -11590,7 +11594,7 @@ of Linux application development.")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0rr2vlbwjjhgsk6lk2iwaww21gks2v63f0cs01rh2mdi8jpfz7h2"))))
|
||||
(base32 "1dljz669ywy1lvvn0jh14ymynmbii45q5vay71zajpcg31249dyw"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("-Dsystemd=disabled"
|
||||
|
||||
@@ -1412,11 +1412,7 @@ Library.")
|
||||
(substitute-keyword-arguments arguments
|
||||
((#:configure-flags flags)
|
||||
#~(append #$flags
|
||||
(list #$(string-append
|
||||
"-DLLVM_TARGETS_TO_BUILD=AMDGPU;X86"
|
||||
(if (string=? "X86" (system->llvm-target))
|
||||
""
|
||||
(string-append ";" (system->llvm-target))))
|
||||
(list "-DLLVM_TARGETS_TO_BUILD=AMDGPU;X86"
|
||||
"-DLLVM_VERSION_SUFFIX=")))))
|
||||
(properties `((hidden? . #t)
|
||||
,@(package-properties llvm-base)))
|
||||
|
||||
+24
-2
@@ -37,7 +37,7 @@
|
||||
(define-public lsof
|
||||
(package
|
||||
(name "lsof")
|
||||
(version "4.99.6")
|
||||
(version "4.99.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@@ -46,7 +46,8 @@
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"08p0c0wci9vam6b29ym7z7sip8gd0j0dz7zy4f0b32dw51rb3z9k"))))
|
||||
"1v32407al4j0hhcph95lv4xvr9h012lii29iyq41iwj39zwfavax"))
|
||||
(patches (search-patches "lsof-compat-linux-6.9.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs (list automake
|
||||
autoconf
|
||||
@@ -56,6 +57,27 @@
|
||||
pkg-config
|
||||
procps ;for ps
|
||||
util-linux)) ;for unshare
|
||||
(arguments
|
||||
(list #:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-configure-ac-version
|
||||
;; see https://github.com/lsof-org/lsof/commit/932a0b3b1992497e23fd9b8d31116b9ca9b0f98d
|
||||
;; to fix tests/case-01-version.bash test fail.
|
||||
(lambda _
|
||||
(substitute* "configure.ac"
|
||||
(("4\\.99\\.0")
|
||||
"4.99.3"))))
|
||||
(add-before 'bootstrap 'disable-failing-tests
|
||||
(lambda _
|
||||
(substitute* "Makefile.am"
|
||||
;; Fails with ‘ERROR!!! client gethostbyaddr() failure’.
|
||||
(("(TESTS \\+=.*) tests/LTsock" _ prefix)
|
||||
prefix)
|
||||
;; Fails on CoW filesystems (eg. btrfs)
|
||||
(("tests/LTlock") "")
|
||||
;; Fails because /proc not mounted in sandbox
|
||||
(("\tdialects/linux/tests/case-20-epoll.bash \\\\")
|
||||
"\\")))))))
|
||||
(synopsis "Display information about open files")
|
||||
(description
|
||||
"Lsof stands for LiSt Open Files, and it does just that.
|
||||
|
||||
+4
-111
@@ -26,7 +26,6 @@
|
||||
;;; Copyright © 2025 Zheng Junjie <z572@z572.online>
|
||||
;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se>
|
||||
;;; Copyright © 2025 Aaron Boyd <aaron.boyd.org@gmail.com>
|
||||
;;; Copyright © 2026 Nguyễn Gia Phong <cnx@loang.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@@ -390,7 +389,7 @@ handy.")
|
||||
(define (make-lua-filesystem name lua)
|
||||
(package
|
||||
(name name)
|
||||
(version "1.9.0")
|
||||
(version "1.7.0.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@@ -401,7 +400,7 @@ handy.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0vd1b9rnbjl24bbnk91jrkli81dc1b2kvpjlsx319azjmynlk0y6"))))
|
||||
"0zmprgkm9zawdf9wnw0v3w6ibaj442wlc6alp39hmw610fl4vghi"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
@@ -432,9 +431,6 @@ directory structure and file attributes.")
|
||||
(define-public lua5.2-filesystem
|
||||
(make-lua-filesystem "lua5.2-filesystem" lua-5.2))
|
||||
|
||||
(define-public lua5.4-filesystem
|
||||
(make-lua-filesystem "lua5.4-filesystem" lua-5.4))
|
||||
|
||||
(define-public lua-bee
|
||||
;; There are no releases; use the commit known to work with the packaged
|
||||
;; luamake.
|
||||
@@ -1064,14 +1060,13 @@ Notable examples are GTK+, GStreamer and Webkit.")
|
||||
(define (make-lua-lpeg name lua)
|
||||
(package
|
||||
(name name)
|
||||
(version "1.1.0")
|
||||
(version "1.0.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0aimsjpcpkh3kk65f0pg1z2bp6d83rn4dg6pgbx1yv14s9kms5ab"))))
|
||||
(base32 "1zjzl7acvcdavmcg5l7wi12jd4rh95q9pl5aiww7hv0v0mv6bmj8"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
@@ -1105,9 +1100,6 @@ Grammars (PEGs).")
|
||||
(define-public lua5.2-lpeg
|
||||
(make-lua-lpeg "lua5.2-lpeg" lua-5.2))
|
||||
|
||||
(define-public lua5.4-lpeg
|
||||
(make-lua-lpeg "lua5.4-lpeg" lua-5.4))
|
||||
|
||||
(define (make-lua-luv name lua)
|
||||
(package
|
||||
(name name)
|
||||
@@ -1209,105 +1201,6 @@ on numbers.")
|
||||
(define-public lua5.1-bitop
|
||||
(make-lua-bitop "lua5.1-bitop" lua-5.1))
|
||||
|
||||
(define (make-lua-djot name lua)
|
||||
(package
|
||||
(name name)
|
||||
(version "0.2.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/jgm/djot.lua")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256 (base32 "0kivx4yyj2zhj23d93h5rr0ab7gkazd3z7r7aqv1bgmigcw47pj2"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet #~(begin
|
||||
(delete-file-recursively "clib")
|
||||
(delete-file-recursively "doc/api")
|
||||
(delete-file "doc/djot.1")))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-makefile
|
||||
(lambda _
|
||||
(substitute* "Makefile"
|
||||
(("^all: .*") "all:\n"))))
|
||||
(delete 'configure)
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(invoke "lua" "test.lua"))))
|
||||
(replace 'install
|
||||
(lambda _
|
||||
(let ((lua-path
|
||||
(string-append
|
||||
#$output
|
||||
"/share/lua/"
|
||||
#$(version-major+minor (package-version lua)))))
|
||||
(install-file "djot.lua" lua-path)
|
||||
(copy-recursively "djot" (string-append lua-path "/djot"))))))))
|
||||
(native-inputs (list lua))
|
||||
(home-page "https://github.com/jgm/djot.lua")
|
||||
(synopsis "Lua parser for the djot light markup language")
|
||||
(description
|
||||
"This package provides a Lua parser for djot, a light markup syntax.
|
||||
It can produce an AST, rendered HTML, or a stream of match tokens
|
||||
that identify elements by source position, which could be used
|
||||
for syntax highlighting or a linting tool.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public lua5.4-djot
|
||||
(make-lua-djot "lua5.4-djot" lua-5.4))
|
||||
|
||||
(define-public lua-djot
|
||||
(make-lua-djot "lua-djot" lua))
|
||||
|
||||
(define-public lua5.2-djot
|
||||
(make-lua-djot "lua5.2-djot" lua-5.2))
|
||||
|
||||
(define-public lua5.1-djot
|
||||
(make-lua-djot "lua5.1-djot" lua-5.1))
|
||||
|
||||
(define-public djot
|
||||
(package
|
||||
(inherit lua5.1-djot)
|
||||
(name "djot")
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments lua5.1-djot)
|
||||
((#:phases phases)
|
||||
#~(modify-phases #$phases
|
||||
(replace 'patch-makefile
|
||||
(lambda _
|
||||
(substitute* "Makefile"
|
||||
(("^all: .*") "all: doc/djot.1\n"))))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(invoke "luajit" "test.lua"))))
|
||||
(add-after 'install 'install-bin-and-man
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((out-lua (string-append #$output "/share/lua/5.1"))
|
||||
(out-bin (string-append #$output "/bin/djot")))
|
||||
(copy-file "bin/main.lua" "bin/djot")
|
||||
(substitute* "bin/djot"
|
||||
(("^local djot = require" all)
|
||||
(string-append
|
||||
"#!"
|
||||
(search-input-file inputs "bin/luajit")
|
||||
"\n"
|
||||
all)))
|
||||
(install-file "bin/djot" (string-append #$output "/bin"))
|
||||
(chmod out-bin #o755)
|
||||
(wrap-program out-bin
|
||||
`("GUIX_LUA_PATH" ";" = (,out-lua))))
|
||||
(install-file "doc/djot.1"
|
||||
(string-append #$output "/share/man/man1"))))))))
|
||||
(native-inputs (list pandoc))
|
||||
(inputs (list luajit))))
|
||||
|
||||
(define-public lutok
|
||||
(package
|
||||
(name "lutok")
|
||||
|
||||
@@ -2872,17 +2872,17 @@ data by providing clean labels during training.")
|
||||
(define-public python-cma
|
||||
(package
|
||||
(name "python-cma")
|
||||
(version "4.4.4")
|
||||
(version "4.4.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "cma" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0w41k8dk8g1ngx797dzag5xcwws77sfnfriim874rq6wnmadcav3"))))
|
||||
"1n17shbcmy7h7k105ar9yhj2zmgykx1wv9fhwd5kbwrcypa221mz"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list #:test-backend #~'custom
|
||||
#:test-flags #~'("src/cma/test.py")))
|
||||
#:test-flags #~'("cma/test.py")))
|
||||
(native-inputs (list python-pytest python-setuptools))
|
||||
(propagated-inputs (list python-numpy))
|
||||
(home-page "https://github.com/CMA-ES/pycma")
|
||||
|
||||
+69
-80
@@ -67,7 +67,6 @@
|
||||
;;; Copyright © 2025 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
|
||||
;;; Copyright © 2026 Sergey Trofimov <sarg@sarg.org.ru>
|
||||
;;; Copyright © 2026 Nguyễn Gia Phong <cnx@loang.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@@ -94,7 +93,6 @@
|
||||
#:use-module (gnu packages bash)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages boost)
|
||||
#:use-module (gnu packages build-tools)
|
||||
#:use-module (gnu packages c)
|
||||
#:use-module (gnu packages calendar)
|
||||
#:use-module (gnu packages check)
|
||||
@@ -769,7 +767,7 @@ operating systems.")
|
||||
(define-public neomutt
|
||||
(package
|
||||
(name "neomutt")
|
||||
(version "20260105")
|
||||
(version "20250404")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -778,21 +776,8 @@ operating systems.")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1sg6ifabci7xyp3zds1w906vx6jsmyjlfr6bqld7m7hj07by9ndd"))
|
||||
(modules '((guix build utils)
|
||||
(ice-9 ftw)
|
||||
(srfi srfi-26)))
|
||||
(snippet
|
||||
#~(begin
|
||||
(define (delete-all-but directory . preserve)
|
||||
(with-directory-excursion directory
|
||||
(let* ((pred (negate (cut member <>
|
||||
(cons* "." ".." preserve))))
|
||||
(items (scandir "." pred)))
|
||||
(for-each (cut delete-file-recursively <>) items))))
|
||||
(delete-all-but "autosetup"
|
||||
"mutt-gettext.tcl"
|
||||
"mutt-iconv.tcl")))))
|
||||
(base32
|
||||
"1w53g6l98cd3x2a6m0q245fm5gln95vzpgskvg4dz9yysmbki9az"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
(list cyrus-sasl
|
||||
@@ -808,19 +793,19 @@ operating systems.")
|
||||
libxml2
|
||||
lmdb
|
||||
notmuch
|
||||
sqlite
|
||||
`(,zstd "lib")))
|
||||
(native-inputs
|
||||
`(("automake" ,automake)
|
||||
("autosetup" ,autosetup)
|
||||
("gettext-minimal" ,gettext-minimal)
|
||||
("pkg-config" ,pkg-config)
|
||||
("docbook-xsl" ,docbook-xsl)
|
||||
("docbook-xml" ,docbook-xml-4.2)
|
||||
("w3m" ,w3m)
|
||||
("tcl" ,tcl)
|
||||
|
||||
;; Test file data for the unit tests included in the neomutt source.
|
||||
("neomutt-test-files"
|
||||
,(let ((commit "c769cdefd45bcdfc4a72664821bd7f67ad4d5f6c"))
|
||||
,(let ((commit "8629adab700a75c54e8e28bf05ad092503a98f75"))
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@@ -829,62 +814,69 @@ operating systems.")
|
||||
(file-name (git-file-name "neomutt-test-files" commit))
|
||||
(sha256
|
||||
(base32
|
||||
"0jvy9z2hmpvcxa10k7f68l2lqdxrppj36c4v8nmjrldkwgpkdaq3")))))))
|
||||
"1ci04nqkab9mh60zzm66sd6mhsr6lya8wp92njpbvafc86vvwdlr")))))))
|
||||
(arguments
|
||||
(list
|
||||
#:test-target "test"
|
||||
#:configure-flags
|
||||
#~(list "--enable-autocrypt"
|
||||
"--gpgme"
|
||||
;; Database, implies header caching.
|
||||
"--disable-tokyocabinet"
|
||||
"--disable-qdbm"
|
||||
"--disable-bdb"
|
||||
"--lmdb"
|
||||
"--kyotocabinet"
|
||||
`(#:test-target "test"
|
||||
#:configure-flags
|
||||
(list "--gpgme"
|
||||
|
||||
"--gdbm"
|
||||
;; Database, implies header caching.
|
||||
"--disable-tokyocabinet"
|
||||
"--disable-qdbm"
|
||||
"--disable-bdb"
|
||||
"--lmdb"
|
||||
"--kyotocabinet"
|
||||
|
||||
"--gnutls"
|
||||
"--sasl"
|
||||
(string-append "--with-sasl="
|
||||
#$(this-package-input "cyrus-sasl"))
|
||||
"--gdbm"
|
||||
|
||||
"--smime"
|
||||
"--notmuch"
|
||||
(string-append "--with-notmuch="
|
||||
#$(this-package-input "notmuch"))
|
||||
"--gnutls"
|
||||
"--ssl=1"
|
||||
"--sasl"
|
||||
(string-append "--with-sasl="
|
||||
(assoc-ref %build-inputs "cyrus-sasl"))
|
||||
|
||||
"--idn2"
|
||||
"--smime"
|
||||
"--notmuch"
|
||||
(string-append "--with-notmuch="
|
||||
(assoc-ref %build-inputs "notmuch"))
|
||||
|
||||
;; If we do not set this, neomutt wants to check
|
||||
;; whether the path exists, which it does not
|
||||
;; in the chroot.
|
||||
"--with-mailpath=/var/mail"
|
||||
(string-append "--with-ncurses="
|
||||
#$(this-package-input "ncurses"))
|
||||
(string-append "--prefix=" #$output)
|
||||
"--zstd=1")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key configure-flags #:allow-other-keys)
|
||||
(apply invoke "autosetup"
|
||||
(string-append "--prefix=" #$output)
|
||||
configure-flags)))
|
||||
(add-before 'check 'prepare-test-files
|
||||
(lambda _
|
||||
(copy-recursively
|
||||
#$(this-package-native-input "neomutt-test-files")
|
||||
"tests")
|
||||
;; FIXME: investigate why tests are failing, Nix also disables
|
||||
;; (a different) one: test_expando_node_padding.
|
||||
(substitute* "test/main.c"
|
||||
(("NEOMUTT_TEST_ITEM\\(test_expando_filter\\)") "")
|
||||
(("NEOMUTT_TEST_ITEM\\(test_mutt_path_tilde\\)") ""))
|
||||
(with-directory-excursion "tests"
|
||||
(setenv "NEOMUTT_TEST_DIR" (getcwd)) ; must be absolute
|
||||
(invoke "bash" "setup.sh")))))))
|
||||
"--idn2"
|
||||
|
||||
;; If we do not set this, neomutt wants to check
|
||||
;; whether the path exists, which it does not
|
||||
;; in the chroot.
|
||||
"--with-mailpath=/var/mail"
|
||||
|
||||
(string-append "--with-ncurses="
|
||||
(assoc-ref %build-inputs "ncurses"))
|
||||
(string-append "--prefix="
|
||||
(assoc-ref %outputs "out"))
|
||||
"--zstd=1")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; TODO: autosetup is meant to be included in the source,
|
||||
;; but we should package autosetup and use our own version of it.
|
||||
(replace 'configure
|
||||
(lambda* (#:key outputs inputs configure-flags #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(flags `(,@configure-flags))
|
||||
(bash (which "bash")))
|
||||
(setenv "SHELL" bash)
|
||||
(setenv "CONFIG_SHELL" bash)
|
||||
(apply invoke bash
|
||||
(string-append (getcwd) "/configure")
|
||||
flags))))
|
||||
(add-before 'check 'prepare-test-files
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(copy-recursively (assoc-ref inputs "neomutt-test-files") "tests")
|
||||
;; FIXME: investigate why tests are failing, Nix is also disabling one
|
||||
(substitute* "test/main.c"
|
||||
(("NEOMUTT_TEST_ITEM\\(test_expando_filter\\)") "")
|
||||
(("NEOMUTT_TEST_ITEM\\(test_mutt_sig_exit_handler\\)") "")
|
||||
(("NEOMUTT_TEST_ITEM\\(test_mutt_path_tilde\\)") ""))
|
||||
(with-directory-excursion "tests"
|
||||
(setenv "NEOMUTT_TEST_DIR" (getcwd)) ; must be absolute
|
||||
(invoke "bash" "setup.sh")))))))
|
||||
(home-page "https://neomutt.org/")
|
||||
(synopsis "Command-line mail reader based on Mutt")
|
||||
(description
|
||||
@@ -1354,7 +1346,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
|
||||
(define-public mu
|
||||
(package
|
||||
(name "mu")
|
||||
(version "1.14.0")
|
||||
(version "1.12.15")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -1363,7 +1355,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1fhnnm58ndfd6hzdagrsgcdcm2qlcjlda13vyx5d9lclhxgdn0vf"))))
|
||||
(base32 "191q23nj690bn4cbb26yf7pw5ihb1xmbna6ccdrkkf4m19yrxr12"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs
|
||||
(list pkg-config
|
||||
@@ -1372,7 +1364,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
|
||||
tzdata-for-tests ; for tests
|
||||
texinfo))
|
||||
(inputs
|
||||
(list glib gmime guile-3.0-latest xapian readline python))
|
||||
(list glib gmime guile-3.0 xapian readline python))
|
||||
(arguments
|
||||
(list
|
||||
#:modules '((guix build meson-build-system)
|
||||
@@ -1419,25 +1411,22 @@ attachments, create new maildirs, and so on.")
|
||||
(define-public alot
|
||||
(package
|
||||
(name "alot")
|
||||
(version "0.12")
|
||||
(version "v0.12")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/pazz/alot")
|
||||
(commit (string-append "v" version))))
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "018zqpjrl3cggj1myysjj04a054mg890khhdh1qjmd70k8l3w1di"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
;; tests: 299 passed, 39 deselected, 9 xfailed, 29 warnings, 11 subtests
|
||||
;; tests: 334 passed, 4 deselected, 9 xfailed, 29 warnings, 11 subtests
|
||||
#:test-flags
|
||||
#~(list
|
||||
;; Randomly fails with FileNotFoundError; does not happen
|
||||
;; in git checkout though, so no upstream issue.
|
||||
"--deselect=tests/test_crypto.py"
|
||||
"-k" (string-join
|
||||
;; alot.settings.errors.ConfigError: failed to read notmuch
|
||||
;; config with command ...
|
||||
|
||||
+20
-119
@@ -30,7 +30,7 @@
|
||||
;;; Copyright © 2018 Eric Brown <brown@fastmail.com>
|
||||
;;; Copyright © 2018, 2021, 2024 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2018 Amin Bandali <bandali@gnu.org>
|
||||
;;; Copyright © 2019, 2021-2026 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2019, 2021-2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2019 Steve Sprang <scs@stevesprang.com>
|
||||
;;; Copyright © 2019 Robert Smith <robertsmith@posteo.net>
|
||||
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
|
||||
@@ -159,7 +159,6 @@
|
||||
#:use-module (gnu packages image-processing)
|
||||
#:use-module (gnu packages java)
|
||||
#:use-module (gnu packages less)
|
||||
#:use-module (gnu packages libedit)
|
||||
#:use-module (gnu packages lisp)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages llvm)
|
||||
@@ -447,66 +446,6 @@ programming languages.")
|
||||
(home-page "https://stcorp.nl/coda")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public cvc5
|
||||
(package
|
||||
(name "cvc5")
|
||||
(version "1.3.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/cvc5/cvc5/")
|
||||
(commit (string-append "cvc5-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0ynz7di4dyyiiydgmf0z9dc2jl7nm44xi0amch29rcgznwr4wy5m"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:build-type "Production"
|
||||
#:configure-flags
|
||||
;; Keep the flags in sync with the options set by `./configure --best`.
|
||||
;; See <https://github.com/cvc5/cvc5/blob/cvc5-1.3.3/configure.sh#L216-L222>.
|
||||
#~(list "-DBUILD_SHARED_LIBS=1"
|
||||
"-DENABLE_GPL=ON"
|
||||
"-DUSE_EDITLINE=ON"
|
||||
"-DUSE_CLN=ON"
|
||||
"-DUSE_POLY=ON"
|
||||
"-DENABLE_IPO=ON"
|
||||
"-DUSE_CRYPTOMINISAT=ON")
|
||||
;; TODO: The reduce_constant_dup test fails, needs investigation.
|
||||
#:test-exclude "reduce_constants_dup\\.smt2"
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
;; Guix's libedit package does not require -ltinfo.
|
||||
(add-after 'unpack 'remove-tinfo
|
||||
(lambda _
|
||||
(substitute* "cmake/FindEditline.cmake"
|
||||
((" tinfo")
|
||||
""))))
|
||||
;; The 'check phase requires test programs build using 'build-tests'.
|
||||
(add-before 'check 'build-tests
|
||||
(lambda _
|
||||
(invoke "cmake" "--build" "." "--target" "build-tests"))))))
|
||||
(inputs (list cadical-2.1
|
||||
cln
|
||||
cryptominisat
|
||||
gmp
|
||||
libedit
|
||||
libpoly
|
||||
symfpu))
|
||||
(native-inputs (list pkg-config
|
||||
python-minimal
|
||||
python-tomli
|
||||
python-pyparsing
|
||||
python-pexpect))
|
||||
(home-page "https://cvc5.github.io/")
|
||||
(synopsis "Satisfiability modulo theories solver")
|
||||
(description
|
||||
"cvc5 is a solver for @acronym{SMT, satisfiability modulo theories}
|
||||
problems. It processes input in the standard SMT-LIB format.")
|
||||
(license (list license:expat license:bsd-3))))
|
||||
|
||||
(define-public qdldl
|
||||
(package
|
||||
(name "qdldl")
|
||||
@@ -5076,7 +5015,6 @@ book.")
|
||||
(lambda _
|
||||
(let ((chuffed #$(this-package-input "chuffed"))
|
||||
(gecode #$(this-package-input "gecode"))
|
||||
(or-tools #$(this-package-input "or-tools"))
|
||||
(pkgdatadir (string-append #$output
|
||||
"/share/minizinc")))
|
||||
(call-with-output-file (string-append pkgdatadir
|
||||
@@ -5097,11 +5035,11 @@ book.")
|
||||
(copy-recursively
|
||||
(string-append solver "/share/minizinc/solvers")
|
||||
(string-append pkgdatadir "/solvers")))
|
||||
(list chuffed gecode or-tools))))))))
|
||||
(list gecode chuffed))))))))
|
||||
(native-inputs
|
||||
(list bison flex))
|
||||
(inputs
|
||||
(list cbc chuffed gecode or-tools zlib))
|
||||
(list cbc chuffed gecode zlib))
|
||||
(home-page "https://www.minizinc.org")
|
||||
(synopsis "High-level constraint modeling language")
|
||||
(description "MiniZinc is a high-level modeling language for constraint
|
||||
@@ -9532,7 +9470,7 @@ built on top of DUNE, the Distributed and Unified Numerics Environment.")
|
||||
(define-public nauty
|
||||
(package
|
||||
(name "nauty")
|
||||
(version "2.9.3")
|
||||
(version "2.9.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@@ -9540,7 +9478,7 @@ built on top of DUNE, the Distributed and Unified Numerics Environment.")
|
||||
"https://pallini.di.uniroma1.it/"
|
||||
"nauty" (string-join (string-split version #\.) "_") ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0nqvri1jfi95xswrcvn9dkyriy7pkjry6nwqhdc0z2pq0jpfvi4z"))))
|
||||
(base32 "0gl7rpl2viahrqmjrrgv0iq31xz093p5sk1ns9r2qdqas43ak3s8"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" "lib"))
|
||||
(arguments
|
||||
@@ -9822,7 +9760,7 @@ diagrams.")
|
||||
(define-public libpoly
|
||||
(package
|
||||
(name "libpoly")
|
||||
(version "0.2.1")
|
||||
(version "0.2.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@@ -9831,7 +9769,7 @@ diagrams.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1nyiddvxzziagz7zrl2in8k1mypaj8z7vmm633h9mk4iiy586ddq"))))
|
||||
"0vwdffmff3widzj8x1pjvpw48s7h1y1pm8cad3zscmg2hzaqwkc0"))))
|
||||
(build-system cmake-build-system)
|
||||
(inputs (list gmp))
|
||||
(native-inputs
|
||||
@@ -9957,19 +9895,19 @@ also included.")
|
||||
(define-public cadical
|
||||
(package
|
||||
(name "cadical")
|
||||
(version "2.2.1")
|
||||
(version "2.0.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/arminbiere/cadical")
|
||||
(commit (string-append "rel-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(patches (search-patches "cadical-add-shared-library.patch"))
|
||||
(sha256
|
||||
(base32 "09p4nm8jyvhnsgpmbawzlk8b932k33s922a2rxm77sy8s31mm13m"))))
|
||||
(base32 "1dzjah3z34v89ka48hncwqkxrwl4xqn9947p0ipf39lxshrq91xa"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:test-target "test"
|
||||
#:configure-flags #~(list "-shared")
|
||||
#:modules `(((guix build copy-build-system) #:prefix copy:)
|
||||
(guix build gnu-build-system)
|
||||
(guix build utils)
|
||||
@@ -9979,7 +9917,16 @@ also included.")
|
||||
#~(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key configure-flags #:allow-other-keys)
|
||||
(setenv "CXXFLAGS" "-DPIC -fPIC")
|
||||
(apply invoke "./configure" configure-flags)))
|
||||
(replace 'check
|
||||
(lambda args
|
||||
;; Tests are incorrectly linked upstream.
|
||||
;; Since we don't install them, just work around this in the
|
||||
;; check phase.
|
||||
(setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/build"))
|
||||
(apply (assoc-ref %standard-phases 'check) args)
|
||||
(unsetenv "LD_LIBRARY_PATH")))
|
||||
(replace 'install
|
||||
(lambda args
|
||||
(apply
|
||||
@@ -9997,39 +9944,6 @@ also included.")
|
||||
clause learning.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public cadical-2.1
|
||||
(package
|
||||
(inherit cadical)
|
||||
(name "cadical")
|
||||
(version "2.1.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/arminbiere/cadical")
|
||||
(commit (string-append "rel-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(patches (search-patches "cadical-add-shared-library.patch"))
|
||||
(sha256 (base32
|
||||
"1gl0xd6zyxb127w8k0mps9m2izaqb7im7j91by4lkknmm7xhwyav"))))
|
||||
(arguments (substitute-keyword-arguments (package-arguments cadical)
|
||||
((#:configure-flags _)
|
||||
#~(list))
|
||||
((#:phases phases)
|
||||
#~(modify-phases #$phases
|
||||
(add-before 'configure 'set-shared-flags
|
||||
(lambda _
|
||||
(setenv "CXXFLAGS" "-DPIC -fPIC")))
|
||||
(replace 'check
|
||||
(lambda args
|
||||
;; Tests are incorrectly linked upstream.
|
||||
;; Since we don't install them, just work around this in the
|
||||
;; check phase.
|
||||
(setenv "LD_LIBRARY_PATH"
|
||||
(string-append (getcwd) "/build"))
|
||||
(apply (assoc-ref %standard-phases
|
||||
'check) args)
|
||||
(unsetenv "LD_LIBRARY_PATH")))))))))
|
||||
|
||||
(define-public cadiback
|
||||
(let ((commit "789329d8fcda851085ed72f1b07d8c3f46243b8a")
|
||||
(revision "1"))
|
||||
@@ -10144,20 +10058,7 @@ true in all models.")
|
||||
(add-after 'unpack 'no-tune-native
|
||||
(lambda _
|
||||
(substitute* "CMakeLists.txt"
|
||||
(("-mtune=native") ""))))
|
||||
;; Refer to the library in ${LOUVAIN_COMMUNITIES_LIBRARIES} by
|
||||
;; full path. This ensures that we find references to it in
|
||||
;; software using this library via CMake.
|
||||
;;
|
||||
;; CMake expects module to set this variable to a full path.
|
||||
;; See <https://cmake.org/cmake/help/v4.3/module/SelectLibraryConfigurations.html#command:select_library_configurations>.
|
||||
(add-after 'unpack 'cmake-lib-full-path
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(substitute* "louvain_communitiesConfig.cmake.in"
|
||||
(("louvain_communities")
|
||||
(string-append
|
||||
(assoc-ref outputs "out")
|
||||
"/lib/liblouvain_communities.so"))))))))
|
||||
(("-mtune=native") "")))))))
|
||||
(native-inputs (list python))
|
||||
(home-page "https://github.com/meelgroup/louvain-community")
|
||||
(synopsis "Multi-criteria community detection")
|
||||
|
||||
@@ -437,8 +437,7 @@ fetch and store media in Amazon S3.")
|
||||
(apply (assoc-ref cargo:%standard-phases phase)
|
||||
#:cargo-target #$(cargo-triplet)
|
||||
args))
|
||||
'(prepare-rust-crates
|
||||
unpack-rust-crates
|
||||
'(unpack-rust-crates
|
||||
configure
|
||||
check-for-pregenerated-files
|
||||
patch-cargo-checksums))))
|
||||
|
||||
+36
-84
@@ -46,7 +46,6 @@
|
||||
;;; Copyright © 2024 Nguyễn Gia Phong <cnx@loang.net>
|
||||
;;; Copyright © 2025 Evgeny Pisemsky <mail@pisemsky.site>
|
||||
;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2025 Adrien 'neox' Bourmault <neox@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@@ -101,7 +100,6 @@
|
||||
#:use-module (gnu packages golang-check)
|
||||
#:use-module (gnu packages golang-compression)
|
||||
#:use-module (gnu packages golang-crypto)
|
||||
#:use-module (gnu packages golang-maths)
|
||||
#:use-module (gnu packages golang-web)
|
||||
#:use-module (gnu packages golang-xyz)
|
||||
#:use-module (gnu packages graphviz)
|
||||
@@ -1151,20 +1149,25 @@ simultaneously and therefore appear under the same nickname on IRC.")
|
||||
(define-public python-nbxmpp
|
||||
(package
|
||||
(name "python-nbxmpp")
|
||||
(version "7.1.0")
|
||||
(version "5.0.4")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://dev.gajim.org/gajim/python-nbxmpp")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "nbxmpp" version))
|
||||
(sha256
|
||||
(base32 "1n7b6yv2k89hsmhmx9pi7m8l3aq97xppaz3hm7mvqgvxnlw0c1kr"))))
|
||||
(base32 "04fnc743d523gb38mm1inii80agmpb9r6hvn3f8ygnj3yq7s2vhn"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments (list #:test-backend #~'unittest))
|
||||
(propagated-inputs
|
||||
(list python-setuptools))
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
;; XXX: This probably should be an option for pyproject-build-system
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests? (invoke "python" "-m" "unittest" "-v")))))))
|
||||
(native-inputs
|
||||
(list python-setuptools
|
||||
python-wheel))
|
||||
(inputs
|
||||
(list glib
|
||||
glib-networking
|
||||
@@ -1184,7 +1187,7 @@ of xmpppy.")
|
||||
(define-public gajim
|
||||
(package
|
||||
(name "gajim")
|
||||
(version "2.4.5")
|
||||
(version "1.9.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@@ -1192,7 +1195,7 @@ of xmpppy.")
|
||||
(version-major+minor version)
|
||||
"/gajim-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1rkxzf1pfd29rip5bw4730fl7b2xk12zpiwnfkyzxlkmbh4j3kp2"))
|
||||
(base32 "0g2nhy6ypj4jbz216sgiy37spq34bwa0ydn2g73fp9qnxfq4vpvz"))
|
||||
(patches
|
||||
(search-patches "gajim-honour-GAJIM_PLUGIN_PATH.patch"))))
|
||||
(build-system pyproject-build-system)
|
||||
@@ -1262,7 +1265,7 @@ of xmpppy.")
|
||||
;; FIXME: Cannot use this expression as it would
|
||||
;; introduce a circular dependency at the top level.
|
||||
;; (version-major+minor (package-version python))
|
||||
"3.11"
|
||||
"3.10"
|
||||
"/site-packages"))))))
|
||||
(native-inputs
|
||||
(list gettext-minimal
|
||||
@@ -1279,14 +1282,13 @@ of xmpppy.")
|
||||
glib-networking
|
||||
gsettings-desktop-schemas
|
||||
gsound
|
||||
libspelling
|
||||
libadwaita
|
||||
gspell
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gtk
|
||||
gtksourceview
|
||||
gtk+
|
||||
gtksourceview-4
|
||||
gupnp-igd
|
||||
libappindicator
|
||||
libnice
|
||||
libomemo
|
||||
libsecret
|
||||
@@ -1297,7 +1299,6 @@ of xmpppy.")
|
||||
python-dbus-1.2
|
||||
python-emoji
|
||||
python-gssapi
|
||||
python-httpx
|
||||
python-idna
|
||||
python-keyring
|
||||
python-nbxmpp
|
||||
@@ -1309,8 +1310,7 @@ of xmpppy.")
|
||||
python-pygobject
|
||||
python-pyopenssl
|
||||
python-qrcode
|
||||
python-sqlalchemy-2
|
||||
python-truststore))
|
||||
python-sqlalchemy-2))
|
||||
(propagated-inputs
|
||||
(list dconf))
|
||||
(synopsis "Fully-featured XMPP client")
|
||||
@@ -2357,11 +2357,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.")
|
||||
(sha256
|
||||
(base32 "098jqccwsfbqkdpnhbych2rd076385wb51fx9qyjfiddidxv2mas"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet '(delete-file-recursively "third_party"))
|
||||
;; Release 0.12.1 has a major bug which prevents replies
|
||||
;; from rendering: https://github.com/Nheko-Reborn/nheko/issues/1944
|
||||
;; TODO: revaluate for future versions.
|
||||
(patches (search-patches "nheko-0-12-1-fix-rendering-replies.patch"))))
|
||||
(snippet '(delete-file-recursively "third_party"))))
|
||||
(arguments
|
||||
(list
|
||||
#:tests? #f ;no test target
|
||||
@@ -3235,7 +3231,6 @@ share/zulip/integrations or in lib/<...>/site-packages/integrations:
|
||||
(snippet '(for-each delete-file-recursively
|
||||
;; TODO: unbundle the rest as well
|
||||
'("vendor/filippo.io"
|
||||
"vendor/github.com/apex"
|
||||
"vendor/github.com/blang"
|
||||
"vendor/github.com/d5"
|
||||
"vendor/github.com/davecgh"
|
||||
@@ -3245,31 +3240,25 @@ share/zulip/integrations or in lib/<...>/site-packages/integrations:
|
||||
"vendor/github.com/go-asn1-ber"
|
||||
"vendor/github.com/golang"
|
||||
"vendor/github.com/golang-jwt"
|
||||
"vendor/github.com/gomarkdown"
|
||||
"vendor/github.com/google"
|
||||
"vendor/github.com/gorilla"
|
||||
"vendor/github.com/google/uuid"
|
||||
"vendor/github.com/gorilla/websocket"
|
||||
"vendor/github.com/hashicorp"
|
||||
"vendor/github.com/Jeffail"
|
||||
"vendor/github.com/jpillora"
|
||||
"vendor/github.com/json-iterator"
|
||||
"vendor/github.com/kballard"
|
||||
"vendor/github.com/klauspost"
|
||||
"vendor/github.com/labstack/echo"
|
||||
"vendor/github.com/magiconair"
|
||||
"vendor/github.com/matterbridge/gomatrix"
|
||||
"vendor/github.com/mattn"
|
||||
"vendor/github.com/mgutz"
|
||||
"vendor/github.com/minio/md5-simd"
|
||||
"vendor/github.com/mattn/go-colorable"
|
||||
"vendor/github.com/mattn/go-isatty"
|
||||
"vendor/github.com/mattn/go-runewidth"
|
||||
"vendor/github.com/mgutz/ansi"
|
||||
"vendor/github.com/minio/sha256-simd"
|
||||
"vendor/github.com/mitchellh"
|
||||
"vendor/github.com/modern-go"
|
||||
"vendor/github.com/opentracing"
|
||||
"vendor/github.com/pborman"
|
||||
"vendor/github.com/pelletier"
|
||||
"vendor/github.com/philhofer"
|
||||
"vendor/github.com/pkg"
|
||||
"vendor/github.com/pmezard"
|
||||
"vendor/github.com/remyoudompheng"
|
||||
"vendor/github.com/rivo"
|
||||
"vendor/github.com/russross"
|
||||
"vendor/github.com/sirupsen"
|
||||
@@ -3277,24 +3266,15 @@ share/zulip/integrations or in lib/<...>/site-packages/integrations:
|
||||
"vendor/github.com/spf13"
|
||||
"vendor/github.com/stretchr"
|
||||
"vendor/github.com/subosito"
|
||||
"vendor/github.com/tinylib"
|
||||
"vendor/github.com/valyala"
|
||||
"vendor/github.com/vmihailenco"
|
||||
"vendor/go.mau.fi"
|
||||
"vendor/github.com/valyala/bytebufferpool"
|
||||
"vendor/github.com/vmihailenco/tagparser"
|
||||
"vendor/go.uber.org"
|
||||
"vendor/golang.org"
|
||||
"vendor/google.golang.org"
|
||||
"vendor/google.golang.org/protobuf/"
|
||||
"vendor/gopkg.in/ini.v1"
|
||||
"vendor/gopkg.in/natefinch"
|
||||
"vendor/gopkg.in/yaml.v2"
|
||||
"vendor/gopkg.in/yaml.v3"
|
||||
"vendor/lukechampine.com"
|
||||
"vendor/modernc.org/cc"
|
||||
"vendor/modernc.org/mathutil"
|
||||
"vendor/modernc.org/memory"
|
||||
"vendor/modernc.org/opt"
|
||||
"vendor/modernc.org/strutil"
|
||||
"vendor/modernc.org/token")))
|
||||
"vendor/gopkg.in/yaml.v3")))
|
||||
(sha256
|
||||
(base32 "0939fiy7z53izznfhlr7c6vaskbmkbj3ncb09fzx5dmz9cjngy80"))))
|
||||
(build-system go-build-system)
|
||||
@@ -3317,13 +3297,12 @@ share/zulip/integrations or in lib/<...>/site-packages/integrations:
|
||||
go-golang-org-x-time
|
||||
go-golang-org-x-tools
|
||||
;; google.golang.org
|
||||
go-google-golang-org-appengine
|
||||
go-google-golang-org-protobuf
|
||||
;; gopkg.in
|
||||
go-gopkg-in-ini-v1
|
||||
go-gopkg-in-natefinch-lumberjack-v2
|
||||
go-gopkg-in-yaml-v2
|
||||
go-gopkg-in-yaml-v3
|
||||
go-gopkg-in-natefinch-lumberjack-v2
|
||||
;; filippo.io
|
||||
go-filippo-io-edwards25519
|
||||
;; uber.org
|
||||
@@ -3331,7 +3310,6 @@ share/zulip/integrations or in lib/<...>/site-packages/integrations:
|
||||
go-go-uber-org-multierr
|
||||
go-go-uber-org-zap
|
||||
;; github.com
|
||||
go-github-com-apex-log
|
||||
go-github-com-blang-semver
|
||||
go-github-com-d5-tengo-v2
|
||||
go-github-com-davecgh-go-spew
|
||||
@@ -3341,43 +3319,32 @@ share/zulip/integrations or in lib/<...>/site-packages/integrations:
|
||||
go-github-com-go-asn1-ber-asn1-ber
|
||||
go-github-com-golang-jwt-jwt
|
||||
go-github-com-golang-protobuf
|
||||
go-github-com-gomarkdown-markdown
|
||||
go-github-com-google-gops
|
||||
go-github-com-google-uuid
|
||||
go-github-com-gorilla-schema
|
||||
go-github-com-gorilla-websocket
|
||||
go-github-com-hashicorp-errwrap
|
||||
go-github-com-hashicorp-go-multierror
|
||||
go-github-com-hashicorp-golang-lru
|
||||
go-github-com-hashicorp-hcl
|
||||
go-github-com-jeffail-gabs
|
||||
go-github-com-jpillora-backoff
|
||||
go-github-com-json-iterator-go
|
||||
go-github-com-kballard-go-shellquote
|
||||
go-github-com-klauspost-compress
|
||||
go-github-com-klauspost-cpuid-v2
|
||||
go-github-com-labstack-echo-v4
|
||||
go-github-com-magiconair-properties
|
||||
go-github-com-matterbridge-gomatrix
|
||||
go-github-com-mattn-go-colorable
|
||||
go-github-com-mattn-go-isatty
|
||||
go-github-com-mattn-go-runewidth
|
||||
go-github-com-mattn-godown
|
||||
go-github-com-mgutz-ansi
|
||||
go-github-com-minio-md5-simd
|
||||
go-github-com-minio-sha256-simd
|
||||
go-github-com-mitchellh-go-homedir
|
||||
go-github-com-mitchellh-mapstructure
|
||||
go-github-com-modern-go-concurrent
|
||||
go-github-com-modern-go-reflect2
|
||||
go-github-com-opentracing-opentracing-go
|
||||
go-github-com-pborman-uuid
|
||||
go-github-com-pelletier-go-toml
|
||||
go-github-com-pelletier-go-toml-v2
|
||||
go-github-com-philhofer-fwd
|
||||
go-github-com-pkg-errors
|
||||
go-github-com-pmezard-go-difflib
|
||||
go-github-com-remyoudompheng-bigfft
|
||||
go-github-com-rivo-uniseg
|
||||
go-github-com-russross-blackfriday
|
||||
go-github-com-sirupsen-logrus
|
||||
@@ -3389,23 +3356,8 @@ share/zulip/integrations or in lib/<...>/site-packages/integrations:
|
||||
go-github-com-spf13-viper
|
||||
go-github-com-stretchr-testify
|
||||
go-github-com-subosito-gotenv
|
||||
go-github-com-tinylib-msgp
|
||||
go-github-com-valyala-bytebufferpool
|
||||
go-github-com-valyala-fasttemplate
|
||||
go-github-com-vmihailenco-msgpack-v5
|
||||
go-github-com-vmihailenco-tagparser
|
||||
;; go.mau.fi
|
||||
go-go-mau-fi-libsignal
|
||||
go-go-mau-fi-whatsmeow
|
||||
;; lukechampine.com
|
||||
go-lukechampine-com-uint128
|
||||
;; modernc.org
|
||||
go-modernc-org-cc-v3
|
||||
go-modernc-org-mathutil
|
||||
go-modernc-org-memory
|
||||
go-modernc-org-opt
|
||||
go-modernc-org-strutil
|
||||
go-modernc-org-token))
|
||||
go-github-com-vmihailenco-tagparser))
|
||||
(synopsis "Bridge together various messaging networks and protocols")
|
||||
(description
|
||||
"Relays messages between different channels from various
|
||||
|
||||
+62
-105
@@ -166,113 +166,70 @@ bind processes, and much more.")
|
||||
|
||||
(define-public hwloc-2
|
||||
(package
|
||||
(name "hwloc")
|
||||
(inherit hwloc-1)
|
||||
(version "2.13.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/open-mpi/hwloc")
|
||||
(commit (string-append "hwloc-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1l9skkcizlv0qvw2lzmysndbm528xvszhiqq3569da157qpa5xav"))
|
||||
;; XXX: Remove after updating package from 2.13.0.
|
||||
(patches (search-patches "hwloc-add-with-opencl.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" ;'lstopo' & co., depends on Cairo, libx11, etc.
|
||||
"lib" ;small closure
|
||||
"doc" ;400+ section 3 man pages
|
||||
"debug"))
|
||||
(native-inputs
|
||||
(list autoconf automake libtool opencl-headers bash pkg-config))
|
||||
(inputs
|
||||
(append (if (%current-target-system)
|
||||
'() ;fewer dependencies when cross-compiling
|
||||
(list libx11 cairo ncurses expat))
|
||||
(list
|
||||
;; XXX: rocm-smi requires libdrm/drm.h but doesn't
|
||||
;; propagate a package providing these. For now, libdrm is
|
||||
;; used to provide this header.
|
||||
libdrm
|
||||
opencl-icd-loader
|
||||
rocm-smi-lib)))
|
||||
(propagated-inputs
|
||||
;; hwloc.pc lists libze_loader and libxml2 in
|
||||
;; 'Requires.private' in 'hwloc.pc'.
|
||||
(list level-zero libpciaccess libxml2))
|
||||
(arguments
|
||||
(list
|
||||
#:configure-flags
|
||||
#~(list
|
||||
(string-append
|
||||
"--with-opencl=" #$(this-package-input "opencl-icd-loader"))
|
||||
"--enable-rsmi"
|
||||
(string-append "--with-rocm=" #$(this-package-input "rocm-smi-lib"))
|
||||
"--localstatedir=/var")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-before 'check 'skip-linux-libnuma-test
|
||||
(lambda _
|
||||
;; Arrange to skip 'tests/hwloc/linux-libnuma', which fails on
|
||||
;; some machines: <https://github.com/open-mpi/hwloc/issues/213>.
|
||||
(substitute* "tests/hwloc/linux-libnuma.c"
|
||||
(("numa_available\\(\\)")
|
||||
"-1"))))
|
||||
(add-after 'install 'refine-libnuma
|
||||
;; Give -L arguments for libraries to avoid propagation
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "lib"))
|
||||
(numa (assoc-ref inputs "numactl")))
|
||||
(substitute* (map (lambda (f) (string-append out "/" f))
|
||||
'("lib/pkgconfig/hwloc.pc" "lib/libhwloc.la"))
|
||||
(("-lnuma" lib)
|
||||
(string-append "-L" numa "/lib " lib))))))
|
||||
(add-after 'install 'avoid-circular-references
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((lib (assoc-ref outputs "lib")))
|
||||
;; Suppress the 'prefix=' and 'exec_prefix=' lines so that the
|
||||
;; "lib" output doesn't refer to "out".
|
||||
(substitute* (string-append lib "/lib/pkgconfig/hwloc.pc")
|
||||
(("^.*prefix=.*$")
|
||||
"")))))
|
||||
(add-after 'install 'move-man-pages
|
||||
(lambda _
|
||||
;; Move section 1 and 3 man pages to the "doc" output.
|
||||
(copy-recursively (string-append #$output "/share/man/man1")
|
||||
(string-append #$output:doc "/share/man/man1"))
|
||||
(copy-recursively (string-append #$output "/share/man/man7")
|
||||
(string-append #$output:doc "/share/man/man7"))
|
||||
(delete-file-recursively
|
||||
(string-append #$output "/share/man/man1"))
|
||||
(delete-file-recursively
|
||||
(string-append #$output "/share/man/man7"))))
|
||||
(add-before 'check 'skip-tests-that-require-/sys
|
||||
(lambda _
|
||||
;; 'test-gather-topology.sh' requires /sys as of 2.9.0; skip it.
|
||||
(setenv "HWLOC_TEST_GATHER_TOPOLOGY" "0")))
|
||||
(add-before 'check 'skip-test-that-fails-on-qemu
|
||||
(lambda _
|
||||
;; Skip test that fails on emulated hardware due to QEMU bug:
|
||||
;; <https://bugs.gnu.org/40342>.
|
||||
(substitute* "tests/hwloc/hwloc_get_last_cpu_location.c"
|
||||
(("hwloc_topology_init" all)
|
||||
(string-append "exit (77);\n" all))))))))
|
||||
(home-page "https://www.open-mpi.org/projects/hwloc/")
|
||||
(synopsis "Abstraction of hardware architectures")
|
||||
(description
|
||||
"hwloc provides a portable abstraction (across OS,
|
||||
versions, architectures, ...) of the hierarchical topology of modern
|
||||
architectures, including NUMA memory nodes, sockets, shared caches, cores and
|
||||
simultaneous multithreading. It also gathers various attributes such as cache
|
||||
and memory information. It primarily aims at helping high-performance
|
||||
computing applications with gathering information about the hardware so as to
|
||||
exploit it accordingly and efficiently.
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.open-mpi.org/release/hwloc/v"
|
||||
(version-major+minor version)
|
||||
"/hwloc-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1aqdznqp7f18yg95vbr5n6ccxxdiywacygvn3wbhzn7bnspkdsaj"))
|
||||
;; XXX: Remove after updating package from 2.13.0.
|
||||
(patches (search-patches "hwloc-add-with-opencl.patch"))))
|
||||
|
||||
hwloc may display the topology in multiple convenient formats. It also offers
|
||||
a powerful programming interface to gather information about the hardware,
|
||||
bind processes, and much more.")
|
||||
(license license:bsd-3)))
|
||||
(native-inputs (modify-inputs native-inputs
|
||||
(append autoconf)
|
||||
(append automake)
|
||||
(append libtool)
|
||||
(append opencl-headers)
|
||||
(append bash))) ;for completion tests
|
||||
(inputs (modify-inputs inputs
|
||||
;; XXX: rocm-smi requires libdrm/drm.h but doesn't propagate a
|
||||
;; package providing these. For now, libdrm is used to provide
|
||||
;; this header.
|
||||
(append libdrm)
|
||||
(append opencl-icd-loader)
|
||||
(append rocm-smi-lib)
|
||||
(delete "numactl"))) ;libnuma is no longer needed.
|
||||
(propagated-inputs (modify-inputs propagated-inputs
|
||||
;; hwloc.pc lists libze_loader and libxml2 in
|
||||
;; 'Requires.private' in 'hwloc.pc'.
|
||||
(append level-zero libxml2)))
|
||||
(arguments
|
||||
(substitute-keyword-arguments arguments
|
||||
((#:configure-flags flags '())
|
||||
#~(cons* (string-append "--with-opencl="
|
||||
#$(this-package-input "opencl-icd-loader"))
|
||||
"--enable-rsmi"
|
||||
(string-append "--with-rocm="
|
||||
#$(this-package-input "rocm-smi-lib"))
|
||||
#$flags))
|
||||
((#:phases phases)
|
||||
#~(modify-phases #$phases
|
||||
(add-after 'unpack 'delete-configure
|
||||
(lambda _
|
||||
;; Remove configure file to generate it with patch.
|
||||
(delete-file "configure")))
|
||||
(replace 'skip-linux-libnuma-test
|
||||
(lambda _
|
||||
;; Arrange to skip 'tests/hwloc/linux-libnuma', which fails on
|
||||
;; some machines: <https://github.com/open-mpi/hwloc/issues/213>.
|
||||
(substitute* "tests/hwloc/linux-libnuma.c"
|
||||
(("numa_available\\(\\)")
|
||||
"-1"))))
|
||||
(add-before 'check 'skip-tests-that-require-/sys
|
||||
(lambda _
|
||||
;; 'test-gather-topology.sh' requires /sys as of 2.9.0; skip it.
|
||||
(setenv "HWLOC_TEST_GATHER_TOPOLOGY" "0")))
|
||||
(add-before 'check 'skip-test-that-fails-on-qemu
|
||||
(lambda _
|
||||
;; Skip test that fails on emulated hardware due to QEMU bug:
|
||||
;; <https://bugs.gnu.org/40342>.
|
||||
(substitute* "tests/hwloc/hwloc_get_last_cpu_location.c"
|
||||
(("hwloc_topology_init" all)
|
||||
(string-append "exit (77);\n" all)))))))))))
|
||||
|
||||
(define-public hwloc
|
||||
;; The latest stable series of hwloc.
|
||||
|
||||
+2
-41
@@ -540,9 +540,8 @@ enables iPod support in music players such as Clementine.")
|
||||
python-setuptools))
|
||||
(inputs
|
||||
(list bash-minimal
|
||||
gst-libav))
|
||||
(propagated-inputs
|
||||
(list python-gst
|
||||
gst-libav
|
||||
python-gst
|
||||
python-pygobject
|
||||
python-pykka
|
||||
python-requests
|
||||
@@ -555,44 +554,6 @@ from local disk or cloud services, and can be controlled using a variety of
|
||||
MPD and web clients.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public mopidy-local
|
||||
(package
|
||||
(name "mopidy-local")
|
||||
(version "3.3.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mopidy/mopidy-local")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1fqw6rq39w4q53w6jgl80x358rhzl4c9gdqb9kfgckmcz6vbcfm1"))))
|
||||
(build-system pyproject-build-system)
|
||||
(native-inputs
|
||||
(list python-pytest
|
||||
python-setuptools))
|
||||
(propagated-inputs
|
||||
(list mopidy
|
||||
python-pykka
|
||||
python-uritools))
|
||||
(home-page "https://mopidy.com/ext/local/")
|
||||
(synopsis "Mopidy extension for playing music from local file archive")
|
||||
(description
|
||||
"This package provides Mopidy's extension for playing music from local
|
||||
file archive.
|
||||
|
||||
In contrast to @url{https://mopidy.com/ext/file, Mopidy-File}, Mopidy-Local
|
||||
builds an index of archive’s metadata ahead of time, and can thus provide
|
||||
additional features like search.
|
||||
|
||||
The music metadata is stored in a SQLite database. This lets users to browse
|
||||
their music collection by album, artist, composer and performer, and provides
|
||||
full-text search capabilities based on SQLite’s FTS modules. It also notices
|
||||
updates via @command{mopidy local scan} while Mopidy is running, so you can
|
||||
scan your media library periodically, for example from a cron job.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public clementine
|
||||
;; Clementine has one automatic release per commit at
|
||||
;; <https://github.com/clementine-player/Clementine/releases>.
|
||||
|
||||
+37
-55
@@ -478,9 +478,9 @@ Raspberry Pi ISP (PiSP), consisting of the Frontend and Backend hardware
|
||||
components.")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public libcamera-minimal
|
||||
(define-public libcamera
|
||||
(package
|
||||
(name "libcamera-minimal")
|
||||
(name "libcamera")
|
||||
(version "0.6.0")
|
||||
(source
|
||||
(origin
|
||||
@@ -491,18 +491,27 @@ components.")
|
||||
(commit (string-append "v" version))))
|
||||
(patches (search-patches
|
||||
"libcamera-ipa_manager-disable-signature-verification.patch"))
|
||||
(file-name (git-file-name "libcamera" version))
|
||||
(file-name
|
||||
(git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0g6rphsa1hi9y22l2vw5cj75bf57clq3cggviwd1bnjhpp61nryc"))))
|
||||
(build-system meson-build-system)
|
||||
(outputs '("out" "doc" "gst" "tools"))
|
||||
(arguments
|
||||
(list #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
|
||||
#:configure-flags
|
||||
#~(list "-Dudev=enabled"
|
||||
"-Dv4l2=enabled"
|
||||
#~(list (string-append "-Dbindir=" #$output:tools "/bin")
|
||||
"-Dudev=enabled"
|
||||
"-Dv4l2=true"
|
||||
"-Dtest=true")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'set-sphinx-theme
|
||||
;; sphinx_book_theme requires node for packaging
|
||||
;; use the default sphinx theme instead
|
||||
(lambda _
|
||||
(substitute* "Documentation/conf.py.in"
|
||||
(("sphinx_book_theme") "alabaster"))))
|
||||
(add-after 'unpack 'disable-gstreamer-tests
|
||||
;; these require /dev/udmabuf
|
||||
(lambda _
|
||||
@@ -521,24 +530,39 @@ components.")
|
||||
(substitute* "test/meson.build"
|
||||
((".*'name': 'file'.*")
|
||||
"")))))
|
||||
#~()))))
|
||||
#~())
|
||||
(add-after 'install 'move-doc-and-gst
|
||||
(lambda _
|
||||
(mkdir-p (string-append #$output:doc "/share"))
|
||||
(rename-file (string-append #$output "/share/doc")
|
||||
(string-append #$output:doc "/share/doc"))
|
||||
(mkdir-p (string-append #$output:gst "/lib"))
|
||||
(rename-file
|
||||
(string-append #$output "/lib/gstreamer-1.0")
|
||||
(string-append #$output:gst "/lib/gstreamer-1.0")))))))
|
||||
(native-inputs
|
||||
(list pkg-config
|
||||
(list googletest
|
||||
graphviz ;for 'dot'
|
||||
doxygen
|
||||
pkg-config
|
||||
python-wrapper
|
||||
python-pyyaml
|
||||
python-packaging))
|
||||
python-sphinx
|
||||
python-sphinxcontrib-doxylink
|
||||
python-pyyaml))
|
||||
(inputs
|
||||
(append
|
||||
(list eudev
|
||||
glib
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
libevent
|
||||
libjpeg-turbo
|
||||
libtiff
|
||||
libyaml
|
||||
libyuv
|
||||
pybind11-2
|
||||
python-jinja2
|
||||
python-ply)
|
||||
python-ply
|
||||
qtbase)
|
||||
;; libpisp is only needed for the rpi/pisp pipeline on ARM.
|
||||
(if (target-arm?)
|
||||
(list libpisp)
|
||||
@@ -549,45 +573,6 @@ Android, and ChromeOS.")
|
||||
(home-page "https://libcamera.org/")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
;; Drop the documentation and the sample utilities.
|
||||
;; The README.rst gives a nice list of what packages are required.
|
||||
(define-public libcamera
|
||||
(package/inherit libcamera-minimal
|
||||
(name "libcamera")
|
||||
(outputs '("out" "doc" "gst" "tools"))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments libcamera-minimal)
|
||||
((#:configure-flags flags #~'())
|
||||
#~(cons (string-append "-Dbindir=" #$output:tools "/bin")
|
||||
#$flags))
|
||||
((#:phases phases #~%standard-phases)
|
||||
#~(modify-phases #$phases
|
||||
(add-after 'unpack 'set-sphinx-theme
|
||||
;; sphinx_book_theme requires node for packaging
|
||||
;; use the default sphinx theme instead
|
||||
(lambda _
|
||||
(substitute* "Documentation/conf.py.in"
|
||||
(("sphinx_book_theme") "alabaster"))))
|
||||
(add-after 'install 'move-doc-and-gst
|
||||
(lambda _
|
||||
(mkdir-p (string-append #$output:doc "/share"))
|
||||
(rename-file (string-append #$output "/share/doc")
|
||||
(string-append #$output:doc "/share/doc"))
|
||||
(mkdir-p (string-append #$output:gst "/lib"))
|
||||
(rename-file
|
||||
(string-append #$output "/lib/gstreamer-1.0")
|
||||
(string-append #$output:gst "/lib/gstreamer-1.0"))))))))
|
||||
(native-inputs
|
||||
(modify-inputs (package-native-inputs libcamera-minimal)
|
||||
(append googletest
|
||||
doxygen
|
||||
graphviz
|
||||
python-sphinx
|
||||
python-sphinxcontrib-doxylink)))
|
||||
(inputs
|
||||
(modify-inputs (package-inputs libcamera-minimal)
|
||||
(append libevent libtiff qtbase)))))
|
||||
|
||||
(define-public libnice
|
||||
(package
|
||||
(name "libnice")
|
||||
@@ -614,9 +599,6 @@ Android, and ChromeOS.")
|
||||
(add-after 'unpack 'disable-failing-tests
|
||||
(lambda _
|
||||
(substitute* "tests/meson.build"
|
||||
;; This test is flaky (see:
|
||||
;; <https://gitlab.freedesktop.org/libnice/libnice/-/work_items/210>).
|
||||
((".*'test-send-recv',.*") "")
|
||||
;; ‘test-set-port-range.c:66:main: assertion failed:
|
||||
;; (nice_agent_gather_candidates (agent, stream1))’
|
||||
(("'test-set-port-range'" all)
|
||||
@@ -2044,7 +2026,7 @@ of the same name.")
|
||||
(define-public wireshark
|
||||
(package
|
||||
(name "wireshark")
|
||||
(version "4.6.4")
|
||||
(version "4.6.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -2053,7 +2035,7 @@ of the same name.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "05jivnnlmbbhc6b3r7zdahiw22fvb9r6pg4pc83ascnja49xlyq6"))))
|
||||
(base32 "0j49gnvc1x37sf7dq3wklzlhp5gihi7d926mmfqb1avyb68n7qjn"))))
|
||||
(build-system qt-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
||||
+16
-23
@@ -1,7 +1,7 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016 Nikita <nikita@n0.is>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2024,2026 Eric Bavier <bavier@posteo.net>
|
||||
;;; Copyright © 2024 Eric Bavier <bavier@posteo.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@@ -20,42 +20,35 @@
|
||||
|
||||
(define-module (gnu packages nickle)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages algebra)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages flex)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages readline)
|
||||
#:use-module (gnu packages ruby-xyz)
|
||||
#:use-module (guix build-system meson)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages))
|
||||
|
||||
(define-public nickle
|
||||
(package
|
||||
(name "nickle")
|
||||
(version "2.107")
|
||||
(version "2.97")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://nickle.org/release/nickle-"
|
||||
version ".tar.xz"))
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1wli8p5fv2ldy51ycc8pcx8rl3ph2wbyiqs21qpjadlvildaaqj0"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list #:phases #~(modify-phases %standard-phases
|
||||
(add-before 'configure 'disable-benchmarks
|
||||
;; Benchmarks would require `gmp` and don't
|
||||
;; test anything not already covered by other
|
||||
;; tests, so disable them here.
|
||||
(lambda _
|
||||
(substitute* "meson.build"
|
||||
(("^subdir\\('bench'\\)" &)
|
||||
(string-append "# " &))))))))
|
||||
(native-inputs (list bc bison flex pkg-config ruby-asciidoctor-pdf))
|
||||
"0gqashcs3r0d1yp6rq6q2ayjdwsjxnd8z0ij55ayrbhn296l7mp2"))
|
||||
(patches (search-patches "nickle-man-release-date.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs (list readline))
|
||||
(arguments
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-build-date
|
||||
(lambda _
|
||||
;; Our patch touches Makefile.am, but rather than rebootstrap,
|
||||
;; make the substitution directly in Makefile.in.
|
||||
(substitute* "Makefile.in"
|
||||
(("BUILD_DATE") "RELEASE_DATE")))))))
|
||||
(synopsis "Numeric oriented programming language")
|
||||
(description
|
||||
"Nickle is a programming language based prototyping environment with
|
||||
|
||||
@@ -398,7 +398,7 @@ taken from the NSS package and thus ultimately from the Mozilla project.")
|
||||
(define-public nsncd
|
||||
(package
|
||||
(name "nsncd")
|
||||
(version "1.5.2")
|
||||
(version "1.5.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -407,7 +407,7 @@ taken from the NSS package and thus ultimately from the Mozilla project.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1kzwd5vlz5paal8k79dkamjqczz7k8azyc8zwjyhalcxzsjkdn0w"))))
|
||||
(base32 "1qiphwlwbnni2vfqjbdzv2a1qgqv2ycmygmyrbx8pgaak9gl5hfi"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:cargo-test-flags
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
;;; Copyright © 2021, 2022, 2023, 2025 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
|
||||
;;; Copyright © 2022, 2023 Zhu Zihao <all_but_last@163.com>
|
||||
;;; Copyright © 2023, 2025-2026 jgart <jgart@dismail.de>
|
||||
;;; Copyright © 2023 jgart <jgart@dismail.de>
|
||||
;;; Copyright © 2023 Wojtek Kosior <koszko@koszko.org>
|
||||
;;; Copyright © 2023 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
|
||||
;;; Copyright © 2024 Arun Isaac <arunisaac@systemreboot.net>
|
||||
@@ -31,7 +31,6 @@
|
||||
;;; Copyright © 2025 Tomás Ortín Fernández <quanrong@mailbox.org>
|
||||
;;; Copyright © 2025-2026 Sharlatan Hellseher <sharlatanus@gmail.com>
|
||||
;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
|
||||
;;; Copyright © 2025 unwox <me@unwox.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@@ -798,47 +797,6 @@ with the @command{module} command commonly found on @acronym{HPC,
|
||||
high-performance computing} clusters.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public toys
|
||||
(package
|
||||
(name "toys")
|
||||
(version "0.1.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.sr.ht/~whereiseveryone/toys")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"169jxh5knp5f2y9wbnc454jjdvvyqb5r0ydv3qkpm332vr0cl6p9"))))
|
||||
(build-system guile-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'register-guix-extension
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((ext-path (string-append #$output "/share/guix/extensions")))
|
||||
(mkdir-p ext-path)
|
||||
(copy-recursively "guix/extensions" ext-path))))
|
||||
(add-after 'register-guix-extension 'clean-up
|
||||
(lambda* _
|
||||
(delete-file "channels.scm")
|
||||
(delete-file-recursively "guix"))))))
|
||||
(native-inputs (list guile-3.0-latest))
|
||||
(inputs
|
||||
(list guile-json-4
|
||||
guile-readline
|
||||
guile-sqlite3
|
||||
guix))
|
||||
(native-search-paths (list $GUIX_EXTENSIONS_PATH))
|
||||
(home-page "https://toys.whereis.social/")
|
||||
(synopsis "Search engine for Guix channels")
|
||||
(description "Toys is a search engine for collecting and displaying Guix
|
||||
channel data found across the internet. Toys provides a command-line
|
||||
interface for interacting with the application.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public guix-xsearch
|
||||
(package
|
||||
(name "guix-xsearch")
|
||||
|
||||
@@ -82,7 +82,7 @@
|
||||
(define-public parallel
|
||||
(package
|
||||
(name "parallel")
|
||||
(version "20260322")
|
||||
(version "20260222")
|
||||
(outputs '("out" "doc"))
|
||||
(source
|
||||
(origin
|
||||
@@ -90,7 +90,7 @@
|
||||
(uri (string-append "mirror://gnu/parallel/parallel-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32 "1q7g5f13nlwichgh0dk8w5fqjnfnxvwxk6rjy0fd5l7l6blq0ikn"))
|
||||
(base32 "0j0zmq1klbvpz590vr2di8yvsniwixlhsmir7zfjy3rajx42l9y6"))
|
||||
(snippet
|
||||
'(begin
|
||||
(use-modules (guix build utils))
|
||||
|
||||
@@ -12,10 +12,10 @@ Liliana Marie Prikler <liliana.prikler@gmail.com>:
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/makefile.in b/makefile.in
|
||||
index 5e1c1b3a..de3fe975 100644
|
||||
index 291cb3e3..d179f591 100644
|
||||
--- a/makefile.in
|
||||
+++ b/makefile.in
|
||||
@@ -38,7 +38,7 @@ COMPILE=$(CXX) $(CXXFLAGS) -I$(DIR) -I../src
|
||||
@@ -34,7 +34,7 @@ COMPILE=$(CXX) $(CXXFLAGS) -I$(DIR) -I$(ROOT)/src
|
||||
|
||||
#--------------------------------------------------------------------------#
|
||||
|
||||
@@ -24,23 +24,26 @@ index 5e1c1b3a..de3fe975 100644
|
||||
|
||||
#--------------------------------------------------------------------------#
|
||||
|
||||
@@ -53,14 +53,17 @@ all: libcadical.a cadical mobical
|
||||
@@ -54,10 +54,10 @@ contrib/%.o: $(ROOT)/contrib/%.cpp $(ROOT)/contrib/%.hpp $(ROOT)/src/*.hpp makef
|
||||
# tester 'mobical') and the library are the main build targets.
|
||||
|
||||
cadical: cadical.o libcadical.a makefile
|
||||
cadical: src/cadical.o libcadical.a makefile
|
||||
- $(COMPILE) -o $@ $< -L. -lcadical $(LIBS)
|
||||
+ $(COMPILE) -static -o $@ $< -L. -lcadical $(LIBS)
|
||||
|
||||
mobical: mobical.o libcadical.a makefile $(LIBS)
|
||||
mobical: src/mobical.o libcadical.a makefile $(LIBS)
|
||||
- $(COMPILE) -o $@ $< -L. -lcadical
|
||||
+ $(COMPILE) -static -o $@ $< -L. -lcadical
|
||||
|
||||
libcadical.a: $(OBJ_SOLVER) $(OBJ_CONTRIB) makefile
|
||||
ar rc $@ $(OBJ_SOLVER) $(OBJ_CONTRIB)
|
||||
@@ -62,5 +62,8 @@ mobical: src/mobical.o libcadical.a makefile $(LIBS)
|
||||
libcadical.a: $(OBJ_SOLVER) $(OBJ_CONTRIB) makefile
|
||||
ar rc $@ $(OBJ_SOLVER) $(OBJ_CONTRIB)
|
||||
|
||||
+libcadical.so: $(OBJ_SOLVER) $(OBJ_CONTRIB) $(LIBS) makefile
|
||||
+ $(COMPILE) -shared -o $@ $(OBJ_SOLVER) $(OBJ_CONTRIB) $(LIBS)
|
||||
+
|
||||
#--------------------------------------------------------------------------#
|
||||
|
||||
# Note that 'build.hpp' is generated and resides in the build directory.
|
||||
# Note that 'build.hpp' is generated and resides in the build directory.
|
||||
@@ -1,35 +0,0 @@
|
||||
Some udmapbuf relying tests were still selected despite using --no-suite=needs-udmabuf.
|
||||
|
||||
Upstream-status: Patch prepared by upstream, not yet committed.
|
||||
|
||||
diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build
|
||||
index 0118304bf8..6bf4d4bb93 100644
|
||||
--- a/testsuite/gsk/meson.build
|
||||
+++ b/testsuite/gsk/meson.build
|
||||
@@ -275,6 +275,16 @@ compare_render_tests = [
|
||||
'zero-length-path-stroke',
|
||||
]
|
||||
|
||||
+# These tests use dmabufs and fail in testrunners that have
|
||||
+# dmabuf support but no access to /dev/udmabuf.
|
||||
+# For that purpose we add them to the 'needs-udmabuf' suite
|
||||
+# with this list
|
||||
+needs_udmabuf = [
|
||||
+ 'yuv-matrix-dmabuf-nv12',
|
||||
+ 'yuv-matrix-dmabuf-rgba',
|
||||
+ 'yuv-matrix-dmabuf-yuyv',
|
||||
+]
|
||||
+
|
||||
# These tests are either slow or need lots of memory.
|
||||
# So we don't run them in parallel with other such tests to not
|
||||
# cause CI failures
|
||||
@@ -386,6 +396,9 @@ foreach renderer : renderers
|
||||
if test_xfails.contains(variant) or (renderer_name == 'cairo' and variant == 'clip')
|
||||
extra_suites += ['failing']
|
||||
endif
|
||||
+ if needs_udmabuf.contains(testname)
|
||||
+ extra_suites += ['needs-udmabuf']
|
||||
+ endif
|
||||
test('compare ' + renderer_name + ' ' + testname + ' ' + variant, compare_render,
|
||||
protocol: 'tap',
|
||||
args: [
|
||||
@@ -1,79 +0,0 @@
|
||||
Upstream-status: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/9675
|
||||
|
||||
diff --git a/demos/gtk-demo/geninclude.py b/demos/gtk-demo/geninclude.py
|
||||
index 2ebfaeb625..5864a608f5 100755
|
||||
--- a/demos/gtk-demo/geninclude.py
|
||||
+++ b/demos/gtk-demo/geninclude.py
|
||||
@@ -2,19 +2,20 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import sys
|
||||
-import re
|
||||
-import os
|
||||
from collections import *
|
||||
|
||||
+
|
||||
def add_quotes(s):
|
||||
return "\"" + s.lower() + "\""
|
||||
|
||||
+
|
||||
def wordify(s):
|
||||
return s.strip().rstrip(".,;:")
|
||||
|
||||
+
|
||||
def is_keyword(s):
|
||||
if s == "GTK":
|
||||
- return False
|
||||
+ return False
|
||||
elif s.startswith(("Gtk", "Gdk", "Pango")):
|
||||
return True
|
||||
elif s.startswith("G") and s[1].isupper():
|
||||
@@ -22,6 +23,7 @@ def is_keyword(s):
|
||||
else:
|
||||
return False
|
||||
|
||||
+
|
||||
out_file = sys.argv[1]
|
||||
in_files = sys.argv[2:]
|
||||
|
||||
@@ -82,6 +84,10 @@ for demo in demos:
|
||||
parent_index = parent_index + 1
|
||||
|
||||
|
||||
+# Sort demos by title
|
||||
+demos = sorted(demos, key=lambda x: x[1])
|
||||
+
|
||||
+
|
||||
# For every child with a parent, generate a list of child demos
|
||||
i = 0
|
||||
for parent in parents:
|
||||
@@ -91,15 +97,12 @@ for parent in parents:
|
||||
for child in demos:
|
||||
if child[1].startswith(parent + "/"):
|
||||
title = child[1][child[1].rfind('/') + 1:]
|
||||
- file_output += " { \"" + child[0] + "\", \"" + title + "\", " + "(const char*[]) {" + ", ".join(list(map(add_quotes, child[2])) + ["NULL"]) + " }, \"" + child[3] + "\", " + child[4] + ", NULL },\n"
|
||||
+ file_output += " { \"" + child[0] + "\", \"" + title + "\", " + "(const char*[]) {" + ", ".join(list(map(add_quotes, sorted(child[2]))) + ["NULL"]) + " }, \"" + child[3] + "\", " + child[4] + ", NULL },\n"
|
||||
|
||||
file_output += " { NULL }\n};\n"
|
||||
i = i + 1
|
||||
|
||||
|
||||
-# Sort demos by title
|
||||
-demos = sorted(demos, key=lambda x: x[1])
|
||||
-
|
||||
file_output += "\nDemoData gtk_demos[] = {\n"
|
||||
for demo in demos:
|
||||
# Do not generate one of these for demos with a parent demo
|
||||
@@ -118,10 +121,10 @@ for demo in demos:
|
||||
|
||||
if demo[5] != -1:
|
||||
child_array = "child" + str(demo[5])
|
||||
- file_output += " { " + name + ", " + title + ", " + "(const char*[]) {" + ", ".join(list(map(add_quotes, keywords)) + ["NULL"]) + " }, " + file + ", " + demo[4] + ", " + child_array + " },\n"
|
||||
+ file_output += " { " + name + ", " + title + ", " + "(const char*[]) {" + ", ".join(list(map(add_quotes, sorted(keywords))) + ["NULL"]) + " }, " + file + ", " + demo[4] + ", " + child_array + " },\n"
|
||||
|
||||
-file_output += " { NULL }\n};\n"
|
||||
|
||||
+file_output += " { NULL }\n};\n"
|
||||
ofile = open(out_file, "w")
|
||||
ofile.write(file_output)
|
||||
ofile.close()
|
||||
@@ -1,35 +0,0 @@
|
||||
Some udmapbuf relying tests were still selected despite using --no-suite=needs-udmabuf.
|
||||
|
||||
Upstream-status: Patch prepared by upstream, not yet committed.
|
||||
|
||||
diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build
|
||||
index 0118304bf8..6bf4d4bb93 100644
|
||||
--- a/testsuite/gsk/meson.build
|
||||
+++ b/testsuite/gsk/meson.build
|
||||
@@ -275,6 +275,16 @@ compare_render_tests = [
|
||||
'zero-length-path-stroke',
|
||||
]
|
||||
|
||||
+# These tests use dmabufs and fail in testrunners that have
|
||||
+# dmabuf support but no access to /dev/udmabuf.
|
||||
+# For that purpose we add them to the 'needs-udmabuf' suite
|
||||
+# with this list
|
||||
+needs_udmabuf = [
|
||||
+ 'yuv-matrix-dmabuf-nv12',
|
||||
+ 'yuv-matrix-dmabuf-rgba',
|
||||
+ 'yuv-matrix-dmabuf-yuyv',
|
||||
+]
|
||||
+
|
||||
# These tests are either slow or need lots of memory.
|
||||
# So we don't run them in parallel with other such tests to not
|
||||
# cause CI failures
|
||||
@@ -386,6 +396,9 @@ foreach renderer : renderers
|
||||
if test_xfails.contains(variant) or (renderer_name == 'cairo' and variant == 'clip')
|
||||
extra_suites += ['failing']
|
||||
endif
|
||||
+ if needs_udmabuf.contains(testname)
|
||||
+ extra_suites += ['needs-udmabuf']
|
||||
+ endif
|
||||
test('compare ' + renderer_name + ' ' + testname + ' ' + variant, compare_render,
|
||||
protocol: 'tap',
|
||||
args: [
|
||||
@@ -1,40 +0,0 @@
|
||||
Description: Adjust int128 alignment
|
||||
Author: Walter Bright <WalterBright@users.noreply.github.com>
|
||||
Origin: backport, https://github.com/ldc-developers/ldc/commit/f634e2a6542a8b563d9ba1b680afd5337b4c09ea
|
||||
Bug: https://github.com/ldc-developers/ldc/issues/1356
|
||||
Last-Update: 2024-12-30
|
||||
---
|
||||
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
||||
--- a/dmd/common/int128.d
|
||||
+++ b/dmd/common/int128.d
|
||||
@@ -20,7 +20,29 @@
|
||||
alias U = ulong;
|
||||
enum Ubits = uint(U.sizeof * 8);
|
||||
|
||||
-align(16) struct Cent
|
||||
+version (DigitalMars)
|
||||
+{
|
||||
+ /* The alignment should follow target.stackAlign(),
|
||||
+ * which is `isXmmSupported() ? 16 : (is64bit ? 8 : 4)
|
||||
+ */
|
||||
+ version (D_SIMD)
|
||||
+ private enum Cent_alignment = 16;
|
||||
+ else version (X86_64)
|
||||
+ private enum Cent_alignment = 8;
|
||||
+ else
|
||||
+ private enum Cent_alignment = 4;
|
||||
+}
|
||||
+else
|
||||
+{
|
||||
+ version (LDC) version (X86) version = LDC_X86;
|
||||
+
|
||||
+ version (X86_64) private enum Cent_alignment = 16;
|
||||
+ // 32-bit x86: need default alignment due to https://github.com/ldc-developers/ldc/issues/1356
|
||||
+ else version (LDC_X86) private enum Cent_alignment = U.alignof;
|
||||
+ else private enum Cent_alignment = (size_t.sizeof * 2);
|
||||
+}
|
||||
+
|
||||
+align(Cent_alignment) struct Cent
|
||||
{
|
||||
U lo; // low 64 bits
|
||||
U hi; // high 64 bits
|
||||
@@ -0,0 +1,67 @@
|
||||
This commit adds the patch that fixes:
|
||||
<https://github.com/lsof-org/lsof/issues/317>
|
||||
|
||||
The issue was triggering the following error in the `test` phase that
|
||||
resulted in a build failure in Linux 6.9 or higher:
|
||||
|
||||
FAIL: lib/dialects/linux/tests/case-20-pidfd-pid.bash
|
||||
|
||||
|
||||
From c1678e3f6e4b4d984cb3078b7bf0c9e24bedb8ca Mon Sep 17 00:00:00 2001
|
||||
From: Jiajie Chen <c@jia.je>
|
||||
Date: Fri, 17 May 2024 15:22:35 +0800
|
||||
Subject: [PATCH] [linux] Maintain original output for pidfd in linux 6.9
|
||||
|
||||
---
|
||||
00DIST | 3 +++
|
||||
lib/dialects/linux/dproc.c | 13 +++++++++++++
|
||||
2 files changed, 16 insertions(+)
|
||||
|
||||
diff --git a/00DIST b/00DIST
|
||||
index d5a0349..9a29611 100644
|
||||
--- a/00DIST
|
||||
+++ b/00DIST
|
||||
@@ -5605,6 +5605,9 @@ Supplement Regenerated the 4.04 distribution to correct a non-
|
||||
|
||||
[linux] Do not embed kernel version in CFLAGS (#314)
|
||||
|
||||
+ [linux] Linux 6.9 changed the pidfs appearence in procfs. Try
|
||||
+ to maintain original output in lsof (#317)
|
||||
+
|
||||
|
||||
Vic Abell <abe@purdue.edu>
|
||||
July 14, 2018
|
||||
diff --git a/lib/dialects/linux/dproc.c b/lib/dialects/linux/dproc.c
|
||||
index cb6bb64..3a7a120 100644
|
||||
--- a/lib/dialects/linux/dproc.c
|
||||
+++ b/lib/dialects/linux/dproc.c
|
||||
@@ -1273,6 +1273,10 @@ static int process_id(struct lsof_context *ctx, /* context */
|
||||
#endif /* defined(HASEPTOPTS) */
|
||||
if (rest && rest[0] == '[' && rest[1] == 'p')
|
||||
fdinfo_mask |= FDINFO_PID;
|
||||
+ else if (Lf->ntype == N_REGLR && rest && *rest && strcmp(pbuf, "pidfd") == 0) {
|
||||
+ // https://github.com/lsof-org/lsof/issues/317
|
||||
+ fdinfo_mask |= FDINFO_PID;
|
||||
+ }
|
||||
|
||||
if ((av = get_fdinfo(ctx, pathi, fdinfo_mask, &fi)) &
|
||||
FDINFO_POS) {
|
||||
@@ -1338,6 +1342,15 @@ static int process_id(struct lsof_context *ctx, /* context */
|
||||
Lf->sf |= SELPTYINFO;
|
||||
}
|
||||
#endif /* defined(HASEPTOPTS) && defined(HASPTYEPT) */
|
||||
+ else if (Lf->ntype == N_REGLR && rest && *rest && Lf->nm &&
|
||||
+ strcmp(Lf->nm, "pidfd") == 0) {
|
||||
+ // https://github.com/lsof-org/lsof/issues/317
|
||||
+ // pidfd since Linux 6.9 becomes a regular file:
|
||||
+ // /proc/PID/fd/FD -> pidfd:[INODE]
|
||||
+ (void)snpf(rest, sizeof(pbuf) - (rest - pbuf),
|
||||
+ "[pidfd:%d]", fi.pid);
|
||||
+ enter_nm(ctx, rest);
|
||||
+ }
|
||||
|
||||
if (Lf->sf)
|
||||
link_lfile(ctx);
|
||||
--
|
||||
2.45.2
|
||||
|
||||
@@ -1,290 +0,0 @@
|
||||
From 2769642d3c7bd3c0d830b2f18ef6b3bf6a710bf4 Mon Sep 17 00:00:00 2001
|
||||
From: Nicolas Werner <nicolas.werner@hotmail.de>
|
||||
Date: Sun, 14 Sep 2025 23:43:20 +0200
|
||||
Subject: [PATCH] Fix most reply rendering issues with qt 6.9.2
|
||||
|
||||
---
|
||||
resources/qml/TimelineBubbleMessageStyle.qml | 31 ++++----
|
||||
resources/qml/TimelineDefaultMessageStyle.qml | 32 ++++-----
|
||||
resources/qml/TopBar.qml | 2 +-
|
||||
resources/qml/delegates/Reply.qml | 70 ++++++++++---------
|
||||
4 files changed, 65 insertions(+), 70 deletions(-)
|
||||
|
||||
diff --git a/resources/qml/TimelineBubbleMessageStyle.qml b/resources/qml/TimelineBubbleMessageStyle.qml
|
||||
index 560cb1338..722718bc4 100644
|
||||
--- a/resources/qml/TimelineBubbleMessageStyle.qml
|
||||
+++ b/resources/qml/TimelineBubbleMessageStyle.qml
|
||||
@@ -210,9 +210,10 @@ TimelineEvent {
|
||||
|
||||
AbstractButton {
|
||||
id: replyRow
|
||||
- visible: wrapper.reply
|
||||
+ visible: wrapper.replyTo
|
||||
+
|
||||
+ leftPadding: Nheko.paddingSmall + 4
|
||||
|
||||
- height: replyLine.height
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
|
||||
@@ -225,19 +226,7 @@ TimelineEvent {
|
||||
cursorShape: Qt.PointingHandCursor
|
||||
}
|
||||
|
||||
- contentItem: Row {
|
||||
- id: replyRowLay
|
||||
-
|
||||
- spacing: Nheko.paddingSmall
|
||||
-
|
||||
- Rectangle {
|
||||
- id: replyLine
|
||||
- height: Math.min( wrapper.reply?.height, timelineView.height / 10) + Nheko.paddingSmall + replyUserButton.height
|
||||
- color: replyRow.userColor
|
||||
- width: 4
|
||||
- }
|
||||
-
|
||||
- Column {
|
||||
+ contentItem: Column {
|
||||
spacing: 0
|
||||
|
||||
id: replyCol
|
||||
@@ -247,7 +236,7 @@ TimelineEvent {
|
||||
|
||||
contentItem: Label {
|
||||
id: userName_
|
||||
- text: wrapper.reply?.userName ?? ''
|
||||
+ text: wrapper.reply?.userName ?? 'missing name'
|
||||
color: replyRow.userColor
|
||||
textFormat: Text.RichText
|
||||
width: wrapper.maxWidth
|
||||
@@ -259,12 +248,20 @@ TimelineEvent {
|
||||
replyUserButton,
|
||||
wrapper.reply,
|
||||
]
|
||||
- }
|
||||
}
|
||||
|
||||
background: Rectangle {
|
||||
//width: replyRow.implicitContentWidth
|
||||
color: Qt.tint(palette.base, Qt.hsla(replyRow.userColor.hslHue, 0.5, replyRow.userColor.hslLightness, 0.1))
|
||||
+ Rectangle {
|
||||
+ anchors.top: parent.top
|
||||
+ anchors.bottom: parent.bottom
|
||||
+ anchors.left: parent.left
|
||||
+
|
||||
+ id: replyLine
|
||||
+ color: replyRow.userColor
|
||||
+ width: 4
|
||||
+ }
|
||||
}
|
||||
|
||||
onClicked: {
|
||||
diff --git a/resources/qml/TimelineDefaultMessageStyle.qml b/resources/qml/TimelineDefaultMessageStyle.qml
|
||||
index 2bc0171a8..49454ac0b 100644
|
||||
--- a/resources/qml/TimelineDefaultMessageStyle.qml
|
||||
+++ b/resources/qml/TimelineDefaultMessageStyle.qml
|
||||
@@ -192,9 +192,9 @@ TimelineEvent {
|
||||
|
||||
AbstractButton {
|
||||
id: replyRow
|
||||
- visible: wrapper.reply
|
||||
+ visible: wrapper.replyTo
|
||||
|
||||
- height: replyLine.height
|
||||
+ leftPadding: Nheko.paddingSmall + 4
|
||||
|
||||
property color userColor: TimelineManager.userColor(wrapper.reply?.userId ?? '', palette.base)
|
||||
|
||||
@@ -205,19 +205,7 @@ TimelineEvent {
|
||||
cursorShape: Qt.PointingHandCursor
|
||||
}
|
||||
|
||||
- contentItem: Row {
|
||||
- id: replyRowLay
|
||||
-
|
||||
- spacing: Nheko.paddingSmall
|
||||
-
|
||||
- Rectangle {
|
||||
- id: replyLine
|
||||
- height: Math.min( wrapper.reply?.height, timelineView.height / 10) + Nheko.paddingSmall + replyUserButton.height
|
||||
- color: replyRow.userColor
|
||||
- width: 4
|
||||
- }
|
||||
-
|
||||
- Column {
|
||||
+ contentItem: Column {
|
||||
spacing: 0
|
||||
|
||||
id: replyCol
|
||||
@@ -227,7 +215,7 @@ TimelineEvent {
|
||||
|
||||
contentItem: Label {
|
||||
id: userName_
|
||||
- text: wrapper.reply?.userName ?? ''
|
||||
+ text: wrapper.reply?.userName ?? 'missing name'
|
||||
color: replyRow.userColor
|
||||
textFormat: Text.RichText
|
||||
width: wrapper.maxWidth
|
||||
@@ -239,12 +227,20 @@ TimelineEvent {
|
||||
replyUserButton,
|
||||
wrapper.reply,
|
||||
]
|
||||
- }
|
||||
}
|
||||
|
||||
background: Rectangle {
|
||||
- //width: replyRow.implicitContentWidth
|
||||
color: Qt.tint(palette.base, Qt.hsla(replyRow.userColor.hslHue, 0.5, replyRow.userColor.hslLightness, 0.1))
|
||||
+
|
||||
+ Rectangle {
|
||||
+ anchors.top: parent.top
|
||||
+ anchors.bottom: parent.bottom
|
||||
+ anchors.left: parent.left
|
||||
+
|
||||
+ id: replyLine
|
||||
+ color: replyRow.userColor
|
||||
+ width: 4
|
||||
+ }
|
||||
}
|
||||
|
||||
onClicked: {
|
||||
diff --git a/resources/qml/TopBar.qml b/resources/qml/TopBar.qml
|
||||
index 900e59e8b..cd20e94ec 100644
|
||||
--- a/resources/qml/TopBar.qml
|
||||
+++ b/resources/qml/TopBar.qml
|
||||
@@ -330,7 +330,7 @@ Pane {
|
||||
ImageButton {
|
||||
id: deletePinButton
|
||||
|
||||
- Layout.alignment: Qt.AlignTop | Qt.AlignLeft
|
||||
+ Layout.alignment: Qt.AlignTop | Qt.AlignRight
|
||||
Layout.preferredHeight: 16
|
||||
Layout.preferredWidth: 16
|
||||
ToolTip.text: qsTr("Unpin")
|
||||
diff --git a/resources/qml/delegates/Reply.qml b/resources/qml/delegates/Reply.qml
|
||||
index 7ee2a0a14..77cad0f0a 100644
|
||||
--- a/resources/qml/delegates/Reply.qml
|
||||
+++ b/resources/qml/delegates/Reply.qml
|
||||
@@ -5,6 +5,7 @@
|
||||
import QtQuick
|
||||
import QtQuick.Controls
|
||||
import QtQuick.Window
|
||||
+import QtQuick.Layouts
|
||||
import im.nheko
|
||||
import "../"
|
||||
|
||||
@@ -21,7 +22,11 @@ AbstractButton {
|
||||
property string userId: eventId ? room.dataById(eventId, Room.UserId, "") : ""
|
||||
property string userName: eventId ? room.dataById(eventId, Room.UserName, "") : ""
|
||||
implicitHeight: replyContainer.height
|
||||
- implicitWidth: replyContainer.implicitWidth
|
||||
+ implicitWidth: replyContainer.implicitWidth + leftPadding + rightPadding
|
||||
+
|
||||
+ leftPadding: 4 + Nheko.paddingSmall
|
||||
+ rightPadding: Nheko.paddingSmall
|
||||
+
|
||||
required property int maxWidth
|
||||
property bool limitHeight: false
|
||||
|
||||
@@ -31,14 +36,14 @@ AbstractButton {
|
||||
}
|
||||
|
||||
onClicked: {
|
||||
- let link = reply.child.linkAt != undefined && reply.child.linkAt(pressX-colorline.width, pressY - userName_.implicitHeight);
|
||||
+ let link = timelineEvent.main.linkAt != undefined && timelineEvent.main.linkAt(pressX-colorline.width, pressY - userName_.implicitHeight);
|
||||
if (link) {
|
||||
Nheko.openLink(link)
|
||||
} else {
|
||||
room.showEvent(r.eventId)
|
||||
}
|
||||
}
|
||||
- onPressAndHold: replyContextMenu.show(reply.child.copyText, reply.child.linkAt(pressX-colorline.width, pressY - userName_.implicitHeight), r.eventId)
|
||||
+ onPressAndHold: replyContextMenu.show(timelineEvent.main.copyText, timelineEvent.main.linkAt(pressX-colorline.width, pressY - userName_.implicitHeight), r.eventId)
|
||||
|
||||
contentItem: TimelineEvent {
|
||||
id: timelineEvent
|
||||
@@ -51,49 +56,36 @@ AbstractButton {
|
||||
maxWidth: r.maxWidth
|
||||
limitAsReply: r.limitHeight
|
||||
|
||||
- //height: replyContainer.implicitHeight
|
||||
- data: Row {
|
||||
+ data: Column {
|
||||
id: replyContainer
|
||||
-
|
||||
- spacing: Nheko.paddingSmall
|
||||
+ spacing: 0
|
||||
|
||||
clip: r.limitHeight
|
||||
|
||||
height: r.limitHeight ? Math.min( timelineEvent.main?.height, timelineView.height / 10) + Nheko.paddingSmall + usernameBtn.height : undefined
|
||||
|
||||
- Rectangle {
|
||||
- id: colorline
|
||||
-
|
||||
- width: 4
|
||||
- height: content.height
|
||||
-
|
||||
- color: TimelineManager.userColor(r.userId, palette.base)
|
||||
- }
|
||||
-
|
||||
- Column {
|
||||
- id: content
|
||||
- spacing: 0
|
||||
+ // FIXME: I have no idea, why this name doesn't render in the reply popup on Qt 6.9.2
|
||||
+ AbstractButton {
|
||||
+ id: usernameBtn
|
||||
|
||||
- AbstractButton {
|
||||
- id: usernameBtn
|
||||
+ visible: r.eventId
|
||||
|
||||
-
|
||||
- contentItem: Label {
|
||||
- id: userName_
|
||||
- text: r.userName
|
||||
- color: r.userColor
|
||||
- textFormat: Text.RichText
|
||||
- width: timelineEvent.main?.width
|
||||
- }
|
||||
- onClicked: room.openUserProfile(r.userId)
|
||||
+ contentItem: Label {
|
||||
+ visible: r.eventId
|
||||
+ id: userName_
|
||||
+ text: r.userName
|
||||
+ color: r.userColor
|
||||
+ textFormat: Text.RichText
|
||||
+ width: timelineEvent.main?.width
|
||||
}
|
||||
-
|
||||
- data: [
|
||||
- usernameBtn, timelineEvent.main,
|
||||
- ]
|
||||
+ onClicked: room.openUserProfile(r.userId)
|
||||
}
|
||||
|
||||
+ data: [
|
||||
+ usernameBtn, timelineEvent.main,
|
||||
+ ]
|
||||
}
|
||||
+
|
||||
}
|
||||
|
||||
background: Rectangle {
|
||||
@@ -103,6 +95,16 @@ AbstractButton {
|
||||
property color userColor: TimelineManager.userColor(r.userId, palette.base)
|
||||
property color bgColor: palette.base
|
||||
color: Qt.tint(bgColor, Qt.hsla(userColor.hslHue, 0.5, userColor.hslLightness, 0.1))
|
||||
+
|
||||
+ Rectangle {
|
||||
+ anchors.top: parent.top
|
||||
+ anchors.bottom: parent.bottom
|
||||
+ anchors.left: parent.left
|
||||
+
|
||||
+ id: colorline
|
||||
+ color: backgroundItem.userColor
|
||||
+ width: 4
|
||||
+ }
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
Submitted close to upstream at
|
||||
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1070162
|
||||
|
||||
From 95ff7e9de4ed815e060b1df59b5b2b105307e0d7 Mon Sep 17 00:00:00 2001
|
||||
From: Eric Bavier <bavier@posteo.net>
|
||||
Date: Mon, 29 Apr 2024 23:34:15 -0500
|
||||
Subject: [PATCH] Fixes substitution of REALEASE_DATE in nickle.1
|
||||
|
||||
* Makefile.am (nickle.1): 'BUILD_DATE' -> 'RELEASE_DATE'.
|
||||
* nickle.1.in: Include version in footer.
|
||||
---
|
||||
Makefile.am | 2 +-
|
||||
nickle.1.in | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index ba28ec9..5ed56a3 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -96,7 +96,7 @@ RELEASE_FILES = $(TARFILE) $(SIGFILE) $(SRPMFILE) $(RPMFILE)
|
||||
|
||||
nickle.1: nickle.1.in nickle-config.h
|
||||
sed -e 's,@''VERSION@,$(VERSION),' \
|
||||
- -e 's,@''BUILD_DATE@,$(BUILD_DATE),' \
|
||||
+ -e 's,@''RELEASE_DATE@,$(RELEASE_DATE),' \
|
||||
-e 's,@''pkgdatadir@,$(pkgdatadir),' $(top_srcdir)/nickle.1.in > $@
|
||||
|
||||
nickle.spec: nickle.spec.in nickle-config.h
|
||||
diff --git a/nickle.1.in b/nickle.1.in
|
||||
index 4871ac2..1ab9e08 100644
|
||||
--- a/nickle.1.in
|
||||
+++ b/nickle.1.in
|
||||
@@ -1,4 +1,4 @@
|
||||
-.TH NICKLE 1 "@RELEASE_DATE@"
|
||||
+.TH NICKLE 1 "@RELEASE_DATE@" "nickle @VERSION@"
|
||||
.SH NAME
|
||||
nickle \- a desk calculator language
|
||||
.SH SYNOPSIS
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@@ -1,984 +0,0 @@
|
||||
From 82e98cf24808754578ab26adef5c33acc949f75e Mon Sep 17 00:00:00 2001
|
||||
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
|
||||
Date: Sat, 5 Jun 2021 22:47:00 -0400
|
||||
Subject: [PATCH] ppsspp: Remove upgrade code and gold support.
|
||||
|
||||
Original patch from Liliana Marie Prikler.
|
||||
Rebased on master (commit 69fa20744958aef8da9ca052ba7675fdc1636e46) by
|
||||
Maxim Cournoyer.
|
||||
Revised again by Liliana Marie Prikler for versions 1.12.3 and 1.14.4.
|
||||
Revised again again by Liliana Marie Prikler for version 1.20.3.
|
||||
---
|
||||
CMakeLists.txt | 78 +++++------------------
|
||||
Common/System/Request.cpp | 2 -
|
||||
Common/System/System.h | 1 -
|
||||
Core/Config.cpp | 123 +------------------------------------
|
||||
Core/Config.h | 11 ----
|
||||
Core/MIPS/IR/IRJit.h | 5 --
|
||||
Qt/QtMain.cpp | 6 --
|
||||
Qt/mainwindow.cpp | 8 +--
|
||||
Qt/mainwindow.h | 3 +-
|
||||
SDL/SDLMain.cpp | 11 +---
|
||||
UI/Background.cpp | 2 +-
|
||||
UI/GameSettingsScreen.cpp | 7 ---
|
||||
UI/MainScreen.cpp | 91 +--------------------------
|
||||
UI/MainScreen.h | 3 -
|
||||
UI/MemStickScreen.cpp | 9 +--
|
||||
UI/MiscScreens.cpp | 36 +----------
|
||||
UI/ReportScreen.cpp | 11 +---
|
||||
UI/UIAtlas.cpp | 1 -
|
||||
UWP/PPSSPP_UWPMain.cpp | 8 +--
|
||||
Windows/MainWindowMenu.cpp | 9 ---
|
||||
Windows/main.cpp | 10 +--
|
||||
Windows/resource.h | 1 -
|
||||
ios/main.mm | 33 ++++------
|
||||
23 files changed, 39 insertions(+), 430 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 070f49b..f206ced 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -137,27 +137,6 @@ if(OPENXR AND NOT ARMV7_DEVICE)
|
||||
message("OpenXR enabled")
|
||||
endif()
|
||||
|
||||
-if(GOLD)
|
||||
- add_compile_definitions(GOLD)
|
||||
- message("Gold Build")
|
||||
- if(IOS_APP_STORE)
|
||||
- message("WARNING: Gold build for iOS is deprecated")
|
||||
- endif()
|
||||
-else()
|
||||
- message("Non-gold Build")
|
||||
-endif()
|
||||
-
|
||||
-if(USE_IAP)
|
||||
- if(GOLD)
|
||||
- message(FATAL_ERROR "USE_IAP and GOLD can't be enabled together")
|
||||
- endif()
|
||||
- if(NOT IOS_APP_STORE)
|
||||
- message(FATAL_ERROR "USE_IAP can only be enabled in app store builds")
|
||||
- endif()
|
||||
- message("USE_IAP for iOS enabled")
|
||||
- add_compile_definitions(USE_IAP)
|
||||
-endif()
|
||||
-
|
||||
if(IOS_APP_STORE)
|
||||
add_compile_definitions(PPSSPP_PLATFORM_IOS_APP_STORE)
|
||||
add_compile_definitions(GLES_SILENCE_DEPRECATION)
|
||||
@@ -211,8 +190,6 @@ option(USE_ASAN "Use address sanitizer" OFF)
|
||||
option(USE_UBSAN "Use undefined behaviour sanitizer" OFF)
|
||||
option(USE_CCACHE "Use ccache if detected" ON)
|
||||
option(USE_NO_MMAP "Disable mmap usage" OFF)
|
||||
-option(USE_IAP "IAP enabled" OFF)
|
||||
-option(GOLD "Gold build" OFF)
|
||||
|
||||
if(USE_CCACHE)
|
||||
include(ccache)
|
||||
@@ -1462,11 +1439,7 @@ elseif(WIN32)
|
||||
set(TargetBin PPSSPPWindows)
|
||||
elseif(LIBRETRO)
|
||||
else()
|
||||
- if(GOLD)
|
||||
- set(TargetBin PPSSPPGold)
|
||||
- else()
|
||||
- set(TargetBin PPSSPPSDL)
|
||||
- endif()
|
||||
+ set(TargetBin PPSSPPSDL)
|
||||
# Require SDL
|
||||
add_compile_definitions(SDL)
|
||||
list(APPEND nativeExtra
|
||||
@@ -2972,17 +2945,10 @@ endif()
|
||||
if(TargetBin)
|
||||
if(APPLE)
|
||||
if(NOT IOS)
|
||||
- if(GOLD)
|
||||
- set(ICON_PATH_ABS ${CMAKE_CURRENT_SOURCE_DIR}/icons/ppsspp_gold.icns)
|
||||
- set(MACOSX_BUNDLE_ICON_FILE ppsspp_gold.icns)
|
||||
- set(MACOSX_BUNDLE_BUNDLE_NAME "PPSSPP Gold")
|
||||
- set(MACOSX_BUNDLE_GUI_IDENTIFIER org.ppsspp.ppssppgold)
|
||||
- else()
|
||||
- set(ICON_PATH_ABS ${CMAKE_CURRENT_SOURCE_DIR}/icons/ppsspp.icns)
|
||||
- set(MACOSX_BUNDLE_ICON_FILE ppsspp.icns)
|
||||
- set(MACOSX_BUNDLE_BUNDLE_NAME "PPSSPP")
|
||||
- set(MACOSX_BUNDLE_GUI_IDENTIFIER org.ppsspp.ppsspp)
|
||||
- endif()
|
||||
+ set(ICON_PATH_ABS ${CMAKE_CURRENT_SOURCE_DIR}/icons/ppsspp.icns)
|
||||
+ set(MACOSX_BUNDLE_ICON_FILE ppsspp.icns)
|
||||
+ set(MACOSX_BUNDLE_BUNDLE_NAME "PPSSPP")
|
||||
+ set(MACOSX_BUNDLE_GUI_IDENTIFIER org.ppsspp.ppsspp)
|
||||
set_source_files_properties(${ICON_PATH_ABS} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
|
||||
endif()
|
||||
|
||||
@@ -3081,25 +3047,15 @@ if(IOS AND NOT LIBRETRO)
|
||||
set(PRODUCT_NAME "PPSSPP")
|
||||
set(BUNDLE_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/PPSSPP-Info.plist")
|
||||
set(BUNDLE_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/ios/App.entitlements")
|
||||
- if(GOLD)
|
||||
- if(IOS_APP_STORE)
|
||||
- set(BUNDLE_IDENTIFIER "org.ppsspp.ppsspp-gold")
|
||||
- else()
|
||||
- set(BUNDLE_IDENTIFIER "org.ppsspp.ppssppgold")
|
||||
- endif()
|
||||
- set(ICON_NAME "PPSSPPGold")
|
||||
- set(DISPLAY_NAME "PPSSPP Gold")
|
||||
+ if(IOS_APP_STORE)
|
||||
+ set(BUNDLE_IDENTIFIER "org.ppsspp.ppsspp-free")
|
||||
else()
|
||||
- if(IOS_APP_STORE)
|
||||
- set(BUNDLE_IDENTIFIER "org.ppsspp.ppsspp-free")
|
||||
- else()
|
||||
- set(BUNDLE_IDENTIFIER "org.ppsspp.ppsspp")
|
||||
- endif()
|
||||
- set(ICON_NAME "AppIcon")
|
||||
- set(DISPLAY_NAME "PPSSPP")
|
||||
+ set(BUNDLE_IDENTIFIER "org.ppsspp.ppsspp")
|
||||
endif()
|
||||
+ set(ICON_NAME "AppIcon")
|
||||
+ set(DISPLAY_NAME "PPSSPP")
|
||||
if(IOS_APP_STORE)
|
||||
- message(STATUS "DevTeam: ${DEVELOPMENT_TEAM_ID} Icon: ${ICON_NAME} Target: ${TargetBin} Gold: ${GOLD} IAP: ${USE_IAP}")
|
||||
+ message(STATUS "DevTeam: ${DEVELOPMENT_TEAM_ID} Icon: ${ICON_NAME} Target: ${TargetBin}")
|
||||
message(STATUS "CURRENT_BINARY_DIR: ${CMAKE_CURRENT_BINARY_DIR}")
|
||||
|
||||
# This is for injecting the version into the plist, and also copying resources.
|
||||
@@ -3191,15 +3147,9 @@ if(IOS AND NOT LIBRETRO)
|
||||
endif()
|
||||
|
||||
if(MACOSX AND NOT IOS)
|
||||
- if(GOLD)
|
||||
- set_target_properties(${TargetBin} PROPERTIES
|
||||
- MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/macOS/InfoGold.plist"
|
||||
- )
|
||||
- else()
|
||||
- set_target_properties(${TargetBin} PROPERTIES
|
||||
- MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/macOS/Info.plist"
|
||||
- )
|
||||
- endif()
|
||||
+ set_target_properties(${TargetBin} PROPERTIES
|
||||
+ MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/macOS/Info.plist"
|
||||
+ )
|
||||
endif()
|
||||
|
||||
if(UNIX AND NOT ANDROID AND NOT APPLE)
|
||||
diff --git a/Common/System/Request.cpp b/Common/System/Request.cpp
|
||||
index 8332529..00035fd 100644
|
||||
--- a/Common/System/Request.cpp
|
||||
+++ b/Common/System/Request.cpp
|
||||
@@ -49,8 +49,6 @@ const char *RequestTypeAsString(SystemRequestType type) {
|
||||
case SystemRequestType::MICROPHONE_COMMAND: return "MICROPHONE_COMMAND";
|
||||
case SystemRequestType::RUN_CALLBACK_IN_WNDPROC: return "RUN_CALLBACK_IN_WNDPROC";
|
||||
case SystemRequestType::MOVE_TO_TRASH: return "MOVE_TO_TRASH";
|
||||
- case SystemRequestType::IAP_RESTORE_PURCHASES: return "IAP_RESTORE_PURCHASES";
|
||||
- case SystemRequestType::IAP_MAKE_PURCHASE: return "IAP_MAKE_PURCHASE";
|
||||
default: return "N/A";
|
||||
}
|
||||
}
|
||||
diff --git a/Common/System/System.h b/Common/System/System.h
|
||||
index e58a5cc..3c227be 100644
|
||||
--- a/Common/System/System.h
|
||||
+++ b/Common/System/System.h
|
||||
@@ -194,7 +194,6 @@ enum SystemProperty {
|
||||
SYSPROP_DISPLAY_HAS_CAMERA_CUTOUT,
|
||||
|
||||
SYSPROP_DEVICE_TYPE,
|
||||
- SYSPROP_APP_GOLD, // To avoid having #ifdef GOLD other than in main.cpp and similar.
|
||||
|
||||
// Exposed on Android. Choosing the optimal sample rate for audio
|
||||
// will result in lower latencies. Buffer size is automatically matched
|
||||
diff --git a/Core/Config.cpp b/Core/Config.cpp
|
||||
index 4380e80..afd177a 100644
|
||||
--- a/Core/Config.cpp
|
||||
+++ b/Core/Config.cpp
|
||||
@@ -237,7 +237,6 @@ static const ConfigSetting generalSettings[] = {
|
||||
ConfigSetting("CurrentDirectory", SETTING(g_Config, currentDirectory), "", CfgFlag::DEFAULT),
|
||||
ConfigSetting("ShowDebuggerOnLoad", SETTING(g_Config, bShowDebuggerOnLoad), false, CfgFlag::DEFAULT),
|
||||
ConfigSetting("ShowImDebugger", SETTING(g_Config, bShowImDebugger), false, CfgFlag::DONT_SAVE),
|
||||
- ConfigSetting("CheckForNewVersion", SETTING(g_Config, bCheckForNewVersion), true, CfgFlag::DEFAULT),
|
||||
ConfigSetting("Language", SETTING(g_Config, sLanguageIni), &DefaultLangRegion, CfgFlag::DEFAULT),
|
||||
ConfigSetting("ForceLagSync2", SETTING(g_Config, bForceLagSync), false, CfgFlag::PER_GAME),
|
||||
ConfigSetting("DiscordRichPresence", SETTING(g_Config, bDiscordRichPresence), false, CfgFlag::DEFAULT),
|
||||
@@ -1112,12 +1111,6 @@ static const ConfigSetting jitSettings[] = {
|
||||
ConfigSetting("DiscardRegsOnJRRA", SETTING(g_Config, bDiscardRegsOnJRRA), false, CfgFlag::DONT_SAVE | CfgFlag::REPORT),
|
||||
};
|
||||
|
||||
-static const ConfigSetting upgradeSettings[] = {
|
||||
- ConfigSetting("UpgradeMessage", SETTING(g_Config, sUpgradeMessage), "", CfgFlag::DEFAULT),
|
||||
- ConfigSetting("UpgradeVersion", SETTING(g_Config, sUpgradeVersion), "", CfgFlag::DEFAULT),
|
||||
- ConfigSetting("DismissedVersion", SETTING(g_Config, sDismissedVersion), "", CfgFlag::DEFAULT),
|
||||
-};
|
||||
-
|
||||
static const ConfigSetting themeSettings[] = {
|
||||
ConfigSetting("ThemeName", SETTING(g_Config, sThemeName), "Default", CfgFlag::DEFAULT),
|
||||
};
|
||||
@@ -1156,7 +1149,6 @@ static const ConfigSectionMeta g_sectionMeta[] = {
|
||||
{ &g_Config, themeSettings, ARRAY_SIZE(themeSettings), "Theme" },
|
||||
{ &g_Config, vrSettings, ARRAY_SIZE(vrSettings), "VR" },
|
||||
{ &g_Config, achievementSettings, ARRAY_SIZE(achievementSettings), "Achievements" },
|
||||
- { &g_Config, upgradeSettings, ARRAY_SIZE(upgradeSettings), "Upgrade" },
|
||||
{ &g_Config.displayLayoutLandscape, displayLayoutSettings, ARRAY_SIZE(displayLayoutSettings), "DisplayLayout.Landscape", "Graphics" }, // We read the old settings from [Graphics], since most people played in landscape before.
|
||||
{ &g_Config.displayLayoutPortrait, displayLayoutSettings, ARRAY_SIZE(displayLayoutSettings), "DisplayLayout.Portrait"}, // These we don't want to read from the old settings, since for most people, those settings will be bad.
|
||||
{ &g_Config.touchControlsLandscape, touchControlSettings, ARRAY_SIZE(touchControlSettings), "TouchControls.Landscape", "Control" }, // We read the old settings from [Control], since most people played in landscape before.
|
||||
@@ -1400,8 +1392,6 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) {
|
||||
}
|
||||
}
|
||||
|
||||
- CheckForUpdate();
|
||||
-
|
||||
INFO_LOG(Log::Loader, "Loading controller config: %s", controllerIniFilename_.c_str());
|
||||
bSaveSettings = true;
|
||||
|
||||
@@ -1623,117 +1613,6 @@ void Config::NotifyUpdatedCpuCore() {
|
||||
}
|
||||
}
|
||||
|
||||
-bool Config::SupportsUpgradeCheck() const {
|
||||
-#if PPSSPP_PLATFORM(WINDOWS) || PPSSPP_PLATFORM(LINUX) || PPSSPP_PLATFORM(MACOS) || PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(IOS_APP_STORE)
|
||||
- return true;
|
||||
-#else
|
||||
- return false;
|
||||
-#endif
|
||||
-}
|
||||
-
|
||||
-#if 0
|
||||
-// Use for debugging the version check without messing with the server
|
||||
-#define NEW_VERSION_OVERRIDE "v1.100.3-gaaaaaaaaa"
|
||||
-constexpr int UPDATE_CHECK_FREQ = 1;
|
||||
-#else
|
||||
-constexpr int UPDATE_CHECK_FREQ = 5;
|
||||
-#endif
|
||||
-
|
||||
-void Config::CheckForUpdate() {
|
||||
- if (!bCheckForNewVersion || !SupportsUpgradeCheck()) {
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- const char *gitVer = PPSSPP_GIT_VERSION;
|
||||
- Version installed(gitVer);
|
||||
- Version upgrade(sUpgradeVersion);
|
||||
- const bool versionsValid = installed.IsValid() && upgrade.IsValid();
|
||||
-
|
||||
- // Do this regardless of iRunCount to prevent a silly bug where one might use an older
|
||||
- // build of PPSSPP, receive an upgrade notice, then start a newer version, and still receive the upgrade notice,
|
||||
- // even if said newer version is >= the upgrade found online.
|
||||
- if ((sDismissedVersion == sUpgradeVersion) || (versionsValid && (installed >= upgrade))) {
|
||||
- sUpgradeMessage.clear();
|
||||
- }
|
||||
-
|
||||
- // Check for new version on every 10 runs.
|
||||
- // Sometimes the download may not be finished when the main screen shows (if the user dismisses the
|
||||
- // splash screen quickly), but then we'll just show the notification next time instead, we store the
|
||||
- // upgrade number in the ini.
|
||||
-
|
||||
- const bool checkThisTime = iRunCount % UPDATE_CHECK_FREQ == 0;
|
||||
- if (checkThisTime) {
|
||||
- const char *versionUrl = "http://www.ppsspp.org/version.json";
|
||||
- const char *acceptMime = "application/json, text/*; q=0.9, */*; q=0.8";
|
||||
- g_DownloadManager.StartDownload(versionUrl, Path(), http::RequestFlags::Default, acceptMime, "version", [this](http::Request &download) { VersionJsonDownloadCompleted(download); });
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-void Config::VersionJsonDownloadCompleted(http::Request &download) {
|
||||
- if (download.ResultCode() != 200) {
|
||||
- ERROR_LOG(Log::Loader, "Failed to download %s: %d", download.url().c_str(), download.ResultCode());
|
||||
- return;
|
||||
- }
|
||||
- std::string data;
|
||||
- download.buffer().TakeAll(&data);
|
||||
- if (data.empty()) {
|
||||
- ERROR_LOG(Log::Loader, "Version check: Empty data from server!");
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- json::JsonReader reader(data.c_str(), data.size());
|
||||
- const json::JsonGet root = reader.root();
|
||||
- if (!root) {
|
||||
- ERROR_LOG(Log::Loader, "Failed to parse json");
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- std::string version;
|
||||
- root.getString("version", &version);
|
||||
-
|
||||
- #ifdef NEW_VERSION_OVERRIDE
|
||||
- version = NEW_VERSION_OVERRIDE;
|
||||
- #endif
|
||||
-
|
||||
- const char *gitVer = PPSSPP_GIT_VERSION;
|
||||
- Version installed(gitVer);
|
||||
- Version upgrade(version);
|
||||
- Version dismissed(g_Config.sDismissedVersion);
|
||||
-
|
||||
- if (!installed.IsValid()) {
|
||||
- ERROR_LOG(Log::Loader, "Version check: Local version string invalid. Build problems? %s", PPSSPP_GIT_VERSION);
|
||||
- return;
|
||||
- }
|
||||
- if (!upgrade.IsValid()) {
|
||||
- ERROR_LOG(Log::Loader, "Version check: Invalid server version: %s", version.c_str());
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- if (installed >= upgrade) {
|
||||
- INFO_LOG(Log::Loader, "Version check: Already up to date, erasing any upgrade message");
|
||||
- g_Config.sUpgradeMessage.clear();
|
||||
- g_Config.sUpgradeVersion = upgrade.ToString();
|
||||
- g_Config.sDismissedVersion.clear();
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- if (installed < upgrade && dismissed != upgrade) {
|
||||
- g_Config.sUpgradeMessage = "New version of PPSSPP available!";
|
||||
- g_Config.sUpgradeVersion = upgrade.ToString();
|
||||
- g_Config.sDismissedVersion.clear();
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-bool Config::ShowUpgradeReminder() {
|
||||
- return !sUpgradeMessage.empty() && !sUpgradeVersion.empty() && sUpgradeVersion != sDismissedVersion;
|
||||
-}
|
||||
-
|
||||
-void Config::DismissUpgrade() {
|
||||
- INFO_LOG(Log::Loader, "Upgrade dismissed for version %s", sUpgradeVersion.c_str());
|
||||
- sDismissedVersion = sUpgradeVersion;
|
||||
- sUpgradeMessage.clear();
|
||||
-}
|
||||
-
|
||||
void Config::SetSearchPath(const Path &searchPath) {
|
||||
searchPath_ = searchPath;
|
||||
}
|
||||
diff --git a/Core/Config.h b/Core/Config.h
|
||||
index 3cb451c..b7f6d10 100644
|
||||
--- a/Core/Config.h
|
||||
+++ b/Core/Config.h
|
||||
@@ -679,11 +679,6 @@ struct Config : public ConfigBlock {
|
||||
|
||||
Path mountRoot; // Actually, mount as host0. keeping consistent with headless args.
|
||||
|
||||
- // Data for upgrade prompt
|
||||
- std::string sUpgradeMessage; // The actual message from the server is currently not used, need a translation mechanism. So this just acts as a flag.
|
||||
- std::string sUpgradeVersion;
|
||||
- std::string sDismissedVersion;
|
||||
-
|
||||
void Load(const char *iniFileName = nullptr, const char *controllerIniFilename = nullptr);
|
||||
bool Save(const char *saveReason);
|
||||
void Reload();
|
||||
@@ -706,12 +701,6 @@ struct Config : public ConfigBlock {
|
||||
|
||||
void UpdateIniLocation(const char *iniFileName = nullptr, const char *controllerIniFilename = nullptr);
|
||||
|
||||
- bool SupportsUpgradeCheck() const;
|
||||
- void CheckForUpdate();
|
||||
- void VersionJsonDownloadCompleted(http::Request &download);
|
||||
- void DismissUpgrade();
|
||||
- bool ShowUpgradeReminder();
|
||||
-
|
||||
void GetReportingInfo(UrlEncoder &data) const;
|
||||
|
||||
int NextValidBackend();
|
||||
diff --git a/Core/MIPS/IR/IRJit.h b/Core/MIPS/IR/IRJit.h
|
||||
index 4667043..e3af580 100644
|
||||
--- a/Core/MIPS/IR/IRJit.h
|
||||
+++ b/Core/MIPS/IR/IRJit.h
|
||||
@@ -38,11 +38,6 @@
|
||||
//
|
||||
// #define IR_PROFILING
|
||||
|
||||
-// Try to catch obvious misses of be above rule.
|
||||
-#if defined(IR_PROFILING) && defined(GOLD)
|
||||
-#error
|
||||
-#endif
|
||||
-
|
||||
namespace MIPSComp {
|
||||
|
||||
// TODO : Use arena allocators. For now let's just malloc.
|
||||
diff --git a/Qt/QtMain.cpp b/Qt/QtMain.cpp
|
||||
index c7d43a3..4e0786d 100644
|
||||
--- a/Qt/QtMain.cpp
|
||||
+++ b/Qt/QtMain.cpp
|
||||
@@ -262,12 +262,6 @@ bool System_GetPropertyBool(SystemProperty prop) {
|
||||
return true;
|
||||
case SYSPROP_SUPPORTS_OPEN_FILE_IN_EDITOR:
|
||||
return true; // FileUtil.cpp: OpenFileInEditor
|
||||
- case SYSPROP_APP_GOLD:
|
||||
-#ifdef GOLD
|
||||
- return true;
|
||||
-#else
|
||||
- return false;
|
||||
-#endif
|
||||
case SYSPROP_CAN_JIT:
|
||||
return true;
|
||||
case SYSPROP_HAS_KEYBOARD:
|
||||
diff --git a/Qt/mainwindow.cpp b/Qt/mainwindow.cpp
|
||||
index cbd9fda..670a1ca 100644
|
||||
--- a/Qt/mainwindow.cpp
|
||||
+++ b/Qt/mainwindow.cpp
|
||||
@@ -112,7 +112,7 @@ void MainWindow::updateMenus()
|
||||
int width = (internalPortrait ? 272 : 480) * action->data().toInt();
|
||||
int height = (internalPortrait ? 480 : 272) * action->data().toInt();
|
||||
if (g_Config.iWindowWidth == width && g_Config.iWindowHeight == height) {
|
||||
- action->setChecked(true);
|
||||
+ action->setChecked(true);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -423,11 +423,6 @@ void MainWindow::forumAct()
|
||||
QDesktopServices::openUrl(QUrl("https://forums.ppsspp.org/"));
|
||||
}
|
||||
|
||||
-void MainWindow::goldAct()
|
||||
-{
|
||||
- QDesktopServices::openUrl(QUrl("https://www.ppsspp.org/buygold"));
|
||||
-}
|
||||
-
|
||||
void MainWindow::gitAct()
|
||||
{
|
||||
QDesktopServices::openUrl(QUrl("https://github.com/hrydgard/ppsspp/"));
|
||||
@@ -680,7 +675,6 @@ void MainWindow::createMenus()
|
||||
MenuTree* helpMenu = new MenuTree(this, menuBar(), QT_TR_NOOP("&Help"));
|
||||
helpMenu->add(new MenuAction(this, SLOT(websiteAct()), QT_TR_NOOP("Visit www.&ppsspp.org")));
|
||||
helpMenu->add(new MenuAction(this, SLOT(forumAct()), QT_TR_NOOP("PPSSPP &forums")));
|
||||
- helpMenu->add(new MenuAction(this, SLOT(goldAct()), QT_TR_NOOP("Buy &Gold")));
|
||||
helpMenu->add(new MenuAction(this, SLOT(gitAct()), QT_TR_NOOP("Git&Hub")));
|
||||
helpMenu->add(new MenuAction(this, SLOT(discordAct()), QT_TR_NOOP("Discord")));
|
||||
helpMenu->addSeparator();
|
||||
diff --git a/Qt/mainwindow.h b/Qt/mainwindow.h
|
||||
index 5e735ae..55a180f 100644
|
||||
--- a/Qt/mainwindow.h
|
||||
+++ b/Qt/mainwindow.h
|
||||
@@ -100,7 +100,7 @@ private slots:
|
||||
void stopAct();
|
||||
void resetAct();
|
||||
void switchUMDAct();
|
||||
- void displayRotationGroup_triggered(QAction *action) {
|
||||
+ void displayRotationGroup_triggered(QAction *action) {
|
||||
DisplayLayoutConfig &config = g_Config.GetDisplayLayoutConfig(g_display.GetDeviceOrientation());
|
||||
config.iInternalScreenRotation = action->data().toInt();
|
||||
}
|
||||
@@ -187,7 +187,6 @@ private slots:
|
||||
// Help
|
||||
void websiteAct();
|
||||
void forumAct();
|
||||
- void goldAct();
|
||||
void gitAct();
|
||||
void discordAct();
|
||||
void aboutAct();
|
||||
diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp
|
||||
index 5eea6e5..9799010 100644
|
||||
--- a/SDL/SDLMain.cpp
|
||||
+++ b/SDL/SDLMain.cpp
|
||||
@@ -438,7 +438,7 @@ bool System_MakeRequest(SystemRequestType type, int requestId, const std::string
|
||||
case SystemRequestType::SET_WINDOW_TITLE:
|
||||
{
|
||||
std::lock_guard<std::mutex> guard(g_mutexWindow);
|
||||
- const char *app_name = System_GetPropertyBool(SYSPROP_APP_GOLD) ? "PPSSPP Gold" : "PPSSPP";
|
||||
+ const char *app_name = "PPSSPP";
|
||||
g_windowState.title = param1.empty() ? app_name : param1;
|
||||
g_windowState.update = true;
|
||||
return true;
|
||||
@@ -742,12 +742,6 @@ bool System_GetPropertyBool(SystemProperty prop) {
|
||||
#endif
|
||||
case SYSPROP_HAS_KEYBOARD:
|
||||
return true;
|
||||
- case SYSPROP_APP_GOLD:
|
||||
-#ifdef GOLD
|
||||
- return true;
|
||||
-#else
|
||||
- return false;
|
||||
-#endif
|
||||
case SYSPROP_CAN_JIT:
|
||||
return true;
|
||||
case SYSPROP_SUPPORTS_OPEN_FILE_IN_EDITOR:
|
||||
@@ -777,9 +771,6 @@ case SYSPROP_HAS_FILE_BROWSER:
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
- // hack for testing - do not commit
|
||||
- case SYSPROP_USE_IAP:
|
||||
- return false;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
diff --git a/UI/Background.cpp b/UI/Background.cpp
|
||||
index 73be05b..3d5fb96 100644
|
||||
--- a/UI/Background.cpp
|
||||
+++ b/UI/Background.cpp
|
||||
@@ -272,7 +272,7 @@ class BouncingIconAnimation : public Animation {
|
||||
// Draw the image.
|
||||
float xpos = xbase + dc.GetBounds().x;
|
||||
float ypos = ybase + dc.GetBounds().y;
|
||||
- ImageID icon = !color_ix && System_GetPropertyBool(SYSPROP_APP_GOLD) ? ImageID("I_ICON_GOLD") : ImageID("I_ICON");
|
||||
+ ImageID icon = ImageID("I_ICON");
|
||||
ui_draw2d.DrawImage(icon, xpos, ypos, scale, COLORS[color_ix], ALIGN_CENTER);
|
||||
dc.Flush();
|
||||
|
||||
diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
|
||||
index 85cd7f7..fa0c330 100644
|
||||
--- a/UI/GameSettingsScreen.cpp
|
||||
+++ b/UI/GameSettingsScreen.cpp
|
||||
@@ -1439,13 +1439,6 @@ void GameSettingsScreen::CreateSystemSettings(UI::ViewGroup *systemSettings) {
|
||||
systemSettings->Add(new CheckBox(&g_Config.bCacheFullIsoInRam, sy->T("Cache full ISO in RAM")))->SetEnabled(!PSP_IsInited());
|
||||
}
|
||||
|
||||
- CheckBox *checkForUpdate = systemSettings->Add(new CheckBox(&g_Config.bCheckForNewVersion, sy->T("VersionCheck", "Check for new versions of PPSSPP")));
|
||||
- checkForUpdate->OnClick.Add([](UI::EventParams &e) {
|
||||
- // Reset the dismissed version so it will check again.
|
||||
- if (g_Config.bCheckForNewVersion) {
|
||||
- g_Config.sDismissedVersion.clear();
|
||||
- }
|
||||
- });
|
||||
systemSettings->Add(new CheckBox(&g_Config.bScreenshotsAsPNG, sy->T("Screenshots as PNG")));
|
||||
static const char *screenshotModeChoices[] = { "Final processed image", "Raw game image" };
|
||||
systemSettings->Add(new PopupMultiChoice(&g_Config.iScreenshotMode, sy->T("Screenshot mode"), screenshotModeChoices, 0, ARRAY_SIZE(screenshotModeChoices), I18NCat::SYSTEM, screenManager()));
|
||||
diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp
|
||||
index 8e7ca54..6153025 100644
|
||||
--- a/UI/MainScreen.cpp
|
||||
+++ b/UI/MainScreen.cpp
|
||||
@@ -57,7 +57,6 @@
|
||||
#include "UI/GameSettingsScreen.h"
|
||||
#include "UI/BaseScreens.h"
|
||||
#include "UI/ControlMappingScreen.h"
|
||||
-#include "UI/IAPScreen.h"
|
||||
#include "UI/RemoteISOScreen.h"
|
||||
#include "UI/DisplayLayoutScreen.h"
|
||||
#include "UI/SavedataScreen.h"
|
||||
@@ -1280,7 +1279,7 @@ class LogoView : public UI::AnchorLayout {
|
||||
|
||||
private:
|
||||
ImageID GetIconID() const {
|
||||
- return System_GetPropertyBool(SYSPROP_APP_GOLD) ? ImageID("I_ICON_GOLD") : ImageID("I_ICON");
|
||||
+ return ImageID("I_ICON");
|
||||
}
|
||||
|
||||
const bool portrait_;
|
||||
@@ -1302,16 +1301,6 @@ void MainScreen::CreateMainButtons(UI::ViewGroup *parent, bool portrait) {
|
||||
parent->Add(new Choice(mm->T("www.ppsspp.org")))->OnClick.Handle(this, &MainScreen::OnPPSSPPOrg);
|
||||
}
|
||||
|
||||
- if (!System_GetPropertyBool(SYSPROP_APP_GOLD) && (System_GetPropertyInt(SYSPROP_DEVICE_TYPE) != DEVICE_TYPE_VR)) {
|
||||
- Choice *gold = parent->Add(portrait ? new Choice(ImageID("I_ICON_GOLD"), portrait ? new LinearLayoutParams() : nullptr) : new Choice(mm->T("Buy PPSSPP Gold")));
|
||||
- gold->OnClick.Add([this](UI::EventParams &) {
|
||||
- LaunchBuyGold(this->screenManager());
|
||||
- });
|
||||
- gold->SetIconRight(ImageID("I_ICON_GOLD"), 0.5f);
|
||||
- gold->SetImageScale(0.6f); // for the left-icon in case of vertical.
|
||||
- gold->SetShine(true);
|
||||
- }
|
||||
-
|
||||
if (!portrait) {
|
||||
parent->Add(new Spacer(16.0));
|
||||
}
|
||||
@@ -1384,7 +1373,7 @@ void MainScreen::CreateViews() {
|
||||
if (g_recentFiles.HasAny()) {
|
||||
tabHolder_->SetCurrentTab(std::clamp(g_Config.iDefaultTab, 0, g_Config.bRemoteTab ? 3 : 2), true);
|
||||
} else if (g_Config.iMaxRecent > 0) {
|
||||
- tabHolder_->SetCurrentTab(1, true);
|
||||
+ tabHolder_->SetCurrentTab(1, true);
|
||||
}
|
||||
|
||||
if (backFromStore_ || showHomebrewTab) {
|
||||
@@ -1490,41 +1479,6 @@ void MainScreen::CreateViews() {
|
||||
}
|
||||
|
||||
root_->SetTag("mainroot");
|
||||
-
|
||||
- if (!g_Config.sUpgradeMessage.empty()) {
|
||||
- auto di = GetI18NCategory(I18NCat::DIALOG);
|
||||
- Margins margins(0, 0);
|
||||
- if (vertical) {
|
||||
- margins.bottom = ITEM_HEIGHT;
|
||||
- }
|
||||
- UI::LinearLayout *upgradeBar = new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT, margins));
|
||||
-
|
||||
- UI::Margins textMargins(10, 5);
|
||||
- UI::Margins buttonMargins(5, 0);
|
||||
- UI::Drawable solid(0xFFbd9939);
|
||||
- upgradeBar->SetSpacing(5.0f);
|
||||
- upgradeBar->SetBG(solid);
|
||||
- std::string upgradeMessage(di->T("New version of PPSSPP available"));
|
||||
- if (!vertical) {
|
||||
- // The version only really fits in the horizontal layout.
|
||||
- upgradeMessage += ": " + g_Config.sUpgradeVersion;
|
||||
- }
|
||||
- upgradeBar->Add(new TextView(upgradeMessage, new LinearLayoutParams(1.0f, UI::Gravity::G_VCENTER, textMargins)));
|
||||
- upgradeBar->Add(new Choice(di->T("Download"), new LinearLayoutParams(buttonMargins)))->OnClick.Handle(this, &MainScreen::OnDownloadUpgrade);
|
||||
- Choice *dismiss = upgradeBar->Add(new Choice("", ImageID("I_CROSS"), new LinearLayoutParams(buttonMargins)));
|
||||
- dismiss->OnClick.Add([this](UI::EventParams &e) {
|
||||
- g_Config.DismissUpgrade();
|
||||
- g_Config.Save("dismissupgrade");
|
||||
- RecreateViews();
|
||||
- });
|
||||
-
|
||||
- // Slip in under root_
|
||||
- LinearLayout *newRoot = new LinearLayout(ORIENT_VERTICAL);
|
||||
- newRoot->Add(root_);
|
||||
- newRoot->Add(upgradeBar);
|
||||
- root_->ReplaceLayoutParams(new LinearLayoutParams(1.0));
|
||||
- root_ = newRoot;
|
||||
- }
|
||||
}
|
||||
|
||||
bool MainScreen::key(const KeyInput &key) {
|
||||
@@ -1565,26 +1519,6 @@ void MainScreen::OnAllowStorage(UI::EventParams &e) {
|
||||
System_AskForPermission(SYSTEM_PERMISSION_STORAGE);
|
||||
}
|
||||
|
||||
-// See Config::SupportsUpgradeCheck() if you add more platforms.
|
||||
-void MainScreen::OnDownloadUpgrade(UI::EventParams &e) {
|
||||
-#if PPSSPP_PLATFORM(ANDROID)
|
||||
- // Go to app store
|
||||
- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) {
|
||||
- System_LaunchUrl(LaunchUrlType::BROWSER_URL, "market://details?id=org.ppsspp.ppssppgold");
|
||||
- } else {
|
||||
- System_LaunchUrl(LaunchUrlType::BROWSER_URL, "market://details?id=org.ppsspp.ppsspp");
|
||||
- }
|
||||
-#elif PPSSPP_PLATFORM(WINDOWS)
|
||||
- System_LaunchUrl(LaunchUrlType::BROWSER_URL, "https://www.ppsspp.org/download");
|
||||
-#elif PPSSPP_PLATFORM(IOS_APP_STORE)
|
||||
- System_LaunchUrl(LaunchUrlType::BROWSER_URL, "itms-apps://itunes.apple.com/app/id6496972903");
|
||||
-#else
|
||||
- // Go directly to ppsspp.org and let the user sort it out
|
||||
- // (for details and in case downloads doesn't have their platform.)
|
||||
- System_LaunchUrl(LaunchUrlType::BROWSER_URL, "https://www.ppsspp.org/");
|
||||
-#endif
|
||||
-}
|
||||
-
|
||||
void MainScreen::sendMessage(UIMessage message, const char *value) {
|
||||
// Always call the base class method first to handle the most common messages.
|
||||
UIBaseScreen::sendMessage(message, value);
|
||||
@@ -1732,24 +1666,6 @@ void MainScreen::OnCredits(UI::EventParams &e) {
|
||||
screenManager()->push(new CreditsScreen());
|
||||
}
|
||||
|
||||
-void LaunchBuyGold(ScreenManager *screenManager) {
|
||||
- if (System_GetPropertyBool(SYSPROP_USE_IAP)) {
|
||||
- screenManager->push(new IAPScreen(true));
|
||||
- } else if (System_GetPropertyBool(SYSPROP_USE_APP_STORE)) {
|
||||
-#if PPSSPP_PLATFORM(ANDROID)
|
||||
- LaunchPlayStoreOrWebsiteGold();
|
||||
-#else
|
||||
- screenManager->push(new IAPScreen(false));
|
||||
-#endif
|
||||
- } else {
|
||||
-#if PPSSPP_PLATFORM(IOS_APP_STORE)
|
||||
- System_LaunchUrl(LaunchUrlType::BROWSER_URL, "https://www.ppsspp.org/buygold_ios");
|
||||
-#else
|
||||
- System_LaunchUrl(LaunchUrlType::BROWSER_URL, "https://www.ppsspp.org/buygold");
|
||||
-#endif
|
||||
- }
|
||||
-}
|
||||
-
|
||||
void MainScreen::OnPPSSPPOrg(UI::EventParams &e) {
|
||||
System_LaunchUrl(LaunchUrlType::BROWSER_URL, "https://www.ppsspp.org");
|
||||
}
|
||||
@@ -1785,9 +1701,6 @@ void MainScreen::dialogFinished(const Screen *dialog, DialogResult result) {
|
||||
if (gameBrowsers_.size() >= 2) {
|
||||
gameBrowsers_[1]->RequestRefresh();
|
||||
}
|
||||
- } else if (tag == "IAP") {
|
||||
- // Gold status may have changed.
|
||||
- RecreateViews();
|
||||
} else if (tag == "Upload") {
|
||||
// Files may have been uploaded.
|
||||
RecreateViews();
|
||||
diff --git a/UI/MainScreen.h b/UI/MainScreen.h
|
||||
index 49d743c..457ccd7 100644
|
||||
--- a/UI/MainScreen.h
|
||||
+++ b/UI/MainScreen.h
|
||||
@@ -166,7 +166,6 @@ class MainScreen : public UIBaseScreen {
|
||||
void OnCredits(UI::EventParams &e);
|
||||
void OnPPSSPPOrg(UI::EventParams &e);
|
||||
void OnForums(UI::EventParams &e);
|
||||
- void OnDownloadUpgrade(UI::EventParams &e);
|
||||
void OnAllowStorage(UI::EventParams &e);
|
||||
|
||||
UI::TabHolder *tabHolder_ = nullptr;
|
||||
@@ -218,5 +217,3 @@ class GridSettingsPopupScreen : public UI::PopupScreen {
|
||||
const float MAX_GAME_GRID_SCALE = 3.0f;
|
||||
const float MIN_GAME_GRID_SCALE = 0.8f;
|
||||
};
|
||||
-
|
||||
-void LaunchBuyGold(ScreenManager *screenManager);
|
||||
diff --git a/UI/MemStickScreen.cpp b/UI/MemStickScreen.cpp
|
||||
index 69b9d3d..8a02aff 100644
|
||||
--- a/UI/MemStickScreen.cpp
|
||||
+++ b/UI/MemStickScreen.cpp
|
||||
@@ -123,12 +123,10 @@ static void AddExplanation(UI::ViewGroup *viewGroup, MemStickScreen::Choice choi
|
||||
case MemStickScreen::CHOICE_STORAGE_ROOT:
|
||||
// Old school choice
|
||||
holder->Add(new TextView(iz->T("DataWillStay", "Data will stay even if you uninstall PPSSPP"), flags, false))->SetBullet(true);
|
||||
- holder->Add(new TextView(iz->T("DataCanBeShared", "Data can be shared between PPSSPP regular/Gold"), flags, false))->SetBullet(true);
|
||||
holder->Add(new TextView(iz->T("EasyUSBAccess", "Easy USB access"), flags, false))->SetBullet(true);
|
||||
break;
|
||||
case MemStickScreen::CHOICE_BROWSE_FOLDER:
|
||||
holder->Add(new TextView(iz->T("DataWillStay", "Data will stay even if you uninstall PPSSPP"), flags, false))->SetBullet(true);
|
||||
- holder->Add(new TextView(iz->T("DataCanBeShared", "Data can be shared between PPSSPP regular/Gold"), flags, false))->SetBullet(true);
|
||||
#if !PPSSPP_PLATFORM(UWP)
|
||||
holder->Add(new TextView(iz->T("EasyUSBAccess", "Easy USB access"), flags, false))->SetBullet(true);
|
||||
#endif
|
||||
@@ -136,13 +134,8 @@ static void AddExplanation(UI::ViewGroup *viewGroup, MemStickScreen::Choice choi
|
||||
case MemStickScreen::CHOICE_PRIVATE_DIRECTORY:
|
||||
// Consider https://www.compart.com/en/unicode/U+26A0 (unicode warning sign?)? or a graphic?
|
||||
holder->Add(new TextView(iz->T("DataWillBeLostOnUninstall", "Warning! Data will be lost when you uninstall PPSSPP!"), flags, false))->SetBullet(true);
|
||||
- holder->Add(new TextView(iz->T("DataCannotBeShared", "Data CANNOT be shared between PPSSPP regular/Gold!"), flags, false))->SetBullet(true);
|
||||
#if !PPSSPP_PLATFORM(UWP)
|
||||
- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) {
|
||||
- holder->Add(new TextView(iz->T("USBAccessThroughGold", "USB access through Android/data/org.ppsspp.ppssppgold/files"), flags, false))->SetBullet(true);
|
||||
- } else {
|
||||
- holder->Add(new TextView(iz->T("USBAccessThrough", "USB access through Android/data/org.ppsspp.ppsspp/files"), flags, false))->SetBullet(true);
|
||||
- }
|
||||
+ holder->Add(new TextView(iz->T("USBAccessThrough", "USB access through Android/data/org.ppsspp.ppsspp/files"), flags, false))->SetBullet(true);
|
||||
#endif
|
||||
break;
|
||||
case MemStickScreen::CHOICE_SET_MANUAL:
|
||||
diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp
|
||||
index 1dedbef..9c4f965 100644
|
||||
--- a/UI/MiscScreens.cpp
|
||||
+++ b/UI/MiscScreens.cpp
|
||||
@@ -441,12 +441,7 @@ void LogoScreen::DrawForeground(UIContext &dc) {
|
||||
|
||||
// Manually formatting UTF-8 is fun. \xXX doesn't work everywhere.
|
||||
snprintf(temp, sizeof(temp), "%s Henrik Rydg%c%crd", cr->T_cstr("created", "Created by"), 0xC3, 0xA5);
|
||||
- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) {
|
||||
- UI::DrawIconShine(dc, Bounds::FromCenter(bounds.centerX() - 125, startY, 60.0f), 0.7f, true);
|
||||
- dc.Draw()->DrawImage(ImageID("I_ICON_GOLD"), bounds.centerX() - 125, startY, 1.2f, 0xFFFFFFFF, ALIGN_CENTER);
|
||||
- } else {
|
||||
- dc.Draw()->DrawImage(ImageID("I_ICON"), bounds.centerX() - 125, startY, 1.2f, 0xFFFFFFFF, ALIGN_CENTER);
|
||||
- }
|
||||
+ dc.Draw()->DrawImage(ImageID("I_ICON"), bounds.centerX() - 125, startY, 1.2f, 0xFFFFFFFF, ALIGN_CENTER);
|
||||
dc.Draw()->DrawImage(ImageID("I_LOGO"), bounds.centerX() + 45, startY, 1.5f, 0xFFFFFFFF, ALIGN_CENTER);
|
||||
//dc.Draw()->DrawTextShadow(UBUNTU48, "PPSSPP", bounds.w / 2, bounds.h / 2 - 30, textColor, ALIGN_CENTER);
|
||||
dc.SetFontScale(1.0f, 1.0f);
|
||||
@@ -512,15 +507,6 @@ void CreditsScreen::CreateDialogViews(UI::ViewGroup *parent) {
|
||||
|
||||
const bool portrait = GetDeviceOrientation() == DeviceOrientation::Portrait;
|
||||
|
||||
- const bool gold = System_GetPropertyBool(SYSPROP_APP_GOLD);
|
||||
-
|
||||
- /*
|
||||
- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) {
|
||||
- root_->Add(new ShinyIcon(ImageID("I_ICON_GOLD"), new AnchorLayoutParams(WRAP_CONTENT, WRAP_CONTENT, 10, 10, NONE, NONE, false)))->SetScale(1.5f);
|
||||
- } else {
|
||||
- root_->Add(new ImageView(ImageID("I_ICON"), "", IS_DEFAULT, new AnchorLayoutParams(WRAP_CONTENT, WRAP_CONTENT, 10, 10, NONE, NONE, false)))->SetScale(1.5f);
|
||||
- }*/
|
||||
-
|
||||
constexpr float columnWidth = 265.0f;
|
||||
|
||||
LinearLayout *left;
|
||||
@@ -544,18 +530,6 @@ void CreditsScreen::CreateDialogViews(UI::ViewGroup *parent) {
|
||||
}
|
||||
|
||||
int rightYOffset = 0;
|
||||
- if (!System_GetPropertyBool(SYSPROP_APP_GOLD)) {
|
||||
- ScreenManager *sm = screenManager();
|
||||
- Choice *gold = new Choice(mm->T("Buy PPSSPP Gold"));
|
||||
- gold->SetIconRight(ImageID("I_ICON_GOLD"), 0.5f);
|
||||
- gold->SetImageScale(0.6f); // for the left-icon in case of vertical.
|
||||
- gold->SetShine(true);
|
||||
-
|
||||
- left->Add(gold)->OnClick.Add([sm](UI::EventParams) {
|
||||
- LaunchBuyGold(sm);
|
||||
- });
|
||||
- rightYOffset = 74;
|
||||
- }
|
||||
left->Add(new Choice(cr->T("PPSSPP Forums"), ImageID("I_LINK_OUT")))->OnClick.Add([](UI::EventParams &e) {
|
||||
System_LaunchUrl(LaunchUrlType::BROWSER_URL, "https://forums.ppsspp.org");
|
||||
});
|
||||
@@ -611,7 +585,7 @@ void CreditsScroller::Draw(UIContext &dc) {
|
||||
specialthankssolarmystic += ')';
|
||||
|
||||
std::string_view credits[] = {
|
||||
- System_GetPropertyBool(SYSPROP_APP_GOLD) ? "PPSSPP Gold" : "PPSSPP",
|
||||
+ "PPSSPP",
|
||||
"",
|
||||
cr->T("title", "A fast and portable PSP emulator"),
|
||||
"",
|
||||
@@ -735,11 +709,7 @@ void CreditsScroller::Draw(UIContext &dc) {
|
||||
|
||||
// TODO: This is kinda ugly, done on every frame...
|
||||
char temp[256];
|
||||
- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) {
|
||||
- snprintf(temp, sizeof(temp), "PPSSPP Gold %s", PPSSPP_GIT_VERSION);
|
||||
- } else {
|
||||
- snprintf(temp, sizeof(temp), "PPSSPP %s", PPSSPP_GIT_VERSION);
|
||||
- }
|
||||
+ snprintf(temp, sizeof(temp), "PPSSPP %s", PPSSPP_GIT_VERSION);
|
||||
credits[0] = (const char *)temp;
|
||||
|
||||
dc.Begin();
|
||||
diff --git a/UI/ReportScreen.cpp b/UI/ReportScreen.cpp
|
||||
index 02080aa..7a0e773 100644
|
||||
--- a/UI/ReportScreen.cpp
|
||||
+++ b/UI/ReportScreen.cpp
|
||||
@@ -478,11 +478,7 @@ void ReportFinishScreen::ShowSuggestions() {
|
||||
bool valid = false;
|
||||
for (const auto &item : suggestions) {
|
||||
std::string_view suggestion = "";
|
||||
- if (item == "Upgrade") {
|
||||
- suggestion = rp->T("SuggestionUpgrade", "Upgrade to a newer PPSSPP build");
|
||||
- } else if (item == "Downgrade") {
|
||||
- suggestion = rp->T("SuggestionDowngrade", "Downgrade to an older PPSSPP version (please report this bug)");
|
||||
- } else if (item == "VerifyDisc") {
|
||||
+ if (item == "VerifyDisc") {
|
||||
suggestion = rp->T("SuggestionVerifyDisc", "Check your ISO is a good copy of your disc");
|
||||
} else if (item == "Config:CPUSpeed:0") {
|
||||
suggestion = rp->T("SuggestionCPUSpeed0", "Disable locked CPU speed setting");
|
||||
@@ -500,11 +496,6 @@ void ReportFinishScreen::ShowSuggestions() {
|
||||
resultItems_->Add(new TextView(std::string(" - ") + std::string(suggestion), FLAG_WRAP_TEXT, false))->SetShadow(true);
|
||||
}
|
||||
}
|
||||
-
|
||||
- if (!valid) {
|
||||
- // No actual valid versions. Let's just say upgrade and hope the server's not broken.
|
||||
- resultItems_->Add(new TextView(std::string(" - ") + rp->T_cstr("SuggestionUpgrade", "Upgrade to a newer PPSSPP build"), FLAG_WRAP_TEXT, false))->SetShadow(true);
|
||||
- }
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/UI/UIAtlas.cpp b/UI/UIAtlas.cpp
|
||||
index 92b1d3a..50199d2 100644
|
||||
--- a/UI/UIAtlas.cpp
|
||||
+++ b/UI/UIAtlas.cpp
|
||||
@@ -75,7 +75,6 @@ static const ImageMeta imageIDs[] = {
|
||||
{"I_GRID", false},
|
||||
{"I_LOGO", false},
|
||||
{"I_ICON", false},
|
||||
- {"I_ICON_GOLD", false},
|
||||
{"I_FOLDER", false},
|
||||
{"I_UP_DIRECTORY", false},
|
||||
{"I_GEAR", false},
|
||||
diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp
|
||||
index a89ee1f..eed5bdf 100644
|
||||
--- a/UWP/PPSSPP_UWPMain.cpp
|
||||
+++ b/UWP/PPSSPP_UWPMain.cpp
|
||||
@@ -478,12 +478,6 @@ bool System_GetPropertyBool(SystemProperty prop) {
|
||||
return true;
|
||||
case SYSPROP_HAS_ACCELEROMETER:
|
||||
return IsMobile();
|
||||
- case SYSPROP_APP_GOLD:
|
||||
-#ifdef GOLD
|
||||
- return true;
|
||||
-#else
|
||||
- return false;
|
||||
-#endif
|
||||
case SYSPROP_CAN_JIT:
|
||||
return true;
|
||||
case SYSPROP_HAS_KEYBOARD:
|
||||
@@ -705,7 +699,7 @@ std::string GetCPUBrandString() {
|
||||
winrt::hstring dev_filter = L"System.Devices.DeviceInstanceID:=\"" + cpu_id + L"\"";
|
||||
|
||||
try {
|
||||
- auto collection = winrt::Windows::Devices::Enumeration::DeviceInformation::FindAllAsync(dev_filter, {},
|
||||
+ auto collection = winrt::Windows::Devices::Enumeration::DeviceInformation::FindAllAsync(dev_filter, {},
|
||||
winrt::Windows::Devices::Enumeration::DeviceInformationKind::Device).get();
|
||||
if (collection.Size() > 0) {
|
||||
cpu_name = collection.GetAt(0).Name();
|
||||
diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp
|
||||
index 856e39d..cc22d2b 100644
|
||||
--- a/Windows/MainWindowMenu.cpp
|
||||
+++ b/Windows/MainWindowMenu.cpp
|
||||
@@ -170,10 +170,6 @@ namespace MainWindow {
|
||||
// Don't need to update here, happens later.
|
||||
|
||||
HMENU helpMenu = GetSubmenuById(hMenu, ID_HELP_MENU);
|
||||
- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) {
|
||||
- RemoveMenu(helpMenu, ID_HELP_BUYGOLD, MF_BYCOMMAND);
|
||||
- }
|
||||
-
|
||||
HMENU hMenuOptions = GetSubmenuById(hMenu, ID_OPTIONS_MENU);
|
||||
g_hMenuBackend = GetSubmenuById(hMenuOptions, ID_OPTIONS_BACKEND_MENU);
|
||||
}
|
||||
@@ -310,7 +306,6 @@ namespace MainWindow {
|
||||
// Help menu: it's translated in CreateHelpMenu.
|
||||
TranslateMenuItem(menu, ID_HELP_OPENWEBSITE);
|
||||
TranslateMenuItem(menu, ID_HELP_OPENFORUM);
|
||||
- TranslateMenuItem(menu, ID_HELP_BUYGOLD);
|
||||
TranslateMenuItem(menu, ID_HELP_GITHUB);
|
||||
TranslateMenuItem(menu, ID_HELP_DISCORD);
|
||||
TranslateMenuItem(menu, ID_HELP_ABOUT);
|
||||
@@ -933,10 +928,6 @@ namespace MainWindow {
|
||||
System_LaunchUrl(LaunchUrlType::BROWSER_URL, "https://www.ppsspp.org/");
|
||||
break;
|
||||
|
||||
- case ID_HELP_BUYGOLD:
|
||||
- System_LaunchUrl(LaunchUrlType::BROWSER_URL, "https://www.ppsspp.org/buygold");
|
||||
- break;
|
||||
-
|
||||
case ID_HELP_OPENFORUM:
|
||||
System_LaunchUrl(LaunchUrlType::BROWSER_URL, "https://forums.ppsspp.org/");
|
||||
break;
|
||||
diff --git a/Windows/main.cpp b/Windows/main.cpp
|
||||
index c7ad098..0280cb9 100644
|
||||
--- a/Windows/main.cpp
|
||||
+++ b/Windows/main.cpp
|
||||
@@ -450,12 +450,6 @@ bool System_GetPropertyBool(SystemProperty prop) {
|
||||
return true;
|
||||
case SYSPROP_HAS_LOGIN_DIALOG:
|
||||
return true;
|
||||
- case SYSPROP_APP_GOLD:
|
||||
-#ifdef GOLD
|
||||
- return true;
|
||||
-#else
|
||||
- return false;
|
||||
-#endif
|
||||
case SYSPROP_CAN_JIT:
|
||||
return true;
|
||||
case SYSPROP_HAS_KEYBOARD:
|
||||
@@ -478,8 +472,6 @@ bool System_GetPropertyBool(SystemProperty prop) {
|
||||
#endif
|
||||
case SYSPROP_HAS_ACCELEROMETER:
|
||||
return g_InputManager.AnyAccelerometer();
|
||||
- case SYSPROP_USE_IAP:
|
||||
- return false; // This should never be set to true on Windows. Only for testing/dev.
|
||||
case SYSPROP_USE_APP_STORE:
|
||||
return false;
|
||||
default:
|
||||
@@ -654,7 +646,7 @@ bool System_MakeRequest(SystemRequestType type, int requestId, const std::string
|
||||
}
|
||||
case SystemRequestType::SET_WINDOW_TITLE:
|
||||
{
|
||||
- const char *name = System_GetPropertyBool(SYSPROP_APP_GOLD) ? "PPSSPP Gold " : "PPSSPP ";
|
||||
+ const char *name = "PPSSPP ";
|
||||
std::wstring winTitle = ConvertUTF8ToWString(std::string(name) + PPSSPP_GIT_VERSION);
|
||||
if (!param1.empty()) {
|
||||
winTitle.append(ConvertUTF8ToWString(" - " + param1));
|
||||
diff --git a/Windows/resource.h b/Windows/resource.h
|
||||
index 0dee92b..602b2fb 100644
|
||||
--- a/Windows/resource.h
|
||||
+++ b/Windows/resource.h
|
||||
@@ -353,7 +353,6 @@
|
||||
// Dummy option to let the buffered rendering hotkey cycle through all the options.
|
||||
#define ID_OPTIONS_BUFFEREDRENDERINGDUMMY 40500
|
||||
#define IDC_STEPOUT 40501
|
||||
-#define ID_HELP_BUYGOLD 40502
|
||||
|
||||
#define IDC_STATIC -1
|
||||
|
||||
diff --git a/ios/main.mm b/ios/main.mm
|
||||
index 0407b8b..13aace6 100644
|
||||
--- a/ios/main.mm
|
||||
+++ b/ios/main.mm
|
||||
@@ -379,16 +379,6 @@ bool System_GetPropertyBool(SystemProperty prop) {
|
||||
case SYSPROP_KEYBOARD_IS_SOFT:
|
||||
// If a hardware keyboard is connected, and we add support, we could return false here.
|
||||
return true;
|
||||
- case SYSPROP_APP_GOLD:
|
||||
-#ifdef GOLD
|
||||
- // This is deprecated.
|
||||
- return true;
|
||||
-#elif PPSSPP_PLATFORM(IOS_APP_STORE)
|
||||
- // Check the IAP status.
|
||||
- return [[IAPManager sharedIAPManager] isGoldUnlocked];
|
||||
-#else
|
||||
- return false;
|
||||
-#endif
|
||||
case SYSPROP_USE_IAP:
|
||||
#if PPSSPP_PLATFORM(IOS_APP_STORE) && defined(USE_IAP)
|
||||
return true;
|
||||
@@ -701,4 +691,3 @@ int main(int argc, char *argv[]) {
|
||||
return UIApplicationMain(argc, argv, NSStringFromClass([PPSSPPUIApplication class]), NSStringFromClass([AppDelegate class]));
|
||||
}
|
||||
}
|
||||
-
|
||||
--
|
||||
2.52.0
|
||||
|
||||
@@ -0,0 +1,112 @@
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 8f33aa2ff4..39928382da 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -4358,7 +4358,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \
|
||||
monodll_msw_utils.o \
|
||||
monodll_utilsexc.o \
|
||||
monodll_fswatcher.o \
|
||||
- monodll_msw_secretstore.o
|
||||
+ monodll_msw_secretstore.o \
|
||||
monodll_msw_uilocale.o
|
||||
@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS)
|
||||
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \
|
||||
@@ -5284,7 +5284,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \
|
||||
monodll_uuid.o \
|
||||
monodll_msw_evtloop.o \
|
||||
monodll_access.o \
|
||||
- monodll_dark_mode.o
|
||||
+ monodll_dark_mode.o \
|
||||
monodll_msw_bmpbndl.o
|
||||
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS)
|
||||
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS = \
|
||||
@@ -6196,7 +6196,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \
|
||||
monodll_uuid.o \
|
||||
monodll_msw_evtloop.o \
|
||||
monodll_access.o \
|
||||
- monodll_dark_mode.o
|
||||
+ monodll_dark_mode.o \
|
||||
monodll_msw_bmpbndl.o
|
||||
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1)
|
||||
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \
|
||||
@@ -6371,7 +6371,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \
|
||||
monolib_msw_utils.o \
|
||||
monolib_utilsexc.o \
|
||||
monolib_fswatcher.o \
|
||||
- monolib_msw_secretstore.o
|
||||
+ monolib_msw_secretstore.o \
|
||||
monolib_msw_uilocale.o
|
||||
@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1)
|
||||
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \
|
||||
@@ -7297,7 +7297,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \
|
||||
monolib_uuid.o \
|
||||
monolib_msw_evtloop.o \
|
||||
monolib_access.o \
|
||||
- monolib_dark_mode.o
|
||||
+ monolib_dark_mode.o \
|
||||
monolib_msw_bmpbndl.o
|
||||
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2)
|
||||
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \
|
||||
@@ -8209,7 +8209,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \
|
||||
monolib_uuid.o \
|
||||
monolib_msw_evtloop.o \
|
||||
monolib_access.o \
|
||||
- monolib_dark_mode.o
|
||||
+ monolib_dark_mode.o \
|
||||
monolib_msw_bmpbndl.o
|
||||
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3)
|
||||
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \
|
||||
@@ -8436,7 +8436,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \
|
||||
basedll_msw_utils.o \
|
||||
basedll_utilsexc.o \
|
||||
basedll_fswatcher.o \
|
||||
- basedll_msw_secretstore.o
|
||||
+ basedll_msw_secretstore.o \
|
||||
basedll_msw_uilocale.o
|
||||
@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2)
|
||||
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \
|
||||
@@ -8523,7 +8523,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \
|
||||
baselib_msw_utils.o \
|
||||
baselib_utilsexc.o \
|
||||
baselib_fswatcher.o \
|
||||
- baselib_msw_secretstore.o
|
||||
+ baselib_msw_secretstore.o \
|
||||
baselib_msw_uilocale.o
|
||||
@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3)
|
||||
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \
|
||||
@@ -9464,7 +9464,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \
|
||||
coredll_uuid.o \
|
||||
coredll_msw_evtloop.o \
|
||||
coredll_access.o \
|
||||
- coredll_dark_mode.o
|
||||
+ coredll_dark_mode.o \
|
||||
coredll_msw_bmpbndl.o
|
||||
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4)
|
||||
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \
|
||||
@@ -10376,7 +10376,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \
|
||||
coredll_uuid.o \
|
||||
coredll_msw_evtloop.o \
|
||||
coredll_access.o \
|
||||
- coredll_dark_mode.o
|
||||
+ coredll_dark_mode.o \
|
||||
coredll_msw_bmpbndl.o
|
||||
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5)
|
||||
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \
|
||||
@@ -11204,7 +11204,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \
|
||||
corelib_uuid.o \
|
||||
corelib_msw_evtloop.o \
|
||||
corelib_access.o \
|
||||
- corelib_dark_mode.o
|
||||
+ corelib_dark_mode.o \
|
||||
corelib_msw_bmpbndl.o
|
||||
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6)
|
||||
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \
|
||||
@@ -12116,7 +12116,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \
|
||||
corelib_uuid.o \
|
||||
corelib_msw_evtloop.o \
|
||||
corelib_access.o \
|
||||
- corelib_dark_mode.o
|
||||
+ corelib_dark_mode.o \
|
||||
corelib_msw_bmpbndl.o
|
||||
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7)
|
||||
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \
|
||||
@@ -1,187 +0,0 @@
|
||||
Upstream-Status: not reported
|
||||
|
||||
diff --git a/include/tao/bow.h b/include/tao/bow.h
|
||||
index 38c7081..0a35886 100644
|
||||
--- a/include/tao/bow.h
|
||||
+++ b/include/tao/bow.h
|
||||
@@ -21,6 +21,7 @@
|
||||
|
||||
#include <tao/access_point.h>
|
||||
#include <tao/device.h>
|
||||
+#include <string>
|
||||
|
||||
#ifdef WIN32
|
||||
#define DLLEXPORT __declspec(dllexport)
|
||||
diff --git a/include/tao/circle.h b/include/tao/circle.h
|
||||
index f3061ae..2f96c68 100644
|
||||
--- a/include/tao/circle.h
|
||||
+++ b/include/tao/circle.h
|
||||
@@ -21,6 +21,7 @@
|
||||
|
||||
#include <tao/cell.h>
|
||||
#include <tao/instrument.h>
|
||||
+#include <string>
|
||||
|
||||
#ifdef WIN32
|
||||
#define DLLEXPORT __declspec(dllexport)
|
||||
diff --git a/include/tao/connector.h b/include/tao/connector.h
|
||||
index 0c255f2..1cdcc13 100644
|
||||
--- a/include/tao/connector.h
|
||||
+++ b/include/tao/connector.h
|
||||
@@ -21,6 +21,7 @@
|
||||
|
||||
#include <tao/access_point.h>
|
||||
#include <tao/device.h>
|
||||
+#include <string>
|
||||
|
||||
#ifdef WIN32
|
||||
#define DLLEXPORT __declspec(dllexport)
|
||||
diff --git a/include/tao/device.h b/include/tao/device.h
|
||||
index 06d025c..9bb48aa 100644
|
||||
--- a/include/tao/device.h
|
||||
+++ b/include/tao/device.h
|
||||
@@ -32,6 +32,7 @@
|
||||
#endif
|
||||
|
||||
#include <tao/access_point.h>
|
||||
+#include <string>
|
||||
|
||||
#ifdef WIN32
|
||||
#define DLLEXPORT __declspec(dllexport)
|
||||
diff --git a/include/tao/ellipse.h b/include/tao/ellipse.h
|
||||
index ac3b849..c05fcf7 100644
|
||||
--- a/include/tao/ellipse.h
|
||||
+++ b/include/tao/ellipse.h
|
||||
@@ -21,6 +21,7 @@
|
||||
|
||||
#include <tao/cell.h>
|
||||
#include <tao/instrument.h>
|
||||
+#include <string>
|
||||
|
||||
#ifdef WIN32
|
||||
#define DLLEXPORT __declspec(dllexport)
|
||||
diff --git a/include/tao/graphics_engine.h b/include/tao/graphics_engine.h
|
||||
index bf67425..b2764aa 100644
|
||||
--- a/include/tao/graphics_engine.h
|
||||
+++ b/include/tao/graphics_engine.h
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <iomanip>
|
||||
#include <memory>
|
||||
#include <sstream>
|
||||
+#include <string>
|
||||
|
||||
#ifdef WIN32
|
||||
#define DLLEXPORT __declspec(dllexport)
|
||||
diff --git a/include/tao/hammer.h b/include/tao/hammer.h
|
||||
index 172a8e8..0a4cf2d 100644
|
||||
--- a/include/tao/hammer.h
|
||||
+++ b/include/tao/hammer.h
|
||||
@@ -20,6 +20,7 @@
|
||||
#define HAMMER_H
|
||||
|
||||
#include <tao/device.h>
|
||||
+#include <string>
|
||||
|
||||
#ifdef WIN32
|
||||
#define DLLEXPORT __declspec(dllexport)
|
||||
diff --git a/include/tao/instrument.h b/include/tao/instrument.h
|
||||
index 3b23ac7..60cb6e0 100644
|
||||
--- a/include/tao/instrument.h
|
||||
+++ b/include/tao/instrument.h
|
||||
@@ -26,6 +26,7 @@ extern "C" {
|
||||
#include <tao/access_point.h>
|
||||
#include <tao/pitch.h>
|
||||
#include <vector>
|
||||
+#include <string>
|
||||
|
||||
#ifdef WIN32
|
||||
#define DLLEXPORT __declspec(dllexport)
|
||||
diff --git a/include/tao/output.h b/include/tao/output.h
|
||||
index db34e92..03e3224 100644
|
||||
--- a/include/tao/output.h
|
||||
+++ b/include/tao/output.h
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <fstream>
|
||||
#include <sstream>
|
||||
#include <vector>
|
||||
+#include <string>
|
||||
|
||||
#ifdef WIN32
|
||||
#define DLLEXPORT __declspec(dllexport)
|
||||
diff --git a/include/tao/pitch.h b/include/tao/pitch.h
|
||||
index a76f5eb..fa31ab2 100644
|
||||
--- a/include/tao/pitch.h
|
||||
+++ b/include/tao/pitch.h
|
||||
@@ -19,6 +19,8 @@
|
||||
#ifndef TAOPITCH_H
|
||||
#define TAOPITCH_H
|
||||
|
||||
+#include <string>
|
||||
+
|
||||
#ifdef WIN32
|
||||
#define DLLEXPORT __declspec(dllexport)
|
||||
#else
|
||||
diff --git a/include/tao/rectangle.h b/include/tao/rectangle.h
|
||||
index 5c1e77c..0056dcd 100644
|
||||
--- a/include/tao/rectangle.h
|
||||
+++ b/include/tao/rectangle.h
|
||||
@@ -21,6 +21,7 @@
|
||||
|
||||
#include <tao/cell.h>
|
||||
#include <tao/instrument.h>
|
||||
+#include <string>
|
||||
|
||||
#ifdef WIN32
|
||||
#define DLLEXPORT __declspec(dllexport)
|
||||
diff --git a/include/tao/rgb_color.h b/include/tao/rgb_color.h
|
||||
index 69259b6..3f8f7b7 100644
|
||||
--- a/include/tao/rgb_color.h
|
||||
+++ b/include/tao/rgb_color.h
|
||||
@@ -1,6 +1,8 @@
|
||||
#ifndef TAORGBCOLOR_H
|
||||
#define TAORGBCOLOR_H
|
||||
|
||||
+#include <string>
|
||||
+
|
||||
/*
|
||||
static struct colors=
|
||||
{
|
||||
diff --git a/include/tao/stop.h b/include/tao/stop.h
|
||||
index 85a6570..f6868f2 100644
|
||||
--- a/include/tao/stop.h
|
||||
+++ b/include/tao/stop.h
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <tao/device.h>
|
||||
#include <tao/pitch.h>
|
||||
#include <tao/strand.h>
|
||||
+#include <string>
|
||||
|
||||
#ifdef WIN32
|
||||
#define DLLEXPORT __declspec(dllexport)
|
||||
diff --git a/include/tao/strand.h b/include/tao/strand.h
|
||||
index 65a0d30..1fe99a4 100644
|
||||
--- a/include/tao/strand.h
|
||||
+++ b/include/tao/strand.h
|
||||
@@ -21,6 +21,7 @@
|
||||
|
||||
#include <tao/cell.h>
|
||||
#include <tao/instrument.h>
|
||||
+#include <string>
|
||||
|
||||
#ifdef WIN32
|
||||
#define DLLEXPORT __declspec(dllexport)
|
||||
diff --git a/include/tao/triangle.h b/include/tao/triangle.h
|
||||
index 06d2b2c..9978f94 100644
|
||||
--- a/include/tao/triangle.h
|
||||
+++ b/include/tao/triangle.h
|
||||
@@ -21,6 +21,7 @@
|
||||
|
||||
#include <tao/cell.h>
|
||||
#include <tao/instrument.h>
|
||||
+#include <string>
|
||||
|
||||
#ifdef WIN32
|
||||
#define DLLEXPORT __declspec(dllexport)
|
||||
--
|
||||
2.52.0
|
||||
|
||||
@@ -361,7 +361,7 @@ GiB).")
|
||||
(define-public meld
|
||||
(package
|
||||
(name "meld")
|
||||
(version "3.23.1")
|
||||
(version "3.23.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@@ -369,7 +369,7 @@ GiB).")
|
||||
(version-major+minor version)
|
||||
"/meld-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0x1mhk39g98x2w54w7y82fmgx6ad622q6k57a6scdiv38s92gy3k"))))
|
||||
(base32 "19n273shqs8l5lrlic0hr5iv1mp9223ijf3pkh8a49g08112lg4q"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs
|
||||
(list desktop-file-utils
|
||||
|
||||
@@ -1346,7 +1346,7 @@ using a stylus.")
|
||||
(define-public xournalpp
|
||||
(package
|
||||
(name "xournalpp")
|
||||
(version "1.3.4")
|
||||
(version "1.3.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -1355,7 +1355,7 @@ using a stylus.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1rs3x9k4nnlwpml49fzjsnp3hs807i7y8ccgffgngmb71999bla4"))))
|
||||
(base32 "1dzjp0hi54h2f5sbh9jmhywls3q52lc8j2bi2zyq6pl0y4nvfx80"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
||||
@@ -205,28 +205,3 @@ provides access to most of pkgconf's functionality, to allow other tooling
|
||||
such as compilers and IDEs to discover and use libraries configured by
|
||||
pkgconf.")
|
||||
(license isc)))
|
||||
|
||||
(define-public pkgconf-as-pkg-config
|
||||
(package/inherit pkgconf
|
||||
(name "pkgconf-as-pkg-config")
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:tests? #f
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(delete 'build)
|
||||
(replace 'install
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((pkgconf (search-input-file inputs "bin/pkgconf")))
|
||||
(mkdir-p (string-append #$output "/bin"))
|
||||
(symlink pkgconf (string-append #$output "/bin/pkg-config"))
|
||||
;; Also make 'pkg.m4' available, some packages might expect it.
|
||||
(mkdir-p (string-append #$output "/share"))
|
||||
(symlink (string-append (dirname (dirname pkgconf))
|
||||
"/share/aclocal")
|
||||
(string-append #$output "/share/aclocal"))))))))
|
||||
(native-inputs '())
|
||||
(inputs (list pkgconf))
|
||||
(propagated-inputs '())))
|
||||
|
||||
@@ -236,7 +236,7 @@ it.")
|
||||
(define-public trealla
|
||||
(package
|
||||
(name "trealla")
|
||||
(version "2.92.16")
|
||||
(version "2.92.6")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -245,7 +245,7 @@ it.")
|
||||
(url "https://github.com/trealla-prolog/trealla")
|
||||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32 "1246f15amc2f5d43s59ncq1i7k97yfxsjz057k2prymglyns0sgk"))
|
||||
(base32 "1qiqdq3bv5wmrss6hnwa7nn3fr2rj5a8g8v53khzfljppalwl401"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
|
||||
@@ -173,7 +173,7 @@ rates.")
|
||||
(define-public pulseaudio
|
||||
(package
|
||||
(name "pulseaudio")
|
||||
(version "17.0")
|
||||
(version "16.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@@ -181,7 +181,7 @@ rates.")
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1dc7xdfbn5rknwsvv5m2ijfwnqrap208liwyhiykjghsczb98dq5"))
|
||||
"1r2aa0g7al9jhrrbrnih6i3bfznd73kkbafrbzwpjyflj7735vwf"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Disable console-kit support by default since it's deprecated
|
||||
|
||||
@@ -289,13 +289,11 @@ were a single file.")
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
;; tests: 742 passed, 1 skipped, 2 deselected
|
||||
;; tests: 743 passed, 1 skipped, 1 deselected
|
||||
#:test-flags
|
||||
#~(list "--ignore=benchmarks/test_bench.py"
|
||||
;; FIXME: Did not raise cramjam.DecompressionError
|
||||
"--deselect=tests/test_variants.py::test_variants_raise_exception[deflate]"
|
||||
;; This test fails nondeterministically.
|
||||
"--deselect=tests/test_variants.py::test_variants_decompress_into[zlib-Buffer-File]")
|
||||
"--deselect=tests/test_variants.py::test_variants_raise_exception[deflate]")
|
||||
#:imported-modules `(,@%cargo-build-system-modules
|
||||
,@%pyproject-build-system-modules)
|
||||
#:modules '(((guix build cargo-build-system) #:prefix cargo:)
|
||||
@@ -789,11 +787,12 @@ the LZ4 frame format.")
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list #:test-backend #~'unittest))
|
||||
(native-inputs (list python-setuptools))
|
||||
(native-inputs
|
||||
(list python-cramjam
|
||||
python-setuptools))
|
||||
(inputs
|
||||
(list snappy))
|
||||
(propagated-inputs (list python-cramjam))
|
||||
(home-page "https://github.com/intake/python-snappy")
|
||||
(home-page "https://github.com/andrix/python-snappy")
|
||||
(synopsis "Python bindings for the Snappy compression library")
|
||||
(description
|
||||
"@code{python-python-snappy} provides bindings to the Snappy library and
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user