mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 07:26:13 -05:00
Merge branch 'core-updates'
This commit is contained in:
commit
4bdf4182fe
375 changed files with 15419 additions and 7439 deletions
|
@ -175,6 +175,7 @@ MODULES = \
|
|||
guix/build/git.scm \
|
||||
guix/build/hg.scm \
|
||||
guix/build/glib-or-gtk-build-system.scm \
|
||||
guix/build/gnu-bootstrap.scm \
|
||||
guix/build/gnu-build-system.scm \
|
||||
guix/build/gnu-dist.scm \
|
||||
guix/build/guile-build-system.scm \
|
||||
|
|
|
@ -384,11 +384,11 @@ (define* (build source
|
|||
#:key verbose? (version (date-version-string)) system
|
||||
(pull-version 0)
|
||||
|
||||
;; For the standalone Guix, default to Guile 2.2. For old
|
||||
;; For the standalone Guix, default to Guile 3.0. For old
|
||||
;; versions of 'guix pull' (pre-0.15.0), we have to use the
|
||||
;; same Guile as the current one.
|
||||
(guile-version (if (> pull-version 0)
|
||||
"2.2"
|
||||
"3.0"
|
||||
(effective-version)))
|
||||
|
||||
#:allow-other-keys
|
||||
|
|
|
@ -26510,7 +26510,7 @@ program. That gives a lot of flexibility. The
|
|||
program to run in that initrd.
|
||||
|
||||
@deffn {Scheme Procedure} expression->initrd @var{exp} @
|
||||
[#:guile %guile-static-stripped] [#:name "guile-initrd"]
|
||||
[#:guile %guile-3.0-static-stripped] [#:name "guile-initrd"]
|
||||
Return as a file-like object a Linux initrd (a gzipped cpio archive)
|
||||
containing @var{guile} and that evaluates @var{exp}, a G-expression,
|
||||
upon booting. All the derivations referenced by @var{exp} are
|
||||
|
|
85
etc/news.scm
85
etc/news.scm
|
@ -2,6 +2,7 @@
|
|||
;;
|
||||
;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
|
||||
;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;
|
||||
;; Copying and distribution of this file, with or without modification, are
|
||||
;; permitted in any medium without royalty provided the copyright notice and
|
||||
|
@ -10,6 +11,73 @@
|
|||
(channel-news
|
||||
(version 0)
|
||||
|
||||
(entry (commit "a33eac038a811603c8b9ed106ae405a5f80a0e9d")
|
||||
(title (en "GNU C Library upgraded")
|
||||
(de "GNU-C-Bibliothek aktualisiert")
|
||||
(es "Actualización de la biblioteca C de GNU")
|
||||
(fr "Mise à jour de la bibliothèque C de GNU")
|
||||
(nl "GNU C-bibliotheek bijgewerkt"))
|
||||
(body
|
||||
(en "The GNU C Library (glibc) has been upgraded to version 2.31. To
|
||||
run previously-installed programs linked against glibc 2.29, you need to
|
||||
install locale data for version 2.29 in addition to locale data for 2.31:
|
||||
|
||||
@example
|
||||
guix install glibc-locales glibc-locales-2.29
|
||||
@end example
|
||||
|
||||
On Guix System, you can adjust the @code{locale-libcs} field of your
|
||||
@code{operating-system} form. Run @code{info \"(guix) Locales\"}, for more
|
||||
info.")
|
||||
(de "Die GNU-C-Bibliothek (glibc) wurde auf Version 2.31
|
||||
aktualisiert. Um zuvor installierte Programme, die an glibc 2.29 gebunden
|
||||
worden sind, weiter benutzen zu können, müssen Sie Locale-Daten für Version
|
||||
2.29 zusätzlich zu den Locale-Daten für 2.31 installieren:
|
||||
|
||||
@example
|
||||
guix install glibc-locales glibc-locales-2.29
|
||||
@end example
|
||||
|
||||
Auf Guix System genügt es, das @code{locale-libcs}-Feld Ihrer
|
||||
@code{operating-system}-Form anzupassen. Führen Sie @code{info \"(guix.de)
|
||||
Locales\"} aus, um weitere Informationen dazu zu erhalten.")
|
||||
(es "Se ha actualizado la biblioteca de C de GNU (glibc) a la versión
|
||||
2.31. Para ejecutar programas instalados previamente que se encuentren
|
||||
enlazados con glibc 2.29, es necesario que instale los datos de localización
|
||||
de la versión 2.29 junto a los datos de localización de la versión 2.31:
|
||||
|
||||
@example
|
||||
guix install glibc-locales glibc-locales-2.29
|
||||
@end example
|
||||
|
||||
En el sistema Guix, puede ajustar el campo @code{locale-libcs} de su
|
||||
declaración @code{operating-system}. Ejecute @code{info \"(guix.es)
|
||||
Localizaciones\"} para obtener más información.")
|
||||
(fr "La bibliothèque C de GNU (glibc) a été mise à jour en version
|
||||
2.31. Pour pouvoir lancer tes programmes déjà installés et liés à glibc 2.29,
|
||||
tu dois installer les données pour la version 2.29 en plus des données de
|
||||
régionalisation pour la version 2.31:
|
||||
|
||||
@example
|
||||
guix install glibc-locales glibc-locales-2.29
|
||||
@end example
|
||||
|
||||
Sur le système Guix, tu peux ajuster le champ @code{locale-libcs} de ta forme
|
||||
@code{operating-system}. Lance @code{info \"(guix.fr) Régionalisation\"} pour
|
||||
plus de détails.")
|
||||
(nl "De GNU C-bibliotheek (glibc) werd bijgewerkt naar versie 2.31.
|
||||
Om gebruik te maken van reeds geïnstalleerde programma's die aan glibc 2.29
|
||||
gebonden zijn, moet u de regionale informatie van versie 2.29 naast die van
|
||||
versie 2.31 installeren:
|
||||
|
||||
@example
|
||||
guix install glibc-locales glibc-locales-2.29
|
||||
@end example
|
||||
|
||||
Op Guix System kunt u het @code{locale-libcs}-veld van uw
|
||||
@code{operating-system}-vorm aanpassen. Voer @code{info \"(guix) Locales\"}
|
||||
uit voor verdere uitleg.")))
|
||||
|
||||
(entry (commit "e1e6491226347d9fb93ff484d78cef98848a510a")
|
||||
(title (en "Guix Cookbook now available as Info")
|
||||
(de "Guix-Kochbuch jetzt als Info-Dokument verfügbar"))
|
||||
|
@ -45,6 +113,15 @@
|
|||
@uref{https://guix.gnu.org/contact/, kontaktieren Sie die Entwickler}, um Ihre
|
||||
Rezepte mit uns zu teilen!")))
|
||||
|
||||
(entry (commit "2ca7af43fe17d9acf082dce85d137a27a8ac4887")
|
||||
(title (en "Further reduced binary seed bootstrap"))
|
||||
(body
|
||||
(en "The package graph on x86_64 and i686 is now rooted in a further
|
||||
@dfn{reduced set of binary seeds}. The initial set of binaries from which
|
||||
packages are built now weighs in at approximately 60 MiB, a quarter of what it
|
||||
used to be. Run @code{info \"(guix) Bootstrapping\"} to learn more, or watch
|
||||
the talk at @uref{https://fosdem.org/2020/schedule/event/gnumes/}.")))
|
||||
|
||||
(entry (commit "0468455e7d279c89ea3ad1b51935efb2b785ec47")
|
||||
(title (en "Rottlog service added to @code{%base-services}")
|
||||
(de "Rottlog-Dienst ist nun Teil der @code{%base-services}"))
|
||||
|
@ -59,6 +136,14 @@
|
|||
genannt wurde, sollten Sie ihn jetzt daraus entfernen. Siehe den Abschnitt
|
||||
„Log-Rotation“ im Handbuch für weitere Informationen.")))
|
||||
|
||||
(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
|
||||
(instead of 2.2). The @code{guile3.0-} packages have been renamed to their
|
||||
original name, and @code{guile2.2-} variants of these packages have been
|
||||
defined. Additionally, derivations are now all built with Guile 3.0, and
|
||||
system services also run on 3.0.")))
|
||||
|
||||
(entry (commit "e3e1a7ba08af2d58c47264c543617e499c239444")
|
||||
(title (en "@command{guix pull} now supports SSH authenticated
|
||||
repositories")
|
||||
|
|
|
@ -66,7 +66,7 @@ (define %packages-to-cross-build
|
|||
;; Packages that must be cross-buildable from x86_64-linux.
|
||||
;; FIXME: Add (@ (gnu packages gcc) gcc) when <https://bugs.gnu.org/40463>
|
||||
;; is fixed.
|
||||
(append (list (@ (gnu packages guile) guile-2.2/fixed))
|
||||
(append (list (@ (gnu packages guile) guile-3.0/fixed))
|
||||
(map specification->package
|
||||
'("coreutils" "grep" "sed" "findutils" "diffutils" "patch"
|
||||
"gawk" "gettext" "gzip" "xz"
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
|
||||
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -54,6 +54,7 @@ (define-module (gnu bootloader grub)
|
|||
grub-bootloader
|
||||
grub-efi-bootloader
|
||||
grub-mkrescue-bootloader
|
||||
grub-minimal-bootloader
|
||||
|
||||
grub-configuration))
|
||||
|
||||
|
@ -457,6 +458,14 @@ (define grub-bootloader
|
|||
(configuration-file "/boot/grub/grub.cfg")
|
||||
(configuration-file-generator grub-configuration-file)))
|
||||
|
||||
(define grub-minimal-bootloader
|
||||
(bootloader
|
||||
(name 'grub)
|
||||
(package grub-minimal)
|
||||
(installer install-grub)
|
||||
(configuration-file "/boot/grub/grub.cfg")
|
||||
(configuration-file-generator grub-configuration-file)))
|
||||
|
||||
(define* grub-efi-bootloader
|
||||
(bootloader
|
||||
(inherit grub-bootloader)
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2020 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
||||
|
@ -38,8 +38,11 @@ (define-module (gnu build cross-toolchain)
|
|||
|
||||
(define %gcc-include-paths
|
||||
;; Environment variables for header search paths.
|
||||
;; Note: See <http://bugs.gnu.org/30756> for why not 'C_INCLUDE_PATH' & co.
|
||||
'("CPATH"))
|
||||
;; Note: See <http://bugs.gnu.org/22186> for why not 'CPATH'.
|
||||
'("C_INCLUDE_PATH"
|
||||
"CPLUS_INCLUDE_PATH"
|
||||
"OBJC_INCLUDE_PATH"
|
||||
"OBJCPLUS_INCLUDE_PATH"))
|
||||
|
||||
(define %gcc-cross-include-paths
|
||||
;; Search path for target headers when cross-compiling.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -76,6 +76,13 @@ (define* (evaluate-populate-directive directive target
|
|||
(('directory name uid gid mode)
|
||||
(loop `(directory ,name ,uid ,gid))
|
||||
(chmod (string-append target name) mode))
|
||||
(('file name)
|
||||
(call-with-output-file (string-append target name)
|
||||
(const #t)))
|
||||
(('file name (? string? content))
|
||||
(call-with-output-file (string-append target name)
|
||||
(lambda (port)
|
||||
(display content port))))
|
||||
((new '-> old)
|
||||
(let try ()
|
||||
(catch 'system-error
|
||||
|
@ -126,11 +133,14 @@ (define (directives store)
|
|||
|
||||
(directory "/home" 0 0)))
|
||||
|
||||
(define (populate-root-file-system system target)
|
||||
(define* (populate-root-file-system system target
|
||||
#:key (extras '()))
|
||||
"Make the essential non-store files and directories on TARGET. This
|
||||
includes /etc, /var, /run, /bin/sh, etc., and all the symlinks to SYSTEM."
|
||||
includes /etc, /var, /run, /bin/sh, etc., and all the symlinks to SYSTEM.
|
||||
EXTRAS is a list of directives appended to the built-in directives to populate
|
||||
TARGET."
|
||||
(for-each (cut evaluate-populate-directive <> target)
|
||||
(directives (%store-directory)))
|
||||
(append (directives (%store-directory)) extras))
|
||||
|
||||
;; Add system generation 1.
|
||||
(let ((generation-1 (string-append target
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
|
||||
;;;
|
||||
|
@ -40,6 +40,7 @@ (define-module (gnu build linux-boot)
|
|||
find-long-option
|
||||
find-long-options
|
||||
make-essential-device-nodes
|
||||
make-hurd-device-nodes
|
||||
make-static-device-nodes
|
||||
configure-qemu-networking
|
||||
|
||||
|
@ -223,7 +224,7 @@ (define* (make-static-device-nodes linux-release-module-directory)
|
|||
(call-with-input-file devname-name
|
||||
read-static-device-nodes))))
|
||||
|
||||
(define* (make-essential-device-nodes #:key (root "/"))
|
||||
(define* (make-essential-device-nodes #:optional (root "/"))
|
||||
"Make essential device nodes under ROOT/dev."
|
||||
;; The hand-made devtmpfs/udev!
|
||||
|
||||
|
@ -323,6 +324,36 @@ (define (scope dir)
|
|||
;; File systems in user space (FUSE).
|
||||
(mknod (scope "dev/fuse") 'char-special #o666 (device-number 10 229)))
|
||||
|
||||
(define* (make-hurd-device-nodes #:optional (root "/"))
|
||||
"Make some of the nodes needed on GNU/Hurd."
|
||||
(define (scope dir)
|
||||
(string-append root
|
||||
(if (string-suffix? "/" root)
|
||||
""
|
||||
"/")
|
||||
dir))
|
||||
|
||||
(mkdir (scope "dev"))
|
||||
(for-each (lambda (file)
|
||||
(call-with-output-file (scope file)
|
||||
(lambda (port)
|
||||
(chmod port #o666))))
|
||||
'("dev/null"
|
||||
"dev/zero"
|
||||
"dev/full"
|
||||
"dev/random"
|
||||
"dev/urandom"))
|
||||
;; Don't create /dev/console, /dev/vcs, etc.: they are created by
|
||||
;; console-run on first boot.
|
||||
|
||||
(mkdir (scope "servers"))
|
||||
(mkdir (scope "servers/socket"))
|
||||
;; Don't create /servers/socket/1 & co: runsystem does that on first boot.
|
||||
|
||||
;; TODO: Set the 'gnu.translator' extended attribute for passive translator
|
||||
;; settings?
|
||||
)
|
||||
|
||||
(define %host-qemu-ipv4-address
|
||||
(inet-pton AF_INET "10.0.2.10"))
|
||||
|
||||
|
|
|
@ -34,6 +34,7 @@ (define-module (gnu build vm)
|
|||
#:use-module (guix records)
|
||||
#:use-module ((guix combinators) #:select (fold2))
|
||||
#:use-module (ice-9 format)
|
||||
#:use-module (ice-9 ftw)
|
||||
#:use-module (ice-9 match)
|
||||
#:use-module (ice-9 regex)
|
||||
#:use-module (ice-9 popen)
|
||||
|
@ -234,6 +235,8 @@ (define-record-type* <partition> partition make-partition
|
|||
(device partition-device (default #f))
|
||||
(size partition-size)
|
||||
(file-system partition-file-system (default "ext4"))
|
||||
(file-system-options partition-file-system-options ;passed to 'mkfs.FS'
|
||||
(default '()))
|
||||
(label partition-label (default #f))
|
||||
(uuid partition-uuid (default #f))
|
||||
(flags partition-flags (default '()))
|
||||
|
@ -308,7 +311,7 @@ (define (options partitions offset)
|
|||
(define MS_BIND 4096) ; <sys/mounts.h> again!
|
||||
|
||||
(define* (create-ext-file-system partition type
|
||||
#:key label uuid)
|
||||
#:key label uuid (options '()))
|
||||
"Create an ext-family file system of TYPE on PARTITION. If LABEL is true,
|
||||
use that as the volume name. If UUID is true, use it as the partition UUID."
|
||||
(format #t "creating ~a partition... ~@[label: ~s~] ~@[uuid: ~s~]\n"
|
||||
|
@ -320,26 +323,29 @@ (define* (create-ext-file-system partition type
|
|||
'())
|
||||
,@(if uuid
|
||||
`("-U" ,(uuid->string uuid))
|
||||
'()))))
|
||||
'())
|
||||
,@options)))
|
||||
|
||||
(define* (create-fat-file-system partition
|
||||
#:key label uuid)
|
||||
#:key label uuid (options '()))
|
||||
"Create a FAT file system on PARTITION. The number of File Allocation Tables
|
||||
will be determined based on file system size. If LABEL is true, use that as the
|
||||
volume name."
|
||||
;; FIXME: UUID is ignored!
|
||||
(format #t "creating FAT partition...\n")
|
||||
(apply invoke "mkfs.fat" partition
|
||||
(if label `("-n" ,label) '())))
|
||||
(append (if label `("-n" ,label) '()) options)))
|
||||
|
||||
(define* (format-partition partition type
|
||||
#:key label uuid)
|
||||
#:key label uuid (options '()))
|
||||
"Create a file system TYPE on PARTITION. If LABEL is true, use that as the
|
||||
volume name."
|
||||
volume name. Options is a list of command-line options passed to 'mkfs.FS'."
|
||||
(cond ((string-prefix? "ext" type)
|
||||
(create-ext-file-system partition type #:label label #:uuid uuid))
|
||||
(create-ext-file-system partition type #:label label #:uuid uuid
|
||||
#:options options))
|
||||
((or (string-prefix? "fat" type) (string= "vfat" type))
|
||||
(create-fat-file-system partition #:label label #:uuid uuid))
|
||||
(create-fat-file-system partition #:label label #:uuid uuid
|
||||
#:options options))
|
||||
(else (error "Unsupported file system."))))
|
||||
|
||||
(define (initialize-partition partition)
|
||||
|
@ -349,7 +355,8 @@ (define (initialize-partition partition)
|
|||
(format-partition (partition-device partition)
|
||||
(partition-file-system partition)
|
||||
#:label (partition-label partition)
|
||||
#:uuid (partition-uuid partition))
|
||||
#:uuid (partition-uuid partition)
|
||||
#:options (partition-file-system-options partition))
|
||||
(mkdir-p target)
|
||||
(mount (partition-device partition) target
|
||||
(partition-file-system partition))
|
||||
|
@ -363,14 +370,20 @@ (define* (root-partition-initializer #:key (closures '())
|
|||
copy-closures?
|
||||
(register-closures? #t)
|
||||
system-directory
|
||||
(deduplicate? #t))
|
||||
(deduplicate? #t)
|
||||
(make-device-nodes
|
||||
make-essential-device-nodes)
|
||||
(extra-directives '()))
|
||||
"Return a procedure to initialize a root partition.
|
||||
|
||||
If REGISTER-CLOSURES? is true, register all of CLOSURES in the partition's
|
||||
store. If DEDUPLICATE? is true, then also deduplicate files common to
|
||||
CLOSURES and the rest of the store when registering the closures. If
|
||||
COPY-CLOSURES? is true, copy all of CLOSURES to the partition.
|
||||
SYSTEM-DIRECTORY is the name of the directory of the 'system' derivation."
|
||||
SYSTEM-DIRECTORY is the name of the directory of the 'system' derivation.
|
||||
|
||||
EXTRA-DIRECTIVES is an optional list of directives to populate the root file
|
||||
system that is passed to 'populate-root-file-system'."
|
||||
(lambda (target)
|
||||
(define target-store
|
||||
(string-append target (%store-directory)))
|
||||
|
@ -381,7 +394,7 @@ (define target-store
|
|||
target))
|
||||
|
||||
;; Populate /dev.
|
||||
(make-essential-device-nodes #:root target)
|
||||
(make-device-nodes target)
|
||||
|
||||
;; Optionally, register the inputs in the image's store.
|
||||
(when register-closures?
|
||||
|
@ -403,12 +416,22 @@ (define target-store
|
|||
|
||||
;; Add the non-store directories and files.
|
||||
(display "populating...\n")
|
||||
(populate-root-file-system system-directory target)
|
||||
(populate-root-file-system system-directory target
|
||||
#:extras extra-directives)
|
||||
|
||||
;; 'register-closure' resets timestamps and everything, so no need to do it
|
||||
;; once more in that case.
|
||||
(unless register-closures?
|
||||
(reset-timestamps target))))
|
||||
;; 'reset-timestamps' also resets file permissions; do that everywhere
|
||||
;; except on /dev so that /dev/null remains writable, etc.
|
||||
(for-each (lambda (directory)
|
||||
(reset-timestamps (string-append target "/" directory)))
|
||||
(scandir target
|
||||
(match-lambda
|
||||
((or "." ".." "dev") #f)
|
||||
(_ #t))))
|
||||
(reset-timestamps (string-append target "/dev")
|
||||
#:preserve-permissions? #t))))
|
||||
|
||||
(define (register-bootcfg-root target bootcfg)
|
||||
"On file system TARGET, register BOOTCFG as a GC root."
|
||||
|
|
10
gnu/ci.scm
10
gnu/ci.scm
|
@ -125,8 +125,12 @@ (define %core-packages
|
|||
%guile-bootstrap-tarball
|
||||
%bootstrap-tarballs))
|
||||
|
||||
(define %packages-to-cross-build
|
||||
%core-packages)
|
||||
(define (packages-to-cross-build target)
|
||||
"Return the list of packages to cross-build for TARGET."
|
||||
;; Don't cross-build the bootstrap tarballs for MinGW.
|
||||
(if (string-contains target "mingw")
|
||||
(drop-right %core-packages 6)
|
||||
%core-packages))
|
||||
|
||||
(define %cross-targets
|
||||
'("mips64el-linux-gnu"
|
||||
|
@ -177,7 +181,7 @@ (define (either proc1 proc2 proc3)
|
|||
(map (lambda (package)
|
||||
(package-cross-job store (job-name package)
|
||||
package target system))
|
||||
%packages-to-cross-build))
|
||||
(packages-to-cross-build target)))
|
||||
(remove (either from-32-to-64? same? pointless?)
|
||||
%cross-targets)))
|
||||
|
||||
|
|
|
@ -313,18 +313,18 @@ (define init-gettext
|
|||
(define set-installer-path
|
||||
;; Add the specified binary to PATH for later use by the installer.
|
||||
#~(let* ((inputs
|
||||
'#$(append (list bash ;start subshells
|
||||
connman ;call connmanctl
|
||||
cryptsetup
|
||||
dosfstools ;mkfs.fat
|
||||
e2fsprogs ;mkfs.ext4
|
||||
btrfs-progs ;mkfs.btrfs
|
||||
jfsutils ;jfs_mkfs
|
||||
kbd ;chvt
|
||||
guix ;guix system init call
|
||||
util-linux ;mkwap
|
||||
shadow)
|
||||
(map canonical-package (list coreutils)))))
|
||||
'#$(list bash ;start subshells
|
||||
connman ;call connmanctl
|
||||
cryptsetup
|
||||
dosfstools ;mkfs.fat
|
||||
e2fsprogs ;mkfs.ext4
|
||||
btrfs-progs
|
||||
jfsutils ;jfs_mkfs
|
||||
kbd ;chvt
|
||||
guix ;guix system init call
|
||||
util-linux ;mkwap
|
||||
shadow
|
||||
coreutils)))
|
||||
(with-output-to-port (%make-void-port "w")
|
||||
(lambda ()
|
||||
(set-path-environment-variable "PATH" '("bin" "sbin") inputs)))))
|
||||
|
|
114
gnu/local.mk
114
gnu/local.mk
|
@ -11,10 +11,10 @@
|
|||
# Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
|
||||
# Copyright © 2016, 2017, 2018, 2019 Alex Vong <alexvong1995@gmail.com>
|
||||
# Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
# Copyright © 2016, 2017, 2018, 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
# Copyright © 2016, 2017, 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
# Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
# Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
|
||||
# Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
# Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
# Copyright © 2017, 2018, 2019 Gábor Boskovits <boskovits@gmail.com>
|
||||
# Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
|
||||
# Copyright © 2018, 2019, 2020 Oleg Pykhalov <go.wigust@gmail.com>
|
||||
|
@ -608,6 +608,7 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/system.scm \
|
||||
%D%/system/accounts.scm \
|
||||
%D%/system/file-systems.scm \
|
||||
%D%/system/hurd.scm \
|
||||
%D%/system/image.scm \
|
||||
%D%/system/install.scm \
|
||||
%D%/system/keyboard.scm \
|
||||
|
@ -735,7 +736,8 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/aegis-test-fixup-1.patch \
|
||||
%D%/packages/patches/aegis-test-fixup-2.patch \
|
||||
%D%/packages/patches/aegisub-icu59-include-unistr.patch \
|
||||
%D%/packages/patches/aegisub-boost68.patch \
|
||||
%D%/packages/patches/aegisub-boost68.patch \
|
||||
%D%/packages/patches/aegisub-make43.patch \
|
||||
%D%/packages/patches/agg-am_c_prototype.patch \
|
||||
%D%/packages/patches/akonadi-paths.patch \
|
||||
%D%/packages/patches/akonadi-not-relocatable.patch \
|
||||
|
@ -748,7 +750,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \
|
||||
%D%/packages/patches/apr-skip-getservbyname-test.patch \
|
||||
%D%/packages/patches/aspell-default-dict-dir.patch \
|
||||
%D%/packages/patches/aspell-gcc-compat.patch \
|
||||
%D%/packages/patches/ath9k-htc-firmware-binutils.patch \
|
||||
%D%/packages/patches/ath9k-htc-firmware-gcc.patch \
|
||||
%D%/packages/patches/ath9k-htc-firmware-objcopy.patch \
|
||||
|
@ -767,7 +768,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/audiofile-hurd.patch \
|
||||
%D%/packages/patches/audiofile-signature-of-multiplyCheckOverflow.patch \
|
||||
%D%/packages/patches/automake-skip-amhello-tests.patch \
|
||||
%D%/packages/patches/avahi-CVE-2018-1000845.patch \
|
||||
%D%/packages/patches/avahi-localstatedir.patch \
|
||||
%D%/packages/patches/avogadro-boost148.patch \
|
||||
%D%/packages/patches/avogadro-eigen3-update.patch \
|
||||
|
@ -777,10 +777,13 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/azr3.patch \
|
||||
%D%/packages/patches/bash-reproducible-linux-pgrp-pipe.patch \
|
||||
%D%/packages/patches/bash-completion-directories.patch \
|
||||
%D%/packages/patches/bash-linux-pgrp-pipe.patch \
|
||||
%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/behave-skip-a-couple-of-tests.patch \
|
||||
%D%/packages/patches/beignet-correct-file-names.patch \
|
||||
%D%/packages/patches/benchmark-unbundle-googletest.patch \
|
||||
%D%/packages/patches/biber-fix-encoding-write.patch \
|
||||
|
@ -817,6 +820,9 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/clang-10.0-libc-search-path.patch \
|
||||
%D%/packages/patches/clang-runtime-asan-build-fixes.patch \
|
||||
%D%/packages/patches/clang-runtime-esan-build-fixes.patch \
|
||||
%D%/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch \
|
||||
%D%/packages/patches/clang-runtime-3.9-libsanitizer-mode-field.patch \
|
||||
%D%/packages/patches/clang-runtime-3.8-libsanitizer-mode-field.patch \
|
||||
%D%/packages/patches/classpath-aarch64-support.patch \
|
||||
%D%/packages/patches/clementine-fix-sqlite.patch \
|
||||
%D%/packages/patches/clementine-remove-crypto++-dependency.patch \
|
||||
|
@ -829,19 +835,24 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/combinatorial-blas-awpm.patch \
|
||||
%D%/packages/patches/combinatorial-blas-io-fix.patch \
|
||||
%D%/packages/patches/containerd-test-with-go1.13.patch \
|
||||
%D%/packages/patches/coreutils-ls.patch \
|
||||
%D%/packages/patches/cpufrequtils-fix-aclocal.patch \
|
||||
%D%/packages/patches/crawl-upgrade-saves.patch \
|
||||
%D%/packages/patches/crda-optional-gcrypt.patch \
|
||||
%D%/packages/patches/clucene-contribs-lib.patch \
|
||||
%D%/packages/patches/cube-nocheck.patch \
|
||||
%D%/packages/patches/curl-use-ssl-cert-env.patch \
|
||||
%D%/packages/patches/cursynth-wave-rand.patch \
|
||||
%D%/packages/patches/cvs-CVE-2017-12836.patch \
|
||||
%D%/packages/patches/cyrus-sasl-ac-try-run-fix.patch \
|
||||
%D%/packages/patches/date-output-pkg-config-files.patch \
|
||||
%D%/packages/patches/darkice-workaround-fpermissive-error.patch \
|
||||
%D%/packages/patches/datefudge-gettimeofday.patch \
|
||||
%D%/packages/patches/dbacl-include-locale.h.patch \
|
||||
%D%/packages/patches/dbus-helper-search-path.patch \
|
||||
%D%/packages/patches/dbus-c++-gcc-compat.patch \
|
||||
%D%/packages/patches/dbus-c++-threading-mutex.patch \
|
||||
%D%/packages/patches/dconf-meson-0.52.patch \
|
||||
%D%/packages/patches/debops-constants-for-external-program-names.patch \
|
||||
%D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \
|
||||
%D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \
|
||||
|
@ -856,6 +867,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/docker-fix-tests.patch \
|
||||
%D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \
|
||||
%D%/packages/patches/doxygen-test.patch \
|
||||
%D%/packages/patches/doxygen-1.8.17-runtests.patch \
|
||||
%D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \
|
||||
%D%/packages/patches/dstat-skip-devices-without-io.patch \
|
||||
%D%/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch \
|
||||
|
@ -898,19 +910,17 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/fasthenry-spFactor.patch \
|
||||
%D%/packages/patches/fbreader-curl-7.62.patch \
|
||||
%D%/packages/patches/ffmpeg-prefer-dav1d.patch \
|
||||
%D%/packages/patches/fifengine-swig-compat.patch \
|
||||
%D%/packages/patches/fifo-map-fix-flags-for-gcc.patch \
|
||||
%D%/packages/patches/fifo-map-remove-catch.hpp.patch \
|
||||
%D%/packages/patches/file-CVE-2018-10360.patch \
|
||||
%D%/packages/patches/findutils-gnulib-libio.patch \
|
||||
%D%/packages/patches/findutils-localstatedir.patch \
|
||||
%D%/packages/patches/findutils-makedev.patch \
|
||||
%D%/packages/patches/findutils-test-xargs.patch \
|
||||
%D%/packages/patches/findutils-test-rwlock-threads.patch \
|
||||
%D%/packages/patches/flann-cmake-3.11.patch \
|
||||
%D%/packages/patches/flint-ldconfig.patch \
|
||||
%D%/packages/patches/foobillard++-pkg-config.patch \
|
||||
%D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \
|
||||
%D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \
|
||||
%D%/packages/patches/fribidi-CVE-2019-18397.patch \
|
||||
%D%/packages/patches/fontconfig-hurd-path-max.patch \
|
||||
%D%/packages/patches/freeimage-unbundle.patch \
|
||||
%D%/packages/patches/fuse-overlapping-headers.patch \
|
||||
%D%/packages/patches/gawk-shell.patch \
|
||||
|
@ -918,18 +928,22 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/gcc-arm-link-spec-fix.patch \
|
||||
%D%/packages/patches/gcc-asan-missing-include.patch \
|
||||
%D%/packages/patches/gcc-boot-2.95.3.patch \
|
||||
%D%/packages/patches/gcc-boot-4.7.4.patch \
|
||||
%D%/packages/patches/gcc-boot-4.6.4.patch \
|
||||
%D%/packages/patches/gcc-cross-environment-variables.patch \
|
||||
%D%/packages/patches/gcc-fix-texi2pod.patch \
|
||||
%D%/packages/patches/gcc-4.8-libsanitizer-fix.patch \
|
||||
%D%/packages/patches/gcc-4.9-libsanitizer-fix.patch \
|
||||
%D%/packages/patches/gcc-4.9-libsanitizer-ustat.patch \
|
||||
%D%/packages/patches/gcc-libsanitizer-ustat.patch \
|
||||
%D%/packages/patches/gcc-4.9-libsanitizer-mode-size.patch \
|
||||
%D%/packages/patches/gcc-6-libsanitizer-mode-size.patch \
|
||||
%D%/packages/patches/gcc-7-libsanitizer-mode-size.patch \
|
||||
%D%/packages/patches/gcc-libvtv-runpath.patch \
|
||||
%D%/packages/patches/gcc-strmov-store-file-names.patch \
|
||||
%D%/packages/patches/gcc-4-compile-with-gcc-5.patch \
|
||||
%D%/packages/patches/gcc-4.6-gnu-inline.patch \
|
||||
%D%/packages/patches/gcc-4.9.3-mingw-gthr-default.patch \
|
||||
%D%/packages/patches/gcc-5-hurd.patch \
|
||||
%D%/packages/patches/gcc-5.0-libvtv-runpath.patch \
|
||||
%D%/packages/patches/gcc-5-source-date-epoch-1.patch \
|
||||
%D%/packages/patches/gcc-5-source-date-epoch-2.patch \
|
||||
|
@ -939,21 +953,18 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/gcc-6-source-date-epoch-2.patch \
|
||||
%D%/packages/patches/gcc-7-cross-mingw.patch \
|
||||
%D%/packages/patches/gcc-7-cross-environment-variables.patch \
|
||||
%D%/packages/patches/gcc-7-cross-toolexeclibdir.patch \
|
||||
%D%/packages/patches/gcc-8-cross-environment-variables.patch \
|
||||
%D%/packages/patches/gcc-8-strmov-store-file-names.patch \
|
||||
%D%/packages/patches/gcc-9-asan-fix-limits-include.patch \
|
||||
%D%/packages/patches/gcc-9-strmov-store-file-names.patch \
|
||||
%D%/packages/patches/gd-CVE-2018-5711.patch \
|
||||
%D%/packages/patches/gd-CVE-2018-1000222.patch \
|
||||
%D%/packages/patches/gd-CVE-2019-6977.patch \
|
||||
%D%/packages/patches/gd-CVE-2019-6978.patch \
|
||||
%D%/packages/patches/gd-fix-tests-on-i686.patch \
|
||||
%D%/packages/patches/gd-freetype-test-failure.patch \
|
||||
%D%/packages/patches/gd-brect-bounds.patch \
|
||||
%D%/packages/patches/gdm-default-session.patch \
|
||||
%D%/packages/patches/geoclue-config.patch \
|
||||
%D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
|
||||
%D%/packages/patches/ghc-diff-swap-cover-args.patch \
|
||||
%D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch \
|
||||
%D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
|
||||
%D%/packages/patches/ghc-testsuite-dlopen-pie.patch \
|
||||
%D%/packages/patches/ghc-diff-swap-cover-args.patch \
|
||||
%D%/packages/patches/ghc-haddock-api-fix-haddock.patch \
|
||||
%D%/packages/patches/ghc-hpack-fix-tests.patch \
|
||||
%D%/packages/patches/ghc-microlens-aeson-fix-tests.patch \
|
||||
|
@ -963,7 +974,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/ghostscript-no-header-id.patch \
|
||||
%D%/packages/patches/ghostscript-no-header-uuid.patch \
|
||||
%D%/packages/patches/ghostscript-no-header-creationdate.patch \
|
||||
%D%/packages/patches/giflib-make-reallocarray-private.patch \
|
||||
%D%/packages/patches/glib-tests-timer.patch \
|
||||
%D%/packages/patches/glibc-CVE-2015-5180.patch \
|
||||
%D%/packages/patches/glibc-CVE-2015-7547.patch \
|
||||
|
@ -977,13 +987,19 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/glibc-CVE-2018-11237.patch \
|
||||
%D%/packages/patches/glibc-CVE-2019-7309.patch \
|
||||
%D%/packages/patches/glibc-CVE-2019-9169.patch \
|
||||
%D%/packages/patches/glibc-CVE-2019-19126.patch \
|
||||
%D%/packages/patches/glibc-allow-kernel-2.6.32.patch \
|
||||
%D%/packages/patches/glibc-boot-2.16.0.patch \
|
||||
%D%/packages/patches/glibc-boot-2.2.5.patch \
|
||||
%D%/packages/patches/glibc-bootstrap-system-2.16.0.patch \
|
||||
%D%/packages/patches/glibc-bootstrap-system.patch \
|
||||
%D%/packages/patches/glibc-hidden-visibility-ldconfig.patch \
|
||||
%D%/packages/patches/glibc-hurd-clock_gettime_monotonic.patch \
|
||||
%D%/packages/patches/glibc-hurd-clock_t_centiseconds.patch \
|
||||
%D%/packages/patches/glibc-hurd-gettyent.patch \
|
||||
%D%/packages/patches/glibc-hurd-mach-print.patch \
|
||||
%D%/packages/patches/glibc-hurd-magic-pid.patch \
|
||||
%D%/packages/patches/glibc-hurd-signal-sa-siginfo.patch \
|
||||
%D%/packages/patches/glibc-ldd-x86_64.patch \
|
||||
%D%/packages/patches/glibc-locales.patch \
|
||||
%D%/packages/patches/glibc-locales-2.28.patch \
|
||||
|
@ -996,15 +1012,18 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/glibc-2.29-git-updates.patch \
|
||||
%D%/packages/patches/glibc-2.27-supported-locales.patch \
|
||||
%D%/packages/patches/glibc-2.28-supported-locales.patch \
|
||||
%D%/packages/patches/glibc-2.29-supported-locales.patch \
|
||||
%D%/packages/patches/glibc-supported-locales.patch \
|
||||
%D%/packages/patches/glm-restore-install-target.patch \
|
||||
%D%/packages/patches/gmp-arm-asm-nothumb.patch \
|
||||
%D%/packages/patches/gmp-faulty-test.patch \
|
||||
%D%/packages/patches/gnome-shell-theme.patch \
|
||||
%D%/packages/patches/gnome-shell-disable-test.patch \
|
||||
%D%/packages/patches/gnome-todo-delete-esource-duplicate.patch \
|
||||
%D%/packages/patches/gnome-tweaks-search-paths.patch \
|
||||
%D%/packages/patches/gnupg-default-pinentry.patch \
|
||||
%D%/packages/patches/gnutls-skip-trust-store-test.patch \
|
||||
%D%/packages/patches/gnutls-cross.patch \
|
||||
%D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
|
||||
%D%/packages/patches/gobject-introspection-cc.patch \
|
||||
%D%/packages/patches/gobject-introspection-girepository.patch \
|
||||
|
@ -1018,18 +1037,21 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/gromacs-tinyxml2.patch \
|
||||
%D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \
|
||||
%D%/packages/patches/grub-efi-fat-serial-number.patch \
|
||||
%D%/packages/patches/gsl-test-i686.patch \
|
||||
%D%/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch \
|
||||
%D%/packages/patches/gspell-dash-test.patch \
|
||||
%D%/packages/patches/guile-1.8-cpp-4.5.patch \
|
||||
%D%/packages/patches/guile-2.2-default-utf8.patch \
|
||||
%D%/packages/patches/guile-2.2-skip-oom-test.patch \
|
||||
%D%/packages/patches/guile-default-utf8.patch \
|
||||
%D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \
|
||||
%D%/packages/patches/guile-linux-syscalls.patch \
|
||||
%D%/packages/patches/guile-present-coding.patch \
|
||||
%D%/packages/patches/guile-2.2-default-utf8.patch \
|
||||
%D%/packages/patches/guile-relocatable.patch \
|
||||
%D%/packages/patches/guile-3.0-relocatable.patch \
|
||||
%D%/packages/patches/guile-linux-syscalls.patch \
|
||||
%D%/packages/patches/guile-3.0-linux-syscalls.patch \
|
||||
%D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \
|
||||
%D%/packages/patches/guile-present-coding.patch \
|
||||
%D%/packages/patches/guile-rsvg-pkgconfig.patch \
|
||||
%D%/packages/patches/guile-emacs-fix-configure.patch \
|
||||
%D%/packages/patches/guile-sqlite3-fix-cross-compilation.patch \
|
||||
%D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \
|
||||
%D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \
|
||||
%D%/packages/patches/gtk2-theme-paths.patch \
|
||||
|
@ -1055,7 +1077,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/hdf-eos5-fix-szip.patch \
|
||||
%D%/packages/patches/hdf-eos5-fortrantests.patch \
|
||||
%D%/packages/patches/hubbub-sort-entities.patch \
|
||||
%D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch \
|
||||
%D%/packages/patches/hurd-cross.patch \
|
||||
%D%/packages/patches/hplip-remove-imageprocessor.patch \
|
||||
%D%/packages/patches/hydra-disable-darcs-test.patch \
|
||||
%D%/packages/patches/icecat-makeicecat.patch \
|
||||
|
@ -1070,6 +1092,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/id3lib-UTF16-writing-bug.patch \
|
||||
%D%/packages/patches/ilmbase-fix-tests.patch \
|
||||
%D%/packages/patches/ilmbase-openexr-pkg-config.patch \
|
||||
%D%/packages/patches/inetutils-hurd.patch \
|
||||
%D%/packages/patches/inkscape-poppler-0.76.patch \
|
||||
%D%/packages/patches/intltool-perl-compatibility.patch \
|
||||
%D%/packages/patches/irrlicht-use-system-libs.patch \
|
||||
|
@ -1085,7 +1108,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/java-xerces-bootclasspath.patch \
|
||||
%D%/packages/patches/java-xerces-build_dont_unzip.patch \
|
||||
%D%/packages/patches/java-xerces-xjavac_taskdef.patch \
|
||||
%D%/packages/patches/jbig2dec-ignore-testtest.patch \
|
||||
%D%/packages/patches/jfsutils-add-sysmacros.patch \
|
||||
%D%/packages/patches/jfsutils-include-systypes.patch \
|
||||
%D%/packages/patches/jsoncpp-fix-inverted-case.patch \
|
||||
|
@ -1131,6 +1153,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/ldc-bootstrap-disable-tests.patch \
|
||||
%D%/packages/patches/ldc-disable-phobos-tests.patch \
|
||||
%D%/packages/patches/leela-zero-gtest.patch \
|
||||
%D%/packages/patches/less-hurd-path-max.patch \
|
||||
%D%/packages/patches/liba52-enable-pic.patch \
|
||||
%D%/packages/patches/liba52-link-with-libm.patch \
|
||||
%D%/packages/patches/liba52-set-soname.patch \
|
||||
|
@ -1148,9 +1171,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/libgit2-mtime-0.patch \
|
||||
%D%/packages/patches/libgnome-encoding.patch \
|
||||
%D%/packages/patches/libgnomeui-utf8.patch \
|
||||
%D%/packages/patches/libgpg-error-gawk-compat.patch \
|
||||
%D%/packages/patches/libffi-3.2.1-complex-alpha.patch \
|
||||
%D%/packages/patches/libjpeg-turbo-CVE-2019-2201.patch \
|
||||
%D%/packages/patches/libjxr-fix-function-signature.patch \
|
||||
%D%/packages/patches/libjxr-fix-typos.patch \
|
||||
%D%/packages/patches/libotr-test-auth-fix.patch \
|
||||
|
@ -1166,6 +1186,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch \
|
||||
%D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \
|
||||
%D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \
|
||||
%D%/packages/patches/libreoffice-poppler-compat.patch \
|
||||
%D%/packages/patches/libsndfile-armhf-type-checks.patch \
|
||||
%D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \
|
||||
%D%/packages/patches/libsndfile-CVE-2017-8362.patch \
|
||||
|
@ -1174,6 +1195,8 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/libtgvoip-disable-sse2.patch \
|
||||
%D%/packages/patches/libtgvoip-disable-webrtc.patch \
|
||||
%D%/packages/patches/libtheora-config-guess.patch \
|
||||
%D%/packages/patches/libtirpc-hurd.patch \
|
||||
%D%/packages/patches/libtirpc-hurd-client.patch \
|
||||
%D%/packages/patches/libtommath-fix-linkage.patch \
|
||||
%D%/packages/patches/libtool-skip-tests2.patch \
|
||||
%D%/packages/patches/libusb-0.1-disable-tests.patch \
|
||||
|
@ -1192,6 +1215,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/lierolibre-remove-arch-warning.patch \
|
||||
%D%/packages/patches/lierolibre-try-building-other-arch.patch \
|
||||
%D%/packages/patches/linkchecker-tests-require-network.patch \
|
||||
%D%/packages/patches/linphoneqt-tabbutton.patch \
|
||||
%D%/packages/patches/linux-libre-support-for-Pinebook-Pro.patch \
|
||||
%D%/packages/patches/linux-pam-no-setfsuid.patch \
|
||||
%D%/packages/patches/lirc-localstatedir.patch \
|
||||
|
@ -1210,7 +1234,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/luminance-hdr-qt-printer.patch \
|
||||
%D%/packages/patches/lvm2-static-link.patch \
|
||||
%D%/packages/patches/lxsession-use-gapplication.patch \
|
||||
%D%/packages/patches/make-glibc-compat.patch \
|
||||
%D%/packages/patches/make-impure-dirs.patch \
|
||||
%D%/packages/patches/mariadb-client-test-32bit.patch \
|
||||
%D%/packages/patches/mars-install.patch \
|
||||
|
@ -1233,6 +1256,8 @@ dist_patch_DATA = \
|
|||
%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 \
|
||||
%D%/packages/patches/mit-krb5-qualify-short-hostnames.patch \
|
||||
%D%/packages/patches/mpc123-initialize-ao.patch \
|
||||
%D%/packages/patches/module-init-tools-moduledir.patch \
|
||||
%D%/packages/patches/monero-use-system-miniupnpc.patch \
|
||||
|
@ -1293,6 +1318,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/openjdk-10-idlj-reproducibility.patch \
|
||||
%D%/packages/patches/openmpi-mtl-priorities.patch \
|
||||
%D%/packages/patches/openocd-nrf52.patch \
|
||||
%D%/packages/patches/openssh-hurd.patch \
|
||||
%D%/packages/patches/openssl-runpath.patch \
|
||||
%D%/packages/patches/openssl-1.1-c-rehash-in.patch \
|
||||
%D%/packages/patches/openssl-c-rehash-in.patch \
|
||||
|
@ -1307,6 +1333,8 @@ dist_patch_DATA = \
|
|||
%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 \
|
||||
%D%/packages/patches/sdl-pango-api_additions.patch \
|
||||
%D%/packages/patches/sdl-pango-blit_overflow.patch \
|
||||
%D%/packages/patches/sdl-pango-fillrect_crash.patch \
|
||||
|
@ -1316,6 +1344,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/patchutils-test-perms.patch \
|
||||
%D%/packages/patches/patch-hurd-path-max.patch \
|
||||
%D%/packages/patches/perl-autosplit-default-time.patch \
|
||||
%D%/packages/patches/perl-cross.patch \
|
||||
%D%/packages/patches/perl-deterministic-ordering.patch \
|
||||
%D%/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \
|
||||
%D%/packages/patches/perl-io-socket-ssl-openssl-1.0.2f-fix.patch \
|
||||
|
@ -1346,7 +1375,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/portaudio-audacity-compat.patch \
|
||||
%D%/packages/patches/portmidi-modular-build.patch \
|
||||
%D%/packages/patches/postgresql-disable-resolve_symlinks.patch \
|
||||
%D%/packages/patches/potrace-tests.patch \
|
||||
%D%/packages/patches/procmail-ambiguous-getline-debian.patch \
|
||||
%D%/packages/patches/procmail-CVE-2014-3618.patch \
|
||||
%D%/packages/patches/procmail-CVE-2017-16844.patch \
|
||||
|
@ -1369,20 +1397,21 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/python-2.7-search-paths.patch \
|
||||
%D%/packages/patches/python-2.7-site-prefixes.patch \
|
||||
%D%/packages/patches/python-2.7-source-date-epoch.patch \
|
||||
%D%/packages/patches/python-3-arm-alignment.patch \
|
||||
%D%/packages/patches/python-3-deterministic-build-info.patch \
|
||||
%D%/packages/patches/python-3-search-paths.patch \
|
||||
%D%/packages/patches/python-3-fix-tests.patch \
|
||||
%D%/packages/patches/python-3.8-search-paths.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 \
|
||||
%D%/packages/patches/python-cffi-x87-stack-clean.patch \
|
||||
%D%/packages/patches/python-cross-compile.patch \
|
||||
%D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \
|
||||
%D%/packages/patches/python-configobj-setuptools.patch \
|
||||
%D%/packages/patches/python-flask-restful-werkzeug-compat.patch \
|
||||
%D%/packages/patches/python-gst-fix-build-with-python-3.8.patch \
|
||||
%D%/packages/patches/python-keras-integration-test.patch \
|
||||
%D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \
|
||||
%D%/packages/patches/python-pyfakefs-remove-bad-test.patch \
|
||||
|
@ -1395,6 +1424,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/python2-parameterized-docstring-test.patch \
|
||||
%D%/packages/patches/python-paste-remove-timing-test.patch \
|
||||
%D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \
|
||||
%D%/packages/patches/python-pycrypto-time-clock.patch \
|
||||
%D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
|
||||
%D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \
|
||||
%D%/packages/patches/python-robotframework-honor-source-date-epoch.patch \
|
||||
|
@ -1411,6 +1441,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/qemu-fix-documentation-build-failure.patch \
|
||||
%D%/packages/patches/qrcodegen-cpp-make-install.patch \
|
||||
%D%/packages/patches/qt4-ldflags.patch \
|
||||
%D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch \
|
||||
%D%/packages/patches/qtbase-use-TZDIR.patch \
|
||||
%D%/packages/patches/qtbase-QTBUG-81715.patch \
|
||||
%D%/packages/patches/qtscript-disable-tests.patch \
|
||||
|
@ -1452,10 +1483,11 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/scheme48-tests.patch \
|
||||
%D%/packages/patches/scotch-build-parallelism.patch \
|
||||
%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/seahorse-gkr-use-0-on-empty-flags.patch \
|
||||
%D%/packages/patches/seq24-rename-mutex.patch \
|
||||
%D%/packages/patches/sharutils-CVE-2018-1000097.patch \
|
||||
%D%/packages/patches/shadow-hurd-pctrl.patch \
|
||||
%D%/packages/patches/shishi-fix-libgcrypt-detection.patch \
|
||||
%D%/packages/patches/slim-session.patch \
|
||||
%D%/packages/patches/slim-config.patch \
|
||||
|
@ -1471,7 +1503,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/superlu-dist-awpm-grid.patch \
|
||||
%D%/packages/patches/superlu-dist-scotchmetis.patch \
|
||||
%D%/packages/patches/supertux-unbundle-squirrel.patch \
|
||||
%D%/packages/patches/swig-guile-gc.patch \
|
||||
%D%/packages/patches/swish-e-search.patch \
|
||||
%D%/packages/patches/swish-e-format-security.patch \
|
||||
%D%/packages/patches/symmetrica-bruch.patch \
|
||||
|
@ -1486,13 +1517,14 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/tar-skip-unreliable-tests.patch \
|
||||
%D%/packages/patches/tcc-boot-0.9.27.patch \
|
||||
%D%/packages/patches/tclxml-3.2-install.patch \
|
||||
%D%/packages/patches/tcl-fix-cross-compilation.patch \
|
||||
%D%/packages/patches/tcsh-fix-autotest.patch \
|
||||
%D%/packages/patches/tcsh-fix-out-of-bounds-read.patch \
|
||||
%D%/packages/patches/teensy-loader-cli-help.patch \
|
||||
%D%/packages/patches/texinfo-5-perl-compat.patch \
|
||||
%D%/packages/patches/texlive-bin-CVE-2018-17407.patch \
|
||||
%D%/packages/patches/texlive-bin-luatex-poppler-compat.patch \
|
||||
%D%/packages/patches/texlive-bin-poppler-0.83.patch \
|
||||
%D%/packages/patches/texlive-bin-poppler-0.86.patch \
|
||||
%D%/packages/patches/telegram-purple-adjust-test.patch \
|
||||
%D%/packages/patches/telepathy-glib-channel-memory-leak.patch \
|
||||
%D%/packages/patches/texi2html-document-encoding.patch \
|
||||
%D%/packages/patches/texi2html-i18n.patch \
|
||||
%D%/packages/patches/thefuck-test-environ.patch \
|
||||
|
@ -1534,6 +1566,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/vboot-utils-fix-format-load-address.patch \
|
||||
%D%/packages/patches/vboot-utils-fix-tests-show-contents.patch \
|
||||
%D%/packages/patches/vboot-utils-skip-test-workbuf.patch \
|
||||
%D%/packages/patches/vigra-python-compat.patch \
|
||||
%D%/packages/patches/vinagre-newer-freerdp.patch \
|
||||
%D%/packages/patches/vinagre-newer-rdp-parameters.patch \
|
||||
%D%/packages/patches/virglrenderer-CVE-2017-6386.patch \
|
||||
|
@ -1582,5 +1615,4 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/zziplib-CVE-2018-16548.patch
|
||||
|
||||
MISC_DISTRO_FILES = \
|
||||
%D%/packages/ld-wrapper.in \
|
||||
%D%/packages/ld-wrapper-next.in
|
||||
%D%/packages/ld-wrapper.in
|
||||
|
|
|
@ -95,7 +95,7 @@ (define-public abiword
|
|||
("libchamplain" ,libchamplain)
|
||||
("libglade" ,libglade)
|
||||
("libgsf" ,libgsf)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("librsvg" ,librsvg)
|
||||
("libxml2" ,libxml2)
|
||||
|
|
|
@ -48,6 +48,7 @@ (define-public acl
|
|||
(arguments
|
||||
`(#:modules ((ice-9 ftw)
|
||||
,@%gnu-build-system-modules)
|
||||
#:configure-flags '("--disable-static")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; XXX After repacking the sources the timestamps are reset to the
|
||||
|
|
|
@ -29,8 +29,9 @@
|
|||
;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
|
||||
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
|
||||
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; 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>
|
||||
;;;
|
||||
|
@ -91,6 +92,7 @@ (define-module (gnu packages admin)
|
|||
#:use-module (gnu packages groff)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages guile)
|
||||
#:use-module (gnu packages hurd)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages imagemagick)
|
||||
#:use-module (gnu packages inkscape)
|
||||
|
@ -257,10 +259,10 @@ (define-public shepherd
|
|||
`(("pkg-config" ,pkg-config)
|
||||
|
||||
;; This is the Guile we use as a cross-compiler...
|
||||
("guile" ,guile-2.2.7)))
|
||||
("guile" ,guile-3.0)))
|
||||
(inputs
|
||||
;; ... and this is the one that appears in shebangs when cross-compiling.
|
||||
`(("guile" ,guile-2.2.7) ;for <https://bugs.gnu.org/37757>
|
||||
`(("guile" ,guile-3.0)
|
||||
|
||||
;; The 'shepherd' command uses Readline when used interactively. It's
|
||||
;; an unusual use case though, so we don't propagate it.
|
||||
|
@ -274,15 +276,18 @@ (define-public shepherd
|
|||
(license license:gpl3+)
|
||||
(home-page "https://www.gnu.org/software/shepherd/")))
|
||||
|
||||
(define-public guile3.0-shepherd
|
||||
(define-public guile2.2-shepherd
|
||||
(package
|
||||
(inherit shepherd)
|
||||
(name "guile3.0-shepherd")
|
||||
(name "guile2.2-shepherd")
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("guile" ,guile-next)))
|
||||
("guile" ,guile-2.2)))
|
||||
(inputs
|
||||
`(("guile" ,guile-next)))))
|
||||
`(("guile" ,guile-2.2)))))
|
||||
|
||||
(define-public guile3.0-shepherd
|
||||
(deprecated-package "guile3.0-shepherd" shepherd))
|
||||
|
||||
(define-public guile2.0-shepherd
|
||||
(package
|
||||
|
@ -488,6 +493,7 @@ (define-public inetutils
|
|||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/inetutils/inetutils-"
|
||||
version ".tar.gz"))
|
||||
(patches (search-patches "inetutils-hurd.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"05n65k4ixl85dc6rxc51b1b732gnmm8xnqi424dy9f1nz7ppb3xy"))))
|
||||
|
@ -499,13 +505,27 @@ (define-public inetutils
|
|||
;; cross-compiling (by default it does not.)
|
||||
,@(if (%current-target-system)
|
||||
'("--with-path-procnet-dev=/proc/net/dev")
|
||||
'())
|
||||
,@(if (hurd-target?)
|
||||
'("--disable-rcp"
|
||||
"--disable-rexec"
|
||||
"--disable-rexecd"
|
||||
"--disable-rlogin"
|
||||
"--disable-rlogind"
|
||||
"--disable-rsh"
|
||||
"--disable-rshd"
|
||||
"--disable-uucpd"
|
||||
"--disable-whois")
|
||||
'()))
|
||||
;; On some systems, 'libls.sh' may fail with an error such as:
|
||||
;; "Failed to tell switch -a apart from -A".
|
||||
#:parallel-tests? #f))
|
||||
(inputs `(("ncurses" ,ncurses)
|
||||
("readline" ,readline))) ;for 'ftp'
|
||||
(native-inputs `(("netstat" ,net-tools))) ;for tests
|
||||
(native-inputs (if (member (%current-system)
|
||||
(package-supported-systems net-tools))
|
||||
`(("netstat" ,net-tools)) ;for tests
|
||||
'()))
|
||||
(home-page "https://www.gnu.org/software/inetutils/")
|
||||
(synopsis "Basic networking utilities")
|
||||
(description
|
||||
|
@ -523,6 +543,7 @@ (define-public shadow
|
|||
(uri (string-append
|
||||
"https://github.com/shadow-maint/shadow/releases/"
|
||||
"download/" version "/shadow-" version ".tar.xz"))
|
||||
(patches (search-patches "shadow-hurd-pctrl.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"0qmfq50sdhz6xilgxvinblll8j2iqfl7hwk45bq744y4plq4dbd3"))))
|
||||
|
@ -556,11 +577,7 @@ (define-public shadow
|
|||
(for-each delete-file (find-files man "^groups\\."))
|
||||
#t))))))
|
||||
|
||||
(inputs (if (string-contains (or (%current-target-system)
|
||||
(%current-system))
|
||||
"-linux")
|
||||
`(("linux-pam" ,linux-pam))
|
||||
'()))
|
||||
(inputs `(("linux-pam" ,linux-pam)))
|
||||
(home-page "https://github.com/shadow-maint/shadow")
|
||||
(synopsis "Authentication-related tools such as passwd, su, and login")
|
||||
(description
|
||||
|
@ -587,13 +604,17 @@ (define-public mingetty
|
|||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(lambda* (#:key inputs outputs target #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(man8 (string-append out "/share/man/man8"))
|
||||
(sbin (string-append out "/sbin"))
|
||||
(shadow (assoc-ref inputs "shadow"))
|
||||
(login (string-append shadow "/bin/login")))
|
||||
(substitute* "Makefile"
|
||||
,@(if (%current-target-system)
|
||||
'((("CC=.*$")
|
||||
(string-append "CC=" target "-gcc\n")))
|
||||
'())
|
||||
(("^SBINDIR.*")
|
||||
(string-append "SBINDIR = " out
|
||||
"/sbin\n"))
|
||||
|
@ -944,8 +965,9 @@ (define-public isc-dhcp
|
|||
("file" ,file)))
|
||||
|
||||
(inputs `(("inetutils" ,inetutils)
|
||||
("net-tools" ,net-tools)
|
||||
("iproute" ,iproute)
|
||||
,@(if (hurd-target?) '()
|
||||
`(("net-tools" ,net-tools)
|
||||
("iproute" ,iproute)))
|
||||
|
||||
;; isc-dhcp bundles a copy of BIND, which has proved vulnerable
|
||||
;; in the past. Use a BIND-VERSION of our choosing instead.
|
||||
|
@ -1767,12 +1789,12 @@ (define-public testdisk
|
|||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("ntfs-3g" ,ntfs-3g)
|
||||
("util-linux" ,util-linux)
|
||||
("util-linux" ,util-linux "lib")
|
||||
("openssl" ,openssl)
|
||||
;; FIXME: add reiserfs.
|
||||
("zlib" ,zlib)
|
||||
("e2fsprogs" ,e2fsprogs)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("ncurses" ,ncurses)))
|
||||
(home-page "https://www.cgsecurity.org/wiki/TestDisk")
|
||||
(synopsis "Data recovery tool")
|
||||
|
@ -2897,14 +2919,7 @@ (define-public igt-gpu-tools
|
|||
(base32 "1gpdjs5aj6vsnzwcjvw5bb120lgffvvshi4202phr0bzw3b92ky8"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; many of the tests try to load kernel modules
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'bootstrap
|
||||
(lambda _
|
||||
;; Don't run configure in this phase.
|
||||
(setenv "NOCONFIGURE" "1")
|
||||
(invoke "sh" "autogen.sh"))))))
|
||||
`(#:tests? #f)) ; many of the tests try to load kernel modules
|
||||
(inputs
|
||||
`(("cairo" ,cairo)
|
||||
("elfutils" ,elfutils) ; libdw
|
||||
|
@ -3643,6 +3658,7 @@ (define-public pam-mount
|
|||
("lvm2" ,lvm2)
|
||||
("openssl" ,openssl)
|
||||
("pcre" ,pcre)
|
||||
("libmount" ,util-linux "lib")
|
||||
("util-linux" ,util-linux)))
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
|
|
@ -62,7 +62,7 @@ (define-public adns
|
|||
(define-public c-ares
|
||||
(package
|
||||
(name "c-ares")
|
||||
(version "1.15.0")
|
||||
(version "1.16.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -70,7 +70,7 @@ (define-public c-ares
|
|||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0lk8knip4xk6qzksdkn7085mmgm4ixfczdyyjw656c193y3rgnvc"))))
|
||||
"129sm0wzij0mp8vdv68v18hnykcjb6ivi66wnqnnw598q7bql1fy"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017, 2019 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
|
||||
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
|
||||
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
|
||||
|
@ -407,7 +408,7 @@ (define-public giac
|
|||
("gsl" ,gsl)
|
||||
("lapack" ,lapack)
|
||||
("libao" ,ao)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("libsamplerate" ,libsamplerate)
|
||||
("libx11" ,libx11)
|
||||
|
@ -690,15 +691,23 @@ (define-public bc
|
|||
(uri (string-append "mirror://gnu/bc/bc-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0amh9ik44jfg66csyvf4zz1l878c4755kjndq9j0270akflgrbb2"))))
|
||||
"0amh9ik44jfg66csyvf4zz1l878c4755kjndq9j0270akflgrbb2"))
|
||||
(patches (search-patches "bc-fix-cross-compilation.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("ed" ,ed)
|
||||
`(("automake" ,automake)
|
||||
("autoconf" ,autoconf)
|
||||
("ed" ,ed)
|
||||
("flex" ,flex)
|
||||
("texinfo" ,texinfo)))
|
||||
(arguments
|
||||
'(#:configure-flags
|
||||
(list "--with-readline")))
|
||||
(list "--with-readline")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'autogen
|
||||
(lambda _
|
||||
(invoke "autoreconf" "-vif"))))))
|
||||
(home-page "https://www.gnu.org/software/bc/")
|
||||
(synopsis "Arbitrary precision numeric processing language")
|
||||
(description
|
||||
|
@ -1240,15 +1249,6 @@ (define-public givaro
|
|||
("libtool" ,libtool)))
|
||||
(propagated-inputs
|
||||
`(("gmp" ,gmp))) ; gmp++.h includes gmpxx.h
|
||||
(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" "yes")
|
||||
#t)))))
|
||||
(synopsis "Algebraic computations with exact rings and fields")
|
||||
(description
|
||||
"Givaro is a C++ library implementing the basic arithmetic of various
|
||||
|
@ -1287,15 +1287,7 @@ (define-public fflas-ffpack
|
|||
`(#:configure-flags
|
||||
(list (string-append "--with-blas-libs="
|
||||
(assoc-ref %build-inputs "openblas")
|
||||
"/lib/libopenblas.so"))
|
||||
#: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" "yes")
|
||||
#t)))))
|
||||
"/lib/libopenblas.so"))))
|
||||
(synopsis "C++ library for linear algebra over finite fields")
|
||||
(description
|
||||
"FFLAS-FFPACK is a C++ template library for basic linear algebra
|
||||
|
@ -1331,15 +1323,6 @@ (define-public linbox
|
|||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("fflas-ffpack" ,fflas-ffpack)))
|
||||
(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" "yes")
|
||||
#t)))))
|
||||
(synopsis "C++ library for linear algebra over exact rings")
|
||||
(description
|
||||
"LinBox is a C++ template library for exact linear algebra computation
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2012 Stefan Handschuh <handschuh.stefan@googlemail.com>
|
||||
;;; Copyright © 2015 Kai-Chung Yan <seamlikok@gmail.com>
|
||||
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
;;; Copyright © 2017 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
|
@ -611,9 +611,20 @@ (define-public android-libutils
|
|||
#:make-flags '("CXXFLAGS=-std=gnu++11 -Wno-error")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'set-paths 'augment-CPLUS_INCLUDE_PATH
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; Hide the default GCC from CPLUS_INCLUDE_PATH to prevent it from
|
||||
;; shadowing the version of GCC provided in native-inputs.
|
||||
(let ((gcc (assoc-ref inputs "gcc")))
|
||||
(setenv "CPLUS_INCLUDE_PATH"
|
||||
(string-join
|
||||
(delete (string-append gcc "/include/c++")
|
||||
(string-split (getenv "CPLUS_INCLUDE_PATH")
|
||||
#\:))
|
||||
":"))
|
||||
#t)))
|
||||
(add-after 'unpack 'enter-source
|
||||
(lambda _ (chdir "libutils") #t))
|
||||
|
||||
(add-after 'install 'install-headers
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(copy-recursively "../include/utils" (string-append (assoc-ref outputs "out") "/include/utils")))))))
|
||||
|
@ -623,7 +634,7 @@ (define-public android-libutils
|
|||
(native-inputs
|
||||
`(("android-bionic-uapi" ,android-bionic-uapi)
|
||||
("android-liblog" ,android-liblog)
|
||||
("gcc" ,gcc-5))) ; XXX: fails to build with GCC 7
|
||||
("gcc@5" ,gcc-5))) ; XXX: fails to build with GCC 7
|
||||
(home-page "https://developer.android.com/")
|
||||
(synopsis "Android utility library")
|
||||
(description "@code{android-libutils} provides utilities for Android NDK developers.")
|
||||
|
@ -840,7 +851,7 @@ (define-public abootimg
|
|||
(install-file "abootimg" bin)
|
||||
#t))))))
|
||||
(inputs
|
||||
`(("libblkid" ,util-linux)))
|
||||
`(("libblkid" ,util-linux "lib")))
|
||||
(home-page "https://ac100.grandou.net/abootimg")
|
||||
(synopsis "Tool for manipulating Android Boot Images")
|
||||
(description "This package provides a tool for manipulating old Android
|
||||
|
|
|
@ -112,7 +112,7 @@ (define-public synfig
|
|||
`(("boost" ,boost)
|
||||
("ffmpeg" ,ffmpeg)
|
||||
("libdv" ,libdv)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("libmng" ,libmng)
|
||||
("zlib" ,zlib)))
|
||||
|
|
|
@ -216,13 +216,7 @@ (define-public xarcan
|
|||
(assoc-ref %build-inputs "xkbcomp")
|
||||
"/bin")
|
||||
,(string-append "--with-xkb-output="
|
||||
"/tmp")) ; FIXME: Copied from xorg
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'noconfigure
|
||||
(lambda _
|
||||
(setenv "NOCONFIGURE" "true")
|
||||
#t)))))
|
||||
"/tmp")))) ; FIXME: Copied from xorg
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("autoconf" ,autoconf)
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2014, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013, 2014, 2015, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
|
||||
;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
|
||||
|
@ -40,7 +40,7 @@ (define-module (gnu packages aspell)
|
|||
(define-public aspell
|
||||
(package
|
||||
(name "aspell")
|
||||
(version "0.60.6.1")
|
||||
(version "0.60.8")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -48,9 +48,8 @@ (define-public aspell
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm"))
|
||||
(patches (search-patches "aspell-default-dict-dir.patch"
|
||||
"aspell-gcc-compat.patch"))))
|
||||
"1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr"))
|
||||
(patches (search-patches "aspell-default-dict-dir.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -67,14 +66,6 @@ (define-public aspell
|
|||
(("\"filter-path(.*)DICT_DIR" _ middle)
|
||||
(string-append "\"filter-path" middle
|
||||
"\"" libdir "\"")))
|
||||
#t)))
|
||||
(add-after 'install 'wrap-aspell
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((bin/aspell (string-append (assoc-ref outputs "out")
|
||||
"/bin/aspell")))
|
||||
(wrap-program bin/aspell
|
||||
'("ASPELL_CONF" "" =
|
||||
("${ASPELL_CONF:-\"dict-dir ${GUIX_PROFILE:-$HOME/.guix-profile}/lib/aspell\"}")))
|
||||
#t))))))
|
||||
(inputs `(("perl" ,perl)))
|
||||
|
||||
|
|
|
@ -140,7 +140,7 @@ (define-public gnuastro
|
|||
(inputs
|
||||
`(("cfitsio" ,cfitsio)
|
||||
("gsl" ,gsl)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libtiff" ,libtiff)
|
||||
("wcslib" ,wcslib)
|
||||
("zlib" ,zlib)))
|
||||
|
@ -226,7 +226,7 @@ (define-public celestia
|
|||
`(("glu" ,glu)
|
||||
("glew" ,glew)
|
||||
("libtheora" ,libtheora)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
;; maybe required?
|
||||
("mesa" ,mesa)
|
||||
|
@ -326,7 +326,7 @@ (define-public xplanet
|
|||
("freetype" ,freetype)
|
||||
("pango" ,pango)
|
||||
("giflib" ,giflib)
|
||||
("libjpeg", libjpeg)
|
||||
("libjpeg", libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("libtiff" ,libtiff)
|
||||
("netpbm" ,netpbm)
|
||||
|
|
|
@ -1630,7 +1630,7 @@ (define-public jack-1
|
|||
;; uuid.h is included in the JACK type headers
|
||||
;; db.h is included in the libjack metadata headers
|
||||
(propagated-inputs
|
||||
`(("libuuid" ,util-linux)
|
||||
`(("libuuid" ,util-linux "lib")
|
||||
("bdb" ,bdb)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
@ -2555,13 +2555,6 @@ (define-public rtmidi
|
|||
(base32
|
||||
"1k962ljpnwyjw9jjiky2372khhri1wqvrj5qsalfpys31xqzw31p"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'bootstrap 'noconfigure
|
||||
(lambda _
|
||||
(setenv "NOCONFIGURE" "yes")
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("jack" ,jack-1)
|
||||
("alsa-lib" ,alsa-lib)))
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
;;; Copyright © 2013, 2014 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -51,6 +52,10 @@ (define-public autogen
|
|||
;; “Something went wrong bootstrapping makefile fragments for
|
||||
;; automatic dependency tracking. Try re-running configure with […]”
|
||||
(list "--disable-dependency-tracking")
|
||||
|
||||
;; XXX: Parallel tests may cause an indefinite hang with GNU Make 4.3.
|
||||
#:parallel-tests? #f
|
||||
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'patch-source-shebangs 'patch-test-scripts
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
;;; Copyright © 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
|
||||
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -54,12 +56,43 @@ (define-public autoconf
|
|||
(base32
|
||||
"113nlmidxy9kjr45kg9x3ngar4951mvag1js2a3j8nxcz34wxsv4"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
;; TODO: remove `if' in the next rebuild cycle.
|
||||
(if (%current-target-system)
|
||||
`(("bash" ,bash-minimal)
|
||||
("perl" ,perl)
|
||||
("m4" ,m4))
|
||||
'()))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("m4" ,m4)))
|
||||
;; XXX: testsuite: 209 and 279 failed. The latter is an impurity. It
|
||||
;; should use our own "cpp" instead of "/lib/cpp".
|
||||
(arguments `(#:tests? #f))
|
||||
(arguments
|
||||
`(;; XXX: testsuite: 209 and 279 failed. The latter is an impurity. It
|
||||
;; should use our own "cpp" instead of "/lib/cpp".
|
||||
#:tests? #f
|
||||
,@(if (%current-target-system)
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'install 'patch-non-shebang-references
|
||||
(lambda* (#:key build inputs outputs #:allow-other-keys)
|
||||
;; `patch-shebangs' patches shebangs only, and the Perl
|
||||
;; scripts use a re-exec feature that references the
|
||||
;; build hosts' perl. Also, BASH and M4 store references
|
||||
;; hide in the scripts.
|
||||
(let ((bash (assoc-ref inputs "bash"))
|
||||
(m4 (assoc-ref inputs "m4"))
|
||||
(perl (assoc-ref inputs "perl"))
|
||||
(out (assoc-ref outputs "out"))
|
||||
(store-directory (%store-directory)))
|
||||
(substitute* (find-files (string-append out "/bin"))
|
||||
(((string-append store-directory "/[^/]*-bash-[^/]*"))
|
||||
bash)
|
||||
(((string-append store-directory "/[^/]*-m4-[^/]*"))
|
||||
m4)
|
||||
(((string-append store-directory "/[^/]*-perl-[^/]*"))
|
||||
perl))
|
||||
#t)))))
|
||||
'())))
|
||||
(home-page "https://www.gnu.org/software/autoconf/")
|
||||
(synopsis "Create source code configuration scripts")
|
||||
(description
|
||||
|
@ -249,17 +282,24 @@ (define-public autobuild
|
|||
(define-public automake
|
||||
(package
|
||||
(name "automake")
|
||||
(version "1.16.1")
|
||||
(version "1.16.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/automake/automake-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"08g979ficj18i1w6w5219bgmns7czr03iadf20mk3lrzl8wbn1ax"))
|
||||
"1l7dkqbsmbf94ax29jj1jf6a0r6ikc8jybg1p5m0c3ki7pg5ki6c"))
|
||||
(patches
|
||||
(search-patches "automake-skip-amhello-tests.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
;; TODO: remove `if' in the next rebuild cycle.
|
||||
(if (%current-target-system)
|
||||
`(("autoconf" ,autoconf-wrapper)
|
||||
("bash" ,bash-minimal)
|
||||
("perl" ,perl))
|
||||
'()))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf-wrapper)
|
||||
("perl" ,perl)))
|
||||
|
@ -268,7 +308,7 @@ (define-public automake
|
|||
(variable "ACLOCAL_PATH")
|
||||
(files '("share/aclocal")))))
|
||||
(arguments
|
||||
'(#:modules ((guix build gnu-build-system)
|
||||
`(#:modules ((guix build gnu-build-system)
|
||||
(guix build utils)
|
||||
(srfi srfi-1)
|
||||
(srfi srfi-26)
|
||||
|
@ -288,6 +328,37 @@ (define-public automake
|
|||
(setenv "CONFIG_SHELL" sh)
|
||||
#t)))
|
||||
|
||||
(add-before 'check 'skip-test
|
||||
(lambda _
|
||||
;; This test requires 'etags' and fails if it's missing.
|
||||
;; Skip it.
|
||||
(substitute* "t/tags-lisp-space.sh"
|
||||
(("^required.*" all)
|
||||
(string-append "exit 77\n" all "\n")))
|
||||
#t))
|
||||
|
||||
,@(if (%current-target-system)
|
||||
`((add-after 'install 'patch-non-shebang-references
|
||||
(lambda* (#:key build inputs outputs #:allow-other-keys)
|
||||
;; `patch-shebangs' patches shebangs only, and the Perl
|
||||
;; scripts use a re-exec feature that references the
|
||||
;; build hosts' perl. Also, AUTOCONF and BASH store
|
||||
;; references hide in the scripts.
|
||||
(let ((autoconf (assoc-ref inputs "autoconf"))
|
||||
(bash (assoc-ref inputs "bash"))
|
||||
(perl (assoc-ref inputs "perl"))
|
||||
(out (assoc-ref outputs "out"))
|
||||
(store-directory (%store-directory)))
|
||||
(substitute* (find-files (string-append out "/bin"))
|
||||
(((string-append store-directory "/[^/]*-autoconf-[^/]*"))
|
||||
autoconf)
|
||||
(((string-append store-directory "/[^/]*-bash-[^/]*"))
|
||||
bash)
|
||||
(((string-append store-directory "/[^/]*-perl-[^/]*"))
|
||||
perl))
|
||||
#t))))
|
||||
'())
|
||||
|
||||
;; Files like `install-sh', `mdate.sh', etc. must use
|
||||
;; #!/bin/sh, otherwise users could leak erroneous shebangs
|
||||
;; in the wild. See <http://bugs.gnu.org/14201> for an
|
||||
|
@ -324,32 +395,6 @@ (define (starts-with-shebang? file)
|
|||
Makefile, simplifying the entire process for the developer.")
|
||||
(license gpl2+))) ; some files are under GPLv3+
|
||||
|
||||
(define-public automake-1.16.2
|
||||
(package
|
||||
(inherit automake)
|
||||
(version "1.16.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/automake/automake-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1l7dkqbsmbf94ax29jj1jf6a0r6ikc8jybg1p5m0c3ki7pg5ki6c"))
|
||||
(patches
|
||||
(search-patches "automake-skip-amhello-tests.patch"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments automake)
|
||||
((#:phases phases '%standard-phases)
|
||||
`(modify-phases ,phases
|
||||
(add-before 'check 'skip-test
|
||||
(lambda _
|
||||
;; This test requires 'etags' and fails if it's missing.
|
||||
;; Skip it.
|
||||
(substitute* "t/tags-lisp-space.sh"
|
||||
(("^required.*" all)
|
||||
(string-append "exit 77\n" all "\n")))
|
||||
#t))))))))
|
||||
|
||||
(define-public libtool
|
||||
(package
|
||||
(name "libtool")
|
||||
|
@ -379,21 +424,22 @@ (define-public libtool
|
|||
|
||||
;; XXX: There are test failures on mips64el-linux starting from 2.4.4:
|
||||
;; <http://hydra.gnu.org/build/181662>.
|
||||
#:tests? ,(not (string-prefix? "mips64"
|
||||
(or (%current-target-system)
|
||||
;; Also, do not run tests when cross compiling
|
||||
#:tests? ,(not (or (%current-target-system)
|
||||
(string-prefix? "mips64"
|
||||
(%current-system))))
|
||||
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'pre-check
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(lambda* (#:key inputs native-inputs #:allow-other-keys)
|
||||
;; Run the test suite in parallel, if possible.
|
||||
(setenv "TESTSUITEFLAGS"
|
||||
(string-append
|
||||
"-j"
|
||||
(number->string (parallel-job-count))))
|
||||
;; Patch references to /bin/sh.
|
||||
(let ((bash (assoc-ref inputs "bash")))
|
||||
(let ((bash (assoc-ref (or native-inputs inputs) "bash")))
|
||||
(substitute* "tests/testsuite"
|
||||
(("/bin/sh")
|
||||
(string-append bash "/bin/sh")))
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
;;; Copyright © 2013, 2014, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -25,17 +26,18 @@ (define-module (gnu packages avahi)
|
|||
#:use-module (guix build-system gnu)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages dbm)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages libdaemon)
|
||||
#:use-module (gnu packages libevent)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages xml))
|
||||
|
||||
(define-public avahi
|
||||
(package
|
||||
(name "avahi")
|
||||
(version "0.7")
|
||||
(replacement avahi/fixed)
|
||||
(version "0.8")
|
||||
(home-page "https://avahi.org")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
@ -43,29 +45,40 @@ (define-public avahi
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0128n7jlshw4bpx0vg8lwj8qwdisjxi7mvniwfafgnkzzrfrpaap"))
|
||||
(patches (search-patches "avahi-localstatedir.patch"))))
|
||||
"1npdixwxxn3s9q1f365x9n9rc5xgfz39hxf23faqvlrklgbhj0q6"))
|
||||
(patches (search-patches "avahi-localstatedir.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Fix version constraint in the avahi-libevent pkg-config file.
|
||||
;; This can be removed for Avahi versions > 0.8.
|
||||
(substitute* "avahi-libevent.pc.in"
|
||||
(("libevent-2\\.1\\.5")
|
||||
"libevent >= 2.1.5"))
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags '("--with-distro=none"
|
||||
"--disable-static"
|
||||
"--localstatedir=/var" ; for the DBus socket
|
||||
"--disable-python"
|
||||
"--disable-mono"
|
||||
"--disable-doxygen-doc"
|
||||
"--disable-xmltoman"
|
||||
"--enable-tests"
|
||||
"--disable-qt3" "--disable-qt4"
|
||||
"--disable-qt4" "--disable-qt5"
|
||||
"--disable-gtk" "--disable-gtk3"
|
||||
"--enable-compat-libdns_sd")))
|
||||
(inputs
|
||||
`(("expat" ,expat)
|
||||
("glib" ,glib)
|
||||
("dbus" ,dbus)
|
||||
`(("dbus" ,dbus)
|
||||
("expat" ,expat)
|
||||
("gdbm" ,gdbm)
|
||||
("glib" ,glib)
|
||||
("libcap" ,libcap) ;to enable chroot support in avahi-daemon
|
||||
("libdaemon" ,libdaemon)))
|
||||
("libdaemon" ,libdaemon)
|
||||
("libevent" ,libevent)))
|
||||
(native-inputs
|
||||
`(("intltool" ,intltool)
|
||||
`(("gettext" ,gettext-minimal)
|
||||
("glib" ,glib "bin")
|
||||
("pkg-config" ,pkg-config)))
|
||||
(synopsis "Implementation of mDNS/DNS-SD protocols")
|
||||
|
@ -75,17 +88,6 @@ (define-public avahi
|
|||
DNS-SD (for \"DNS-Based Service Discovery\") protocols.")
|
||||
(license lgpl2.1+)))
|
||||
|
||||
(define avahi/fixed
|
||||
(package
|
||||
(inherit avahi)
|
||||
(source (origin
|
||||
(inherit (package-source avahi))
|
||||
(patches
|
||||
(append (search-patches "avahi-CVE-2018-1000845.patch")
|
||||
(origin-patches (package-source avahi))))))
|
||||
;; Hide a duplicate of the CVE fixed above.
|
||||
(properties `((lint-hidden-cve . ("CVE-2017-6519"))))))
|
||||
|
||||
(define-public nss-mdns
|
||||
(package
|
||||
(name "nss-mdns")
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2019 Alex Vong <alexvong1995@gmail.com>
|
||||
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -203,18 +204,18 @@ (define-public hdup
|
|||
(define-public libarchive
|
||||
(package
|
||||
(name "libarchive")
|
||||
(version "3.4.0")
|
||||
(version "3.4.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (list (string-append "https://libarchive.org/downloads/libarchive-"
|
||||
version ".tar.gz")
|
||||
version ".tar.xz")
|
||||
(string-append "https://github.com/libarchive/libarchive"
|
||||
"/releases/download/v" version "/libarchive-"
|
||||
version ".tar.gz")))
|
||||
version ".tar.xz")))
|
||||
(sha256
|
||||
(base32
|
||||
"0pl25mmz1b1cnwf35kxmygyy9g7z7hslxbx329a9yx8csh7dahw6"))))
|
||||
"18dd01ahs2hv74xm7axjc3yhq839p0x0s4vssvlmm8fknja09qfq"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("bzip2" ,bzip2)
|
||||
|
@ -234,24 +235,34 @@ (define-public libarchive
|
|||
(("/bin/pwd") (which "pwd")))
|
||||
#t))
|
||||
(replace 'check
|
||||
(lambda _
|
||||
;; XXX: The test_owner_parse, test_read_disk, and
|
||||
;; test_write_disk_lookup tests expect user 'root' to exist, but
|
||||
;; the chroot's /etc/passwd doesn't have it. Turn off those tests.
|
||||
;;
|
||||
;; XXX: Adjust test that fails with zstd 1.4.1 because the default
|
||||
;; options compresses two bytes better than this test expects.
|
||||
;; https://github.com/libarchive/libarchive/issues/1226
|
||||
(substitute* "libarchive/test/test_write_filter_zstd.c"
|
||||
(("compression-level\", \"6\"")
|
||||
"compression-level\", \"7\""))
|
||||
(lambda* (#:key (tests? #t) #:allow-other-keys)
|
||||
(if tests?
|
||||
;; XXX: The test_owner_parse, test_read_disk, and
|
||||
;; test_write_disk_lookup tests expect user 'root' to
|
||||
;; exist, but the chroot's /etc/passwd doesn't have
|
||||
;; it. Turn off those tests.
|
||||
;;
|
||||
;; XXX: Adjust test that fails with zstd 1.4.1
|
||||
;; because the default options compresses two bytes
|
||||
;; better than this test expects.
|
||||
;; https://github.com/libarchive/libarchive/issues/1226
|
||||
(begin
|
||||
(substitute* "libarchive/test/test_write_filter_zstd.c"
|
||||
(("compression-level\", \"6\"")
|
||||
"compression-level\", \"7\""))
|
||||
|
||||
;; The tests allow one to disable tests matching a globbing pattern.
|
||||
(invoke "make" "libarchive_test" "bsdcpio_test" "bsdtar_test")
|
||||
;; XXX: This glob disables too much.
|
||||
(invoke "./libarchive_test" "^test_*_disk*")
|
||||
(invoke "./bsdcpio_test" "^test_owner_parse")
|
||||
(invoke "./bsdtar_test")))
|
||||
;; The tests allow one to disable tests matching a globbing pattern.
|
||||
(invoke "make"
|
||||
"libarchive_test"
|
||||
"bsdcpio_test"
|
||||
"bsdtar_test")
|
||||
|
||||
;; XXX: This glob disables too much.
|
||||
(invoke "./libarchive_test" "^test_*_disk*")
|
||||
(invoke "./bsdcpio_test" "^test_owner_parse")
|
||||
(invoke "./bsdtar_test"))
|
||||
;; Tests may be disabled if cross-compiling.
|
||||
(format #t "Test suite not run.~%"))))
|
||||
(add-after 'install 'add--L-in-libarchive-pc
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
|
|
|
@ -1,16 +1,16 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2014, 2019 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
|
||||
;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
||||
;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2016, 2018 Alex Vong <alexvong1995@gmail.com>
|
||||
;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
|
||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2017, 2018, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
|
||||
|
@ -93,14 +93,14 @@ (define-public hello
|
|||
(define-public grep
|
||||
(package
|
||||
(name "grep")
|
||||
(version "3.3")
|
||||
(version "3.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/grep/grep-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"055mqp6vrd0brkygmygb2673qwz409a7kyp1mzbfy6cn94f58q5r"))
|
||||
"1yy33kiwrxrwj2nxa4fg15bvmwyghqbs8qwkdvy5phm784f7brjq"))
|
||||
(patches (search-patches "grep-timing-sensitive-test.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("perl" ,perl))) ;some of the tests require it
|
||||
|
@ -134,14 +134,14 @@ (define-public grep
|
|||
(define-public sed
|
||||
(package
|
||||
(name "sed")
|
||||
(version "4.7")
|
||||
(version "4.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/sed/sed-" version
|
||||
".tar.xz"))
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0smxcx66vx29djzb542nxcynl7qnzxqa5032ibazi7x2s267d198"))))
|
||||
"0alqagh0nliymz23kfjg6g9w3cr086k0sfni56gi8fhzqwa3xksk"))))
|
||||
(build-system gnu-build-system)
|
||||
(synopsis "Stream editor")
|
||||
(native-inputs
|
||||
|
@ -171,7 +171,22 @@ (define-public tar
|
|||
(build-system gnu-build-system)
|
||||
;; Note: test suite requires ~1GiB of disk space.
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
`(,@(if (hurd-target?)
|
||||
'(#:make-flags
|
||||
(list (string-append
|
||||
"TESTSUITEFLAGS= -k '"
|
||||
"!sparse"
|
||||
",!renamed dirs in incrementals"
|
||||
",!--exclude-tag option in incremental pass"
|
||||
",!incremental dumps with -C"
|
||||
",!incremental dumps of nested directories"
|
||||
",!incremental restores with -C"
|
||||
",!concatenated incremental archives (renames)"
|
||||
",!renamed directory containing subdirectories"
|
||||
",!renamed subdirectories"
|
||||
"'")))
|
||||
'())
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-before 'build 'set-shell-file-name
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; Do not use "/bin/sh" to run programs.
|
||||
|
@ -254,40 +269,29 @@ (define-public diffutils
|
|||
(define-public findutils
|
||||
(package
|
||||
(name "findutils")
|
||||
(version "4.6.0")
|
||||
(version "4.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/findutils/findutils-"
|
||||
version ".tar.gz"))
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"178nn4dl7wbcw499czikirnkniwnx36argdnqgz4ik9i6zvwkm6y"))
|
||||
(patches (search-patches
|
||||
"findutils-gnulib-libio.patch"
|
||||
"findutils-localstatedir.patch"
|
||||
"findutils-makedev.patch"
|
||||
"findutils-test-xargs.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; The gnulib test-lock test is prone to writer starvation
|
||||
;; with our glibc@2.25, which prefers readers, so disable it.
|
||||
;; The gnulib commit b20e8afb0b2 should fix this once
|
||||
;; incorporated here.
|
||||
(substitute* "tests/Makefile.in"
|
||||
(("test-lock\\$\\(EXEEXT\\) ") ""))
|
||||
#t))))
|
||||
"16kqz9yz98dasmj70jwf5py7jk558w96w0vgp3zf9xsqk3gzpzn5"))
|
||||
(patches (search-patches "findutils-localstatedir.patch"
|
||||
"findutils-test-rwlock-threads.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags (list
|
||||
;; Tell 'updatedb' to write to /var.
|
||||
"--localstatedir=/var"
|
||||
|
||||
;; Work around cross-compilation failure. See
|
||||
;; <http://savannah.gnu.org/bugs/?27299#comment1>.
|
||||
,@(if (%current-target-system)
|
||||
'("gl_cv_func_wcwidth_works=yes")
|
||||
'()))))
|
||||
"--localstatedir=/var")
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-before 'check 'adjust-test-shebangs
|
||||
(lambda _
|
||||
(substitute* '("tests/xargs/verbose-quote.sh"
|
||||
"tests/find/exec-plus-last-file.sh")
|
||||
(("#!/bin/sh")
|
||||
(string-append "#!" (which "sh"))))
|
||||
#t)))))
|
||||
(synopsis "Operating on files matching given criteria")
|
||||
(description
|
||||
"Findutils supplies the basic file directory searching utilities of the
|
||||
|
@ -302,23 +306,26 @@ (define-public findutils
|
|||
(define-public coreutils
|
||||
(package
|
||||
(name "coreutils")
|
||||
(version "8.31")
|
||||
(version "8.32")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/coreutils/coreutils-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1zg9m79x1i2nifj4kb0waf9x3i5h6ydkypkjnbsb9rnwis8rqypz"))))
|
||||
"1yjcrh5hw70c0yn8zw55pd6j51dj90anpq8mmg649ps9g3gdhn24"))
|
||||
(patches (search-patches "coreutils-ls.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("acl" ,acl) ; TODO: add SELinux
|
||||
("gmp" ,gmp) ;bignums in 'expr', yay!
|
||||
|
||||
;; Drop the dependency on libcap when cross-compiling since it's
|
||||
;; not quite cross-compilable.
|
||||
,@(if (%current-target-system)
|
||||
'()
|
||||
`(("libcap" ,libcap))))) ;capability support is 'ls', etc.
|
||||
;; Do not use libcap when cross-compiling since it's not quite
|
||||
;; cross-compilable; and use it only for supported systems.
|
||||
,@(if (and (not (%current-target-system))
|
||||
(member (%current-system)
|
||||
(package-supported-systems libcap)))
|
||||
`(("libcap" ,libcap)) ;capability support in 'ls', etc.
|
||||
'())))
|
||||
(native-inputs
|
||||
;; Perl is needed to run tests in native builds, and to run the bundled
|
||||
;; copy of help2man. However, don't pass it when cross-compiling since
|
||||
|
@ -330,6 +337,23 @@ (define-public coreutils
|
|||
(outputs '("out" "debug"))
|
||||
(arguments
|
||||
`(#:parallel-build? #f ; help2man may be called too early
|
||||
,@(if (hurd-target?)
|
||||
'(#:make-flags ; these tests fail deterministically
|
||||
(list (string-append "XFAIL_TESTS=tests/misc/env-S.pl"
|
||||
" tests/misc/kill.sh"
|
||||
" tests/misc/nice.sh"
|
||||
" tests/misc/shred-passes.sh"
|
||||
" tests/split/fail.sh"
|
||||
" tests/split/l-chunk.sh"
|
||||
" tests/dd/stats.sh"
|
||||
" test-fdutimensat"
|
||||
" test-futimens"
|
||||
" test-linkat"
|
||||
" test-renameat"
|
||||
" test-renameatu"
|
||||
" test-tls"
|
||||
" test-utimensat")))
|
||||
'())
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-before 'build 'patch-shell-references
|
||||
(lambda _
|
||||
|
@ -341,16 +365,6 @@ (define-public coreutils
|
|||
(("/bin/sh") (which "sh")))
|
||||
(substitute* (find-files "tests" "\\.sh$")
|
||||
(("#!/bin/sh") (string-append "#!" (which "sh"))))
|
||||
#t))
|
||||
(add-before 'check 'disable-broken-test
|
||||
(lambda _
|
||||
;; This test hits the 127 character shebang limit in the build
|
||||
;; environment due to the way "env -S" splits arguments into
|
||||
;; shebangs. Note that "env-S-script.sh" works around this
|
||||
;; specific issue, but "env-S.pl" is not adjusted for build
|
||||
;; environments with long prefixes (/tmp/guix-build-...).
|
||||
(substitute* "Makefile"
|
||||
(("^.*tests/misc/env-S.pl.*$") ""))
|
||||
#t)))))
|
||||
(synopsis "Core GNU utilities (file, text, shell)")
|
||||
(description
|
||||
|
@ -373,31 +387,31 @@ (define-public coreutils-minimal
|
|||
(define-public gnu-make
|
||||
(package
|
||||
(name "make")
|
||||
(version "4.2.1")
|
||||
(version "4.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/make/make-" version
|
||||
".tar.bz2"))
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"12f5zzyq2w56g95nni65hc0g5p7154033y2f3qmjvd016szn5qnn"))
|
||||
(patches (search-patches "make-impure-dirs.patch"
|
||||
"make-glibc-compat.patch"))))
|
||||
"06cfqzpqsvdnsxbysl5p2fgdgxgl9y4p7scpnrfa8z2zgkjdspz0"))
|
||||
(patches (search-patches "make-impure-dirs.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("pkg-config" ,pkg-config))) ; to detect Guile
|
||||
(inputs `(("guile" ,guile-2.0)))
|
||||
(inputs `(("guile" ,guile-3.0)))
|
||||
(outputs '("out" "debug"))
|
||||
(arguments
|
||||
'(;; Work around faulty glob detection with glibc 2.27. See
|
||||
;; <https://lists.nongnu.org/archive/html/bug-make/2017-11/msg00027.html>.
|
||||
#:configure-flags '("make_cv_sys_gnu_glob=yes")
|
||||
`(,@(if (hurd-target?)
|
||||
'(#:configure-flags '("CFLAGS=-D__alloca=alloca"
|
||||
"ac_cv_func_posix_spawn=no"))
|
||||
'())
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'set-default-shell
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; Change the default shell from /bin/sh.
|
||||
(let ((bash (assoc-ref inputs "bash")))
|
||||
(substitute* "job.c"
|
||||
(substitute* "src/job.c"
|
||||
(("default_shell =.*$")
|
||||
(format #f "default_shell = \"~a/bin/sh\";\n"
|
||||
bash)))
|
||||
|
@ -413,17 +427,42 @@ (define-public gnu-make
|
|||
(license gpl3+)
|
||||
(home-page "https://www.gnu.org/software/make/")))
|
||||
|
||||
(define-public gnu-make-4.2
|
||||
(package
|
||||
(inherit gnu-make)
|
||||
(version "4.2.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/make/make-" version
|
||||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"12f5zzyq2w56g95nni65hc0g5p7154033y2f3qmjvd016szn5qnn"))))
|
||||
(arguments
|
||||
`(#:configure-flags '("CFLAGS=-D__alloca=alloca")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'set-default-shell
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; Change the default shell from /bin/sh.
|
||||
(let ((bash (assoc-ref inputs "bash")))
|
||||
(substitute* "job.c"
|
||||
(("default_shell =.*$")
|
||||
(format #f "default_shell = \"~a/bin/sh\";\n"
|
||||
bash)))
|
||||
#t))))))))
|
||||
|
||||
(define-public binutils
|
||||
(package
|
||||
(name "binutils")
|
||||
(version "2.32")
|
||||
(version "2.34")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/binutils/binutils-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0b8767nyal1bc4cyzg5h9iis8kpkln1i3wkamig75cifj1fb2f6y"))
|
||||
"1rin1f5c7wm4n3piky6xilcrpf2s0n3dd5vqq8irrxkcic3i1w49"))
|
||||
(patches (search-patches "binutils-loongson-workaround.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
|
||||
|
@ -448,7 +487,17 @@ (define-public binutils
|
|||
|
||||
;; Make sure 'ar' and 'ranlib' produce archives in a
|
||||
;; deterministic fashion.
|
||||
"--enable-deterministic-archives")))
|
||||
"--enable-deterministic-archives")
|
||||
|
||||
;; XXX: binutils 2.34 was mistakenly released without generated manuals:
|
||||
;; <https://sourceware.org/bugzilla/show_bug.cgi?id=25491>. To avoid a
|
||||
;; circular dependency on texinfo, prevent the build system from creating
|
||||
;; the manuals by calling "true" instead of "makeinfo"...
|
||||
#:make-flags '("MAKEINFO=true")))
|
||||
|
||||
;; ...and "hide" this package so that users who install binutils get the
|
||||
;; version with documentation defined below.
|
||||
(properties '((hidden? . #t)))
|
||||
|
||||
(synopsis "Binary utilities: bfd gas gprof ld")
|
||||
(description
|
||||
|
@ -461,6 +510,37 @@ (define-public binutils
|
|||
(license gpl3+)
|
||||
(home-page "https://www.gnu.org/software/binutils/")))
|
||||
|
||||
;; Work around a problem with binutils 2.34 whereby manuals are missing from
|
||||
;; the release tarball. Remove this and the related code above when updating.
|
||||
(define-public binutils+documentation
|
||||
(package/inherit
|
||||
binutils
|
||||
(native-inputs
|
||||
`(("texinfo" ,texinfo)))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments binutils)
|
||||
((#:make-flags _ ''()) ''())))
|
||||
(properties '())))
|
||||
|
||||
;; FIXME: ath9k-firmware-htc-binutils.patch do not apply on 2.34 because of a
|
||||
;; big refactoring of xtensa-modules.c (commit 567607c11fbf7105 upstream).
|
||||
;; Keep this version around until the patch is updated.
|
||||
(define-public binutils-2.33
|
||||
(package/inherit
|
||||
binutils
|
||||
(version "2.33.1")
|
||||
(source (origin
|
||||
(inherit (package-source binutils))
|
||||
(uri (string-append "mirror://gnu/binutils/binutils-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1cmd0riv37bqy9mwbg6n3523qgr8b3bbm5kwj19sjrasl4yq9d0c"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments binutils)
|
||||
((#:make-flags _ ''()) ''())))
|
||||
(properties '())))
|
||||
|
||||
(define-public binutils-gold
|
||||
(package
|
||||
(inherit binutils)
|
||||
|
@ -491,7 +571,7 @@ (define-public binutils-gold
|
|||
(define* (make-ld-wrapper name #:key
|
||||
(target (const #f))
|
||||
binutils
|
||||
(guile (canonical-package guile-2.2))
|
||||
(guile (canonical-package guile-3.0))
|
||||
(bash (canonical-package bash))
|
||||
(guile-for-build guile))
|
||||
"Return a package called NAME that contains a wrapper for the 'ld' program
|
||||
|
@ -529,7 +609,9 @@ (define* (make-ld-wrapper name #:key
|
|||
'(string-append bin "/ld")))
|
||||
(go (string-append ld ".go")))
|
||||
|
||||
(setvbuf (current-output-port) _IOLBF)
|
||||
(setvbuf (current-output-port)
|
||||
(cond-expand (guile-2.0 _IOLBF)
|
||||
(else 'line)))
|
||||
(format #t "building ~s/bin/ld wrapper in ~s~%"
|
||||
(assoc-ref %build-inputs "binutils")
|
||||
out)
|
||||
|
@ -569,13 +651,13 @@ (define-public glibc
|
|||
;; version 2.28, GNU/Hurd used a different glibc branch.
|
||||
(package
|
||||
(name "glibc")
|
||||
(version "2.29")
|
||||
(version "2.31")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0jzh58728flfh939a8k9pi1zdyalfzlxmwra7k0rzji5gvavivpk"))
|
||||
"05zxkyz9bv3j9h0xyid1rhvh3klhsmrpkf3bcs6frvlgyr2gwilj"))
|
||||
(snippet
|
||||
;; Disable 'ldconfig' and /etc/ld.so.cache. The latter is
|
||||
;; required on LFS distros to avoid loading the distro's libc.so
|
||||
|
@ -587,14 +669,14 @@ (define-public glibc
|
|||
#t))
|
||||
(modules '((guix build utils)))
|
||||
(patches (search-patches "glibc-ldd-x86_64.patch"
|
||||
"glibc-CVE-2019-7309.patch"
|
||||
"glibc-CVE-2019-9169.patch"
|
||||
"glibc-2.29-git-updates.patch"
|
||||
"glibc-hidden-visibility-ldconfig.patch"
|
||||
"glibc-versioned-locpath.patch"
|
||||
"glibc-allow-kernel-2.6.32.patch"
|
||||
"glibc-reinstate-prlimit64-fallback.patch"
|
||||
"glibc-supported-locales.patch"))))
|
||||
"glibc-supported-locales.patch"
|
||||
"glibc-hurd-clock_t_centiseconds.patch"
|
||||
"glibc-hurd-clock_gettime_monotonic.patch"
|
||||
"glibc-hurd-signal-sa-siginfo.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
|
||||
;; Glibc's <limits.h> refers to <linux/limit.h>, for instance, so glibc
|
||||
|
@ -821,6 +903,44 @@ (define (linker-script? file)
|
|||
;; Below are old libc versions, which we use mostly to build locale data in
|
||||
;; the old format (which the new libc cannot cope with.)
|
||||
|
||||
(define-public glibc-2.30
|
||||
(package
|
||||
(inherit glibc)
|
||||
(version "2.30")
|
||||
(source (origin
|
||||
(inherit (package-source glibc))
|
||||
(uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1bxqpg91d02qnaz837a5kamm0f43pr1il4r9pknygywsar713i72"))
|
||||
(patches (search-patches "glibc-ldd-x86_64.patch"
|
||||
"glibc-CVE-2019-19126.patch"
|
||||
"glibc-hidden-visibility-ldconfig.patch"
|
||||
"glibc-versioned-locpath.patch"
|
||||
"glibc-allow-kernel-2.6.32.patch"
|
||||
"glibc-reinstate-prlimit64-fallback.patch"
|
||||
"glibc-2.29-supported-locales.patch"))))))
|
||||
|
||||
(define-public glibc-2.29
|
||||
(package
|
||||
(inherit glibc)
|
||||
(version "2.29")
|
||||
(source (origin
|
||||
(inherit (package-source glibc))
|
||||
(uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0jzh58728flfh939a8k9pi1zdyalfzlxmwra7k0rzji5gvavivpk"))
|
||||
(patches (search-patches "glibc-ldd-x86_64.patch"
|
||||
"glibc-CVE-2019-7309.patch"
|
||||
"glibc-CVE-2019-9169.patch"
|
||||
"glibc-2.29-git-updates.patch"
|
||||
"glibc-hidden-visibility-ldconfig.patch"
|
||||
"glibc-versioned-locpath.patch"
|
||||
"glibc-allow-kernel-2.6.32.patch"
|
||||
"glibc-reinstate-prlimit64-fallback.patch"
|
||||
"glibc-2.29-supported-locales.patch"))))))
|
||||
|
||||
(define-public glibc-2.28
|
||||
(package
|
||||
(inherit glibc)
|
||||
|
@ -980,21 +1100,8 @@ (define-public (make-gcc-libc base-gcc libc)
|
|||
(package-name libc) "-"
|
||||
(package-version libc)))
|
||||
(arguments
|
||||
(substitute-keyword-arguments
|
||||
(ensure-keyword-arguments (package-arguments base-gcc)
|
||||
'(#:implicit-inputs? #f))
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(add-before 'configure 'treat-glibc-as-system-header
|
||||
(lambda _
|
||||
(let ((libc (assoc-ref %build-inputs "libc")))
|
||||
;; GCCs build processes requires that the libc
|
||||
;; we're building against is on the system header
|
||||
;; search path.
|
||||
(for-each (lambda (var)
|
||||
(setenv var (string-append libc "/include")))
|
||||
'("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH"))
|
||||
#t)))))))
|
||||
(ensure-keyword-arguments (package-arguments base-gcc)
|
||||
'(#:implicit-inputs? #f)))
|
||||
(native-inputs
|
||||
`(,@(package-native-inputs base-gcc)
|
||||
,@(append (fold alist-delete (%final-inputs) '("libc" "libc:static")))
|
||||
|
@ -1134,18 +1241,12 @@ (define-public glibc-utf8-locales
|
|||
(make-glibc-utf8-locales glibc))
|
||||
|
||||
;; Packages provided to ease use of binaries linked against the previous libc.
|
||||
(define-public glibc-locales-2.28
|
||||
(package (inherit (make-glibc-locales glibc-2.28))
|
||||
(name "glibc-locales-2.28")))
|
||||
(define-public glibc-utf8-locales-2.28
|
||||
(package (inherit (make-glibc-utf8-locales glibc-2.28))
|
||||
(name "glibc-utf8-locales-2.28")))
|
||||
|
||||
;; These should no longer be needed.
|
||||
(define-public glibc-utf8-locales-2.27
|
||||
(deprecated-package "glibc-utf8-locales-2.27" glibc-utf8-locales-2.28))
|
||||
(define-public glibc-locales-2.27
|
||||
(deprecated-package "glibc-locales-2.27" glibc-locales-2.28))
|
||||
(define-public glibc-locales-2.29
|
||||
(package (inherit (make-glibc-locales glibc-2.29))
|
||||
(name "glibc-locales-2.29")))
|
||||
(define-public glibc-utf8-locales-2.29
|
||||
(package (inherit (make-glibc-utf8-locales glibc-2.29))
|
||||
(name "glibc-utf8-locales-2.29")))
|
||||
|
||||
(define-public which
|
||||
(package
|
||||
|
@ -1282,26 +1383,7 @@ (define-public tzdata
|
|||
;;; package.
|
||||
(define-public tzdata-for-tests
|
||||
(hidden-package
|
||||
(package
|
||||
(inherit tzdata)
|
||||
(version "2019b")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://data.iana.org/time-zones/releases/tzdata"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0r0clnlslwm15m1c61dinf1fi9ffgl6aipng7i7yryfwj0n0kn85"))))
|
||||
(inputs
|
||||
`(("tzcode" ,(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://data.iana.org/time-zones/releases/tzcode"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0vbmswvv3li25s31shyllq5v24449lxnrki9hr043nipjd09sirf")))))))))
|
||||
(package/inherit tzdata)))
|
||||
|
||||
(define-public libiconv
|
||||
(package
|
||||
|
|
|
@ -69,7 +69,16 @@ (define %patch-series-5.0
|
|||
(4 "021gqqvgydixkrmqss64b6srfdlkvnx88lyfzpxfrn5d6bc7li0l")
|
||||
(5 "0xl2kyzm84nlyklrqzkn73ixabhzfhn9x91lzcmis89cppclvxav")
|
||||
(6 "0844749ixk1z60437nkznzms1f0nzh9an62kj7sny6r0zyk2k1fn")
|
||||
(7 "16xg37gp1b8zlj5969w8mcrparwqlcbj9695vn3qhgb7wdz1xd0p")))
|
||||
(7 "16xg37gp1b8zlj5969w8mcrparwqlcbj9695vn3qhgb7wdz1xd0p")
|
||||
(8 "1qyp19krjh8zxvb0jgwmyjz40djslwcf4xi7kc1ab0iaca44bipf")
|
||||
(9 "00yrjjqd95s81b21qq3ba1y7h879q8jaajlkjggc6grhcwbs4g7d")
|
||||
(10 "04ca5bjv456v538mkspzvn4xb2zdphh31r4fpvfm9p5my0jw7yyn")
|
||||
(11 "1sklyixvsv8993kxzs0jigacpdchjrq7jv5xpdx7kbqyp4rf6k9c")
|
||||
(12 "0cz21qg2gbr40lfgza7g02bqi2qknwqgxnq459pjj640d0cywhr9")
|
||||
(13 "16h9nwz3yzwj7fnxvlidjymdc4yr30h818433gh9j1x3in6igmzm")
|
||||
(14 "12gm5bvv2pd3m72z2ilj26pa08c61az253dsgfl24vpf2ijywvjx")
|
||||
(15 "0pm0px758w4i23s55wajcv6lqfiym7zgxvq0pxf6vclkv8nxy5x5")
|
||||
(16 "0vdha332km2iwx8g2ld15jy7d24cbplzgr1531dpzylr9ajxglgz")))
|
||||
|
||||
(define (download-patches store count)
|
||||
"Download COUNT Bash patches into store. Return a list of
|
||||
|
@ -116,7 +125,8 @@ (define-public bash
|
|||
(base32
|
||||
"0kgvfwqdcd90waczf4gx39xnrxzijhjrzyzv7s8v4w31qqm0za5l"))
|
||||
(patch-flags '("-p0"))
|
||||
(patches %patch-series-5.0)))
|
||||
(patches (cons (search-patch "bash-linux-pgrp-pipe.patch")
|
||||
%patch-series-5.0))))
|
||||
(version (string-append version "." (number->string (length %patch-series-5.0))))
|
||||
(build-system gnu-build-system)
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2016, 2018 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
|
||||
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -24,6 +24,7 @@ (define-module (gnu packages bdw-gc)
|
|||
#:use-module (guix licenses)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages hurd))
|
||||
|
@ -31,14 +32,14 @@ (define-module (gnu packages bdw-gc)
|
|||
(define-public libgc
|
||||
(package
|
||||
(name "libgc")
|
||||
(version "7.6.12")
|
||||
(version "8.0.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/ivmai/bdwgc/releases"
|
||||
"/download/v" version "/gc-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"10jhhi79d5brwlsyhwgpnrmc8nhlf7aan2lk9xhgihk5jc6srbvc"))))
|
||||
"1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
@ -54,21 +55,14 @@ (define-public libgc
|
|||
,@(if (hurd-triplet? (or (%current-system)
|
||||
(%current-target-system)))
|
||||
'("--disable-gcj-support")
|
||||
'()))
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-after 'unpack 'adjust-pc-file
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((libatomic-ops (assoc-ref inputs "libatomic-ops")))
|
||||
;; GC 7.6.10 and later includes -latomic_ops in the
|
||||
;; pkg-config file. To avoid propagation, insert an
|
||||
;; absolute reference so dependent programs can find it.
|
||||
(substitute* "bdw-gc.pc.in"
|
||||
(("@ATOMIC_OPS_LIBS@" match)
|
||||
(string-append "-L" libatomic-ops "/lib "
|
||||
match)))
|
||||
#t))))))
|
||||
'()))))
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
(inputs `(("libatomic-ops" ,libatomic-ops)))
|
||||
(propagated-inputs
|
||||
(if (%current-target-system)
|
||||
;; The build system refuses to check for compiler intrinsics when
|
||||
;; cross-compiling, and demands using libatomic-ops instead.
|
||||
`(("libatomic-ops" ,libatomic-ops))
|
||||
'()))
|
||||
(outputs '("out" "debug"))
|
||||
(synopsis "The Boehm-Demers-Weiser conservative garbage collector
|
||||
for C and C++")
|
||||
|
@ -91,17 +85,27 @@ (define-public libgc
|
|||
|
||||
(license (x11-style (string-append home-page "license.txt")))))
|
||||
|
||||
(define-public libgc-8.0
|
||||
;; TODO: Add a static output in libgc in the next rebuild cycle.
|
||||
(define-public libgc/static-libs
|
||||
(package/inherit
|
||||
libgc
|
||||
(arguments (substitute-keyword-arguments (package-arguments libgc)
|
||||
((#:configure-flags flags ''())
|
||||
`(cons "--enable-static" ,flags))))
|
||||
(properties '((hidden? . #t)))))
|
||||
|
||||
(define-public libgc-7
|
||||
(package
|
||||
(inherit libgc)
|
||||
(version "8.0.4")
|
||||
(version "7.6.12")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/ivmai/bdwgc/releases"
|
||||
"/download/v" version "/gc-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3"))))))
|
||||
"10jhhi79d5brwlsyhwgpnrmc8nhlf7aan2lk9xhgihk5jc6srbvc"))))
|
||||
(propagated-inputs `(("libatomic-ops" ,libatomic-ops)))))
|
||||
|
||||
(define-public libgc/back-pointers
|
||||
(package/inherit
|
||||
|
|
|
@ -11995,7 +11995,8 @@ (define-public sailfish
|
|||
;; Ensure that Eigen headers can be found
|
||||
(setenv "CPLUS_INCLUDE_PATH"
|
||||
(string-append (assoc-ref inputs "eigen")
|
||||
"/include/eigen3"))
|
||||
"/include/eigen3:"
|
||||
(or (getenv "CPLUS_INCLUDE_PATH") "")))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("boost" ,boost)
|
||||
|
@ -12173,8 +12174,8 @@ (define-public salmon
|
|||
(("lib/libdivsufsort.a") "/lib/libdivsufsort.so"))
|
||||
|
||||
;; Ensure that all headers can be found
|
||||
(setenv "CPATH"
|
||||
(string-append (getenv "CPATH")
|
||||
(setenv "CPLUS_INCLUDE_PATH"
|
||||
(string-append (or (getenv "CPLUS_INCLUDE_PATH") "")
|
||||
":"
|
||||
(assoc-ref inputs "eigen")
|
||||
"/include/eigen3"))
|
||||
|
|
|
@ -31,7 +31,7 @@ (define-module (gnu packages bison)
|
|||
(define-public bison
|
||||
(package
|
||||
(name "bison")
|
||||
(version "3.4.1")
|
||||
(version "3.5.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -39,7 +39,7 @@ (define-public bison
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"03c2pmq3bs0drdislnz6gm1rwz3n4pb2rz9navyxydppxg2rl597"))))
|
||||
"1i57hbczvr8674z73775jxdd3y59qggs5lmfd60gmwm5i1gmpy1b"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(;; Building in parallel on many-core systems may cause an error such as
|
||||
|
|
|
@ -407,7 +407,7 @@ (define-public libtorrent-rasterbar
|
|||
(assoc-ref %outputs "out") "/lib"))))
|
||||
(inputs `(("boost" ,boost)
|
||||
("openssl" ,openssl)))
|
||||
(native-inputs `(("python" ,python-2)
|
||||
(native-inputs `(("python" ,python-wrapper)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(home-page "https://www.libtorrent.org/")
|
||||
(synopsis "Feature complete BitTorrent implementation")
|
||||
|
|
|
@ -10,7 +10,9 @@
|
|||
;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
|
||||
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2019, 2020 Giacomo Leidi <goodoldpaul@autistici.org>
|
||||
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -40,66 +42,113 @@ (define-module (gnu packages boost)
|
|||
#:use-module (gnu packages icu4c)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages shells))
|
||||
#:use-module (gnu packages shells)
|
||||
#:use-module (srfi srfi-1))
|
||||
|
||||
(define (version-with-underscores version)
|
||||
(string-map (lambda (x) (if (eq? x #\.) #\_ x)) version))
|
||||
|
||||
(define (boost-patch name version hash)
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.boost.org/patches/"
|
||||
(version-with-underscores version) "/" name))
|
||||
(file-name (string-append "boost-" name))
|
||||
(sha256 (base32 hash))))
|
||||
|
||||
(define-public boost
|
||||
(package
|
||||
(name "boost")
|
||||
(version "1.70.0")
|
||||
(version "1.72.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (let ((version-with-underscores
|
||||
(string-map (lambda (x) (if (eq? x #\.) #\_ x)) version)))
|
||||
(list (string-append "mirror://sourceforge/boost/boost/" version
|
||||
"/boost_" version-with-underscores ".tar.bz2")
|
||||
(string-append "https://dl.bintray.com/boostorg/release/"
|
||||
version "/source/boost_"
|
||||
version-with-underscores ".tar.bz2"))))
|
||||
(uri (string-append "https://dl.bintray.com/boostorg/release/"
|
||||
version "/source/boost_"
|
||||
(version-with-underscores version) ".tar.bz2"))
|
||||
(patches
|
||||
(list (boost-patch
|
||||
;; 1.72.0 was released with a faulty coroutine submodule:
|
||||
;; <https://github.com/boostorg/coroutine/issues/46>.
|
||||
"0001-revert-cease-dependence-on-range.patch" version
|
||||
"1zcqxzh56m1s635wqwk15j3zcs2gmjvjy2f0hid7i78s4pgm0yfs")))
|
||||
(sha256
|
||||
(base32
|
||||
"0y47nc7w0arwgj4x1phadxbvl7wyfcgknbz5kv8lzpl98wsyh2j3"))))
|
||||
"08h7cv61fd0lzb4z50xanfqn0pdgvizjrpd1kcdgj725pisb5jar"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("icu4c" ,icu4c)
|
||||
("zlib" ,zlib)))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("python" ,python-2)
|
||||
,@(if (%current-target-system)
|
||||
'()
|
||||
`(("python" ,python-wrapper)))
|
||||
("tcsh" ,tcsh)))
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
`(#:imported-modules ((guix build python-build-system)
|
||||
,@%gnu-build-system-modules)
|
||||
#:modules (((guix build python-build-system) #:select (python-version))
|
||||
,@%gnu-build-system-modules)
|
||||
#:tests? #f
|
||||
#:make-flags
|
||||
(list "threading=multi" "link=shared"
|
||||
|
||||
;; XXX: Disable installation of Boosts modular CMake config scripts
|
||||
;; which conflicts in 1.70.0 with the ones provided by CMake.
|
||||
;; See <https://bugs.gnu.org/36721>.
|
||||
"--no-cmake-config"
|
||||
|
||||
;; Set the RUNPATH to $libdir so that the libs find each other.
|
||||
(string-append "linkflags=-Wl,-rpath="
|
||||
(assoc-ref %outputs "out") "/lib"))
|
||||
(assoc-ref %outputs "out") "/lib")
|
||||
,@(if (%current-target-system)
|
||||
`("--user-config=user-config.jam"
|
||||
;; Python is not supported when cross-compiling.
|
||||
"--without-python"
|
||||
"binary-format=elf"
|
||||
"target-os=linux"
|
||||
,@(cond
|
||||
((string-prefix? "arm" (%current-target-system))
|
||||
'("abi=aapcs"
|
||||
"address-model=32"
|
||||
"architecture=arm"))
|
||||
((string-prefix? "aarch64" (%current-target-system))
|
||||
'("abi=aapcs"
|
||||
"address-model=64"
|
||||
"architecture=arm"))
|
||||
(else '())))
|
||||
'()))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'bootstrap)
|
||||
(replace 'configure
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((icu (assoc-ref inputs "icu4c"))
|
||||
(python (assoc-ref inputs "python"))
|
||||
(out (assoc-ref outputs "out")))
|
||||
(substitute* '("libs/config/configure"
|
||||
"libs/spirit/classic/phoenix/test/runtest.sh"
|
||||
"tools/build/src/engine/execunix.c"
|
||||
"tools/build/src/engine/Jambase"
|
||||
"tools/build/src/engine/jambase.c")
|
||||
"tools/build/src/engine/execunix.cpp"
|
||||
"tools/build/src/engine/Jambase")
|
||||
(("/bin/sh") (which "sh")))
|
||||
|
||||
(setenv "SHELL" (which "sh"))
|
||||
(setenv "CONFIG_SHELL" (which "sh"))
|
||||
|
||||
,@(if (%current-target-system)
|
||||
`((call-with-output-file "user-config.jam"
|
||||
(lambda (port)
|
||||
(format port
|
||||
"using gcc : cross : ~a-c++ ;"
|
||||
,(%current-target-system)))))
|
||||
'())
|
||||
|
||||
(invoke "./bootstrap.sh"
|
||||
(string-append "--prefix=" out)
|
||||
;; Auto-detection looks for ICU only in traditional
|
||||
;; install locations.
|
||||
(string-append "--with-icu=" icu)
|
||||
;; Ditto for Python.
|
||||
,@(if (%current-target-system)
|
||||
'()
|
||||
`((string-append "--with-python-root=" python)
|
||||
(string-append "--with-python=" python "/bin/python")
|
||||
(string-append "--with-python-version="
|
||||
(python-version python))))
|
||||
"--with-toolset=gcc"))))
|
||||
(replace 'build
|
||||
(lambda* (#:key make-flags #:allow-other-keys)
|
||||
|
@ -109,17 +158,27 @@ (define-public boost
|
|||
(replace 'install
|
||||
(lambda* (#:key make-flags #:allow-other-keys)
|
||||
(apply invoke "./b2" "install" make-flags)))
|
||||
(add-after 'install 'provide-libboost_python
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
;; Boost can build support for both Python 2 and Python 3 since
|
||||
;; version 1.67.0, and suffixes each library with the Python
|
||||
;; version. Many consumers only check for libboost_python
|
||||
;; however, so we provide it here as suggested in
|
||||
;; <https://github.com/boostorg/python/issues/203>.
|
||||
(with-directory-excursion (string-append out "/lib")
|
||||
(symlink "libboost_python27.so" "libboost_python.so"))
|
||||
#t))))))
|
||||
,@(if (%current-target-system)
|
||||
'()
|
||||
'((add-after 'install 'provide-libboost_python
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(python-version (python-version
|
||||
(assoc-ref inputs "python")))
|
||||
(libboost_pythonNN.so
|
||||
(string-append "libboost_python"
|
||||
(string-join (string-split
|
||||
python-version #\.)
|
||||
"")
|
||||
".so")))
|
||||
(with-directory-excursion (string-append out "/lib")
|
||||
(symlink libboost_pythonNN.so "libboost_python.so")
|
||||
;; Some packages only look for the major version.
|
||||
(symlink libboost_pythonNN.so
|
||||
(string-append "libboost_python"
|
||||
(string-take python-version 1)
|
||||
".so")))
|
||||
#t))))))))
|
||||
|
||||
(home-page "https://www.boost.org")
|
||||
(synopsis "Peer-reviewed portable C++ source libraries")
|
||||
|
@ -129,54 +188,16 @@ (define-public boost
|
|||
(license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt"
|
||||
"Some components have other similar licences."))))
|
||||
|
||||
;; TODO: Merge with 'Boost' in the next rebuild cycle.
|
||||
(define-public boost-with-python3
|
||||
(define-public boost-with-python2
|
||||
(package
|
||||
(inherit boost)
|
||||
(name "boost-python3")
|
||||
(name "boost-python2")
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("python" ,python)
|
||||
("tcsh" ,tcsh)))
|
||||
(arguments (substitute-keyword-arguments (package-arguments boost)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((icu (assoc-ref inputs "icu4c"))
|
||||
(python (assoc-ref inputs "python"))
|
||||
(out (assoc-ref outputs "out")))
|
||||
(substitute* '("libs/config/configure"
|
||||
"libs/spirit/classic/phoenix/test/runtest.sh"
|
||||
"tools/build/src/engine/execunix.c"
|
||||
"tools/build/src/engine/Jambase"
|
||||
"tools/build/src/engine/jambase.c")
|
||||
(("/bin/sh") (which "sh")))
|
||||
`(("python" ,python-2)
|
||||
,@(alist-delete "python" (package-native-inputs boost))))))
|
||||
|
||||
(setenv "SHELL" (which "sh"))
|
||||
(setenv "CONFIG_SHELL" (which "sh"))
|
||||
|
||||
(substitute* "tools/build/src/tools/python.jam"
|
||||
(("include/python\\$\\(version\\)")
|
||||
"include/python$(version)m"))
|
||||
|
||||
(invoke "./bootstrap.sh"
|
||||
(string-append "--prefix=" out)
|
||||
;; Auto-detection looks for dependencies only
|
||||
;; in traditional install locations.
|
||||
(string-append "--with-icu=" icu)
|
||||
(string-append "--with-python=" python "/bin/python3")
|
||||
(string-append "--with-python-root=" python)
|
||||
"--with-python-version=3.7"
|
||||
"--with-toolset=gcc"))))
|
||||
(replace 'provide-libboost_python
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(with-directory-excursion (string-append out "/lib")
|
||||
(symlink "libboost_python37.so" "libboost_python.so")
|
||||
;; Some packages also look for libboost_python3.so
|
||||
(symlink "libboost_python37.so" "libboost_python3.so"))
|
||||
#t)))))))))
|
||||
(define-public boost-with-python3
|
||||
(deprecated-package "boost-with-python3" boost))
|
||||
|
||||
(define-public boost-static
|
||||
(package
|
||||
|
@ -189,10 +210,18 @@ (define-public boost-static
|
|||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(replace 'provide-libboost_python
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(python-version (python-version
|
||||
(assoc-ref inputs "python")))
|
||||
(libboost_pythonNN.a
|
||||
(string-append "libboost_python"
|
||||
(string-join (string-split
|
||||
python-version #\.)
|
||||
"")
|
||||
".a")))
|
||||
(with-directory-excursion (string-append out "/lib")
|
||||
(symlink "libboost_python27.a" "libboost_python.a"))
|
||||
(symlink libboost_pythonNN.a "libboost_python.a"))
|
||||
#t)))))))))
|
||||
|
||||
(define-public boost-1.69
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
;;; Copyright © 2019 nee <nee@cock.li>
|
||||
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
|
||||
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2018, 2019, 2020 Vagrant Cascadian <vagrant@debian.org>
|
||||
;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
|
||||
;;;
|
||||
|
@ -93,7 +94,9 @@ (define-public grub
|
|||
(sha256
|
||||
(base32
|
||||
"0zgp5m3hmc9jh8wpjx6czzkh5id2y8n1k823x2mjvm2sk6b28ag5"))
|
||||
(patches (search-patches "grub-efi-fat-serial-number.patch"))))
|
||||
(patches (search-patches
|
||||
"grub-efi-fat-serial-number.patch"
|
||||
"grub-verifiers-Blocklist-fallout-cleanup.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
@ -154,11 +157,19 @@ (define-public grub
|
|||
|
||||
;; Depend on LVM2 for libdevmapper, used by 'grub-probe' and
|
||||
;; 'grub-install' to recognize mapped devices (LUKS, etc.)
|
||||
("lvm2" ,lvm2)
|
||||
,@(if (member (or (%current-target-system)
|
||||
(%current-system))
|
||||
(package-supported-systems lvm2))
|
||||
`(("lvm2" ,lvm2))
|
||||
'())
|
||||
|
||||
;; Depend on mdadm, which is invoked by 'grub-probe' and 'grub-install'
|
||||
;; to determine whether the root file system is RAID.
|
||||
("mdadm" ,mdadm)
|
||||
,@(if (member (or (%current-target-system)
|
||||
(%current-system))
|
||||
(package-supported-systems mdadm))
|
||||
`(("mdadm" ,mdadm))
|
||||
'())
|
||||
|
||||
;; Console-setup's ckbcomp is invoked by grub-kbdcomp. It is required
|
||||
;; for generating alternative keyboard layouts.
|
||||
|
@ -166,7 +177,11 @@ (define-public grub
|
|||
|
||||
;; Needed for ‘grub-mount’, the only reliable way to tell whether a given
|
||||
;; file system will be readable by GRUB without rebooting.
|
||||
("fuse" ,fuse)
|
||||
,@(if (member (or (%current-target-system)
|
||||
(%current-system))
|
||||
(package-supported-systems fuse))
|
||||
`(("fuse" ,fuse))
|
||||
'())
|
||||
|
||||
("freetype" ,freetype)
|
||||
;; ("libusb" ,libusb)
|
||||
|
@ -198,7 +213,9 @@ (define-public grub
|
|||
;; Dependencies for the test suite. The "real" QEMU is needed here,
|
||||
;; because several targets are used.
|
||||
("parted" ,parted)
|
||||
("qemu" ,qemu-minimal)
|
||||
,@(if (member (%current-system) (package-supported-systems qemu-minimal))
|
||||
`(("qemu" ,qemu-minimal))
|
||||
'())
|
||||
("xorriso" ,xorriso)))
|
||||
(home-page "https://www.gnu.org/software/grub/")
|
||||
(synopsis "GRand Unified Boot loader")
|
||||
|
@ -212,6 +229,33 @@ (define-public grub
|
|||
(license license:gpl3+)
|
||||
(properties '((cpe-name . "grub2")))))
|
||||
|
||||
(define-public grub-minimal
|
||||
(package
|
||||
(inherit grub)
|
||||
(name "grub-minimal")
|
||||
(inputs
|
||||
(fold alist-delete (package-inputs grub)
|
||||
'("lvm2" "mdadm" "fuse" "console-setup")))
|
||||
(native-inputs
|
||||
(fold alist-delete (package-native-inputs grub)
|
||||
'("help2man" "texinfo" "parted" "qemu" "xorriso")))
|
||||
(arguments
|
||||
`(#:configure-flags (list "PYTHON=true")
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-stuff
|
||||
(lambda* (#:key native-inputs inputs #:allow-other-keys)
|
||||
(substitute* "grub-core/Makefile.in"
|
||||
(("/bin/sh") (which "sh")))
|
||||
|
||||
;; Make the font visible.
|
||||
(copy-file (assoc-ref (or native-inputs inputs)
|
||||
"unifont")
|
||||
"unifont.bdf.gz")
|
||||
(system* "gunzip" "unifont.bdf.gz")
|
||||
|
||||
#t)))
|
||||
#:tests? #f))))
|
||||
|
||||
(define-public grub-efi
|
||||
(package
|
||||
(inherit grub)
|
||||
|
@ -305,7 +349,7 @@ (define-public syslinux
|
|||
("perl" ,perl)
|
||||
("python-2" ,python-2)))
|
||||
(inputs
|
||||
`(("libuuid" ,util-linux)
|
||||
`(("libuuid" ,util-linux "lib")
|
||||
("mtools" ,mtools)))
|
||||
(arguments
|
||||
`(#:parallel-build? #f
|
||||
|
@ -943,7 +987,7 @@ (define-public vboot-utils
|
|||
("libyaml" ,libyaml)
|
||||
("openssl" ,openssl)
|
||||
("openssl:static" ,openssl "static")
|
||||
("util-linux" ,util-linux)))
|
||||
("util-linux" ,util-linux "lib")))
|
||||
(home-page
|
||||
"https://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot")
|
||||
(synopsis "ChromiumOS verified boot utilities")
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2014, 2015, 2018, 2019 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2017, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2019 Carl Dong <contact@carldong.me>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -104,6 +104,15 @@ (define %bootstrap-executables
|
|||
,(base32 "07830bx29ad5i0l1ykj0g0b1jayjdblf01sr3ww9wbnwdbzinqms"))
|
||||
("xz"
|
||||
,(base32 "0i9kxdi17bm5gxfi2xzm0y73p3ii0cqxli1sbljm6rh2fjgyn90k")))
|
||||
("i586-gnu"
|
||||
("bash"
|
||||
,(base32 "1as8649aqaibahhhrvkj10ci8shpi4hq5n7gnik8rhhy0dc1jarg"))
|
||||
("mkdir"
|
||||
,(base32 "1snqgpfrl00hfn82lm29jqylzjsfb9jd6ha74dp12phwb8fpbmb9"))
|
||||
("tar"
|
||||
,(base32 "0nq2c1zb3wv5bf7kd83sziaashydazrn7xgq6kijlk0zj2syzc2m"))
|
||||
("xz"
|
||||
,(base32 "033rhpk6zrpxpd6ffjyg5y2zwq9x9cnq0zljb7k8jlncbalsayq5")))
|
||||
("mips64el-linux"
|
||||
("bash"
|
||||
,(base32 "1aw046dhda240k9pb9iaj5aqkm23gkvxa9j82n4k7fk87nbrixw6"))
|
||||
|
@ -114,12 +123,17 @@ (define %bootstrap-executables
|
|||
("xz"
|
||||
,(base32 "09j1d69qr0hhhx4k4ih8wp00dfc9y4rp01hfg3vc15yxd0jxabh5")))))
|
||||
|
||||
(define (bootstrap-executable-url program system)
|
||||
"Return the URL where PROGRAM can be found for SYSTEM."
|
||||
(string-append
|
||||
"https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/bootstrap/"
|
||||
system "/" program
|
||||
"?id=44f07d1dc6806e97c4e9ee3e6be883cc59dc666e"))
|
||||
(define %bootstrap-executable-base-urls
|
||||
;; This is where the bootstrap executables come from.
|
||||
'("https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/bootstrap/"
|
||||
"http://lilypond.org/janneke/guix/"))
|
||||
|
||||
(define (bootstrap-executable-file-name system program)
|
||||
"Return the FILE-NAME part of url where PROGRAM can be found for SYSTEM."
|
||||
(match system
|
||||
("i586-gnu" (string-append system "/20200326/" program))
|
||||
(_ (string-append system "/" program
|
||||
"?id=44f07d1dc6806e97c4e9ee3e6be883cc59dc666e"))))
|
||||
|
||||
(define bootstrap-executable
|
||||
(mlambda (program system)
|
||||
|
@ -140,7 +154,9 @@ (define bootstrap-executable
|
|||
((sha256)
|
||||
(origin
|
||||
(method url-fetch/executable)
|
||||
(uri (bootstrap-executable-url program system))
|
||||
(uri (map (cute string-append <>
|
||||
(bootstrap-executable-file-name system program))
|
||||
%bootstrap-executable-base-urls))
|
||||
(file-name program)
|
||||
(sha256 sha256)))))))
|
||||
|
||||
|
@ -301,7 +317,8 @@ (define %bootstrap-base-urls
|
|||
"http://alpha.gnu.org/gnu/guix/bootstrap"
|
||||
"ftp://alpha.gnu.org/gnu/guix/bootstrap"
|
||||
"http://www.fdn.fr/~lcourtes/software/guix/packages"
|
||||
"http://flashner.co.il/guix/bootstrap"))
|
||||
"http://flashner.co.il/guix/bootstrap"
|
||||
"http://lilypond.org/janneke/guix/"))
|
||||
|
||||
(define (bootstrap-guile-url-path system)
|
||||
"Return the URI for FILE."
|
||||
|
@ -311,6 +328,8 @@ (define (bootstrap-guile-url-path system)
|
|||
"/20170217/guile-2.0.14.tar.xz")
|
||||
("armhf-linux"
|
||||
"/20150101/guile-2.0.11.tar.xz")
|
||||
("i586-gnu"
|
||||
"/20200326/guile-static-stripped-2.0.14-i586-pc-gnu.tar.xz")
|
||||
(_
|
||||
"/20131110/guile-2.0.9.tar.xz"))))
|
||||
|
||||
|
@ -326,7 +345,9 @@ (define (bootstrap-guile-hash system)
|
|||
("armhf-linux"
|
||||
(base32 "1mi3brl7l58aww34rawhvja84xc7l1b4hmwdmc36fp9q9mfx0lg5"))
|
||||
("aarch64-linux"
|
||||
(base32 "1giy2aprjmn5fp9c4s9r125fljw4wv6ixy5739i5bffw4jgr0f9r"))))
|
||||
(base32 "1giy2aprjmn5fp9c4s9r125fljw4wv6ixy5739i5bffw4jgr0f9r"))
|
||||
("i586-gnu"
|
||||
(base32 "0wgqpsmvg25rnqn49ap7kwd2qxccd8dr4lllzp7i3rjvgav27vac"))))
|
||||
|
||||
(define (bootstrap-guile-origin system)
|
||||
"Return an <origin> object for the Guile tarball of SYSTEM."
|
||||
|
@ -456,6 +477,8 @@ (define %bootstrap-coreutils&co
|
|||
"/20150101/static-binaries.tar.xz")
|
||||
("aarch64-linux"
|
||||
"/20170217/static-binaries.tar.xz")
|
||||
("i586-gnu"
|
||||
"/20200326/static-binaries-0-i586-pc-gnu.tar.xz")
|
||||
(_
|
||||
"/20131110/static-binaries.tar.xz")))
|
||||
%bootstrap-base-urls))
|
||||
|
@ -473,6 +496,9 @@ (define %bootstrap-coreutils&co
|
|||
("aarch64-linux"
|
||||
(base32
|
||||
"18dfiq6c6xhsdpbidigw6480wh0vdgsxqq3xindq4lpdgqlccpfh"))
|
||||
("i586-gnu"
|
||||
(base32
|
||||
"17kllqnf3fg79gzy9ansgi801c46yh9c23h4d923plvb0nfm1cfn"))
|
||||
("mips64el-linux"
|
||||
(base32
|
||||
"072y4wyfsj1bs80r6vbybbafy8ya4vfy7qj25dklwk97m6g71753"))))))
|
||||
|
@ -519,6 +545,8 @@ (define %bootstrap-binutils
|
|||
"/20150101/binutils-2.25.tar.xz")
|
||||
("aarch64-linux"
|
||||
"/20170217/binutils-2.27.tar.xz")
|
||||
("i586-gnu"
|
||||
"/20200326/binutils-static-stripped-2.34-i586-pc-gnu.tar.xz")
|
||||
(_
|
||||
"/20131110/binutils-2.23.2.tar.xz")))
|
||||
%bootstrap-base-urls))
|
||||
|
@ -536,6 +564,9 @@ (define %bootstrap-binutils
|
|||
("aarch64-linux"
|
||||
(base32
|
||||
"111s7ilfiby033rczc71797xrmaa3qlv179wdvsaq132pd51xv3n"))
|
||||
("i586-gnu"
|
||||
(base32
|
||||
"11kykv1kmqc5wln57rs4klaqa13hm952smkc57qcsyss21kfjprs"))
|
||||
("mips64el-linux"
|
||||
(base32
|
||||
"1x8kkhcxmfyzg1ddpz2pxs6fbdl6412r7x0nzbmi5n7mj8zw2gy7"))))))
|
||||
|
@ -589,6 +620,8 @@ (define %bootstrap-glibc
|
|||
"/20150101/glibc-2.20.tar.xz")
|
||||
("aarch64-linux"
|
||||
"/20170217/glibc-2.25.tar.xz")
|
||||
("i586-gnu"
|
||||
"/20200326/glibc-stripped-2.31-i586-pc-gnu.tar.xz")
|
||||
(_
|
||||
"/20131110/glibc-2.18.tar.xz")))
|
||||
%bootstrap-base-urls))
|
||||
|
@ -606,6 +639,9 @@ (define %bootstrap-glibc
|
|||
("aarch64-linux"
|
||||
(base32
|
||||
"07nx3x8598i2924rjnlrncg6rm61c9bmcczbbcpbx0fb742nvv5c"))
|
||||
("i586-gnu"
|
||||
(base32
|
||||
"14ddm10lpbas8bankmn5bcrlqvz1v5dnn1qjzxb19r57vd2w5952"))
|
||||
("mips64el-linux"
|
||||
(base32
|
||||
"0k97a3whzx3apsi9n2cbsrr79ad6lh00klxph9hw4fqyp1abkdsg")))))))))
|
||||
|
@ -675,6 +711,8 @@ (define %bootstrap-gcc
|
|||
"/20150101/gcc-4.8.4.tar.xz")
|
||||
("aarch64-linux"
|
||||
"/20170217/gcc-5.4.0.tar.xz")
|
||||
("i586-gnu"
|
||||
"/20200326/gcc-stripped-5.5.0-i586-pc-gnu.tar.xz")
|
||||
(_
|
||||
"/20131110/gcc-4.8.2.tar.xz")))
|
||||
%bootstrap-base-urls))
|
||||
|
@ -692,6 +730,9 @@ (define %bootstrap-gcc
|
|||
("aarch64-linux"
|
||||
(base32
|
||||
"1ar3vdzyqbfm0z36kmvazvfswxhcihlacl2dzdjgiq25cqnq9ih1"))
|
||||
("i586-gnu"
|
||||
(base32
|
||||
"1j2zc58wzil71a34h7c70sd68dmqvcscrw3rmn2whq79vd70zvv5"))
|
||||
("mips64el-linux"
|
||||
(base32
|
||||
"1m5miqkyng45l745n0sfafdpjkqv9225xf44jqkygwsipj2cv9ks")))))))))
|
||||
|
@ -808,19 +849,18 @@ (define %bootstrap-mes
|
|||
(define (%bootstrap-inputs)
|
||||
;; The initial, pre-built inputs. From now on, we can start building our
|
||||
;; own packages.
|
||||
`(,@(match (%current-system)
|
||||
((or "i686-linux" "x86_64-linux")
|
||||
`(("linux-libre-headers" ,%bootstrap-linux-libre-headers)
|
||||
("bootstrap-mescc-tools" ,%bootstrap-mescc-tools)
|
||||
("mes" ,%bootstrap-mes)))
|
||||
(_
|
||||
`(("libc" ,%bootstrap-glibc)
|
||||
("gcc" ,%bootstrap-gcc)
|
||||
("binutils" ,%bootstrap-binutils))))
|
||||
("coreutils&co" ,%bootstrap-coreutils&co)
|
||||
|
||||
;; In gnu-build-system.scm, we rely on the availability of Bash.
|
||||
("bash" ,%bootstrap-coreutils&co)))
|
||||
(match (%current-system)
|
||||
((or "i686-linux" "x86_64-linux")
|
||||
`(("linux-libre-headers" ,%bootstrap-linux-libre-headers)
|
||||
("bootstrap-mescc-tools" ,%bootstrap-mescc-tools)
|
||||
("mes" ,%bootstrap-mes)))
|
||||
(_
|
||||
`(("libc" ,%bootstrap-glibc)
|
||||
("gcc" ,%bootstrap-gcc)
|
||||
("binutils" ,%bootstrap-binutils)
|
||||
("coreutils&co" ,%bootstrap-coreutils&co)
|
||||
;; In gnu-build-system.scm, we rely on the availability of Bash.
|
||||
("bash" ,%bootstrap-coreutils&co)))))
|
||||
|
||||
(define %bootstrap-inputs-for-tests
|
||||
;; These are bootstrap inputs that are cheap to produce (no compilation
|
||||
|
|
|
@ -171,7 +171,7 @@ (define-public gn
|
|||
(define-public meson
|
||||
(package
|
||||
(name "meson")
|
||||
(version "0.50.1")
|
||||
(version "0.53.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/mesonbuild/meson/"
|
||||
|
@ -179,7 +179,7 @@ (define-public meson
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1k2fw5qk4mqjcb4j5dhp8xfn0caqphb11yh8zkw7v9w01kb5d3zn"))))
|
||||
"07y2hh9dfn1m9g4bsy49nbn3vdmd0b2iwr8bxg19fhqq6c7q73ry"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH
|
||||
|
|
|
@ -38,6 +38,7 @@ (define-module (gnu packages calendar)
|
|||
#:use-module (gnu packages dav)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages icu4c)
|
||||
#:use-module (gnu packages perl)
|
||||
|
@ -136,7 +137,10 @@ (define-public libical
|
|||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; test suite appears broken
|
||||
#:configure-flags '("-DSHARED_ONLY=true")
|
||||
#:configure-flags '("-DSHARED_ONLY=true"
|
||||
;; required by evolution-data-server
|
||||
"-DGOBJECT_INTROSPECTION=true"
|
||||
"-DICAL_GLIB_VAPI=true")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'patch-paths
|
||||
|
@ -153,9 +157,11 @@ (define-public libical
|
|||
(("\\\"/usr/share/lib/zoneinfo\\\"") "")))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("gtk-doc" ,gtk-doc)
|
||||
`(("gobject-introspection" ,gobject-introspection)
|
||||
("gtk-doc" ,gtk-doc)
|
||||
("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)))
|
||||
("pkg-config" ,pkg-config)
|
||||
("vala" ,vala)))
|
||||
(inputs
|
||||
`(("glib" ,glib)
|
||||
("libxml2" ,libxml2)
|
||||
|
|
|
@ -477,7 +477,7 @@ (define-public dvdstyler
|
|||
("eudev" ,eudev)
|
||||
("fontconfig" ,fontconfig)
|
||||
("libexif" ,libexif)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("ffmpeg" ,ffmpeg-3.4)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
|
|
|
@ -67,6 +67,7 @@ (define-module (gnu packages check)
|
|||
#:use-module (gnu packages python-web)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages time)
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module (guix utils)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
|
@ -645,26 +646,20 @@ (define-public python2-minimock
|
|||
(define-public python-mock
|
||||
(package
|
||||
(name "python-mock")
|
||||
(version "2.0.0")
|
||||
(version "3.0.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "mock" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1flbpksir5sqrvq2z0dp8sl4bzbadg21sj4d42w3klpdfvgvcn5i"))))
|
||||
"1hrp6j0yrx2xzylfv02qa8kph661m6yq4p0mc8fnimch9j4psrc3"))))
|
||||
(propagated-inputs
|
||||
`(("python-pbr" ,python-pbr-minimal)
|
||||
("python-six" ,python-six)))
|
||||
`(("python-six" ,python-six)))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
`(("python-unittest2" ,python-unittest2)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(zero? (system* "unit2")))))))
|
||||
;; FIXME: Tests require "pytest", which depends on this package.
|
||||
'(#:tests? #f))
|
||||
(home-page "https://github.com/testing-cabal/mock")
|
||||
(synopsis "Python mocking and patching library for testing")
|
||||
(description
|
||||
|
@ -772,35 +767,40 @@ (define-public python2-unittest2
|
|||
(define-public python-pytest
|
||||
(package
|
||||
(name "python-pytest")
|
||||
(version "4.4.2")
|
||||
(version "5.3.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "pytest" version))
|
||||
(sha256
|
||||
(base32
|
||||
"18w38kjnffdcrlbw6ny6dksgxai6x9bxpjs2m6klqmb8hfzjkcb2"))))
|
||||
"139i9cjhrv5aici3skq8iihvfb3lq0d8xb5j7qycr2hlk8cfjpqd"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(invoke "pytest" "-vv" "-k"
|
||||
(string-append
|
||||
;; These tests involve the /usr directory, and fails.
|
||||
"not test_remove_dir_prefix"
|
||||
" and not test_argcomplete"
|
||||
;; This test tries to override PYTHONPATH, and
|
||||
;; subsequently fails to locate the test libraries.
|
||||
" and not test_collection")))))))
|
||||
(lambda* (#:key (tests? #t) #:allow-other-keys)
|
||||
(if tests?
|
||||
(invoke "pytest" "-vv" "-k"
|
||||
(string-append
|
||||
;; These tests involve the /usr directory, and fails.
|
||||
"not test_remove_dir_prefix"
|
||||
" and not test_argcomplete"
|
||||
;; This test tries to override PYTHONPATH, and
|
||||
;; subsequently fails to locate the test libraries.
|
||||
" and not test_collection"))
|
||||
(format #t "test suite not run~%"))
|
||||
#t)))))
|
||||
(propagated-inputs
|
||||
`(("python-atomicwrites" ,python-atomicwrites)
|
||||
("python-attrs" ,python-attrs-bootstrap)
|
||||
("python-more-itertools" ,python-more-itertools)
|
||||
("python-packaging" ,python-packaging-bootstrap)
|
||||
("python-pluggy" ,python-pluggy)
|
||||
("python-py" ,python-py)
|
||||
("python-six" ,python-six-bootstrap)))
|
||||
("python-six" ,python-six-bootstrap)
|
||||
("python-wcwidth" ,python-wcwidth)))
|
||||
(native-inputs
|
||||
`(;; Tests need the "regular" bash since 'bash-final' lacks `compgen`.
|
||||
("bash" ,bash)
|
||||
|
@ -808,7 +808,8 @@ (define-public python-pytest
|
|||
("python-nose" ,python-nose)
|
||||
("python-mock" ,python-mock)
|
||||
("python-pytest" ,python-pytest-bootstrap)
|
||||
("python-setuptools-scm" ,python-setuptools-scm)))
|
||||
("python-setuptools-scm" ,python-setuptools-scm)
|
||||
("python-xmlschema" ,python-xmlschema)))
|
||||
(home-page "https://docs.pytest.org/en/latest/")
|
||||
(synopsis "Python testing library")
|
||||
(description
|
||||
|
@ -818,15 +819,41 @@ (define-public python-pytest
|
|||
(license license:expat)
|
||||
(properties `((python2-variant . ,(delay python2-pytest))))))
|
||||
|
||||
;; Pytest 4.x are the last versions that support Python 2.
|
||||
(define-public python2-pytest
|
||||
(let ((pytest (package-with-python2
|
||||
(strip-python2-variant python-pytest))))
|
||||
(package
|
||||
(inherit pytest)
|
||||
(propagated-inputs
|
||||
`(("python2-funcsigs" ,python2-funcsigs)
|
||||
("python2-pathlib2" ,python2-pathlib2)
|
||||
,@(package-propagated-inputs pytest))))))
|
||||
(package
|
||||
(inherit (strip-python2-variant python-pytest))
|
||||
(name "python2-pytest")
|
||||
(version "4.6.9")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "pytest" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0fgkmpc31nzy97fxfrkqbzycigdwxwwmninx3qhkzp81migggs0r"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:python ,python-2
|
||||
,@(package-arguments python-pytest)))
|
||||
(propagated-inputs
|
||||
`(("python-atomicwrites" ,python2-atomicwrites)
|
||||
("python-attrs" ,python2-attrs-bootstrap)
|
||||
("python-funcsigs" ,python2-funcsigs)
|
||||
("python-importlib-metadata" ,python2-importlib-metadata-bootstrap)
|
||||
("python-more-itertools" ,python2-more-itertools)
|
||||
("python-packaging" ,python2-packaging-bootstrap)
|
||||
("python-pathlib2" ,python2-pathlib2)
|
||||
("python-pluggy" ,python2-pluggy)
|
||||
("python-py" ,python2-py)
|
||||
("python-six" ,python2-six-bootstrap)
|
||||
("python-wcwidth" ,python2-wcwidth)))
|
||||
(native-inputs
|
||||
`(("bash" ,bash) ;tests require 'compgen'
|
||||
("python-hypothesis" ,python2-hypothesis)
|
||||
("python-nose" ,python2-nose)
|
||||
("python-mock" ,python2-mock)
|
||||
("python-pytest" ,python2-pytest-bootstrap)
|
||||
("python-setuptools-scm" ,python2-setuptools-scm)))))
|
||||
|
||||
(define-public python-pytest-bootstrap
|
||||
(package
|
||||
|
@ -837,24 +864,37 @@ (define-public python-pytest-bootstrap
|
|||
(properties `((python2-variant . ,(delay python2-pytest-bootstrap))))))
|
||||
|
||||
(define-public python2-pytest-bootstrap
|
||||
(let ((pytest (package-with-python2
|
||||
(strip-python2-variant python-pytest-bootstrap))))
|
||||
(package (inherit pytest)
|
||||
(propagated-inputs
|
||||
`(("python2-funcsigs" ,python2-funcsigs-bootstrap)
|
||||
("python2-pathlib2" ,python2-pathlib2-bootstrap)
|
||||
,@(package-propagated-inputs pytest))))))
|
||||
(hidden-package
|
||||
(package/inherit
|
||||
python2-pytest
|
||||
(name "python2-pytest-bootstrap")
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments python2-pytest)
|
||||
((#:tests? _ #f) #f)))
|
||||
(native-inputs
|
||||
`(("python-setuptools-scm" ,python2-setuptools-scm)))
|
||||
(propagated-inputs
|
||||
`(("python-atomicwrites" ,python2-atomicwrites)
|
||||
("python-attrs" ,python2-attrs-bootstrap)
|
||||
("python-funcsigs" ,python2-funcsigs-bootstrap)
|
||||
("python-importlib-metadata" ,python2-importlib-metadata-bootstrap)
|
||||
("python-more-itertools" ,python2-more-itertools)
|
||||
("python-packaging" ,python2-packaging-bootstrap)
|
||||
("python-pathlib2" ,python2-pathlib2-bootstrap)
|
||||
("python-pluggy" ,python2-pluggy-bootstrap)
|
||||
("python-py" ,python2-py)
|
||||
("python-wcwidth" ,python2-wcwidth))))))
|
||||
|
||||
(define-public python-pytest-cov
|
||||
(package
|
||||
(name "python-pytest-cov")
|
||||
(version "2.6.1")
|
||||
(version "2.8.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "pytest-cov" version))
|
||||
(sha256
|
||||
(base32 "0cyxbbghx2l4p60w10k00j1j74q1ngfiffr0pxn73ababjr69dha"))))
|
||||
(base32 "0avzlk9p4nc44k7lpx9109dybq71xqnggxb9f4hp0l64pbc44ryc"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -883,18 +923,28 @@ (define-public python2-pytest-cov
|
|||
(define-public python-pytest-runner
|
||||
(package
|
||||
(name "python-pytest-runner")
|
||||
(version "4.4")
|
||||
(version "5.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "pytest-runner" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1x0d9n40lsiphblbs61rdc0d5r31f6vh0vcahqdv0mffakbnrb80"))))
|
||||
"0awll1bva5zy8cspsxcpv7pjcrdf5c6pf56nqn4f74vvmlzfgiwn"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
'(;; FIXME: The test suite requires 'python-flake8' and 'python-black',
|
||||
;; but that introduces a circular dependency.
|
||||
#:tests? #f
|
||||
#:phases (modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(if tests?
|
||||
(invoke "pytest" "-vv")
|
||||
(format #t "test suite not run~%"))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("python-pytest" ,python-pytest-bootstrap)
|
||||
("python-setuptools-scm" ,python-setuptools-scm)))
|
||||
`(("python-setuptools-scm" ,python-setuptools-scm)))
|
||||
(home-page "https://github.com/pytest-dev/pytest-runner")
|
||||
(synopsis "Invoke py.test as a distutils command")
|
||||
(description
|
||||
|
@ -1385,14 +1435,14 @@ (define-public python2-testrepository
|
|||
(define-public python-coverage
|
||||
(package
|
||||
(name "python-coverage")
|
||||
(version "4.5.3")
|
||||
(version "5.0.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "coverage" version))
|
||||
(sha256
|
||||
(base32
|
||||
"02f6m073qdispn96rc616hg0rnmw1pgqzw3bgxwiwza4zf9hirlx"))))
|
||||
"1vrg8panqw79pswg52ygbrff3wdnxarrd9qz6c64ah0c4h2cmbvp"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
;; FIXME: 95 tests failed, 539 passed, 6 skipped, 2 errors.
|
||||
|
@ -1677,20 +1727,20 @@ (define-public python-pytest-sugar
|
|||
(define-public python-hypothesis
|
||||
(package
|
||||
(name "python-hypothesis")
|
||||
(version "4.18.3")
|
||||
(version "5.4.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "hypothesis" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0a35nwqyjnm4cphi43xracqpkws0ip61mndvqb1iqq7gkva83lb1"))))
|
||||
"0zn09bn6hadk4vxl6jy8bkjr5fz8mrhin3z46w7pq5qgbaycr89p"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
`(("python-flake8" ,python-flake8)
|
||||
("python-pytest" ,python-pytest-bootstrap)))
|
||||
(arguments
|
||||
;; XXX: Tests are not distributed with the PyPI archive.
|
||||
'(#:tests? #f))
|
||||
(propagated-inputs
|
||||
`(("python-attrs" ,python-attrs-bootstrap)
|
||||
("python-coverage" ,python-coverage)))
|
||||
("python-sortedcontainers" ,python-sortedcontainers)))
|
||||
(synopsis "Library for property based testing")
|
||||
(description "Hypothesis is a library for testing your Python code against a
|
||||
much larger range of examples than you would ever want to write by hand. It’s
|
||||
|
@ -1700,10 +1750,18 @@ (define-public python-hypothesis
|
|||
(license license:mpl2.0)
|
||||
(properties `((python2-variant . ,(delay python2-hypothesis))))))
|
||||
|
||||
;; This is the last version of Hypothesis that supports Python 2.
|
||||
(define-public python2-hypothesis
|
||||
(let ((hypothesis (package-with-python2
|
||||
(strip-python2-variant python-hypothesis))))
|
||||
(package (inherit hypothesis)
|
||||
(version "4.57.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "hypothesis" version))
|
||||
(sha256
|
||||
(base32
|
||||
"183gpxbfcdhdqzlahkji5a71n6lmvgqsbkcb0ihqad51n2j6jhrw"))))
|
||||
(propagated-inputs
|
||||
`(("python2-enum34" ,python2-enum34)
|
||||
,@(package-propagated-inputs hypothesis))))))
|
||||
|
@ -2075,7 +2133,9 @@ (define-public behave
|
|||
(uri (pypi-uri "behave" version))
|
||||
(sha256
|
||||
(base32
|
||||
"11hsz365qglvpp1m1w16239c3kiw15lw7adha49lqaakm8kj6rmr"))))
|
||||
"11hsz365qglvpp1m1w16239c3kiw15lw7adha49lqaakm8kj6rmr"))
|
||||
(patches (search-patches
|
||||
"behave-skip-a-couple-of-tests.patch"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
`(("python-mock" ,python-mock)
|
||||
|
@ -2256,13 +2316,13 @@ (define-public python2-nose-timer
|
|||
(define-public python-freezegun
|
||||
(package
|
||||
(name "python-freezegun")
|
||||
(version "0.3.12")
|
||||
(version "0.3.14")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "freezegun" version))
|
||||
(sha256
|
||||
(base32 "1rx57v8ryjncjimg8hys9kx1r3rknvwcl4y340g20jn0sf69qk9a"))))
|
||||
(base32 "0al75mk829j1izxi760b7yjnknjihyfhp2mvi5qiyrxb9cpxwqk2"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
`(("python-mock" ,python-mock)
|
||||
|
@ -2429,11 +2489,21 @@ (define-public libfaketime
|
|||
(let ((out (assoc-ref outputs "out")))
|
||||
(setenv "CC" "gcc")
|
||||
(setenv "PREFIX" out)
|
||||
|
||||
;; XXX: Without this flag, the CLOCK_REALTIME test hangs
|
||||
;; indefinitely. See README.packagers for more information.
|
||||
;; Try removing this for future versions of libfaketime.
|
||||
(setenv "FAKETIME_COMPILE_CFLAGS" "-DFORCE_MONOTONIC_FIX")
|
||||
|
||||
#t)))
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
(substitute* "test/functests/test_exclude_mono.sh"
|
||||
(("/bin/bash") (which "bash")))
|
||||
|
||||
;; Do not fail due to use of 'ftime', which was deprecated in
|
||||
;; glibc 2.31. Remove this for later versions of libfaketime.
|
||||
(setenv "FAKETIME_COMPILE_CFLAGS" "-Wno-deprecated-declarations")
|
||||
#t)))
|
||||
#:test-target "test"))
|
||||
(native-inputs
|
||||
|
@ -2569,6 +2639,19 @@ (define-public python-pyfakefs
|
|||
(define-public python2-pyfakefs
|
||||
(package-with-python2 python-pyfakefs))
|
||||
|
||||
;; This minimal variant is used to avoid a circular dependency between
|
||||
;; python2-importlib-metadata, which requires pyfakefs for its tests, and
|
||||
;; python2-pytest, which requires python2-importlib-metadata.
|
||||
(define-public python2-pyfakefs-bootstrap
|
||||
(hidden-package
|
||||
(package
|
||||
(inherit python2-pyfakefs)
|
||||
(name "python2-pyfakefs-bootstrap")
|
||||
(native-inputs '())
|
||||
(arguments
|
||||
`(#:python ,python-2
|
||||
#:tests? #f)))))
|
||||
|
||||
(define-public python-aiounittest
|
||||
(package
|
||||
(name "python-aiounittest")
|
||||
|
|
|
@ -77,7 +77,7 @@ (define-public chez-scheme
|
|||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("ncurses" ,ncurses)
|
||||
("libuuid" ,util-linux)
|
||||
("libuuid" ,util-linux "lib")
|
||||
("libx11" ,libx11)
|
||||
("xorg-rgb" ,xorg-rgb)
|
||||
("nanopass" ,nanopass)
|
||||
|
|
|
@ -427,18 +427,6 @@ (define opus+custom
|
|||
`(cons "--enable-custom-modes"
|
||||
,flags))))))
|
||||
|
||||
;; Add a custom ld wrapper that supports quoted strings in response files.
|
||||
;; To be merged with 'ld-wrapper' in a future rebuild cycle.
|
||||
(define-public ld-wrapper-next
|
||||
(let ((orig (car (assoc-ref (%final-inputs) "ld-wrapper"))))
|
||||
(package
|
||||
(inherit orig)
|
||||
(name "ld-wrapper-next")
|
||||
(inputs
|
||||
`(("wrapper" ,(search-path %load-path
|
||||
"gnu/packages/ld-wrapper-next.in"))
|
||||
,@(alist-delete "wrapper" (package-inputs orig)))))))
|
||||
|
||||
(define-public ungoogled-chromium
|
||||
(package
|
||||
(name "ungoogled-chromium")
|
||||
|
@ -770,7 +758,6 @@ (define-public ungoogled-chromium
|
|||
("clang" ,clang-9)
|
||||
("gn" ,gn)
|
||||
("gperf" ,gperf)
|
||||
("ld-wrapper" ,ld-wrapper-next)
|
||||
("ninja" ,ninja)
|
||||
("node" ,node)
|
||||
("pkg-config" ,pkg-config)
|
||||
|
@ -799,7 +786,7 @@ (define-public ungoogled-chromium
|
|||
("glib" ,glib)
|
||||
("gtk+" ,gtk+)
|
||||
("harfbuzz" ,harfbuzz)
|
||||
("icu4c" ,icu4c-66.1)
|
||||
("icu4c" ,icu4c)
|
||||
("jsoncpp" ,jsoncpp)
|
||||
("lcms" ,lcms)
|
||||
("libevent" ,libevent)
|
||||
|
|
|
@ -120,7 +120,7 @@ (define-public cuirass
|
|||
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs)))
|
||||
#t))))))
|
||||
(inputs
|
||||
`(("guile" ,guile-2.2)
|
||||
`(("guile" ,guile-3.0)
|
||||
("guile-fibers" ,guile-fibers)
|
||||
("guile-gcrypt" ,guile-gcrypt)
|
||||
("guile-json" ,guile-json-3)
|
||||
|
|
|
@ -51,13 +51,6 @@ (define-public cinnamon-desktop
|
|||
(base32
|
||||
"18mjy80ly9361npjhxpm3n0pkmrwviaqr2kixjb7hyxa6kzzh5xw"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'bootstrap 'skip-premature-configure
|
||||
(lambda _
|
||||
(setenv "NOCONFIGURE" "set")
|
||||
#t)))))
|
||||
;; TODO: package 'libgsystem'.
|
||||
(inputs
|
||||
`(("accountsservice" ,accountsservice)
|
||||
|
|
|
@ -5,10 +5,12 @@
|
|||
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
|
||||
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017, 2018, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
|
||||
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -32,6 +34,7 @@ (define-module (gnu packages cmake)
|
|||
#:use-module (guix utils)
|
||||
#:use-module (guix deprecation)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system emacs)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages backup)
|
||||
|
@ -39,19 +42,63 @@ (define-module (gnu packages cmake)
|
|||
#:use-module (gnu packages crypto)
|
||||
#:use-module (gnu packages curl)
|
||||
#:use-module (gnu packages file)
|
||||
#:use-module (gnu packages hurd)
|
||||
#:use-module (gnu packages libevent)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages serialization)
|
||||
#:use-module (gnu packages sphinx)
|
||||
#:use-module (gnu packages texinfo)
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module (ice-9 match)
|
||||
#:use-module (srfi srfi-1))
|
||||
|
||||
;;; This minimal variant of CMake does not include the documentation. It is
|
||||
;;; used by the cmake-build-system.
|
||||
(define-public cmake-minimal
|
||||
;;; Build phases shared between 'cmake-bootstrap' and the later variants
|
||||
;;; that use cmake-build-system.
|
||||
(define %common-build-phases
|
||||
`((add-after 'unpack 'split-package
|
||||
;; Remove files that have been packaged in other package recipes.
|
||||
(lambda _
|
||||
(delete-file "Auxiliary/cmake-mode.el")
|
||||
(substitute* "Auxiliary/CMakeLists.txt"
|
||||
((".*cmake-mode.el.*") ""))
|
||||
#t))
|
||||
(add-before 'configure 'patch-bin-sh
|
||||
(lambda _
|
||||
;; Replace "/bin/sh" by the right path in... a lot of
|
||||
;; files.
|
||||
(substitute*
|
||||
'("Modules/CompilerId/Xcode-3.pbxproj.in"
|
||||
"Modules/Internal/CPack/CPack.RuntimeScript.in"
|
||||
"Source/cmGlobalXCodeGenerator.cxx"
|
||||
"Source/cmLocalUnixMakefileGenerator3.cxx"
|
||||
"Source/cmExecProgramCommand.cxx"
|
||||
"Utilities/Release/release_cmake.cmake"
|
||||
"Tests/CMakeLists.txt"
|
||||
"Tests/RunCMake/File_Generate/RunCMakeTest.cmake")
|
||||
(("/bin/sh") (which "sh")))
|
||||
#t))))
|
||||
|
||||
(define %common-disabled-tests
|
||||
'(;; This test copies libgcc_s.so.1 from GCC and tries to modify its RPATH,
|
||||
;; but does not cope with the file being read-only.
|
||||
"BundleUtilities"
|
||||
;; This test requires network access.
|
||||
"CTestTestUpload"
|
||||
;; This test requires 'ldconfig' which is not available in Guix.
|
||||
"RunCMake.install"))
|
||||
|
||||
(define %preserved-third-party-files
|
||||
'(;; 'Source/cm_getdate.c' includes archive_getdate.c wholesale, so it must
|
||||
;; be available along with the required headers.
|
||||
"Utilities/cmlibarchive/libarchive/archive_getdate.c"
|
||||
"Utilities/cmlibarchive/libarchive/archive_getdate.h"))
|
||||
|
||||
;;; The "bootstrap" CMake. It is used to build 'cmake-minimal' below, as well
|
||||
;;; as any dependencies that need cmake-build-system.
|
||||
(define-public cmake-bootstrap
|
||||
(package
|
||||
(name "cmake-minimal")
|
||||
(version "3.15.1")
|
||||
(name "cmake-bootstrap")
|
||||
(version "3.16.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.cmake.org/files/v"
|
||||
|
@ -59,23 +106,50 @@ (define-public cmake-minimal
|
|||
"/cmake-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1xyprly3sf4wi0n1x79k4n22yxm6pb7fv70gqr9lvc7qv14cbphq"))
|
||||
(modules '((guix build utils)))
|
||||
"1z4bb8z6b4dvq5hrvajrf1hyybqay3xybyimf71w1jgcp180nxjz"))
|
||||
(modules '((guix build utils)
|
||||
(ice-9 ftw)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Drop bundled software.
|
||||
(with-directory-excursion "Utilities"
|
||||
(for-each delete-file-recursively
|
||||
'("cmbzip2"
|
||||
;; "cmcompress"
|
||||
"cmcurl"
|
||||
"cmexpat"
|
||||
;; "cmjsoncpp"
|
||||
;; "cmlibarchive"
|
||||
"cmliblzma"
|
||||
;; "cmlibuv"
|
||||
"cmzlib"))
|
||||
#t)))))
|
||||
`(begin
|
||||
;; CMake bundles its dependencies in the "Utilities" directory.
|
||||
;; Delete those to ensure the system libraries are used.
|
||||
(define preserved-files
|
||||
'(,@%preserved-third-party-files
|
||||
;; Use the bundled JsonCpp during bootstrap to work around
|
||||
;; a circular dependency. TODO: JsonCpp can be built with
|
||||
;; Meson instead of CMake, but meson-build-system currently
|
||||
;; does not support cross-compilation.
|
||||
"Utilities/cmjsoncpp"
|
||||
;; LibUV is required to bootstrap the initial build system.
|
||||
"Utilities/cmlibuv"))
|
||||
|
||||
(file-system-fold (lambda (dir stat result) ;enter?
|
||||
(or (string=? "Utilities" dir) ;init
|
||||
;; The bundled dependencies are
|
||||
;; distinguished by having a "cm"
|
||||
;; prefix to their upstream names.
|
||||
(and (string-prefix? "Utilities/cm" dir)
|
||||
(not (member dir preserved-files)))))
|
||||
(lambda (file stat result) ;leaf
|
||||
(unless (or (member file preserved-files)
|
||||
;; Preserve top-level files.
|
||||
(string=? "Utilities"
|
||||
(dirname file)))
|
||||
(delete-file file)))
|
||||
(const #t) ;down
|
||||
(lambda (dir stat result) ;up
|
||||
(when (equal? (scandir dir) '("." ".."))
|
||||
(rmdir dir)))
|
||||
(const #t) ;skip
|
||||
(lambda (file stat errno result)
|
||||
(format (current-error-port)
|
||||
"warning: failed to delete ~a: ~a~%"
|
||||
file (strerror errno)))
|
||||
#t
|
||||
"Utilities"
|
||||
lstat)
|
||||
#t))
|
||||
(patches (search-patches "cmake-curl-certificates.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
|
@ -86,7 +160,7 @@ (define-public cmake-minimal
|
|||
(string-append "--parallel=" parallel-job-count)
|
||||
(string-append "--prefix=" out)
|
||||
"--system-libs"
|
||||
"--no-system-jsoncpp" ; FIXME: Circular dependency.
|
||||
"--no-system-jsoncpp"
|
||||
;; By default, the man pages and other docs land
|
||||
;; in PREFIX/man and PREFIX/doc, but we want them
|
||||
;; in share/{man,doc}. Note that unlike
|
||||
|
@ -95,14 +169,18 @@ (define-public cmake-minimal
|
|||
;; to --mandir and --docdir.
|
||||
"--mandir=share/man"
|
||||
,(string-append "--docdir=share/doc/cmake-"
|
||||
(version-major+minor version))))
|
||||
(version-major+minor version))
|
||||
|
||||
;; By default CMake is built without any optimizations. Use
|
||||
;; the recommended Release target for a ~2.5x speedup.
|
||||
"--" "-DCMAKE_BUILD_TYPE=Release"))
|
||||
#:make-flags
|
||||
(let ((skipped-tests
|
||||
(list "BundleUtilities" ; This test fails on Guix.
|
||||
(list ,@%common-disabled-tests
|
||||
"CTestTestSubdir" ; This test fails to build 2 of the 3 tests.
|
||||
;; These tests requires network access.
|
||||
"CTestCoverageCollectGCOV"
|
||||
"CTestTestUpload")))
|
||||
;; This test fails when ARGS (below) is in use, see
|
||||
;; <https://gitlab.kitware.com/cmake/cmake/issues/17165>.
|
||||
"CTestCoverageCollectGCOV")))
|
||||
(list
|
||||
(string-append
|
||||
;; These arguments apply for the tests only.
|
||||
|
@ -111,29 +189,7 @@ (define-public cmake-minimal
|
|||
" --exclude-regex ^\\(" (string-join skipped-tests "\\|") "\\)$")))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'split-package
|
||||
;; Remove files that have been packaged in other package recipes.
|
||||
(lambda _
|
||||
(delete-file "Auxiliary/cmake-mode.el")
|
||||
(substitute* "Auxiliary/CMakeLists.txt"
|
||||
((".*cmake-mode.el.*") ""))
|
||||
#t))
|
||||
(add-before 'configure 'patch-bin-sh
|
||||
(lambda _
|
||||
;; Replace "/bin/sh" by the right path in... a lot of
|
||||
;; files.
|
||||
(substitute*
|
||||
'("Modules/CompilerId/Xcode-3.pbxproj.in"
|
||||
"Modules/CPack.RuntimeScript.in"
|
||||
"Source/cmGlobalXCodeGenerator.cxx"
|
||||
"Source/cmLocalUnixMakefileGenerator3.cxx"
|
||||
"Source/cmExecProgramCommand.cxx"
|
||||
"Utilities/Release/release_cmake.cmake"
|
||||
"Utilities/cmlibarchive/libarchive/archive_write_set_format_shar.c"
|
||||
"Tests/CMakeLists.txt"
|
||||
"Tests/RunCMake/File_Generate/RunCMakeTest.cmake")
|
||||
(("/bin/sh") (which "sh")))
|
||||
#t))
|
||||
,@%common-build-phases
|
||||
(add-before 'configure 'set-paths
|
||||
(lambda _
|
||||
;; Help cmake's bootstrap process to find system libraries
|
||||
|
@ -148,18 +204,31 @@ (define-public cmake-minimal
|
|||
(apply invoke "./configure" configure-flags))))))
|
||||
(inputs
|
||||
`(("bzip2" ,bzip2)
|
||||
("curl" ,curl)
|
||||
("curl" ,curl-minimal)
|
||||
("expat" ,expat)
|
||||
("file" ,file)
|
||||
("libarchive" ,libarchive)
|
||||
("libuv" ,libuv)
|
||||
("ncurses" ,ncurses) ; required for ccmake
|
||||
,@(if (hurd-target?)
|
||||
'()
|
||||
`(("libuv" ,libuv))) ;not supported on the Hurd
|
||||
("ncurses" ,ncurses) ;required for ccmake
|
||||
("rhash" ,rhash)
|
||||
("zlib" ,zlib)))
|
||||
(native-search-paths
|
||||
(list (search-path-specification
|
||||
(variable "CMAKE_PREFIX_PATH")
|
||||
(files '("")))))
|
||||
(files '("")))
|
||||
;; "cmake-curl-certificates.patch" changes CMake to honor 'SSL_CERT_DIR'
|
||||
;; and 'SSL_CERT_FILE', hence these search path entries.
|
||||
(search-path-specification
|
||||
(variable "SSL_CERT_DIR")
|
||||
(separator #f) ;single entry
|
||||
(files '("etc/ssl/certs")))
|
||||
(search-path-specification
|
||||
(variable "SSL_CERT_FILE")
|
||||
(file-type 'regular)
|
||||
(separator #f) ;single entry
|
||||
(files '("etc/ssl/certs/ca-certificates.crt")))))
|
||||
(home-page "https://cmake.org/")
|
||||
(synopsis "Cross-platform build system")
|
||||
(description
|
||||
|
@ -169,23 +238,84 @@ (define-public cmake-minimal
|
|||
and workspaces that can be used in the compiler environment of your choice.")
|
||||
(properties '((hidden? . #t)))
|
||||
(license (list license:bsd-3 ; cmake
|
||||
license:bsd-4 ; cmcompress
|
||||
license:bsd-2 ; cmlibarchive
|
||||
license:expat ; cmjsoncpp is dual MIT/public domain
|
||||
license:public-domain)))) ; cmlibarchive/archive_getdate.c
|
||||
|
||||
;;; This minimal variant of CMake does not include the documentation. It is
|
||||
;;; used by the cmake-build-system.
|
||||
(define-public cmake-minimal
|
||||
(package
|
||||
(inherit cmake-bootstrap)
|
||||
(name "cmake-minimal")
|
||||
(source (origin
|
||||
(inherit (package-source cmake-bootstrap))
|
||||
(snippet
|
||||
(match (origin-snippet (package-source cmake-bootstrap))
|
||||
((_ _ exp ...)
|
||||
;; Now we can delete the remaining software bundles.
|
||||
(append `(begin
|
||||
(define preserved-files ',%preserved-third-party-files))
|
||||
exp))))))
|
||||
(inputs
|
||||
`(("curl" ,curl)
|
||||
("jsoncpp" ,jsoncpp)
|
||||
,@(alist-delete "curl" (package-inputs cmake-bootstrap))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list "-DCMAKE_USE_SYSTEM_LIBRARIES=ON"
|
||||
(string-append "-DCMAKE_DOC_DIR=share/doc/cmake-"
|
||||
,(version-major+minor (package-version
|
||||
cmake-bootstrap))))
|
||||
|
||||
;; This is the CMake used in cmake-build-system. Ensure compiler
|
||||
;; optimizations are enabled to save size and CPU cycles.
|
||||
#:build-type "Release"
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
,@%common-build-phases
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? parallel-tests? #:allow-other-keys)
|
||||
(let ((skipped-tests (list ,@%common-disabled-tests
|
||||
;; This test requires the bundled libuv.
|
||||
"BootstrapTest")))
|
||||
(if tests?
|
||||
(begin
|
||||
(invoke "ctest" "-j" (if parallel-tests?
|
||||
(number->string (parallel-job-count))
|
||||
"1")
|
||||
"--exclude-regex"
|
||||
(string-append "^(" (string-join skipped-tests "|") ")$")))
|
||||
(format #t "test suite not run~%"))
|
||||
#t))))
|
||||
,@(if (%current-target-system)
|
||||
'()
|
||||
`(#:cmake ,cmake-bootstrap))))))
|
||||
|
||||
;;; The "user-facing" CMake, now with manuals and HTML documentation.
|
||||
(define-public cmake
|
||||
(package
|
||||
(inherit cmake-minimal)
|
||||
(name "cmake")
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments cmake-minimal)
|
||||
((#:configure-flags configure-flags ''())
|
||||
`(append ,configure-flags
|
||||
;; Extra configure flags used to generate the documentation.
|
||||
'("--sphinx-info"
|
||||
"--sphinx-man"
|
||||
"--sphinx-html")))
|
||||
;; Use cmake-minimal this time.
|
||||
((#:cmake _ #f)
|
||||
(if (%current-target-system)
|
||||
cmake-minimal-cross
|
||||
cmake-minimal))
|
||||
|
||||
;; Enable debugging information for convenience.
|
||||
((#:build-type _ #f) "RelWithDebInfo")
|
||||
|
||||
((#:configure-flags flags ''())
|
||||
`(append (list "-DSPHINX_INFO=ON" "-DSPHINX_MAN=ON" "-DSPHINX_HTML=ON"
|
||||
(string-append "-DCMAKE_DOC_DIR=share/doc/cmake-"
|
||||
,(version-major+minor (package-version
|
||||
cmake-minimal)))
|
||||
"-DCMAKE_INFO_DIR=share/info"
|
||||
"-DCMAKE_MAN_DIR=share/man")
|
||||
,flags))
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(add-after 'install 'move-html-doc
|
||||
|
@ -208,45 +338,13 @@ (define-public cmake
|
|||
(outputs '("out" "doc"))
|
||||
(properties (alist-delete 'hidden? (package-properties cmake-minimal)))))
|
||||
|
||||
(define-public cmake-3.15.5
|
||||
;; CMake 3.15.5 fixes some issues, but declare another version to
|
||||
;; avoid triggering the rebuild of all CMake-based packages.
|
||||
;; See <https://issues.guix.gnu.org/issue/38060>.
|
||||
;;
|
||||
;; Furthermore, this variant fixes X.509 certificate lookup:
|
||||
;; <https://issues.guix.gnu.org/issue/37371>.
|
||||
(define-public cmake-minimal-cross
|
||||
(package
|
||||
(inherit cmake)
|
||||
(version "3.15.5")
|
||||
(source (origin
|
||||
(inherit (package-source cmake))
|
||||
(uri (string-append "https://www.cmake.org/files/v"
|
||||
(version-major+minor version)
|
||||
"/cmake-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1d5y8d92axcc6rfqlsxamayfs3fc1vdby91hn5mx1kn02ppprpgv"))
|
||||
(patches
|
||||
(append (search-patches "cmake-curl-certificates.patch")
|
||||
(origin-patches (package-source cmake))))))
|
||||
|
||||
(native-search-paths
|
||||
;; "cmake-curl-certificates.patch" changes CMake to honor 'SSL_CERT_DIR'
|
||||
;; and 'SSL_CERT_FILE', hence these search path entries.
|
||||
(append (list (search-path-specification
|
||||
(variable "SSL_CERT_DIR")
|
||||
(separator #f) ;single entry
|
||||
(files '("etc/ssl/certs")))
|
||||
(search-path-specification
|
||||
(variable "SSL_CERT_FILE")
|
||||
(file-type 'regular)
|
||||
(separator #f) ;single entry
|
||||
(files '("etc/ssl/certs/ca-certificates.crt"))))
|
||||
(package-native-search-paths cmake)))))
|
||||
|
||||
;; This was cmake@3.15.1 plus "cmake-curl-certificates.patch".
|
||||
(define-deprecated cmake/fixed cmake-3.15.5)
|
||||
(export cmake/fixed)
|
||||
(inherit cmake-minimal)
|
||||
(name "cmake-minimal-cross")
|
||||
(native-search-paths '())
|
||||
(search-paths
|
||||
(package-native-search-paths cmake-minimal))))
|
||||
|
||||
(define-public emacs-cmake-mode
|
||||
(package
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
|
||||
(define-module (gnu packages code)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
|
@ -660,9 +661,24 @@ (define-public indent
|
|||
;; overrides this to be in PREFIX/doc. Fix this.
|
||||
(substitute* "doc/Makefile.in"
|
||||
(("^docdir = .*$") "docdir = @docdir@\n"))
|
||||
#t))
|
||||
(add-after 'unpack 'fix-configure
|
||||
(lambda* (#:key inputs native-inputs #:allow-other-keys)
|
||||
;; Replace outdated config.sub and config.guess:
|
||||
(with-directory-excursion "config"
|
||||
(for-each (lambda (file)
|
||||
(install-file
|
||||
(string-append (assoc-ref
|
||||
(or native-inputs inputs) "automake")
|
||||
"/share/automake-"
|
||||
,(version-major+minor
|
||||
(package-version automake))
|
||||
"/" file) "."))
|
||||
'("config.sub" "config.guess")))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("texinfo" ,texinfo)))
|
||||
`(("texinfo" ,texinfo)
|
||||
("automake" ,automake))) ; For up to date 'config.guess' and 'config.sub'.
|
||||
(synopsis "Code reformatter")
|
||||
(description
|
||||
"Indent is a program that makes source code easier to read by
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -270,16 +270,14 @@ (define-public gzip
|
|||
(define-public bzip2
|
||||
(package
|
||||
(name "bzip2")
|
||||
(version "1.0.6")
|
||||
(version "1.0.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
;; XXX The bzip.org domain was allowed to expire.
|
||||
(uri (string-append "https://web.archive.org/web/20180624184806/"
|
||||
"http://www.bzip.org/"
|
||||
version "/bzip2-" version ".tar.gz"))
|
||||
(uri (string-append "https://sourceware.org/pub/bzip2/bzip2-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1kfrc7f0ja9fdn6j1y6yir6li818npy6217hvr3wzmnmzhs8z152"))))
|
||||
"0s92986cv0p692icqlw1j42y9nld8zd83qwhzbqd61p1dqbh6nmb"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:modules ((guix build gnu-build-system)
|
||||
|
@ -288,6 +286,22 @@ (define-public bzip2
|
|||
(srfi srfi-1))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'set-paths 'hide-input-bzip2
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((bzip2 (assoc-ref inputs "bzip2")))
|
||||
(if bzip2
|
||||
;; Prevent the build system from retaining a reference to
|
||||
;; BZIP2 from INPUTS.
|
||||
(begin
|
||||
(setenv "LIBRARY_PATH"
|
||||
(string-join (delete (string-append bzip2 "/lib")
|
||||
(string-split (getenv "LIBRARY_PATH")
|
||||
#\:))
|
||||
":"))
|
||||
(format #t "environment variable `LIBRARY_PATH' set to `~a'~%"
|
||||
(getenv "LIBRARY_PATH")))
|
||||
(format #t "no bzip2 found, nothing done~%"))
|
||||
#t)))
|
||||
(replace 'configure
|
||||
(lambda* (#:key target #:allow-other-keys)
|
||||
(when ,(%current-target-system)
|
||||
|
@ -1345,18 +1359,18 @@ (define-public unshield
|
|||
(define-public zstd
|
||||
(package
|
||||
(name "zstd")
|
||||
(version "1.4.2")
|
||||
(version "1.4.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/facebook/zstd/releases/download/"
|
||||
"v" version "/zstd-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1ja3nrjynmiwwdjrf6crraizkbagp7y414bqqq2ady91nn1hjwqj"))))
|
||||
(base32 "05ckxap00qvc0j51d3ci38150cxsw82w7s9zgd5fgzspnzmp1vsr"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" ;1.1MiB executables and documentation
|
||||
"lib" ;1MiB shared library and headers
|
||||
"static")) ;1MiB static library
|
||||
(outputs '("out" ;1.2MiB executables and documentation
|
||||
"lib" ;1.2MiB shared library and headers
|
||||
"static")) ;1.2MiB static library
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
|
@ -1376,12 +1390,10 @@ (define-public zstd
|
|||
(delete-file ar))
|
||||
(find-files shared-libs "\\.a$"))
|
||||
|
||||
;; While here, remove prefix= from the pkg-config file because it
|
||||
;; is unused, and because it contains a needless reference to $out.
|
||||
;; XXX: It would be great if #:disallow-references worked between
|
||||
;; outputs.
|
||||
;; Make sure the pkg-config file refers to the right output.
|
||||
(substitute* (string-append shared-libs "/pkgconfig/libzstd.pc")
|
||||
(("^prefix=.*") ""))
|
||||
(("^prefix=.*")
|
||||
(string-append "prefix=" lib "\n")))
|
||||
|
||||
#t))))
|
||||
#:make-flags
|
||||
|
@ -1558,13 +1570,13 @@ (define-public zziplib
|
|||
(package
|
||||
(name "zziplib")
|
||||
(version "0.13.69")
|
||||
(replacement zziplib/fixed)
|
||||
(home-page "https://github.com/gdraheim/zziplib")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference (url home-page)
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(patches (search-patches "zziplib-CVE-2018-16548.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"0fbk9k7ryas2wh2ykwkvm1pbi40i88rfvc3dydh9xyd7w2jcki92"))))
|
||||
|
@ -1596,13 +1608,6 @@ (define-public zziplib
|
|||
;; files carry the Zlib license; see "docs/copying.html" for details.
|
||||
(license (list license:lgpl2.0+ license:mpl1.1))))
|
||||
|
||||
(define zziplib/fixed
|
||||
(package
|
||||
(inherit zziplib)
|
||||
(source (origin
|
||||
(inherit (package-source zziplib))
|
||||
(patches (search-patches "zziplib-CVE-2018-16548.patch"))))))
|
||||
|
||||
(define-public libzip
|
||||
(package
|
||||
(name "libzip")
|
||||
|
@ -1791,17 +1796,7 @@ (define-public innoextract
|
|||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-before 'configure 'glibc-is-already-a-system-library
|
||||
(lambda _
|
||||
;; Prevent the build system from passing the glibc
|
||||
;; header files to GCC as "system headers", because
|
||||
;; it conflicts with the system headers already known
|
||||
;; to GCC, causing #include_next failures.
|
||||
(substitute* "CMakeLists.txt"
|
||||
(("include_directories\\(SYSTEM \\$\\{iconv")
|
||||
"include_directories(${iconv"))
|
||||
#t)))))
|
||||
#:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON")))
|
||||
(inputs `(("boost" ,boost)
|
||||
("libiconv" ,libiconv)
|
||||
("xz" ,xz)))
|
||||
|
|
|
@ -1480,7 +1480,7 @@ (define-public r-jpeg
|
|||
(base32
|
||||
"1a8mi70x79a691r40yiw684jkg1mr9n8agkxlcksxcnrdybs9c0x"))))
|
||||
(build-system r-build-system)
|
||||
(inputs `(("libjpeg" ,libjpeg)))
|
||||
(inputs `(("libjpeg" ,libjpeg-turbo)))
|
||||
(home-page "https://www.rforge.net/jpeg/")
|
||||
(synopsis "Read and write JPEG images with R")
|
||||
(description "This package provides a way to read, write and display
|
||||
|
@ -9900,7 +9900,7 @@ (define-public r-tiff
|
|||
(build-system r-build-system)
|
||||
(inputs
|
||||
`(("libtiff" ,libtiff)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("zlib" ,zlib)))
|
||||
(home-page "https://www.rforge.net/tiff/")
|
||||
(synopsis "Read and write TIFF images")
|
||||
|
@ -18630,7 +18630,7 @@ (define-public r-readbitmap
|
|||
(properties `((upstream-name . "readbitmap")))
|
||||
(build-system r-build-system)
|
||||
(inputs
|
||||
`(("libjpeg" ,libjpeg)
|
||||
`(("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)))
|
||||
(propagated-inputs
|
||||
`(("r-bmp" ,r-bmp)
|
||||
|
|
|
@ -4,8 +4,9 @@
|
|||
;;; Copyright © 2016, 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2019 Carl Dong <contact@carldong.me>
|
||||
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -54,8 +55,11 @@ (define-syntax %xgcc
|
|||
|
||||
(define %gcc-include-paths
|
||||
;; Environment variables for header search paths.
|
||||
;; Note: See <http://bugs.gnu.org/30756> for why not 'C_INCLUDE_PATH' & co.
|
||||
'("CPATH"))
|
||||
;; Note: See <http://bugs.gnu.org/22186> for why not 'CPATH'.
|
||||
'("C_INCLUDE_PATH"
|
||||
"CPLUS_INCLUDE_PATH"
|
||||
"OBJC_INCLUDE_PATH"
|
||||
"OBJCPLUS_INCLUDE_PATH"))
|
||||
|
||||
(define %gcc-cross-include-paths
|
||||
;; Search path for target headers when cross-compiling.
|
||||
|
@ -70,8 +74,8 @@ (define (cross p target)
|
|||
`(cons ,(string-append "--target=" target)
|
||||
,flags))))))
|
||||
|
||||
(define (cross-binutils target)
|
||||
"Return a cross-Binutils for TARGET."
|
||||
(define* (cross-binutils target #:optional (binutils binutils))
|
||||
"Return a cross-Binutils for TARGET using BINUTILS."
|
||||
(let ((binutils (package (inherit binutils)
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments
|
||||
|
@ -158,6 +162,13 @@ (define (cross-gcc-arguments target xgcc libc)
|
|||
"--disable-libsanitizer"
|
||||
))
|
||||
|
||||
;; Install cross-built libraries such as libgcc_s.so in
|
||||
;; the "lib" output.
|
||||
,@(if libc
|
||||
`((string-append "--with-toolexeclibdir="
|
||||
(assoc-ref %outputs "lib")
|
||||
"/" ,target "/lib"))
|
||||
'())
|
||||
;; For a newlib (non-glibc) target
|
||||
,@(if (cross-newlib? target)
|
||||
'("--with-newlib")
|
||||
|
@ -176,19 +187,7 @@ (define (cross-gcc-arguments target xgcc libc)
|
|||
,flags))
|
||||
flags))
|
||||
((#:phases phases)
|
||||
`(cross-gcc-build-phases
|
||||
,target
|
||||
(modify-phases ,phases
|
||||
(add-before 'configure 'treat-glibc-as-system-header
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((libc (assoc-ref inputs "libc")))
|
||||
(when libc
|
||||
;; For GCC6 and later, make sure Glibc is treated as a "system
|
||||
;; header" such that #include_next does the right thing.
|
||||
(for-each (lambda (var)
|
||||
(setenv var (string-append libc "/include")))
|
||||
'("CROSS_C_INCLUDE_PATH" "CROSS_CPLUS_INCLUDE_PATH")))
|
||||
#t))))))))))
|
||||
`(cross-gcc-build-phases ,target ,phases))))))
|
||||
|
||||
(define (cross-gcc-patches xgcc target)
|
||||
"Return GCC patches needed for XGCC and TARGET."
|
||||
|
@ -204,12 +203,19 @@ (define (cross-gcc-patches xgcc target)
|
|||
|
||||
(define (cross-gcc-snippet target)
|
||||
"Return GCC snippet needed for TARGET."
|
||||
(cond ((target-mingw? target)
|
||||
'(begin
|
||||
(copy-recursively "libstdc++-v3/config/os/mingw32-w64"
|
||||
"libstdc++-v3/config/os/newlib")
|
||||
#t))
|
||||
(else #f)))
|
||||
`(begin
|
||||
,@(if (target-mingw? target)
|
||||
'((copy-recursively "libstdc++-v3/config/os/mingw32-w64"
|
||||
"libstdc++-v3/config/os/newlib"))
|
||||
'())
|
||||
;; TOOLDIR_BASE_PREFIX is erroneous when using a separate "lib"
|
||||
;; output. Specify it correctly, otherwise GCC won't find its shared
|
||||
;; libraries installed in the "lib" output. See:
|
||||
;; https://lists.gnu.org/archive/html/bug-guix/2020-03/msg00196.html.
|
||||
(substitute* "gcc/Makefile.in"
|
||||
(("-DTOOLDIR_BASE_PREFIX=[^ ]*")
|
||||
"-DTOOLDIR_BASE_PREFIX=\\\"../../../../\\\""))
|
||||
#t))
|
||||
|
||||
(define* (cross-gcc target
|
||||
#:key
|
||||
|
@ -224,22 +230,26 @@ (define* (cross-gcc target
|
|||
(name (string-append "gcc-cross-"
|
||||
(if libc "" "sans-libc-")
|
||||
target))
|
||||
(source (origin (inherit (package-source xgcc))
|
||||
(patches
|
||||
(append
|
||||
(origin-patches (package-source xgcc))
|
||||
(cons (cond
|
||||
((version>=? (package-version xgcc) "8.0") (search-patch "gcc-8-cross-environment-variables.patch"))
|
||||
((version>=? (package-version xgcc) "6.0") (search-patch "gcc-6-cross-environment-variables.patch"))
|
||||
(else (search-patch "gcc-cross-environment-variables.patch")))
|
||||
(cross-gcc-patches xgcc target))))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
(cross-gcc-snippet target))))
|
||||
(source
|
||||
(origin
|
||||
(inherit (package-source xgcc))
|
||||
(patches
|
||||
(append
|
||||
(origin-patches (package-source xgcc))
|
||||
(append (cond
|
||||
((version>=? (package-version xgcc) "8.0")
|
||||
(search-patches "gcc-8-cross-environment-variables.patch"))
|
||||
((version>=? (package-version xgcc) "6.0")
|
||||
(search-patches "gcc-7-cross-toolexeclibdir.patch"
|
||||
"gcc-6-cross-environment-variables.patch"))
|
||||
(else
|
||||
(search-patches "gcc-cross-environment-variables.patch")))
|
||||
(cross-gcc-patches xgcc target))))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
(cross-gcc-snippet target))))
|
||||
|
||||
;; For simplicity, use a single output. Otherwise libgcc_s & co. are not
|
||||
;; found by default, etc.
|
||||
(outputs '("out"))
|
||||
(outputs '("out" "lib"))
|
||||
|
||||
(arguments
|
||||
`(#:implicit-inputs? #f
|
||||
|
@ -261,27 +271,31 @@ (define* (cross-gcc target
|
|||
#:binutils xbinutils))
|
||||
("binutils-cross" ,xbinutils)
|
||||
|
||||
;; Call it differently so that the builder can check whether the "libc"
|
||||
;; input is #f.
|
||||
("libc-native" ,@(assoc-ref (%final-inputs) "libc"))
|
||||
|
||||
;; Remaining inputs.
|
||||
,@(let ((inputs (append (package-inputs xgcc)
|
||||
(alist-delete "libc" (%final-inputs)))))
|
||||
(fold alist-delete (%final-inputs)
|
||||
'("libc" "libc:static"))
|
||||
|
||||
;; Call it differently so that the builder can
|
||||
;; check whether the "libc" input is #f.
|
||||
`(("libc-native"
|
||||
,@(assoc-ref (%final-inputs) "libc"))
|
||||
("libc-native:static"
|
||||
,@(assoc-ref (%final-inputs)
|
||||
"libc:static"))))))
|
||||
(cond
|
||||
((target-mingw? target)
|
||||
(if libc
|
||||
`(("libc" ,libc)
|
||||
,@inputs)
|
||||
`(("mingw-source" ,(package-source mingw-w64))
|
||||
,@inputs)))
|
||||
`(,@inputs
|
||||
("libc" ,libc))
|
||||
`(,@inputs
|
||||
("mingw-source" ,(package-source mingw-w64)))))
|
||||
(libc
|
||||
`(("libc" ,libc)
|
||||
`(,@inputs
|
||||
("libc" ,libc)
|
||||
("libc:static" ,libc "static")
|
||||
("xkernel-headers" ;the target headers
|
||||
,@(assoc-ref (package-propagated-inputs libc)
|
||||
"kernel-headers"))
|
||||
,@inputs))
|
||||
"kernel-headers"))))
|
||||
(else inputs)))))
|
||||
|
||||
(inputs '())
|
||||
|
@ -293,7 +307,15 @@ (define* (cross-gcc target
|
|||
(map (lambda (variable)
|
||||
(search-path-specification
|
||||
(variable variable)
|
||||
(files '("include"))))
|
||||
|
||||
;; Add 'include/c++' here so that <cstdlib>'s
|
||||
;; "#include_next <stdlib.h>" finds GCC's
|
||||
;; <stdlib.h>, not libc's.
|
||||
(files (match variable
|
||||
("CROSS_CPLUS_INCLUDE_PATH"
|
||||
'("include/c++" "include"))
|
||||
(_
|
||||
'("include"))))))
|
||||
%gcc-cross-include-paths)))
|
||||
(native-search-paths '())))
|
||||
|
||||
|
@ -499,7 +521,16 @@ (define* (cross-libc target
|
|||
(("/[^ ]+/lib/libc.so.0.3")
|
||||
(string-append out "/lib/libc.so.0.3"
|
||||
" libmachuser.so libhurduser.so"))))
|
||||
#t)))
|
||||
#t))
|
||||
;; TODO: move to glibc in the next rebuild cycle
|
||||
(add-after 'unpack 'patch-libc/hurd
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(for-each
|
||||
(lambda (name)
|
||||
(let ((patch (assoc-ref inputs name)))
|
||||
(invoke "patch" "-p1" "--force" "-i" patch)))
|
||||
'("hurd-mach-print.patch"
|
||||
"hurd-gettyent.patch")))))
|
||||
'())))))
|
||||
|
||||
;; Shadow the native "kernel-headers" because glibc's recipe expects the
|
||||
|
@ -515,7 +546,12 @@ (define* (cross-libc target
|
|||
,@(if (hurd-triplet? target)
|
||||
`(("cross-mig"
|
||||
,@(assoc-ref (package-native-inputs xheaders)
|
||||
"cross-mig")))
|
||||
"cross-mig"))
|
||||
;; TODO: move to glibc in the next rebuild cycle
|
||||
("hurd-mach-print.patch"
|
||||
,@(search-patches "glibc-hurd-mach-print.patch"))
|
||||
("hurd-gettyent.patch"
|
||||
,@(search-patches "glibc-hurd-gettyent.patch")))
|
||||
'())
|
||||
,@(package-inputs libc) ;FIXME: static-bash
|
||||
,@(package-native-inputs libc))))))
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
|
||||
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
|
||||
;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org>
|
||||
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -715,19 +716,28 @@ (define-public libb2
|
|||
(define-public rhash
|
||||
(package
|
||||
(name "rhash")
|
||||
(version "1.3.8")
|
||||
(version "1.3.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/rhash/RHash/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(uri (string-append "mirror://sourceforge/rhash/rhash/" version
|
||||
"/rhash-" version "-src.tar.gz"))
|
||||
(file-name (string-append "rhash-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0k60ywyhwqwqxa2q2l85vwgf884hcgy31nxir3dqgz7ymib6llxy"))))
|
||||
"1xn9fqa6rlnhsbgami45g82dlw9i1skg2sri3ydiinwak5ph1ca2"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
`(#:configure-flags
|
||||
(list (string-append "--prefix=" (assoc-ref %outputs "out"))
|
||||
,@(let ((target (%current-target-system)))
|
||||
(if target
|
||||
`((string-append "--target=" ,target)
|
||||
(string-append "--cc="
|
||||
(assoc-ref %build-inputs "cross-gcc")
|
||||
"/bin/" ,target "-gcc"))
|
||||
'())))
|
||||
#:make-flags
|
||||
;; The binaries in /bin need some help finding librhash.so.0.
|
||||
(list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib"))
|
||||
#:test-target "test" ; ‘make check’ just checks the sources
|
||||
|
@ -736,9 +746,13 @@ (define-public rhash
|
|||
(replace 'configure
|
||||
;; ./configure is not GNU autotools' and doesn't gracefully handle
|
||||
;; unrecognized options, so we must call it manually.
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(invoke "./configure"
|
||||
(string-append "--prefix=" (assoc-ref outputs "out")))))
|
||||
(lambda* (#:key configure-flags #:allow-other-keys)
|
||||
(apply invoke "./configure" configure-flags)))
|
||||
(add-before 'check 'patch-/bin/sh
|
||||
(lambda _
|
||||
(substitute* "Makefile"
|
||||
(("/bin/sh") (which "sh")))
|
||||
#t))
|
||||
(add-after 'install 'install-library-extras
|
||||
(lambda* (#:key make-flags #:allow-other-keys)
|
||||
(apply invoke
|
||||
|
|
|
@ -62,7 +62,7 @@ (define-public cryptsetup
|
|||
("libgcrypt" ,libgcrypt)
|
||||
("lvm2" ,lvm2) ; device-mapper
|
||||
("popt" ,popt)
|
||||
("util-linux" ,util-linux))) ; libuuid
|
||||
("util-linux" ,util-linux "lib"))) ;libuuid
|
||||
(synopsis "Hard disk encryption tool")
|
||||
(description
|
||||
"LUKS (Linux Unified Key Setup)/Cryptsetup provides a standard on-disk
|
||||
|
@ -142,6 +142,6 @@ (define-public cryptsetup-static
|
|||
("libgcrypt" ,libgcrypt-static)
|
||||
("lvm2" ,lvm2-static)
|
||||
("util-linux" ,util-linux "static")
|
||||
("util-linux" ,util-linux)
|
||||
("util-linux" ,util-linux "lib")
|
||||
("popt" ,popt))))
|
||||
(synopsis "Hard disk encryption tool (statically linked)")))
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2017 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -158,7 +159,7 @@ (define-public cups-filters
|
|||
("ijs" ,ijs)
|
||||
("dbus" ,dbus)
|
||||
("lcms" ,lcms)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("libtiff" ,libtiff)
|
||||
("glib" ,glib)
|
||||
|
@ -536,7 +537,20 @@ (define-public hplip
|
|||
(string-append "rulessystemdir = " out
|
||||
"/lib/systemd/system"))
|
||||
(("/etc/sane.d")
|
||||
(string-append out "/etc/sane.d"))))))
|
||||
(string-append out "/etc/sane.d")))
|
||||
#t)))
|
||||
(add-before 'configure 'fix-build-with-python-3.8
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((python (assoc-ref inputs "python")))
|
||||
;; XXX: The configure script of looks for Python headers in the
|
||||
;; wrong places as of version 3.20.3. Help it by adding the
|
||||
;; include directory on C_INCLUDE_PATH.
|
||||
(when python
|
||||
(setenv "C_INCLUDE_PATH"
|
||||
(string-append python "/include/python"
|
||||
(python:python-version python)
|
||||
":" (getenv "C_INCLUDE_PATH"))))
|
||||
#t)))
|
||||
(add-after 'install 'install-models-dat
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
|
@ -585,7 +599,7 @@ (define-public hplip
|
|||
(inputs
|
||||
`(("cups-minimal" ,cups-minimal)
|
||||
("dbus" ,dbus)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libusb" ,libusb)
|
||||
("python" ,python)
|
||||
("python-dbus" ,python-dbus)
|
||||
|
|
|
@ -4,11 +4,12 @@
|
|||
;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
|
||||
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016, 2017, 2019 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2017, 2019 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Roel Janssen <roel@gnu.org>
|
||||
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -36,7 +37,6 @@ (define-module (gnu packages curl)
|
|||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages golang)
|
||||
#:use-module (gnu packages groff)
|
||||
#:use-module (gnu packages guile)
|
||||
#:use-module (gnu packages kerberos)
|
||||
#:use-module (gnu packages libidn)
|
||||
|
@ -45,20 +45,21 @@ (define-module (gnu packages curl)
|
|||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages web))
|
||||
#:use-module (gnu packages web)
|
||||
#:use-module (srfi srfi-1))
|
||||
|
||||
(define-public curl
|
||||
(package
|
||||
(name "curl")
|
||||
(version "7.65.3")
|
||||
(replacement curl-7.66.0)
|
||||
(version "7.69.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://curl.haxx.se/download/curl-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1sjz4fq7jg96mpmpqq82nd61njna6jp3c4m9yrbx2j1rh5a8ingj"))))
|
||||
"0kwxh76iq9fblk7iyv4f75bmcmasarp2bcm1mm07wyvzd7kdbiq3"))
|
||||
(patches (search-patches "curl-use-ssl-cert-env.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out"
|
||||
"doc")) ;1.2 MiB of man3 pages
|
||||
|
@ -70,27 +71,42 @@ (define-public curl
|
|||
("zlib" ,zlib)))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
;; to enable the --manual option and make test 1026 pass
|
||||
("groff" ,groff)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python" ,python-wrapper)))
|
||||
(native-search-paths
|
||||
;; Note: This search path is respected by the `curl` command-line tool only.
|
||||
;; Ideally we would bake this into libcurl itself so other users can benefit,
|
||||
;; but it's not supported upstream due to thread safety concerns.
|
||||
;; These variables are introduced by curl-use-ssl-cert-env.patch.
|
||||
(list (search-path-specification
|
||||
(variable "SSL_CERT_DIR")
|
||||
(separator #f) ;single entry
|
||||
(files '("etc/ssl/certs")))
|
||||
(search-path-specification
|
||||
(variable "SSL_CERT_FILE")
|
||||
(file-type 'regular)
|
||||
(separator #f) ;single entry
|
||||
(files '("etc/ssl/certs/ca-certificates.crt")))
|
||||
;; Note: This search path is respected by the `curl` command-line
|
||||
;; tool only. Patching libcurl to read it too would bring no
|
||||
;; advantages and require maintaining a more complex patch.
|
||||
(search-path-specification
|
||||
(variable "CURL_CA_BUNDLE")
|
||||
(file-type 'regular)
|
||||
(separator #f) ;single entry
|
||||
(files '("etc/ssl/certs/ca-certificates.crt")))))
|
||||
(arguments
|
||||
`(#:configure-flags (list "--with-gnutls"
|
||||
`(#:disallowed-references ("doc")
|
||||
#:configure-flags (list "--with-gnutls"
|
||||
(string-append "--with-gssapi="
|
||||
(assoc-ref %build-inputs "mit-krb5"))
|
||||
"--disable-static")
|
||||
;; Add a phase to patch '/bin/sh' occurances in tests/runtests.pl
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'do-not-record-configure-flags
|
||||
(lambda _
|
||||
;; Do not save the configure options to avoid unnecessary references.
|
||||
(substitute* "curl-config.in"
|
||||
(("@CONFIGURE_OPTIONS@")
|
||||
"\"not available\""))
|
||||
#t))
|
||||
(add-after
|
||||
'install 'move-man3-pages
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
|
@ -143,17 +159,14 @@ (define-public curl
|
|||
"See COPYING in the distribution."))
|
||||
(home-page "https://curl.haxx.se/")))
|
||||
|
||||
(define curl-7.66.0
|
||||
(package
|
||||
(inherit curl)
|
||||
(version "7.66.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://curl.haxx.se/download/curl-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1hcqxpibhknhjy56wcxz5vd6m9ggx3ykwp3wp5wx05ih36481d6v"))))))
|
||||
;; This package exists mainly to bootstrap CMake. It must not depend on
|
||||
;; anything that uses cmake-build-system.
|
||||
(define-public curl-minimal
|
||||
(hidden-package
|
||||
(package/inherit
|
||||
curl
|
||||
(name "curl-minimal")
|
||||
(inputs (alist-delete "openldap" (package-inputs curl))))))
|
||||
|
||||
(define-public kurly
|
||||
(package
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
;;; Copyright © 2013, 2014, 2015, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -20,6 +21,7 @@
|
|||
|
||||
(define-module (gnu packages cyrus-sasl)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages dbm)
|
||||
#:use-module (gnu packages kerberos)
|
||||
#:use-module (gnu packages tls)
|
||||
|
@ -41,8 +43,13 @@ (define-public cyrus-sasl
|
|||
"ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-"
|
||||
version ".tar.gz")))
|
||||
(sha256 (base32
|
||||
"1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6"))))
|
||||
"1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6"))
|
||||
(patches (search-patches "cyrus-sasl-ac-try-run-fix.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("libtool" ,libtool)))
|
||||
(inputs `(("gdbm" ,gdbm)
|
||||
("openssl" ,openssl)))
|
||||
(propagated-inputs
|
||||
|
@ -57,7 +64,13 @@ (define-public cyrus-sasl
|
|||
;; 'plugin_common.c'. When building the shared libraries there, libtool
|
||||
;; ends up doing "ln -s plugin_common.lo plugin_common.o", which can
|
||||
;; fail with EEXIST when building things in parallel.
|
||||
#:parallel-build? #f))
|
||||
#:parallel-build? #f
|
||||
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'autogen
|
||||
(lambda _
|
||||
(invoke "autoreconf" "-vif"))))))
|
||||
(synopsis "Simple Authentication Security Layer implementation")
|
||||
(description
|
||||
"SASL (Simple Authentication Security Layer) is an Internet
|
||||
|
|
|
@ -168,7 +168,7 @@ (define-public 4store
|
|||
("avahi" ,avahi)
|
||||
("cyrus-sasl" ,cyrus-sasl)
|
||||
("openssl" ,openssl)
|
||||
("util-linux" ,util-linux)))
|
||||
("util-linux" ,util-linux "lib")))
|
||||
;; http://www.4store.org has been down for a while now.
|
||||
(home-page "https://github.com/4store/4store")
|
||||
(synopsis "Clustered RDF storage and query engine")
|
||||
|
@ -761,6 +761,20 @@ (define-public mariadb
|
|||
"-DINSTALL_SHAREDIR=share")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
,@(if (string-prefix? "arm" (%current-system))
|
||||
;; XXX: Because of the GCC 5 input, we need to hide GCC 7 from
|
||||
;; CPLUS_INCLUDE_PATH so that its headers do not shadow GCC 5.
|
||||
'((add-after 'set-paths 'hide-default-gcc
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((gcc (assoc-ref inputs "gcc")))
|
||||
(setenv "CPLUS_INCLUDE_PATH"
|
||||
(string-join
|
||||
(delete (string-append gcc "/include/c++")
|
||||
(string-split (getenv "CPLUS_INCLUDE_PATH")
|
||||
#\:))
|
||||
":"))
|
||||
#t))))
|
||||
'())
|
||||
(add-after 'unpack 'fix-pcre-detection
|
||||
(lambda _
|
||||
;; The bundled PCRE in MariaDB has a patch that was upstreamed
|
||||
|
@ -893,7 +907,7 @@ (define-public mariadb
|
|||
`(("bison" ,bison)
|
||||
;; XXX: On armhf, use GCC 5 to work around <https://bugs.gnu.org/37605>.
|
||||
,@(if (string-prefix? "armhf" (%current-system))
|
||||
`(("gcc", gcc-5))
|
||||
`(("gcc@5", gcc-5))
|
||||
'())
|
||||
("perl" ,perl)))
|
||||
(inputs
|
||||
|
@ -974,7 +988,7 @@ (define-public postgresql
|
|||
(invoke "make" "-C" "contrib" "install"))))))
|
||||
(inputs
|
||||
`(("readline" ,readline)
|
||||
("libuuid" ,util-linux)
|
||||
("libuuid" ,util-linux "lib")
|
||||
("openssl" ,openssl)
|
||||
("zlib" ,zlib)))
|
||||
(home-page "https://www.postgresql.org/")
|
||||
|
@ -2698,7 +2712,7 @@ (define-public python2-pickleshare
|
|||
(define-public python-apsw
|
||||
(package
|
||||
(name "python-apsw")
|
||||
(version "3.28.0-r1")
|
||||
(version "3.31.1-r1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -2706,7 +2720,7 @@ (define-public python-apsw
|
|||
"/download/" version "/apsw-" version ".zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"0x62534l5hcgwrc4k2gxpdzc1sxlhm6m4nwlay74rnmr77qh8wly"))))
|
||||
"1gap5lr6c7bp134nzvfwr693i6d0fqyaysg3ms2cayjldv616yfx"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
`(("unzip" ,unzip)))
|
||||
|
|
|
@ -80,6 +80,11 @@ (define-public vdirsyncer
|
|||
(if tests?
|
||||
(invoke "make" "test")
|
||||
#t)))
|
||||
(add-after 'unpack 'patch-version-call
|
||||
(lambda _
|
||||
(substitute* "docs/conf.py"
|
||||
(("^release.*") (string-append "release = '" ,version "'\n")))
|
||||
#t))
|
||||
(add-after 'install 'manpage
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(invoke "make" "--directory=docs/" "man")
|
||||
|
|
|
@ -55,7 +55,7 @@ (define-public bdb-4.8
|
|||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(lambda* (#:key target outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(doc (assoc-ref outputs "doc")))
|
||||
;; '--docdir' is not honored, so we need to patch.
|
||||
|
@ -74,6 +74,10 @@ (define-public bdb-4.8
|
|||
'("--build=aarch64-unknown-linux-gnu")
|
||||
'())
|
||||
|
||||
,@(if (%current-target-system) ; cross building
|
||||
'((string-append "--host=" target))
|
||||
'())
|
||||
|
||||
;; Remove 7 MiB of .a files.
|
||||
"--disable-static"
|
||||
|
||||
|
@ -134,7 +138,8 @@ (define-public gdbm
|
|||
(sha256
|
||||
(base32
|
||||
"1p4ibds6z3ccy65lkmd6lm7js0kwifvl53r0fd759fjxgr917rl6"))))
|
||||
(arguments `(#:configure-flags '("--enable-libgdbm-compat")))
|
||||
(arguments `(#:configure-flags '("--enable-libgdbm-compat"
|
||||
"--disable-static")))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "http://www.gnu.org.ua/software/gdbm")
|
||||
(synopsis
|
||||
|
|
|
@ -112,7 +112,7 @@ (define-public fsarchiver
|
|||
("libgcrypt" ,libgcrypt)
|
||||
("lz4" ,lz4)
|
||||
("lzo" ,lzo)
|
||||
("util-linux" ,util-linux)
|
||||
("util-linux" ,util-linux "lib")
|
||||
("xz" ,xz)
|
||||
("zlib" ,zlib)
|
||||
("zstd:lib" ,zstd "lib")))
|
||||
|
@ -212,13 +212,15 @@ (define-public parted
|
|||
(inputs
|
||||
`(("lvm2" ,lvm2)
|
||||
("readline" ,readline)
|
||||
("util-linux" ,util-linux)))
|
||||
("util-linux" ,util-linux "lib")))
|
||||
(native-inputs
|
||||
`(("gettext" ,gettext-minimal)
|
||||
|
||||
;; For the tests.
|
||||
("e2fsprogs" ,e2fsprogs)
|
||||
("perl" ,perl)
|
||||
("python" ,python-2)))
|
||||
("python" ,python-2)
|
||||
("util-linux" ,util-linux)))
|
||||
(home-page "https://www.gnu.org/software/parted/")
|
||||
(synopsis "Disk partition editor")
|
||||
(description
|
||||
|
@ -242,7 +244,7 @@ (define-public fdisk
|
|||
(inputs
|
||||
`(("gettext" ,gettext-minimal)
|
||||
("guile" ,guile-1.8)
|
||||
("util-linux" ,util-linux)
|
||||
("util-linux" ,util-linux "lib")
|
||||
("parted" ,parted)))
|
||||
;; The build neglects to look for its own headers in its own tree. A next
|
||||
;; release should fix this, but may never come: GNU fdisk looks abandoned.
|
||||
|
@ -282,7 +284,7 @@ (define-public gptfdisk
|
|||
`(("gettext" ,gettext-minimal)
|
||||
("ncurses" ,ncurses)
|
||||
("popt" ,popt)
|
||||
("util-linux" ,util-linux))) ; libuuid
|
||||
("util-linux" ,util-linux "lib"))) ;libuuid
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
#:phases
|
||||
|
@ -472,7 +474,7 @@ (define-public gparted
|
|||
;; as '/dev/disk/by-id'
|
||||
`(#:tests? #f))
|
||||
(inputs
|
||||
`(("util-linux" ,util-linux)
|
||||
`(("util-linux" ,util-linux "lib")
|
||||
("parted" ,parted)
|
||||
("glib" ,glib)
|
||||
("gtkmm" ,gtkmm)
|
||||
|
@ -700,7 +702,7 @@ (define-public volume-key
|
|||
(inputs
|
||||
`(("cryptsetup" ,cryptsetup)
|
||||
("nss" ,nss)
|
||||
("libblkid" ,util-linux)
|
||||
("libblkid" ,util-linux "lib")
|
||||
("lvm2" ,lvm2) ; for "-ldevmapper"
|
||||
("glib" ,glib)
|
||||
("gpgme" ,gpgme)))
|
||||
|
@ -753,7 +755,7 @@ (define-public ndctl
|
|||
("json-c" ,json-c)
|
||||
("keyutils" ,keyutils)
|
||||
("kmod" ,kmod)
|
||||
("util-linux" ,util-linux)))
|
||||
("util-linux" ,util-linux "lib")))
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list "--disable-asciidoctor" ; use docbook-xsl instead
|
||||
|
@ -922,7 +924,7 @@ (define-public rmlint
|
|||
("libelf" ,libelf)
|
||||
("elfutils" ,elfutils)
|
||||
("json-glib" ,json-glib)
|
||||
("libblkid" ,util-linux)))
|
||||
("libblkid" ,util-linux "lib")))
|
||||
(home-page "https://rmlint.rtfd.org")
|
||||
(synopsis "Remove duplicates and other lint from the file system")
|
||||
(description "@command{rmlint} finds space waste and other broken things
|
||||
|
|
|
@ -271,7 +271,7 @@ (define-public slim
|
|||
(build-system cmake-build-system)
|
||||
(inputs `(("linux-pam" ,linux-pam)
|
||||
("libpng" ,libpng)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("freeglut" ,freeglut)
|
||||
("libxrandr" ,libxrandr)
|
||||
("libxrender" ,libxrender)
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
|
||||
;;; Copyright © 2016 ng0 <ng0@n0.is>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
|
||||
;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
|
||||
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
|
||||
|
|
|
@ -183,7 +183,7 @@ (define-public docbook-xsl
|
|||
(define-public dblatex
|
||||
(package
|
||||
(name "dblatex")
|
||||
(version "0.3.10")
|
||||
(version "0.3.11")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/dblatex/dblatex/"
|
||||
|
@ -191,7 +191,7 @@ (define-public dblatex
|
|||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1yicd861rqz78i2khl35j7nvc0ccv4jx4hzqrbhll17082vrdmkg"))))
|
||||
"0rp1bc2lgisigscq1i7zxfd2qdaxxxld6khbcxss4pq7fpi9fzkv"))))
|
||||
(build-system python-build-system)
|
||||
;; TODO: Add xfig/transfig for fig2dev utility
|
||||
(inputs
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
|
||||
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -33,6 +34,7 @@ (define-module (gnu packages documentation)
|
|||
#:use-module (guix build-system cmake)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages bash)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages bison)
|
||||
|
@ -148,7 +150,7 @@ (define-public asciidoc-py3
|
|||
(define-public doxygen
|
||||
(package
|
||||
(name "doxygen")
|
||||
(version "1.8.15")
|
||||
(version "1.8.17")
|
||||
(home-page "http://www.doxygen.nl/")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
@ -159,8 +161,9 @@ (define-public doxygen
|
|||
".src.tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"0p94b4yb6bk2dxzs5kyl82xxgq2qakgbx5yy3ssbbadncb20x75x"))
|
||||
(patches (search-patches "doxygen-test.patch"))))
|
||||
"16dmv0gm1x8rvbm82fmjvi213q8fxqxinm75pcf595flya59ific"))
|
||||
(patches (search-patches "doxygen-test.patch"
|
||||
"doxygen-1.8.17-runtests.patch"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("bison" ,bison)
|
||||
|
@ -170,7 +173,15 @@ (define-public doxygen
|
|||
(inputs
|
||||
`(("bash" ,bash-minimal)))
|
||||
(arguments
|
||||
`(#:test-target "tests"
|
||||
;; Force cmake to use iconv header from cross-libc instead of the one
|
||||
;; from native libc.
|
||||
`(,@(if (%current-target-system)
|
||||
'(#:configure-flags
|
||||
(list (string-append "-DICONV_INCLUDE_DIR="
|
||||
(assoc-ref %build-inputs "cross-libc")
|
||||
"/include")))
|
||||
'())
|
||||
#:test-target "tests"
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-before 'configure 'patch-sh
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
|
|
|
@ -291,7 +291,7 @@ (define-public fbreader
|
|||
("fribidi" ,fribidi)
|
||||
("glib" ,glib)
|
||||
("gtk+-2" ,gtk+-2)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("liblinebreak" ,liblinebreak)
|
||||
("libxft" ,libxft)
|
||||
("sqlite" ,sqlite)
|
||||
|
|
|
@ -28,14 +28,14 @@ (define-module (gnu packages ed)
|
|||
(define-public ed
|
||||
(package
|
||||
(name "ed")
|
||||
(version "1.15")
|
||||
(version "1.16")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/ed/ed-"
|
||||
version ".tar.lz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0x6ivy5k0d7dy5z9g8q8nipr89m4qbk2ink2898qq43smp08ji5d"))))
|
||||
"0b4b1lwizvng9bvpcjnmpj2i80xz9xw2w8nfff27b2h4mca7mh6g"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("lzip" ,lzip)))
|
||||
(arguments
|
||||
|
|
|
@ -112,6 +112,7 @@ (define-public sbsigntools
|
|||
("util-linux" ,util-linux))) ; getopt
|
||||
(inputs
|
||||
`(("gnu-efi" ,gnu-efi)
|
||||
("libuuid" ,util-linux "lib")
|
||||
("openssl" ,openssl)))
|
||||
(synopsis "EFI signing tools")
|
||||
(description "This package provides tools for signing EFI binaries.")
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com>
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
|
||||
|
@ -68,6 +68,7 @@
|
|||
;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
|
||||
;;; Copyright © 2020 Jérémy Korwin-Zmijowski <jeremy@korwin-zmijowski.fr>
|
||||
;;; Copyright © 2020 Alberto Eleuterio Flores Guerrero <barbanegra+guix@posteo.mx>
|
||||
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2020 pinoaffe <pinoaffe@airmail.cc>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -2427,13 +2428,21 @@ (define-public emacs-guix
|
|||
"releases/emacs-guix-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0yz64c0z4ygi2k4af18k4r1ncgys18jb8icywkp2g5pgmpn5l7ps"))))
|
||||
"0yz64c0z4ygi2k4af18k4r1ncgys18jb8icywkp2g5pgmpn5l7ps"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Add support for Guile 3.0. Remove for versions > 0.5.2.
|
||||
(substitute* "configure"
|
||||
(("\"2\\.2 2\\.0\"")
|
||||
"\"3.0 2.2 2.0\""))
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("emacs" ,emacs-minimal)))
|
||||
(inputs
|
||||
`(("guile" ,guile-2.2)
|
||||
`(("guile" ,guile-3.0)
|
||||
("guix" ,guix)))
|
||||
(propagated-inputs
|
||||
`(("geiser" ,emacs-geiser)
|
||||
|
@ -10334,15 +10343,12 @@ (define-public emacs-exwm
|
|||
;; Add a .desktop file to xsessions
|
||||
(mkdir-p xsessions)
|
||||
(mkdir-p bin)
|
||||
(with-output-to-file
|
||||
(string-append xsessions "/exwm.desktop")
|
||||
(lambda _
|
||||
(format #t "[Desktop Entry]~@
|
||||
Name=~a~@
|
||||
Comment=~a~@
|
||||
Exec=~a~@
|
||||
TryExec=~:*~a~@
|
||||
Type=Application~%" ,name ,synopsis exwm-executable)))
|
||||
(make-desktop-entry-file
|
||||
(string-append xsessions "/exwm.desktop")
|
||||
#:name ,name
|
||||
#:comment ,synopsis
|
||||
#:exec exwm-executable
|
||||
#:try-exec exwm-executable)
|
||||
;; Add a shell wrapper to bin
|
||||
(with-output-to-file exwm-executable
|
||||
(lambda _
|
||||
|
|
|
@ -141,7 +141,7 @@ (define-public emacs
|
|||
"lisp/textmodes/artist.el"
|
||||
"lisp/progmodes/sh-script.el")
|
||||
(("\"/bin/sh\"")
|
||||
(format "~s" (which "sh"))))
|
||||
(format #f "~s" (which "sh"))))
|
||||
#t))
|
||||
(add-before 'configure 'fix-/bin/pwd
|
||||
(lambda _
|
||||
|
@ -165,7 +165,7 @@ (define* (emacs-byte-compile-directory dir)
|
|||
(byte-recompile-directory
|
||||
(file-name-as-directory ,dir) 0 1))))
|
||||
(invoke emacs "--quick" "--batch"
|
||||
(format "--eval=~s" expr))))
|
||||
(format #f "--eval=~s" expr))))
|
||||
|
||||
(copy-file (assoc-ref inputs "guix-emacs.el")
|
||||
(string-append lisp-dir "/guix-emacs.el"))
|
||||
|
@ -195,7 +195,7 @@ (define* (emacs-byte-compile-directory dir)
|
|||
("libxft" ,libxft)
|
||||
("libtiff" ,libtiff)
|
||||
("giflib" ,giflib)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("imagemagick" ,imagemagick)
|
||||
("acl" ,acl)
|
||||
|
||||
|
|
|
@ -770,7 +770,8 @@ (define-public libfive
|
|||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(setenv "CPLUS_INCLUDE_PATH"
|
||||
(string-append (assoc-ref inputs "catch")
|
||||
"/include/catch"))
|
||||
"/include/catch:"
|
||||
(or (getenv "CPLUS_INCLUDE_PATH") "")))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
@ -2216,7 +2217,7 @@ (define-public lib3mf
|
|||
(native-inputs
|
||||
`(("googletest-source" ,(package-source googletest))))
|
||||
(inputs
|
||||
`(("libuuid" ,util-linux)))
|
||||
`(("libuuid" ,util-linux "lib")))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
|
|
|
@ -124,7 +124,7 @@ (define-public efl
|
|||
("glib" ,glib)
|
||||
("harfbuzz" ,harfbuzz)
|
||||
("libinput" ,libinput-minimal)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libsndfile" ,libsndfile)
|
||||
("libpng" ,libpng)
|
||||
("libx11" ,libx11)
|
||||
|
@ -133,7 +133,7 @@ (define-public efl
|
|||
("lz4" ,lz4)
|
||||
("openssl" ,openssl)
|
||||
("pulseaudio" ,pulseaudio)
|
||||
("util-linux" ,util-linux)
|
||||
("util-linux" ,util-linux "lib")
|
||||
("wayland" ,wayland)
|
||||
("zlib" ,zlib)))
|
||||
(arguments
|
||||
|
|
|
@ -122,7 +122,7 @@ (define-public bcachefs-tools
|
|||
("libscrypt" ,libscrypt)
|
||||
("libsodium" ,libsodium)
|
||||
("liburcu" ,liburcu)
|
||||
("util-linux" ,util-linux) ; lib{blkid,uuid}
|
||||
("util-linux" ,util-linux "lib") ; lib{blkid,uuid}
|
||||
("lz4" ,lz4)
|
||||
("zlib" ,zlib)
|
||||
("zstd:lib" ,zstd "lib")))
|
||||
|
@ -214,7 +214,7 @@ (define-public jfsutils
|
|||
"jfsutils-include-systypes.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("util-linux" ,util-linux)))
|
||||
`(("util-linux" ,util-linux "lib")))
|
||||
(home-page "http://jfs.sourceforge.net/home.html")
|
||||
(synopsis "Utilities for managing JFS file systems")
|
||||
(description
|
||||
|
@ -358,7 +358,7 @@ (define-public glusterfs
|
|||
("fuse", fuse)
|
||||
("openssl" ,openssl)
|
||||
("liburcu" ,liburcu)
|
||||
("libuuid" ,util-linux)
|
||||
("libuuid" ,util-linux "lib")
|
||||
("libxml2" ,libxml2)
|
||||
("readline" ,readline)
|
||||
("zlib" ,zlib)
|
||||
|
@ -590,7 +590,7 @@ (define-public zfs
|
|||
("openssl" ,openssl)
|
||||
("python" ,python)
|
||||
("python-cffi" ,python-cffi)
|
||||
("util-linux" ,util-linux)
|
||||
("util-linux" ,util-linux "lib")
|
||||
("zlib" ,zlib)))
|
||||
(home-page "https://zfsonlinux.org/")
|
||||
(synopsis "Native ZFS on Linux")
|
||||
|
|
|
@ -30,15 +30,14 @@ (define-module (gnu packages file)
|
|||
(define-public file
|
||||
(package
|
||||
(name "file")
|
||||
(version "5.33")
|
||||
(version "5.38")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "ftp://ftp.astron.com/pub/file/file-"
|
||||
version ".tar.gz"))
|
||||
(patches (search-patches "file-CVE-2018-10360.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"1iipnwjkag7q04zjkaqic41r9nlw0ml6mhqian6qkkbisb1whlhw"))))
|
||||
"0d7s376b4xqymnrsjxi3nsv3f5v89pzfspzml2pcajdk5by2yg2r"))))
|
||||
(build-system gnu-build-system)
|
||||
|
||||
;; When cross-compiling, this package depends upon a native install of
|
||||
|
|
|
@ -258,7 +258,7 @@ (define-public ledger
|
|||
("gmp" ,gmp)
|
||||
("libedit" ,libedit)
|
||||
("mpfr" ,mpfr)
|
||||
("python" ,python-2)
|
||||
("python" ,python)
|
||||
("utfcpp" ,utfcpp)))
|
||||
(native-inputs
|
||||
`(("groff" ,groff)
|
||||
|
|
|
@ -5,6 +5,8 @@
|
|||
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Vagrant Cascadian <vagrant@debian.org>
|
||||
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -31,6 +33,7 @@ (define-module (gnu packages firmware)
|
|||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages admin)
|
||||
#:use-module (gnu packages assembly)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages cmake)
|
||||
#:use-module (gnu packages cross-base)
|
||||
|
@ -59,7 +62,7 @@ (define-public ath9k-htc-firmware
|
|||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'pre-configure
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(lambda* (#:key inputs native-inputs #:allow-other-keys)
|
||||
(chdir "target_firmware")
|
||||
|
||||
;; 'configure' is a simple script that runs 'cmake' with
|
||||
|
@ -67,7 +70,7 @@ (define-public ath9k-htc-firmware
|
|||
(substitute* "configure"
|
||||
(("^TOOLCHAIN=.*$")
|
||||
(string-append "TOOLCHAIN="
|
||||
(assoc-ref inputs "cross-gcc")
|
||||
(assoc-ref (or native-inputs inputs) "cross-gcc")
|
||||
"\n")))
|
||||
#t))
|
||||
(replace 'install
|
||||
|
@ -82,8 +85,11 @@ (define-public ath9k-htc-firmware
|
|||
|
||||
;; The firmware is cross-compiled using a "bare bones" compiler (no libc.)
|
||||
;; Use our own tool chain for that.
|
||||
(native-inputs `(("cross-gcc" ,(cross-gcc "xtensa-elf"))
|
||||
("cross-binutils" ,(cross-binutils "xtensa-elf"))
|
||||
(native-inputs `(("cross-gcc" ,(cross-gcc
|
||||
"xtensa-elf"
|
||||
#:xbinutils (cross-binutils "xtensa-elf"
|
||||
binutils-2.33)))
|
||||
("cross-binutils" ,(cross-binutils "xtensa-elf" binutils-2.33))
|
||||
("cmake" ,cmake-minimal)
|
||||
("perl" ,perl)))
|
||||
(home-page "https://wireless.wiki.kernel.org/en/users/Drivers/ath9k_htc")
|
||||
|
@ -314,14 +320,26 @@ (define-public ovmf
|
|||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("acpica" ,acpica)
|
||||
("gcc" ,gcc-5)
|
||||
("gcc@5" ,gcc-5)
|
||||
("nasm" ,nasm)
|
||||
("python-2" ,python-2)
|
||||
("util-linux" ,util-linux)))
|
||||
("util-linux" ,util-linux "lib")))
|
||||
(arguments
|
||||
`(#:tests? #f ; No check target.
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; Hide the default GCC from CPLUS_INCLUDE_PATH to prevent it from
|
||||
;; shadowing the version of GCC provided in native-inputs.
|
||||
(add-after 'set-paths 'hide-gcc7
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((gcc (assoc-ref inputs "gcc")))
|
||||
(setenv "CPLUS_INCLUDE_PATH"
|
||||
(string-join
|
||||
(delete (string-append gcc "/include/c++")
|
||||
(string-split (getenv "CPLUS_INCLUDE_PATH")
|
||||
#\:))
|
||||
":"))
|
||||
#t)))
|
||||
(replace 'configure
|
||||
(lambda _
|
||||
(let* ((cwd (getcwd))
|
||||
|
|
|
@ -56,7 +56,7 @@ (define-public fltk
|
|||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("libjpeg" ,libjpeg)
|
||||
`(("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("libx11" ,libx11)
|
||||
("libxft" ,libxft)
|
||||
|
@ -129,7 +129,7 @@ (define-public ntk
|
|||
(assoc-ref outputs "out") "/lib"))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("libjpeg" ,libjpeg)
|
||||
`(("libjpeg" ,libjpeg-turbo)
|
||||
("glu" ,glu)
|
||||
("waf" ,python-waf)))
|
||||
;; ntk.pc lists "x11" and "xft" in Requires.private, and "cairo" in
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2016 Dmitry Nikolaev <cameltheman@gmail.com>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2016 Toni Reina <areina@riseup.net>
|
||||
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017 José Miguel Sánchez García <jmi2k@openmailbox.com>
|
||||
|
@ -236,6 +236,8 @@ (define-public font-lato
|
|||
(define-public font-gnu-freefont
|
||||
(package
|
||||
(name "font-gnu-freefont")
|
||||
;; Note: Remove the special FontForge input and package once the 2020
|
||||
;; release is out.
|
||||
(version "20120503")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
@ -289,12 +291,8 @@ (define-public font-gnu-freefont
|
|||
(lambda (file) (string-suffix? "woff" file))
|
||||
(find-files "." "")))))))
|
||||
#:test-target "tests"))
|
||||
;; replace python 3 with python 2
|
||||
;; python 3 support commits aren't yet released in 20120503
|
||||
;; so freefont needs python 2 support in fontforge
|
||||
(native-inputs `(("fontforge" ,(package (inherit fontforge)
|
||||
(inputs `(("python-2" ,python-2)
|
||||
,@(package-inputs fontforge)))))))
|
||||
;; FreeFont anno 2012 requires a FontForge built with Python 2.
|
||||
(native-inputs `(("fontforge" ,fontforge-20190801)))
|
||||
(home-page "https://www.gnu.org/software/freefont/")
|
||||
(synopsis "Unicode-encoded outline fonts")
|
||||
(description
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
|
||||
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;;
|
||||
|
@ -60,7 +60,9 @@ (define-module (gnu packages fontutils)
|
|||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (guix build-system meson))
|
||||
#:use-module (guix build-system meson)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (srfi srfi-1))
|
||||
|
||||
(define-public freetype
|
||||
(package
|
||||
|
@ -296,13 +298,14 @@ (define-public fontconfig
|
|||
(uri (string-append
|
||||
"https://www.freedesktop.org/software/fontconfig/release/fontconfig-"
|
||||
version ".tar.bz2"))
|
||||
(patches (search-patches "fontconfig-hurd-path-max.patch"))
|
||||
(sha256 (base32
|
||||
"0hb700a68kk0ip51wdlnjjc682kvlrmb6q920mzajykdk0mdsmgn"))))
|
||||
(build-system gnu-build-system)
|
||||
;; In Requires or Requires.private of fontconfig.pc.
|
||||
(propagated-inputs `(("expat" ,expat)
|
||||
("freetype" ,freetype)
|
||||
("libuuid" ,util-linux)))
|
||||
("libuuid" ,util-linux "lib")))
|
||||
(inputs `(("gs-fonts" ,gs-fonts)))
|
||||
(native-inputs
|
||||
`(("gperf" ,gperf)
|
||||
|
@ -397,6 +400,8 @@ (define-public teckit
|
|||
(sha256
|
||||
(base32 "0gbxyip4wdibirdg2pvzayzyy927vxyd6dfyfiflx8zg88qzn8v8"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags '("--disable-static")))
|
||||
(inputs
|
||||
`(("zlib" ,zlib)
|
||||
("expat" ,expat)))
|
||||
|
@ -465,7 +470,7 @@ (define-public graphite2
|
|||
(define-public potrace
|
||||
(package
|
||||
(name "potrace")
|
||||
(version "1.15")
|
||||
(version "1.16")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -473,8 +478,7 @@ (define-public potrace
|
|||
"/potrace-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"17ajildjp14shsy339xarh1lw1p0k60la08ahl638a73mh23kcx9"))
|
||||
(patches (search-patches "potrace-tests.patch"))))
|
||||
"1k3sxgjqq0jnpk9xxys05q32sl5hbf1lbk1gmfxcrmpdgnhli0my"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("ghostscript" ,ghostscript))) ;for tests
|
||||
(inputs `(("zlib" ,zlib)))
|
||||
|
@ -519,16 +523,18 @@ (define-public libotf
|
|||
(define-public libspiro
|
||||
(package
|
||||
(name "libspiro")
|
||||
(version "0.5.20150702")
|
||||
(version "20190731")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/fontforge/libspiro/releases"
|
||||
"/download/" version "/libspiro-dist-" version ".tar.gz"))
|
||||
"/download/" version "/libspiro-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"153ckwj6h3wwlsgcppzqj8cymv1927hi8ar8fzpchq5q89cj2kai"))))
|
||||
"0m63x97b7aciviijprvy85gm03p2jsgslxn323zl9zn7qz6d3ir4"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags '("--disable-static")))
|
||||
(synopsis "Clothoid to bezier conversion library")
|
||||
(description
|
||||
"Raph Levien's Spiro package as a library. A mechanism for drawing
|
||||
|
@ -539,7 +545,7 @@ (define-public libspiro
|
|||
(define-public libuninameslist
|
||||
(package
|
||||
(name "libuninameslist")
|
||||
(version "20190701")
|
||||
(version "20200313")
|
||||
(home-page "https://github.com/fontforge/libuninameslist")
|
||||
(source
|
||||
(origin
|
||||
|
@ -548,7 +554,7 @@ (define-public libuninameslist
|
|||
"/libuninameslist-dist-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"18c9pcz81wm26q2m7npmvh9j3ibjs2hycxfh5xic2xgjfw40v2qn"))))
|
||||
"10ri80c64xb4rhbif3sr87y5vhi3m702zb0m02imvj1jib9rq0m8"))))
|
||||
(build-system gnu-build-system)
|
||||
(synopsis "Unicode names and annotation list")
|
||||
(description
|
||||
|
@ -565,15 +571,15 @@ (define-public libuninameslist
|
|||
(define-public fontforge
|
||||
(package
|
||||
(name "fontforge")
|
||||
(version "20190801")
|
||||
(version "20200314")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/fontforge/fontforge/releases/download/"
|
||||
version "/fontforge-" version ".tar.gz"))
|
||||
version "/fontforge-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0lh8yx01asbzxm6car5cfi64njh5p4lxc7iv8dldr5rwg357a86r"))))
|
||||
(build-system gnu-build-system)
|
||||
(base32 "0qf88wd6riycq56d24brybyc93ns74s0nyyavm43zp2kfcihn6fd"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs `(("cairo" ,cairo)
|
||||
|
@ -584,7 +590,7 @@ (define-public fontforge
|
|||
("libSM" ,libsm)
|
||||
("libX11" ,libx11)
|
||||
("libXi" ,libxi)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libltdl" ,libltdl)
|
||||
("libpng" ,libpng)
|
||||
("libspiro" ,libspiro)
|
||||
|
@ -598,8 +604,20 @@ (define-public fontforge
|
|||
("python" ,python)
|
||||
("zlib" ,zlib)))
|
||||
(arguments
|
||||
'(#:phases
|
||||
'(#:configure-flags '(;; TODO: Provide GTK+ for the Wayland-friendly GDK
|
||||
;; backend, instead of the legacy X11 backend.
|
||||
;; Currently it introduces a circular dependency.
|
||||
"-DENABLE_X11=ON")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'do-not-override-RPATH
|
||||
(lambda _
|
||||
;; Do not attempt to set a default RPATH, as our ld-wrapper
|
||||
;; already does the right thing.
|
||||
(substitute* "CMakeLists.txt"
|
||||
(("^set_default_rpath\\(\\)")
|
||||
""))
|
||||
#t))
|
||||
(add-after 'install 'set-library-path
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
|
@ -624,6 +642,31 @@ (define-public fontforge
|
|||
(license license:gpl3+)
|
||||
(home-page "https://fontforge.github.io")))
|
||||
|
||||
;; This is the last version that supports Python 2, which is needed for
|
||||
;; GNU FreeFont. Remove once no longer required.
|
||||
(define-public fontforge-20190801
|
||||
(package
|
||||
(inherit fontforge)
|
||||
(version "20190801")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/fontforge/fontforge/releases/download/"
|
||||
version "/fontforge-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0lh8yx01asbzxm6car5cfi64njh5p4lxc7iv8dldr5rwg357a86r"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments fontforge)
|
||||
((#:configure-flags _)
|
||||
''())
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(delete 'do-not-override-RPATH)))))
|
||||
(inputs
|
||||
`(("python" ,python-2)
|
||||
,@(alist-delete "python" (package-inputs fontforge))))))
|
||||
|
||||
(define-public python2-ufolib
|
||||
(package
|
||||
(name "python2-ufolib")
|
||||
|
@ -756,7 +799,7 @@ (define-public fontmanager
|
|||
("desktop-file-utils" ,desktop-file-utils)))
|
||||
(inputs
|
||||
`(("json-glib" ,json-glib)
|
||||
("sqlite-with-column-metadata" ,sqlite-with-column-metadata)
|
||||
("sqlite" ,sqlite)
|
||||
("fonconfig" ,fontconfig)
|
||||
("freetype" ,freetype)
|
||||
("gtk+" ,gtk+)))
|
||||
|
|
|
@ -532,7 +532,7 @@ (define (source-file regexp)
|
|||
(find-files ".." "^(kbd-model-map|language-fallback-map)$"))
|
||||
#t)))))))
|
||||
(native-inputs (package-native-inputs elogind))
|
||||
(inputs `(("libmount" ,util-linux)
|
||||
(inputs `(("libmount" ,util-linux "lib")
|
||||
("xkeyboard-config" ,xkeyboard-config)
|
||||
("kbd" ,kbd)
|
||||
,@(package-inputs elogind)))
|
||||
|
@ -743,7 +743,7 @@ (define-public weston
|
|||
("lcms" ,lcms)
|
||||
("libevdev" ,libevdev)
|
||||
("libinput" ,libinput-minimal)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libunwind" ,libunwind)
|
||||
("libva" ,libva)
|
||||
("libwebp" ,libwebp)
|
||||
|
|
|
@ -27,18 +27,17 @@ (define-module (gnu packages fribidi)
|
|||
|
||||
(define-public fribidi
|
||||
(package
|
||||
(replacement fribidi/fixed)
|
||||
(name "fribidi")
|
||||
(version "1.0.5")
|
||||
(version "1.0.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
(string-append "https://github.com/fribidi/fribidi/releases"
|
||||
"/download/v" version "/fribidi-" version
|
||||
".tar.bz2"))
|
||||
".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1kp4b1hpx2ky20ixgy2xhj5iygfl7ps5k9kglh1z5i7mhykg4r3a"))))
|
||||
(base32 "1iz06r6ha2nrgbzbn4141r58a60a9s5qiaadjjhhvdkg0alpxr65"))))
|
||||
(build-system gnu-build-system)
|
||||
(synopsis "Implementation of the Unicode bidirectional algorithm")
|
||||
(description
|
||||
|
@ -48,13 +47,6 @@ (define-public fribidi
|
|||
(home-page "https://github.com/fribidi/fribidi")
|
||||
(license lgpl2.1+)))
|
||||
|
||||
(define fribidi/fixed
|
||||
(package
|
||||
(inherit fribidi)
|
||||
(source
|
||||
(origin (inherit (package-source fribidi))
|
||||
(patches (search-patches "fribidi-CVE-2019-18397.patch"))))))
|
||||
|
||||
(define-public bidiv
|
||||
(package
|
||||
(name "bidiv")
|
||||
|
|
|
@ -533,7 +533,7 @@ (define-public sfml
|
|||
("xcb-util-image" ,xcb-util-image)
|
||||
("libxrandr" ,libxrandr)
|
||||
("eudev" ,eudev)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libsndfile" ,libsndfile)
|
||||
("stb-image" ,stb-image)
|
||||
("stb-image-write" ,stb-image-write)))
|
||||
|
@ -780,7 +780,7 @@ (define-public allegro
|
|||
("freetype" ,freetype)
|
||||
("glu" ,glu)
|
||||
("gtk" ,gtk+-2)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("libtheora" ,libtheora)
|
||||
("libvorbis" ,libvorbis)
|
||||
|
@ -862,7 +862,7 @@ (define-public aseprite
|
|||
("curl" ,curl)
|
||||
("freetype" ,freetype)
|
||||
("giflib" ,giflib)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("libwebp" ,libwebp)
|
||||
("libx11" ,libx11)
|
||||
|
@ -1014,7 +1014,7 @@ (define-public python-pygame
|
|||
("sdl-mixer" ,sdl-mixer)
|
||||
("sdl-ttf" ,sdl-ttf)
|
||||
("sdl-gfx" ,sdl-gfx)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("libX11" ,libx11)
|
||||
("libsmpeg" ,libsmpeg)
|
||||
|
@ -1727,7 +1727,7 @@ (define-public eureka
|
|||
("libxft" ,libxft)
|
||||
("libxinerama" ,libxinerama)
|
||||
("libfontconfig" ,fontconfig)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("fltk" ,fltk)
|
||||
("zlib" ,zlib)))
|
||||
|
@ -1935,7 +1935,7 @@ (define-public ioquake3
|
|||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("sdl2" ,sdl2)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("openal" ,openal)
|
||||
("curl" ,curl)
|
||||
("opusfile" ,opusfile)
|
||||
|
@ -2289,7 +2289,7 @@ (define-public warsow-qfusion
|
|||
("curl" ,curl)
|
||||
("freetype" ,freetype)
|
||||
("ffmpeg" ,ffmpeg)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libogg" ,libogg)
|
||||
("libpng" ,libpng)
|
||||
("libtheora" ,libtheora)
|
||||
|
@ -2300,7 +2300,7 @@ (define-public warsow-qfusion
|
|||
("qtbase" ,qtbase)
|
||||
("qtdeclarative" ,qtdeclarative)
|
||||
("sdl2" ,sdl2)
|
||||
("uuid.h" ,util-linux)
|
||||
("uuid.h" ,util-linux "lib")
|
||||
("zlib" ,zlib)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
|
|
@ -241,7 +241,7 @@ (define-public adanaxisgpl
|
|||
`(("expat" ,expat)
|
||||
("freeglut" ,freeglut)
|
||||
("glu" ,glu)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libogg" ,libogg)
|
||||
("libtiff" ,libtiff)
|
||||
("libvorbis" ,libvorbis)
|
||||
|
@ -863,7 +863,7 @@ (define-public freedroidrpg
|
|||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("glu" ,glu)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libogg" ,libogg)
|
||||
("libpng" ,libpng)
|
||||
("libvorbis" ,libvorbis)
|
||||
|
@ -2213,7 +2213,7 @@ (define-public irrlicht
|
|||
#:make-flags '("CC=gcc" "sharedlib")))
|
||||
(inputs
|
||||
`(("bzip2" ,bzip2)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("libx11" ,libx11)
|
||||
("libxxf86vm" ,libxxf86vm)
|
||||
|
@ -2360,7 +2360,7 @@ (define-public minetest
|
|||
("gmp" ,gmp)
|
||||
("irrlicht" ,irrlicht)
|
||||
("jsoncpp" ,jsoncpp)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("libogg" ,libogg)
|
||||
("libvorbis" ,libvorbis)
|
||||
|
@ -2497,6 +2497,7 @@ (define-public fifengine
|
|||
(uri (string-append "https://codeload.github.com/fifengine/"
|
||||
"fifengine/tar.gz/" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(patches (search-patches "fifengine-swig-compat.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"1y4grw25cq5iqlg05rnbyxw1njl11ypidnlsm3qy4sm3xxdvb0p8"))))
|
||||
|
@ -2513,7 +2514,9 @@ (define-public fifengine
|
|||
"/include/AL")
|
||||
(string-append "-DPYTHON_SITE_PACKAGES="
|
||||
(assoc-ref %outputs "out")
|
||||
"/lib/python3.7/site-packages"))
|
||||
"/lib/python"
|
||||
,(version-major+minor (package-version python))
|
||||
"/site-packages"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-run_tests.py
|
||||
|
@ -2602,7 +2605,7 @@ (define-public fizmo
|
|||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("freetype" ,freetype)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("libsndfile" ,libsndfile)
|
||||
("libxml2" ,libxml2)
|
||||
|
@ -2731,7 +2734,7 @@ (define-public supertuxkart
|
|||
("curl" ,curl)
|
||||
;; The following input is needed to build the bundled and modified
|
||||
;; version of irrlicht.
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("openssl" ,openssl)
|
||||
("enet" ,enet)))
|
||||
(native-inputs
|
||||
|
@ -2882,20 +2885,7 @@ (define-public wesnoth
|
|||
"1i8mz6gw3qar09bscczhki0g4scj8pl58v85rp0g55r4bcq41l5v"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ;no check target
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-before 'configure 'treat-boost-as-system-header
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((boost (assoc-ref inputs "boost")))
|
||||
;; Ensure Boost is treated as "system headers" to
|
||||
;; pacify compiler warnings induced by Boost headers.
|
||||
(for-each (lambda (variable)
|
||||
(setenv variable
|
||||
(string-append boost "/include:"
|
||||
(or (getenv variable)
|
||||
""))))
|
||||
'("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH"))
|
||||
#t))))))
|
||||
`(#:tests? #f)) ;no check target
|
||||
(native-inputs
|
||||
`(("gettext" ,gettext-minimal)
|
||||
("pkg-config" ,pkg-config)))
|
||||
|
@ -4391,7 +4381,7 @@ (define-public hyperrogue
|
|||
(add-after 'set-paths 'set-sdl-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(setenv "CPATH"
|
||||
(string-append (getenv "CPATH") ":"
|
||||
(string-append (or (getenv "CPATH") "") ":"
|
||||
(assoc-ref inputs "sdl-union")
|
||||
"/include/SDL"))))
|
||||
(replace 'configure
|
||||
|
@ -4800,7 +4790,8 @@ (define-public kiki
|
|||
(string-append (assoc-ref inputs "sdl-union")
|
||||
"/include/SDL:"
|
||||
(assoc-ref inputs "python")
|
||||
"/include/python2.7"))
|
||||
"/include/python2.7:"
|
||||
(or (getenv "CPLUS_INCLUDE_PATH") "")))
|
||||
(substitute* "src/main/main.cpp"
|
||||
(("#include <SDL.h>" line)
|
||||
(string-append line "
|
||||
|
@ -5577,7 +5568,7 @@ (define-public tome4
|
|||
(setenv "CPATH"
|
||||
(string-append (assoc-ref inputs "sdl-union")
|
||||
"/include/SDL2:"
|
||||
(getenv "CPATH")))
|
||||
(or (getenv "CPATH") "")))
|
||||
#t))
|
||||
(delete 'check)
|
||||
;; premake doesn't provide install target
|
||||
|
@ -5631,19 +5622,13 @@ (define-public tome4
|
|||
(copy-recursively "game" (string-append data "/game"))
|
||||
;; launcher
|
||||
(mkdir-p applications)
|
||||
(with-output-to-file (string-append applications "/"
|
||||
,name ".desktop")
|
||||
(lambda ()
|
||||
(display
|
||||
(string-append
|
||||
"[Desktop Entry]
|
||||
Name=ToME4
|
||||
Comment=" ,synopsis "\n"
|
||||
"Exec=" ,name "\n"
|
||||
"Icon=" icon "\n"
|
||||
"Terminal=false
|
||||
Type=Application
|
||||
Categories=Game;RolePlaying;\n")))))
|
||||
(make-desktop-entry-file
|
||||
(string-append applications "/" ,name ".desktop")
|
||||
#:name "ToME4"
|
||||
#:comment ,synopsis
|
||||
#:exec ,name
|
||||
#:icon icon
|
||||
#:categories '("Game" "RolePlaying")))
|
||||
#t)))))
|
||||
(home-page "https://te4.org")
|
||||
(description "Tales of Maj’Eyal (ToME) RPG, featuring tactical turn-based
|
||||
|
@ -6100,7 +6085,7 @@ (define-public gzdoom
|
|||
("fluidsynth" ,fluidsynth)
|
||||
("gtk+3" ,gtk+)
|
||||
("libgme" ,libgme)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libsndfile" ,libsndfile)
|
||||
("mesa" ,mesa)
|
||||
("mpg123" ,mpg123)
|
||||
|
@ -6557,7 +6542,7 @@ (define (install src dst)
|
|||
`(("xonotic-data" ,xonotic-data)
|
||||
("alsa-lib" ,alsa-lib)
|
||||
("curl" ,curl)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libmodplug" ,libmodplug)
|
||||
("libvorbis" ,libvorbis)
|
||||
("libogg" ,libogg)
|
||||
|
@ -7988,22 +7973,18 @@ (define-public drascula
|
|||
;; game, so we borrow SCUMMVM's.
|
||||
(let ((apps (string-append out "/share/applications")))
|
||||
(mkdir-p apps)
|
||||
(with-output-to-file (string-append apps "/drascula.desktop")
|
||||
(lambda _
|
||||
(format #t
|
||||
"[Desktop Entry]~@
|
||||
Name=Drascula: The Vampire Strikes Back~@
|
||||
GenericName=Drascula~@
|
||||
Exec=~a/bin/drascula~@
|
||||
Icon=~a/share/icons/hicolor/scalable/apps/scummvm.svg~@
|
||||
Categories=AdventureGame;Game;RolePlaying;~@
|
||||
Keywords=game;adventure;roleplaying;2D,fantasy;~@
|
||||
Comment=Classic 2D point and click adventure game~@
|
||||
Comment[de]=klassisches 2D-Abenteuerspiel in Zeigen-und-Klicken-Manier~@
|
||||
Comment[fr]=Jeux classique d'aventure pointer-et-cliquer en 2D~@
|
||||
Comment[it]=Gioco classico di avventura punta e clicca 2D~@
|
||||
Type=Application~%"
|
||||
out scummvm))))
|
||||
(make-desktop-entry-file
|
||||
(string-append apps "/drascula.desktop")
|
||||
#:name "Drascula: The Vampire Strikes Back"
|
||||
#:generic-name "Drascula"
|
||||
#:exec (string-append out "/bin/drascula")
|
||||
#:icon (string-append scummvm "/share/icons/hicolor/scalable/apps/scummvm.svg")
|
||||
#:categories '("AdventureGame" "Game" "RolePlaying")
|
||||
#:keywords '("game" "adventure" "roleplaying" "2D" "fantasy")
|
||||
#:comment '((#f "Classic 2D point and click adventure game")
|
||||
("de" "Klassisches 2D-Abenteuerspiel in Zeigen-und-Klicken-Manier")
|
||||
("fr" "Jeu classique d'aventure pointer-et-cliquer en 2D")
|
||||
("it" "Gioco classico di avventura punta e clicca 2D"))))
|
||||
#t))))
|
||||
(native-inputs
|
||||
`(("bash" ,bash)
|
||||
|
@ -10246,7 +10227,7 @@ (define-public xmoto
|
|||
`(("curl" ,curl)
|
||||
("font-dejavu" ,font-dejavu)
|
||||
("glu" ,glu)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("libxdg-basedir" ,libxdg-basedir)
|
||||
("libxml2" ,libxml2)
|
||||
|
@ -10565,7 +10546,7 @@ (define-public neverball
|
|||
(native-inputs
|
||||
`(("gettext" ,gettext-minimal))) ;for msgfmt
|
||||
(inputs
|
||||
`(("libjpeg" ,libjpeg)
|
||||
`(("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("libvorbis" ,libvorbis)
|
||||
("physfs" ,physfs)
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
;;; Copyright © 2015, 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Carlos Sánchez de La Lama <csanchezdll@gmail.com>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
|
||||
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
|
||||
;;;
|
||||
|
@ -342,7 +342,9 @@ (define-public gcc-4.7
|
|||
(files '("include")))
|
||||
(search-path-specification
|
||||
(variable "CPLUS_INCLUDE_PATH")
|
||||
(files '("include")))
|
||||
;; Add 'include/c++' here so that <cstdlib>'s "#include_next
|
||||
;; <stdlib.h>" finds GCC's <stdlib.h>, not libc's.
|
||||
(files '("include/c++" "include")))
|
||||
(search-path-specification
|
||||
(variable "LIBRARY_PATH")
|
||||
(files '("lib" "lib64")))))
|
||||
|
@ -402,6 +404,7 @@ (define-public gcc-4.9
|
|||
"14l06m7nvcvb0igkbip58x59w3nq6315k6jcz3wr9ch1rn9d44bc"))
|
||||
(patches (search-patches "gcc-4.9-libsanitizer-fix.patch"
|
||||
"gcc-4.9-libsanitizer-ustat.patch"
|
||||
"gcc-4.9-libsanitizer-mode-size.patch"
|
||||
"gcc-arm-bug-71399.patch"
|
||||
"gcc-asan-missing-include.patch"
|
||||
"gcc-libvtv-runpath.patch"
|
||||
|
@ -421,7 +424,33 @@ (define-public gcc-4.9
|
|||
#t))))
|
||||
;; Override inherited texinfo-5 with latest version.
|
||||
(native-inputs `(("perl" ,perl) ;for manpages
|
||||
("texinfo" ,texinfo)))))
|
||||
("texinfo" ,texinfo)))
|
||||
(arguments
|
||||
(if (%current-target-system)
|
||||
(package-arguments gcc-4.8)
|
||||
;; For native builds of GCC 4.9 and GCC 5, the C++ include path needs
|
||||
;; to be adjusted so it does not interfere with GCC's own build processes.
|
||||
(substitute-keyword-arguments (package-arguments gcc-4.8)
|
||||
((#:modules modules %gnu-build-system-modules)
|
||||
`((srfi srfi-1)
|
||||
,@modules))
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((libc (assoc-ref inputs "libc"))
|
||||
(gcc (assoc-ref inputs "gcc")))
|
||||
(setenv "CPLUS_INCLUDE_PATH"
|
||||
(string-join (fold delete
|
||||
(string-split (getenv "CPLUS_INCLUDE_PATH")
|
||||
#\:)
|
||||
(list (string-append libc "/include")
|
||||
(string-append gcc "/include/c++")))
|
||||
":"))
|
||||
(format #t
|
||||
"environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
|
||||
(getenv "CPLUS_INCLUDE_PATH"))
|
||||
#t))))))))))
|
||||
|
||||
(define-public gcc-5
|
||||
;; Note: GCC >= 5 ships with .info files but 'make install' fails to install
|
||||
|
@ -441,7 +470,9 @@ (define-public gcc-5
|
|||
"gcc-5.0-libvtv-runpath.patch"
|
||||
"gcc-5-source-date-epoch-1.patch"
|
||||
"gcc-5-source-date-epoch-2.patch"
|
||||
"gcc-fix-texi2pod.patch"))
|
||||
"gcc-6-libsanitizer-mode-size.patch"
|
||||
"gcc-fix-texi2pod.patch"
|
||||
"gcc-5-hurd.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Fix 'libcc1/configure' error when cross-compiling GCC.
|
||||
|
@ -473,35 +504,31 @@ (define-public gcc-6
|
|||
(base32
|
||||
"0i89fksfp6wr1xg9l8296aslcymv2idn60ip31wr9s4pwin7kwby"))
|
||||
(patches (search-patches "gcc-strmov-store-file-names.patch"
|
||||
"gcc-6-libsanitizer-mode-size.patch"
|
||||
"gcc-6-source-date-epoch-1.patch"
|
||||
"gcc-6-source-date-epoch-2.patch"
|
||||
"gcc-5.0-libvtv-runpath.patch"))))
|
||||
|
||||
;; GCC 4.9 and 5 has a workaround that is not needed for GCC 6 and later.
|
||||
(arguments (package-arguments gcc-4.8))
|
||||
|
||||
(inputs
|
||||
`(("isl" ,isl)
|
||||
,@(package-inputs gcc-4.7)))
|
||||
|
||||
(native-search-paths
|
||||
;; We have to use 'CPATH' for GCC > 5, not 'C_INCLUDE_PATH' & co., due to
|
||||
;; <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129>.
|
||||
(list (search-path-specification
|
||||
(variable "CPATH")
|
||||
(files '("include")))
|
||||
(search-path-specification
|
||||
(variable "LIBRARY_PATH")
|
||||
(files '("lib" "lib64")))))))
|
||||
,@(package-inputs gcc-4.7)))))
|
||||
|
||||
(define-public gcc-7
|
||||
(package
|
||||
(inherit gcc-6)
|
||||
(version "7.4.0")
|
||||
(version "7.5.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/gcc/gcc-"
|
||||
version "/gcc-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0lgy170b0pp60j9cczqkmaqyjjb584vfamj4c30swd7k0j6y5pgd"))
|
||||
"0qg6kqc5l72hpnj4vr6l0p69qav0rh4anlkk3y55540zy3klc6dq"))
|
||||
(patches (search-patches "gcc-strmov-store-file-names.patch"
|
||||
"gcc-7-libsanitizer-mode-size.patch"
|
||||
"gcc-5.0-libvtv-runpath.patch"))))
|
||||
(description
|
||||
"GCC is the GNU Compiler Collection. It provides compiler front-ends
|
||||
|
@ -628,12 +655,12 @@ (define* (custom-gcc gcc name languages
|
|||
(native-search-paths search-paths)
|
||||
(properties (alist-delete 'hidden? (package-properties gcc)))
|
||||
(arguments
|
||||
(substitute-keyword-arguments `(#:modules ((guix build gnu-build-system)
|
||||
(guix build utils)
|
||||
(ice-9 regex)
|
||||
(srfi srfi-1)
|
||||
(srfi srfi-26))
|
||||
,@(package-arguments gcc))
|
||||
(substitute-keyword-arguments (package-arguments gcc)
|
||||
((#:modules modules %gnu-build-system-modules)
|
||||
`(,@modules
|
||||
(srfi srfi-1)
|
||||
(srfi srfi-26)
|
||||
(ice-9 regex)))
|
||||
((#:configure-flags flags)
|
||||
`(cons (string-append "--enable-languages="
|
||||
,(string-join languages ","))
|
||||
|
@ -911,7 +938,7 @@ (define-public libstdc++-doc-9
|
|||
(define-public isl
|
||||
(package
|
||||
(name "isl")
|
||||
(version "0.21")
|
||||
(version "0.22.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (list (string-append
|
||||
|
@ -922,8 +949,27 @@ (define-public isl
|
|||
name "-" version ".tar.bz2")))
|
||||
(sha256
|
||||
(base32
|
||||
"0ng8l3q1px9lkzb44nxnzhh6fhdbclrwng9xs2v9m8yii8gs336i"))))
|
||||
"1kf54jib0nind1pvakblnfhimmwzm0y1llz8470ag0di5vwqwrhs"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" "static"))
|
||||
(arguments
|
||||
'(#:phases (modify-phases %standard-phases
|
||||
(add-after 'install 'move-static-library
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(static (assoc-ref outputs "static"))
|
||||
(source (string-append out "/lib/libisl.a"))
|
||||
(target (string-append static "/lib/libisl.a")))
|
||||
(mkdir-p (dirname target))
|
||||
(link source target)
|
||||
(delete-file source)
|
||||
|
||||
;; Remove reference to libisl.a from the .la file so
|
||||
;; libtool looks for it in the usual locations.
|
||||
(substitute* (string-append out "/lib/libisl.la")
|
||||
(("^old_library=.*")
|
||||
"old_library=''\n"))
|
||||
#t))))))
|
||||
(inputs `(("gmp" ,gmp)))
|
||||
(home-page "http://isl.gforge.inria.fr/")
|
||||
(synopsis
|
||||
|
|
|
@ -42,7 +42,7 @@ (define-public gd
|
|||
;; Note: With libgd.org now pointing to github.com, genuine old
|
||||
;; tarballs are no longer available. Notably, versions 2.0.x are
|
||||
;; missing.
|
||||
(version "2.2.5")
|
||||
(version "2.3.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -50,19 +50,15 @@ (define-public gd
|
|||
version "/libgd-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0lfy5f241sbv8s3splm2zqiaxv7lxrcshh875xryryk7yk5jqc4c"))
|
||||
|
||||
(patches (search-patches "gd-CVE-2018-5711.patch"
|
||||
"gd-CVE-2018-1000222.patch"
|
||||
"gd-CVE-2019-6977.patch"
|
||||
"gd-CVE-2019-6978.patch"
|
||||
"gd-fix-tests-on-i686.patch"
|
||||
"gd-freetype-test-failure.patch"))))
|
||||
"0n5czhxzinvjvmhkf5l9fwjdx5ip69k5k7pj6zwb6zs1k9dibngc"))
|
||||
(patches (search-patches "gd-fix-tests-on-i686.patch"
|
||||
"gd-brect-bounds.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
;; As recommended by github.com/libgd/libgd/issues/278 to fix rounding
|
||||
;; issues on aarch64 and other architectures.
|
||||
`(#:make-flags '("CFLAGS=-ffp-contract=off")
|
||||
#:configure-flags '("--disable-static")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; This test is known to fail on i686-linux:
|
||||
|
@ -77,12 +73,11 @@ (define-public gd
|
|||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("freetype" ,freetype)
|
||||
`(("fontconfig" ,fontconfig)
|
||||
("freetype" ,freetype)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("zlib" ,zlib)))
|
||||
(propagated-inputs
|
||||
`(("fontconfig" ,fontconfig)
|
||||
("libjpeg" ,libjpeg)))
|
||||
(home-page "https://www.libgd.org/")
|
||||
(synopsis "Library for the dynamic creation of images by programmers")
|
||||
(description
|
||||
|
@ -113,8 +108,10 @@ (define-public perl-gd
|
|||
("freetype" ,freetype)
|
||||
("gd" ,gd)
|
||||
("libpng" ,libpng)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("zlib" ,zlib)))
|
||||
(native-inputs
|
||||
`(("perl-extutils-pkgconfig" ,perl-extutils-pkgconfig)))
|
||||
(arguments
|
||||
`(#:make-maker-flags
|
||||
(list (string-append "--lib_jpeg_path="
|
||||
|
|
|
@ -92,7 +92,6 @@ (define-public gdb-9.1
|
|||
("readline" ,readline)
|
||||
("ncurses" ,ncurses)
|
||||
("guile" ,guile-2.0)
|
||||
("python" ,python)
|
||||
("python-wrapper" ,python-wrapper)
|
||||
("dejagnu" ,dejagnu)
|
||||
("source-highlight" ,source-highlight)
|
||||
|
|
|
@ -140,7 +140,7 @@ (define-public geos
|
|||
(define-public gnome-maps
|
||||
(package
|
||||
(name "gnome-maps")
|
||||
(version "3.32.2.1")
|
||||
(version "3.34.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
|
@ -148,7 +148,7 @@ (define-public gnome-maps
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1m191iq1gjaqz79ci3dkbmwrkxp7pzknngimlf5bqib5x8yairlb"))))
|
||||
"00xslcnhhwslqglgfv2im7vq3awa49y2jxzr8wsby7f713k28vf5"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:glib-or-gtk? #t
|
||||
|
@ -189,11 +189,12 @@ (define-public gnome-maps
|
|||
,geocode-glib-path)))
|
||||
#t))))))
|
||||
(native-inputs
|
||||
`(("gobject-introspection" ,gobject-introspection)
|
||||
("intltool" ,intltool)
|
||||
`(("gettext" ,gettext-minimal)
|
||||
("gobject-introspection" ,gobject-introspection)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("folks" ,folks)
|
||||
`(("evolution-data-server" ,evolution-data-server)
|
||||
("folks" ,folks)
|
||||
("libchamplain" ,libchamplain)
|
||||
("libgee" ,libgee)
|
||||
("libsecret" ,libsecret)
|
||||
|
@ -209,10 +210,9 @@ (define-public gnome-maps
|
|||
("glib" ,glib)
|
||||
("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
|
||||
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
|
||||
("gtk+" ,gtk+)
|
||||
("rest" ,rest)
|
||||
("webkitgtk" ,webkitgtk)))
|
||||
(propagated-inputs
|
||||
`(("gtk+3" ,gtk+)))
|
||||
(synopsis "Graphical map viewer and wayfinding program")
|
||||
(description "GNOME Maps is a graphical map viewer. It uses map data from
|
||||
the OpenStreetMap project. It can provide directions for walking, bicycling,
|
||||
|
@ -1444,7 +1444,7 @@ (define-public qmapshack
|
|||
("qtwebengine" ,qtwebengine)
|
||||
("quazip" ,quazip)
|
||||
("routino" ,routino)
|
||||
("sqlite" ,sqlite-with-column-metadata) ; See wrap phase
|
||||
("sqlite" ,sqlite) ; See wrap phase
|
||||
("zlib" ,zlib)))
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
|
@ -1465,23 +1465,15 @@ (define-public qmapshack
|
|||
(invoke "patch" "-p1" "-i" "FindQuaZip5.patch")
|
||||
#t))
|
||||
(add-after 'install 'wrap
|
||||
;; The program fails to run with the error:
|
||||
;; undefined symbol: sqlite3_column_table_name16
|
||||
;; Forcing the program to use sqlite-with-column-metadata instead
|
||||
;; of sqlite using LD_LIBRARY_PATH solves the problem.
|
||||
;;
|
||||
;; The program also fails to find the QtWebEngineProcess program,
|
||||
;; The program fails to find the QtWebEngineProcess program,
|
||||
;; so we set QTWEBENGINEPROCESS_PATH to help it.
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((bin (string-append (assoc-ref outputs "out") "/bin"))
|
||||
(qtwebengineprocess (string-append
|
||||
(assoc-ref inputs "qtwebengine")
|
||||
"/lib/qt5/libexec/QtWebEngineProcess"))
|
||||
(sqlite-lib (string-append (assoc-ref inputs "sqlite")
|
||||
"/lib")))
|
||||
"/lib/qt5/libexec/QtWebEngineProcess")))
|
||||
(for-each (lambda (program)
|
||||
(wrap-program program
|
||||
`("LD_LIBRARY_PATH" ":" prefix (,sqlite-lib))
|
||||
`("QTWEBENGINEPROCESS_PATH" =
|
||||
(,qtwebengineprocess))))
|
||||
(find-files bin ".*")))
|
||||
|
@ -1993,7 +1985,7 @@ (define-public qgis
|
|||
("qtwebkit" ,qtwebkit)
|
||||
("qwt" ,qwt)
|
||||
("saga" ,saga)
|
||||
("sqlite" ,sqlite-with-column-metadata)))
|
||||
("sqlite" ,sqlite)))
|
||||
(native-inputs
|
||||
`(("bison" ,bison)
|
||||
("flex" ,flex)
|
||||
|
|
|
@ -7,7 +7,8 @@
|
|||
;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -57,7 +58,9 @@ (define-public lcms
|
|||
(sha256 (base32
|
||||
"083xisy6z01zhm7p7rgk4bx9d6zlr8l20qkfv1g29ylnhgwzvij8"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("libjpeg" ,libjpeg)
|
||||
(arguments
|
||||
`(#:configure-flags '("--disable-static")))
|
||||
(inputs `(("libjpeg" ,libjpeg-turbo)
|
||||
("libtiff" ,libtiff)
|
||||
("zlib" ,zlib)))
|
||||
(synopsis "Little CMS, a small-footprint colour management engine")
|
||||
|
@ -84,6 +87,25 @@ (define-public libpaper
|
|||
(sha256 (base32
|
||||
"0zhcx67afb6b5r936w5jmaydj3ks8zh83n9rm5sv3m3k8q8jib1q"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("automake" ,automake))) ; For up to date 'config.guess' and 'config.sub'.
|
||||
(arguments
|
||||
`(#:configure-flags '("--disable-static")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-configure
|
||||
(lambda* (#:key inputs native-inputs #:allow-other-keys)
|
||||
;; Replace outdated config.sub and config.guess:
|
||||
(for-each (lambda (file)
|
||||
(install-file
|
||||
(string-append (assoc-ref
|
||||
(or native-inputs inputs) "automake")
|
||||
"/share/automake-"
|
||||
,(version-major+minor
|
||||
(package-version automake))
|
||||
"/" file) "."))
|
||||
'("config.sub" "config.guess"))
|
||||
#t)))))
|
||||
(synopsis "Library for handling paper sizes")
|
||||
(description
|
||||
"The paper library and accompanying files are intended to provide a simple
|
||||
|
@ -137,13 +159,7 @@ (define-public psutils
|
|||
(define-public ghostscript
|
||||
(package
|
||||
(name "ghostscript")
|
||||
(version "9.27")
|
||||
|
||||
;; The problems addressed by GHOSTSCRIPT/FIXED are not security-related,
|
||||
;; but they have a significant impact on usability, hence this graft.
|
||||
;; TODO: Ungraft on next update cycle.
|
||||
(replacement ghostscript/fixed)
|
||||
|
||||
(version "9.52")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -153,7 +169,7 @@ (define-public ghostscript
|
|||
"/ghostscript-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"06dnj0mxyaryfbwlsjwaqf847w91w2h8f108kxxcc41nrnx1y3zw"))
|
||||
"0z1w42y2jmcpl2m1l3z0sfii6zmvzcwcgzn6bydklia6ig7jli2p"))
|
||||
(patches (search-patches "ghostscript-no-header-creationdate.patch"
|
||||
"ghostscript-no-header-id.patch"
|
||||
"ghostscript-no-header-uuid.patch"))
|
||||
|
@ -186,6 +202,10 @@ (define-public ghostscript
|
|||
(string-append "ZLIBDIR="
|
||||
(assoc-ref %build-inputs "zlib") "/include")
|
||||
"--enable-dynamic"
|
||||
"--disable-compile-inits"
|
||||
(string-append "--with-fontpath="
|
||||
(assoc-ref %build-inputs "gs-fonts")
|
||||
"/share/fonts/type1/ghostscript")
|
||||
|
||||
,@(if (%current-target-system)
|
||||
'(;; Specify the native compiler, which is used to build 'echogs'
|
||||
|
@ -213,10 +233,6 @@ (define-public ghostscript
|
|||
(substitute* "base/gscdef.c"
|
||||
(("GS_DOCDIR")
|
||||
"\"~/.guix-profile/share/doc/ghostscript\""))
|
||||
;; The docdir default changed in 9.23 and a compatibility
|
||||
;; symlink was added from datadir->docdir. Remove it.
|
||||
(substitute* "base/unixinst.mak"
|
||||
(("ln -s \\$\\(DESTDIR\\)\\$\\(docdir\\).*") ""))
|
||||
#t))
|
||||
(add-after 'configure 'patch-config-files
|
||||
(lambda _
|
||||
|
@ -249,6 +265,7 @@ (define-public ghostscript
|
|||
#t))))))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("pkg-config" ,pkg-config) ;needed for freetype
|
||||
("python" ,python-wrapper)
|
||||
("tcl" ,tcl)
|
||||
|
||||
|
@ -256,12 +273,14 @@ (define-public ghostscript
|
|||
;; these libraries.
|
||||
,@(if (%current-target-system)
|
||||
`(("zlib/native" ,zlib)
|
||||
("libjpeg/native" ,libjpeg))
|
||||
("libjpeg/native" ,libjpeg-turbo))
|
||||
'())))
|
||||
(inputs
|
||||
`(("freetype" ,freetype)
|
||||
`(("fontconfig" ,fontconfig)
|
||||
("freetype" ,freetype)
|
||||
("gs-fonts" ,gs-fonts)
|
||||
("jbig2dec" ,jbig2dec)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpaper" ,libpaper)
|
||||
("libpng" ,libpng)
|
||||
("libtiff" ,libtiff)
|
||||
|
@ -275,25 +294,6 @@ (define-public ghostscript
|
|||
(home-page "https://www.ghostscript.com/")
|
||||
(license license:agpl3+)))
|
||||
|
||||
(define ghostscript/fixed
|
||||
;; This adds the Freetype dependency (among other things), which fixes the
|
||||
;; rendering issues described in <https://issues.guix.gnu.org/issue/34877>.
|
||||
(package/inherit
|
||||
ghostscript
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments ghostscript)
|
||||
((#:configure-flags flags ''())
|
||||
`(append (list "--disable-compile-inits"
|
||||
(string-append "--with-fontpath="
|
||||
(assoc-ref %build-inputs "gs-fonts")
|
||||
"/share/fonts/type1/ghostscript"))
|
||||
,flags))))
|
||||
(native-inputs `(("pkg-config" ,pkg-config) ;needed for freetype
|
||||
,@(package-native-inputs ghostscript)))
|
||||
(inputs `(("gs-fonts" ,gs-fonts)
|
||||
("fontconfig" ,fontconfig)
|
||||
,@(package-inputs ghostscript)))))
|
||||
|
||||
(define-public ghostscript/x
|
||||
(package/inherit ghostscript
|
||||
(name (string-append (package-name ghostscript) "-with-x"))
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2018 Thorsten Wilms <t_w_@freenet.de>
|
||||
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -117,7 +118,7 @@ (define-public gegl
|
|||
`(("cairo" ,cairo)
|
||||
("pango" ,pango)
|
||||
("libpng" ,libpng)
|
||||
("libjpeg" ,libjpeg)))
|
||||
("libjpeg" ,libjpeg-turbo)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("glib" ,glib "bin") ; for gtester
|
||||
|
@ -151,9 +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
|
||||
|
@ -178,7 +186,7 @@ (define-public gimp
|
|||
("glib-networking" ,glib-networking)
|
||||
("libtiff" ,libtiff)
|
||||
("libwebp" ,libwebp)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("atk" ,atk)
|
||||
("gexiv2" ,gexiv2)
|
||||
("gtk+" ,gtk+-2)
|
||||
|
|
|
@ -294,7 +294,7 @@ (define-public mesa
|
|||
'(,@(match (%current-system)
|
||||
((or "armhf-linux" "aarch64-linux")
|
||||
;; TODO: Fix svga driver for aarch64 and armhf.
|
||||
'("-Dgallium-drivers=etnaviv,freedreno,nouveau,r300,r600,swrast,tegra,v3d,vc4,virgl"))
|
||||
'("-Dgallium-drivers=etnaviv,freedreno,kmsro,lima,nouveau,panfrost,r300,r600,swrast,tegra,v3d,vc4,virgl"))
|
||||
(_
|
||||
'("-Dgallium-drivers=iris,nouveau,r300,r600,radeonsi,svga,swrast,virgl")))
|
||||
;; Enable various optional features. TODO: opencl requires libclc,
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
|
||||
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
|
||||
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -105,6 +105,9 @@ (define dbus
|
|||
;; Install the session bus socket under /tmp.
|
||||
"--with-session-socket-dir=/tmp"
|
||||
|
||||
;; Build shared libraries only.
|
||||
"--disable-static"
|
||||
|
||||
;; Use /etc/dbus-1 for system-wide config.
|
||||
;; Look for configuration file under
|
||||
;; /etc/dbus-1. This is notably required by
|
||||
|
@ -162,7 +165,7 @@ (define dbus
|
|||
(define glib
|
||||
(package
|
||||
(name "glib")
|
||||
(version "2.60.6")
|
||||
(version "2.62.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/"
|
||||
|
@ -170,7 +173,7 @@ (define glib
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0v7vpx2md1gn0wwiirn7g4bhf2csfvcr03y96q2zv97ain6sp3zz"))
|
||||
"174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh"))
|
||||
(patches (search-patches "glib-tests-timer.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
|
@ -185,11 +188,9 @@ (define glib
|
|||
`(("pcre" ,pcre) ; in the Requires.private field of glib-2.0.pc
|
||||
("libffi" ,libffi) ; in the Requires.private field of gobject-2.0.pc
|
||||
;; These are in the Requires.private field of gio-2.0.pc
|
||||
("util-linux" ,util-linux) ; for libmount
|
||||
("util-linux" ,util-linux "lib") ;for libmount
|
||||
("libselinux" ,libselinux)
|
||||
("zlib" ,zlib)))
|
||||
(inputs
|
||||
`(("coreutils" ,coreutils)))
|
||||
(native-inputs
|
||||
`(("gettext" ,gettext-minimal)
|
||||
("m4" ,m4) ; for installing m4 macros
|
||||
|
@ -199,11 +200,26 @@ (define glib
|
|||
("perl" ,perl) ; needed by GIO tests
|
||||
("tzdata" ,tzdata-for-tests))) ; for tests/gdatetime.c
|
||||
(arguments
|
||||
`(;; TODO: Uncomment on the next rebuild cycle.
|
||||
;; #:disallowed-references (,tzdata-for-tests)
|
||||
|
||||
`(#:disallowed-references (,tzdata-for-tests)
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-dbus-launch-path
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((dbus (assoc-ref inputs "dbus")))
|
||||
(substitute* "gio/gdbusaddress.c"
|
||||
(("command_line = g_strdup_printf \\(\"dbus-launch")
|
||||
(string-append "command_line = g_strdup_printf (\""
|
||||
dbus "/bin/dbus-launch")))
|
||||
#t)))
|
||||
(add-after 'unpack 'patch-gio-launch-desktop
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
;; See also <https://gitlab.gnome.org/GNOME/glib/issues/1633>
|
||||
;; for another future fix.
|
||||
(substitute* "gio/gdesktopappinfo.c"
|
||||
(("gio-launch-desktop")
|
||||
(string-append out "/libexec/gio-launch-desktop")))
|
||||
#t)))
|
||||
(add-before 'build 'pre-build
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
;; For tests/gdatetime.c.
|
||||
|
@ -284,7 +300,7 @@ (define pattern+procs
|
|||
(;; Requires /etc/machine-id.
|
||||
"/gdbus/codegen-peer-to-peer"))
|
||||
|
||||
("gio/tests/gdbus-unix-addresses.c"
|
||||
("gio/tests/gdbus-address-get-session.c"
|
||||
(;; Requires /etc/machine-id.
|
||||
"/gdbus/x11-autolaunch"))
|
||||
|
||||
|
@ -312,6 +328,13 @@ (define pattern+procs
|
|||
(mkdir-p bin)
|
||||
(rename-file (string-append out "/bin")
|
||||
(string-append bin "/bin"))
|
||||
;; This one is an implementation detail of glib.
|
||||
;; It is wrong that that's in "/bin" in the first place,
|
||||
;; but that's what upstream is doing right now.
|
||||
;; See <https://gitlab.gnome.org/GNOME/glib/issues/1633>.
|
||||
(mkdir (string-append out "/libexec"))
|
||||
(rename-file (string-append bin "/bin/gio-launch-desktop")
|
||||
(string-append out "/libexec/gio-launch-desktop"))
|
||||
;; Do not refer to "bindir", which points to "${prefix}/bin".
|
||||
;; We don't patch "bindir" to point to "$bin/bin", because that
|
||||
;; would create a reference cycle between the "out" and "bin"
|
||||
|
@ -380,14 +403,14 @@ (define-public glib-with-documentation
|
|||
(define gobject-introspection
|
||||
(package
|
||||
(name "gobject-introspection")
|
||||
(version "1.60.2")
|
||||
(version "1.62.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/"
|
||||
"gobject-introspection/" (version-major+minor version)
|
||||
"/gobject-introspection-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "172ymc1vbg2rclq1rszx4y32vm900nn1mc4qg1a4mqxjiwvf5pzz"))
|
||||
(base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi"))
|
||||
(patches (search-patches
|
||||
"gobject-introspection-cc.patch"
|
||||
"gobject-introspection-girepository.patch"
|
||||
|
@ -529,20 +552,10 @@ (define itstool
|
|||
translated.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public itstool/fixed
|
||||
;; This variant fixes a python-libxml2 crash when processing UTF-8
|
||||
;; sequences: <https://bugs.gnu.org/37468>. Since the issue is quite rare,
|
||||
;; create this variant here to avoid a full rebuild.
|
||||
(package/inherit
|
||||
itstool
|
||||
(inputs
|
||||
`(("python-libxml2" ,python-libxml2/fixed)
|
||||
,@(alist-delete "python-libxml2" (package-inputs itstool))))))
|
||||
|
||||
(define dbus-glib
|
||||
(package
|
||||
(name "dbus-glib")
|
||||
(version "0.108")
|
||||
(version "0.110")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -550,7 +563,7 @@ (define dbus-glib
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0b307hw9j41npzr6niw1bs6ryp87m5yafg492gqwvsaj4dz0qd4z"))))
|
||||
"09g8swvc95bk1z6j8sw463p2v0dqmgm2zjfndf7i8sbcyq67dr3w"))))
|
||||
(build-system gnu-build-system)
|
||||
(propagated-inputs ; according to dbus-glib-1.pc
|
||||
`(("dbus" ,dbus)
|
||||
|
@ -570,7 +583,7 @@ (define dbus-glib
|
|||
(define libsigc++
|
||||
(package
|
||||
(name "libsigc++")
|
||||
(version "2.10.2")
|
||||
(version "2.10.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/libsigc++/"
|
||||
|
@ -578,7 +591,7 @@ (define libsigc++
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"163s14d1rqp82gc1vsm3q0wzsbdicb9q6307kz0zk5lm6x9h5jmi"))))
|
||||
"11j7j1jv4z58d9s7jvl42fnqa1dzl4idgil9r45cjv1w673dys0b"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("pkg-config" ,pkg-config)
|
||||
("m4" ,m4)))
|
||||
|
@ -597,7 +610,7 @@ (define libsigc++
|
|||
(define glibmm
|
||||
(package
|
||||
(name "glibmm")
|
||||
(version "2.60.0")
|
||||
(version "2.62.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/glibmm/"
|
||||
|
@ -605,7 +618,7 @@ (define glibmm
|
|||
"/glibmm-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1g7jxqd270dv2d83r7pf5893mwpz7d5xib0q01na2yalh34v38d3"))))
|
||||
"1ziwx6r7k7wbvg4qq1rgrv8zninapgrmhn1hs6926a3krh9ryr9n"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -679,7 +692,7 @@ (define-public python2-pygobject-2
|
|||
(define-public python-pygobject
|
||||
(package
|
||||
(name "python-pygobject")
|
||||
(version "3.28.3")
|
||||
(version "3.34.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -688,24 +701,20 @@ (define-public python-pygobject
|
|||
"/pygobject-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1c6h3brzlyvzbpdsammnd957azmp6cbzqrd65r400vnh2l8f5lrx"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'delete-broken-tests
|
||||
(lambda _
|
||||
;; FIXME: this test freezes and times out.
|
||||
(delete-file "tests/test_mainloop.py")
|
||||
;; FIXME: this test fails with this kind of error:
|
||||
;; AssertionError: <Handlers.SIG_IGN: 1> != <built-in function default_int_handler
|
||||
(delete-file "tests/test_ossig.py")
|
||||
"06i7ynnbvgpz0gw09zsjbvhgcp5qz4yzdifw27qjwdazg2mckql7"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; We disable these tests in a snippet so that they are inherited
|
||||
;; by the Python 2 variant which is built differently.
|
||||
(with-directory-excursion "tests"
|
||||
;; FIXME: These tests require Gdk and/or Gtk 4.
|
||||
(for-each delete-file
|
||||
'("test_atoms.py" "test_overrides_gtk.py"))
|
||||
#t)))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs
|
||||
`(("which" ,which)
|
||||
;for tests: dbus-run-session and glib-compile-schemas
|
||||
("dbus" ,dbus)
|
||||
("glib-bin" ,glib "bin")
|
||||
`(("glib-bin" ,glib "bin")
|
||||
("pkg-config" ,pkg-config)
|
||||
("python-pytest" ,python-pytest)))
|
||||
(inputs
|
||||
|
@ -728,45 +737,31 @@ (define-public python-pygobject
|
|||
(define-public python2-pygobject
|
||||
(package (inherit (strip-python2-variant python-pygobject))
|
||||
(name "python2-pygobject")
|
||||
|
||||
;; Note: We use python-build-system here, because Meson only supports
|
||||
;; Python 3, and needs PYTHONPATH etc set up correctly, which makes it
|
||||
;; difficult to use for Python 2 projects.
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:python ,python-2
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'delete-broken-tests
|
||||
(lambda _
|
||||
;; FIXME: this test freezes and times out.
|
||||
(delete-file "tests/test_mainloop.py")
|
||||
;; FIXME: this test fails with this kind of error:
|
||||
;; AssertionError: <Handlers.SIG_IGN: 1> != <built-in function default_int_handler
|
||||
(delete-file "tests/test_ossig.py")
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("python" ,python-2)
|
||||
("python-pycairo" ,python2-pycairo)
|
||||
`(("python-pycairo" ,python2-pycairo)
|
||||
("gobject-introspection" ,gobject-introspection)))
|
||||
(native-inputs
|
||||
`(("which" ,which)
|
||||
;for tests: dbus-run-session and glib-compile-schemas
|
||||
("dbus" ,dbus)
|
||||
("glib-bin" ,glib "bin")
|
||||
`(("glib-bin" ,glib "bin")
|
||||
("pkg-config" ,pkg-config)
|
||||
("python-pytest" ,python2-pytest)))))
|
||||
|
||||
;; Newer version of this core-updates package, for Lollypop.
|
||||
(define-public python-pygobject-3.34
|
||||
(package/inherit
|
||||
python-pygobject
|
||||
(version "3.34.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/pygobject/"
|
||||
(version-major+minor version)
|
||||
"/pygobject-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "06i7ynnbvgpz0gw09zsjbvhgcp5qz4yzdifw27qjwdazg2mckql7"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'delete-broken-tests
|
||||
(lambda _
|
||||
(with-directory-excursion "tests"
|
||||
(for-each
|
||||
delete-file
|
||||
;; FIXME: these tests require Gdk and/or Gtk 4.
|
||||
'("test_atoms.py"
|
||||
"test_overrides_gtk.py")))
|
||||
#t)))))))
|
||||
|
||||
(define-public perl-glib
|
||||
(package
|
||||
(name "perl-glib")
|
||||
|
@ -810,6 +805,7 @@ (define telepathy-glib
|
|||
"1symyzbjmxvksn2ifdkk50lafjm2llf2sbmky062gq2pz3cg23cy"))
|
||||
(patches
|
||||
(list
|
||||
(search-patch "telepathy-glib-channel-memory-leak.patch")
|
||||
;; Don't use the same test name for multiple tests.
|
||||
;; <https://bugs.freedesktop.org/show_bug.cgi?id=92245>
|
||||
(origin
|
||||
|
@ -829,7 +825,18 @@ (define telepathy-glib
|
|||
;;
|
||||
;; EOFError: EOF read where object expected
|
||||
;; make[2]: *** [Makefile:1906: _gen/register-dbus-glib-marshallers-body.h] Error 1
|
||||
#:parallel-build? #f))
|
||||
#:parallel-build? #f
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'disable-failing-tests
|
||||
(lambda _
|
||||
;; None of the tests below are able to find the org.gtk.vfs.Daemon
|
||||
;; service file provided by gvfs.
|
||||
(substitute* "tests/dbus/Makefile.in"
|
||||
(("test-contacts\\$\\(EXEEXT\\)") "")
|
||||
(("test-file-transfer-channel\\$\\(EXEEXT\\)") "")
|
||||
(("test-stream-tube\\$\\(EXEEXT\\)") ""))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("glib" ,glib "bin") ; uses glib-mkenums
|
||||
("gobject-introspection" ,gobject-introspection)
|
||||
|
@ -915,7 +922,7 @@ (define-public appstream-glib
|
|||
(propagated-inputs
|
||||
`(("gcab" ,gcab) ; for .pc file
|
||||
("gdk-pixbuf" ,gdk-pixbuf) ; for .pc file
|
||||
("util-linux" ,util-linux))) ; for .pc file
|
||||
("libuuid" ,util-linux "lib"))) ; for .pc file
|
||||
(inputs
|
||||
`(("glib" ,glib)
|
||||
("gperf" ,gperf)
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -102,7 +102,7 @@ (define-public libextractor
|
|||
("gtk+" ,gtk+)
|
||||
("libarchive" ,libarchive)
|
||||
("libgsf" ,libgsf)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libltdl" ,libltdl)
|
||||
("libmpeg2" ,libmpeg2)
|
||||
("libmp4v2" ,libmp4v2)
|
||||
|
@ -270,7 +270,7 @@ (define-public gnunet
|
|||
("libextractor" ,libextractor)
|
||||
("libidn" ,libidn2)
|
||||
("libgcrypt" ,libgcrypt)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libltdl" ,libltdl)
|
||||
("libmicrohttpd" ,libmicrohttpd)
|
||||
("libogg" ,libogg)
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
|
||||
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -78,7 +79,7 @@ (define-module (gnu packages gnupg)
|
|||
(define-public libgpg-error
|
||||
(package
|
||||
(name "libgpg-error")
|
||||
(version "1.36")
|
||||
(version "1.37")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -86,17 +87,33 @@ (define-public libgpg-error
|
|||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0z696dmhfxm2n6pmr8b857wwljq9h633yi99bhbn7h88f91rigds"))
|
||||
(patches (search-patches "libgpg-error-gawk-compat.patch"))
|
||||
;; XXX: Remove this snippet with the gawk patch above. It avoids having
|
||||
;; to call autoreconf for the Makefile.am change to take effect.
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
(substitute* "src/Makefile.in"
|
||||
(("namespace=errnos") "pkg_namespace=errnos"))
|
||||
#t))))
|
||||
"0qwpx8mbc2l421a22l0l1hpzkip9jng06bbzgxwpkkvk5bvnybdk"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(if (%current-target-system)
|
||||
`(#:modules ((ice-9 match)
|
||||
(guix build gnu-build-system)
|
||||
(guix build utils))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; When cross-compiling, some platform specific properties cannot
|
||||
;; be detected. Create a symlink to the appropriate platform
|
||||
;; file. See Cross-Compiling section at:
|
||||
;; https://github.com/gpg/libgpg-error/blob/master/README
|
||||
(add-after 'unpack 'cross-symlinks
|
||||
(lambda* (#:key target inputs #:allow-other-keys)
|
||||
(let ((triplet
|
||||
(match (string-take target
|
||||
(string-index target #\-))
|
||||
("armhf" "arm-unknown-linux-gnueabi")
|
||||
(x
|
||||
(string-append x "-unknown-linux-gnu")))))
|
||||
(symlink
|
||||
(string-append "lock-obj-pub." triplet ".h")
|
||||
"src/syscfg/lock-obj-pub.linux-gnu.h"))
|
||||
#t))))
|
||||
'()))
|
||||
(native-inputs `(("gettext" ,gettext-minimal)))
|
||||
(home-page "https://gnupg.org")
|
||||
(synopsis "Library of error values for GnuPG components")
|
||||
(description
|
||||
|
@ -111,15 +128,14 @@ (define-public libgpg-error
|
|||
(define-public libgcrypt
|
||||
(package
|
||||
(name "libgcrypt")
|
||||
(version "1.8.4")
|
||||
(replacement libgcrypt-1.8.5)
|
||||
(version "1.8.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"09r27ywj9zplq6n9qw3mn7zmvf6y2jdmwx5d1kg8yqkj0qx18f7n"))))
|
||||
"1hvsazms1bfd769q0ngl0r9g5i4m9mpz9jmvvrdzyzk3rfa2ljiv"))))
|
||||
(build-system gnu-build-system)
|
||||
(propagated-inputs
|
||||
`(("libgpg-error-host" ,libgpg-error)))
|
||||
|
@ -132,7 +148,10 @@ (define-public libgcrypt
|
|||
;; the 'gpg-error-config' it runs is the native one---i.e., the wrong one.
|
||||
`(#:configure-flags
|
||||
(list (string-append "--with-gpg-error-prefix="
|
||||
(assoc-ref %build-inputs "libgpg-error-host")))))
|
||||
(assoc-ref %build-inputs "libgpg-error-host"))
|
||||
;; When cross-compiling, _gcry_mpih_lshift etc are undefined
|
||||
,@(if (%current-target-system) '("--disable-asm")
|
||||
'()))))
|
||||
(outputs '("out" "debug"))
|
||||
(home-page "https://gnupg.org/")
|
||||
(synopsis "Cryptographic function library")
|
||||
|
@ -145,18 +164,6 @@ (define-public libgcrypt
|
|||
(properties '((ftp-server . "ftp.gnupg.org")
|
||||
(ftp-directory . "/gcrypt/libgcrypt")))))
|
||||
|
||||
(define-public libgcrypt-1.8.5
|
||||
(package
|
||||
(inherit libgcrypt)
|
||||
(version "1.8.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1hvsazms1bfd769q0ngl0r9g5i4m9mpz9jmvvrdzyzk3rfa2ljiv"))))))
|
||||
|
||||
(define-public libassuan
|
||||
(package
|
||||
(name "libassuan")
|
||||
|
@ -478,13 +485,28 @@ (define-public guile-gcrypt
|
|||
"0n232iyayc46f7hywmjw0jr7pbmmz5h4b04jskhkzz9gxz0ci99c"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
;; When cross-compiling, the bash script libgcrypt-config provided by
|
||||
;; libgcrypt must be accessible during configure phase.
|
||||
`(,@(if (%current-target-system)
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'add-libgrypt-config
|
||||
(lambda _
|
||||
(setenv "PATH" (string-append
|
||||
(assoc-ref %build-inputs "libgcrypt")
|
||||
"/bin:"
|
||||
(getenv "PATH")))
|
||||
#t))))
|
||||
'())))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("texinfo" ,texinfo)))
|
||||
("texinfo" ,texinfo)
|
||||
("guile" ,guile-3.0)))
|
||||
(inputs
|
||||
`(("guile" ,guile-2.2)
|
||||
`(("guile" ,guile-3.0)
|
||||
("libgcrypt" ,libgcrypt)))
|
||||
(synopsis "Cryptography library for Guile using Libgcrypt")
|
||||
(description
|
||||
|
@ -498,18 +520,27 @@ (define-public guile-gcrypt
|
|||
(define-public guile2.0-gcrypt
|
||||
(package (inherit guile-gcrypt)
|
||||
(name "guile2.0-gcrypt")
|
||||
(native-inputs
|
||||
`(("guile" ,guile-2.0)
|
||||
,@(alist-delete "guile" (package-native-inputs guile-gcrypt))))
|
||||
(inputs
|
||||
`(("guile" ,guile-2.0)
|
||||
,@(alist-delete "guile" (package-inputs guile-gcrypt))))))
|
||||
|
||||
(define-public guile3.0-gcrypt
|
||||
(define-public guile2.2-gcrypt
|
||||
(package
|
||||
(inherit guile-gcrypt)
|
||||
(name "guile3.0-gcrypt")
|
||||
(name "guile2.2-gcrypt")
|
||||
(native-inputs
|
||||
`(("guile" ,guile-2.2)
|
||||
,@(alist-delete "guile" (package-native-inputs guile-gcrypt))))
|
||||
(inputs
|
||||
`(("guile" ,guile-next)
|
||||
`(("guile" ,guile-2.2)
|
||||
,@(alist-delete "guile" (package-inputs guile-gcrypt))))))
|
||||
|
||||
(define-public guile3.0-gcrypt
|
||||
(deprecated-package "guile3.0-gcrypt" guile-gcrypt))
|
||||
|
||||
(define-public python-gpg
|
||||
(package
|
||||
(name "python-gpg")
|
||||
|
|
|
@ -139,7 +139,7 @@ (define-public windowmaker
|
|||
("libx11" ,libx11)
|
||||
("libxinerama" ,libxinerama)
|
||||
("fontconfig" ,fontconfig)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("giflib" ,giflib)
|
||||
("libpng" ,libpng)
|
||||
("libtiff" ,libtiff)))
|
||||
|
|
|
@ -1022,20 +1022,6 @@ (define-public icecat
|
|||
(string-append name "\"" null-hash "\"")))
|
||||
(generate-all-checksums "third_party/rust"))
|
||||
#t))
|
||||
(add-before 'configure 'augment-CPLUS_INCLUDE_PATH
|
||||
(lambda* (#:key build inputs #:allow-other-keys)
|
||||
;; Here, we add additional entries to CPLUS_INCLUDE_PATH, to work
|
||||
;; around a problem that otherwise occurs when attempting to
|
||||
;; build Stylo, which requires Rust and Clang. Without these
|
||||
;; additional entries, errors occur during the build indicating
|
||||
;; that the <cstddef> and "c++config.h" headers cannot be found.
|
||||
;; Note that the 'build' keyword argument contains the GNU
|
||||
;; triplet, e.g. "x86_64-unknown-linux-gnu".
|
||||
(let ((gcc (assoc-ref inputs "gcc")))
|
||||
(setenv "CPLUS_INCLUDE_PATH"
|
||||
(string-append gcc "/include/c++" ":"
|
||||
gcc "/include/c++/" build)))
|
||||
#t))
|
||||
(replace 'configure
|
||||
;; configure does not work followed by both "SHELL=..." and
|
||||
;; "CONFIG_SHELL=..."; set environment variables instead
|
||||
|
|
|
@ -531,6 +531,8 @@ (define-public mscgen
|
|||
(base32
|
||||
"08yw3maxhn5fl1lff81gmcrpa4j9aas4mmby1g9w5qcr0np82d1w"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("gd" ,gd)))
|
||||
(home-page "http://www.mcternan.me.uk/mscgen/")
|
||||
|
|
|
@ -119,7 +119,7 @@ (define-public fox
|
|||
("freetype" ,freetype)
|
||||
("gl" ,mesa)
|
||||
("glu" ,glu)
|
||||
("jpeg" ,libjpeg)
|
||||
("jpeg" ,libjpeg-turbo)
|
||||
("png" ,libpng)
|
||||
("tiff" ,libtiff)
|
||||
("x11" ,libx11)
|
||||
|
@ -172,11 +172,11 @@ (define-public blender
|
|||
"-DWITH_MOD_OCEANSIM=ON"
|
||||
"-DWITH_OPENSUBDIV=ON"
|
||||
"-DWITH_PYTHON_INSTALL=OFF"
|
||||
(string-append "-DPYTHON_LIBRARY=python" ,python-version "m")
|
||||
(string-append "-DPYTHON_LIBRARY=python" ,python-version)
|
||||
(string-append "-DPYTHON_LIBPATH=" (assoc-ref %build-inputs "python")
|
||||
"/lib")
|
||||
(string-append "-DPYTHON_INCLUDE_DIR=" (assoc-ref %build-inputs "python")
|
||||
"/include/python" ,python-version "m")
|
||||
"/include/python" ,python-version)
|
||||
(string-append "-DPYTHON_VERSION=" ,python-version)
|
||||
(string-append "-DPYTHON_NUMPY_PATH="
|
||||
(assoc-ref %build-inputs "python-numpy")
|
||||
|
@ -211,7 +211,7 @@ (define-public blender
|
|||
("opensubdiv" ,opensubdiv)
|
||||
("ilmbase" ,ilmbase)
|
||||
("openjpeg" ,openjpeg)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("libtiff" ,libtiff)
|
||||
("ffmpeg" ,ffmpeg)
|
||||
|
@ -469,7 +469,7 @@ (define-public openimageio
|
|||
(inputs
|
||||
`(("boost" ,boost)
|
||||
("libpng" ,libpng)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libtiff" ,libtiff)
|
||||
("giflib" ,giflib)
|
||||
("openexr" ,openexr)
|
||||
|
@ -531,7 +531,7 @@ (define-public openscenegraph
|
|||
("unzip" ,unzip)))
|
||||
(inputs
|
||||
`(("giflib" ,giflib)
|
||||
("libjpeg" ,libjpeg) ; required by the JPEG texture plugin
|
||||
("libjpeg" ,libjpeg-turbo) ; required for the JPEG texture plugin.
|
||||
("jasper" ,jasper)
|
||||
("librsvg" ,librsvg)
|
||||
("libxrandr" ,libxrandr)
|
||||
|
@ -570,7 +570,7 @@ (define-public openscenegraph-3.4
|
|||
"-DCMAKE_CXX_FLAGS=-fpermissive"
|
||||
,flags))))
|
||||
(inputs
|
||||
`(("libjpeg" ,libjpeg)
|
||||
`(("libjpeg" ,libjpeg-turbo)
|
||||
,@(package-inputs openscenegraph)))))
|
||||
|
||||
|
||||
|
@ -635,7 +635,7 @@ (define-public povray
|
|||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("boost" ,boost)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("libtiff" ,libtiff)
|
||||
("openexr" ,openexr)
|
||||
|
@ -987,7 +987,7 @@ (define (bin-directory input-name)
|
|||
`(("imagemagick" ,imagemagick)
|
||||
("lcms" ,lcms)
|
||||
("fbida" ,fbida)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("zip" ,zip)
|
||||
("perl" ,perl)
|
||||
("perl-cpanel-json-xs" ,perl-cpanel-json-xs)
|
||||
|
|
|
@ -56,15 +56,15 @@ (define-module (gnu packages graphviz)
|
|||
(define-public graphviz
|
||||
(package
|
||||
(name "graphviz")
|
||||
(version "2.40.1")
|
||||
(version "2.42.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-"
|
||||
version ".tar.gz"))
|
||||
"https://www2.graphviz.org/Packages/stable/portable_source/"
|
||||
"graphviz-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"08d4ygkxz2f553bxj6087da56a23kx1khv0j8ycxa102vvx1hlna"))))
|
||||
"1pbswjbx3fjdlsxcm7cmlsl5bvaa3d6gcnr0cr8x3c8pag13zbwg"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
;; FIXME: rtest/rtest.sh is a ksh script (!). Add ksh as an input.
|
||||
|
@ -104,7 +104,7 @@ (define-public graphviz
|
|||
("libltdl" ,libltdl)
|
||||
("libXaw" ,libxaw)
|
||||
("expat" ,expat)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)))
|
||||
(native-inputs
|
||||
`(("bison" ,bison)
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -55,12 +56,28 @@ (define-public groff
|
|||
;; from 'inputs'.
|
||||
|
||||
(inputs `(("ghostscript" ,ghostscript)))
|
||||
(native-inputs `(("bison" ,bison)
|
||||
|
||||
;; When cross-compiling, this package depends upon a native install of
|
||||
;; itself.
|
||||
(native-inputs `(,@(if (%current-target-system)
|
||||
`(("self" ,this-package))
|
||||
'())
|
||||
("bison" ,bison)
|
||||
("perl" ,perl)
|
||||
("psutils" ,psutils)
|
||||
("texinfo" ,texinfo)))
|
||||
(arguments
|
||||
`(#:parallel-build? #f ; parallel build fails
|
||||
,@(if (%current-target-system)
|
||||
`(#:make-flags
|
||||
;; In groff-minimal package, that inherits from this package,
|
||||
;; we'll need to locate "groff" instead of "self".
|
||||
(let ((groff (or (assoc-ref %build-host-inputs "groff")
|
||||
(assoc-ref %build-host-inputs "self"))))
|
||||
(list
|
||||
(string-append "GROFF_BIN_PATH=" groff)
|
||||
(string-append "GROFFBIN=" groff "/bin/groff"))))
|
||||
'())
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'disable-relocatability
|
||||
|
@ -115,7 +132,8 @@ (define-public groff-minimal
|
|||
;; Omit the DVI, PS, PDF, and HTML backends.
|
||||
(inputs '())
|
||||
(native-inputs `(("bison" ,bison)
|
||||
("perl" ,perl)))
|
||||
("perl" ,perl)
|
||||
("groff" ,groff)))
|
||||
|
||||
(arguments
|
||||
`(#:disallowed-references (,perl)
|
||||
|
|
|
@ -265,7 +265,7 @@ (define-public gst-plugins-good
|
|||
("libcaca" ,libcaca)
|
||||
("libdv" ,libdv)
|
||||
("libiec61883" ,libiec61883)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("libshout" ,libshout)
|
||||
("libsoup" ,libsoup)
|
||||
|
@ -521,7 +521,9 @@ (define-public python-gst
|
|||
"gst-python-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1a48ca66izmm8hnp608jv5isg3jxb0vlfmhns0bg9nbkilag7390"))))
|
||||
"1a48ca66izmm8hnp608jv5isg3jxb0vlfmhns0bg9nbkilag7390"))
|
||||
(patches
|
||||
(search-patches "python-gst-fix-build-with-python-3.8.patch"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:modules ((guix build meson-build-system)
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue