Merge branch 'master' into core-updates
Marius Bakke
commit
bee7bb315c
|
|
@ -3,7 +3,7 @@
|
|||
# Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
||||
# Copyright © 2015, 2017 Alex Kost <alezost@gmail.com>
|
||||
# Copyright © 2016, 2018 Mathieu Lirzin <mthl@gnu.org>
|
||||
# Copyright © 2016, 2017 Mark H Weaver <mhw@netris.org>
|
||||
# Copyright © 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
|
||||
# Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
# Copyright © 2017 Leo Famulari <leo@famulari.name>
|
||||
# Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
|
|
@ -254,6 +254,9 @@ dist_noinst_DATA = guix/tests.scm guix/tests/http.scm
|
|||
# Auxiliary files for packages.
|
||||
AUX_FILES = \
|
||||
gnu/packages/aux-files/emacs/guix-emacs.el \
|
||||
gnu/packages/aux-files/linux-libre/4.15-arm.conf \
|
||||
gnu/packages/aux-files/linux-libre/4.15-i686.conf \
|
||||
gnu/packages/aux-files/linux-libre/4.15-x86_64.conf \
|
||||
gnu/packages/aux-files/linux-libre/4.14-arm.conf \
|
||||
gnu/packages/aux-files/linux-libre/4.14-i686.conf \
|
||||
gnu/packages/aux-files/linux-libre/4.14-x86_64.conf \
|
||||
|
|
@ -450,6 +453,7 @@ EXTRA_DIST = \
|
|||
CODE-OF-CONDUCT \
|
||||
.dir-locals.el \
|
||||
bin/guix.in \
|
||||
etc/guix-install.sh \
|
||||
build-aux/build-self.scm \
|
||||
build-aux/compile-all.scm \
|
||||
build-aux/hydra/evaluate.scm \
|
||||
|
|
|
|||
|
|
@ -51,6 +51,8 @@
|
|||
((guix scripts system) #:select (read-operating-system))
|
||||
((guix scripts pack)
|
||||
#:select (lookup-compressor self-contained-tarball))
|
||||
(gnu bootloader)
|
||||
(gnu bootloader u-boot)
|
||||
(gnu packages)
|
||||
(gnu packages gcc)
|
||||
(gnu packages base)
|
||||
|
|
@ -135,7 +137,10 @@ SYSTEM."
|
|||
"i686-w64-mingw32"))
|
||||
|
||||
(define %guixsd-supported-systems
|
||||
'("x86_64-linux" "i686-linux"))
|
||||
'("x86_64-linux" "i686-linux" "armhf-linux"))
|
||||
|
||||
(define %u-boot-systems
|
||||
'("armhf-linux"))
|
||||
|
||||
(define (qemu-jobs store system)
|
||||
"Return a list of jobs that build QEMU images for SYSTEM."
|
||||
|
|
@ -159,20 +164,32 @@ system.")
|
|||
(expt 2 20))
|
||||
|
||||
(if (member system %guixsd-supported-systems)
|
||||
(list (->job 'usb-image
|
||||
(run-with-store store
|
||||
(mbegin %store-monad
|
||||
(set-guile-for-build (default-guile))
|
||||
(system-disk-image installation-os
|
||||
#:disk-image-size
|
||||
(* 1024 MiB)))))
|
||||
(->job 'iso9660-image
|
||||
(run-with-store store
|
||||
(mbegin %store-monad
|
||||
(set-guile-for-build (default-guile))
|
||||
(system-disk-image installation-os
|
||||
#:file-system-type
|
||||
"iso9660")))))
|
||||
(if (member system %u-boot-systems)
|
||||
(list (->job 'flash-image
|
||||
(run-with-store store
|
||||
(mbegin %store-monad
|
||||
(set-guile-for-build (default-guile))
|
||||
(system-disk-image
|
||||
(operating-system (inherit installation-os)
|
||||
(bootloader (bootloader-configuration
|
||||
(bootloader u-boot-bootloader)
|
||||
(target #f))))
|
||||
#:disk-image-size
|
||||
(* 1024 MiB))))))
|
||||
(list (->job 'usb-image
|
||||
(run-with-store store
|
||||
(mbegin %store-monad
|
||||
(set-guile-for-build (default-guile))
|
||||
(system-disk-image installation-os
|
||||
#:disk-image-size
|
||||
(* 1024 MiB)))))
|
||||
(->job 'iso9660-image
|
||||
(run-with-store store
|
||||
(mbegin %store-monad
|
||||
(set-guile-for-build (default-guile))
|
||||
(system-disk-image installation-os
|
||||
#:file-system-type
|
||||
"iso9660"))))))
|
||||
'()))
|
||||
|
||||
(define (system-test-jobs store system)
|
||||
|
|
|
|||
|
|
@ -403,6 +403,11 @@ dependencies. This is often quicker than installing from source, which
|
|||
is described in the next sections. The only requirement is to have
|
||||
GNU@tie{}tar and Xz.
|
||||
|
||||
We provide a
|
||||
@uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh,
|
||||
shell installer script}, which automates the download, installation, and
|
||||
initial configuration of Guix. It should be run as the root user.
|
||||
|
||||
Installing goes along these lines:
|
||||
|
||||
@enumerate
|
||||
|
|
@ -8192,7 +8197,7 @@ parted /dev/sda set 1 esp on
|
|||
Once you are done partitioning the target hard disk drive, you have to
|
||||
create a file system on the relevant partition(s)@footnote{Currently
|
||||
GuixSD only supports ext4 and btrfs file systems. In particular, code
|
||||
that reads partition UUIDs and labels only works for these file system
|
||||
that reads file system UUIDs and labels only works for these file system
|
||||
types.}. For the ESP, if you have one and assuming it is
|
||||
@file{/dev/sda2}, run:
|
||||
|
||||
|
|
@ -8233,7 +8238,7 @@ root file system):
|
|||
mount LABEL=my-root /mnt
|
||||
@end example
|
||||
|
||||
Also mount any other partitions you would like to use on the target
|
||||
Also mount any other file systems you would like to use on the target
|
||||
system relative to this path. If you have @file{/boot} on a separate
|
||||
partition for example, mount it at @file{/mnt/boot} now so it is found
|
||||
by @code{guix system init} afterwards.
|
||||
|
|
@ -8320,7 +8325,7 @@ to a mounted EFI partition, like @code{/boot/efi}, and do make sure the
|
|||
path is actually mounted.
|
||||
|
||||
@item
|
||||
Be sure that your partition labels match the value of their respective
|
||||
Be sure that your file system labels match the value of their respective
|
||||
@code{device} fields in your @code{file-system} configuration, assuming
|
||||
your @code{file-system} configuration sets the value of @code{title} to
|
||||
@code{'label}.
|
||||
|
|
@ -8526,7 +8531,7 @@ of a package:
|
|||
@end lisp
|
||||
|
||||
@findex specification->package
|
||||
Referring to packages by variable name, like @var{tcpdump} above, has
|
||||
Referring to packages by variable name, like @code{bind} above, has
|
||||
the advantage of being unambiguous; it also allows typos and such to be
|
||||
diagnosed right away as ``unbound variables''. The downside is that one
|
||||
needs to know which module defines which package, and to augment the
|
||||
|
|
@ -8617,7 +8622,7 @@ instead of full-blown desktop environments would look like this:
|
|||
@include os-config-lightweight-desktop.texi
|
||||
@end lisp
|
||||
|
||||
This example refers to the @file{/boot/efi} partition by its UUID,
|
||||
This example refers to the @file{/boot/efi} file system by its UUID,
|
||||
@code{1234-ABCD}. Replace this UUID with the right UUID on your system,
|
||||
as returned by the @command{blkid} command.
|
||||
|
||||
|
|
@ -8881,8 +8886,8 @@ interpreted.
|
|||
|
||||
When it is the symbol @code{device}, then the @code{device} field is
|
||||
interpreted as a file name; when it is @code{label}, then @code{device}
|
||||
is interpreted as a partition label name; when it is @code{uuid},
|
||||
@code{device} is interpreted as a partition unique identifier (UUID).
|
||||
is interpreted as a file system label name; when it is @code{uuid},
|
||||
@code{device} is interpreted as a file system unique identifier (UUID).
|
||||
|
||||
UUIDs may be converted from their string representation (as shown by the
|
||||
@command{tune2fs -l} command) using the @code{uuid} form@footnote{The
|
||||
|
|
@ -8900,8 +8905,8 @@ like this:
|
|||
(device (uuid "4dab5feb-d176-45de-b287-9b0a6e4c01cb")))
|
||||
@end example
|
||||
|
||||
The @code{label} and @code{uuid} options offer a way to refer to disk
|
||||
partitions without having to hard-code their actual device
|
||||
The @code{label} and @code{uuid} options offer a way to refer to file
|
||||
systems without having to hard-code their actual device
|
||||
name@footnote{Note that, while it is tempting to use
|
||||
@file{/dev/disk/by-uuid} and similar device names to achieve the same
|
||||
result, this is not recommended: These special device nodes are created
|
||||
|
|
@ -11283,8 +11288,8 @@ configuration file. It is used to pass extra text to be
|
|||
added verbatim to the configuration file.
|
||||
@end deffn
|
||||
|
||||
@deffn {Scheme Procedure} screen-locker-service @var{package} [@var{name}]
|
||||
Add @var{package}, a package for a screen-locker or screen-saver whose
|
||||
@deffn {Scheme Procedure} screen-locker-service @var{package} [@var{program}]
|
||||
Add @var{package}, a package for a screen locker or screen saver whose
|
||||
command is @var{program}, to the set of setuid programs and add a PAM entry
|
||||
for it. For example:
|
||||
|
||||
|
|
@ -11322,16 +11327,16 @@ CUPS service will generate a self-signed certificate if needed, for
|
|||
secure connections to the print server.
|
||||
|
||||
Suppose you want to enable the Web interface of CUPS and also add
|
||||
support for HP printers @i{via} the @code{hplip} package. You can do
|
||||
that directly, like this (you need to use the @code{(gnu packages cups)}
|
||||
module):
|
||||
support for Epson printers @i{via} the @code{escpr} package and for HP
|
||||
printers @i{via} the @code{hplip} package. You can do that directly,
|
||||
like this (you need to use the @code{(gnu packages cups)} module):
|
||||
|
||||
@example
|
||||
(service cups-service-type
|
||||
(cups-configuration
|
||||
(web-interface? #t)
|
||||
(extensions
|
||||
(list cups-filters hplip))))
|
||||
(list cups-filters escpr hplip))))
|
||||
@end example
|
||||
|
||||
The available configuration parameters follow. Each parameter
|
||||
|
|
@ -18626,7 +18631,7 @@ initialization system.
|
|||
|
||||
@item --root=@var{root}
|
||||
Mount @var{root} as the root file system. @var{root} can be a
|
||||
device name like @code{/dev/sda1}, a partition label, or a partition
|
||||
device name like @code{/dev/sda1}, a file system label, or a file system
|
||||
UUID.
|
||||
|
||||
@item --system=@var{system}
|
||||
|
|
@ -18667,7 +18672,7 @@ the root file system specified on the kernel command line via @code{--root}.
|
|||
@var{file-systems} are mounted (@pxref{Mapped Devices}).
|
||||
@var{helper-packages} is a list of packages to be copied in the initrd. It may
|
||||
include @code{e2fsck/static} or other packages needed by the initrd to check
|
||||
root partition.
|
||||
the root file system.
|
||||
|
||||
When @var{qemu-networking?} is true, set up networking with the standard QEMU
|
||||
parameters. When @var{virtio?} is true, load additional modules so that the
|
||||
|
|
|
|||
|
|
@ -0,0 +1,425 @@
|
|||
#!/bin/bash
|
||||
# GNU Guix --- Functional package management for GNU
|
||||
# Copyright © 2017 sharlatan <sharlatanus@gmail.com>
|
||||
# Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||
#
|
||||
# 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/>.
|
||||
|
||||
set -e
|
||||
|
||||
[ "$UID" -eq 0 ] || { echo "This script must be run as root."; exit 1; }
|
||||
|
||||
REQUIRE=(
|
||||
"dirname"
|
||||
"readlink"
|
||||
"wget"
|
||||
"gpg"
|
||||
"grep"
|
||||
"which"
|
||||
"sed"
|
||||
"sort"
|
||||
"getent"
|
||||
"mktemp"
|
||||
"rm"
|
||||
"chmod"
|
||||
"uname"
|
||||
"groupadd"
|
||||
"tail"
|
||||
"tr"
|
||||
)
|
||||
|
||||
PAS=$'[ \033[32;1mPASS\033[0m ] '
|
||||
ERR=$'[ \033[31;1mFAIL\033[0m ] '
|
||||
INF="[ INFO ] "
|
||||
|
||||
DEBUG=0
|
||||
GNU_URL="https://alpha.gnu.org/gnu/guix/"
|
||||
OPENPGP_SIGNING_KEY_ID="3CE464558A84FDC69DB40CFB090B11993D9AEBB5"
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
#+UTILITIES
|
||||
|
||||
_err()
|
||||
{ # All errors go to stderr.
|
||||
printf "[%s]: %s\n" "$(date +%s.%3N)" "$1"
|
||||
}
|
||||
|
||||
_msg()
|
||||
{ # Default message to stdout.
|
||||
printf "[%s]: %s\n" "$(date +%s.%3N)" "$1"
|
||||
}
|
||||
|
||||
_debug()
|
||||
{
|
||||
if [ "${DEBUG}" = '1' ]; then
|
||||
printf "[%s]: %s\n" "$(date +%s.%3N)" "$1"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
chk_require()
|
||||
{ # Check that every required command is available.
|
||||
declare -a cmds
|
||||
declare -a warn
|
||||
|
||||
cmds=(${1})
|
||||
|
||||
_debug "--- [ $FUNCNAME ] ---"
|
||||
|
||||
for c in ${cmds[@]}; do
|
||||
command -v "$c" &>/dev/null
|
||||
[ "$?" -eq "1" ] &&
|
||||
warn+=("$c")
|
||||
done
|
||||
|
||||
[ "${#warn}" -ne 0 ] &&
|
||||
{ _err "${ERR}Missing commands: ${warn[*]}.";
|
||||
return 1; }
|
||||
|
||||
_msg "${PAS}verification of required commands completed"
|
||||
|
||||
gpg --list-keys ${OPENPGP_SIGNING_KEY_ID} >/dev/null 2>&1 || (
|
||||
_err "${ERR}Missing OpenPGP public key. Fetch it with this command:"
|
||||
echo " gpg --keyserver pgp.mit.edu --recv-keys ${OPENPGP_SIGNING_KEY_ID}"
|
||||
exit 1
|
||||
)
|
||||
}
|
||||
|
||||
chk_term()
|
||||
{ # Check for ANSI terminal for color printing.
|
||||
local ansi_term
|
||||
|
||||
if [ -t 2 ]; then
|
||||
if [ "${TERM+set}" = 'set' ]; then
|
||||
case "$TERM" in
|
||||
xterm*|rxvt*|urxvt*|linux*|vt*|eterm*|screen*)
|
||||
ansi_term=true
|
||||
;;
|
||||
*)
|
||||
ansi_term=false
|
||||
ERR="[ FAIL ] "
|
||||
PAS="[ PASS ] "
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
chk_init_sys()
|
||||
{ # Return init system type name.
|
||||
if [[ $(/sbin/init --version 2>/dev/null) =~ upstart ]]; then
|
||||
_msg "${INF}init system is: upstart"
|
||||
INIT_SYS="upstart"
|
||||
return 0
|
||||
elif [[ $(systemctl) =~ -\.mount ]]; then
|
||||
_msg "${INF}init system is: systemd"
|
||||
INIT_SYS="systemd"
|
||||
return 0
|
||||
elif [[ -f /etc/init.d/cron && ! -h /etc/init.d/cron ]]; then
|
||||
_msg "${INF}init system is: sysv-init"
|
||||
INIT_SYS="sysv-init"
|
||||
return 0
|
||||
else
|
||||
INIT_SYS="NA"
|
||||
_err "${ERR}Init system could not be detected."
|
||||
fi
|
||||
}
|
||||
|
||||
chk_sys_arch()
|
||||
{ # Check for operating system and architecture type.
|
||||
local os
|
||||
local arch
|
||||
|
||||
os="$(uname -s)"
|
||||
arch="$(uname -m)"
|
||||
|
||||
case "$arch" in
|
||||
i386 | i486 | i686 | i786 | x86)
|
||||
local arch=i686
|
||||
;;
|
||||
x86_64 | x86-64 | x64 | amd64)
|
||||
local arch=x86_64
|
||||
;;
|
||||
*)
|
||||
_err "${ERR}Unsupported CPU type: ${arch}"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
case "$os" in
|
||||
Linux | linux)
|
||||
local os=linux
|
||||
;;
|
||||
*)
|
||||
_err "${ERR}Your operation system (${os}) is not supported."
|
||||
exit 1
|
||||
esac
|
||||
|
||||
ARCH_OS="${arch}-${os}"
|
||||
}
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
#+MAIN
|
||||
|
||||
guix_get_bin_list()
|
||||
{ # Scan GNU archive and save list of binaries
|
||||
local gnu_url="$1"
|
||||
local -a bin_ver_ls
|
||||
local latest_ver
|
||||
local default_ver
|
||||
|
||||
_debug "--- [ $FUNCNAME ] ---"
|
||||
|
||||
# Filter only version and architecture
|
||||
bin_ver_ls=("$(wget -qO- "$gnu_url" \
|
||||
| sed -n -e 's/.*guix-binary-\([0-9.]*\)\..*.tar.xz.*/\1/p' \
|
||||
| sort -Vu)")
|
||||
|
||||
latest_ver="$(echo "$bin_ver_ls" \
|
||||
| grep -oP "([0-9]{1,2}\.){2}[0-9]{1,2}" \
|
||||
| tail -n1)"
|
||||
|
||||
default_ver="guix-binary-${latest_ver}.${ARCH_OS}"
|
||||
|
||||
if [[ "${#bin_ver_ls}" -ne "0" ]]; then
|
||||
_msg "${PAS}Release for your system: ${default_ver}"
|
||||
else
|
||||
_err "${ERR}Could not obtain list of Guix releases."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Use default to download according to the list and local ARCH_OS.
|
||||
BIN_VER="$default_ver"
|
||||
}
|
||||
|
||||
guix_get_bin()
|
||||
{ # Download and verify binary package.
|
||||
local url="$1"
|
||||
local bin_ver="$2"
|
||||
local dl_path="$3"
|
||||
|
||||
_debug "--- [ $FUNCNAME ] ---"
|
||||
|
||||
_msg "${INF}Downloading Guix release archive"
|
||||
|
||||
wget --help | grep -q '\--show-progress' && \
|
||||
_PROGRESS_OPT="-q --show-progress" || _PROGRESS_OPT=""
|
||||
wget $_PROGRESS_OPT -P "$dl_path" "${url}/${bin_ver}.tar.xz" "${url}/${bin_ver}.tar.xz.sig"
|
||||
|
||||
if [[ "$?" -eq 0 ]]; then
|
||||
_msg "${PAS}download completed."
|
||||
else
|
||||
_err "${ERR}could not download ${url}/${bin_ver}.tar.xz."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
pushd $dl_path >/dev/null
|
||||
gpg --verify "${bin_ver}.tar.xz.sig" >/dev/null 2>&1
|
||||
if [[ "$?" -eq 0 ]]; then
|
||||
_msg "${PAS}Signature is valid."
|
||||
popd >/dev/null
|
||||
else
|
||||
_err "${ERR}could not verify the signature."
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
sys_create_store()
|
||||
{ # Unpack and install /gnu/store and /var/guix
|
||||
local pkg="$1"
|
||||
local tmp_path="$2"
|
||||
|
||||
_debug "--- [ $FUNCNAME ] ---"
|
||||
|
||||
cd "$tmp_path"
|
||||
tar --warning=no-timestamp \
|
||||
--extract \
|
||||
--file "$pkg" &&
|
||||
_msg "${PAS}unpacked archive"
|
||||
|
||||
if [[ -e "/var/guix" || -e "/gnu" ]]; then
|
||||
_err "${ERR}A previous Guix installation was found. Refusing to overwrite."
|
||||
exit 1
|
||||
else
|
||||
_msg "${INF}Installing /var/guix and /gnu..."
|
||||
mv "${tmp_path}/var/guix" /var/
|
||||
mv "${tmp_path}/gnu" /
|
||||
fi
|
||||
|
||||
_msg "${INF}Linking the root user's profile"
|
||||
ln -sf /var/guix/profiles/per-user/root/guix-profile \
|
||||
~root/.guix-profile
|
||||
|
||||
GUIX_PROFILE="${HOME}/.guix-profile"
|
||||
source "${GUIX_PROFILE}/etc/profile"
|
||||
_msg "${PAS}activated root profile at /root/.guix-profile"
|
||||
}
|
||||
|
||||
sys_create_build_user()
|
||||
{ # Create the group and user accounts for build users.
|
||||
|
||||
_debug "--- [ $FUNCNAME ] ---"
|
||||
|
||||
if [ $(getent group guixbuild) ]; then
|
||||
_msg "${INF}group guixbuild exists"
|
||||
else
|
||||
groupadd --system guixbuild
|
||||
_msg "${PAS}group <guixbuild> created"
|
||||
fi
|
||||
|
||||
for i in $(seq -w 1 10); do
|
||||
if id "guixbuilder${i}" &>/dev/null; then
|
||||
_msg "${INF}user is already in the system, reset"
|
||||
usermod -g guixbuild -G guixbuild \
|
||||
-d /var/empty -s "$(which nologin)" \
|
||||
-c "Guix build user $i" \
|
||||
"guixbuilder${i}";
|
||||
else
|
||||
useradd -g guixbuild -G guixbuild \
|
||||
-d /var/empty -s "$(which nologin)" \
|
||||
-c "Guix build user $i" --system \
|
||||
"guixbuilder${i}";
|
||||
_msg "${PAS}user added <guixbuilder${i}>"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
sys_enable_guix_daemon()
|
||||
{ # Run the daemon, and set it to automatically start on boot.
|
||||
|
||||
local info_path
|
||||
local local_bin
|
||||
local var_guix
|
||||
|
||||
_debug "--- [ $FUNCNAME ] ---"
|
||||
|
||||
info_path="/usr/local/share/info"
|
||||
local_bin="/usr/local/bin"
|
||||
var_guix="/var/guix/profiles/per-user/root/guix-profile"
|
||||
|
||||
case "$INIT_SYS" in
|
||||
upstart)
|
||||
{ initctl reload-configuration;
|
||||
cp ~root/.guix-profile/lib/upstart/system/guix-daemon.conf \
|
||||
/etc/init/ &&
|
||||
start guix-daemon; } &&
|
||||
_msg "${PAS}enabled Guix daemon via upstart"
|
||||
;;
|
||||
systemd)
|
||||
{ cp ~root/.guix-profile/lib/systemd/system/guix-daemon.service \
|
||||
/etc/systemd/system/;
|
||||
chmod 664 /etc/systemd/system/guix-daemon.service;
|
||||
systemctl daemon-reload &&
|
||||
systemctl start guix-daemon &&
|
||||
systemctl enable guix-daemon; } &&
|
||||
_msg "${PAS}enabled Guix daemon via systemd"
|
||||
;;
|
||||
NA|*)
|
||||
_msg "${ERR}unsupported init system; run the daemon manually:"
|
||||
echo " ~root/.guix-profile/bin/guix-daemon --build-users-group=guixbuild"
|
||||
;;
|
||||
esac
|
||||
|
||||
_msg "${INF}making the guix command available to other users"
|
||||
|
||||
[ -e "$local_bin" ] || mkdir -p "$local_bin"
|
||||
ln -sf "${var_guix}/bin/guix" "$local_bin"
|
||||
|
||||
[ -e "$info_path" ] || mkdir -p "$info_path"
|
||||
for i in ${var_guix}/share/info/*; do
|
||||
ln -sf "$i" "$info_path"
|
||||
done
|
||||
}
|
||||
|
||||
sys_authorize_build_farms()
|
||||
{ # authorize the public keys of the two build farms
|
||||
while true; do
|
||||
read -p "Permit downloading pre-built package binaries from the project's build farms? (yes/no) " yn
|
||||
case $yn in
|
||||
[Yy]*) guix archive --authorize < ~root/.guix-profile/share/guix/hydra.gnu.org.pub &&
|
||||
_msg "${PAS}Authorized public key for hydra.gnu.org";
|
||||
guix archive --authorize < ~root/.guix-profile/share/guix/berlin.guixsd.org.pub &&
|
||||
_msg "${PAS}Authorized public key for berlin.guixsd.org";
|
||||
break;;
|
||||
[Nn]*) _msg "${INF}Skipped authorizing build farm public keys"
|
||||
break;;
|
||||
*) _msg "Please answer yes or no.";
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
welcome()
|
||||
{
|
||||
cat<<"EOF"
|
||||
░░░ ░░░
|
||||
░░▒▒░░░░░░░░░ ░░░░░░░░░▒▒░░
|
||||
░░▒▒▒▒▒░░░░░░░ ░░░░░░░▒▒▒▒▒░
|
||||
░▒▒▒░░▒▒▒▒▒ ░░░░░░░▒▒░
|
||||
░▒▒▒▒░ ░░░░░░
|
||||
▒▒▒▒▒ ░░░░░░
|
||||
▒▒▒▒▒ ░░░░░
|
||||
░▒▒▒▒▒ ░░░░░
|
||||
▒▒▒▒▒ ░░░░░
|
||||
▒▒▒▒▒ ░░░░░
|
||||
░▒▒▒▒▒░░░░░
|
||||
▒▒▒▒▒▒░░░
|
||||
▒▒▒▒▒▒░
|
||||
_____ _ _ _ _ _____ _
|
||||
/ ____| \ | | | | | / ____| (_)
|
||||
| | __| \| | | | | | | __ _ _ ___ __
|
||||
| | |_ | . ' | | | | | | |_ | | | | \ \/ /
|
||||
| |__| | |\ | |__| | | |__| | |_| | |> <
|
||||
\_____|_| \_|\____/ \_____|\__,_|_/_/\_\
|
||||
|
||||
This script installs GNU Guix on your system
|
||||
|
||||
https://www.gnu.org/software/guix/
|
||||
EOF
|
||||
echo -n "Press return to continue..."
|
||||
read -r ANSWER
|
||||
}
|
||||
|
||||
main()
|
||||
{
|
||||
local tmp_path
|
||||
welcome
|
||||
|
||||
_msg "Starting installation ($(date))"
|
||||
|
||||
chk_term
|
||||
chk_require "${REQUIRE[*]}"
|
||||
chk_init_sys
|
||||
chk_sys_arch
|
||||
|
||||
_msg "${INF}system is ${ARCH_OS}"
|
||||
|
||||
tmp_path="$(mktemp -t -d guix.XXX)"
|
||||
|
||||
guix_get_bin_list "${GNU_URL}"
|
||||
guix_get_bin "${GNU_URL}" "${BIN_VER}" "$tmp_path"
|
||||
|
||||
sys_create_store "${BIN_VER}.tar.xz" "${tmp_path}"
|
||||
sys_create_build_user
|
||||
sys_enable_guix_daemon
|
||||
sys_authorize_build_farms
|
||||
|
||||
_msg "${INF}cleaning up ${tmp_path}"
|
||||
rm -r "${tmp_path}"
|
||||
|
||||
_msg "${PAS}Guix has successfully been installed!"
|
||||
_msg "${INF}Run 'info guix' to read the manual."
|
||||
}
|
||||
|
||||
main "$@"
|
||||
|
|
@ -37,6 +37,7 @@
|
|||
#:export (mount-essential-file-systems
|
||||
linux-command-line
|
||||
find-long-option
|
||||
find-long-options
|
||||
make-essential-device-nodes
|
||||
make-static-device-nodes
|
||||
configure-qemu-networking
|
||||
|
|
@ -99,6 +100,16 @@ Return the value associated with OPTION, or #f on failure."
|
|||
(lambda (arg)
|
||||
(substring arg (+ 1 (string-index arg #\=)))))))
|
||||
|
||||
(define (find-long-options option arguments)
|
||||
"Find OPTIONs among ARGUMENTS, where OPTION is something like \"console\".
|
||||
Return the values associated with OPTIONs as a list, or the empty list if
|
||||
OPTION doesn't appear in ARGUMENTS."
|
||||
(let ((opt (string-append option "=")))
|
||||
(filter-map (lambda (arg)
|
||||
(and (string-prefix? opt arg)
|
||||
(substring arg (+ 1 (string-index arg #\=)))))
|
||||
arguments)))
|
||||
|
||||
(define* (make-disk-device-nodes base major #:optional (minor 0))
|
||||
"Make the block device nodes around BASE (something like \"/root/dev/sda\")
|
||||
with the given MAJOR number, starting with MINOR."
|
||||
|
|
|
|||
|
|
@ -357,6 +357,7 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/packages/re2c.scm \
|
||||
%D%/packages/readline.scm \
|
||||
%D%/packages/regex.scm \
|
||||
%D%/packages/robotics.scm \
|
||||
%D%/packages/rrdtool.scm \
|
||||
%D%/packages/rsync.scm \
|
||||
%D%/packages/ruby.scm \
|
||||
|
|
@ -997,6 +998,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/python-3-deterministic-build-info.patch \
|
||||
%D%/packages/patches/python-3-search-paths.patch \
|
||||
%D%/packages/patches/python-3-fix-tests.patch \
|
||||
%D%/packages/patches/python-axolotl-AES-fix.patch \
|
||||
%D%/packages/patches/python-dendropy-fix-tests.patch \
|
||||
%D%/packages/patches/python-fix-tests.patch \
|
||||
%D%/packages/patches/python-genshi-add-support-for-python-3.4-AST.patch \
|
||||
|
|
@ -1045,11 +1047,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/ripperx-missing-file.patch \
|
||||
%D%/packages/patches/rpcbind-CVE-2017-8779.patch \
|
||||
%D%/packages/patches/rsem-makefile.patch \
|
||||
%D%/packages/patches/rsync-CVE-2017-16548.patch \
|
||||
%D%/packages/patches/rsync-CVE-2017-17433.patch \
|
||||
%D%/packages/patches/rsync-CVE-2017-17433-fix-tests.patch \
|
||||
%D%/packages/patches/rsync-CVE-2017-17434-pt1.patch \
|
||||
%D%/packages/patches/rsync-CVE-2017-17434-pt2.patch \
|
||||
%D%/packages/patches/rtags-separate-rct.patch \
|
||||
%D%/packages/patches/ruby-concurrent-ignore-broken-test.patch \
|
||||
%D%/packages/patches/ruby-concurrent-test-arm.patch \
|
||||
|
|
@ -1091,7 +1088,6 @@ 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-fix-dns-rebinding-vuln.patch \
|
||||
%D%/packages/patches/ttf2eot-cstddef.patch \
|
||||
%D%/packages/patches/ttfautohint-source-date-epoch.patch \
|
||||
%D%/packages/patches/tophat-build-with-later-seqan.patch \
|
||||
|
|
|
|||
|
|
@ -187,6 +187,49 @@ interface and is based on GNU Guile.")
|
|||
(home-page "https://www.gnu.org/software/shepherd/")
|
||||
(properties '((ftp-server . "alpha.gnu.org")))))
|
||||
|
||||
(define-public daemontools
|
||||
(package
|
||||
(name "daemontools")
|
||||
(version "0.76")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://cr.yp.to/" name "/"
|
||||
name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"07scvw88faxkscxi91031pjkpccql6wspk4yrlnsbrrb5c0kamd5"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ;; No tests as far as I can tell.
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'chdir
|
||||
(lambda _
|
||||
(chdir ,(string-append name "-" version))))
|
||||
(delete 'configure)
|
||||
(add-before 'build 'patch
|
||||
(lambda _
|
||||
(substitute* "src/error.h"
|
||||
(("extern int errno;")
|
||||
"#include <errno.h>"))))
|
||||
(replace 'build
|
||||
(lambda _
|
||||
(invoke "package/compile")))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin")))
|
||||
(for-each (lambda (file)
|
||||
(install-file file bin))
|
||||
(find-files "command"))))))))
|
||||
(synopsis "Tools for managing UNIX style services")
|
||||
(description
|
||||
"@code{daemontools} is a collection of tools for managing UNIX
|
||||
services.")
|
||||
(license license:public-domain)
|
||||
(home-page "https://cr.yp.to/daemontools.html")))
|
||||
|
||||
(define-public dfc
|
||||
(package
|
||||
(name "dfc")
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2013, 2015, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016, 2017, 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
|
|
@ -516,6 +516,7 @@ a C program.")
|
|||
(license license:bsd-3)))
|
||||
|
||||
(define-public fftw
|
||||
;; TODO: Make this 3.3.7 (see below) on the next upgrade cycle.
|
||||
(package
|
||||
(name "fftw")
|
||||
(version "3.3.5")
|
||||
|
|
@ -575,6 +576,42 @@ cosine/ sine transforms or DCT/DST).")
|
|||
(string-append (package-description fftw)
|
||||
" With OpenMPI parallelism support."))))
|
||||
|
||||
(define-public fftw-3.3.7
|
||||
;; TODO: Make this the default 'fftw' on the next upgrade cycle.
|
||||
(package
|
||||
(inherit fftw)
|
||||
(version "3.3.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "ftp://ftp.fftw.org/pub/fftw/fftw-"
|
||||
version".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0wsms8narnbhfsa8chdflv2j9hzspvflblnqdn7hw8x5xdzrnq1v"))))))
|
||||
|
||||
(define-public fftw-avx
|
||||
(package
|
||||
(inherit fftw-3.3.7)
|
||||
(name "fftw-avx")
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments fftw-3.3.7)
|
||||
((#:configure-flags flags ''())
|
||||
;; Enable AVX & co. See details at:
|
||||
;; <http://fftw.org/fftw3_doc/Installation-on-Unix.html>.
|
||||
`(append '("--enable-avx" "--enable-avx2" "--enable-avx512"
|
||||
"--enable-avx-128-fma")
|
||||
,flags))
|
||||
((#:substitutable? _ #f)
|
||||
;; To run the tests, we must have a CPU that supports all these
|
||||
;; extensions. Since we cannot be sure that machines in the build
|
||||
;; farm support them, disable substitutes altogether.
|
||||
#f)
|
||||
((#:phases _)
|
||||
;; Since we're not providing binaries, let '-mtune=native' through.
|
||||
'%standard-phases)))
|
||||
(synopsis "Computing the discrete Fourier transform (AVX2-optimized)")
|
||||
(supported-systems '("x86_64-linux"))))
|
||||
|
||||
(define-public eigen
|
||||
(package
|
||||
(name "eigen")
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
#:use-module (guix packages)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages gettext)
|
||||
|
|
@ -34,16 +35,18 @@
|
|||
(define-public cfitsio
|
||||
(package
|
||||
(name "cfitsio")
|
||||
(version "3390")
|
||||
(version "3.420")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/" name version
|
||||
".tar.gz"))
|
||||
"http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/"
|
||||
name (string-replace-substring version "." "") ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "02gllydm63irwbqqisa3mrskw1fphm5rlplglz3mq9whi3rxilv2"))))
|
||||
(base32 "1f0nmki45h9kw7vxpxiav9cb6vs3qqi6zrp2lpci5yhqc5isl43c"))))
|
||||
(build-system gnu-build-system)
|
||||
;; XXX Building with curl currently breaks wcslib. It doesn't use
|
||||
;; pkg-config and hence won't link with -lcurl.
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
#:phases
|
||||
|
|
@ -55,7 +58,7 @@
|
|||
(home-page "http://heasarc.gsfc.nasa.gov/fitsio/fitsio.html")
|
||||
(synopsis "Library for reading and writing FITS files")
|
||||
(description "CFITSIO provides simple high-level routines for reading and
|
||||
writing FITS (Flexible Image Transport System) files that insulate the
|
||||
writing @dfn{FITS} (Flexible Image Transport System) files that insulate the
|
||||
programmer from the internal complexities of the FITS format. CFITSIO also
|
||||
provides many advanced features for manipulating and filtering the information
|
||||
in FITS files.")
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 4.1.0-gnu Kernel Configuration
|
||||
# Linux/x86 4.1.49-gnu Kernel Configuration
|
||||
#
|
||||
# CONFIG_64BIT is not set
|
||||
CONFIG_X86_32=y
|
||||
|
|
@ -738,6 +738,7 @@ CONFIG_PCIEASPM_DEFAULT=y
|
|||
# CONFIG_PCIEASPM_POWERSAVE is not set
|
||||
# CONFIG_PCIEASPM_PERFORMANCE is not set
|
||||
CONFIG_PCIE_PME=y
|
||||
CONFIG_PCI_BUS_ADDR_T_64BIT=y
|
||||
CONFIG_PCI_MSI=y
|
||||
# CONFIG_PCI_DEBUG is not set
|
||||
CONFIG_PCI_REALLOC_ENABLE_AUTO=y
|
||||
|
|
@ -1302,6 +1303,7 @@ CONFIG_BRIDGE=m
|
|||
CONFIG_BRIDGE_IGMP_SNOOPING=y
|
||||
CONFIG_BRIDGE_VLAN_FILTERING=y
|
||||
CONFIG_HAVE_NET_DSA=y
|
||||
# CONFIG_NET_DSA is not set
|
||||
CONFIG_VLAN_8021Q=m
|
||||
CONFIG_VLAN_8021Q_GVRP=y
|
||||
CONFIG_VLAN_8021Q_MVRP=y
|
||||
|
|
@ -1954,7 +1956,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
|
|||
CONFIG_BLK_DEV_DRBD=m
|
||||
# CONFIG_DRBD_FAULT_INJECTION is not set
|
||||
CONFIG_BLK_DEV_NBD=m
|
||||
CONFIG_BLK_DEV_NVME=m
|
||||
CONFIG_BLK_DEV_NVME=y
|
||||
CONFIG_BLK_DEV_OSD=m
|
||||
CONFIG_BLK_DEV_SX8=m
|
||||
CONFIG_BLK_DEV_RAM=y
|
||||
|
|
@ -2002,7 +2004,7 @@ CONFIG_HMC6352=m
|
|||
CONFIG_DS1682=m
|
||||
CONFIG_TI_DAC7512=m
|
||||
CONFIG_VMWARE_BALLOON=m
|
||||
CONFIG_BMP085=y
|
||||
CONFIG_BMP085=m
|
||||
CONFIG_BMP085_I2C=m
|
||||
CONFIG_BMP085_SPI=m
|
||||
CONFIG_PCH_PHUB=m
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 4.1.0-gnu Kernel Configuration
|
||||
# Linux/x86 4.1.49-gnu Kernel Configuration
|
||||
#
|
||||
CONFIG_64BIT=y
|
||||
CONFIG_X86_64=y
|
||||
|
|
@ -727,6 +727,7 @@ CONFIG_PCIEASPM_DEFAULT=y
|
|||
# CONFIG_PCIEASPM_POWERSAVE is not set
|
||||
# CONFIG_PCIEASPM_PERFORMANCE is not set
|
||||
CONFIG_PCIE_PME=y
|
||||
CONFIG_PCI_BUS_ADDR_T_64BIT=y
|
||||
CONFIG_PCI_MSI=y
|
||||
# CONFIG_PCI_DEBUG is not set
|
||||
CONFIG_PCI_REALLOC_ENABLE_AUTO=y
|
||||
|
|
@ -801,7 +802,6 @@ CONFIG_X86_X32=y
|
|||
CONFIG_COMPAT=y
|
||||
CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
|
||||
CONFIG_SYSVIPC_COMPAT=y
|
||||
CONFIG_KEYS_COMPAT=y
|
||||
CONFIG_X86_DEV_DMA_OPS=y
|
||||
CONFIG_PMC_ATOM=y
|
||||
CONFIG_NET=y
|
||||
|
|
@ -1282,6 +1282,7 @@ CONFIG_BRIDGE=m
|
|||
CONFIG_BRIDGE_IGMP_SNOOPING=y
|
||||
CONFIG_BRIDGE_VLAN_FILTERING=y
|
||||
CONFIG_HAVE_NET_DSA=y
|
||||
# CONFIG_NET_DSA is not set
|
||||
CONFIG_VLAN_8021Q=m
|
||||
CONFIG_VLAN_8021Q_GVRP=y
|
||||
CONFIG_VLAN_8021Q_MVRP=y
|
||||
|
|
@ -1919,7 +1920,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
|
|||
CONFIG_BLK_DEV_DRBD=m
|
||||
# CONFIG_DRBD_FAULT_INJECTION is not set
|
||||
CONFIG_BLK_DEV_NBD=m
|
||||
CONFIG_BLK_DEV_NVME=m
|
||||
CONFIG_BLK_DEV_NVME=y
|
||||
CONFIG_BLK_DEV_SKD=m
|
||||
CONFIG_BLK_DEV_OSD=m
|
||||
CONFIG_BLK_DEV_SX8=m
|
||||
|
|
@ -1966,7 +1967,7 @@ CONFIG_HMC6352=m
|
|||
CONFIG_DS1682=m
|
||||
CONFIG_TI_DAC7512=m
|
||||
CONFIG_VMWARE_BALLOON=m
|
||||
CONFIG_BMP085=y
|
||||
CONFIG_BMP085=m
|
||||
CONFIG_BMP085_I2C=m
|
||||
CONFIG_BMP085_SPI=m
|
||||
CONFIG_USB_SWITCH_FSA9480=m
|
||||
|
|
@ -7769,6 +7770,7 @@ CONFIG_OPTIMIZE_INLINING=y
|
|||
# Security options
|
||||
#
|
||||
CONFIG_KEYS=y
|
||||
CONFIG_KEYS_COMPAT=y
|
||||
CONFIG_PERSISTENT_KEYRINGS=y
|
||||
CONFIG_BIG_KEYS=y
|
||||
CONFIG_TRUSTED_KEYS=y
|
||||
|
|
|
|||
|
|
@ -2051,8 +2051,8 @@ CONFIG_VIRTIO_BLK=m
|
|||
# CONFIG_VIRTIO_BLK_SCSI is not set
|
||||
CONFIG_BLK_DEV_RBD=m
|
||||
# CONFIG_BLK_DEV_RSXX is not set
|
||||
CONFIG_NVME_CORE=m
|
||||
CONFIG_BLK_DEV_NVME=m
|
||||
CONFIG_NVME_CORE=y
|
||||
CONFIG_BLK_DEV_NVME=y
|
||||
CONFIG_NVME_FABRICS=m
|
||||
CONFIG_NVME_RDMA=m
|
||||
# CONFIG_NVME_FC is not set
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 4.14.0-gnu Kernel Configuration
|
||||
# Linux/x86 4.14.15-gnu Kernel Configuration
|
||||
#
|
||||
# CONFIG_64BIT is not set
|
||||
CONFIG_X86_32=y
|
||||
|
|
@ -331,6 +331,7 @@ CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
|
|||
CONFIG_STRICT_KERNEL_RWX=y
|
||||
CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
|
||||
CONFIG_STRICT_MODULE_RWX=y
|
||||
CONFIG_ARCH_HAS_REFCOUNT=y
|
||||
CONFIG_REFCOUNT_FULL=y
|
||||
|
||||
#
|
||||
|
|
@ -438,6 +439,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y
|
|||
CONFIG_X86_MPPARSE=y
|
||||
# CONFIG_X86_BIGSMP is not set
|
||||
# CONFIG_GOLDFISH is not set
|
||||
CONFIG_RETPOLINE=y
|
||||
# CONFIG_INTEL_RDT is not set
|
||||
CONFIG_X86_EXTENDED_PLATFORM=y
|
||||
# CONFIG_X86_GOLDFISH is not set
|
||||
|
|
@ -1912,6 +1914,7 @@ CONFIG_DEV_COREDUMP=y
|
|||
CONFIG_SYS_HYPERVISOR=y
|
||||
# CONFIG_GENERIC_CPU_DEVICES is not set
|
||||
CONFIG_GENERIC_CPU_AUTOPROBE=y
|
||||
CONFIG_GENERIC_CPU_VULNERABILITIES=y
|
||||
CONFIG_REGMAP=y
|
||||
CONFIG_REGMAP_I2C=y
|
||||
CONFIG_REGMAP_SPI=y
|
||||
|
|
@ -2156,8 +2159,8 @@ CONFIG_VIRTIO_BLK=y
|
|||
# CONFIG_VIRTIO_BLK_SCSI is not set
|
||||
CONFIG_BLK_DEV_RBD=m
|
||||
CONFIG_BLK_DEV_RSXX=m
|
||||
CONFIG_NVME_CORE=m
|
||||
CONFIG_BLK_DEV_NVME=m
|
||||
CONFIG_NVME_CORE=y
|
||||
CONFIG_BLK_DEV_NVME=y
|
||||
CONFIG_NVME_FABRICS=m
|
||||
CONFIG_NVME_RDMA=m
|
||||
CONFIG_NVME_FC=m
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 4.14.0-gnu Kernel Configuration
|
||||
# Linux/x86 4.14.15-gnu Kernel Configuration
|
||||
#
|
||||
CONFIG_64BIT=y
|
||||
CONFIG_X86_64=y
|
||||
|
|
@ -351,6 +351,7 @@ CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
|
|||
CONFIG_STRICT_KERNEL_RWX=y
|
||||
CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
|
||||
CONFIG_STRICT_MODULE_RWX=y
|
||||
CONFIG_ARCH_HAS_REFCOUNT=y
|
||||
CONFIG_REFCOUNT_FULL=y
|
||||
|
||||
#
|
||||
|
|
@ -458,6 +459,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y
|
|||
CONFIG_X86_X2APIC=y
|
||||
CONFIG_X86_MPPARSE=y
|
||||
# CONFIG_GOLDFISH is not set
|
||||
CONFIG_RETPOLINE=y
|
||||
# CONFIG_INTEL_RDT is not set
|
||||
CONFIG_X86_EXTENDED_PLATFORM=y
|
||||
CONFIG_X86_NUMACHIP=y
|
||||
|
|
@ -1901,6 +1903,7 @@ CONFIG_DEV_COREDUMP=y
|
|||
CONFIG_SYS_HYPERVISOR=y
|
||||
# CONFIG_GENERIC_CPU_DEVICES is not set
|
||||
CONFIG_GENERIC_CPU_AUTOPROBE=y
|
||||
CONFIG_GENERIC_CPU_VULNERABILITIES=y
|
||||
CONFIG_REGMAP=y
|
||||
CONFIG_REGMAP_I2C=y
|
||||
CONFIG_REGMAP_SPI=y
|
||||
|
|
@ -2140,8 +2143,8 @@ CONFIG_VIRTIO_BLK=y
|
|||
# CONFIG_VIRTIO_BLK_SCSI is not set
|
||||
CONFIG_BLK_DEV_RBD=m
|
||||
CONFIG_BLK_DEV_RSXX=m
|
||||
CONFIG_NVME_CORE=m
|
||||
CONFIG_BLK_DEV_NVME=m
|
||||
CONFIG_NVME_CORE=y
|
||||
CONFIG_BLK_DEV_NVME=y
|
||||
CONFIG_NVME_FABRICS=m
|
||||
CONFIG_NVME_RDMA=m
|
||||
CONFIG_NVME_FC=m
|
||||
|
|
@ -8967,8 +8970,8 @@ CONFIG_OPTIMIZE_INLINING=y
|
|||
# CONFIG_DEBUG_NMI_SELFTEST is not set
|
||||
CONFIG_X86_DEBUG_FPU=y
|
||||
CONFIG_PUNIT_ATOM_DEBUG=m
|
||||
CONFIG_UNWINDER_FRAME_POINTER=y
|
||||
# CONFIG_UNWINDER_ORC is not set
|
||||
CONFIG_UNWINDER_FRAME_POINTER=y
|
||||
# CONFIG_UNWINDER_GUESS is not set
|
||||
|
||||
#
|
||||
|
|
@ -8986,6 +8989,7 @@ CONFIG_SECURITY=y
|
|||
CONFIG_SECURITY_WRITABLE_HOOKS=y
|
||||
CONFIG_SECURITYFS=y
|
||||
CONFIG_SECURITY_NETWORK=y
|
||||
CONFIG_PAGE_TABLE_ISOLATION=y
|
||||
# CONFIG_SECURITY_INFINIBAND is not set
|
||||
CONFIG_SECURITY_NETWORK_XFRM=y
|
||||
CONFIG_SECURITY_PATH=y
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 4.4.0-gnu Kernel Configuration
|
||||
# Linux/x86 4.4.113-gnu Kernel Configuration
|
||||
#
|
||||
# CONFIG_64BIT is not set
|
||||
CONFIG_X86_32=y
|
||||
|
|
@ -302,11 +302,6 @@ CONFIG_MODULE_UNLOAD=y
|
|||
CONFIG_MODVERSIONS=y
|
||||
CONFIG_MODULE_SRCVERSION_ALL=y
|
||||
# CONFIG_MODULE_SIG is not set
|
||||
# CONFIG_MODULE_SIG_SHA1 is not set
|
||||
# CONFIG_MODULE_SIG_SHA224 is not set
|
||||
# CONFIG_MODULE_SIG_SHA256 is not set
|
||||
# CONFIG_MODULE_SIG_SHA384 is not set
|
||||
# CONFIG_MODULE_SIG_SHA512 is not set
|
||||
# CONFIG_MODULE_COMPRESS is not set
|
||||
CONFIG_MODULES_TREE_LOOKUP=y
|
||||
CONFIG_BLOCK=y
|
||||
|
|
@ -379,6 +374,7 @@ CONFIG_SMP=y
|
|||
CONFIG_X86_FEATURE_NAMES=y
|
||||
CONFIG_X86_MPPARSE=y
|
||||
# CONFIG_X86_BIGSMP is not set
|
||||
CONFIG_RETPOLINE=y
|
||||
CONFIG_X86_EXTENDED_PLATFORM=y
|
||||
# CONFIG_X86_GOLDFISH is not set
|
||||
CONFIG_X86_INTEL_MID=y
|
||||
|
|
@ -1327,6 +1323,7 @@ CONFIG_BRIDGE=m
|
|||
CONFIG_BRIDGE_IGMP_SNOOPING=y
|
||||
CONFIG_BRIDGE_VLAN_FILTERING=y
|
||||
CONFIG_HAVE_NET_DSA=y
|
||||
# CONFIG_NET_DSA is not set
|
||||
CONFIG_VLAN_8021Q=m
|
||||
CONFIG_VLAN_8021Q_GVRP=y
|
||||
CONFIG_VLAN_8021Q_MVRP=y
|
||||
|
|
@ -1448,7 +1445,6 @@ CONFIG_OPENVSWITCH_VXLAN=m
|
|||
CONFIG_OPENVSWITCH_GENEVE=m
|
||||
CONFIG_VSOCKETS=m
|
||||
CONFIG_VMWARE_VMCI_VSOCKETS=m
|
||||
CONFIG_NETLINK_MMAP=y
|
||||
CONFIG_NETLINK_DIAG=m
|
||||
CONFIG_MPLS=y
|
||||
CONFIG_NET_MPLS_GSO=m
|
||||
|
|
@ -1775,6 +1771,7 @@ CONFIG_DEV_COREDUMP=y
|
|||
CONFIG_SYS_HYPERVISOR=y
|
||||
# CONFIG_GENERIC_CPU_DEVICES is not set
|
||||
CONFIG_GENERIC_CPU_AUTOPROBE=y
|
||||
CONFIG_GENERIC_CPU_VULNERABILITIES=y
|
||||
CONFIG_REGMAP=y
|
||||
CONFIG_REGMAP_I2C=y
|
||||
CONFIG_REGMAP_SPI=y
|
||||
|
|
@ -2016,7 +2013,7 @@ CONFIG_VIRTIO_BLK=y
|
|||
# CONFIG_BLK_DEV_HD is not set
|
||||
CONFIG_BLK_DEV_RBD=m
|
||||
CONFIG_BLK_DEV_RSXX=m
|
||||
CONFIG_BLK_DEV_NVME=m
|
||||
CONFIG_BLK_DEV_NVME=y
|
||||
|
||||
#
|
||||
# Misc devices
|
||||
|
|
@ -2047,7 +2044,7 @@ CONFIG_HMC6352=m
|
|||
CONFIG_DS1682=m
|
||||
CONFIG_TI_DAC7512=m
|
||||
CONFIG_VMWARE_BALLOON=m
|
||||
CONFIG_BMP085=y
|
||||
CONFIG_BMP085=m
|
||||
CONFIG_BMP085_I2C=m
|
||||
CONFIG_BMP085_SPI=m
|
||||
CONFIG_PCH_PHUB=m
|
||||
|
|
@ -8357,7 +8354,7 @@ CONFIG_CRYPTO_RNG_DEFAULT=m
|
|||
CONFIG_CRYPTO_PCOMP=m
|
||||
CONFIG_CRYPTO_PCOMP2=y
|
||||
CONFIG_CRYPTO_AKCIPHER2=y
|
||||
CONFIG_CRYPTO_AKCIPHER=m
|
||||
CONFIG_CRYPTO_AKCIPHER=y
|
||||
CONFIG_CRYPTO_RSA=m
|
||||
CONFIG_CRYPTO_MANAGER=y
|
||||
CONFIG_CRYPTO_MANAGER2=y
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 4.4.0-gnu Kernel Configuration
|
||||
# Linux/x86 4.4.113-gnu Kernel Configuration
|
||||
#
|
||||
CONFIG_64BIT=y
|
||||
CONFIG_X86_64=y
|
||||
|
|
@ -315,11 +315,6 @@ CONFIG_MODULE_UNLOAD=y
|
|||
CONFIG_MODVERSIONS=y
|
||||
CONFIG_MODULE_SRCVERSION_ALL=y
|
||||
# CONFIG_MODULE_SIG is not set
|
||||
# CONFIG_MODULE_SIG_SHA1 is not set
|
||||
# CONFIG_MODULE_SIG_SHA224 is not set
|
||||
# CONFIG_MODULE_SIG_SHA256 is not set
|
||||
# CONFIG_MODULE_SIG_SHA384 is not set
|
||||
# CONFIG_MODULE_SIG_SHA512 is not set
|
||||
# CONFIG_MODULE_COMPRESS is not set
|
||||
CONFIG_MODULES_TREE_LOOKUP=y
|
||||
CONFIG_BLOCK=y
|
||||
|
|
@ -392,6 +387,7 @@ CONFIG_SMP=y
|
|||
CONFIG_X86_FEATURE_NAMES=y
|
||||
CONFIG_X86_X2APIC=y
|
||||
CONFIG_X86_MPPARSE=y
|
||||
CONFIG_RETPOLINE=y
|
||||
CONFIG_X86_EXTENDED_PLATFORM=y
|
||||
CONFIG_X86_NUMACHIP=y
|
||||
# CONFIG_X86_VSMP is not set
|
||||
|
|
@ -815,7 +811,6 @@ CONFIG_X86_X32=y
|
|||
CONFIG_COMPAT=y
|
||||
CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
|
||||
CONFIG_SYSVIPC_COMPAT=y
|
||||
CONFIG_KEYS_COMPAT=y
|
||||
CONFIG_X86_DEV_DMA_OPS=y
|
||||
CONFIG_PMC_ATOM=y
|
||||
CONFIG_NET=y
|
||||
|
|
@ -1305,6 +1300,7 @@ CONFIG_BRIDGE=m
|
|||
CONFIG_BRIDGE_IGMP_SNOOPING=y
|
||||
CONFIG_BRIDGE_VLAN_FILTERING=y
|
||||
CONFIG_HAVE_NET_DSA=y
|
||||
# CONFIG_NET_DSA is not set
|
||||
CONFIG_VLAN_8021Q=m
|
||||
CONFIG_VLAN_8021Q_GVRP=y
|
||||
CONFIG_VLAN_8021Q_MVRP=y
|
||||
|
|
@ -1422,7 +1418,6 @@ CONFIG_OPENVSWITCH_VXLAN=m
|
|||
CONFIG_OPENVSWITCH_GENEVE=m
|
||||
CONFIG_VSOCKETS=m
|
||||
CONFIG_VMWARE_VMCI_VSOCKETS=m
|
||||
CONFIG_NETLINK_MMAP=y
|
||||
CONFIG_NETLINK_DIAG=m
|
||||
CONFIG_MPLS=y
|
||||
CONFIG_NET_MPLS_GSO=m
|
||||
|
|
@ -1744,6 +1739,7 @@ CONFIG_DEV_COREDUMP=y
|
|||
CONFIG_SYS_HYPERVISOR=y
|
||||
# CONFIG_GENERIC_CPU_DEVICES is not set
|
||||
CONFIG_GENERIC_CPU_AUTOPROBE=y
|
||||
CONFIG_GENERIC_CPU_VULNERABILITIES=y
|
||||
CONFIG_REGMAP=y
|
||||
CONFIG_REGMAP_I2C=y
|
||||
CONFIG_REGMAP_SPI=y
|
||||
|
|
@ -1980,7 +1976,7 @@ CONFIG_VIRTIO_BLK=y
|
|||
# CONFIG_BLK_DEV_HD is not set
|
||||
CONFIG_BLK_DEV_RBD=m
|
||||
CONFIG_BLK_DEV_RSXX=m
|
||||
CONFIG_BLK_DEV_NVME=m
|
||||
CONFIG_BLK_DEV_NVME=y
|
||||
|
||||
#
|
||||
# Misc devices
|
||||
|
|
@ -2009,7 +2005,7 @@ CONFIG_HMC6352=m
|
|||
CONFIG_DS1682=m
|
||||
CONFIG_TI_DAC7512=m
|
||||
CONFIG_VMWARE_BALLOON=m
|
||||
CONFIG_BMP085=y
|
||||
CONFIG_BMP085=m
|
||||
CONFIG_BMP085_I2C=m
|
||||
CONFIG_BMP085_SPI=m
|
||||
CONFIG_USB_SWITCH_FSA9480=m
|
||||
|
|
@ -8058,12 +8054,14 @@ CONFIG_PUNIT_ATOM_DEBUG=m
|
|||
# Security options
|
||||
#
|
||||
CONFIG_KEYS=y
|
||||
CONFIG_KEYS_COMPAT=y
|
||||
CONFIG_PERSISTENT_KEYRINGS=y
|
||||
CONFIG_BIG_KEYS=y
|
||||
CONFIG_TRUSTED_KEYS=y
|
||||
CONFIG_ENCRYPTED_KEYS=y
|
||||
# CONFIG_SECURITY_DMESG_RESTRICT is not set
|
||||
CONFIG_SECURITY=y
|
||||
CONFIG_PAGE_TABLE_ISOLATION=y
|
||||
CONFIG_SECURITYFS=y
|
||||
CONFIG_SECURITY_NETWORK=y
|
||||
CONFIG_SECURITY_NETWORK_XFRM=y
|
||||
|
|
@ -8144,7 +8142,7 @@ CONFIG_CRYPTO_RNG_DEFAULT=m
|
|||
CONFIG_CRYPTO_PCOMP=m
|
||||
CONFIG_CRYPTO_PCOMP2=y
|
||||
CONFIG_CRYPTO_AKCIPHER2=y
|
||||
CONFIG_CRYPTO_AKCIPHER=m
|
||||
CONFIG_CRYPTO_AKCIPHER=y
|
||||
CONFIG_CRYPTO_RSA=m
|
||||
CONFIG_CRYPTO_MANAGER=y
|
||||
CONFIG_CRYPTO_MANAGER2=y
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 4.9.0-gnu Kernel Configuration
|
||||
# Linux/x86 4.9.78-gnu Kernel Configuration
|
||||
#
|
||||
# CONFIG_64BIT is not set
|
||||
CONFIG_X86_32=y
|
||||
|
|
@ -397,6 +397,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y
|
|||
CONFIG_X86_MPPARSE=y
|
||||
# CONFIG_X86_BIGSMP is not set
|
||||
# CONFIG_GOLDFISH is not set
|
||||
CONFIG_RETPOLINE=y
|
||||
CONFIG_X86_EXTENDED_PLATFORM=y
|
||||
# CONFIG_X86_GOLDFISH is not set
|
||||
CONFIG_X86_INTEL_MID=y
|
||||
|
|
@ -1383,6 +1384,7 @@ CONFIG_BRIDGE=m
|
|||
CONFIG_BRIDGE_IGMP_SNOOPING=y
|
||||
CONFIG_BRIDGE_VLAN_FILTERING=y
|
||||
CONFIG_HAVE_NET_DSA=y
|
||||
# CONFIG_NET_DSA is not set
|
||||
CONFIG_VLAN_8021Q=m
|
||||
CONFIG_VLAN_8021Q_GVRP=y
|
||||
CONFIG_VLAN_8021Q_MVRP=y
|
||||
|
|
@ -1864,6 +1866,7 @@ CONFIG_DEV_COREDUMP=y
|
|||
CONFIG_SYS_HYPERVISOR=y
|
||||
# CONFIG_GENERIC_CPU_DEVICES is not set
|
||||
CONFIG_GENERIC_CPU_AUTOPROBE=y
|
||||
CONFIG_GENERIC_CPU_VULNERABILITIES=y
|
||||
CONFIG_REGMAP=y
|
||||
CONFIG_REGMAP_I2C=y
|
||||
CONFIG_REGMAP_SPI=y
|
||||
|
|
@ -2105,8 +2108,8 @@ CONFIG_VIRTIO_BLK=y
|
|||
# CONFIG_BLK_DEV_HD is not set
|
||||
CONFIG_BLK_DEV_RBD=m
|
||||
CONFIG_BLK_DEV_RSXX=m
|
||||
CONFIG_NVME_CORE=m
|
||||
CONFIG_BLK_DEV_NVME=m
|
||||
CONFIG_NVME_CORE=y
|
||||
CONFIG_BLK_DEV_NVME=y
|
||||
# CONFIG_BLK_DEV_NVME_SCSI is not set
|
||||
CONFIG_NVME_FABRICS=m
|
||||
CONFIG_NVME_RDMA=m
|
||||
|
|
@ -6038,6 +6041,7 @@ CONFIG_SND_SOC_INTEL_HASWELL=m
|
|||
CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
|
||||
# CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
|
||||
CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
|
||||
|
|
@ -8755,7 +8759,7 @@ CONFIG_CRYPTO=y
|
|||
#
|
||||
CONFIG_CRYPTO_ALGAPI=y
|
||||
CONFIG_CRYPTO_ALGAPI2=y
|
||||
CONFIG_CRYPTO_AEAD=m
|
||||
CONFIG_CRYPTO_AEAD=y
|
||||
CONFIG_CRYPTO_AEAD2=y
|
||||
CONFIG_CRYPTO_BLKCIPHER=y
|
||||
CONFIG_CRYPTO_BLKCIPHER2=y
|
||||
|
|
@ -8763,7 +8767,7 @@ CONFIG_CRYPTO_HASH=y
|
|||
CONFIG_CRYPTO_HASH2=y
|
||||
CONFIG_CRYPTO_RNG=y
|
||||
CONFIG_CRYPTO_RNG2=y
|
||||
CONFIG_CRYPTO_RNG_DEFAULT=m
|
||||
CONFIG_CRYPTO_RNG_DEFAULT=y
|
||||
CONFIG_CRYPTO_AKCIPHER2=y
|
||||
CONFIG_CRYPTO_AKCIPHER=y
|
||||
CONFIG_CRYPTO_KPP2=y
|
||||
|
|
@ -8775,8 +8779,8 @@ CONFIG_CRYPTO_MANAGER=y
|
|||
CONFIG_CRYPTO_MANAGER2=y
|
||||
CONFIG_CRYPTO_USER=m
|
||||
CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
|
||||
CONFIG_CRYPTO_GF128MUL=m
|
||||
CONFIG_CRYPTO_NULL=m
|
||||
CONFIG_CRYPTO_GF128MUL=y
|
||||
CONFIG_CRYPTO_NULL=y
|
||||
CONFIG_CRYPTO_NULL2=y
|
||||
CONFIG_CRYPTO_PCRYPT=m
|
||||
CONFIG_CRYPTO_WORKQUEUE=y
|
||||
|
|
@ -8791,16 +8795,16 @@ CONFIG_CRYPTO_GLUE_HELPER_X86=m
|
|||
# Authenticated Encryption with Associated Data
|
||||
#
|
||||
CONFIG_CRYPTO_CCM=m
|
||||
CONFIG_CRYPTO_GCM=m
|
||||
CONFIG_CRYPTO_GCM=y
|
||||
CONFIG_CRYPTO_CHACHA20POLY1305=m
|
||||
CONFIG_CRYPTO_SEQIV=m
|
||||
CONFIG_CRYPTO_SEQIV=y
|
||||
CONFIG_CRYPTO_ECHAINIV=m
|
||||
|
||||
#
|
||||
# Block modes
|
||||
#
|
||||
CONFIG_CRYPTO_CBC=y
|
||||
CONFIG_CRYPTO_CTR=m
|
||||
CONFIG_CRYPTO_CTR=y
|
||||
CONFIG_CRYPTO_CTS=m
|
||||
CONFIG_CRYPTO_ECB=y
|
||||
CONFIG_CRYPTO_LRW=m
|
||||
|
|
@ -8824,7 +8828,7 @@ CONFIG_CRYPTO_CRC32C_INTEL=y
|
|||
CONFIG_CRYPTO_CRC32=m
|
||||
CONFIG_CRYPTO_CRC32_PCLMUL=m
|
||||
CONFIG_CRYPTO_CRCT10DIF=y
|
||||
CONFIG_CRYPTO_GHASH=m
|
||||
CONFIG_CRYPTO_GHASH=y
|
||||
CONFIG_CRYPTO_POLY1305=m
|
||||
CONFIG_CRYPTO_MD4=m
|
||||
CONFIG_CRYPTO_MD5=y
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 4.9.0-gnu Kernel Configuration
|
||||
# Linux/x86 4.9.78-gnu Kernel Configuration
|
||||
#
|
||||
CONFIG_64BIT=y
|
||||
CONFIG_X86_64=y
|
||||
|
|
@ -414,6 +414,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y
|
|||
CONFIG_X86_X2APIC=y
|
||||
CONFIG_X86_MPPARSE=y
|
||||
# CONFIG_GOLDFISH is not set
|
||||
CONFIG_RETPOLINE=y
|
||||
CONFIG_X86_EXTENDED_PLATFORM=y
|
||||
CONFIG_X86_NUMACHIP=y
|
||||
# CONFIG_X86_VSMP is not set
|
||||
|
|
@ -871,7 +872,6 @@ CONFIG_X86_X32=y
|
|||
CONFIG_COMPAT=y
|
||||
CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
|
||||
CONFIG_SYSVIPC_COMPAT=y
|
||||
CONFIG_KEYS_COMPAT=y
|
||||
CONFIG_X86_DEV_DMA_OPS=y
|
||||
CONFIG_PMC_ATOM=y
|
||||
CONFIG_NET=y
|
||||
|
|
@ -1373,6 +1373,7 @@ CONFIG_BRIDGE=m
|
|||
CONFIG_BRIDGE_IGMP_SNOOPING=y
|
||||
CONFIG_BRIDGE_VLAN_FILTERING=y
|
||||
CONFIG_HAVE_NET_DSA=y
|
||||
# CONFIG_NET_DSA is not set
|
||||
CONFIG_VLAN_8021Q=m
|
||||
CONFIG_VLAN_8021Q_GVRP=y
|
||||
CONFIG_VLAN_8021Q_MVRP=y
|
||||
|
|
@ -1845,6 +1846,7 @@ CONFIG_DEV_COREDUMP=y
|
|||
CONFIG_SYS_HYPERVISOR=y
|
||||
# CONFIG_GENERIC_CPU_DEVICES is not set
|
||||
CONFIG_GENERIC_CPU_AUTOPROBE=y
|
||||
CONFIG_GENERIC_CPU_VULNERABILITIES=y
|
||||
CONFIG_REGMAP=y
|
||||
CONFIG_REGMAP_I2C=y
|
||||
CONFIG_REGMAP_SPI=y
|
||||
|
|
@ -2081,8 +2083,8 @@ CONFIG_VIRTIO_BLK=y
|
|||
# CONFIG_BLK_DEV_HD is not set
|
||||
CONFIG_BLK_DEV_RBD=m
|
||||
CONFIG_BLK_DEV_RSXX=m
|
||||
CONFIG_NVME_CORE=m
|
||||
CONFIG_BLK_DEV_NVME=m
|
||||
CONFIG_NVME_CORE=y
|
||||
CONFIG_BLK_DEV_NVME=y
|
||||
# CONFIG_BLK_DEV_NVME_SCSI is not set
|
||||
CONFIG_NVME_FABRICS=m
|
||||
CONFIG_NVME_RDMA=m
|
||||
|
|
@ -4473,8 +4475,6 @@ CONFIG_USBPCWATCHDOG=m
|
|||
# Watchdog Pretimeout Governors
|
||||
#
|
||||
# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
|
||||
# CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP is not set
|
||||
# CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC is not set
|
||||
CONFIG_SSB_POSSIBLE=y
|
||||
|
||||
#
|
||||
|
|
@ -5848,6 +5848,7 @@ CONFIG_SND_SOC_INTEL_HASWELL=m
|
|||
CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
|
||||
# CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
|
||||
CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
|
||||
|
|
@ -8495,6 +8496,7 @@ CONFIG_PUNIT_ATOM_DEBUG=m
|
|||
# Security options
|
||||
#
|
||||
CONFIG_KEYS=y
|
||||
CONFIG_KEYS_COMPAT=y
|
||||
CONFIG_PERSISTENT_KEYRINGS=y
|
||||
CONFIG_BIG_KEYS=y
|
||||
CONFIG_TRUSTED_KEYS=y
|
||||
|
|
@ -8502,6 +8504,7 @@ CONFIG_ENCRYPTED_KEYS=y
|
|||
CONFIG_KEY_DH_OPERATIONS=y
|
||||
# CONFIG_SECURITY_DMESG_RESTRICT is not set
|
||||
CONFIG_SECURITY=y
|
||||
CONFIG_PAGE_TABLE_ISOLATION=y
|
||||
CONFIG_SECURITYFS=y
|
||||
CONFIG_SECURITY_NETWORK=y
|
||||
CONFIG_SECURITY_NETWORK_XFRM=y
|
||||
|
|
@ -8581,7 +8584,7 @@ CONFIG_CRYPTO=y
|
|||
#
|
||||
CONFIG_CRYPTO_ALGAPI=y
|
||||
CONFIG_CRYPTO_ALGAPI2=y
|
||||
CONFIG_CRYPTO_AEAD=m
|
||||
CONFIG_CRYPTO_AEAD=y
|
||||
CONFIG_CRYPTO_AEAD2=y
|
||||
CONFIG_CRYPTO_BLKCIPHER=y
|
||||
CONFIG_CRYPTO_BLKCIPHER2=y
|
||||
|
|
@ -8589,7 +8592,7 @@ CONFIG_CRYPTO_HASH=y
|
|||
CONFIG_CRYPTO_HASH2=y
|
||||
CONFIG_CRYPTO_RNG=y
|
||||
CONFIG_CRYPTO_RNG2=y
|
||||
CONFIG_CRYPTO_RNG_DEFAULT=m
|
||||
CONFIG_CRYPTO_RNG_DEFAULT=y
|
||||
CONFIG_CRYPTO_AKCIPHER2=y
|
||||
CONFIG_CRYPTO_AKCIPHER=y
|
||||
CONFIG_CRYPTO_KPP2=y
|
||||
|
|
@ -8601,8 +8604,8 @@ CONFIG_CRYPTO_MANAGER=y
|
|||
CONFIG_CRYPTO_MANAGER2=y
|
||||
CONFIG_CRYPTO_USER=m
|
||||
CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
|
||||
CONFIG_CRYPTO_GF128MUL=m
|
||||
CONFIG_CRYPTO_NULL=m
|
||||
CONFIG_CRYPTO_GF128MUL=y
|
||||
CONFIG_CRYPTO_NULL=y
|
||||
CONFIG_CRYPTO_NULL2=y
|
||||
CONFIG_CRYPTO_PCRYPT=m
|
||||
CONFIG_CRYPTO_WORKQUEUE=y
|
||||
|
|
@ -8617,16 +8620,16 @@ CONFIG_CRYPTO_GLUE_HELPER_X86=m
|
|||
# Authenticated Encryption with Associated Data
|
||||
#
|
||||
CONFIG_CRYPTO_CCM=m
|
||||
CONFIG_CRYPTO_GCM=m
|
||||
CONFIG_CRYPTO_GCM=y
|
||||
CONFIG_CRYPTO_CHACHA20POLY1305=m
|
||||
CONFIG_CRYPTO_SEQIV=m
|
||||
CONFIG_CRYPTO_SEQIV=y
|
||||
CONFIG_CRYPTO_ECHAINIV=m
|
||||
|
||||
#
|
||||
# Block modes
|
||||
#
|
||||
CONFIG_CRYPTO_CBC=y
|
||||
CONFIG_CRYPTO_CTR=m
|
||||
CONFIG_CRYPTO_CTR=y
|
||||
CONFIG_CRYPTO_CTS=m
|
||||
CONFIG_CRYPTO_ECB=y
|
||||
CONFIG_CRYPTO_LRW=m
|
||||
|
|
@ -8651,7 +8654,7 @@ CONFIG_CRYPTO_CRC32=m
|
|||
CONFIG_CRYPTO_CRC32_PCLMUL=m
|
||||
CONFIG_CRYPTO_CRCT10DIF=y
|
||||
CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
|
||||
CONFIG_CRYPTO_GHASH=m
|
||||
CONFIG_CRYPTO_GHASH=y
|
||||
CONFIG_CRYPTO_POLY1305=m
|
||||
CONFIG_CRYPTO_POLY1305_X86_64=m
|
||||
CONFIG_CRYPTO_MD4=m
|
||||
|
|
|
|||
|
|
@ -2074,7 +2074,7 @@ identify enrichments with functional annotations of the genome.")
|
|||
(define-public diamond
|
||||
(package
|
||||
(name "diamond")
|
||||
(version "0.9.15")
|
||||
(version "0.9.16")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -2083,7 +2083,7 @@ identify enrichments with functional annotations of the genome.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0c9v0lddz8df5pnra464832cgn1igzpawgsknly7s1mq0qk9aiqj"))))
|
||||
"1sydm3jldl4pypy74g82dj9j8vx3j3ikf3i9srxqjp7r64039hiy"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; no "check" target
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com>
|
||||
;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2016, 2018 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Tomáš Čech <sleep_walker@gnu.org>
|
||||
|
|
@ -60,17 +60,15 @@
|
|||
(define-public transmission
|
||||
(package
|
||||
(name "transmission")
|
||||
(version "2.92")
|
||||
(version "2.93")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://transmission.cachefly.net/transmission-"
|
||||
version ".tar.xz"))
|
||||
;; CVE-2018-5702
|
||||
(patches (search-patches "transmission-fix-dns-rebinding-vuln.patch"))
|
||||
"https://github.com/transmission/transmission-releases/raw/"
|
||||
"master/transmission-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0pykmhi7pdmzq47glbj8i2im6iarp4wnj4l1pyvsrnba61f0939s"))))
|
||||
"02xrp49gsv4jkbzp37qrwlnb9nlja08s92dyvgdbr6a4187945c8"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(outputs '("out" ; library and command-line interface
|
||||
"gui")) ; graphical user interface
|
||||
|
|
|
|||
|
|
@ -373,7 +373,7 @@ also initializes the boards (RAM etc).")
|
|||
`(,@(if (not same-arch?)
|
||||
`(("cross-gcc" ,(cross-gcc triplet #:xgcc gcc-7))
|
||||
("cross-binutils" ,(cross-binutils triplet)))
|
||||
'())
|
||||
`(("gcc-7" ,gcc-7)))
|
||||
,@(package-native-inputs u-boot)))
|
||||
(arguments
|
||||
`(#:modules ((ice-9 ftw) (guix build utils) (guix build gnu-build-system))
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@
|
|||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system go)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (guix build-system trivial))
|
||||
|
||||
|
|
@ -270,6 +271,30 @@ normally do not detect. The goal is to detect only real errors in the code
|
|||
(i.e. have zero false positives).")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public go-gopkg.in-check.v1
|
||||
(let ((commit "20d25e2804050c1cd24a7eea1e7a6447dd0e74ec")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "go-gopkg.in-check.v1")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/go-check/check.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "gopkg.in/check.v1"))
|
||||
(synopsis "Rich testing extension for Go's testing package")
|
||||
(description
|
||||
"@code{check} is a rich testing extension for Go's testing package.")
|
||||
(home-page "https://github.com/go-check/check")
|
||||
(license license:bsd-2))))
|
||||
|
||||
(define-public googletest
|
||||
(package
|
||||
(name "googletest")
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
|
||||
;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
|
||||
;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
|
||||
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
|
||||
;;;
|
||||
|
|
@ -257,7 +257,7 @@ cloc can handle a greater variety of programming languages.")
|
|||
(define-public the-silver-searcher
|
||||
(package
|
||||
(name "the-silver-searcher")
|
||||
(version "2.0.0")
|
||||
(version "2.1.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -265,7 +265,7 @@ cloc can handle a greater variety of programming languages.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"04wm3r5p2mgv8mdkvysak0d5199h5y0yzl032624brfxpzmqfcq0"))))
|
||||
"1m0mih1x4jpswc8ganhqh0gmwbmd2hzmz7402mxfh19s3kcjnrfl"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at>
|
||||
;;; Copyright © 2017 Petter <petter@mykolab.ch>
|
||||
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -52,6 +53,7 @@
|
|||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages backup)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages boost)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages curl)
|
||||
#:use-module (gnu packages file)
|
||||
|
|
@ -2060,3 +2062,29 @@ faster by plzip, unless the @code{-b} option was used: lzip usually produces
|
|||
single-member files which can't be decompressed in parallel.")
|
||||
(license (list license:bsd-2 ; arg_parser.{cc,h}
|
||||
license:gpl2+)))) ; everything else
|
||||
|
||||
(define-public innoextract
|
||||
(package
|
||||
(name "innoextract")
|
||||
(version "1.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/dscharrer/innoextract/archive/"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"08sp5vbfjvq1irhhraqkn5m2x1z209r4axhx7laf1adcw30ccapi"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ;; No tests available.
|
||||
(inputs `(("boost" ,boost)
|
||||
("libiconv" ,libiconv)
|
||||
("xz" ,xz)))
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
(home-page "https://constexpr.org/innoextract/")
|
||||
(synopsis "Tool for extracting Inno Setup installers")
|
||||
(description "innoextract allows extracting Inno Setup installers under
|
||||
non-Windows systems without running the actual installer using wine.")
|
||||
(license license:zlib)))
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
|
||||
;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -100,3 +101,26 @@ operating system functions.")
|
|||
APIs on top of Standard Template Library (@dfn{STL}) classes.")
|
||||
(license (list license:expat ; cJSON
|
||||
license:bsd-4))))) ; everything else (LICENSE.txt)
|
||||
|
||||
(define-public dashel
|
||||
(package
|
||||
(name "dashel")
|
||||
(version "1.3.3")
|
||||
(home-page "https://github.com/aseba-community/dashel")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append home-page "/archive/" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ckzac1rsw3cxmpdpwcqv46jyp7risk5ybq6jjiizbqn7labf6dw"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments '(#:tests? #f)) ;no tests
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
(synopsis "Data stream helper encapsulation library")
|
||||
(description
|
||||
"Dashel is a data stream helper encapsulation C++ library. It provides a
|
||||
unified access to TCP/UDP sockets, serial ports, console, and files streams.
|
||||
It also allows a server application to wait for any activity on any
|
||||
combination of these streams.")
|
||||
(license license:bsd-3)))
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@
|
|||
|
||||
(define-module (gnu packages databases)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages admin)
|
||||
#:use-module (gnu packages algebra)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages avahi)
|
||||
|
|
@ -67,6 +68,7 @@
|
|||
#:use-module (gnu packages gnupg)
|
||||
#:use-module (gnu packages guile)
|
||||
#:use-module (gnu packages time)
|
||||
#:use-module (gnu packages golang)
|
||||
#:use-module (gnu packages jemalloc)
|
||||
#:use-module (gnu packages language)
|
||||
#:use-module (gnu packages libevent)
|
||||
|
|
@ -86,6 +88,8 @@
|
|||
#:use-module (gnu packages serialization)
|
||||
#:use-module (gnu packages statistics)
|
||||
#:use-module (gnu packages tcl)
|
||||
#:use-module (gnu packages terminals)
|
||||
#:use-module (gnu packages textutils)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages valgrind)
|
||||
#:use-module (gnu packages xml)
|
||||
|
|
@ -94,6 +98,7 @@
|
|||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system go)
|
||||
#:use-module (guix build-system perl)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (guix build-system ruby)
|
||||
|
|
@ -173,6 +178,50 @@ store key/value pairs in a file in a manner similar to the Unix dbm library
|
|||
and provides interfaces to the traditional file format.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public go-gopkg.in-mgo.v2
|
||||
(package
|
||||
(name "go-gopkg.in-mgo.v2")
|
||||
(version "2016.08.01")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/go-mgo/mgo")
|
||||
(commit (string-append "r" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0rwbi1z63w43b0z9srm8m7iz1fdwx7bq7n2mz862d6liiaqa59jd"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
`(#:import-path "gopkg.in/mgo.v2"
|
||||
;; TODO: The tests fail as MongoDB fails to start
|
||||
;; Error parsing command line: unrecognised option '--chunkSize'
|
||||
#:tests? #f
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'reset-gzip-timestamps)
|
||||
(add-before 'check 'start-mongodb
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(or (not tests?)
|
||||
(with-directory-excursion "src/gopkg.in/mgo.v2"
|
||||
(invoke "make" "startdb")))))
|
||||
(add-after 'check 'stop'mongodb
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(or (not tests?)
|
||||
(with-directory-excursion "src/gopkg.in/mgo.v2"
|
||||
(invoke "make" "stopdb"))))))))
|
||||
(native-inputs
|
||||
`(("go-gopkg.in-check.v1" ,go-gopkg.in-check.v1)
|
||||
("mongodb" ,mongodb)
|
||||
("daemontools" ,daemontools)))
|
||||
(synopsis "@code{mgo} offers a rich MongoDB driver for Go.")
|
||||
(description
|
||||
"@code{mgo} (pronounced as mango) is a MongoDB driver for the Go language.
|
||||
It implements a rich selection of features under a simple API following
|
||||
standard Go idioms.")
|
||||
(home-page "http://labix.org/mgo")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public bdb
|
||||
(package
|
||||
(name "bdb")
|
||||
|
|
@ -2565,3 +2614,86 @@ transforms idiomatic python function calls to well-formed SQL queries.")
|
|||
|
||||
(define-public python2-sql
|
||||
(package-with-python2 python-sql))
|
||||
|
||||
(define-public mongo-tools
|
||||
(package
|
||||
(name "mongo-tools")
|
||||
(version "3.4.0")
|
||||
(source
|
||||
(origin (method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mongodb/mongo-tools")
|
||||
(commit (string-append "r" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"095nc57k4m4iyim0x3fgpw681qba123iyl4qz7xysbv5ngbr19mc"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
`(#:unpack-path "github.com/mongodb"
|
||||
#:import-path "github.com/mongodb/mongo-tools"
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'delete-bundled-source-code
|
||||
(lambda _
|
||||
(delete-file-recursively
|
||||
"src/github.com/mongodb/mongo-tools/vendor")
|
||||
#t))
|
||||
|
||||
;; We don't need to install the source code for end-user application
|
||||
(delete 'install-source)
|
||||
|
||||
(replace 'build
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let build ((tools
|
||||
'("bsondump" "mongodump" "mongoexport" "mongofiles"
|
||||
"mongoimport" "mongooplog" "mongorestore"
|
||||
"mongostat" "mongotop")))
|
||||
(if (null? tools)
|
||||
#t
|
||||
(if (let* ((tool (car tools))
|
||||
(command
|
||||
`("go" "install" "-v"
|
||||
"-tags=\"ssl sasl\""
|
||||
"-ldflags"
|
||||
"-extldflags=-Wl,-z,now,-z,relro"
|
||||
,(string-append
|
||||
"src/github.com/mongodb/mongo-tools/"
|
||||
tool "/main/" tool ".go"))))
|
||||
(simple-format #t "build: running ~A\n"
|
||||
(string-join command))
|
||||
(zero? (apply system* command)))
|
||||
(build (cdr tools))
|
||||
#f))))))))
|
||||
(native-inputs
|
||||
`(("go-github.com-howeyc-gopass" ,go-github.com-howeyc-gopass)
|
||||
("go-github.com-jessevdk-go-flags" ,go-github.com-jessevdk-go-flags)
|
||||
("go-golang.org-x-crypto-ssh-terminal" ,go-golang.org-x-crypto-ssh-terminal)
|
||||
("go-gopkg.in-mgo.v2" ,go-gopkg.in-mgo.v2)
|
||||
("go-gopkg.in-tomb.v2" ,go-gopkg.in-tomb.v2)
|
||||
("go-github.com-nsf-termbox-go" ,go-github.com-nsf-termbox-go)))
|
||||
(home-page "https://github.com/mongodb/mongo-tools")
|
||||
(synopsis "Various tools for interacting with MongoDB and BSON")
|
||||
(description
|
||||
"This package includes a collection of tools related to MongoDB.
|
||||
@table @code
|
||||
@item bsondump
|
||||
Display BSON files in a human-readable format
|
||||
@item mongoimport
|
||||
Convert data from JSON, TSV or CSV and insert them into a collection
|
||||
@item mongoexport
|
||||
Write an existing collection to CSV or JSON format
|
||||
@item mongodump/mongorestore
|
||||
Dump MongoDB backups to disk in the BSON format
|
||||
@item mongorestore
|
||||
Read MongoDB backups in the BSON format, and restore them to a live database
|
||||
@item mongostat
|
||||
Monitor live MongoDB servers, replica sets, or sharded clusters
|
||||
@item mongofiles
|
||||
Read, write, delete, or update files in GridFS
|
||||
@item mongooplog
|
||||
Replay oplog entries between MongoDB servers
|
||||
@item mongotop
|
||||
Monitor read/write activity on a mongo server
|
||||
@end table")
|
||||
(license license:asl2.0)))
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -37,14 +37,14 @@
|
|||
(define-public dico
|
||||
(package
|
||||
(name "dico")
|
||||
(version "2.4")
|
||||
(version "2.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/dico/dico-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"13m7vahfbdj7hb38bjgd4cmfswavvxrcpppj9n4m4rar3wyzg52g"))))
|
||||
"0szm3z4xvq0pjj8kxl4paq63byamf281kzn1la0cdm5ngavypxxq"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags (list (string-append "--with-guile-site-dir=" %output
|
||||
|
|
@ -67,7 +67,7 @@
|
|||
("groff" ,groff)
|
||||
("readline" ,readline)
|
||||
("zlib" ,zlib)
|
||||
;; ("wordnet" ,wordnet) ;FIXME: link failure
|
||||
("wordnet" ,wordnet)
|
||||
("libltdl" ,libltdl)))
|
||||
(home-page "https://www.gnu.org/software/dico/")
|
||||
(synopsis "Implementation of DICT server (RFC 2229)")
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
|
|
@ -91,14 +91,14 @@ acronyms distributed as an info document.")
|
|||
(define-public gcide
|
||||
(package
|
||||
(name "gcide")
|
||||
(version "0.51")
|
||||
(version "0.52")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://gnu/gcide/gcide-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1wm0s51ygc6480dq8gwahzr35ls8jgpf34yiwl5yqcaa0i19fdv7"))))
|
||||
"1n3bp91sik66z3ca7mjqbr9nck3hg5ck0c8g84xc0qnfpx5vznh2"))))
|
||||
(build-system trivial-build-system)
|
||||
(arguments
|
||||
'(#:builder (begin
|
||||
|
|
|
|||
|
|
@ -4855,6 +4855,32 @@ To make YASnippet aware of these snippets, add the above directory to
|
|||
@code{yas-snippet-dirs}.")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public emacs-helm-c-yasnippet
|
||||
(let ((commit "65ca732b510bfc31636708aebcfe4d2d845b59b0")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "emacs-helm-c-yasnippet")
|
||||
(version (string-append "0.6.7" "-" revision "."
|
||||
(string-take commit 7)))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/emacs-jp/helm-c-yasnippet")
|
||||
(commit commit)))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"1cbafjqlzxbg19xfdqsinsh7afq58gkf44rsg1qxfgm8g6zhr7f8"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-helm" ,emacs-helm)
|
||||
("emacs-yasnippet" ,emacs-yasnippet)))
|
||||
(home-page "https://github.com/emacs-jp/helm-c-yasnippet")
|
||||
(synopsis "Helm integration for Yasnippet")
|
||||
(description "This Emacs library provides Helm interface for
|
||||
Yasnippet.")
|
||||
(license license:gpl2+))))
|
||||
|
||||
(define-public emacs-memoize
|
||||
(package
|
||||
(name "emacs-memoize")
|
||||
|
|
@ -6869,3 +6895,27 @@ supports multiple backends such as @code{vlc}, @code{mpg123},
|
|||
@code{ogg123}, @code{speexdec}, @code{timidity}, @code{mikmod} and
|
||||
@code{afplay}.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public groovy-emacs-modes
|
||||
(package
|
||||
(name "groovy-emacs-modes")
|
||||
(version "2.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/Groovy-Emacs-Modes/" name
|
||||
"/archive/" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"15j0hnkx9nppjzda5cqsxxz5f3bq9hc4xfyjcdypzqiypcvmpa39"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-s" ,emacs-s)))
|
||||
(home-page "https://github.com/Groovy-Emacs-Modes/groovy-emacs-modes")
|
||||
(synopsis "Groovy related modes for Emacs")
|
||||
(description
|
||||
"This package provides @code{groovy-mode} for syntax highlighing in
|
||||
Groovy source files, REPL integration with run-groovy and Grails project
|
||||
navigation with the grails mode.")
|
||||
(license license:gpl3+)))
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
|
||||
;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2016, 2017 ng0 <ng0@infotropique.org>
|
||||
;;; Copyright © 2016, 2017, 2018 ng0 <ng0@n0.is>
|
||||
;;; Copyright © 2016 Jookia <166291@gmail.com>
|
||||
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2016 Dmitry Nikolaev <cameltheman@gmail.com>
|
||||
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2016 Toni Reina <areina@riseup.net>
|
||||
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
|
|
@ -865,7 +865,7 @@ designed to work well in user interface environments.")
|
|||
(base32
|
||||
"1z65x0dw5dq6rs6p9wyfrir50rlh95vgzsxr8jcd40nqazw4jhpi"))))
|
||||
(build-system font-build-system)
|
||||
(home-page "http://mozilla.github.io/Fira/")
|
||||
(home-page "https://mozilla.github.io/Fira/")
|
||||
(synopsis "Mozilla's monospace font")
|
||||
(description "This is the typeface used by Mozilla in Firefox OS.")
|
||||
(license license:silofl1.1)))
|
||||
|
|
@ -883,11 +883,34 @@ designed to work well in user interface environments.")
|
|||
(base32
|
||||
"1r6zdnqqp4bgq5nmgqbj0vvj7x1h9w912851ggbl9wc7fdjnjqnq"))))
|
||||
(build-system font-build-system)
|
||||
(home-page "http://mozilla.github.io/Fira/")
|
||||
(home-page "https://mozilla.github.io/Fira/")
|
||||
(synopsis "Mozilla's Fira Sans Font")
|
||||
(description "This is the typeface used by Mozilla in Firefox OS.")
|
||||
(license license:silofl1.1)))
|
||||
|
||||
(define-public font-fira-code
|
||||
(package
|
||||
(name "font-fira-code")
|
||||
(version "1.204")
|
||||
(source (origin
|
||||
(method url-fetch/zipbomb)
|
||||
(uri (string-append "https://github.com/tonsky/FiraCode/releases/"
|
||||
"download/" version
|
||||
"/FiraCode_" version ".zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"17wky221b3igrqhmxgmqiyv1xdfn0nw471vzhpkrvv1w2w1w1k18"))))
|
||||
(build-system font-build-system)
|
||||
(home-page "https://mozilla.github.io/Fira/")
|
||||
(synopsis "Monospaced font with programming ligatures")
|
||||
(description
|
||||
"Fira Code is an extension of the Fira Mono font containing a set of ligatures
|
||||
for common programming multi-character combinations. This is just a font rendering
|
||||
feature: underlying code remains ASCII-compatible. This helps to read and understand
|
||||
code faster. For some frequent sequences like .. or //, ligatures allow us to
|
||||
correct spacing.")
|
||||
(license license:silofl1.1)))
|
||||
|
||||
(define-public font-awesome
|
||||
(package
|
||||
(name "font-awesome")
|
||||
|
|
|
|||
|
|
@ -386,7 +386,7 @@ support.")
|
|||
(define-public tiled
|
||||
(package
|
||||
(name "tiled")
|
||||
(version "1.1.0")
|
||||
(version "1.1.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/bjorn/tiled/archive/v"
|
||||
|
|
@ -394,7 +394,7 @@ support.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1xxvy5xyi32pbdva1hp05xq5l8403ck8hqdkv52lbscy92avvvp8"))))
|
||||
"102vw13iw1kbjj6h2sm8gl1jfvmqgq0zddd6hdmqagza5b6w32k3"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("qtbase" ,qtbase)
|
||||
|
|
@ -1056,7 +1056,7 @@ games.")
|
|||
(define-public godot
|
||||
(package
|
||||
(name "godot")
|
||||
(version "2.1.4")
|
||||
(version "3.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
|
@ -1064,7 +1064,8 @@ games.")
|
|||
version "-stable.tar.gz"))
|
||||
(file-name (string-append name "-" version))
|
||||
(sha256
|
||||
(base32 "1mz89nafc1m7srbqvy7iagxrxmqvf5hbqi7i0lwaapkx6q0kpkq7"))))
|
||||
(base32
|
||||
"1jhp269n1a7c663v2555444icbjwzscj4r8cq4rrrap7r7dr4hyc"))))
|
||||
(build-system scons-build-system)
|
||||
(arguments
|
||||
`(#:scons ,scons-python2
|
||||
|
|
@ -1140,6 +1141,7 @@ games.")
|
|||
("libwebp" ,libwebp)
|
||||
("libx11" ,libx11)
|
||||
("libxcursor" ,libxcursor)
|
||||
("libxi" ,libxi)
|
||||
("libxinerama" ,libxinerama)
|
||||
("libxrandr" ,libxrandr)
|
||||
("mesa" ,mesa)
|
||||
|
|
|
|||
|
|
@ -17,9 +17,9 @@
|
|||
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
|
||||
;;; Copyright © 2016, 2017 Rodger Fox <thylakoid@openmailbox.org>
|
||||
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
||||
;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
|
||||
;;; Copyright © 2016, 2017, 2018 ng0 <ng0@n0.is>
|
||||
;;; Copyright © 2016 Albin Söderqvist <albin@fripost.org>
|
||||
;;; Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net>
|
||||
;;; Copyright © 2016, 2017, 2018 Kei Kebreau <kkebreau@posteo.net>
|
||||
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
|
||||
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
|
||||
|
|
@ -139,6 +139,7 @@
|
|||
#:use-module (gnu packages vulkan)
|
||||
#:use-module (gnu packages web)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system go)
|
||||
#:use-module (guix build-system haskell)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (guix build-system cmake)
|
||||
|
|
@ -364,6 +365,94 @@ played. Freedoom complements the Doom engine with free levels, artwork, sound
|
|||
effects and music to make a completely free game.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public golly
|
||||
(package
|
||||
(name "golly")
|
||||
(version "3.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/golly/golly-"
|
||||
version "/golly-" version
|
||||
"-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0dn74k3rylhx023n047lz4z6qrqijfcxi0b6jryqklhmm2n532f7"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:make-flags (list "CC=gcc"
|
||||
(string-append "GOLLYDIR="
|
||||
(assoc-ref %outputs "out")
|
||||
"/share/golly"))
|
||||
#:tests? #f ; no check target
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; For some reason, setting the PYTHON_SHLIB make flag doesn't
|
||||
;; properly set the path to the Python shared library. This
|
||||
;; substitution acheives the same end by different means.
|
||||
(substitute* "gui-wx/wxprefs.cpp"
|
||||
(("pythonlib = wxT\\(STRINGIFY\\(PYTHON_SHLIB\\)\\)")
|
||||
(string-append "pythonlib = \""
|
||||
(assoc-ref inputs "python")
|
||||
"/lib/libpython-2.7.so\"")))
|
||||
#t))
|
||||
(replace 'build
|
||||
(lambda* (#:key make-flags outputs #:allow-other-keys)
|
||||
(with-directory-excursion "gui-wx"
|
||||
(apply invoke `("make" ,@make-flags "-f" "makefile-gtk")))))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin"))
|
||||
(doc (string-append out "/share/doc/golly"))
|
||||
(pixmaps (string-append out "/share/pixmaps"))
|
||||
(share (string-append out "/share/golly")))
|
||||
(for-each (lambda (binary)
|
||||
(install-file binary bin))
|
||||
'("bgolly" "golly"))
|
||||
(for-each (lambda (document)
|
||||
(install-file
|
||||
(string-append "docs/" document ".html")
|
||||
doc))
|
||||
'("License" "ReadMe" "ToDo"))
|
||||
(install-file "gui-wx/icons/appicon.xpm" pixmaps)
|
||||
(for-each (lambda (folder)
|
||||
(copy-recursively
|
||||
folder
|
||||
(string-append share "/" folder)))
|
||||
'("Help" "Patterns" "Rules" "Scripts")))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("lua" ,lua)))
|
||||
(inputs
|
||||
`(("glu" ,glu)
|
||||
("mesa" ,mesa)
|
||||
("python" ,python-2)
|
||||
("wxwidgets" ,wxwidgets-gtk2)
|
||||
("zlib" ,zlib)))
|
||||
(home-page "http://golly.sourceforge.net/")
|
||||
(synopsis "Software for exploring cellular automata")
|
||||
(description
|
||||
"Golly simulates Conway's Game of Life and many other types of cellular
|
||||
automata. The following features are available:
|
||||
@enumerate
|
||||
@item Support for bounded and unbounded universes, with cells of up to 256
|
||||
states.
|
||||
@item Support for multiple algorithms, including Bill Gosper's Hashlife
|
||||
algorithm.
|
||||
@item Loading patterns from BMP, PNG, GIF and TIFF image files.
|
||||
@item Reading RLE, macrocell, Life 1.05/1.06, dblife and MCell files.
|
||||
@item Scriptable via Lua or Python.
|
||||
@item Extracting patterns, rules and scripts from zip files.
|
||||
@item Downloading patterns, rules and scripts from online archives.
|
||||
@item Pasting patterns from the clipboard.
|
||||
@item Unlimited undo/redo.
|
||||
@item Configurable keyboard shortcuts.
|
||||
@item Auto fit option to keep patterns within the view.
|
||||
@end enumerate")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public meandmyshadow
|
||||
(package
|
||||
(name "meandmyshadow")
|
||||
|
|
@ -1716,7 +1805,7 @@ This game is based on the GPL version of the famous game TuxRacer.")
|
|||
("libjpeg" ,libjpeg)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(home-page "http://supertuxkart.net")
|
||||
(home-page "https://supertuxkart.net/")
|
||||
(synopsis "3D kart racing game")
|
||||
(description "SuperTuxKart is a 3D kart racing game, with a focus on
|
||||
having fun over realism. You can play with up to 4 friends on one PC, racing
|
||||
|
|
@ -3047,45 +3136,45 @@ http://lavachat.symlynx.com/unix/")
|
|||
(license license:gpl2+)))
|
||||
|
||||
(define-public red-eclipse
|
||||
(let ((release "1.5.8")
|
||||
(revision 2)
|
||||
(let ((release "1.6.0")
|
||||
(revision 0)
|
||||
(data-sources
|
||||
'(("acerspyro" "0zmg78scrfdv33h7vszqvzylcqjwg7d5b0j2riav3rjfh326j8xx")
|
||||
("actors" "0l00rsvppqzdpsikm5qpj38jiygirszxlzay2nxp4g4n2qjq0m4a")
|
||||
("appleflap" "0jhfr7f13hk3nswwxqc4jajriipr6zz6j63v955nv4sgxs7lzbjd")
|
||||
("blendbrush" "1nk0zaisbqf2khrivq8ls6z2lnh6d51m133m2ppxk7k4c9gq1imq")
|
||||
("caustics" "1hq08k476wayi0kmk4ps8h6jr75yinq04f1r2p8r79xsdpxq9my5")
|
||||
("crosshairs" "1gmrmjm7i7n9py0qrzamk7ygi63yx1mr2pp6iwz2vwngprl03n8m")
|
||||
("dziq" "0gr36ydrv8syjxv7w9dw3ix8waaq201fzxr0klkqp260p8xp215s")
|
||||
("elyvisions" "05syxlpsap6nfwxnnd0ls7qj1p4vhw2jxi41pi5inwpfifapfphz")
|
||||
("fonts" "184syks602xc657q08973w5ji50x5zssvd4vp2q2ig8m68iyr51c")
|
||||
("freezurbern" "020gpgcpy4rqjd9d18npfm96j8f02jcjnccbxcgzk1yb58y687ya")
|
||||
("john" "0hj5kwlb2gb0gsnl9bk7dkqlk8r7vxcw8gxpgrb3kfn8d9cwcb7k")
|
||||
("jojo" "0fij06040r7s5p7jksxm7wxi9jqwkhhm8iywys0dagk8j2wcbvsz")
|
||||
("jwin" "0ysfynjvypc8dszf7rsvk02jgw8fmsli49vy2xpm83zpkrqpddgf")
|
||||
("luckystrike" "1bm0xdqjv35ry5xwbzw3a3v1xf2gj1jwfg29nyl6w3ch0h6crr11")
|
||||
("maps" "0c9d1zxmpnngwhchzw6xb6cf84cx8xyycmdqcvyhamrd95d96qma")
|
||||
("mayhem" "133pdql7ari159skd9qdmw0p1m73x32d1v6jswkz0xwk8vgxmkil")
|
||||
("mikeplus64" "1d5npn9wlw0mviz9vhzzcsj98jvfh1wbvlh1nyqfj4ws5nfxhs7x")
|
||||
("misc" "19x2ps6yxnfrz0xdhqdwncaq25ds7i4w2l8sdfi95yh2r7c5k1qn")
|
||||
("nieb" "15029nipl92cb0jbh46z00k51hf3jk4v05pwx266b6b11bapdz0c")
|
||||
("nobiax" "0k9apim5z4ihd5ajmnbq4gyh24w872dv0mr5v8wqn31a8gxzahhp")
|
||||
("particles" "06827r9pnhzjil381xiwcbc93v9nxin7qlr59yrvk9gdzxmklk9m")
|
||||
("philipk" "1l6fhl6qz471vjn05hvk29bm8dhwnzqbmi2hdylpa9k998nzkfc1")
|
||||
("projectiles" "03ay8ik52n3vx723swqlnl5gpkzf1v1gadwj3zcnh43ch7nd2bqh")
|
||||
("props" "1yxz7gfmb79sqqrkyfdzp4ar9rf5f1kpfij4nrkk1l8vbw9liksc")
|
||||
("skyboxes" "1mm98mhb6yhb006p1hlic91jcwjxhq79mblxciwbqqa9c5g4yki6")
|
||||
("snipergoth" "1vlpmwlg71g6l5b706gp82bc07i5bbw2zphzynm2fx49za0zdi44")
|
||||
("sounds" "156g5wh8cvdh6zr33haqm566sd28ylnzdf2h4pqzpxbb2i19vbfg")
|
||||
("textures" "0wkhl5cgymr9kslzhksi83hs15rb0q01xvax5khi6b4dcl3mrmsh")
|
||||
("torley" "1xlag6ndjyqafl984n6d9zi96dv9aif7vrc2nvikc3iwgjwlbxav")
|
||||
("trak" "12x9ix8zkqn9svy56qmdgj4x2814qh25f4srplgq691lqn9qjhvd")
|
||||
("ulukai" "0gz1hd8hca2biskc85hw4jjacpsmqg9x4w6cwrka8x987xmc92k5")
|
||||
("unnamed" "09v8fjy6jqypm1i121kilg3z6zpw7dm0i4gxhd9b7ihprvzvy8r7")
|
||||
("vanities" "0m3vfq9l71pbb80qz4s3k8r5azmm158chqbw8snch09ymxm6h462")
|
||||
("vegetation" "07yzm9lbzr624j4i652ny5p762p83gadg40c1k8gwff4y7yk55gn")
|
||||
("weapons" "05fsp17gdrhjqdwia7rwdw9gcijaqwcnny8lf6krms43xmn8cj0x")
|
||||
("wicked" "0jjgwzdibr5my369gwvmvbklpjlwq939zgf643rv0168xc087xb2"))))
|
||||
'(("acerspyro" "07mzgdahnr3w3w7kf8nmy20r199rimfx9ryqxjdr793sw0vawqd3")
|
||||
("actors" "1hkgscfhg0kmwgym0mw56fhcckzbb2hh3nsvd45v4mdfyk0xnrm7")
|
||||
("appleflap" "1q4xs3x904mrrbxzv6lpr3lywm8p6i8339ijzy9j091s2wdl51ka")
|
||||
("blendbrush" "004md2haysr9w8fj6l7bj9wcfjqrq9wx1rrjf9dv16k5sbrkqza9")
|
||||
("caustics" "1qmmv8ds70j1ixy4rvli309vbcyjq1l5j1wri6nbnjay10f9fcgq")
|
||||
("crosshairs" "0q1vadg5cai9i6igl6y08774fd05gav0kinbgb2757n47ig50bns")
|
||||
("dziq" "1s9248ky2qqy24z9c2vgpisz500dvsaj249pv1fkrxgsypjm1z6v")
|
||||
("elyvisions" "15synpms05996v4c4kdl0h899spl4z7si9kl8c4m7rvc2yvin1ga")
|
||||
("fonts" "1l4727ai8mphi7n3wcjp2lh3p47nh6w82s5dpqbbjpqr9gilb69j")
|
||||
("freezurbern" "0hcdbzs02mvpsfhmahhqjv6pd8lbsag1bm6rpy61ns5qwmhg96ys")
|
||||
("john" "1whyvlx87mb83kfb7jhhnwz9s7lry4li8l3xar61vmlqgmsnz33d")
|
||||
("jojo" "02wxa93f5al4rlnsdjpd0hlnca0ympnj8481lgdxx70hny8zi3qi")
|
||||
("jwin" "1gb4l7lbhr150hml1y0wbyx7266q5nslh6n494wwrrsvp11s2qk8")
|
||||
("luckystrike" "0wy2spvhx5k233fsl283250ym5bqvkk8i6i19sw3zvzyxp2p4yq9")
|
||||
("maps" "1dmvp9mskval606z5srjd909jpm6qz4fdcpaszkkhfr5ajbj30vq")
|
||||
("mayhem" "0hkzzx0rxda70ixw9lfh9v1dpsbn2dj86jrr3zxjgasbgaxw37ax")
|
||||
("mikeplus64" "144fxhp4qjqjw3gvhf7ym6rnfxvxc0zvd3f54jg1jgnccc1hfyah")
|
||||
("misc" "0bpvibyc6vjhbzsf67xxn85yq2h97xs96icbskwzs2wsd860kq8c")
|
||||
("nieb" "0d72wsibk9sg9nhin3fwzz9zljiccyln0fn42y2q2xbd4my23b1k")
|
||||
("nobiax" "19lr36ys98cmpp739svjar1j942fbxz6r062gi7ygh89zh9yrgfy")
|
||||
("particles" "02pnq8ksl7f6kqxss3aza98jssdq2s41rhkhki71ynavp2a5akar")
|
||||
("philipk" "1xkrb7wa1pyhbs4xxx7vnnzsxrqzswk7gjbdac7i7rj0lwnfaij2")
|
||||
("projectiles" "1hra0f1ifiddh16fv4pqcr2amf046lf445v0653zkyri43zgrj5f")
|
||||
("props" "0ff6a8pz62f4nsk4c9cr50kirw108a661y5j6fvlsjickw3xjmyv")
|
||||
("skyboxes" "1lq58dhrdiivq7llkiyqwpi3bwa89r8hbi98p7zjhw7wdn34i6n2")
|
||||
("snipergoth" "0d5qf01bxd4dlffgxf8i91zq6mbyjmfd00dpyligpfj6fdbz87gc")
|
||||
("sounds" "0z6jmxsr3w735hrdnxypdb0gi399pwkaycv9grjpiqy43j3ic7gj")
|
||||
("textures" "0k5a47g2z99xn17vw7bqbp0w726gxmk33g5gwmqvfhxxxzzwimvi")
|
||||
("torley" "12x23l8xcv9ard5v76lb210lvp66whsns2p3k3xkd1sabp5ixbd5")
|
||||
("trak" "03kmwj47yb3dqzb6k9kilna9ja8c6jcnblvbs72x15767fl496pb")
|
||||
("ulukai" "0vvd016a7x981ixif6dnlg45s0ak7i89pgyrgwy2fpd94nl2am15")
|
||||
("unnamed" "18sxvdha41njp6g8wn56mjy6w9x778c793gh8fr0h9cnysb5gfmi")
|
||||
("vanities" "1p38mc2566bmb4vdyr9n9s6fkwmynp2xlpdq2a97gzgi4nmm0232")
|
||||
("vegetation" "0pf3qvqzabdcri5za61z6m89b5hq7sd3q0idkazmx88a62mcclkb")
|
||||
("weapons" "1jr05y9qhhx53plvir35srvv3cmn6wa065p3bskx6h1x6dcbx3c6")
|
||||
("wicked" "14b9f92h8hccp7a015z6rqgbs8236sdyxnwsq991ylnap7cbwvam"))))
|
||||
(package
|
||||
(name "red-eclipse")
|
||||
(version (if (zero? revision)
|
||||
|
|
@ -3099,7 +3188,7 @@ http://lavachat.symlynx.com/unix/")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0r66rsqxvd7hxrhb0fahqqmf3r0cw2drhv5vndbswcq90l1bxfmf"))))
|
||||
"1vs9k6f5fgsiy1n72imlqm8khjwm8cryc08zwd4gr7yxlxv45bs0"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no check target
|
||||
|
|
@ -3115,19 +3204,24 @@ http://lavachat.symlynx.com/unix/")
|
|||
(delete-file-recursively "data")
|
||||
(mkdir "data")
|
||||
(for-each (lambda (name)
|
||||
(system* "tar" "-xvf"
|
||||
(assoc-ref inputs name)
|
||||
"-Cdata"
|
||||
"--transform"
|
||||
(string-append "s/"
|
||||
name "-" ,release "/"
|
||||
name "/")))
|
||||
(invoke "tar" "-xvf"
|
||||
(assoc-ref inputs name)
|
||||
"-Cdata"
|
||||
"--transform"
|
||||
(string-append "s/"
|
||||
name "-" ,release "/"
|
||||
name "/")))
|
||||
(list ,@(map car data-sources)))
|
||||
#t))
|
||||
(add-after 'unpack-data 'add-store-data-package-path-as-default
|
||||
(add-after 'unpack-data 'add-store-data-package-path-as-default
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(substitute* "src/engine/server.cpp"
|
||||
(("(else[[:space:]]*)((addpackagedir\\()\"data\"(\\);))" _ else_part addpackagedir_original addpackagedir_open addpackagedir_close)
|
||||
(("(else[[:space:]]*)((addpackagedir\\()\"data\"(\\);))"
|
||||
_
|
||||
else_part
|
||||
addpackagedir_original
|
||||
addpackagedir_open
|
||||
addpackagedir_close)
|
||||
(string-append else_part
|
||||
"{ "
|
||||
addpackagedir_open
|
||||
|
|
@ -3156,8 +3250,8 @@ http://lavachat.symlynx.com/unix/")
|
|||
(copy-recursively "data"
|
||||
(string-append out "/share/redeclipse/data"))
|
||||
(mkdir-p (string-append out "/lib/redeclipse"))
|
||||
(symlink (string-append out "/share/redeclipse/data")
|
||||
(string-append out "/lib/redeclipse/data")))
|
||||
(symlink (string-append out "/share/redeclipse/data")
|
||||
(string-append out "/lib/redeclipse/data")))
|
||||
#t))
|
||||
(add-after 'copy-data 'wrap-program
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
|
|
@ -3819,7 +3913,7 @@ the GNU GPL.")
|
|||
(define-public tintin++
|
||||
(package
|
||||
(name "tintin++")
|
||||
(version "2.01.2")
|
||||
(version "2.01.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/tintin"
|
||||
|
|
@ -3827,7 +3921,7 @@ the GNU GPL.")
|
|||
"/tintin" "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"13h39agyhlhm17zyqlb56bmbbxpimikyf5pana3gd3ylvqy1xq81"))))
|
||||
"1g7bh8xs1ml0iyraps3a3dzaycci922y7fk5j0wyr4ssyjzsy8nx"))))
|
||||
(inputs
|
||||
`(("gnutls" ,gnutls)
|
||||
("pcre" ,pcre)
|
||||
|
|
@ -5453,3 +5547,29 @@ smuggler or bounty hunter. Forge and break alliances with the various
|
|||
factions fighting for power, freedom or self-determination. The universe is
|
||||
whatever you make of it.")
|
||||
(license license:gpl3)))
|
||||
|
||||
(define-public badass
|
||||
(let ((commit "3c3cd669b4fc8f73a102e3702788f7b28dc47dbb")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "badass")
|
||||
(version (git-version "0.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/umayr/badass.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"05c9vdcb5ym3z0n5ll3v39mw4yl9jcjnlydmn0yl89ai9pv71zb6"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "github.com/umayr/badass"))
|
||||
(synopsis "Hacking contribution graphs in git")
|
||||
(description
|
||||
"Badass generates false commits for a range of dates, essentially
|
||||
hacking the gamification of contribution graphs on platforms such as
|
||||
Github or Gitlab.")
|
||||
(home-page "https://github.com/umayr/badass")
|
||||
(license license:expat))))
|
||||
|
|
|
|||
|
|
@ -37,14 +37,14 @@
|
|||
(define-public gdb
|
||||
(package
|
||||
(name "gdb")
|
||||
(version "8.0.1")
|
||||
(version "8.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/gdb/gdb-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1qwmcbaxf0jc7yjl0fimgcfj2yqcrl6h7azgs1d838kbwf9mzg9x"))))
|
||||
"0d2bpqk58fqlx21rbnk8mbcjlggzc9kb5sjirrfrrrjq70ka0qdg"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; FIXME "make check" fails on single-processor systems.
|
||||
|
|
|
|||
|
|
@ -185,13 +185,13 @@ authentication and support for SSL3 and TLS.")
|
|||
(define-public gnurl
|
||||
(package
|
||||
(name "gnurl")
|
||||
(version "7.57.0")
|
||||
(version "7.58.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/gnunet/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0cl2x1jddnhn1z8gd75w6k7lb6pymn5rf2vqgl2vdkbxsz677z07"))))
|
||||
"1yyswsz0csplqi8hlhqaxlafqn5kh5016j8k2gaxziv4cb343znx"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out"
|
||||
"doc")) ; 1.5 MiB of man3 pages
|
||||
|
|
@ -205,8 +205,7 @@ authentication and support for SSL3 and TLS.")
|
|||
("pkg-config" ,pkg-config)
|
||||
("python" ,python-2)))
|
||||
(arguments
|
||||
`(#:configure-flags (list "--disable-ntlm-wb"
|
||||
"--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt")
|
||||
`(#:configure-flags (list "--disable-ntlm-wb")
|
||||
#:test-target "test"
|
||||
#:parallel-tests? #f
|
||||
#:phases
|
||||
|
|
|
|||
|
|
@ -446,3 +446,53 @@ interfaces in Go. The goal is to enable developers to write fast and
|
|||
distributable command line applications in an expressive way.")
|
||||
(home-page "https://github.com/davidjpeacock/cli")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public go-github.com-jessevdk-go-flags
|
||||
(package
|
||||
(name "go-github.com-jessevdk-go-flags")
|
||||
(version "1.3.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/jessevdk/go-flags")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1jk2k2l10lwrn1r3nxdvbs0yz656830j4khzirw8p4ahs7c5zz36"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "github.com/jessevdk/go-flags"))
|
||||
(synopsis "Go library for parsing command line arguments")
|
||||
(description
|
||||
"The @code{flags} package provides a command line option parser. The
|
||||
functionality is similar to the go builtin @code{flag} package, but
|
||||
@code{flags} provides more options and uses reflection to provide a succinct
|
||||
way of specifying command line options.")
|
||||
(home-page "https://github.com/jessevdk/go-flags")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public go-gopkg.in-tomb.v2
|
||||
(let ((commit "d5d1b5820637886def9eef33e03a27a9f166942c")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "go-gopkg.in-tomb.v2")
|
||||
(version (string-append "0.0.0-" revision "." (string-take commit 7)))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/go-tomb/tomb.git")
|
||||
(commit commit)))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1sv15sri99szkdz1bkh0ir46w9n8prrwx5hfai13nrhkawfyfy10"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "gopkg.in/tomb.v2"))
|
||||
(synopsis "@code{tomb} handles clean goroutine tracking and termination")
|
||||
(description
|
||||
"The @code{tomb} package handles clean goroutine tracking and
|
||||
termination.")
|
||||
(home-page "https://gopkg.in/tomb.v2")
|
||||
(license license:bsd-3))))
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
|
||||
;;; Copyright © 2017 ng0 <ng0@infotropique.org>
|
||||
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -72,7 +73,8 @@
|
|||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system trivial)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (ice-9 match))
|
||||
#:use-module (ice-9 match)
|
||||
#:use-module ((srfi srfi-1) #:prefix srfi-1:))
|
||||
|
||||
;;; Commentary:
|
||||
;;;
|
||||
|
|
@ -689,31 +691,43 @@ format is also supported.")
|
|||
("pkg-config" ,pkg-config)
|
||||
("texinfo" ,texinfo)
|
||||
("help2man" ,help2man)))
|
||||
(inputs
|
||||
`(("guile-2.2" ,guile-2.2)
|
||||
,@(srfi-1:alist-delete "guile" (package-inputs mcron))))
|
||||
(arguments
|
||||
`(#:modules ((ice-9 match) (ice-9 ftw)
|
||||
,@%gnu-build-system-modules)
|
||||
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-after 'unpack 'bootstrap
|
||||
(lambda _
|
||||
(zero? (system* "autoreconf" "-vfi"))))
|
||||
(add-after 'install 'wrap-mcron
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; Wrap the 'mcron' command to refer to the right
|
||||
;; modules.
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin"))
|
||||
(site (string-append
|
||||
out "/share/guile/site")))
|
||||
(match (scandir site)
|
||||
(("." ".." version)
|
||||
(let ((modules (string-append site "/" version)))
|
||||
(wrap-program (string-append bin "/mcron")
|
||||
`("GUILE_LOAD_PATH" ":" prefix
|
||||
(,modules))
|
||||
`("GUILE_LOAD_COMPILED_PATH" ":" prefix
|
||||
(,modules)))
|
||||
#t))))))))))))
|
||||
;; When building the targets in parallel, help2man tries to generate
|
||||
;; the manpage from ./cron --help before it is built, which fails.
|
||||
#:parallel-build? #f
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'use-guile-2.2
|
||||
(lambda _
|
||||
(substitute* "configure.ac"
|
||||
(("PKG_CHECK_MODULES\\(\\[GUILE\\],.*$")
|
||||
"PKG_CHECK_MODULES([GUILE], [guile-2.2])\n"))
|
||||
#t))
|
||||
(add-after 'use-guile-2.2 'bootstrap
|
||||
(lambda _
|
||||
(invoke "autoreconf" "-vfi")))
|
||||
(add-after 'install 'wrap-mcron
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; Wrap the 'mcron' command to refer to the right
|
||||
;; modules.
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin"))
|
||||
(site (string-append
|
||||
out "/share/guile/site")))
|
||||
(match (scandir site)
|
||||
(("." ".." version)
|
||||
(let ((modules (string-append site "/" version)))
|
||||
(wrap-program (string-append bin "/mcron")
|
||||
`("GUILE_LOAD_PATH" ":" prefix
|
||||
(,modules))
|
||||
`("GUILE_LOAD_COMPILED_PATH" ":" prefix
|
||||
(,modules)))
|
||||
#t))))))))))))
|
||||
|
||||
(define-public guile-ics
|
||||
(package
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
|
||||
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -183,9 +184,9 @@ may also simplify input method development.")
|
|||
("automake" ,automake)
|
||||
("glib" ,glib "bin")
|
||||
("libtool" ,libtool)))
|
||||
(synopsis "Chinese Pinyin and ZhuYin input methods for IBus")
|
||||
(synopsis "Chinese pinyin and ZhuYin input methods for IBus")
|
||||
(description
|
||||
"This package includes a Chinese Pinyin input method and a Chinese
|
||||
"This package includes a Chinese pinyin input method and a Chinese
|
||||
ZhuYin (Bopomofo) input method based on libpinyin for IBus.")
|
||||
(home-page "https://github.com/libpinyin/ibus-libpinyin")
|
||||
(license gpl2+)))
|
||||
|
|
@ -193,7 +194,7 @@ ZhuYin (Bopomofo) input method based on libpinyin for IBus.")
|
|||
(define-public libpinyin
|
||||
(package
|
||||
(name "libpinyin")
|
||||
(version "2.1.0")
|
||||
(version "2.1.91")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -202,7 +203,7 @@ ZhuYin (Bopomofo) input method based on libpinyin for IBus.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1iijpin65cmgawfx7sfdw1anmabljva0af1f9gx8ad6b4slhvknn"))))
|
||||
"1yr4zyz3rwvmvj6bh8pc54hbp4rd2xk3g06y38z220fshx2l8pwf"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
@ -230,7 +231,7 @@ ZhuYin (Bopomofo) input method based on libpinyin for IBus.")
|
|||
("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("libtool" ,libtool)))
|
||||
(synopsis "Library to handle Chinese Pinyin")
|
||||
(synopsis "Library to handle Chinese pinyin")
|
||||
(description
|
||||
"The libpinyin C++ library provides algorithms needed for sentence-based
|
||||
Chinese pinyin input methods.")
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@
|
|||
(define-public feh
|
||||
(package
|
||||
(name "feh")
|
||||
(version "2.23")
|
||||
(version "2.23.1")
|
||||
(home-page "https://feh.finalrewind.org/")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"18922zv8ckm82r1ap1yn7plbk6djpj02za2ahng58sjj2fw3rpqn"))))
|
||||
"1gp9szkcx7x0ifxihncbdaf6m075rqnnb8jks8dj0h9xhv869hcv"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases (modify-phases %standard-phases (delete 'configure))
|
||||
|
|
|
|||
|
|
@ -47,14 +47,14 @@
|
|||
;; The 7 release series has an incompatible API, while the 6 series is still
|
||||
;; maintained. Don't update to 7 until we've made sure that the ImageMagick
|
||||
;; users are ready for the 7-series API.
|
||||
(version "6.9.9-30")
|
||||
(version "6.9.9-34")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://imagemagick/ImageMagick-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1vqy5pzd1zdag9hf6s6xvyvfa30zx08cps9xg2481v7d2pyxs79j"))))
|
||||
"0b11pxaiq0bvr3f3fj791jnfmwn61i3ini78cwi0szrn3akqwzdk"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch")
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
|
||||
;;; Copyright © 2014 Kevin Lemonnier <lemonnierk@ulrar.net>
|
||||
;;; Copyright © 2015, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 ng0 <ng0@infotropique.org>
|
||||
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
|
|
@ -115,7 +115,7 @@ irssi, but graphical.")
|
|||
(define-public irssi
|
||||
(package
|
||||
(name "irssi")
|
||||
(version "1.0.6")
|
||||
(version "1.1.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/irssi/irssi/"
|
||||
|
|
@ -123,7 +123,7 @@ irssi, but graphical.")
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"11c5vrwz525ld3478p81hngnv9aw0cd4xvfqcrr7ycxz7r7qi7h2"))))
|
||||
"00jz5mf2cwzfig0qcs3y4jpp5v8icvwf239k5chr2qq47lbsp6qh"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
|||
|
|
@ -378,28 +378,37 @@ It has been modified to remove all non-free binary blobs.")
|
|||
(define %intel-compatible-systems '("x86_64-linux" "i686-linux"))
|
||||
(define %linux-compatible-systems '("x86_64-linux" "i686-linux" "armhf-linux"))
|
||||
|
||||
(define %linux-libre-version "4.14.15")
|
||||
(define %linux-libre-hash "0s94d51bym3zipxf40xjzq943b7b2x4ba1gp3j7l5npj5nr2xiy8")
|
||||
|
||||
;; linux-libre configuration for armhf-linux is derived from Debian armmp. It
|
||||
;; supports qemu "virt" machine and possibly a large number of ARM boards.
|
||||
;; See : https://wiki.debian.org/DebianKernel/ARMMP.
|
||||
|
||||
(define %linux-libre-version "4.15")
|
||||
(define %linux-libre-hash "11h1954mkyy2wc0c9jd9dxysqq9wrjr6jmsxdysdd73g50a6amg6")
|
||||
|
||||
(define-public linux-libre
|
||||
(make-linux-libre %linux-libre-version
|
||||
%linux-libre-hash
|
||||
%linux-compatible-systems
|
||||
#:configuration-file kernel-config))
|
||||
|
||||
(define %linux-libre-4.14-version "4.14.16")
|
||||
(define %linux-libre-4.14-hash "0qigj0wjm2pdjsz99mqmvf52m9qfkab8hiasdbvkby9dq59h4smd")
|
||||
|
||||
(define-public linux-libre-4.14
|
||||
(make-linux-libre %linux-libre-4.14-version
|
||||
%linux-libre-4.14-hash
|
||||
%linux-compatible-systems
|
||||
#:configuration-file kernel-config))
|
||||
|
||||
(define-public linux-libre-4.9
|
||||
(make-linux-libre "4.9.78"
|
||||
"12j7nxz92krq2ax7rii4pr6y1pr37n7ml692kqifpzpbzqm5yb9k"
|
||||
(make-linux-libre "4.9.79"
|
||||
"1dvig7yixnmnrzbkjj41q8z1k3b7mk03a7kn33347cik185vq73p"
|
||||
%intel-compatible-systems
|
||||
#:configuration-file kernel-config))
|
||||
|
||||
(define-public linux-libre-4.4
|
||||
(make-linux-libre "4.4.113"
|
||||
"17l5gw99ph312k0x4d3f08zlsp1ljr6c1mp0xvqp1257gnz84bgb"
|
||||
(make-linux-libre "4.4.114"
|
||||
"1xhwisv98vdi02lbi3sr2kvywfq5ibbisz5487202qqcrf1x95jx"
|
||||
%intel-compatible-systems
|
||||
#:configuration-file kernel-config))
|
||||
|
||||
|
|
@ -416,6 +425,13 @@ It has been modified to remove all non-free binary blobs.")
|
|||
#:defconfig "multi_v7_defconfig"
|
||||
#:extra-version "arm-generic"))
|
||||
|
||||
(define-public linux-libre-arm-generic-4.14
|
||||
(make-linux-libre %linux-libre-4.14-version
|
||||
%linux-libre-4.14-hash
|
||||
'("armhf-linux")
|
||||
#:defconfig "multi_v7_defconfig"
|
||||
#:extra-version "arm-generic"))
|
||||
|
||||
(define-public linux-libre-arm-omap2plus
|
||||
(make-linux-libre %linux-libre-version
|
||||
%linux-libre-hash
|
||||
|
|
@ -423,6 +439,13 @@ It has been modified to remove all non-free binary blobs.")
|
|||
#:defconfig "omap2plus_defconfig"
|
||||
#:extra-version "arm-omap2plus"))
|
||||
|
||||
(define-public linux-libre-arm-omap2plus-4.14
|
||||
(make-linux-libre %linux-libre-4.14-version
|
||||
%linux-libre-4.14-hash
|
||||
'("armhf-linux")
|
||||
#:defconfig "omap2plus_defconfig"
|
||||
#:extra-version "arm-omap2plus"))
|
||||
|
||||
|
||||
;;;
|
||||
;;; Pluggable authentication modules (PAM).
|
||||
|
|
@ -1155,7 +1178,7 @@ that the Ethernet protocol is much simpler than the IP protocol.")
|
|||
(define-public iproute
|
||||
(package
|
||||
(name "iproute2")
|
||||
(version "4.14.1")
|
||||
(version "4.15.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -1163,7 +1186,7 @@ that the Ethernet protocol is much simpler than the IP protocol.")
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0rq0n7yxb0hmk0s6wx5awzjgf7ikjbibd0a5ix20ldfcmxlc0fnl"))))
|
||||
"0mc3g4kj7h3jhwz2b2gdf41gp6bhqn7axh4mnyvhkdnpk5m63m28"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no test suite
|
||||
|
|
@ -2017,14 +2040,14 @@ time.")
|
|||
(define-public lvm2
|
||||
(package
|
||||
(name "lvm2")
|
||||
(version "2.02.176")
|
||||
(version "2.02.177")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "ftp://sources.redhat.com/pub/lvm2/releases/LVM2."
|
||||
version ".tgz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0wx4rvy4frdmb66znh2xms2j2n06sm361ki6l5ks4y1ciii87kny"))
|
||||
"1wl0isn0yz5wvglwylnlqkppafwmvhliq5bd92vjqp5ir4za49a0"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
|
@ -3499,7 +3522,7 @@ such as frequency and voltage scaling.")
|
|||
(define-public haveged
|
||||
(package
|
||||
(name "haveged")
|
||||
(version "1.9.1")
|
||||
(version "1.9.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -3507,7 +3530,7 @@ such as frequency and voltage scaling.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"059pxlfd4l5dqhd6r3lynzfz4wby2f17294fy17pi9j2jpnn68ww"))))
|
||||
"0w5ypz6451msckivjriwyw8djydlwffam7x23xh626s2vzdrlzgp"))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "http://www.issihosts.com/haveged")
|
||||
(synopsis "Entropy source for the Linux random number generator")
|
||||
|
|
@ -4324,6 +4347,7 @@ the MTP device as a file system.")
|
|||
(base32 "0dvscyf47i3j5ay0amncqmqw9kd916689r2pqdvpnsrhp6j46zp1"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments `(#:configure-flags '("--disable-silent-rules")))
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
(inputs `(("expat" ,expat) ("libcap" ,libcap) ("check" ,check)
|
||||
("groff" ,groff) ; for tests
|
||||
("libselinux" ,libselinux)))
|
||||
|
|
@ -4456,20 +4480,15 @@ relevant @file{/dev/vcs*} file(s).")
|
|||
(define-public fbcat
|
||||
(package
|
||||
(name "fbcat")
|
||||
(version "0.5")
|
||||
(version "0.5.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/jwilk/fbcat/releases/download/"
|
||||
version "/" name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1dla1na3nf3s4xy0p6w0v54zipg1x8c14yqsw8w9qjzhchr4caxw"))))
|
||||
(base32 "0pj9hxmwhbz6kmd7847yx2jh1scl9l25zgndyi8s9vlzdkq2q8d7"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
;; For building the man pages.
|
||||
`(("docbook-xml" ,docbook-xml)
|
||||
("docbook-xsl" ,docbook-xsl)
|
||||
("xsltproc" ,libxslt)))
|
||||
(inputs
|
||||
;; The ‘fbgrab’ wrapper can use one of several PPM-to-PNG converters. We
|
||||
;; choose netpbm simply because it's the smallest. It still adds ~94 MiB
|
||||
|
|
@ -4477,23 +4496,13 @@ relevant @file{/dev/vcs*} file(s).")
|
|||
`(("pnmtopng" ,netpbm)))
|
||||
(outputs (list "out" "fbgrab"))
|
||||
(arguments
|
||||
`(#:make-flags (list "CC=gcc")
|
||||
`(#:make-flags
|
||||
(list "CC=gcc"
|
||||
(string-append "PREFIX=" (assoc-ref %outputs "out")))
|
||||
#:tests? #f ; no tests
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-docbook-location
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "doc/Makefile"
|
||||
(("http://docbook.sourceforge.net/release/xsl/current")
|
||||
(string-append (assoc-ref inputs "docbook-xsl")
|
||||
"/xml/xsl/docbook-xsl-"
|
||||
,(package-version docbook-xsl))))
|
||||
#t))
|
||||
(delete 'configure) ; no configure script
|
||||
(add-after 'build 'build-documentation
|
||||
(lambda* (#:key make-flags #:allow-other-keys)
|
||||
(zero? (apply system* "make" "-C" "doc"
|
||||
make-flags))))
|
||||
(add-after 'build 'qualify-references
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((pnmtopng (assoc-ref inputs "pnmtopng"))
|
||||
|
|
@ -4504,17 +4513,17 @@ relevant @file{/dev/vcs*} file(s).")
|
|||
(("pnmtopng" all)
|
||||
(string-append pnmtopng "/bin/" all)))
|
||||
#t)))
|
||||
(replace 'install
|
||||
;; The Makefile lacks an ‘install’ target. Install files manually.
|
||||
(add-after 'install 'split-fbgrab-output
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(out:fbgrab (assoc-ref outputs "fbgrab")))
|
||||
(install-file "fbcat" (string-append out "/bin"))
|
||||
(install-file "doc/fbcat.1"
|
||||
(string-append out "/share/man/man1"))
|
||||
(install-file "fbgrab" (string-append out:fbgrab "/bin"))
|
||||
(install-file "doc/fbgrab.1"
|
||||
(string-append out:fbgrab "/share/man/man1"))
|
||||
(for-each (lambda (file)
|
||||
(let ((old (string-append out "/" file))
|
||||
(new (string-append out:fbgrab "/" file)))
|
||||
(mkdir-p (dirname new))
|
||||
(rename-file old new)))
|
||||
(list "bin/fbgrab"
|
||||
"share/man/man1/fbgrab.1"))
|
||||
#t))))))
|
||||
(home-page "https://jwilk.net/software/fbcat")
|
||||
(synopsis "Take a screenshot of the contents of the Linux framebuffer")
|
||||
|
|
|
|||
|
|
@ -240,14 +240,14 @@ aliasing facilities to work just as they would on normal mail.")
|
|||
(define-public mutt
|
||||
(package
|
||||
(name "mutt")
|
||||
(version "1.9.2")
|
||||
(version "1.9.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://bitbucket.org/mutt/mutt/downloads/"
|
||||
"mutt-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"15kqxpx8bykqbyw4q33hkz0j2f65v6cl21sl5li2vw5vaaim5qd2"))
|
||||
"1qbngck1pq1jkpnbpcwcb2q2zqrkgp0nd68wwp57bprxjgb8a6j3"))
|
||||
(patches (search-patches "mutt-store-references.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de>
|
||||
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017 ng0 <ng0@infotropique.org>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -153,7 +154,7 @@ from Mint-X-F and Faenza-Fresh icon packs.")
|
|||
(define-public mate-themes
|
||||
(package
|
||||
(name "mate-themes")
|
||||
(version "3.22.13")
|
||||
(version "3.22.14")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://pub.mate-desktop.org/releases/themes/"
|
||||
|
|
@ -161,7 +162,7 @@ from Mint-X-F and Faenza-Fresh icon packs.")
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1p7w63an8qs15hkj79nppy7471glv0rm1b0himn3c4w69q8qdc9i"))))
|
||||
"09fqvlnmrvc73arl7jv9ygkxi46lw7c1q8qra6w3ap7x83f9zdak"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
|
||||
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
|
||||
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017 Dave Love <me@fx@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
|
@ -1605,7 +1605,7 @@ scientific applications modeled by partial differential equations.")
|
|||
(define-public slepc
|
||||
(package
|
||||
(name "slepc")
|
||||
(version "3.8.0")
|
||||
(version "3.8.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -1613,7 +1613,7 @@ scientific applications modeled by partial differential equations.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0qyrsdndfdw2g0jmj9iskxj3j20zlkplhv26288s079dhm7cr365"))))
|
||||
"04zd48p43rnvg68p6cp28zll0px5whglc5v0sc3s6vdj1v920z8y"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("python" ,python-2)))
|
||||
|
|
@ -1642,7 +1642,7 @@ scientific applications modeled by partial differential equations.")
|
|||
(format #t "configure flags: ~s~%" flags)
|
||||
(setenv "SLEPC_DIR" (getcwd))
|
||||
(setenv "PETSC_DIR" (assoc-ref inputs "petsc"))
|
||||
(zero? (apply system* "./configure" flags)))))
|
||||
(invoke "./configure" flags))))
|
||||
(add-after 'install 'delete-doc
|
||||
;; TODO: SLEPc installs HTML documentation alongside headers in
|
||||
;; $out/include. We'd like to move them to share/doc, but delete
|
||||
|
|
@ -1671,7 +1671,7 @@ as well as other related problems such as the singular value decomposition.
|
|||
The emphasis of the software is on methods and techniques appropriate for
|
||||
problems in which the associated matrices are sparse, for example, those
|
||||
arising after the discretization of partial differential equations.")
|
||||
(license license:lgpl3)))
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public slepc-complex
|
||||
(package (inherit slepc)
|
||||
|
|
@ -2806,7 +2806,7 @@ environments.")
|
|||
(define-public openspecfun
|
||||
(package
|
||||
(name "openspecfun")
|
||||
(version "0.5.2")
|
||||
(version "0.5.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -2815,14 +2815,15 @@ environments.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1y5b2h6f2k72536kym3vzy3li3bhpd23x463g7hdmjdi3cncavz1"))))
|
||||
"1rs1bv8jq751fv9vq79890wqf9xlbjc7lvz3ighzyfczbyjcf18m"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ;no "check" target
|
||||
'(#:tests? #f ; no "check" target
|
||||
#:make-flags
|
||||
(list (string-append "prefix=" (assoc-ref %outputs "out")))
|
||||
;; no configure script
|
||||
#:phases (modify-phases %standard-phases (delete 'configure))))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)))) ; no configure script
|
||||
(inputs
|
||||
`(("fortran" ,gfortran)))
|
||||
(home-page "https://github.com/JuliaLang/openspecfun")
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
;;; Copyright © 2016, 2017 Clément Lassieur <clement@lassieur.org>
|
||||
;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com>
|
||||
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
|
||||
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
|
||||
;;;
|
||||
|
|
@ -483,7 +483,7 @@ compromised.")
|
|||
("zlib" ,zlib)
|
||||
("icu4c" ,icu4c)
|
||||
("cyrus-sasl" ,cyrus-sasl)))
|
||||
(home-page "http://znc.in")
|
||||
(home-page "https://znc.in")
|
||||
(synopsis "IRC network bouncer")
|
||||
(description "ZNC is an IRC network bouncer or BNC. It can detach the
|
||||
client from the actual IRC server, and also from selected channels. Multiple
|
||||
|
|
@ -773,7 +773,7 @@ protocols.")
|
|||
(define-public c-toxcore
|
||||
(package
|
||||
(name "c-toxcore")
|
||||
(version "0.1.10")
|
||||
(version "0.1.11")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -782,7 +782,7 @@ protocols.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1lbvq9pp1ganjk5lql5lzcn8bcmgfi8y026pb2j2nq8yldqrrjby"))))
|
||||
"040vwihl1r5159vzimmnff75iqfg53vhnfi5wcb3cd0c2r51idl5"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 nee <nee.git@hidamari.blue>
|
||||
;;; Copyright © 2018 Stefan Reichör <stefan@xsteve.at>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -2170,14 +2171,14 @@ from the command line.")
|
|||
(define-public qtractor
|
||||
(package
|
||||
(name "qtractor")
|
||||
(version "0.8.5")
|
||||
(version "0.8.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://downloads.sourceforge.net/qtractor/"
|
||||
"qtractor-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0anhsd3gg8cxbf31mn2mimf19ycbbxqvd7ldizk93yq2zfbzzqqa"))))
|
||||
"0qf75bccsyplx6fcaz48k6027yp06zhl8ixhhjdbr30xgpslnjm3"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments `(#:tests? #f)) ; no "check" target
|
||||
(inputs
|
||||
|
|
@ -2489,6 +2490,48 @@ websites such as Libre.fm.")
|
|||
(define-public python2-pylast
|
||||
(package-with-python2 python-pylast))
|
||||
|
||||
(define-public instantmusic
|
||||
(let ((commit "300891d09c703525215fa5a116b9294af1c923c8")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "instantmusic")
|
||||
(version (git-version "1.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/yask123/Instant-Music-Downloader.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0j7qivaa04bpdz3anmgci5833dgiyfqqwq9fdrpl9m68b34gl773"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs
|
||||
`(("python-requests" ,python-requests)
|
||||
("eyed3", eyed3)
|
||||
("python-beautifulsoup4" ,python-beautifulsoup4)
|
||||
("youtube-dl" ,youtube-dl)))
|
||||
(arguments
|
||||
'(#:modules ((guix build python-build-system)
|
||||
(guix build utils)
|
||||
(srfi srfi-26))
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-before 'build 'change-directory
|
||||
(lambda _
|
||||
(chdir "instantmusic-0.1") #t))
|
||||
(add-before 'check 'fix-file-permissions
|
||||
(lambda _
|
||||
;; Fix some read-only files that would cause a build failure
|
||||
(for-each (cut chmod <> #o644)
|
||||
(find-files "instantmusic.egg-info"
|
||||
"PKG-INFO|.*\\.txt"))
|
||||
#t)))))
|
||||
(home-page "http://iyask.me/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.")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public beets
|
||||
(package
|
||||
(name "beets")
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
|
||||
;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
(define-public nano
|
||||
(package
|
||||
(name "nano")
|
||||
(version "2.9.2")
|
||||
(version "2.9.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0m9xm085pi0fhmmshgppipjimr1jkxksbyg8pa5cwaap3d2vgk2f"))))
|
||||
"04j05nbnp8vjjwja90d83p4s6ywyl6qhggflcjzw0p9d9gyvr0vp"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("gettext" ,gettext-minimal)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2014, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2015, 2016, 2017 Stefan Reichör <stefan@xsteve.at>
|
||||
|
|
@ -18,6 +18,7 @@
|
|||
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
|
||||
;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
|
||||
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
|
||||
;;; Copyright © 2018 Adam Van Ymeren <adam@vany.ca>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -50,6 +51,7 @@
|
|||
#:use-module (gnu packages algebra)
|
||||
#:use-module (gnu packages audio)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages code)
|
||||
|
|
@ -67,6 +69,7 @@
|
|||
#:use-module (gnu packages libidn)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages lua)
|
||||
#:use-module (gnu packages multiprecision)
|
||||
#:use-module (gnu packages kerberos)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages pcre)
|
||||
|
|
@ -451,7 +454,7 @@ and up to 1 Mbit/s downstream.")
|
|||
(define-public whois
|
||||
(package
|
||||
(name "whois")
|
||||
(version "5.2.20")
|
||||
(version "5.3.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -459,7 +462,7 @@ and up to 1 Mbit/s downstream.")
|
|||
name "_" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"02f00vpgrdb77w7lskl9jfm2akpy21ws9cjazs13gash2xksnj38"))))
|
||||
"08sp2gzv09rar1a5mnfmbc24pqvhpqqmz2hnmv436n7v7d09qy2d"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; Does not exist
|
||||
|
|
@ -490,7 +493,7 @@ which can be used to encrypt a password with @code{crypt(3)}.")
|
|||
(define-public wireshark
|
||||
(package
|
||||
(name "wireshark")
|
||||
(version "2.4.3")
|
||||
(version "2.4.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -498,7 +501,7 @@ which can be used to encrypt a password with @code{crypt(3)}.")
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0bpiby916k3k8bm7q8b1dflva6zs0a4ircskrck0d538dfcrb50q"))))
|
||||
"0n3g28hrhifnchlz4av0blq4ykm4zaxwwxbzdm9wsba27677b6h4"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("c-ares" ,c-ares)
|
||||
("glib" ,glib)
|
||||
|
|
@ -1571,3 +1574,81 @@ routers (or @dfn{hops}) between the local host and a user-specified destination.
|
|||
It then continually measures the response time and packet loss at each hop, and
|
||||
displays the results in real time.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public strongswan
|
||||
(package
|
||||
(name "strongswan")
|
||||
(version "5.6.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.strongswan.org/strongswan-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32 "0lxbyiary8iapx3ysw40czrmxf983fhfzs5mvz2hk1j1mpc85hp0"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'adjust-to-environment
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; Adjust file names.
|
||||
(substitute* "src/libstrongswan/utils/process.c"
|
||||
(("/bin/sh")
|
||||
(string-append (assoc-ref inputs "bash") "/bin/sh")))
|
||||
|
||||
(substitute* "src/libstrongswan/tests/suites/test_process.c"
|
||||
(("/bin/sh") (which "sh"))
|
||||
(("/bin/echo") (which "echo"))
|
||||
(("cat") (which "cat")))
|
||||
|
||||
;; This is needed for tests.
|
||||
(setenv "TZDIR" (string-append (assoc-ref inputs "tzdata")
|
||||
"/share/zoneinfo"))
|
||||
#t)))
|
||||
#:configure-flags
|
||||
(list
|
||||
;; Disable bsd-4 licensed plugins
|
||||
"--disable-des"
|
||||
"--disable-blowfish")))
|
||||
(inputs
|
||||
`(("curl" ,curl)
|
||||
("gmp" ,gmp)
|
||||
("libgcrypt" ,libgcrypt)
|
||||
("openssl" ,openssl)))
|
||||
(native-inputs
|
||||
`(("coreutils" ,coreutils)
|
||||
("tzdata" ,tzdata-2017a)))
|
||||
(synopsis "IKEv1/v2 keying daemon")
|
||||
(description "StrongSwan is an IPsec implementation originally based upon
|
||||
the FreeS/WAN project. It contains support for IKEv1, IKEv2, MOBIKE, IPv6,
|
||||
NAT-T and more.")
|
||||
(home-page "https://strongswan.org/")
|
||||
(license
|
||||
(list license:gpl2+
|
||||
;; src/aikgen/*
|
||||
;; src/libcharon/plugins/dnscert/*
|
||||
;; src/libcharon/plugins/ext_auth/*
|
||||
;; src/libcharon/plugins/vici/ruby/*
|
||||
;; src/libcharon/plugins/xauth_pam/xauth_pam_listener.[ch]
|
||||
license:expat
|
||||
;; src/inclue/sys/*
|
||||
license:bsd-3
|
||||
;; src/libstrongswan/plugins/sha3/sha3_keccak.c
|
||||
license:public-domain
|
||||
;; src/libstrongswan/plugins/pkcs11/pkcs11.h
|
||||
(license:non-copyleft
|
||||
"file://src/libstrongswan/plugins/pkcs11/pkcs11.h"
|
||||
"pkcs11 contains a unknown permissive license. View the specific
|
||||
file for more details.")
|
||||
;; These files are not included in the
|
||||
;; build, they are disabled through
|
||||
;; options to ./configure
|
||||
;;
|
||||
;; src/libstrongswan/plugins/blowfish/bf_enc.c
|
||||
;; src/libstrongswan/plugins/blowfish/bf_locl.h
|
||||
;; src/libstrongswan/plugins/blowfish/bf_pi.h
|
||||
;; src/libstrongswan/plugins/blowfish/bf_skey.c
|
||||
;; src/libstrongswan/plugins/blowfish/blowfish_crypter.c
|
||||
;; src/libstrongswan/plugins/des/des_crypter.c
|
||||
license:bsd-4))))
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
;;; Copyright © 2015 Cyril Roelandt <tipecaml@gmail.com>
|
||||
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017 Clément Lassieur <clement@lassieur.org>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -175,10 +176,10 @@ guidelines}.")
|
|||
(home-page "https://www.openstack.org/")
|
||||
(synopsis "Mock object framework for Python")
|
||||
(description
|
||||
"Mox3 is an unofficial port of the Google mox framework
|
||||
(http://code.google.com/p/pymox/) to Python 3. It was meant to be as compatible
|
||||
"Mox3 is an unofficial port of the @uref{https://code.google.com/p/pymox/,
|
||||
Google mox framework} to Python 3. It was meant to be as compatible
|
||||
with mox as possible, but small enhancements have been made. The library was
|
||||
tested on Python version 3.2, 2.7 and 2.6.")
|
||||
tested on Python versions 3.2, 2.7, and 2.6.")
|
||||
(license asl2.0)))
|
||||
|
||||
(define-public python2-mox3
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
Patch taken from the Debian package for python-axolotl-0.1.39.
|
||||
See <https://bugs.gnu.org/29415>.
|
||||
|
||||
Description: Removes IV paramenter from AES constructor, since it is not necessary for ctr mode.
|
||||
Author: Josue Ortega <josue@debian.org>
|
||||
Last-Update: 2017-04-13
|
||||
|
||||
--- a/axolotl/sessioncipher.py
|
||||
+++ b/axolotl/sessioncipher.py
|
||||
@@ -228,13 +228,7 @@
|
||||
# counterint = struct.unpack(">L", counterbytes)[0]
|
||||
# counterint = int.from_bytes(counterbytes, byteorder='big')
|
||||
ctr = Counter.new(128, initial_value=counter)
|
||||
-
|
||||
- # cipher = AES.new(key, AES.MODE_CTR, counter=ctr)
|
||||
- ivBytes = bytearray(16)
|
||||
- ByteUtil.intToByteArray(ivBytes, 0, counter)
|
||||
-
|
||||
- cipher = AES.new(key, AES.MODE_CTR, IV=bytes(ivBytes), counter=ctr)
|
||||
-
|
||||
+ cipher = AES.new(key, AES.MODE_CTR, counter=ctr)
|
||||
return cipher
|
||||
|
||||
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
https://bugzilla.samba.org/show_bug.cgi?id=13112
|
||||
https://git.samba.org/rsync.git/?p=rsync.git;a=patch;h=47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1
|
||||
|
||||
From 47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1 Mon Sep 17 00:00:00 2001
|
||||
From: Wayne Davison <wayned@samba.org>
|
||||
Date: Sun, 5 Nov 2017 11:33:15 -0800
|
||||
Subject: [PATCH] Enforce trailing \0 when receiving xattr name values. Fixes
|
||||
bug 13112.
|
||||
|
||||
---
|
||||
xattrs.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/xattrs.c b/xattrs.c
|
||||
index 68305d7..4867e6f 100644
|
||||
--- a/xattrs.c
|
||||
+++ b/xattrs.c
|
||||
@@ -824,6 +824,10 @@ void receive_xattr(int f, struct file_struct *file)
|
||||
out_of_memory("receive_xattr");
|
||||
name = ptr + dget_len + extra_len;
|
||||
read_buf(f, name, name_len);
|
||||
+ if (name_len < 1 || name[name_len-1] != '\0') {
|
||||
+ rprintf(FERROR, "Invalid xattr name received (missing trailing \\0).\n");
|
||||
+ exit_cleanup(RERR_FILEIO);
|
||||
+ }
|
||||
if (dget_len == datum_len)
|
||||
read_buf(f, ptr, dget_len);
|
||||
else {
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
https://git.samba.org/?p=rsync.git;a=patch;h=f5e8a17e093065fb20fea00a29540fe2c7896441
|
||||
minor edits were made to get the patch to apply
|
||||
|
||||
From f5e8a17e093065fb20fea00a29540fe2c7896441 Mon Sep 17 00:00:00 2001
|
||||
From: Wayne Davison <wayned@samba.org>
|
||||
Date: Sun, 3 Dec 2017 15:49:56 -0800
|
||||
Subject: [PATCH] Fix issue with earlier path-check (fixes "make check") and
|
||||
make a BOOL more explicit.
|
||||
|
||||
---
|
||||
checksum.c | 2 +-
|
||||
receiver.c | 10 +++++-----
|
||||
2 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/receiver.c b/receiver.c
|
||||
index 9c46242..75cb00d 100644
|
||||
--- a/receiver.c
|
||||
+++ b/receiver.c
|
||||
@@ -574,15 +574,15 @@ int recv_files(int f_in, int f_out, char *local_name)
|
||||
file = dir_flist->files[cur_flist->parent_ndx];
|
||||
fname = local_name ? local_name : f_name(file, fbuf);
|
||||
|
||||
- if (daemon_filter_list.head
|
||||
- && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
|
||||
+ if (DEBUG_GTE(RECV, 1))
|
||||
+ rprintf(FINFO, "recv_files(%s)\n", fname);
|
||||
+
|
||||
+ if (daemon_filter_list.head && (*fname != '.' || fname[1] != '\0')
|
||||
+ && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
|
||||
rprintf(FERROR, "attempt to hack rsync failed.\n");
|
||||
exit_cleanup(RERR_PROTOCOL);
|
||||
}
|
||||
|
||||
- if (DEBUG_GTE(RECV, 1))
|
||||
- rprintf(FINFO, "recv_files(%s)\n", fname);
|
||||
-
|
||||
#ifdef SUPPORT_XATTRS
|
||||
if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers
|
||||
&& !(want_xattr_optim && BITS_SET(iflags, ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE)))
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-17433
|
||||
https://git.samba.org/?p=rsync.git;a=patch;h=3e06d40029cfdce9d0f73d87cfd4edaf54be9c51
|
||||
|
||||
From 3e06d40029cfdce9d0f73d87cfd4edaf54be9c51 Mon Sep 17 00:00:00 2001
|
||||
From: Jeriko One <jeriko.one@gmx.us>
|
||||
Date: Thu, 2 Nov 2017 23:44:19 -0700
|
||||
Subject: [PATCH] Check fname in recv_files sooner.
|
||||
|
||||
---
|
||||
receiver.c | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/receiver.c b/receiver.c
|
||||
index baae3a9..9fdafa1 100644
|
||||
--- a/receiver.c
|
||||
+++ b/receiver.c
|
||||
@@ -574,6 +574,12 @@ int recv_files(int f_in, int f_out, char *local_name)
|
||||
file = dir_flist->files[cur_flist->parent_ndx];
|
||||
fname = local_name ? local_name : f_name(file, fbuf);
|
||||
|
||||
+ if (daemon_filter_list.head
|
||||
+ && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
|
||||
+ rprintf(FERROR, "attempt to hack rsync failed.\n");
|
||||
+ exit_cleanup(RERR_PROTOCOL);
|
||||
+ }
|
||||
+
|
||||
if (DEBUG_GTE(RECV, 1))
|
||||
rprintf(FINFO, "recv_files(%s)\n", fname);
|
||||
|
||||
@@ -645,12 +651,6 @@ int recv_files(int f_in, int f_out, char *local_name)
|
||||
|
||||
cleanup_got_literal = 0;
|
||||
|
||||
- if (daemon_filter_list.head
|
||||
- && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
|
||||
- rprintf(FERROR, "attempt to hack rsync failed.\n");
|
||||
- exit_cleanup(RERR_PROTOCOL);
|
||||
- }
|
||||
-
|
||||
if (read_batch) {
|
||||
int wanted = redoing
|
||||
? we_want_redo(ndx)
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-17434
|
||||
https://git.samba.org/?p=rsync.git;a=patch;h=5509597decdbd7b91994210f700329d8a35e70a1
|
||||
|
||||
From 5509597decdbd7b91994210f700329d8a35e70a1 Mon Sep 17 00:00:00 2001
|
||||
From: Jeriko One <jeriko.one@gmx.us>
|
||||
Date: Thu, 16 Nov 2017 17:26:03 -0800
|
||||
Subject: [PATCH] Check daemon filter against fnamecmp in recv_files().
|
||||
|
||||
---
|
||||
receiver.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/receiver.c b/receiver.c
|
||||
index 9fdafa1..9c46242 100644
|
||||
--- a/receiver.c
|
||||
+++ b/receiver.c
|
||||
@@ -722,7 +722,7 @@ int recv_files(int f_in, int f_out, char *local_name)
|
||||
break;
|
||||
}
|
||||
if (!fnamecmp || (daemon_filter_list.head
|
||||
- && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0)) {
|
||||
+ && check_filter(&daemon_filter_list, FLOG, fnamecmp, 0) < 0)) {
|
||||
fnamecmp = fname;
|
||||
fnamecmp_type = FNAMECMP_FNAME;
|
||||
}
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-17434
|
||||
https://git.samba.org/?p=rsync.git;a=patch;h=70aeb5fddd1b2f8e143276f8d5a085db16c593b9
|
||||
|
||||
From 70aeb5fddd1b2f8e143276f8d5a085db16c593b9 Mon Sep 17 00:00:00 2001
|
||||
From: Jeriko One <jeriko.one@gmx.us>
|
||||
Date: Thu, 16 Nov 2017 17:05:42 -0800
|
||||
Subject: [PATCH] Sanitize xname in read_ndx_and_attrs.
|
||||
|
||||
---
|
||||
rsync.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/rsync.c b/rsync.c
|
||||
index b82e598..a0945ba 100644
|
||||
--- a/rsync.c
|
||||
+++ b/rsync.c
|
||||
@@ -49,6 +49,7 @@ extern int flist_eof;
|
||||
extern int file_old_total;
|
||||
extern int keep_dirlinks;
|
||||
extern int make_backups;
|
||||
+extern int sanitize_paths;
|
||||
extern struct file_list *cur_flist, *first_flist, *dir_flist;
|
||||
extern struct chmod_mode_struct *daemon_chmod_modes;
|
||||
#ifdef ICONV_OPTION
|
||||
@@ -396,6 +397,11 @@ int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr, uchar *type_ptr,
|
||||
if (iflags & ITEM_XNAME_FOLLOWS) {
|
||||
if ((len = read_vstring(f_in, buf, MAXPATHLEN)) < 0)
|
||||
exit_cleanup(RERR_PROTOCOL);
|
||||
+
|
||||
+ if (sanitize_paths) {
|
||||
+ sanitize_path(buf, buf, "", 0, SP_DEFAULT);
|
||||
+ len = strlen(buf);
|
||||
+ }
|
||||
} else {
|
||||
*buf = '\0';
|
||||
len = -1;
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
|
@ -1,302 +0,0 @@
|
|||
Fix a weakness that allows remote code execution via the Transmission
|
||||
RPC server using DNS rebinding:
|
||||
|
||||
https://bugs.chromium.org/p/project-zero/issues/detail?id=1447
|
||||
|
||||
Patch adapted from Tavis Ormandy's patch on the Transmission master
|
||||
branch to the Transmission 2.92 release by Leo Famulari
|
||||
<leo@famulari.name>:
|
||||
|
||||
https://github.com/transmission/transmission/pull/468/commits
|
||||
|
||||
From fe2d3c6e75088f3d9b6040ce06da3d530358bc2f Mon Sep 17 00:00:00 2001
|
||||
From: Tavis Ormandy <taviso@google.com>
|
||||
Date: Thu, 11 Jan 2018 10:00:41 -0800
|
||||
Subject: [PATCH] mitigate dns rebinding attacks against daemon
|
||||
|
||||
---
|
||||
libtransmission/quark.c | 2 +
|
||||
libtransmission/quark.h | 2 +
|
||||
libtransmission/rpc-server.c | 116 +++++++++++++++++++++++++++++++++++++----
|
||||
libtransmission/rpc-server.h | 4 ++
|
||||
libtransmission/session.c | 2 +
|
||||
libtransmission/transmission.h | 1 +
|
||||
libtransmission/web.c | 3 ++
|
||||
7 files changed, 121 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/libtransmission/quark.c b/libtransmission/quark.c
|
||||
index 30cc2bca4..b4fd7aabd 100644
|
||||
--- a/libtransmission/quark.c
|
||||
+++ b/libtransmission/quark.c
|
||||
@@ -289,6 +289,8 @@ static const struct tr_key_struct my_static[] =
|
||||
{ "rpc-authentication-required", 27 },
|
||||
{ "rpc-bind-address", 16 },
|
||||
{ "rpc-enabled", 11 },
|
||||
+ { "rpc-host-whitelist", 18 },
|
||||
+ { "rpc-host-whitelist-enabled", 26 },
|
||||
{ "rpc-password", 12 },
|
||||
{ "rpc-port", 8 },
|
||||
{ "rpc-url", 7 },
|
||||
diff --git a/libtransmission/quark.h b/libtransmission/quark.h
|
||||
index 7f5212733..17464be8f 100644
|
||||
--- a/libtransmission/quark.h
|
||||
+++ b/libtransmission/quark.h
|
||||
@@ -291,6 +291,8 @@ enum
|
||||
TR_KEY_rpc_authentication_required,
|
||||
TR_KEY_rpc_bind_address,
|
||||
TR_KEY_rpc_enabled,
|
||||
+ TR_KEY_rpc_host_whitelist,
|
||||
+ TR_KEY_rpc_host_whitelist_enabled,
|
||||
TR_KEY_rpc_password,
|
||||
TR_KEY_rpc_port,
|
||||
TR_KEY_rpc_url,
|
||||
diff --git a/libtransmission/rpc-server.c b/libtransmission/rpc-server.c
|
||||
index a3485f3fa..292cd5fce 100644
|
||||
--- a/libtransmission/rpc-server.c
|
||||
+++ b/libtransmission/rpc-server.c
|
||||
@@ -52,6 +52,7 @@ struct tr_rpc_server
|
||||
bool isEnabled;
|
||||
bool isPasswordEnabled;
|
||||
bool isWhitelistEnabled;
|
||||
+ bool isHostWhitelistEnabled;
|
||||
tr_port port;
|
||||
char * url;
|
||||
struct in_addr bindAddress;
|
||||
@@ -63,6 +64,7 @@ struct tr_rpc_server
|
||||
char * password;
|
||||
char * whitelistStr;
|
||||
tr_list * whitelist;
|
||||
+ tr_list * hostWhitelist;
|
||||
|
||||
char * sessionId;
|
||||
time_t sessionIdExpiresAt;
|
||||
@@ -588,6 +590,49 @@ isAddressAllowed (const tr_rpc_server * server, const char * address)
|
||||
return false;
|
||||
}
|
||||
|
||||
+static bool isHostnameAllowed(tr_rpc_server const* server, struct evhttp_request* req)
|
||||
+{
|
||||
+ /* If password auth is enabled, any hostname is permitted. */
|
||||
+ if (server->isPasswordEnabled)
|
||||
+ {
|
||||
+ return true;
|
||||
+ }
|
||||
+
|
||||
+ char const* const host = evhttp_find_header(req->input_headers, "Host");
|
||||
+
|
||||
+ // If whitelist is disabled, no restrictions.
|
||||
+ if (!server->isHostWhitelistEnabled)
|
||||
+ return true;
|
||||
+
|
||||
+ /* No host header, invalid request. */
|
||||
+ if (host == NULL)
|
||||
+ {
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
+ /* Host header might include the port. */
|
||||
+ char* const hostname = tr_strndup(host, strcspn(host, ":"));
|
||||
+
|
||||
+ /* localhost or ipaddress is always acceptable. */
|
||||
+ if (strcmp(hostname, "localhost") == 0 || strcmp(hostname, "localhost.") == 0 || tr_addressIsIP(hostname))
|
||||
+ {
|
||||
+ tr_free(hostname);
|
||||
+ return true;
|
||||
+ }
|
||||
+
|
||||
+ /* Otherwise, hostname must be whitelisted. */
|
||||
+ for (tr_list* l = server->hostWhitelist; l != NULL; l = l->next) {
|
||||
+ if (tr_wildmat(hostname, l->data))
|
||||
+ {
|
||||
+ tr_free(hostname);
|
||||
+ return true;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ tr_free(hostname);
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
static bool
|
||||
test_session_id (struct tr_rpc_server * server, struct evhttp_request * req)
|
||||
{
|
||||
@@ -663,6 +708,23 @@ handle_request (struct evhttp_request * req, void * arg)
|
||||
handle_upload (req, server);
|
||||
}
|
||||
#ifdef REQUIRE_SESSION_ID
|
||||
+ else if (!isHostnameAllowed(server, req))
|
||||
+ {
|
||||
+ char* tmp = tr_strdup_printf(
|
||||
+ "<p>Transmission received your request, but the hostname was unrecognized.</p>"
|
||||
+ "<p>To fix this, choose one of the following options:"
|
||||
+ "<ul>"
|
||||
+ "<li>Enable password authentication, then any hostname is allowed.</li>"
|
||||
+ "<li>Add the hostname you want to use to the whitelist in settings.</li>"
|
||||
+ "</ul></p>"
|
||||
+ "<p>If you're editing settings.json, see the 'rpc-host-whitelist' and 'rpc-host-whitelist-enabled' entries.</p>"
|
||||
+ "<p>This requirement has been added to help prevent "
|
||||
+ "<a href=\"https://en.wikipedia.org/wiki/DNS_rebinding\">DNS Rebinding</a> "
|
||||
+ "attacks.</p>");
|
||||
+ send_simple_response(req, 421, tmp);
|
||||
+ tr_free(tmp);
|
||||
+ }
|
||||
+
|
||||
else if (!test_session_id (server, req))
|
||||
{
|
||||
const char * sessionId = get_current_session_id (server);
|
||||
@@ -674,7 +736,7 @@ handle_request (struct evhttp_request * req, void * arg)
|
||||
"<li> When you get this 409 error message, resend your request with the updated header"
|
||||
"</ol></p>"
|
||||
"<p>This requirement has been added to help prevent "
|
||||
- "<a href=\"http://en.wikipedia.org/wiki/Cross-site_request_forgery\">CSRF</a> "
|
||||
+ "<a href=\"https://en.wikipedia.org/wiki/Cross-site_request_forgery\">CSRF</a> "
|
||||
"attacks.</p>"
|
||||
"<p><code>%s: %s</code></p>",
|
||||
TR_RPC_SESSION_ID_HEADER, sessionId);
|
||||
@@ -875,19 +937,14 @@ tr_rpcGetUrl (const tr_rpc_server * server)
|
||||
return server->url ? server->url : "";
|
||||
}
|
||||
|
||||
-void
|
||||
-tr_rpcSetWhitelist (tr_rpc_server * server, const char * whitelistStr)
|
||||
+static void
|
||||
+tr_rpcSetList (char const* whitelistStr, tr_list** list)
|
||||
{
|
||||
void * tmp;
|
||||
const char * walk;
|
||||
|
||||
- /* keep the string */
|
||||
- tmp = server->whitelistStr;
|
||||
- server->whitelistStr = tr_strdup (whitelistStr);
|
||||
- tr_free (tmp);
|
||||
-
|
||||
/* clear out the old whitelist entries */
|
||||
- while ((tmp = tr_list_pop_front (&server->whitelist)))
|
||||
+ while ((tmp = tr_list_pop_front (list)) != NULL)
|
||||
tr_free (tmp);
|
||||
|
||||
/* build the new whitelist entries */
|
||||
@@ -896,7 +953,7 @@ tr_rpcSetWhitelist (tr_rpc_server * server, const char * whitelistStr)
|
||||
const char * delimiters = " ,;";
|
||||
const size_t len = strcspn (walk, delimiters);
|
||||
char * token = tr_strndup (walk, len);
|
||||
- tr_list_append (&server->whitelist, token);
|
||||
+ tr_list_append (list, token);
|
||||
if (strcspn (token, "+-") < len)
|
||||
tr_logAddNamedInfo (MY_NAME, "Adding address to whitelist: %s (And it has a '+' or '-'! Are you using an old ACL by mistake?)", token);
|
||||
else
|
||||
@@ -909,6 +966,21 @@ tr_rpcSetWhitelist (tr_rpc_server * server, const char * whitelistStr)
|
||||
}
|
||||
}
|
||||
|
||||
+void tr_rpcSetHostWhitelist(tr_rpc_server* server, char const* whitelistStr)
|
||||
+{
|
||||
+ tr_rpcSetList(whitelistStr, &server->hostWhitelist);
|
||||
+}
|
||||
+
|
||||
+void tr_rpcSetWhitelist(tr_rpc_server* server, char const* whitelistStr)
|
||||
+{
|
||||
+ /* keep the string */
|
||||
+ char* const tmp = server->whitelistStr;
|
||||
+ server->whitelistStr = tr_strdup(whitelistStr);
|
||||
+ tr_free(tmp);
|
||||
+
|
||||
+ tr_rpcSetList(whitelistStr, &server->whitelist);
|
||||
+}
|
||||
+
|
||||
const char*
|
||||
tr_rpcGetWhitelist (const tr_rpc_server * server)
|
||||
{
|
||||
@@ -930,6 +1002,11 @@ tr_rpcGetWhitelistEnabled (const tr_rpc_server * server)
|
||||
return server->isWhitelistEnabled;
|
||||
}
|
||||
|
||||
+void tr_rpcSetHostWhitelistEnabled(tr_rpc_server* server, bool isEnabled)
|
||||
+{
|
||||
+ server->isHostWhitelistEnabled = isEnabled;
|
||||
+}
|
||||
+
|
||||
/****
|
||||
***** PASSWORD
|
||||
****/
|
||||
@@ -1063,6 +1140,28 @@ tr_rpcInit (tr_session * session, tr_variant * settings)
|
||||
else
|
||||
tr_rpcSetWhitelistEnabled (s, boolVal);
|
||||
|
||||
+ key = TR_KEY_rpc_host_whitelist_enabled;
|
||||
+
|
||||
+ if (!tr_variantDictFindBool(settings, key, &boolVal))
|
||||
+ {
|
||||
+ missing_settings_key(key);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ tr_rpcSetHostWhitelistEnabled(s, boolVal);
|
||||
+ }
|
||||
+
|
||||
+ key = TR_KEY_rpc_host_whitelist;
|
||||
+
|
||||
+ if (!tr_variantDictFindStr(settings, key, &str, NULL) && str != NULL)
|
||||
+ {
|
||||
+ missing_settings_key(key);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ tr_rpcSetHostWhitelist(s, str);
|
||||
+ }
|
||||
+
|
||||
key = TR_KEY_rpc_authentication_required;
|
||||
if (!tr_variantDictFindBool (settings, key, &boolVal))
|
||||
missing_settings_key (key);
|
||||
diff --git a/libtransmission/rpc-server.h b/libtransmission/rpc-server.h
|
||||
index e0302c5ea..8c9e6b24e 100644
|
||||
--- a/libtransmission/rpc-server.h
|
||||
+++ b/libtransmission/rpc-server.h
|
||||
@@ -49,6 +49,10 @@ void tr_rpcSetWhitelist (tr_rpc_server * server,
|
||||
|
||||
const char* tr_rpcGetWhitelist (const tr_rpc_server * server);
|
||||
|
||||
+void tr_rpcSetHostWhitelistEnabled(tr_rpc_server* server, bool isEnabled);
|
||||
+
|
||||
+void tr_rpcSetHostWhitelist(tr_rpc_server* server, char const* whitelist);
|
||||
+
|
||||
void tr_rpcSetPassword (tr_rpc_server * server,
|
||||
const char * password);
|
||||
|
||||
diff --git a/libtransmission/session.c b/libtransmission/session.c
|
||||
index 844cadba8..58b717913 100644
|
||||
--- a/libtransmission/session.c
|
||||
+++ b/libtransmission/session.c
|
||||
@@ -359,6 +359,8 @@ tr_sessionGetDefaultSettings (tr_variant * d)
|
||||
tr_variantDictAddStr (d, TR_KEY_rpc_username, "");
|
||||
tr_variantDictAddStr (d, TR_KEY_rpc_whitelist, TR_DEFAULT_RPC_WHITELIST);
|
||||
tr_variantDictAddBool (d, TR_KEY_rpc_whitelist_enabled, true);
|
||||
+ tr_variantDictAddStr(d, TR_KEY_rpc_host_whitelist, TR_DEFAULT_RPC_HOST_WHITELIST);
|
||||
+ tr_variantDictAddBool(d, TR_KEY_rpc_host_whitelist_enabled, true);
|
||||
tr_variantDictAddInt (d, TR_KEY_rpc_port, atoi (TR_DEFAULT_RPC_PORT_STR));
|
||||
tr_variantDictAddStr (d, TR_KEY_rpc_url, TR_DEFAULT_RPC_URL_STR);
|
||||
tr_variantDictAddBool (d, TR_KEY_scrape_paused_torrents_enabled, true);
|
||||
diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h
|
||||
index 4f76adfd6..e213a8f4e 100644
|
||||
--- a/libtransmission/transmission.h
|
||||
+++ b/libtransmission/transmission.h
|
||||
@@ -123,6 +123,7 @@ const char* tr_getDefaultDownloadDir (void);
|
||||
#define TR_DEFAULT_BIND_ADDRESS_IPV4 "0.0.0.0"
|
||||
#define TR_DEFAULT_BIND_ADDRESS_IPV6 "::"
|
||||
#define TR_DEFAULT_RPC_WHITELIST "127.0.0.1"
|
||||
+#define TR_DEFAULT_RPC_HOST_WHITELIST ""
|
||||
#define TR_DEFAULT_RPC_PORT_STR "9091"
|
||||
#define TR_DEFAULT_RPC_URL_STR "/transmission/"
|
||||
#define TR_DEFAULT_PEER_PORT_STR "51413"
|
||||
diff --git a/libtransmission/web.c b/libtransmission/web.c
|
||||
index ee495e9fc..c7f062730 100644
|
||||
--- a/libtransmission/web.c
|
||||
+++ b/libtransmission/web.c
|
||||
@@ -594,6 +594,7 @@ tr_webGetResponseStr (long code)
|
||||
case 415: return "Unsupported Media Type";
|
||||
case 416: return "Requested Range Not Satisfiable";
|
||||
case 417: return "Expectation Failed";
|
||||
+ case 421: return "Misdirected Request";
|
||||
case 500: return "Internal Server Error";
|
||||
case 501: return "Not Implemented";
|
||||
case 502: return "Bad Gateway";
|
||||
|
|
@ -67,14 +67,14 @@
|
|||
(define-public libraw
|
||||
(package
|
||||
(name "libraw")
|
||||
(version "0.18.6")
|
||||
(version "0.18.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.libraw.org/data/LibRaw-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0fx5mwkg0rx37qgxnajc8g8i0mhc6822100ljay5g94aap5arf75"))))
|
||||
"0wap67mb03fl2himbs20yncnnrr71mszsfm2v4spks58c714gqw7"))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "https://www.libraw.org")
|
||||
(synopsis "Raw image decoder")
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
(define-public php
|
||||
(package
|
||||
(name "php")
|
||||
(version "7.1.12")
|
||||
(version "7.2.1")
|
||||
(home-page "https://secure.php.net/")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1czflr5wb2f7pmgdc1vxy1kcln5rlkkly2z3skrb2wa5fx88h4d0"))
|
||||
"08l8zmp8wbavq6wlgx19irz59csb44jhbsr172bfsq36v8pzhv3c"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(with-directory-excursion "ext"
|
||||
|
|
@ -271,12 +271,25 @@
|
|||
;; ("ISO-8859-1"=>"UTF-8") unknown error.
|
||||
"ext/standard/tests/file/bug43008.phpt"
|
||||
;; Table data not created in sqlite(?).
|
||||
"ext/pdo_sqlite/tests/bug_42589.phpt"))
|
||||
"ext/pdo_sqlite/tests/bug_42589.phpt"
|
||||
|
||||
;; Small variation in output.
|
||||
"ext/mbstring/tests/mb_ereg_variation3.phpt"
|
||||
"ext/mbstring/tests/mb_ereg_replace_variation1.phpt"
|
||||
"ext/mbstring/tests/bug72994.phpt"
|
||||
"ext/ldap/tests/ldap_set_option_error.phpt"
|
||||
|
||||
;; XXX: This is CVE-2018-5711. There is no fix yet in libgd.
|
||||
;; See https://github.com/libgd/libgd/issues/420
|
||||
"ext/gd/tests/bug75571.phpt"))
|
||||
|
||||
;; Skip tests requiring network access.
|
||||
(setenv "SKIP_ONLINE_TESTS" "1")
|
||||
;; Without this variable, 'make test' passes regardless of failures.
|
||||
(setenv "REPORT_EXIT_STATUS" "1")
|
||||
;; Skip tests requiring I/O facilities that are unavailable in the
|
||||
;; build environment
|
||||
(setenv "SKIP_IO_CAPTURE_TESTS" "1")
|
||||
#t)))
|
||||
#:test-target "test"))
|
||||
(inputs
|
||||
|
|
|
|||
|
|
@ -450,7 +450,7 @@ python-axolotl.")
|
|||
(define-public python-axolotl
|
||||
(package
|
||||
(name "python-axolotl")
|
||||
(version "0.1.35")
|
||||
(version "0.1.39")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -458,8 +458,9 @@ python-axolotl.")
|
|||
"https://github.com/tgalal/python-axolotl/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(patches (search-patches "python-axolotl-AES-fix.patch"))
|
||||
(sha256
|
||||
(base32 "1z8d89p7v40p4bwywjm9h4z28fdvra79ddw06azlkrfjbl7dxmz8"))))
|
||||
(base32 "0badsgkgz0ir3hqynxzsfjgacppi874syvvmgccc6j164053x6zm"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
|||
|
|
@ -822,15 +822,15 @@ Python 3 support.")
|
|||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://bitbucket.org/emptypage/uniseg-python/"
|
||||
"get/rel-" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(uri (pypi-uri "uniseg" version ".zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"1df4gddnj2a0v8z35wb2ra5vvh1f1qyxs8fgd25c8g64031mna6x"))))
|
||||
"05jsazvz6nbmh6l3v1rph5ydkqn1hzx1pyggdyvgp2qgmgrnmiz2"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f)) ; The test suite requires network access.
|
||||
(native-inputs
|
||||
`(("unzip" ,unzip)))
|
||||
(home-page
|
||||
"https://bitbucket.org/emptypage/uniseg-python")
|
||||
(synopsis
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
(define-public re2
|
||||
(package
|
||||
(name "re2")
|
||||
(version "2018-01-01")
|
||||
(version "2018-02-01")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1hhp8gi0lzw1mvnksb112rc9kcz4j9kjic7v6gbgzyfgk43996mr"))))
|
||||
"1131hwgid76la15hh2g15gj20fzz8iq3krniwks6wxn9h4q87ay8"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:modules ((guix build gnu-build-system)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,126 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;;
|
||||
;;; 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 robotics)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (gnu packages avahi)
|
||||
#:use-module (gnu packages cpp)
|
||||
#:use-module (gnu packages gl)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages protobuf)
|
||||
#:use-module (gnu packages qt)
|
||||
#:use-module (gnu packages sdl)
|
||||
#:use-module (gnu packages valgrind)
|
||||
#:use-module (gnu packages xml))
|
||||
|
||||
(define-public enki
|
||||
;; Previous versions use Qt4 and are unsuitable for Aseba.
|
||||
(let ((commit "afd2d8e2f91c095f6745505ca1f32f31ea874200")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "enki")
|
||||
(version (git-version "2.0pre" revision commit))
|
||||
(home-page "https://github.com/enki-community/enki/")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference (url home-page) (commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"1d1901zzsfml97hb4mb3ah3ab1bk4kh7bn6m7xrj1rv0gk9wkhq7"))
|
||||
(file-name (string-append name "-" version "-checkout"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
;; Optionally, add Python + Boost for Python bindings.
|
||||
`(("sdl2" ,sdl2)))
|
||||
(propagated-inputs
|
||||
;; 'Viewer.h' includes 'QGLWidget'.
|
||||
`(("qtbase" ,qtbase) ;the viewer module needs Qt5 + MESA
|
||||
("mesa" ,mesa)))
|
||||
(synopsis "Robot simulator")
|
||||
(description
|
||||
"Enki is a robot simulator written in C++. It provides collision and
|
||||
limited physics support for robots evolving on a flat surface. On a
|
||||
contemporary desktop computer, Enki is able to simulate groups of robots
|
||||
hundred times faster than real-time.")
|
||||
|
||||
;; The 'LICENSE' file as well as source file headers says that
|
||||
;; researchers using the software are "asked" to cite using a given
|
||||
;; citation, but that sentence is written as not being part of the
|
||||
;; license (fortunately).
|
||||
(license license:gpl2+))))
|
||||
|
||||
(define-public aseba
|
||||
;; Use the commit that allows us to build with Qt5.
|
||||
(let ((commit "3b35de80d5fdd47592b1c01d57e1f4ef37c5e5ea")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "aseba")
|
||||
(version (git-version "1.6.0" revision commit))
|
||||
(home-page "https://github.com/aseba-community/aseba")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference (url home-page) (commit commit)
|
||||
(recursive? #t))) ;for Blockly
|
||||
(sha256
|
||||
(base32
|
||||
"0j31lmc9f0ksvkh0md2fgsz92hcsrwnrqqcynamizs2ah8iwlqi5"))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Add missing Qt5::Network.
|
||||
'(substitute* "targets/playground/CMakeLists.txt"
|
||||
(("target_link_libraries(.*)\\$\\{EXTRA_LIBS\\}" _ middle)
|
||||
(string-append "target_link_libraries" middle
|
||||
" Qt5::Network ${EXTRA_LIBS}"))))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("valgrind" ,valgrind))) ;for tests
|
||||
(inputs
|
||||
`(("dashel" ,dashel)
|
||||
("enki" ,enki)
|
||||
("protobuf" ,protobuf) ;for logging
|
||||
("qtbase" ,qtbase)
|
||||
("qtsvg" ,qtsvg)
|
||||
("qttools" ,qttools) ;for libQt5Help, needed by "studio"
|
||||
("qtwebkit" ,qtwebkit)
|
||||
("qtx11extras" ,qtx11extras)
|
||||
("eudev" ,eudev)
|
||||
("libxml2" ,libxml2)
|
||||
("sdl2" ,sdl2)
|
||||
("avahi" ,avahi))) ;XXX: we need the libdnssd compat layer
|
||||
(synopsis "Event-based robot programming tools")
|
||||
(description
|
||||
"Aseba means @dfn{actuator and sensor event-based architecture}.
|
||||
It is a set of tools which allow beginners to program robots easily and
|
||||
efficiently. It includes robot simulators, a programming language, and a
|
||||
visual programming language (VPL) that is notably used together with the
|
||||
Thymio educational robot.")
|
||||
|
||||
;; Source file headers say "version 3.0" without "or any later version".
|
||||
(license license:lgpl3))))
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
;;; Copyright © 2012, 2013 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -32,22 +33,14 @@
|
|||
(define-public rsync
|
||||
(package
|
||||
(name "rsync")
|
||||
(version "3.1.2")
|
||||
(version "3.1.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://rsync.samba.org/ftp/rsync/src/rsync-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1hm1q04hz15509f0p9bflw4d6jzfvpm1d36dxjwihk1wzakn5ypc"))
|
||||
(patches (search-patches "rsync-CVE-2017-16548.patch"
|
||||
"rsync-CVE-2017-17433.patch"
|
||||
"rsync-CVE-2017-17433-fix-tests.patch"
|
||||
"rsync-CVE-2017-17434-pt1.patch"
|
||||
"rsync-CVE-2017-17434-pt2.patch"
|
||||
))
|
||||
))
|
||||
(properties `((lint-hidden-cve . ("CVE-2017-15994")))) ; introduced after 3.1.2
|
||||
"1h0011dj6jgqpgribir4anljjv7bbrdcs8g91pbsmzf5zr75bk2m"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("perl" ,perl)
|
||||
("acl" ,acl)))
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
|
||||
;;; Copyright © 2017 Nikolai Merinov <nikolai.merinov@member.fsf.org>
|
||||
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -89,7 +90,8 @@
|
|||
|
||||
(define* (cargo-version rustc-version #:optional (patch 0))
|
||||
;; Computes the cargo version that matches the rustc version.
|
||||
;; https://github.com/rust-lang/cargo#Releases
|
||||
;; This has so far continued to follow a predictable pattern:
|
||||
;; https://github.com/rust-lang/cargo/blob/50a46f47/README.md#releases
|
||||
(increment-rust-version rustc-version 0 patch))
|
||||
|
||||
(define* (rustc-version bootstrap-version #:optional (patch 0))
|
||||
|
|
|
|||
|
|
@ -303,14 +303,14 @@ destructors. It is the core memory allocator used in Samba.")
|
|||
(define-public tevent
|
||||
(package
|
||||
(name "tevent")
|
||||
(version "0.9.34")
|
||||
(version "0.9.35")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.samba.org/ftp/tevent/tevent-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"12kvfjs0dwi4iqbz740a37z0c7kmg8bhl53mwdj02jkznbw3w8bk"))))
|
||||
"1s8nbkmqz8dzdlsd6qynhvyl05pw93r151f3i2kgjfpbck9ak8r5"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
|
@ -338,14 +338,14 @@ many event types, including timers, signals, and the classic file descriptor eve
|
|||
(define-public ldb
|
||||
(package
|
||||
(name "ldb")
|
||||
(version "1.3.0")
|
||||
(version "1.3.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.samba.org/ftp/ldb/ldb-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"03arsnsbkxb2d811pbarb7d12yg8g05f1q576z48sp647dd3xda4"))))
|
||||
"1lnbcazm1kqqcc7syy0xbq9srhbylkqhpsmsbsm4c3xfangjr7xi"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
|
|
|||
|
|
@ -73,7 +73,14 @@
|
|||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(add-after 'unpack 'enter-dir
|
||||
(lambda _ (chdir ,name) #t)))))
|
||||
(lambda _ (chdir ,name) #t))
|
||||
(add-after 'enter-dir 'portability
|
||||
(lambda _
|
||||
(substitute* "src/ibpkeys.c"
|
||||
(("#include \"ibpkey_internal.h\"" line)
|
||||
(string-append line "\n#include <inttypes.h>\n"))
|
||||
(("%#lx") "%#\" PRIx64 \""))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("flex" ,flex)))
|
||||
(home-page "https://selinuxproject.org/")
|
||||
|
|
@ -101,6 +108,7 @@ boolean settings).")
|
|||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(delete 'portability)
|
||||
(add-after 'unpack 'enter-dir
|
||||
(lambda _ (chdir ,name) #t)))))
|
||||
(inputs
|
||||
|
|
@ -136,6 +144,7 @@ module into a binary representation.")
|
|||
,flags))
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(delete 'portability)
|
||||
(replace 'enter-dir
|
||||
(lambda _ (chdir ,name) #t))
|
||||
(add-after 'enter-dir 'remove-Werror
|
||||
|
|
@ -187,6 +196,7 @@ the core SELinux management utilities.")
|
|||
,flags))
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(delete 'portability)
|
||||
(replace 'enter-dir
|
||||
(lambda _ (chdir ,name) #t))
|
||||
(add-after 'build 'pywrap
|
||||
|
|
@ -228,6 +238,7 @@ binary policies.")
|
|||
,flags)))
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(delete 'portability)
|
||||
(replace 'enter-dir
|
||||
(lambda _ (chdir ,name) #t))))))
|
||||
(inputs
|
||||
|
|
@ -250,6 +261,7 @@ binary policies.")
|
|||
,@(substitute-keyword-arguments (package-arguments libsepol)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(delete 'portability)
|
||||
(replace 'enter-dir
|
||||
(lambda _ (chdir "python/sepolgen") #t))
|
||||
;; By default all Python files would be installed to
|
||||
|
|
@ -310,6 +322,7 @@ based on required access.")
|
|||
`(#:tests? #f ; the test target causes a rebuild
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'portability)
|
||||
(add-after 'unpack 'set-SEPOL-variable
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(setenv "SEPOL"
|
||||
|
|
@ -372,6 +385,7 @@ tools, and libraries designed to facilitate SELinux policy analysis.")
|
|||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(delete 'portability)
|
||||
(add-after 'unpack 'enter-dir
|
||||
(lambda _ (chdir ,name) #t))
|
||||
(add-after 'enter-dir 'ignore-/usr-tests
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@
|
|||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system glib-or-gtk)
|
||||
#:use-module (guix build-system go)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
|
|
@ -52,6 +53,7 @@
|
|||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages python-web)
|
||||
#:use-module (gnu packages qt)
|
||||
#:use-module (gnu packages textutils)
|
||||
#:use-module (gnu packages wm)
|
||||
#:use-module (gnu packages xdisorg)
|
||||
#:use-module (gnu packages xml)
|
||||
|
|
@ -572,3 +574,96 @@ eye-candy, customizable, and reasonably lightweight.")
|
|||
It's a terminal emulator with few dependencies, so you don't need a full GNOME
|
||||
desktop installed to have a decent terminal emulator.")
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public go-github.com-nsf-termbox-go
|
||||
(let ((commit "4ed959e0540971545eddb8c75514973d670cf739")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "go-github.com-nsf-termbox-go")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/nsf/termbox-go.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1vx64i1mg660if3wwm81p4b7lzxfb3qbr39i7misdyld3fc486p9"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "github.com/nsf/termbox-go"))
|
||||
(propagated-inputs
|
||||
`(("go-github.com-mattn-go-runewidth"
|
||||
,go-github.com-mattn-go-runewidth)))
|
||||
(synopsis "@code{termbox} provides a minimal API for text-based user
|
||||
interfaces")
|
||||
(description
|
||||
"Termbox is a library that provides a minimalistic API which allows the
|
||||
programmer to write text-based user interfaces.")
|
||||
(home-page "https://github.com/nsf/termbox-go")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public go-golang.org-x-crypto-ssh-terminal
|
||||
(let ((commit "c78caca803c95773f48a844d3dcab04b9bc4d6dd")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "go-golang.org-x-crypto-ssh-terminal")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://go.googlesource.com/crypto")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0vxlfxr9y681yn2cfh6dbqmq35vvq4f45ay0mm31ffkny9cms0y4"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "golang.org/x/crypto/ssh/terminal"
|
||||
#:unpack-path "golang.org/x/crypto"
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'reset-gzip-timestamps 'make-gzip-archive-writable
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(map (lambda (file)
|
||||
(make-file-writable file))
|
||||
(find-files
|
||||
(string-append (assoc-ref outputs "out")
|
||||
"/src/golang.org/x/crypto/ed25519/testdata")
|
||||
".*\\.gz$"))
|
||||
#t)))))
|
||||
(synopsis "Support functions for dealing with terminals in Go")
|
||||
(description "@code{terminal} provides support functions for dealing
|
||||
with terminals in Go.")
|
||||
(home-page "https://go.googlesource.com/crypto/")
|
||||
(license license:bsd-3))))
|
||||
|
||||
(define-public go-github.com-howeyc-gopass
|
||||
(let ((commit "bf9dde6d0d2c004a008c27aaee91170c786f6db8")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "go-github.com-howeyc-gopass")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/howeyc/gopass.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "github.com/howeyc/gopass"))
|
||||
(propagated-inputs
|
||||
`(("go-golang.org-x-crypto-ssh-terminal"
|
||||
,go-golang.org-x-crypto-ssh-terminal)))
|
||||
(synopsis "Retrieve password from a terminal or piped input in Go")
|
||||
(description
|
||||
"@code{gopass} is a Go package for retrieving a password from user
|
||||
terminal or piped input.")
|
||||
(home-page "https://github.com/howeyc/gopass")
|
||||
(license license:isc))))
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@
|
|||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system ant)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system go)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (gnu packages)
|
||||
|
|
@ -660,3 +661,26 @@ source code.")
|
|||
"This library simply implements Levenshtein distance algorithm with C++
|
||||
and Cython.")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public go-github.com-mattn-go-runewidth
|
||||
(package
|
||||
(name "go-github.com-mattn-go-runewidth")
|
||||
(version "0.0.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mattn/go-runewidth")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "github.com/mattn/go-runewidth"))
|
||||
(synopsis "@code{runewidth} provides Go functions to work with string widths")
|
||||
(description
|
||||
"The @code{runewidth} library provides Go functions for padding,
|
||||
measuring and checking the width of strings, with support east asian text.")
|
||||
(home-page "https://github.com/jessevdk/go-flags")
|
||||
(license license:expat)))
|
||||
|
|
|
|||
|
|
@ -503,13 +503,13 @@ netcat implementation that supports TLS.")
|
|||
(package
|
||||
(name "python-acme")
|
||||
;; Remember to update the hash of certbot when updating python-acme.
|
||||
(version "0.21.0")
|
||||
(version "0.21.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "acme" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0kalcz8xc0z8azh3v3a8h27clwy4wh5lx6w8zac1rchbghkawknn"))))
|
||||
"02x6f37ddldaxrxzh2wjw8wmzqchxb7gl5i4i4daysas9yzqlvi9"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
@ -558,7 +558,7 @@ netcat implementation that supports TLS.")
|
|||
(uri (pypi-uri name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0msqm3ils193m56h4c9866rg8ib50g0wag0i30sffbs6sd335jh7"))))
|
||||
"1sn4wqkp6kjj9p8maf4jnjwwvb083hgakm9i10rk9273nnqfkj76"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(,@(substitute-keyword-arguments (package-arguments python-acme)
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
|
||||
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
|
||||
;;; Copyright © 2018 Roel Janssen <roel@gnu.org>
|
||||
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -510,15 +511,15 @@ SMPTE 314M.")
|
|||
(define-public libmatroska
|
||||
(package
|
||||
(name "libmatroska")
|
||||
(version "1.4.7")
|
||||
(version "1.4.8")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://dl.matroska.org/downloads/"
|
||||
name "/" name "-" version ".tar.bz2"))
|
||||
name "/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1yi5cnv13nhl27xyqayd5l3sf0j3swfj3apzibv71yg9pariwi26"))))
|
||||
"14n9sw974prr3yp4yjb7aadi6x2yz5a0hjw8fs3qigy5shh2piyq"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
|
@ -1114,32 +1115,33 @@ access to mpv's powerful playback capabilities.")
|
|||
(define-public libvpx
|
||||
(package
|
||||
(name "libvpx")
|
||||
(version "1.6.1")
|
||||
(version "1.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://storage.googleapis.com/"
|
||||
"downloads.webmproject.org/releases/webm/"
|
||||
name "-" version ".tar.bz2"))
|
||||
;; XXX: Upstream does not provide tarballs for > 1.6.1.
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://chromium.googlesource.com/webm/libvpx")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"06d8hqjkfs6wl45qf4pwh1kpbvkx6cwywd5y8d4lgagvjwm0qb0w"))
|
||||
"0vvh89hvp8qg9an9vcmwb7d9k3nixhxaz6zi65qdjnd0i56kkcz6"))
|
||||
(patches (search-patches "libvpx-CVE-2016-2818.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(setenv "CONFIG_SHELL" (which "bash"))
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(setenv "LDFLAGS"
|
||||
(string-append "-Wl,-rpath=" out "/lib"))
|
||||
(zero? (system* "./configure"
|
||||
"--enable-shared"
|
||||
`(#:configure-flags (list "--enable-shared"
|
||||
"--as=yasm"
|
||||
;; Limit size to avoid CVE-2015-1258
|
||||
"--size-limit=16384x16384"
|
||||
(string-append "--prefix=" out)))))))
|
||||
(string-append "--prefix=" (assoc-ref %outputs "out")))
|
||||
#:make-flags (list (string-append "LDFLAGS=-Wl,-rpath="
|
||||
(assoc-ref %outputs "out") "/lib"))
|
||||
#:phases (modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key configure-flags #:allow-other-keys)
|
||||
;; The configure script does not understand some of the GNU
|
||||
;; options, so we only add the flags specified above.
|
||||
(apply invoke "./configure" configure-flags))))
|
||||
#:tests? #f)) ; no check target
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
|
|
@ -1152,7 +1154,7 @@ access to mpv's powerful playback capabilities.")
|
|||
(define-public youtube-dl
|
||||
(package
|
||||
(name "youtube-dl")
|
||||
(version "2018.01.21")
|
||||
(version "2018.01.27")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://yt-dl.org/downloads/"
|
||||
|
|
@ -1160,7 +1162,7 @@ access to mpv's powerful playback capabilities.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"14ggjxnhc2sxc93h7d5k3z4n35n5q3ffsif97np0ar93x5z3zgn5"))))
|
||||
"14vbm8pr6xdrdbk8j9k4v82rnalbdpk2lcm7n9wj6z6d441ymji9"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
;; The problem here is that the directory for the man page and completion
|
||||
|
|
@ -1309,7 +1311,7 @@ audio, images) from the Web. It can use either mpv or vlc for playback.")
|
|||
(define-public libbluray
|
||||
(package
|
||||
(name "libbluray")
|
||||
(version "1.0.1")
|
||||
(version "1.0.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.videolan.org/videolan/"
|
||||
|
|
@ -1317,12 +1319,23 @@ audio, images) from the Web. It can use either mpv or vlc for playback.")
|
|||
name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0fl5cxfj870rwqmmz3s04wh7wnabb7rnynfj1v3sz37ln8frm7qg"))))
|
||||
"1zxfnw1xbghcj7b3zz5djndv6gwssxda19cz1lrlqrkg8577r7kd"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--disable-bdjava-jar")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'refer-to-libxml2-in-.pc-file
|
||||
;; Avoid the need to propagate libxml2 by referring to it
|
||||
;; directly, as is already done for fontconfig & freetype.
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((libxml2 (assoc-ref inputs "libxml2")))
|
||||
(substitute* "configure"
|
||||
((" libxml-2.0") ""))
|
||||
(substitute* "src/libbluray.pc.in"
|
||||
(("^Libs.private:" field)
|
||||
(string-append field " -L" libxml2 "/lib -lxml2")))
|
||||
#t)))
|
||||
(add-before 'build 'fix-dlopen-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((libaacs (assoc-ref inputs "libaacs"))
|
||||
|
|
@ -1464,7 +1477,7 @@ encapsulated.")
|
|||
(define-public libdvdcss
|
||||
(package
|
||||
(name "libdvdcss")
|
||||
(version "1.4.0")
|
||||
(version "1.4.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.videolan.org/pub/"
|
||||
|
|
@ -1472,7 +1485,7 @@ encapsulated.")
|
|||
name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0nl45ifc4xcb196snv9d6hinfw614cqpzcqp92dg43c0hickg290"))))
|
||||
"1b7awvyahivglp7qmgx2g5005kc5npv257gw7wxdprjsnx93f1zb"))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "https://www.videolan.org/developers/libdvdcss.html")
|
||||
(synopsis "Library for accessing DVDs as block devices")
|
||||
|
|
@ -1703,30 +1716,6 @@ pixel motion compensation, lumi masking, trellis quantization, and H.263, MPEG
|
|||
and custom quantization matrices.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public livestreamer
|
||||
(package
|
||||
(name "livestreamer")
|
||||
(version "1.12.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/chrippa/livestreamer/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append "livestreamer-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1fp3d3z2grb1ls97smjkraazpxnvajda2d1g1378s6gzmda2jvjd"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f)) ; tests rely on external web servers
|
||||
(propagated-inputs
|
||||
`(("python-requests" ,python-requests)))
|
||||
(synopsis "Internet video stream viewer")
|
||||
(description "Livestreamer is a command-line utility that extracts streams
|
||||
from various services and pipes them into a video playing application.")
|
||||
(home-page "http://livestreamer.io/")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public streamlink
|
||||
(package
|
||||
(name "streamlink")
|
||||
|
|
@ -1756,6 +1745,9 @@ from various services and pipes them into a video playing application.")
|
|||
from sites like Twitch.tv and pipes them into a video player of choice.")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public livestreamer
|
||||
(deprecated-package "livestreamer" streamlink))
|
||||
|
||||
(define-public mlt
|
||||
(package
|
||||
(name "mlt")
|
||||
|
|
@ -2007,7 +1999,7 @@ making @dfn{screencasts}.")
|
|||
(define-public simplescreenrecorder
|
||||
(package
|
||||
(name "simplescreenrecorder")
|
||||
(version "0.3.8")
|
||||
(version "0.3.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -2016,8 +2008,8 @@ making @dfn{screencasts}.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0v8w35n8w772s08w7k0icynqdsdakbrcanbgx6j847bfqfsg21gg"))))
|
||||
(build-system gnu-build-system)
|
||||
"1gnf9wbiq2fcbqcn1a5nfmp8r0nxrrlgh2wly2mfkkwymynhx0pk"))))
|
||||
(build-system cmake-build-system)
|
||||
;; Although libx11, libxfixes, libxext are listed as build dependencies in
|
||||
;; README.md, the program builds and functions properly without them.
|
||||
;; As a result, they are omitted. Please add them back if problems appear.
|
||||
|
|
@ -2028,8 +2020,12 @@ making @dfn{screencasts}.")
|
|||
("jack" ,jack-1)
|
||||
("libxi" ,libxi)
|
||||
("pulseaudio" ,pulseaudio)
|
||||
("qt" ,qt-4))) ; README.md: using Qt 5 causes some stability issues
|
||||
("qt" ,qt)))
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list "-DWITH_QT5=TRUE")
|
||||
#:tests? #f)) ; no test suite
|
||||
;; Using HTTPS causes part of the page to be displayed improperly.
|
||||
(home-page "http://www.maartenbaert.be/simplescreenrecorder/")
|
||||
(synopsis "Screen recorder")
|
||||
|
|
@ -2518,10 +2514,10 @@ and ITU-T H.222.0.")
|
|||
(package
|
||||
(name "ffms2")
|
||||
(version "2.23")
|
||||
(home-page "https://github.com/FFMS/ffms2/")
|
||||
(home-page "https://github.com/FFMS/ffms2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append home-page "archive/" version ".tar.gz"))
|
||||
(uri (string-append home-page "/archive/" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
|
|
|
|||
|
|
@ -179,17 +179,17 @@ Interface} specification.")
|
|||
(name "nginx")
|
||||
;; Consider updating the nginx-docs package if the nginx package is
|
||||
;; updated.
|
||||
(version "1.12.2")
|
||||
(version "1.13.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://nginx.org/download/nginx-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"05h4rwja7170z0l979yjghy9i9ichllwhicylzpmmyyml6fkfprh"))))
|
||||
"1ib4hkngj9z7pl73lnn96d85m7v2wwb56nkypwx7d6pm3z1vc444"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("pcre" ,pcre)
|
||||
("openssl" ,openssl)
|
||||
(inputs `(("openssl" ,openssl)
|
||||
("pcre" ,pcre)
|
||||
("zlib" ,zlib)))
|
||||
(arguments
|
||||
`(#:tests? #f ; no test target
|
||||
|
|
@ -230,7 +230,8 @@ Interface} specification.")
|
|||
(setenv "CC" "gcc")
|
||||
(format #t "environment variable `CC' set to `gcc'~%")
|
||||
(format #t "configure flags: ~s~%" flags)
|
||||
(zero? (apply system* "./configure" flags)))))
|
||||
(apply invoke "./configure" flags)
|
||||
#t)))
|
||||
(add-after 'install 'install-man-page
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
|
|
@ -251,12 +252,13 @@ Interface} specification.")
|
|||
(rename-file (string-append out "/conf")
|
||||
(string-append share "/conf"))
|
||||
(rename-file (string-append out "/html")
|
||||
(string-append share "/html"))))))))
|
||||
(string-append share "/html"))
|
||||
#t))))))
|
||||
(home-page "https://nginx.org")
|
||||
(synopsis "HTTP and reverse proxy server")
|
||||
(description
|
||||
"Nginx (\"engine X\") is a high-performance web and reverse proxy server
|
||||
created by Igor Sysoev. It can be used both as a standalone web server
|
||||
created by Igor Sysoev. It can be used both as a stand-alone web server
|
||||
and as a proxy to reduce the load on back-end HTTP or mail servers.")
|
||||
;; Almost all of nginx is distributed under the bsd-2 license.
|
||||
;; The exceptions are:
|
||||
|
|
@ -343,7 +345,8 @@ documentation.")
|
|||
(("#banner \\{ background: black;")
|
||||
"#banner { background: black;
|
||||
display: none;"))
|
||||
(zero? (system* "make")))))
|
||||
(invoke "make")
|
||||
#t)))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((output (assoc-ref outputs "out")))
|
||||
|
|
@ -494,7 +497,7 @@ libraries for working with JNLP applets.")
|
|||
(define-public jansson
|
||||
(package
|
||||
(name "jansson")
|
||||
(version "2.9")
|
||||
(version "2.10")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
|
@ -502,7 +505,7 @@ libraries for working with JNLP applets.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"19fjgfwjfj99rqa3kf96x5rssj88siazggksgrikd6h4r9sd1l0a"))))
|
||||
"0iv4rxsnamqm3ldpg7dyhjq0x9cp023nc7ac820jdd3pwb8ml8bq"))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "http://www.digip.org/jansson/")
|
||||
(synopsis "JSON C library")
|
||||
|
|
@ -4044,14 +4047,14 @@ a pure C99 library.")
|
|||
(define-public uwsgi
|
||||
(package
|
||||
(name "uwsgi")
|
||||
(version "2.0.12")
|
||||
(version "2.0.15")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://projects.unbit.it/downloads/uwsgi-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"02g46dnw5j1iw8fsq392bxbk8d21b9pdgb3ypcinv3b4jzdm2srh"))))
|
||||
"1zvj28wp3c1hacpd4c6ra5ilwvvfq3l8y6gn8i7mnncpddlzjbjp"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" "python"))
|
||||
(arguments
|
||||
|
|
@ -4152,7 +4155,7 @@ you'd expect.")
|
|||
(define-public uhttpmock
|
||||
(package
|
||||
(name "uhttpmock")
|
||||
(version "0.5.0")
|
||||
(version "0.5.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -4160,7 +4163,7 @@ you'd expect.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0vniyx341pnnmvxmqacc49k0g7h9a9nhknfslidrqmxj5lm1ini6"))))
|
||||
"163py4klka423x7li2b685gmg3a6hjf074mlff2ajhmi3l0lm8x6"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
@ -4896,7 +4899,7 @@ tools like SSH (Secure Shell) to reach the outside world.")
|
|||
(define-public stunnel
|
||||
(package
|
||||
(name "stunnel")
|
||||
(version "5.39")
|
||||
(version "5.44")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -4904,7 +4907,7 @@ tools like SSH (Secure Shell) to reach the outside world.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1vjdn32iw11zqsygwxbjmqgs4644dk3ql1h8ap890ls6a1x0i318"))))
|
||||
"1692y69wl7j6yjgnrrzclgzb34bxsaxjzl1dfy47vms7pdfk42lr"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("openssl" ,openssl)))
|
||||
(arguments
|
||||
|
|
@ -4995,7 +4998,7 @@ functions of Tidy.")
|
|||
(define-public hiawatha
|
||||
(package
|
||||
(name "hiawatha")
|
||||
(version "10.4")
|
||||
(version "10.7")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -5007,7 +5010,7 @@ functions of Tidy.")
|
|||
'(delete-file-recursively "mbedtls"))
|
||||
(sha256
|
||||
(base32
|
||||
"0m2llzm72s29c32abnj03532m85fawvi8ybjpx6s3mgvx2yvq3p4"))))
|
||||
"0x2zfc8kc6c7rl4gwymwmg13w1c60biv6c6c9fvzpnl59bc9jgin"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; No tests included
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
|
@ -55,6 +55,12 @@
|
|||
"CFLAGS=-DUSE_INTERP_RESULT -O2")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'build-libwn-PIC
|
||||
(lambda _
|
||||
;; GNU Dico links libWN.a in its wordnet.so plugin, so it needs
|
||||
;; PIC.
|
||||
(invoke "make" "-C" "lib" "CFLAGS=-O2 -g -fPIC"
|
||||
"LDFLAGS=-fPIC")))
|
||||
(add-after 'install 'post-install
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
|
|
|
|||
|
|
@ -924,7 +924,7 @@ XSL-T processor. It also performs any necessary post-processing.")
|
|||
("libltdl" ,libltdl)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(home-page "http://www.libexpat.org/")
|
||||
(home-page "https://www.aleksey.com/xmlsec/")
|
||||
(synopsis "XML Security Library")
|
||||
(description
|
||||
"The XML Security Library is a C library based on Libxml2. It
|
||||
|
|
@ -1095,7 +1095,7 @@ XSLT and EXSLT.")
|
|||
(define-public html-xml-utils
|
||||
(package
|
||||
(name "html-xml-utils")
|
||||
(version "7.4")
|
||||
(version "7.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -1104,7 +1104,7 @@ XSLT and EXSLT.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"04pgrahsfawnzd9pilvirs05pfdgsd7qwvw4dvkb42rgybhw6h95"))))
|
||||
"0cbmqa9c4bc4ikk7vmgd65ixh2pl9mr336c4his3m8l7rgsjnh8n"))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "https://www.w3.org/Tools/HTML-XML-utils/")
|
||||
(synopsis "Command line utilities to manipulate HTML and XML files")
|
||||
|
|
|
|||
|
|
@ -590,7 +590,7 @@ theme."
|
|||
#:optional
|
||||
(program (package-name package))
|
||||
#:key allow-empty-passwords?)
|
||||
"Add @var{package}, a package for a screen-locker or screen-saver whose
|
||||
"Add @var{package}, a package for a screen locker or screen saver whose
|
||||
command is @var{program}, to the set of setuid programs and add a PAM entry
|
||||
for it. For example:
|
||||
|
||||
|
|
|
|||
|
|
@ -290,7 +290,6 @@ loaded at boot time in the order in which they appear."
|
|||
"usb-storage" "uas" ;for the installation image etc.
|
||||
"usbhid" "hid-generic" "hid-apple" ;keyboards during early boot
|
||||
"dm-crypt" "xts" "serpent_generic" "wp512" ;for encrypted root partitions
|
||||
"nvme" ;for new SSD NVMe devices
|
||||
"nls_iso8859-1" ;for `mkfs.fat`, et.al
|
||||
,@(if (string-match "^(x86_64|i[3-6]86)-" (%current-system))
|
||||
'("pata_acpi" "pata_atiixp" ;for ATA controllers
|
||||
|
|
|
|||
|
|
@ -770,7 +770,7 @@ otherwise simply ignore them."
|
|||
#:reporter (progress-reporter/file
|
||||
(uri-abbreviation uri) size))
|
||||
(newline)))
|
||||
#t)))
|
||||
file)))
|
||||
((ftp)
|
||||
(false-if-exception* (ftp-fetch uri file
|
||||
#:timeout timeout)))
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
#!@GUILE@ \
|
||||
--no-auto-compile -e main -s
|
||||
-*- scheme -*-
|
||||
!#
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013 Mark H Weaver <mhw@netris.org>
|
||||
|
|
@ -57,3 +56,7 @@
|
|||
;; but since the 'guix' command is not updated by 'guix pull', we cannot
|
||||
;; really do it now.
|
||||
(apply guix-main args)))
|
||||
|
||||
;;; Local Variables:
|
||||
;;; mode: scheme
|
||||
;;; End:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -96,7 +96,10 @@
|
|||
(test-skip (if %store 0 12))
|
||||
|
||||
(test-assert "add-to-store, flat"
|
||||
(let* ((file (search-path %load-path "language/tree-il/spec.scm"))
|
||||
;; Use 'readlink*' in case spec.scm is a symlink, as is the case when Guile
|
||||
;; was installed with Stow.
|
||||
(let* ((file (readlink*
|
||||
(search-path %load-path "language/tree-il/spec.scm")))
|
||||
(drv (add-to-store %store "flat-test" #f "sha256" file)))
|
||||
(and (eq? 'regular (stat:type (stat drv)))
|
||||
(valid-path? %store drv)
|
||||
|
|
@ -104,7 +107,9 @@
|
|||
(call-with-input-file drv get-bytevector-all)))))
|
||||
|
||||
(test-assert "add-to-store, recursive"
|
||||
(let* ((dir (dirname (search-path %load-path "language/tree-il/spec.scm")))
|
||||
(let* ((dir (dirname
|
||||
(readlink* (search-path %load-path
|
||||
"language/tree-il/spec.scm"))))
|
||||
(drv (add-to-store %store "dir-tree-test" #t "sha256" dir)))
|
||||
(and (eq? 'directory (stat:type (stat drv)))
|
||||
(valid-path? %store drv)
|
||||
|
|
|
|||
Reference in New Issue