Browse Source

Merge branch 'master' into core-updates

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
gn-latest-20200725
Marius Bakke 1 year ago
parent
commit
2778302399
No known key found for this signature in database GPG Key ID: A2A06DF2A33A54FA
172 changed files with 12139 additions and 1669 deletions
  1. +1
    -0
      .gitignore
  2. +5
    -1
      build-aux/build-self.scm
  3. +53
    -1
      doc/guix-cookbook.texi
  4. +107
    -14
      doc/guix.texi
  5. +8
    -0
      etc/news.scm
  6. +18
    -7
      etc/release-manifest.scm
  7. +5
    -1
      gnu/bootloader/grub.scm
  8. +0
    -1
      gnu/ci.scm
  9. +19
    -11
      gnu/installer.scm
  10. +16
    -5
      gnu/installer/newt.scm
  11. +23
    -10
      gnu/installer/newt/keymap.scm
  12. +2
    -2
      gnu/installer/newt/page.scm
  13. +57
    -0
      gnu/installer/newt/parameters.scm
  14. +2
    -2
      gnu/installer/newt/user.scm
  15. +45
    -0
      gnu/installer/proxy.scm
  16. +10
    -4
      gnu/installer/record.scm
  17. +20
    -3
      gnu/local.mk
  18. +5
    -2
      gnu/packages/admin.scm
  19. +4
    -4
      gnu/packages/algebra.scm
  20. +2
    -2
      gnu/packages/assembly.scm
  21. +110
    -10
      gnu/packages/astronomy.scm
  22. +57
    -10
      gnu/packages/audio.scm
  23. +20
    -10
      gnu/packages/bioconductor.scm
  24. +23
    -8
      gnu/packages/bioinformatics.scm
  25. +6
    -3
      gnu/packages/bittorrent.scm
  26. +1
    -1
      gnu/packages/cdrom.scm
  27. +13
    -4
      gnu/packages/cedille.scm
  28. +48
    -0
      gnu/packages/check.scm
  29. +2
    -2
      gnu/packages/chromium.scm
  30. +9
    -11
      gnu/packages/coq.scm
  31. +88
    -35
      gnu/packages/cran.scm
  32. +2
    -2
      gnu/packages/crates-io.scm
  33. +11
    -11
      gnu/packages/cross-base.scm
  34. +80
    -0
      gnu/packages/databases.scm
  35. +2
    -1
      gnu/packages/debug.scm
  36. +2
    -1
      gnu/packages/dico.scm
  37. +4
    -5
      gnu/packages/diffoscope.scm
  38. +3
    -2
      gnu/packages/disk.scm
  39. +4
    -1
      gnu/packages/docker.scm
  40. +1
    -0
      gnu/packages/ebook.scm
  41. +663
    -122
      gnu/packages/emacs-xyz.scm
  42. +21
    -28
      gnu/packages/emulators.scm
  43. +9
    -8
      gnu/packages/engineering.scm
  44. +64
    -0
      gnu/packages/finance.scm
  45. +55
    -11
      gnu/packages/fonts.scm
  46. +165
    -4
      gnu/packages/games.scm
  47. +3
    -2
      gnu/packages/genimage.scm
  48. +16
    -0
      gnu/packages/geo.scm
  49. +6
    -0
      gnu/packages/gimp.scm
  50. +116
    -16
      gnu/packages/gnome.scm
  51. +3
    -3
      gnu/packages/gnunet.scm
  52. +6
    -6
      gnu/packages/gnuzilla.scm
  53. +42
    -4
      gnu/packages/golang.scm
  54. +6
    -4
      gnu/packages/gps.scm
  55. +26
    -20
      gnu/packages/graphics.scm
  56. +47
    -0
      gnu/packages/gtk.scm
  57. +2
    -2
      gnu/packages/guile-xyz.scm
  58. +45
    -35
      gnu/packages/guile.scm
  59. +2
    -2
      gnu/packages/haskell-apps.scm
  60. +15
    -10
      gnu/packages/hurd.scm
  61. +2
    -1
      gnu/packages/image-processing.scm
  62. +58
    -0
      gnu/packages/image-viewers.scm
  63. +58
    -3
      gnu/packages/image.scm
  64. +41
    -1
      gnu/packages/java.scm
  65. +262
    -287
      gnu/packages/julia.scm
  66. +11
    -10
      gnu/packages/kde-frameworks.scm
  67. +1
    -0
      gnu/packages/kde-internet.scm
  68. +594
    -0
      gnu/packages/linphone.scm
  69. +121
    -23
      gnu/packages/linux.scm
  70. +44
    -6
      gnu/packages/lisp-xyz.scm
  71. +51
    -4
      gnu/packages/lisp.scm
  72. +1
    -1
      gnu/packages/lxde.scm
  73. +48
    -9
      gnu/packages/mail.scm
  74. +5
    -4
      gnu/packages/man.scm
  75. +4
    -5
      gnu/packages/mastodon.scm
  76. +86
    -82
      gnu/packages/mate.scm
  77. +194
    -2
      gnu/packages/maths.scm
  78. +121
    -0
      gnu/packages/matrix.scm
  79. +3
    -2
      gnu/packages/messaging.scm
  80. +4
    -1
      gnu/packages/mingw.scm
  81. +10
    -2
      gnu/packages/mpi.scm
  82. +143
    -104
      gnu/packages/music.scm
  83. +19
    -14
      gnu/packages/netpbm.scm
  84. +1
    -1
      gnu/packages/networking.scm
  85. +3
    -1
      gnu/packages/nfs.scm
  86. +5
    -5
      gnu/packages/ntp.scm
  87. +3
    -2
      gnu/packages/ocaml.scm
  88. +1
    -1
      gnu/packages/package-management.scm
  89. +25
    -0
      gnu/packages/patches/beancount-disable-googleapis-fonts.patch
  90. +22
    -0
      gnu/packages/patches/binutils-mingw-w64-reproducible-import-libraries.patch
  91. +137
    -0
      gnu/packages/patches/binutils-mingw-w64-specify-timestamp.patch
  92. +18
    -0
      gnu/packages/patches/calibre-msgpack-compat.patch
  93. +0
    -12
      gnu/packages/patches/higan-remove-march-native-flag.patch
  94. +2
    -2
      gnu/packages/patches/icecat-makeicecat.patch
  95. +28
    -0
      gnu/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch
  96. +155
    -0
      gnu/packages/patches/mediastreamer2-srtp2.patch
  97. +26
    -0
      gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch
  98. +23
    -0
      gnu/packages/patches/mingw-w64-reproducible-gendef.patch
  99. +42
    -0
      gnu/packages/patches/pam-krb5-CVE-2020-10595.patch
  100. +34
    -0
      gnu/packages/patches/python-aiohttp-3.6.2-no-warning-fail.patch

