Merge branch 'master' into staging
This commit is contained in:
commit
fe6d003908
@ -632,7 +632,7 @@ commit_v1_0_1 = d68de958b60426798ed62797ff7c96c327a672ac
|
||||
|
||||
# Authenticate the current Git checkout by checking signatures on every commit
|
||||
# starting from $(commit_v1_0_1).
|
||||
authenticate:
|
||||
authenticate: guix/openpgp.go guix/git.go
|
||||
$(AM_V_at)echo "Authenticating Git checkout..." ; \
|
||||
"$(top_builddir)/pre-inst-env" $(GUILE) \
|
||||
--no-auto-compile -e git-authenticate \
|
||||
|
@ -112,7 +112,8 @@ COMMIT."
|
||||
#:select? version-controlled?))
|
||||
(hash (query-path-hash store source))
|
||||
(location (package-definition-location))
|
||||
(old-hash (origin-sha256 (package-source guix))))
|
||||
(old-hash (content-hash-value
|
||||
(origin-hash (package-source guix)))))
|
||||
(edit-expression location
|
||||
(update-definition commit hash
|
||||
#:old-hash old-hash
|
||||
|
@ -136,9 +136,9 @@ if test "x$guix_cv_have_recent_guile_sqlite3" != "xyes"; then
|
||||
AC_MSG_ERROR([A recent Guile-SQLite3 could not be found; please install it.])
|
||||
fi
|
||||
|
||||
GUILE_MODULE_AVAILABLE([have_guile_gcrypt], [(gcrypt hash)])
|
||||
if test "x$have_guile_gcrypt" != "xyes"; then
|
||||
AC_MSG_ERROR([Guile-Gcrypt could not be found; please install it.])
|
||||
GUIX_CHECK_GUILE_GCRYPT
|
||||
if test "x$guix_cv_have_recent_guile_gcrypt" != "xyes"; then
|
||||
AC_MSG_ERROR([A recent Guile-Gcrypt could not be found; please install it.])
|
||||
fi
|
||||
|
||||
dnl Guile-newt is used by the graphical installer.
|
||||
|
@ -141,7 +141,7 @@ as well as images, OS examples, and translations."
|
||||
(date->string date "~B ~Y")
|
||||
version version))))))
|
||||
|
||||
(install-file #$(file-append* documentation "/htmlxref.cnf")
|
||||
(install-file #$(file-append documentation "/htmlxref.cnf")
|
||||
#$output)
|
||||
|
||||
(for-each (lambda (texi)
|
||||
|
@ -501,7 +501,7 @@ It is a good idea to strip commit identifiers in the @code{version}
|
||||
field to, say, 7 digits. It avoids an aesthetic annoyance (assuming
|
||||
aesthetics have a role to play here) as well as problems related to OS
|
||||
limits such as the maximum shebang length (127 bytes for the Linux
|
||||
kernel.) It is best to use the full commit identifiers in
|
||||
kernel). It is best to use the full commit identifiers in
|
||||
@code{origin}s, though, to avoid ambiguities. A typical package
|
||||
definition may look like this:
|
||||
|
||||
@ -938,7 +938,7 @@ your @code{operating-system} configuration:
|
||||
@lisp
|
||||
(service qemu-binfmt-service-type
|
||||
(qemu-binfmt-configuration
|
||||
(platforms (lookup-qemu-platforms "arm" "aarch64" "mips64el"))
|
||||
(platforms (lookup-qemu-platforms "arm" "aarch64"))
|
||||
(guix-support? #t)))
|
||||
@end lisp
|
||||
|
||||
@ -951,7 +951,6 @@ commands, respectively:
|
||||
@example
|
||||
guix build --system=armhf-linux --rounds=2 hello
|
||||
guix build --system=aarch64-linux --rounds=2 hello
|
||||
guix build --system=mips64el-linux --rounds=2 hello
|
||||
@end example
|
||||
|
||||
@item
|
||||
|
149
doc/guix.texi
149
doc/guix.texi
@ -36,7 +36,7 @@ Copyright @copyright{} 2016, 2017, 2018, 2019, 2020 Efraim Flashner@*
|
||||
Copyright @copyright{} 2016 John Darrington@*
|
||||
Copyright @copyright{} 2016, 2017 Nikita Gillmann@*
|
||||
Copyright @copyright{} 2016, 2017, 2018, 2019, 2020 Jan Nieuwenhuizen@*
|
||||
Copyright @copyright{} 2016 Julien Lepiller@*
|
||||
Copyright @copyright{} 2016, 2017, 2018, 2019, 2020 Julien Lepiller@*
|
||||
Copyright @copyright{} 2016 Alex ter Weele@*
|
||||
Copyright @copyright{} 2016, 2017, 2018, 2019 Christopher Baines@*
|
||||
Copyright @copyright{} 2017, 2018, 2019 Clément Lassieur@*
|
||||
@ -464,11 +464,12 @@ and Linux-Libre kernel.
|
||||
@item aarch64-linux
|
||||
little-endian 64-bit ARMv8-A processors, Linux-Libre kernel.
|
||||
|
||||
@item mips64el-linux
|
||||
@item mips64el-linux (deprecated)
|
||||
little-endian 64-bit MIPS processors, specifically the Loongson series,
|
||||
n32 ABI, and Linux-Libre kernel. This configuration is no longer fully
|
||||
supported; in particular, the project's build farms no longer provide
|
||||
substitutes for this architecture.
|
||||
supported; in particular, there is no ongoing work to ensure that this
|
||||
architecture still works. Should someone decide they wish to revive this
|
||||
architecture then the code is still available.
|
||||
|
||||
@end table
|
||||
|
||||
@ -567,17 +568,18 @@ Installing goes along these lines:
|
||||
@item
|
||||
@cindex downloading Guix binary
|
||||
Download the binary tarball from
|
||||
@indicateurl{@value{BASE-URL}/guix-binary-@value{VERSION}.@var{system}.tar.xz},
|
||||
where @var{system} is @code{x86_64-linux} for an @code{x86_64} machine
|
||||
already running the kernel Linux, and so on.
|
||||
@indicateurl{@value{BASE-URL}/guix-binary-@value{VERSION}.x86_64-linux.tar.xz},
|
||||
where @code{x86_64-linux} can be replaced with @code{i686-linux} for an
|
||||
@code{i686} (32-bits) machine already running the kernel Linux, and so on
|
||||
(@pxref{GNU Distribution}).
|
||||
|
||||
@c The following is somewhat duplicated in ``System Installation''.
|
||||
Make sure to download the associated @file{.sig} file and to verify the
|
||||
authenticity of the tarball against it, along these lines:
|
||||
|
||||
@example
|
||||
$ wget @value{BASE-URL}/guix-binary-@value{VERSION}.@var{system}.tar.xz.sig
|
||||
$ gpg --verify guix-binary-@value{VERSION}.@var{system}.tar.xz.sig
|
||||
$ wget @value{BASE-URL}/guix-binary-@value{VERSION}.x86_64-linux.tar.xz.sig
|
||||
$ gpg --verify guix-binary-@value{VERSION}.x86_64-linux.tar.xz.sig
|
||||
@end example
|
||||
|
||||
If that command fails because you do not have the required public key,
|
||||
@ -603,13 +605,13 @@ you may have to run @code{su -} or @code{sudo -i}. As @code{root}, run:
|
||||
@example
|
||||
# cd /tmp
|
||||
# tar --warning=no-timestamp -xf \
|
||||
/path/to/guix-binary-@value{VERSION}.@var{system}.tar.xz
|
||||
/path/to/guix-binary-@value{VERSION}.x86_64-linux.tar.xz
|
||||
# mv var/guix /var/ && mv gnu /
|
||||
@end example
|
||||
|
||||
This creates @file{/gnu/store} (@pxref{The Store}) and @file{/var/guix}.
|
||||
The latter contains a ready-to-use profile for @code{root} (see next
|
||||
step.)
|
||||
step).
|
||||
|
||||
Do @emph{not} unpack the tarball on a working Guix system since that
|
||||
would overwrite its own essential files.
|
||||
@ -617,10 +619,10 @@ would overwrite its own essential files.
|
||||
The @option{--warning=no-timestamp} option makes sure GNU@tie{}tar does
|
||||
not emit warnings about ``implausibly old time stamps'' (such
|
||||
warnings were triggered by GNU@tie{}tar 1.26 and older; recent
|
||||
versions are fine.)
|
||||
versions are fine).
|
||||
They stem from the fact that all the
|
||||
files in the archive have their modification time set to zero (which
|
||||
means January 1st, 1970.) This is done on purpose to make sure the
|
||||
means January 1st, 1970). This is done on purpose to make sure the
|
||||
archive content is independent of its creation time, thus making it
|
||||
reproducible.
|
||||
|
||||
@ -705,7 +707,7 @@ there:
|
||||
That way, assuming @file{/usr/local/share/info} is in the search path,
|
||||
running @command{info guix} will open this manual (@pxref{Other Info
|
||||
Directories,,, texinfo, GNU Texinfo}, for more details on changing the
|
||||
Info search path.)
|
||||
Info search path).
|
||||
|
||||
@item
|
||||
@cindex substitutes, authorization thereof
|
||||
@ -1059,8 +1061,8 @@ The @file{/etc/guix/machines.scm} file typically looks like this:
|
||||
(speed 2.)) ;incredibly fast!
|
||||
|
||||
(build-machine
|
||||
(name "meeps.example.org")
|
||||
(system "mips64el-linux")
|
||||
(name "armeight.example.org")
|
||||
(system "aarch64-linux")
|
||||
(host-key "ssh-rsa AAAAB3Nza@dots{}")
|
||||
(user "alice")
|
||||
(private-key
|
||||
@ -1070,7 +1072,7 @@ The @file{/etc/guix/machines.scm} file typically looks like this:
|
||||
|
||||
@noindent
|
||||
In the example above we specify a list of two build machines, one for
|
||||
the @code{x86_64} architecture and one for the @code{mips64el}
|
||||
the @code{x86_64} architecture and one for the @code{aarch64}
|
||||
architecture.
|
||||
|
||||
In fact, this file is---not surprisingly!---a Scheme file that is
|
||||
@ -1363,7 +1365,7 @@ build failed and the client specified @option{--keep-failed}
|
||||
(@pxref{Invoking guix build, @option{--keep-failed}}).
|
||||
|
||||
The daemon listens for connections and spawns one sub-process for each session
|
||||
started by a client (one of the @command{guix} sub-commands.) The
|
||||
started by a client (one of the @command{guix} sub-commands). The
|
||||
@command{guix processes} command allows you to get an overview of the activity
|
||||
on your system by viewing each of the active sessions and clients.
|
||||
@xref{Invoking guix processes}, for more information.
|
||||
@ -1917,8 +1919,8 @@ about their support in GNU/Linux.
|
||||
|
||||
An ISO-9660 installation image that can be written to a USB stick or
|
||||
burnt to a DVD can be downloaded from
|
||||
@indicateurl{@value{BASE-URL}/guix-system-install-@value{VERSION}.@var{system}.iso.xz},
|
||||
where @var{system} is one of:
|
||||
@indicateurl{@value{BASE-URL}/guix-system-install-@value{VERSION}.x86_64-linux.iso.xz},
|
||||
where you can replace @code{x86_64-linux} with one of:
|
||||
|
||||
@table @code
|
||||
@item x86_64-linux
|
||||
@ -1933,8 +1935,8 @@ Make sure to download the associated @file{.sig} file and to verify the
|
||||
authenticity of the image against it, along these lines:
|
||||
|
||||
@example
|
||||
$ wget @value{BASE-URL}/guix-system-install-@value{VERSION}.@var{system}.iso.xz.sig
|
||||
$ gpg --verify guix-system-install-@value{VERSION}.@var{system}.iso.xz.sig
|
||||
$ wget @value{BASE-URL}/guix-system-install-@value{VERSION}.x86_64-linux.iso.xz.sig
|
||||
$ gpg --verify guix-system-install-@value{VERSION}.x86_64-linux.iso.xz.sig
|
||||
@end example
|
||||
|
||||
If that command fails because you do not have the required public key,
|
||||
@ -1965,7 +1967,7 @@ To copy the image to a USB stick, follow these steps:
|
||||
Decompress the image using the @command{xz} command:
|
||||
|
||||
@example
|
||||
xz -d guix-system-install-@value{VERSION}.@var{system}.iso.xz
|
||||
xz -d guix-system-install-@value{VERSION}.x86_64-linux.iso.xz
|
||||
@end example
|
||||
|
||||
@item
|
||||
@ -1974,7 +1976,7 @@ its device name. Assuming that the USB stick is known as @file{/dev/sdX},
|
||||
copy the image with:
|
||||
|
||||
@example
|
||||
dd if=guix-system-install-@value{VERSION}.@var{system}.iso of=/dev/sdX
|
||||
dd if=guix-system-install-@value{VERSION}.x86_64-linux.iso of=/dev/sdX
|
||||
sync
|
||||
@end example
|
||||
|
||||
@ -1990,7 +1992,7 @@ To copy the image to a DVD, follow these steps:
|
||||
Decompress the image using the @command{xz} command:
|
||||
|
||||
@example
|
||||
xz -d guix-system-install-@value{VERSION}.@var{system}.iso.xz
|
||||
xz -d guix-system-install-@value{VERSION}.x86_64-linux.iso.xz
|
||||
@end example
|
||||
|
||||
@item
|
||||
@ -1999,7 +2001,7 @@ its device name. Assuming that the DVD drive is known as @file{/dev/srX},
|
||||
copy the image with:
|
||||
|
||||
@example
|
||||
growisofs -dvd-compat -Z /dev/srX=guix-system-install-@value{VERSION}.@var{system}.iso
|
||||
growisofs -dvd-compat -Z /dev/srX=guix-system-install-@value{VERSION}.x86_64-linux.iso
|
||||
@end example
|
||||
|
||||
Access to @file{/dev/srX} usually requires root privileges.
|
||||
@ -2292,7 +2294,7 @@ mkfs.ext4 -L my-root /dev/sda2
|
||||
If you are instead planning to encrypt the root partition, you can use
|
||||
the Cryptsetup/LUKS utilities to do that (see @inlinefmtifelse{html,
|
||||
@uref{https://linux.die.net/man/8/cryptsetup, @code{man cryptsetup}},
|
||||
@code{man cryptsetup}} for more information.) Assuming you want to
|
||||
@code{man cryptsetup}} for more information). Assuming you want to
|
||||
store the root partition on @file{/dev/sda2}, the command sequence would
|
||||
be along these lines:
|
||||
|
||||
@ -2764,7 +2766,7 @@ Install the specified @var{package}s.
|
||||
Each @var{package} may specify either a simple package name, such as
|
||||
@code{guile}, or a package name followed by an at-sign and version number,
|
||||
such as @code{guile@@1.8.8} or simply @code{guile@@1.8} (in the latter
|
||||
case, the newest version prefixed by @code{1.8} is selected.)
|
||||
case, the newest version prefixed by @code{1.8} is selected).
|
||||
|
||||
If no version number is specified, the
|
||||
newest available version will be selected. In addition, @var{package}
|
||||
@ -3368,7 +3370,7 @@ When using HTTPS, the server's X.509 certificate is @emph{not} validated
|
||||
HTTPS clients such as Web browsers usually do. This is because Guix
|
||||
authenticates substitute information itself, as explained above, which
|
||||
is what we care about (whereas X.509 certificates are about
|
||||
authenticating bindings between domain names and public keys.)
|
||||
authenticating bindings between domain names and public keys).
|
||||
|
||||
@node Proxy Settings
|
||||
@subsection Proxy Settings
|
||||
@ -4578,7 +4580,7 @@ The main options are:
|
||||
|
||||
@table @code
|
||||
@item --export
|
||||
Export the specified store files or packages (see below.) Write the
|
||||
Export the specified store files or packages (see below). Write the
|
||||
resulting archive to the standard output.
|
||||
|
||||
Dependencies are @emph{not} included in the output, unless
|
||||
@ -4595,7 +4597,7 @@ exported store items.
|
||||
Read an archive from the standard input, and import the files listed
|
||||
therein into the store. Abort if the archive has an invalid digital
|
||||
signature, or if it is signed by a public key not among the authorized
|
||||
keys (see @option{--authorize} below.)
|
||||
keys (see @option{--authorize} below).
|
||||
|
||||
@item --missing
|
||||
Read a list of store file names from the standard input, one per line,
|
||||
@ -4611,7 +4613,7 @@ to generate the key pair.
|
||||
|
||||
The generated key pair is typically stored under @file{/etc/guix}, in
|
||||
@file{signing-key.pub} (public key) and @file{signing-key.sec} (private
|
||||
key, which must be kept secret.) When @var{parameters} is omitted,
|
||||
key, which must be kept secret). When @var{parameters} is omitted,
|
||||
an ECDSA key using the Ed25519 curve is generated, or, for Libgcrypt
|
||||
versions before 1.6.0, it is a 4096-bit RSA key.
|
||||
Alternatively, @var{parameters} can specify
|
||||
@ -4927,7 +4929,7 @@ interpreted as packages that will be added to the environment directly.
|
||||
|
||||
@item --pure
|
||||
Unset existing environment variables when building the new environment, except
|
||||
those specified with @option{--preserve} (see below.) This has the effect of
|
||||
those specified with @option{--preserve} (see below). This has the effect of
|
||||
creating an environment in which search paths only contain package inputs.
|
||||
|
||||
@item --preserve=@var{regexp}
|
||||
@ -4945,7 +4947,7 @@ guix environment --pure --preserve=^SLURM --ad-hoc openmpi @dots{} \
|
||||
This example runs @command{mpirun} in a context where the only environment
|
||||
variables defined are @env{PATH}, environment variables whose name starts
|
||||
with @samp{SLURM}, as well as the usual ``precious'' variables (@env{HOME},
|
||||
@env{USER}, etc.)
|
||||
@env{USER}, etc.).
|
||||
|
||||
@item --search-paths
|
||||
Display the environment variable definitions that make up the
|
||||
@ -4966,7 +4968,7 @@ directory is created that matches the current user's home directory, and
|
||||
|
||||
The spawned process runs as the current user outside the container. Inside
|
||||
the container, it has the same UID and GID as the current user, unless
|
||||
@option{--user} is passed (see below.)
|
||||
@option{--user} is passed (see below).
|
||||
|
||||
@item --network
|
||||
@itemx -N
|
||||
@ -5329,7 +5331,7 @@ the system type of the build host.
|
||||
@item --target=@var{triplet}
|
||||
@cindex cross-compilation
|
||||
Cross-build for @var{triplet}, which must be a valid GNU triplet, such
|
||||
as @code{"mips64el-linux-gnu"} (@pxref{Specifying target triplets, GNU
|
||||
as @code{"aarch64-linux-gnu"} (@pxref{Specifying target triplets, GNU
|
||||
configuration triplets,, autoconf, Autoconf}).
|
||||
|
||||
@item --compression=@var{tool}
|
||||
@ -5718,7 +5720,7 @@ Return the @code{<derivation>} object of @var{package} cross-built from
|
||||
@var{system} to @var{target}.
|
||||
|
||||
@var{target} must be a valid GNU triplet denoting the target hardware
|
||||
and operating system, such as @code{"mips64el-linux-gnu"}
|
||||
and operating system, such as @code{"aarch64-linux-gnu"}
|
||||
(@pxref{Specifying Target Triplets,,, autoconf, Autoconf}).
|
||||
@end deffn
|
||||
|
||||
@ -5867,7 +5869,7 @@ Lastly, @code{propagated-inputs} is similar to @code{inputs}, but the
|
||||
specified packages will be automatically installed alongside the package
|
||||
they belong to (@pxref{package-cmd-propagated-inputs, @command{guix
|
||||
package}}, for information on how @command{guix package} deals with
|
||||
propagated inputs.)
|
||||
propagated inputs).
|
||||
|
||||
For example this is necessary when a C/C++ library needs headers of
|
||||
another library to compile, or when a pkg-config file refers to another
|
||||
@ -7070,7 +7072,7 @@ argument.
|
||||
Return @code{#t} when @var{path} designates a valid store item and
|
||||
@code{#f} otherwise (an invalid item may exist on disk but still be
|
||||
invalid, for instance because it is the result of an aborted or failed
|
||||
build.)
|
||||
build).
|
||||
|
||||
A @code{&store-protocol-error} condition is raised if @var{path} is not
|
||||
prefixed by the store directory (@file{/gnu/store}).
|
||||
@ -7115,7 +7117,7 @@ directory in the store, but may produce more.
|
||||
@cindex dependencies, build-time
|
||||
The inputs of the derivations---i.e., its build-time dependencies---which may
|
||||
be other derivations or plain files in the store (patches, build scripts,
|
||||
etc.)
|
||||
etc.).
|
||||
|
||||
@item
|
||||
The system type targeted by the derivation---e.g., @code{x86_64-linux}.
|
||||
@ -7537,7 +7539,7 @@ The store monad---an alias for @code{%state-monad}.
|
||||
|
||||
Values in the store monad encapsulate accesses to the store. When its
|
||||
effect is needed, a value of the store monad must be ``evaluated'' by
|
||||
passing it to the @code{run-with-store} procedure (see below.)
|
||||
passing it to the @code{run-with-store} procedure (see below).
|
||||
@end defvr
|
||||
|
||||
@deffn {Scheme Procedure} run-with-store @var{store} @var{mval} [#:guile-for-build] [#:system (%current-system)]
|
||||
@ -7675,7 +7677,7 @@ into gexps. For example, a useful type of high-level objects that can be
|
||||
inserted in a gexp is ``file-like objects'', which make it easy to
|
||||
add files to the store and to refer to them in
|
||||
derivations and such (see @code{local-file} and @code{plain-file}
|
||||
below.)
|
||||
below).
|
||||
|
||||
To illustrate the idea, here is an example of a gexp:
|
||||
|
||||
@ -7719,7 +7721,7 @@ native package build:
|
||||
"-s"
|
||||
(string-append #$emacs "/bin/emacs")
|
||||
(string-append #$output "/bin/vi")))
|
||||
#:target "mips64el-linux-gnu")
|
||||
#:target "aarch64-linux-gnu")
|
||||
@end lisp
|
||||
|
||||
@noindent
|
||||
@ -7846,7 +7848,7 @@ Like the above, but refers to native builds of the objects listed in
|
||||
@end table
|
||||
|
||||
G-expressions created by @code{gexp} or @code{#~} are run-time objects
|
||||
of the @code{gexp?} type (see below.)
|
||||
of the @code{gexp?} type (see below).
|
||||
@end deffn
|
||||
|
||||
@deffn {Scheme Syntax} with-imported-modules @var{modules} @var{body}@dots{}
|
||||
@ -7892,7 +7894,7 @@ Return @code{#t} if @var{obj} is a G-expression.
|
||||
G-expressions are meant to be written to disk, either as code building
|
||||
some derivation, or as plain files in the store. The monadic procedures
|
||||
below allow you to do that (@pxref{The Store Monad}, for more
|
||||
information about monads.)
|
||||
information about monads).
|
||||
|
||||
@deffn {Monadic Procedure} gexp->derivation @var{name} @var{exp} @
|
||||
[#:system (%current-system)] [#:target #f] [#:graft? #t] @
|
||||
@ -8839,7 +8841,7 @@ also be offloaded to a remote machine of the right architecture.
|
||||
@item --target=@var{triplet}
|
||||
@cindex cross-compilation
|
||||
Cross-build for @var{triplet}, which must be a valid GNU triplet, such
|
||||
as @code{"mips64el-linux-gnu"} (@pxref{Specifying Target Triplets, GNU
|
||||
as @code{"aarch64-linux-gnu"} (@pxref{Specifying Target Triplets, GNU
|
||||
configuration triplets,, autoconf, Autoconf}).
|
||||
|
||||
@anchor{build-check}
|
||||
@ -8903,13 +8905,13 @@ guix build --log-file -e '(@@ (gnu packages guile) guile-2.0)'
|
||||
|
||||
If a log is unavailable locally, and unless @option{--no-substitutes} is
|
||||
passed, the command looks for a corresponding log on one of the
|
||||
substitute servers (as specified with @option{--substitute-urls}.)
|
||||
substitute servers (as specified with @option{--substitute-urls}).
|
||||
|
||||
So for instance, imagine you want to see the build log of GDB on MIPS,
|
||||
but you are actually on an @code{x86_64} machine:
|
||||
|
||||
@example
|
||||
$ guix build --log-file gdb -s mips64el-linux
|
||||
$ guix build --log-file gdb -s aarch64-linux
|
||||
https://@value{SUBSTITUTE-SERVER}/log/@dots{}-gdb-7.10
|
||||
@end example
|
||||
|
||||
@ -9142,7 +9144,7 @@ hash (@pxref{Invoking guix archive}).
|
||||
@item --exclude-vcs
|
||||
@itemx -x
|
||||
When combined with @option{--recursive}, exclude version control system
|
||||
directories (@file{.bzr}, @file{.git}, @file{.hg}, etc.)
|
||||
directories (@file{.bzr}, @file{.git}, @file{.hg}, etc.).
|
||||
|
||||
@vindex git-fetch
|
||||
As an example, here is how you would compute the hash of a Git checkout,
|
||||
@ -9675,7 +9677,7 @@ guix refresh -l -e '(@@@@ (gnu packages commencement) glibc-final)'
|
||||
@end example
|
||||
|
||||
This command lists the dependents of the ``final'' libc (essentially all
|
||||
the packages.)
|
||||
the packages).
|
||||
|
||||
@item --update
|
||||
@itemx -u
|
||||
@ -9782,7 +9784,7 @@ be used when passing @command{guix refresh} one or more package names:
|
||||
|
||||
@item --list-updaters
|
||||
@itemx -L
|
||||
List available updaters and exit (see @option{--type} above.)
|
||||
List available updaters and exit (see @option{--type} above).
|
||||
|
||||
For each updater, display the fraction of packages it covers; at the
|
||||
end, display the fraction of packages covered by all these updaters.
|
||||
@ -9846,7 +9848,7 @@ When this option is omitted, @command{guix refresh} uses
|
||||
@file{~/.config/guix/upstream/trustedkeys.kbx} as the keyring for upstream
|
||||
signing keys. OpenPGP signatures are checked against keys from this keyring;
|
||||
missing keys are downloaded to this keyring as well (see
|
||||
@option{--key-download} below.)
|
||||
@option{--key-download} below).
|
||||
|
||||
You can export keys from your default GPG keyring into a keybox file using
|
||||
commands like this one:
|
||||
@ -10110,6 +10112,13 @@ libraries. (That libc and GCC's libraries represent a large fraction of
|
||||
the closure is not a problem @i{per se} because they are always available
|
||||
on the system anyway.)
|
||||
|
||||
Since the command also accepts store file names, assessing the size of
|
||||
a build result is straightforward:
|
||||
|
||||
@example
|
||||
guix size $(guix system build config.scm)
|
||||
@end example
|
||||
|
||||
When the package(s) passed to @command{guix size} are available in the
|
||||
store@footnote{More precisely, @command{guix size} looks for the
|
||||
@emph{ungrafted} variant of the given package(s), as returned by
|
||||
@ -10258,7 +10267,7 @@ guix graph --type=reverse-package ocaml
|
||||
|
||||
...@: yields the graph of packages that @emph{explicitly} depend on OCaml (if
|
||||
you are also interested in cases where OCaml is an implicit dependency, see
|
||||
@code{reverse-bag} below.)
|
||||
@code{reverse-bag} below).
|
||||
|
||||
Note that for core packages this can yield huge graphs. If all you want
|
||||
is to know the number of packages that depend on a given package, use
|
||||
@ -10832,7 +10841,7 @@ When a difference is found between the hash of a locally-built item and
|
||||
that of a server-provided substitute, or among substitutes provided by
|
||||
different servers, the command displays it as in the example above and
|
||||
its exit code is 2 (other non-zero exit codes denote other kinds of
|
||||
errors.)
|
||||
errors).
|
||||
|
||||
The one option that matters is:
|
||||
|
||||
@ -11158,7 +11167,7 @@ integration tool; their process identifier (PID) is given by the
|
||||
The @code{LockHeld} fields show which store items are currently locked by this
|
||||
session, which corresponds to store items being built or substituted (the
|
||||
@code{LockHeld} field is not displayed when @command{guix processes} is not
|
||||
running as root.) Last, by looking at the @code{ChildProcess} field, we
|
||||
running as root). Last, by looking at the @code{ChildProcess} field, we
|
||||
understand that these three builds are being offloaded (@pxref{Daemon Offload
|
||||
Setup}).
|
||||
|
||||
@ -11800,7 +11809,7 @@ variables.
|
||||
@defvr {Scheme Variable} %base-file-systems
|
||||
These are essential file systems that are required on normal systems,
|
||||
such as @code{%pseudo-terminal-file-system} and @code{%immutable-store} (see
|
||||
below.) Operating system declarations should always contain at least
|
||||
below). Operating system declarations should always contain at least
|
||||
these.
|
||||
@end defvr
|
||||
|
||||
@ -12629,7 +12638,7 @@ Since this is part of @code{%base-services}, you can use
|
||||
@code{modify-services} to customize the set of special files
|
||||
(@pxref{Service Reference, @code{modify-services}}). But the simple way
|
||||
to add a special file is @i{via} the @code{extra-special-file} procedure
|
||||
(see below.)
|
||||
(see below).
|
||||
@end defvr
|
||||
|
||||
@deffn {Scheme Procedure} extra-special-file @var{file} @var{target}
|
||||
@ -14940,7 +14949,7 @@ definition (@pxref{operating-system Reference, system-wide packages}).
|
||||
This is the type for the @uref{https://wiki.gnome.org/Projects/GDM/, GNOME
|
||||
Desktop Manager} (GDM), a program that manages graphical display servers and
|
||||
handles graphical user logins. Its value must be a @code{gdm-configuration}
|
||||
(see below.)
|
||||
(see below).
|
||||
|
||||
@cindex session types (X11)
|
||||
@cindex X11 session types
|
||||
@ -16211,7 +16220,7 @@ gnome-session``. Currently only GNOME has support for Wayland.
|
||||
@defvr {Scheme Variable} gnome-desktop-service-type
|
||||
This is the type of the service that adds the @uref{https://www.gnome.org,
|
||||
GNOME} desktop environment. Its value is a @code{gnome-desktop-configuration}
|
||||
object (see below.)
|
||||
object (see below).
|
||||
|
||||
This service adds the @code{gnome} package to the system profile, and extends
|
||||
polkit with the actions from @code{gnome-settings-daemon}.
|
||||
@ -16229,7 +16238,7 @@ The GNOME package to use.
|
||||
@defvr {Scheme Variable} xfce-desktop-service-type
|
||||
This is the type of a service to run the @uref{Xfce, https://xfce.org/}
|
||||
desktop environment. Its value is an @code{xfce-desktop-configuration} object
|
||||
(see below.)
|
||||
(see below).
|
||||
|
||||
This service adds the @code{xfce} package to the system profile, and
|
||||
extends polkit with the ability for @code{thunar} to manipulate the file
|
||||
@ -16249,7 +16258,7 @@ The Xfce package to use.
|
||||
@deffn {Scheme Variable} mate-desktop-service-type
|
||||
This is the type of the service that runs the @uref{https://mate-desktop.org/,
|
||||
MATE desktop environment}. Its value is a @code{mate-desktop-configuration}
|
||||
object (see below.)
|
||||
object (see below).
|
||||
|
||||
This service adds the @code{mate} package to the system
|
||||
profile, and extends polkit with the actions from
|
||||
@ -16563,7 +16572,7 @@ Users need to be in the @code{lp} group to access the D-Bus service.
|
||||
@defvr {Scheme Variable} gnome-keyring-service-type
|
||||
This is the type of the service that adds the
|
||||
@uref{https://wiki.gnome.org/Projects/GnomeKeyring, GNOME Keyring}. Its
|
||||
value is a @code{gnome-keyring-configuration} object (see below.)
|
||||
value is a @code{gnome-keyring-configuration} object (see below).
|
||||
|
||||
This service adds the @code{gnome-keyring} package to the system profile
|
||||
and extends PAM with entries using @code{pam_gnome_keyring.so}, unlocking
|
||||
@ -22310,10 +22319,10 @@ configuration:
|
||||
|
||||
Note that ddclient needs to access credentials that are stored in a
|
||||
@dfn{secret file}, by default @file{/etc/ddclient/secrets} (see
|
||||
@code{secret-file} below.) You are expected to create this file manually, in
|
||||
@code{secret-file} below). You are expected to create this file manually, in
|
||||
an ``out-of-band'' fashion (you @emph{could} make this file part of the
|
||||
service configuration, for instance by using @code{plain-file}, but it will be
|
||||
world-readable @i{via} @file{/gnu/store}.) See the examples in the
|
||||
world-readable @i{via} @file{/gnu/store}). See the examples in the
|
||||
@file{share/ddclient} directory of the @code{ddclient} package.
|
||||
|
||||
@c %start of fragment
|
||||
@ -24476,7 +24485,7 @@ emulated:
|
||||
@lisp
|
||||
(service qemu-binfmt-service-type
|
||||
(qemu-binfmt-configuration
|
||||
(platforms (lookup-qemu-platforms "arm" "aarch64" "mips64el"))))
|
||||
(platforms (lookup-qemu-platforms "arm" "aarch64"))))
|
||||
@end lisp
|
||||
|
||||
In this example, we enable transparent emulation for the ARM and aarch64
|
||||
@ -26388,7 +26397,7 @@ password, and which needs to access the @file{/etc/passwd} and
|
||||
obvious security reasons. To address that, these executables are
|
||||
@dfn{setuid-root}, meaning that they always run with root privileges
|
||||
(@pxref{How Change Persona,,, libc, The GNU C Library Reference Manual},
|
||||
for more info about the setuid mechanism.)
|
||||
for more info about the setuid mechanism).
|
||||
|
||||
The store itself @emph{cannot} contain setuid programs: that would be a
|
||||
security issue since any user on the system can write derivations that
|
||||
@ -27525,7 +27534,7 @@ each other:
|
||||
Emit in Dot/Graphviz format to standard output the @dfn{service
|
||||
extension graph} of the operating system defined in @var{file}
|
||||
(@pxref{Service Composition}, for more information on service
|
||||
extensions.)
|
||||
extensions).
|
||||
|
||||
The command:
|
||||
|
||||
@ -28086,7 +28095,7 @@ services and service types. This interface is provided by the
|
||||
|
||||
@deffn {Scheme Procedure} service @var{type} [@var{value}]
|
||||
Return a new service of @var{type}, a @code{<service-type>} object (see
|
||||
below.) @var{value} can be any object; it represents the parameters of
|
||||
below). @var{value} can be any object; it represents the parameters of
|
||||
this particular service instance.
|
||||
|
||||
When @var{value} is omitted, the default value specified by @var{type}
|
||||
@ -28642,7 +28651,7 @@ Occasionally, important security vulnerabilities are discovered in software
|
||||
packages and must be patched. Guix developers try hard to keep track of
|
||||
known vulnerabilities and to apply fixes as soon as possible in the
|
||||
@code{master} branch of Guix (we do not yet provide a ``stable'' branch
|
||||
containing only security updates.) The @command{guix lint} tool helps
|
||||
containing only security updates). The @command{guix lint} tool helps
|
||||
developers find out about vulnerable versions of software packages in the
|
||||
distribution:
|
||||
|
||||
@ -29089,7 +29098,7 @@ reason.
|
||||
Guix is based on the @uref{https://nixos.org/nix/, Nix package manager},
|
||||
which was designed and
|
||||
implemented by Eelco Dolstra, with contributions from other people (see
|
||||
the @file{nix/AUTHORS} file in Guix.) Nix pioneered functional package
|
||||
the @file{nix/AUTHORS} file in Guix). Nix pioneered functional package
|
||||
management, and promoted unprecedented features, such as transactional
|
||||
package upgrades and rollbacks, per-user profiles, and referentially
|
||||
transparent build processes. Without this work, Guix would not exist.
|
||||
|
@ -1,7 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
# This hook script prevents the user from pushing to Savannah if any of the new
|
||||
# commits' OpenPGP signatures cannot be verified.
|
||||
# A hook script that prevents the user from pushing unsigned commits.
|
||||
|
||||
# Called by "git push" after it has checked the remote status, but before
|
||||
# anything has been pushed. If this script exits with a non-zero status nothing
|
||||
@ -19,51 +18,13 @@
|
||||
#
|
||||
# <local ref> <local sha1> <remote ref> <remote sha1>
|
||||
|
||||
z40=0000000000000000000000000000000000000000
|
||||
|
||||
# Only use the hook when pushing to Savannah.
|
||||
case "$2" in
|
||||
*git.sv.gnu.org*)
|
||||
break
|
||||
*.gnu.org*)
|
||||
exec make authenticate check-channel-news
|
||||
exit 127
|
||||
;;
|
||||
*)
|
||||
*)
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
|
||||
while read local_ref local_sha remote_ref remote_sha
|
||||
do
|
||||
if [ "$local_sha" = $z40 ]
|
||||
then
|
||||
# Handle delete
|
||||
:
|
||||
else
|
||||
if [ "$remote_sha" = $z40 ]
|
||||
then
|
||||
# We are pushing a new branch. To prevent wasting too
|
||||
# much time for this relatively rare case, we examine
|
||||
# all commits since the first signed commit, rather than
|
||||
# the full history. This check *will* fail, and the user
|
||||
# will need to temporarily disable the hook to push the
|
||||
# new branch.
|
||||
range="e3d0fcbf7e55e8cbe8d0a1c5a24d73f341d7243b..$local_sha"
|
||||
else
|
||||
# Update to existing branch, examine new commits
|
||||
range="$remote_sha..$local_sha"
|
||||
fi
|
||||
|
||||
# Verify the signatures of all commits being pushed.
|
||||
ret=0
|
||||
for commit in $(git rev-list $range)
|
||||
do
|
||||
if ! git verify-commit $commit >/dev/null 2>&1
|
||||
then
|
||||
printf "%s failed signature check\n" $commit
|
||||
ret=1
|
||||
fi
|
||||
done
|
||||
exit $ret
|
||||
fi
|
||||
done
|
||||
|
||||
exit 0
|
||||
|
@ -1,6 +1,6 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2017 David Craven <david@craven.ch>
|
||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
;;;
|
||||
@ -42,6 +42,7 @@
|
||||
bootloader-name
|
||||
bootloader-package
|
||||
bootloader-installer
|
||||
bootloader-disk-image-installer
|
||||
bootloader-configuration-file
|
||||
bootloader-configuration-file-generator
|
||||
|
||||
@ -125,6 +126,8 @@ record."
|
||||
(name bootloader-name)
|
||||
(package bootloader-package)
|
||||
(installer bootloader-installer)
|
||||
(disk-image-installer bootloader-disk-image-installer
|
||||
(default #f))
|
||||
(configuration-file bootloader-configuration-file)
|
||||
(configuration-file-generator bootloader-configuration-file-generator))
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
|
||||
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;;
|
||||
@ -423,18 +423,65 @@ fi~%"))))
|
||||
|
||||
(define install-grub
|
||||
#~(lambda (bootloader device mount-point)
|
||||
;; Install GRUB on DEVICE which is mounted at MOUNT-POINT.
|
||||
(let ((grub (string-append bootloader "/sbin/grub-install"))
|
||||
(install-dir (string-append mount-point "/boot")))
|
||||
;; Tell 'grub-install' that there might be a LUKS-encrypted /boot or
|
||||
;; root partition.
|
||||
(setenv "GRUB_ENABLE_CRYPTODISK" "y")
|
||||
;; Install GRUB on DEVICE which is mounted at MOUNT-POINT. If DEVICE
|
||||
;; is #f, then we populate the disk-image rooted at MOUNT-POINT.
|
||||
(if device
|
||||
(begin
|
||||
;; Tell 'grub-install' that there might be a LUKS-encrypted
|
||||
;; /boot or root partition.
|
||||
(setenv "GRUB_ENABLE_CRYPTODISK" "y")
|
||||
|
||||
;; Hide potentially confusing messages from the user, such as
|
||||
;; "Installing for i386-pc platform."
|
||||
(invoke/quiet grub "--no-floppy" "--target=i386-pc"
|
||||
"--boot-directory" install-dir
|
||||
device))))
|
||||
;; Hide potentially confusing messages from the user, such as
|
||||
;; "Installing for i386-pc platform."
|
||||
(invoke/quiet grub "--no-floppy" "--target=i386-pc"
|
||||
"--boot-directory" install-dir
|
||||
device))
|
||||
;; When creating a disk-image, only install GRUB modules.
|
||||
(copy-recursively (string-append bootloader "/lib/")
|
||||
install-dir)))))
|
||||
|
||||
(define install-grub-disk-image
|
||||
#~(lambda (bootloader root-index image)
|
||||
;; Install GRUB on the given IMAGE. The root partition index is
|
||||
;; ROOT-INDEX.
|
||||
(let ((grub-mkimage
|
||||
(string-append bootloader "/bin/grub-mkimage"))
|
||||
(modules '("biosdisk" "part_msdos" "fat" "ext2"))
|
||||
(grub-bios-setup
|
||||
(string-append bootloader "/sbin/grub-bios-setup"))
|
||||
(root-device (format #f "hd0,msdos~a" root-index))
|
||||
(boot-img (string-append bootloader "/lib/grub/i386-pc/boot.img"))
|
||||
(device-map "device.map"))
|
||||
|
||||
;; Create a minimal, standalone GRUB image that will be written
|
||||
;; directly in the MBR-GAP (space between the end of the MBR and the
|
||||
;; first partition).
|
||||
(apply invoke grub-mkimage
|
||||
"-O" "i386-pc"
|
||||
"-o" "core.img"
|
||||
"-p" (format #f "(~a)/boot/grub" root-device)
|
||||
modules)
|
||||
|
||||
;; Create a device mapping file.
|
||||
(call-with-output-file device-map
|
||||
(lambda (port)
|
||||
(format port "(hd0) ~a~%" image)))
|
||||
|
||||
;; Copy the default boot.img, that will be written on the MBR sector
|
||||
;; by GRUB-BIOS-SETUP.
|
||||
(copy-file boot-img "boot.img")
|
||||
|
||||
;; Install both the "boot.img" and the "core.img" files on the given
|
||||
;; IMAGE. On boot, the MBR sector will execute the minimal GRUB
|
||||
;; written in the MBR-GAP. GRUB configuration and missing modules will
|
||||
;; be read from ROOT-DEVICE.
|
||||
(invoke grub-bios-setup
|
||||
"-m" device-map
|
||||
"-r" root-device
|
||||
"-d" "."
|
||||
image))))
|
||||
|
||||
(define install-grub-efi
|
||||
#~(lambda (bootloader efi-dir mount-point)
|
||||
@ -465,21 +512,20 @@ fi~%"))))
|
||||
(name 'grub)
|
||||
(package grub)
|
||||
(installer install-grub)
|
||||
(disk-image-installer install-grub-disk-image)
|
||||
(configuration-file "/boot/grub/grub.cfg")
|
||||
(configuration-file-generator grub-configuration-file)))
|
||||
|
||||
(define grub-minimal-bootloader
|
||||
(define* grub-minimal-bootloader
|
||||
(bootloader
|
||||
(name 'grub)
|
||||
(package grub-minimal)
|
||||
(installer install-grub)
|
||||
(configuration-file "/boot/grub/grub.cfg")
|
||||
(configuration-file-generator grub-configuration-file)))
|
||||
(inherit grub-bootloader)
|
||||
(package grub-minimal)))
|
||||
|
||||
(define* grub-efi-bootloader
|
||||
(bootloader
|
||||
(inherit grub-bootloader)
|
||||
(installer install-grub-efi)
|
||||
(disk-image-installer #f)
|
||||
(name 'grub-efi)
|
||||
(package grub-efi)))
|
||||
|
||||
|
@ -47,9 +47,10 @@
|
||||
"Take SEXP, a tuple as returned by 'partition->gexp', and turn it into a
|
||||
<partition> record."
|
||||
(match sexp
|
||||
((size file-system label uuid)
|
||||
((size file-system file-system-options label uuid)
|
||||
(partition (size size)
|
||||
(file-system file-system)
|
||||
(file-system-options file-system-options)
|
||||
(label label)
|
||||
(uuid uuid)))))
|
||||
|
||||
@ -63,25 +64,30 @@
|
||||
take the partition metadata size into account, take a 25% margin."
|
||||
(* 1.25 (file-size root)))
|
||||
|
||||
(define* (make-ext4-image partition target root
|
||||
#:key
|
||||
(owner-uid 0)
|
||||
(owner-gid 0))
|
||||
"Handle the creation of EXT4 partition images. See 'make-partition-image'."
|
||||
(define* (make-ext-image partition target root
|
||||
#:key
|
||||
(owner-uid 0)
|
||||
(owner-gid 0))
|
||||
"Handle the creation of EXT2/3/4 partition images. See
|
||||
'make-partition-image'."
|
||||
(let ((size (partition-size partition))
|
||||
(fs (partition-file-system partition))
|
||||
(fs-options (partition-file-system-options partition))
|
||||
(label (partition-label partition))
|
||||
(uuid (partition-uuid partition))
|
||||
(options "lazy_itable_init=1,lazy_journal_init=1"))
|
||||
(invoke "mke2fs" "-t" "ext4" "-d" root
|
||||
"-L" label "-U" (uuid->string uuid)
|
||||
"-E" (format #f "root_owner=~a:~a,~a"
|
||||
owner-uid owner-gid options)
|
||||
target
|
||||
(format #f "~ak"
|
||||
(size-in-kib
|
||||
(if (eq? size 'guess)
|
||||
(estimate-partition-size root)
|
||||
size))))))
|
||||
(journal-options "lazy_itable_init=1,lazy_journal_init=1"))
|
||||
(apply invoke
|
||||
`("mke2fs" "-t" ,fs "-d" ,root
|
||||
"-L" ,label "-U" ,(uuid->string uuid)
|
||||
"-E" ,(format #f "root_owner=~a:~a,~a"
|
||||
owner-uid owner-gid journal-options)
|
||||
,@fs-options
|
||||
,target
|
||||
,(format #f "~ak"
|
||||
(size-in-kib
|
||||
(if (eq? size 'guess)
|
||||
(estimate-partition-size root)
|
||||
size)))))))
|
||||
|
||||
(define* (make-vfat-image partition target root)
|
||||
"Handle the creation of VFAT partition images. See 'make-partition-image'."
|
||||
@ -105,8 +111,8 @@ ROOT directory to populate the image."
|
||||
(let* ((partition (sexp->partition partition-sexp))
|
||||
(type (partition-file-system partition)))
|
||||
(cond
|
||||
((string=? type "ext4")
|
||||
(make-ext4-image partition target root))
|
||||
((string-prefix? "ext" type)
|
||||
(make-ext-image partition target root))
|
||||
((string=? type "vfat")
|
||||
(make-vfat-image partition target root))
|
||||
(else
|
||||
@ -140,15 +146,17 @@ deduplicates files common to CLOSURE and the rest of PREFIX."
|
||||
|
||||
(define* (initialize-efi-partition root
|
||||
#:key
|
||||
bootloader-package
|
||||
grub-efi
|
||||
#:allow-other-keys)
|
||||
"Install in ROOT directory, an EFI loader using BOOTLOADER-PACKAGE."
|
||||
(install-efi-loader bootloader-package root))
|
||||
"Install in ROOT directory, an EFI loader using GRUB-EFI."
|
||||
(install-efi-loader grub-efi root))
|
||||
|
||||
(define* (initialize-root-partition root
|
||||
#:key
|
||||
bootcfg
|
||||
bootcfg-location
|
||||
bootloader-package
|
||||
bootloader-installer
|
||||
(deduplicate? #t)
|
||||
references-graphs
|
||||
(register-closures? #t)
|
||||
@ -172,6 +180,9 @@ of the directory of the 'system' derivation."
|
||||
#:deduplicate? deduplicate?))
|
||||
references-graphs))
|
||||
|
||||
(when bootloader-installer
|
||||
(display "installing bootloader...\n")
|
||||
(bootloader-installer bootloader-package #f root))
|
||||
(when bootcfg
|
||||
(install-boot-config bootcfg bootcfg-location root)))
|
||||
|
||||
|
20
gnu/ci.scm
20
gnu/ci.scm
@ -219,19 +219,21 @@ system.")
|
||||
(run-with-store store
|
||||
(mbegin %store-monad
|
||||
(set-guile-for-build (default-guile))
|
||||
(system-image
|
||||
(image
|
||||
(inherit efi-disk-image)
|
||||
(size (* 1500 MiB))
|
||||
(operating-system installation-os))))))
|
||||
(lower-object
|
||||
(system-image
|
||||
(image
|
||||
(inherit efi-disk-image)
|
||||
(size (* 1500 MiB))
|
||||
(operating-system installation-os)))))))
|
||||
(->job 'iso9660-image
|
||||
(run-with-store store
|
||||
(mbegin %store-monad
|
||||
(set-guile-for-build (default-guile))
|
||||
(system-image
|
||||
(image
|
||||
(inherit iso9660-image)
|
||||
(operating-system installation-os)))))))
|
||||
(lower-object
|
||||
(system-image
|
||||
(image
|
||||
(inherit iso9660-image)
|
||||
(operating-system installation-os))))))))
|
||||
'()))
|
||||
|
||||
(define channel-build-system
|
||||
|
@ -22,7 +22,9 @@
|
||||
partition?
|
||||
partition-device
|
||||
partition-size
|
||||
partition-offset
|
||||
partition-file-system
|
||||
partition-file-system-options
|
||||
partition-label
|
||||
partition-uuid
|
||||
partition-flags
|
||||
@ -45,13 +47,16 @@
|
||||
|
||||
(define-record-type* <partition> partition make-partition
|
||||
partition?
|
||||
(device partition-device (default #f))
|
||||
(size partition-size)
|
||||
(file-system partition-file-system (default "ext4"))
|
||||
(label partition-label (default #f))
|
||||
(uuid partition-uuid (default #f))
|
||||
(flags partition-flags (default '()))
|
||||
(initializer partition-initializer (default #f)))
|
||||
(device partition-device (default #f))
|
||||
(size partition-size)
|
||||
(offset partition-offset (default 0))
|
||||
(file-system partition-file-system (default "ext4"))
|
||||
(file-system-options partition-file-system-options
|
||||
(default '()))
|
||||
(label partition-label (default #f))
|
||||
(uuid partition-uuid (default #f))
|
||||
(flags partition-flags (default '()))
|
||||
(initializer partition-initializer (default #f)))
|
||||
|
||||
|
||||
;;;
|
||||
|
14
gnu/local.mk
14
gnu/local.mk
@ -19,7 +19,7 @@
|
||||
# Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
|
||||
# Copyright © 2018, 2019, 2020 Oleg Pykhalov <go.wigust@gmail.com>
|
||||
# Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com>
|
||||
# Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
# Copyright © 2018, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
# Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
|
||||
# Copyright © 2019, 2020 John Soo <jsoo1@asu.edu>
|
||||
# Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
|
||||
@ -157,6 +157,7 @@ GNU_SYSTEM_MODULES = \
|
||||
%D%/packages/debian.scm \
|
||||
%D%/packages/debug.scm \
|
||||
%D%/packages/dejagnu.scm \
|
||||
%D%/packages/dhall.scm \
|
||||
%D%/packages/dico.scm \
|
||||
%D%/packages/dictionaries.scm \
|
||||
%D%/packages/diffoscope.scm \
|
||||
@ -850,7 +851,6 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/cvs-CVE-2017-12836.patch \
|
||||
%D%/packages/patches/cyrus-sasl-ac-try-run-fix.patch \
|
||||
%D%/packages/patches/date-output-pkg-config-files.patch \
|
||||
%D%/packages/patches/darkice-workaround-fpermissive-error.patch \
|
||||
%D%/packages/patches/datefudge-gettimeofday.patch \
|
||||
%D%/packages/patches/dbacl-include-locale.h.patch \
|
||||
%D%/packages/patches/dbus-helper-search-path.patch \
|
||||
@ -862,6 +862,7 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/desmume-gcc6-fixes.patch \
|
||||
%D%/packages/patches/desmume-gcc7-fixes.patch \
|
||||
%D%/packages/patches/dfu-programmer-fix-libusb.patch \
|
||||
%D%/packages/patches/dhall-remove-network-tests.patch \
|
||||
%D%/packages/patches/diffutils-gets-undeclared.patch \
|
||||
%D%/packages/patches/dkimproxy-add-ipv6-support.patch \
|
||||
%D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \
|
||||
@ -886,7 +887,7 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/emacs-fix-scheme-indent-function.patch \
|
||||
%D%/packages/patches/emacs-json-reformat-fix-tests.patch \
|
||||
%D%/packages/patches/emacs-highlight-stages-add-gexp.patch \
|
||||
%D%/packages/patches/emacs-magit-log-format-author-margin.patch \
|
||||
%D%/packages/patches/emacs-libgit-use-system-libgit2.patch \
|
||||
%D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \
|
||||
%D%/packages/patches/emacs-source-date-epoch.patch \
|
||||
%D%/packages/patches/emacs-telega-test-env.patch \
|
||||
@ -1040,6 +1041,7 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/gromacs-tinyxml2.patch \
|
||||
%D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \
|
||||
%D%/packages/patches/grub-efi-fat-serial-number.patch \
|
||||
%D%/packages/patches/grub-setup-root.patch \
|
||||
%D%/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch \
|
||||
%D%/packages/patches/gspell-dash-test.patch \
|
||||
%D%/packages/patches/guile-1.8-cpp-4.5.patch \
|
||||
@ -1118,7 +1120,6 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/jsoncpp-fix-inverted-case.patch \
|
||||
%D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \
|
||||
%D%/packages/patches/kdbusaddons-kinit-file-name.patch \
|
||||
%D%/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch \
|
||||
%D%/packages/patches/libvirt-create-machine-cgroup.patch \
|
||||
%D%/packages/patches/libziparchive-add-includes.patch \
|
||||
%D%/packages/patches/localed-xorg-keyboard.patch \
|
||||
@ -1233,7 +1234,6 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/luit-posix.patch \
|
||||
%D%/packages/patches/luminance-hdr-qt-printer.patch \
|
||||
%D%/packages/patches/lvm2-static-link.patch \
|
||||
%D%/packages/patches/lxsession-use-gapplication.patch \
|
||||
%D%/packages/patches/make-impure-dirs.patch \
|
||||
%D%/packages/patches/mariadb-client-test-32bit.patch \
|
||||
%D%/packages/patches/mars-install.patch \
|
||||
@ -1464,7 +1464,8 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/rtags-separate-rct.patch \
|
||||
%D%/packages/patches/racket-store-checksum-override.patch \
|
||||
%D%/packages/patches/retroarch-disable-online-updater.patch \
|
||||
%D%/packages/patches/ruby-rack-ignore-failing-test.patch \
|
||||
%D%/packages/patches/ruby-rack-ignore-failing-test.patch \
|
||||
%D%/packages/patches/ruby-sanitize-system-libxml.patch \
|
||||
%D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\
|
||||
%D%/packages/patches/runc-CVE-2019-5736.patch \
|
||||
%D%/packages/patches/rust-1.19-mrustc.patch \
|
||||
@ -1531,6 +1532,7 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/tipp10-fix-compiling.patch \
|
||||
%D%/packages/patches/tipp10-remove-license-code.patch \
|
||||
%D%/packages/patches/tk-find-library.patch \
|
||||
%D%/packages/patches/transmission-CVE-2018-10756.patch \
|
||||
%D%/packages/patches/ttf2eot-cstddef.patch \
|
||||
%D%/packages/patches/ttfautohint-source-date-epoch.patch \
|
||||
%D%/packages/patches/tomb-fix-errors-on-open.patch \
|
||||
|
@ -58,6 +58,7 @@
|
||||
#:use-module (guix build-system meson)
|
||||
#:use-module (guix build-system perl)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (guix build-system ruby)
|
||||
#:use-module (guix build-system trivial)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
@ -121,6 +122,7 @@
|
||||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages qt)
|
||||
#:use-module (gnu packages readline)
|
||||
#:use-module (gnu packages ruby)
|
||||
#:use-module (gnu packages sphinx)
|
||||
#:use-module (gnu packages tcl)
|
||||
#:use-module (gnu packages terminals)
|
||||
@ -429,6 +431,71 @@ services.")
|
||||
graphs and can export its output to different formats.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public facter
|
||||
(package
|
||||
(name "facter")
|
||||
(version "4.0.24")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/puppetlabs/facter-ng")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1n8yd2p7m0jf0wld6q43f2gqxyz8fiamz3p79wbl53q5qih0vba2"))))
|
||||
(build-system ruby-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
(add-after 'unpack 'delete-facter-ng-gemspec
|
||||
(lambda _
|
||||
;; XXX: ruby-build-system incorrectly finds
|
||||
;; facter-ng.gemspec from this directory and tries to
|
||||
;; build that instead of the proper facter.gemspec.
|
||||
;; Just delete it as a workaround, as it appears to
|
||||
;; only exist for backwards-compatibility after the
|
||||
;; facter-ng->facter rename.
|
||||
(delete-file "agent/facter-ng.gemspec")
|
||||
#t))
|
||||
(add-after 'unpack 'embed-iproute-reference
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((iproute (assoc-ref inputs "iproute")))
|
||||
;; Provide an absolute reference to the 'ip' executable
|
||||
;; to avoid propagating it.
|
||||
(substitute* "lib/resolvers/networking_linux_resolver.rb"
|
||||
(("execute\\('ip")
|
||||
(string-append "execute('" iproute "/sbin/ip")))
|
||||
#t)))
|
||||
(delete 'check)
|
||||
(add-after 'wrap 'check
|
||||
(lambda* (#:key tests? outputs #:allow-other-keys)
|
||||
;; XXX: The test suite wants to run Bundler and
|
||||
;; complains that the gemspec is invalid. For now
|
||||
;; just make sure that we can run the wrapped
|
||||
;; executable directly.
|
||||
(if tests?
|
||||
(invoke (string-append (assoc-ref outputs "out")
|
||||
"/bin/facter")
|
||||
;; Many facts depend on /sys, /etc/os-release,
|
||||
;; etc, so we only run a small sample.
|
||||
"facterversion" "architecture"
|
||||
"kernel" "kernelversion")
|
||||
(format #t "tests disabled~%"))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("iproute" ,iproute)
|
||||
("ruby-hocon" ,ruby-hocon)
|
||||
("ruby-sys-filesystem" ,ruby-sys-filesystem)
|
||||
("ruby-thor" ,ruby-thor)))
|
||||
(synopsis "Collect and display system facts")
|
||||
(description
|
||||
"Facter is a tool that gathers basic facts about nodes (systems) such
|
||||
as hardware details, network settings, OS type and version, and more. These
|
||||
facts can be collected on the command line with the @command{facter} command
|
||||
or via the @code{facter} Ruby library.")
|
||||
(home-page "https://github.com/puppetlabs/facter-ng")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public htop
|
||||
(package
|
||||
(name "htop")
|
||||
@ -718,7 +785,7 @@ would need and has several interesting built-in capabilities.")
|
||||
(define-public netcat-openbsd
|
||||
(package
|
||||
(name "netcat-openbsd")
|
||||
(version "1.206-1")
|
||||
(version "1.217-1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -727,14 +794,12 @@ would need and has several interesting built-in capabilities.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"08r3mmck3s5pbvwyq19wp5g8jqcxza3cm8nkc6jm7rqn4jdydc4z"))))
|
||||
"0kcvi3pav2fdx5c22psjv5dggk4cmrqiaq2cklhqngsk4a7vrjan"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no test suite
|
||||
`(#:tests? #f ; no test suite
|
||||
#:make-flags
|
||||
(list "CC=gcc"
|
||||
(string-append "CFLAGS=-I" (assoc-ref %build-inputs "libbsd") "/include")
|
||||
"LDFLAGS=-lbsd")
|
||||
(list "CC=gcc")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
@ -2027,13 +2092,13 @@ of supported upstream metrics systems simultaneously.")
|
||||
(define-public ansible
|
||||
(package
|
||||
(name "ansible")
|
||||
(version "2.9.6")
|
||||
(version "2.9.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "ansible" version))
|
||||
(sha256
|
||||
(base32 "1jfbp1i3nl4yvqwd5ssy43dz3pq2x03mn875vb8r56gqh43kmksr"))))
|
||||
(base32 "1l99vwkl48iwr8ffd1ihqia995mz8h8hwk4akm4w0cgiifp88gg8"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
`(("python-bcrypt" ,python-bcrypt)
|
||||
@ -3118,14 +3183,14 @@ everyone's screenshots nowadays.")
|
||||
(define-public nnn
|
||||
(package
|
||||
(name "nnn")
|
||||
(version "2.8.1")
|
||||
(version "3.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/jarun/nnn/releases/download/v"
|
||||
version "/nnn-v" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1g47bndxld875d0xb3pgmlw223mz47p1xcvwym861y6l4zkgiyp0"))))
|
||||
(base32 "1zflz7yj5wzdnl0728g8qrld2z6dqn7sblbmkjvyqlv1fwjd1fsf"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("ncurses" ,ncurses)
|
||||
|
@ -1242,7 +1242,7 @@ follower.")
|
||||
(define-public fluidsynth
|
||||
(package
|
||||
(name "fluidsynth")
|
||||
(version "2.1.2")
|
||||
(version "2.1.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -1251,7 +1251,7 @@ follower.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0pf8hjn15isf772nz8qcqja700aay8nhdwmr24djkj42c7chf96j"))))
|
||||
"0dv6jprz2bzasvk91x2rv2pqyyvxkc72s4r6vsqw723a3kqa5bhc"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; no check target
|
||||
@ -3930,15 +3930,15 @@ other Gnaural instances, allowing synchronous sessions between many users.")
|
||||
(define-public darkice
|
||||
(package
|
||||
(name "darkice")
|
||||
(version "1.3")
|
||||
(version "1.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/darkice/darkice/"
|
||||
version "/darkice-" version ".tar.gz"))
|
||||
(uri (string-append "https://github.com/rafael2k/darkice/releases/"
|
||||
"download/v" version "/darkice-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1rlxds7ssq7nk2in4s46xws7xy9ylxsqgcz85hxjgh17lsm0y39c"))
|
||||
(patches
|
||||
(search-patches "darkice-workaround-fpermissive-error.patch"))))
|
||||
(base32
|
||||
"05yq7lggxygrkd76yiqby3msrgdn082p0qlvmzzv9xbw8hmyra76"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
(inputs `(("lame" ,lame)
|
||||
@ -3988,7 +3988,7 @@ stream to one or more IceCast and/or ShoutCast servers.")
|
||||
(define-public redkite
|
||||
(package
|
||||
(name "redkite")
|
||||
(version "0.8.0")
|
||||
(version "0.8.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -3997,8 +3997,7 @@ stream to one or more IceCast and/or ShoutCast servers.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1747w1kg8y9jbl11xi018d85dm38xk7843pz26sh0k5fdv87a10q"))))
|
||||
(base32 "17kv2jc4jvn3sdicz3sf8dnf25wbvv7ijzkr0mm0sbrrjz6vrwz0"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ;no tests included
|
||||
|
@ -16,6 +16,7 @@
|
||||
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2020 Marcin Karpezo <sirmacik@wioo.waw.pl>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -736,14 +737,14 @@ changes are stored.")
|
||||
(define-public wimlib
|
||||
(package
|
||||
(name "wimlib")
|
||||
(version "1.13.1")
|
||||
(version "1.13.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://wimlib.net/downloads/"
|
||||
"wimlib-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0pxgrpr3dr81rcf2jh71aiiq3v4anc5sj1nld18f2vhvbijbrx27"))))
|
||||
"0id9ym3hzij4kpdrk0sz3ijxp5r0z1md5jch83pml9hdy1zbx5bj"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
@ -1026,6 +1027,42 @@ stored previously can be read back in full at any time. The program
|
||||
is format-agnostic, so you can feed virtually any files to it.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public dump
|
||||
(package
|
||||
(name "dump")
|
||||
(version "0.4b46")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/dump/dump/"
|
||||
version "/dump-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"15rg5y15ak0ppqlhcih78layvg7cwp6hc16p3c58xs8svlkxjqc0"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
`("--sysconfdir=/etc"
|
||||
"--disable-readline"
|
||||
"--disable-rmt")))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("openssl" ,openssl-1.0)
|
||||
("zlib" ,zlib)
|
||||
("util-linux" ,util-linux "lib")
|
||||
("e2fsprogs" ,e2fsprogs)))
|
||||
(home-page "https://dump.sourceforge.io/")
|
||||
(synopsis "Ext2/3/4 filesystem dump/restore utilities")
|
||||
(description "Dump examines files in a filesystem, determines which ones
|
||||
need to be backed up, and copies those files to a specified disk, tape or
|
||||
other storage medium. Subsequent incremental backups can then be layered on
|
||||
top of the full backup. The restore command performs the inverse function of
|
||||
dump; it can restore a full backup of a filesystem. Single files and
|
||||
directory subtrees may also be restored from full or partial backups in
|
||||
interractive mode.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public burp
|
||||
(package
|
||||
(name "burp")
|
||||
|
@ -1401,7 +1401,7 @@ package provides command line tools using the Bio++ library.")
|
||||
("python" ,python-wrapper)))
|
||||
(native-inputs
|
||||
`(("cpio" ,cpio)))
|
||||
(home-page "http://blast.ncbi.nlm.nih.gov")
|
||||
(home-page "https://blast.ncbi.nlm.nih.gov")
|
||||
(synopsis "Basic local alignment search tool")
|
||||
(description
|
||||
"BLAST is a popular method of performing a DNA or protein sequence
|
||||
@ -14684,7 +14684,7 @@ is a Cython wrapper for FIt-SNE.")
|
||||
("java-eclipse-jdt-core" ,java-eclipse-jdt-core)
|
||||
("java-eclipse-jdt-compiler-apt" ,java-eclipse-jdt-compiler-apt)
|
||||
("java-openmpi" ,java-openmpi)))
|
||||
(home-page "http://sourceforge.net/projects/bbmap/")
|
||||
(home-page "https://sourceforge.net/projects/bbmap/")
|
||||
(synopsis "Aligner and other tools for short sequencing reads")
|
||||
(description
|
||||
"This package provides bioinformatic tools to align, deduplicate,
|
||||
|
@ -73,6 +73,7 @@
|
||||
(uri (string-append
|
||||
"https://github.com/transmission/transmission-releases/raw/"
|
||||
"master/transmission-" version ".tar.xz"))
|
||||
(patches (search-patches "transmission-CVE-2018-10756.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"0zbbj7rlm6m7vb64x68a64cwmijhsrwx9l63hbwqs7zr9742qi1m"))))
|
||||
@ -314,15 +315,15 @@ Aria2 can be manipulated via built-in JSON-RPC and XML-RPC interfaces.")
|
||||
(define-public uget
|
||||
(package
|
||||
(name "uget")
|
||||
(version "2.0.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/urlget/"
|
||||
"uget%20%28stable%29/" version "/uget-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0919cf7lfk1djdl003cahqjvafdliv7v2l8r5wg95n4isqggdk75"))))
|
||||
(version "2.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/urlget/"
|
||||
"uget%20%28stable%29/" version "/uget-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0rg2mr2cndxvnjib8zm5dp7y2hgbvnqkz2j2jmg0xlzfh9d34b2m"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("curl" ,curl)
|
||||
@ -336,7 +337,7 @@ Aria2 can be manipulated via built-in JSON-RPC and XML-RPC interfaces.")
|
||||
(native-inputs
|
||||
`(("intltool" ,intltool)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(home-page "http://ugetdm.com/")
|
||||
(home-page "https://ugetdm.com/")
|
||||
(synopsis "Universal download manager with GTK+ interface")
|
||||
(description
|
||||
"uGet is portable download manager with GTK+ interface supporting
|
||||
|
@ -96,6 +96,7 @@
|
||||
"0zgp5m3hmc9jh8wpjx6czzkh5id2y8n1k823x2mjvm2sk6b28ag5"))
|
||||
(patches (search-patches
|
||||
"grub-efi-fat-serial-number.patch"
|
||||
"grub-setup-root.patch"
|
||||
"grub-verifiers-Blocklist-fallout-cleanup.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
|
@ -9,6 +9,7 @@
|
||||
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
|
||||
;;; Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
|
||||
;;; Copyright © 2020 Leo Prikler <leo.prikler@student.tugraz.at>
|
||||
;;; Copyright © 2020 Yuval Kogman <nothingmuch@woobling.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -33,12 +34,14 @@
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages lua)
|
||||
#:use-module (gnu packages package-management)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages python-crypto)
|
||||
#:use-module (gnu packages python-web)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages ninja)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system python))
|
||||
@ -310,3 +313,38 @@ Service. It allows you to checkout, commit, perform reviews etc. The vast
|
||||
majority of the OBS functionality is available via commands and the rest can
|
||||
be reached via direct API calls.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public compiledb
|
||||
(package
|
||||
(name "compiledb")
|
||||
(version "0.10.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "compiledb" version))
|
||||
(sha256
|
||||
(base32 "0vlngsdxfakyl8b7rnvn8h3l216lhbrrydr04yhy6kd03zflgfq6"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'no-compat-shim-dependency
|
||||
;; shutilwhich is only needed for python 3.3 and earlier
|
||||
(lambda _
|
||||
(substitute* "setup.py" (("^ *'shutilwhich'\n") ""))
|
||||
(substitute* "compiledb/compiler.py" (("shutilwhich") "shutil")))))))
|
||||
(propagated-inputs
|
||||
`(("python-bashlex" ,python-bashlex)
|
||||
("python-click" ,python-click)))
|
||||
(native-inputs
|
||||
`(("python-pytest" ,python-pytest)))
|
||||
(home-page
|
||||
"https://github.com/nickdiego/compiledb")
|
||||
(synopsis
|
||||
"Generate Clang JSON Compilation Database files for make-based build systems")
|
||||
(description
|
||||
"@code{compiledb} provides a @code{make} python wrapper script which,
|
||||
besides executing the make build command, updates the JSON compilation
|
||||
database file corresponding to that build, resulting in a command-line
|
||||
interface similar to Bear.")
|
||||
(license license:gpl3)))
|
||||
|
@ -7,6 +7,7 @@
|
||||
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
|
||||
;;; Copyright © 2019 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -254,6 +255,57 @@ string formatting and autoresizing, option and config file parsing, type
|
||||
checking casts and more.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public packcc
|
||||
(package
|
||||
(name "packcc")
|
||||
;; We need a few fixes on top of the latest release to prevent test
|
||||
;; failures in Universal Ctags.
|
||||
(version "1.2.5-19-g58d1b9d")
|
||||
(home-page "https://github.com/enechaev/packcc")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url home-page)
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0biyv835jlk43fvmmd3p8jafs7k2iw9qlaj37hvsl604ai6rd5aj"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ;no tests
|
||||
#:make-flags '("-DUSE_SYSTEM_STRNLEN=1")
|
||||
#:phases (modify-phases %standard-phases
|
||||
;; The project consists of a single source file and has
|
||||
;; no actual build system, so we need to do it manually.
|
||||
(delete 'configure)
|
||||
(replace 'build
|
||||
(lambda* (#:key make-flags #:allow-other-keys)
|
||||
(apply invoke "gcc" "-o" "packcc" "packcc.c"
|
||||
make-flags)))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(install-file "packcc" (string-append out "/bin"))
|
||||
(install-file "README.md"
|
||||
(string-append out "/share/doc/packcc"))
|
||||
#t))))))
|
||||
(synopsis "Packrat parser generator for C")
|
||||
(description
|
||||
"PackCC is a packrat parser generator for the C programming language.
|
||||
Its main features are:
|
||||
@itemize
|
||||
@item Generates a parser in C from a grammar described in a PEG.
|
||||
@item Gives your parser great efficiency by packrat parsing.
|
||||
@item Supports direct and indirect left-recursive grammar rules.
|
||||
@end itemize
|
||||
The grammar of your parser can be described in a @acronym{PEG, Parsing
|
||||
Expression Grammar}. The PEG is a top-down parsing language, and is similar
|
||||
to the regular-expression grammar. The PEG does not require tokenization to
|
||||
be a separate step, and tokenization rules can be written in the same way as
|
||||
any other grammar rules.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public sparse
|
||||
(package
|
||||
(name "sparse")
|
||||
|
@ -13,6 +13,7 @@
|
||||
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2019 Hartmut Goebel <h.goebel@goebel-consult.de>
|
||||
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -43,11 +44,16 @@
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages bash)
|
||||
#:use-module (gnu packages c)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages cpp)
|
||||
#:use-module (gnu packages emacs)
|
||||
#:use-module (gnu packages gcc)
|
||||
#:use-module (gnu packages graphviz)
|
||||
#:use-module (gnu packages llvm)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages lua)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages pcre)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages perl-compression)
|
||||
@ -55,9 +61,8 @@
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages sqlite)
|
||||
#:use-module (gnu packages texinfo)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages llvm)
|
||||
#:use-module (gnu packages lua))
|
||||
#:use-module (gnu packages web)
|
||||
#:use-module (gnu packages xml))
|
||||
|
||||
;;; Tools to deal with source code: metrics, cross-references, etc.
|
||||
|
||||
@ -321,6 +326,83 @@ features that are not supported by the standard @code{stdio} implementation.")
|
||||
(license (license:non-copyleft
|
||||
"http://sourceforge.net/p/ctrio/git/ci/master/tree/README"))))
|
||||
|
||||
(define-public universal-ctags
|
||||
;; The project is unable to decide whether to use 1.0 or 6.0 as the
|
||||
;; first public release version (it started as a fork of another ctags
|
||||
;; project that was on version 5.8), and five years later have been
|
||||
;; unable to tag a release. Thus, we just take the master branch.
|
||||
(let ((commit "0c78c0c4a68030df0d025c90bad291108b5e7107")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "universal-ctags")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/universal-ctags/ctags")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0lnxc3kwi6srw0015m16vyjfdc7pdr9d1qzxjsbfv3c69ag87jhc"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Remove the bundled PackCC and associated build rules.
|
||||
(substitute* "Makefile.am"
|
||||
(("\\$\\(packcc_verbose\\)\\$\\(PACKCC\\)")
|
||||
"packcc")
|
||||
(("\\$\\(PEG_SRCS\\) \\$\\(PEG_HEADS\\): packcc\\$\\(EXEEXT\\)")
|
||||
"$(PEG_SRCS) $(PEG_HEADS):")
|
||||
(("noinst_PROGRAMS \\+= packcc")
|
||||
""))
|
||||
(delete-file-recursively "misc/packcc")
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases (modify-phases %standard-phases
|
||||
(add-after 'unpack 'make-files-writable
|
||||
(lambda _
|
||||
(for-each make-file-writable (find-files "."))
|
||||
#t))
|
||||
(add-before 'bootstrap 'patch-optlib2c
|
||||
(lambda _
|
||||
;; The autogen.sh script calls out to optlib2c to
|
||||
;; generate translations, so we can not wait for the
|
||||
;; patch-source-shebangs phase.
|
||||
(patch-shebang "misc/optlib2c")
|
||||
#t))
|
||||
(add-before 'check 'patch-tests
|
||||
(lambda _
|
||||
(substitute* "misc/units"
|
||||
(("SHELL=/bin/sh")
|
||||
(string-append "SHELL=" (which "sh"))))
|
||||
(substitute* "Tmain/utils.sh"
|
||||
(("/bin/echo") (which "echo")))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("packcc" ,packcc)
|
||||
("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("jansson" ,jansson)
|
||||
("libseccomp" ,libseccomp)
|
||||
("libxml2" ,libxml2)
|
||||
("libyaml" ,libyaml)))
|
||||
(home-page "https://ctags.io/")
|
||||
(synopsis "Generate tag files for source code")
|
||||
(description
|
||||
"Universal Ctags generates an index (or tag) file of language objects
|
||||
found in source files for many popular programming languages. This index
|
||||
makes it easy for text editors and other tools to locate the indexed items.
|
||||
Universal Ctags improves on traditional ctags because of its multilanguage
|
||||
support, its ability for the user to define new languages searched by regular
|
||||
expressions, and its ability to generate emacs-style TAGS files.")
|
||||
(license license:gpl2+))))
|
||||
|
||||
(define-public withershins
|
||||
(package
|
||||
(name "withershins")
|
||||
|
@ -7,7 +7,7 @@
|
||||
;;; Copyright © 2015, 2016, 2017, 2018, 2020 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015, 2017, 2018 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
|
||||
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
|
||||
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
@ -1942,7 +1942,7 @@ download times, and other distribution and storage costs.")
|
||||
(define-public quazip
|
||||
(package
|
||||
(name "quazip")
|
||||
(version "0.9")
|
||||
(version "0.9.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -1951,7 +1951,7 @@ download times, and other distribution and storage costs.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0psvf3d9akyyx3bckc9325nmbp97xiagf8la4vhca5xn2f430fbn"))))
|
||||
"11icgwv2xyxhd1hm1add51xv54zwkcqkg85d1xqlgiigvbm196iq"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ;no test
|
||||
@ -2207,11 +2207,8 @@ computations.")
|
||||
(arguments
|
||||
`(#:tests? #f ; no check target
|
||||
#:make-flags
|
||||
(let ((target ,(%current-target-system)))
|
||||
(list (string-append "CC=" (if target
|
||||
(string-append target "-gcc")
|
||||
"gcc"))
|
||||
(string-append "DESTDIR=" (assoc-ref %outputs "out"))))
|
||||
(list (string-append "CC=" ,(cc-for-target))
|
||||
(string-append "DESTDIR=" (assoc-ref %outputs "out")))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
|
@ -21726,3 +21726,81 @@ of R without the need of linking to R code. Rserve supports remote
|
||||
connection, user authentication and file transfer. A simple R client is
|
||||
included in this package as well.")
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public r-brms
|
||||
(package
|
||||
(name "r-brms")
|
||||
(version "2.12.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "brms" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1699lwkklfhjz7fddawlig552g2zvrc34mqwrzqjgl35r9fm08gs"))))
|
||||
(properties `((upstream-name . "brms")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-abind" ,r-abind)
|
||||
("r-backports" ,r-backports)
|
||||
("r-bayesplot" ,r-bayesplot)
|
||||
("r-bridgesampling" ,r-bridgesampling)
|
||||
("r-coda" ,r-coda)
|
||||
("r-future" ,r-future)
|
||||
("r-ggplot2" ,r-ggplot2)
|
||||
("r-glue" ,r-glue)
|
||||
("r-loo" ,r-loo)
|
||||
("r-matrix" ,r-matrix)
|
||||
("r-matrixstats" ,r-matrixstats)
|
||||
("r-mgcv" ,r-mgcv)
|
||||
("r-nleqslv" ,r-nleqslv)
|
||||
("r-nlme" ,r-nlme)
|
||||
("r-rcpp" ,r-rcpp)
|
||||
("r-rstan" ,r-rstan)
|
||||
("r-rstantools" ,r-rstantools)
|
||||
("r-shinystan" ,r-shinystan)))
|
||||
(native-inputs `(("r-knitr" ,r-knitr)))
|
||||
(home-page
|
||||
"https://github.com/paul-buerkner/brms")
|
||||
(synopsis
|
||||
"Bayesian Regression Models using 'Stan'")
|
||||
(description
|
||||
"Fit Bayesian generalized (non-)linear multivariate multilevel models
|
||||
using 'Stan' for full Bayesian inference. A wide range of distributions and
|
||||
link functions are supported, allowing users to fit -- among others -- linear,
|
||||
robust linear, count data, survival, response times, ordinal, zero-inflated,
|
||||
hurdle, and even self-defined mixture models all in a multilevel context.
|
||||
Further modeling options include non-linear and smooth terms, auto-correlation
|
||||
structures, censored data, meta-analytic standard errors, and quite a few
|
||||
more. In addition, all parameters of the response distribution can be
|
||||
predicted in order to perform distributional regression. Prior specifications
|
||||
are flexible and explicitly encourage users to apply prior distributions that
|
||||
actually reflect their beliefs. Model fit can easily be assessed and compared
|
||||
with posterior predictive checks and leave-one-out cross-validation.")
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public r-mstate
|
||||
(package
|
||||
(name "r-mstate")
|
||||
(version "0.2.12")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "mstate" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0qnhivbibzss8yfsg44cvbf73n4jj4i28rbdysl88g14ig5sabgv"))))
|
||||
(properties `((upstream-name . "mstate")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-rcolorbrewer" ,r-rcolorbrewer)
|
||||
("r-survival" ,r-survival)))
|
||||
(home-page
|
||||
"https://www.lumc.nl/org/bds/research/medische-statistiek/survival-analysis/")
|
||||
(synopsis
|
||||
"Data Preparation, Estimation and Prediction in Multi-State Models")
|
||||
(description
|
||||
"Contains functions for data preparation, descriptives, hazard estimation
|
||||
and prediction with Aalen-Johansen or simulation in competing risks and
|
||||
multi-state models.")
|
||||
(license license:gpl2+)))
|
||||
|
@ -3,7 +3,7 @@
|
||||
;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
|
||||
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019, 2020 John Soo <jsoo1@asu.edu>
|
||||
;;; Copyright © 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
|
||||
@ -25681,15 +25681,14 @@ designed for reexporting.")
|
||||
(define-public rust-version-check-0.9
|
||||
(package
|
||||
(name "rust-version-check")
|
||||
(version "0.9.1")
|
||||
(version "0.9.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "version_check" version))
|
||||
(file-name (string-append name "-" version ".crate"))
|
||||
(sha256
|
||||
(base32
|
||||
"1kikqlnggii1rvnxrbls55sc46lxvinz5k3giscgncjj4p87b1q7"))))
|
||||
(base32 "1vbaqdf802qinsq8q20w8w0qn2pv0rkq5p73ijcblrwxcvjp5adm"))))
|
||||
(build-system cargo-build-system)
|
||||
(home-page "https://github.com/SergioBenitez/version_check")
|
||||
(synopsis "Check that the installed rustc meets some version requirements")
|
||||
|
133
gnu/packages/dhall.scm
Normal file
133
gnu/packages/dhall.scm
Normal file
@ -0,0 +1,133 @@
|
||||
;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages dhall)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages haskell-xyz)
|
||||
#:use-module (gnu packages haskell-check)
|
||||
#:use-module (gnu packages haskell-crypto)
|
||||
#:use-module (gnu packages haskell-web)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix build-system haskell)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages))
|
||||
|
||||
(define-public dhall
|
||||
(package
|
||||
(name "dhall")
|
||||
(version "1.31.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://hackage.haskell.org/package/dhall/dhall-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"18v7vvcbcm9s7slh6h43rj9yakkkxwnwgj6kv84i6qzd2j7d80mc"))
|
||||
(patches (search-patches "dhall-remove-network-tests.patch"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-aeson" ,ghc-aeson)
|
||||
("ghc-aeson-pretty" ,ghc-aeson-pretty)
|
||||
("ghc-ansi-terminal" ,ghc-ansi-terminal)
|
||||
("ghc-atomic-write" ,ghc-atomic-write-0.2.0.7)
|
||||
("ghc-case-insensitive" ,ghc-case-insensitive)
|
||||
("ghc-cborg" ,ghc-cborg)
|
||||
("ghc-cborg-json" ,ghc-cborg-json)
|
||||
("ghc-contravariant" ,ghc-contravariant)
|
||||
("ghc-data-fix" ,ghc-data-fix)
|
||||
("ghc-diff" ,ghc-diff)
|
||||
("ghc-dotgen" ,ghc-dotgen)
|
||||
("ghc-either" ,ghc-either)
|
||||
("ghc-exceptions" ,ghc-exceptions)
|
||||
("ghc-hashable" ,ghc-hashable)
|
||||
("ghc-lens-family-core" ,ghc-lens-family-core)
|
||||
("ghc-megaparsec" ,ghc-megaparsec)
|
||||
("ghc-memory" ,ghc-memory)
|
||||
("ghc-network-uri" ,ghc-network-uri)
|
||||
("ghc-optparse-applicative" ,ghc-optparse-applicative)
|
||||
("ghc-parsers" ,ghc-parsers)
|
||||
("ghc-parser-combinators" ,ghc-parser-combinators)
|
||||
("ghc-prettyprinter" ,ghc-prettyprinter-1.6)
|
||||
("ghc-prettyprinter-ansi-terminal" ,ghc-prettyprinter-ansi-terminal)
|
||||
("ghc-pretty-simple" ,ghc-pretty-simple)
|
||||
("ghc-profunctors" ,ghc-profunctors)
|
||||
("ghc-repline" ,ghc-repline-0.3)
|
||||
("ghc-serialise" ,ghc-serialise)
|
||||
("ghc-scientific" ,ghc-scientific)
|
||||
("ghc-text-manipulate" ,ghc-text-manipulate)
|
||||
("ghc-th-lift-instances" ,ghc-th-lift-instances)
|
||||
("ghc-transformers-compat" ,ghc-transformers-compat)
|
||||
("ghc-unordered-containers" ,ghc-unordered-containers)
|
||||
("ghc-uri-encode" ,ghc-uri-encode)
|
||||
("ghc-vector" ,ghc-vector)
|
||||
("ghc-cryptonite" ,ghc-cryptonite)
|
||||
("ghc-http-types" ,ghc-http-types)
|
||||
("ghc-http-client" ,ghc-http-client)
|
||||
("ghc-http-client-tls" ,ghc-http-client-tls)))
|
||||
(native-inputs
|
||||
`(("ghc-foldl" ,ghc-foldl)
|
||||
("ghc-generic-random" ,ghc-generic-random-1.3.0.1)
|
||||
("ghc-quickcheck" ,ghc-quickcheck)
|
||||
("ghc-quickcheck-instances" ,ghc-quickcheck-instances)
|
||||
("ghc-semigroups" ,ghc-semigroups)
|
||||
("ghc-special-values" ,ghc-special-values)
|
||||
("ghc-spoon" ,ghc-spoon)
|
||||
("ghc-tasty" ,ghc-tasty)
|
||||
("ghc-tasty-expected-failure" ,ghc-tasty-expected-failure)
|
||||
("ghc-tasty-hunit" ,ghc-tasty-hunit)
|
||||
("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)
|
||||
("ghc-turtle" ,ghc-turtle)
|
||||
("ghc-mockery" ,ghc-mockery)
|
||||
("ghc-doctest" ,ghc-doctest)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; Remove tests that require network
|
||||
(add-after 'unpack 'remove-more-tests
|
||||
(lambda _
|
||||
(substitute* "src/Dhall/Tutorial.hs"
|
||||
(((string-append
|
||||
"-- >>> input auto "
|
||||
"\"https://raw.githubusercontent.com/dhall-lang"
|
||||
"/dhall-haskell/18e4e9a18dc53271146df3ccf5b4177c3552236b/"
|
||||
"examples/True\" :: IO Bool"))
|
||||
"")
|
||||
(((string-append
|
||||
"-- >>> input auto "
|
||||
"\"False == "
|
||||
"https://raw.githubusercontent.com/dhall-lang"
|
||||
"/dhall-haskell/18e4e9a18dc53271146df3ccf5b4177c3552236b/"
|
||||
"examples/True\" :: IO Bool"))
|
||||
""))
|
||||
#t)))))
|
||||
(home-page
|
||||
"https://dhall-lang.org/")
|
||||
(synopsis
|
||||
"Configuration language guaranteed to terminate")
|
||||
(description
|
||||
"Dhall is an explicitly typed configuration language that is not Turing
|
||||
complete. Despite being Turing incomplete, Dhall is a real programming
|
||||
language with a type-checker and evaluator.
|
||||
|
||||
Use this library to parse, type-check, evaluate, and pretty-print the Dhall
|
||||
configuration language. This package also includes an executable which
|
||||
type-checks a Dhall file and reduces the file to a fully evaluated normal
|
||||
form.")
|
||||
(license license:bsd-3)))
|
@ -119,7 +119,7 @@ acronyms distributed as an info document.")
|
||||
"GCIDE is a free dictionary based on a combination of sources. It can
|
||||
be used via the GNU Dico program or accessed online at
|
||||
http://gcide.gnu.org.ua/")
|
||||
(home-page "http://gcide.gnu.org.ua/")
|
||||
(home-page "https://gcide.gnu.org.ua/")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public diction
|
||||
|
@ -70,7 +70,7 @@
|
||||
#:use-module (ice-9 match))
|
||||
|
||||
(define-public diffoscope
|
||||
(let ((version "143"))
|
||||
(let ((version "145"))
|
||||
(package
|
||||
(name "diffoscope")
|
||||
(version version)
|
||||
@ -82,7 +82,7 @@
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0j58dqdk8ln8y0bcnfy37ljs37nkl56lzxqns396300ysln0qiwm"))))
|
||||
"01n7q3q0hib4bd8gcq0yjghy5zhp0fh0bq1jxrn2ww8zyd4knmc3"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
|
@ -391,14 +391,14 @@ to result in system-wide compromise.")
|
||||
(define-public unbound
|
||||
(package
|
||||
(name "unbound")
|
||||
(version "1.10.0")
|
||||
(version "1.10.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.unbound.net/downloads/unbound-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0mg9divpysr42sp0m693a70693dp8025v6c9dv1yabr4g1jlhbqm"))))
|
||||
(base32 "0dnmh9jjh2v274f0hl31bgv40pl77mmfgky8bkqr5kvi3b17fdmp"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" "python"))
|
||||
(native-inputs
|
||||
@ -595,14 +595,14 @@ Extensions} (DNSSEC).")
|
||||
(define-public knot
|
||||
(package
|
||||
(name "knot")
|
||||
(version "2.9.4")
|
||||
(version "2.9.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://secure.nic.cz/files/knot-dns/"
|
||||
"knot-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "00d5lkan1yfxphw8q1vrmfpmg8kykdaky8082m1s1ps03cxckwsp"))
|
||||
(base32 "0xmzmhd2m9rb24clrrd9k058harsq67nyjplpbyxvy1g46xah28i"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -47,8 +47,7 @@
|
||||
popularized by X11-window managers like dwm, to the console. As a console
|
||||
window manager it tries to make it easy to work with multiple console based
|
||||
programs.")
|
||||
(home-page "http://www.brain-dump.org/projects/dvtm/")
|
||||
|
||||
(home-page "https://www.brain-dump.org/projects/dvtm/")
|
||||
;; "dvtm reuses some code of dwm and is released under the same MIT/X11
|
||||
;; license. The terminal emulation part is licensed under the ISC license."
|
||||
;; source: http://www.brain-dump.org/projects/dvtm/#license
|
||||
|
@ -114,7 +114,7 @@
|
||||
("texi2html" ,texi2html)
|
||||
("glib:bin" ,glib "bin")
|
||||
("pkg-config" ,pkg-config)))
|
||||
(home-page "http://gcompris.net")
|
||||
(home-page "https://gcompris.net")
|
||||
(synopsis "Educational software suite")
|
||||
(description "GCompris is an educational software suite comprising of
|
||||
numerous activities for children aged 2 to 10. Some of the activities are
|
||||
@ -606,14 +606,14 @@ Portuguese, Spanish and Italian.")
|
||||
(define-public fet
|
||||
(package
|
||||
(name "fet")
|
||||
(version "5.44.4")
|
||||
(version "5.44.7")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.lalescu.ro/liviu/fet/download/"
|
||||
"fet-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32 "1bji4910v6adhngdh5ajz5bxam9z3yqnh8d1h1xajy6npm6qq3nx"))))
|
||||
(base32 "19b22brpb2mpvg14c2a0xmv8ipq5jg7yjmly8y3gfy8gmc3wqg5m"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -31,7 +31,7 @@
|
||||
;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
|
||||
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017 Mike Gerwitz <mtg@gnu.org>
|
||||
;;; Copyright © 2017, 2018, 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2017, 2018, 2019, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2018 Sohom Bhattacharjee <soham.bhattacharjee15@gmail.com>
|
||||
;;; Copyright © 2018, 2019 Mathieu Lirzin <mthl@gnu.org>
|
||||
;;; Copyright © 2018, 2019, 2020 Pierre Neidhardt <mail@ambrevar.xyz>
|
||||
@ -71,6 +71,8 @@
|
||||
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2020 pinoaffe <pinoaffe@airmail.cc>
|
||||
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
|
||||
;;; Copyright © 2020 Ryan Desfosses <rdes@protonmail.com>
|
||||
;;; Copyright © 2020 Marcin Karpezo <sirmacik@wioo.waw.pl>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -316,13 +318,88 @@ For remote processes a substitute is provided, which communicates with Emacs
|
||||
on stdout instead of using a socket as the Emacsclient does.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-libgit
|
||||
(let ((commit "0ef8b13aef011a98b7da756e4f1ce3bb18e4d55a")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "emacs-libgit")
|
||||
(version (git-version "20200515" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/magit/libegit2.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0pnjr3bg6y6354dfjjxfj0g51swzgl1fncpprah75x4k94rd369f"))
|
||||
(patches (search-patches
|
||||
;; Submitted for inclusion upstream (see:
|
||||
;; https://github.com/magit/libegit2/pull/96).
|
||||
"emacs-libgit-use-system-libgit2.patch"))))
|
||||
;; Use the cmake-build-system as it provides support for cross builds.
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("-DUSE_SYSTEM_LIBGIT2=x")
|
||||
;; Add the emacs-build-system byte compilation and install phases.
|
||||
#:imported-modules (,@%cmake-build-system-modules
|
||||
(guix build emacs-build-system)
|
||||
(guix build emacs-utils))
|
||||
#:modules ((guix build cmake-build-system)
|
||||
((guix build emacs-build-system) #:prefix emacs:)
|
||||
(guix build emacs-utils)
|
||||
(guix build utils))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'set-libgit--module-file
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(make-file-writable "libgit.el")
|
||||
(emacs-substitute-variables "libgit.el"
|
||||
("libgit--module-file"
|
||||
(string-append out "/share/emacs/site-lisp/libegit2.so")))
|
||||
#t)))
|
||||
(add-before 'install 'prepare-for-install
|
||||
(lambda _
|
||||
(let ((s (string-append "../" ,name "-" ,version "-checkout")))
|
||||
(copy-file "libegit2.so" (string-append s "/libegit2.so"))
|
||||
(chdir s)
|
||||
#t)))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((install (assoc-ref emacs:%standard-phases 'install)))
|
||||
(install #:outputs outputs
|
||||
#:include (cons "\\.so$"
|
||||
emacs:%default-include)))))
|
||||
(add-after 'install 'make-autoloads
|
||||
(assoc-ref emacs:%standard-phases 'make-autoloads))
|
||||
(add-after 'make-autoloads 'enable-autoloads-compilation
|
||||
(assoc-ref emacs:%standard-phases 'enable-autoloads-compilation))
|
||||
(add-after 'enable-autoloads-compilation 'patch-el-files
|
||||
(assoc-ref emacs:%standard-phases 'patch-el-files))
|
||||
(add-after 'patch-el-files 'emacs-build
|
||||
(assoc-ref emacs:%standard-phases 'build))
|
||||
(add-after 'emacs-build 'validate-compiled-autoloads
|
||||
(assoc-ref emacs:%standard-phases 'validate-compiled-autoloads)))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("emacs" ,emacs-no-x)
|
||||
("git" ,git-minimal)))
|
||||
(inputs
|
||||
`(("libgit2" ,libgit2)))
|
||||
(home-page "https://github.com/magit/libegit2")
|
||||
(synopsis "Emacs bindings for libgit2")
|
||||
(description "This is an experimental module written in C providing
|
||||
libgit2 bindings for Emacs, intended to boost the performance of Magit.")
|
||||
;; The LICENSE file says GPL v2+, but libgit.el says GPL v3+.
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-magit
|
||||
;; `magit-setup-buffer' macro introduced in c761d28d and required in
|
||||
;; `emacs-forge'.
|
||||
(let ((commit "c761d28d49e5238037512b898db0ec9b40d85770"))
|
||||
;; There hasn't been an official release since 2018-11-16.
|
||||
(let ((commit "d05545ec2fd7edf915eaf1b9c15c785bb08975cc"))
|
||||
(package
|
||||
(name "emacs-magit")
|
||||
(version (git-version "2.90.1" "3" commit))
|
||||
(version (git-version "2.90.1" "4" commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -331,93 +408,76 @@ on stdout instead of using a socket as the Emacsclient does.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"16qx0404l05q1m6w7y5j8ck1z5nfmpinm00w0p2yh1hn5zzwy6dd"))
|
||||
;; FIXME: emacs-forge uses a function defined in this patch,
|
||||
;; which is newer than the current commit.
|
||||
(patches
|
||||
(search-patches
|
||||
"emacs-magit-log-format-author-margin.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Fix syntax error
|
||||
(substitute* "lisp/magit-extras.el"
|
||||
(("rev\\)\\)\\)\\)\\)\\)") "rev)))))"))
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("texinfo" ,texinfo)
|
||||
("emacs" ,emacs-minimal)))
|
||||
"11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
`(#:emacs ,emacs-no-x ;module support is required
|
||||
#:tests? #t
|
||||
#:test-command '("make" "test")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'build-info-manual
|
||||
(lambda _
|
||||
(invoke "make" "info")
|
||||
;; Copy info files to the lisp directory, which acts as
|
||||
;; the root of the project for the emacs-build-system.
|
||||
(for-each (lambda (f)
|
||||
(install-file f "lisp"))
|
||||
(find-files "Documentation" "\\.info$"))
|
||||
(chdir "lisp")
|
||||
#t))
|
||||
(add-after 'build-info-manual 'set-magit-version
|
||||
(lambda _
|
||||
(make-file-writable "magit.el")
|
||||
(emacs-substitute-variables "magit.el"
|
||||
("magit-version" ,version))
|
||||
#t))
|
||||
(add-after 'set-magit-version 'patch-exec-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((perl (assoc-ref inputs "perl")))
|
||||
(make-file-writable "magit-sequence.el")
|
||||
(emacs-substitute-variables "magit-sequence.el"
|
||||
("magit-perl-executable" (string-append perl "/bin/perl")))
|
||||
#t)))
|
||||
(add-before 'check 'configure-git
|
||||
(lambda _
|
||||
;; Otherwise some tests fail with error "unable to auto-detect
|
||||
;; email address".
|
||||
(setenv "HOME" (getcwd))
|
||||
(invoke "git" "config" "--global" "user.name" "toto")
|
||||
(invoke "git" "config" "--global" "user.email"
|
||||
"toto@toto.com")))
|
||||
(add-after 'configure-git 'disable-tramp-test
|
||||
(lambda _
|
||||
;; There is an issue causing TRAMP to fail in the build
|
||||
;; environment. Setting the tramp-remote-shell parameter of
|
||||
;; the sudo-method to the file name of the shell didn't help.
|
||||
(chdir "..")
|
||||
(substitute* "t/magit-tests.el"
|
||||
(("^\\(ert-deftest magit-toplevel:tramp.*" all)
|
||||
(string-append all " (skip-unless nil)")))
|
||||
#t))
|
||||
(add-before 'install 'enter-lisp-directory
|
||||
(lambda _
|
||||
(chdir "lisp")
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("texinfo" ,texinfo)))
|
||||
(inputs
|
||||
`(("git" ,git)
|
||||
("perl" ,perl)))
|
||||
(propagated-inputs
|
||||
`(("dash" ,emacs-dash)
|
||||
("with-editor" ,emacs-with-editor)
|
||||
("transient" ,emacs-transient)))
|
||||
(arguments
|
||||
`(#:modules ((guix build gnu-build-system)
|
||||
(guix build utils)
|
||||
(guix build emacs-utils))
|
||||
#:imported-modules (,@%gnu-build-system-modules
|
||||
(guix build emacs-utils))
|
||||
#:test-target "test"
|
||||
#:tests? #f ; tests are not included in the release
|
||||
#:make-flags
|
||||
(list (string-append "PREFIX=" %output)
|
||||
;; Don't put .el files in a sub-directory.
|
||||
(string-append "lispdir=" %output "/share/emacs/site-lisp"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch
|
||||
(lambda _
|
||||
(chmod "lisp/magit-extras.el" #o644)
|
||||
(emacs-batch-edit-file "lisp/magit-extras.el"
|
||||
`(progn (progn
|
||||
(goto-char (point-min))
|
||||
(re-search-forward "(defun magit-copy-buffer-revision ()")
|
||||
(forward-sexp 2)
|
||||
(kill-sexp)
|
||||
(insert ,(format #f "~S"
|
||||
'(if (use-region-p)
|
||||
(copy-region-as-kill nil nil 'region)
|
||||
(when-let ((rev (cl-case major-mode
|
||||
((magit-cherry-mode
|
||||
magit-log-select-mode
|
||||
magit-reflog-mode
|
||||
magit-refs-mode
|
||||
magit-revision-mode
|
||||
magit-stash-mode
|
||||
magit-stashes-mode)
|
||||
(car magit-refresh-args))
|
||||
((magit-diff-mode magit-log-mode)
|
||||
(let ((r (caar magit-refresh-args)))
|
||||
(if (string-match "\\.\\.\\.?\\(.+\\)" r)
|
||||
(match-string 1 r)
|
||||
r)))
|
||||
(magit-status-mode "HEAD"))))
|
||||
(when (magit-commit-p rev)
|
||||
(setq rev (magit-rev-parse rev))
|
||||
(push (list rev default-directory) magit-revision-stack)
|
||||
(kill-new (message "%s" rev))))))))
|
||||
(basic-save-buffer)))
|
||||
#t))
|
||||
(delete 'configure)
|
||||
(add-before
|
||||
'build 'patch-exec-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((perl (assoc-ref inputs "perl")))
|
||||
(make-file-writable "lisp/magit-sequence.el")
|
||||
(emacs-substitute-variables "lisp/magit-sequence.el"
|
||||
("magit-perl-executable" (string-append perl "/bin/perl")))
|
||||
#t))))))
|
||||
`(("emacs-dash" ,emacs-dash)
|
||||
("emacs-libgit" ,emacs-libgit)
|
||||
("emacs-transient" ,emacs-transient)
|
||||
("emacs-with-editor" ,emacs-with-editor)))
|
||||
(home-page "https://magit.vc/")
|
||||
(synopsis "Emacs interface for the Git version control system")
|
||||
(description
|
||||
"With Magit, you can inspect and modify your Git repositories with Emacs.
|
||||
You can review and commit the changes you have made to the tracked files, for
|
||||
example, and you can browse the history of past changes. There is support for
|
||||
cherry picking, reverting, merging, rebasing, and other common Git
|
||||
operations.")
|
||||
(description "With Magit, you can inspect and modify your Git
|
||||
repositories with Emacs. You can review and commit the changes you have made
|
||||
to the tracked files, for example, and you can browse the history of past
|
||||
changes. There is support for cherry picking, reverting, merging, rebasing,
|
||||
and other common Git operations.")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-magit-svn
|
||||
@ -1904,7 +1964,7 @@ Lock key.")
|
||||
(define-public emacs-chronometrist
|
||||
(package
|
||||
(name "emacs-chronometrist")
|
||||
(version "0.4.2")
|
||||
(version "0.4.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -1913,7 +1973,7 @@ Lock key.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1ccy7qz1wcmggqlf3hwigbqq4wrx1amds4x9bxz9py6bypglyjc5"))))
|
||||
(base32 "1ljjqzghcap4admv0hvw6asm148b80mfgjgxjjcw6qc95fkjjjlr"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-dash" ,emacs-dash)
|
||||
@ -5581,7 +5641,7 @@ orange and red as accent colors.")
|
||||
(base32
|
||||
"0gy2pvz79whpavp4jmz8h9krzn7brmvv3diixi1d4w51pcdvaldd"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://bitbucket.org/zck/2048.el")
|
||||
(home-page "https://hg.sr.ht/~zck/game-2048")
|
||||
(synopsis "Implementation of the game 2048 in Emacs Lisp")
|
||||
(description
|
||||
"This program is an implementation of 2048 for Emacs.
|
||||
@ -5911,7 +5971,7 @@ test tags. It supports both interactive and non-interactive use.")
|
||||
(sha256
|
||||
(base32 "1m37scr82lqqy954fchjxrmdh4lngrl4d1yzxhp3yfjhsydizhrj"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "http://github.com/rocky/emacs-load-relative")
|
||||
(home-page "https://github.com/rocky/emacs-load-relative")
|
||||
(synopsis "Emacs Lisp relative file loading related functions")
|
||||
(description
|
||||
"Provides functions which facilitate writing multi-file Emacs packages
|
||||
@ -6076,6 +6136,28 @@ the Hydra very seamless; it's like a minor mode that disables itself
|
||||
automatically.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-interleave
|
||||
(package
|
||||
(name "emacs-interleave")
|
||||
(version "1.4.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri
|
||||
(git-reference
|
||||
(url "https://github.com/rudolfochrist/interleave")
|
||||
(commit (string-append "interleave-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0l5b681mrpk12lx5c16m7kc13p29z6zismwg1llsjg7cdmrmsrcb"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/rudolfochrist/interleave")
|
||||
(synopsis "Emacs minor mode to interleave notes and text books")
|
||||
(description
|
||||
"Interleave is a minor mode that presents a document viewer side
|
||||
by side to an Org buffer with your notes relevant to the current page.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-ivy
|
||||
(package
|
||||
(name "emacs-ivy")
|
||||
@ -6933,25 +7015,25 @@ in Emacs.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-evil-markdown
|
||||
(let ((commit "46cd81b37991c4325fc24015a610f832b0ff995d")
|
||||
(revision "1"))
|
||||
(let ((commit "685d7fbb81bc02fa32779d2a127b99a0c8c7436b")
|
||||
(revision "2"))
|
||||
(package
|
||||
(name "emacs-evil-markdown")
|
||||
(version (git-version "0.0.2" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/Somelauw/evil-markdown.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0mad8sp5y9vyk28595qygspnyh8bfmb1fbxjlw70qwc1kdn822n4"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/Somelauw/evil-markdown.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1z1sjn6dcqv8mmkh6nfcwhnql2z6xr9yx3hs77bfxj79pf3c466p"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-markdown-mode" ,emacs-markdown-mode)
|
||||
("emacs-evil" ,emacs-evil)))
|
||||
(home-page "http://jblevins.org/projects/evil-markdown/")
|
||||
`(("emacs-evil" ,emacs-evil)
|
||||
("emacs-markdown-mode" ,emacs-markdown-mode)))
|
||||
(home-page "https://github.com/Somelauw/evil-markdown/")
|
||||
(synopsis "Evil keybindings for @code{markdown-mode}")
|
||||
(description
|
||||
"This package provides custom text objects and bindings for
|
||||
@ -7467,7 +7549,7 @@ names, e.g. #0000ff is displayed in white with a blue background.")
|
||||
(sha256
|
||||
(base32 "1cyvp3bi6yhckbdnq98xvghmhdzghya5y9wd7hxjawibs75rza95"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "http://github.com/Kungsgeten/ryo-modal")
|
||||
(home-page "https://github.com/Kungsgeten/ryo-modal")
|
||||
(synopsis "Emacs minor mode for defining modal editing environments")
|
||||
(description "RYO modal provides a convenient way of defining modal
|
||||
keybindings in Emacs, and does not come with any predefined bindings.")
|
||||
@ -8268,7 +8350,7 @@ news items, openrc and runscripts.")
|
||||
(define-public emacs-evil
|
||||
(package
|
||||
(name "emacs-evil")
|
||||
(version "1.2.14")
|
||||
(version "1.14.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -8278,7 +8360,7 @@ news items, openrc and runscripts.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1833w397xhac5g3pp25szr2gyvclxy91aw27azvbmsx94pyk2a3q"))))
|
||||
"17xrn3s6a4afmls8fw8nnxa1jq9dmj2qqrxa2vngh50hxpz8840p"))))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
@ -15437,8 +15519,8 @@ bookmarks and history.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-stumpwm-mode
|
||||
(let ((commit "dd5b037923ec7d3cc27c55806bcec5a1b8cf4e91")
|
||||
(revision "2"))
|
||||
(let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6")
|
||||
(revision "3"))
|
||||
(package
|
||||
(name "emacs-stumpwm-mode")
|
||||
(version (git-version "0.0.1" revision commit))
|
||||
@ -15450,7 +15532,7 @@ bookmarks and history.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0ahxdj9f884afpzxczx6mx7l4nwg4kw6afqaq7lwhf7lxcwylldn"))))
|
||||
"0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
@ -16071,8 +16153,8 @@ Org-mode file, and citations of Zotero items in Pandoc Markdown files.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-evil-magit
|
||||
(let ((commit "4b66a1db8285457147a5436f209391016a819ea1")
|
||||
(revision "3"))
|
||||
(let ((commit "253c644807013fe92429acdef418748794b8f254")
|
||||
(revision "4"))
|
||||
(package
|
||||
(name "emacs-evil-magit")
|
||||
(version (git-version "0.4.2" revision commit))
|
||||
@ -16085,7 +16167,7 @@ Org-mode file, and citations of Zotero items in Pandoc Markdown files.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0kkmbswfh34k3amfl3v140vsnz1gq4n4mg9g4khjd9yjph3zms4h"))))
|
||||
"08mh7phxsdb9w4dfs0pmr4l4fdzzr2rm88z2s8karfi5j5ik2ag5"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-evil" ,emacs-evil)
|
||||
@ -16457,10 +16539,10 @@ you searched for and execute it, or view its documentation.")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-helm-emms
|
||||
(let ((commit "b785cb845a98a643eba9d5d53c9c0b4e6810a3cd"))
|
||||
(let ((commit "37e5aa029abfa5a5c48636314de8157142944fa2"))
|
||||
(package
|
||||
(name "emacs-helm-emms")
|
||||
(version (git-version "1.3" "2" commit))
|
||||
(version (git-version "1.3" "3" commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -16470,7 +16552,7 @@ you searched for and execute it, or view its documentation.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1595r09y3rmwd46nnhvjja3hb8j2ila295ijxv61cg52ws4wginh"))))
|
||||
"0r1ai6xhzayyik30w2sx9n62bxxwm12vfmjspv0daqif9az8y3vg"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-helm" ,emacs-helm)
|
||||
@ -19211,11 +19293,11 @@ as Emacs Lisp.")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-transient
|
||||
;; 0.1.0 depends on lv.el but not later versions.
|
||||
(let ((commit "7e45a57ec81185631fe763733f64c99021df2a06"))
|
||||
(let ((revision "1")
|
||||
(commit "a6e4cced303b3febd59412b24a97eaf1e855e6d7"))
|
||||
(package
|
||||
(name "emacs-transient")
|
||||
(version (git-version "0.1.0" "1" commit))
|
||||
(version (git-version "0.2.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -19224,48 +19306,40 @@ as Emacs Lisp.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0r6d4c1lga3bk0s7q7y4v4hbpxnd9h40cjxybqvax2z902931fz1"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("texinfo" ,texinfo)
|
||||
("emacs" ,emacs-minimal)))
|
||||
(propagated-inputs
|
||||
`(("dash" ,emacs-dash)))
|
||||
"01xsw9sxr50valc2q590ngy3ra2ll01p39l9cbzvqqz6mxyymxmd"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
`(#:modules ((guix build gnu-build-system)
|
||||
(guix build utils)
|
||||
(srfi srfi-26)
|
||||
(guix build emacs-utils))
|
||||
#:imported-modules (,@%gnu-build-system-modules
|
||||
(guix build emacs-utils))
|
||||
#:tests? #f ; tests are not included in the release
|
||||
#:make-flags (list "lisp" "info")
|
||||
`(#:tests? #f ;no test suite
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(replace 'install
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(lisp (string-append out "/share/emacs/site-lisp"))
|
||||
(info (string-append out "/share/info")))
|
||||
(for-each (cut install-file <> lisp)
|
||||
(find-files "." "\\.elc*$"))
|
||||
(install-file "docs/transient.info" (string-append info)))
|
||||
(add-after 'unpack 'build-info-manual
|
||||
(lambda _
|
||||
(invoke "make" "info")
|
||||
;; Move the info file to lisp so that it gets installed by the
|
||||
;; emacs-build-system.
|
||||
(rename-file "docs/transient.info" "lisp/transient.info")))
|
||||
(add-after 'build-info-manual 'enter-lisp-directory
|
||||
(lambda _
|
||||
(chdir "lisp")
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("texinfo" ,texinfo)))
|
||||
(propagated-inputs
|
||||
`(("dash" ,emacs-dash)))
|
||||
(home-page "https://magit.vc/manual/transient")
|
||||
(synopsis "Transient commands in Emacs")
|
||||
(description
|
||||
"Taking inspiration from prefix keys and prefix arguments in Emacs,
|
||||
Transient implements a similar abstraction involving a prefix command, infix
|
||||
arguments and suffix commands. We could call this abstraction a \"transient
|
||||
command\", but because it always involves at least two commands (a prefix and
|
||||
a suffix) we prefer to call it just a \"transient\".")
|
||||
(description "Taking inspiration from prefix keys and prefix arguments
|
||||
in Emacs, Transient implements a similar abstraction involving a prefix
|
||||
command, infix arguments and suffix commands. We could call this abstraction
|
||||
a \"transient command\", but because it always involves at least two
|
||||
commands (a prefix and a suffix) we prefer to call it just a \"transient\".")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-forge
|
||||
(let ((commit "63cbf81f166fc71861d8e3d246df8e5ccedcb9bb"))
|
||||
(let ((commit "09bf8adc9c9afb492632e612f51f39e1cc15fca0"))
|
||||
(package
|
||||
(name "emacs-forge")
|
||||
(version (git-version "0.1.0" "3" commit))
|
||||
(version (git-version "0.1.0" "4" commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -19275,11 +19349,10 @@ a suffix) we prefer to call it just a \"transient\".")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1yf2xjx3459py6rji740jm8bmh2pv66ghnbjxsvjd4jf9kcdav83"))))
|
||||
"148h1rvmfmxyrfy2q5l0vzblr7lpsyw1si30hfwhzsj8fvj21qcr"))))
|
||||
(build-system emacs-build-system)
|
||||
(native-inputs
|
||||
`(("texinfo" ,texinfo)
|
||||
("emacs" ,emacs-minimal)))
|
||||
`(("texinfo" ,texinfo)))
|
||||
(propagated-inputs
|
||||
`(("emacs-closql" ,emacs-closql)
|
||||
("emacs-dash" ,emacs-dash)
|
||||
|
@ -61,6 +61,7 @@
|
||||
#:use-module (gnu packages commencement)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages curl)
|
||||
#:use-module (gnu packages digest)
|
||||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages flex)
|
||||
#:use-module (gnu packages fontutils)
|
||||
@ -82,6 +83,7 @@
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages image-processing)
|
||||
#:use-module (gnu packages imagemagick)
|
||||
#:use-module (gnu packages libevent)
|
||||
#:use-module (gnu packages linux) ;FIXME: for pcb
|
||||
#:use-module (gnu packages m4)
|
||||
#:use-module (gnu packages maths)
|
||||
@ -535,7 +537,7 @@ featuring various improvements and bug fixes.")))
|
||||
(copy-recursively "doc" doc)
|
||||
(copy-recursively "examples" examples)
|
||||
#t))))))
|
||||
(home-page "http://www.rle.mit.edu/cpg/research_codes.htm")
|
||||
(home-page "https://www.rle.mit.edu/cpg/research_codes.htm")
|
||||
(synopsis "Multipole-accelerated capacitance extraction program")
|
||||
(description
|
||||
"Fastcap is a capacitance extraction program based on a
|
||||
@ -583,7 +585,7 @@ multipole-accelerated algorithm.")
|
||||
(copy-recursively "doc" doc)
|
||||
(copy-recursively "examples" examples)
|
||||
#t))))))
|
||||
(home-page "http://www.rle.mit.edu/cpg/research_codes.htm")
|
||||
(home-page "https://www.rle.mit.edu/cpg/research_codes.htm")
|
||||
(synopsis "Multipole-accelerated inductance analysis program")
|
||||
(description
|
||||
"Fasthenry is an inductance extraction program based on a
|
||||
@ -1334,7 +1336,7 @@ bindings for Python, Java, OCaml and more.")
|
||||
(define-public radare2
|
||||
(package
|
||||
(name "radare2")
|
||||
(version "4.2.1")
|
||||
(version "4.4.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -1342,39 +1344,37 @@ bindings for Python, Java, OCaml and more.")
|
||||
(commit version)))
|
||||
(sha256
|
||||
(base32
|
||||
"14b9433cgc2nabhz836zfgvgh2dwailcmvy05krsa0inmzbvx9fg"))
|
||||
(file-name (git-file-name name version))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
(substitute* "libr/asm/p/Makefile"
|
||||
(("LDFLAGS\\+=") "LDFLAGS+=-Wl,-rpath=$(LIBDIR) "))
|
||||
(substitute* "libr/parse/p/Makefile"
|
||||
(("LDFLAGS\\+=") "LDFLAGS+=-Wl,-rpath=$(LIBDIR) "))
|
||||
(substitute* "libr/bin/p/Makefile"
|
||||
(("LDFLAGS\\+=") "LDFLAGS+=-Wl,-rpath=$(LIBDIR) "))
|
||||
#t))))
|
||||
"0gwdnrnk7wdgkajp2qwg4fyplh7nsbmf01bzx07px6xmiscd9z2s"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; tests require git and network access
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'mklibdir
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(mkdir-p (string-append (assoc-ref %outputs "out") "/lib"))
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(mkdir-p (string-append (assoc-ref outputs "out") "/lib"))
|
||||
#t)))
|
||||
#:configure-flags
|
||||
(list "--with-sysmagic" "--with-syszip" "--with-openssl"
|
||||
"--without-nonpic" "--with-rpath" "--with-syscapstone")
|
||||
(list "--with-openssl"
|
||||
"--with-rpath"
|
||||
"--with-syscapstone"
|
||||
"--with-sysmagic"
|
||||
"--with-syszip"
|
||||
"--with-sysxxhash")
|
||||
#:make-flags
|
||||
(list "CC=gcc")))
|
||||
;; TODO: Add gmp and libzip and make the build system actually find them.
|
||||
(inputs
|
||||
`(("openssl" ,openssl)
|
||||
("zip" ,zip)
|
||||
("gmp" ,gmp)
|
||||
("capstone" ,capstone)))
|
||||
`(("capstone" ,capstone)
|
||||
("libuv" ,libuv)
|
||||
("openssl" ,openssl)
|
||||
("zip" ,zip)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(propagated-inputs
|
||||
;; In the Libs: section of r_hash.pc.
|
||||
`(("xxhash" ,xxhash)))
|
||||
(home-page "https://radare.org/")
|
||||
(synopsis "Reverse engineering framework")
|
||||
(description
|
||||
@ -2175,7 +2175,7 @@ simulation.")
|
||||
(define-public cutter
|
||||
(package
|
||||
(name "cutter")
|
||||
(version "1.10.1")
|
||||
(version "1.10.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -2184,8 +2184,7 @@ simulation.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1gvsrcskcdd1hxrjpkpc657anmfs25f174vxk4wzvn385rnmrxd3"))))
|
||||
(base32 "0qj8jyij02nif4jpirl09ygwnv8a9zi3vkb5sf5s8mg7qwlpnvyk"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
@ -2194,8 +2193,8 @@ simulation.")
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(radare2 (assoc-ref inputs "radare2")))
|
||||
;; fix pkg-config detection ./src/lib_radare2.pri:PREFIX=/usr/lib
|
||||
;; override `qmake PREFIX=`
|
||||
;; Fix pkg-config detection ./src/lib_radare2.pri:PREFIX=/usr/lib
|
||||
;; override `qmake PREFIX=`.
|
||||
(substitute* "./src/lib_radare2.pri"
|
||||
(("PREFIX") "R2PREFIX")
|
||||
(("R2PREFIX=/usr") (string-append "R2PREFIX=" radare2)))
|
||||
|
@ -69,7 +69,7 @@
|
||||
(define-public efl
|
||||
(package
|
||||
(name "efl")
|
||||
(version "1.24.1")
|
||||
(version "1.24.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@ -77,7 +77,7 @@
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1xsbz5kl74cgzyzwmjy3p50m0iigvi53lklkp92v49k4j99zpak7"))))
|
||||
"0w3srvigg4kfi7xq76c7y4hnq5yr2gxrrsvlyj1g2wc1igz1vyg1"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs
|
||||
`(("check" ,check)
|
||||
|
@ -187,6 +187,38 @@ caching system, and lets you assign different roles to each device based on its
|
||||
performance and other characteristics.")
|
||||
(license license:gpl2+))))
|
||||
|
||||
(define-public exfatprogs
|
||||
(package
|
||||
(name "exfatprogs")
|
||||
(version "1.0.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/exfatprogs/exfatprogs")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1s47qvhr702z5c19wfqz8cwl9ammmincs7a8vjc6p974wnnjg77y"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list "--disable-static")))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("libtool" ,libtool)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(home-page "https://github.com/exfatprogs/exfatprogs")
|
||||
(synopsis "Tools to create, check, and repair exFAT file systems")
|
||||
(description
|
||||
"These are command-line user space tools for the @acronym{exFAT,
|
||||
Extensible File Allocation Table} file systems. Included are
|
||||
@command{mkfs.exfat} to create (format) new exFAT file systems, and
|
||||
@command{fsck.exfat} to check their consistency and repair them.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public httpfs2
|
||||
(package
|
||||
(name "httpfs2")
|
||||
@ -323,7 +355,7 @@ from the jfsutils package. It is meant to be used in initrds.")
|
||||
(define-public disorderfs
|
||||
(package
|
||||
(name "disorderfs")
|
||||
(version "0.5.9")
|
||||
(version "0.5.10")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -333,7 +365,7 @@ from the jfsutils package. It is meant to be used in initrds.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0irgr9hkm9icx1s44m9382484yx8hddzjxbsz621ip9c946pif0g"))))
|
||||
"0lsisx5118k0qk0b5klbxl03rvhycnznyfx05yxmjawh85bfhmlh"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
@ -491,8 +523,9 @@ network. LIBNFS offers three different APIs, for different use :
|
||||
))))
|
||||
|
||||
(define-public apfs-fuse
|
||||
(let ((commit "c7036a3030d128bcecefc1eabc47c039ccfdcec9")
|
||||
(revision "0"))
|
||||
;; Later versions require FUSE 3.
|
||||
(let ((commit "7b89418e8dc27103d3c4f8fa348086ffcd634c17")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "apfs-fuse")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
@ -504,11 +537,13 @@ network. LIBNFS offers three different APIs, for different use :
|
||||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"1akd4cx1f9cyq6sfk9ybv4chhjwjlnqi8ic4z5ajnd5x0g76nz3r"))
|
||||
"0x2siy3cmnm9wsdfazg3xc8r3kbg73gijmnn1vjw33pp71ckylxr"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; No test suite
|
||||
#:configure-flags
|
||||
'("-DUSE_FUSE3=OFF") ; FUSE 3 is not packaged yet.
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; No 'install' target in CMakeLists.txt
|
||||
@ -523,6 +558,7 @@ network. LIBNFS offers three different APIs, for different use :
|
||||
(install-file "apfs-dump-quick" bin)
|
||||
(install-file "apfs-fuse" bin)
|
||||
(install-file "libapfs.a" lib)
|
||||
(install-file "../source/README.md" doc)
|
||||
#t))))))
|
||||
(inputs
|
||||
`(("bzip2" ,bzip2)
|
||||
|
@ -547,7 +547,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch
|
||||
;; the system's dynamically linked library.
|
||||
(package
|
||||
(name "monero")
|
||||
(version "0.15.0.5")
|
||||
(version "0.16.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -568,7 +568,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch
|
||||
#t))
|
||||
(sha256
|
||||
(base32
|
||||
"06zzwa0y8ic6x3y2fy501788r51p4klanyvmm76ywrwf087njlkv"))))
|
||||
"0x74h5z0nxxxip97ibc854pqmrgd8r4d6w62m424f66i8gbzfskh"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("doxygen" ,doxygen)
|
||||
@ -666,7 +666,7 @@ the Monero command line client and daemon.")
|
||||
(define-public monero-gui
|
||||
(package
|
||||
(name "monero-gui")
|
||||
(version "0.15.0.4")
|
||||
(version "0.16.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -676,14 +676,16 @@ the Monero command line client and daemon.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"12m5fgnxkr11q2arx1m5ccpxqm5ljcvm6l547dwqn297zs5jim4z"))))
|
||||
"06vdrsj5y9k0zn32hspyxc7sw1kkyrvi3chzkdbnxk9jvyj8k4ld"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
`(("monero-source" ,(package-source monero))
|
||||
("pkg-config" ,pkg-config)
|
||||
("qttools" ,qttools)))
|
||||
(inputs
|
||||
`(("boost" ,boost)
|
||||
("hidapi" ,hidapi)
|
||||
("libgcrypt" ,libgcrypt)
|
||||
("libsodium" ,libsodium)
|
||||
("libunwind" ,libunwind)
|
||||
("libusb" ,libusb)
|
||||
@ -705,7 +707,16 @@ the Monero command line client and daemon.")
|
||||
`(#:tests? #f ; No tests
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-makefile-vars
|
||||
(add-after 'unpack 'get-monero-extra-files
|
||||
;; Some headers and GnuPG public keys of the monero package source
|
||||
;; code are required to build the GUI.
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(invoke "tar" "-xv" "--wildcards" "--strip-components=1"
|
||||
"-C" "monero"
|
||||
"-f" (assoc-ref inputs "monero-source")
|
||||
"*.asc" "*.h")
|
||||
#t))
|
||||
(add-after 'get-monero-extra-files 'fix-makefile-vars
|
||||
(lambda _
|
||||
(substitute* "src/zxcvbn-c/makefile"
|
||||
(("\\?=") "="))
|
||||
@ -1510,14 +1521,14 @@ like Flowee the Hub, which Fulcrum connects to over RPC.")
|
||||
(define-public flowee
|
||||
(package
|
||||
(name "flowee")
|
||||
(version "2020.03.3")
|
||||
(version "2020.04.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://gitlab.com/FloweeTheHub/thehub/-/archive/"
|
||||
version "/thehub-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0ksyh7ll3v9p8f5y15vcb2vkrpzb4h0ricag9j90ad4b4rfsnpjw"))))
|
||||
(base32 "1vwvaxm3b71pfx8l4rrv06wqks6xdf2333w856b36s1bzvj53rhc"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("-Dbuild_tests=ON" "-Denable_gui=OFF")
|
||||
|
@ -677,7 +677,7 @@ for use at smaller text sizes")))
|
||||
(define-public font-gnu-unifont
|
||||
(package
|
||||
(name "font-gnu-unifont")
|
||||
(version "13.0.01")
|
||||
(version "13.0.02")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@ -687,7 +687,7 @@ for use at smaller text sizes")))
|
||||
(string-append "mirror://gnu/unifont/unifont-"
|
||||
version "/unifont-" version ".tar.gz")))
|
||||
(sha256
|
||||
(base32 "1svzm3xahb2m8r79ha9gb1z3zlckykx9d87cghswj7dxn9868j4b"))))
|
||||
(base32 "1fg908qadh14kfbpzqfj3vgzlxgx68sdlwhl2prz7arq5r45dami"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" ; TrueType version
|
||||
"pcf" ; PCF (bitmap) version
|
||||
@ -1121,16 +1121,14 @@ later hand-tweaked with the gbdfed(1) editor:
|
||||
(define-public font-comic-neue
|
||||
(package
|
||||
(name "font-comic-neue")
|
||||
;; The ‘v2.3’ and ‘v2.4’ releases at https://github.com/crozynski/comicneue
|
||||
;; are equivalent. The home page hosts 2.3, not 2.4, so we use that here.
|
||||
(version "2.3")
|
||||
(version "2.5")
|
||||
(source (origin
|
||||
(method url-fetch/zipbomb)
|
||||
(uri (string-append
|
||||
"http://www.comicneue.com/comic-neue-" version ".zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"1695hkpd8kqnr2a88p8xs496slgzxjjkzpa9aa33ml3pnh7519zk"))))
|
||||
"1ng0m0zs7qr91qy5ff0l01l27npr76961c6zfkxnhxf68zpwz5k4"))))
|
||||
(build-system font-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -256,15 +256,14 @@ necessary.
|
||||
(uri (string-append "https://binaries.openttd.org/extra/catcodec/"
|
||||
version "/catcodec-" version "-source.tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1qg0c2i4p29sxj0q6qp2jynlrzm5pphz2xhcjqlxa69ycrnlxzs7"))))
|
||||
(base32 "1qg0c2i4p29sxj0q6qp2jynlrzm5pphz2xhcjqlxa69ycrnlxzs7"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
#:make-flags (list (string-append "prefix=" %output))
|
||||
#:phases (modify-phases %standard-phases
|
||||
(delete 'configure))))
|
||||
(home-page "http://dev.openttdcoop.org/projects/catcodec")
|
||||
(home-page "https://dev.openttdcoop.org/projects/catcodec")
|
||||
(synopsis "Encode/decode OpenTTD sounds")
|
||||
(description "catcodec encodes and decodes sounds for OpenTTD. These
|
||||
sounds are not much more than some metadata (description and filename) and raw
|
||||
@ -632,6 +631,7 @@ garbage collection and can be extended with plugins.")
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; no check target
|
||||
#:configure-flags '("-DPHYSFS_BUILD_STATIC=OFF")
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-CMakeLists.txt
|
||||
(lambda _
|
||||
@ -681,7 +681,6 @@ archive on a per-file basis.")
|
||||
("mesa" ,mesa)
|
||||
("mpg123" ,mpg123)
|
||||
("openal" ,openal)
|
||||
("physfs" ,physfs)
|
||||
("sdl2" ,sdl2)
|
||||
("zlib" ,zlib)))
|
||||
(synopsis "2D game framework for Lua")
|
||||
@ -1157,7 +1156,7 @@ developed mainly for Ren'py.")
|
||||
(native-inputs
|
||||
`(("python2-cython" ,python2-cython)
|
||||
("xdg-utils" ,xdg-utils)))
|
||||
(home-page "http://www.renpy.org/")
|
||||
(home-page "https://www.renpy.org/")
|
||||
(synopsis "Ren'py python module")
|
||||
(description "This package contains the shared libraries and Python
|
||||
modules of Ren'py.")
|
||||
@ -1345,7 +1344,7 @@ if __name__ == \"__main__\":
|
||||
("xorg-server" ,xorg-server)))
|
||||
(outputs
|
||||
(list "out" "tutorial" "the-question"))
|
||||
(home-page "http://www.renpy.org/")
|
||||
(home-page "https://www.renpy.org/")
|
||||
(synopsis "Visual Novel Engine")
|
||||
(description "Ren'Py is a visual novel engine that helps you use words,
|
||||
images, and sounds to tell interactive stories that run on computers and
|
||||
|
@ -23,7 +23,7 @@
|
||||
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2016 Steve Webber <webber.sl@gmail.com>
|
||||
;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@hyperbola.info>
|
||||
;;; Copyright © 2017, 2018 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2017, 2018, 2020 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017, 2019 nee <nee-git@hidamari.blue>
|
||||
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
|
||||
@ -450,7 +450,7 @@ possible, while battling many vicious aliens.")
|
||||
(define-public cataclysm-dda
|
||||
(package
|
||||
(name "cataclysm-dda")
|
||||
(version "0.E")
|
||||
(version "0.E-2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -458,7 +458,7 @@ possible, while battling many vicious aliens.")
|
||||
(url "https://github.com/CleverRaven/Cataclysm-DDA.git")
|
||||
(commit version)))
|
||||
(sha256
|
||||
(base32 "0pbi0fw37zimzdklfj58s1ql0wlqq7dy6idkcsib3hn910ajaxan"))
|
||||
(base32 "15l6w6lxays7qmsv0ci2ry53asb9an9dh7l7fc13256k085qcg68"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
@ -4819,24 +4819,27 @@ emerges from a sewer hole and pulls her below ground.")
|
||||
(define-public cdogs-sdl
|
||||
(package
|
||||
(name "cdogs-sdl")
|
||||
(version "0.6.9")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/cxong/cdogs-sdl.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"13gyv2hzk43za1n3lsjnd5v64xlzfzq7n10scd1rcbsnk1n007zr"))))
|
||||
(version "0.8.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/cxong/cdogs-sdl.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0vx37zb2iw7sfw5a2bs97ydlmb301nvy485ybdm8g46c5hn9s13c"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list (string-append "-DCDOGS_DATA_DIR="
|
||||
(assoc-ref %outputs "out")
|
||||
"/share/cdogs-sdl/"))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("mesa" ,mesa)
|
||||
`(("gtk+" ,gtk+)
|
||||
("mesa" ,mesa)
|
||||
("sdl2" ,sdl2)
|
||||
("sdl2-image" ,sdl2-image)
|
||||
("sdl2-mixer" ,sdl2-mixer)))
|
||||
@ -6384,7 +6387,7 @@ original.")
|
||||
(define-public fortune-mod
|
||||
(package
|
||||
(name "fortune-mod")
|
||||
(version "2.12.0")
|
||||
(version "2.22.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -6394,7 +6397,7 @@ original.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0laxgqsdg7kvpvvm1f54b94ga9r0cr9g3ffii8avg8fy65x6pzc9"))))
|
||||
"17h2g35j8nzljsqaqhrsx75jakbmlqnsa150g2xw414fcbnjbyps"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:test-target "check"
|
||||
@ -6672,7 +6675,7 @@ quotation from a collection of quotes.")
|
||||
("pkg-config" ,pkg-config)
|
||||
("libtool" ,libtool)
|
||||
("gmp" ,gmp)))
|
||||
(home-page "http://xonotic.org")
|
||||
(home-page "https://xonotic.org")
|
||||
(synopsis "Fast-paced first-person shooter game")
|
||||
(description
|
||||
"Xonotic is a free, fast-paced first-person shooter.
|
||||
|
@ -131,3 +131,15 @@ written in C, C++, Ada, Objective-C, Pascal and more.")
|
||||
;; This is the fixed version that packages depend on. Update it rarely
|
||||
;; enough to avoid massive rebuilds.
|
||||
gdb-9.1)
|
||||
|
||||
(define-public gdb-9.2
|
||||
(package
|
||||
(inherit gdb)
|
||||
(version "9.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/gdb/gdb-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0mf5fn8v937qwnal4ykn3ji1y2sxk0fa1yfqi679hxmpg6pdf31n"))))))
|
||||
|
@ -51,7 +51,7 @@
|
||||
(define-public babl
|
||||
(package
|
||||
(name "babl")
|
||||
(version "0.1.74")
|
||||
(version "0.1.76")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (list (string-append "https://download.gimp.org/pub/babl/"
|
||||
@ -65,7 +65,7 @@
|
||||
"/babl-" version ".tar.xz")))
|
||||
(sha256
|
||||
(base32
|
||||
"03nfcvy3453xkfvsfcnsfcjf2vg2pin09qnr9jlssdysa1lhnwcs"))))
|
||||
"183kj2yq08vvldp8307vq61y2ravcqkyarrhak9w2l30gygp9100"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
@ -53,6 +53,7 @@
|
||||
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
|
||||
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
|
||||
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
|
||||
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -1010,11 +1011,12 @@ useful as a tutorial and users' guide for new or less experienced users.")
|
||||
;; This version from GNOME's repository includes fixes for compiling with
|
||||
;; recent versions of the build tools. The latest activity on the
|
||||
;; pre-GNOME version has been in 2014, while GNOME has continued applying
|
||||
;; fixes in 2016.
|
||||
(let ((commit "fbc306168edab63db80b904956117cbbdc514ee4"))
|
||||
;; fixes since.
|
||||
(let ((commit "3cf7ec4c2e5bca139a7f3e17f9fc9009c237fcc5")
|
||||
(revision "2"))
|
||||
(package
|
||||
(name "dia")
|
||||
(version (git-version "0.97.3" "1" commit))
|
||||
(version (git-version "0.97.3" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -1023,24 +1025,23 @@ useful as a tutorial and users' guide for new or less experienced users.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1b4bba0k8ph4cwgw8xjglss0p6n111bpd5app67lrq79mp0ad06l"))))
|
||||
(build-system gnu-build-system)
|
||||
"04r8dspa6nmicrifhi3sh46hqvyy88hzq37xx99q3q1mwsrpmwy8"))))
|
||||
(build-system meson-build-system)
|
||||
(inputs
|
||||
`(("freetype" ,freetype)
|
||||
("gdk-pixbuf" ,gdk-pixbuf)
|
||||
`(("graphene" ,graphene)
|
||||
("gtk+" ,gtk+-2)
|
||||
("libart-lgpl" ,libart-lgpl)
|
||||
("libxml2" ,libxml2)
|
||||
("pango" ,pango)))
|
||||
("libxslt" ,libxslt)
|
||||
("poppler" ,poppler)
|
||||
;; Without Python 2, build fails: plug-ins/python/meson.build:4:0:
|
||||
;; ERROR: Unknown method "dependency" in object.
|
||||
("python-2" ,python-2)))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("intltool" ,intltool)
|
||||
`(("appstream-glib" ,appstream-glib)
|
||||
("docbook-xsl" ,docbook-xsl)
|
||||
("glib" ,glib "bin")
|
||||
("libtool" ,libtool)
|
||||
("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python-wrapper" ,python-wrapper)))
|
||||
("intltool" ,intltool)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(home-page "https://wiki.gnome.org/Apps/Dia")
|
||||
(synopsis "Diagram creation for GNOME")
|
||||
(description "Dia can be used to draw different types of diagrams, and
|
||||
@ -2090,7 +2091,7 @@ API add-ons to make GTK+ widgets OpenGL-capable.")
|
||||
(define-public glade3
|
||||
(package
|
||||
(name "glade")
|
||||
(version "3.22.1")
|
||||
(version "3.36.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
@ -2098,7 +2099,7 @@ API add-ons to make GTK+ widgets OpenGL-capable.")
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"16p38xavpid51qfy0s26n0n21f9ws1w9k5s65bzh1w7ay8p9my6z"))))
|
||||
"023gx8rj51njn8fsb6ma5kz1irjpxi4js0n8rwy22inc4ysldd8r"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; needs X, GL, and software rendering
|
||||
@ -7920,7 +7921,7 @@ world.")
|
||||
("evince" ,evince)
|
||||
("file-roller" ,file-roller)
|
||||
("gedit" ,gedit)
|
||||
; TODO: ("gnome-boxes" ,gnome-boxes)
|
||||
("gnome-boxes" ,gnome-boxes)
|
||||
("gnome-calculator" ,gnome-calculator)
|
||||
("gnome-calendar" ,gnome-calendar)
|
||||
("gnome-characters" ,gnome-characters)
|
||||
@ -8874,8 +8875,9 @@ from gi.repository import Atspi"))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("python" ,python)
|
||||
("python-pygobject" ,python-pygobject)))
|
||||
`(("python" ,python)))
|
||||
(propagated-inputs
|
||||
`(("python-pygobject" ,python-pygobject)))
|
||||
(synopsis "Python client bindings for D-Bus AT-SPI")
|
||||
(home-page "https://wiki.linuxfoundation.org/accessibility\
|
||||
/atk/at-spi/at-spi_on_d-bus")
|
||||
@ -8885,6 +8887,15 @@ accessibility infrastructure.")
|
||||
(license license:lgpl2.0)
|
||||
(properties '((upstream-name . "pyatspi")))))
|
||||
|
||||
(define-public python2-pyatspi
|
||||
(package
|
||||
(inherit python-pyatspi)
|
||||
(name "python2-pyatspi")
|
||||
(inputs
|
||||
`(("python" ,python-2)))
|
||||
(propagated-inputs
|
||||
`(("python-pygobject" ,python2-pygobject)))))
|
||||
|
||||
(define-public orca
|
||||
(package
|
||||
(name "orca")
|
||||
@ -9926,7 +9937,7 @@ integrate seamlessly with the GNOME desktop.")
|
||||
(define-public gnome-boxes
|
||||
(package
|
||||
(name "gnome-boxes")
|
||||
(version "3.35.91")
|
||||
(version "3.36.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@ -9934,8 +9945,7 @@ integrate seamlessly with the GNOME desktop.")
|
||||
(version-major+minor version) "/"
|
||||
"gnome-boxes-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0l96spz6pc8q4l5p9a58cc0kgvdr7pbc89hy6ixn72k5pl3s7fxj"))))
|
||||
(base32 "16l0mq2ydmywcdya1795mcy8syg4zkmz9ws3pzjcqv5y4m7cjj03"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
'(#:glib-or-gtk? #t
|
||||
@ -10169,7 +10179,7 @@ your operating-system definition:
|
||||
(define-public piper
|
||||
(package
|
||||
(name "piper")
|
||||
(version "0.4")
|
||||
(version "0.5")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -10177,7 +10187,8 @@ your operating-system definition:
|
||||
(url "https://github.com/libratbag/piper.git")
|
||||
(commit version)))
|
||||
(sha256
|
||||
(base32 "17h06j8lxpbfygq8fzycl7lml4vv7r05bsyhh3gga2hp0zms4mvg"))))
|
||||
(base32 "00vrcsbsv2477l1ncpyzc61lhxgac84dsgr3sjs8qxw3nh1gaasv"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs
|
||||
`(("gettext" ,gettext-minimal)
|
||||
|
@ -3141,6 +3141,31 @@ network protocol.")
|
||||
(home-page "https://github.com/lucas-clemente/quic-go")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-francoispqt-gojay
|
||||
(package
|
||||
(name "go-github-com-francoispqt-gojay")
|
||||
(version "1.2.13")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/francoispqt/gojay")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1ix95qdyajfmxhf9y52vjrih63f181pjs4v5as8905s4d5vmkd06"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "github.com/francoispqt/gojay"))
|
||||
(propagated-inputs
|
||||
`(("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify)))
|
||||
(synopsis "JSON encoder/decoder with powerful stream API for Golang")
|
||||
(description "GoJay is a performant JSON encoder/decoder for Golang. It has
|
||||
a simple API and doesn't use reflection. It relies on small interfaces to
|
||||
decode/encode structures and slices.")
|
||||
(home-page "https://github.com/francoispqt/gojay")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-pkg-errors
|
||||
(package
|
||||
(name "go-github-com-pkg-errors")
|
||||
|
@ -26,6 +26,7 @@
|
||||
;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net>
|
||||
;;; Copyright © 2020 Evan Straw <evan.straw99@gmail.com>
|
||||
;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
|
||||
;;; Copyright © 2020 Julien Lepiler <julien@lepiller.eu>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -2872,11 +2873,11 @@ in C using Gtk+-3 and WebKitGtk.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacsy-minimal
|
||||
(let ((commit "d459ca1d3d09e7624e662bc4cfc3596850796fc6"))
|
||||
(let ((commit "v0.4.1-28-gd459ca1"))
|
||||
(package
|
||||
(inherit emacsy)
|
||||
(name "emacsy-minimal")
|
||||
(version (git-version "v0.4.1" "28" commit))
|
||||
(version (string-drop commit 1))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -3608,3 +3609,77 @@ WebSocket protocol as defined by RFC 6455.")
|
||||
|
||||
(define-public guile3.0-websocket
|
||||
(deprecated-package "guile3.0-websocket" guile-websocket))
|
||||
|
||||
(define-public guile-rdf
|
||||
(package
|
||||
(name "guile-rdf")
|
||||
(version "1.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://framagit.org/tyreunom/guile-rdf")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0dwn3app1fscbpmpgvjs5jy1y0gwy3j5gdx8br79af6a88zjlnqf"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)); tests require network
|
||||
(inputs
|
||||
`(("guile" ,guile-3.0)))
|
||||
(native-inputs
|
||||
`(("automake" ,automake)
|
||||
("autoconf" ,autoconf)
|
||||
("pkg-config" ,pkg-config)
|
||||
("texinfo" ,texinfo)))
|
||||
(home-page "https://framagit.org/tyreunom/guile-rdf")
|
||||
(synopsis "Guile implementation of the RDF abstract and concrete syntaxes")
|
||||
(description "Guile RDF is an implementation of the RDF (Resource Description
|
||||
Framework) format defined by the W3C for GNU Guile. RDF structures include
|
||||
triples (facts with a subject, a predicate and an object), graphs which are
|
||||
sets of triples, and datasets, which are collections of graphs.
|
||||
|
||||
RDF specifications include the specification of concrete syntaxes and of
|
||||
operations on graphs. This library implements some basic functionalities,
|
||||
such as parsing and producing turtle and nquads syntax, as well as
|
||||
manipulating graphs and datasets.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public guile-jsonld
|
||||
(package
|
||||
(name "guile-jsonld")
|
||||
(version "1.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://framagit.org/tyreunom/guile-jsonld")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0zfn3nwlz6xzip1j8xbj768dc299r037cfc81bk6kwl9xhzkjbrg"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)); require network
|
||||
(propagated-inputs
|
||||
`(("guile-gnutls" ,gnutls)
|
||||
("guile-json" ,guile-json-3)
|
||||
("guile-rdf" ,guile-rdf)))
|
||||
(inputs
|
||||
`(("guile" ,guile-3.0)))
|
||||
(native-inputs
|
||||
`(("automake" ,automake)
|
||||
("autoconf" ,autoconf)
|
||||
("pkg-config" ,pkg-config)
|
||||
("texinfo" ,texinfo)))
|
||||
(home-page "https://framagit.org/tyreunom/guile-jsonld")
|
||||
(synopsis "Guile implementation of the JsonLD API specification")
|
||||
(description "Guile JsonLD is an implementation of the JsonLD (Json for
|
||||
Linked Data) API defined by the W3C for GNU Guile. It allows you to express links
|
||||
between data, in a way that is very similar to WikiData or RDF for instance.
|
||||
An object can have relations (in the form of an IRI) that relates it to one or
|
||||
more objects or strings, represented by a Json object or an IRI.")
|
||||
(license license:gpl3+)))
|
||||
|
@ -387,7 +387,7 @@ applications.")
|
||||
(define-public usbguard
|
||||
(package
|
||||
(name "usbguard")
|
||||
(version "0.7.6")
|
||||
(version "0.7.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@ -395,7 +395,7 @@ applications.")
|
||||
version "/usbguard-" version ".tar.gz"))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0gzhs8s4aka86mkcjib36z54si939ki4bmk46p6v8kln1fixad3j"))))
|
||||
(base32 "1il5immqfxh2cj8wn1bfk7l42inflzgjf07yqprpz7r3lalbxc25"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -11,6 +11,7 @@
|
||||
;;; Copyright © 2018 Tonton <tonton@riseup.net>
|
||||
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2019 Timothy Sample <samplet@ngyro.com>
|
||||
;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -996,3 +997,43 @@ values (similar to @code{toEnum} but for any algebraic data type). This
|
||||
can be used for SmallCheck-style systematic testing, QuickCheck-style
|
||||
random testing, and hybrids of the two.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-inspection-testing
|
||||
(package
|
||||
(name "ghc-inspection-testing")
|
||||
(version "0.4.2.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://hackage.haskell.org/package/inspection-testing/"
|
||||
"inspection-testing-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1bppz99p6ix6hah8lbr9mapl2zxgmkg9i7h6hk8wq6zf54hwz3yp"))))
|
||||
(build-system haskell-build-system)
|
||||
(home-page
|
||||
"https://github.com/nomeata/inspection-testing")
|
||||
(synopsis "GHC plugin to do inspection testing")
|
||||
(description
|
||||
"Some carefully crafted libraries make promises to their users beyond
|
||||
functionality and performance.
|
||||
|
||||
Examples are: Fusion libraries promise intermediate data structures to be
|
||||
eliminated. Generic programming libraries promise that the generic
|
||||
implementation is identical to the hand-written one. Some libraries may
|
||||
promise allocation-free or branch-free code.
|
||||
|
||||
Conventionally, the modus operandi in all these cases is that the library
|
||||
author manually inspects the (intermediate or final) code produced by the
|
||||
compiler. This is not only tedious, but makes it very likely that some change,
|
||||
either in the library itself or the surrounding eco-system, breaks the
|
||||
library's promised without anyone noticing.
|
||||
|
||||
This package provides a disciplined way of specifying such properties, and
|
||||
have them checked by the compiler. This way, this checking can be part of the
|
||||
ususal development cycle and regressions caught early.
|
||||
|
||||
See the documentation in \"Test.Inspection\" or the project webpage for more
|
||||
examples and more information.")
|
||||
(license license:expat)))
|
||||
|
@ -19,7 +19,7 @@
|
||||
;;; Copyright © 2018, 2019 Gabriel Hondet <gabrielhondet@gmail.com>
|
||||
;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net>
|
||||
;;; Copyright © 2019 Jacob MacDonald <jaccarmac@gmail.com>
|
||||
;;; Copyright © 2019 John Soo <jsoo1@asu.edu>
|
||||
;;; Copyright © 2019,2020 John Soo <jsoo1@asu.edu>
|
||||
;;; Copyright © 2019 Kyle Meyer <kyle@kyleam.com>
|
||||
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
|
||||
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
|
||||
@ -567,6 +567,21 @@ will destroy the permissions on the original file. This library preserves
|
||||
permissions while atomically writing to a file.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public ghc-atomic-write-0.2.0.7
|
||||
(package
|
||||
(inherit ghc-atomic-write)
|
||||
(version "0.2.0.7")
|
||||
(source
|
||||
(origin
|
||||
(inherit (package-source ghc-atomic-write))
|
||||
(uri (string-append
|
||||
"https://hackage.haskell.org/package/atomic-write/atomic-write-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"03cn3ii74h0w3g4h78xsx9v2sn58r3qsr2dbdwq340xwhiwcgxdm"))))))
|
||||
|
||||
(define-public ghc-attoparsec
|
||||
(package
|
||||
(name "ghc-attoparsec")
|
||||
@ -1535,6 +1550,82 @@ constructor which can be parameterised by a string-like type like:
|
||||
the resulting type will be insensitive to cases.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-cborg
|
||||
(package
|
||||
(name "ghc-cborg")
|
||||
(version "0.2.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://hackage/package/cborg/cborg-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1rdnvy0w17s70ikmbyrnwax5rvqh19l95sh8i7ipgxi23z1r0bp1"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-half" ,ghc-half)
|
||||
("ghc-primitive" ,ghc-primitive)))
|
||||
(native-inputs
|
||||
`(("ghc-aeson" ,ghc-aeson)
|
||||
("ghc-base64-bytestring" ,ghc-base64-bytestring)
|
||||
("ghc-base16-bytestring" ,ghc-base16-bytestring)
|
||||
("ghc-fail" ,ghc-fail)
|
||||
("ghc-quickcheck" ,ghc-quickcheck)
|
||||
("ghc-scientific" ,ghc-scientific)
|
||||
("ghc-tasty" ,ghc-tasty)
|
||||
("ghc-tasty-hunit" ,ghc-tasty-hunit)
|
||||
("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)
|
||||
("ghc-vector" ,ghc-vector)))
|
||||
(home-page "http://hackage.haskell.org/package/cborg")
|
||||
(synopsis "Concise Binary Object Representation")
|
||||
(description
|
||||
"This package (formerly binary-serialise-cbor) provides an
|
||||
efficient implementation of the Concise Binary Object
|
||||
Representation (CBOR), as specified by RFC 7049 at
|
||||
https://tools.ietf.org/html/rfc7049.
|
||||
|
||||
If you are looking for a library for serialisation of Haskell values, have a
|
||||
look at the @url{https://hackage.haskell.org/package/serialise} package, which
|
||||
is built upon this library.
|
||||
|
||||
An implementation of the standard bijection between CBOR and JSON is provided
|
||||
by the @url{https://hackage.haskell.org/package/cborg-json} package.
|
||||
|
||||
Also see @code{https://hackage.haskell.org/package/cbor-tool} for a convenient
|
||||
command-line utility for working with CBOR data.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-cborg-json
|
||||
(package
|
||||
(name "ghc-cborg-json")
|
||||
(version "0.2.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://hackage/package/cborg-json/cborg-json-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0ysilz7rrjk94sqr3a61s98hr9qfi1xg13bskmlpc6mpgi2s4s5b"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-aeson" ,ghc-aeson)
|
||||
("ghc-aeson-pretty" ,ghc-aeson-pretty)
|
||||
("ghc-unordered-containers" ,ghc-unordered-containers)
|
||||
("ghc-scientific" ,ghc-scientific)
|
||||
("ghc-vector" ,ghc-vector)
|
||||
("ghc-cborg" ,ghc-cborg)))
|
||||
(home-page "https://github.com/well-typed/cborg")
|
||||
(synopsis "A library for encoding JSON as CBOR")
|
||||
(description
|
||||
"This package implements the bijection between JSON and CBOR
|
||||
defined in the CBOR specification, RFC 7049.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-cereal
|
||||
(package
|
||||
(name "ghc-cereal")
|
||||
@ -2724,6 +2815,28 @@ package.")
|
||||
package.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-data-fix
|
||||
(package
|
||||
(name "ghc-data-fix")
|
||||
(version "0.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://hackage/package/data-fix/"
|
||||
"data-fix-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "14hk6hq5hdb3l5bhmzhw086jpzlvp9qbw9dzw30wlz5jbh2ihmvy"))))
|
||||
(build-system haskell-build-system)
|
||||
(home-page "https://github.com/spell-music/data-fix")
|
||||
(synopsis "Fixpoint data types")
|
||||
(description
|
||||
"Fixpoint types and recursion schemes. If you define your AST as
|
||||
fixpoint type, you get fold and unfold operations for free.
|
||||
|
||||
Thanks for contribution to: Matej Kollar, Herbert Valerio Riedel")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-data-hash
|
||||
(package
|
||||
(name "ghc-data-hash")
|
||||
@ -3244,6 +3357,30 @@ It is modeled after doctest for Python, see
|
||||
@uref{https://docs.python.org/library/doctest.html, the Doctest website}.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public ghc-dotgen
|
||||
(package
|
||||
(name "ghc-dotgen")
|
||||
(version "0.4.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://hackage/package/dotgen/dotgen-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"148q93qsmqgr5pzdwvpjqfd6bdm1pwzcp2rblfwswx2x8c5f43fg"))))
|
||||
(build-system haskell-build-system)
|
||||
(home-page "https://github.com/ku-fpg/dotgen")
|
||||
(synopsis
|
||||
"Simple interface for building .dot graph files")
|
||||
(description
|
||||
"This package provides a simple interface for building .dot graph
|
||||
files, for input into the dot and graphviz tools. It includes a
|
||||
monadic interface for building graphs.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-double-conversion
|
||||
(package
|
||||
(name "ghc-double-conversion")
|
||||
@ -4359,6 +4496,60 @@ specific Windows, Mac, and Linux file system event notification.")
|
||||
deriving mechanism in Haskell to arbitrary classes.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-generic-random
|
||||
(package
|
||||
(name "ghc-generic-random")
|
||||
(version "1.2.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://hackage.haskell.org/package/generic-random/"
|
||||
"generic-random-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "130lmblycxnpqbsl7vf6a90zccibnvcb5zaclfajcn3by39007lv"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs `(("ghc-quickcheck" ,ghc-quickcheck)))
|
||||
(native-inputs
|
||||
`(("ghc-inspection-testing" ,ghc-inspection-testing)))
|
||||
(arguments
|
||||
`(#:cabal-revision
|
||||
("1" "1d0hx41r7yq2a86ydnfh2fv540ah8cz05l071s2z4wxcjw0ymyn4")))
|
||||
(home-page
|
||||
"https://github.com/lysxia/generic-random")
|
||||
(synopsis
|
||||
"Generic random generators for QuickCheck")
|
||||
(description
|
||||
"Derive instances of @code{Arbitrary} for QuickCheck, with various options
|
||||
to customize implementations.
|
||||
|
||||
Automating the arbitrary boilerplate also ensures that when a type changes to
|
||||
have more or fewer constructors, then the generator either fixes itself to
|
||||
generate that new case (when using the uniform distribution) or causes a
|
||||
compilation error so you remember to fix it (when using an explicit
|
||||
distribution).
|
||||
|
||||
This package also offers a simple (optional) strategy to ensure termination
|
||||
for recursive types: make @code{Test.QuickCheck.Gen}'s size parameter decrease
|
||||
at every recursive call; when it reaches zero, sample directly from a
|
||||
trivially terminating generator given explicitly (@code{genericArbitraryRec}
|
||||
and @code{withBaseCase}) or implicitly (@code{genericArbitrary'}).")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public ghc-generic-random-1.3.0.1
|
||||
(package
|
||||
(inherit ghc-generic-random)
|
||||
(version "1.3.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://hackage.haskell.org/package/generic-random/"
|
||||
"generic-random-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0d9w7xcmsb31b95fr9d5jwbsajcl1yi4347dlbw4bybil2vjwd7k"))))
|
||||
(arguments '())))
|
||||
|
||||
(define-public ghc-generics-sop
|
||||
(package
|
||||
(name "ghc-generics-sop")
|
||||
@ -5112,6 +5303,37 @@ monad, as well as a typeclass abstracting their common operations, and
|
||||
a set of wrappers to use the hash tables in the IO monad.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-haskeline-0.8
|
||||
(package
|
||||
(name "ghc-haskeline")
|
||||
(version "0.8.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://hackage.haskell.org/package/haskeline/haskeline-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0gqsa5s0drim9m42hv4wrq61mnvcdylxysfxfw3acncwilfrn9pb"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs `(("ghc-exceptions" ,ghc-exceptions)))
|
||||
(native-inputs `(("ghc-hunit" ,ghc-hunit)))
|
||||
;; FIXME: Tests failing
|
||||
(arguments `(#:tests? #f))
|
||||
(home-page "https://github.com/judah/haskeline")
|
||||
(synopsis
|
||||
"Command-line interface for user input, written in Haskell")
|
||||
(description
|
||||
"Haskeline provides a user interface for line input in command-line
|
||||
programs. This library is similar in purpose to readline, but since it is
|
||||
written in Haskell it is (hopefully) more easily used in other Haskell
|
||||
programs.
|
||||
|
||||
Haskeline runs both on POSIX-compatible systems and on Windows.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-haskell-lexer
|
||||
(package
|
||||
(name "ghc-haskell-lexer")
|
||||
@ -6498,6 +6720,42 @@ of getters, folds, isomorphisms, traversals, setters and lenses and their
|
||||
indexed variants.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-lens-family-core
|
||||
(package
|
||||
(name "ghc-lens-family-core")
|
||||
(version "1.2.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://hackage/package/lens-family-core/lens-family-core-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"009rf10pj1cb50v44cc1pq7qvfrmkkk9dikahs9qmvbvgl3mykwi"))))
|
||||
(build-system haskell-build-system)
|
||||
(home-page
|
||||
"http://hackage.haskell.org/package/lens-family-core")
|
||||
(synopsis "Haskell 98 Lens Families")
|
||||
(description
|
||||
"This package provides first class functional references. In addition to
|
||||
the usual operations of getting, setting and composition, plus integration
|
||||
with the state monad, lens families provide some unique features:
|
||||
|
||||
@itemize
|
||||
@item Polymorphic updating
|
||||
@item Traversals
|
||||
@item Cast projection functions to read-only lenses
|
||||
@item Cast @code{toList} functions to read-only traversals
|
||||
@item Cast semantic editor combinators to modify-only traversals
|
||||
@end itemize
|
||||
|
||||
For optimal first-class support use the lens-family package with rank 2/rank N
|
||||
polymorphism. @code{Lens.Family.Clone} allows for first-class support of
|
||||
lenses and traversals for those who require Haskell 98.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-libffi
|
||||
(package
|
||||
(name "ghc-libffi")
|
||||
@ -6975,6 +7233,42 @@ With it, you can determine the type of a file by examining its contents rather
|
||||
than its name.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-managed
|
||||
(package
|
||||
(name "ghc-managed")
|
||||
(version "1.0.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://hackage/package/managed/managed-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1kbrw99yh5x5blykmx2n88mplbbi4ss1ij5j17b7asw6q0ihm9zi"))))
|
||||
(build-system haskell-build-system)
|
||||
(home-page "http://hackage.haskell.org/package/managed")
|
||||
(synopsis "Monad for managed values")
|
||||
(description
|
||||
"In Haskell you very often acquire values using the with... idiom using
|
||||
functions of type (a -> IO r) -> IO r. This idiom forms a Monad, which is a
|
||||
special case of the ContT monad (from transformers) or the Codensity
|
||||
monad (from kan-extensions). The main purpose behind this package is to
|
||||
provide a restricted form of these monads specialized to this unusually common
|
||||
case.
|
||||
|
||||
The reason this package defines a specialized version of these types
|
||||
is to:
|
||||
|
||||
@itemize
|
||||
@item be more beginner-friendly,
|
||||
@item simplify inferred types and error messages, and:
|
||||
@item provide some additional type class instances that would otherwise be
|
||||
orphan instances
|
||||
@end itemize")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-markdown-unlit
|
||||
(package
|
||||
(name "ghc-markdown-unlit")
|
||||
@ -8211,6 +8505,29 @@ replay capababilities, implementing fast parser monads, designing monadic
|
||||
DSLs, etc.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-optional-args
|
||||
(package
|
||||
(name "ghc-optional-args")
|
||||
(version "1.0.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://hackage/package/optional-args/optional-args-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1r5hhn6xvc01grggxdyy48daibwzi0aikgidq0ahpa6bfynm8d1f"))))
|
||||
(build-system haskell-build-system)
|
||||
(home-page
|
||||
"http://hackage.haskell.org/package/optional-args")
|
||||
(synopsis "Optional function arguments")
|
||||
(description
|
||||
"This library provides a type for specifying @code{Optional} function
|
||||
arguments.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-options
|
||||
(package
|
||||
(name "ghc-options")
|
||||
@ -8999,6 +9316,45 @@ the persistent interface, not for users of the persistent suite of database
|
||||
libraries.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public ghc-pgp-wordlist
|
||||
(package
|
||||
(name "ghc-pgp-wordlist")
|
||||
(version "0.1.0.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://hackage/package/pgp-wordlist/pgp-wordlist-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"15g6qh0fb7kjj3l0w8cama7cxgnhnhybw760md9yy7cqfq15cfzg"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-vector" ,ghc-vector)))
|
||||
(native-inputs
|
||||
`(("ghc-hunit" ,ghc-hunit)
|
||||
("ghc-tasty" ,ghc-tasty)
|
||||
("ghc-tasty-hunit" ,ghc-tasty-hunit)
|
||||
("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)
|
||||
("ghc-doctest" ,ghc-doctest)))
|
||||
(home-page
|
||||
"https://github.com/quchen/pgp-wordlist")
|
||||
(synopsis
|
||||
"Translate between binary data and a human-readable collection of words")
|
||||
(description
|
||||
"The PGP Word List consists of two phonetic alphabets, each with one word
|
||||
per possible byte value. A string of bytes is translated with these
|
||||
alphabets, alternating between them at each byte.
|
||||
|
||||
The PGP words corresponding to the bytes 5B 1D CA 6E are \"erase breakaway
|
||||
spellbind headwaters\", for example.
|
||||
|
||||
For further information, see
|
||||
@url{http://en.wikipedia.org/wiki/PGP_word_list}.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-pipes
|
||||
(package
|
||||
(name "ghc-pipes")
|
||||
@ -9160,6 +9516,76 @@ provides the pretty printing class and instances for the Prelude
|
||||
types.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-prettyprinter
|
||||
(package
|
||||
(name "ghc-prettyprinter")
|
||||
(version "1.2.1.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://hackage/package/prettyprinter/prettyprinter-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1p9c3q55hba4c0zyxc624g5df7wgsclpsmd8wqpdnmib882q9d1v"))))
|
||||
(build-system haskell-build-system)
|
||||
(native-inputs
|
||||
`(("ghc-doctest" ,ghc-doctest)
|
||||
("ghc-pgp-wordlist" ,ghc-pgp-wordlist)
|
||||
("ghc-tasty" ,ghc-tasty)
|
||||
("ghc-tasty-hunit" ,ghc-tasty-hunit)
|
||||
("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)))
|
||||
(home-page "https://github.com/quchen/prettyprinter")
|
||||
(synopsis
|
||||
"Modern, easy to use, well-documented, extensible pretty-printer")
|
||||
(description
|
||||
"A prettyprinter/text rendering engine. Easy to use, well-documented,
|
||||
ANSI terminal backend exists, HTML backend is trivial to implement, no name
|
||||
clashes, @code{Text}-based, extensible.")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public ghc-prettyprinter-1.6
|
||||
(package
|
||||
(inherit ghc-prettyprinter)
|
||||
(version "1.6.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://hackage/package/prettyprinter/prettyprinter-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32 "10fphxh8lvdaw7i8jyllwmj87w02db92mf99zfw5vddp9mv6b5rz"))))
|
||||
(inputs
|
||||
`(("ghc-quickckeck-instances" , ghc-quickcheck-instances)
|
||||
,@(package-inputs ghc-prettyprinter)))))
|
||||
|
||||
(define-public ghc-prettyprinter-ansi-terminal
|
||||
(package
|
||||
(name "ghc-prettyprinter-ansi-terminal")
|
||||
(version "1.1.1.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://hackage/package/prettyprinter-ansi-terminal/"
|
||||
"prettyprinter-ansi-terminal-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0ha6vz707qzb5ky7kdsnw2zgphg2dnxrpbrxy8gaw119vwhb9q6k"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-ansi-terminal" ,ghc-ansi-terminal)
|
||||
("ghc-prettyprinter" ,ghc-prettyprinter-1.6)))
|
||||
(native-inputs `(("ghc-doctest" ,ghc-doctest)))
|
||||
(home-page
|
||||
"https://github.com/quchen/prettyprinter")
|
||||
(synopsis
|
||||
"ANSI terminal backend for the prettyprinter package")
|
||||
(description "ANSI terminal backend for the prettyprinter package.")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public ghc-pretty-hex
|
||||
(package
|
||||
(name "ghc-pretty-hex")
|
||||
@ -9208,6 +9634,33 @@ complex generic values into an interactive Html page, for easier
|
||||
examination.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public ghc-pretty-simple
|
||||
(package
|
||||
(name "ghc-pretty-simple")
|
||||
(version "2.2.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://hackage/package/pretty-simple/"
|
||||
"pretty-simple-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0wsi9235ihm15s145lxi7325vv2k4bhighc5m88kn1lk0pl81aqq"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-ansi-terminal" ,ghc-ansi-terminal)
|
||||
("ghc-glob" ,ghc-glob)
|
||||
("ghc-optparse-applicative" ,ghc-optparse-applicative)
|
||||
("ghc-aeson" ,ghc-aeson)))
|
||||
(native-inputs
|
||||
`(("ghc-doctest" ,ghc-doctest)))
|
||||
(home-page "https://github.com/cdepillabout/pretty-simple")
|
||||
(synopsis "Pretty printer for data types with a 'Show' instance")
|
||||
(description
|
||||
"Pretty-simple is a pretty printer for Haskell data types that have a
|
||||
Show instance.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-primitive
|
||||
(package
|
||||
(name "ghc-primitive")
|
||||
@ -9890,6 +10343,46 @@ inspired by libtre.")
|
||||
"This provides an extra text interface for regex-tdfa.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-repline
|
||||
(package
|
||||
(name "ghc-repline")
|
||||
(version "0.2.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://hackage/package/repline/repline-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ph21kbbanlcs8n5lwk16g9vqkb98mkbz5mzwrp8j2rls2921izc"))))
|
||||
(build-system haskell-build-system)
|
||||
(home-page "https://github.com/sdiehl/repline")
|
||||
(synopsis "Haskeline wrapper for GHCi-like REPL interfaces")
|
||||
(description
|
||||
"Haskeline wrapper for GHCi-like REPL interfaces. Composable with
|
||||
normal mtl transformers.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public ghc-repline-0.3
|
||||
(package
|
||||
(inherit ghc-repline)
|
||||
(version "0.3.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://hackage/package/repline/repline-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0niihfyggg2qisadg7w49cr5k5qyyynia93iip0ng2bbmzwi88g8"))))
|
||||
(inputs
|
||||
`(("ghc-exceptions" ,ghc-exceptions)
|
||||
("ghc-haskeline" ,ghc-haskeline-0.8)))))
|
||||
|
||||
(define-public ghc-rerebase
|
||||
(package
|
||||
(name "ghc-rerebase")
|
||||
@ -10642,6 +11135,56 @@ semigroup.")
|
||||
("ghc-hashable" ,ghc-hashable-bootstrap)))
|
||||
(properties '((hidden? #t)))))
|
||||
|
||||
(define-public ghc-serialise
|
||||
(package
|
||||
(name "ghc-serialise")
|
||||
(version "0.2.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://hackage/package/serialise/serialise-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"19ary6ivzk8z7wcxhm860qmh7pwqj0qjqzav1h42y85l608zqgh4"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-cborg" ,ghc-cborg)
|
||||
("ghc-half" ,ghc-half)
|
||||
("ghc-hashable" ,ghc-hashable)
|
||||
("ghc-primitive" ,ghc-primitive)
|
||||
("ghc-unordered-containers" ,ghc-unordered-containers)
|
||||
("ghc-vector" ,ghc-vector)))
|
||||
(native-inputs
|
||||
`(("ghc-quickcheck" ,ghc-quickcheck)
|
||||
("ghc-tasty" ,ghc-tasty)
|
||||
("ghc-tasty-hunit" ,ghc-tasty-hunit)
|
||||
("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)
|
||||
("ghc-quickcheck-instances" ,ghc-quickcheck-instances)))
|
||||
(arguments
|
||||
`(#:cabal-revision
|
||||
("1" "1rknhad1i8bpknsnphmcmb6dnb48c2p2c13ia2qqch3hkhsvfpr6")))
|
||||
(home-page "https://github.com/well-typed/cborg")
|
||||
(synopsis "Binary serialisation library for Haskell values")
|
||||
(description
|
||||
"This package (formerly binary-serialise-cbor) provides pure,
|
||||
efficient serialization of Haskell values directly into ByteStrings for
|
||||
storage or transmission purposes. By providing a set of type class instances,
|
||||
you can also serialise any custom data type you have as well.
|
||||
|
||||
The underlying binary format used is the 'Concise Binary Object
|
||||
Representation', or CBOR, specified in RFC 7049. As a result, serialised
|
||||
Haskell values have implicit structure outside of the Haskell program itself,
|
||||
meaning they can be inspected or analyzed without custom tools.
|
||||
|
||||
An implementation of the standard bijection between CBOR and JSON is
|
||||
provided by the https://hackage.haskell.org/package/cborg-json
|
||||
package. Also see https://hackage.haskell.org/package/cbor-tool for a
|
||||
convenient command-line utility for working with CBOR data.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-setenv
|
||||
(package
|
||||
(name "ghc-setenv")
|
||||
@ -10983,6 +11526,32 @@ core of @url{https://hackage.haskell.org/package/generics-sop,
|
||||
generics-sop}.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-special-values
|
||||
(package
|
||||
(name "ghc-special-values")
|
||||
(version "0.1.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://hackage.haskell.org/package/special-values/"
|
||||
"special-values-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1kkdw2c4d2hha99v9f89ahmifjxp7fxmxyfwq9a8xk6s0h9xs51w"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-scientific" ,ghc-scientific)
|
||||
("ghc-ieee754" ,ghc-ieee754)
|
||||
("ghc-nats" ,ghc-nats)))
|
||||
(home-page
|
||||
"https://github.com/minad/special-values#readme")
|
||||
(synopsis "Typeclass providing special values")
|
||||
(description
|
||||
"Special values are provided by a SpecialValues typeclass. Those can be
|
||||
used for example by QuickCheck, see quickcheck-special." )
|
||||
(license license:expat)))
|
||||
|
||||
(define-public ghc-split
|
||||
(package
|
||||
(name "ghc-split")
|
||||
@ -11056,6 +11625,37 @@ internal state).")
|
||||
(native-inputs '())
|
||||
(properties '((hidden? #t)))))
|
||||
|
||||
(define-public ghc-spoon
|
||||
(package
|
||||
(name "ghc-spoon")
|
||||
(version "0.3.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://hackage.haskell.org/package/spoon/spoon-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1m41k0mfy6fpfrv2ym4m5jsjaj9xdfl2iqpppd3c4d0fffv51cxr"))))
|
||||
(build-system haskell-build-system)
|
||||
(arguments
|
||||
`(#:cabal-revision
|
||||
("1"
|
||||
"09s5jjcsg4g4qxchq9g2l4i9d5zh3rixpkbiysqcgl69kj8mwv74")))
|
||||
(home-page
|
||||
"http://hackage.haskell.org/package/spoon")
|
||||
(synopsis
|
||||
"Catch errors thrown from pure computations")
|
||||
(description
|
||||
"Takes an error-throwing expression and puts it back in the Maybe it
|
||||
belongs in.
|
||||
|
||||
Note that this suffers from the
|
||||
@url{https://ghc.haskell.org/trac/ghc/ticket/5902}. Buyer beware.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-statevar
|
||||
(package
|
||||
(name "ghc-statevar")
|
||||
@ -11867,6 +12467,44 @@ instances for strict and lazy text types for versions older than 1.2.1 of the
|
||||
text package.")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public ghc-text-manipulate
|
||||
(package
|
||||
(name "ghc-text-manipulate")
|
||||
(version "0.2.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://hackage.haskell.org/package/text-manipulate"
|
||||
"/text-manipulate-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0bwxyjj3ll45srxhsp2ihikgqglvjc6m02ixr8xpvyqwkcfwgsg0"))))
|
||||
(build-system haskell-build-system)
|
||||
(native-inputs
|
||||
`(("ghc-tasty" ,ghc-tasty)
|
||||
("ghc-tasty-hunit" ,ghc-tasty-hunit)))
|
||||
(home-page
|
||||
"https://github.com/brendanhay/text-manipulate")
|
||||
(synopsis
|
||||
"Case conversion, word boundary manipulation, and textual subjugation")
|
||||
(description
|
||||
"Manipulate identifiers and structurally non-complex pieces of text by
|
||||
delimiting word boundaries via a combination of whitespace,
|
||||
control-characters, and case-sensitivity.
|
||||
|
||||
Has support for common idioms like casing of programmatic variable names,
|
||||
taking, dropping, and splitting by word, and modifying the first character of
|
||||
a piece of text.
|
||||
|
||||
Caution: this library makes heavy use of the text library's internal loop
|
||||
optimisation framework. Since internal modules are not guaranteed to have a
|
||||
stable API there is potential for build breakage when the text dependency is
|
||||
upgraded. Consider yourself warned!")
|
||||
(license license:mpl2.0)))
|
||||
|
||||
(define-public ghc-text-metrics
|
||||
(package
|
||||
(name "ghc-text-metrics")
|
||||
@ -12537,6 +13175,69 @@ generating functions similar to those in @code{Data.List} for tuples of
|
||||
statically known size.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-turtle
|
||||
(package
|
||||
(name "ghc-turtle")
|
||||
(version "1.5.15")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://hackage/package/turtle/turtle-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0yckgsc2a4g5x867gni80ldp226bsnhncfbil4ql6v2zwm4r8p7f"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint)
|
||||
("ghc-async" ,ghc-async)
|
||||
("ghc-clock" ,ghc-clock)
|
||||
("ghc-exceptions" ,ghc-exceptions)
|
||||
("ghc-foldl" ,ghc-foldl)
|
||||
("ghc-hostname" ,ghc-hostname)
|
||||
("ghc-managed" ,ghc-managed)
|
||||
("ghc-semigroups" ,ghc-semigroups)
|
||||
("ghc-system-filepath" ,ghc-system-filepath)
|
||||
("ghc-system-fileio" ,ghc-system-fileio)
|
||||
("ghc-streaming-commons" ,ghc-streaming-commons)
|
||||
("ghc-temporary" ,ghc-temporary)
|
||||
("ghc-optparse-applicative" ,ghc-optparse-applicative)
|
||||
("ghc-optional-args" ,ghc-optional-args)
|
||||
("ghc-unix-compat" ,ghc-unix-compat)))
|
||||
(native-inputs
|
||||
`(("ghc-doctest" ,ghc-doctest)
|
||||
("ghc-fail" ,ghc-fail)))
|
||||
(arguments
|
||||
`(#:cabal-revision
|
||||
("1" "02q1rv7zx31xz9wnmcqwd4w3iw7623p07iyi21zr0cqlignic5pg")))
|
||||
(home-page
|
||||
"http://hackage.haskell.org/package/turtle")
|
||||
(synopsis "Shell programming, Haskell-style")
|
||||
(description
|
||||
"Turtle is a reimplementation of the Unix command line environment in
|
||||
Haskell so that you can use Haskell as both a shell and a scripting
|
||||
language. Features include:
|
||||
|
||||
@itemize
|
||||
@item Batteries included: Command an extended suite of predefined utilities.
|
||||
@item Interoperability: You can still run external shell commands.
|
||||
@item Portability: Works on Windows, OS X, and Linux.
|
||||
@item Exception safety: Safely acquire and release resources.
|
||||
@item Streaming: Transform or fold command output in constant space.
|
||||
@item Patterns: Use typed regular expressions that can parse structured values.
|
||||
@item Formatting: Type-safe printf-style text formatting.
|
||||
@item Modern: Supports text and system-filepath.
|
||||
@end itemize
|
||||
|
||||
Read \"Turtle.Tutorial\" for a detailed tutorial or \"Turtle.Prelude\" for a
|
||||
quick-start guide. Turtle is designed to be beginner-friendly, but as a
|
||||
result lacks certain features, like tracing commands. If you feel comfortable
|
||||
using turtle then you should also check out the Shelly library which provides
|
||||
similar functionality.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-typed-process
|
||||
(package
|
||||
(name "ghc-typed-process")
|
||||
|
@ -10523,14 +10523,14 @@ classes prior to Java SE 8.")
|
||||
(define-public java-xerces
|
||||
(package
|
||||
(name "java-xerces")
|
||||
(version "2.11.0")
|
||||
(version "2.12.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://apache/xerces/j/source/"
|
||||
"Xerces-J-src." version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1006igwy2lqrmjvdk64v8dg6qbk9c29pm8xxx7r87n0vnpvmx6pm"))
|
||||
(base32 "0494kq36gw3nah19ifb720vwxbpg4ww0k6m3zq6wyanw6a083p6s"))
|
||||
(patches (search-patches
|
||||
"java-xerces-xjavac_taskdef.patch"
|
||||
"java-xerces-build_dont_unzip.patch"
|
||||
|
@ -4,7 +4,7 @@
|
||||
;;; Copyright © 2015, 2019 Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
|
||||
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017 Ben Woodcroft <donttrustben@gmail.com>
|
||||
;;; Copyright © 2017, 2019 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017, 2019, 2020 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;;
|
||||
@ -28,6 +28,7 @@
|
||||
#:use-module (guix licenses)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python)
|
||||
@ -182,17 +183,60 @@ project.")
|
||||
(define-public ruby-ffi
|
||||
(package
|
||||
(name "ruby-ffi")
|
||||
(version "1.10.0")
|
||||
(version "1.12.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (rubygems-uri "ffi" version))
|
||||
;; Pull from git because the RubyGems release bundles LibFFI,
|
||||
;; and comes with a gemspec that makes it difficult to unbundle.
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ffi/ffi")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"))))
|
||||
"1cvqsbjr2gfjgqggq9kdx90qhhzr7qkyr9wmxdsfsik6cnxnnpmd"))))
|
||||
(build-system ruby-build-system)
|
||||
;; FIXME: Before running tests the build system attempts to build libffi
|
||||
;; from sources.
|
||||
(arguments `(#:tests? #f))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'do-not-depend-on-ccache
|
||||
(lambda _
|
||||
(substitute* "spec/ffi/fixtures/GNUmakefile"
|
||||
(("^CCACHE := .*")
|
||||
""))
|
||||
#t))
|
||||
(replace 'replace-git-ls-files
|
||||
(lambda _
|
||||
;; Do not try to execute git, or include the (un)bundled LibFFI.
|
||||
(substitute* "ffi.gemspec"
|
||||
(("git ls-files -z")
|
||||
"find * -type f -print0 | sort -z")
|
||||
(("lfs \\+?= .*")
|
||||
"lfs = []\n"))
|
||||
(substitute* "Rakefile"
|
||||
(("LIBFFI_GIT_FILES = .*")
|
||||
"LIBFFI_GIT_FILES = []\n"))
|
||||
#t))
|
||||
(replace 'build
|
||||
(lambda _
|
||||
;; Tests depend on the native extensions, so we build it
|
||||
;; beforehand without going through the gem machinery.
|
||||
(invoke "rake" "compile")
|
||||
|
||||
;; XXX: Ideally we'd use "rake native gem" here to prevent the
|
||||
;; install phase from needlessly rebuilding everything, but that
|
||||
;; requires the bundled LibFFI, and the install phase can not
|
||||
;; deal with such gems anyway.
|
||||
(invoke "gem" "build" "ffi.gemspec")))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(if tests?
|
||||
(begin
|
||||
(setenv "MAKE" "make")
|
||||
(setenv "CC" "gcc")
|
||||
(invoke "rspec" "spec"))
|
||||
(format #t "test suite not run~%"))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("ruby-rake-compiler" ,ruby-rake-compiler)
|
||||
("ruby-rspec" ,ruby-rspec)
|
||||
|
@ -370,50 +370,50 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
||||
(sha256 hash)))
|
||||
|
||||
|
||||
(define-public linux-libre-5.6-version "5.6.14")
|
||||
(define-public linux-libre-5.6-version "5.6.15")
|
||||
(define-public linux-libre-5.6-pristine-source
|
||||
(let ((version linux-libre-5.6-version)
|
||||
(hash (base32 "18vyxi64i93v4qyky5q62kkasm1da7wmz91xfkx3j7ki84skyxik")))
|
||||
(hash (base32 "0kh34f9vdfsi9g83fa1i1926djyzfi466w02c4y4d46ljf9pkav5")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-5.6)))
|
||||
|
||||
(define-public linux-libre-5.4-version "5.4.42")
|
||||
(define-public linux-libre-5.4-version "5.4.43")
|
||||
(define-public linux-libre-5.4-pristine-source
|
||||
(let ((version linux-libre-5.4-version)
|
||||
(hash (base32 "0cdwazpzfrrb2y5fp87v9yihy7v8mlbqjzxpzmv7p83609y1nhsf")))
|
||||
(hash (base32 "0i07g72138xdf1l8x593jndq0waf3fx7plz3m6n5f9fl885bjrr6")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-5.4)))
|
||||
|
||||
(define-public linux-libre-4.19-version "4.19.124")
|
||||
(define-public linux-libre-4.19-version "4.19.125")
|
||||
(define-public linux-libre-4.19-pristine-source
|
||||
(let ((version linux-libre-4.19-version)
|
||||
(hash (base32 "005dznldnj1m03cbkc5pd2q2cv9jj1j6a0x2vh4p79ypg4c01nfm")))
|
||||
(hash (base32 "0zmxs6q2rgssvsh76xq9xgcax7bps19x2448d1q1fj9pzc7g8hwq")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-4.19)))
|
||||
|
||||
(define-public linux-libre-4.14-version "4.14.181")
|
||||
(define-public linux-libre-4.14-version "4.14.182")
|
||||
(define-public linux-libre-4.14-pristine-source
|
||||
(let ((version linux-libre-4.14-version)
|
||||
(hash (base32 "0kaasqhmg9in7pf4ldk9z4z1cjgv1c9xdr1ca0pznngygibym6xb")))
|
||||
(hash (base32 "142v7qnfska86jqzilwq00kxdrq08iaaaw7f47xp9bnhb8fiy7b7")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-4.14)))
|
||||
|
||||
(define-public linux-libre-4.9-version "4.9.224")
|
||||
(define-public linux-libre-4.9-version "4.9.225")
|
||||
(define-public linux-libre-4.9-pristine-source
|
||||
(let ((version linux-libre-4.9-version)
|
||||
(hash (base32 "0jf92cx0b3wq9fxa3169wk4wqvy58hglfk6lsynszy8kjplhfvfz")))
|
||||
(hash (base32 "1s63aymgsc4lsysy9d972ps9cyrf6bncyy5wcpv5a3wbaj678iz5")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-4.9)))
|
||||
|
||||
(define-public linux-libre-4.4-version "4.4.224")
|
||||
(define-public linux-libre-4.4-version "4.4.225")
|
||||
(define-public linux-libre-4.4-pristine-source
|
||||
(let ((version linux-libre-4.4-version)
|
||||
(hash (base32 "1lb8ypn558vk73bj4a20wq40cig9vmzjn2xzzdws78gfair6hxpg")))
|
||||
(hash (base32 "0pn66hf9yrjg15skq1inscr5m0slvgsd2qm8rg5id70llrb4jis9")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-4.4)))
|
||||
@ -1223,11 +1223,8 @@ at login. Local and dynamic reconfiguration are its key features.")
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
(let* ((target ,(%current-target-system)))
|
||||
(list (string-append "CC=" (if target
|
||||
(string-append target "-gcc")
|
||||
"gcc"))
|
||||
(string-append "prefix=" (assoc-ref %outputs "out"))))
|
||||
(list (string-append "CC=" ,(cc-for-target))
|
||||
(string-append "prefix=" (assoc-ref %outputs "out")))
|
||||
#:tests? #f ; no test suite
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
@ -3386,12 +3383,9 @@ interface.")
|
||||
#t))))
|
||||
#:test-target "verify"
|
||||
#:make-flags (let ((out (assoc-ref %outputs "out"))
|
||||
(regdb (assoc-ref %build-inputs "wireless-regdb"))
|
||||
(target ,(%current-target-system)))
|
||||
(regdb (assoc-ref %build-inputs "wireless-regdb")))
|
||||
(list
|
||||
(string-append
|
||||
"CC=" (if target
|
||||
(string-append target "-gcc") "gcc"))
|
||||
(string-append "CC=" ,(cc-for-target))
|
||||
"V=1"
|
||||
|
||||
;; Disable signature-checking on 'regulatory.bin'.
|
||||
@ -4512,8 +4506,8 @@ Ridge, Joliet, and zisofs.")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://www.nico.schottelius.org/software/gpm/archives/gpm-"
|
||||
version ".tar.bz2"))
|
||||
"https://www.nico.schottelius.org/software/gpm/archives/"
|
||||
"gpm-" version ".tar.bz2"))
|
||||
(patches (search-patches "gpm-glibc-2.26.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
@ -4542,7 +4536,7 @@ Ridge, Joliet, and zisofs.")
|
||||
("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("libtool" ,libtool)))
|
||||
(home-page "http://www.nico.schottelius.org/software/gpm/")
|
||||
(home-page "https://www.nico.schottelius.org/software/gpm/")
|
||||
(synopsis "Mouse support for the Linux console")
|
||||
(description
|
||||
"The GPM (general-purpose mouse) daemon is a mouse server for
|
||||
@ -5992,16 +5986,14 @@ re-use code and to avoid re-inventing the wheel.")
|
||||
(define-public libnftnl
|
||||
(package
|
||||
(name "libnftnl")
|
||||
(version "1.1.5")
|
||||
(version "1.1.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://netfilter.org/libnftnl/"
|
||||
"libnftnl-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32 "1wqlxf76bkqf3qhka9sw32qhb2ni20q1k6rn3iril2kw482lvpk6"))
|
||||
(patches
|
||||
(search-patches "libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch"))))
|
||||
(base32 "1jhyxsfrfqjascrm5lnxlcyzj6n0gc0qc1bp2asb7m61dxlmmsy1"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
@ -7050,12 +7042,8 @@ system boot process.")
|
||||
`(#:tests? #f ; there are no tests
|
||||
#:make-flags
|
||||
(let ((prefix-dir (lambda (var dir)
|
||||
(string-append var "=" %output "/" dir)))
|
||||
(target ,(%current-target-system)))
|
||||
(list (string-append "CC="
|
||||
(if target
|
||||
(string-append target "-gcc")
|
||||
"gcc"))
|
||||
(string-append var "=" %output "/" dir))))
|
||||
(list (string-append "CC=" ,(cc-for-target))
|
||||
(prefix-dir "SBINDIR" "sbin/")
|
||||
(prefix-dir "ETCDIR" "etc/")
|
||||
(prefix-dir "MANDIR" "share/man/")))
|
||||
|
@ -806,7 +806,7 @@ enough to play the original mainframe Zork all the way through.")
|
||||
(define-public txr
|
||||
(package
|
||||
(name "txr")
|
||||
(version "235")
|
||||
(version "238")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -815,12 +815,15 @@ enough to play the original mainframe Zork all the way through.")
|
||||
(commit (string-append "txr-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0kpqk2x0sz7sqxsrhasq0xnljjlnxwhh4xjx2nii0zy2jkv4vsbn"))))
|
||||
(base32 "0asdq4n828xb1m31s7f47mqcbjqkzxz11bwnw8v3f2249m93ync4"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags
|
||||
(list "cc=gcc"
|
||||
(string-append "--prefix=" (assoc-ref %outputs "out")))
|
||||
`(#:configure-flags
|
||||
(let ((target ,(%current-target-system)))
|
||||
(list (string-append "cc=" (if target
|
||||
(string-append target "-gcc")
|
||||
"gcc"))
|
||||
(string-append "--prefix=" (assoc-ref %outputs "out"))))
|
||||
#:test-target "tests"
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
|
@ -201,7 +201,11 @@ compiler. In LLVM this library is called \"compiler-rt\".")
|
||||
(supported-systems (delete "mips64el-linux" %supported-systems))))
|
||||
|
||||
(define* (clang-from-llvm llvm clang-runtime hash
|
||||
#:key (patches '()))
|
||||
#:key (patches '()) tools-extra)
|
||||
"Produce Clang with dependencies on LLVM and CLANG-RUNTIME, and applying the
|
||||
given PATCHES. When TOOLS-EXTRA is given, it must point to the
|
||||
'clang-tools-extra' tarball, which contains code for 'clang-tidy', 'pp-trace',
|
||||
'modularize', and other tools."
|
||||
(package
|
||||
(name "clang")
|
||||
(version (package-version llvm))
|
||||
@ -218,11 +222,15 @@ compiler. In LLVM this library is called \"compiler-rt\".")
|
||||
;; doesn't seem to be any way to do this with clang's autotools-based
|
||||
;; build system.
|
||||
(build-system cmake-build-system)
|
||||
(outputs (if tools-extra '("out" "extra") '("out")))
|
||||
(native-inputs (package-native-inputs llvm))
|
||||
(inputs
|
||||
`(("libxml2" ,libxml2)
|
||||
("gcc-lib" ,gcc "lib")
|
||||
,@(package-inputs llvm)))
|
||||
,@(package-inputs llvm)
|
||||
,@(if tools-extra
|
||||
`(("clang-tools-extra" ,tools-extra))
|
||||
'())))
|
||||
(propagated-inputs
|
||||
`(("llvm" ,llvm)
|
||||
("clang-runtime" ,clang-runtime)))
|
||||
@ -243,6 +251,71 @@ compiler. In LLVM this library is called \"compiler-rt\".")
|
||||
#:build-type "Release"
|
||||
|
||||
#:phases (modify-phases %standard-phases
|
||||
,@(if tools-extra
|
||||
`((add-after 'unpack 'add-tools-extra
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; Unpack the 'clang-tools-extra' tarball under
|
||||
;; tools/.
|
||||
(let ((extra (assoc-ref inputs
|
||||
"clang-tools-extra")))
|
||||
(invoke "tar" "xf" extra)
|
||||
(rename-file ,(string-append
|
||||
"clang-tools-extra-"
|
||||
(package-version llvm)
|
||||
".src")
|
||||
"tools/extra")
|
||||
#t)))
|
||||
(add-after 'install 'move-extra-tools
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; Move the extra tools to the "extra" output.
|
||||
;; These programs alone weigh in at 296 MiB,
|
||||
;; because they statically-link a whole bunch of
|
||||
;; Clang libraries.
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(extra (assoc-ref outputs "extra"))
|
||||
(bin (string-append out "/bin"))
|
||||
(bin* (string-append extra "/bin"))
|
||||
(lib (string-append out "/lib")))
|
||||
(define (move program)
|
||||
(rename-file (string-append bin "/" program)
|
||||
(string-append bin* "/"
|
||||
program)))
|
||||
|
||||
(mkdir-p bin*)
|
||||
(for-each move
|
||||
'("clang-apply-replacements"
|
||||
"clang-change-namespace"
|
||||
"clangd"
|
||||
"clang-doc"
|
||||
"clang-include-fixer"
|
||||
"clang-move"
|
||||
"clang-query"
|
||||
"clang-reorder-fields"
|
||||
"clang-tidy"
|
||||
"find-all-symbols"
|
||||
"modularize"
|
||||
"pp-trace"))
|
||||
|
||||
;; Remove MiBs of .a files coming from
|
||||
;; 'clang-tools-extra'.
|
||||
(for-each (lambda (component)
|
||||
(delete-file
|
||||
(string-append lib "/libclang"
|
||||
component ".a")))
|
||||
'("ApplyReplacements"
|
||||
"ChangeNamespace"
|
||||
"Daemon"
|
||||
"DaemonTweaks"
|
||||
"Doc"
|
||||
"IncludeFixer"
|
||||
"IncludeFixerPlugin"
|
||||
"Move"))
|
||||
(for-each delete-file
|
||||
(find-files
|
||||
lib
|
||||
"^(libfindAllSymbols|libclangTidy)"))
|
||||
#t))))
|
||||
'())
|
||||
(add-after 'unpack 'add-missing-triplets
|
||||
(lambda _
|
||||
;; Clang iterates through known triplets to search for
|
||||
@ -414,7 +487,15 @@ output), and Binutils.")
|
||||
(define-public clang-10
|
||||
(clang-from-llvm llvm-10 clang-runtime-10
|
||||
"08fbxa2a0kr3ni35ckppj0kyvlcyaywrhpqwcdrdy0z900mhcnw8"
|
||||
#:patches '("clang-10.0-libc-search-path.patch")))
|
||||
#:patches '("clang-10.0-libc-search-path.patch")
|
||||
#:tools-extra
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (llvm-download-uri "clang-tools-extra"
|
||||
(package-version llvm-10)))
|
||||
(sha256
|
||||
(base32
|
||||
"074ija5s2jsdn0k035r2dzmryjmqxdnyg4xwvaqych2bazv8rpxc")))))
|
||||
|
||||
(define-public clang-toolchain-10
|
||||
(make-clang-toolchain clang-10))
|
||||
|
@ -4,7 +4,7 @@
|
||||
;;; Copyright © 2017 Nikita <nikita@n0.is>
|
||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2017 Brendan Tildesley <mail@brendan.scot>
|
||||
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 ison <ison@airmail.cc>
|
||||
;;; Copyright © 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||
@ -31,6 +31,7 @@
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages bash)
|
||||
#:use-module (gnu packages curl)
|
||||
#:use-module (gnu packages disk)
|
||||
#:use-module (gnu packages docbook)
|
||||
#:use-module (gnu packages file-systems)
|
||||
@ -104,14 +105,14 @@ libFM file management library.")))
|
||||
(define-public lxappearance
|
||||
(package
|
||||
(name "lxappearance")
|
||||
(version "0.6.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/lxde/"
|
||||
"LXAppearance/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"07r0xbi6504zjnbpan7zrn7gi4j0kbsqqfpj8v2x94gr05p16qj4"))))
|
||||
(version "0.6.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/lxde/"
|
||||
"LXAppearance/lxappearance-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("gtk+" ,gtk+-2)))
|
||||
(native-inputs `(("intltool" ,intltool)
|
||||
@ -125,16 +126,16 @@ able to change themes, icons, and fonts used by GTK+ applications.")
|
||||
(define-public lxrandr
|
||||
(package
|
||||
(name "lxrandr")
|
||||
(version "0.3.1")
|
||||
(version "0.3.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/lxde/LXRandR"
|
||||
"%20%28monitor%20config%20tool%29/LXRandR%20"
|
||||
(version-major+minor version) ".x/"
|
||||
name "-" version ".tar.xz"))
|
||||
"lxrandr-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0khqi42paqg82jllb2kza4arf3fafzgq90fhyr3rw3d9hn23763d"))))
|
||||
"04n3vgh3ix12p8jfs4w0dyfq3anbjy33h7g53wbbqqc0f74xyplb"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("gtk+" ,gtk+-2)))
|
||||
(native-inputs `(("intltool" ,intltool)
|
||||
@ -518,16 +519,14 @@ in LXDE.")
|
||||
(define-public lxsession
|
||||
(package
|
||||
(name "lxsession")
|
||||
(version "0.5.3")
|
||||
(version "0.5.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://downloads.sourceforge.net/lxde/"
|
||||
name "-" version ".tar.xz"))
|
||||
(patches (search-patches "lxsession-use-gapplication.patch"))
|
||||
"lxsession-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1a0zmyywwzdh59nc0l94cir18vhp633z4q2xfhn5zx11ajj45gwh"))
|
||||
(base32 "0imv9nysip1j9lrb2z96kl05isjgp312323wnnd5b59h0ff0sgp4"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Remove C files generated by Vala so we can build from source.
|
||||
@ -560,6 +559,8 @@ in LXDE.")
|
||||
("intltool" ,intltool)
|
||||
("docbook-xsl" ,docbook-xsl)
|
||||
("vala" ,vala)
|
||||
|
||||
;; For bootstrapping.
|
||||
("autoconf" ,autoconf)
|
||||
("automake" ,automake)))
|
||||
(synopsis "Lightweight X11 session manager")
|
||||
@ -571,15 +572,14 @@ in LXDE.")
|
||||
(define-public lxpanel
|
||||
(package
|
||||
(name "lxpanel")
|
||||
(version "0.9.3")
|
||||
(version "0.10.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://downloads.sourceforge.net/lxde/"
|
||||
name "-" version ".tar.xz"))
|
||||
"lxpanel-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ccgv7jgl3y865cpb6w7baaz7468fxncm83bqxlwyni5bwhglb1l"))))
|
||||
(base32 "0zis3b815p375s6mymhf5sn1a0c1xv0ixxzb0mh3fqhrby6cqy26"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
@ -594,7 +594,8 @@ in LXDE.")
|
||||
#t))))))
|
||||
(inputs
|
||||
;; TODO: libindicator-0.3.0
|
||||
`(("gtk+-2" ,gtk+-2)
|
||||
`(("curl" ,curl)
|
||||
("gtk+-2" ,gtk+-2)
|
||||
("alsa-lib" ,alsa-lib)
|
||||
("libwnck-2" ,libwnck-2)
|
||||
("keybinder" ,keybinder)
|
||||
|
@ -1403,7 +1403,11 @@ Python.")
|
||||
(list "CC=gcc")
|
||||
#:modules ((ice-9 ftw)
|
||||
(guix build utils)
|
||||
(guix build cmake-build-system))
|
||||
(guix build cmake-build-system)
|
||||
((guix build python-build-system)
|
||||
#:select (python-version)))
|
||||
#:imported-modules (,@%cmake-build-system-modules
|
||||
(guix build python-build-system))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'set-source-file-times-to-1980
|
||||
@ -1428,6 +1432,12 @@ Python.")
|
||||
;; optional package.
|
||||
(substitute* "tensorflow/tools/pip_package/setup.py"
|
||||
((".*'tensorboard >.*") ""))
|
||||
|
||||
;; Fix the build with python-3.8, taken from rejected upstream patch:
|
||||
;; https://github.com/tensorflow/tensorflow/issues/34197
|
||||
(substitute* (find-files "tensorflow/python" ".*\\.cc$")
|
||||
(("(nullptr,)(\\ +/. tp_print)" _ _ tp_print)
|
||||
(string-append "NULL, " tp_print)))
|
||||
#t))
|
||||
(add-after 'python3.7-compatibility 'chdir
|
||||
(lambda _ (chdir "tensorflow/contrib/cmake") #t))
|
||||
@ -1617,16 +1627,19 @@ INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n")))
|
||||
(invoke "make" "tf_python_build_pip_package")
|
||||
#t))
|
||||
(add-after 'build-pip-package 'install-python
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(wheel (car (find-files "../build/tf_python/dist/" "\\.whl$"))))
|
||||
(wheel (car (find-files "../build/tf_python/dist/" "\\.whl$")))
|
||||
(python-version (python-version
|
||||
(assoc-ref inputs "python"))))
|
||||
(invoke "python" "-m" "pip" "install" wheel
|
||||
(string-append "--prefix=" out))
|
||||
|
||||
;; XXX: broken RUNPATH, see fix-python-build phase.
|
||||
(delete-file
|
||||
(string-append
|
||||
out "/lib/python3.7/site-packages/tensorflow/contrib/"
|
||||
out "/lib/python" python-version
|
||||
"/site-packages/tensorflow/contrib/"
|
||||
"seq2seq/python/ops/lib_beam_search_ops.so"))
|
||||
#t))))))
|
||||
(native-inputs
|
||||
@ -1808,7 +1821,7 @@ advanced research.")
|
||||
("numpy" ,python-numpy)
|
||||
("pandas" ,python-pandas)
|
||||
("scipy" ,python-scipy)))
|
||||
(home-page "http://github.com/interpretable-ml/iml")
|
||||
(home-page "https://github.com/interpretable-ml/iml")
|
||||
(synopsis "Interpretable Machine Learning (iML) package")
|
||||
(description "Interpretable ML (iML) is a set of data type objects,
|
||||
visualizations, and interfaces that can be used by any method designed to
|
||||
|
@ -347,7 +347,7 @@ to run without any changes.")
|
||||
(define-public fetchmail
|
||||
(package
|
||||
(name "fetchmail")
|
||||
(version "6.4.1")
|
||||
(version "6.4.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@ -355,21 +355,14 @@ to run without any changes.")
|
||||
(version-major+minor version) "/"
|
||||
"fetchmail-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1859wvfc9fq72mwp4njdiy0x89hnddlfr3nix71qqglcs0fz2crz"))))
|
||||
(base32 "073bjh8qbvww7f5gbd6pq640qspi7dc6cjndvm0h2jcl0a90c3yk"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("openssl" ,openssl)))
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list (string-append "--with-ssl="
|
||||
(assoc-ref %build-inputs "openssl")))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'create-test-environment
|
||||
(lambda _
|
||||
;; Fix ‘Cannot find absolute path for user's home directory’.
|
||||
(setenv "HOME" "/tmp")
|
||||
#t)))))
|
||||
(assoc-ref %build-inputs "openssl")))))
|
||||
(home-page "https://www.fetchmail.info/")
|
||||
(synopsis "Remote-mail retrieval and forwarding utility")
|
||||
(description
|
||||
@ -389,7 +382,7 @@ aliasing facilities to work just as they would on normal mail.")
|
||||
(define-public mutt
|
||||
(package
|
||||
(name "mutt")
|
||||
(version "1.13.5")
|
||||
(version "1.14.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (list
|
||||
@ -399,7 +392,7 @@ aliasing facilities to work just as they would on normal mail.")
|
||||
version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"0lx65a44b03rbvcrz0y9syrik67fx3hvblxyyvz5l9bb7rdipmvc"))
|
||||
"0cdcls0x6f2w99hkjz48hxhnx86w3bnyxzibchdc9yspih770bz2"))
|
||||
(patches (search-patches "mutt-store-references.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
@ -423,8 +416,8 @@ aliasing facilities to work just as they would on normal mail.")
|
||||
"--with-sasl"
|
||||
"--with-sqlite3" ; required for Autocrypt
|
||||
"--with-idn2" ; recommended for Autocrypt
|
||||
;; so that mutt does not check whether the path
|
||||
;; exists, which it does not in the chroot
|
||||
;; So that mutt does not check whether the path
|
||||
;; exists, which it does not in the chroot.
|
||||
"--with-mailpath=/var/mail")))
|
||||
(home-page "http://www.mutt.org/")
|
||||
(synopsis "Mail client")
|
||||
@ -718,15 +711,15 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
|
||||
(define-public mu
|
||||
(package
|
||||
(name "mu")
|
||||
(version "1.4.6")
|
||||
(version "1.4.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/djcb/mu/releases/"
|
||||
"download/" version "/"
|
||||
"download/1,4.7/" ; sic
|
||||
"mu-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"15spbplf9p8cdxqfwnv3x67451sfpna9q5n2kgqqwh2y78i7zlhc"))))
|
||||
"19qmz9fgnjpj0cxb8y9nb2dfk7pc0a9kwfiysa0f13ps3d5k4mhm"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
@ -2704,10 +2697,7 @@ operators and scripters.")
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
(let ((target ,(%current-target-system)))
|
||||
(list (string-append "CC=" (if target
|
||||
(string-append target "-gcc")
|
||||
"gcc"))))
|
||||
(list (string-append "CC=" ,(cc-for-target)))
|
||||
#:configure-flags (list (string-append "--with-ssl-include-dir="
|
||||
(assoc-ref %build-inputs "openssl")
|
||||
"/include/openssl")
|
||||
@ -2762,14 +2752,14 @@ tools and applications:
|
||||
(define-public balsa
|
||||
(package
|
||||
(name "balsa")
|
||||
(version "2.6.0")
|
||||
(version "2.6.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://pawsa.fedorapeople.org/balsa/"
|
||||
name "-" version ".tar.bz2"))
|
||||
"balsa-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32 "0ycidvgy9npd6avxk88sf2ca609m7zb0hzrk1yajrgwb1rfqx68a"))))
|
||||
(base32 "1xkxx801p7sbfkn0bh3cz85wra4xf1z1zhjqqc80z1z1nln7fhb4"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
@ -228,7 +228,7 @@ CommonMark to an abstract syntax tree (@dfn{AST}) and rendering the document
|
||||
as HTML, groff man, LaTeX, CommonMark, or an XML representation of the
|
||||
AST. The package also provides the command-line program @command{cmark}
|
||||
for parsing and rendering CommonMark.")
|
||||
(home-page "http://commonmark.org")
|
||||
(home-page "https://commonmark.org")
|
||||
;; cmark is distributed with a BSD-2 license, but some components are Expat
|
||||
;; licensed. The CommonMark specification is Creative Commons CC-BY-SA 4.0
|
||||
;; licensed. See 'COPYING' in the source distribution for more information.
|
||||
|
@ -227,15 +227,15 @@ programming languages.")
|
||||
(define-public qhull
|
||||
(package
|
||||
(name "qhull")
|
||||
(version "2015.2")
|
||||
(version "2019.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://www.qhull.org/download/qhull-"
|
||||
(car (string-split version #\.))
|
||||
"-src-7.2.0.tgz"))
|
||||
"-src-7.3.2.tgz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0dm4b2xr3asy6w74khq2zg4gf26zsy3qf9sq7pf7lmrvbj911c3q"))))
|
||||
"1ys3vh3qq0v9lh452xb932vp63advds1pxk42lk7cc1niiar0y9b"))))
|
||||
(build-system cmake-build-system)
|
||||
(synopsis "Calculate convex hulls and related structures")
|
||||
(description
|
||||
@ -920,7 +920,17 @@ computations.")
|
||||
(("(/gnu/store/)([a-Z0-9]*)" all prefix hash)
|
||||
(string-append prefix (string-take hash 10) "...")))
|
||||
#t))
|
||||
)))
|
||||
(add-after 'install 'provide-absolute-libjpeg-reference
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(libjpeg (assoc-ref inputs "libjpeg")))
|
||||
;; libjpeg-turbo does not provide a .la file, so libtool is
|
||||
;; unable to add an absolute reference for -ljpeg in the .la
|
||||
;; files. Fix it manually to avoid having to propagate it.
|
||||
(substitute* (find-files (string-append out "/lib") "\\.la$")
|
||||
(("-ljpeg")
|
||||
(string-append "-L" libjpeg "/lib -ljpeg")))
|
||||
#t))))))
|
||||
(home-page "https://www.hdfgroup.org/products/hdf4/")
|
||||
(synopsis
|
||||
"Library and multi-object file format for storing and managing data")
|
||||
@ -1602,14 +1612,14 @@ interfaces.")
|
||||
(define-public clp
|
||||
(package
|
||||
(name "clp")
|
||||
(version "1.17.1")
|
||||
(version "1.17.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.coin-or.org/download/source/"
|
||||
"Clp/Clp-" version ".tgz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1wdg820g3iikf9344ijwsc8sy6c0m6im42bzzizm6rlmkvnmxhk9"))
|
||||
"0ap1f0lxppa6pnbc4bg7ih7a96avwaki482nig8w5fr3vg9wvkzr"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Make sure we don't use the bundled software.
|
||||
@ -3183,7 +3193,7 @@ point numbers.")
|
||||
(define-public wxmaxima
|
||||
(package
|
||||
(name "wxmaxima")
|
||||
(version "20.03.1")
|
||||
(version "20.04.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -3192,7 +3202,7 @@ point numbers.")
|
||||
(commit (string-append "Version-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "09ciip0wkahps5jdsqqr72bwjrd15bacw38zp23v3hm71xfk8hky"))))
|
||||
(base32 "0vrjxzfgmjdzm1rgl0crz4b4badl14jwh032y3xkcdvjl5j67lp3"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("gettext" ,gettext-minimal)
|
||||
@ -5349,20 +5359,20 @@ management via the GIMPS project's Primenet server.")
|
||||
(define-public nauty
|
||||
(package
|
||||
(name "nauty")
|
||||
(version "2.6r12")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://pallini.di.uniroma1.it/"
|
||||
"nauty" (string-join (string-split version #\.) "")
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1p4mxf8q5wm47nxyskxbqwa5p1vvkycv1zgswvnk9nsn6vff0al6"))))
|
||||
(version "2.7r1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://pallini.di.uniroma1.it/"
|
||||
"nauty" (string-join (string-split version #\.) "") ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0xsfqfcknbd6g6wzpa5l7crmmk3bf3zjh37rhylq6b20dqcmvjkn"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" "lib"))
|
||||
(arguments
|
||||
`(#:test-target "checks"
|
||||
#:configure-flags '("--enable-generic") ;prevent -march-native
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; Default make target does not build all available
|
||||
@ -5382,15 +5392,16 @@ management via the GIMPS project's Primenet server.")
|
||||
(include (string-append lib-output "/include/nauty"))
|
||||
(lib (string-append lib-output "/lib/nauty")))
|
||||
(for-each (lambda (f) (install-file f bin))
|
||||
'("dreadnaut" "NRswitchg" "addedgeg" "amtog" "biplabg"
|
||||
"blisstog" "bliss2dre" "catg" "checks6" "complg"
|
||||
"converseg" "copyg" "countg" "cubhamg" "deledgeg"
|
||||
"delptg" "directg" "dretodot" "dretog" "genbg"
|
||||
'("addedgeg" "amtog" "assembleg" "biplabg" "blisstog"
|
||||
"bliss2dre" "catg" "checks6" "complg" "converseg"
|
||||
"copyg" "countg" "cubhamg" "deledgeg" "delptg"
|
||||
"directg" "dreadnaut" "dretodot" "dretog" "genbg"
|
||||
"genbgL" "geng" "genquarticg" "genrang" "genspecialg"
|
||||
"gentourng" "gentreeg" "hamheuristic" "labelg"
|
||||
"linegraphg" "listg" "multig" "newedgeg" "pickg"
|
||||
"planarg" "ranlabg" "shortg" "showg" "subdivideg"
|
||||
"sumlines" "twohamg" "vcolg" "watercluster2"))
|
||||
"sumlines" "twohamg" "underlyingg" "vcolg"
|
||||
"watercluster2" "NRswitchg"))
|
||||
(for-each (lambda (f) (install-file f include))
|
||||
(find-files "." "\\.h$"))
|
||||
(for-each (lambda (f) (install-file f lib))
|
||||
|
@ -2,7 +2,7 @@
|
||||
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
|
||||
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -37,14 +37,14 @@
|
||||
(define-public mc
|
||||
(package
|
||||
(name "mc")
|
||||
(version "4.8.23")
|
||||
(version "4.8.24")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://ftp.midnight-commander.org/mc-"
|
||||
(uri (string-append "https://ftp.midnight-commander.org/mc-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "077z7phzq3m1sxyz7li77lyzv4rjmmh3wp2vy86pnc4387kpqzyx"))))
|
||||
(base32 "0ikd2yql44p7nagmb08dmjqdwadclnvgr7ri9pmzc2s5f301r7w5"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("pkg-config" ,pkg-config)
|
||||
("perl" ,perl)))
|
||||
|
@ -62,7 +62,7 @@
|
||||
(define-public nagios
|
||||
(package
|
||||
(name "nagios")
|
||||
(version "4.3.4")
|
||||
(version "4.4.6")
|
||||
;; XXX: Nagios 4.2.x and later bundle a copy of AngularJS.
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
@ -71,7 +71,7 @@
|
||||
version "/nagios-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1wa4m952sb23dqi5w759adimsp21bkhp598rpq9dnhz3v497h2y9"))
|
||||
"1x5hb97zbvkm73q53ydp1gwj8nnznm72q9c4rm6ny7phr995l3db"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Ensure reproducibility.
|
||||
|
@ -309,22 +309,24 @@ This package contains the binary.")
|
||||
(define-public mpg123
|
||||
(package
|
||||
(name "mpg123")
|
||||
(version "1.25.13")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (list (string-append "mirror://sourceforge/mpg123/mpg123/"
|
||||
version "/mpg123-" version ".tar.bz2")
|
||||
(string-append
|
||||
"https://www.mpg123.org/download/mpg123-"
|
||||
version ".tar.bz2")))
|
||||
(sha256
|
||||
(base32
|
||||
"02l915jq0ymndb082g6w89bpf66z04ifa1lr7ga3yycw6m46hc4h"))))
|
||||
(version "1.26.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (list (string-append "mirror://sourceforge/mpg123/mpg123/"
|
||||
version "/mpg123-" version ".tar.bz2")
|
||||
(string-append
|
||||
"https://www.mpg123.org/download/mpg123-"
|
||||
version ".tar.bz2")))
|
||||
(sha256
|
||||
(base32 "0s62k45mz6264h0ljkrrs9vyagvl78q9pxhi7dnbk56pmgs0br74"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments '(#:configure-flags '("--with-default-audio=pulse")))
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
(inputs `(("pulseaudio" ,pulseaudio)
|
||||
("alsa-lib" ,alsa-lib)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("alsa-lib" ,alsa-lib)
|
||||
("pulseaudio" ,pulseaudio)))
|
||||
(home-page "https://www.mpg123.org/")
|
||||
(synopsis "Console MP3 player and decoder library")
|
||||
(description
|
||||
|
@ -384,14 +384,14 @@ many input formats and provides a customisable Vi-style user interface.")
|
||||
(define-public denemo
|
||||
(package
|
||||
(name "denemo")
|
||||
(version "2.3.0")
|
||||
(version "2.4.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/denemo/"
|
||||
"denemo-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1blkcl3slbsq9jlhwcf2m9v9g38a0sjfhh9advgi2qr1gxri08by"))))
|
||||
(base32 "145kq0zfgdadykl3i6na221i4s5wzdrcqq48amzyfarnrqk2rmpd"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
@ -2237,61 +2237,66 @@ capabilities, custom envelopes, effects, etc.")
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public yoshimi
|
||||
(package
|
||||
(name "yoshimi")
|
||||
(version "1.7.0.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/yoshimi/"
|
||||
(version-major+minor version)
|
||||
"/yoshimi-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1pkqrrr51vlxh96vy0c0rf5ijjvymys4brsw9rv1bdp1bb8izw6c"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; there are no tests
|
||||
#:configure-flags
|
||||
(list (string-append "-DCMAKE_INSTALL_DATAROOTDIR="
|
||||
(assoc-ref %outputs "out") "/share"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'enter-dir
|
||||
(lambda _ (chdir "src") #t))
|
||||
;; Move SSE compiler optimization flags from generic target to
|
||||
;; athlon64 and core2 targets, because otherwise the build would fail
|
||||
;; on non-Intel machines.
|
||||
(add-after 'unpack 'remove-sse-flags-from-generic-target
|
||||
(lambda _
|
||||
(substitute* "src/CMakeLists.txt"
|
||||
(("-msse -msse2 -mfpmath=sse") "")
|
||||
(("-march=(athlon64|core2)" flag)
|
||||
(string-append flag " -msse -msse2 -mfpmath=sse")))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("boost" ,boost)
|
||||
("fftwf" ,fftwf)
|
||||
("alsa-lib" ,alsa-lib)
|
||||
("jack" ,jack-1)
|
||||
("fontconfig" ,fontconfig)
|
||||
("minixml" ,minixml)
|
||||
("mesa" ,mesa)
|
||||
("fltk" ,fltk)
|
||||
("lv2" ,lv2)
|
||||
("readline" ,readline)
|
||||
("ncurses" ,ncurses)
|
||||
("cairo" ,cairo)
|
||||
("zlib" ,zlib)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(home-page "http://yoshimi.sourceforge.net/")
|
||||
(synopsis "Multi-paradigm software synthesizer")
|
||||
(description
|
||||
"Yoshimi is a fork of ZynAddSubFX, a feature-heavy real-time software
|
||||
;; Release 1.7.1 doesn't build with our version of LV2. Applying only
|
||||
;; 86996cbb235f0fe138ae814a6758c2c8ba1c2a38 is not enough.
|
||||
(let ((commit "bfcadc6537dbcb301cd93346f21d36bcbffa36c7")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "yoshimi")
|
||||
(version (git-version "1.7.1" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.code.sf.net/p/yoshimi/code")
|
||||
(commit commit)))
|
||||
(sha256
|
||||
(base32 "0vhdxj7ky4iyq11r5wj9jwavjih4xvcn2djbrlmwpkdhrzpy6myl"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; there are no tests
|
||||
#:configure-flags
|
||||
(list (string-append "-DCMAKE_INSTALL_DATAROOTDIR="
|
||||
(assoc-ref %outputs "out") "/share"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'enter-dir
|
||||
(lambda _ (chdir "src") #t))
|
||||
;; Move SSE compiler optimization flags from generic target to
|
||||
;; athlon64 and core2 targets, because otherwise the build would fail
|
||||
;; on non-Intel machines.
|
||||
(add-after 'unpack 'remove-sse-flags-from-generic-target
|
||||
(lambda _
|
||||
(substitute* "src/CMakeLists.txt"
|
||||
(("-msse -msse2 -mfpmath=sse") "")
|
||||
(("-march=(athlon64|core2)" flag)
|
||||
(string-append flag " -msse -msse2 -mfpmath=sse")))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("boost" ,boost)
|
||||
("fftwf" ,fftwf)
|
||||
("alsa-lib" ,alsa-lib)
|
||||
("jack" ,jack-1)
|
||||
("fontconfig" ,fontconfig)
|
||||
("minixml" ,minixml)
|
||||
("mesa" ,mesa)
|
||||
("fltk" ,fltk)
|
||||
("lv2" ,lv2)
|
||||
("readline" ,readline)
|
||||
("ncurses" ,ncurses)
|
||||
("cairo" ,cairo)
|
||||
("zlib" ,zlib)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(home-page "http://yoshimi.sourceforge.net/")
|
||||
(synopsis "Multi-paradigm software synthesizer")
|
||||
(description
|
||||
"Yoshimi is a fork of ZynAddSubFX, a feature-heavy real-time software
|
||||
synthesizer. It offers three synthesizer engines, multitimbral and polyphonic
|
||||
synths, microtonal capabilities, custom envelopes, effects, etc. Yoshimi
|
||||
improves on support for JACK features, such as JACK MIDI.")
|
||||
(license license:gpl2)))
|
||||
(license license:gpl2))))
|
||||
|
||||
(define-public libgig
|
||||
(package
|
||||
@ -2718,8 +2723,7 @@ tune-in sender list from @url{http://opml.radiotime.com}.")
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
#:make-flags (list "CC=gcc" "CFLAGS=-std=c99"
|
||||
(string-append "PREFIX=" %output))
|
||||
#:make-flags (list "CC=gcc" (string-append "PREFIX=" %output))
|
||||
#:phases (modify-phases %standard-phases
|
||||
(delete 'configure))))
|
||||
(inputs
|
||||
@ -2962,7 +2966,7 @@ websites such as Libre.fm.")
|
||||
(home-page "https://github.com/yask123/Instant-Music-Downloader")
|
||||
(synopsis "Command-line program to download a song from YouTube")
|
||||
(description "InstantMusic downloads a song from YouTube in MP3 format.
|
||||
Songs can be searched by artist, name or even by a part of the song text.")
|
||||
Songs can be searched by artist, name or even by a part of the song text.")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public beets
|
||||
@ -3011,9 +3015,9 @@ Songs can be searched by artist, name or even by a part of the song text.")
|
||||
(home-page "https://beets.io")
|
||||
(synopsis "Music organizer")
|
||||
(description "The purpose of beets is to get your music collection right
|
||||
once and for all. It catalogs your collection, automatically improving its
|
||||
metadata as it goes using the MusicBrainz database. Then it provides a variety
|
||||
of tools for manipulating and accessing your music.")
|
||||
once and for all. It catalogs your collection, automatically improving its
|
||||
metadata as it goes using the MusicBrainz database. Then it provides a variety
|
||||
of tools for manipulating and accessing your music.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public beets-bandcamp
|
||||
@ -3039,8 +3043,8 @@ of tools for manipulating and accessing your music.")
|
||||
(synopsis "Bandcamp plugin for beets")
|
||||
(description
|
||||
"This plugin for beets automatically obtains tag data from @uref{Bandcamp,
|
||||
https://bandcamp.com/}. It's also capable of getting song lyrics and album art
|
||||
using the beets FetchArt plugin.")
|
||||
https://bandcamp.com/}. It's also capable of getting song lyrics and album art
|
||||
using the beets FetchArt plugin.")
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public milkytracker
|
||||
@ -3081,9 +3085,9 @@ using the beets FetchArt plugin.")
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(synopsis "Music tracker for working with .MOD/.XM module files")
|
||||
(description "MilkyTracker is a music application for creating .MOD and .XM
|
||||
module files. It attempts to recreate the module replay and user experience of
|
||||
the popular DOS program Fasttracker II, with special playback modes available
|
||||
for improved Amiga ProTracker 2/3 compatibility.")
|
||||
module files. It attempts to recreate the module replay and user experience of
|
||||
the popular DOS program Fasttracker II, with special playback modes available
|
||||
for improved Amiga ProTracker 2/3 compatibility.")
|
||||
(home-page "https://milkytracker.titandemo.org/")
|
||||
;; 'src/milkyplay' is under Modified BSD, the rest is under GPL3 or later.
|
||||
(license (list license:bsd-3 license:gpl3+))))
|
||||
@ -3107,8 +3111,8 @@ for improved Amiga ProTracker 2/3 compatibility.")
|
||||
`(begin
|
||||
(substitute* "schism/version.c"
|
||||
(("Schism Tracker built %s %s.*$")
|
||||
(string-append "Schism Tracker version " ,version "\");")))
|
||||
#t))))
|
||||
(string-append "Schism Tracker version " ,version "\") ;")))
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
@ -4864,6 +4868,49 @@ effects. It contains a bitcrusher, delay, distortion, equalizer, compressor,
|
||||
and reverb.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public lsp-plugins
|
||||
(package
|
||||
(name "lsp-plugins")
|
||||
(version "1.1.21")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/sadko4u/lsp-plugins.git")
|
||||
(commit (string-append "lsp-plugins-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1zw0iip6ki9k65kh8dp53x7l4va4mi5rj793n2yn4p9y84qzwrz9"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
(list
|
||||
(string-append "CC=" ,(cc-for-target))
|
||||
"BUILD_MODULES=\"lv2 ladspa jack\"" "VST_UI=0"
|
||||
(string-append "PREFIX=" (assoc-ref %outputs "out"))
|
||||
(string-append "ETC_PATH=" (assoc-ref %outputs "out") "/etc"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)) ; no configure
|
||||
#:test-target "test"))
|
||||
(inputs
|
||||
`(("cairo", cairo)
|
||||
("hicolor-icon-theme", hicolor-icon-theme)
|
||||
("jack", jack-1)
|
||||
("ladspa", ladspa)
|
||||
("libsndfile", libsndfile)
|
||||
("lv2", lv2)
|
||||
("mesa", mesa)))
|
||||
(native-inputs
|
||||
`(("pkg-config", pkg-config)))
|
||||
(synopsis "Audio plugin collection")
|
||||
(description "LSP (Linux Studio Plugins) is a collection of audio
|
||||
plugins available as LADSPA/LV2 plugins and as standalone JACK
|
||||
applications.")
|
||||
(home-page "https://lsp-plug.in/")
|
||||
(license license:lgpl3)))
|
||||
|
||||
(define-public sherlock-lv2
|
||||
(package
|
||||
(name "sherlock-lv2")
|
||||
@ -5538,3 +5585,66 @@ It is provided as an LV2 plugin and as a standalone Jack application.")
|
||||
It is provided as an LV2 plugin and as a standalone Jack application.")
|
||||
(home-page "https://github.com/pdesaulniers/wolf-spectrum")
|
||||
(license license:gpl3)))
|
||||
|
||||
(define-public shiru-lv2
|
||||
(let ((commit "08853f99140012234649e67e5647906fda74f6cc")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "shiru-lv2")
|
||||
(version (git-version "0.0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/linuxmao-org/shiru-plugins.git")
|
||||
(commit commit)
|
||||
;; Bundles a specific commit of the DISTRHO plugin framework.
|
||||
(recursive? #t)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"00rf6im3rhg98h60sgl1r2s37za5vr5h14pybwi07h8zbc8mi6fm"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no check target
|
||||
#:make-flags (list "CC=gcc")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure) ;no configure target
|
||||
(replace 'install ;no install target
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin"))
|
||||
(lv2 (string-append out "/lib/lv2")))
|
||||
;; Install LV2.
|
||||
(for-each
|
||||
(lambda (file)
|
||||
(copy-recursively file
|
||||
(string-append lv2 "/" (basename file))))
|
||||
(find-files "bin" "\\.lv2$" #:directories? #t))
|
||||
;; Install executables.
|
||||
(for-each
|
||||
(lambda (file)
|
||||
(install-file file bin))
|
||||
(find-files "bin"
|
||||
(lambda (name stat)
|
||||
(and
|
||||
(equal? (dirname name) "bin")
|
||||
(not (string-suffix? ".so" name))
|
||||
(not (string-suffix? ".lv2" name))))))
|
||||
#t))))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("cairo", cairo)
|
||||
("glu", glu)
|
||||
("jack", jack-1)
|
||||
("lv2", lv2)
|
||||
("mesa", mesa)
|
||||
("pango", pango)))
|
||||
(synopsis "Audio plugin collection")
|
||||
(description "Shiru plugins is a collection of audio plugins created
|
||||
by Shiru, ported to LV2 by the Linux MAO project using the DISTRHO plugin
|
||||
framework.")
|
||||
(home-page "http://shiru.untergrund.net/software.shtml")
|
||||
(license license:wtfpl2))))
|
||||
|
@ -456,7 +456,7 @@ more.")
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("zeromq" ,zeromq)))
|
||||
(home-page "http://zeromq.org")
|
||||
(home-page "https://zeromq.org")
|
||||
(synopsis "High-level C bindings for ØMQ")
|
||||
(description
|
||||
"czmq provides bindings for the ØMQ core API that hides the differences
|
||||
@ -487,7 +487,7 @@ between different versions of ØMQ.")
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("zeromq" ,zeromq)))
|
||||
(home-page "http://zeromq.org")
|
||||
(home-page "https://zeromq.org")
|
||||
(synopsis "C++ bindings for the ØMQ messaging library")
|
||||
(description
|
||||
"This package provides header-only C++ bindings for ØMQ. The header
|
||||
@ -767,14 +767,14 @@ of the same name.")
|
||||
(define-public wireshark
|
||||
(package
|
||||
(name "wireshark")
|
||||
(version "3.2.3")
|
||||
(version "3.2.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.wireshark.org/download/src/wireshark-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1fpsfjrap7j84sy728yhcr2gad9nq3n5gq03mwrmxnc6ijwf81zh"))))
|
||||
(base32 "1amqgn94g6h6cfnsccm2zb4c73pfv1qmzi1i6h1hnbcyhhg4czfi"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
@ -1723,25 +1723,29 @@ the bandwidth, loss, and other parameters.")
|
||||
(define-public nethogs
|
||||
(package
|
||||
(name "nethogs")
|
||||
(version "0.8.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/raboof/nethogs/archive/v"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1k4x8r7s4dgcb6n2rjn28h2yyij92mwm69phncl3597cdxr954va"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(version "0.8.6")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/raboof/nethogs")
|
||||
(commit (string-append "v" version))))
|
||||
(hash
|
||||
(content-hash
|
||||
(base32 "0sn1sdp86akwlm4r1vmkxjjl50c0xaisk91bbz57z7kcsaphxna9")
|
||||
sha256))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("libpcap" ,libpcap)
|
||||
("ncurses" ,ncurses)))
|
||||
(arguments
|
||||
`(#:make-flags `("CC=gcc"
|
||||
,(string-append "PREFIX=" %output))
|
||||
,(string-append "PREFIX=" %output)
|
||||
,(string-append "VERSION=" ,version))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)))) ; No ./configure script.
|
||||
(delete 'configure)))) ; no ./configure script.
|
||||
(home-page "https://github.com/raboof/nethogs")
|
||||
(synopsis "Per-process bandwidth monitor")
|
||||
(description "NetHogs is a small 'net top' tool for Linux. Instead of
|
||||
@ -2897,14 +2901,14 @@ maximum extent possible.")
|
||||
(define-public batctl
|
||||
(package
|
||||
(name "batctl")
|
||||
(version "2020.0")
|
||||
(version "2020.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://downloads.open-mesh.org/batman/releases/batman-adv-"
|
||||
version "/batctl-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "01414ywhlb2b9ng9d5kd5rr1s7wzvi234j8hj6ra2spn92qykvv0"))))
|
||||
(base32 "0fy252q1my3a57v6pfz8i97h6zv7v03di01dhwjkj47pqnx1rqm3"))))
|
||||
(inputs
|
||||
`(("libnl" ,libnl)))
|
||||
(native-inputs
|
||||
@ -3099,7 +3103,7 @@ cables.")
|
||||
(define-public haproxy
|
||||
(package
|
||||
(name "haproxy")
|
||||
(version "2.1.3")
|
||||
(version "2.1.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.haproxy.org/download/"
|
||||
@ -3107,7 +3111,7 @@ cables.")
|
||||
"/src/haproxy-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0n8bw3d6gikr8c56ycrvksp1sl0b4yfzp19867cxkl3l0daqwrxv"))))
|
||||
"1kcizs5r538chhpwqykdngxyqfi98i03akfjnii721npjvv0y0si"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
|
@ -3,6 +3,7 @@
|
||||
;;; Copyright © 2017, 2018 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -45,7 +46,7 @@
|
||||
(define-public nfs-utils
|
||||
(package
|
||||
(name "nfs-utils")
|
||||
(version "2.4.2")
|
||||
(version "2.4.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@ -53,7 +54,7 @@
|
||||
"/nfs-utils-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0f0hm8jq1p5gra55v621qpbb3mryakaikzpy5znkvxym0dx76r24"))))
|
||||
"16b5y82cjy1cvijg5zmdvivc6sfdlv2slyynxbwwyw43vpjzqrdg"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
@ -54,14 +54,14 @@
|
||||
(define-public parallel
|
||||
(package
|
||||
(name "parallel")
|
||||
(version "20200422")
|
||||
(version "20200522")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/parallel/parallel-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32 "0c2mr2rzsz0y24q4mbm2zmc2fz6bcda4gbc4qgg59sirrj8vzpjb"))))
|
||||
(base32 "10is46v5dpccxibby0zikg1q68mdwpmgdpxk796zka93idd6id29"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -1,62 +0,0 @@
|
||||
Copied from Debian:
|
||||
<https://sources.debian.org/data/main/d/darkice/1.3-0.2/debian/patches/0001-Cast-float-in-SRC-lib-calls-to-delete-fpermissive-co.patch>
|
||||
|
||||
From 1e2eb18d349f205c70cb2836232825442359b6e3 Mon Sep 17 00:00:00 2001
|
||||
From: belette <ouack23@yahoo.fr>
|
||||
Date: Wed, 26 Oct 2016 02:43:43 +0200
|
||||
Subject: Cast float* in SRC lib calls to delete fpermissive compilation error
|
||||
|
||||
---
|
||||
darkice/trunk/src/FaacEncoder.cpp | 2 +-
|
||||
darkice/trunk/src/OpusLibEncoder.cpp | 2 +-
|
||||
darkice/trunk/src/VorbisLibEncoder.cpp | 2 +-
|
||||
darkice/trunk/src/aacPlusEncoder.cpp | 2 +-
|
||||
4 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
--- a/src/FaacEncoder.cpp
|
||||
+++ b/src/FaacEncoder.cpp
|
||||
@@ -164,7 +164,7 @@ FaacEncoder :: write ( const void * buf,
|
||||
if ( converter ) {
|
||||
unsigned int converted;
|
||||
#ifdef HAVE_SRC_LIB
|
||||
- src_short_to_float_array ((short *) b, converterData.data_in, samples);
|
||||
+ src_short_to_float_array ((short *) b, (float *) converterData.data_in, samples);
|
||||
converterData.input_frames = nSamples;
|
||||
converterData.data_out = resampledOffset + (resampledOffsetSize * channels);
|
||||
int srcError = src_process (converter, &converterData);
|
||||
--- a/src/OpusLibEncoder.cpp
|
||||
+++ b/src/OpusLibEncoder.cpp
|
||||
@@ -403,7 +403,7 @@ OpusLibEncoder :: write ( const void * buf,
|
||||
#ifdef HAVE_SRC_LIB
|
||||
(void)inCount;
|
||||
converterData.input_frames = processed;
|
||||
- src_short_to_float_array (shortBuffer, converterData.data_in, totalSamples);
|
||||
+ src_short_to_float_array (shortBuffer, (float *) converterData.data_in, totalSamples);
|
||||
int srcError = src_process (converter, &converterData);
|
||||
if (srcError)
|
||||
throw Exception (__FILE__, __LINE__, "libsamplerate error: ", src_strerror (srcError));
|
||||
--- a/src/VorbisLibEncoder.cpp
|
||||
+++ b/src/VorbisLibEncoder.cpp
|
||||
@@ -337,7 +337,7 @@ VorbisLibEncoder :: write ( const void * buf,
|
||||
int converted;
|
||||
#ifdef HAVE_SRC_LIB
|
||||
converterData.input_frames = nSamples;
|
||||
- src_short_to_float_array (shortBuffer, converterData.data_in, totalSamples);
|
||||
+ src_short_to_float_array (shortBuffer, (float *) converterData.data_in, totalSamples);
|
||||
int srcError = src_process (converter, &converterData);
|
||||
if (srcError)
|
||||
throw Exception (__FILE__, __LINE__, "libsamplerate error: ", src_strerror (srcError));
|
||||
--- a/src/aacPlusEncoder.cpp
|
||||
+++ b/src/aacPlusEncoder.cpp
|
||||
@@ -155,7 +155,7 @@ aacPlusEncoder :: write ( const void * buf,
|
||||
if ( converter ) {
|
||||
unsigned int converted;
|
||||
#ifdef HAVE_SRC_LIB
|
||||
- src_short_to_float_array ((short *) b, converterData.data_in, samples);
|
||||
+ src_short_to_float_array ((short *) b, (float *) converterData.data_in, samples);
|
||||
converterData.input_frames = nSamples;
|
||||
converterData.data_out = resampledOffset + (resampledOffsetSize * channels);
|
||||
int srcError = src_process (converter, &converterData);
|
||||
--
|
||||
2.11.0
|
||||
|
97
gnu/packages/patches/dhall-remove-network-tests.patch
Normal file
97
gnu/packages/patches/dhall-remove-network-tests.patch
Normal file
@ -0,0 +1,97 @@
|
||||
diff a/dhall-lang/tests/import/failure/referentiallyInsane.dhall b/dhall-lang/tests/import/failure/referentiallyInsane.dhall
|
||||
--- a/dhall-lang/tests/import/failure/referentiallyInsane.dhall
|
||||
+++ /dev/null
|
||||
@@ -1,13 +0,0 @@
|
||||
-{- The following remote import attempts to import an environment variable, which
|
||||
- must be disallowed by the referential sanity check
|
||||
-
|
||||
- One reason for doing this is to protect against remote imports exfiltrating
|
||||
- environment variables (such as via custom headers). Only referentially
|
||||
- opaque imports (i.e. local imports) have permission to refer to other
|
||||
- referentially opaque imports in order to protect against this attack.
|
||||
-
|
||||
- The referential sanity check also ensures that remote imports are
|
||||
- referentially transparent. Or in other words, any import that is globally
|
||||
- addressable must have a meaning that is not context-sensitive.
|
||||
--}
|
||||
-https://raw.githubusercontent.com/dhall-lang/dhall-lang/master/tests/import/data/referentiallyOpaque.dhall
|
||||
diff a/dhall-lang/tests/import/success/customHeadersA.dhall b/dhall-lang/tests/import/success/customHeadersA.dhall
|
||||
--- a/dhall-lang/tests/import/success/customHeadersA.dhall
|
||||
+++ /dev/null
|
||||
@@ -1,3 +0,0 @@
|
||||
-https://httpbin.org/user-agent
|
||||
- using [ { mapKey = "User-Agent", mapValue = "Dhall" } ]
|
||||
- as Text
|
||||
diff a/dhall-lang/tests/import/success/noHeaderForwardingA.dhall b/dhall-lang/tests/import/success/noHeaderForwardingA.dhall
|
||||
--- a/dhall-lang/tests/import/success/noHeaderForwardingA.dhall
|
||||
+++ /dev/null
|
||||
@@ -1,6 +0,0 @@
|
||||
-{- The purpose of this test is to verify that the custom headers supplied to
|
||||
- this import are not forwarded to the transitive import of
|
||||
- https://httpbin.org/user-agent
|
||||
--}
|
||||
-https://raw.githubusercontent.com/dhall-lang/dhall-lang/master/tests/import/success/customHeadersA.dhall
|
||||
- using [ { mapKey = "User-Agent", mapValue = "Secret" } ]
|
||||
diff a/dhall-lang/tests/import/success/unit/RemoteAsTextA.dhall b/dhall-lang/tests/import/success/unit/RemoteAsTextA.dhall
|
||||
--- a/dhall-lang/tests/import/success/unit/RemoteAsTextA.dhall
|
||||
+++ /dev/null
|
||||
@@ -1 +0,0 @@
|
||||
-https://raw.githubusercontent.com/dhall-lang/dhall-lang/0b983b92aa2222dc3e292c20550ee37dea3f41df/tests/import/data/example.txt as Text
|
||||
diff a/dhall-lang/tests/import/success/unit/SimpleRemoteA.dhall b/dhall-lang/tests/import/success/unit/SimpleRemoteA.dhall
|
||||
--- a/dhall-lang/tests/import/success/unit/SimpleRemoteA.dhall
|
||||
+++ /dev/null
|
||||
@@ -1 +0,0 @@
|
||||
-https://raw.githubusercontent.com/dhall-lang/dhall-lang/0b983b92aa2222dc3e292c20550ee37dea3f41df/tests/import/data/simple.dhall
|
||||
diff a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain1A.dhall b/dhall-lang/tests/import/success/unit/asLocation/RemoteChain1A.dhall
|
||||
--- a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain1A.dhall
|
||||
+++ /dev/null
|
||||
@@ -1 +0,0 @@
|
||||
-https://raw.githubusercontent.com/dhall-lang/dhall-lang/0b983b92aa2222dc3e292c20550ee37dea3f41df/tests/import/data/simpleLocation.dhall
|
||||
diff a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain2A.dhall b/dhall-lang/tests/import/success/unit/asLocation/RemoteChain2A.dhall
|
||||
--- a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain2A.dhall
|
||||
+++ /dev/null
|
||||
@@ -1 +0,0 @@
|
||||
-https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/Canonicalize3A.dhall
|
||||
diff a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain3A.dhall b/dhall-lang/tests/import/success/unit/asLocation/RemoteChain3A.dhall
|
||||
--- a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain3A.dhall
|
||||
+++ /dev/null
|
||||
@@ -1 +0,0 @@
|
||||
-https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/Canonicalize5A.dhall
|
||||
diff a/dhall-lang/tests/import/success/unit/asLocation/RemoteChainEnvA.dhall b/dhall-lang/tests/import/success/unit/asLocation/RemoteChainEnvA.dhall
|
||||
--- a/dhall-lang/tests/import/success/unit/asLocation/RemoteChainEnvA.dhall
|
||||
+++ /dev/null
|
||||
@@ -1,5 +0,0 @@
|
||||
-{-
|
||||
- This test verifies that `env:VAR as Location` isn't rejected as referentially opaque,
|
||||
- as `env:VAR` on its own would.
|
||||
--}
|
||||
-https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/EnvA.dhall
|
||||
diff a/dhall-lang/tests/import/success/unit/asLocation/RemoteChainMissingA.dhall b/dhall-lang/tests/import/success/unit/asLocation/RemoteChainMissingA.dhall
|
||||
--- a/dhall-lang/tests/import/success/unit/asLocation/RemoteChainMissingA.dhall
|
||||
+++ /dev/null
|
||||
@@ -1,6 +0,0 @@
|
||||
-{- This test verifies that `missing as Location` succeeds when chained since:
|
||||
- * The `missing` is never actually resolved (due to the `as Location`)
|
||||
- * The `missing` should be treated as referentially transparent (and therefore
|
||||
- be a valid transitive dependency of a remote import)
|
||||
--}
|
||||
-https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/MissingA.dhall
|
||||
diff a/dhall-lang/tests/type-inference/success/CacheImportsA.dhall b/dhall-lang/tests/type-inference/success/CacheImportsA.dhall
|
||||
--- a/dhall-lang/tests/type-inference/success/CacheImportsA.dhall
|
||||
+++ /dev/null
|
||||
@@ -1,6 +0,0 @@
|
||||
-{-
|
||||
- This URL returns (probably) a different result for each request. This test
|
||||
- ensures that import results for a given URL are correctly cached within an
|
||||
- execution of dhall.
|
||||
--}
|
||||
-let _ = assert : https://csrng.net/csrng/csrng.php?min=0&max=1000 as Text === https://csrng.net/csrng/csrng.php?min=0&max=1000 as Text in 0
|
||||
diff a/dhall-lang/tests/type-inference/success/CacheImportsCanonicalizeA.dhall b/dhall-lang/tests/type-inference/success/CacheImportsCanonicalizeA.dhall
|
||||
--- a/dhall-lang/tests/type-inference/success/CacheImportsCanonicalizeA.dhall
|
||||
+++ /dev/null
|
||||
@@ -1,5 +0,0 @@
|
||||
-{-
|
||||
- This URL returns (probably) a different result for each request. This test
|
||||
- ensures that import locations are canonicalized before being cached.
|
||||
--}
|
||||
-let _ = assert : https://csrng.net/csrng/csrng.php?min=0&max=1000 as Text === https://csrng.net/csrng/../csrng/csrng.php?min=0&max=1000 as Text in 0
|
88
gnu/packages/patches/emacs-libgit-use-system-libgit2.patch
Normal file
88
gnu/packages/patches/emacs-libgit-use-system-libgit2.patch
Normal file
@ -0,0 +1,88 @@
|
||||
From de3c48d72ec7064e7f0522877fe759c729df0c50 Mon Sep 17 00:00:00 2001
|
||||
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
Date: Wed, 25 Mar 2020 11:32:18 -0400
|
||||
Subject: [PATCH] Allow using a system provided libgit2 library
|
||||
|
||||
Setting the USE_SYSTEM_LIBGIT2 Make or CMake variable (through the
|
||||
BUILD_OPTIONS variable) to any value enables using the system library.
|
||||
The default behavior of using a bundled copy of libgit2 is unchanged.
|
||||
---
|
||||
CMakeLists.txt | 9 +++++++--
|
||||
Makefile | 11 +++++++++++
|
||||
src/CMakeLists.txt | 9 +++++++--
|
||||
3 files changed, 25 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a393d7c..75d6ca6 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -7,9 +7,14 @@ set(BUILD_SHARED_LIBS OFF CACHE BOOL "shared" FORCE)
|
||||
set(BUILD_CLAR OFF CACHE BOOL "clar" FORCE)
|
||||
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DEGIT_DEBUG")
|
||||
|
||||
-add_subdirectory(libgit2)
|
||||
+if(USE_SYSTEM_LIBGIT2)
|
||||
+ find_package(PkgConfig REQUIRED)
|
||||
+ pkg_check_modules(git2 REQUIRED IMPORTED_TARGET libgit2)
|
||||
+else()
|
||||
+ add_subdirectory(libgit2)
|
||||
+ find_library(git2 libgit2.a)
|
||||
+endif()
|
||||
|
||||
-find_library(git2 libgit2.a)
|
||||
add_subdirectory(src)
|
||||
|
||||
enable_testing()
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 8199532..6a6a4e1 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -13,6 +13,13 @@ ifeq ($(UNAME),MSYS)
|
||||
BUILD_OPTIONS+= -G "MSYS Makefiles"
|
||||
endif
|
||||
|
||||
+# If the variable USE_SYSTEM_LIBGIT2 is set to *any* value, use the
|
||||
+# system provided libgit2 library.
|
||||
+USE_SYSTEM_LIBGIT2? := \
|
||||
+ $(if $(or $(USE_SYSTEM_LIBGIT2),\
|
||||
+ $(findstring USE_SYSTEM_LIBGIT2,$(BUILD_OPTIONS))),\
|
||||
+ true)
|
||||
+
|
||||
ifeq "$(TRAVIS)" "true"
|
||||
## Makefile for Travis ###################################################
|
||||
#
|
||||
@@ -87,7 +94,11 @@ submodule-update:
|
||||
@git submodule update
|
||||
|
||||
libgit2:
|
||||
+ifeq ($(USE_SYSTEM_LIBGIT2?),)
|
||||
@git submodule update --init
|
||||
+else
|
||||
+ @echo "Using the system provided libgit2 library"
|
||||
+endif
|
||||
|
||||
CLEAN = $(ELCS) $(PKG)-autoloads.el build
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index cfb5777..0dbad8a 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -13,8 +13,13 @@ if(WIN32)
|
||||
set_target_properties(egit2 PROPERTIES PREFIX lib)
|
||||
endif(WIN32)
|
||||
|
||||
-target_link_libraries(egit2 git2)
|
||||
-target_include_directories(egit2 SYSTEM PRIVATE "${libgit2_SOURCE_DIR}/include")
|
||||
+if(USE_SYSTEM_LIBGIT2)
|
||||
+ target_link_libraries(egit2 PRIVATE PkgConfig::git2)
|
||||
+else()
|
||||
+ target_link_libraries(egit2 git2)
|
||||
+ target_include_directories(
|
||||
+ egit2 SYSTEM PRIVATE "${libgit2_SOURCE_DIR}/include")
|
||||
+endif()
|
||||
|
||||
if(CMAKE_COMPILER_IS_GNUCC)
|
||||
target_compile_options(egit2 PRIVATE -Wall -Wextra)
|
||||
--
|
||||
2.26.2
|
||||
|
@ -1,72 +0,0 @@
|
||||
From 94914ca4690c0cff12d600a0c8ba6bfb3fb38dc5 Mon Sep 17 00:00:00 2001
|
||||
From: Jonas Bernoulli <jonas@bernoul.li>
|
||||
Date: Tue, 25 Jun 2019 21:44:32 +0200
|
||||
Subject: [PATCH] magit-log-format-author-margin: New function
|
||||
|
||||
Split it from `magit-log-format-margin'.
|
||||
---
|
||||
lisp/magit-log.el | 48 +++++++++++++++++++++++++----------------------
|
||||
1 file changed, 26 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/lisp/magit-log.el b/lisp/magit-log.el
|
||||
index c8e6ef63..c0a79b19 100644
|
||||
--- a/lisp/magit-log.el
|
||||
+++ b/lisp/magit-log.el
|
||||
@@ -1374,28 +1374,32 @@ The shortstat style is experimental and rather slow."
|
||||
(when-let ((option (magit-margin-option)))
|
||||
(if magit-log-margin-show-shortstat
|
||||
(magit-log-format-shortstat-margin rev)
|
||||
- (pcase-let ((`(,_ ,style ,width ,details ,details-width)
|
||||
- (or magit-buffer-margin
|
||||
- (symbol-value option))))
|
||||
- (magit-make-margin-overlay
|
||||
- (concat (and details
|
||||
- (concat (propertize (truncate-string-to-width
|
||||
- (or author "")
|
||||
- details-width
|
||||
- nil ?\s (make-string 1 magit-ellipsis))
|
||||
- 'face 'magit-log-author)
|
||||
- " "))
|
||||
- (propertize
|
||||
- (if (stringp style)
|
||||
- (format-time-string
|
||||
- style
|
||||
- (seconds-to-time (string-to-number date)))
|
||||
- (pcase-let* ((abbr (eq style 'age-abbreviated))
|
||||
- (`(,cnt ,unit) (magit--age date abbr)))
|
||||
- (format (format (if abbr "%%2i%%-%ic" "%%2i %%-%is")
|
||||
- (- width (if details (1+ details-width) 0)))
|
||||
- cnt unit)))
|
||||
- 'face 'magit-log-date)))))))
|
||||
+ (magit-log-format-author-margin author date))))
|
||||
+
|
||||
+(defun magit-log-format-author-margin (author date &optional previous-line)
|
||||
+ (pcase-let ((`(,_ ,style ,width ,details ,details-width)
|
||||
+ (or magit-buffer-margin
|
||||
+ (symbol-value option))))
|
||||
+ (magit-make-margin-overlay
|
||||
+ (concat (and details
|
||||
+ (concat (propertize (truncate-string-to-width
|
||||
+ (or author "")
|
||||
+ details-width
|
||||
+ nil ?\s (make-string 1 magit-ellipsis))
|
||||
+ 'face 'magit-log-author)
|
||||
+ " "))
|
||||
+ (propertize
|
||||
+ (if (stringp style)
|
||||
+ (format-time-string
|
||||
+ style
|
||||
+ (seconds-to-time (string-to-number date)))
|
||||
+ (pcase-let* ((abbr (eq style 'age-abbreviated))
|
||||
+ (`(,cnt ,unit) (magit--age date abbr)))
|
||||
+ (format (format (if abbr "%%2i%%-%ic" "%%2i %%-%is")
|
||||
+ (- width (if details (1+ details-width) 0)))
|
||||
+ cnt unit)))
|
||||
+ 'face 'magit-log-date))
|
||||
+ previous-line)))
|
||||
|
||||
(defun magit-log-format-shortstat-margin (rev)
|
||||
(magit-make-margin-overlay
|
||||
--
|
||||
2.23.0
|
||||
|
@ -1,26 +1,24 @@
|
||||
diff --git a/src/bin/e_auth.c b/src/bin/e_auth.c
|
||||
index 8b0aa6641..f15d2c2a2 100644
|
||||
index 8b0aa6641..3dff0ad84 100644
|
||||
--- a/src/bin/e_auth.c
|
||||
+++ b/src/bin/e_auth.c
|
||||
@@ -11,9 +11,7 @@ e_auth_begin(char *passwd)
|
||||
pwlen = strlen(passwd);
|
||||
@@ -12,8 +12,7 @@ e_auth_begin(char *passwd)
|
||||
if (pwlen == 0) goto out;
|
||||
|
||||
- snprintf(buf, sizeof(buf),
|
||||
snprintf(buf, sizeof(buf),
|
||||
- "%s/enlightenment/utils/enlightenment_ckpasswd pw",
|
||||
- e_prefix_lib_get());
|
||||
+ snprintf(buf, sizeof(buf), "/run/setuid-programs/enlightenment_ckpasswd");
|
||||
+ "/run/setuid-programs/enlightenment_ckpasswd pw");
|
||||
exe = ecore_exe_pipe_run(buf, ECORE_EXE_PIPE_WRITE, NULL);
|
||||
if (!exe) goto out;
|
||||
if (ecore_exe_send(exe, passwd, pwlen) != EINA_TRUE) goto out;
|
||||
@@ -46,9 +44,7 @@ e_auth_polkit_begin(char *passwd, const char *cookie, unsigned int uid)
|
||||
pwlen = strlen(passwd);
|
||||
@@ -47,8 +46,7 @@ e_auth_polkit_begin(char *passwd, const char *cookie, unsigned int uid)
|
||||
if (pwlen == 0) goto out;
|
||||
|
||||
- snprintf(buf, sizeof(buf),
|
||||
snprintf(buf, sizeof(buf),
|
||||
- "%s/enlightenment/utils/enlightenment_ckpasswd pk",
|
||||
- e_prefix_lib_get());
|
||||
+ snprintf(buf, sizeof(buf), "/run/setuid-programs/enlightenment_ckpasswd");
|
||||
+ "/run/setuid-programs/enlightenment_ckpasswd pk");
|
||||
exe = ecore_exe_pipe_run(buf, ECORE_EXE_PIPE_WRITE, NULL);
|
||||
if (!exe) goto out;
|
||||
snprintf(buf, sizeof(buf), "%s %u %s", cookie, uid, passwd);
|
||||
|
124
gnu/packages/patches/grub-setup-root.patch
Normal file
124
gnu/packages/patches/grub-setup-root.patch
Normal file
@ -0,0 +1,124 @@
|
||||
This patch is taken from OpenWrt, see:
|
||||
|
||||
https://github.com/openwrt/openwrt/blob/master/package/boot/grub2/patches/100-grub_setup_root.patch.
|
||||
|
||||
It allows to use grub-bios-setup on a raw disk-images, without root permissions.
|
||||
|
||||
--- a/util/grub-setup.c
|
||||
+++ b/util/grub-setup.c
|
||||
@@ -87,6 +87,8 @@ static struct argp_option options[] = {
|
||||
N_("install even if problems are detected"), 0},
|
||||
{"skip-fs-probe",'s',0, 0,
|
||||
N_("do not probe for filesystems in DEVICE"), 0},
|
||||
+ {"root-device", 'r', N_("DEVICE"), 0,
|
||||
+ N_("use DEVICE as the root device"), 0},
|
||||
{"verbose", 'v', 0, 0, N_("print verbose messages."), 0},
|
||||
{"allow-floppy", 'a', 0, 0,
|
||||
/* TRANSLATORS: The potential breakage isn't limited to floppies but it's
|
||||
@@ -130,6 +132,7 @@ struct arguments
|
||||
char *core_file;
|
||||
char *dir;
|
||||
char *dev_map;
|
||||
+ char *root_dev;
|
||||
int force;
|
||||
int fs_probe;
|
||||
int allow_floppy;
|
||||
@@ -178,6 +181,13 @@ argp_parser (int key, char *arg, struct
|
||||
arguments->dev_map = xstrdup (arg);
|
||||
break;
|
||||
|
||||
+ case 'r':
|
||||
+ if (arguments->root_dev)
|
||||
+ free (arguments->root_dev);
|
||||
+
|
||||
+ arguments->root_dev = xstrdup (arg);
|
||||
+ break;
|
||||
+
|
||||
case 'f':
|
||||
arguments->force = 1;
|
||||
break;
|
||||
@@ -313,7 +323,7 @@ main (int argc, char *argv[])
|
||||
GRUB_SETUP_FUNC (arguments.dir ? : DEFAULT_DIRECTORY,
|
||||
arguments.boot_file ? : DEFAULT_BOOT_FILE,
|
||||
arguments.core_file ? : DEFAULT_CORE_FILE,
|
||||
- dest_dev, arguments.force,
|
||||
+ arguments.root_dev, dest_dev, arguments.force,
|
||||
arguments.fs_probe, arguments.allow_floppy,
|
||||
arguments.add_rs_codes);
|
||||
|
||||
--- a/util/setup.c
|
||||
+++ b/util/setup.c
|
||||
@@ -252,13 +252,12 @@ identify_partmap (grub_disk_t disk __att
|
||||
void
|
||||
SETUP (const char *dir,
|
||||
const char *boot_file, const char *core_file,
|
||||
- const char *dest, int force,
|
||||
+ char *root, const char *dest, int force,
|
||||
int fs_probe, int allow_floppy,
|
||||
int add_rs_codes __attribute__ ((unused))) /* unused on sparc64 */
|
||||
{
|
||||
char *core_path;
|
||||
char *boot_img, *core_img, *boot_path;
|
||||
- char *root = 0;
|
||||
size_t boot_size, core_size;
|
||||
grub_uint16_t core_sectors;
|
||||
grub_device_t root_dev = 0, dest_dev, core_dev;
|
||||
@@ -307,7 +306,10 @@ SETUP (const char *dir,
|
||||
|
||||
core_dev = dest_dev;
|
||||
|
||||
- {
|
||||
+ if (root)
|
||||
+ root_dev = grub_device_open(root);
|
||||
+
|
||||
+ if (!root_dev) {
|
||||
char **root_devices = grub_guess_root_devices (dir);
|
||||
char **cur;
|
||||
int found = 0;
|
||||
@@ -320,6 +322,8 @@ SETUP (const char *dir,
|
||||
char *drive;
|
||||
grub_device_t try_dev;
|
||||
|
||||
+ if (root_dev)
|
||||
+ break;
|
||||
drive = grub_util_get_grub_dev (*cur);
|
||||
if (!drive)
|
||||
continue;
|
||||
--- a/include/grub/util/install.h
|
||||
+++ b/include/grub/util/install.h
|
||||
@@ -191,13 +191,13 @@ grub_install_get_image_target (const cha
|
||||
void
|
||||
grub_util_bios_setup (const char *dir,
|
||||
const char *boot_file, const char *core_file,
|
||||
- const char *dest, int force,
|
||||
+ char *root, const char *dest, int force,
|
||||
int fs_probe, int allow_floppy,
|
||||
int add_rs_codes);
|
||||
void
|
||||
grub_util_sparc_setup (const char *dir,
|
||||
const char *boot_file, const char *core_file,
|
||||
- const char *dest, int force,
|
||||
+ char *root, const char *dest, int force,
|
||||
int fs_probe, int allow_floppy,
|
||||
int add_rs_codes);
|
||||
|
||||
--- a/util/grub-install.c
|
||||
+++ b/util/grub-install.c
|
||||
@@ -1712,7 +1712,7 @@ main (int argc, char *argv[])
|
||||
/* Now perform the installation. */
|
||||
if (install_bootsector)
|
||||
grub_util_bios_setup (platdir, "boot.img", "core.img",
|
||||
- install_drive, force,
|
||||
+ NULL, install_drive, force,
|
||||
fs_probe, allow_floppy, add_rs_codes);
|
||||
break;
|
||||
}
|
||||
@@ -1738,7 +1738,7 @@ main (int argc, char *argv[])
|
||||
/* Now perform the installation. */
|
||||
if (install_bootsector)
|
||||
grub_util_sparc_setup (platdir, "boot.img", "core.img",
|
||||
- install_drive, force,
|
||||
+ NULL, install_drive, force,
|
||||
fs_probe, allow_floppy,
|
||||
0 /* unused */ );
|
||||
break;
|
@ -1,47 +0,0 @@
|
||||
From: Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
Date: Tue, 10 Dec 2019 16:20:40 +0100
|
||||
Subject: gnu: libnftnl: Don't check NFTNL_FLOWTABLE_SIZE.
|
||||
|
||||
Taken verbatim from the upstream commit[0] directly following the 1.1.5
|
||||
release.
|
||||
|
||||
[0]: https://git.netfilter.org/libnftnl/commit/?id=b2388765e0c4405442faa13845419f6a35d0134c
|
||||
|
||||
From b2388765e0c4405442faa13845419f6a35d0134c Mon Sep 17 00:00:00 2001
|
||||
From: Phil Sutter <phil@nwl.cc>
|
||||
Date: Mon, 2 Dec 2019 18:29:56 +0100
|
||||
Subject: tests: flowtable: Don't check NFTNL_FLOWTABLE_SIZE
|
||||
|
||||
Marshalling code around that attribute has been dropped by commit
|
||||
d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE") so it's value is
|
||||
lost during the test.
|
||||
|
||||
Assuming that NFTNL_FLOWTABLE_SIZE will receive kernel support at a
|
||||
later point, leave the test code in place but just comment it out.
|
||||
|
||||
Fixes: d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE")
|
||||
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
||||
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||
---
|
||||
tests/nft-flowtable-test.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/tests/nft-flowtable-test.c b/tests/nft-flowtable-test.c
|
||||
index 3edb00d..8ab8d4c 100644
|
||||
--- a/tests/nft-flowtable-test.c
|
||||
+++ b/tests/nft-flowtable-test.c
|
||||
@@ -33,9 +33,11 @@ static void cmp_nftnl_flowtable(struct nftnl_flowtable *a, struct nftnl_flowtabl
|
||||
if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_USE) !=
|
||||
nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_USE))
|
||||
print_err("Flowtable use mismatches");
|
||||
+#if 0
|
||||
if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_SIZE) !=
|
||||
nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_SIZE))
|
||||
print_err("Flowtable size mismatches");
|
||||
+#endif
|
||||
if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_FLAGS) !=
|
||||
nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_FLAGS))
|
||||
print_err("Flowtable flags mismatches");
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
@ -1,152 +0,0 @@
|
||||
Upstream patch to remove libunique dependency, and use glib >= 2.28.0
|
||||
to handle unique apps both for GTK+ 2 and 3.
|
||||
https://sourceforge.net/p/lxde/patches/539/
|
||||
|
||||
|
||||
From a7d3b40a79a7a16c1f5d50d2bd466570258dae29 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
|
||||
Date: Sun, 22 Jan 2017 01:09:59 +0100
|
||||
Subject: [PATCH] Use GApplication for unique app handling
|
||||
|
||||
Remove libunique dependency, and use glib >= 2.28.0 to handle unique apps both for GTK+ 2 and 3.
|
||||
---
|
||||
Makefile.am | 6 ------
|
||||
configure.ac | 7 +------
|
||||
lxclipboard/main.vala | 16 +---------------
|
||||
lxpolkit/main.vala | 16 +---------------
|
||||
4 files changed, 3 insertions(+), 42 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index c2e1fe8..e3a3b97 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -90,9 +90,6 @@ if USE_GTK3
|
||||
lxclipboard_lxclipboard_VALAFLAGS += --define USE_GTK3
|
||||
else
|
||||
lxclipboard_lxclipboard_VALAFLAGS += --define USE_GTK2
|
||||
-lxclipboard_lxclipboard_VALAFLAGS += --pkg unique-1.0
|
||||
-lxclipboard_lxclipboard_CPPFLAGS += $(UNIQUE_CFLAGS)
|
||||
-lxclipboard_lxclipboard_LDADD += $(UNIQUE_LIBS)
|
||||
endif
|
||||
|
||||
lxpolkit_lxpolkit_vala_SOURCES = \
|
||||
@@ -137,9 +134,6 @@ if USE_GTK3
|
||||
lxpolkit_lxpolkit_VALAFLAGS += --define USE_GTK3
|
||||
else
|
||||
lxpolkit_lxpolkit_VALAFLAGS += --define USE_GTK2
|
||||
-lxpolkit_lxpolkit_VALAFLAGS += --pkg unique-1.0
|
||||
-lxpolkit_lxpolkit_CPPFLAGS += $(UNIQUE_CFLAGS)
|
||||
-lxpolkit_lxpolkit_LDADD += $(UNIQUE_LIBS)
|
||||
endif
|
||||
|
||||
lxsession_db_lxsession_db_SOURCES = \
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 06ddbb3..9126f4d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -45,7 +45,7 @@ PKG_CHECK_MODULES(X11, [x11])
|
||||
AC_SUBST(X11_CFLAGS)
|
||||
AC_SUBST(X11_LIBS)
|
||||
|
||||
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.6.0])
|
||||
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.28.0])
|
||||
AC_SUBST(GLIB_CFLAGS)
|
||||
AC_SUBST(GLIB_LIBS)
|
||||
|
||||
@@ -79,11 +79,6 @@ else
|
||||
CFLAGS="$CFLAGS -D USE_GTK2"
|
||||
gtk_modules="gtk+-2.0 >= 2.6.0"
|
||||
VALA_GTK_LIBS="gtk+-2.0"
|
||||
-
|
||||
- PKG_CHECK_MODULES(UNIQUE, [unique-1.0])
|
||||
- AC_SUBST(UNIQUE_CFLAGS)
|
||||
- AC_SUBST(UNIQUE_LIBS)
|
||||
-
|
||||
fi
|
||||
PKG_CHECK_MODULES(GTK, [$gtk_modules])
|
||||
AC_SUBST(GTK_CFLAGS)
|
||||
diff --git a/lxclipboard/main.vala b/lxclipboard/main.vala
|
||||
index bee4044..3d4a8d7 100644
|
||||
--- a/lxclipboard/main.vala
|
||||
+++ b/lxclipboard/main.vala
|
||||
@@ -17,9 +17,6 @@
|
||||
* MA 02110-1301, USA.
|
||||
*/
|
||||
using Gtk;
|
||||
-#if USE_GTK2
|
||||
-using Unique;
|
||||
-#endif
|
||||
|
||||
namespace Lxsession
|
||||
{
|
||||
@@ -28,17 +25,7 @@ namespace Lxsession
|
||||
public static int main(string[] args)
|
||||
{
|
||||
Gtk.init (ref args);
|
||||
-#if USE_GTK2
|
||||
- Unique.App app = new Unique.App("org.lxde.lxclipboard", null);
|
||||
-
|
||||
- if(app.is_running)
|
||||
- {
|
||||
- message("lxclipboard is already running. Existing");
|
||||
- return 0;
|
||||
- }
|
||||
-#endif
|
||||
-# if USE_GTK3
|
||||
- Gtk.Application app = new Gtk.Application (
|
||||
+ GLib.Application app = new GLib.Application (
|
||||
"org.lxde.lxclipboard",
|
||||
GLib.ApplicationFlags.FLAGS_NONE);
|
||||
app.register ();
|
||||
@@ -48,7 +35,6 @@ namespace Lxsession
|
||||
message("lxclipboard is already running. Existing");
|
||||
return 0;
|
||||
}
|
||||
-#endif
|
||||
|
||||
clipboard_start ();
|
||||
|
||||
diff --git a/lxpolkit/main.vala b/lxpolkit/main.vala
|
||||
index c0d6ae2..50c3cb7 100644
|
||||
--- a/lxpolkit/main.vala
|
||||
+++ b/lxpolkit/main.vala
|
||||
@@ -17,9 +17,6 @@
|
||||
* MA 02110-1301, USA.
|
||||
*/
|
||||
using Gtk;
|
||||
-#if USE_GTK2
|
||||
-using Unique;
|
||||
-#endif
|
||||
|
||||
const string GETTEXT_PACKAGE = "lxsession";
|
||||
|
||||
@@ -33,17 +30,7 @@ namespace Lxsession
|
||||
Intl.bind_textdomain_codeset(GETTEXT_PACKAGE, "utf-8");
|
||||
|
||||
Gtk.init (ref args);
|
||||
-#if USE_GTK2
|
||||
- Unique.App app = new Unique.App("org.lxde.lxpolkit", null);
|
||||
-
|
||||
- if(app.is_running)
|
||||
- {
|
||||
- message(_("lxpolkit is already running. Existing"));
|
||||
- return 0;
|
||||
- }
|
||||
-#endif
|
||||
-# if USE_GTK3
|
||||
- Gtk.Application app = new Gtk.Application (
|
||||
+ GLib.Application app = new GLib.Application (
|
||||
"org.lxde.lxpolkit",
|
||||
GLib.ApplicationFlags.FLAGS_NONE);
|
||||
app.register ();
|
||||
@@ -53,7 +40,6 @@ namespace Lxsession
|
||||
message(_("lxpolkit is already running. Existing"));
|
||||
return 0;
|
||||
}
|
||||
-#endif
|
||||
|
||||
policykit_agent_init();
|
||||
|
||||
--
|
||||
2.11.0
|
||||
|
@ -1,50 +1,13 @@
|
||||
Use upstream utf8proc package, as suggested in
|
||||
http://source.netsurf-browser.org/libutf8proc.git/commit/?id=770e329cceaf0620c7b482589a9b17ed1d19c16d
|
||||
Fix include directory for system utf8proc.
|
||||
|
||||
Work around upstream's lack of a pkg-config file and update API.
|
||||
|
||||
--- netsurf-3.6/Makefile
|
||||
+++ netsurf-3.6/Makefile
|
||||
@@ -527,10 +527,9 @@
|
||||
$(eval $(call pkg_config_find_and_add,libcss,CSS))
|
||||
$(eval $(call pkg_config_find_and_add,libdom,DOM))
|
||||
$(eval $(call pkg_config_find_and_add,libnsutils,nsutils))
|
||||
-$(eval $(call pkg_config_find_and_add,libutf8proc,utf8proc))
|
||||
--- netsurf-3.10/utils/idna.c
|
||||
+++ netsurf-3.10/utils/idna.c
|
||||
@@ -167,7 +167,7 @@
|
||||
|
||||
# Common libraries without pkg-config support
|
||||
-LDFLAGS += -lz
|
||||
+LDFLAGS += -lz -lutf8proc
|
||||
#ifdef WITH_UTF8PROC
|
||||
|
||||
# Optional libraries with pkgconfig
|
||||
|
||||
--- netsurf-3.8/utils/idna.c
|
||||
+++ netsurf-3.8/utils/idna.c
|
||||
@@ -27,7 +27,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
-#include <libutf8proc/utf8proc.h>
|
||||
+#include <utf8proc.h>
|
||||
|
||||
#include "netsurf/inttypes.h"
|
||||
|
||||
--- netsurf-3.8/test/Makefile
|
||||
+++ netsurf-3.8/test/Makefile
|
||||
@@ -142,14 +142,15 @@
|
||||
-Itest -Iinclude -Icontent/handlers -Ifrontends -I. -I.. \
|
||||
-Dnsgtk \
|
||||
$(SAN_FLAGS) \
|
||||
- $(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils libutf8proc) \
|
||||
+ $(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils) \
|
||||
$(LIB_CFLAGS)
|
||||
TESTCFLAGS := $(BASE_TESTCFLAGS) \
|
||||
$(COV_CFLAGS) \
|
||||
$(COV_CPPFLAGS)
|
||||
|
||||
TESTLDFLAGS := -L$(TESTROOT) \
|
||||
- $(shell pkg-config --libs libcurl libparserutils libwapcaplet libdom libnsutils libutf8proc) -lz \
|
||||
+ $(shell pkg-config --libs libcurl libparserutils libwapcaplet libdom libnsutils) \
|
||||
+ $(LDFLAGS) \
|
||||
$(SAN_FLAGS) \
|
||||
$(LIB_LDFLAGS)\
|
||||
$(COV_LDFLAGS)
|
||||
int32_t idna_contexto[] = {
|
||||
/* CONTEXTO codepoints which have a rule defined */
|
||||
|
38
gnu/packages/patches/ruby-sanitize-system-libxml.patch
Normal file
38
gnu/packages/patches/ruby-sanitize-system-libxml.patch
Normal file
@ -0,0 +1,38 @@
|
||||
Fix test failures that occur when nokogiri is using system libxml:
|
||||
|
||||
https://github.com/rgrove/sanitize/issues/198
|
||||
|
||||
Taken from upstream:
|
||||
https://github.com/rgrove/sanitize/commit/21da9b62baf9ea659811d92e6b574130aee57eba
|
||||
|
||||
diff --git a/test/test_malicious_html.rb b/test/test_malicious_html.rb
|
||||
index 2c23074..0756de0 100644
|
||||
--- a/test/test_malicious_html.rb
|
||||
+++ b/test/test_malicious_html.rb
|
||||
@@ -135,6 +135,8 @@
|
||||
# The relevant libxml2 code is here:
|
||||
# <https://github.com/GNOME/libxml2/commit/960f0e275616cadc29671a218d7fb9b69eb35588>
|
||||
describe 'unsafe libxml2 server-side includes in attributes' do
|
||||
+ using_unpatched_libxml2 = Nokogiri::VersionInfo.instance.libxml2_using_system?
|
||||
+
|
||||
tag_configs = [
|
||||
{
|
||||
tag_name: 'a',
|
||||
@@ -166,6 +168,8 @@
|
||||
input = %[<#{tag_name} #{attr_name}='examp<!--" onmouseover=alert(1)>-->le.com'>foo</#{tag_name}>]
|
||||
|
||||
it 'should escape unsafe characters in attributes' do
|
||||
+ skip "behavior should only exist in nokogiri's patched libxml" if using_unpatched_libxml2
|
||||
+
|
||||
# This uses Nokogumbo's HTML-compliant serializer rather than
|
||||
# libxml2's.
|
||||
@s.fragment(input).
|
||||
@@ -191,6 +195,8 @@
|
||||
input = %[<#{tag_name} #{attr_name}='examp<!--" onmouseover=alert(1)>-->le.com'>foo</#{tag_name}>]
|
||||
|
||||
it 'should not escape characters unnecessarily' do
|
||||
+ skip "behavior should only exist in nokogiri's patched libxml" if using_unpatched_libxml2
|
||||
+
|
||||
# This uses Nokogumbo's HTML-compliant serializer rather than
|
||||
# libxml2's.
|
||||
@s.fragment(input).
|
71
gnu/packages/patches/transmission-CVE-2018-10756.patch
Normal file
71
gnu/packages/patches/transmission-CVE-2018-10756.patch
Normal file
@ -0,0 +1,71 @@
|
||||
Fix CVE-2018-10756:
|
||||
|
||||
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-10756
|
||||
|
||||
Patch copied from Fedora:
|
||||
|
||||
https://src.fedoraproject.org/rpms/transmission/blob/master/f/2123adf8e5e1c2b48791f9d22fc8c747e974180e.patch
|
||||
|
||||
--- a/libtransmission/variant.c 2018-05-01 12:21:08.000000000 -0500
|
||||
+++ b/libtransmission/variant.c 2020-05-18 10:21:27.554214128 -0500
|
||||
@@ -820,7 +820,7 @@
|
||||
struct SaveNode
|
||||
{
|
||||
const tr_variant * v;
|
||||
- tr_variant sorted;
|
||||
+ tr_variant* sorted;
|
||||
size_t childIndex;
|
||||
bool isVisited;
|
||||
};
|
||||
@@ -849,26 +849,33 @@
|
||||
|
||||
qsort (tmp, n, sizeof (struct KeyIndex), compareKeyIndex);
|
||||
|
||||
- tr_variantInitDict (&node->sorted, n);
|
||||
+ node->sorted = tr_new(tr_variant, 1);
|
||||
+ tr_variantInitDict (node->sorted, n);
|
||||
for (i=0; i<n; ++i)
|
||||
- node->sorted.val.l.vals[i] = *tmp[i].val;
|
||||
+ node->sorted->val.l.vals[i] = *tmp[i].val;
|
||||
node->sorted.val.l.count = n;
|
||||
|
||||
tr_free (tmp);
|
||||
|
||||
- node->v = &node->sorted;
|
||||
+ v = node->sorted;
|
||||
}
|
||||
else
|
||||
{
|
||||
- node->v = v;
|
||||
+ node->sorted = NULL;
|
||||
}
|
||||
+
|
||||
+ node->v = v;
|
||||
}
|
||||
|
||||
static void
|
||||
nodeDestruct (struct SaveNode * node)
|
||||
{
|
||||
- if (node->v == &node->sorted)
|
||||
- tr_free (node->sorted.val.l.vals);
|
||||
+ //TR_ASSERT(node != NULL);
|
||||
+ if (node->sorted != NULL)
|
||||
+ {
|
||||
+ tr_free(node->sorted->val.l.vals);
|
||||
+ tr_free(node->sorted);
|
||||
+ }
|
||||
}
|
||||
|
||||
/**
|
||||
--- a/libtransmission/variant.c 2020-05-18 10:21:49.000000000 -0500
|
||||
+++ b/libtransmission/variant.c 2020-05-18 10:24:34.673648865 -0500
|
||||
@@ -853,7 +853,7 @@
|
||||
tr_variantInitDict (node->sorted, n);
|
||||
for (i=0; i<n; ++i)
|
||||
node->sorted->val.l.vals[i] = *tmp[i].val;
|
||||
- node->sorted.val.l.count = n;
|
||||
+ node->sorted->val.l.count = n;
|
||||
|
||||
tr_free (tmp);
|
||||
|
||||
|
@ -163,7 +163,7 @@ refreshed, and more.")
|
||||
(define-public colordiff
|
||||
(package
|
||||
(name "colordiff")
|
||||
(version "1.0.18")
|
||||
(version "1.0.19")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@ -172,8 +172,7 @@ refreshed, and more.")
|
||||
(string-append "http://www.colordiff.org/archive/colordiff-"
|
||||
version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"1q6n60n4b9fnzccxyxv04mxjsql4ddq17vl2c74ijvjdhpcfrkr9"))))
|
||||
(base32 "069vzzgs7b44bmfh3ks2psrdb26s1w19gp9w4xxbgi7nhx6w3s26"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
|
@ -690,7 +690,7 @@ extracting content or merging files.")
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://mupdf.com/downloads/archive/"
|
||||
name "-" version "-source.tar.xz"))
|
||||
"mupdf-" version "-source.tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1npmy92lkj41nnc14b4fpq7z62pminy94zsdbrczj22jpn283rvg"))
|
||||
|
@ -4786,12 +4786,12 @@ back to a full directory scan if none of these are available.")
|
||||
(define-public perl-getopt-long
|
||||
(package
|
||||
(name "perl-getopt-long")
|
||||
(version "v2.49.1")
|
||||
(version "2.49.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://cpan/authors/id/J/JV/JV/"
|
||||
"Getopt-Long-" (substring version 1) ".tar.gz"))
|
||||
"Getopt-Long-v" (substring version 1) ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0bw8gbhj8s5gmkqvs3m7pk9arqhgqssrby4yimh29ah9alix9ylq"))))
|
||||
@ -5268,14 +5268,14 @@ filehandles; in particular, IO::Scalar, IO::ScalarArray, and IO::Lines.")
|
||||
(define-public perl-io-tty
|
||||
(package
|
||||
(name "perl-io-tty")
|
||||
(version "1.12")
|
||||
(version "1.14")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://cpan/authors/id/T/TO/TODDR/IO-Tty-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0399anjy3bc0w8xzsc3qx5vcyqryc9gc52lc7wh7i49hsdq8gvx2"))))
|
||||
"1dcmxdhrapxvvzlfp6yzz7655f3c6x8jrw0md8ndp2qj27iy9wsi"))))
|
||||
(build-system perl-build-system)
|
||||
(home-page "https://metacpan.org/release/IO-Tty")
|
||||
(synopsis "Perl interface to pseudo ttys")
|
||||
@ -10034,14 +10034,14 @@ still work as expected.")
|
||||
(define-public perl-timedate
|
||||
(package
|
||||
(name "perl-timedate")
|
||||
(version "2.32")
|
||||
(version "2.33")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://cpan/authors/id/A/AT/ATOOMIC/"
|
||||
"TimeDate-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1mmk9dy4a26a4d4c5rswqqhxr0295j93bjbcx91d3qkmwfcs1v1l"))))
|
||||
(base32 "1cjyc0yi873597r7xcp9yz0l1c46ik2kxwfrn00zbrlx0d5rrdn0"))))
|
||||
(build-system perl-build-system)
|
||||
(home-page "https://metacpan.org/release/TimeDate")
|
||||
(synopsis "Date parsing/formatting subroutines")
|
||||
@ -10052,12 +10052,12 @@ time values and formatting dates into ASCII strings.")
|
||||
(define-public perl-time-mock
|
||||
(package
|
||||
(name "perl-time-mock")
|
||||
(version "v0.0.2")
|
||||
(version "0.0.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://cpan/authors/id/E/EW/EWILHELM/"
|
||||
"Time-Mock-" version ".tar.gz"))
|
||||
"Time-Mock-v" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0bwqyg8z98m8cjw1qcm4wg502n225k33j2fp8ywxkgfjdd1zgllv"))))
|
||||
@ -10790,14 +10790,13 @@ such that being individual extensions would be wasteful.")
|
||||
(define-public perl-file-find-object
|
||||
(package
|
||||
(name "perl-file-find-object")
|
||||
(version "v0.2.13")
|
||||
(version "0.2.13")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-"
|
||||
version
|
||||
".tar.gz"))
|
||||
"mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-v"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0gf13b76b824s73r5rp00v8xrd6dnb5yi5jjavfc394scqv6ldh4"))))
|
||||
|
@ -62,13 +62,11 @@ line syntax.")
|
||||
(version "1.16")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (list (string-append "http://rpm5.org/files/popt/popt-"
|
||||
version ".tar.gz")
|
||||
;; The rpm5.org domain does not resolve since 2019-06-13,
|
||||
;; so fallback to Debians copy.
|
||||
(string-append "https://deb.debian.org/debian/pool/main"
|
||||
"/p/popt/popt_" version ".orig.tar.gz")))
|
||||
;; Ensure the file name stays the same.
|
||||
;; The original rpm5.org domain is not accessible since
|
||||
;; 2019-06-13, so use Debians copy of the tarball.
|
||||
(uri (string-append "https://deb.debian.org/debian/pool/main"
|
||||
"/p/popt/popt_" version ".orig.tar.gz"))
|
||||
;; Ensure the file name stays the same to prevent rebuilds.
|
||||
(file-name (string-append "popt-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
|
@ -6,6 +6,7 @@
|
||||
;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2020 Edouard Klein <edk@beaver-labs.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -337,6 +338,28 @@ testing framework.")
|
||||
framework.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-pytest-pycodestyle
|
||||
(package
|
||||
(name "python-pytest-pycodestyle")
|
||||
(version "2.0.0") ;later versions require python-pytest~=5.4
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "pytest-pycodestyle" version))
|
||||
(sha256
|
||||
(base32
|
||||
"02i5gl7pm9cwxk15sn29inz3n8flpj1r3p1l110h43f2na5w8h7z"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs
|
||||
`(("python-pycodestyle" ,python-pycodestyle)))
|
||||
(native-inputs
|
||||
`(("python-pytest" ,python-pytest)))
|
||||
(home-page "https://github.com/henry0312/pytest-pycodestyle")
|
||||
(synopsis "Pytest plugin to run pycodestyle")
|
||||
(description "This package provides a plugin to run @code{pycodestyle}
|
||||
for the @code{pytest} framework.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-codacy-coverage
|
||||
(package
|
||||
(name "python-codacy-coverage")
|
||||
|
@ -1366,14 +1366,14 @@ I/O-free core, and integration modules for different event loops.")
|
||||
(define-public python-argon2-cffi
|
||||
(package
|
||||
(name "python-argon2-cffi")
|
||||
(version "19.2.0")
|
||||
(version "20.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "argon2-cffi" version))
|
||||
(sha256
|
||||
(base32
|
||||
"18xxfw30gi3lwaz4vwb05iavzlrk3fa1x9fippzrgd3px8z65apz"))
|
||||
"0zgr4mnnm0p4i99023safb0qb8cgvl202nly1rvylk2b7qnrn0nq"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet '(begin (delete-file-recursively "extras") #t))))
|
||||
(build-system python-build-system)
|
||||
|
@ -2371,13 +2371,13 @@ applications.")
|
||||
(define-public python-flask-sqlalchemy
|
||||
(package
|
||||
(name "python-flask-sqlalchemy")
|
||||
(version "2.4.0")
|
||||
(version "2.4.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "Flask-SQLAlchemy" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0nnllf0ddbh9jlhngnyjj98lbxgxr1csaplllx0caw98syq0k5hc"))))
|
||||
"19apnn2m9bl1d1h2nc52pnmiyx993mwzmfjrv04l3wn5hyznyr8b"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs
|
||||
`(("python-flask" ,python-flask)
|
||||
|
@ -78,6 +78,8 @@
|
||||
;;; Copyright © 2020 Alex ter Weele <alex.ter.weele@gmail.com>
|
||||
;;; Copyright © 2020 Matthew Kraai <kraai@ftbfs.org>
|
||||
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
|
||||
;;; Copyright © 2020 Josh Holland <josh@inv.alid.pw>
|
||||
;;; Copyright © 2020 Yuval Kogman <nothingmuch@woobling.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -848,14 +850,14 @@ of the netcdf4 package before.")
|
||||
(define-public python-netcdf4
|
||||
(package
|
||||
(name "python-netcdf4")
|
||||
(version "1.4.2")
|
||||
(version "1.5.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "netCDF4" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0c0sklgrmv15ygliin8qq0hp7vanmbi74m6zpi0r1ksr0hssyd5r"))))
|
||||
"1gn35mb2yc263pci720aik8ymz41lrvxlrn3z83vyjwghiashg1a"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
@ -1748,23 +1750,44 @@ Python 3.3+.")
|
||||
(define-public python2-pyicu
|
||||
(package-with-python2 python-pyicu))
|
||||
|
||||
(define-public python2-dogtail
|
||||
;; Python 2 only, as it leads to "TabError: inconsistent use of tabs and
|
||||
;; spaces in indentation" with Python 3.
|
||||
(define-public python-dogtail
|
||||
(package
|
||||
(name "python2-dogtail")
|
||||
(version "0.9.9")
|
||||
(name "python-dogtail")
|
||||
(version "0.9.11")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "dogtail" version))
|
||||
(uri
|
||||
(string-append
|
||||
"https://gitlab.com/dogtail/dogtail/-/raw/released/"
|
||||
"dogtail-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0p5wfssvzr9w0bvhllzbbd8fnp4cca2qxcpcsc33dchrmh5n552x"))))
|
||||
"0sr38z7b2n12bvfd4xw4b5dnnhkn5zl3h0ymmnnzavcihfqia6l0"))))
|
||||
(build-system python-build-system)
|
||||
(arguments `(#:python ,python-2
|
||||
#:tests? #f)) ; invalid command "test"
|
||||
;; Currently no offical homepage.
|
||||
(home-page "https://pypi.org/project/dogtail/")
|
||||
(arguments
|
||||
`(#:tests? #f ; TODO Launching dbus for the tests
|
||||
; fails
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(system "Xvfb :1 &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
(invoke "dbus-run-session" "--" "nosetests" "-v" "tests/"))
|
||||
#t)))))
|
||||
(propagated-inputs
|
||||
`(("python-pygobject" ,python-pygobject)
|
||||
("python-pycairo" ,python-pycairo)
|
||||
("python-pyatspi" ,python-pyatspi)))
|
||||
(native-inputs
|
||||
`(("python-nose" ,python-nose)
|
||||
("gtk+" ,gtk+)
|
||||
("xvfb" ,xorg-server)
|
||||
("dbus" ,dbus)
|
||||
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
|
||||
("gobject-introspection" ,gobject-introspection)))
|
||||
(home-page "https://gitlab.com/dogtail/dogtail/")
|
||||
(synopsis "GUI test tool and automation framework written in Python")
|
||||
(description
|
||||
"Dogtail is a GUI test tool and automation framework written in Python.
|
||||
@ -1773,6 +1796,9 @@ applications. dogtail scripts are written in Python and executed like any
|
||||
other Python program.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public python2-dogtail
|
||||
(package-with-python2 python-dogtail))
|
||||
|
||||
(define-public python-empy
|
||||
(package
|
||||
(name "python-empy")
|
||||
@ -7940,13 +7966,13 @@ should be stored on various operating systems.")
|
||||
(define-public python-llfuse
|
||||
(package
|
||||
(name "python-llfuse")
|
||||
(version "1.3.5")
|
||||
(version "1.3.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "llfuse" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1n7a90jww3ly49fm7x27m3xw3la3qfrnykcakga654g6kcyjlhbf"))))
|
||||
"1j9fzxpgmb4rxxyl9jcf84zvznhgi3hnh4hg5vb0qaslxkvng8ii"))))
|
||||
(build-system python-build-system)
|
||||
(inputs
|
||||
`(("fuse" ,fuse)
|
||||
@ -19996,3 +20022,39 @@ allows you, from Python code, to “fix” invalid (X)HTML markup.")
|
||||
(description "This packages selects the fastest JSON functions available
|
||||
at import time.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-bashlex
|
||||
(package
|
||||
(name "python-bashlex")
|
||||
(version "0.14")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "bashlex" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1z9g96fgsfpdwawp4sb5x6hbdhmda7kgmcrqlf9xx4bs1f8f14js"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'pregenerate-yacc-tables
|
||||
(lambda _
|
||||
;; parser.py caches tables, which attempts to write to site lib
|
||||
;; see https://github.com/idank/bashlex/issues/51
|
||||
(invoke "python" "-c" "import bashlex"))))))
|
||||
(home-page
|
||||
"https://github.com/idank/bashlex")
|
||||
(synopsis "Python parser for bash")
|
||||
(description "@code{bashlex} is a Python port of the parser used
|
||||
internally by GNU bash.
|
||||
|
||||
For the most part it's transliterated from C, the major differences are:
|
||||
|
||||
@itemize
|
||||
@item it does not execute anything
|
||||
@item it is reentrant
|
||||
@item it generates a complete AST
|
||||
@end itemize
|
||||
")
|
||||
(license license:gpl3+)))
|
||||
|
@ -1,10 +1,11 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2017, 2018, 2019 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2017, 2018, 2019, 2020 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2019, 2020 Christopher Howard <christopher@librehacker.com>
|
||||
;;; Copyright © 2019, 2020 Evan Straw <evan.straw99@gmail.com>
|
||||
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
|
||||
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
|
||||
;;; Copyright © 2020 Charlie Ritter <chewzerita@posteo.net>
|
||||
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -191,7 +192,7 @@ memory contents between them.")
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/csete/aptdec")
|
||||
(url "https://github.com/Xerbo/aptdec")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
@ -202,7 +203,15 @@ memory contents between them.")
|
||||
`(("libpng" ,libpng)
|
||||
("libsndfile" ,libsndfile)))
|
||||
(arguments
|
||||
`(#:make-flags (list "CC=gcc")
|
||||
`(#:make-flags
|
||||
(list
|
||||
(string-append "CC="
|
||||
(if ,(%current-target-system)
|
||||
(string-append (assoc-ref %build-inputs "cross-gcc")
|
||||
"/bin/" ,(%current-target-system) "-gcc")
|
||||
"gcc"))
|
||||
(string-append "PREFIX=" %output)
|
||||
(string-append "RPM_BUILD_ROOT=" %output))
|
||||
#:tests? #f ; no tests
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
@ -212,7 +221,7 @@ memory contents between them.")
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(install-file "atpdec" (string-append out "/bin")))
|
||||
#t)))))
|
||||
(home-page "https://github.com/csete/aptdec")
|
||||
(home-page "https://github.com/Xerbo/aptdec")
|
||||
(synopsis "NOAA Automatic Picture Transmission (APT) decoder")
|
||||
(description "Aptdec decodes Automatic Picture Transmission (APT) images.
|
||||
These are medium resolution images of the Earth transmitted by, among other
|
||||
@ -573,14 +582,14 @@ using GNU Radio and the Qt GUI toolkit.")
|
||||
(define-public fldigi
|
||||
(package
|
||||
(name "fldigi")
|
||||
(version "4.1.12")
|
||||
(version "4.1.13")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://www.w1hkj.com/files/fldigi/fldigi-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1yjjv2ss84xfiaidypp476mhrbpnw4zf7mb5cdqwhdh604x0svr1"))))
|
||||
(base32 "0mlq4z5k3h466plij8hg9xn5xbjxk557g4pw13cplpf32fhng224"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
@ -1017,11 +1026,8 @@ gain and standing wave ratio.")
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
#:make-flags
|
||||
(let ((target ,(%current-target-system)))
|
||||
(list (string-append "CC=" (if target
|
||||
(string-append target "-gcc")
|
||||
"gcc"))
|
||||
"BLADERF=no"))
|
||||
(list (string-append "CC=" ,(cc-for-target))
|
||||
"BLADERF=no")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
|
@ -381,13 +381,13 @@ announcement.")
|
||||
(define-public ruby-rake-compiler
|
||||
(package
|
||||
(name "ruby-rake-compiler")
|
||||
(version "1.0.4")
|
||||
(version "1.1.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (rubygems-uri "rake-compiler" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1xpdi4w8zaklk1i9ps8g3k0icw3v5fcks092l84w28rgrpx82qip"))))
|
||||
"0l4hg21v0phfrfsc2hilgmwvn2imxr0byqh8dv16bya1s5d3km0q"))))
|
||||
(build-system ruby-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f)) ; needs cucumber
|
||||
@ -645,10 +645,12 @@ outcomes of a code example.")
|
||||
(("rspec rspec-core rspec-expectations rspec-mocks rspec-support")
|
||||
""))
|
||||
#t))
|
||||
(add-before 'build 'update-ffi-in-gemfile
|
||||
(add-before 'build 'loosen-ffi-requirement
|
||||
(lambda _
|
||||
;; Accept any version of ruby-ffi.
|
||||
(substitute* "Gemfile"
|
||||
((" gem 'ffi', '~> 1.9.25'") " gem 'ffi', '~> 1.10.0'"))
|
||||
((" gem 'ffi', '~> 1\\.9\\.25'")
|
||||
" gem 'ffi'"))
|
||||
#t))
|
||||
(add-before 'build 'remove-unnecessary-dependency-versions-from-gemfile
|
||||
(lambda _
|
||||
@ -1680,18 +1682,70 @@ Ruby.")
|
||||
(define-public ruby-thor
|
||||
(package
|
||||
(name "ruby-thor")
|
||||
(version "0.19.4")
|
||||
(version "1.0.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (rubygems-uri "thor" version))
|
||||
;; Pull from git because the gem has no tests.
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/erikhuda/thor")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"01n5dv9kql60m6a00zc0r66jvaxx98qhdny3klyj0p3w34pad2ns"))))
|
||||
"1anrx5vynk57hn5c8ig5pgkmcsbj9q5mvckd5rviw1jid7n89k57"))))
|
||||
(build-system ruby-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f)) ; no test suite
|
||||
'(#:phases (modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-readline-tests
|
||||
(lambda _
|
||||
;; Ensure Readline is initialized before running the
|
||||
;; test to avoid a type clash with the mock ::Readline.
|
||||
;; See <https://github.com/erikhuda/thor/pull/717>.
|
||||
(substitute* "spec/line_editor/readline_spec.rb"
|
||||
(("unless defined\\? ::Readline" all)
|
||||
(string-append "Thor::LineEditor::Readline.available?\n"
|
||||
all)))
|
||||
#t))
|
||||
(add-after 'unpack 'remove-coveralls-dependency
|
||||
(lambda _
|
||||
;; Do not hook the test suite into the online
|
||||
;; coveralls service.
|
||||
(substitute* "Gemfile"
|
||||
((".*coveralls.*") ""))
|
||||
(substitute* "spec/helper.rb"
|
||||
(("require \"coveralls\"") "")
|
||||
(("Coveralls::SimpleCov::Formatter") "")
|
||||
;; Also drop the WebMock dependency which is only
|
||||
;; present to allow a coveralls.io connection, and
|
||||
;; would otherwise introduce a circular dependency.
|
||||
(("require \"webmock/rspec\"") "")
|
||||
(("WebMock\\.disable_net_connect.*") ""))
|
||||
#t))
|
||||
(add-after 'unpack 'disable-network-tests
|
||||
(lambda _
|
||||
;; These tests attempt to look up example.com.
|
||||
(substitute* "spec/actions/file_manipulation_spec.rb"
|
||||
(("it \"accepts (https?) remote sources" _ proto)
|
||||
(string-append "xit \"accepts " proto " remote sources")))
|
||||
#t))
|
||||
(add-after 'unpack 'disable-quality-tests
|
||||
(lambda _
|
||||
;; These tests attempt to check the git repository for
|
||||
;; tabs vs spaces, double vs single quotes, etc, and
|
||||
;; depend on the git checkout.
|
||||
(delete-file "spec/quality_spec.rb")
|
||||
#t))
|
||||
(add-before 'check 'make-files-writable
|
||||
(lambda _
|
||||
;; The tests needs rw access to the test suite.
|
||||
(for-each make-file-writable (find-files "spec"))
|
||||
#t))
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(invoke "rspec" "spec"))))))
|
||||
(native-inputs
|
||||
`(("bundler" ,bundler)))
|
||||
`(("ruby-rspec" ,ruby-rspec)
|
||||
("ruby-simplecov" ,ruby-simplecov)))
|
||||
(synopsis "Ruby toolkit for building command-line interfaces")
|
||||
(description "Thor is a toolkit for building powerful command-line
|
||||
interfaces.")
|
||||
@ -1799,6 +1853,41 @@ and inspect the environment.")
|
||||
(home-page "https://github.com/e2/nenv")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public ruby-ptools
|
||||
(package
|
||||
(name "ruby-ptools")
|
||||
(version "1.3.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (rubygems-uri "ptools" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1jb1h1nsk9zwykpniw8filbsk26kjsdlpk5wz6w0zyamcd41h87j"))))
|
||||
(build-system ruby-build-system)
|
||||
(arguments
|
||||
'(#:phases (modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-/bin/ls
|
||||
(lambda _
|
||||
(substitute* "test/test_binary.rb"
|
||||
(("/bin/ls")
|
||||
(which "ls")))
|
||||
#t))
|
||||
(add-before 'install 'create-gem
|
||||
(lambda _
|
||||
;; Do not attempt to sign the gem.
|
||||
(substitute* "Rakefile"
|
||||
(("spec\\.signing_key = .*")
|
||||
""))
|
||||
(invoke "rake" "gem:create"))))))
|
||||
(synopsis "Extra methods for Ruby's @code{File} class")
|
||||
(description
|
||||
"The @dfn{ptools} (power tools) library extends Ruby's core @code{File}
|
||||
class with many additional methods modelled after common POSIX tools, such as
|
||||
@code{File.which} for finding executables, @code{File.tail} to print the last
|
||||
lines of a file, @code{File.wc} to count words, and so on.")
|
||||
(home-page "https://github.com/djberg96/ptools")
|
||||
(license license:artistic2.0)))
|
||||
|
||||
(define-public ruby-permutation
|
||||
(package
|
||||
(name "ruby-permutation")
|
||||
@ -2176,13 +2265,13 @@ two hashes.")
|
||||
(define-public ruby-rubygems-tasks
|
||||
(package
|
||||
(name "ruby-rubygems-tasks")
|
||||
(version "0.2.4")
|
||||
(version "0.2.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (rubygems-uri "rubygems-tasks" version))
|
||||
(sha256
|
||||
(base32
|
||||
"16cp45qlbcglnqdm4f1vj3diywdz4v024saqpgrz6palf0wmgz2j"))))
|
||||
"1x3sz3n2dlknd3v7w1mrq6f0ag6pwzhjvg7z29p75w3p42ma1gbx"))))
|
||||
(build-system ruby-build-system)
|
||||
;; Tests need Internet access.
|
||||
(arguments `(#:tests? #f))
|
||||
@ -2408,7 +2497,7 @@ interface for Ruby programs.")
|
||||
(define-public ruby-fast-gettext
|
||||
(package
|
||||
(name "ruby-fast-gettext")
|
||||
(version "2.0.2")
|
||||
(version "2.0.3")
|
||||
(home-page "https://github.com/grosser/fast_gettext")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
@ -2417,7 +2506,7 @@ interface for Ruby programs.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1rd48fp89k1sclgn2v26br2glwl3iv7z72mizzzmkdmqalqfn1sa"))))
|
||||
"1dg14apq5sfjshhcq0idphhs7aq9ikzswhqmn689p1h76mxqr1v6"))))
|
||||
(build-system ruby-build-system)
|
||||
(arguments
|
||||
'(#:test-target "spec"
|
||||
@ -2804,6 +2893,28 @@ objects.")
|
||||
(home-page "https://github.com/floehopper/metaclass")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public ruby-mkmf-lite
|
||||
(package
|
||||
(name "ruby-mkmf-lite")
|
||||
(version "0.3.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (rubygems-uri "mkmf-lite" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0br9k6zijj1zc25n8p7f2j1mwl58nfgdknf3q13h9k156jvrir06"))))
|
||||
(build-system ruby-build-system)
|
||||
(propagated-inputs
|
||||
`(("ruby-ptools" ,ruby-ptools)))
|
||||
(synopsis "Lightweight alternative to @code{mkmf}")
|
||||
(description
|
||||
"@code{mkmf-lite} is a light version of Ruby's @code{mkmf.rb} designed
|
||||
for use as a library. It does not create packages, builds, or log files of
|
||||
any kind. Instead, it provides mixin methods that you can use in FFI or tests
|
||||
to check for the presence of header files, constants, and so on.")
|
||||
(home-page "https://github.com/djberg96/mkmf-lite")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public ruby-mspec
|
||||
(package
|
||||
(name "ruby-mspec")
|
||||
@ -3744,7 +3855,7 @@ and manipulate Git repositories by wrapping system calls to the git binary.")
|
||||
(define-public ruby-hocon
|
||||
(package
|
||||
(name "ruby-hocon")
|
||||
(version "1.3.0")
|
||||
(version "1.3.1")
|
||||
(home-page "https://github.com/puppetlabs/ruby-hocon")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
@ -3752,7 +3863,7 @@ and manipulate Git repositories by wrapping system calls to the git binary.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1wz4cswjg3gs1y1bar7j4j88wjimfa9zhvy51jyi177i5dzax416"))))
|
||||
"172hh2zr0n9nnszv0qvlgwszgkrq84yahrg053m68asy79zpmbqr"))))
|
||||
(build-system ruby-build-system)
|
||||
(arguments
|
||||
'(#:phases (modify-phases %standard-phases
|
||||
@ -4012,13 +4123,13 @@ to reproduce user environments.")
|
||||
(define-public ruby-nokogiri
|
||||
(package
|
||||
(name "ruby-nokogiri")
|
||||
(version "1.10.5")
|
||||
(version "1.10.9")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (rubygems-uri "nokogiri" version))
|
||||
(sha256
|
||||
(base32
|
||||
"185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7"))))
|
||||
"12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"))))
|
||||
(build-system ruby-build-system)
|
||||
(arguments
|
||||
;; Tests fail because Nokogiri can only test with an installed extension,
|
||||
@ -5158,117 +5269,82 @@ multibyte strings, internationalization, time zones, and testing.")
|
||||
(define-public ruby-crass
|
||||
(package
|
||||
(name "ruby-crass")
|
||||
(version "1.0.4")
|
||||
(version "1.0.6")
|
||||
(home-page "https://github.com/rgrove/crass")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (rubygems-uri "crass" version))
|
||||
;; The gem does not contain tests, so pull from git.
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url home-page)
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi"))))
|
||||
"1gbsb81psgb6xhnwpx4s409jc0mk0gijh039sy5xyi8jpaaadp40"))))
|
||||
(build-system ruby-build-system)
|
||||
(native-inputs
|
||||
`(("bundler" ,bundler)
|
||||
("ruby-minitest" ,ruby-minitest)))
|
||||
(synopsis "Pure Ruby CSS parser")
|
||||
(description
|
||||
"Crass is a pure Ruby CSS parser based on the CSS Syntax Level 3 spec.")
|
||||
(home-page "https://github.com/rgrove/crass/")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public ruby-nokogumbo
|
||||
(let ((commit "fb51ff299a1c34346837580b6d1d9a60fadf5dbd"))
|
||||
(package
|
||||
(name "ruby-nokogumbo")
|
||||
(version (string-append "1.4.7-1." (string-take commit 8)))
|
||||
(source (origin
|
||||
;; We use the git reference, because there's no Rakefile in the
|
||||
;; published gem and the tarball on Github is outdated.
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/rubys/nokogumbo.git")
|
||||
(commit "d56f954d20a")))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"0bnppjy96xiadrsrc9dp8y6wvdwnkfa930n7acrp0mqm4qywl2wl"))))
|
||||
(build-system ruby-build-system)
|
||||
(arguments
|
||||
`(#:modules ((guix build ruby-build-system)
|
||||
(guix build utils)
|
||||
(ice-9 rdelim))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'build-gemspec
|
||||
(lambda _
|
||||
(substitute* "Rakefile"
|
||||
;; Build Makefile even without a copy of gumbo-parser sources
|
||||
(("'gumbo-parser/src',") "")
|
||||
;; We don't bundle gumbo-parser sources
|
||||
(("'gumbo-parser/src/\\*',") "")
|
||||
(("'gumbo-parser/visualc/include/\\*',") "")
|
||||
;; The definition of SOURCES will be cut in gemspec, and
|
||||
;; "FileList" will be undefined.
|
||||
(("SOURCES \\+ FileList\\[")
|
||||
"['ext/nokogumboc/extconf.rb', 'ext/nokogumboc/nokogumbo.c', "))
|
||||
|
||||
;; Copy the Rakefile and cut out the gemspec.
|
||||
(copy-file "Rakefile" ".gemspec")
|
||||
(with-atomic-file-replacement ".gemspec"
|
||||
(lambda (in out)
|
||||
(let loop ((line (read-line in 'concat))
|
||||
(skipping? #t))
|
||||
(if (eof-object? line)
|
||||
#t
|
||||
(let ((skip-next? (if skipping?
|
||||
(not (string-prefix? "SPEC =" line))
|
||||
(string-prefix? "end" line))))
|
||||
(when (or (not skipping?)
|
||||
(and skipping? (not skip-next?)))
|
||||
(format #t "~a" line)
|
||||
(display line out))
|
||||
(loop (read-line in 'concat) skip-next?))))))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("gumbo-parser" ,gumbo-parser)))
|
||||
(propagated-inputs
|
||||
`(("ruby-nokogiri" ,ruby-nokogiri)))
|
||||
(synopsis "Ruby bindings to the Gumbo HTML5 parser")
|
||||
(description
|
||||
"Nokogumbo allows a Ruby program to invoke the Gumbo HTML5 parser and
|
||||
(package
|
||||
(name "ruby-nokogumbo")
|
||||
(version "2.0.2")
|
||||
(source (origin
|
||||
;; We use the git reference, because there's no Rakefile in the
|
||||
;; published gem and the tarball on Github is outdated.
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/rubys/nokogumbo.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"1qg0iyw450lw6d0j1ghzg79a6l60nm1m4qmrzwzybi585861jxcx"))))
|
||||
(build-system ruby-build-system)
|
||||
(native-inputs
|
||||
`(("ruby-rake-compiler" ,ruby-rake-compiler)))
|
||||
(inputs
|
||||
`(("gumbo-parser" ,gumbo-parser)))
|
||||
(propagated-inputs
|
||||
`(("ruby-nokogiri" ,ruby-nokogiri)))
|
||||
(synopsis "Ruby bindings to the Gumbo HTML5 parser")
|
||||
(description
|
||||
"Nokogumbo allows a Ruby program to invoke the Gumbo HTML5 parser and
|
||||
access the result as a Nokogiri parsed document.")
|
||||
(home-page "https://github.com/rubys/nokogumbo/")
|
||||
(license license:asl2.0))))
|
||||
(home-page "https://github.com/rubys/nokogumbo/")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public ruby-sanitize
|
||||
(package
|
||||
(name "ruby-sanitize")
|
||||
(version "4.6.3")
|
||||
(version "5.1.0")
|
||||
(home-page "https://github.com/rgrove/sanitize")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(method git-fetch)
|
||||
;; The gem does not include the Rakefile, so we download the
|
||||
;; release tarball from Github.
|
||||
(uri (string-append "https://github.com/rgrove/"
|
||||
"sanitize/archive/v" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
;; source from Github.
|
||||
(uri (git-reference
|
||||
(url home-page)
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(patches (search-patches "ruby-sanitize-system-libxml.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"1fmqppwif3cm8h79006jfzkdnlxxzlry9kzk03psk0d5xpg55ycc"))))
|
||||
"0lj0q9yhjp0q0in5majkshnki07mw8m2vxgndx4m5na6232aszl0"))))
|
||||
(build-system ruby-build-system)
|
||||
(propagated-inputs
|
||||
`(("ruby-crass" ,ruby-crass)
|
||||
("ruby-nokogiri" ,ruby-nokogiri)
|
||||
("ruby-nokogumbo" ,ruby-nokogumbo)))
|
||||
(native-inputs
|
||||
`(("bundler" ,bundler)
|
||||
("ruby-minitest" ,ruby-minitest)
|
||||
("ruby-redcarpet" ,ruby-redcarpet)
|
||||
("ruby-yard" ,ruby-yard)))
|
||||
`(("ruby-minitest" ,ruby-minitest)))
|
||||
(synopsis "Whitelist-based HTML and CSS sanitizer")
|
||||
(description
|
||||
"Sanitize is a whitelist-based HTML and CSS sanitizer. Given a list of
|
||||
acceptable elements, attributes, and CSS properties, Sanitize will remove all
|
||||
unacceptable HTML and/or CSS from a string.")
|
||||
(home-page "https://github.com/rgrove/sanitize/")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public ruby-oj
|
||||
@ -9263,6 +9339,35 @@ the Thin library.")
|
||||
(home-page "https://github.com/sj26/skinny")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public ruby-sys-filesystem
|
||||
(package
|
||||
(name "ruby-sys-filesystem")
|
||||
(version "1.3.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (rubygems-uri "sys-filesystem" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0mizqnsiagagmracadr16s5na2ks2j3ih1w0f3gp4ssrda6szl01"))))
|
||||
(build-system ruby-build-system)
|
||||
(arguments
|
||||
'(#:phases (modify-phases %standard-phases
|
||||
(add-before 'check 'set-HOME
|
||||
(lambda _
|
||||
;; Some tests attempt to stat $HOME. Let them.
|
||||
(setenv "HOME" "/tmp")
|
||||
#t)))))
|
||||
(propagated-inputs
|
||||
`(("ruby-ffi" ,ruby-ffi)))
|
||||
(native-inputs
|
||||
`(("ruby-mkmf-lite" ,ruby-mkmf-lite)))
|
||||
(synopsis "Gather file system information")
|
||||
(description
|
||||
"The @code{sys-filesystem} library provides a cross-platform interface
|
||||
for gathering file system information, such as disk space and mount points.")
|
||||
(home-page "https://github.com/djberg96/sys-filesystem")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public mailcatcher
|
||||
(package
|
||||
(name "mailcatcher")
|
||||
|
@ -103,7 +103,7 @@ readers and is needed to communicate with such devices through the
|
||||
(define-public eid-mw
|
||||
(package
|
||||
(name "eid-mw")
|
||||
(version "4.4.23")
|
||||
(version "4.4.27")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -112,7 +112,7 @@ readers and is needed to communicate with such devices through the
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0kf147zxsp5ilghr46hjxa2nsikhv8198n04q81qzn9zln69av04"))))
|
||||
(base32 "17lw8iwp7h5cs3db80sysr84ffi333cf2vrhncs9l6hy6glfl2v1"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
@ -139,7 +139,7 @@ readers and is needed to communicate with such devices through the
|
||||
;; Patch it to just return the real version number directly.
|
||||
(substitute* "scripts/build-aux/genver.sh"
|
||||
(("/bin/sh") (which "sh"))
|
||||
(("^(GITDESC=).*" match) (string-append match ,version "\n")))
|
||||
(("^(GITDESC=).*" _ match) (string-append match ,version "\n")))
|
||||
(invoke "sh" "./bootstrap.sh"))))))
|
||||
(synopsis "Belgian eID Middleware")
|
||||
(description "The Belgian eID Middleware is required to authenticate with
|
||||
|
@ -14,6 +14,7 @@
|
||||
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
|
||||
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -793,47 +794,44 @@ Shell (pdksh).")
|
||||
(define-public oil
|
||||
(package
|
||||
(name "oil")
|
||||
(version "0.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.oilshell.org/download/oil-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"12c9s462879adb6mwd3fqafk0dnqsm16s18rhym6cmzfzy8v8zm3"))))
|
||||
;; https://www.oilshell.org/blog/2020/04/release-0.8.pre4.html#comment-on-version-numbering
|
||||
(version "0.8.pre5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.oilshell.org/download/oil-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "02llxx10izxpv1y32qn8k6r0y7al01rzxjirc8h6x8nd9kiaqknl"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; the tests are not distributed in the tarballs
|
||||
#:strip-binaries? #f ; the binaries cannot be stripped
|
||||
`(#:strip-binaries? #f ; strip breaks the binary
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-compiler-invocation
|
||||
(lambda _
|
||||
(substitute* "configure"
|
||||
((" cc ") " gcc "))
|
||||
#t))
|
||||
(replace 'configure
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(setenv "CC" "gcc")
|
||||
;; The configure script doesn't recognize CONFIG_SHELL.
|
||||
(setenv "CONFIG_SHELL" (which "sh"))
|
||||
(substitute* "configure"
|
||||
((" cc ") " $CC "))
|
||||
(invoke "./configure" (string-append "--prefix=" out)
|
||||
"--with-readline"))))
|
||||
(add-before 'install 'make-destination
|
||||
(replace 'check
|
||||
;; The tests are not distributed in the tarballs but upstream
|
||||
;; recommends running this smoke test.
|
||||
;; https://github.com/oilshell/oil/blob/release/0.8.pre5/INSTALL.txt#L38-L48
|
||||
(lambda _
|
||||
;; The build scripts don't create the destination directory.
|
||||
(mkdir-p (string-append (assoc-ref %outputs "out") "/bin")))))))
|
||||
(let* ((oil "_bin/oil.ovm"))
|
||||
(invoke/quiet oil "osh" "-c" "echo hi")
|
||||
(invoke/quiet oil "osh" "-n" "configure")))))))
|
||||
(inputs
|
||||
`(("readline" ,readline)))
|
||||
(synopsis "Bash-compatible Unix shell")
|
||||
(description "Oil is a Unix / POSIX shell, compatible with Bash. It
|
||||
implements the Oil language, which is a new shell language to which Bash can be
|
||||
automatically translated. The Oil language is a superset of Bash. It also
|
||||
implements the OSH language, a statically-parseable language based on Bash as it
|
||||
is commonly written.")
|
||||
(home-page "https://www.oilshell.org/")
|
||||
(license (list psfl ; The Oil sources include a patched Python 2 source tree
|
||||
(home-page "https://www.oilshell.org")
|
||||
(synopsis "Programming language and Bash-compatible Unix shell")
|
||||
(description "Oil is a programming language with automatic translation for
|
||||
Bash. It includes osh, a Unix/POSIX shell that runs unmodified Bash
|
||||
scripts.")
|
||||
(license (list psfl ; tarball includes python2.7
|
||||
asl2.0))))
|
||||
|
||||
(define-public oil-shell
|
||||
|
@ -133,7 +133,7 @@ a server that supports the SSH-2 protocol.")
|
||||
(define-public openssh
|
||||
(package
|
||||
(name "openssh")
|
||||
(version "8.2p1")
|
||||
(version "8.3p1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://openbsd/OpenSSH/portable/"
|
||||
@ -141,7 +141,7 @@ a server that supports the SSH-2 protocol.")
|
||||
(patches (search-patches "openssh-hurd.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"0wg6ckzvvklbzznijxkk28fb8dnwyjd0w30ra0afwv6gwr8m34j3"))))
|
||||
"1cl74ghi9y21dc3f4xa0qamb7dhwacbynh1ks9syprrg8zhgpgpj"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("groff" ,groff)
|
||||
("pkg-config" ,pkg-config)))
|
||||
|
@ -2052,13 +2052,13 @@ jackknifed confidence intervals are available for most estimates.")
|
||||
(define-public r-rversions
|
||||
(package
|
||||
(name "r-rversions")
|
||||
(version "2.0.1")
|
||||
(version "2.0.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "rversions" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1ic6sxnyya24d5xsxjg3fba73fhya9fhs0kaf66yha6nwxj1zv2i"))))
|
||||
"0ghpla5r3d6zh5dn6d6ii5p0a952lcdv004m88fk8r9k76vz88rm"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-curl" ,r-curl)
|
||||
|
@ -46,6 +46,7 @@
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix packages))
|
||||
|
||||
(define-public blind
|
||||
@ -62,12 +63,8 @@
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no check target
|
||||
#:make-flags
|
||||
(let ((target ,(%current-target-system)))
|
||||
(list (string-append "CC=" (if target
|
||||
(string-append target "-gcc")
|
||||
"gcc"))
|
||||
(string-append "PREFIX=" %output)))
|
||||
#:make-flags (list (string-append "CC=" ,(cc-for-target))
|
||||
(string-append "PREFIX=" %output))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)))) ; no configure script
|
||||
@ -152,14 +149,11 @@ optimising the environment for the application in use and the task performed.")
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
#:make-flags
|
||||
(let ((target ,(%current-target-system)))
|
||||
(list (string-append "CC=" (if target
|
||||
(string-append target "-gcc")
|
||||
"gcc"))
|
||||
(string-append "PREFIX=" %output)
|
||||
(string-append "FREETYPEINC="
|
||||
(assoc-ref %build-inputs "freetype")
|
||||
"/include/freetype2")))
|
||||
(list (string-append "CC=" ,(cc-for-target))
|
||||
(string-append "PREFIX=" %output)
|
||||
(string-append "FREETYPEINC="
|
||||
(assoc-ref %build-inputs "freetype")
|
||||
"/include/freetype2"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases (delete 'configure))))
|
||||
(inputs
|
||||
@ -190,11 +184,8 @@ numbers of user-defined menu items efficiently.")
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
#:make-flags
|
||||
(let ((target ,(%current-target-system)))
|
||||
(list (string-append "CC=" (if target
|
||||
(string-append target "-gcc")
|
||||
"gcc"))
|
||||
(string-append "PREFIX=" %output)))))
|
||||
(list (string-append "CC=" ,(cc-for-target))
|
||||
(string-append "PREFIX=" %output))))
|
||||
(inputs
|
||||
`(("libx11" ,libx11)
|
||||
("libxkbfile" ,libxkbfile)
|
||||
@ -221,11 +212,8 @@ numbers of user-defined menu items efficiently.")
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
#:make-flags
|
||||
(let ((target ,(%current-target-system)))
|
||||
(list (string-append "CC=" (if target
|
||||
(string-append target "-gcc")
|
||||
"gcc"))
|
||||
(string-append "PREFIX=" %output)))
|
||||
(list (string-append "CC=" ,(cc-for-target))
|
||||
(string-append "PREFIX=" %output))
|
||||
#:phases (modify-phases %standard-phases (delete 'configure))))
|
||||
(inputs
|
||||
`(("libx11" ,libx11)
|
||||
@ -253,11 +241,8 @@ numbers of user-defined menu items efficiently.")
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
#:make-flags
|
||||
(let ((target ,(%current-target-system)))
|
||||
(list (string-append "CC=" (if target
|
||||
(string-append target "-gcc")
|
||||
"gcc"))
|
||||
(string-append "PREFIX=" %output)))
|
||||
(list (string-append "CC=" ,(cc-for-target))
|
||||
(string-append "PREFIX=" %output))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
@ -298,11 +283,8 @@ drawing.")
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
#:make-flags
|
||||
(let ((target ,(%current-target-system)))
|
||||
(list (string-append "CC=" (if target
|
||||
(string-append target "-gcc")
|
||||
"gcc"))
|
||||
(string-append "PREFIX=" %output)))
|
||||
(list (string-append "CC=" ,(cc-for-target))
|
||||
(string-append "PREFIX=" %output))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
@ -347,14 +329,11 @@ point surf to another URI by setting its XProperties.")
|
||||
(delete 'configure)) ; no configuration
|
||||
#:tests? #f ; no test suite
|
||||
#:make-flags
|
||||
(let ((target ,(%current-target-system))
|
||||
(pkg-config (lambda (flag)
|
||||
(let ((pkg-config (lambda (flag)
|
||||
(string-append
|
||||
"$(shell pkg-config " flag " "
|
||||
"xft fontconfig x11 libpng)"))))
|
||||
(list (string-append "CC=" (if target
|
||||
(string-append target "-gcc")
|
||||
"gcc"))
|
||||
(list (string-append "CC=" ,(cc-for-target))
|
||||
(string-append "PREFIX=" %output)
|
||||
(string-append "INCS=-I. " (pkg-config "--cflags"))
|
||||
(string-append "LIBS=" (pkg-config "--libs") " -lm")))))
|
||||
@ -390,11 +369,8 @@ few minutes.")
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
#:make-flags
|
||||
(let ((target ,(%current-target-system)))
|
||||
(list (string-append "CC=" (if target
|
||||
(string-append target "-gcc")
|
||||
"gcc"))
|
||||
(string-append "PREFIX=" %output)))))
|
||||
(list (string-append "CC=" ,(cc-for-target))
|
||||
(string-append "PREFIX=" %output))))
|
||||
(inputs
|
||||
`(("libx11" ,libx11)))
|
||||
(home-page "https://git.2f30.org/xbattmon/")
|
||||
@ -452,11 +428,8 @@ drivers capable of injecting packets in wireless networks.")
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
#:make-flags
|
||||
(let ((target ,(%current-target-system)))
|
||||
(list (string-append "CC=" (if target
|
||||
(string-append target "-gcc")
|
||||
"gcc"))
|
||||
(string-append "PREFIX=" %output)))
|
||||
(list (string-append "CC=" ,(cc-for-target))
|
||||
(string-append "PREFIX=" %output))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)))) ; no configure script
|
||||
@ -484,11 +457,8 @@ left.")
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
#:make-flags
|
||||
(let ((target ,(%current-target-system)))
|
||||
(list (string-append "CC=" (if target
|
||||
(string-append target "-gcc")
|
||||
"gcc"))
|
||||
(string-append "PREFIX=" %output)))
|
||||
(list (string-append "CC=" ,(cc-for-target))
|
||||
(string-append "PREFIX=" %output))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)))) ; no configure script
|
||||
@ -514,11 +484,8 @@ left.")
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
#:make-flags
|
||||
(let ((target ,(%current-target-system)))
|
||||
(list (string-append "CC=" (if target
|
||||
(string-append target "-gcc")
|
||||
"gcc"))
|
||||
(string-append "PREFIX=" %output)))
|
||||
(list (string-append "CC=" ,(cc-for-target))
|
||||
(string-append "PREFIX=" %output))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)))) ; no configure script
|
||||
@ -550,11 +517,8 @@ cups server to be installed.")
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
#:make-flags
|
||||
(let ((target ,(%current-target-system)))
|
||||
(list (string-append "CC=" (if target
|
||||
(string-append target "-gcc")
|
||||
"gcc"))
|
||||
(string-append "PREFIX=" %output)))
|
||||
(list (string-append "CC=" ,(cc-for-target))
|
||||
(string-append "PREFIX=" %output))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure) ; no configure script
|
||||
@ -588,11 +552,8 @@ cups server to be installed.")
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
#:make-flags
|
||||
(let ((target ,(%current-target-system)))
|
||||
(list (string-append "CC=" (if target
|
||||
(string-append target "-gcc")
|
||||
"gcc"))
|
||||
(string-append "PREFIX=" %output)))
|
||||
(list (string-append "CC=" ,(cc-for-target))
|
||||
(string-append "PREFIX=" %output))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)))) ; no configure script
|
||||
@ -621,11 +582,8 @@ environment variable.")
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
#:make-flags
|
||||
(let ((target ,(%current-target-system)))
|
||||
(list (string-append "CC=" (if target
|
||||
(string-append target "-gcc")
|
||||
"gcc"))
|
||||
(string-append "PREFIX=" %output)))
|
||||
(list (string-append "CC=" ,(cc-for-target))
|
||||
(string-append "PREFIX=" %output))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)))) ; no configure script
|
||||
@ -666,11 +624,8 @@ initially intended to be used on musl-based Linux distributions.
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
#:make-flags
|
||||
(let ((target ,(%current-target-system)))
|
||||
(list (string-append "CC=" (if target
|
||||
(string-append target "-gcc")
|
||||
"gcc"))
|
||||
(string-append "PREFIX=" %output)))
|
||||
(list (string-append "CC=" ,(cc-for-target))
|
||||
(string-append "PREFIX=" %output))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)))) ; no configure script
|
||||
@ -707,11 +662,8 @@ colormap to stdout.")
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
#:make-flags
|
||||
(let ((target ,(%current-target-system)))
|
||||
(list (string-append "CC=" (if target
|
||||
(string-append target "-gcc")
|
||||
"gcc"))
|
||||
(string-append "PREFIX=" %output)))
|
||||
(list (string-append "CC=" ,(cc-for-target))
|
||||
(string-append "PREFIX=" %output))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)))) ; no configure script
|
||||
@ -756,11 +708,8 @@ as -1, to be used instead of U+FFFD.
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
#:make-flags
|
||||
(let ((target ,(%current-target-system)))
|
||||
(list (string-append "CC=" (if target
|
||||
(string-append target "-gcc")
|
||||
"gcc"))
|
||||
(string-append "PREFIX=" %output)))
|
||||
(list (string-append "CC=" ,(cc-for-target))
|
||||
(string-append "PREFIX=" %output))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure) ; no configure script
|
||||
@ -805,11 +754,8 @@ chat output in the background.")
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
#:make-flags
|
||||
(let ((target ,(%current-target-system)))
|
||||
(list (string-append "CC=" (if target
|
||||
(string-append target "-gcc")
|
||||
"gcc"))
|
||||
(string-append "PREFIX=" %output)))
|
||||
(list (string-append "CC=" ,(cc-for-target))
|
||||
(string-append "PREFIX=" %output))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)))) ; no configure script
|
||||
|
@ -135,14 +135,14 @@ file system, and many more features.")
|
||||
(define-public tuir
|
||||
(package
|
||||
(name "tuir")
|
||||
(version "1.28.3")
|
||||
(version "1.29.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "tuir" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1gpyjrl7jdfjq30m32nzh59ajv91gq19l93jjri2wsv5yrf90hdr"))))
|
||||
"06xb030ibphbrz4nsxm8mh3g60ld8xfp6kc3j6vi1k4ls5s4h79i"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -52,7 +52,7 @@
|
||||
(delete-file "src/cal")
|
||||
(delete-file "src/calendar")
|
||||
(delete-file "src/tw"))))))
|
||||
(home-page "http://taskwarrior.org")
|
||||
(home-page "https://taskwarrior.org")
|
||||
(synopsis "Command line task manager")
|
||||
(description
|
||||
"Taskwarrior is a command-line task manager following the Getting Things
|
||||
|
@ -43,6 +43,7 @@
|
||||
#:use-module (gnu packages assembly)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages boost)
|
||||
#:use-module (gnu packages code)
|
||||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages fontutils)
|
||||
#:use-module (gnu packages gcc)
|
||||
@ -196,7 +197,7 @@ bindings and many of the powerful features of GNU Emacs.")
|
||||
(define-public jucipp
|
||||
(package
|
||||
(name "jucipp")
|
||||
(version "1.5.1")
|
||||
(version "1.6.0")
|
||||
(home-page "https://gitlab.com/cppit/jucipp")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
@ -208,7 +209,7 @@ bindings and many of the powerful features of GNU Emacs.")
|
||||
(recursive? #t)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0v7fmsya2zn1xx59bkv4cbyinmcnv52hm4j40nbfwalcks631xrr"))))
|
||||
(base32 "177myy6qvjlb6j3f3i3xmfml5r3p9in8xzpvm0n59dn56s81gpnr"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("-DBUILD_TESTING=ON"
|
||||
@ -225,19 +226,6 @@ bindings and many of the powerful features of GNU Emacs.")
|
||||
(chdir "build")
|
||||
#t))
|
||||
|
||||
;; This phase is necessary to fix a test failure, see
|
||||
;; <https://gitlab.com/cppit/jucipp/-/issues/423>.
|
||||
(add-after 'unpack 'add-reference-to-clang-internal-header
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "src/compile_commands.cc"
|
||||
((".*-I/usr/lib/clang.*" all)
|
||||
(string-append "arguments.emplace_back(\"-I"
|
||||
(assoc-ref inputs "libclang")
|
||||
"/lib/clang/"
|
||||
,@(list (package-version clang))
|
||||
"/include\");\n"
|
||||
all)))
|
||||
#t))
|
||||
(add-after 'unpack 'patch-tiny-process-library
|
||||
(lambda _
|
||||
(with-directory-excursion "lib/tiny-process-library"
|
||||
@ -269,6 +257,7 @@ bindings and many of the powerful features of GNU Emacs.")
|
||||
(inputs
|
||||
`(("aspell" ,aspell)
|
||||
("boost" ,boost)
|
||||
("ctags" ,universal-ctags)
|
||||
("gtkmm" ,gtkmm)
|
||||
("gtksourceviewmm" ,gtksourceviewmm)
|
||||
("libclang" ,clang)
|
||||
|
@ -1307,7 +1307,7 @@ also walk each side of a merge and test those changes individually.")
|
||||
(define-public gitolite
|
||||
(package
|
||||
(name "gitolite")
|
||||
(version "3.6.7")
|
||||
(version "3.6.11")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -1316,7 +1316,7 @@ also walk each side of a merge and test those changes individually.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0rmyzr66lxh2ildf3h1nh3hh2ndwk21rjdin50r5vhwbdd7jg8vb"))))
|
||||
(base32 "1rkj7gknwjlc5ij9w39zf5mr647bm45la57yjczydmvrb8c56yrh"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; no tests
|
||||
@ -1718,14 +1718,14 @@ RCS, PRCS, and Aegis packages.")
|
||||
(define-public cvs-fast-export
|
||||
(package
|
||||
(name "cvs-fast-export")
|
||||
(version "1.51")
|
||||
(version "1.55")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://www.catb.org/~esr/cvs-fast-export/"
|
||||
"cvs-fast-export-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0nn5cf8syb5nbjvkn8w561pk25clv187h4hs9pnc700g9w56chzf"))))
|
||||
"06y2myhhv2ap08bq7d7shq0b7lq6wgznwrpz6622xq66cxkf2n5g"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
@ -1885,7 +1885,10 @@ accessed and migrated on modern systems.")
|
||||
("ed" ,ed)))
|
||||
(arguments
|
||||
`(#:configure-flags (list "--with-no-aegis-configured"
|
||||
"--sharedstatedir=/var/com/aegis")
|
||||
"--sharedstatedir=/var/com/aegis"
|
||||
;; Uses the old 'throw()' specifier with 'new'
|
||||
;; which changed in C++11.
|
||||
"CXXFLAGS=-std=c++03")
|
||||
#:parallel-build? #f ; There are some nasty racy rules in the Makefile.
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
@ -1928,7 +1931,7 @@ accessed and migrated on modern systems.")
|
||||
|
||||
;; The author decided to call the check rule "sure".
|
||||
(invoke "make" "sure")))))))
|
||||
(home-page "http://aegis.sourceforge.net")
|
||||
(home-page "https://sourceforge.net/projects/aegis/")
|
||||
(synopsis "Project change supervisor")
|
||||
(description "Aegis is a project change supervisor, and performs some of
|
||||
the Software Configuration Management needed in a CASE environment. Aegis
|
||||
@ -2168,7 +2171,7 @@ by rclone usable with git-annex.")
|
||||
(define-public fossil
|
||||
(package
|
||||
(name "fossil")
|
||||
(version "2.10")
|
||||
(version "2.11")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@ -2176,8 +2179,7 @@ by rclone usable with git-annex.")
|
||||
"https://www.fossil-scm.org/index.html/uv/"
|
||||
"fossil-src-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"041bs4fgk52fw58p7s084pxk9d9vs5v2f2pjbznqawz75inpg8yq"))
|
||||
(base32 "0c9nzx42wxfmym9vf1pnbdb1c7gp7a7zqky60izxsph7w2xh8nix"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -930,7 +930,7 @@ operate properly.")
|
||||
(define-public ffmpeg
|
||||
(package
|
||||
(name "ffmpeg")
|
||||
(version "4.2.2")
|
||||
(version "4.2.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
|
||||
@ -939,7 +939,7 @@ operate properly.")
|
||||
(patches (search-patches "ffmpeg-prefer-dav1d.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"176jn1lcdf0gk7sa5l2mv0faqp5dsqdhx1gqcrgymqhfmdal4xfb"))))
|
||||
"0cddkb5sma9dzy8i59sfls19rhjlq40zn9mh3x666dqkxl5ckxlx"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("dav1d" ,dav1d)
|
||||
@ -1530,7 +1530,7 @@ projects while introducing many more.")
|
||||
(define-public mpv-mpris
|
||||
(package
|
||||
(name "mpv-mpris")
|
||||
(version "0.4")
|
||||
(version "0.5")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -1540,7 +1540,7 @@ projects while introducing many more.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1fr3jvja8s2gdpx8qyk9r17977flms3qpm8zci62nd9r5wjdvr5i"))))
|
||||
"07p6li5z38pkfd40029ag2jqx917vyl3ng5p2i4v5a0af14slcnk"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
'(#:install-plan
|
||||
@ -2423,7 +2423,7 @@ be used for realtime video capture via Linux-specific APIs.")
|
||||
(define-public obs
|
||||
(package
|
||||
(name "obs")
|
||||
(version "25.0.7")
|
||||
(version "25.0.8")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -2432,10 +2432,12 @@ be used for realtime video capture via Linux-specific APIs.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"02ppkp1j5yxnxv663nz5wv4vbcg3k53l43xq94d1p1b3j4wxwq8b"))))
|
||||
"0j2k65q3wfyfxhvkl6icz4qy0s3kfqhksizy2i3ah7yml266axbj"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ; no tests
|
||||
`(#:tests? #f ; no test suite
|
||||
#:configure-flags
|
||||
(list (string-append "-DOBS_VERSION_OVERRIDE=" ,version))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
@ -2449,6 +2451,7 @@ be used for realtime video capture via Linux-specific APIs.")
|
||||
("jansson" ,jansson)
|
||||
("libx264" ,libx264)
|
||||
("libxcomposite" ,libxcomposite)
|
||||
("mbedtls" ,mbedtls-apache)
|
||||
("mesa" ,mesa)
|
||||
("pulseaudio" ,pulseaudio)
|
||||
("qtbase" ,qtbase)
|
||||
|
@ -655,9 +655,10 @@ virtualization library.")
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:use-setuptools? #f ; uses custom distutils 'install' command
|
||||
;; Some of the tests seem to require network access to install virtual
|
||||
;; machines.
|
||||
#:tests? #f
|
||||
#:test-target "test_ui"
|
||||
#:tests? #f ; TODO The tests currently fail
|
||||
; RuntimeError: Loop condition wasn't
|
||||
; met
|
||||
#:imported-modules ((guix build glib-or-gtk-build-system)
|
||||
,@%python-build-system-modules)
|
||||
#:modules ((ice-9 match)
|
||||
@ -704,6 +705,16 @@ virtualization library.")
|
||||
,(filter identity paths))))
|
||||
bin-files))
|
||||
#t))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(setenv "HOME" "/tmp")
|
||||
(system "Xvfb :1 &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
;; Dogtail requires that Assistive Technology support be enabled
|
||||
(setenv "GTK_MODULES" "gail:atk-bridge")
|
||||
(invoke "dbus-run-session" "--" "python" "setup.py" "test_ui"))
|
||||
#t))
|
||||
(add-after 'install 'glib-or-gtk-compile-schemas
|
||||
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
|
||||
(add-after 'install 'glib-or-gtk-wrap
|
||||
@ -732,7 +743,14 @@ virtualization library.")
|
||||
("gobject-introspection" ,gobject-introspection)
|
||||
("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache
|
||||
("perl" ,perl) ; pod2man
|
||||
("intltool" ,intltool)))
|
||||
("intltool" ,intltool)
|
||||
;; The following are required for running the tests
|
||||
;; ("python-dogtail" ,python-dogtail)
|
||||
;; ("xvfb" ,xorg-server-for-tests)
|
||||
;; ("dbus" ,dbus)
|
||||
;; ("at-spi2-core" ,at-spi2-core)
|
||||
;; ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
|
||||
))
|
||||
(home-page "https://virt-manager.org/")
|
||||
(synopsis "Manage virtual machines")
|
||||
(description
|
||||
|
@ -229,14 +229,14 @@ Interface} specification.")
|
||||
;; ’stable’ and recommends that “in general you deploy the NGINX mainline
|
||||
;; branch at all times” (https://www.nginx.com/blog/nginx-1-6-1-7-released/)
|
||||
;; Consider updating the nginx-documentation package together with this one.
|
||||
(version "1.17.9")
|
||||
(version "1.19.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://nginx.org/download/nginx-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"12dnrdxwnlid0wr797vdxj9z1fmxnk7ib55bznvl2g3mbi05vmkx"))))
|
||||
"1j1n3rlvan6l9j3vw8axbbdm96w7s0x6ygmgqvbplzfd3wbid9j4"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("openssl" ,openssl)
|
||||
("pcre" ,pcre)
|
||||
@ -278,7 +278,6 @@ Interface} specification.")
|
||||
(string-append "--crossbuild="
|
||||
system ":" release ":" machine)))))
|
||||
(setenv "CC" "gcc")
|
||||
(format #t "environment variable `CC' set to `gcc'~%")
|
||||
(format #t "configure flags: ~s~%" flags)
|
||||
(apply invoke "./configure" flags)
|
||||
#t)))
|
||||
@ -360,13 +359,13 @@ documentation.")
|
||||
(license license:bsd-2))))
|
||||
|
||||
(define-public nginx-documentation
|
||||
;; This documentation should be relevant for nginx@1.15.9.
|
||||
(let ((revision 2345)
|
||||
(changeset "7ef11708457e"))
|
||||
;; This documentation should be relevant for the current nginx package.
|
||||
(let ((version "1.19.0")
|
||||
(revision 2549)
|
||||
(changeset "c13a55aae487"))
|
||||
(package
|
||||
(name "nginx-documentation")
|
||||
(version
|
||||
(simple-format #f "2019-03-01-~A-~A" revision changeset))
|
||||
(version (simple-format #f "~A-~A-~A" version revision changeset))
|
||||
(source
|
||||
(origin (method hg-fetch)
|
||||
(uri (hg-reference
|
||||
@ -375,7 +374,7 @@ documentation.")
|
||||
(file-name (string-append name "-" version))
|
||||
(sha256
|
||||
(base32
|
||||
"15975jvh53mnsgi4hhgrwdwy3by23v4kxnhy2vnkziq8v7wkmy4y"))))
|
||||
"0vwwvk6wf8f6c6n6yffmya9a287s6dbx1p739hdl3hwxfyh2ygc5"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; no test suite
|
||||
@ -2620,7 +2619,7 @@ development server with Starman.")
|
||||
(define-public perl-cgi
|
||||
(package
|
||||
(name "perl-cgi")
|
||||
(version "4.46")
|
||||
(version "4.47")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@ -2628,7 +2627,7 @@ development server with Starman.")
|
||||
"CGI-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"16225vmdsfa2y7i1ydv7634nd0qxxb0ccwnfszjq58rwqgfri2bq"))))
|
||||
"1a9cylhqsm5icvbg09m21nj0xx4zy5gbk4p74npm1ch3qlryzyyr"))))
|
||||
(build-system perl-build-system)
|
||||
(native-inputs
|
||||
`(("perl-test-deep" ,perl-test-deep)
|
||||
@ -4748,7 +4747,7 @@ tools they trust (e.g. wget).")
|
||||
(define netsurf-buildsystem
|
||||
(package
|
||||
(name "netsurf-buildsystem")
|
||||
(version "1.7")
|
||||
(version "1.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@ -4756,7 +4755,7 @@ tools they trust (e.g. wget).")
|
||||
"buildsystem-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1q23aaycv35ma5471l1gxib8lfq2s9kprrkaqgfc926d04rlbmhw"))))
|
||||
"0alsmaig9ln8dgllb3z63gq90fiz75jz0ic71fi0k0k898qix14k"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("perl" ,perl)))
|
||||
(arguments
|
||||
@ -4812,7 +4811,7 @@ C. It is developed as part of the NetSurf project.")
|
||||
(define-public hubbub
|
||||
(package
|
||||
(name "hubbub")
|
||||
(version "0.3.6")
|
||||
(version "0.3.7")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@ -4820,7 +4819,7 @@ C. It is developed as part of the NetSurf project.")
|
||||
"libhubbub-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1x3v7xvagx85v9h3pypzc86rcxs4mij87mmcqkp8pq50q6awfmnp"))
|
||||
"1dimfyblmym98qa1b80c5jslv2zk8r44xbdrgrsrw1n9wr9y4yly"))
|
||||
(patches (search-patches "hubbub-sort-entities.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
@ -4951,7 +4950,7 @@ commenting.")
|
||||
(define-public libwapcaplet
|
||||
(package
|
||||
(name "libwapcaplet")
|
||||
(version "0.4.2")
|
||||
(version "0.4.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@ -4959,7 +4958,7 @@ commenting.")
|
||||
"libwapcaplet-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1fjwzbn7j8bi1b9bvwxsy3i2cr6byq2s2d29866801pjnf528g86"))))
|
||||
"0p0c2q9lsj4vs97aa7vjllfhw33zv3dpysdkjblzhib6dpfs2alv"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("netsurf-buildsystem" ,netsurf-buildsystem)
|
||||
@ -4977,7 +4976,7 @@ developed as part of the Netsurf project.")
|
||||
(define-public libcss
|
||||
(package
|
||||
(name "libcss")
|
||||
(version "0.9.0")
|
||||
(version "0.9.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@ -4985,7 +4984,7 @@ developed as part of the Netsurf project.")
|
||||
"libcss-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1vw9j3d2mr4wbvs8fyqmgslkbxknvac10456775hflxxcivbm3xr"))))
|
||||
"1p66sdiiqm7w4jkq23hsf08khsnmq93hshh9f9m8sbirjdpf3p6j"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("netsurf-buildsystem" ,netsurf-buildsystem)
|
||||
@ -5045,7 +5044,7 @@ in which the loaded data is arranged in memory.")
|
||||
(define-public libdom
|
||||
(package
|
||||
(name "libdom")
|
||||
(version "0.4.0")
|
||||
(version "0.4.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@ -5053,7 +5052,7 @@ in which the loaded data is arranged in memory.")
|
||||
"libdom-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ixkqsl3f7dl1kajksm0c231w1v5xy8z6hm3v67hgm9nh4qcvfcy"))))
|
||||
"0jpg5hx3y0mdxk5szd47dyijqimd2321brbqk2620pp5f4j0gvlq"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("netsurf-buildsystem" ,netsurf-buildsystem)
|
||||
@ -5112,7 +5111,7 @@ project.")
|
||||
(define-public libnsbmp
|
||||
(package
|
||||
(name "libnsbmp")
|
||||
(version "0.1.5")
|
||||
(version "0.1.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@ -5120,7 +5119,7 @@ project.")
|
||||
name "-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0lib2m07d1i0k80m4blkwnj0g7rha4jbm5vrgd0wwbkyfa0hvk35"))))
|
||||
"0krjg69a2amxjsahdgm3wmy9ngnyr3gfs2a1zhdlbvb0z1jr7i3r"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("netsurf-buildsystem" ,netsurf-buildsystem)))
|
||||
@ -5158,7 +5157,7 @@ C. It is developed as part of the NetSurf project.")
|
||||
(define-public libnslog
|
||||
(package
|
||||
(name "libnslog")
|
||||
(version "0.1.2")
|
||||
(version "0.1.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@ -5166,12 +5165,12 @@ C. It is developed as part of the NetSurf project.")
|
||||
"libnslog-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ggs6xvxp8fbg5w8pifalipm458ygr9ab6j2yvj8fnnmxwvdh4jd"))))
|
||||
"1l2k0kdv9iv18svhv360vszjavhl4g09cp8a8yb719pgsylxr67w"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("netsurf-buildsystem" ,netsurf-buildsystem)
|
||||
("pkg-config" ,pkg-config)
|
||||
("check" ,check-0.12) ; For tests
|
||||
("check" ,check) ; For tests
|
||||
("bison" ,bison)
|
||||
("flex" ,flex)))
|
||||
(arguments netsurf-buildsystem-arguments)
|
||||
@ -5186,7 +5185,7 @@ client applications. It is developed as part of the NetSurf project.")
|
||||
(define-public libnsutils
|
||||
(package
|
||||
(name "libnsutils")
|
||||
(version "0.0.5")
|
||||
(version "0.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@ -5194,7 +5193,7 @@ client applications. It is developed as part of the NetSurf project.")
|
||||
name "-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"09w1rixps1iiq6wirjwxmd6h87llvjzvw565rahjb3rlyhcplfqf"))))
|
||||
"1w5fyy2i60a3v3if3iqcn9sy9sycx6966rcx53v85gja6hb6a33r"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("netsurf-buildsystem" ,netsurf-buildsystem)))
|
||||
@ -5209,7 +5208,7 @@ developed as part of the NetSurf project.")
|
||||
(define-public libnspsl
|
||||
(package
|
||||
(name "libnspsl")
|
||||
(version "0.1.5")
|
||||
(version "0.1.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@ -5217,7 +5216,7 @@ developed as part of the NetSurf project.")
|
||||
"libnspsl-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0siq8zjfxv75i9fw6q5hkaijpdm1w3zskd5qk6vsvz8cqan4vifd"))))
|
||||
"02q28n5i6fwqcz1nn167rb71k1q95mx38mfah6zi1lvqrc2q5ifk"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("netsurf-buildsystem" ,netsurf-buildsystem)))
|
||||
@ -5232,7 +5231,7 @@ Public Suffix List. It is developed as part of the NetSurf project.")
|
||||
(define-public nsgenbind
|
||||
(package
|
||||
(name "nsgenbind")
|
||||
(version "0.7")
|
||||
(version "0.8")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@ -5240,7 +5239,7 @@ Public Suffix List. It is developed as part of the NetSurf project.")
|
||||
"nsgenbind-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0rplmky4afsjwiwh7grkmcdmzg86zksa55j93dvq92f91yljwqqq"))))
|
||||
"1cqwgwca49jvmijwiyaab2bwxicgxdrnlpinf8kp3nha02nm73ad"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("netsurf-buildsystem" ,netsurf-buildsystem)
|
||||
@ -5260,7 +5259,7 @@ w3c webidl files and a binding configuration file.")
|
||||
(define-public netsurf
|
||||
(package
|
||||
(name "netsurf")
|
||||
(version "3.9")
|
||||
(version "3.10")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@ -5268,7 +5267,7 @@ w3c webidl files and a binding configuration file.")
|
||||
"releases/source/netsurf-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1hzcm2s2wh5sapgr000lg63hcdbj6hyajxl43xa1x80kc5piqbyp"))
|
||||
"0plra64c5xyiw12yx2q13brxsv8apmany97zqa2lcqckw4ll8j1n"))
|
||||
(patches (search-patches "netsurf-system-utf8proc.patch"
|
||||
"netsurf-y2038-tests.patch"
|
||||
"netsurf-longer-test-timeout.patch"
|
||||
@ -5335,18 +5334,18 @@ w3c webidl files and a binding configuration file.")
|
||||
(display (read-line in 'concat) out)
|
||||
(sxml->xml
|
||||
(let rec ((sxml (xml->sxml in
|
||||
#:default-entity-handler
|
||||
(lambda (port name)
|
||||
(string-append "<ENTITY>"
|
||||
(symbol->string name)
|
||||
"</ENTITY>")))))
|
||||
#:default-entity-handler
|
||||
(lambda (port name)
|
||||
(string-append "<ENTITY>"
|
||||
(symbol->string name)
|
||||
"</ENTITY>")))))
|
||||
;; We'd like to use sxml-match here, but it can't
|
||||
;; match against generic tag symbols...
|
||||
(match sxml
|
||||
(`(div (@ (class "links")) . ,rest)
|
||||
'())
|
||||
(`(ENTITY ,ent)
|
||||
`(*ENTITY* ,ent))
|
||||
(`(ENTITY ,ent)
|
||||
`(*ENTITY* ,ent))
|
||||
((x ...)
|
||||
(map rec x))
|
||||
(x x)))
|
||||
|
@ -1661,8 +1661,8 @@ productive, customizable lisp based systems.")
|
||||
(delete 'create-symlinks)))))))
|
||||
|
||||
(define-public stumpish
|
||||
(let ((commit "dd5b037923ec7d3cc27c55806bcec5a1b8cf4e91")
|
||||
(revision "1"))
|
||||
(let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6")
|
||||
(revision "2"))
|
||||
(package
|
||||
(name "stumpish")
|
||||
(version (git-version "0.0.1" revision commit)) ;no upstream release
|
||||
@ -1674,7 +1674,7 @@ productive, customizable lisp based systems.")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0ahxdj9f884afpzxczx6mx7l4nwg4kw6afqaq7lwhf7lxcwylldn"))))
|
||||
(base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml"))))
|
||||
(inputs
|
||||
`(("bash" ,bash)
|
||||
("rlwrap" ,rlwrap)))
|
||||
@ -1701,8 +1701,8 @@ productive, customizable lisp based systems.")
|
||||
(deprecated-package "sbcl-stumpwm-with-slynk" stumpwm+slynk))
|
||||
|
||||
(define-public sbcl-stumpwm-ttf-fonts
|
||||
(let ((commit "dd5b037923ec7d3cc27c55806bcec5a1b8cf4e91")
|
||||
(revision "1"))
|
||||
(let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6")
|
||||
(revision "2"))
|
||||
(package
|
||||
(name "sbcl-ttf-fonts")
|
||||
(version (git-version "0.0.1" revision commit)) ;no upstream release
|
||||
@ -1714,7 +1714,7 @@ productive, customizable lisp based systems.")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0ahxdj9f884afpzxczx6mx7l4nwg4kw6afqaq7lwhf7lxcwylldn"))))
|
||||
(base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml"))))
|
||||
(inputs
|
||||
`(("stumpwm" ,stumpwm "lib")
|
||||
("clx-truetype" ,sbcl-clx-truetype)))
|
||||
@ -1732,8 +1732,8 @@ rendering.")
|
||||
(license (list license:gpl2+ license:gpl3+ license:bsd-2)))))
|
||||
|
||||
(define-public sbcl-stumpwm-pass
|
||||
(let ((commit "dd5b037923ec7d3cc27c55806bcec5a1b8cf4e91")
|
||||
(revision "1"))
|
||||
(let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6")
|
||||
(revision "2"))
|
||||
(package
|
||||
(name "sbcl-pass")
|
||||
(version (git-version "0.0.1" revision commit)) ;no upstream release
|
||||
@ -1745,7 +1745,7 @@ rendering.")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0ahxdj9f884afpzxczx6mx7l4nwg4kw6afqaq7lwhf7lxcwylldn"))))
|
||||
(base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml"))))
|
||||
(inputs
|
||||
`(("stumpwm" ,stumpwm "lib")))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
@ -1762,8 +1762,8 @@ password-store into StumpWM.")
|
||||
(license (list license:gpl2+ license:gpl3+ license:bsd-2)))))
|
||||
|
||||
(define-public sbcl-stumpwm-globalwindows
|
||||
(let ((commit "dd5b037923ec7d3cc27c55806bcec5a1b8cf4e91")
|
||||
(revision "1"))
|
||||
(let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6")
|
||||
(revision "2"))
|
||||
(package
|
||||
(name "sbcl-globalwindows")
|
||||
(version (git-version "0.0.1" revision commit)) ;no upstream release
|
||||
@ -1775,7 +1775,7 @@ password-store into StumpWM.")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0ahxdj9f884afpzxczx6mx7l4nwg4kw6afqaq7lwhf7lxcwylldn"))))
|
||||
(base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml"))))
|
||||
(inputs
|
||||
`(("stumpwm" ,stumpwm "lib")))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
@ -1792,8 +1792,8 @@ windows in the current X session.")
|
||||
(license (list license:gpl2+ license:gpl3+ license:bsd-2)))))
|
||||
|
||||
(define-public sbcl-stumpwm-swm-gaps
|
||||
(let ((commit "dd5b037923ec7d3cc27c55806bcec5a1b8cf4e91")
|
||||
(revision "1"))
|
||||
(let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6")
|
||||
(revision "2"))
|
||||
(package
|
||||
(name "sbcl-swm-gaps")
|
||||
(version (git-version "0.0.1" revision commit)) ;no upstream release
|
||||
@ -1805,7 +1805,7 @@ windows in the current X session.")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0ahxdj9f884afpzxczx6mx7l4nwg4kw6afqaq7lwhf7lxcwylldn"))))
|
||||
(base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml"))))
|
||||
(inputs
|
||||
`(("stumpwm" ,stumpwm "lib")))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
|
@ -162,7 +162,7 @@ program.")
|
||||
(define-public autorandr
|
||||
(package
|
||||
(name "autorandr")
|
||||
(version "1.9")
|
||||
(version "1.10.1")
|
||||
(home-page "https://github.com/phillipberndt/autorandr")
|
||||
(source
|
||||
(origin
|
||||
@ -172,8 +172,10 @@ program.")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1bb0l7fcm5lcx9y02zdxv7pfdqf4v4gsc5br3v1x9gzjvqj64l7n"))))
|
||||
(base32 "0msw9b1hdy3gbq9w5d04mfizhyirz1c648x84mlcbzl8salm7vpg"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("xrandr" ,xrandr)
|
||||
("libxcb" ,libxcb)))
|
||||
@ -188,7 +190,11 @@ program.")
|
||||
(("/usr") (assoc-ref outputs "out")))
|
||||
(substitute* "autorandr.py"
|
||||
(("popen\\(\"xrandr") (string-append "popen(\"" xrandr))
|
||||
(("\\[\"xrandr") (string-append "[\"" xrandr))))
|
||||
(("\\[\"xrandr") (string-append "[\"" xrandr)))
|
||||
(substitute* "contrib/autorandr_launcher/autorandr_launcher.c"
|
||||
(("/usr/bin/autorandr")
|
||||
(string-append (assoc-ref outputs "out") "/bin/autorandr")))
|
||||
(setenv "CC" "gcc"))
|
||||
#t))
|
||||
(add-after 'install 'install-contrib
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
@ -196,10 +202,8 @@ program.")
|
||||
(string-append "DESTDIR=" (assoc-ref outputs "out"))
|
||||
"PREFIX="
|
||||
"BASH_COMPLETIONS_DIR=etc/bash_completiond.d"
|
||||
"install_manpage"
|
||||
"install_bash_completion"
|
||||
"install_launcher"
|
||||
"install_autostart_config"))))))
|
||||
"install"
|
||||
"TARGETS=autorandr launcher manpage bash_completion"))))))
|
||||
(synopsis "Auto-detect connected displays and load appropriate setup")
|
||||
(description "Autorandr wraps around xrandr to help with X11
|
||||
multi-screen configuration management. It allows the user to create profiles
|
||||
@ -614,7 +618,7 @@ move windows, switch between desktops, etc.).")
|
||||
(define-public scrot
|
||||
(package
|
||||
(name "scrot")
|
||||
(version "1.2")
|
||||
(version "1.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -624,7 +628,7 @@ move windows, switch between desktops, etc.).")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "08gkdby0ysx2mki57z81zlm7vfnq9c1gq692xw67cg5vv2p3320w"))))
|
||||
(base32 "0x70hd59ik37kqd8xqpwrz46np01jv324iz28x2s0kk36d7sblsj"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
@ -792,7 +796,7 @@ to find buttons, etc, on the screen to click on.")
|
||||
(define-public xbanish
|
||||
(package
|
||||
(name "xbanish")
|
||||
(version "1.6")
|
||||
(version "1.7")
|
||||
(home-page "https://github.com/jcs/xbanish")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
@ -801,14 +805,14 @@ to find buttons, etc, on the screen to click on.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0vp8ja68hpmqkl61zyjar3czhmny1hbm74m8f393incfz1ymr3i8"))))
|
||||
"0ic5f7zgc32p5g1wxas9y5h8dhik0pvsa8wmn6skdry56gw9vg9q"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ;no tests
|
||||
`(#:tests? #f ; no tests
|
||||
#:make-flags (list "CC=gcc"
|
||||
(string-append "PREFIX=" (assoc-ref %outputs "out")))
|
||||
#:phases (modify-phases %standard-phases
|
||||
(delete 'configure))))
|
||||
(delete 'configure)))) ; no configure script
|
||||
(inputs
|
||||
`(("libx11" ,libx11)
|
||||
("libxfixes" ,libxfixes)
|
||||
@ -1571,13 +1575,13 @@ program for X11. It was designed to be fast, tiny and scriptable in any languag
|
||||
#:make-flags
|
||||
(let ((out (assoc-ref %outputs "out")))
|
||||
(list (string-append "DESTDIR=" out)))))
|
||||
(home-page "https://github.com/vixus0/xftwidth")
|
||||
(synopsis "Calculator for determining pixel widths of displayed text using Xft fonts")
|
||||
(description "xftwidth is a small C program for calculating the pixel
|
||||
widths of displayed text using Xft fonts. It is especially useful in scripts
|
||||
for displaying text in graphical panels, menus, popups, and notification
|
||||
windows generated using dzen. These scripts are often used in conjunction with
|
||||
minimalistic tiling window managers such as herbstluftwm and bspwm.")
|
||||
(home-page "http://github.com/vixus0/xftwidth")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public xcb-util-xrm
|
||||
|
@ -1286,14 +1286,14 @@ spreadsheet.")
|
||||
(define-public xerces-c
|
||||
(package
|
||||
(name "xerces-c")
|
||||
(version "3.1.4")
|
||||
(version "3.2.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://apache/xerces/c/3/sources/"
|
||||
"xerces-c-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0hb29c0smqlpxj0zdm09s983z5jx37szlliccnvgh0qq91wwqwwr"))))
|
||||
"0jf1khvlssg31vkxbc25dxjxcxm56xb8nywj1sypj6hxzjlrkz0j"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(let ((system (or (%current-target-system)
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user