ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-23 21:17:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into core-updates

Browse source 
Conflicts:
	etc/news.scm
	gnu/local.mk
	gnu/packages/check.scm
	gnu/packages/cross-base.scm
	gnu/packages/gimp.scm
	gnu/packages/java.scm
	gnu/packages/mail.scm
	gnu/packages/sdl.scm
	gnu/packages/texinfo.scm
	gnu/packages/tls.scm
	gnu/packages/version-control.scm
This commit is contained in:
Marius Bakke 2020-04-08 13:00:50 +02:00
commit 2778302399
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
172 changed files with 12138 additions and 1668 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -138,6 +138,7 @@
/test-env
/test-tmp
/tests/*.trs
/tests/services/*.trs
GPATH
GRTAGS
GTAGS

6
build-aux/build-self.scm
View file

@ -408,7 +408,11 @@ (define* (build source
(major ((store-lift nix-server-major-version)))
(minor ((store-lift nix-server-minor-version))))
(mbegin %store-monad
(show-what-to-build* (list build))
;; Before 'with-build-handler' was implemented and used, we had to
;; explicitly call 'show-what-to-build*'.
(munless (module-defined? (resolve-module '(guix store))
'with-build-handler)
(show-what-to-build* (list build)))
(built-derivations (list build))
;; Use the port beneath the current store as the stdin of BUILD. This

54
doc/guix-cookbook.texi
View file

@ -11,6 +11,7 @@
Copyright @copyright{} 2019 Ricardo Wurmus@*
Copyright @copyright{} 2019 Efraim Flashner@*
Copyright @copyright{} 2019 Pierre Neidhardt@*
Copyright @copyright{} 2020 Oleg Pykhalov@*
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
@ -1319,7 +1320,8 @@ chapter is to demonstrate some advanced configuration concepts.
reference.
@menu
* Customizing the Kernel:: Creating and using a custom Linux kernel on Guix System.
* Customizing the Kernel:: Creating and using a custom Linux kernel on Guix System.
* Customizing a Window Manager:: Handle customization of a Window manager on Guix System.
@end menu
@node Customizing the Kernel
@ -1562,6 +1564,56 @@ likely that you'll need to modify the initrd on a machine using a custom
kernel, since certain modules which are expected to be built may not be
available for inclusion into the initrd.
@node Customizing a Window Manager
@section Customizing a Window Manager
@cindex wm
@node StumpWM
@subsection StumpWM
@cindex stumpwm
You could install StumpWM with a Guix system by adding
@code{stumpwm-checkout} and optionally @code{`(,stumpwm-checkout "lib")}
packages to a system configuration file, e.g. @file{/etc/config.scm}.
An example configuration can look like this:
@lisp
(use-modules (gnu))
(use-package-modules wm)
(operating-system
;; …
(packages (append (list sbcl stumpwm-checkout `(,stumpwm-checkout "lib"))
%base-packages)))
@end lisp
@cindex stumpwm fonts
By default StumpWM uses X11 fonts, which could be small or pixelated on
your system. You could fix this by installing StumpWM contrib Lisp
module @code{sbcl-stumpwm-ttf-fonts}, adding it to Guix system packages:
@lisp
(use-modules (gnu))
(use-package-modules fonts wm)
(operating-system
;; …
(packages (append (list sbcl stumpwm-checkout `(,stumpwm-checkout "lib"))
sbcl-stumpwm-ttf-fonts font-dejavu %base-packages)))
@end lisp
Then you need to add the following code to a StumpWM configuration file
@file{~/.stumpwm.d/init.lisp}:
@lisp
(require :ttf-fonts)
(setf xft:*font-dirs* '("/run/current-system/profile/share/fonts/"))
(setf clx-truetype:+font-cache-filename+ (concat (getenv "HOME") "/.fonts/font-cache.sexp"))
(xft:cache-fonts)
(set-font (make-instance 'xft:font :family "DejaVu Sans Mono" :subfamily "Book" :size 11))
@end lisp
@c *********************************************************************
@node Advanced package management
@chapter Advanced package management

121
doc/guix.texi
View file

@ -76,6 +76,7 @@ Copyright @copyright{} 2020 Damien Cassou@*
Copyright @copyright{} 2020 Jakub Kądziołka@*
Copyright @copyright{} 2020 Jack Hill@*
Copyright @copyright{} 2020 Naga Malleswari@*
Copyright @copyright{} 2020 Brice Waegeneire@*
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
@ -1684,6 +1685,17 @@ to display fonts, you have to install fonts with Guix as well.
Essential font packages include @code{gs-fonts}, @code{font-dejavu}, and
@code{font-gnu-freefont-ttf}.
@cindex @code{fc-cache}
@cindex font cache
Once you have installed or removed fonts, or when you notice an
application that does not find fonts, you may need to install Fontconfig
and to force an update of its font cache by running:
@example
guix install fontconfig
fc-cache -rv
@end example
To display text written in Chinese languages, Japanese, or Korean in
graphical applications, consider installing
@code{font-adobe-source-han-sans} or @code{font-wqy-zenhei}. The former
@ -1717,13 +1729,6 @@ xset +fp $(dirname $(readlink -f ~/.guix-profile/share/fonts/truetype/fonts.dir)
After that, you can run @code{xlsfonts} (from @code{xlsfonts} package)
to make sure your TrueType fonts are listed there.
@cindex @code{fc-cache}
@cindex font cache
After installing fonts you may have to refresh the font cache to use
them in applications. The same applies when applications installed via
Guix do not seem to find fonts. To force rebuilding of the font cache
run @code{fc-cache -rv}. The @code{fc-cache} command is provided by
the @code{fontconfig} package.
@subsection X.509 Certificates
@ -11915,6 +11920,9 @@ about. Here are a few example:
;; The Catalan layout.
(keyboard-layout "es" "cat")
;; Arabic layout with "Alt-Shift" to switch to US layout.
(keyboard-layout "ar,us" #:options '("grp:alt_shift_toggle"))
;; The Latin American Spanish layout. In addition, the
;; "Caps Lock" key is used as an additional "Ctrl" key,
;; and the "Menu" key is used as a "Compose" key to enter
@ -12771,9 +12779,24 @@ List of extra command-line options for @command{guix-daemon}.
File where @command{guix-daemon}'s standard output and standard error
are written.
@cindex HTTP proxy, for @code{guix-daemon}
@cindex proxy, for @code{guix-daemon} HTTP access
@item @code{http-proxy} (default: @code{#f})
The HTTP proxy used for downloading fixed-output derivations and
substitutes.
The URL of the HTTP and HTTPS proxy used for downloading fixed-output
derivations and substitutes.
It is also possible to change the daemon's proxy at run time through the
@code{set-http-proxy} action, which restarts it:
@example
herd set-http-proxy guix-daemon http://localhost:8118
@end example
To clear the proxy settings, run:
@example
herd set-http-proxy guix-daemon
@end example
@item @code{tmpdir} (default: @code{#f})
A directory path where the @command{guix-daemon} will perform builds.
@ -13178,17 +13201,27 @@ their contents in separate files, possibly compressed. The @code{(gnu
services admin)} module provides an interface to GNU@tie{}Rot[t]log, a
log rotation tool (@pxref{Top,,, rottlog, GNU Rot[t]log Manual}).
The example below defines an operating system that provides log rotation
with the default settings, for commonly encountered log files.
This service is part of @code{%base-services}, and thus enabled by
default, with the default settings, for commonly encountered log files.
The example below shows how to extend it with an additional
@dfn{rotation}, should you need to do that (usually, services that
produce log files already take care of that):
@lisp
(use-modules (guix) (gnu))
(use-service-modules admin mcron)
(use-package-modules base idutils)
(use-service-modules admin)
(define my-log-files
;; Log files that I want to rotate.
'("/var/log/something.log" "/var/log/another.log"))
(operating-system
;; @dots{}
(services (cons (service rottlog-service-type)
(services (cons (simple-service 'rotate-my-stuff
rottlog-service-type
(list (log-rotation
(frequency 'daily)
(files my-log-files))))
%base-services)))
@end lisp
@ -20682,6 +20715,30 @@ but it also fetches and indexes mail retrieved from Debbugs.
This is the service type for Mumi.
@end defvr
@deftp {Data Type} mumi-configuration
Data type representing the Mumi service configuration. This type has the
following fields:
@table @asis
@item @code{mumi} (default: @code{mumi})
The Mumi package to use.
@item @code{mailer?} (default: @code{#true})
Whether to enable or disable the mailer component.
@item @code{mumi-configuration-sender}
The email address used as the sender for comments.
@item @code{mumi-configuration-smtp}
A URI to configure the SMTP settings for Mailutils. This could be
something like @code{sendmail:///path/to/bin/msmtp} or any other URI
supported by Mailutils. @xref{SMTP Mailboxes, SMTP Mailboxes,,
mailutils, GNU@tie{}Mailutils}.
@end table
@end deftp
@subsubheading FastCGI
@cindex fastcgi
@cindex fcgiwrap
@ -25383,6 +25440,42 @@ notifications.
@end table
@end deftp
@cindex modprobe
@cindex kernel module loader
@subsubsection Kernel Module Loader Service
The kernel module loader service allows one to load loadable kernel
modules at boot. This is especially useful for modules that don't
autoload and need to be manually loaded, as it's the case with
@code{ddcci}.
@deffn {Scheme Variable} kernel-module-loader-service-type
The service type for loading loadable kernel modules at boot with
@command{modprobe}. Its value must be a list of strings representing
module names. For example loading the drivers provided by
@code{ddcci-driver-linux}, in debugging mode by passing some module
parameters, can be done as follow:
@lisp
(use-modules (gnu) (gnu services))
(use-package-modules linux)
(use-service-modules linux)
(define ddcci-config
(plain-file "ddcci.conf"
"options ddcci dyndbg delay=120"))
(operating-system
...
(services (cons* (service kernel-module-loader-service-type
'("ddcci" "ddcci_backlight"))
(simple-service 'ddcci-config etc-service-type
(list `("modprobe.d/ddcci.conf"
,ddcci-config)))
%base-services))
(kernel-loadable-modules (list ddcci-driver-linux)))
@end lisp
@end deffn
@node Miscellaneous Services
@subsection Miscellaneous Services

8
etc/news.scm
View file

@ -10,6 +10,14 @@
(channel-news
(version 0)
(entry (commit "0468455e7d279c89ea3ad1b51935efb2b785ec47")
(title (en "Rottlog service added to @code{%base-services}"))
(body (en "An instance of @code{rottlog-service-type}, the system
service responsible for log rotation, has been added to @code{%base-services}.
If your operating system configuration for Guix System is explicitly adding
@code{rottlog-service-type} to the services, you should now remove it. See
the ``Log Rotation'' section of the manual for more information.")))
(entry (commit "b6bee63bed4f013064c0d902e7c8b83ed7514ade")
(title (en "@code{guile} package now refers to version 3.0"))
(body (en "The @code{guile} package has been upgraded to version 3.0

25
etc/release-manifest.scm
View file

@ -23,6 +23,7 @@
(guix packages)
(guix profiles)
((gnu ci) #:select (%cross-targets))
(guix utils)
(srfi srfi-1)
(srfi srfi-26))
@ -61,11 +62,17 @@ (define %system-packages
(define %packages-to-cross-build
;; Packages that must be cross-buildable from x86_64-linux.
(cons (@ (gnu packages gcc) gcc)
(map specification->package
'("coreutils" "grep" "sed" "findutils" "diffutils" "patch"
"gawk" "gettext" "gzip" "xz"
"hello" "guile@2.2" "zlib"))))
;; FIXME: Add (@ (gnu packages gcc) gcc) when <https://bugs.gnu.org/40463>
;; is fixed.
(append (list (@ (gnu packages guile) guile-2.2/fixed))
(map specification->package
'("coreutils" "grep" "sed" "findutils" "diffutils" "patch"
"gawk" "gettext" "gzip" "xz"
"hello" "zlib"))))
(define %packages-to-cross-build-for-mingw
;; Many things don't build for MinGW. Restrict to what's known to work.
(map specification->package '("hello")))
(define %cross-bootstrap-targets
;; Cross-compilation triplets for which 'bootstrap-tarballs' must be
@ -91,8 +98,12 @@ (define %cross-manifest
(append-map (lambda (target)
(map (cut package->manifest-entry* <> "x86_64-linux"
#:target target)
%packages-to-cross-build))
%cross-targets)))
(if (target-mingw? target)
%packages-to-cross-build-for-mingw
%packages-to-cross-build)))
;; XXX: Important bits like libsigsegv and libffi don't support
;; RISCV at the moment, so don't require RISCV support.
(delete "riscv64-linux-gnu" %cross-targets))))
(define %cross-bootstrap-manifest
(manifest

6
gnu/bootloader/grub.scm
View file

@ -241,7 +241,11 @@ (define builder
"-i" #+(keyboard-layout->console-keymap layout)
"-o" #$output))))
(computed-file (string-append "grub-keymap." (keyboard-layout-name layout))
(computed-file (string-append "grub-keymap."
(string-map (match-lambda
(#\, #\-)
(chr chr))
(keyboard-layout-name layout)))
builder))
(define (grub-setup-io config)

1
gnu/ci.scm
View file

@ -132,7 +132,6 @@ (define (packages-to-cross-build target)
(define %cross-targets
'("mips64el-linux-gnu"
"mips64el-linux-gnuabi64"
"arm-linux-gnueabihf"
"aarch64-linux-gnu"
"powerpc-linux-gnu"

30
gnu/installer.scm
View file

@ -113,8 +113,10 @@ (define apply-locale
(setlocale LC_ALL locale))
;; Restart the documentation viewer so it displays the manual in
;; language that corresponds to LOCALE.
(with-error-to-port (%make-void-port "w")
;; language that corresponds to LOCALE. Make sure that nothing is
;; printed on the console.
(parameterize ((shepherd-message-port
(%make-void-port "w")))
(lambda ()
(stop-service 'term-tty2)
(start-service 'term-tty2 (list locale)))))))
@ -172,7 +174,7 @@ (define apply-keymap
(kmscon-update-keymap (default-keyboard-model)
layout variant))))
(define* (compute-keymap-step)
(define* (compute-keymap-step context)
"Return a gexp that runs the keymap-page of INSTALLER and install the
selected keymap."
#~(lambda (current-installer)
@ -184,7 +186,7 @@ (define* (compute-keymap-step)
"/share/X11/xkb/rules/base.xml")))
(lambda (models layouts)
((installer-keymap-page current-installer)
layouts)))))
layouts '#$context)))))
(#$apply-keymap result)
result)))
@ -193,10 +195,15 @@ (define (installer-steps)
#:locales-name "locales"
#:iso639-languages-name "iso639-languages"
#:iso3166-territories-name "iso3166-territories"))
(keymap-step (compute-keymap-step))
(timezone-data #~(string-append #$tzdata
"/share/zoneinfo/zone.tab")))
#~(lambda (current-installer)
((installer-parameters-menu current-installer)
(lambda ()
((installer-parameters-page current-installer)
(lambda _
(#$(compute-keymap-step 'param)
current-installer)))))
(list
;; Ask the user to choose a locale among those supported by
;; the glibc. Install the selected locale right away, so that
@ -238,7 +245,8 @@ (define (installer-steps)
(id 'keymap)
(description (G_ "Keyboard mapping selection"))
(compute (lambda _
(#$keymap-step current-installer)))
(#$(compute-keymap-step 'default)
current-installer)))
(configuration-formatter keyboard-layout->configuration))
;; Ask the user to input a hostname for the system.
@ -271,7 +279,7 @@ (define (installer-steps)
(description (G_ "Services"))
(compute (lambda _
((installer-services-page current-installer))))
(configuration-formatter system-services->configuration))
(configuration-formatter system-services->configuration))
;; Run a partitioning tool allowing the user to modify
;; partition tables, partitions and their mount points.
@ -284,7 +292,7 @@ (define (installer-steps)
((installer-partition-page current-installer))))
(configuration-formatter user-partitions->configuration))
(installer-step
(installer-step
(id 'final)
(description (G_ "Configuration file"))
(compute
@ -295,8 +303,8 @@ (define (installer-steps)
(define guile-newt
;; Guile-Newt with 'form-watch-fd'.
;; TODO: Remove once a new release is out.
(let ((commit "b3c885d42cfac327d3531c9d064939514ce6bf12")
(revision "1"))
(let ((commit "c3cdeb0b53ac71aedabee669f57d44563c662446")
(revision "2"))
(package
(inherit (@ (gnu packages guile-xyz) guile-newt))
(name "guile-newt")
@ -309,7 +317,7 @@ (define guile-newt
(file-name (git-file-name name version))
(sha256
(base32
"02p0bi6c05699idgx6gfkljhqgi8zf09clhzx81i8wa064s70r1y")))))))
"1gksd1lzgjjh1p9vczghg8jw995d22hm34kbsiv8rcryirv2xy09")))))))
(define (installer-program)
"Return a file-like object that runs the given INSTALLER."

21
gnu/installer/newt.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -21,6 +21,7 @@ (define-module (gnu installer newt)
#:use-module (gnu installer utils)
#:use-module (gnu installer newt ethernet)
#:use-module (gnu installer newt final)
#:use-module (gnu installer newt parameters)
#:use-module (gnu installer newt hostname)
#:use-module (gnu installer newt keymap)
#:use-module (gnu installer newt locale)
@ -44,7 +45,9 @@ (define-module (gnu installer newt)
(define (init)
(newt-init)
(clear-screen)
(set-screen-size!))
(set-screen-size!)
(push-help-line
(format #f (G_ "Press <F1> for installation parameters."))))
(define (exit)
(newt-finish)
@ -91,8 +94,8 @@ (define (welcome-page logo)
(define (menu-page steps)
(run-menu-page steps))
(define* (keymap-page layouts)
(run-keymap-page layouts))
(define* (keymap-page layouts context)
(run-keymap-page layouts #:context context))
(define (network-page)
(run-network-page))
@ -109,6 +112,12 @@ (define (partition-page)
(define (services-page)
(run-services-page))
(define (parameters-menu menu-proc)
(newt-set-help-callback menu-proc))
(define (parameters-page keyboard-layout-selection)
(run-parameters-page keyboard-layout-selection))
(define newt-installer
(installer
(name 'newt)
@ -125,4 +134,6 @@ (define newt-installer
(user-page user-page)
(partition-page partition-page)
(services-page services-page)
(welcome-page welcome-page)))
(welcome-page welcome-page)
(parameters-menu parameters-menu)
(parameters-page parameters-page)))

33
gnu/installer/newt/keymap.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
@ -33,20 +33,32 @@ (define-module (gnu installer newt keymap)
#:export (run-keymap-page
keyboard-layout->configuration))
(define (run-layout-page layouts layout->text)
(define (run-layout-page layouts layout->text context)
(let ((title (G_ "Layout")))
(run-listbox-selection-page
#:title title
#:info-text (G_ "Please choose your keyboard layout.")
#:info-text
(case context
((param) (G_ "Please choose your keyboard layout. \
It will only be used during the installation process."))
(else (G_ "Please choose your keyboard layout. \
It will be used during the install process, and for the installed system. \
You can switch to different layout at any time from the parameters menu.")))
#:listbox-items layouts
#:listbox-item->text layout->text
#:sort-listbox-items? #f
#:button-text (G_ "Exit")
#:button-text
(case context
((param) (G_ "Continue"))
(else (G_ "Exit")))
#:button-callback-procedure
(lambda _
(raise
(condition
(&installer-step-abort)))))))
(case context
((param) (const #t))
(else
(lambda _
(raise
(condition
(&installer-step-abort)))))))))
(define (run-variant-page variants variant->text)
(let ((title (G_ "Variant")))
@ -100,7 +112,7 @@ (define (sort-variants variants)
variants))
(cut append <> <>)))
(define* (run-keymap-page layouts)
(define* (run-keymap-page layouts #:key (context #f))
"Run a page asking the user to select a keyboard layout and variant. LAYOUTS
is a list of supported X11-KEYMAP-LAYOUT. Return a list of two elements, the
names of the selected keyboard layout and variant."
@ -114,7 +126,8 @@ (define keymap-steps
(sort-layouts layouts)
(lambda (layout)
(gettext (x11-keymap-layout-description layout)
"xkeyboard-config"))))))
"xkeyboard-config"))
context))))
;; Propose the user to select a variant among those supported by the
;; previously selected layout.
(installer-step

4
gnu/installer/newt/page.scm
View file

@ -231,7 +231,7 @@ (define* (run-input-page text title
(add-component-callback
input-visible-cb
(lambda (component)
(lambda ()
(set-entry-flags input-entry
FLAG-PASSWORD
FLAG-ROLE-TOGGLE)))
@ -486,7 +486,7 @@ (define (choice->item str)
;; do nothing.
(add-component-callback
listbox
(lambda (component)
(lambda ()
(let* ((current-key (current-listbox-entry listbox))
(listbox-keys (map car keys))
(last-key (last-listbox-key))

57
gnu/installer/newt/parameters.scm Normal file
View file

@ -0,0 +1,57 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu installer newt parameters)
#:use-module (gnu installer proxy)
#:use-module (gnu installer steps)
#:use-module (gnu installer newt page)
#:use-module (guix i18n)
#:use-module (ice-9 match)
#:use-module (newt)
#:export (run-parameters-page))
(define (run-proxy-page)
(define proxy
(run-input-page (G_ "Please enter the HTTP proxy URL. If you enter an \
empty string, proxy usage will be disabled.")
(G_ "HTTP proxy configuration")
#:allow-empty-input? #t))
(if (string=? proxy "")
(clear-http-proxy)
(set-http-proxy proxy)))
(define (run-parameters-page keyboard-layout-selection)
"Run a parameters page allowing to change the keyboard layout"
(let* ((items
(list
(cons (G_ "Change keyboard layout") keyboard-layout-selection)
(cons (G_ "Configure HTTP proxy") run-proxy-page)))
(result
(run-listbox-selection-page
#:info-text (G_ "Please choose one of the following parameters or \
press ‘Back’ to go back to the installation process.")
#:title (G_ "Installation parameters")
#:listbox-items items
#:listbox-item->text car
#:sort-listbox-items? #f
#:listbox-height 6
#:button-text (G_ "Back"))))
(match result
((_ . proc)
(proc))
(_ #f))))

4
gnu/installer/newt/user.scm
View file

@ -89,7 +89,7 @@ (define (pad-label label)
(add-component-callback
entry-name
(lambda (component)
(lambda ()
(set-entry-text entry-home-directory
(string-append "/home/" (entry-value entry-name)))
@ -99,7 +99,7 @@ (define (pad-label label)
(add-component-callback
password-visible-cb
(lambda (component)
(lambda ()
(set-entry-flags entry-password
FLAG-PASSWORD
FLAG-ROLE-TOGGLE)))

45
gnu/installer/proxy.scm Normal file
View file

@ -0,0 +1,45 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu installer proxy)
#:use-module (gnu services herd)
#:export (set-http-proxy
clear-http-proxy))
(define-syntax-rule (with-silent-shepherd exp ...)
(parameterize ((shepherd-message-port
(%make-void-port "w")))
exp ...))
(define (set-http-proxy proxy)
(with-silent-shepherd
(with-shepherd-action 'guix-daemon
('set-http-proxy proxy)
result
result)))
(define (clear-http-proxy)
(with-silent-shepherd
(with-shepherd-action 'guix-daemon
('set-http-proxy)
result
result)))
;; Local Variables:
;; eval: (put 'with-silent-shepherd 'scheme-indent-function 0)
;; End:

14
gnu/installer/record.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -37,7 +37,9 @@ (define-module (gnu installer record)
installer-user-page
installer-partition-page
installer-services-page
installer-welcome-page))
installer-welcome-page
installer-parameters-menu
installer-parameters-page))
;;;
@ -61,7 +63,7 @@ (define-record-type* <installer>
(exit-error installer-exit-error)
;; procedure void -> void
(final-page installer-final-page)
;; procedure (layouts) -> (list layout variant)
;; procedure (layouts context) -> (list layout variant)
(keymap-page installer-keymap-page)
;; procedure: (#:key supported-locales iso639-languages iso3166-territories)
;; -> glibc-locale
@ -81,4 +83,8 @@ (define-record-type* <installer>
;; procedure void -> void
(services-page installer-services-page)
;; procedure (logo) -> void
(welcome-page installer-welcome-page))
(welcome-page installer-welcome-page)
;; procedure (menu-proc) -> void
(parameters-menu installer-parameters-menu)
;; procedure (keyboard-layout-selection) -> void
(parameters-page installer-parameters-page))

23
gnu/local.mk
View file

@ -28,6 +28,8 @@
# Copyright © 2019 Amin Bandali <bandali@gnu.org>
# Copyright © 2020 Brendan Tildesley <mail@brendan.scot>
# Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
# Copyright © 2020 R Veera Kumar <vkor@vkten.in>
# Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz
#
# This file is part of GNU Guix.
#
@ -319,6 +321,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/libusb.scm \
%D%/packages/libunwind.scm \
%D%/packages/lighting.scm \
%D%/packages/linphone.scm \
%D%/packages/linux.scm \
%D%/packages/lirc.scm \
%D%/packages/lisp.scm \
@ -343,6 +346,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/marst.scm \
%D%/packages/mate.scm \
%D%/packages/maths.scm \
%D%/packages/matrix.scm \
%D%/packages/maven.scm \
%D%/packages/mc.scm \
%D%/packages/mcrypt.scm \
@ -658,6 +662,7 @@ INSTALLER_MODULES = \
%D%/installer/locale.scm \
%D%/installer/newt.scm \
%D%/installer/parted.scm \
%D%/installer/proxy.scm \
%D%/installer/record.scm \
%D%/installer/services.scm \
%D%/installer/steps.scm \
@ -668,6 +673,7 @@ INSTALLER_MODULES = \
\
%D%/installer/newt/ethernet.scm \
%D%/installer/newt/final.scm \
%D%/installer/newt/parameters.scm \
%D%/installer/newt/hostname.scm \
%D%/installer/newt/keymap.scm \
%D%/installer/newt/locale.scm \
@ -761,6 +767,7 @@ dist_patch_DATA = \
%D%/packages/patches/bastet-change-source-of-unordered_set.patch \
%D%/packages/patches/bazaar-CVE-2017-14176.patch \
%D%/packages/patches/bc-fix-cross-compilation.patch \
%D%/packages/patches/beancount-disable-googleapis-fonts.patch \
%D%/packages/patches/beets-werkzeug-compat.patch \
%D%/packages/patches/beignet-correct-file-names.patch \
%D%/packages/patches/benchmark-unbundle-googletest.patch \
@ -768,10 +775,13 @@ dist_patch_DATA = \
%D%/packages/patches/bidiv-update-fribidi.patch \
%D%/packages/patches/binutils-boot-2.20.1a.patch \
%D%/packages/patches/binutils-loongson-workaround.patch \
%D%/packages/patches/binutils-mingw-w64-specify-timestamp.patch \
%D%/packages/patches/binutils-mingw-w64-reproducible-import-libraries.patch \
%D%/packages/patches/blender-2.79-newer-ffmpeg.patch \
%D%/packages/patches/blender-2.79-python-3.7-fix.patch \
%D%/packages/patches/bluez-CVE-2020-0556.patch \
%D%/packages/patches/byobu-writable-status.patch \
%D%/packages/patches/calibre-msgpack-compat.patch \
%D%/packages/patches/calibre-no-updates-dialog.patch \
%D%/packages/patches/calibre-remove-test-bs4.patch \
%D%/packages/patches/calibre-remove-test-sqlite.patch \
@ -1035,7 +1045,6 @@ dist_patch_DATA = \
%D%/packages/patches/hdf-eos5-remove-gctp.patch \
%D%/packages/patches/hdf-eos5-fix-szip.patch \
%D%/packages/patches/hdf-eos5-fortrantests.patch \
%D%/packages/patches/higan-remove-march-native-flag.patch \
%D%/packages/patches/hubbub-sort-entities.patch \
%D%/packages/patches/hurd-cross.patch \
%D%/packages/patches/hplip-remove-imageprocessor.patch \
@ -1070,6 +1079,7 @@ dist_patch_DATA = \
%D%/packages/patches/jfsutils-add-sysmacros.patch \
%D%/packages/patches/jfsutils-include-systypes.patch \
%D%/packages/patches/jsoncpp-fix-inverted-case.patch \
%D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \
%D%/packages/patches/kdbusaddons-kinit-file-name.patch \
%D%/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch \
%D%/packages/patches/libvirt-create-machine-cgroup.patch \
@ -1201,12 +1211,15 @@ dist_patch_DATA = \
%D%/packages/patches/mcrypt-CVE-2012-4426.patch \
%D%/packages/patches/mcrypt-CVE-2012-4527.patch \
%D%/packages/patches/libmemcached-build-with-gcc7.patch \
%D%/packages/patches/mediastreamer2-srtp2.patch \
%D%/packages/patches/mesa-skip-disk-cache-test.patch \
%D%/packages/patches/mescc-tools-boot.patch \
%D%/packages/patches/meson-for-build-rpath.patch \
%D%/packages/patches/metabat-fix-compilation.patch \
%D%/packages/patches/mhash-keygen-test-segfault.patch \
%D%/packages/patches/mingw-w64-6.0.0-gcc.patch \
%D%/packages/patches/mingw-w64-dlltool-temp-prefix.patch \
%D%/packages/patches/mingw-w64-reproducible-gendef.patch \
%D%/packages/patches/minisat-friend-declaration.patch \
%D%/packages/patches/minisat-install.patch \
%D%/packages/patches/mit-krb5-hurd.patch \
@ -1282,6 +1295,7 @@ dist_patch_DATA = \
%D%/packages/patches/p7zip-CVE-2016-9296.patch \
%D%/packages/patches/p7zip-CVE-2017-17969.patch \
%D%/packages/patches/p7zip-remove-unused-code.patch \
%D%/packages/patches/pam-krb5-CVE-2020-10595.patch \
%D%/packages/patches/pam-mount-luks2-support.patch \
%D%/packages/patches/pango-skip-libthai-test.patch \
%D%/packages/patches/pciutils-hurd-configure.patch \
@ -1351,6 +1365,7 @@ dist_patch_DATA = \
%D%/packages/patches/python-3-fix-tests.patch \
%D%/packages/patches/python-3.8-fix-tests.patch \
%D%/packages/patches/python-CVE-2018-14647.patch \
%D%/packages/patches/python-aiohttp-3.6.2-no-warning-fail.patch \
%D%/packages/patches/python-alembic-exceptions-cause.patch \
%D%/packages/patches/python-axolotl-AES-fix.patch \
%D%/packages/patches/python-cairocffi-dlopen-path.patch \
@ -1404,7 +1419,6 @@ dist_patch_DATA = \
%D%/packages/patches/readline-link-ncurses.patch \
%D%/packages/patches/readline-6.2-CVE-2014-2524.patch \
%D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \
%D%/packages/patches/reprotest-support-guix.patch \
%D%/packages/patches/ri-li-modernize_cpp.patch \
%D%/packages/patches/ripperx-missing-file.patch \
%D%/packages/patches/rpcbind-CVE-2017-8779.patch \
@ -1429,7 +1443,6 @@ dist_patch_DATA = \
%D%/packages/patches/scotch-integer-declarations.patch \
%D%/packages/patches/screen-hurd-path-max.patch \
%D%/packages/patches/sdl-libx11-1.6.patch \
%D%/packages/patches/sdl2-mesa-compat.patch \
%D%/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch \
%D%/packages/patches/seq24-rename-mutex.patch \
%D%/packages/patches/sharutils-CVE-2018-1000097.patch \
@ -1544,6 +1557,10 @@ dist_patch_DATA = \
%D%/packages/patches/xmoto-utf8.patch \
%D%/packages/patches/xmoto-remove-glext.patch \
%D%/packages/patches/xmoto-reproducible.patch \
%D%/packages/patches/xplanet-1.3.1-cxx11-eof.patch \
%D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch \
%D%/packages/patches/xplanet-1.3.1-libimage_gif.c.patch \
%D%/packages/patches/xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch \
%D%/packages/patches/xsane-fix-memory-leak.patch \
%D%/packages/patches/xsane-fix-pdf-floats.patch \
%D%/packages/patches/xsane-fix-snprintf-buffer-length.patch \

7
gnu/packages/admin.scm
View file

@ -33,6 +33,7 @@
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -1291,9 +1292,10 @@ (define-public sudo
;; XXX: The 'testsudoers' test series expects user 'root' to exist, but
;; the chroot's /etc/passwd doesn't have it. Turn off the tests.
#:tests? #f))
(native-inputs
`(("groff" ,groff)))
(inputs
`(("groff" ,groff)
("linux-pam" ,linux-pam)
`(("linux-pam" ,linux-pam)
("zlib" ,zlib)
("coreutils" ,coreutils)))
(home-page "https://www.sudo.ws/")
@ -2647,6 +2649,7 @@ (define-public pam-krb5
(uri (string-append
"https://archives.eyrie.org/software/kerberos/"
"pam-krb5-" version ".tar.xz"))
(patches (search-patches "pam-krb5-CVE-2020-10595.patch"))
(sha256
(base32
"1qjp8i1s9bz7g6kiqrkzzkxn5pfspa4sy53b6z40fqmdf9przdfb"))))

8
gnu/packages/algebra.scm
View file

@ -228,7 +228,7 @@ (define-public python-fpylll
(define-public pari-gp
(package
(name "pari-gp")
(version "2.11.2")
(version "2.11.3")
(source (origin
(method url-fetch)
(uri (string-append
@ -236,7 +236,7 @@ (define-public pari-gp
version ".tar.gz"))
(sha256
(base32
"0fck8ssmirl8fy7s4mspgrxjs5sag76xbshqlqzkcl3kqyrk4raa"))))
"1jd65h2psrmba2dx7rkf5qidf9ka0cwbsg20pd18k45ggr30l467"))))
(build-system gnu-build-system)
(native-inputs
`(("texlive" ,(texlive-union
@ -270,7 +270,7 @@ (define-public pari-gp
(define-public gp2c
(package
(name "gp2c")
(version "0.0.11pl2")
(version "0.0.11pl3")
(source (origin
(method url-fetch)
(uri (string-append
@ -278,7 +278,7 @@ (define-public gp2c
version ".tar.gz"))
(sha256
(base32
"0wqsf05wgkqvmmsx7jinvzdqav6rl56sr8haibgs31nzz4x9xz9g"))))
"0yymbrgyjw500hqgmkj5m4nmscd7c9rs9w2c96lxgrcyab8krhrm"))))
(build-system gnu-build-system)
(native-inputs `(("perl" ,perl)))
(inputs `(("pari-gp" ,pari-gp)))

4
gnu/packages/assembly.scm
View file

@ -259,7 +259,7 @@ (define-public libjit
(define-public rgbds
(package
(name "rgbds")
(version "0.3.10")
(version "0.4.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -268,7 +268,7 @@ (define-public rgbds
(file-name (git-file-name name version))
(sha256
(base32
"0752fbffxgxyf3jw2iij88l05dqhppgcxy7dvk82hp4wdg4cflpq"))))
"15680964nlsa83nqgxk7knxajn98lddz2hg6jnn8ffmnms5wdam7"))))
(build-system gnu-build-system)
(arguments
`(#:phases

124
gnu/packages/astronomy.scm
View file

@ -3,6 +3,8 @@
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 by Amar Singh <nly@disroot.org>
;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in>
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -25,22 +27,28 @@ (define-module (gnu packages astronomy)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix utils)
#:use-module (gnu packages autotools)
#:use-module (gnu packages image)
#:use-module (gnu packages compression)
#:use-module (gnu packages gettext)
#:use-module (gnu packages version-control)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages xiph)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages)
#:use-module (gnu packages algebra)
#:use-module (gnu packages lua)
#:use-module (gnu packages perl)
#:use-module (gnu packages autotools)
#:use-module (gnu packages compression)
#:use-module (gnu packages curl)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gl)
#:use-module (gnu packages qt)
#:use-module (gnu packages gtk)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
#:use-module (gnu packages image)
#:use-module (gnu packages lua)
#:use-module (gnu packages maths)
#:use-module (gnu packages netpbm)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages qt)
#:use-module (gnu packages version-control)
#:use-module (gnu packages xiph)
#:use-module (gnu packages xorg)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (srfi srfi-1))
@ -289,3 +297,95 @@ (define-public libnova
(license (list license:lgpl2.0+
license:gpl2+)))) ; examples/transforms.c & lntest/*.c
(define-public xplanet
(package
(name "xplanet")
(version "1.3.1")
(source
(origin
(method url-fetch)
(uri
(string-append
"mirror://sourceforge/xplanet/xplanet/"
version "/xplanet-" version ".tar.gz"))
(sha256
(base32 "1rzc1alph03j67lrr66499zl0wqndiipmj99nqgvh9xzm1qdb023"))
(patches
(search-patches
"xplanet-1.3.1-cxx11-eof.patch"
"xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch"
"xplanet-1.3.1-libimage_gif.c.patch"
"xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("libx11" ,libx11)
("libxscrnsaver" ,libxscrnsaver)
("libice" ,libice)
("freetype" ,freetype)
("pango" ,pango)
("giflib" ,giflib)
("libjpeg", libjpeg-turbo)
("libpng" ,libpng)
("libtiff" ,libtiff)
("netpbm" ,netpbm)
("zlib" ,zlib)))
(arguments
`(#:configure-flags
(let ((netpbm (assoc-ref %build-inputs "netpbm")))
(append (list
;; Give correct path for pnm.h header to configure script
(string-append "CPPFLAGS=-I" netpbm "/include/netpbm")
;; no nasa jpl cspice support
"--without-cspice" )))))
(home-page "http://xplanet.sourceforge.net/")
(synopsis "Planetary body renderer")
(description
"Xplanet renders an image of a planet into an X window or file.
All of the major planets and most satellites can be drawn and different map
projections are also supported, including azimuthal, hemisphere, Lambert,
Mercator, Mollweide, Peters, polyconic, orthographic and rectangular.")
(license license:gpl2+)))
(define-public gpredict
(package
(name "gpredict")
(version "2.2.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/csete/gpredict/releases"
"/download/v" version
"/gpredict-" version ".tar.bz2"))
(sha256
(base32 "0hwf97kng1zy8rxyglw04x89p0bg07zq30hgghm20yxiw2xc8ng7"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)))
(inputs
`(("curl" ,curl)
("glib" ,glib)
("goocanvas" ,goocanvas)
("gtk+" ,gtk+)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-tests
(lambda _
;; Remove reference to non-existent file.
(substitute* "po/POTFILES.in"
(("src/gtk-sat-tree\\.c")
""))
#t)))))
(synopsis "Satellite tracking and orbit prediction application")
(description
"Gpredict is a real-time satellite tracking and orbit prediction
application. It can track a large number of satellites and display their
position and other data in lists, tables, maps, and polar plots (radar view).
Gpredict can also predict the time of future passes for a satellite, and
provide you with detailed information about each pass.")
(home-page "http://gpredict.oz9aec.net/index.php")
(license license:gpl2+)))

67
gnu/packages/audio.scm
View file

@ -11,7 +11,7 @@
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018 okapi <okapi@firemail.cc>
;;; Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2018, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2018 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com>
@ -28,6 +28,7 @@
;;; Copyright © 2019 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
;;; Copyright © 2019 Hartmt Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -96,6 +97,7 @@ (define-module (gnu packages audio)
#:use-module (gnu packages sdl)
#:use-module (gnu packages serialization)
#:use-module (gnu packages telephony)
#:use-module (gnu packages linphone)
#:use-module (gnu packages tls)
#:use-module (gnu packages video)
#:use-module (gnu packages vim) ;xxd
@ -119,6 +121,45 @@ (define-module (gnu packages audio)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26))
(define-public vo-amrwbenc
(package
(name "vo-amrwbenc")
(version "0.1.3")
(source
(origin
(method url-fetch)
(uri
(string-append "https://sourceforge.net/projects/opencore-amr/files/"
name "/" name "-" version ".tar.gz"))
(sha256
(base32 "0klx3nkidc6b8aawchpk19n3xlrzgnc046w4gd0rdqphw28v6ljn"))))
(build-system gnu-build-system)
(synopsis "Adaptive Multi Rate Codec")
(description "VO-AMR is a library of VisualOn implementation of
Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec.")
(home-page "https://sourceforge.net/projects/opencore-amr/")
(license license:asl2.0)))
(define-public opencore-amr
(package
(name "opencore-amr")
(version "0.1.5")
(source
(origin
(method url-fetch)
(uri
(string-append "https://sourceforge.net/projects/opencore-amr/files/"
name "/" name "-" version ".tar.gz"))
(sha256
(base32 "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c"))))
(build-system gnu-build-system)
(synopsis "Adaptive Multi Rate Codec")
(description "OpenCore-AMR is a library of OpenCORE Framework
implementation of Adaptive Multi Rate Narrowband and Wideband
(AMR-NB and AMR-WB) speech codec.")
(home-page "https://sourceforge.net/projects/opencore-amr/")
(license license:asl2.0)))
(define-public alsa-modular-synth
(package
(name "alsa-modular-synth")
@ -153,10 +194,10 @@ (define-public alsa-modular-synth
("jack" ,jack-1)
("ladspa" ,ladspa)
("liblo" ,liblo)
("qtbase" ,qtbase)
("qttools" ,qttools)))
("qtbase" ,qtbase)))
(native-inputs
`(("pkg-config" ,pkg-config)
("qttools" ,qttools)
("gcc" ,gcc-5)))
(home-page "http://alsamodular.sourceforge.net/")
(synopsis "Realtime modular synthesizer and effect processor")
@ -3335,7 +3376,7 @@ (define-public filteraudio
(define-public gsm
(package
(name "gsm")
(version "1.0.18")
(version "1.0.19")
(source
(origin
(method url-fetch)
@ -3344,18 +3385,24 @@ (define-public gsm
"-" version ".tar.gz"))
(sha256
(base32
"041amvpz8cvxykl3pwqldrzxligmmzcg8ncdnxbg32rlqf3q1xh4"))))
"1xkha9ss5g5qnfaybi8il0mcvp8knwg9plgh8404vh58d0pna0s9"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "tst"
#:make-flags (list (string-append "INSTALL_ROOT=" %output))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'add-fpic-ccflag
(lambda _
;; The -fPIC compiler option is needed when building
;; mediastreamer.
(substitute* "Makefile"
(("^CCFLAGS.*" all)
(string-append all "CCFLAGS += -fPIC\n")))
#t))
(add-before 'install 'pre-install
(lambda _
(let ((out (assoc-ref %outputs "out")))
(substitute* "Makefile"
(("INSTALL_ROOT\t=")
(string-append "INSTALL_ROOT\t=\t" out)))
(mkdir-p (string-append out "/inc"))
(mkdir-p (string-append out "/man"))
(mkdir-p (string-append out "/man/man1"))
@ -3874,7 +3921,7 @@ (define-public libltc
(define-public redkite
(package
(name "redkite")
(version "0.6.2")
(version "0.8.0")
(source
(origin
(method git-fetch)
@ -3884,7 +3931,7 @@ (define-public redkite
(file-name (git-file-name name version))
(sha256
(base32
"1i874izajbdhlfacwwj84qrsxf7g4y6nblzxalrkzaap9sa7d1r6"))))
"1747w1kg8y9jbl11xi018d85dm38xk7843pz26sh0k5fdv87a10q"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f)) ;no tests included

30
gnu/packages/bioconductor.scm
View file

@ -1958,14 +1958,14 @@ (define-public r-interactionset
(define-public r-genomicinteractions
(package
(name "r-genomicinteractions")
(version "1.20.1")
(version "1.20.2")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "GenomicInteractions" version))
(sha256
(base32
"140bp7c8p079xh5wwxmrq3a73pm6mdc9czq5w2gzjml7dgrca38a"))))
"0mqb899wah5n7bp2lajhwy2zpqqhi18plza3i3m51rfl9n62smph"))))
(properties
`((upstream-name . "GenomicInteractions")))
(build-system r-build-system)
@ -1986,6 +1986,8 @@ (define-public r-genomicinteractions
("r-rtracklayer" ,r-rtracklayer)
("r-s4vectors" ,r-s4vectors)
("r-stringr" ,r-stringr)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://github.com/ComputationalRegulatoryGenomicsICL/GenomicInteractions/")
(synopsis "R package for handling genomic interaction data")
(description
@ -4077,14 +4079,14 @@ (define-public r-atacseqqc
(define-public r-gofuncr
(package
(name "r-gofuncr")
(version "1.6.0")
(version "1.6.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "GOfuncR" version))
(sha256
(base32
"0hmi13pz923fm95asys615rih63b1i2nvynfczr1zcsc9fzn4h35"))))
"1wk7ja6f5il8jx8v05ijzcs9pijp3b953h566ya66xp7dz5jg9rb"))))
(properties `((upstream-name . "GOfuncR")))
(build-system r-build-system)
(propagated-inputs
@ -4095,6 +4097,8 @@ (define-public r-gofuncr
("r-mapplots" ,r-mapplots)
("r-rcpp" ,r-rcpp)
("r-vioplot" ,r-vioplot)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://bioconductor.org/packages/GOfuncR/")
(synopsis "Gene ontology enrichment using FUNC")
(description
@ -5829,14 +5833,14 @@ (define-public r-opencyto
(define-public r-cytoml
(package
(name "r-cytoml")
(version "1.12.0")
(version "1.12.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "CytoML" version))
(sha256
(base32
"0m8x18wkvis85cawv7j07pk59w76wnzy93ia99gd24j82z4h97p1"))))
"0wgi8rwb4spxzd5xvs5amfr5g82ny2nad57j3nmhnhnj1cpirjxz"))))
(properties `((upstream-name . "CytoML")))
(build-system r-build-system)
(inputs
@ -5866,6 +5870,8 @@ (define-public r-cytoml
("r-runit" ,r-runit)
("r-xml" ,r-xml)
("r-yaml" ,r-yaml)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://github.com/RGLab/CytoML")
(synopsis "GatingML interface for cross platform cytometry data sharing")
(description
@ -5906,14 +5912,14 @@ (define-public r-flowsom
(define-public r-mixomics
(package
(name "r-mixomics")
(version "6.10.8")
(version "6.10.9")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "mixOmics" version))
(sha256
(base32
"0307vhx9ck24rxqbvq15815ssxcc226sl2la060n204b51wi9jaa"))))
"0b457yg8mwqlrn5l344w8qcj8v2ghlj1wdx1ysxbncqvqx7nvgig"))))
(properties `((upstream-name . "mixOmics")))
(build-system r-build-system)
(propagated-inputs
@ -5930,6 +5936,8 @@ (define-public r-mixomics
("r-rcolorbrewer" ,r-rcolorbrewer)
("r-reshape2" ,r-reshape2)
("r-tidyr" ,r-tidyr)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "http://www.mixOmics.org")
(synopsis "Multivariate methods for exploration of biological datasets")
(description
@ -7490,14 +7498,14 @@ (define-public r-biocset
(define-public r-biocworkflowtools
(package
(name "r-biocworkflowtools")
(version "1.12.0")
(version "1.12.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BiocWorkflowTools" version))
(sha256
(base32
"1v4bhnpdkmllm7aghms9b7369hkrgz7mn69wbrqg1x42pgkf30ad"))))
"0z28s572wg9qxv52dmixxz1xf1z3fyp2j7kzk0k32fp628918wr6"))))
(properties
`((upstream-name . "BiocWorkflowTools")))
(build-system r-build-system)
@ -7511,6 +7519,8 @@ (define-public r-biocworkflowtools
("r-rstudioapi" ,r-rstudioapi)
("r-stringr" ,r-stringr)
("r-usethis" ,r-usethis)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://bioconductor.org/packages/BiocWorkflowTools/")
(synopsis "Tools to aid the development of Bioconductor Workflow packages")
(description

31
gnu/packages/bioinformatics.scm
View file

@ -16,6 +16,7 @@
;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -7580,13 +7581,13 @@ (define-public r-genomeinfodbdata
(define-public r-genomeinfodb
(package
(name "r-genomeinfodb")
(version "1.22.0")
(version "1.22.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "GenomeInfoDb" version))
(sha256
(base32
"07zljs2mfi8rf31g903f43v2f7767xbnflfrx9qjnmgf7bm039x0"))))
"0phadr67yb4l25x41a9wg4pjy1wbxlk14jhidhz6g5n4z6x45qbm"))))
(properties
`((upstream-name . "GenomeInfoDb")))
(build-system r-build-system)
@ -7596,6 +7597,8 @@ (define-public r-genomeinfodb
("r-iranges" ,r-iranges)
("r-rcurl" ,r-rcurl)
("r-s4vectors" ,r-s4vectors)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://bioconductor.org/packages/GenomeInfoDb")
(synopsis "Utilities for manipulating chromosome identifiers")
(description
@ -7808,13 +7811,13 @@ (define-public r-annotationdbi
(define-public r-biomart
(package
(name "r-biomart")
(version "2.42.0")
(version "2.42.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "biomaRt" version))
(sha256
(base32
"0difh4dsccjzhpfkvajy2adh98ym9164gd6clnsnic6qr6sk86ss"))))
"0676s8aq9xj2pdrfk28kf5j69fmssn900k4vxrp11ghwjr8z24h7"))))
(properties
`((upstream-name . "biomaRt")))
(build-system r-build-system)
@ -7827,6 +7830,8 @@ (define-public r-biomart
("r-rappdirs" ,r-rappdirs)
("r-stringr" ,r-stringr)
("r-xml" ,r-xml)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://bioconductor.org/packages/biomaRt")
(synopsis "Interface to BioMart databases")
(description
@ -13549,17 +13554,27 @@ (define-public intervaltree
(define-public python-intervaltree
(package
(name "python-intervaltree")
(version "2.1.0")
(version "3.0.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "intervaltree" version))
(sha256
(base32
"02w191m9zxkcjqr1kv2slxvhymwhj3jnsyy3a28b837pi15q19dc"))))
"0wz234g6irlm4hivs2qzmnywk0ss06ckagwh15nflkyb3p462kyb"))))
(build-system python-build-system)
;; FIXME: error when collecting tests
(arguments '(#:tests? #f))
(arguments
`(#:phases
(modify-phases %standard-phases
;; pytest seems to have a check to make sure the user is testing
;; their checked-out code and not an installed, potentially
;; out-of-date copy. This is harmless here, since we just installed
;; the package, so we disable the check to avoid skipping tests
;; entirely.
(add-before 'check 'import-mismatch-error-workaround
(lambda _
(setenv "PY_IGNORE_IMPORTMISMATCH" "1")
#t)))))
(propagated-inputs
`(("python-sortedcontainers" ,python-sortedcontainers)))
(native-inputs

9
gnu/packages/bittorrent.scm
View file

@ -94,10 +94,13 @@ (define-public transmission
(string-append gui
"/bin/transmission-gtk"))
;; Move the '.desktop' file as well.
;; Move the '.desktop' and icon files as well.
(mkdir (string-append gui "/share"))
(rename-file (string-append out "/share/applications")
(string-append gui "/share/applications")))
(for-each
(lambda (dir)
(rename-file (string-append out "/share/" dir)
(string-append gui "/share/" dir)))
'("applications" "icons" "pixmaps")))
#t)))))
(inputs
`(("inotify-tools" ,inotify-tools)

2
gnu/packages/cdrom.scm
View file

@ -466,7 +466,7 @@ (define-public dvdstyler
("flex" ,flex)
("python" ,python-2)
("xmlto" ,xmlto)
("gettext" ,gnu-gettext)
("gettext" ,gettext-minimal)
("docbook-xml" ,docbook-xml)
("docbook-xsl" ,docbook-xsl)
("zip" ,zip)))

17
gnu/packages/cedille.scm
View file

@ -51,17 +51,24 @@ (define-public cedille
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-cedille-path-el
(add-after 'unpack 'patch-cedille-paths
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(substitute* "cedille-mode.el"
(("/usr/share/emacs/site-lisp/cedille-mode")
(string-append out "/share/emacs/site-lisp")))
(string-append
out "/share/emacs/site-lisp/cedille")))
(substitute* "cedille-mode/cedille-mode-info.el"
(("\\(concat cedille-path-el \"cedille-info-main.info\"\\)")
(string-append
"\"" out "/share/info/cedille-info-main.info.gz\"")))
#t)))
(add-after 'unpack 'copy-cedille-mode
(add-after 'patch-cedille-paths 'copy-cedille-mode
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lisp (string-append out "/share/emacs/site-lisp")))
(lisp
(string-append
out "/share/emacs/site-lisp/cedille/")))
(mkdir-p (string-append lisp "cedille-mode"))
(copy-recursively
"cedille-mode"
@ -104,6 +111,8 @@ (define-public cedille
(install-file "cedille" (string-append out "/bin"))
(install-file "core/cedille-core"
(string-append out "/bin"))
(install-file "docs/info/cedille-info-main.info"
(string-append out "/share/info"))
#t))))))
(home-page "https://cedille.github.io/")
(synopsis

48
gnu/packages/check.scm
View file

@ -30,6 +30,7 @@
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2019 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -1075,6 +1076,31 @@ (define-public python-pytest-timeout
timeout has been exceeded.")
(license license:expat)))
(define-public python-pytest-forked
(package
(name "python-pytest-forked")
(version "1.1.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pytest-forked" version))
(sha256
(base32
"000i4q7my2fq4l49n8idx2c812dql97qv6qpm2vhrrn9v6g6j18q"))))
(build-system python-build-system)
(propagated-inputs
`(("python-pytest" ,python-pytest)))
(native-inputs
`(("python-setuptools-scm" ,python-setuptools-scm)))
(home-page
"https://github.com/pytest-dev/pytest-forked")
(synopsis
"Run tests in isolated forked subprocesses")
(description
"Pytest plugin which will run each test in a subprocess and will report if
a test crashed the process.")
(license license:expat)))
(define-public python-scripttest
(package
(name "python-scripttest")
@ -2590,3 +2616,25 @@ (define-public python2-pyfakefs-bootstrap
(arguments
`(#:python ,python-2
#:tests? #f)))))
(define-public python-aiounittest
(package
(name "python-aiounittest")
(version "1.3.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "aiounittest" version))
(sha256
(base32
"1q4bhmi80smaa1lknvdna0sx3915naczlfna1fp435nf6cjyrjl1"))))
(build-system python-build-system)
(native-inputs
`(("python-coverage" ,python-coverage)
("python-nose" ,python-nose)))
(home-page
"https://github.com/kwarunek/aiounittest")
(synopsis "Test asyncio code more easily")
(description "Aiounittest is a library that helps write tests using
asynchronous code in Python (asyncio).")
(license license:expat)))

4
gnu/packages/chromium.scm
View file

@ -247,7 +247,7 @@ (define* (computed-origin-method gexp-promise hash-algo hash
#:system system
#:guile-for-build guile)))
(define %chromium-version "80.0.3987.149")
(define %chromium-version "80.0.3987.163")
(define %ungoogled-revision "516e2d990a50a4bbeb8c583e56333c2935e2af95")
(define %debian-revision "debian/80.0.3987.116-1")
(define package-revision "0")
@ -263,7 +263,7 @@ (define %chromium-origin
%chromium-version ".tar.xz"))
(sha256
(base32
"07icl3hgg1wjkmz88lbpjf6ll4xyi64spki1nmsy6899jgkxvgjh"))))
"0ikk4cgz3jgjhyncsvlqvlc03y7jywjpa6v34fwsjxs88flyzpdn"))))
(define %ungoogled-origin
(origin

20
gnu/packages/coq.scm
View file

@ -132,15 +132,17 @@ (define-public coq
(define-public proof-general
(package
(name "proof-general")
(version "4.2")
(version "4.4")
(source (origin
(method url-fetch)
(uri (string-append
"http://proofgeneral.inf.ed.ac.uk/releases/"
"ProofGeneral-" version ".tgz"))
(method git-fetch)
(uri (git-reference
(url (string-append
"https://github.com/ProofGeneral/PG"))
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"09qb0myq66fw17v4ziz401ilsb5xlxz1nl2wsp69d0vrfy0bcrrm"))))
"0bdfk91wf71z80mdfnl8hpinripndcjgdkz854zil6521r84nqk8"))))
(build-system gnu-build-system)
(native-inputs
`(("which" ,which)
@ -175,10 +177,6 @@ (define-public proof-general
(emacs (assoc-ref inputs "host-emacs")))
(define (coq-prog name)
(string-append coq "/bin/" name))
(emacs-substitute-variables "coq/coq.el"
("coq-prog-name" (coq-prog "coqtop"))
("coq-compiler" (coq-prog "coqc"))
("coq-dependency-analyzer" (coq-prog "coqdep")))
(substitute* "Makefile"
(("/sbin/install-info") "install-info"))
(substitute* "bin/proofgeneral"
@ -198,7 +196,7 @@ (define (coq-prog name)
(substitute* "Makefile"
((" [^ ]*\\.pdf") ""))
(apply invoke "make" "install-doc" make-flags))))))
(home-page "http://proofgeneral.inf.ed.ac.uk/")
(home-page "https://proofgeneral.github.io/ ")
(synopsis "Generic front-end for proof assistants based on Emacs")
(description
"Proof General is a major mode to turn Emacs into an interactive proof

123
gnu/packages/cran.scm
View file

@ -19,6 +19,8 @@
;;; Copyright © 2019 Nicolò Balzarotti <anothersms@gmail.com>
;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz>
;;; Copyright © 2020 Todor Kondić <tk.code@protonmail.com>
;;; Copyright © 2020 Danjela Lura <danielaluraa@gmail.com>
;;; Copyright © 2020 Naga Malleswari <nagamalli@riseup.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -100,6 +102,31 @@ (define-public r-clipr
the system clipboards.")
(license license:gpl3)))
(define-public r-oenb
(package
(name "r-oenb")
(version "0.0.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "oenb" version))
(sha256
(base32
"1x1jlqp6r27c4gb7wafzpmh5rq6yq61a2d395r5lsmv2g5jb4biz"))))
(properties `((upstream-name . "oenb")))
(build-system r-build-system)
(propagated-inputs
`(("r-dplyr" ,r-dplyr)
("r-xml" ,r-xml)))
(native-inputs `(("r-knitr" ,r-knitr)))
(home-page "https://github.com/franzmohr/oenb")
(synopsis "Tools for the OeNB Data Web Service")
(description
"Tools to access data from the data web service of the
@acronym{OeNB, Oesterreichische Nationalbank},
@url{https://www.oenb.at/en/Statistics/User-Defined-Tables/webservice.html}.")
(license license:gpl2+)))
(define-public r-scales
(package
(name "r-scales")
@ -425,14 +452,14 @@ (define-public r-reprex
(define-public r-callr
(package
(name "r-callr")
(version "3.4.2")
(version "3.4.3")
(source
(origin
(method url-fetch)
(uri (cran-uri "callr" version))
(sha256
(base32
"0bdlp0labwyfl36jqslj2g7zmw7zwr58v9gam435kiblhjimb8fc"))))
"1dc20gdawy9mhnc452qlshv2p4krs6c2gymvpv365mn141zjgdq1"))))
(build-system r-build-system)
(propagated-inputs
`(("r-r6" ,r-r6)
@ -3645,14 +3672,14 @@ (define-public r-laeken
(define-public r-vcd
(package
(name "r-vcd")
(version "1.4-6")
(version "1.4-7")
(source
(origin
(method url-fetch)
(uri (cran-uri "vcd" version))
(sha256
(base32
"0rjz49py5l6wnaimw6k8rcyzlvs8cyz5g2xwqj2qis92ly0l103z"))))
"16aj688nhlcvdxzfsqh4s375v8f8vl8997dl8h1xg29b42nv52gc"))))
(build-system r-build-system)
(propagated-inputs
`(("r-colorspace" ,r-colorspace)
@ -4160,14 +4187,14 @@ (define-public r-uuid
(define-public r-tinytex
(package
(name "r-tinytex")
(version "0.20")
(version "0.21")
(source
(origin
(method url-fetch)
(uri (cran-uri "tinytex" version))
(sha256
(base32
"0n8v8inpsc99r0snvqbjhqlc6nm9hxjsw120hrxc2mw03pa5fvkg"))))
"088zzc2v0izbcs45p19v547pi78vkr08ibpvvi1g9bkbya4x3mq9"))))
(build-system r-build-system)
(propagated-inputs
`(("r-xfun" ,r-xfun)))
@ -4435,14 +4462,14 @@ (define-public r-aggregation
(define-public r-quantmod
(package
(name "r-quantmod")
(version "0.4-16")
(version "0.4.17")
(source
(origin
(method url-fetch)
(uri (cran-uri "quantmod" version))
(sha256
(base32
"12l5br8abr1yagxqjnjvqzp79sqsv5vx56cxs37gk73r474f4vc2"))))
"1ss441rwlr88kz212m0wgx0hwgwi41rhy1jncg2lgqzqfvr5dzqa"))))
(build-system r-build-system)
(propagated-inputs
`(("r-curl" ,r-curl)
@ -4801,14 +4828,14 @@ (define-public r-egg
(define-public r-heatmaply
(package
(name "r-heatmaply")
(version "1.0.0")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "heatmaply" version))
(sha256
(base32
"0576gml3bcl7r1biigzj1rag2xzz422knbw7arc8d2gsakjj757g"))))
"133q8ir45vhfxs2lnd96k97g21ihg2arfhp349kmk339pk32fcxz"))))
(build-system r-build-system)
(propagated-inputs
`(("r-assertthat" ,r-assertthat)
@ -5776,14 +5803,14 @@ (define-public r-analytics
(define-public r-reticulate
(package
(name "r-reticulate")
(version "1.14")
(version "1.15")
(source
(origin
(method url-fetch)
(uri (cran-uri "reticulate" version))
(sha256
(base32
"0icb9zl9zlx75njv7y1dr450k0yw2n3q2jkr4nicnphdyfn69gkn"))))
"03dmnx9jhxx6vfbv2i5n6sln38kb9zkshz982pg3l9i4jjf3xns7"))))
(build-system r-build-system)
(inputs `(("python" ,python)))
(propagated-inputs
@ -5791,6 +5818,8 @@ (define-public r-reticulate
("r-jsonlite" ,r-jsonlite)
("r-matrix" ,r-matrix)
("r-rcpp" ,r-rcpp)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://github.com/rstudio/reticulate")
(synopsis "R interface to Python")
(description
@ -6013,14 +6042,14 @@ (define-public r-factominer
(define-public r-factoextra
(package
(name "r-factoextra")
(version "1.0.6")
(version "1.0.7")
(source
(origin
(method url-fetch)
(uri (cran-uri "factoextra" version))
(sha256
(base32
"0bpsbcmp6jpa9qk53dhfzghrz98dh0h0n68brl7rjz724yjbvhn8"))))
"1allvdjhd3pq8xz30b1cymwcik5iaahghrjrlnn54cwkfhfg0kv2"))))
(build-system r-build-system)
(propagated-inputs
`(("r-abind" ,r-abind)
@ -7176,13 +7205,13 @@ (define-public r-abctools
(define-public r-ggstance
(package
(name "r-ggstance")
(version "0.3.3")
(version "0.3.4")
(source
(origin
(method url-fetch)
(uri (cran-uri "ggstance" version))
(sha256
(base32 "0kdksay61hyb6612b07r84chh7a9aibjyclk3qcypvr9aang8hkh"))))
(base32 "0aqz3dn02cgij018a4sglqwrwr9dzzj12l8xr1064q7hfd4f64m1"))))
(build-system r-build-system)
(propagated-inputs
`(("r-ggplot2" ,r-ggplot2)
@ -8545,14 +8574,14 @@ (define-public r-bayestestr
(define-public r-performance
(package
(name "r-performance")
(version "0.4.4")
(version "0.4.5")
(source
(origin
(method url-fetch)
(uri (cran-uri "performance" version))
(sha256
(base32
"18h9y66cpsb3k6xnaya87vnpv2s3chf4bzsc4ym3n5sxhh41j7la"))))
"0j6wmnwhfdd3v1a17qmg491q50579knjzscmyr4yk3xr0jbsbg8x"))))
(build-system r-build-system)
(propagated-inputs
`(("r-bayestestr" ,r-bayestestr)
@ -8716,19 +8745,18 @@ (define-public r-gh
(define-public r-fs
(package
(name "r-fs")
(version "1.3.2")
(version "1.4.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "fs" version))
(sha256
(base32
"1w30bflx4d7a6f3dn96bf7s7v6aqpvz2yzzxal6qz9jyhb16bxaz"))))
"1ishdxrxy88w1lrn657a573wdra5v7xf1yfa1c4kss07rlynwrj7"))))
(build-system r-build-system)
(propagated-inputs
`(("r-rcpp" ,r-rcpp)))
(native-inputs
`(("pkg-config" ,pkg-config)))
`(("pkg-config" ,pkg-config)
("r-knitr" ,r-knitr)))
(home-page "https://fs.r-lib.org")
(synopsis "Cross-platform file system operations based on libuv")
(description
@ -9121,14 +9149,14 @@ (define-public r-mvabund
(define-public r-afex
(package
(name "r-afex")
(version "0.26-0")
(version "0.27-2")
(source
(origin
(method url-fetch)
(uri (cran-uri "afex" version))
(sha256
(base32
"0h3p1svgk1ap3lj08fi8nzdb3710h99bv150krf1x8wci1a0r1if"))))
"0qsmcddy4449qjj3ajmqvdiqdkhkswmz5dqf150wxwq897p3bvf2"))))
(build-system r-build-system)
(propagated-inputs
`(("r-car" ,r-car)
@ -9136,6 +9164,8 @@ (define-public r-afex
("r-lmertest" ,r-lmertest)
("r-pbkrtest" ,r-pbkrtest)
("r-reshape2" ,r-reshape2)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://afex.singmann.science/")
(synopsis "Analysis of factorial experiments")
(description
@ -9866,13 +9896,13 @@ (define-public r-colorramps
(define-public r-tidytree
(package
(name "r-tidytree")
(version "0.3.2")
(version "0.3.3")
(source
(origin
(method url-fetch)
(uri (cran-uri "tidytree" version))
(sha256
(base32 "0dx9jn19mfykn20camsmq1amlgg0w6z5hn5rdqygs1fk1l5aazad"))))
(base32 "05b53dap0f784kl6s1wgck6m7brwmy6ifqp7v5l06s1spfspagl6"))))
(build-system r-build-system)
(propagated-inputs
`(("r-ape" ,r-ape)
@ -11570,13 +11600,13 @@ (define-public r-ppls
(define-public r-huge
(package
(name "r-huge")
(version "1.3.4")
(version "1.3.4.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "huge" version))
(sha256
(base32 "07n3j1va2z4v30rj22cww72khgzbz2xsp0yc0qswlrwyxi4my5i3"))))
(base32 "11m80dnaxqw5v006q6kvhndl2y5ih5553fcqg4jcaljd8sp9xvvq"))))
(build-system r-build-system)
(propagated-inputs
`(("r-igraph" ,r-igraph)
@ -12712,14 +12742,14 @@ (define-public r-valr
(define-public r-rematch2
(package
(name "r-rematch2")
(version "2.1.0")
(version "2.1.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "rematch2" version))
(sha256
(base32
"00cznm6rk33b53w7zybkz7549bnydc66znpi5mb0xd24pmqp0rvq"))))
"13siaa8s2ji9q6hykhb2r34ag76335ypmbqr90xaqilbir0klhnh"))))
(build-system r-build-system)
(propagated-inputs
`(("r-tibble" ,r-tibble)))
@ -19351,14 +19381,14 @@ (define-public r-fracdiff
(define-public r-forecast
(package
(name "r-forecast")
(version "8.11")
(version "8.12")
(source
(origin
(method url-fetch)
(uri (cran-uri "forecast" version))
(sha256
(base32
"0ayidhnk9cxav2qi83jrvqlg2jh4zlf4lki4xw48gdqsmjvih9x1"))))
"1ycj5z4wd5a16nlcjy07dqm8jkih240xa02cn4wvysnnhkapyq7b"))))
(properties `((upstream-name . "forecast")))
(build-system r-build-system)
(propagated-inputs
@ -19503,14 +19533,14 @@ (define-public r-spacyr
(define-public r-snowballc
(package
(name "r-snowballc")
(version "0.6.0")
(version "0.7.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "SnowballC" version))
(sha256
(base32
"0b7pqdavf5jbf8si4ybnii5fff39p3b1rb5rym05j8s48hs7sqb1"))))
"1wwm71mp4b2mjb5985x782p6xj519dfrpd40qli7lmig6afyw3xi"))))
(properties `((upstream-name . "SnowballC")))
(build-system r-build-system)
(home-page "https://r-forge.r-project.org/projects/r-temis/")
@ -21027,3 +21057,26 @@ (define-public r-remoter
with R, controlling a remote R session (the server) from a local one (the
client).")
(license license:bsd-2)))
(define-public r-asd
(package
(name "r-asd")
(version "2.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "asd" version))
(sha256
(base32
"0p3r4qjam3sl3rpcilb0pgx4xx3ly71xqnvkv31vzjs885lgxz4l"))))
(properties `((upstream-name . "asd")))
(build-system r-build-system)
(propagated-inputs
`(("r-mvtnorm" ,r-mvtnorm)))
(home-page "https://cran.r-project.org/web/packages/asd")
(synopsis "Simulations for Adaptive Seamless Designs")
(description
"This package provdes means to run simulations for adaptive seamless
designs with and without early outcomes for treatment selection and
subpopulation type designs.")
(license license:gpl3)))

4
gnu/packages/crates-io.scm
View file

@ -1476,7 +1476,7 @@ (define-public rust-bstr-0.1
(define-public rust-bumpalo-3
(package
(name "rust-bumpalo")
(version "3.2.0")
(version "3.2.1")
(source
(origin
(method url-fetch)
@ -1485,7 +1485,7 @@ (define-public rust-bumpalo-3
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"0hpp4wfcn04gnl1ji4a80b85xwknsci81xqyllq174gq9z0rsd8z"))))
"11silgpsnfv6ir7j2nh7a69564f92vq20k9ha7zcbynpiav9vbhj"))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f ; cargo_readme_up_to_date test fails

22
gnu/packages/cross-base.scm
View file

@ -74,12 +74,6 @@ (define (cross p target)
`(cons ,(string-append "--target=" target)
,flags))))))
(define (package-with-patch original patch)
"Return package ORIGINAL with PATCH applied."
(package (inherit original)
(source (origin (inherit (package-source original))
(patches (list patch))))))
(define* (cross-binutils target #:optional (binutils binutils))
"Return a cross-Binutils for TARGET using BINUTILS."
(let ((binutils (package (inherit binutils)
@ -101,11 +95,17 @@ (define* (cross-binutils target #:optional (binutils binutils))
`(cons "--with-sysroot=/" ,flags)))))))
;; For Xtensa, apply Qualcomm's patch.
(cross (if (string-prefix? "xtensa-" target)
(package-with-patch binutils
(search-patch
"ath9k-htc-firmware-binutils.patch"))
binutils)
(cross (cond ((string-prefix? "xtensa-" target)
(package-with-patches binutils
(search-patches
"ath9k-htc-firmware-binutils.patch")))
((target-mingw? target)
(package-with-extra-patches
binutils
(search-patches
"binutils-mingw-w64-specify-timestamp.patch"
"binutils-mingw-w64-reproducible-import-libraries.patch")))
(else binutils))
target)))
(define (cross-gcc-arguments target xgcc libc)

80
gnu/packages/databases.scm
View file

@ -41,6 +41,7 @@
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -2205,6 +2206,41 @@ (define-public python-peewee
(define-public python2-peewee
(package-with-python2 python-peewee))
(define-public python-tortoise-orm
(package
(name "python-tortoise-orm")
(version "0.16.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "tortoise-orm" version))
(sha256
(base32
"01hbvfyxs2qd1mjc96aipwsdxxhydw8ww686r4gsf87bl6f98dvz"))))
(build-system python-build-system)
;; Disable tests for now. They pull in a lot of dependencies.
(arguments `(#:tests? #f))
(native-inputs
`(("python-ciso8601" ,python-ciso8601)
("python-asynctest" ,python-asynctest)
("python-nose2" ,python-nose2)))
(propagated-inputs
`(("python-aiosqlite" ,python-aiosqlite)
("python-pypika" ,python-pypika)
("python-typing-extensions"
,python-typing-extensions)))
(home-page
"https://github.com/tortoise/tortoise-orm")
(synopsis
"Easy async ORM for python, built with relations in mind")
(description
"Tortoise ORM is an easy-to-use asyncio ORM (Object Relational Mapper)
inspired by Django. Tortoise ORM was build with relations in mind and
admiration for the excellent and popular Django ORM. It’s engraved in its
design that you are working not with just tables, you work with relational
data.")
(license license:asl2.0)))
(define-public sqlcipher
(package
(name "sqlcipher")
@ -2716,6 +2752,29 @@ (define-public python-apsw
(define-public python2-apsw
(package-with-python2 python-apsw))
(define-public python-aiosqlite
(package
(name "python-aiosqlite")
(version "0.11.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "aiosqlite" version))
(sha256
(base32
"1f3zdldp9zgrw6qz5fsp3wa5zw73cjf139pj4vf24ryv895320jg"))))
(build-system python-build-system)
(native-inputs
`(("python-aiounittest" ,python-aiounittest)))
(home-page "https://github.com/jreese/aiosqlite")
(synopsis
"Asyncio bridge for sqlite3")
(description
"The package aiosqlite replicates the standard sqlite3 module, but with
async versions of all the standard connection and cursor methods, and context
managers for automatically closing connections.")
(license license:expat)))
(define-public python2-neo4j-driver
(package
(name "python2-neo4j-driver")
@ -3024,6 +3083,27 @@ (define-public python-sql
(define-public python2-sql
(package-with-python2 python-sql))
(define-public python-pypika
(package
(name "python-pypika")
(version "0.36.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "PyPika" version))
(sha256
(base32
"0qzn5vygirg52dlizm6ayzdc5llq8p2krrx0kymr236lrz89wqp8"))))
(build-system python-build-system)
(native-inputs
`(("python-parameterized" ,python-parameterized)))
(home-page "https://github.com/kayak/pypika")
(synopsis "SQL query builder API for Python")
(description
"PyPika is a python SQL query builder that exposes the full richness of
the SQL language using a syntax that reflects the resulting query.")
(license license:asl2.0)))
(define-public mongo-tools
(package
(name "mongo-tools")

3
gnu/packages/debug.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -119,11 +120,11 @@ (define-public c-reduce
(sha256
(base32 "0qx0zq8jxzx2as2zf0740g7kvgq163ayn3041di4vwk77490y76v"))))
(build-system gnu-build-system)
(native-inputs `(("flex" ,flex)))
(inputs
`(("astyle" ,astyle)
("llvm" ,llvm)
("clang" ,clang)
("flex" ,flex)
("indent" ,indent)
("perl" ,perl)
("exporter-lite" ,perl-exporter-lite)

3
gnu/packages/dico.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2015, 2016, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -63,13 +64,13 @@ (define-public dico
(lambda _
;; Test '71: append + dooffs + env' fails if $V is not 2.
(invoke "make" "check" "V=2"))))))
(native-inputs `(("groff" ,groff)))
(inputs
`(("m4" ,m4) ;used at run time
("pcre" ,pcre)
("python" ,python-2)
("guile" ,guile-2.2)
("gsasl" ,gsasl)
("groff" ,groff)
("readline" ,readline)
("zlib" ,zlib)
("wordnet" ,wordnet)

9
gnu/packages/diffoscope.scm
View file

@ -68,7 +68,7 @@ (define-module (gnu packages diffoscope)
#:use-module (ice-9 match))
(define-public diffoscope
(let ((version "137"))
(let ((version "138"))
(package
(name "diffoscope")
(version version)
@ -80,7 +80,7 @@ (define-public diffoscope
(file-name (git-file-name name version))
(sha256
(base32
"11llnh2h2mx3xygj4482ld1rnjnhszk4828pmcbi75kanxfrqzq6"))))
"1lsxwyqaaxmin8h06l0352f0kh0l9brbqfn0zv8hmb64bp5r20nr"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
@ -228,7 +228,7 @@ (define-public diffoscope
(define-public reprotest
(package
(name "reprotest")
(version "0.7.13")
(version "0.7.14")
(source
(origin
(method git-fetch)
@ -236,10 +236,9 @@ (define-public reprotest
(url "https://salsa.debian.org/reproducible-builds/reprotest.git")
(commit version)))
(file-name (git-file-name name version))
(patches (search-patches "reprotest-support-guix.patch"))
(sha256
(base32
"0jj9sqxbdpypnc0y8md352wwzh1by6nyhmx5fwqnvrbznrng332f"))))
"12d07xq5zx5dfbsgakm6zcn7hgf0h9f5kvfjqkiyak4ix5aa6xkf"))))
(inputs
`(("python-debian" ,python-debian)
("python-distro" ,python-distro)

5
gnu/packages/disk.scm
View file

@ -16,6 +16,7 @@
;;; Copyright © 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2020 Pkill -9 <pkill9@runbox.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -370,12 +371,12 @@ (define-public gparted
("parted" ,parted)
("glib" ,glib)
("gtkmm" ,gtkmm)
("libxml2" ,libxml2)
("yelp-tools" ,yelp-tools)))
("libxml2" ,libxml2)))
(native-inputs
`(("intltool" ,intltool)
("itstool" ,itstool)
("lvm2" ,lvm2) ; for tests
("yelp-tools" ,yelp-tools)
("pkg-config" ,pkg-config)))
(home-page "https://gparted.org/")
(synopsis "Partition editor to graphically manage disk partitions")

5
gnu/packages/docker.scm
View file

@ -503,6 +503,7 @@ (define-public docker
(replace 'configure
(lambda _
(setenv "DOCKER_GITCOMMIT" (string-append "v" ,%docker-version))
(setenv "VERSION" (string-append ,%docker-version "-ce"))
;; Automatically use bundled dependencies.
;; TODO: Unbundle - see file "vendor.conf".
(setenv "AUTO_GOPATH" "1")
@ -540,7 +541,9 @@ (define-public docker
(let* ((out (assoc-ref outputs "out"))
(out-bin (string-append out "/bin")))
(install-file "bundles/dynbinary-daemon/dockerd" out-bin)
(install-file "bundles/dynbinary-daemon/dockerd-dev" out-bin)
(install-file (string-append "bundles/dynbinary-daemon/dockerd-"
(getenv "VERSION"))
out-bin)
#t))))))
(inputs
`(("btrfs-progs" ,btrfs-progs)

1
gnu/packages/ebook.scm
View file

@ -104,6 +104,7 @@ (define-public calibre
(delete-file "resources/calibre-portable.sh")
#t))
(patches (search-patches "calibre-no-updates-dialog.patch"
"calibre-msgpack-compat.patch"
"calibre-remove-test-bs4.patch" ; TODO: fix test.
"calibre-remove-test-sqlite.patch" ; TODO: fix test.
"calibre-remove-test-unrar.patch"))))

787
gnu/packages/emacs-xyz.scm
View file

File diff suppressed because it is too large Load diff

49
gnu/packages/emulators.scm
View file

@ -197,7 +197,7 @@ (define-public dolphin-emu
"-DX11_FOUND=1")))
(native-inputs
`(("pkg-config" ,pkg-config)
("gettext" ,gnu-gettext)))
("gettext" ,gettext-minimal)))
(inputs
`(("alsa-lib" ,alsa-lib)
("ao" ,ao)
@ -311,28 +311,19 @@ (define-public emulation-station
(home-page "https://emulationstation.org")
(license license:expat))))
;; Note: higan v107 has been released, but as explained by the dialog that
;; appears after starting the new version, it's an experimental release. The
;; author recommends v106 for general use.
;;
;; When updating to v107 (or probably beyond), sdl will have to be replaced
;; with sdl2, and libxrandr will need to be added to inputs. The patch
;; `higan-remove-march-native-flag.patch' will not be necessary, since the flag
;; is now being added only for `platform=local', which is not the default.
(define-public higan
(package
(name "higan")
(version "106")
(version "110")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/byuu/higan/")
(commit (string-append "v" version))))
(url "https://github.com/higan-emu/higan.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1mxivf8124vz4hl0b0xa1yqv0z9m3i12v9psmbpqkprrbq0wbgn1"))
(patches (search-patches "higan-remove-march-native-flag.patch"))))
(base32 "11rvm53c3p2f6zk8xbyv2j51xp8zmqnch7zravhj3fk590qrjrr2"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -342,11 +333,12 @@ (define-public higan
("eudev" ,eudev)
("gtk+" ,gtk+-2)
("gtksourceview-2" ,gtksourceview-2)
("libxrandr" ,libxrandr)
("libxv" ,libxv)
("mesa" ,mesa)
("openal" ,openal)
("pulseaudio" ,pulseaudio)
("sdl" ,sdl)))
("sdl2" ,sdl2)))
(arguments
'(#:phases
(let ((build-phase (assoc-ref %standard-phases 'build))
@ -405,18 +397,19 @@ (define-public higan
(string-append "prefix=" (assoc-ref %outputs "out")))
;; There is no test suite.
#:tests? #f))
(home-page "https://byuu.org/higan")
(synopsis "Nintendo multi-system emulator")
(home-page "https://github.com/higan-emu/higan/")
(synopsis "Multi-system emulator")
(description
"higan (formerly bsnes) is an emulator for multiple Nintendo video game
consoles, including the Nintendo Entertainment System (NES/Famicom), Super
Nintendo Entertainment System (SNES/Super Famicom), Game Boy, Game Boy
Color (GBC), and Game Boy Advance (GBA). It also supports the subsystems
Super Game Boy, BS-X Satellaview, and Sufami Turbo.")
;; As noted in these files among more:
;; - icarus/icarus.cpp
;; - higan/emulator/emulator.hpp
(license license:gpl3)))
"higan is a multi-system emulator with an uncompromising focus on
accuracy and code readability.
It currently emulates the following systems: Famicom, Famicom Disk System,
Super Famicom, Super Game Boy, Game Boy, Game Boy Color, Game Boy Advance,
Game Boy Player, SG-1000, SC-3000, Master System, Game Gear, Mega Drive, Mega
CD, PC Engine, SuperGrafx, MSX, MSX2, ColecoVision, Neo Geo Pocket, Neo Geo
Pocket Color, WonderSwan, WonderSwan Color, SwanCrystal, Pocket Challenge
V2.")
(license license:gpl3+)))
(define-public mgba
(package
@ -1281,7 +1274,7 @@ (define-public scummvm
(define-public mame
(package
(name "mame")
(version "0.219")
(version "0.220")
(source
(origin
(method git-fetch)
@ -1290,7 +1283,7 @@ (define-public mame
(commit (apply string-append "mame" (string-split version #\.)))))
(file-name (git-file-name name version))
(sha256
(base32 "0s3nhkfa5c17ar1lzgvm20ndqain9llgqkab0ji5ycv2c85f06fl"))
(base32 "0x3yr195zi7xjr21p1c2l8c0vhg0a0af0mpz4i1w7q7r9krvcvz4"))
(modules '((guix build utils)))
(snippet
;; Remove bundled libraries.

17
gnu/packages/engineering.scm
View file

@ -15,6 +15,7 @@
;;; Copyright © 2019 Steve Sprang <scs@stevesprang.com>
;;; Copyright © 2019 John Soo <jsoo1@asu.edu>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -227,13 +228,13 @@ (define-public geda-gaf
("glib" ,glib)
("gtk" ,gtk+-2)
("guile" ,guile-2.0)
("desktop-file-utils" ,desktop-file-utils)
("shared-mime-info" ,shared-mime-info)
("m4" ,m4)
("pcb" ,pcb)
("python" ,python-2))) ; for xorn
(native-inputs
`(("pkg-config" ,pkg-config)
("desktop-file-utils" ,desktop-file-utils)
("perl" ,perl))) ; for tests
(home-page "http://geda-project.org/")
(synopsis "Schematic capture, netlister, symbols, symbol checker, and utils")
@ -266,8 +267,9 @@ (define-public lepton-eda
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("desktop-file-utils" ,desktop-file-utils)
("libtool" ,libtool)
("gettext" ,gnu-gettext)
("gettext" ,gettext-minimal)
("texinfo" ,texinfo)
("groff" ,groff)
("which" ,which)
@ -276,7 +278,6 @@ (define-public lepton-eda
`(("glib" ,glib)
("gtk" ,gtk+-2)
("guile" ,guile-2.2)
("desktop-file-utils" ,desktop-file-utils)
("shared-mime-info" ,shared-mime-info)
("m4" ,m4)
("pcb" ,pcb)))
@ -385,13 +386,13 @@ (define-public pcb
("gd" ,gd)
("gtk" ,gtk+-2)
("gtkglext" ,gtkglext)
("desktop-file-utils" ,desktop-file-utils)
("shared-mime-info" ,shared-mime-info)
("tk" ,tk)))
(native-inputs
`(("pkg-config" ,pkg-config)
("intltool" ,intltool)
("bison" ,bison)
("desktop-file-utils" ,desktop-file-utils)
("flex" ,flex)
;; For tests
("imagemagick" ,imagemagick)
@ -675,11 +676,11 @@ (define-public gerbv
(build-system gnu-build-system)
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
("desktop-file-utils" ,desktop-file-utils)
("pkg-config" ,pkg-config)))
(inputs
`(("cairo" ,cairo)
("gtk" ,gtk+-2)
("desktop-file-utils" ,desktop-file-utils)))
("gtk" ,gtk+-2)))
(home-page "http://gerbv.geda-project.org/")
(synopsis "Gerber file viewer")
(description
@ -856,7 +857,7 @@ (define-public kicad
(native-inputs
`(("boost" ,boost)
("desktop-file-utils" ,desktop-file-utils)
("gettext" ,gnu-gettext)
("gettext" ,gettext-minimal)
("kicad-i18l" ,kicad-i18l)
("pkg-config" ,pkg-config)
("swig" ,swig)
@ -903,7 +904,7 @@ (define kicad-i18l
(delete 'build)
(delete 'check))))
(native-inputs
`(("gettext" ,gnu-gettext)))
`(("gettext" ,gettext-minimal)))
(home-page "https://kicad-pcb.org/")
(synopsis "KiCad GUI translations")
(description "This package contains the po files that are used for the GUI

64
gnu/packages/finance.scm
View file

@ -16,6 +16,7 @@
;;; Copyright © 2019 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2019 Sebastian Schott <sschott@mailbox.org>
;;; Copyright © 2020 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2020 Christopher Lemmer Webber <cwebber@dustycloud.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -39,6 +40,7 @@ (define-module (gnu packages finance)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system cmake)
#:use-module (guix build-system emacs)
#:use-module (guix build-system python)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system go)
@ -1398,3 +1400,65 @@ (define-public bitcoin-unlimited
electronic cash system. This package provides a command line client and
a Qt GUI.")
(license license:expat)))
(define-public beancount
(package
(name "beancount")
(version "2.2.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "beancount" version))
(sha256
(base32
"0pcfl2rx2ng06i4f9izdpnlnb1k0rdzsckbzzn4cn4ixfzyssm0m"))
(patches (search-patches "beancount-disable-googleapis-fonts.patch"))))
(build-system python-build-system)
(arguments
`(#:tests? #f ; Says test is missing, not sure why
#:phases
(modify-phases %standard-phases
;; Not importing the googleapis package for now
(add-after 'unpack 'ignore-googleapis
(lambda _
(substitute* "setup.py"
(("'google-api-python-client',") ""))
#t)))))
(inputs
`(("python-beautifulsoup4" ,python-beautifulsoup4)
("python-bottle" ,python-bottle)
("python-chardet" ,python-chardet)
("python-dateutil" ,python-dateutil)
("python-lxml" ,python-lxml)
("python-magic" ,python-magic)
("python-ply" ,python-ply)
("python-requests" ,python-requests)))
(native-inputs
`(("python-pytest" ,python-pytest)))
(home-page "http://furius.ca/beancount")
(synopsis "Command-line double-entry accounting tool")
(description
"Beancount is a double-entry bookkeeping computer language that lets you
define financial transaction records in a text file, read them in memory,
generate a variety of reports from them, and provides a web interface.")
(license license:gpl2)))
;; The beancount source ships with elisp in a subdirectory
(define-public emacs-beancount
(package
(inherit beancount)
(name "emacs-beancount")
(build-system emacs-build-system)
(arguments
`(#:tests? #f ;no tests
#:phases
(modify-phases %standard-phases
(add-before 'install 'chdir-emacs
(lambda _
(chdir "editors/emacs")
#t)))))
(inputs '())
(native-inputs '())
(synopsis "Emacs mode for beancount")
(description
"Emacs-beancount is an Emacs mode for the Beancount accounting tool.")))

66
gnu/packages/fonts.scm
View file

@ -31,6 +31,7 @@
;;; Copyright © 2020 Damien Cassou <damien@cassou.me>
;;; Copyright © 2020 Amin Bandali <bandali@gnu.org>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
;;;
;;; This file is part of GNU Guix.
;;;
@ -559,17 +560,16 @@ (define-public font-wqy-microhei
(define-public font-rachana
(package
(name "font-rachana")
(version "7.0")
(version "7.0.3")
(source
(origin
(method url-fetch)
(uri (string-append
"https://gitlab.com/smc/rachana/repository/archive.tar.gz?ref=Version"
version))
(file-name (string-append name "-" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/smc/fonts/rachana")
(commit (string-append "Version" version))))
(sha256
(base32
"0jc091gshna6p1dd6lf507jxkgk6rsja835fc9dm71mcplq53bm1"))))
(base32 "0r100pvk56y1s38nbv24d78s8nd7dkblgasbn8s887dzj6dps23d"))
(file-name (git-file-name name version))))
(build-system font-build-system)
(home-page "https://smc.org.in")
(synopsis "Malayalam font")
@ -650,7 +650,7 @@ (define-public font-anonymous-pro-minus
(define-public font-gnu-unifont
(package
(name "font-gnu-unifont")
(version "12.1.04")
(version "13.0.01")
(source
(origin
(method url-fetch)
@ -660,7 +660,7 @@ (define-public font-gnu-unifont
(string-append "mirror://gnu/unifont/unifont-"
version "/unifont-" version ".tar.gz")))
(sha256
(base32 "1h5dyhg4j8sh4qpbwnsn34igb8mfapz5b3nf4k71hq1c5z3j0mcv"))))
(base32 "1svzm3xahb2m8r79ha9gb1z3zlckykx9d87cghswj7dxn9868j4b"))))
(build-system gnu-build-system)
(outputs '("out" ; TrueType version
"pcf" ; PCF (bitmap) version
@ -703,7 +703,7 @@ (define-public font-gnu-unifont
"GNU Unifont is a bitmap font covering essentially all of
Unicode's Basic Multilingual Plane. The package also includes
utilities to ease adding new glyphs to the font.")
(home-page "http://unifoundry.com/unifont.html")
(home-page "http://unifoundry.com/unifont/index.html")
(properties '((upstream-name . "unifont")))
(license license:gpl2+)))
@ -1178,6 +1178,50 @@ (define-public font-iosevka-slab
(sha256
(base32 "1rkmgi08kknc1fg54zpa6w92m3b3v7pc8cpwygz22kgd2h0mdrr8"))))))
(define-public font-iosevka-term
(package
(inherit font-iosevka)
(name "font-iosevka-term")
(version (package-version font-iosevka))
(source
(origin
(method url-fetch/zipbomb)
(uri (string-append "https://github.com/be5invis/Iosevka"
"/releases/download/v" version
"/02-iosevka-term-" version ".zip"))
(sha256
(base32
"1mxlb3qf64nykjd0x4gjfvib3k5kyv9ssv9iyzxxgk2z80bydz00"))))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'install 'make-files-writable
(lambda _
(for-each make-file-writable (find-files "." ".*"))
#t)))))))
(define-public font-iosevka-term-slab
(package
(inherit font-iosevka)
(name "font-iosevka-term-slab")
(version (package-version font-iosevka))
(source
(origin
(method url-fetch/zipbomb)
(uri (string-append "https://github.com/be5invis/Iosevka"
"/releases/download/v" version
"/06-iosevka-term-slab-" version ".zip"))
(sha256
(base32
"1gc16hih157qy6vpa8f88psq0fnksiigi3msqazc75zsm3z4kzqj"))))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'install 'make-files-writable
(lambda _
(for-each make-file-writable (find-files "." ".*"))
#t)))))))
(define-public font-go
(let ((commit "f03a046406d4d7fbfd4ed29f554da8f6114049fc")
(revision "1"))

169
gnu/packages/games.scm
View file

@ -48,6 +48,9 @@
;;; Copyright © 2017, 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020 Alberto Eleuterio Flores Guerrero <barbanegra+guix@posteo.mx>
;;; Copyright © 2020 Naga Malleswari <nagamalli@riseup.net>
;;; Copyright © 2020 Vitaliy Shatrov <D0dyBo0D0dyBo0@protonmail.com>
;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -172,6 +175,7 @@ (define-module (gnu packages games)
#:use-module (gnu packages xml)
#:use-module (gnu packages messaging)
#:use-module (gnu packages networking)
#:use-module (guix build-system copy)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix build-system go)
@ -1093,6 +1097,46 @@ (define-public knights
;; license. The whole package is released under GPLv3+.
(license license:gpl3+)))
(define-public gnome-chess
(package
(name "gnome-chess")
(version "3.36.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"1a9fgi749gy1f60vbcyrqqkab9vqs42hji70q73k1xx8rv0agmg0"))))
(build-system meson-build-system)
(arguments
'(#:glib-or-gtk? #t
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache
;; Don't create 'icon-theme.cache'.
(lambda _
(substitute* "meson_post_install.py"
(("gtk-update-icon-cache") "true"))
#t)))))
(inputs
`(("gtk+" ,gtk+)
("librsvg" ,librsvg)))
(native-inputs
`(("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin") ; for desktop-file-validate and appstream-util
("itstool" ,itstool)
("pkg-config" ,pkg-config)
("vala" ,vala)))
(home-page "https://wiki.gnome.org/Apps/Chess")
(synopsis "Chess board for GNOME")
(description "GNOME Chess provides a 2D board for playing chess games
against human or computer players. It supports loading and saving games in
Portable Game Notation. To play against a computer, install a chess engine
such as chess or stockfish.")
(license license:gpl3+)))
(define-public gnubg
(package
(name "gnubg")
@ -1250,10 +1294,11 @@ (define-public nethack
(string-join (string-split version #\.) "") "-src.tgz"))
(sha256
(base32 "1liyckjp34j354qnxc1zn9730lh1p2dabrg1hap24z6xnqx0rpng"))))
(native-inputs
`(("bison" ,bison)
("flex" ,flex)))
(inputs
`(("ncurses" ,ncurses)
("bison" ,bison)
("flex" ,flex)
("less" ,less)))
(build-system gnu-build-system)
(arguments
@ -6634,7 +6679,7 @@ (define-public quadrapassel
#t)))))
(native-inputs
`(("desktop-file-utils" ,desktop-file-utils) ;for desktop-file-validate
("gettext" ,gnu-gettext)
("gettext" ,gettext-minimal)
("glib" ,glib "bin") ;for glib-compile-resources
("itstool" ,itstool)
("libxml2" ,libxml2) ;for xmllint
@ -7139,7 +7184,7 @@ (define-public edgar
`(("pkg-config" ,pkg-config)
("autoconf" ,autoconf)
("automake" ,automake)
("gnu-gettext" ,gnu-gettext)
("gnu-gettext" ,gettext-minimal)
("libtool" ,libtool)
("which" ,which)))
(synopsis "2d action platformer game")
@ -10291,3 +10336,119 @@ (define-public 7kaa
capturing their buildings with spies, or offering opponents money for their
kingdom.")
(license license:gpl2+)))
(define-public neverball
;; Git version is 6-years younger than latest release.
(let ((commit "760a25d32a5fb0661b99426d4ddcb9ac9f3d1644")
(revision "1"))
(package
(name "neverball")
(version (git-version "1.6.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Neverball/neverball.git")
(commit commit)))
(sha256
(base32
"0bwh67df3lyf33bv710y25l3frjdd34j9b7gsjadwxviz6r1vpj5"))
(file-name (git-file-name name version))
(modules '((guix build utils)))
(snippet
'(begin
;; Octocat seems to be non-free. Oddly, Debian doesn't strip it.
(delete-file-recursively "data/ball/octocat")
#t))))
(build-system copy-build-system)
(arguments
`(#:install-plan
'(("neverball" "bin/")
("neverputt" "bin/")
("mapc" "bin/")
("data" "share/games/neverball/")
("locale" "share/")
("dist/" "share/games/neverball" #:include ("neverball_replay.png"
"neverlogos.svg"
"svg readme.txt"))
("dist/" "share/applications" #:include ("neverball.desktop"
"neverputt.desktop"))
("dist/neverball_16.png"
"/share/icons/hicolor/16x16/apps/neverball.png")
("dist/neverball_24.png"
"/share/icons/hicolor/24x24/apps/neverball.png")
("dist/neverball_32.png"
"/share/icons/hicolor/32x32/apps/neverball.png")
("dist/neverball_48.png"
"/share/icons/hicolor/48x48/apps/neverball.png")
("dist/neverball_64.png"
"/share/icons/hicolor/64x64/apps/neverball.png")
("dist/neverball_128.png"
"/share/icons/hicolor/128x128/apps/neverball.png")
("dist/neverball_256.png"
"/share/icons/hicolor/256x256/apps/neverball.png")
("dist/neverball_512.png"
"/share/icons/hicolor/512x512/apps/neverball.png")
("dist/neverputt_16.png"
"/share/icons/hicolor/16x16/apps/neverputt.png")
("dist/neverputt_24.png"
"/share/icons/hicolor/24x24/apps/neverputt.png")
("dist/neverputt_32.png"
"/share/icons/hicolor/32x32/apps/neverputt.png")
("dist/neverputt_48.png"
"/share/icons/hicolor/48x48/apps/neverputt.png")
("dist/neverputt_64.png"
"/share/icons/hicolor/64x64/apps/neverputt.png")
("dist/neverputt_128.png"
"/share/icons/hicolor/128x128/apps/neverputt.png")
("dist/neverputt_256.png"
"/share/icons/hicolor/256x256/apps/neverputt.png")
("dist/neverputt_512.png"
"/share/icons/hicolor/512x512/apps/neverputt.png")
("dist/" "share/man/man1" #:include ("mapc.1"))
("dist/" "share/man/man6" #:include ("neverball.6" "neverputt.6"))
("doc/" "share/doc/neverball")
("README.md" "share/doc/neverball/"))
#:phases
(modify-phases %standard-phases
(add-before 'install 'build
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(sdl (assoc-ref inputs "sdl")))
(invoke "make" "-j" (number->string (parallel-job-count))
"--environment-overrides"
"CC=gcc" "BUILD=release"
(string-append "DATADIR="
out
"/share/games/neverball/data")
(string-append "LOCALEDIR=" out "/share/locale")
(string-append "SDL_CPPFLAGS=-I"
sdl
"/include/SDL2/")))
#t))
(add-after 'install 'fix-some-broken-fonts
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/neverball")
`("LANG" = ("en_US.utf8")))
(wrap-program (string-append out "/bin/neverputt")
`("LANG" = ("en_US.utf8"))))
#t)))))
(native-inputs
`(("gettext" ,gettext-minimal))) ;for msgfmt
(inputs
`(("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libvorbis" ,libvorbis)
("physfs" ,physfs)
("sdl" ,(sdl-union (list sdl2 sdl2-ttf)))))
(home-page "https://neverball.org/")
(synopsis "3D floor-tilting game")
(description
"In the grand tradition of Marble Madness and Super Monkey Ball,
Neverball has you guide a rolling ball through dangerous territory. Balance
on narrow bridges, navigate mazes, ride moving platforms, and dodge pushers
and shovers to get to the goal. Race against the clock to collect coins to
earn extra balls. Also included is Neverputt, which is a 3D miniature golf
game.") ;thanks to Debian for description
(license license:gpl2+))))

5
gnu/packages/genimage.scm
View file

@ -41,7 +41,7 @@ (define-module (gnu packages genimage)
(define-public genimage
(package
(name "genimage")
(version "10")
(version "11")
(source (origin
(method git-fetch)
(uri (git-reference
@ -50,7 +50,7 @@ (define-public genimage
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
"0had00p2why2l1fl14mq7nbhmmfbd3na4qnnpg36akdy05g67jbn"))))
"15jmh17lvm3jw9c92bjarly7iwhmnfl322d91mprfv10ppb9ip54"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@ -149,6 +149,7 @@ (define-public genimage
(substitute* '("test/ext2test.dump"
"test/ext3test.dump"
"test/ext4test.dump"
"test/ext2test-percent.dump"
"test/mke2fs.dump")
(("root") "unknown"))
#t))

16
gnu/packages/geo.scm
View file

@ -1925,6 +1925,22 @@ (define-public qgis
(add-after 'wrap-python 'wrap-qt
(lambda* (#:key outputs #:allow-other-keys)
(wrap-qt-program (assoc-ref outputs "out") "qgis")
#t))
(add-after 'wrap-qt 'wrap-gis
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(saga (string-append (assoc-ref inputs "saga") "/bin"))
(grass-version ,(package-version grass))
(grass-majorminor (string-join
(list-head
(string-split grass-version #\.) 2)
""))
(grass (string-append (assoc-ref inputs "grass")
"/grass" grass-majorminor)))
(wrap-program (string-append out "/bin/qgis")
`("PATH" ":" prefix (,saga))
`("QGIS_PREFIX_PATH" = (,out))
`("GISBASE" = (,grass))))
#t)))))
(inputs
`(("exiv2" ,exiv2)

6
gnu/packages/gimp.scm
View file

@ -152,10 +152,16 @@ (define-public gimp
(list (string-append "--with-html-dir="
(assoc-ref %outputs "doc")
"/share/gtk-doc/html")
;; Prevent the build system from running 'gtk-update-icon-cache'
;; which is not needed during the build because Guix runs it at
;; profile creation time.
"ac_cv_path_GTK_UPDATE_ICON_CACHE=true"
;; Disable automatic network request on startup to check for
;; version updates.
"--disable-check-update"
;; ./configure requests not to annoy upstream with packaging bugs.
"--with-bug-report-url=https://bugs.gnu.org/guix")
#:phases

132
gnu/packages/gnome.scm
View file

@ -49,6 +49,7 @@
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 raingloom <raingloom@riseup.net>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Naga Malleswari <nagamalli@riseup.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -249,6 +250,49 @@ (define-public brasero
features to enable users to create their discs easily and quickly.")
(license license:gpl2+)))
(define-public mm-common
(package
(name "mm-common")
(version "1.0.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"1m4w33da9f4rx2d6kdj3ix3kl0gn16ml82v2mdn4hljr3q29nzdr"))))
(build-system meson-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "util/mm-common-prepare.in"
(("ln") (string-append (assoc-ref inputs "coreutils")
"/bin/ln"))
(("cp") (string-append (assoc-ref inputs "coreutils")
"/bin/cp"))
(("sed") (string-append (assoc-ref inputs "sed")
"/bin/sed"))
(("cat") (string-append (assoc-ref inputs "coreutils")
"/bin/cat")))
#t)))))
(native-inputs
`(("coreutils" ,coreutils)
("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)
("sed" ,sed)))
(inputs
`(("python" ,python)))
(synopsis "Module of GNOME C++ bindings")
(description "The mm-common module provides the build infrastructure
and utilities shared among the GNOME C++ binding libraries. Release
archives of mm-common include the Doxygen tag file for the GNU C++
Library reference documentation.")
(home-page "https://gitlab.gnome.org/GNOME/mm-common")
(license license:gpl2+)))
(define-public phodav
(package
(name "phodav")
@ -334,7 +378,7 @@ (define-public gnome-color-manager
(define-public gnome-online-miners
(package
(name "gnome-online-miners")
(version "3.30.0")
(version "3.34.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@ -342,7 +386,7 @@ (define-public gnome-online-miners
name "-" version ".tar.xz"))
(sha256
(base32
"0pjamwwzn5wqgihyss357dyl2q70r0bngnqmwsqawchx5f9aja9c"))))
"1n2jz9i8a42zwxx5h8j2gdy6q1vyydh4vl00r0al7w8jzdh24p44"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)
@ -536,7 +580,18 @@ (define-public gnome-initial-setup
(arguments
'(#:configure-flags '(;; Enable camera support for user selfie.
"-Dcheese=auto"
"-Dsystemd=false")))
"-Dsystemd=false")
#:phases (modify-phases %standard-phases
(add-after 'unpack 'set-gkbd-file-name
(lambda* (#:key inputs #:allow-other-keys)
;; Allow the "Preview" button in the keyboard layout
;; selection dialog to display the layout.
(let ((libgnomekbd (assoc-ref inputs "libgnomekbd")))
(substitute* "gnome-initial-setup/pages/keyboard/cc-input-chooser.c"
(("\"gkbd-keyboard-display")
(string-append "\"" libgnomekbd
"/bin/gkbd-keyboard-display")))
#t))))))
(native-inputs
`(("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
@ -565,7 +620,8 @@ (define-public gnome-initial-setup
("pwquality" ,libpwquality)
("rest" ,rest)
("upower" ,upower)
("webkitgtk" ,webkitgtk)))
("webkitgtk" ,webkitgtk)
("libgnomekbd" ,libgnomekbd)))
(synopsis "Initial setup wizard for GNOME desktop")
(description "This package provides a set-up wizard when a
user logs into GNOME for the first time. It typically provides a
@ -5037,7 +5093,7 @@ (define-public eog-plugins
(synopsis "Extensions for the Eye of GNOME image viewer")
(native-inputs
`(("pkg-config" ,pkg-config)
("gettext" ,gnu-gettext)))
("gettext" ,gettext-minimal)))
(inputs
`(("eog" ,eog)
("glib" ,glib)
@ -6042,7 +6098,7 @@ (define-public mutter
(define-public gnome-online-accounts
(package
(name "gnome-online-accounts")
(version "3.32.1")
(version "3.36.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@ -6050,7 +6106,7 @@ (define-public gnome-online-accounts
name "-" version ".tar.xz"))
(sha256
(base32
"08g9kdj8fzcgp76z2zsj9m7wfjks9z6xfrfrbfmcr69k40mapfx8"))))
"0bigfi225g1prnxpb9lcc1i7mdcrkplwb05vilc43jik12cn53qw"))))
(outputs '("out" "lib"))
(build-system glib-or-gtk-build-system)
(arguments
@ -7608,7 +7664,7 @@ (define-public gnome-default-applications
(let* ((out (assoc-ref %outputs "out"))
(apps (string-append out "/share/applications")))
(mkdir-p apps)
(call-with-output-file (string-append apps "/defaults.list")
(call-with-output-file (string-append apps "/gnome-mimeapps.list")
(lambda (port)
(format port "[Default Applications]\n")
(format port "inode/directory=org.gnome.Nautilus.desktop\n")
@ -7680,6 +7736,17 @@ (define-public gnome-weather
("gjs" ,gjs)
("gnome-desktop" ,gnome-desktop)
("libgweather" ,libgweather)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'install 'fix-desktop-file
;; FIXME: "gapplication launch org.gnome.Weather" fails for some reason.
;; See https://issues.guix.gnu.org/issue/39324.
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(applications (string-append out "/share/applications")))
(substitute* (string-append applications "/org.gnome.Weather.desktop")
(("Exec=.*") "Exec=gnome-weather\n"))))))))
(synopsis "Weather monitoring for GNOME desktop")
(description "GNOME Weather is a small application that allows you to
monitor the current weather conditions for your city, or anywhere in the
@ -8849,10 +8916,15 @@ (define-public lollypop
(base32 "1ng9492k8754vlqggbfsyzbmfdx4w17fzc4ad21fr92710na0w5a"))))
(build-system meson-build-system)
(arguments
`(#:imported-modules ((guix build python-build-system)
,@%meson-build-system-modules)
`(#:imported-modules
(,@%meson-build-system-modules
(guix build python-build-system))
#:modules
((guix build meson-build-system)
((guix build python-build-system) #:prefix python:)
(guix build utils))
#:glib-or-gtk? #t
#:tests? #f ; no test suite
#:tests? #f ; no test suite
#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-program
@ -8863,9 +8935,7 @@ (define-public lollypop
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
#t))
(add-after 'install 'wrap-python
(@@ (guix build python-build-system) wrap))
(add-after 'install 'wrap-glib-or-gtk
(@@ (guix build glib-or-gtk-build-system) wrap-all-programs)))))
(assoc-ref python:%standard-phases 'wrap)))))
(native-inputs
`(("intltool" ,intltool)
("itstool" ,itstool)
@ -9121,7 +9191,7 @@ (define-public workrave
("libxscrnsaver" ,libxscrnsaver)))
(native-inputs `(("boost" ,boost)
("pkg-config" ,pkg-config)
("gettext" ,gnu-gettext)
("gettext" ,gettext-minimal)
("autoconf" ,autoconf)
("autoconf-archive" , autoconf-archive)
("automake" ,automake)
@ -9818,7 +9888,7 @@ (define-public geary
`(("appstream-glib" ,appstream-glib)
("cmake-minimal" ,cmake-minimal)
("desktop-file-utils" ,desktop-file-utils)
("gettext" ,gnu-gettext)
("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
("itstool" ,itstool)
@ -9904,3 +9974,33 @@ (define-public parlatype
environment. Its main purpose is the manual transcription of spoken
audio files.")
(license license:gpl3+))))
(define-public jsonrpc-glib
(package
(name "jsonrpc-glib")
(version "3.34.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"0j05x4xv2cp3cbmp30m68z8g4rdw7b030ip4wszyfj9ya15v5kni"))))
(build-system meson-build-system)
(inputs
`(("json-glib" ,json-glib)
("glib" ,glib)))
(native-inputs
`(("pkg-config" ,pkg-config)
("glib:bin" ,glib "bin") ; for glib-genmarshal, etc.
("gobject-introspection" ,gobject-introspection)
("vala" ,vala)))
(home-page "https://gitlab.gnome.org/GNOME/jsonrpc-glib")
(synopsis "JSON-RPC library for GLib")
(description "Jsonrpc-GLib is a library to communicate with JSON-RPC based
peers in either a synchronous or asynchronous fashion. It also allows
communicating using the GVariant serialization format instead of JSON when
both peers support it. You might want that when communicating on a single
host to avoid parser overhead and memory-allocator fragmentation.")
(license license:lgpl2.1+)))

6
gnu/packages/gnunet.scm
View file

@ -180,13 +180,13 @@ (define-public libmicrohttpd
(define-public gnurl
(package
(name "gnurl")
(version "7.67.0")
(version "7.69.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gnunet/" name "-" version ".tar.Z"))
(uri (string-append "mirror://gnu/gnunet/gnurl-" version ".tar.gz"))
(sha256
(base32
"0ssjz2npr2zjvcpfz9qbaj92xc9ayg8wx4hyl132snl94qr2v670"))))
"0x8m26y3klndis6a28j8i0b7ab04d38q3rmlvgaqa65bjhlfdrp0"))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ; 1.8 MiB of man3 pages

12
gnu/packages/gnuzilla.scm
View file

@ -554,8 +554,8 @@ (define* (computed-origin-method gexp-promise hash-algo hash
#:system system
#:guile-for-build guile)))
(define %icecat-version "68.6.0-guix0-preview1")
(define %icecat-build-id "20200309000000") ;must be of the form YYYYMMDDhhmmss
(define %icecat-version "68.7.0-guix0-preview1")
(define %icecat-build-id "20200406000000") ;must be of the form YYYYMMDDhhmmss
;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
@ -577,11 +577,11 @@ (define icecat-source
"firefox-" upstream-firefox-version ".source.tar.xz"))
(sha256
(base32
"17qwfq9hwra8jarawy8k2sqfa6hdhwa9qk84ndr6gjvmxcy22a14"))))
"0w3mad0r4khcd7hfmm3xix9x6mp5yp8g8kyh18vanfnjqdls0gmd"))))
(upstream-icecat-base-version "68.6.0") ; maybe older than base-version
(upstream-icecat-base-version "68.7.0") ; maybe older than base-version
;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version))
(gnuzilla-commit "9dcb24d885eae5973eb2245b532b158c685d707a")
(gnuzilla-commit "d185c5a67506311e19440fd4b824a822ce840369")
(gnuzilla-source
(origin
(method git-fetch)
@ -593,7 +593,7 @@ (define icecat-source
(string-take gnuzilla-commit 8)))
(sha256
(base32
"1y3jmh055vmx44gsjgwxvwv3zcyvz8pc5mhgrwkzm0ybbwpp2pqi"))))
"09skws692qv5kbhj8bvy3prj7v0iyfz68xjck4vbfxkahldfppqx"))))
(makeicecat-patch
(local-file (search-patch "icecat-makeicecat.patch"))))

46
gnu/packages/golang.scm
View file

@ -221,7 +221,7 @@ (define-public go-1.13
(package
(inherit go-1.4)
(name "go")
(version "1.13.8")
(version "1.13.9")
(source
(origin
(method url-fetch)
@ -229,7 +229,7 @@ (define-public go-1.13
name version ".src.tar.gz"))
(sha256
(base32
"0d7cxffk72568h46srzswrxd0bsdip7amgkf499wzn6l6d3g0fxi"))))
"07gksk9194wa90xyd6yhagxfv7syvsx29bh8ypc4mg700vc1kfrl"))))
(arguments
(substitute-keyword-arguments (package-arguments go-1.4)
((#:phases phases)
@ -2186,6 +2186,34 @@ (define-public go-github-com-spaolacci-murmur3
required by Go's standard Hash interface.")
(license license:bsd-3)))
(define-public go-github-com-calmh-murmur3
(let ((commit "74e9af8f47ac56901c490d45546ca167b60c7066")
(revision "0"))
(package
(name "go-github-com-calmh-murmur3")
(version (git-version "1.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/calmh/murmur3.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0k8345ivx228qdbkl8bisd2wxwsinkb44ghba6r09538fr3fbr5w"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/calmh/murmur3"))
(home-page "https://github.com/calmh/murmur3")
(synopsis "Native MurmurHash3 Go implementation")
(description "Native Go implementation of Austin Appleby's third
MurmurHash revision (aka MurmurHash3).
Reference algorithm has been slightly hacked as to support the streaming mode
required by Go's standard Hash interface.")
(license license:bsd-3))))
(define-public go-github-com-multiformats-go-multihash
(let ((commit "97cdb562a04c6ef66d8ed40cd62f8fbcddd396d6")
(revision "0"))
@ -3463,9 +3491,19 @@ (define-public go-github-com-willf-bloom
"0ygan8pgcay7wx3cs3ja8rdqj7nly7v3and97ddcc66020jxchzg"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/willf/bloom"))
'(#:import-path "github.com/willf/bloom"
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-import-path
(lambda _
;; See 'go.mod' in the source distribution of Syncthing 1.4.1 for
;; more information.
;; <https://github.com/spaolacci/murmur3/issues/29>
(substitute* "src/github.com/willf/bloom/bloom.go"
(("spaolacci") "calmh"))
#t)))))
(propagated-inputs
`(("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3)
`(("go-github-com-calmh-murmur3" ,go-github-com-calmh-murmur3)
("go-github-com-willf-bitset" ,go-github-com-willf-bitset)))
(synopsis "Bloom filters in Go")
(description "This package provides a Go implementation of bloom filters,

10
gnu/packages/gps.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -86,10 +87,10 @@ (define-public gpsbabel
(inputs
`(("expat" ,expat)
("zlib" ,zlib)
("qtbase" ,qtbase)
("qttools" ,qttools)))
("qtbase" ,qtbase)))
(native-inputs
`(("which" ,which)
("qttools" ,qttools)
("libxml2" ,libxml2))) ;'xmllint' needed for the KML tests
(home-page "https://www.gpsbabel.org/")
(synopsis "Convert and exchange data with GPS and map programs")
@ -220,14 +221,14 @@ (define-public gpxsee
(define-public gpsd
(package
(name "gpsd")
(version "3.19")
(version "3.20")
(source
(origin
(method url-fetch)
(uri (string-append "https://download-mirror.savannah.gnu.org"
"/releases/gpsd/gpsd-" version ".tar.gz"))
(sha256
(base32 "0faz2mvk82hi7ispxxih07lhpyz5dazs4gcknym9piiabga29p97"))))
(base32 "0l2yz0yw9sil82lh2l4swkkldgmhzhv588n5lcavib4f0q2phahp"))))
(build-system scons-build-system)
(native-inputs
`(("bc" ,bc)
@ -235,6 +236,7 @@ (define-public gpsd
(inputs
`(("bluez" ,bluez)
("dbus" ,dbus)
("gtk+" ,gtk+)
("libcap" ,libcap)
("libusb" ,libusb)
("ncurses" ,ncurses)

46
gnu/packages/graphics.scm
View file

@ -19,6 +19,7 @@
;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -274,50 +275,55 @@ (define-public ilmbase
(define-public ogre
(package
(name "ogre")
(version "1.10.11")
(version "1.12.5")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/OGRECave/ogre.git")
(commit (string-append "v" version))))
(url "https://github.com/OGRECave/ogre.git")
(commit (string-append "v" version))
(recursive? #t))) ;for Dear ImGui submodule
(file-name (git-file-name name version))
(sha256
(base32
"072rzw9mxymbiypgkrbkk9h10rgly6gczik4dlmssk6xkpqckaqr"))))
(base32 "1sx0jsw4kmb4ycf62bgx3ygwv8k1cgjx52y47d7dk07z6gk6wpyj"))))
(build-system cmake-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-before 'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "Tests/CMakeLists.txt"
(("URL(.*)$")
(string-append "URL " (assoc-ref inputs "googletest-source"))))
;; CMakeLists.txt forces CMAKE_INSTALL_RPATH value. As
;; a consequence, we cannot suggest ours in configure flags. Fix
;; it.
(lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* "CMakeLists.txt"
(("set\\(CMAKE_INSTALL_RPATH .*") ""))
#t)))
#:configure-flags
(list "-DOGRE_BUILD_TESTS=TRUE"
(string-append "-DCMAKE_INSTALL_RPATH="
(assoc-ref %outputs "out") "/lib:"
(assoc-ref %outputs "out") "/lib/OGRE:"
(assoc-ref %build-inputs "googletest") "/lib")
"-DOGRE_INSTALL_DOCS=TRUE"
"-DOGRE_INSTALL_SAMPLES=TRUE"
"-DOGRE_INSTALL_SAMPLES_SOURCE=TRUE")))
(let* ((out (assoc-ref %outputs "out"))
(runpath
(string-join (list (string-append out "/lib")
(string-append out "/lib/OGRE"))
";")))
(list (string-append "-DCMAKE_INSTALL_RPATH=" runpath)
"-DOGRE_BUILD_DEPENDENCIES=OFF"
"-DOGRE_BUILD_TESTS=TRUE"
"-DOGRE_INSTALL_DOCS=TRUE"
"-DOGRE_INSTALL_SAMPLES=TRUE"
"-DOGRE_INSTALL_SAMPLES_SOURCE=TRUE"))))
(native-inputs
`(("boost" ,boost)
("doxygen" ,doxygen)
("googletest-source" ,(package-source googletest))
("googletest" ,googletest-1.8)
("pkg-config" ,pkg-config)))
(inputs
`(("font-dejavu" ,font-dejavu)
("freeimage" ,freeimage)
("freetype" ,freetype)
("glu" ,glu)
("googletest" ,googletest)
("sdl2" ,sdl2)
("libxaw" ,libxaw)
("libxrandr" ,libxrandr)
("pugixml" ,pugixml)
("sdl2" ,sdl2)
("tinyxml" ,tinyxml)
("zziplib" ,zziplib)))
(synopsis "Scene-oriented, flexible 3D engine written in C++")

47
gnu/packages/gtk.scm
View file

@ -23,6 +23,7 @@
;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net>
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -1972,3 +1973,49 @@ (define-public gtk-layer-shell
entire output. It supports all Layer Shell features including popups and
popovers.")
(license license:expat)))
(define-public goocanvas
(package
(name "goocanvas")
(version "2.0.4")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/goocanvas/"
(version-major+minor version)
"/goocanvas-" version ".tar.xz"))
(sha256
(base32 "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67"))))
(build-system gnu-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)
("glib-bin" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
("gtk-doc" ,gtk-doc)
("pkg-config" ,pkg-config)
("python" ,python)))
(inputs
`(("cairo" ,cairo)
("glib" ,glib)
("gtk+" ,gtk+)
("python-pygobject" ,python-pygobject)))
(arguments
`(#:configure-flags '("--disable-rebuilds"
"--disable-static")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-install-path
(lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* "configure"
(("\\(gi._overridesdir\\)")
(string-append "((gi._overridesdir).replace(\\\""
(assoc-ref inputs "python-pygobject")
"\\\", \\\""
(assoc-ref outputs "out")
"\\\"))")))
#t)))))
(synopsis "Canvas widget for GTK+")
(description "GooCanvas is a canvas widget for GTK+ that uses the cairo 2D
library for drawing.")
(home-page "https://wiki.gnome.org/GooCanvas")
(license license:lgpl2.0)))

4
gnu/packages/guile-xyz.scm
View file

@ -2590,7 +2590,7 @@ (define-public guile-gi
(setenv "DISPLAY" ":1")
#t)))))
(native-inputs
`(("gettext" ,gnu-gettext)
`(("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin") ; for glib-compile-resources
("libtool" ,libtool)
("pkg-config" ,pkg-config)
@ -2670,7 +2670,7 @@ (define-public emacsy
("automake" ,automake)
("bzip2" ,bzip2)
("guile" ,guile-2.2)
("gettext" ,gnu-gettext)
("gettext" ,gettext-minimal)
("libtool" ,libtool)
("perl" ,perl)
("pkg-config" ,pkg-config)

80
gnu/packages/guile.scm
View file

@ -6,7 +6,7 @@
;;; Copyright © 2015, 2017 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2019 Mathieu Othacehe <m.othacehe@gmail.com>
@ -419,40 +419,50 @@ (define-deprecated name package
(define-deprecated-guile3.0-package guile3.0-readline)
(define-public guile-for-guile-emacs
(package (inherit guile-2.2)
(name "guile-for-guile-emacs")
(version "20150510.d8d9a8d")
(source (origin
(method git-fetch)
(uri (git-reference
(url "git://git.hcoop.net/git/bpt/guile.git")
(commit "d8d9a8da05ec876acba81a559798eb5eeceb5a17")))
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
"00sprsshy16y8pxjy126hr2adqcvvzzz96hjyjwgg8swva1qh6b0"))))
(arguments
`(;; Tests aren't passing for now.
;; Obviously we should re-enable this!
#:tests? #f
,@(package-arguments guile-2.2)))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("flex" ,flex)
("texinfo" ,texinfo)
("gettext" ,gettext-minimal)
,@(package-native-inputs guile-2.2)))
;; Same as in guile-2.0
(native-search-paths
(list (search-path-specification
(variable "GUILE_LOAD_PATH")
(files '("share/guile/site/2.0")))
(search-path-specification
(variable "GUILE_LOAD_COMPILED_PATH")
(files '("lib/guile/2.0/site-ccache"
"share/guile/site/2.0")))))))
(let ((commit "15ca78482ac0dd2e3eb36dcb31765d8652d7106d")
(revision "1"))
(package (inherit guile-2.2)
(name "guile-for-guile-emacs")
(version (git-version "2.1.2" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "git://git.savannah.gnu.org/guile.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1l7ik4q4zk7vq4m3gnwizc0b64b1mdr31hxqlzxs94xaf2lvi7s2"))))
(arguments
(substitute-keyword-arguments (package-arguments guile-2.2)
((#:phases phases '%standard-phases)
`(modify-phases ,phases
(replace 'bootstrap
(lambda _
;; Disable broken tests.
;; TODO: Fix them!
(substitute* "test-suite/tests/gc.test"
(("\\(pass-if \"after-gc-hook gets called\"" m)
(string-append "#;" m)))
(substitute* "test-suite/tests/version.test"
(("\\(pass-if \"version reporting works\"" m)
(string-append "#;" m)))
;; Warning: Unwind-only `out-of-memory' exception; skipping pre-unwind handler.
;; FAIL: test-out-of-memory
(substitute* "test-suite/standalone/Makefile.am"
(("(check_SCRIPTS|TESTS) \\+= test-out-of-memory") ""))
(patch-shebang "build-aux/git-version-gen")
(invoke "sh" "autogen.sh")
#t))))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("flex" ,flex)
("texinfo" ,texinfo)
("gettext" ,gettext-minimal)
,@(package-native-inputs guile-2.2))))))
;;;

4
gnu/packages/haskell-apps.scm
View file

@ -341,14 +341,14 @@ (define-public ghcid
(define-public git-annex
(package
(name "git-annex")
(version "8.20200309")
(version "8.20200330")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"git-annex/git-annex-" version ".tar.gz"))
(sha256
(base32 "1yjb01jh5rccqg44nqh4iyxmbpkcpm6m82lnw7s0s2vizj8891p5"))))
(base32 "0xy0ld7kr4cfdl4g4yzvrzl5r60dcj33cxm28a4qz6nqm2yhd4sv"))))
(build-system haskell-build-system)
(arguments
`(#:configure-flags

25
gnu/packages/hurd.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2016, 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
@ -263,17 +263,22 @@ (define-public gnumach
(inherit gnumach-headers)
(name "gnumach")
(arguments
`(#:phases (modify-phases %standard-phases
(add-after 'install 'produce-image
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(boot (string-append out "/boot")))
(invoke "make" "gnumach.gz")
(install-file "gnumach.gz" boot)
#t))))))
(substitute-keyword-arguments (package-arguments gnumach-headers)
((#:phases phases '%standard-phases)
`(modify-phases %standard-phases
(add-after 'install 'produce-image
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(boot (string-append out "/boot")))
(invoke "make" "gnumach.gz")
(install-file "gnumach.gz" boot)
#t)))))))
(native-inputs
`(("mig" ,mig)
("perl" ,perl)))
("perl" ,perl)
("autoconf" ,autoconf)
("automake" ,automake)
("texinfo" ,texinfo-4)))
(supported-systems (cons "i686-linux" %hurd-systems))
(synopsis "Microkernel of the GNU system")
(description

3
gnu/packages/image-processing.scm
View file

@ -8,6 +8,7 @@
;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2018 Lprndn <guix@lprndn.info>
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -798,11 +799,11 @@ (define-public itk-snap
("vtk" ,vtk-6)
("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative)
("qttools" ,qttools)
("vxl" ,vxl-1)
("zlib" ,zlib)))
(native-inputs
`(("googletest" ,googletest)
("qttools" ,qttools)
("pkg-config" ,pkg-config)
("c3d-src"
,(let* ((commit "f521358db26e00002c911cc47bf463b043942ad3")

58
gnu/packages/image-viewers.scm
View file

@ -13,6 +13,7 @@
;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com>
;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2020 Peng Mei Yu <pengmeiyu@riseup.net>
;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in>
;;;
;;; This file is part of GNU Guix.
;;;
@ -595,3 +596,60 @@ (define-public imv
@end itemize\n")
(home-page "https://github.com/eXeC64/imv")
(license license:expat)))
(define-public qiv
(package
(name "qiv")
(version "2.3.1")
(source
(origin
(method url-fetch)
(uri (string-append "http://spiegl.de/qiv/download/qiv-"
version ".tgz"))
(sha256
(base32 "1rlf5h67vhj7n1y7jqkm9k115nfnzpwngj3kzqsi2lg676srclv7"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
;; That is required for testing.
("xorg-server" ,xorg-server-for-tests)))
(inputs
`(("imlib2" ,imlib2)
("glib" ,glib)
("gtk+" ,gtk+-2)
("lcms" ,lcms)
("libjpeg" ,libjpeg-turbo)
("libtiff" ,libtiff)
("libexif" ,libexif)
("libx11" ,libx11)
("libxext" ,libxext)))
(arguments
`(#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure script
(add-before 'install 'patch-file-start-xserver
(lambda* (#:key inputs #:allow-other-keys)
;; patch the file so that qiv runs and exits by itself
(substitute* "Makefile"
(("./qiv -f ./intro.jpg") "./qiv -f -C -s ./intro.jpg")
;; Fail the build when test fails.
(("echo \"-- Test Failed --\"")
"(echo \"-- Test Failed --\" ; false)"))
;; There must be a running X server and make install doesn't start one.
;; Therefore we must do it.
(system "Xvfb :1 &")
(setenv "DISPLAY" ":1")
#t)))
#:tests? #f ; there is no check target
#:make-flags
(list
(string-append "PREFIX=" (assoc-ref %outputs "out")))))
(home-page "http://spiegl.de/qiv/")
(synopsis "Graphical image viewer for X")
(description
"Quick Image Viewer is a small and fast GDK/Imlib2 image viewer.
Features include zoom, maxpect, scale down, fullscreen, slideshow, delete,
brightness/contrast/gamma correction, pan with keyboard and mouse, flip,
rotate left/right, jump/forward/backward images, filename filter and use it
to set X desktop background.")
(license license:gpl2)))

61
gnu/packages/image.scm
View file

@ -24,6 +24,7 @@
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in>
;;;
;;; This file is part of GNU Guix.
;;;
@ -45,6 +46,7 @@ (define-module (gnu packages image)
#:use-module (gnu packages algebra)
#:use-module (gnu packages assembly)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages cmake)
@ -1629,7 +1631,7 @@ (define-public gpick
(build-system scons-build-system)
(native-inputs
`(("boost" ,boost)
("gettext" ,gnu-gettext)
("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)))
(inputs
`(("expat" ,expat)
@ -1970,7 +1972,7 @@ (define-public icoutils
(define-public libavif
(package
(name "libavif")
(version "0.5.6")
(version "0.6.3")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1979,7 +1981,7 @@ (define-public libavif
(file-name (git-file-name name version))
(sha256
(base32
"15g76j9vb88q1v3azscph8im8714zdl70bni0al4ww9v80vhqpkd"))))
"0fn2mcpvzw6h9sv8h0icbz10i8ihzzf5d5mx3fc4pvhicyz4syq8"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags '("-DAVIF_CODEC_AOM=ON" "-DAVIF_CODEC_DAV1D=ON"
@ -2009,3 +2011,56 @@ (define-public libavif
(home-page "https://github.com/AOMediaCodec/libavif")
(license (list license:bsd-2 ; libavif itself
license:expat)))) ; cJSON in the test suite
(define-public mtpaint
(let ((commit "03b1b0938067b88d86d9f1b1088730f1934d411e")
(revision "1"))
(package
(name "mtpaint")
;; The author neither releases tarballs nor uses git version tags.
;; Instead, author puts version in git commit title.
(version (git-version "3.49.25" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/wjaguar/mtPaint/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0izm2wvj26566fd8mqvypr7bmv7jnq8qhp4760m7z2wrc4y8pjn1"))))
(build-system gnu-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)
("which" ,which)))
(inputs
`(("imlib2" ,imlib2)
("libtiff" ,libtiff)
("libpng" ,libpng)
("libungif", libungif)
("libjpeg", libjpeg-turbo)
("libwebp" ,libwebp)
("openjpeg" ,openjpeg)
("lcms" ,lcms)
("zlib", zlib)
("glib" ,glib)
;; support for gtk3 is in testing stage
("gtk+" ,gtk+-2)))
(arguments
`(#:configure-flags
(list
;; internationalized version
"intl"
;; install man page
"man")
;; no check target
#:tests? #f))
(home-page "http://mtpaint.sourceforge.net/")
(synopsis "Create pixel art and manipulate digital images")
(description
"Mtpaint is a graphic editing program which uses the GTK+ toolkit.
It can create and edit indexed palette or 24bit RGB images, offers basic
painting and palette manipulation tools. It also handles JPEG, JPEG2000,
GIF, TIFF, WEBP, BMP, PNG, XPM formats.")
(license license:gpl3+))))

42
gnu/packages/java.scm
View file

@ -12,6 +12,8 @@
;;; Copyright © 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019, 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -106,6 +108,44 @@ (define-module (gnu packages java)
;; build framework. We then build the more recent JDKs Icedtea 2.x and
;; Icedtea 3.x.
(define-public libantlr3c
(package
(name "libantlr3c")
(version "3.4")
(source
(origin
(method url-fetch)
(uri
(string-append "https://www.antlr3.org/download/C/"
name "-" version ".tar.gz"))
(sha256
(base32 "0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags (list "--enable-debuginfo" "--disable-static")
#:phases (modify-phases %standard-phases
(replace 'configure
(lambda* (#:key build target native-inputs inputs outputs
(configure-flags '()) out-of-source? system
#:allow-other-keys)
(let ((configure (assoc-ref %standard-phases 'configure))
(enable-64bit? (member system '("aarch64-linux"
"x86_64-linux"
"mips64el-linux"))))
(configure #:build build #:target target
#:native-inputs native-inputs
#:inputs inputs #:outputs outputs
#:configure-flags `(,(if enable-64bit?
"--enable-64bit"
'())
,@configure-flags)
#:out-of-source? out-of-source?)))))))
(synopsis "ANTLR C Library")
(description "LIBANTLR3C provides run-time C libraries for ANTLR3 (ANother
Tool for Language Recognition v3).")
(home-page "https://www.antlr3.org/")
(license license:bsd-3)))
(define jikes
(package
(name "jikes")
@ -7167,7 +7207,7 @@ (define antlr3-bootstrap
(inputs
`(("junit" ,java-junit)))))
(define antlr3-3.3
(define-public antlr3-3.3
(package
(inherit antlr3)
(name "antlr3")

551
gnu/packages/julia.scm
View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
@ -28,6 +29,7 @@ (define-module (gnu packages julia)
#:use-module (gnu packages algebra)
#:use-module (gnu packages base)
#:use-module (gnu packages compression)
#:use-module (gnu packages curl)
#:use-module (gnu packages elf)
#:use-module (gnu packages gcc)
#:use-module (gnu packages llvm)
@ -41,29 +43,30 @@ (define-module (gnu packages julia)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages textutils)
#:use-module (gnu packages ssh)
#:use-module (gnu packages tls)
#:use-module (gnu packages version-control)
#:use-module (gnu packages wget)
#:use-module (ice-9 match))
(define libuv-julia
(let ((commit "26dbe5672c33fc885462c509fe2a9b36f35866fd")
(revision "6"))
;; When upgrading Julia, also upgrade this.
;; Get the commit from https://github.com/JuliaLang/julia/blob/v1.1.1/deps/libuv.version
(let ((commit "35b1504507a7a4168caae3d78db54d1121b121e1")
(revision "1"))
;; When upgrading Julia, also upgrade this. Get the commit from
;; https://github.com/JuliaLang/julia/blob/v1.3.1/deps/libuv.version
(package
(inherit libuv)
(name "libuv-julia")
(version (string-append "1.9.0-" revision "." (string-take commit 8)))
(version (git-version "2.0.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/JuliaLang/libuv.git")
(commit commit)))
(url "https://github.com/JuliaLang/libuv.git")
(commit commit)))
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
"17pn2xmqaramilx897s9grs966i5246gi6sric5alch4g9j4685n"))))
"0dn3v6fdp1z382pqg3nhjzk60l61ky9b65mfgaj29fv2da95rwjs"))))
(build-system gnu-build-system)
(arguments
(substitute-keyword-arguments (package-arguments libuv)
@ -72,93 +75,115 @@ (define libuv-julia
(delete 'autogen)))))
(home-page "https://github.com/JuliaLang/libuv"))))
(define (llvm-patch-url version name)
(string-append "https://raw.githubusercontent.com/JuliaLang/julia/v" version
"/deps/patches/" name))
(define libunwind-julia
;; The Julia projects requires their patched version.
;; Get from https://github.com/JuliaLang/julia/tree/master/deps/patches
(package
(inherit libunwind)
(name "libunwind-julia")
(version "1.3.1")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://savannah/libunwind/libunwind-"
version ".tar.gz"))
(sha256
(base32
"1y0l08k6ak1mqbfj6accf9s5686kljwgsl4vcqpxzk5n74wpm6a3"))
(patches
(list
(julia-patch "libunwind-prefer-extbl"
"0lr4dafw8qyfh8sw8hhbwkql1dlhqv8px7k81y2l20hhxfgnh2m1")
(julia-patch "libunwind-static-arm"
"1jk3bmiw61ypcchqkk1fyg5wh8wpggk574wxyfyaic870zh3lhgq")))))
(home-page "https://github.com/JuliaLang/tree/master/deps/")))
(define (llvm-patch name sha)
(let ((version "1.1.1"))
(define (julia-patch-url version name)
(string-append "https://raw.githubusercontent.com/JuliaLang/julia/v" version
"/deps/patches/" name))
(define (julia-patch name sha)
(let ((version "1.3.1"))
(origin (method url-fetch)
(uri (llvm-patch-url version name))
(sha256 (base32 sha))
(file-name name))))
(uri (julia-patch-url version name))
(sha256 (base32 sha))
(file-name name))))
(define llvm-julia
(package
(inherit llvm-6)
(name "llvm-julia")
(source (origin
(method url-fetch)
(uri "http://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz")
(sha256
(base32
"1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn"))
(inherit (package-source llvm-6))
;; Those patches are inside the Julia source repo.
;; They are _not_ Julia specific (https://github.com/julialang/julia#llvm)
;; but they are required to build Julia.
;; Discussion: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919628
(patches
(list
(llvm-patch "llvm-6.0-D44650.patch"
"1336q4vqayr94wdcnlmcxh90mjdh34dzw9x2cbiqjnx9b1j8fxyb")
(llvm-patch "llvm-6.0-DISABLE_ABI_CHECKS.patch"
"014fawd1ba7yckalypfld22zgic87x9nx3cim42zrwygywd36pyg")
(llvm-patch "llvm-6.0-NVPTX-addrspaces.patch"
"1qdi2zmrjsrj0h84zv2vyly2hjcn4f67mfy0s1q353g4v4jkscqc")
(llvm-patch "llvm-6.0.0_D27296-libssp.patch"
"0s5hi2r1j63i8m6ig1346crx2aiv9f7rgb3mg80kw1wx5y7pdpfh")
(llvm-patch "llvm-D27629-AArch64-large_model_6.0.1.patch"
"1qrshmlqvnasdyc158vfn3hnbigqph3lsq7acb9w8lwkpnnm2j4z")
(llvm-patch "llvm-D34078-vectorize-fdiv.patch"
"1696hg84a0jxcnggvqsc2cdp271hf9a44p4qsd078qm1mfawkaay")
(llvm-patch "llvm-D42262-jumpthreading-not-i1.patch"
"1c8w210gwidbnkkw8anp17dk5pnxws2fl3mb2qxh7y9wzfpixgaq")
(llvm-patch "llvm-D44892-Perf-integration.patch"
"0r37jd0ssh2k1pndkfd5blgpg9z90im4vlzprhb0n0wwz45g4b05")
(llvm-patch "llvm-D46460.patch"
"1miqgswdc0qvbaf4571c2xkxyp9ais06b1bcpa83sq22vr4hbsfb")
(llvm-patch "llvm-D49832-SCEVPred.patch"
"0v5c88hgqj6dymv3j86ca5mhpqab5fbnrvjiw1nvnrnya9l4dlbn")
(llvm-patch "llvm-D50010-VNCoercion-ni.patch"
"0iblb3q1xixwrb12jpb89h3ywmqmzdp6aqp416j4ncwakyjhhfkp")
(llvm-patch "llvm-D50167-scev-umin.patch"
"1f2rakcnnyhr7w10k7gqg0k0491pyvx5ijplivw557f714ys3q6v")
(llvm-patch "llvm-OProfile-line-num.patch"
"1jvbbmwyags0xfwamb13qrf3rgcz9i1r03m9lava7swag8xb78c7")
(llvm-patch "llvm-PPC-addrspaces.patch"
"1f23nhsxh2s3jskbgs7da9nwg3s1hrkbk5aahl08x41wi3mny01p")
(llvm-patch "llvm-rL323946-LSRTy.patch"
"10cz3vy1yw0w643z7xx021wa4kymx9fcm3bjg61s6vzdqd6d9fns")
(llvm-patch "llvm-rL326967-aligned-load.patch"
"04jxnv32yj5x17hqhi8g2p8rhgp38gmjzr871w7z8s44pq10v9v4")
(llvm-patch "llvm-rL327898.patch"
"15ah49gbsll23z28kpyahi5vl0fh3fkxcgd1zmxxdcl96s3x8bnq")))))
(map (match-lambda
((name hash)
(julia-patch name hash)))
(list
'("llvm-6.0-D44650"
"1336q4vqayr94wdcnlmcxh90mjdh34dzw9x2cbiqjnx9b1j8fxyb")
'("llvm-6.0-DISABLE_ABI_CHECKS"
"014fawd1ba7yckalypfld22zgic87x9nx3cim42zrwygywd36pyg")
'("llvm-6.0-NVPTX-addrspaces"
"1qdi2zmrjsrj0h84zv2vyly2hjcn4f67mfy0s1q353g4v4jkscqc")
'("llvm-6.0.0_D27296-libssp"
"0s5hi2r1j63i8m6ig1346crx2aiv9f7rgb3mg80kw1wx5y7pdpfh")
'("llvm-D27629-AArch64-large_model_6.0.1"
"1qrshmlqvnasdyc158vfn3hnbigqph3lsq7acb9w8lwkpnnm2j4z")
'("llvm-D34078-vectorize-fdiv"
"1696hg84a0jxcnggvqsc2cdp271hf9a44p4qsd078qm1mfawkaay")
'("llvm-D42262-jumpthreading-not-i1"
"1c8w210gwidbnkkw8anp17dk5pnxws2fl3mb2qxh7y9wzfpixgaq")
'("llvm-D44892-Perf-integration"
"0r37jd0ssh2k1pndkfd5blgpg9z90im4vlzprhb0n0wwz45g4b05")
'("llvm-D46460"
"1miqgswdc0qvbaf4571c2xkxyp9ais06b1bcpa83sq22vr4hbsfb")
'("llvm-D49832-SCEVPred"
"0v5c88hgqj6dymv3j86ca5mhpqab5fbnrvjiw1nvnrnya9l4dlbn")
'("llvm-D50010-VNCoercion-ni"
"0iblb3q1xixwrb12jpb89h3ywmqmzdp6aqp416j4ncwakyjhhfkp")
'("llvm-D50167-scev-umin"
"1f2rakcnnyhr7w10k7gqg0k0491pyvx5ijplivw557f714ys3q6v")
'("llvm-OProfile-line-num"
"1jvbbmwyags0xfwamb13qrf3rgcz9i1r03m9lava7swag8xb78c7")
'("llvm-PPC-addrspaces"
"1f23nhsxh2s3jskbgs7da9nwg3s1hrkbk5aahl08x41wi3mny01p")
'("llvm-rL323946-LSRTy"
"10cz3vy1yw0w643z7xx021wa4kymx9fcm3bjg61s6vzdqd6d9fns")
'("llvm-rL326967-aligned-load"
"04jxnv32yj5x17hqhi8g2p8rhgp38gmjzr871w7z8s44pq10v9v4")
'("llvm-rL327898"
"15ah49gbsll23z28kpyahi5vl0fh3fkxcgd1zmxxdcl96s3x8bnq"))))))
(arguments
(substitute-keyword-arguments (package-arguments llvm-6)
((#:configure-flags flags)
`(list ;; Taken from NixOS. Only way I could get libLLVM-6.0.so
"-DCMAKE_BUILD_TYPE=Release"
"-DCMAKE_BUILD_TYPE=Release"
;; Build a native compiler and the NVPTX backend (NVIDIA) since
;; Julia insists on it, nothing more. This reduces build times and
;; disk usage.
,(string-append "-DLLVM_TARGETS_TO_BUILD=" (system->llvm-target))
"-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=NVPTX"
;; Build a native compiler and the NVPTX backend (NVIDIA) since
;; Julia insists on it, nothing more. This reduces build times and
;; disk usage.
,(string-append "-DLLVM_TARGETS_TO_BUILD=" (system->llvm-target))
"-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=NVPTX"
"-DLLVM_INSTALL_UTILS=ON"
"-DLLVM_BUILD_TESTS=ON"
"-DLLVM_ENABLE_FFI=ON"
"-DLLVM_ENABLE_RTTI=ON"
;; "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
;; "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
;; "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly"
"-DLLVM_ENABLE_DUMP=ON"
"-DLLVM_LINK_LLVM_DYLIB=ON"))))))
"-DLLVM_INSTALL_UTILS=ON"
"-DLLVM_BUILD_TESTS=ON"
"-DLLVM_ENABLE_FFI=ON"
"-DLLVM_ENABLE_RTTI=ON"
;; "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
;; "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
;; "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly"
"-DLLVM_ENABLE_DUMP=ON"
"-DLLVM_LINK_LLVM_DYLIB=ON"))))))
(define-public julia
(package
(name "julia")
(version "1.1.1")
(version "1.3.1")
(source (origin
(method url-fetch)
(uri (string-append
@ -166,7 +191,9 @@ (define-public julia
version "/julia-" version ".tar.gz"))
(sha256
(base32
"0hk983mywimclgnjc41zmlppm5kfdz2aj85ky07p49ilcqxi998f"))))
"1nwkmr9j55g1zkxdchnid1h022s0is52vx23niksshgvh793g41x"))
(patches
(search-patches "julia-SOURCE_DATE_EPOCH-mtime.patch"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
@ -188,32 +215,27 @@ (define-public julia
(add-after 'unpack 'prepare-deps
(lambda* (#:key inputs #:allow-other-keys)
(mkdir "deps/srccache")
(copy-file (assoc-ref inputs "dsfmt")
"deps/srccache/dsfmt-2.2.3.tar.gz")
;; no USE_SYSTEM_{OBJCONV/LIBWHICH} option
(copy-file (assoc-ref inputs "objconv")
"deps/srccache/objconv.zip")
(copy-file (assoc-ref inputs "suitesparse")
"deps/srccache/SuiteSparse-4.4.5.tar.gz")
(copy-file (string-append (assoc-ref inputs "virtualenv")
"/bin/virtualenv")
"julia-env")
(copy-file (assoc-ref inputs "libwhich")
(string-append "deps/srccache/libwhich-"
"81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
".tar.gz"))
(copy-file (assoc-ref inputs "rmath")
"deps/srccache/Rmath-julia-0.1.tar.gz")
;; needed by libwhich
(setenv "LD_LIBRARY_PATH"
(string-join (map (lambda (pkg)
;; needed by libwhich
(setenv "LD_LIBRARY_PATH"
(string-join (map (lambda (pkg)
(string-append (assoc-ref inputs pkg)
"/lib"))
'("arpack-ng" "fftw" "gmp" "lapack"
"libgit2" "mpfr" "openblas" "openlibm"
"openspecfun" "pcre2"))
'("arpack-ng" "curl" "dsfmt"
"gmp" "lapack"
"libssh2" "libgit2"
"mbedtls" "mpfr"
"openblas" "openlibm" "pcre2"
"suitesparse"))
":"))
#t))
#t))
;; FIXME: Building the documentation requires Julia packages that
;; would be downloaded from the Internet. We should build them in a
;; separate build phase.
@ -229,172 +251,152 @@ (define-public julia
;; Some tests require a home directory to be set.
(lambda _ (setenv "HOME" "/tmp") #t))
(add-after 'unpack 'hardcode-soname-map
;; ./src/runtime_ccall.cpp creates a map from library names to paths
;; using the output of "/sbin/ldconfig -p". Since ldconfig is not
;; used in Guix, we patch runtime_ccall.cpp to contain a static map.
(lambda* (#:key inputs #:allow-other-keys)
(use-modules (ice-9 match))
(substitute* "src/runtime_ccall.cpp"
;; Patch out invocations of '/sbin/ldconfig' to avoid getting
;; error messages about missing '/sbin/ldconfig' on Guix System.
(("popen\\(.*ldconfig.*\\);")
"NULL;\n")
;; Populate 'sonameMap'.
(("jl_read_sonames.*;")
(string-join
(map (match-lambda
((input libname soname)
(string-append
"sonameMap[\"" libname "\"] = "
"\"" (assoc-ref inputs input) "/lib/" soname "\";")))
'(("libc" "libc" "libc.so.6")
("pcre2" "libpcre2-8" "libpcre2-8.so")
("mpfr" "libmpfr" "libmpfr.so")
("openblas" "libblas" "libopenblas.so")
("arpack-ng" "libarpack" "libarpack.so")
("lapack" "liblapack" "liblapack.so")
("libgit2" "libgit2" "libgit2.so")
("gmp" "libgmp" "libgmp.so")
("openspecfun" "libopenspecfun" "libopenspecfun.so")
("fftw" "libfftw3" "libfftw3_threads.so")
("fftwf" "libfftw3f" "libfftw3f_threads.so"))))))
(substitute* "base/math.jl"
(("const libm = Base.libm_name")
(string-append "const libm = \""
(assoc-ref inputs "openlibm")
"/lib/libopenlibm.so"
"\""))
(("const openspecfun = \"libopenspecfun\"")
(string-append "const openspecfun = \""
(assoc-ref inputs "openspecfun")
"/lib/libopenspecfun.so"
"\"")))
#t))
;; ./src/runtime_ccall.cpp creates a map from library names to paths
;; using the output of "/sbin/ldconfig -p". Since ldconfig is not
;; used in Guix, we patch runtime_ccall.cpp to contain a static map.
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "base/math.jl"
(("const libm = Base.libm_name")
(string-append "const libm = \""
(assoc-ref inputs "openlibm")
"/lib/libopenlibm.so"
"\"")))
#t))
(add-before 'build 'fix-include-and-link-paths
(lambda* (#:key inputs #:allow-other-keys)
;; LIBUTF8PROC is a linker flag, not a build target. It is
;; included in the LIBFILES_* variable which is used as a
;; collection of build targets and a list of libraries to link
;; against.
(substitute* "src/flisp/Makefile"
(("\\$\\(BUILDDIR\\)/\\$\\(EXENAME\\): \\$\\(OBJS\\) \\$\\(LIBFILES_release\\)")
"$(BUILDDIR)/$(EXENAME): $(OBJS) $(LLT_release)")
(("\\$\\(BUILDDIR\\)/\\$\\(EXENAME\\)-debug: \\$\\(DOBJS\\) \\$\\(LIBFILES_debug\\)")
"$(BUILDDIR)/$(EXENAME)-debug: $(DOBJS) $(LLT_debug)"))
(lambda* (#:key inputs #:allow-other-keys)
;; LIBUTF8PROC is a linker flag, not a build target. It is
;; included in the LIBFILES_* variable which is used as a
;; collection of build targets and a list of libraries to link
;; against.
(substitute* "src/flisp/Makefile"
(("\\$\\(BUILDDIR\\)/\\$\\(EXENAME\\)\\$\\(EXE\\): \\$\\(OBJS\\) \\$\\(LIBFILES_release\\)")
"$(BUILDDIR)/$(EXENAME)$(EXE): $(OBJS) $(LLT_release)")
(("\\$\\(BUILDDIR\\)/\\$\\(EXENAME\\)-debug$(EXE): \\$\\(DOBJS\\) \\$\\(LIBFILES_debug\\)")
"$(BUILDDIR)/$(EXENAME)-debug\\$\\(EXE\\): $(DOBJS) $(LLT_debug)"))
;; The REPL must be linked with libuv.
(substitute* "ui/Makefile"
(("JLDFLAGS \\+= ")
(string-append "JLDFLAGS += "
(assoc-ref %build-inputs "libuv")
"/lib/libuv.so ")))
;; The REPL must be linked with libuv.
(substitute* "ui/Makefile"
(("JLDFLAGS \\+= ")
(string-append "JLDFLAGS += "
(assoc-ref %build-inputs "libuv")
"/lib/libuv.so ")))
(substitute* "base/Makefile"
(("\\$\\(build_includedir\\)/uv/errno.h")
(string-append (assoc-ref inputs "libuv")
"/include/uv/errno.h")))
#t))
(substitute* "base/Makefile"
(("\\$\\(build_includedir\\)/uv/errno.h")
(string-append (assoc-ref inputs "libuv")
"/include/uv/errno.h")))
#t))
(add-before 'build 'replace-default-shell
(lambda _
(substitute* "base/client.jl"
(("/bin/sh") (which "sh")))
#t))
(add-after 'unpack 'hardcode-paths
(lambda _
(substitute* "stdlib/InteractiveUtils/src/InteractiveUtils.jl"
(("`which") (string-append "`" (which "which")))
(("`wget") (string-append "`" (which "wget"))))
(substitute* "base/client.jl"
(("/bin/sh") (which "sh")))
#t))
(add-before 'build 'fix-precompile
(lambda _
(substitute* "base/loading.jl"
(("something(Base.active_project(), \"\")") "\"\""))
#t))
(add-before 'check 'disable-broken-tests
(lambda _
(define (touch file-name)
(call-with-output-file file-name (const #t)))
;; FIXME: All git tests works except this one. But *THIS* "fix"
;; is not working, so right now I'm disabling all libgit2.jl tests
;; (substitute* "stdlib/LibGit2/test/libgit2.jl"
;; (("!LibGit2.use_http_path(cfg, github_cred)") "true")
;; (("LibGit2.use_http_path(cfg, mygit_cred)") "true"))
(map (lambda (test)
(delete-file test)
(touch test))
'("stdlib/Sockets/test/runtests.jl"
"stdlib/Distributed/test/runtests.jl"
;; FIXME: see above
"stdlib/LibGit2/test/libgit2.jl"))
(substitute* "test/choosetests.jl"
;; These tests fail, probably because some of the input
;; binaries have been stripped and thus backtraces don't look
;; as expected.
(("\"backtrace\",") "")
(("\"cmdlineargs\",") ""))
#t)))
(substitute* "test/choosetests.jl"
(("tests = testnames")
;; Those failings are not deterministic. They depends on the
;; running order. I think it depends on the number of
;; runners, disabling it for now
;; https://github.com/JuliaLang/julia/issues/34330
"tests = filter(e->!in(e,[\"backtrace\",\"exceptions\",
\"stress\",\"precompile\",
\"client\",\"stacktraces\"]),
testnames)"))
;; When HOME is not set, julia calls uv_os_homedir, which in
;; turns call getpwuid_r. Add the HOME env variable to the
;; external julia call to fix this
(substitute* "test/cmdlineargs.jl"
(("\"JULIA_PROJECT\"") "\"HOME\"=>\"/tmp\", \"JULIA_PROJECT\""))
;; Marking the test as broken as it's a known bug:
;; https://github.com/JuliaLang/julia/issues/32377
(substitute* "stdlib/REPL/test/replcompletions.jl"
(("@test count") "@test_broken count"))
#t))
(add-after 'install 'make-wrapper
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(program "julia"))
(with-directory-excursion bin
(wrap-program program
`("JULIA_LOAD_PATH" ":" prefix
("" "$JULIA_LOAD_PATH")))
(wrap-program program
`("JULIA_DEPOT_PATH" ":" prefix
("" "$JULIA_DEPOT_PATH"))))
#t))))
#:make-flags
(list
(string-append "prefix=" (assoc-ref %outputs "out"))
(string-append "PREFIX=" (assoc-ref %outputs "out"))
(string-append "prefix=" (assoc-ref %outputs "out"))
(string-append "PREFIX=" (assoc-ref %outputs "out"))
;; Passing the MARCH flag is necessary to build binary substitutes for
;; the supported architectures.
,(match (or (%current-target-system)
(%current-system))
("x86_64-linux" "MARCH=x86-64")
("i686-linux" "MARCH=pentium4")
("aarch64-linux" "MARCH=armv8-a")
;; Prevent errors when querying this package on unsupported
;; platforms, e.g. when running "guix package --search="
(_ "MARCH=UNSUPPORTED"))
;; Passing the MARCH flag is necessary to build binary substitutes for
;; the supported architectures.
,(match (or (%current-target-system)
(%current-system))
("x86_64-linux" "MARCH=x86-64")
("i686-linux" "MARCH=pentium4")
("aarch64-linux" "MARCH=armv8-a")
;; Prevent errors when querying this package on unsupported
;; platforms, e.g. when running "guix package --search="
(_ "MARCH=UNSUPPORTED"))
"CONFIG_SHELL=bash" ;needed to build bundled libraries
"USE_SYSTEM_DSFMT=0" ;not packaged for Guix and upstream has no
;build system for a shared library.
"USE_SYSTEM_LAPACK=1"
"USE_SYSTEM_BLAS=1"
"USE_BLAS64=0" ;needed when USE_SYSTEM_BLAS=1
"LIBBLAS=-lopenblas"
"LIBBLASNAME=libopenblas"
"CONFIG_SHELL=bash" ;needed to build bundled libraries
;; list of "USE_SYSTEM_*" is here:
;; https://github.com/JuliaLang/julia/blob/v1.3.1/Make.inc
"USE_SYSTEM_DSFMT=1"
"USE_SYSTEM_P7ZIP=1"
"USE_SYSTEM_LAPACK=1"
"USE_SYSTEM_BLAS=1"
"USE_BLAS64=0" ;needed when USE_SYSTEM_BLAS=1
"LIBBLAS=-lopenblas"
"LIBBLASNAME=libopenblas"
"USE_SYSTEM_FFTW=1"
"LIBFFTWNAME=libfftw3"
"LIBFFTWFNAME=libfftw3f"
"USE_SYSTEM_SUITESPARSE=1"
(string-append "SUITESPARSE_INC=-I "
(assoc-ref %build-inputs "suitesparse")
"/include")
"USE_GPL_LIBS=1" ;proudly
"USE_SYSTEM_UTF8PROC=1"
(string-append "UTF8PROC_INC="
(assoc-ref %build-inputs "utf8proc")
"/include")
"USE_SYSTEM_LLVM=1"
"LLVM_VER=6.0.1"
;; TODO: Suitesparse does not install shared libraries, so we cannot
;; use the suitesparse package.
;; "USE_SYSTEM_SUITESPARSE=1"
;; (string-append "SUITESPARSE_INC=-I "
;; (assoc-ref %build-inputs "suitesparse")
;; "/include")
"USE_LLVM_SHLIB=1"
"USE_SYSTEM_LIBUNWIND=1"
"USE_SYSTEM_LIBUV=1"
(string-append "LIBUV="
(assoc-ref %build-inputs "libuv")
"/lib/libuv.so")
(string-append "LIBUV_INC="
(assoc-ref %build-inputs "libuv")
"/include")
"USE_SYSTEM_PATCHELF=1"
"USE_SYSTEM_PCRE=1"
"USE_SYSTEM_OPENLIBM=1"
"USE_GPL_LIBS=1" ;proudly
"USE_SYSTEM_UTF8PROC=1"
(string-append "UTF8PROC_INC="
(assoc-ref %build-inputs "utf8proc")
"/include")
"USE_SYSTEM_LLVM=1"
"LLVM_VER=6.0.1"
"USE_LLVM_SHLIB=1"
"USE_SYSTEM_LIBUNWIND=1"
"USE_SYSTEM_LIBUV=1"
(string-append "LIBUV="
(assoc-ref %build-inputs "libuv")
"/lib/libuv.so")
(string-append "LIBUV_INC="
(assoc-ref %build-inputs "libuv")
"/include")
"USE_SYSTEM_PATCHELF=1"
"USE_SYSTEM_PCRE=1"
"USE_SYSTEM_OPENLIBM=1"
"USE_SYSTEM_GMP=1"
"USE_SYSTEM_MPFR=1"
"USE_SYSTEM_ARPACK=1"
"USE_SYSTEM_LIBGIT2=1"
"USE_SYSTEM_ZLIB=1"
"USE_SYSTEM_OPENSPECFUN=1")))
"USE_SYSTEM_GMP=1"
"USE_SYSTEM_MPFR=1"
"USE_SYSTEM_ARPACK=1"
"USE_SYSTEM_LIBGIT2=1"
(string-append "LIBUV="
(assoc-ref %build-inputs "libuv")
"/lib/libuv.so")
(string-append "LIBUV_INC="
(assoc-ref %build-inputs "libuv")
"/include")
"USE_SYSTEM_ZLIB=1")))
(inputs
`(("llvm" ,llvm-julia)
("p7zip" ,p7zip)
;; The bundled version is 3.3.0 so stick to that version. With other
;; versions, we get test failures in 'linalg/arnoldi' as described in
;; <https://bugs.gnu.org/30282>.
@ -403,12 +405,12 @@ (define (touch file-name)
("coreutils" ,coreutils) ;for bindings to "mkdir" and the like
("lapack" ,lapack)
("openblas" ,openblas) ;Julia does not build with Atlas
("libunwind" ,libunwind)
("libunwind" ,libunwind-julia)
("openlibm" ,openlibm)
("openspecfun" ,openspecfun)
("mbedtls" ,mbedtls-apache)
("curl" ,curl)
("libgit2" ,libgit2)
("fftw" ,fftw)
("fftwf" ,fftwf)
("libssh2" ,libssh2)
("fortran" ,gfortran)
("libuv" ,libuv-julia)
("pcre2" ,pcre2)
@ -418,31 +420,9 @@ (define (touch file-name)
("which" ,which)
("zlib" ,zlib)
("gmp" ,gmp)
("virtualenv" ,python2-virtualenv)
;; FIXME: The following inputs are downloaded from upstream to allow us
;; to use the lightweight Julia release tarball. Ideally, these inputs
;; would eventually be replaced with proper Guix packages.
;; TODO: run "make -f contrib/repackage_system_suitesparse4.make" to copy static lib
;; Find dependency versions here:
;; https://raw.githubusercontent.com/JuliaLang/julia/77a2c1e245c85812dc1c7687540beedecc52758f/deps/Versions.make
("rmath"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/JuliaLang/Rmath-julia")
(commit "v0.1")))
(file-name "rmath-julia-0.1-checkout")
(sha256
(base32
"1zkpy0cg5zivq40zbhbdgj9128fqzs2j94wkwih8nc6xaj3gp9p6"))))
("suitesparse"
,(origin
(method url-fetch)
(uri "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.5.tar.gz")
(sha256
(base32
"1jcbxb8jx5wlcixzf6n5dca2rcfx6mlcms1k2rl5gp67ay3bix43"))))
("suitesparse" ,suitesparse)
;; Find dependencies versions here:
;; https://raw.githubusercontent.com/JuliaLang/julia/v1.3.0/deps/Versions.make
("objconv"
,(origin
(method url-fetch)
@ -453,29 +433,21 @@ (define (touch file-name)
(base32
"0wp6ld9vk11f4nnkn56627zmlv9k5vafi99qa3yyn1pgcd61zcfs"))))
("libwhich"
,(let ((commit "81e9723c0273d78493dc8c8ed570f68d9ce7e89e"))
,(let ((commit "81e9723c0273d78493dc8c8ed570f68d9ce7e89e"))
(origin
;; Note: We use a /tarball URL, but that's because Julia's build
;; system checks the hash of that tarball; thus we can't use
;; 'git-fetch'.
(method url-fetch)
(uri (string-append
"https://api.github.com/repos/vtjnash/libwhich/tarball/"
commit))
(method url-fetch)
(uri (string-append
"https://api.github.com/repos/vtjnash/libwhich/tarball/"
commit))
(file-name (string-append "libwhich-" (string-take commit 7)
".tar.gz"))
(sha256
(base32
"1p7zg31kpmpbmh1znrk1xrbd074agx13b9q4dcw8n2zrwwdlbz3b")))))
("dsfmt"
,(origin
(method url-fetch)
(uri (string-append
"http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/"
"SFMT/dSFMT-src-2.2.3.tar.gz"))
(sha256
(base32
"03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42"))))))
(sha256
(base32
"1p7zg31kpmpbmh1znrk1xrbd074agx13b9q4dcw8n2zrwwdlbz3b")))))
("dsfmt" ,dsfmt)))
(native-inputs
`(("openssl" ,openssl)
("perl" ,perl)
@ -483,9 +455,12 @@ (define (touch file-name)
("pkg-config" ,pkg-config)
("python" ,python-2)))
(native-search-paths
(list (search-path-specification
(variable "JULIA_LOAD_PATH")
(files (list "share/julia/packages/")))))
(list (search-path-specification
(variable "JULIA_LOAD_PATH")
(files (list "share/julia/packages/")))
(search-path-specification
(variable "JULIA_DEPOT_PATH")
(files (list "share/julia/")))))
;; Julia is not officially released for ARM and MIPS.
;; See https://github.com/JuliaLang/julia/issues/10639
(supported-systems '("i686-linux" "x86_64-linux" "aarch64-linux"))

21
gnu/packages/kde-frameworks.scm
View file

@ -6,6 +6,7 @@
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -957,10 +958,10 @@ (define-public kplotting
"11kpq34j37c1gsvj5nxhkc31bw8gw2n7nkqsfx87jw9f4v2vhmr9"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
(inputs
`(("qtbase" ,qtbase)
`(("extra-cmake-modules" ,extra-cmake-modules)
("qttools" ,qttools)))
(inputs
`(("qtbase" ,qtbase)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Data plotting library")
(description "KPlotWidget is a QWidget-derived class that provides a virtual
@ -2448,7 +2449,8 @@ (define-public kdewebkit
"1s3bmn1ck7xvc7a6gv7ywv9161hdahiiw20aq88s4qkm2s5wyy6v"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
`(("extra-cmake-modules" ,extra-cmake-modules)
("qttools" ,qttools)))
(inputs
`(("kconfig" ,kconfig)
("kcoreaddons" ,kcoreaddons)
@ -2458,7 +2460,6 @@ (define-public kdewebkit
("kservice" ,kservice)
("kwallet" ,kwallet)
("qtbase" ,qtbase)
("qttools" ,qttools)
("qtwebkit" ,qtwebkit)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "KDE Integration for QtWebKit")
@ -2558,6 +2559,7 @@ (define-public kiconthemes
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("qttools" ,qttools)
("shared-mime-info" ,shared-mime-info)))
(inputs
`(("karchive" ,karchive)
@ -2570,8 +2572,7 @@ (define-public kiconthemes
("kitemviews" ,kitemviews)
("kwidgetsaddons" ,kwidgetsaddons)
("qtbase" ,qtbase)
("qtsvg" ,qtsvg)
("qttools" ,qttools)))
("qtsvg" ,qtsvg)))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -2686,6 +2687,7 @@ (define-public kio
("solid" ,solid)))
(native-inputs
`(("dbus" ,dbus)
("qttools" ,qttools)
("extra-cmake-modules" ,extra-cmake-modules)))
(inputs
`(;; TODO: LibACL , <ftp://oss.sgi.com/projects/xfs/cmd_tars>
@ -2708,7 +2710,6 @@ (define-public kio
("libxslt" ,libxslt)
("qtbase" ,qtbase)
("qtscript" ,qtscript)
("qttools" ,qttools)
("qtx11extras" ,qtx11extras)
("sonnet" ,sonnet)))
(arguments
@ -3241,7 +3242,8 @@ (define-public kxmlgui
`(("kconfig" ,kconfig)
("kconfigwidgets" ,kconfigwidgets)))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
`(("extra-cmake-modules" ,extra-cmake-modules)
("qttools" ,qttools)))
(inputs
`(("attica" ,attica)
("kauth" ,kauth)
@ -3255,7 +3257,6 @@ (define-public kxmlgui
("kwidgetsaddons" ,kwidgetsaddons)
("kwindowsystem" ,kwindowsystem)
("qtbase" ,qtbase)
("qttools" ,qttools)
("sonnet" ,sonnet)))
(arguments
`(#:tests? #f ; FIXME: 1/5 tests fail.

1
gnu/packages/kde-internet.scm
View file

@ -42,6 +42,7 @@ (define-module (gnu packages kde-internet)
#:use-module (gnu packages serialization)
#:use-module (gnu packages ssh)
#:use-module (gnu packages telephony)
#:use-module (gnu packages linphone)
#:use-module (gnu packages tls)
#:use-module (gnu packages video)
#:use-module (gnu packages web)

594
gnu/packages/linphone.scm Normal file
View file

@ -0,0 +1,594 @@
;;; GNU Guix --- Functional package management for GNU
;;;
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages linphone)
#:use-module (gnu packages)
#:use-module (gnu packages admin)
#:use-module (gnu packages audio)
#:use-module (gnu packages base)
#:use-module (gnu packages compression)
#:use-module (gnu packages documentation)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnome-xyz)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gtk)
#:use-module (gnu packages image)
#:use-module (gnu packages linux)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages java)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages telephony)
#:use-module (gnu packages tls)
#:use-module (gnu packages video)
#:use-module (gnu packages xiph)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu))
(define-public bcunit
(package
(name "bcunit")
(version "3.0.2")
(source
(origin
(method url-fetch)
(uri
(string-append "https://www.linphone.org/releases/sources/" name
"/" name "-" version ".tar.gz"))
(sha256
(base32 "0ylchj8w98ic2fkqpxc6yk4s6s0h0ql2zsz5n49jd7126m4h8dqk"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f ; No test target
#:configure-flags
(list
"-DENABLE_STATIC=NO"))) ; Not required
(synopsis "Belledonne Communications Unit Testing Framework")
(description "BCUnit is a fork of the defunct project CUnit,
with several fixes and patches applied. It is an unit testing
framework for writing, administering, and running unit tests in C.")
(home-page "https://gitlab.linphone.org/BC/public/bcunit")
(license license:lgpl2.0+)))
(define-public bctoolbox
(package
(name "bctoolbox")
(version "0.6.0")
(source
(origin
(method url-fetch)
(uri
(string-append "https://www.linphone.org/releases/sources/" name
"/" name "-" version ".tar.gz"))
(sha256
(base32 "1a1i70pb4hhnykkwyhhc7fv67q556l8kprny8xzgfqpj1nby2ms6"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f ; No test target
#:configure-flags
(list
"-DENABLE_STATIC=OFF"))) ; Not required
(inputs
`(("bcunit" ,bcunit)
("mbedtls" ,mbedtls-apache)))
(synopsis "Belledonne Communications Tool Box")
(description "BcToolBox is an utilities library used by Belledonne
Communications softwares like belle-sip, mediastreamer2 and linphone.")
(home-page "https://gitlab.linphone.org/BC/public/bctoolbox")
(license license:gpl2+)))
(define-public belr
(package
(name "belr")
(version "0.1.3")
(source
(origin
(method url-fetch)
(uri
(string-append "https://www.linphone.org/releases/sources/" name
"/" name "-" version ".tar.gz"))
(sha256
(base32 "1fwv2cg3qy9vdc7dimcda7nqcqc1h2cdd7ikhk7ng7q4ys8m96c1"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; No test target
#:configure-flags
(list
"-DENABLE_STATIC=OFF"))) ; Not required
(inputs
`(("bctoolbox" ,bctoolbox)))
(synopsis "Belledonne Communications Language Recognition Library")
(description "Belr is Belledonne Communications' language recognition library,
written in C++11. It parses text inputs formatted according to a language
defined by an ABNF grammar, such as the protocols standardized at IETF.")
(home-page "https://gitlab.linphone.org/BC/public/belr")
(license license:gpl3+)))
(define-public belcard
(package
(name "belcard")
(version "1.0.2")
(source
(origin
(method url-fetch)
(uri
(string-append "https://www.linphone.org/releases/sources/" name
"/" name "-" version ".tar.gz"))
(sha256
(base32 "0iiyrll1shnbb0561pkvdqcmx9b2cdr76xpsbaqdirc3s4xzcl0k"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; No test target
#:configure-flags
(list
"-DENABLE_STATIC=OFF"))) ; Not required
(inputs
`(("bctoolbox" ,bctoolbox)
("belr" ,belr)))
(synopsis "Belledonne Communications VCard Library")
(description "Belcard is a C++ library to manipulate VCard standard format.")
(home-page "https://gitlab.linphone.org/BC/public/belcard")
(license license:gpl3+)))
(define-public bcmatroska2
(package
(name "bcmatroska2")
(version "0.23")
(source
(origin
(method url-fetch)
(uri
(string-append "https://www.linphone.org/releases/sources/" name
"/" name "-" version ".tar.gz"))
(sha256
(base32 "1a0vlk4fhh189pfzrwbc3xbc5vyx6cnxy642d1h40045jz9y4h15"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; No test target
#:configure-flags
(list
"-DENABLE_STATIC=NO"))) ; Not required
(synopsis "Belledonne Communications Media Container")
(description "BcMatroska is a free and open standard multi-media
container format. It can hold an unlimited number of video, audio,
picture, or subtitle tracks in one file. ")
(home-page "https://gitlab.linphone.org/BC/public/bcmatroska2")
(license
(list
;; That license applies for Core C and LibEBML2.
;; https://www.matroska.org/node/47
license:bsd-4
;; That license applies for LibMatroska2.
;; https://www.matroska.org/node/47
license:lgpl2.1+))))
(define-public bcg729
(package
(name "bcg729")
(version "1.0.4")
(source
(origin
(method url-fetch)
(uri
(string-append "https://www.linphone.org/releases/sources/" name
"/" name "-" version ".tar.gz"))
(sha256
(base32 "01y34ky7ykjgfnf8a9f59hg61fqfjiprfrzshdz06w0lz4gvy3qs"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; No test target
#:configure-flags
(list
"-DENABLE_STATIC=NO"))) ; Not required
(synopsis "Belledonne Communications G729 Codec")
(description "BcG729 is an implementation of both encoder and decoder of
the ITU G729 speech codec. The library written in C 99 is fully portable and
can be executed on many platforms including both ARM and x86 processors. It
supports concurrent channels encoding and decoding for multi call application
such as conferencing.")
(home-page "https://gitlab.linphone.org/BC/public/belcard")
(license license:gpl2+)))
(define-public ortp
(package
(name "ortp")
(version "1.0.2")
(source
(origin
(method url-fetch)
(uri
(string-append "https://www.linphone.org/releases/sources/" name
"/" name "-" version ".tar.gz"))
(sha256
(base32 "016qg0lmdgmqh2kv19w9qhi4kkiyi5h1xp35g2s65b1j8ccm25d5"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; No test target
#:configure-flags
(list
"-DENABLE_STATIC=NO"))) ; Not required
(native-inputs
`(("dot" ,graphviz)
("doxygen" ,doxygen)))
(inputs
`(("bctoolbox" ,bctoolbox)))
(synopsis "Belledonne Communications RTP Library")
(description "oRTP is a C library implementing the RTP protocol. It
implements the RFC 3550 standard.")
(home-page "https://gitlab.linphone.org/BC/public/ortp")
(license license:gpl2+)))
(define-public bzrtp
(package
(name "bzrtp")
(version "1.0.6")
(source
(origin
(method url-fetch)
(uri
(string-append "https://www.linphone.org/releases/sources/" name
"/" name "-" version ".tar.gz"))
(sha256
(base32 "12y0kkh90pixaaxfyx26ca2brhy6nw57fsypp6vh8jk1illv0j5z"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; No test target
#:configure-flags
(list
"-DENABLE_STATIC=NO")))
(inputs
`(("bctoolbox" ,bctoolbox)
("sqlite3" ,sqlite)
("xml2" ,libxml2)))
(synopsis "Belledonne Communications ZRTP Library")
(description "BZRTP is an implementation of ZRTP keys exchange
protocol, written in C. It is fully portable and can be executed on many
platforms including both ARM and x86.")
(home-page "https://gitlab.linphone.org/BC/public/bzrtp")
(license license:gpl2+)))
(define-public belle-sip
(package
(name "belle-sip")
(version "1.6.3")
(source
(origin
(method url-fetch)
(uri
(string-append "https://www.linphone.org/releases/sources/" name
"/" name "-" version ".tar.gz"))
(sha256
(base32 "0s55kggmgxap54dkw5856bgk4xg7yvbzialpxnjm0zhpic3hff1z"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; Requires network access
#:configure-flags
(list
"-DENABLE_STATIC=NO")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch
(lambda _
(substitute* "src/CMakeLists.txt"
;; ANTLR would use multithreaded DFA generation
;; otherwise--which would not be reproducible.
(("-Xmultithreaded ") ""))
#t)))))
(inputs
`(("antlr3" ,antlr3-3.3)
("antlr3c" ,libantlr3c)
("bctoolbox" ,bctoolbox)
("java" ,icedtea)
("zlib" ,zlib)))
(synopsis "Belledonne Communications SIP Library")
(description "Belle-sip is a modern library implementing SIP transport,
transaction and dialog layers. It is written in C, with an object-oriented
API. It also comprises a simple HTTP/HTTPS client implementation.")
(home-page "https://gitlab.linphone.org/BC/public/belle-sip")
(license license:gpl2+)))
(define-public mediastreamer2
(package
(name "mediastreamer2")
(version "2.16.1")
(source
(origin
(method url-fetch)
(uri
(string-append "https://www.linphone.org/releases/sources/"
"mediastreamer/mediastreamer-" version ".tar.gz"))
(sha256
(base32 "0whpqr69wz0pnzvragkpfblxhd0rds8k06c3mw5a0ag216a1yd9k"))
(patches (search-patches "mediastreamer2-srtp2.patch"))))
(outputs '("out" "doc" "tester"))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; No test target
#:configure-flags
(list
"-DENABLE_STATIC=NO" ; Not required
"-DENABLE_STRICT=NO" ; Would otherwise treat warnings as err
"-DENABLE_BV16=NO" ; Not available
"-DCMAKE_C_FLAGS=-DMS2_GIT_VERSION=\\\"unknown\\\""
"-DCMAKE_CXX_FLAGS=-DMS2_GIT_VERSION=\\\"unknown\\\"")
#:phases
(modify-phases %standard-phases
(add-after 'install 'separate-outputs
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc"))
(tester (assoc-ref outputs "tester"))
(tester-name (string-append ,name "_tester")))
;; Copy the tester executable.
(mkdir-p (string-append tester "/bin"))
(rename-file (string-append out "/bin/" tester-name)
(string-append tester "/bin/" tester-name))
;; Copy the tester data files.
(copy-recursively (string-append out "/share/" tester-name)
(string-append tester "/share/" tester-name))
(delete-file-recursively (string-append out "/share/"
tester-name))
;; Copy the HTML documentation.
(copy-recursively (string-append out "/share/doc/"
,name "-" ,version "/html")
(string-append doc "/share/doc/"
,name "-" ,version "/html"))
(delete-file-recursively (string-append out "/share/doc/"
,name "-" ,version
"/html"))
#t))))))
(native-inputs
`(("dot" ,graphviz)
("doxygen" ,doxygen)
("python" ,python)))
(inputs
`(("alsa" ,alsa-lib)
("bcg729" ,bcg729)
("bcmatroska2" ,bcmatroska2)
("bctoolbox" ,bctoolbox)
("ffmpeg" ,ffmpeg)
("glew" ,glew)
("glu" ,glu)
("glx" ,mesa-utils)
("gsm" ,gsm)
("opengl" ,mesa)
("opus" ,opus)
("ortp" ,ortp)
("pcap" ,libpcap)
("portaudio" ,portaudio)
("pulseaudio" ,pulseaudio)
("spandsp" ,spandsp)
("speex" ,speex)
("speexdsp" ,speexdsp)
("srtp" ,libsrtp)
("theora" ,libtheora)
("turbojpeg" ,libjpeg-turbo)
("v4l" ,v4l-utils)
("vpx" ,libvpx)
("x11" ,libx11)
("xv" ,libxv)
("zrtp", bzrtp)))
(synopsis "Belledonne Communications Streaming Engine")
(description "Mediastreamer2 is a powerful and lightweight
streaming engine for telephony applications. This media processing
and streaming toolkit is responsible for receiving and sending all
multimedia streams in Linphone, including media capture, encoding and
decoding, and rendering.")
(home-page "https://gitlab.linphone.org/BC/public/mediastreamer2")
(license license:gpl2+)))
(define-public liblinphone
(package
(name "liblinphone")
(version "3.12.0")
(source
(origin
(method url-fetch)
(uri
(string-append "https://www.linphone.org/releases/sources/linphone"
"/linphone-" version ".tar.gz"))
(sha256
(base32 "0phhkx55xdyg28d4wn8l8q4yvsmdgzmjiw584d4s190sq1azm91x"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; No test target
#:configure-flags
(list
(string-append "-DGTK2_GDKCONFIG_INCLUDE_DIR="
(string-append (assoc-ref %build-inputs "gtk2")
"/lib/gtk-2.0/include"))
(string-append "-DGTK2_GLIBCONFIG_INCLUDE_DIR="
(string-append (assoc-ref %build-inputs "glib")
"/lib/glib-2.0/include"))
"-DENABLE_STATIC=NO" ; Not required
"-DENABLE_GTK_UI=YES") ; For Legacy UI
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch
(lambda _
(substitute* "gtk/main.c"
(("#include \"liblinphone_gitversion.h\"")
""))
#t)))))
(native-inputs
`(("dot" ,graphviz)
("doxygen" ,doxygen)
("gettext" ,gettext-minimal)
("iconv" ,libiconv)
("python" ,python)
("xml2" ,libxml2)
("zlib" ,zlib)))
(inputs
`(("bctoolbox" ,bctoolbox)
("belcard" ,belcard)
("bellesip" ,belle-sip)
("bzrtp", bzrtp)
("glib" ,glib)
("gtk2" ,gtk+-2)
("mediastreamer2" ,mediastreamer2)
("notify" ,libnotify)
("ortp" ,ortp)
("pystache" ,python-pystache)
("six" ,python-six)
("sqlite" ,sqlite)
("udev" ,eudev)))
(propagated-inputs
`(("murrine" ,murrine))) ; Required for GTK UI
(synopsis "Belledonne Communications Softphone Library")
(description "Liblinphone is a high-level SIP library integrating
all calling and instant messaging features into an unified
easy-to-use API. It is the cross-platform VoIP library on which the
Linphone application is based on, and that anyone can use to add audio
and video calls or instant messaging capabilities to an application.")
(home-page "https://gitlab.linphone.org/BC/public/liblinphone")
(license license:gpl2+)))
(define-public msopenh264
(package
(name "msopenh264")
(version "1.2.1")
(source
(origin
(method url-fetch)
(uri
(string-append "https://www.linphone.org/releases/sources/plugins/"
name "/" name "-" version ".tar.gz"))
(sha256
(base32 "0rdxgazm52560g52pp6mp3mwx6j1z3h2zyizzfycp8y8zi92fqm8"))
(patches
(list
;; For support for OpenH264 version >= 2.
(origin
(method url-fetch)
(uri
(string-append "https://gitlab.linphone.org/BC/public/msopenh264/commit/"
"493d147d28c9a0f788ba4e50b47a1ce7b18bf326.diff"))
(file-name "msopenh264-openh264.patch")
(sha256
(base32 "0mmd7nz5n9ian4rcwn200nldmy5j0dpdrna7r32rqnaw82bx3kdb")))))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; No test target
#:configure-flags
(list
"-DENABLE_STATIC=NO"))) ; Not required
(inputs
`(("mediastreamer2" ,mediastreamer2)
("openh264" ,openh264)
("ortp" ,ortp)))
(synopsis "Media Streamer H.264 Codec")
(description "MsOpenH264 is an H.264 encoder/decoder plugin for
mediastreamer2 based on the openh264 library.")
(home-page "https://gitlab.linphone.org/BC/public/msopenh264")
(license license:gpl2+)))
(define-public mssilk
(package
(name "mssilk")
(version "1.1.1")
(source
(origin
(method url-fetch)
(uri
(string-append "https://www.linphone.org/releases/sources/plugins/"
name "/" name "-" version ".tar.gz"))
(sha256
(base32 "07ip0vd29d1n98lnqs5wpimcsmpm65yl7g5vk4hbqghcbsjw94lj"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; No test target
#:configure-flags
(list
"-DENABLE_STATIC=NO"))) ; Not required
(inputs
`(("mediastreamer2" ,mediastreamer2)
("ortp" ,ortp)))
(synopsis "Media Streamer SILK Codec")
(description "MSSILK is a plugin of MediaStreamer, adding support for
AMR codec. It is based on the Skype's SILK implementation.")
(home-page "https://gitlab.linphone.org/BC/public/mssilk")
(license license:gpl2+)))
(define-public mswebrtc
(package
(name "mswebrtc")
(version "1.1.1")
(source
(origin
(method url-fetch)
(uri
(string-append "https://www.linphone.org/releases/sources/plugins/"
name "/" name "-" version ".tar.gz"))
(sha256
(base32 "1wj28hl9myhshqmn64xg0jf07aw75gmnilb5rff6rcbdxim87mqr"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; No test target
#:configure-flags
(list
"-DENABLE_STATIC=NO")))
(inputs
`(("bctoolbox" ,bctoolbox)
("mediastreamer2" ,mediastreamer2)
("ortp" ,ortp)))
(synopsis "Media Streamer WebRTC Codec")
(description "MSWebRTC is a plugin of MediaStreamer, adding support for
WebRTC codec. It includes features from WebRTC, such as, iSAC and AECM.")
(home-page "https://gitlab.linphone.org/BC/public/mswebrtc")
(license license:gpl2+)))
(define-public msamr
(package
(name "msamr")
(version "1.1.3")
(source
(origin
(method url-fetch)
(uri
(string-append "https://www.linphone.org/releases/sources/plugins/"
name "/" name "-" version ".tar.gz"))
(sha256
(base32 "16c9f3z4wnj73k7y8gb0fgpr4axsm7b5zrbjvy8vsgz9gyg3agm5"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; No test target
#:configure-flags
(list
"-DENABLE_STATIC=NO" ; Not required
"-DENABLE_WIDEBAND=YES")))
(inputs
`(("mediastreamer2" ,mediastreamer2)
("opencoreamr" ,opencore-amr)
("ortp" ,ortp)
("voamrwbenc" ,vo-amrwbenc)))
(synopsis "Media Streamer AMR Codec")
(description "MSAMR is a plugin of MediaStreamer, adding support for
AMR codec. It is based on the opencore-amr implementation.")
(home-page "https://gitlab.linphone.org/BC/public/msamr")
(license license:gpl3+)))

144
gnu/packages/linux.scm
View file

@ -192,6 +192,12 @@ (define (linux-libre-deblob-scripts version
"deblob-check"))
(sha256 deblob-check-hash))))
(define deblob-scripts-5.6
(linux-libre-deblob-scripts
"5.6"
(base32 "09hxrr4xzllq5lmipfb6if30318lksrk9py1axc36m9ynql4w0rc")
(base32 "09qz5d31g5zwicsnncjnjij193hk0g6kg0ss9jyzh6lp3wilcm71")))
(define deblob-scripts-5.4
(linux-libre-deblob-scripts
"5.4.28"
@ -362,42 +368,51 @@ (define (%upstream-linux-source version hash)
"linux-" version ".tar.xz"))
(sha256 hash)))
(define-public linux-libre-5.4-version "5.4.28")
(define-public linux-libre-5.6-version "5.6.2")
(define-public linux-libre-5.6-pristine-source
(let ((version linux-libre-5.6-version)
(hash (base32 "1fdmcx5fk9wq9yx6vvnw76nvdysbvm83cik1dj1d67lw6bc92k9d")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.6)))
(define-public linux-libre-5.4-version "5.4.30")
(define-public linux-libre-5.4-pristine-source
(let ((version linux-libre-5.4-version)
(hash (base32 "197p7rjmbs229ncj1y8s80f7n4bm8g9w0jrv1109m3rl8q9wqqy8")))
(hash (base32 "1vwx6j87pkfyq68chng1hy0c85hpc2byabiv1pcikrmw07vpip8i")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.4)))
(define-public linux-libre-4.19-version "4.19.113")
(define-public linux-libre-4.19-version "4.19.114")
(define-public linux-libre-4.19-pristine-source
(let ((version linux-libre-4.19-version)
(hash (base32 "1rf0jz7r1f4rb4k0g3glssfa1hm2ka6vlbwjlkmsx1bybxnmg85m")))
(hash (base32 "03hz6vg5bg728ilbm4z997pf52cgxzsxb03vz5cs55gwdbfa0h0y")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.19)))
(define-public linux-libre-4.14-version "4.14.174")
(define-public linux-libre-4.14-version "4.14.175")
(define-public linux-libre-4.14-pristine-source
(let ((version linux-libre-4.14-version)
(hash (base32 "12ai2lc2ny38s93d0m5ngrv030vwv1h2hhzp0fs6fhjxasikq8jc")))
(hash (base32 "0b12w0d21sk261jr4p1pm32v0r20a5c2j1p5hasdqw80sb2hli6b")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.14)))
(define-public linux-libre-4.9-version "4.9.217")
(define-public linux-libre-4.9-version "4.9.218")
(define-public linux-libre-4.9-pristine-source
(let ((version linux-libre-4.9-version)
(hash (base32 "06b8av9f9pk2yp95nzv4322k0d5wsg40sxd9kfim1xzb093abckg")))
(hash (base32 "1ka98c8sbfipzll6ss9fcsn26lh4cy60372yfw27pif4brhnwfnz")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.9)))
(define-public linux-libre-4.4-version "4.4.217")
(define-public linux-libre-4.4-version "4.4.218")
(define-public linux-libre-4.4-pristine-source
(let ((version linux-libre-4.4-version)
(hash (base32 "0vsjchywznmjn01flgvm9vsja5zqni319rfwgy997afcbz0c9spx")))
(hash (base32 "0qzhcy8i111jbpnkpzq7hqf9nkwq4s7smi820hfvnmd2ky7cns7a")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.4)))
@ -430,6 +445,15 @@ (define (source-with-patches source patches)
(patches (append (origin-patches source)
patches))))
(define-public linux-libre-5.6-source
(source-with-patches linux-libre-5.6-pristine-source
(list %boot-logo-patch
%linux-libre-arm-export-__sync_icache_dcache-patch
;; Pinebook Pro patch from linux-next,
;; can be dropped for linux-libre 5.7
(search-patch
"linux-libre-support-for-Pinebook-Pro.patch"))))
(define-public linux-libre-5.4-source
(source-with-patches linux-libre-5.4-pristine-source
(list %boot-logo-patch
@ -529,6 +553,10 @@ (define (make-linux-libre-headers* version source)
(description "Headers of the Linux-Libre kernel.")
(license license:gpl2)))
(define-public linux-libre-headers-5.6
(make-linux-libre-headers* linux-libre-5.6-version
linux-libre-5.6-source))
(define-public linux-libre-headers-5.4
(make-linux-libre-headers* linux-libre-5.4-version
linux-libre-5.4-source))
@ -823,7 +851,24 @@ (define-public linux-libre-arm-generic
linux-libre-source
'("armhf-linux")
#:defconfig "multi_v7_defconfig"
#:extra-version "arm-generic"))
#:extra-version "arm-generic"
#:extra-options
(append
`(;; needed to fix the RTC on rockchip platforms
("CONFIG_RTC_DRV_RK808" . #t))
%default-extra-linux-options)))
(define-public linux-libre-arm-generic-5.6
(make-linux-libre* linux-libre-5.6-version
linux-libre-5.6-source
'("armhf-linux")
#:defconfig "multi_v7_defconfig"
#:extra-version "arm-generic"
#:extra-options
(append
`(;; needed to fix the RTC on rockchip platforms
("CONFIG_RTC_DRV_RK808" . #t))
%default-extra-linux-options)))
(define-public linux-libre-arm-veyron
(deprecated-package "linux-libre-arm-veyron" linux-libre-arm-generic))
@ -868,7 +913,24 @@ (define-public linux-libre-arm64-generic
linux-libre-source
'("aarch64-linux")
#:defconfig "defconfig"
#:extra-version "arm64-generic"))
#:extra-version "arm64-generic"
#:extra-options
(append
`(;; needed to fix the RTC on rockchip platforms
("CONFIG_RTC_DRV_RK808" . #t))
%default-extra-linux-options)))
(define-public linux-libre-arm64-generic-5.6
(make-linux-libre* linux-libre-5.6-version
linux-libre-5.6-source
'("aarch64-linux")
#:defconfig "defconfig"
#:extra-version "arm64-generic"
#:extra-options
(append
`(;; needed to fix the RTC on rockchip platforms
("CONFIG_RTC_DRV_RK808" . #t))
%default-extra-linux-options)))
(define-public linux-libre-riscv64-generic
(make-linux-libre* linux-libre-version
@ -4432,6 +4494,40 @@ (define-public btrfs-progs/static
from the btrfs-progs package. It is meant to be used in initrds.")
(license (package-license btrfs-progs))))
(define-public cramfs-tools
(package
(name "cramfs-tools")
(home-page "https://github.com/npitre/cramfs-tools")
(version "2.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(sha256
(base32 "183rfqqyzx52q0vxicdgf0p984idh3rqkvzfb93gjvyzfhc15c0p"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; No tests.
#:phases
(modify-phases %standard-phases
(delete 'configure)
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(install-file "mkcramfs" (string-append out "/sbin"))
(install-file "cramfsck" (string-append out "/sbin")))
#t)))))
(inputs
`(("zlib" ,zlib)))
(synopsis "Tools to manage Cramfs file systems")
(description "Cramfs is a Linux file system designed to be simple, small,
and to compress things well. It is used on a number of embedded systems and
small devices. This version has additional features such as uncompressed
blocks and random block placement.")
(license license:gpl2+)))
(define-public compsize
(package
(name "compsize")
@ -4571,7 +4667,7 @@ (define-public freefall
(define-public thinkfan
(package
(name "thinkfan")
(version "1.0.2")
(version "1.1")
(source
(origin
(method git-fetch)
@ -4580,7 +4676,7 @@ (define-public thinkfan
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "107vw0962hrwva3wra9n3hxlbfzg82ldc10qssv3dspja88g8psr"))))
(base32 "1fxd1w3z65glw6y04myn7ihgswkx6sqnkky159mik4n96pfrsvr5"))))
(build-system cmake-build-system)
(arguments
`(#:modules ((guix build cmake-build-system)
@ -5699,13 +5795,13 @@ (define-public nftables
(build-system gnu-build-system)
(arguments `(#:configure-flags
'("--disable-man-doc"))) ; FIXME: Needs docbook2x.
(inputs `(("bison" ,bison)
("flex" ,flex)
("gmp" ,gmp)
(inputs `(("gmp" ,gmp)
("libmnl" ,libmnl)
("libnftnl" ,libnftnl)
("readline" ,readline)))
(native-inputs `(("pkg-config" ,pkg-config)))
(native-inputs `(("pkg-config" ,pkg-config)
("bison" ,bison)
("flex" ,flex)))
(home-page "https://www.nftables.org")
(synopsis "Userspace utility for Linux packet filtering")
(description "nftables is the project that aims to replace the existing
@ -5919,9 +6015,11 @@ (define-public procenv
(base32 "1javw97yw0qvjmj14js8vw6nsfyf2xc0kfiyq5f2hsp0553w2cdq"))))
(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
(native-inputs `(("groff" ,groff) ; for tests
("pkg-config" ,pkg-config)))
(inputs `(("check" ,check)
("expat" ,expat)
("libcap" ,libcap)
("libselinux" ,libselinux)))
(synopsis "Utility to show process environment")
(description "Procenv is a command-line tool that displays as much detail about
@ -6587,10 +6685,10 @@ (define-public ell
(("/usr/bin/dbus-daemon") (which "dbus-daemon")))
#t)))))
(inputs
`(("dbus" ,dbus)
("libtool" ,libtool)))
`(("dbus" ,dbus)))
(native-inputs
`(("autoconf" ,autoconf)
("libtool" ,libtool)
("pkgconfig" ,pkg-config)
("automake" ,automake)))
(home-page "https://01.org/ell")

50
gnu/packages/lisp-xyz.scm
View file

@ -18,6 +18,7 @@
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 Konrad Hinsen <konrad.hinsen@fastmail.net>
;;; Copyright © 2020 Dimakis Dimakakos <me@bendersteed.tech>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -619,6 +620,43 @@ (define-public cl-clx
(define-public ecl-clx
(sbcl-package->ecl-package sbcl-clx))
(define-public sbcl-clx-truetype
(let ((commit "c6e10a918d46632324d5863a8ed067a83fc26de8")
(revision "1"))
(package
(name "sbcl-clx-truetype")
(version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/l04m33/clx-truetype")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"079hyp92cjkdfn6bhkxsrwnibiqbz4y4af6nl31lzw6nm91j5j37"))
(modules '((guix build utils)))
(snippet
'(begin
(substitute* "package.lisp"
((":export") ":export\n :+font-cache-filename+"))
#t))))
(build-system asdf-build-system/sbcl)
(inputs
`(("clx" ,sbcl-clx)
("zpb-ttf" ,sbcl-zpb-ttf)
("cl-vectors" ,sbcl-cl-vectors)
("cl-paths-ttf" ,sbcl-cl-paths-ttf)
("cl-fad" ,sbcl-cl-fad)
("cl-store" ,sbcl-cl-store)
("trivial-features" ,sbcl-trivial-features)))
(home-page "https://github.com/l04m33/clx-truetype")
(synopsis "Antialiased TrueType font rendering using CLX and XRender")
(description "CLX-TrueType is pure common lisp solution for
antialiased TrueType font rendering using CLX and XRender extension.")
(license license:expat))))
(define-public sbcl-cl-ppcre-unicode
(package (inherit sbcl-cl-ppcre)
(name "sbcl-cl-ppcre-unicode")
@ -6643,8 +6681,8 @@ (define-public ecl-metatilities-base
(sbcl-package->ecl-package sbcl-metatilities-base))
(define-public sbcl-cl-containers
(let ((commit "b2980bac9ac87ad32b63b722ce520fa26cb36ee6")
(revision "2"))
(let ((commit "3d1df53c22403121bffb5d553cf7acb1503850e7")
(revision "3"))
(package
(name "sbcl-cl-containers")
(version (git-version "0.12.1" revision commit))
@ -6657,7 +6695,7 @@ (define-public sbcl-cl-containers
(file-name (git-file-name name version))
(sha256
(base32
"19hmlax19hq0xjaqr8za90vwf06ymxw1m29sj053a309k3hm84gx"))))
"18s6jfq11n8nv9k4biz32pm1s7y9zl054ry1gmdbcf39nisy377y"))))
(build-system asdf-build-system/sbcl)
(native-inputs
`(("lift" ,sbcl-lift)))
@ -7204,8 +7242,8 @@ (define-public ecl-trivial-macroexpand-all
(sbcl-package->ecl-package sbcl-trivial-macroexpand-all))
(define-public sbcl-serapeum
(let ((commit "65837f8a0d65b36369ec8d000fff5c29a395b5fe")
(revision "0"))
(let ((commit "64f0c4a161bbbda7c275012ca1415b4293b9e169")
(revision "1"))
(package
(name "sbcl-serapeum")
(version (git-version "0.0.0" revision commit))
@ -7219,7 +7257,7 @@ (define-public sbcl-serapeum
(file-name (git-file-name name version))
(sha256
(base32
"0clwf81r2lvk1rbfvk91s9zmbkas9imf57ilqclw12mxaxlfsnbw"))))
"0djnj0py8hdjnk5j6shjq2kbmyxqd5sw79cilcfmpfz4dzjdgkx9"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("alexandria" ,sbcl-alexandria)

55
gnu/packages/lisp.scm
View file

@ -365,14 +365,14 @@ (define-public clisp
(define-public sbcl
(package
(name "sbcl")
(version "2.0.2")
(version "2.0.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-"
version "-source.tar.bz2"))
(sha256
(base32 "07pyzdjnhcpqwvr3rrk4i18maqdywbq1qj93fnpx1h4b7dp08r28"))))
(base32 "001gckyw8hl842nk7nwf5kcspzkc1g8dycpwylzh5chl6893ym5m"))))
(build-system gnu-build-system)
(outputs '("out" "doc"))
(native-inputs
@ -687,6 +687,53 @@ (define-public ccl
(license (list license:lgpl2.1
license:clarified-artistic)))) ;TRIVIAL-LDAP package
(define-public ccl-1.12
;; This is a development snapshot. The last stable version is from November
;; 2017 and does not support package-local-nicknames, which prevents CCL
;; from compiling some third-party packages.
;; The main drawback of 1.12 is that ARM is not supported for now.
(package
(inherit ccl)
(version "1.12-dev.5")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Clozure/ccl/")
(commit (string-append "v" version))))
(file-name (git-file-name "ccl" version))
(sha256
(base32
"1za5j4ll4hk1vi1i7v1bmqhaqbsgc16izn46qmry7dnbig0rdqm0"))))
;; CCL consists of a "lisp kernel" and "heap image".
;; See comment in `ccl' package.
(inputs
`(("ccl-bootstrap"
,(origin
(method url-fetch)
(uri (string-append
"https://github.com/Clozure/ccl/releases/download/v" version "/"
(match (%current-system)
((or "i686-linux" "x86_64-linux") "linuxx86")
;; Prevent errors when querying this package on unsupported
;; platforms, e.g. when running "guix package --search="
(_ "UNSUPPORTED"))
".tar.gz"))
(sha256
(base32
(match (%current-system)
((or "i686-linux" "x86_64-linux")
"1pqiybxxv4wx5zlp1i60nim3njaczwl5321bdwq6frjsl3s95xmb")
(_ ""))))))))
(arguments
(substitute-keyword-arguments (package-arguments ccl)
((#:phases phases)
`(modify-phases ,phases
(replace 'unpack (assoc-ref %standard-phases 'unpack))
(add-after 'unpack 'unpack-image
(lambda* (#:key inputs #:allow-other-keys)
(invoke "tar" "xzvf" (assoc-ref inputs "ccl-bootstrap"))))))))
(supported-systems '("i686-linux" "x86_64-linux"))))
(define-public lush2
(package
(name "lush2")
@ -798,7 +845,7 @@ (define-public confusion-mdl
(define-public txr
(package
(name "txr")
(version "233")
(version "234")
(source
(origin
(method git-fetch)
@ -809,7 +856,7 @@ (define-public txr
(patches (search-patches "txr-shell.patch"))
(sha256
(base32
"14dwjgx9lbfajk3q539m3v3b9j047q83ldnqb4cagbs8ampvhfbv"))))
"0c9qsj4xwc24c9g02mr5n97m4d87d4n0pcc2c2n58l2vg5dnzba0"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("cc=gcc")

2
gnu/packages/lxde.scm
View file

@ -264,11 +264,11 @@ (define-public spacefm
(file-name (string-append name "-" version ".tar.gz"))))
(build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config)
("desktop-file-utils" ,desktop-file-utils)
("intltool" ,intltool)))
(inputs `(("bash" ,bash)
("gtk+" ,gtk+)
("eudev" ,eudev)
("desktop-file-utils" ,desktop-file-utils)
("shared-mime-info" ,shared-mime-info)
("ffmpegthumbnailer" ,ffmpegthumbnailer)
("jmtpfs" ,jmtpfs)

57
gnu/packages/mail.scm
View file

@ -29,6 +29,8 @@
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Justus Winter <justus@sequoia-pgp.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -81,6 +83,7 @@ (define-module (gnu packages mail)
#:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz)
#:use-module (gnu packages flex)
#:use-module (gnu packages haskell-xyz)
#:use-module (gnu packages kerberos)
#:use-module (gnu packages libcanberra)
#:use-module (gnu packages libevent)
@ -218,11 +221,11 @@ (define-public mailutils
#:parallel-tests? #f))
(native-inputs
`(("perl" ,perl))) ;for 'gylwrap'
(inputs
`(("dejagnu" ,dejagnu)
("m4" ,m4)
`(("perl" ,perl) ;for 'gylwrap'
("texinfo" ,texinfo)
("dejagnu" ,dejagnu)))
(inputs
`(("m4" ,m4)
("guile" ,guile-3.0)
("gsasl" ,gsasl)
("gnutls" ,gnutls)
@ -525,7 +528,7 @@ (define-public neomutt
(define-public gmime
(package
(name "gmime")
(version "3.2.6")
(version "3.2.7")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gmime/"
@ -533,7 +536,7 @@ (define-public gmime
"/gmime-" version ".tar.xz"))
(sha256
(base32
"05s7qjrxbj010q016pmdqdq73gz8vl4hv29kwaign0j8gi61kzxb"))))
"0i3xfc84qn1z99i70q68kbnp9rmgqrnprqb418ba52s6g9j9dsia"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@ -1076,6 +1079,38 @@ (define-public python-notmuch
(define-public python2-notmuch
(package-with-python2 python-notmuch))
(define-public muchsync
(package
(name "muchsync")
(version "5")
(source
(origin
(method url-fetch)
(uri (string-append "http://www.muchsync.org/src/"
"muchsync-" version ".tar.gz"))
(sha256
(base32 "1k2m44pj5i6vfhp9icdqs42chsp208llanc666p3d9nww8ngq2lb"))))
(build-system gnu-build-system)
(native-inputs
`(("ghc-pandoc" ,ghc-pandoc)
("pkg-config" ,pkg-config)))
(inputs
`(("libcrypto" ,openssl)
("notmuch" ,notmuch)
("sqlite" ,sqlite)
("xapian" ,xapian)))
(home-page "http://www.muchsync.org/")
(synopsis "Synchronize notmuch mail across machines")
(description
"Muchsync brings Notmuch to all of your computers by synchronizing your
mail messages and Notmuch tags across machines. The protocol is heavily
pipelined to work efficiently over high-latency networks such as mobile
broadband. Muchsync supports arbitrary pairwise synchronization among
replicas. A version-vector-based algorithm allows it to exchange only the
minimum information necessary to bring replicas up to date regardless of which
pairs have previously synchronized.")
(license gpl2+)))
(define-public getmail
(package
(name "getmail")
@ -2965,8 +3000,8 @@ (define-public tnef
(license gpl2+)))
(define-public mumi
(let ((commit "6653e2d525b945fcd671dbfbf7b42cc588a1cf4b")
(revision "7"))
(let ((commit "c85015dac8110bd7a4c37375b9eb05ebeadedf74")
(revision "15"))
(package
(name "mumi")
(version (git-version "0.0.0" revision commit))
@ -2978,7 +3013,7 @@ (define-public mumi
(file-name (git-file-name name version))
(sha256
(base32
"0h1q61yl01hm7wygv1bv47ncg7l7gcw7aq8ny61g3hr1acsqysjf"))))
"05nma73kqnva6ci92aq8jb3718ry5dz3sd64ibpxn5w77z5kpwr7"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build gnu-build-system)
@ -3009,11 +3044,15 @@ (define-public mumi
(inputs
`(("guile-debbugs" ,guile-debbugs)
("guile-email" ,guile-email)
("guile-gcrypt" ,guile-gcrypt)
("guile-json" ,guile-json-3)
("guile-redis" ,guile-redis)
("guile-sqlite3" ,guile-sqlite3)
("guile-syntax-highlight" ,guile-syntax-highlight)
("guile-webutils" ,guile-webutils)
("gnutls" ,gnutls) ;needed to talk to https://debbugs.gnu.org
("guile" ,guile-2.2)
("mailutils" ,mailutils)
("mumimu" ,mumimu))) ;'mumimu' executable recorded in (mumi config)
(native-inputs
`(("autoconf" ,autoconf)

9
gnu/packages/man.scm
View file

@ -7,6 +7,7 @@
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -137,10 +138,10 @@ (define-public man-db
(srfi srfi-1))))
(native-inputs
`(("pkg-config" ,pkg-config)
("flex" ,flex)
("groff" ,groff))) ;needed at build time (troff, grops, soelim, etc.)
(inputs
`(("flex" ,flex)
("gdbm" ,gdbm)
`(("gdbm" ,gdbm)
("groff-minimal" ,groff-minimal)
("less" ,less)
("libpipeline" ,libpipeline)
@ -230,7 +231,7 @@ (define-public help2man
(define-public scdoc
(package
(name "scdoc")
(version "1.9.4")
(version "1.10.1")
(source
(origin
(method url-fetch)
@ -239,7 +240,7 @@ (define-public scdoc
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"00zc3rzj97gscby31djlqyczvqpyhrl66i44czwzmmn7rc5j03m1"))))
"13x7g1r56bshvfmlvapvz35ywnbgsh337kywb5kcv8nc6b3j3q40"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags

9
gnu/packages/mastodon.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
@ -29,19 +29,18 @@ (define-module (gnu packages mastodon)
(define-public toot
(package
(name "toot")
(version "0.24.0")
(version "0.25.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "toot" version))
(sha256
(base32 "0w83b6ydaggrand9285wfrjrm1qry8fjl4as0iihma630ky6y2w3"))))
(base32 "16akld7zfr52rqrbgf6hmsca9qsrfdbbbd9bji8d26zggxmqq4vq"))))
(build-system python-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(delete 'check)
(add-after 'install 'check
(replace 'check
(lambda* (#:key inputs outputs #:allow-other-keys)
(add-installed-pythonpath inputs outputs)
(invoke "py.test"))))))

168
gnu/packages/mate.scm
View file

@ -3,8 +3,9 @@
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com>
;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -94,7 +95,7 @@ (define-public mate-common
(define-public mate-power-manager
(package
(name "mate-power-manager")
(version "1.22.0")
(version "1.24.1")
(source
(origin
(method url-fetch)
@ -102,14 +103,14 @@ (define-public mate-power-manager
name "-" version ".tar.xz"))
(sha256
(base32
"03c09h41qfz83wmjfvwzkq4xqc54aswmki4h034qcxbgfnyfmk1i"))))
"13ar40x5hs4d4h81q8qsy0agbx5wnarry3mbhws54zydcxd7j20a"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
("intltool" ,intltool)
("yelp-tools" ,yelp-tools)
("gettext" ,gettext-minimal)
("glib" ,glib "bin") ; glib-gettextize
("libtool" ,libtool)))
("polkit" ,polkit))) ; for ITS rules
(inputs
`(("gtk+" ,gtk+)
("glib" ,glib)
@ -133,7 +134,7 @@ (define-public mate-power-manager
(define-public mate-icon-theme
(package
(name "mate-icon-theme")
(version "1.22.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
@ -141,7 +142,7 @@ (define-public mate-icon-theme
name "-" version ".tar.xz"))
(sha256
(base32
"090vfxpn1b1wwvkilv1j3cx4swdm4z0s7xyvhvqhdzj58zsf2000"))))
"0a2lz61ivwwcdznmwlmgjr6ipr9sdl5g2czbagnpxkwz8f3m77na"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@ -194,14 +195,14 @@ (define-public mate-icon-theme-faenza
(define-public mate-themes
(package
(name "mate-themes")
(version "3.22.20")
(version "3.22.21")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://mate/themes/" (version-major+minor version)
"/mate-themes-" version ".tar.xz"))
(sha256
(base32 "0c3dhf8p9nc2maky4g9xr04iil9wwbdkmhpzynlc6lfg4ksqq2bx"))))
(base32 "051g2vq817g84yrqzf7hjcqr4xrghnw1rprjd6jf5mhhzmwcas6n"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@ -221,7 +222,7 @@ (define-public mate-themes
(define-public mate-desktop
(package
(name "mate-desktop")
(version "1.22.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
@ -229,7 +230,7 @@ (define-public mate-desktop
name "-" version ".tar.xz"))
(sha256
(base32
"09gn840p6qds21kxab4pidjd53g76s76i7178fdibrz462mda217"))))
"0l4bbj6nz315s5ndq5sw1jcgi3s1whk59bj12c4mbpsvmlb33adg"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@ -255,7 +256,7 @@ (define-public mate-desktop
(define-public libmateweather
(package
(name "libmateweather")
(version "1.22.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
@ -263,7 +264,7 @@ (define-public libmateweather
name "-" version ".tar.xz"))
(sha256
(base32
"1ribgcwl4ncfbcf9bkcbxrgc7yzajdnxg12837psngymkqswlp6a"))))
"094mnlczxq9crjj8z7dzs1zmwscdkbp54l3qjaf4a4bhd8lihv8d"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags
@ -301,14 +302,14 @@ (define-public libmateweather
(define-public mate-terminal
(package
(name "mate-terminal")
(version "1.23.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://mate/" (version-major+minor version) "/"
"mate-terminal-" version ".tar.xz"))
(sha256
(base32 "1jkw8i2j45p80i7wmm0j0gkbd44nr2qj8bf79jrh5z8kn01b1ibd"))))
(base32 "0nc23nmbkya2fgf7j65z85dcibwi5akkr8nscqrvk039ckirhk97"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@ -340,7 +341,7 @@ (define-public mate-terminal
(define-public mate-session-manager
(package
(name "mate-session-manager")
(version "1.22.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
@ -348,31 +349,13 @@ (define-public mate-session-manager
name "-" version ".tar.xz"))
(sha256
(base32
"1kpfmgay01gm74paaxccs3lim4jfb4hsm7i85jfdypr51985pwyj"))))
"01scj5d1xlri9b2id8gm9kfni9nzhdjdf7rag7fvcxwqp7baz3h3"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags (list "--enable-elogind"
`(#:configure-flags (list "--with-elogind"
"--disable-schemas-compile")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'pre-configure
(lambda* (#:key outputs #:allow-other-keys)
;; Use elogind instead of systemd.
(substitute* "configure"
(("libsystemd-login")
"libelogind")
(("systemd") "elogind"))
(substitute* "mate-session/gsm-systemd.c"
(("#include <systemd/sd-login.h>")
"#include <elogind/sd-login.h>"))
;; Remove uses of the systemd journal.
(substitute* "mate-session/main.c"
(("#ifdef HAVE_SYSTEMD") "#if 0"))
(substitute* "mate-session/gsm-manager.c"
(("#ifdef HAVE_SYSTEMD") "#if 0"))
(substitute* "mate-session/gsm-autostart-app.c"
(("#ifdef HAVE_SYSTEMD") "#if 0"))
#t))
(add-after 'install 'update-xsession-dot-desktop
(lambda* (#:key outputs #:allow-other-keys)
;; Record the absolute file name of 'mate-session' in the
@ -389,6 +372,7 @@ (define-public mate-session-manager
(native-inputs
`(("pkg-config" ,pkg-config)
("intltool" ,intltool)
("libxcomposite" ,libxcomposite)
("xtrans" ,xtrans)
("gobject-introspection" ,gobject-introspection)))
(inputs
@ -407,7 +391,7 @@ (define-public mate-session-manager
(define-public mate-settings-daemon
(package
(name "mate-settings-daemon")
(version "1.22.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
@ -415,7 +399,7 @@ (define-public mate-settings-daemon
name "-" version ".tar.xz"))
(sha256
(base32
"0yr5v6b9hdk20j29smbw1k4fkyg82i5vlflmgly0vi5whgc74gym"))))
"1hc5a36wqpjv9i2lgrn1h12s8y910xab3phx5vzbzq47kj6m3gw9"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@ -449,7 +433,7 @@ (define-public mate-settings-daemon
(define-public libmatemixer
(package
(name "libmatemixer")
(version "1.22.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
@ -457,7 +441,7 @@ (define-public libmatemixer
name "-" version ".tar.xz"))
(sha256
(base32
"1v0gpr55gj4mj8hzxbhgzrmhaxvs2inxhsmirvjw39sc7iplvrh9"))))
"08vkdp2kzy27xwscwp2jj5nz0yblrka2482l6cx3wl4dnk0rpznm"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@ -478,7 +462,7 @@ (define-public libmatemixer
(define-public libmatekbd
(package
(name "libmatekbd")
(version "1.22.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
@ -486,7 +470,7 @@ (define-public libmatekbd
name "-" version ".tar.xz"))
(sha256
(base32
"1dsr7618c92mhwabwhgxqsfp7gnf9zrz2z790jc5g085dxhg13y8"))))
"1sq7gwr9q3hq4q0vx32qqa68qcqf5by9mqyxnq6lwgaq8ydq16ab"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@ -509,7 +493,7 @@ (define-public libmatekbd
(define-public mate-menus
(package
(name "mate-menus")
(version "1.22.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
@ -517,7 +501,7 @@ (define-public mate-menus
name "-" version ".tar.xz"))
(sha256
(base32
"1lkakbf2f1815c146z4xp5f0h4lim6jzr02681wbvzalc6k97v5c"))))
"1vv4j38h7mrbfrsj99k25z6y7b5dg30fzd2qnhk7pl8ca8s1jhrd"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@ -550,7 +534,7 @@ (define-public mate-menus
(define-public mate-applets
(package
(name "mate-applets")
(version "1.22.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
@ -558,7 +542,7 @@ (define-public mate-applets
name "-" version ".tar.xz"))
(sha256
(base32
"0f5ym6z7awi0kw6i1sdkj2qly88sl692j5r1zhklihyz1z9a6j0h"))))
"0nm3amb3v458mxv1mbz9y8f4230gldmydmkkm7vqxsrxbccynkxq"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@ -623,7 +607,7 @@ (define-public mate-applets
(define-public mate-media
(package
(name "mate-media")
(version "1.22.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
@ -631,7 +615,7 @@ (define-public mate-media
name "-" version ".tar.xz"))
(sha256
(base32
"0jrxbz00vjas0yp3ixvyzfsdby2ac3p3bds9yd7q1437mmhf71mj"))))
"1d5dx79yfqghjaxrdrdh053nfnvkbx8p3ma7j87s7rsvy5irs963"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@ -659,7 +643,7 @@ (define-public mate-media
(define-public mate-panel
(package
(name "mate-panel")
(version "1.22.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
@ -667,7 +651,7 @@ (define-public mate-panel
name "-" version ".tar.xz"))
(sha256
(base32
"17l4ryy71bkszr6shm9dm31zcsd7m0digi1mmvdlib5hqzvc7li7"))))
"1hrh10pqk8mva1ix2nmsp3cbbn81cgqy0b9lqhsl0b5p0s40i7in"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags
@ -834,7 +818,7 @@ (define-public atril
(define-public caja
(package
(name "caja")
(version "1.22.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
@ -842,7 +826,7 @@ (define-public caja
name "-" version ".tar.xz"))
(sha256
(base32
"14x9n9q7vip5zp4mdgccj1p1dm4xn429g0bjw2v8iz7zmjb7vcgl"))))
"1cnfy481hcwjv3ia3kw0d4h7ga8cng0pqm3z349v4qcmfdapmqc0"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags '("--disable-update-mimedb")
@ -892,7 +876,7 @@ (define-public caja
(define-public caja-extensions
(package
(name "caja-extensions")
(version "1.22.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
@ -900,7 +884,7 @@ (define-public caja-extensions
name "-" version ".tar.xz"))
(sha256
(base32
"1h866jmdd3qpjzi7wjj11krwiaadnlf21844g1zqfb4jgrzj773p"))))
"175v5c05nrdliya23rbqma49alldq67dklmvpq18nq71sfry4pp6"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags (list "--enable-sendto"
@ -920,6 +904,7 @@ (define-public caja-extensions
("glib:bin" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
("gtk-doc" ,gtk-doc)
("libxml2" ,libxml2)
("pkg-config" ,pkg-config)))
(inputs
`(("attr" ,attr)
@ -946,7 +931,7 @@ (define-public caja-extensions
(define-public mate-control-center
(package
(name "mate-control-center")
(version "1.22.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
@ -954,8 +939,21 @@ (define-public mate-control-center
name "-" version ".tar.xz"))
(sha256
(base32
"06wpfsxsiv7w3dl7p395r5vcxqbjlllydqbnvbr6yn0lrac15i71"))))
"192plsh83m2qz7jgakns2yvhqbj53v7i54iwb0z26i2awy0j9rcd"))))
(build-system glib-or-gtk-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
(add-before 'build 'fix-polkit-action
(lambda* (#:key outputs #:allow-other-keys)
;; Make sure the polkit file refers to the right
;; executable.
(let ((out (assoc-ref outputs "out")))
(substitute*
'("capplets/display/org.mate.randr.policy.in"
"capplets/display/org.mate.randr.policy")
(("/usr/sbin")
(string-append out "/sbin")))
#t))))))
(native-inputs
`(("pkg-config" ,pkg-config)
("intltool" ,intltool)
@ -991,6 +989,7 @@ (define-public mate-control-center
("mate-menus" ,mate-menus)
("mate-settings-daemon" ,mate-settings-daemon)
("pango" ,pango)
("polkit" ,polkit)
("startup-notification" ,startup-notification)))
(propagated-inputs
`(("gdk-pixbuf" ,gdk-pixbuf+svg) ; mate-slab.pc
@ -1005,7 +1004,7 @@ (define-public mate-control-center
(define-public marco
(package
(name "marco")
(version "1.22.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
@ -1013,7 +1012,7 @@ (define-public marco
name "-" version ".tar.xz"))
(sha256
(base32
"1i1pi1z9mrb6564mxcwb93jqpdppfv58c2viwmicsixis62hv5wx"))))
"0hcbyv8czymhwz5q9rwig7kkhlhik6y080bls736f3wsbqnnirc2"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@ -1055,7 +1054,7 @@ (define-public marco
(define-public mate-user-guide
(package
(name "mate-user-guide")
(version "1.22.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
@ -1063,7 +1062,7 @@ (define-public mate-user-guide
name "-" version ".tar.xz"))
(sha256
(base32
"0ckn7h7l0qdgdx440dwx1h8i601s22sxlf5a7179hfirk9016j0z"))))
"0ddxya84iydvy85dbqls0wmz2rph87wri3rsdhv4rkbhh5g4sd7f"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@ -1094,7 +1093,7 @@ (define-public mate-user-guide
(define-public mate-calc
(package
(name "mate-calc")
(version "1.22.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
@ -1102,7 +1101,7 @@ (define-public mate-calc
name "-" version ".tar.xz"))
(sha256
(base32
"1njk6v7z3969ikvcrabr1lw5f5572vb14w064zm3mydj8cc5inlr"))))
"0f7hc1gg41kcwcyvsqqg79qylrp0qqymris8qizk2x3cfvvg7261"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)
@ -1125,7 +1124,7 @@ (define-public mate-calc
(define-public mate-backgrounds
(package
(name "mate-backgrounds")
(version "1.22.0")
(version "1.24.1")
(source
(origin
(method url-fetch)
@ -1133,7 +1132,7 @@ (define-public mate-backgrounds
name "-" version ".tar.xz"))
(sha256
(base32
"1j9ch04qi2q4mdcvb92w667ra9hpfdf2bfpi1dpw0nbph7r6qvj9"))))
"0b9yx68p9l867bqsl9z2g4wrs8p396ls673jgaliys5snmk8n8dn"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("intltool" ,intltool)))
@ -1147,7 +1146,7 @@ (define-public mate-backgrounds
(define-public mate-netbook
(package
(name "mate-netbook")
(version "1.22.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
@ -1155,7 +1154,7 @@ (define-public mate-netbook
name "-" version ".tar.xz"))
(sha256
(base32
"17p1wv9bcr3kvlahnxmxj786vka86nysi90x5xci6ilwyjlaxh0l"))))
"1bmk9gq5gcqkvfppa7i1hqfph8sajc3xs189s4ha97g0ifwd98a8"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)
@ -1188,7 +1187,7 @@ (define-public mate-netbook
(define-public mate-screensaver
(package
(name "mate-screensaver")
(version "1.22.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
@ -1196,7 +1195,7 @@ (define-public mate-screensaver
name "-" version ".tar.xz"))
(sha256
(base32
"17fxyccsc410wbyxmds1sm7gjqbj6z46x5cjk1791hfzf0sh82sy"))))
"0gpw6x9d0b77f14vjl7ghq5dya1mwcnvmgigg00manfwlksr5zby"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags
@ -1259,7 +1258,7 @@ (define-public mate-screensaver
(define-public mate-utils
(package
(name "mate-utils")
(version "1.22.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
@ -1267,7 +1266,7 @@ (define-public mate-utils
name "-" version ".tar.xz"))
(sha256
(base32
"0kz95hicjksgkwaj83fdp2rnaygfgjbj0jsnwy4n0lj5q90j7r28"))))
"1b16n1628gcsym5mph6lr9x5xm4rgkxsa8xwr2wlx8g2gw2775i1"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)
@ -1291,6 +1290,7 @@ (define-public mate-utils
("libxext" ,libxext)
("mate-panel" ,mate-panel)
("pango" ,pango)
("udisks" ,udisks)
("zlib" ,zlib)))
(home-page "https://mate-desktop.org/")
(synopsis "Utilities for the MATE Desktop")
@ -1311,7 +1311,7 @@ (define-public mate-utils
(define-public eom
(package
(name "eom")
(version "1.22.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
@ -1319,7 +1319,7 @@ (define-public eom
name "-" version ".tar.xz"))
(sha256
(base32
"093vbip848bp9y603yasbrg1bcp68m64hma7zhi5m37x2r103r6l"))))
"0zzximp2534bky0vac219alafblw6m0lis0gncq92017s6c1mb77"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)
@ -1361,7 +1361,7 @@ (define-public eom
(define-public engrampa
(package
(name "engrampa")
(version "1.22.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
@ -1369,7 +1369,7 @@ (define-public engrampa
name "-" version ".tar.xz"))
(sha256
(base32
"16yjplfl2sqa7n6404hjn0vwkh0xkdch73q7n5czynihmh3azc7p"))))
"13cak3qgrzqj74x9jq1sf155793v2bqqz4mk4i04g9f9xn3g85fl"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags (list "--disable-schemas-compile"
@ -1414,7 +1414,7 @@ (define-public engrampa
(define-public pluma
(package
(name "pluma")
(version "1.22.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
@ -1422,7 +1422,7 @@ (define-public pluma
name "-" version ".tar.xz"))
(sha256
(base32
"07rr5asdjr9slmaijp4m8v9vxscihvm36mfrwlp3lv12kry42a05"))))
"1vmndhlhy3qkf3xs5kkv0xhbv5ar25pqz0kp17hc4qhgjzycfr0r"))))
(build-system glib-or-gtk-build-system)
(arguments
`(; Tests can not succeed.
@ -1453,7 +1453,7 @@ (define-public pluma
("libice" ,libice)
("packagekit" ,packagekit)
("pango" ,pango)
("python-2" ,python-2)
("python" ,python)
("scrollkeeper" ,scrollkeeper)))
(home-page "https://mate-desktop.org/")
(synopsis "Text Editor for MATE")
@ -1464,7 +1464,7 @@ (define-public pluma
(define-public mate-system-monitor
(package
(name "mate-system-monitor")
(version "1.22.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
@ -1472,7 +1472,7 @@ (define-public mate-system-monitor
name "-" version ".tar.xz"))
(sha256
(base32
"0rs0n5ivmvi355fp3ymcp1jj2sz9viw31475aw7zh7s1l7dn969x"))))
"1cb36lrsn4fhsryl2kl4yq0qhp1p4r7k21w3fc2ywjga8fdxx6y5"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("autoconf" ,autoconf)
@ -1504,7 +1504,7 @@ (define-public mate-system-monitor
(define-public mate-polkit
(package
(name "mate-polkit")
(version "1.22.0")
(version "1.24.0")
(source
(origin
(method url-fetch)
@ -1512,7 +1512,7 @@ (define-public mate-polkit
name "-" version ".tar.xz"))
(sha256
(base32
"02r8n71xflhvw2hsf6g4svdahzyg3r4n6xamasyzqfhyn0mqmjy0"))))
"1450bqzlnvwy3xa98lj102j2cf7piqbxcd1cy2zp41rdl8ri3gvn"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)
@ -1551,6 +1551,7 @@ (define-public mate
(union-build (assoc-ref %outputs "out")
directories)
#t)))))
(native-inputs `(("desktop-file-utils" ,desktop-file-utils)))
(inputs
;; TODO: Add more packages
`(("at-spi2-core" ,at-spi2-core)
@ -1558,7 +1559,6 @@ (define-public mate
("caja" ,caja)
("dbus" ,dbus)
("dconf" ,dconf)
("desktop-file-utils" ,desktop-file-utils)
("engrampa" ,engrampa)
("eom" ,eom)
("font-cantarell" ,font-cantarell)
@ -1596,6 +1596,10 @@ (define-public mate
("shared-mime-info" ,shared-mime-info)
("yelp" ,yelp)
("zenity" ,zenity)))
;; FIXME: Propagating glib:bin fixes http://issues.guix.gnu.org/issue/38135
;; The proper fix is in core-updates. So we can remove this after next merge.
(propagated-inputs
`(("glib:bin" ,glib "bin")))
(synopsis "The MATE desktop environment")
(home-page "https://mate-desktop.org/")
(description

196
gnu/packages/maths.scm
View file

@ -35,6 +35,9 @@
;;; Copyright © 2019 Robert Smith <robertsmith@posteo.net>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
@ -62,6 +65,7 @@ (define-module (gnu packages maths)
#:use-module (guix utils)
#:use-module ((guix build utils) #:select (alist-replace))
#:use-module (guix build-system cmake)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (guix build-system ruby)
@ -79,6 +83,7 @@ (define-module (gnu packages maths)
#:use-module (gnu packages dbm)
#:use-module (gnu packages documentation)
#:use-module (gnu packages elf)
#:use-module (gnu packages file)
#:use-module (gnu packages flex)
#:use-module (gnu packages fltk)
#:use-module (gnu packages fontutils)
@ -86,8 +91,10 @@ (define-module (gnu packages maths)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gd)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages glib)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gtk)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
#:use-module (gnu packages java)
#:use-module (gnu packages less)
@ -375,6 +382,81 @@ (define-public dionysus
(license license:gpl3+)
(home-page "https://www.gnu.org/software/dionysus/")))
(define-public dsfmt
(package
(name "dsfmt")
(version "2.2.3")
(source
(origin
(method url-fetch)
(uri
(string-append
"http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/"
"dSFMT-src-" version ".tar.gz"))
(sha256
(base32
"03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42"))
(modules '((guix build utils)))
;; Don't distribute html documentation with bundled jquery.
(snippet
'(begin
(delete-file-recursively "html") #t))
;; Add patches borrowed from Julia.
(patches
(list
(origin
(method url-fetch)
(uri (string-append
"https://raw.githubusercontent.com/JuliaLang/julia/"
"v1.3.0/deps/patches/dSFMT.c.patch"))
(sha256 (base32
"09mhv11bms8jsmkmdqvlcgljwhzw3b6n9nncpi2b6dla9798hw2y"))
(file-name "dSFMT.c.patch"))
(origin
(method url-fetch)
(uri (string-append
"https://raw.githubusercontent.com/JuliaLang/julia/"
"v1.3.0/deps/patches/dSFMT.h.patch"))
(sha256 (base32
"1py5rd0yxic335lzka23f6x2dhncrpizpyrk57gi2f28c0p98y5n"))
(file-name "dSFMT.h.patch"))))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure script
(replace 'build
;; Upstream Makefile does not build a shared library. Borrow from Julia
;; https://github.com/JuliaLang/julia/blob/v1.3.0/deps/dsfmt.mk
(lambda _
(invoke
"gcc" "-DNDEBUG" "-DDSFMT_MEXP=19937"
"-fPIC" "-DDSFMT_DO_NOT_USE_OLD_NAMES"
"-O3" "-finline-functions" "-fomit-frame-pointer"
"-fno-strict-aliasing" "--param" "max-inline-insns-single=1800"
"-Wmissing-prototypes" "-Wall" "-std=c99" "-shared" "dSFMT.c"
"-o" "libdSFMT.so")))
(replace 'install ; no "install" target
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib"))
(inc (string-append out "/include"))
(doc (string-append out "/share/doc/" ,name "-" ,version)))
(install-file "libdSFMT.so" lib)
(install-file "dSFMT.h" inc)
(install-file "LICENSE.txt" doc)
#t))))))
(synopsis "Double precision SIMD-oriented Fast Mersenne Twister")
(description
"The dSMFT package speeds up Fast Mersenne Twister generation by avoiding
the expensive conversion of integer to double (floating point). dSFMT directly
generates double precision floating point pseudorandom numbers which have the
IEEE Standard for Binary Floating-Point Arithmetic (ANSI/IEEE Std 754-1985)
format. dSFMT is only available on the CPUs which use IEEE 754 format double
precision floating point numbers.")
(home-page "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/")
(license license:bsd-3)))
(define-public gsl
(package
(name "gsl")
@ -2653,8 +2735,9 @@ (define-public scotch
"scotch-integer-declarations.patch"))))
(build-system gnu-build-system)
(inputs
`(("zlib" ,zlib)
("flex" ,flex)
`(("zlib" ,zlib)))
(native-inputs
`(("flex" ,flex)
("bison" ,bison)))
(outputs '("out" "metis"))
(arguments
@ -5353,3 +5436,112 @@ (define-public minisat
(home-page
"http://minisat.se/MiniSat.html")
(license license:expat))))
(define-public libqalculate
(package
(name "libqalculate")
(version "3.8.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Qalculate/libqalculate/")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1vbaza9c7159xf2ym90l0xkyj2mp6c3hbghhsqn29yvz08fda9df"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
("gettext" ,gettext-minimal)
("intltool" ,intltool)
("automake" ,automake)
("autoconf" ,autoconf)
("libtool" ,libtool)
("doxygen" ,doxygen)
("file" ,file)))
(inputs
`(("gmp" ,gmp)
("mpfr" ,mpfr)
("libxml2" ,libxml2)
("curl" ,curl)
("icu4c" ,icu4c)
("gnuplot" ,gnuplot)
("readline" ,readline)
("libiconv" ,libiconv)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'bootstrap 'setenv
;; Prevent the autogen.sh script to carry out the configure
;; script, which has not yet been patched to replace /bin/sh.
(lambda _
(setenv "NOCONFIGURE" "TRUE")
#t)))))
(home-page "https://qalculate.github.io/")
(synopsis "Multi-purpose cli desktop calculator and library")
(description
"Libqalculate is a multi-purpose cli desktop calculator and library.
It provides basic and advanced functionality. Features include customizable
functions, unit calculations, and conversions, physical constants, symbolic
calculations (including integrals and equations), arbitrary precision,
uncertainity propagation, interval arithmetic, plotting and a user-friendly
cli.")
(license license:gpl2+)))
(define-public qalculate-gtk
(package
(name "qalculate-gtk")
(version "3.8.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Qalculate/qalculate-gtk/")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0nsg6dzg5r7rzqr671nvrf1c50rjwpz7bxv5f20i4s7agizgv840"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
("intltool" ,intltool)
("automake" ,automake)
("autoconf" ,autoconf)
("libtool" ,libtool)
("file" ,file)))
(inputs
`(("gmp" ,gmp)
("mpfr" ,mpfr)
("libqalculate" ,libqalculate)
("libxml2" ,libxml2)
("glib" ,glib)
("gtk+" ,gtk+)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'bootstrap 'setenv
;; Prevent the autogen.sh script to carry out the configure
;; script, which has not yet been patched to replace /bin/sh.
(lambda _
(setenv "NOCONFIGURE" "TRUE")
#t))
(add-before 'check 'add-pot-file
;; the file contains translations and are currently not in use
;; left out on purpose so add it to POTFILES.skip
(lambda _
(with-output-to-file "po/POTFILES.skip"
(lambda _
(format #t "data/shortcuts.ui~%")
#t))
#t)))))
(home-page "https://qalculate.github.io/")
(synopsis "Multi-purpose graphical desktop calculator")
(description
"Qalculate-gtk is the GTK frontend for libqalculate. It is a
multi-purpose GUI desktop calculator. It provides basic and advanced
functionality. Features include customizable functions, unit calculations,
and conversions, physical constants, symbolic calculations (including
integrals and equations), arbitrary precision, uncertainity propagation,
interval arithmetic, plotting.")
(license license:gpl2+)))

121
gnu/packages/matrix.scm Normal file
View file

@ -0,0 +1,121 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Alex ter Weele <alex.ter.weele@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages matrix)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages check)
#:use-module (gnu packages databases)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages xml)
#:use-module (guix build-system python)
#:use-module (guix download)
#:use-module (guix packages))
(define-public python-matrix-synapse-ldap3
(package
(name "python-matrix-synapse-ldap3")
(version "0.1.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "matrix-synapse-ldap3" version))
(sha256
(base32
"01bms89sl16nyh9f141idsz4mnhxvjrc3gj721wxh1fhikps0djx"))))
(build-system python-build-system)
(arguments
;; tests require synapse, creating a circular dependency.
'(#:tests? #f))
(propagated-inputs
`(("python-twisted" ,python-twisted)
("python-ldap3" ,python-ldap3)
("python-service-identity" ,python-service-identity)))
(home-page "https://github.com/matrix-org/matrix-synapse-ldap3")
(synopsis "LDAP3 auth provider for Synapse")
(description
"This package allows Synapse to use LDAP as a password provider.
This lets users log in to Synapse with their username and password from
an LDAP server.")
(license license:asl2.0)))
(define-public synapse
(package
(name "synapse")
(version "1.11.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "matrix-synapse" version))
(sha256
(base32
"0cqbwcz0fi4w413s1kcxvf696qi4n46n1k4ggnygqri5yq26qlfy"))))
(build-system python-build-system)
;; TODO I think there are custom tests
(propagated-inputs
`(("python-simplejson" ,python-simplejson) ; not attested but required
;; requirements (synapse/python_dependencies.py)
("python-jsonschema" ,python-jsonschema)
("python-frozendict" ,python-frozendict)
("python-unpaddedbase64" ,python-unpaddedbase64)
("python-canonicaljson" ,python-canonicaljson)
("python-signedjson" ,python-signedjson)
("python-pynacl" ,python-pynacl)
("python-idna" ,python-idna)
("python-service-identity" ,python-service-identity)
("python-twisted" ,python-twisted)
("python-treq" ,python-treq)
("python-pyopenssl" ,python-pyopenssl)
("python-pyyaml" ,python-pyyaml)
("python-pyasn1" ,python-pyasn1)
("python-pyasn1-modules" ,python-pyasn1-modules)
("python-daemonize" ,python-daemonize)
("python-bcrypt" ,python-bcrypt)
("python-pillow" ,python-pillow)
("python-sortedcontainers" ,python-sortedcontainers)
("python-pymacaroons" ,python-pymacaroons)
("python-msgpack" ,python-msgpack)
("python-phonenumbers" ,python-phonenumbers)
("python-six" ,python-six)
("python-prometheus-client" ,python-prometheus-client)
("python-attrs" ,python-attrs)
("python-netaddr" ,python-netaddr)
("python-jinja2" ,python-jinja2)
("python-bleach" ,python-bleach)
("python-typing-extensions" ,python-typing-extensions)
;; conditional requirements (synapse/python_dependencies.py)
("python-matrix-synapse-ldap3" ,python-matrix-synapse-ldap3)
("python-psycopg2" ,python-psycopg2)
("python-jinja2" ,python-jinja2)
("python-txacme" ,python-txacme)
("python-pysaml2" ,python-pysaml2)
("python-lxml" ,python-lxml)
;; sentry-sdk, jaeger-client, and opentracing could be included, but
;; all are monitoring aids and not essential.
("python-pyjwt" ,python-pyjwt)))
(native-inputs
`(("python-mock" ,python-mock)
("python-parameterized" ,python-parameterized)))
(home-page "https://github.com/matrix-org/synapse")
(synopsis "Matrix reference homeserver")
(description "Synapse is a reference \"homeserver\" implementation of
Matrix from the core development team at matrix.org, written in
Python/Twisted. It is intended to showcase the concept of Matrix and let
folks see the spec in the context of a codebase and let you run your own
homeserver and generally help bootstrap the ecosystem.")
(license license:asl2.0)))

5
gnu/packages/messaging.scm
View file

@ -19,6 +19,7 @@
;;; Copyright © 2019, 2020 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2019, 2020 Timotej Lazar <timotej.lazar@araneo.si>
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -307,7 +308,7 @@ (define-public hexchat
(("if 'DESTDIR' not in os.environ:")
"if False:"))
#t)))))
(synopsis "Graphical IRC Client")
(synopsis "Graphical IRC client")
(description
"HexChat lets you connect to multiple IRC networks at once. The main
window shows the list of currently connected networks and their channels, the
@ -2030,13 +2031,13 @@ (define-public telegram-purple
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
("gettext" ,gettext-minimal)
("which" ,which)))
(inputs
`(("pidgin" ,pidgin)
("libgcrypt" ,libgcrypt)
("libwebp" ,libwebp)
("glib" ,glib)
("gettext" ,gnu-gettext)
("gtk+" ,gtk+-2)
("zlib" ,zlib)))
(arguments

5
gnu/packages/mingw.scm
View file

@ -53,7 +53,10 @@ (define* (make-mingw-w64 machine
"mingw-w64-release/mingw-w64-v" version ".tar.bz2"))
(sha256
(base32 "0a5njsa2zw2ssdz10jkb10mhrf3cb8qp9avs89zqmw4n6pzxy85a"))
(patches (search-patches "mingw-w64-6.0.0-gcc.patch"))))
(patches
(search-patches "mingw-w64-6.0.0-gcc.patch"
"mingw-w64-dlltool-temp-prefix.patch"
"mingw-w64-reproducible-gendef.patch"))))
(native-inputs `(("xgcc-core" ,(if xgcc xgcc (cross-gcc triplet)))
("xbinutils" ,(if xbinutils xbinutils (cross-binutils triplet)))
,@(if with-winpthreads?

12
gnu/packages/mpi.scm
View file

@ -135,7 +135,7 @@ (define-public hwloc-2
;; Note: 2.0 isn't the default yet, see above.
(package
(inherit hwloc-1)
(version "2.1.0")
(version "2.2.0")
(source (origin
(method url-fetch)
(uri (string-append "https://www.open-mpi.org/software/hwloc/v"
@ -143,7 +143,7 @@ (define-public hwloc-2
"/downloads/hwloc-" version ".tar.bz2"))
(sha256
(base32
"0qh8s7pphz0m5cwb7liqmc17xzfs23xhz5wn24r6ikvjyx99fhhr"))))
"0li27a3lnmb77qxpijj0kpblz32wmqd3b386sypq8ar7vy9vhw5f"))))
;; libnuma is no longer needed.
(inputs (alist-delete "numactl" (package-inputs hwloc-1)))
@ -158,6 +158,14 @@ (define-public hwloc-2
(substitute* "tests/hwloc/linux-libnuma.c"
(("numa_available\\(\\)")
"-1"))
#t))
(add-before 'check 'skip-test-that-fails-on-qemu
(lambda _
;; Skip test that fails on emulated hardware due to QEMU bug:
;; <https://bugs.gnu.org/40342>.
(substitute* "tests/hwloc/hwloc_get_last_cpu_location.c"
(("hwloc_topology_init" all)
(string-append "exit (77);\n" all)))
#t))))))))
(define-deprecated hwloc-2.0 hwloc-2)

249
gnu/packages/music.scm
View file

@ -25,6 +25,7 @@
;;; Copyright © 2019 raingloom <raingloom@protonmail.com>
;;; Copyright © 2019 David Wilson <david@daviwil.com>
;;; Copyright © 2019, 2020 Alexandros Theodotou <alex@zrythm.org>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -380,22 +381,28 @@ (define-public cmus
(define-public denemo
(package
(name "denemo")
(version "2.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/denemo/denemo-"
version ".tar.gz"))
(sha256
(base32
"0hggf8c4xcrjcxd5m00r788r7jg7g8ff54w2idfaqpj5j2ix3299"))))
(version "2.3.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnu/denemo/"
"denemo-" version ".tar.gz"))
(sha256
(base32 "1blkcl3slbsq9jlhwcf2m9v9g38a0sjfhh9advgi2qr1gxri08by"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
;; Denemo's documentation says to use this command to run its
;; testsuite.
(lambda _
(lambda* (#:key inputs #:allow-other-keys)
;; Tests require to write $HOME.
(setenv "HOME" (getcwd))
;; Replace hard-coded diff file name.
(substitute* "tests/integration.c"
(("/usr/bin/diff")
(string-append (assoc-ref inputs "diffutils") "/bin/diff")))
;; Denemo's documentation says to use this command to run its
;; test suite.
(invoke "make" "-C" "tests" "check")))
(add-before 'build 'set-lilypond
;; This phase sets the default path for lilypond to its current
@ -408,24 +415,12 @@ (define-public denemo
(string-append "g_string_new (\""
lilypond
"\");"))))
#t))
(add-after 'install 'correct-filename
;; "graft-derivation/shallow" from the (guix grafts) module runs in
;; the C locale, expecting file names to be ASCII encoded. This
;; phase renames a filename with a Unicode character in it to meet
;; the aforementioned condition.
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")))
(chdir (string-append
out
"/share/denemo/templates/instruments/woodwind"))
(rename-file "Clarinet in B♭.denemo"
"Clarinet in Bb.denemo"))
#t)))))
(native-inputs
`(("intltool" ,intltool)
`(("diffutils" ,diffutils)
("glib:bin" ,glib "bin") ; for gtester
("gtk-doc" ,gtk-doc)
("intltool" ,intltool)
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
(inputs
@ -504,16 +499,16 @@ (define-public dumb-allegro4
(define-public hydrogen
(package
(name "hydrogen")
(version "1.0.0-beta1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hydrogen-music/hydrogen.git")
(commit version)))
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
"0nv83l70j5bjz2wd6n3a8cq3bmgrvdvg6g2hjhc1g5h6xnbqsh9x"))))
(version "1.0.0-beta2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hydrogen-music/hydrogen.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1s3jrdyjpm92flw9mkkxchnj0wz8nn1y1kifii8ws252iiqjya4a"))))
(build-system cmake-build-system)
(arguments
`(#:test-target "tests"
@ -528,16 +523,18 @@ (define-public hydrogen
#t)))))
(native-inputs
`(("cppunit" ,cppunit)
("pkg-config" ,pkg-config)))
("pkg-config" ,pkg-config)
("qtlinguist" ,qttools)))
(inputs
`(("alsa-lib" ,alsa-lib)
("jack" ,jack-1)
;; ("ladspa" ,ladspa) ; cannot find during configure
;; ("ladspa" ,ladspa) ; require LADSPA_PATH to be set
("lash" ,lash)
("libarchive" ,libarchive)
("liblo" ,liblo)
("libsndfile" ,libsndfile)
("libtar" ,libtar)
("lrdf" ,lrdf)
("pulseaudio" ,pulseaudio)
("qtbase" ,qtbase)
("qtxmlpatterns" ,qtxmlpatterns)
("zlib" ,zlib)))
@ -908,21 +905,20 @@ (define-public libgme
(define-public lilypond
(package
(name "lilypond")
(version "2.19.80")
(source (origin
(method url-fetch)
(uri (string-append
"http://download.linuxaudio.org/lilypond/sources/v"
(version-major+minor version) "/"
name "-" version ".tar.gz"))
(sha256
(base32
"0lql4q946gna2pl1g409mmmsvn2qvnq2z5cihrkfhk7plcqdny9n"))))
(version "2.20.0")
(source
(origin
(method url-fetch)
(uri (string-append "http://lilypond.org/download/sources/"
"v" (version-major+minor version) "/"
"lilypond-" version ".tar.gz"))
(sha256
(base32 "0qd6pd4siss016ffmcyw5qc6pr2wihnvrgd4kh1x725w7wr02nar"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; out-test/collated-files.html fails
`(#:tests? #f ;out-test/collated-files.html fails
#:out-of-source? #t
#:make-flags '("conf=www") ;to generate images for info manuals
#:make-flags '("conf=www") ;to generate images for info manuals
#:configure-flags
(list "CONFIGURATION=www"
(string-append "--with-texgyre-dir="
@ -940,25 +936,25 @@ (define-public lilypond
(("TEX_FIKPARM=.*") "TEX_FIKPARM=found\n"))
#t))
(add-after 'unpack 'fix-path-references
(lambda _
(substitute* "scm/backend-library.scm"
(("\\(search-executable '\\(\"gs\"\\)\\)")
(string-append "\"" (which "gs") "\""))
(("\"/bin/sh\"")
(string-append "\"" (which "sh") "\"")))
#t))
(lambda _
(substitute* "scm/backend-library.scm"
(("\\(search-executable '\\(\"gs\"\\)\\)")
(string-append "\"" (which "gs") "\""))
(("\"/bin/sh\"")
(string-append "\"" (which "sh") "\"")))
#t))
(add-before 'configure 'prepare-configuration
(lambda _
(substitute* "configure"
(("SHELL=/bin/sh") "SHELL=sh")
;; When checking the fontforge version do not consider the
;; version string that's part of the directory.
(("head -n") "tail -n")
;; Also allow for SOURCE_DATE_EPOCH = 0 in fontforge.
(("20110222") "19700101"))
(setenv "out" "www")
(setenv "conf" "www")
#t))
(lambda _
(substitute* "configure"
(("SHELL=/bin/sh") "SHELL=sh")
;; When checking the fontforge version do not consider the
;; version string that's part of the directory.
(("head -n") "tail -n")
;; Also allow for SOURCE_DATE_EPOCH = 0 in fontforge.
(("20110222") "19700101"))
(setenv "out" "www")
(setenv "conf" "www")
#t))
(add-after 'install 'install-info
(lambda _
(invoke "make"
@ -982,13 +978,13 @@ (define-public lilypond
("dblatex" ,dblatex)
("gettext" ,gettext-minimal)
("imagemagick" ,imagemagick)
("netpbm" ,netpbm) ;for pngtopnm
("netpbm" ,netpbm) ;for pngtopnm
("texlive" ,(texlive-union (list texlive-metapost
texlive-generic-epsf
texlive-latex-lh
texlive-latex-cyrillic)))
("texinfo" ,texinfo)
("texi2html" ,texi2html)
("texi2html" ,texi2html-1.82)
("rsync" ,rsync)
("pkg-config" ,pkg-config)
("zip" ,zip)))
@ -1427,10 +1423,10 @@ (define-public synthv1
("alsa-lib" ,alsa-lib)
("non-session-manager" ,non-session-manager)
("liblo" ,liblo)
("qtbase" ,qtbase)
("qttools" ,qttools)))
("qtbase" ,qtbase)))
(native-inputs
`(("pkg-config" ,pkg-config)))
`(("pkg-config" ,pkg-config)
("qttools" ,qttools)))
(home-page "https://synthv1.sourceforge.io")
(synopsis "Polyphonic subtractive synthesizer")
(description
@ -2037,25 +2033,26 @@ (define-public python-pyportmidi
(define-public frescobaldi
(package
(name "frescobaldi")
(version "3.0.0")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/wbsoft/frescobaldi/releases/download/v"
version "/frescobaldi-" version ".tar.gz"))
(sha256
(base32
"15cqhbjbjikr7ljgiq56bz2gxrr38j8p0f78p2vhyzydaviy9a2z"))))
(version "3.1.1")
(source
(origin
(method url-fetch)
(uri (string-append
"https://github.com/wbsoft/frescobaldi/releases/download/v"
version "/frescobaldi-" version ".tar.gz"))
(sha256
(base32 "0kfwvgygx2ds01w8g7vzykfrajglmr2brchk9d67ahzijpgvfkj5"))))
(build-system python-build-system)
(arguments `(#:tests? #f)) ; no tests included
(arguments
`(#:tests? #f)) ;no tests included
(inputs
`(("lilypond" ,lilypond)
("portmidi" ,portmidi)
("python-pyqt" ,python-pyqt)
("python-ly" ,python-ly)
("python-pyportmidi" ,python-pyportmidi)
("poppler" ,poppler)
("portmidi" ,portmidi)
("python-ly" ,python-ly)
("python-poppler-qt5" ,python-poppler-qt5)
("python-pyportmidi" ,python-pyportmidi)
("python-pyqt" ,python-pyqt)
("python-sip" ,python-sip)))
(home-page "http://www.frescobaldi.org/")
(synopsis "LilyPond sheet music text editor")
@ -2142,11 +2139,11 @@ (define-public vmpk
`(("drumstick" ,drumstick)
("qtbase" ,qtbase)
("qtsvg" ,qtsvg)
("qttools" ,qttools)
("qtx11extras" ,qtx11extras)))
(native-inputs
`(("libxslt" ,libxslt) ;for xsltproc
("docbook-xsl" ,docbook-xsl)
("qttools" ,qttools)
("pkg-config" ,pkg-config)))
(home-page "http://vmpk.sourceforge.net")
(synopsis "Virtual MIDI piano keyboard")
@ -4096,15 +4093,14 @@ (define-public dssi
(define-public rosegarden
(package
(name "rosegarden")
(version "18.12")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://sourceforge/rosegarden/rosegarden/"
version "/rosegarden-" version ".tar.bz2"))
(sha256
(base32
"15i9fm0vkn3wsgahaxqi1j5zs0wc0j3wdwml0x49084gk2p328vb"))))
(version "19.12")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/rosegarden/rosegarden/"
version "/rosegarden-" version ".tar.bz2"))
(sha256
(base32 "1qcaxc6hdzva7kwxxhgl95437fagjbxzv4mihsgpr7y9qk08ppw1"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release")
@ -4146,9 +4142,9 @@ (define-public rosegarden
(("COMMAND [$][{]QT_RCC_EXECUTABLE[}]")
"COMMAND ${QT_RCC_EXECUTABLE} --format-version 1")
;; Extraneous.
;(("qt5_add_resources[(]rg_SOURCES ../data/data.qrc[)]")
; "qt5_add_resources(rg_SOURCES ../data/data.qrc OPTIONS --format-version 1)")
)
;;(("qt5_add_resources[(]rg_SOURCES ../data/data.qrc[)]")
;; "qt5_add_resources(rg_SOURCES ../data/data.qrc OPTIONS --format-version 1)")
)
;; Make hashtable traversal order predicable.
(setenv "QT_RCC_TEST" "1") ; important
#t))
@ -4666,7 +4662,7 @@ (define-public fmit
("qtmultimedia" ,qtmultimedia)
("qtsvg" ,qtsvg)))
(native-inputs
`(("gettext" ,gnu-gettext)
`(("gettext" ,gettext-minimal)
("hicolor-icon-theme" ,hicolor-icon-theme)
("itstool" ,itstool)
("qttools" ,qttools)))
@ -4970,7 +4966,7 @@ (define-public zam-plugins
(define-public geonkick
(package
(name "geonkick")
(version "1.9.0")
(version "1.10.0")
(source
(origin
(method git-fetch)
@ -4980,7 +4976,7 @@ (define-public geonkick
(file-name (git-file-name name version))
(sha256
(base32
"17mwxnmxszdm2wjbigciwh8qx0487q9qhf4sl92y6nqdb0dlghnl"))))
"1a59wnm4035kjhs66hihlkiv45p3ffb2yaj1awvyyi5f0lds5zvh"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ;no tests included
@ -5161,7 +5157,7 @@ (define-public helm
(define-public zrythm
(package
(name "zrythm")
(version "0.7.573")
(version "0.8.200")
(source
(origin
(method url-fetch)
@ -5169,7 +5165,7 @@ (define-public zrythm
version ".tar.xz"))
(sha256
(base32
"075gq478xbzz5ql4fsrgfzhgxi7z26k6034lhlkmm0klfcb8j9mg"))))
"13ivxbrd44qnhyh46dcr94dvqxg8cn4bbd8xm77ljw0p9b4ks4zs"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
@ -5194,6 +5190,7 @@ (define-public zrythm
("gettext" ,gettext-minimal)
("glibc" ,glibc)
("gtk+" ,gtk+)
("guile" ,guile-2.2)
("libcyaml" ,libcyaml)
("libsamplerate" ,libsamplerate)
("libsndfile" ,libsndfile)
@ -5383,3 +5380,45 @@ (define-public fogpad
port of the Regrader plugin created by Igorski. It is available as an LV2
plugin and a standalone JACK application.")
(license license:expat)))
(define-public tap-lv2
(let ((commit "cab6e0dfb2ce20e4ad34b067d1281ec0b193598a")
(revision "1"))
(package
(name "tap-lv2")
(version (git-version "0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/moddevices/tap-lv2.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0q480djfqd9g8mzrggc4vl7yclrhdjqx563ghs8mvi2qq8liycw3"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no check target
#:make-flags
(list "CC=gcc")
#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure
(replace 'install
(lambda _
(invoke "make"
(string-append "INSTALL_PATH="
(assoc-ref %outputs "out")
"/lib/lv2")
"install"))))))
(inputs
`(("lv2", lv2)))
(native-inputs
`(("pkg-config", pkg-config)))
(synopsis "Audio plugin collection")
(description "TAP (Tom's Audio Processing) plugins is a collection of
audio effect plugins originally released as LADSPA plugins. This package
offers an LV2 version ported by moddevices.")
(home-page "http://tap-plugins.sourceforge.net/")
(license license:gpl2))))

33
gnu/packages/netpbm.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -114,7 +114,10 @@ (define-syntax drop
("pkg-config" ,pkg-config)
("python" ,python-wrapper)))
(arguments
`(#:phases
`(#:modules ((guix build gnu-build-system)
(guix build utils)
(ice-9 match))
#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
@ -145,7 +148,7 @@ (define-syntax drop
(add-before 'check 'setup-check
(lambda _
;; install temporarily into /tmp/netpbm
(system* "make" "package")
(invoke "make" "package")
;; remove test requiring X
(substitute* "test/all-in-place.test" (("pamx") ""))
;; do not worry about non-existing file
@ -168,19 +171,21 @@ (define-syntax drop
(replace 'install
(lambda* (#:key outputs make-flags #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(apply system* "make" "package"
(apply invoke "make" "package"
(string-append "pkgdir=" out) make-flags)
;; copy static library
(copy-file (string-append out "/link/libnetpbm.a")
(string-append out "/lib/libnetpbm.a"))
;; remove superfluous folders and files
(system* "rm" "-r" (string-append out "/link"))
(system* "rm" "-r" (string-append out "/misc"))
;; Remove superfluous files.
(with-directory-excursion out
(for-each delete-file
'("config_template" "pkginfo" "README"
"VERSION")))
#t))))))
(for-each delete-file-recursively
'("config_template" "pkginfo" "README" "VERSION"
"link/" "misc/"))
;; Install the required ‘libnetpbm.so’ link.
;; See <https://issues.guix.gnu.org/issue/40376>.
(with-directory-excursion "lib"
(symlink
(match (find-files "." "^libnetpbm\\.so\\.[^.]*\\.[^.]*$")
((head _ ...) head))
"libnetpbm.so"))
#t)))))))
(synopsis "Toolkit for manipulation of images")
(description
"Netpbm is a toolkit for the manipulation of graphic images, including

2
gnu/packages/networking.scm
View file

@ -2692,13 +2692,13 @@ (define-public iwd
(build-system gnu-build-system)
(inputs
`(("dbus" ,dbus)
("libtool" ,libtool)
("ell" ,ell)
("readline" ,readline)))
(native-inputs
`(("asciidoc" ,asciidoc)
("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("pkgconfig" ,pkg-config)
("python" ,python)
("openssl" ,openssl)))

4
gnu/packages/nfs.scm
View file

@ -27,6 +27,7 @@ (define-module (gnu packages nfs)
#:use-module (gnu packages kerberos)
#:use-module (gnu packages onc-rpc)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages sqlite)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
@ -115,7 +116,8 @@ (define-public nfs-utils
("lvm2" ,lvm2)
("util-linux" ,util-linux "lib")
("mit-krb5" ,mit-krb5)
("libtirpc" ,libtirpc)))
("libtirpc" ,libtirpc)
("python-wrapper" ,python-wrapper))) ;for the Python based tools
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.kernel.org/pub/linux/utils/nfs-utils/")

12
gnu/packages/ntp.scm
View file

@ -24,18 +24,18 @@
(define-module (gnu packages ntp)
#:use-module (gnu packages)
#:use-module (gnu packages base)
#:use-module (gnu packages linux)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages libevent)
#:use-module (gnu packages linux)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages tls)
#:use-module (gnu packages libevent)
#:use-module (guix build-system gnu)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix l:)
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (srfi srfi-1))
(define-public ntp

5
gnu/packages/ocaml.scm
View file

@ -706,7 +706,8 @@ (define-public emacs-tuareg
(define-public ocaml-menhir
(package
(name "ocaml-menhir")
(version "20181113")
;; More recent versions can be built after we have dune >= 2.0
(version "20190626")
(source
(origin
(method git-fetch)
@ -715,7 +716,7 @@ (define-public ocaml-menhir
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1iqdf64ayq4s3d9jkwhs3s8wqc2s48b292hp0kcjsskfhcvwg0kr"))))
(base32 "0v8av4pw6rykzb7wx54xhbsx0jhh8xyb4x0k4yrxi0w5ylkck6mb"))))
(build-system ocaml-build-system)
(inputs
`(("ocaml" ,ocaml)))

2
gnu/packages/package-management.scm
View file

@ -1100,7 +1100,7 @@ (define-public flatpak
(assoc-ref %build-inputs "bubblewrap")
"/bin/bwrap"))))
(native-inputs `(("bison" ,bison)
("gettext" ,gnu-gettext)
("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin") ; for glib-mkenums + gdbus-codegen
("gobject-introspection" ,gobject-introspection)
("libcap" ,libcap)

25
gnu/packages/patches/beancount-disable-googleapis-fonts.patch Normal file
View file

@ -0,0 +1,25 @@
https://sources.debian.org/data/main/b/beancount/2.2.0-3/debian/patches/0001-Remove-fonts.googleapis.com-links-for-the-bean-web-t.patch
From: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date: Tue, 1 May 2018 04:49:55 +0200
Subject: Remove fonts.googleapis.com links for the bean-web template
---
beancount/web/web.html | 4 ----
1 file changed, 4 deletions(-)
diff --git a/beancount/web/web.html b/beancount/web/web.html
index 3995ce2..ec9e707 100644
--- a/beancount/web/web.html
+++ b/beancount/web/web.html
@@ -3,10 +3,6 @@
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
- <link href="https://fonts.googleapis.com/css?family=Roboto+Condensed:400italic,700italic,700,400" rel="stylesheet" type="text/css" />
- <link href="https://fonts.googleapis.com/css?family=Roboto:400italic,700italic,700,400" rel="stylesheet" type="text/css" />
- <link href='https://fonts.googleapis.com/css?family=Droid+Sans+Mono' rel='stylesheet' type='text/css' />
-
<link href="/resources/web.css" rel="stylesheet" type="text/css" />
<title>{{title}}: {{pagetitle}}</title>

22
gnu/packages/patches/binutils-mingw-w64-reproducible-import-libraries.patch Normal file
View file

@ -0,0 +1,22 @@
This following patch was originally found at the debian mingw-w64 team's
binutils repo located here:
https://salsa.debian.org/mingw-w64-team/binutils-mingw-w64.git
Invoke the following in the aforementioned repo to see the original patch:
$ git show da63f6b:debian/patches/reproducible-import-libraries.patch
Description: Make DLL import libraries reproducible
Author: Benjamin Moody <benjamin.moody@gmail.com>
Bug-Debian: https://bugs.debian.org/915055
--- a/ld/pe-dll.c
+++ b/ld/pe-dll.c
@@ -2844,6 +2844,7 @@
bfd_set_format (outarch, bfd_archive);
outarch->has_armap = 1;
+ outarch->flags |= BFD_DETERMINISTIC_OUTPUT;
/* Work out a reasonable size of things to put onto one line. */
ar_head = make_head (outarch);

137
gnu/packages/patches/binutils-mingw-w64-specify-timestamp.patch Normal file
View file

@ -0,0 +1,137 @@
This following patch was originally found at the debian mingw-w64 team's
binutils repo located here:
https://salsa.debian.org/mingw-w64-team/binutils-mingw-w64.git
Invoke the following in the aforementioned repo to see the original patch:
$ git show da63f6b:debian/patches/specify-timestamp.patch
Description: Allow the PE timestamp to be specified
Author: Stephen Kitt <skitt@debian.org>
--- a/bfd/peXXigen.c
+++ b/bfd/peXXigen.c
@@ -70,6 +70,9 @@
#include <wctype.h>
#endif
+#include <errno.h>
+#include <limits.h>
+
/* NOTE: it's strange to be including an architecture specific header
in what's supposed to be general (to PE/PEI) code. However, that's
where the definitions are, and they don't vary per architecture
@@ -879,10 +882,38 @@
/* Use a real timestamp by default, unless the no-insert-timestamp
option was chosen. */
- if ((pe_data (abfd)->insert_timestamp))
- H_PUT_32 (abfd, time (0), filehdr_out->f_timdat);
- else
+ if (pe_data (abfd)->insert_timestamp) {
+ time_t now;
+ char *source_date_epoch;
+ unsigned long long epoch;
+ char *endptr;
+
+ now = time(NULL);
+ source_date_epoch = getenv("SOURCE_DATE_EPOCH");
+ if (source_date_epoch) {
+ errno = 0;
+ epoch = strtoull(source_date_epoch, &endptr, 10);
+ if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0))
+ || (errno != 0 && epoch == 0)) {
+ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: strtoull: %s\n",
+ strerror(errno));
+ } else if (endptr == source_date_epoch) {
+ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: No digits were found: %s\n",
+ endptr);
+ } else if (*endptr != '\0') {
+ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: Trailing garbage: %s\n",
+ endptr);
+ } else if (epoch > ULONG_MAX) {
+ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: value must be smaller than or equal to: %lu but was found to be: %llu\n",
+ ULONG_MAX, epoch);
+ } else {
+ now = epoch;
+ }
+ }
+ H_PUT_32 (abfd, now, filehdr_out->f_timdat);
+ } else {
H_PUT_32 (abfd, 0, filehdr_out->f_timdat);
+ }
PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr,
filehdr_out->f_symptr);
--- a/ld/pe-dll.c
+++ b/ld/pe-dll.c
@@ -26,6 +26,8 @@
#include "filenames.h"
#include "safe-ctype.h"
+#include <errno.h>
+#include <limits.h>
#include <time.h>
#include "ld.h"
@@ -1202,8 +1204,36 @@
memset (edata_d, 0, edata_sz);
- if (pe_data (abfd)->insert_timestamp)
- H_PUT_32 (abfd, time (0), edata_d + 4);
+ if (pe_data (abfd)->insert_timestamp) {
+ time_t now;
+ char *source_date_epoch;
+ unsigned long long epoch;
+ char *endptr;
+
+ now = time(NULL);
+ source_date_epoch = getenv("SOURCE_DATE_EPOCH");
+ if (source_date_epoch) {
+ errno = 0;
+ epoch = strtoull(source_date_epoch, &endptr, 10);
+ if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0))
+ || (errno != 0 && epoch == 0)) {
+ einfo("Environment variable $SOURCE_DATE_EPOCH: strtoull: %s\n",
+ strerror(errno));
+ } else if (endptr == source_date_epoch) {
+ einfo("Environment variable $SOURCE_DATE_EPOCH: No digits were found: %s\n",
+ endptr);
+ } else if (*endptr != '\0') {
+ einfo("Environment variable $SOURCE_DATE_EPOCH: Trailing garbage: %s\n",
+ endptr);
+ } else if (epoch > ULONG_MAX) {
+ einfo("Environment variable $SOURCE_DATE_EPOCH: value must be smaller than or equal to: %lu but was found to be: %llu\n",
+ ULONG_MAX, epoch);
+ } else {
+ now = epoch;
+ }
+ }
+ H_PUT_32 (abfd, now, edata_d + 4);
+ }
if (pe_def_file->version_major != -1)
{
--- a/ld/emultempl/pe.em
+++ b/ld/emultempl/pe.em
@@ -303,7 +303,7 @@
OPTION_USE_NUL_PREFIXED_IMPORT_TABLES},
{"no-leading-underscore", no_argument, NULL, OPTION_NO_LEADING_UNDERSCORE},
{"leading-underscore", no_argument, NULL, OPTION_LEADING_UNDERSCORE},
- {"insert-timestamp", no_argument, NULL, OPTION_INSERT_TIMESTAMP},
+ {"insert-timestamp", optional_argument, NULL, OPTION_INSERT_TIMESTAMP},
{"no-insert-timestamp", no_argument, NULL, OPTION_NO_INSERT_TIMESTAMP},
#ifdef DLL_SUPPORT
/* getopt allows abbreviations, so we do this to stop it
--- a/ld/emultempl/pep.em
+++ b/ld/emultempl/pep.em
@@ -321,7 +321,7 @@
{"no-bind", no_argument, NULL, OPTION_NO_BIND},
{"wdmdriver", no_argument, NULL, OPTION_WDM_DRIVER},
{"tsaware", no_argument, NULL, OPTION_TERMINAL_SERVER_AWARE},
- {"insert-timestamp", no_argument, NULL, OPTION_INSERT_TIMESTAMP},
+ {"insert-timestamp", optional_argument, NULL, OPTION_INSERT_TIMESTAMP},
{"no-insert-timestamp", no_argument, NULL, OPTION_NO_INSERT_TIMESTAMP},
{"build-id", optional_argument, NULL, OPTION_BUILD_ID},
{NULL, no_argument, NULL, 0}

18
gnu/packages/patches/calibre-msgpack-compat.patch Normal file
View file

@ -0,0 +1,18 @@
Fix deserialization with msgpack 1.0.
Patch copied from upstream source repository:
https://github.com/kovidgoyal/calibre/commit/0ff41ac64994ec11b7859fc004c94d08769e3af3
diff --git a/src/calibre/utils/serialize.py b/src/calibre/utils/serialize.py
index f5d560c468..c35ae53849 100644
--- a/src/calibre/utils/serialize.py
+++ b/src/calibre/utils/serialize.py
@@ -110,7 +110,7 @@ def msgpack_decoder(code, data):
def msgpack_loads(dump, use_list=True):
# use_list controls whether msgpack arrays are unpacked as lists or tuples
import msgpack
- return msgpack.unpackb(dump, ext_hook=msgpack_decoder, raw=False, use_list=use_list)
+ return msgpack.unpackb(dump, ext_hook=msgpack_decoder, raw=False, use_list=use_list, strict_map_key=False)
def json_loads(data):

12
gnu/packages/patches/higan-remove-march-native-flag.patch
View file

@ -1,12 +0,0 @@
Remove -march=native from build flags.
--- a/higan/GNUmakefile
+++ b/higan/GNUmakefile
@@ -26,7 +26,6 @@
flags += -fopenmp
link += -fopenmp
ifeq ($(binary),application)
- flags += -march=native
link += -Wl,-export-dynamic
link += -lX11 -lXext
else ifeq ($(binary),library)

4
gnu/packages/patches/icecat-makeicecat.patch
View file

@ -25,7 +25,7 @@ index 8be2362..48716f2 100755
-wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc
-gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353
-gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc
-echo -n 2428213ceb75cb6772b3044d9c14870d1ae5b0161379aeb29248650e13761c9f firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
-echo -n ad3ea069c3d23aab360ad04ff4d0f5e556d3538f7dd4eae0690c4e9241537570 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
-
-echo Extracting Firefox tarball
-tar -xf firefox-${FFVERSION}esr.source.tar.xz
@ -37,7 +37,7 @@ index 8be2362..48716f2 100755
+# wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc
+# gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353
+# gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc
+# echo -n 2428213ceb75cb6772b3044d9c14870d1ae5b0161379aeb29248650e13761c9f firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
+# echo -n ad3ea069c3d23aab360ad04ff4d0f5e556d3538f7dd4eae0690c4e9241537570 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
+#
+# echo Extracting Firefox tarball
+# tar -xf firefox-${FFVERSION}esr.source.tar.xz

28
gnu/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch Normal file
View file

@ -0,0 +1,28 @@
--- /dev/null
+++ b/gnu/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch
@@ -0,0 +1,22 @@
+Fix one of upstream non-determinism, tracked here:
+
+https://github.com/JuliaLang/julia/issues/34115
+https://github.com/JuliaLang/julia/issues/25900
+
+
+Patch by Nicoló Balzarotti <nicolo@nixo.xyz>.
+
+--- a/base/loading.jl
++++ b/base/loading.jl
+@@ -807,7 +807,10 @@
+ path = normpath(joinpath(dirname(prev), _path))
+ end
+ if _track_dependencies[]
+- push!(_require_dependencies, (mod, path, mtime(path)))
++ push!(_require_dependencies,
++ (mod, path,
++ haskey(ENV, "SOURCE_DATE_EPOCH") ?
++ parse(Float64, ENV["SOURCE_DATE_EPOCH"]) : mtime(path)))
+ end
+ return path, prev
+ end
--
2.26.0

155
gnu/packages/patches/mediastreamer2-srtp2.patch Normal file
View file

@ -0,0 +1,155 @@
From 97903498364ae2596e790cb2c2ce9ac76c04d64a Mon Sep 17 00:00:00 2001
From: Danmei Chen <danmei.chen@belledonne-communications.com>
Date: Fri, 19 Jan 2018 10:04:07 +0100
Subject: [PATCH] add compability with srtp2
---
cmake/FindSRTP.cmake | 24 ++++++++++++++++++++----
src/CMakeLists.txt | 1 +
src/crypto/ms_srtp.c | 10 ++--------
src/utils/srtp_prefix.h | 41 +++++++++++++++++++++++++++++++++++++++++
4 files changed, 64 insertions(+), 12 deletions(-)
create mode 100644 src/utils/srtp_prefix.h
diff --git a/cmake/FindSRTP.cmake b/cmake/FindSRTP.cmake
index 988b846a..f720ce7e 100644
--- a/cmake/FindSRTP.cmake
+++ b/cmake/FindSRTP.cmake
@@ -31,20 +31,36 @@ set(_SRTP_ROOT_PATHS
)
find_path(SRTP_INCLUDE_DIRS
- NAMES srtp/srtp.h
+ NAMES srtp2/srtp.h
HINTS _SRTP_ROOT_PATHS
PATH_SUFFIXES include
)
if(SRTP_INCLUDE_DIRS)
set(HAVE_SRTP_SRTP_H 1)
-endif()
-
-find_library(SRTP_LIBRARIES
+ set(SRTP_VERSION 2)
+ find_library(SRTP_LIBRARIES
+ NAMES srtp2
+ HINTS ${_SRTP_ROOT_PATHS}
+ PATH_SUFFIXES bin lib
+ )
+else()
+ find_path(SRTP_INCLUDE_DIRS
+ NAMES srtp/srtp.h
+ HINTS _SRTP_ROOT_PATHS
+ PATH_SUFFIXES include
+ )
+ if(SRTP_INCLUDE_DIRS)
+ set(HAVE_SRTP_SRTP_H 1)
+ set(SRTP_VERSION 1)
+ endif()
+ find_library(SRTP_LIBRARIES
NAMES srtp
HINTS ${_SRTP_ROOT_PATHS}
PATH_SUFFIXES bin lib
)
+endif()
+
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(SRTP
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index da429764..c46faa62 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -183,6 +183,7 @@ set(VOIP_SOURCE_FILES_C
utils/pcap_sender.c
utils/pcap_sender.h
utils/stream_regulator.c
+ utils/srtp_prefix.h
voip/audioconference.c
voip/audiostream.c
voip/bandwidthcontroller.c
diff --git a/src/crypto/ms_srtp.c b/src/crypto/ms_srtp.c
index 5a510c99..67810316 100644
--- a/src/crypto/ms_srtp.c
+++ b/src/crypto/ms_srtp.c
@@ -25,6 +25,7 @@
#include "mediastreamer2/ms_srtp.h"
#include "mediastreamer2/mediastream.h"
+
#ifdef HAVE_SRTP
/*srtp defines all this stuff*/
@@ -34,13 +35,7 @@
#undef PACKAGE_TARNAME
#undef PACKAGE_VERSION
-#if defined(MS2_WINDOWS_PHONE)
-// Windows phone doesn't use make install
-#include <srtp.h>
-#else
-#include <srtp/srtp.h>
-#endif
-
+#include "srtp_prefix.h"
#include "ortp/b64.h"
@@ -352,7 +347,6 @@ int ms_srtp_init(void)
srtp_init_done++;
}else{
ms_fatal("Couldn't initialize SRTP library: %d.", st);
- err_reporting_init("mediastreamer2");
}
}else srtp_init_done++;
return (int)st;
diff --git a/src/utils/srtp_prefix.h b/src/utils/srtp_prefix.h
new file mode 100644
index 00000000..68bde496
--- /dev/null
+++ b/src/utils/srtp_prefix.h
@@ -0,0 +1,41 @@
+/*
+ mediastreamer2 library - modular sound and video processing and streaming
+ Copyright (C) 2006-2014 Belledonne Communications, Grenoble
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+#ifndef __SRTP2_H__
+#define __SRTP2_H__
+
+#if defined(MS2_WINDOWS_PHONE)
+// Windows phone doesn't use make install
+#include <srtp.h>
+#elif SRTP_VERSION==1
+#include <srtp/srtp.h>
+#else
+#include <srtp2/srtp.h>
+#define err_status_t srtp_err_status_t
+#define err_status_ok srtp_err_status_ok
+#define crypto_policy_t srtp_crypto_policy_t
+#define crypto_policy_set_aes_cm_256_hmac_sha1_80 srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80
+#define crypto_policy_set_aes_cm_128_hmac_sha1_32 srtp_crypto_policy_set_aes_cm_128_hmac_sha1_32
+#define crypto_policy_set_aes_cm_128_null_auth srtp_crypto_policy_set_aes_cm_128_null_auth
+#define crypto_policy_set_null_cipher_hmac_sha1_80 srtp_crypto_policy_set_null_cipher_hmac_sha1_80
+#define crypto_policy_set_aes_cm_128_hmac_sha1_80 srtp_crypto_policy_set_aes_cm_128_hmac_sha1_80
+#define crypto_policy_set_aes_cm_256_hmac_sha1_32 srtp_crypto_policy_set_aes_cm_256_hmac_sha1_32
+#define ssrc_t srtp_ssrc_t
+#endif
+
+#endif
--
2.21.0

26
gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch Normal file
View file

@ -0,0 +1,26 @@
This following patch was originally found at the debian mingw-w64 team's
mingw-w64 repo located here:
https://salsa.debian.org/mingw-w64-team/mingw-w64.git
Invoke the following in the aforementioned repo to see the original patch:
$ git show 4974e2c:debian/patches/dlltool-temp-prefix.patch
Description: Specify dlltool's temp prefix
Author: Stephen Kitt <steve@sk2.org>
By default dlltool uses its pid for the object files it generates.
Enforcing its temp prefix allows the files it generates to be
reproducible.
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -36,7 +36,7 @@
DTDEF32=$(GENLIB) $(DLLTOOLFLAGS32) $(AM_DLLTOOLFLAGS)
DTDEF64=$(GENLIB) $(DLLTOOLFLAGS64) $(AM_DLLTOOLFLAGS)
else
- AM_DLLTOOLFLAGS=-k --as=$(AS) --output-lib $@
+ AM_DLLTOOLFLAGS=-k --as=$(AS) --output-lib $@ --temp-prefix $$(basename $@ .a)
DLLTOOLFLAGSARM32=-m arm
DLLTOOLFLAGSARM64=-m arm64
DLLTOOLFLAGS32=--as-flags=--32 -m i386

23
gnu/packages/patches/mingw-w64-reproducible-gendef.patch Normal file
View file

@ -0,0 +1,23 @@
This following patch was originally found at the debian mingw-w64 team's
mingw-w64 repo located here:
https://salsa.debian.org/mingw-w64-team/mingw-w64.git
Invoke the following in the aforementioned repo to see the original patch:
$ git show 4974e2c:debian/patches/reproducible-gendef.patch
Description: Drop __DATE__ from gendef
Author: Stephen Kitt <skitt@debian.org>
This allows gendef to be built reproducibly.
--- a/mingw-w64-tools/gendef/src/gendef.c
+++ b/mingw-w64-tools/gendef/src/gendef.c
@@ -196,7 +196,6 @@
" By default, the output files are named after their DLL counterparts\n"
" gendef MYDLL.DLL Produces MYDLL.def\n"
" gendef - MYDLL.DLL Prints the exports to stdout\n");
- fprintf (stderr, "\nBuilt on %s\n", __DATE__);
fprintf (stderr, "\nReport bugs to <mingw-w64-public@lists.sourceforge.net>\n");
exit (0);
}

42
gnu/packages/patches/pam-krb5-CVE-2020-10595.patch Normal file
View file

@ -0,0 +1,42 @@
Fix CVE-2020-10595:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-10595
Patch copied from upstream advisory:
https://seclists.org/oss-sec/2020/q1/128
diff --git a/prompting.c b/prompting.c
index e985d95..d81054f 100644
--- a/prompting.c
+++ b/prompting.c
@@ -314,26 +314,27 @@ pamk5_prompter_krb5(krb5_context context UNUSED, void *data, const char *name,
/*
* Reuse pam_prompts as a starting index and copy the data into the reply
* area of the krb5_prompt structs.
*/
pam_prompts = 0;
if (name != NULL && !args->silent)
pam_prompts++;
if (banner != NULL && !args->silent)
pam_prompts++;
for (i = 0; i < num_prompts; i++, pam_prompts++) {
- size_t len;
+ size_t len, allowed;
if (resp[pam_prompts].resp == NULL)
goto cleanup;
len = strlen(resp[pam_prompts].resp);
- if (len > prompts[i].reply->length)
+ allowed = prompts[i].reply->length;
+ if (allowed == 0 || len > allowed - 1)
goto cleanup;
/*
* The trailing nul is not included in length, but other applications
* expect it to be there. Therefore, we copy one more byte than the
* actual length of the password, but set length to just the length of
* the password.
*/
memcpy(prompts[i].reply->data, resp[pam_prompts].resp, len + 1);
prompts[i].reply->length = (unsigned int) len;

34
gnu/packages/patches/python-aiohttp-3.6.2-no-warning-fail.patch Normal file
View file

@ -0,0 +1,34 @@
Do not fail test on runtime warning like: RuntimeWarning: coroutine 'noop2' was
never awaited. This could be related to
https://github.com/aio-libs/aiohttp/commit/60f01cca36b9f9d8d35dd351384eaae2f8fd0d4b,
which does not fix this issue though.
--- a/aiohttp/pytest_plugin.py 2019-10-09 18:52:31.000000000 +0200
+++ b/aiohttp/pytest_plugin.py 2020-03-05 08:35:48.230396025 +0100
@@ -120,15 +120,6 @@
"""
with warnings.catch_warnings(record=True) as _warnings:
yield
- rw = ['{w.filename}:{w.lineno}:{w.message}'.format(w=w)
- for w in _warnings # type: ignore
- if w.category == RuntimeWarning]
- if rw:
- raise RuntimeError('{} Runtime Warning{},\n{}'.format(
- len(rw),
- '' if len(rw) == 1 else 's',
- '\n'.join(rw)
- ))
@contextlib.contextmanager
--- a/tests/test_pytest_plugin.py 2020-03-05 09:26:58.502284893 +0100
+++ a/tests/test_pytest_plugin.py 2020-03-05 09:27:06.074284619 +0100
@@ -170,7 +170,7 @@
expected_outcomes = (
{'failed': 0, 'passed': 2}
if IS_PYPY and bool(os.environ.get('PYTHONASYNCIODEBUG'))
- else {'failed': 1, 'passed': 1}
+ else {'failed': 0, 'passed': 2}
)
"""Under PyPy "coroutine 'foobar' was never awaited" does not happen."""
result.assert_outcomes(**expected_outcomes)

Some files were not shown because too many files have changed in this diff Show more