+ 1
- 0
.gitignore View File

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


+ 5
- 1
build-aux/build-self.scm View File

@ -408,7 +408,11 @@ files."
(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


+ 53
- 1
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


+ 107
- 14
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
- 0
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


+ 18
- 7
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 @@ TARGET."
(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 @@ TARGET."
(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


+ 5
- 1
gnu/bootloader/grub.scm View File

@ -241,7 +241,11 @@ the 'share/X11/xkb/symbols/' directory of 'xkeyboard-config'."
"-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)


+ 0
- 1
gnu/ci.scm View File

@ -132,7 +132,6 @@ SYSTEM."
(define %cross-targets
'("mips64el-linux-gnu"
"mips64el-linux-gnuabi64"
"arm-linux-gnueabihf"
"aarch64-linux-gnu"
"powerpc-linux-gnu"


+ 19
- 11
gnu/installer.scm View File

@ -113,8 +113,10 @@ version of this file."
(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 @@ been performed at build time."
(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 @@ selected keymap."
"/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 @@ selected keymap."
#: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 @@ selected keymap."
(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 @@ selected keymap."
(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 @@ selected keymap."
((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 @@ selected keymap."
(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 @@ selected keymap."
(file-name (git-file-name name version))
(sha256
(base32
"02p0bi6c05699idgx6gfkljhqgi8zf09clhzx81i8wa064s70r1y")))))))
"1gksd1lzgjjh1p9vczghg8jw995d22hm34kbsiv8rcryirv2xy09")))))))
(define (installer-program)
"Return a file-like object that runs the given INSTALLER."


+ 16
- 5
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 @@
#: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 (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 @@ problem. The backtrace is displayed below. Please report it by email to \
(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 @@ problem. The backtrace is displayed below. Please report it by email to \
(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 @@ problem. The backtrace is displayed below. Please report it by email to \
(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)))

+ 23
- 10
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 @@
#: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 @@
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 @@ names of the selected keyboard layout and variant."
(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


+ 2
- 2
gnu/installer/newt/page.scm View File

@ -231,7 +231,7 @@ input box, such as FLAG-PASSWORD."
(add-component-callback
input-visible-cb
(lambda (component)
(lambda ()
(set-entry-flags input-entry
FLAG-PASSWORD
FLAG-ROLE-TOGGLE)))
@ -486,7 +486,7 @@ the current listbox item has to be selected by key."
;; 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
- 0
gnu/installer/newt/parameters.scm 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))))

+ 2
- 2
gnu/installer/newt/user.scm View File

@ -89,7 +89,7 @@ REAL-NAME, and HOME-DIRECTORY as the initial values in the form."
(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 @@ REAL-NAME, and HOME-DIRECTORY as the initial values in the form."
(add-component-callback
password-visible-cb
(lambda (component)
(lambda ()
(set-entry-flags entry-password
FLAG-PASSWORD
FLAG-ROLE-TOGGLE)))


+ 45
- 0
gnu/installer/proxy.scm 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:

+ 10
- 4
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 @@
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 @@
(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 @@
;; 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))

+ 20
- 3
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 \


+ 5
- 2
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 @@ system administrator.")
;; 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 @@ shortcut syntax and completion options.")
(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"))))


+ 4
- 4
gnu/packages/algebra.scm View File

@ -228,7 +228,7 @@ the real span of the lattice.")
(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 @@ the real span of the lattice.")
version ".tar.gz"))
(sha256
(base32
"0fck8ssmirl8fy7s4mspgrxjs5sag76xbshqlqzkcl3kqyrk4raa"))))
"1jd65h2psrmba2dx7rkf5qidf9ka0cwbsg20pd18k45ggr30l467"))))
(build-system gnu-build-system)
(native-inputs
`(("texlive" ,(texlive-union
@ -270,7 +270,7 @@ PARI is also available as a C library to allow for faster computations.")
(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 @@ PARI is also available as a C library to allow for faster computations.")
version ".tar.gz"))
(sha256
(base32
"0wqsf05wgkqvmmsx7jinvzdqav6rl56sr8haibgs31nzz4x9xz9g"))))
"0yymbrgyjw500hqgmkj5m4nmscd7c9rs9w2c96lxgrcyab8krhrm"))))
(build-system gnu-build-system)
(native-inputs `(("perl" ,perl)))
(inputs `(("pari-gp" ,pari-gp)))


+ 2
- 2
gnu/packages/assembly.scm View File

@ -259,7 +259,7 @@ runtime")
(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 @@ runtime")
(file-name (git-file-name name version))
(sha256
(base32
"0752fbffxgxyf3jw2iij88l05dqhppgcxy7dvk82hp4wdg4cflpq"))))
"15680964nlsa83nqgxk7knxajn98lddz2hg6jnn8ffmnms5wdam7"))))
(build-system gnu-build-system)
(arguments
`(#:phases


+ 110
- 10
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 @@
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages algebra)
#:use-module (gnu packages autotools)
#:use-module (gnu packages image)
#:use-module (gnu packages compression)
#:use-module (gnu packages curl)
#:use-module (gnu packages fontutils)
#: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 algebra)
#:use-module (gnu packages lua)
#:use-module (gnu packages perl)
#: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 @@ Mechanics, Astrometry and Astrodynamics library.")
(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+)))

+ 57
- 10
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 @@
#: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 @@
#: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 @@
("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 @@ code, used in @code{libtoxcore}.")
(define-public gsm
(package
(name "gsm")
(version "1.0.18")
(version "1.0.19")
(source
(origin
(method url-fetch)
@ -3344,18 +3385,24 @@ code, used in @code{libtoxcore}.")
"-" 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 @@ stream to one or more IceCast and/or ShoutCast servers.")
(define-public redkite
(package
(name "redkite")
(version "0.6.2")
(version "0.8.0")
(source
(origin
(method git-fetch)
@ -3884,7 +3931,7 @@ stream to one or more IceCast and/or ShoutCast servers.")
(file-name (git-file-name name version))
(sha256
(base32
"1i874izajbdhlfacwwj84qrsxf7g4y6nblzxalrkzaap9sa7d1r6"))))
"1747w1kg8y9jbl11xi018d85dm38xk7843pz26sh0k5fdv87a10q"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f)) ;no tests included


+ 20
- 10
gnu/packages/bioconductor.scm View File

@ -1958,14 +1958,14 @@ experiments.")
(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 @@ experiments.")
("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 @@ footprints.")
(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 @@ footprints.")
("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 @@ sequential way to mimic the manual gating strategy.")
(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 @@ sequential way to mimic the manual gating strategy.")
("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 @@ self-organizing map clustering and minimal spanning trees.")
(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 @@ self-organizing map clustering and minimal spanning trees.")
("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 @@ accessing web references for elements/sets are also available in BiocSet.")