futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into core-updates

Browse Source
This commit is contained in:
Mark H Weaver 2017-08-09 17:25:31 -04:00
commit cc294bcee6
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
29 changed files with 640 additions and 331 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/local.mk
View File

@ -184,6 +184,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/gperf.scm \ %D%/packages/gperf.scm \
%D%/packages/gprolog.scm \ %D%/packages/gprolog.scm \
%D%/packages/gps.scm \ %D%/packages/gps.scm \
%D%/packages/graph.scm \
%D%/packages/graphics.scm \ %D%/packages/graphics.scm \
%D%/packages/graphviz.scm \ %D%/packages/graphviz.scm \
%D%/packages/groff.scm \ %D%/packages/groff.scm \
@ -985,7 +986,6 @@ dist_patch_DATA = \
%D%/packages/patches/rsem-makefile.patch \ %D%/packages/patches/rsem-makefile.patch \
%D%/packages/patches/ruby-concurrent-ignore-broken-test.patch \ %D%/packages/patches/ruby-concurrent-ignore-broken-test.patch \
%D%/packages/patches/ruby-concurrent-test-arm.patch \ %D%/packages/patches/ruby-concurrent-test-arm.patch \
%D%/packages/patches/ruby-puma-ignore-broken-test.patch \
%D%/packages/patches/ruby-rack-ignore-failing-test.patch \ %D%/packages/patches/ruby-rack-ignore-failing-test.patch \
%D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\ %D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\
%D%/packages/patches/rxvt-unicode-escape-sequences.patch \ %D%/packages/patches/rxvt-unicode-escape-sequences.patch \

10
gnu/packages/admin.scm
View File

@ -13,7 +13,7 @@
;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at> ;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at>
;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net> ;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net> ;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2017 Ben Sturmfels <ben@sturm.com.au> ;;; Copyright © 2017 Ben Sturmfels <ben@sturm.com.au>
;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com> ;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com>
@ -849,8 +849,9 @@ system administrator.")
;; Avoid non-determinism; see <http://bugs.gnu.org/21918>. ;; Avoid non-determinism; see <http://bugs.gnu.org/21918>.
#:parallel-build? #f #:parallel-build? #f
#:phases (alist-cons-before #:phases
'configure 'pre-configure (modify-phases %standard-phases
(add-before 'configure 'pre-configure
(lambda _ (lambda _
(substitute* "src/sudo_usage.h.in" (substitute* "src/sudo_usage.h.in"
;; Do not capture 'configure' arguments since we would ;; Do not capture 'configure' arguments since we would
@ -870,8 +871,7 @@ system administrator.")
"$(TMPDIR)/dummy") "$(TMPDIR)/dummy")
(("\\$\\(DESTDIR\\)\\$\\(vardir\\)") (("\\$\\(DESTDIR\\)\\$\\(vardir\\)")
;; Don't try to create /var/db/sudo. ;; Don't try to create /var/db/sudo.
"$(TMPDIR)/dummy"))) "$(TMPDIR)/dummy")))))
%standard-phases)
;; XXX: The 'testsudoers' test series expects user 'root' to exist, but ;; XXX: The 'testsudoers' test series expects user 'root' to exist, but
;; the chroot's /etc/passwd doesn't have it. Turn off the tests. ;; the chroot's /etc/passwd doesn't have it. Turn off the tests.

5
gnu/packages/aspell.scm
View File

@ -5,6 +5,7 @@
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Christopher Andersson <christopher@8bits.nu> ;;; Copyright © 2016 Christopher Andersson <christopher@8bits.nu>
;;; Copyright © 2016 Theodoros Foradis <theodoros.for@openmailbox.org> ;;; Copyright © 2016 Theodoros Foradis <theodoros.for@openmailbox.org>
;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -123,10 +124,10 @@ dictionaries, including personal ones.")
(define-public aspell-dict-en (define-public aspell-dict-en
(aspell-dictionary "en" "English" (aspell-dictionary "en" "English"
#:version "2016.11.20-0" #:version "2017.01.22-0"
#:sha256 #:sha256
(base32 (base32
"1496jnhh2jvhkzcj0p4vy89bcs4g5wz6a76m33vw4dhchn5xm9jw"))) "1qamzpw1fsnn5n9jpsnnnzqj1a0m0xvsikmkdp5a6pmb7sp3ziwk")))
(define-public aspell-dict-eo (define-public aspell-dict-eo
(aspell-dictionary "eo" "Esperanto" (aspell-dictionary "eo" "Esperanto"

8
gnu/packages/bioinformatics.scm
View File

@ -60,6 +60,7 @@
#:use-module (gnu packages gd) #:use-module (gnu packages gd)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages graph)
#:use-module (gnu packages groff) #:use-module (gnu packages groff)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages haskell) #:use-module (gnu packages haskell)
@ -8071,14 +8072,14 @@ in SNV base substitution data.")
(define-public r-wgcna (define-public r-wgcna
(package (package
(name "r-wgcna") (name "r-wgcna")
(version "1.60") (version "1.61")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "WGCNA" version)) (uri (cran-uri "WGCNA" version))
(sha256 (sha256
(base32 (base32
"16mxhwzhh5q48wmz1iba2r21cp0n0v8g11am4pi52iv6g0663ixl")))) "1vrc2k33a196hrrl7k0z534fp96vv0shmigcr65ny1q0v6lq0h6i"))))
(properties `((upstream-name . "WGCNA"))) (properties `((upstream-name . "WGCNA")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -8090,6 +8091,9 @@ in SNV base substitution data.")
("r-go-db" ,r-go-db) ("r-go-db" ,r-go-db)
("r-hmisc" ,r-hmisc) ("r-hmisc" ,r-hmisc)
("r-impute" ,r-impute) ("r-impute" ,r-impute)
("r-rcpp" ,r-rcpp)
("r-robust" ,r-robust)
("r-survival" ,r-survival)
("r-matrixstats" ,r-matrixstats) ("r-matrixstats" ,r-matrixstats)
("r-preprocesscore" ,r-preprocesscore))) ("r-preprocesscore" ,r-preprocesscore)))
(home-page (home-page

2
gnu/packages/check.scm
View File

@ -213,6 +213,8 @@ normally do not detect. The goal is to detect only real errors in the code
(base32 (base32
"1n5p1m2m3fjrjdj752lf92f9wq3pl5cbsfrb49jqbg52ghkz99jq")))) "1n5p1m2m3fjrjdj752lf92f9wq3pl5cbsfrb49jqbg52ghkz99jq"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments
`(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
(native-inputs (native-inputs
`(("python-2" ,python-2))) `(("python-2" ,python-2)))
(home-page "https://github.com/google/googletest/") (home-page "https://github.com/google/googletest/")

16
gnu/packages/debug.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2015, 2016, 2017 Eric Bavier <bavier@member.fsf.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -287,20 +287,26 @@ down the road.")
;; not accept a directory name instead. To let the gnu-build-system's ;; not accept a directory name instead. To let the gnu-build-system's
;; patch-* phases work properly, we unpack the source first, then ;; patch-* phases work properly, we unpack the source first, then
;; repack before the configure phase. ;; repack before the configure phase.
(let ((make-dir (string-append "make-" (package-version gnu-make))))
`(#:configure-flags '("--with-make-tar=./make.tar.xz") `(#:configure-flags '("--with-make-tar=./make.tar.xz")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'unpack-make (add-after 'unpack 'unpack-make
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(zero? (system* "tar" "xf" (assoc-ref inputs "make-source"))))) (zero? (system* "tar" "xf" (assoc-ref inputs "make-source")))))
(add-after 'unpack-make 'set-default-shell
(lambda _
;; Taken mostly directly from (@ (gnu packages base) gnu-make)
(substitute* (string-append ,make-dir "/job.c")
(("default_shell = .*$")
(format #f "default_shell = \"~a\";\n"
(which "sh"))))))
(add-before 'configure 'repack-make (add-before 'configure 'repack-make
(lambda _ (lambda _
(zero? (system* "tar" "cJf" "./make.tar.xz" (zero? (system* "tar" "cJf" "./make.tar.xz" ,make-dir))))
(string-append "make-"
,(package-version gnu-make))))))
(add-before 'configure 'bootstrap (add-before 'configure 'bootstrap
(lambda _ (lambda _
(zero? (system* "autoreconf" "-vfi"))))))) (zero? (system* "autoreconf" "-vfi"))))))))
(home-page "https://github.com/losalamos/stress-make") (home-page "https://github.com/losalamos/stress-make")
(synopsis "Expose race conditions in Makefiles") (synopsis "Expose race conditions in Makefiles")
(description (description

2
gnu/packages/fonts.scm
View File

@ -140,7 +140,7 @@ provide serif, sans and monospaced variants.")
(base32 (base32
"1p3qs51x5327gnk71yq8cvmxc6wgx79sqxfvxcv80cdvgggjfnyv")))) "1p3qs51x5327gnk71yq8cvmxc6wgx79sqxfvxcv80cdvgggjfnyv"))))
(build-system font-build-system) (build-system font-build-system)
(home-page "http://www.gnome.org/fonts/") (home-page "https://www.gnome.org/fonts/")
(synopsis "Bitstream Vera sans-serif typeface") (synopsis "Bitstream Vera sans-serif typeface")
(description "Vera is a sans-serif typeface from Bitstream, Inc. This (description "Vera is a sans-serif typeface from Bitstream, Inc. This
package provides the TrueType (TTF) files.") package provides the TrueType (TTF) files.")

41
gnu/packages/game-development.scm
View File

@ -35,6 +35,7 @@
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
@ -45,6 +46,7 @@
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnunet) #:use-module (gnu packages gnunet)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages m4)
#:use-module (gnu packages multiprecision) #:use-module (gnu packages multiprecision)
#:use-module (gnu packages music) #:use-module (gnu packages music)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
@ -893,3 +895,42 @@ suitable for pixel art, game graphics, and generally any detailed graphics
painted with a mouse.") painted with a mouse.")
(home-page "http://pulkomandy.tk/projects/GrafX2") (home-page "http://pulkomandy.tk/projects/GrafX2")
(license license:gpl2))) ; GPLv2 only (license license:gpl2))) ; GPLv2 only
(define-public ois
(package
(name "ois")
(version "1.3")
(source
(origin
;; Development has moved to github and there are no recent tarball
;; releases.
(method git-fetch)
(uri (git-reference
(url "https://github.com/wgois/OIS.git")
(commit "bb75ccc1aabc1c547195579963601ff6080ca2f2")))
(file-name (string-append name "-" version))
(sha256
(base32
"0w0pamjc3vj0jr718hysrw8x076fq6n9rd6wcb36sn2jd0lqvi98"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _ (zero? (system* "sh" "bootstrap")))))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("m4" ,m4)
("pkg-config" ,pkg-config)))
(inputs
`(("libxaw" ,libxaw)))
(synopsis "Object Oriented Input System")
(description
"Cross Platform Object Oriented Input Lib System is a cross platform,
simple solution for using all kinds of Input Devices (Keyboards, Mice,
Joysticks, etc) and feedback devices (e.g. force feedback). Meant to be very
robust and compatible with many systems and operating systems.")
(home-page "https://github.com/wgois/OIS")
(license license:zlib)))

8
gnu/packages/games.scm
View File

@ -4384,7 +4384,7 @@ fight against their plot and save his fellow rabbits from slavery.")
(define-public 0ad-data (define-public 0ad-data
(package (package
(name "0ad-data") (name "0ad-data")
(version "0.0.21-alpha") (version "0.0.22-alpha")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -4393,7 +4393,7 @@ fight against their plot and save his fellow rabbits from slavery.")
(file-name (string-append name "-" version ".tar.xz")) (file-name (string-append name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"15xadyrpvq27lm9p1ny7bcmmv56m16h3xadbkdx69gfkzxc3razk")) "0vknk9ay9h2p34r7mym2g066f3s3c5d5vmap0ckcs5b86h5cscjc"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
#~(begin #~(begin
@ -4438,7 +4438,7 @@ fight against their plot and save his fellow rabbits from slavery.")
(define-public 0ad (define-public 0ad
(package (package
(name "0ad") (name "0ad")
(version "0.0.21-alpha") (version "0.0.22-alpha")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -4447,7 +4447,7 @@ fight against their plot and save his fellow rabbits from slavery.")
(file-name (string-append name "-" version ".tar.xz")) (file-name (string-append name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1kw3hqnr737ipx4f03khz3hvsh3ha7r8iy9njppk2faa53j27gln")) "1cgmr4g5g9wv36v7ylbrvqhsjwgcsdgbqwc8zlqmnayk9zgkdpgx"))
;; A snippet here would cause a build failure because of timestamps ;; A snippet here would cause a build failure because of timestamps
;; reset. See https://bugs.gnu.org/26734. ;; reset. See https://bugs.gnu.org/26734.
)) ))

17
gnu/packages/gimp.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -43,7 +43,7 @@
(define-public babl (define-public babl
(package (package
(name "babl") (name "babl")
(version "0.1.18") (version "0.1.28")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append "https://download.gimp.org/pub/babl/" (uri (list (string-append "https://download.gimp.org/pub/babl/"
@ -54,7 +54,7 @@
version ".tar.bz2"))) version ".tar.bz2")))
(sha256 (sha256
(base32 (base32
"1ygvnq22pf0zvf3bj7h67vvbpz7b8hhjvrr79ribws7sr5dljfj8")))) "00w6xfcv960c98qvxv81gcbj8l1jiab9sggmdl77m19awwiyvwv3"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "http://gegl.org/babl/") (home-page "http://gegl.org/babl/")
(synopsis "Image pixel format conversion library") (synopsis "Image pixel format conversion library")
@ -83,12 +83,13 @@ provided as well as the framework to add new color models and data types.")
(patches (search-patches "gegl-CVE-2012-4433.patch")))) (patches (search-patches "gegl-CVE-2012-4433.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(;; More than just the one test disabled below now fails; disable them '(;; More than just the one test disabled below now fails; disable them
;; all according to the rationale given below. ;; all according to the rationale given below.
#:tests? #f #:tests? #f
#:configure-flags '("LDFLAGS=-lm")
#:phases #:phases
(alist-cons-before (modify-phases %standard-phases
'build 'pre-build (add-before 'build 'pre-build
(lambda _ (lambda _
;; This test program seems to crash on exit. Specifically, whilst ;; This test program seems to crash on exit. Specifically, whilst
;; g_object_unreffing bufferA and bufferB - This seems to be a bug ;; g_object_unreffing bufferA and bufferB - This seems to be a bug
@ -101,8 +102,8 @@ provided as well as the framework to add new color models and data types.")
(("g_object_unref \\(buffer.\\);") "")) (("g_object_unref \\(buffer.\\);") ""))
(substitute* "tests/compositions/Makefile" (substitute* "tests/compositions/Makefile"
(("/bin/sh") (which "sh")))) (("/bin/sh") (which "sh")))
%standard-phases))) #t)))))
(inputs (inputs
`(("babl" ,babl) `(("babl" ,babl)
("glib" ,glib) ("glib" ,glib)

2
gnu/packages/glib.scm
View File

@ -283,7 +283,7 @@ shared NFS home directories.")
"GLib provides data structure handling for C, portability wrappers, "GLib provides data structure handling for C, portability wrappers,
and interfaces for such runtime functionality as an event loop, threads, and interfaces for such runtime functionality as an event loop, threads,
dynamic loading, and an object system.") dynamic loading, and an object system.")
(home-page "http://developer.gnome.org/glib/") (home-page "https://developer.gnome.org/glib/")
(license license:lgpl2.0+))) ; some files are under lgpl2.1+ (license license:lgpl2.0+))) ; some files are under lgpl2.1+
(define gobject-introspection (define gobject-introspection

96
gnu/packages/gnome.scm
View File

@ -141,7 +141,7 @@
(define-public brasero (define-public brasero
(package (package
(name "brasero") (name "brasero")
(version "3.12.1") (version "3.12.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -149,7 +149,7 @@
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"09vi2hyhl0bz7imv3ky6h7x5m3d546n968wcghydwrkvwm9ylpls")))) "0h90y674j26rvjahb8cc0w79zx477rb6zaqcj26wzvq8kmpic8k8"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
`(#:configure-flags (list `(#:configure-flags (list
@ -165,7 +165,7 @@
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "plugins/growisofs/burn-growisofs.c" (substitute* "plugins/growisofs/burn-growisofs.c"
(("\"growisofs") (string-append "\"" (which "growisofs")))) (("\"growisofs") (string-append "\"" (which "growisofs"))))
#t ))))) #t)))))
(propagated-inputs (propagated-inputs
`(("hicolor-icon-theme" ,hicolor-icon-theme))) `(("hicolor-icon-theme" ,hicolor-icon-theme)))
(native-inputs (native-inputs
@ -345,6 +345,13 @@ formats like PNG, SVG, PDF and EPS.")
;; The ca-certificates.crt is not available in the build ;; The ca-certificates.crt is not available in the build
;; environment. ;; environment.
(setenv "SSL_CERT_FILE" "/dev/null") (setenv "SSL_CERT_FILE" "/dev/null")
#t))
(add-before 'check 'disable-failing-tests
(lambda _
;; The PicasaWeb API tests fail with gnome-online-accounts@3.24.2.
;; They have been removed in libgdata 0.17.6, so just do the same.
(substitute* "gdata/tests/Makefile"
(("picasaweb\\$\\(EXEEXT\\) ") ""))
#t))))) #t)))))
(native-inputs (native-inputs
`(("glib:bin" ,glib "bin") `(("glib:bin" ,glib "bin")
@ -578,7 +585,7 @@ and keep up to date translations of documentation.")
`(("p11-kit" ,p11-kit) `(("p11-kit" ,p11-kit)
("glib" ,glib) ("glib" ,glib)
("gtk+" ,gtk+))) ("gtk+" ,gtk+)))
(home-page "http://www.gnome.org") (home-page "https://www.gnome.org")
(synopsis "Libraries for displaying certificates and accessing key stores") (synopsis "Libraries for displaying certificates and accessing key stores")
(description (description
"The GCR package contains libraries used for displaying certificates and "The GCR package contains libraries used for displaying certificates and
@ -609,7 +616,7 @@ GNOME Desktop.")
(propagated-inputs (propagated-inputs
;; Referred to in .h files and .pc. ;; Referred to in .h files and .pc.
`(("glib" ,glib))) `(("glib" ,glib)))
(home-page "http://www.gnome.org") (home-page "https://www.gnome.org")
(synopsis "Accessing passwords from the GNOME keyring") (synopsis "Accessing passwords from the GNOME keyring")
(description (description
"Client library to access passwords from the GNOME keyring.") "Client library to access passwords from the GNOME keyring.")
@ -673,7 +680,7 @@ GNOME Desktop.")
("libxslt" ,libxslt) ;for documentation ("libxslt" ,libxslt) ;for documentation
("docbook-xml" ,docbook-xml-4.2) ("docbook-xml" ,docbook-xml-4.2)
("docbook-xsl" ,docbook-xsl))) ("docbook-xsl" ,docbook-xsl)))
(home-page "http://www.gnome.org") (home-page "https://www.gnome.org")
(synopsis "Daemon to store passwords and encryption keys") (synopsis "Daemon to store passwords and encryption keys")
(description (description
"gnome-keyring is a program that keeps passwords and other secrets for "gnome-keyring is a program that keeps passwords and other secrets for
@ -744,7 +751,7 @@ forgotten when the session ends.")
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("xmllint" ,libxml2))) ("xmllint" ,libxml2)))
(home-page (home-page
"http://www.gnome.org/projects/evince/") "https://www.gnome.org/projects/evince/")
(synopsis "GNOME's document viewer") (synopsis "GNOME's document viewer")
(description (description
"Evince is a document viewer for multiple document formats. It "Evince is a document viewer for multiple document formats. It
@ -843,7 +850,7 @@ GNOME and KDE desktops to the icon names proposed in the specification.")
`(("icon-naming-utils" ,icon-naming-utils) `(("icon-naming-utils" ,icon-naming-utils)
("intltool" ,intltool) ("intltool" ,intltool)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(home-page "http://art.gnome.org/") (home-page "https://art.gnome.org/")
(synopsis (synopsis
"GNOME icon theme") "GNOME icon theme")
(description (description
@ -1142,7 +1149,7 @@ XML/CSS rendering engine.")
`(("gdk-pixbuf" ,gdk-pixbuf) `(("gdk-pixbuf" ,gdk-pixbuf)
("glib" ,glib) ("glib" ,glib)
("libxml2" ,libxml2))) ("libxml2" ,libxml2)))
(home-page "http://www.gnome.org/projects/libgsf") (home-page "https://www.gnome.org/projects/libgsf")
(synopsis "GNOME's Structured File Library") (synopsis "GNOME's Structured File Library")
(description (description
"Libgsf aims to provide an efficient extensible I/O abstraction for "Libgsf aims to provide an efficient extensible I/O abstraction for
@ -1377,7 +1384,7 @@ is intended for user preferences; not arbitrary data storage.")
(string-append "INTLTOOL_" tool " = intltool-" (string-append "INTLTOOL_" tool " = intltool-"
(string-downcase tool) "\n"))) (string-downcase tool) "\n")))
#t))))) #t)))))
(home-page "http://www.gnome.org") (home-page "https://www.gnome.org")
(synopsis "Base MIME and Application database for GNOME") (synopsis "Base MIME and Application database for GNOME")
(description "GNOME Mime Data is a module which contains the base MIME (description "GNOME Mime Data is a module which contains the base MIME
and Application database for GNOME. The data stored by this module is and Application database for GNOME. The data stored by this module is
@ -1832,7 +1839,7 @@ Hints specification (EWMH).")
(define-public gnumeric (define-public gnumeric
(package (package
(name "gnumeric") (name "gnumeric")
(version "1.12.34") (version "1.12.35")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -1840,7 +1847,7 @@ Hints specification (EWMH).")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"09f7h4lvwzyl0amd3axapwbsrnrvvpwxyhs540jlrv425n0j0j8b")))) "02kcq2af16m9mlzgkbdzswhw0nl6zf01dmvsfq3shy1mab7f7cbp"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
`(;; The gnumeric developers don't worry much about failing tests. `(;; The gnumeric developers don't worry much about failing tests.
@ -1995,7 +2002,7 @@ passwords in the GNOME keyring.")
("gobject-introspection" ,gobject-introspection))) ; for gir tests ("gobject-introspection" ,gobject-introspection))) ; for gir tests
(propagated-inputs (propagated-inputs
`(("glib" ,glib))) ; required by libvala-0.26.pc `(("glib" ,glib))) ; required by libvala-0.26.pc
(home-page "http://live.gnome.org/Vala/") (home-page "https://live.gnome.org/Vala/")
(synopsis "Compiler for the GObject type system") (synopsis "Compiler for the GObject type system")
(description (description
"Vala is a programming language that aims to bring modern programming "Vala is a programming language that aims to bring modern programming
@ -2029,7 +2036,7 @@ libraries written in C.")
`(("gtk+" ,gtk+) ;required by vte-2.91.pc `(("gtk+" ,gtk+) ;required by vte-2.91.pc
("gnutls" ,gnutls) ;ditto ("gnutls" ,gnutls) ;ditto
("pcre2" ,pcre2))) ;ditto ("pcre2" ,pcre2))) ;ditto
(home-page "http://www.gnome.org/") (home-page "https://www.gnome.org/")
(synopsis "Virtual Terminal Emulator") (synopsis "Virtual Terminal Emulator")
(description (description
"VTE is a library (libvte) implementing a terminal emulator widget for "VTE is a library (libvte) implementing a terminal emulator widget for
@ -2299,7 +2306,7 @@ indicators etc).")
`(("python" ,python-2) `(("python" ,python-2)
("python2-pygtk" ,python2-pygtk) ("python2-pygtk" ,python2-pygtk)
("librsvg" ,librsvg))) ("librsvg" ,librsvg)))
(home-page "http://www.gnome.org") (home-page "https://www.gnome.org")
(synopsis "Python bindings to librsvg") (synopsis "Python bindings to librsvg")
(description (description
"This packages provides Python bindings to librsvg, the SVG rendering "This packages provides Python bindings to librsvg, the SVG rendering
@ -2350,7 +2357,7 @@ library.")
("gnutls" ,gnutls) ("gnutls" ,gnutls)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("p11-kit" ,p11-kit))) ("p11-kit" ,p11-kit)))
(home-page "http://www.gnome.org") (home-page "https://www.gnome.org")
(synopsis "Network-related GIO modules") (synopsis "Network-related GIO modules")
(description (description
"This package contains various network related extensions for the GIO "This package contains various network related extensions for the GIO
@ -3020,7 +3027,7 @@ services for numerous locations.")
("librsvg" ,librsvg) ("librsvg" ,librsvg)
("xf86-input-wacom" ,xf86-input-wacom) ("xf86-input-wacom" ,xf86-input-wacom)
("network-manager" ,network-manager))) ("network-manager" ,network-manager)))
(home-page "http://www.gnome.org") (home-page "https://www.gnome.org")
(synopsis "GNOME settings daemon") (synopsis "GNOME settings daemon")
(description (description
"This package contains the daemon responsible for setting the various "This package contains the daemon responsible for setting the various
@ -3343,7 +3350,7 @@ GL based interactive canvas library.")
("cairo" ,cairo) ("cairo" ,cairo)
("gtk+3" ,gtk+) ("gtk+3" ,gtk+)
("glib" ,glib))) ("glib" ,glib)))
(home-page "http://projects.gnome.org/libchamplain/") (home-page "https://projects.gnome.org/libchamplain/")
(synopsis "C library providing a ClutterActor to display maps") (synopsis "C library providing a ClutterActor to display maps")
(description (description
"libchamplain is a C library providing a ClutterActor to display maps. "libchamplain is a C library providing a ClutterActor to display maps.
@ -3512,7 +3519,7 @@ as possible!")
(variable "GRL_PLUGIN_PATH") (variable "GRL_PLUGIN_PATH")
(files (list (string-append "lib/grilo-" (files (list (string-append "lib/grilo-"
(version-major+minor version))))))) (version-major+minor version)))))))
(home-page "http://live.gnome.org/Grilo") (home-page "https://live.gnome.org/Grilo")
(synopsis "Framework for discovering and browsing media") (synopsis "Framework for discovering and browsing media")
(description (description
"Grilo is a framework focused on making media discovery and browsing easy "Grilo is a framework focused on making media discovery and browsing easy
@ -3565,7 +3572,7 @@ for application developers.")
;; with: "assertion failed: (source)". Outside of the build container, ;; with: "assertion failed: (source)". Outside of the build container,
;; most tests succeed. ;; most tests succeed.
#:tests? #f)) #:tests? #f))
(home-page "http://live.gnome.org/Grilo") (home-page "https://live.gnome.org/Grilo")
(synopsis "Plugins for the Grilo media discovery library") (synopsis "Plugins for the Grilo media discovery library")
(description (description
"Grilo is a framework focused on making media discovery and browsing easy "Grilo is a framework focused on making media discovery and browsing easy
@ -4087,7 +4094,7 @@ a secret password store, an adblocker, and a modern UI.")
(define-public epiphany (define-public epiphany
(package (package
(name "epiphany") (name "epiphany")
(version "3.24.2") (version "3.24.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -4095,7 +4102,7 @@ a secret password store, an adblocker, and a modern UI.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"13f5h7mbxdyjf93jp46hiaxsrngpr6frgf69d8iza7arc060vg2s")))) "0m51cclpnb7lxk8w526rriyb2bi3aj17fbcvikhkg7qd65v1dxgy"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
;; FIXME: tests run under Xvfb, but fail with: ;; FIXME: tests run under Xvfb, but fail with:
@ -4564,7 +4571,7 @@ configuration program to choose applications starting on login.")
`(("gtk+" ,gtk+) `(("gtk+" ,gtk+)
("readline" ,readline))) ("readline" ,readline)))
(synopsis "Javascript bindings for GNOME") (synopsis "Javascript bindings for GNOME")
(home-page "http://live.gnome.org/Gjs") (home-page "https://live.gnome.org/Gjs")
(description (description
"Gjs is a javascript binding for GNOME. It's mainly based on spidermonkey "Gjs is a javascript binding for GNOME. It's mainly based on spidermonkey
javascript engine and the GObject introspection framework.") javascript engine and the GObject introspection framework.")
@ -4573,7 +4580,7 @@ javascript engine and the GObject introspection framework.")
(define-public gedit (define-public gedit
(package (package
(name "gedit") (name "gedit")
(version "3.22.0") (version "3.22.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -4581,11 +4588,10 @@ javascript engine and the GObject introspection framework.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0i9z5d31vibb3dd329gwvyga38zq5k1a2glcdq7m93ycbl5mlfq6")))) "0as9r5zvnyrxh699q6jnd0p9ddqy5qamfbxggpdjzagzixhw6yxa"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
`(#:configure-flags '("--disable-spell") ; XXX: gspell not packaged yet `(#:phases
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after (add-after
'install 'wrap-gedit 'install 'wrap-gedit
@ -4611,6 +4617,7 @@ javascript engine and the GObject introspection framework.")
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (inputs
`(("glib" ,glib) `(("glib" ,glib)
("gspell" ,gspell)
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("gtksourceview" ,gtksourceview) ("gtksourceview" ,gtksourceview)
("libpeas" ,libpeas) ("libpeas" ,libpeas)
@ -4651,7 +4658,7 @@ powerful general purpose text editor.")
`(("libnotify" ,libnotify) `(("libnotify" ,libnotify)
("webkitgtk" ,webkitgtk))) ("webkitgtk" ,webkitgtk)))
(synopsis "Display graphical dialog boxes from shell scripts") (synopsis "Display graphical dialog boxes from shell scripts")
(home-page "http://www.gnome.org") (home-page "https://www.gnome.org")
(description (description
"Zenity is a rewrite of gdialog, the GNOME port of dialog which allows you "Zenity is a rewrite of gdialog, the GNOME port of dialog which allows you
to display dialog boxes from the commandline and shell scripts.") to display dialog boxes from the commandline and shell scripts.")
@ -4660,7 +4667,7 @@ to display dialog boxes from the commandline and shell scripts.")
(define-public mutter (define-public mutter
(package (package
(name "mutter") (name "mutter")
(version "3.24.2") (version "3.24.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -4668,7 +4675,7 @@ to display dialog boxes from the commandline and shell scripts.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"043q3384vwrkjdfhbwn9pwdml6z0g0ad0cj2fjnjzg6402i67071")))) "1slspy5krbqfvnma72lvdnxjf8ag2cvxssa8bvi7y3xxy7xv603k"))))
;; NOTE: Since version 3.21.x, mutter now bundles and exports forked ;; NOTE: Since version 3.21.x, mutter now bundles and exports forked
;; versions of cogl and clutter. As a result, many of the inputs, ;; versions of cogl and clutter. As a result, many of the inputs,
;; propagated-inputs, and configure flags used in cogl and clutter are ;; propagated-inputs, and configure flags used in cogl and clutter are
@ -4749,7 +4756,7 @@ to display dialog boxes from the commandline and shell scripts.")
("xkeyboard-config" ,xkeyboard-config) ("xkeyboard-config" ,xkeyboard-config)
("zenity" ,zenity))) ("zenity" ,zenity)))
(synopsis "Window and compositing manager") (synopsis "Window and compositing manager")
(home-page "http://www.gnome.org") (home-page "https://www.gnome.org")
(description (description
"Mutter is a window and compositing manager that displays and manages your "Mutter is a window and compositing manager that displays and manages your
desktop via OpenGL. Mutter combines a sophisticated display engine using the desktop via OpenGL. Mutter combines a sophisticated display engine using the
@ -4760,7 +4767,7 @@ window manager.")
(define-public gnome-online-accounts (define-public gnome-online-accounts
(package (package
(name "gnome-online-accounts") (name "gnome-online-accounts")
(version "3.24.1") (version "3.24.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -4768,7 +4775,7 @@ window manager.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0lgniqmkr6ffdw3kcqd34lvp969j2q2qzcy30zkzl5c09r7anc0a")))) "1fmgywfcvlb5sa0slxxlg80gafiaal8vnq6h5lcybqa12lnxa2mp"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(native-inputs (native-inputs
`(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
@ -5034,7 +5041,7 @@ users.")
("util-linux" ,util-linux) ("util-linux" ,util-linux)
("elogind" ,elogind))) ("elogind" ,elogind)))
(synopsis "Network connection manager") (synopsis "Network connection manager")
(home-page "http://www.gnome.org/projects/NetworkManager/") (home-page "https://www.gnome.org/projects/NetworkManager/")
(description (description
"NetworkManager is a system network service that manages your network "NetworkManager is a system network service that manages your network
devices and connections, attempting to keep active network connectivity when devices and connections, attempting to keep active network connectivity when
@ -5097,7 +5104,7 @@ services.")
("jansson" ,jansson) ; for team support ("jansson" ,jansson) ; for team support
("modem-manager" ,modem-manager))) ("modem-manager" ,modem-manager)))
(synopsis "Applet for managing network connections") (synopsis "Applet for managing network connections")
(home-page "http://www.gnome.org/projects/NetworkManager/") (home-page "https://www.gnome.org/projects/NetworkManager/")
(description (description
"This package contains a systray applet for NetworkManager. It displays "This package contains a systray applet for NetworkManager. It displays
the available networks and allows users to easily switch between them.") the available networks and allows users to easily switch between them.")
@ -5198,7 +5205,7 @@ libxml2.")
("libcanberra" ,libcanberra) ("libcanberra" ,libcanberra)
("linux-pam" ,linux-pam))) ("linux-pam" ,linux-pam)))
(synopsis "Display manager for GNOME") (synopsis "Display manager for GNOME")
(home-page "http://wiki.gnome.org/Projects/GDM/") (home-page "https://wiki.gnome.org/Projects/GDM/")
(description (description
"GNOME Display Manager is a system service that is responsible for "GNOME Display Manager is a system service that is responsible for
providing graphical log-ins and managing local and remote displays.") providing graphical log-ins and managing local and remote displays.")
@ -5491,7 +5498,7 @@ easy, safe, and automatic.")
(define-public tracker (define-public tracker
(package (package
(name "tracker") (name "tracker")
(version "1.12.0") (version "1.12.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -5499,7 +5506,7 @@ easy, safe, and automatic.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0vsrzzkcfvmylhpk1ww6xdx8z9sgjs0gn74gz82qngjyq3c3s6c3")))) "1zdzh8l5ahi906i40i4pqw2cs1hwrl6l9a7fp344a3idk3pl5szb"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(native-inputs (native-inputs
`(("gnome-common" ,gnome-common) `(("gnome-common" ,gnome-common)
@ -6512,18 +6519,19 @@ that support the Assistive Technology Service Provider Interface (AT-SPI).")
"/lib/aspell")) "/lib/aspell"))
#t))))) #t)))))
(inputs (inputs
`(("enchant" ,enchant) `(("gtk+" ,gtk+)
("iso-codes" ,iso-codes) ("glib" ,glib)
("gtk+" ,gtk+) ("iso-codes" ,iso-codes)))
("glib" ,glib)))
(native-inputs (native-inputs
`(("glib" ,glib "bin") `(("glib" ,glib "bin")
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("xmllint" ,libxml2) ("xmllint" ,libxml2)
;; For tests. ;; For tests.
("xorg-server" ,xorg-server) ("aspell-dict-en" ,aspell-dict-en)
("aspell-dict-en" ,aspell-dict-en))) ("xorg-server" ,xorg-server)))
(propagated-inputs
`(("enchant" ,enchant))) ; enchant.pc is required by gspell-1.pc
(home-page "https://wiki.gnome.org/Projects/gspell") (home-page "https://wiki.gnome.org/Projects/gspell")
(synopsis "GNOME's alternative spell checker") (synopsis "GNOME's alternative spell checker")
(description (description

6
gnu/packages/gnunet.scm
View File

@ -5,7 +5,7 @@
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2017 ng0 <ng0@no-reply.infotropique.org> ;;; Copyright © 2016, 2017 ng0 <ng0@infotropique.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -186,14 +186,14 @@ and support for SSL3 and TLS.")
(define-public gnurl (define-public gnurl
(package (package
(name "gnurl") (name "gnurl")
(version "7.54.1") (version "7.55.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://gnunet.org/sites/default/files/" (uri (string-append "https://gnunet.org/sites/default/files/"
name "-" version ".tar.bz2")) name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0szbj352h95sgc9kbx9wzkgjksmg3g5k6cvlc7hz3wrbdh5gb0a4")))) "0i9bik76rbyag3mbxbk8j383iaxs5v7lmjkn4v36ascl6bdks6vn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"doc")) ; 1.5 MiB of man3 pages "doc")) ; 1.5 MiB of man3 pages

7
gnu/packages/gnupg.scm
View File

@ -203,14 +203,14 @@ compatible to GNU Pth.")
(define-public gnupg (define-public gnupg
(package (package
(name "gnupg") (name "gnupg")
(version "2.1.22") (version "2.1.23")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnupg/gnupg/gnupg-" version (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
".tar.bz2")) ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1msazgy1q1pp7y2xr46z0il4pfzmzgzkp7v0hv5cz4hvkspnywa6")))) "0xqd5nm4j3w9lwk35vg57gl2i8bfkmx7d24i44gkbscm2lwpci59"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -229,8 +229,7 @@ compatible to GNU Pth.")
("sqlite" ,sqlite) ("sqlite" ,sqlite)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments (arguments
`(#:configure-flags '("--enable-gpg2-is-gpg" `(#:configure-flags '(;; Otherwise, the test suite looks for the `gpg`
;; Otherwise, the test suite looks for the `gpg`
;; executable in its installation directory in ;; executable in its installation directory in
;; /gnu/store before it has been installed. ;; /gnu/store before it has been installed.
"--enable-gnupg-builddir-envvar") "--enable-gnupg-builddir-envvar")

90
gnu/packages/gnuzilla.scm
View File

@ -509,52 +509,86 @@ standards.")
(mozilla-patch "icecat-CVE-2017-5470-pt20.patch" "38273203b827" "12p9r4spdp09d6ic9sqspvdr50lmc1p86ydz2fxdifb1f95njhx0") (mozilla-patch "icecat-CVE-2017-5470-pt20.patch" "38273203b827" "12p9r4spdp09d6ic9sqspvdr50lmc1p86ydz2fxdifb1f95njhx0")
(mozilla-patch "icecat-bug-1357022.patch" "5bd51bc3f587" "0z5drxpfjvb7s43qgcr404h8ckchgakwwwi4nxpx2i653w22a743") (mozilla-patch "icecat-bug-1357022.patch" "5bd51bc3f587" "0z5drxpfjvb7s43qgcr404h8ckchgakwwwi4nxpx2i653w22a743")
(mozilla-patch "icecat-bug-1318845.patch" "512efd480dac" "13cmqap795ayh6gh3b5bc6002pz0wp92qngs7fh5qqklc7a0gkzv") (mozilla-patch "icecat-bug-1318845.patch" "512efd480dac" "13cmqap795ayh6gh3b5bc6002pz0wp92qngs7fh5qqklc7a0gkzv")
(mozilla-patch "icecat-bug-1371586.patch" "d0c92199b9ed" "0qmsm7d4h6ysx3an247kpx9qpksfms7hrjgpdrghdbxla1hc4nc9") (mozilla-patch "icecat-CVE-2017-7798-pt1.patch" "d0c92199b9ed" "0qmsm7d4h6ysx3an247kpx9qpksfms7hrjgpdrghdbxla1hc4nc9")
(mozilla-patch "icecat-bug-1364513.patch" "88e9c2137640" "1mh4l745q1wlabn9sz47n0vy3h7c66fcay2b9dwa16iqwvh3lpiw") (mozilla-patch "icecat-bug-1364513.patch" "88e9c2137640" "1mh4l745q1wlabn9sz47n0vy3h7c66fcay2b9dwa16iqwvh3lpiw")
(mozilla-patch "icecat-bug-1366203.patch" "08dd87b6bb8f" "15bfwfwwd978mlcpk1d6m7506k8c2y402md7wzf6piabxl5kk6cf") (mozilla-patch "icecat-bug-1366203.patch" "08dd87b6bb8f" "15bfwfwwd978mlcpk1d6m7506k8c2y402md7wzf6piabxl5kk6cf")
(mozilla-patch "icecat-bug-1368576.patch" "5a51a9ef8149" "0j0f9j0pryv3ik4bizhv8s6rr4dl1mjm01c23msayr0vbnpcagcs") (mozilla-patch "icecat-CVE-2017-7779-pt01.patch" "5a51a9ef8149" "0j0f9j0pryv3ik4bizhv8s6rr4dl1mjm01c23msayr0vbnpcagcs")
(mozilla-patch "icecat-bug-1369913.patch" "f47eaebc0c5c" "1b52xm3awpigasaz0hk5b13l7v4ry9vrawf571lzy2wwhphs4nxx") (mozilla-patch "icecat-CVE-2017-7779-pt02.patch" "f47eaebc0c5c" "1b52xm3awpigasaz0hk5b13l7v4ry9vrawf571lzy2wwhphs4nxx")
(mozilla-patch "icecat-bug-1371424.patch" "40ce248a8c15" "1b722fiifr999ga0991cg5mlhidcnvf3zx2aiq5zjaabqn0f4dzk") (mozilla-patch "icecat-CVE-2017-7779-pt03.patch" "40ce248a8c15" "1b722fiifr999ga0991cg5mlhidcnvf3zx2aiq5zjaabqn0f4dzk")
(mozilla-patch "icecat-bug-1372112.patch" "0c8359ac6718" "1w0v2p5jnhzvcsx8h1bglwjhp5y5bg1g8pzpvjw7pg1wlq2frccr") (mozilla-patch "icecat-CVE-2017-7798-pt2.patch" "0c8359ac6718" "1w0v2p5jnhzvcsx8h1bglwjhp5y5bg1g8pzpvjw7pg1wlq2frccr")
(mozilla-patch "icecat-bug-1354443-pt1.patch" "8c27a68ee87e" "0kn05q8nvp26w5rnj8r0byw89h2awmwn04l9l3xv2i5w2a7zmjzf") (mozilla-patch "icecat-CVE-2017-7779-pt04.patch" "8c27a68ee87e" "0kn05q8nvp26w5rnj8r0byw89h2awmwn04l9l3xv2i5w2a7zmjzf")
(mozilla-patch "icecat-bug-1354443-pt2.patch" "b2ee0c5466da" "0jgwsppq0606lwg5jk9q69lqa14q3j7h3c7q6mxbz7zqrcg7d0zg") (mozilla-patch "icecat-CVE-2017-7779-pt05.patch" "b2ee0c5466da" "0jgwsppq0606lwg5jk9q69lqa14q3j7h3c7q6mxbz7zqrcg7d0zg")
(mozilla-patch "icecat-bug-1354443-pt3.patch" "25f6ec16e501" "1yqd5ndwgd8x2pj9k2bnaq3rb1g7wikq0ii7l4dm6bqwabi2rdsg") (mozilla-patch "icecat-CVE-2017-7779-pt06.patch" "25f6ec16e501" "1yqd5ndwgd8x2pj9k2bnaq3rb1g7wikq0ii7l4dm6bqwabi2rdsg")
(mozilla-patch "icecat-bug-1354443-pt4.patch" "30443b4f758e" "0riszl3xnpfq5ffywygrc12nsvx0ffd36d5rf4vp87r8lj3fr55r") (mozilla-patch "icecat-CVE-2017-7779-pt07.patch" "30443b4f758e" "0riszl3xnpfq5ffywygrc12nsvx0ffd36d5rf4vp87r8lj3fr55r")
(mozilla-patch "icecat-bug-1354443-pt5.patch" "1b934ab92c59" "114cvfzfxgkwwd4zpnrmm2kx6m94k0b3xcraba9aawwwhdxj6a1d") (mozilla-patch "icecat-CVE-2017-7779-pt08.patch" "1b934ab92c59" "114cvfzfxgkwwd4zpnrmm2kx6m94k0b3xcraba9aawwwhdxj6a1d")
(mozilla-patch "icecat-bug-1354443-pt6.patch" "830a345dc0e7" "01riivv033w3mr8b2myaw38rz2za1bdlhybny737ly68hhc67xdz") (mozilla-patch "icecat-CVE-2017-7779-pt09.patch" "830a345dc0e7" "01riivv033w3mr8b2myaw38rz2za1bdlhybny737ly68hhc67xdz")
(mozilla-patch "icecat-bug-1365189.patch" "5c26df489768" "1fdw4zbn0ilfghanxky4y7qcmkpkks2q1aqkzv26dnhhrr8350a1") (mozilla-patch "icecat-CVE-2017-7786.patch" "5c26df489768" "1fdw4zbn0ilfghanxky4y7qcmkpkks2q1aqkzv26dnhhrr8350a1")
(mozilla-patch "icecat-bug-1365875.patch" "f21e4d78a0a8" "0szsc3zm3wgrw8pxm0rz54whkrc14yy4d8vwmxgqsdns43qjgkpk") (mozilla-patch "icecat-CVE-2017-7791.patch" "f21e4d78a0a8" "0szsc3zm3wgrw8pxm0rz54whkrc14yy4d8vwmxgqsdns43qjgkpk")
(mozilla-patch "icecat-bug-1346590.patch" "f19b6c6a0c6c" "0wkr010qnh4127z1j7fp45sqdk2da9x7j2k405r0x5bgqdd09qzp") (mozilla-patch "icecat-CVE-2017-7779-pt10.patch" "f19b6c6a0c6c" "0wkr010qnh4127z1j7fp45sqdk2da9x7j2k405r0x5bgqdd09qzp")
(mozilla-patch "icecat-bug-1376087.patch" "8353a3fa4106" "0kzs8pl6spjwgdsmiw702zvbvz73ng9zf184clsfr82l8kmggbgw") (mozilla-patch "icecat-CVE-2017-7784.patch" "8353a3fa4106" "0kzs8pl6spjwgdsmiw702zvbvz73ng9zf184clsfr82l8kmggbgw")
(mozilla-patch "icecat-bug-1371889.patch" "b38fed9a9772" "14vzsldlv4hjpxgnl6fjjbzhgcwsmd52v06cgmv0a7y3lnggj3hp") (mozilla-patch "icecat-bug-1371889.patch" "b38fed9a9772" "14vzsldlv4hjpxgnl6fjjbzhgcwsmd52v06cgmv0a7y3lnggj3hp"); XXX backed out upstream
(mozilla-patch "icecat-bug-1322896.patch" "c254d3cc826c" "0pixwr18qik87c8qf4irg6hdffd8rbwpng73jxg05h7s827nfw3g") (mozilla-patch "icecat-CVE-2017-7787.patch" "c254d3cc826c" "0pixwr18qik87c8qf4irg6hdffd8rbwpng73jxg05h7s827nfw3g")
(mozilla-patch "icecat-bug-1368652.patch" "6356dbf20658" "0a0hsxkik7ysfa48w8k21lidaabwpmxi1d3214r5zqkqqfhn9qjm") (mozilla-patch "icecat-CVE-2017-7792.patch" "6356dbf20658" "0a0hsxkik7ysfa48w8k21lidaabwpmxi1d3214r5zqkqqfhn9qjm")
(mozilla-patch "icecat-bug-1358073.patch" "8d6e685d061b" "0430gwg7zzbg0q9w2m04s5ljh47bc8x1gxvmkzbn23bh1wy4d4sq") (mozilla-patch "icecat-bug-1358073.patch" "8d6e685d061b" "0430gwg7zzbg0q9w2m04s5ljh47bc8x1gxvmkzbn23bh1wy4d4sq")
(mozilla-patch "icecat-bug-1370869.patch" "3b8fde840188" "0vkymvzkfpzpg86npa5vpvvf564k18hkfdz8857rl0z4dp4rybzx") (mozilla-patch "icecat-bug-1370869.patch" "3b8fde840188" "0vkymvzkfpzpg86npa5vpvvf564k18hkfdz8857rl0z4dp4rybzx")
(mozilla-patch "icecat-bug-1369994.patch" "267b649087ff" "04wzazdm0kvbfcgmlhx8qs1ibqn8sbvqdsd237rja5wpr761xxf1") (mozilla-patch "icecat-CVE-2017-7779-pt11.patch" "267b649087ff" "04wzazdm0kvbfcgmlhx8qs1ibqn8sbvqdsd237rja5wpr761xxf1")
(mozilla-patch "icecat-bug-1354796.patch" "69d1a9de76b9" "1q0p4kf8pvnkwwff3lz526pjj15a25pf724awblkcnzamwbib5ns") (mozilla-patch "icecat-bug-1354796.patch" "69d1a9de76b9" "1q0p4kf8pvnkwwff3lz526pjj15a25pf724awblkcnzamwbib5ns")
(mozilla-patch "icecat-bug-1363027.patch" "c5eaa2d51b9f" "1xyj5n1vqhscc369q6wxibs2igbilaiwyc0q9cq64j2qx8q0yqah") (mozilla-patch "icecat-bug-1363027.patch" "c5eaa2d51b9f" "1xyj5n1vqhscc369q6wxibs2igbilaiwyc0q9cq64j2qx8q0yqah")
(mozilla-patch "icecat-bug-1364189.patch" "852a7781259e" "12y344p54avz5mrqirq14zp4csx8ydilnjv9nsw48kpa9y0l5xsg") (mozilla-patch "icecat-bug-1364189.patch" "852a7781259e" "12y344p54avz5mrqirq14zp4csx8ydilnjv9nsw48kpa9y0l5xsg")
(mozilla-patch "icecat-bug-1342417.patch" "37ccdc5fff2b" "1acywg8girplbs7wjrjbvkximhiyizddmnkkq1ldd0l3qbx9nihc") (mozilla-patch "icecat-bug-1342417.patch" "37ccdc5fff2b" "1acywg8girplbs7wjrjbvkximhiyizddmnkkq1ldd0l3qbx9nihc")
(mozilla-patch "icecat-bug-1362924-pt1.patch" "057ed884ecb0" "1m49bqkq5lzc2j59wgwy0gbzvqj50p9lfn7cbc2n01v6d7m8rc2j") (mozilla-patch "icecat-CVE-2017-7779-pt12.patch" "057ed884ecb0" "1m49bqkq5lzc2j59wgwy0gbzvqj50p9lfn7cbc2n01v6d7m8rc2j")
(mozilla-patch "icecat-bug-1362924-pt2.patch" "dd7ed649b82f" "1fama1l2vx4p6ahhrsrpysfbk9nh5gwbi4pdnclpyxd42idsdqxs") (mozilla-patch "icecat-CVE-2017-7779-pt13.patch" "dd7ed649b82f" "1fama1l2vx4p6ahhrsrpysfbk9nh5gwbi4pdnclpyxd42idsdqxs")
(mozilla-patch "icecat-bug-1353312.patch" "731958f7ff4d" "0l3i3mkb6rslnjag3caf4xyhjzxn91wfs0g6dbika4sxnhfs5d4i") (mozilla-patch "icecat-CVE-2017-7753.patch" "731958f7ff4d" "0l3i3mkb6rslnjag3caf4xyhjzxn91wfs0g6dbika4sxnhfs5d4i")
(mozilla-patch "icecat-bug-1364870.patch" "de8deecbcb02" "048ic1vk7fd7wxqjgjqlnb7kv03ynaa4wkrk0ka8m39pkjh3yyxj") (mozilla-patch "icecat-bug-1364870.patch" "de8deecbcb02" "048ic1vk7fd7wxqjgjqlnb7kv03ynaa4wkrk0ka8m39pkjh3yyxj")
(mozilla-patch "icecat-bug-1365333.patch" "e3d13b270f45" "0jr8hpxpmfgrbh09xd9nj597cdnc6kl6gs5nir4zlzbbn8kp3429") (mozilla-patch "icecat-bug-1365333.patch" "e3d13b270f45" "0jr8hpxpmfgrbh09xd9nj597cdnc6kl6gs5nir4zlzbbn8kp3429")
(mozilla-patch "icecat-bug-1372063.patch" "58a144bf9677" "12y8vikbzcfcfiidjdq67dvdhhvylx68wdgnypsafrd1q8dx9jza") (mozilla-patch "icecat-bug-1372063.patch" "58a144bf9677" "12y8vikbzcfcfiidjdq67dvdhhvylx68wdgnypsafrd1q8dx9jza")
(mozilla-patch "icecat-bug-1373970.patch" "8321ef71adb5" "1wk8kq9n2vhqlinvvw01avv3c7qj0k3qnn7dj0whnl08a5yrqhpl") (mozilla-patch "icecat-bug-1373970.patch" "8321ef71adb5" "1wk8kq9n2vhqlinvvw01avv3c7qj0k3qnn7dj0whnl08a5yrqhpl")
(mozilla-patch "icecat-bug-1338646.patch" "322c18d011af" "1yqb7zmjz211ryb98pjj7axbj6bwkj63rmfyifsybdy3zpb4nf48") (mozilla-patch "icecat-bug-1338646.patch" "322c18d011af" "1yqb7zmjz211ryb98pjj7axbj6bwkj63rmfyifsybdy3zpb4nf48")
(mozilla-patch "icecat-bug-1371283.patch" "f9bc084fbb8a" "1ssml15yzx9s0wraq4n0xvq5bw7j8xq0p2y39h8j3f1c448n0j50") (mozilla-patch "icecat-CVE-2017-7779-pt14.patch" "f9bc084fbb8a" "1ssml15yzx9s0wraq4n0xvq5bw7j8xq0p2y39h8j3f1c448n0j50")
(mozilla-patch "icecat-bug-1359477.patch" "9b70b5b852e4" "0z2bi7w46g7mm8msav8vz28mgvnv21z3a5876n9gpw317gns4d6a") (mozilla-patch "icecat-bug-1359477.patch" "9b70b5b852e4" "0z2bi7w46g7mm8msav8vz28mgvnv21z3a5876n9gpw317gns4d6a")
(mozilla-patch "icecat-bug-1366903.patch" "6785c2a852da" "0p9jr171qi59scr5lrj6g0mv8mgm1i1wglr3jd16xywb0ymynnn5") (mozilla-patch "icecat-CVE-2017-7779-pt15.patch" "6785c2a852da" "0p9jr171qi59scr5lrj6g0mv8mgm1i1wglr3jd16xywb0ymynnn5")
(mozilla-patch "icecat-bug-1368105.patch" "11c8e23f0fd7" "0zcikv6dn7biii4gspv2kfvma5hc76hk86jahm3zl2zlkk8ikfm9") (mozilla-patch "icecat-CVE-2017-7779-pt16.patch" "11c8e23f0fd7" "0zcikv6dn7biii4gspv2kfvma5hc76hk86jahm3zl2zlkk8ikfm9")
(mozilla-patch "icecat-bug-1355168.patch" "f45ba43512ad" "0p28q5acns5zjj7ks2x5lrmwzzps741507sq31xvrpzan5yav37x") (mozilla-patch "icecat-bug-1355168.patch" "f45ba43512ad" "0p28q5acns5zjj7ks2x5lrmwzzps741507sq31xvrpzan5yav37x")
(mozilla-patch "icecat-bug-1308820.patch" "e9a10fac6aae" "1s2zaka6ik1rmylamyh38vsqnqlblbqdhjpp0cv08fjb9flh5sbw") (mozilla-patch "icecat-bug-1308820.patch" "e9a10fac6aae" "1s2zaka6ik1rmylamyh38vsqnqlblbqdhjpp0cv08fjb9flh5sbw")
(mozilla-patch "icecat-bug-1305036.patch" "c42a348f2ed0" "1pz7qbdv9xvyd1dy7g9h047c0gmrgp5qdy2360qjk6879n74h1zb") (mozilla-patch "icecat-bug-1305036.patch" "c42a348f2ed0" "1pz7qbdv9xvyd1dy7g9h047c0gmrgp5qdy2360qjk6879n74h1zb")
(mozilla-patch "icecat-bug-1342913.patch" "f02db36497d2" "0g1kg418l1cibh5k1sjqj2vs2jcblpbn7b06qazk2kzcg70vf5gv") (mozilla-patch "icecat-bug-1342913.patch" "f02db36497d2" "0g1kg418l1cibh5k1sjqj2vs2jcblpbn7b06qazk2kzcg70vf5gv")
(mozilla-patch "icecat-bug-1374047.patch" "0a44ed156da5" "1y8z1czm7f91p9bpd32b9k43nl0b9g4fzwv4w0khby9y38xgvcbs") (mozilla-patch "icecat-CVE-2017-7800.patch" "0a44ed156da5" "1y8z1czm7f91p9bpd32b9k43nl0b9g4fzwv4w0khby9y38xgvcbs")
(mozilla-patch "icecat-bug-1371259.patch" "0a86729d653e" "0wyh7qskjwq9274d25p2ajylaab5mj5h8by58rz9lxsz06zrnz9f") (mozilla-patch "icecat-CVE-2017-7801.patch" "0a86729d653e" "0wyh7qskjwq9274d25p2ajylaab5mj5h8by58rz9lxsz06zrnz9f")
(mozilla-patch "icecat-bug-1378826.patch" "98ff43fb228a" "0ih0nsmk8rzdrajzlnryqiqb71jg7v4p71hfla2hrlvn41r3709m"))) (mozilla-patch "icecat-CVE-2017-7779-pt17.patch" "98ff43fb228a" "0ih0nsmk8rzdrajzlnryqiqb71jg7v4p71hfla2hrlvn41r3709m")
(mozilla-patch "icecat-CVE-2017-7802.patch" "09f62bfc5800" "07q18qzxja1cywihr5vhhws328zghrwc6ldx8kcsawia1r1i5gp7")
(mozilla-patch "icecat-bug-1321803-pt1.patch" "cfb75012cfbd" "1bwwfm1vhr7ddsvmi1cinwdq6f4nd71fkd9lbnlhmh4ix63gz2yl")
(mozilla-patch "icecat-bug-1321803-pt2.patch" "0f3f951461d7" "1rp1cj4c0dkhd4pda88kx499h7ycw3037yh2khff78y61ckg2a85")
(mozilla-patch "icecat-bug-1321803-pt3.patch" "b654a39db998" "1v79mh8lrnn7q40c8zj24byrqyw3x8fwcw25w90wqajnbf0ixskx")
(mozilla-patch "icecat-bug-1334338.patch" "1be1fe3c9622" "1mhd9nyp8map76hgwrhm1k955fz8y5iszdvvgrv3z1r1h77k0nz0")
(mozilla-patch "icecat-bug-1379538.patch" "8fa66bc91b07" "1l44rwkdrv9y41nfb9h3fkykk3ci7xclp6rfwbbzm4293l00adrd")
(mozilla-patch "icecat-CVE-2017-7779-pt18.patch" "7c095249ef8a" "05dbvxlmh7jljjmis540nfgk2nn968prmxrm96674avn33989sqy")
(mozilla-patch "icecat-bug-1073952.patch" "06db7fb30689" "19qf9lrwy48fjzz3wpjfxsgqab68dnlci8jrwsljhpy6787xwxg2")
(mozilla-patch "icecat-CVE-2017-7803.patch" "c52d8ce8d5df" "03l9hk278b9mw75rxpn2ay1slyz21axa2l7dfxwkvj5vdn7ykdbj")
(mozilla-patch "icecat-CVE-2017-7779-pt19.patch" "d68c9edf056f" "0zfz0l9m675n4vvm87n8g3bdhhysla4qnywli5kwjy4krj9kq6qa")
(mozilla-patch "icecat-CVE-2017-7779-pt20.patch" "5dd82ab194b9" "10mdzwxibnmqs7y5arf8sjnva31i5vhbprlc63n74h8gh8k5kdlp")
(mozilla-patch "icecat-CVE-2017-7779-pt21.patch" "8fc70b2b57a8" "0yszfmb47x3rrzn5wncv112c1b7xw11j62adx4f7950fdj7zqr32")
(mozilla-patch "icecat-bug-1379444.patch" "47dd26630291" "0r2rc634sr4a5mfc53p1wx8d0zm6dsxiw2vzc7l89mac0d0cmi5n")
(mozilla-patch "icecat-bug-1372467.patch" "0f906e04a41d" "0f2zdpnb23yg3v5f1ha24cmagcwa01kf2xz1l2lcws4ss1w5b4a9")
(mozilla-patch "icecat-bug-1372383.patch" "56349462ff47" "17gc7kf0i367c1yh2w1701k8snvdm04nznc3q3yxdl3wxkh3c3sb")
(mozilla-patch "icecat-CVE-2017-7779-pt22.patch" "7b79969a18ee" "0ixycxbjh0wmihrhzpyjbkcnvwwrzs3ffb0lymzvqnr90yxvxhyy")
(mozilla-patch "icecat-CVE-2017-7779-pt23.patch" "f0ab032fd674" "04wc4i94cfj2vcawrv7hgbb70fkxggi7s6srk3i184686rczzpyw")
(mozilla-patch "icecat-bug-1308908.patch" "48a89721d076" "01gvdzy6whp2dqmjvx49f4mvl75dhjgr8dvx71pg4sx3xmdbkzyq")
(mozilla-patch "icecat-bug-1347667.patch" "ef1d17821945" "0s6gaarnvnibgf9x0xqcymaqc63lnbh9fm2g33i8cpp1xjhmywcv")
(mozilla-patch "icecat-bug-1367128-pt1.patch" "5a0f69630b03" "1vqbwmy58qxwfaisq0dxvvbsd5w5i4yb691i78gw1dv7kgf523qy")
(mozilla-patch "icecat-bug-1367128-pt2.patch" "7db52eca97b2" "081p8izjxscylfs090c9mzlmfvpdfvg1qsf5rik30hvifcpxp6lq")
(mozilla-patch "icecat-bug-1367128-pt3.patch" "c448439eb5dc" "18gp7mg3zh9dxi1300mcm0zk67nlmvp5q50gnyc1v2sv0gs6fdfb")
(mozilla-patch "icecat-bug-1377016.patch" "319a986ae1f4" "1dlmrklkpx42c72pblpw1fi91dhqarqyl3ldnd4943x2hsy3am8k")
(mozilla-patch "icecat-bug-1342433.patch" "09f5bd33efb8" "0dky981ggyc0237mbbyy1chndk0aznkhw00d3lrafiyxsyk6vg3z")
(mozilla-patch "icecat-bug-1359058-pt1.patch" "7ccb26caa02f" "1q97f4qbwjnz6f3g5dcy2v0av9jgbaplaz9pnm5yqdc250f5bhjz")
(mozilla-patch "icecat-bug-1359058-pt2.patch" "a93c1a40f0d8" "0gafbwv2npdjqh41fpvzmzdw3kcw1b41gm3jg9biwqxxwnvqqmfj")
(mozilla-patch "icecat-bug-1382303-pt1.patch" "688c9284fb12" "1rqimwkh8krihabsx7x2awvxls8n9dm2bmbl133fnkp2sjya979w")
(mozilla-patch "icecat-bug-1382303-pt2.patch" "7f969ba7b6e8" "036n1yrmmb6gydxcgyps89g63kj1w2rihk1zsmk7yw3crln226ai")
(mozilla-patch "icecat-bug-1382303-pt3.patch" "7e7b4f104462" "0wkw72qqyql528hvssrqyq72f5csfxa5fgv5s903csh97vawfl7i")
(mozilla-patch "icecat-bug-1383000.patch" "ce65d0641c07" "08bxn3b8rgjhkvdndc7mrd0k1715wbpa5qaxhslxlgj6lpkgk0b1")
(mozilla-patch "icecat-CVE-2017-7807.patch" "a86c77d533ee" "0mzfxpyk4484dk3j1sgplakx39ya0jnp3plxvcmvlc47ry60yq93")
(mozilla-patch "icecat-bug-1346620.patch" "d71000abc9bf" "10d632nq5zbhndrsx2vpkl7jprlnas361n1yh9s9szn8k4mj01rf")
(mozilla-patch "icecat-bug-1381016.patch" "c74486f87dc3" "1l938a2lhrlqfhmgrpypx13v6jw08528m4gnllr2h5sk2x65czip")
(mozilla-patch "icecat-bug-1371657.patch" "20a1a6ad46d5" "17yn5dpymrymgdywah403fzw0p2y9bjkccg0h4d221i3pwns4bcz")))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

118
gnu/packages/graph.scm Normal file
View File

@ -0,0 +1,118 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages graph)
#:use-module (guix download)
#:use-module (guix packages)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (guix build-system r)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages)
#:use-module (gnu packages gcc)
#:use-module (gnu packages compression)
#:use-module (gnu packages maths)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages statistics)
#:use-module (gnu packages xml))
(define-public igraph
(package
(name "igraph")
(version "0.7.1")
(source
(origin
(method url-fetch)
(uri (string-append "http://igraph.org/nightly/get/c/igraph-"
version ".tar.gz"))
(sha256
(base32
"1pxh8sdlirgvbvsw8v65h6prn7hlm45bfsl1yfcgd6rn4w706y6r"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(list "--with-external-glpk"
"--with-external-blas"
"--with-external-lapack")))
(inputs
`(("gmp" ,gmp)
("glpk" ,glpk)
("libxml2" ,libxml2)
("lapack" ,lapack)
("openblas" ,openblas)
("zlib" ,zlib)))
(home-page "http://igraph.org")
(synopsis "Network analysis and visualization")
(description
"This package provides a library for the analysis of networks and graphs.
It can handle large graphs very well and provides functions for generating
random and regular graphs, graph visualization, centrality methods and much
more.")
(license license:gpl2+)))
(define-public python-igraph
(package (inherit igraph)
(name "python-igraph")
(version "0.7.1.post6")
(source
(origin
(method url-fetch)
(uri (pypi-uri "python-igraph" version))
(sha256
(base32
"0xp61zz710qlzhmzbfr65d5flvsi8zf2xy78s6rsszh719wl5sm5"))))
(build-system python-build-system)
(arguments '())
(inputs
`(("igraph" ,igraph)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://pypi.python.org/pypi/python-igraph")
(synopsis "Python bindings for the igraph network analysis library")))
(define-public r-igraph
(package
(name "r-igraph")
(version "1.1.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "igraph" version))
(sha256
(base32
"1v26wyk52snh8z6m5p7yqwcd9dbqifhm57j112i9x53ppi0npcc9"))))
(build-system r-build-system)
(native-inputs
`(("gfortran" ,gfortran)))
(inputs
`(("gmp" ,gmp)
("libxml2" ,libxml2)))
(propagated-inputs
`(("r-irlba" ,r-irlba)
("r-magrittr" ,r-magrittr)
("r-matrix" ,r-matrix)
("r-pkgconfig" ,r-pkgconfig)))
(home-page "http://igraph.org")
(synopsis "Network analysis and visualization")
(description
"This package provides routines for simple graphs and network analysis.
It can handle large graphs very well and provides functions for generating
random and regular graphs, graph visualization, centrality methods and much
more.")
(license license:gpl2+)))

4
gnu/packages/gtk.scm
View File

@ -1355,7 +1355,7 @@ can also be used to document application code.")
(inputs (inputs
;; Don't propagate GTK+ to reduce "profile pollution". ;; Don't propagate GTK+ to reduce "profile pollution".
`(("gtk+" ,gtk+-2))) ; required by gtk-engines-2.pc `(("gtk+" ,gtk+-2))) ; required by gtk-engines-2.pc
(home-page "http://live.gnome.org/GnomeArt") (home-page "https://live.gnome.org/GnomeArt")
(synopsis "Theming engines for GTK+ 2.x") (synopsis "Theming engines for GTK+ 2.x")
(description (description
"This package contains the standard GTK+ 2.x theming engines including "This package contains the standard GTK+ 2.x theming engines including
@ -1385,7 +1385,7 @@ Redmond95 and ThinIce.")
("intltool" ,intltool))) ("intltool" ,intltool)))
(propagated-inputs (propagated-inputs
`(("gtk+" ,gtk+-2))) `(("gtk+" ,gtk+-2)))
(home-page "http://live.gnome.org/GnomeArt") (home-page "https://live.gnome.org/GnomeArt")
(synopsis "Cairo-based theming engine for GTK+ 2.x") (synopsis "Cairo-based theming engine for GTK+ 2.x")
(description (description
"Murrine is a cairo-based GTK+ theming engine. It is named after the "Murrine is a cairo-based GTK+ theming engine. It is named after the

10
gnu/packages/image-viewers.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2013, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2017 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net> ;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
@ -214,7 +214,13 @@ it and customize it for your needs.")
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'autogen (add-after 'unpack 'autogen
(lambda _ (lambda _
(zero? (system* "sh" "autogen.sh"))))))) (zero? (system* "sh" "autogen.sh"))))
(add-before 'install 'skip-gtk-update-icon-cache
(lambda _
;; Don't create 'icon-theme.cache'
(substitute* (find-files "data" "^Makefile$")
(("gtk-update-icon-cache") (which "true")))
#t)))))
(native-inputs (native-inputs
`(("automake" ,automake) `(("automake" ,automake)
("autoconf" ,autoconf) ("autoconf" ,autoconf)

17
gnu/packages/libreoffice.scm
View File

@ -4,6 +4,7 @@
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2017 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -695,19 +696,29 @@ Zoner Draw version 4 and 5.")
(define-public hunspell (define-public hunspell
(package (package
(name "hunspell") (name "hunspell")
(version "1.5.4") (version "1.6.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/hunspell/hunspell/archive/v" (uri (string-append "https://github.com/hunspell/hunspell/archive/v"
version ".tar.gz")) version ".tar.gz"))
(sha256 (base32 (sha256 (base32
"0ngwk18dwd8p5a5f20h2jlgrz9wbc1k189mmmprb2zmqwfi02b45")) "0j9c20sj7bgd6f77193g1ihy8w905byk2gdhdc0r9dsh7irr7x9h"))
(file-name (string-append name "-" version ".tar.gz")))) (file-name (string-append name "-" version ".tar.gz"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)))
(inputs (inputs
`(("perl" ,perl))) `(("perl" ,perl)))
(home-page "http://hunspell.sourceforge.net/") (arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(zero? (system* "autoreconf" "-vfi")))))))
(home-page "https://hunspell.github.io/")
(synopsis "Spell checker") (synopsis "Spell checker")
(description "Hunspell is a spell checker and morphological analyzer (description "Hunspell is a spell checker and morphological analyzer
library and program designed for languages with rich morphology and complex library and program designed for languages with rich morphology and complex

16
gnu/packages/linux.scm
View File

@ -366,8 +366,8 @@ It has been modified to remove all non-free binary blobs.")
(define %intel-compatible-systems '("x86_64-linux" "i686-linux")) (define %intel-compatible-systems '("x86_64-linux" "i686-linux"))
(define %linux-libre-version "4.12.4") (define %linux-libre-version "4.12.5")
(define %linux-libre-hash "13c6ka4fhzi41bjlssbkz84hkag7knqpvfyp2jjhm3wm25r4lhw8") (define %linux-libre-hash "0kybil1h07fwl9rb0rvmp0w356hi2v1azw603r18vh9x93i8b8xi")
(define-public linux-libre (define-public linux-libre
(make-linux-libre %linux-libre-version (make-linux-libre %linux-libre-version
@ -376,20 +376,20 @@ It has been modified to remove all non-free binary blobs.")
#:configuration-file kernel-config)) #:configuration-file kernel-config))
(define-public linux-libre-4.9 (define-public linux-libre-4.9
(make-linux-libre "4.9.40" (make-linux-libre "4.9.41"
"1qaqi2dcydyxw79yj9pa7yxf13ss4rng7bgg0i1dl63c3g7qjgcz" "1mkx7rvcny8b0yjkzd8zc53d15h1w8y75m0x6jx0dz3r9y3k0nql"
%intel-compatible-systems %intel-compatible-systems
#:configuration-file kernel-config)) #:configuration-file kernel-config))
(define-public linux-libre-4.4 (define-public linux-libre-4.4
(make-linux-libre "4.4.79" (make-linux-libre "4.4.80"
"03x1nc2fxmh29sf2fbsqzmw8qrdzv5gakr9xrg1shxh31c6xr3xr" "1s0d7lsapghgk6jh6igx2fhzj1f6nwmvhqrl2hdwf3dx14z93mp2"
%intel-compatible-systems %intel-compatible-systems
#:configuration-file kernel-config)) #:configuration-file kernel-config))
(define-public linux-libre-4.1 (define-public linux-libre-4.1
(make-linux-libre "4.1.42" (make-linux-libre "4.1.43"
"1g5jhn7cm6ixn7w8ciqm6qgxv7k1jg50v6k05hsvzvrqfpaxqlbz" "0ycqmvczj7lm7czilnwpyp14n2lzilyx7m43rsq1qdm2m5rp4q2w"
%intel-compatible-systems %intel-compatible-systems
#:configuration-file kernel-config)) #:configuration-file kernel-config))

80
gnu/packages/maths.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2016, 2017 John Darrington <jmd@gnu.org> ;;; Copyright © 2014, 2016, 2017 John Darrington <jmd@gnu.org>
;;; Copyright © 2014, 2015, 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2015, 2016, 2017 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2014 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2014 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2014 Mathieu Lirzin <mathieu.lirzin@openmailbox.org> ;;; Copyright © 2014 Mathieu Lirzin <mathieu.lirzin@openmailbox.org>
;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
@ -1216,7 +1216,7 @@ September 2004}")
(define-public petsc (define-public petsc
(package (package
(name "petsc") (name "petsc")
(version "3.7.2") (version "3.7.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1224,7 +1224,7 @@ September 2004}")
(uri (string-append "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/" (uri (string-append "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/"
"petsc-lite-" version ".tar.gz")) "petsc-lite-" version ".tar.gz"))
(sha256 (sha256
(base32 "0jfrq6rd4zagw1iimz05m2w91k0jvz3qbik1lk8pqcxw3rvdqk5d")))) (base32 "1y3f5jjq0v5b62i3sabp4kp5mgfyp3vnk0dxhwkrhpypax77nzxh"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("python" ,python-2) `(("python" ,python-2)
@ -1247,6 +1247,10 @@ September 2004}")
(assoc-ref %build-inputs "superlu") "/include") (assoc-ref %build-inputs "superlu") "/include")
,(string-append "--with-superlu-lib=" ,(string-append "--with-superlu-lib="
(assoc-ref %build-inputs "superlu") "/lib/libsuperlu.a")) (assoc-ref %build-inputs "superlu") "/lib/libsuperlu.a"))
#:make-flags
;; Honor (parallel-job-count) for build. Do not use --with-make-np,
;; whose value is dumped to $out/lib/petsc/conf/petscvariables.
(list (format #f "MAKE_NP=~a" (parallel-job-count)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
@ -1261,13 +1265,17 @@ September 2004}")
(format #t "configure flags: ~s~%" flags) (format #t "configure flags: ~s~%" flags)
(zero? (apply system* "./configure" flags))))) (zero? (apply system* "./configure" flags)))))
(add-after 'configure 'clean-local-references (add-after 'configure 'clean-local-references
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(substitute* (find-files "." "^petsc(conf|machineinfo).h$") (substitute* (find-files "." "^petsc(conf|machineinfo).h$")
;; Prevent build directory from leaking into compiled code ;; Prevent build directory from leaking into compiled code
(((getcwd)) out) (((getcwd)) out)
;; Scrub timestamp for reproducibility ;; Scrub timestamp for reproducibility
((".*Libraries compiled on.*") "")) ((".*Libraries compiled on.*") ""))
(substitute* (find-files "." "petscvariables")
;; Do not expose build machine characteristics, set to defaults.
(("MAKE_NP = [:digit:]+") "MAKE_NP = 2")
(("NPMAX = [:digit:]+") "NPMAX = 2"))
#t))) #t)))
(add-after 'install 'clean-install (add-after 'install 'clean-install
;; Try to keep installed files from leaking build directory names. ;; Try to keep installed files from leaking build directory names.
@ -1342,16 +1350,15 @@ scientific applications modeled by partial differential equations.")
(define-public slepc (define-public slepc
(package (package
(name "slepc") (name "slepc")
(version "3.7.1") (version "3.7.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://slepc.upv.es/download/download.php?" (uri (string-append "http://slepc.upv.es/download/distrib/slepc-"
"filename=slepc-" version ".tar.gz")) version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1hijlmrvxvfqslnx8yydzw5xqbsn1yy02g32w0hln1z3cgr1c0k7")))) "12pbl8yd6r8k9xjlr1qw25rs0k1acgic7hw1s6l6bhiv9s285drg"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("python" ,python-2))) `(("python" ,python-2)))
@ -1365,6 +1372,8 @@ scientific applications modeled by partial differential equations.")
#:configure-flags #:configure-flags
`(,(string-append "--with-arpack-dir=" `(,(string-append "--with-arpack-dir="
(assoc-ref %build-inputs "arpack") "/lib")) (assoc-ref %build-inputs "arpack") "/lib"))
#:make-flags ;honor (parallel-job-count)
`(,(format #f "MAKE_NP=~a" (parallel-job-count)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
@ -2415,7 +2424,7 @@ Fresnel integrals, and similar related functions as well.")
(define-public suitesparse (define-public suitesparse
(package (package
(name "suitesparse") (name "suitesparse")
(version "4.4.3") (version "4.5.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -2424,33 +2433,31 @@ Fresnel integrals, and similar related functions as well.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"100hdzr0mf4mzlwnqpmwpfw4pymgsf9n3g0ywb1yps2nk1zbkdy5")))) "1dnr6pmjzc2qmbkmb4shigx1l74ilf6abn7svyd6brxgvph8vadr"))
(modules '((guix build utils)))
(snippet
;; Remove bundled metis source
'(delete-file-recursively "metis-5.1.0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:parallel-build? #f ;cholmod build fails otherwise '(#:tests? #f ;no "check" target
#:tests? #f ;no "check" target
#:make-flags #:make-flags
(list "CC=gcc" (list "CC=gcc"
"BLAS=-lblas" "BLAS=-lblas"
"TBB=-ltbb" "TBB=-ltbb"
"CHOLMOD_CONFIG=-DNPARTITION" ;required when METIS is not used "MY_METIS_LIB=-lmetis"
(string-append "INSTALL_LIB=" (string-append "INSTALL_LIB="
(assoc-ref %outputs "out") "/lib") (assoc-ref %outputs "out") "/lib")
(string-append "INSTALL_INCLUDE=" (string-append "INSTALL_INCLUDE="
(assoc-ref %outputs "out") "/include")) (assoc-ref %outputs "out") "/include")
"library")
#:phases #:phases
(alist-cons-before (modify-phases %standard-phases
'install 'prepare-out (delete 'configure)))) ;no configure script
;; README.txt states that the target directories must exist prior to
;; running "make install".
(lambda _
(mkdir-p (string-append (assoc-ref %outputs "out") "/lib"))
(mkdir-p (string-append (assoc-ref %outputs "out") "/include")))
;; no configure script
(alist-delete 'configure %standard-phases))))
(inputs (inputs
`(("tbb" ,tbb) `(("tbb" ,tbb)
("lapack" ,lapack))) ("lapack" ,lapack)
("metis" ,metis)))
(home-page "http://faculty.cse.tamu.edu/davis/suitesparse.html") (home-page "http://faculty.cse.tamu.edu/davis/suitesparse.html")
(synopsis "Suite of sparse matrix software") (synopsis "Suite of sparse matrix software")
(description (description
@ -2686,7 +2693,7 @@ revised simplex and the branch-and-bound methods.")
(define-public dealii (define-public dealii
(package (package
(name "dealii") (name "dealii")
(version "8.4.1") (version "8.5.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -2694,7 +2701,7 @@ revised simplex and the branch-and-bound methods.")
"download/v" version "/dealii-" version ".tar.gz")) "download/v" version "/dealii-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1bdksvvyp1rj37df1ndh8j3x9nzpc3sazw8nd0hzvnlw0qnyk800")) "0yfpy4zh8j7hmqakw17zdlmvfdcmhwgs66wcb716plc4y7v3z4g6"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove bundled sources: UMFPACK, TBB, muParser, and boost ;; Remove bundled sources: UMFPACK, TBB, muParser, and boost
@ -2713,21 +2720,10 @@ revised simplex and the branch-and-bound methods.")
("suitesparse" ,suitesparse))) ;for UMFPACK ("suitesparse" ,suitesparse))) ;for UMFPACK
(arguments (arguments
`(#:build-type "DebugRelease" ;only supports Release, Debug, or DebugRelease `(#:build-type "DebugRelease" ;only supports Release, Debug, or DebugRelease
#:configure-flags '("-DCOMPAT_FILES=OFF") ;Follow new directory structure #:configure-flags
#:phases (modify-phases %standard-phases ;; Work around a bug in libsuitesparseconfig linking
(add-after ;; see https://github.com/dealii/dealii/issues/4745
'install 'hint-example-prefix '("-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON")))
;; Set Cmake hints in examples so that they can find this
;; deal.II when configuring.
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref %outputs "out"))
(exmpl (string-append out "/share/doc"
"/dealii/examples")))
(substitute* (find-files exmpl "CMakeLists.txt")
(("([[:space:]]*HINTS.*)\n" _ line)
(string-append line " $ENV{HOME}/.guix-profile "
out "\n")))
#t))))))
(home-page "https://www.dealii.org") (home-page "https://www.dealii.org")
(synopsis "Finite element library") (synopsis "Finite element library")
(description (description

15
gnu/packages/moreutils.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -30,21 +30,20 @@
(define-public moreutils (define-public moreutils
(package (package
(name "moreutils") (name "moreutils")
(version "0.60") (version "0.61")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (list (uri (list
(string-append (string-append
"mirror://debian/pool/main/m/moreutils/moreutils_" "https://git.joeyh.name/index.cgi/moreutils.git/snapshot/"
version ".orig.tar.xz") name "-" version ".tar.gz")
;; The main Debian mirrors only hold the current packages.
(string-append (string-append
"http://snapshot.debian.org/archive/debian-debug/20170109T210531Z" "http://drabczyk.org/"
"/pool/main/m/moreutils/moreutils_0.60.orig.tar.xz"))) name "-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"1i8pphg5i5y4x1s1hz73gqhispgspr13bysmk9vh7l6jrfx1hbg4")))) "12rhzy8hw8vljlf10b7ys9zky0p94fdvd6ihq8w8cnkia4rd6izb"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; For building the manual pages. ;; For building the manual pages.
(native-inputs (native-inputs

13
gnu/packages/patches/ruby-puma-ignore-broken-test.patch
View File

@ -1,13 +0,0 @@
diff --git a/test/test_cli.rb b/test/test_cli.rb
index 9c515c6..6bd439f 100644
--- a/test/test_cli.rb
+++ b/test/test_cli.rb
@@ -88,7 +88,7 @@ class TestCLI < Test::Unit::TestCase
s << "GET /stats HTTP/1.0\r\n\r\n"
body = s.read
- assert_match(/\{ "workers": 2, "phase": 0, "booted_workers": 0, "old_workers": 0, "worker_status": \[\{ "pid": \d+, "index": 0, "phase": 0, "booted": false, "last_checkin": "[^"]+", "last_status": \{\} \},\{ "pid": \d+, "index": 1, "phase": 0, "booted": false, "last_checkin": "[^"]+", "last_status": \{\} \}\] \}/, body.split("\r\n").last)
+ #assert_match(/\{ "workers": 2, "phase": 0, "booted_workers": 0, "old_workers": 0, "worker_status": \[\{ "pid": \d+, "index": 0, "phase": 0, "booted": false, "last_checkin": "[^"]+", "last_status": \{\} \},\{ "pid": \d+, "index": 1, "phase": 0, "booted": false, "last_checkin": "[^"]+", "last_status": \{\} \}\] \}/, body.split("\r\n").last)
# wait until the first status ping has come through
sleep 6

4
gnu/packages/python.scm
View File

@ -7982,14 +7982,14 @@ Debian-related files, such as:
(define-public python-nbformat (define-public python-nbformat
(package (package
(name "python-nbformat") (name "python-nbformat")
(version "4.1.0") (version "4.3.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "nbformat" version)) (uri (pypi-uri "nbformat" version))
(sha256 (sha256
(base32 (base32
"0mq8iki3d4mnx7wy05phss7x98mds4fqydin8lcagidp1knw1xnv")))) "12s7j4qja8b5bs1kyw5dzmrqbjxxj8wk52cyasbiqbv7fblcrssz"))))
(build-system python-build-system) (build-system python-build-system)
(arguments `(#:tests? #f)) ; no test target (arguments `(#:tests? #f)) ; no test target
(propagated-inputs (propagated-inputs

82
gnu/packages/ruby.scm
View File

@ -49,6 +49,7 @@
(define-public ruby (define-public ruby
(package (package
(name "ruby") (name "ruby")
(replacement ruby-2.4.1)
(version "2.4.0") (version "2.4.0")
(source (source
(origin (origin
@ -102,6 +103,26 @@ a focus on simplicity and productivity.")
(home-page "https://ruby-lang.org") (home-page "https://ruby-lang.org")
(license license:ruby))) (license license:ruby)))
(define-public ruby-2.4.1
(package
(inherit ruby)
(name "ruby")
(version "2.4.1")
(source
(origin
(method url-fetch)
(uri (string-append "http://cache.ruby-lang.org/pub/ruby/"
(version-major+minor version)
"/ruby-" version ".tar.xz"))
(sha256
(base32
"0m763zf2v0jhrha3cx21g4dif6vc9gm714invs8h3sg35ncskj2g"))
(modules '((guix build utils)))
(snippet `(begin
;; Remove bundled libffi
(delete-file-recursively "ext/fiddle/libffi-3.2.1")
#t))))))
(define-public ruby-2.3 (define-public ruby-2.3
(package (package
(inherit ruby) (inherit ruby)
@ -2544,14 +2565,14 @@ you about the changes.")
(define-public ruby-activesupport (define-public ruby-activesupport
(package (package
(name "ruby-activesupport") (name "ruby-activesupport")
(version "5.0.0") (version "5.1.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (rubygems-uri "activesupport" version)) (uri (rubygems-uri "activesupport" version))
(sha256 (sha256
(base32 (base32
"0k7zhnz0aw1ym8phs10r85f91ja45vsd058fm9v0h2k0igw12cpf")))) "16r18n6b1nlky0xx2lw8c1f15gr2vm34xz5g4byjcxf88m1s07xh"))))
(build-system ruby-build-system) (build-system ruby-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -2857,18 +2878,23 @@ including comments and whitespace.")
(license license:expat))) (license license:expat)))
(define-public ruby-tdiff (define-public ruby-tdiff
;; Use a newer than released snapshot so that rspec-2 is not required.
(let ((commit "b662a6048f08abc45c1a834e5f34dd1c662935e2"))
(package (package
(name "ruby-tdiff") (name "ruby-tdiff")
(version "0.3.3") (version (string-append "0.3.3-1." (string-take commit 8)))
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (rubygems-uri "tdiff" version)) (uri (git-reference
(url "https://github.com/postmodern/tdiff.git")
(commit commit)))
(file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"0k41jbvn8qq4mgrixnhlk742b971d136i8wpbcv2cczvi22xpc86")))) "0n3gq8rx49f7ln6zqlshqfg2mgqyy30rsdjlnki5mv307ykc7ad4"))))
(build-system ruby-build-system) (build-system ruby-build-system)
(native-inputs (native-inputs
`(("ruby-rspec-2" ,ruby-rspec-2) `(("ruby-rspec" ,ruby-rspec)
("ruby-yard" ,ruby-yard) ("ruby-yard" ,ruby-yard)
("ruby-rubygems-tasks" ,ruby-rubygems-tasks))) ("ruby-rubygems-tasks" ,ruby-rubygems-tasks)))
(synopsis "Calculate the differences between two tree-like structures") (synopsis "Calculate the differences between two tree-like structures")
@ -2876,24 +2902,29 @@ including comments and whitespace.")
"This library provides functions to calculate the differences between two "This library provides functions to calculate the differences between two
tree-like structures. It is similar to Ruby's built-in @code{TSort} module.") tree-like structures. It is similar to Ruby's built-in @code{TSort} module.")
(home-page "https://github.com/postmodern/tdiff") (home-page "https://github.com/postmodern/tdiff")
(license license:expat))) (license license:expat))))
(define-public ruby-nokogiri-diff (define-public ruby-nokogiri-diff
;; Use a newer than released snapshot so that rspec-2 is not required.
(let ((commit "a38491e4d8709b7406f2cae11a50226d927d06f5"))
(package (package
(name "ruby-nokogiri-diff") (name "ruby-nokogiri-diff")
(version "0.2.0") (version (string-append "0.2.0-1." (string-take commit 8)))
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (rubygems-uri "nokogiri-diff" version)) (uri (git-reference
(url "https://github.com/postmodern/nokogiri-diff.git")
(commit commit)))
(file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"0njr1s42war0bj1axb2psjvk49l74a8wzr799wckqqdcb6n51lc1")))) "1ah2sfjh9n1p0ln2wkqzfl448ml7j4zfy6dhp1qgzq2m41php6rf"))))
(build-system ruby-build-system) (build-system ruby-build-system)
(propagated-inputs (propagated-inputs
`(("ruby-tdiff" ,ruby-tdiff) `(("ruby-tdiff" ,ruby-tdiff)
("ruby-nokogiri" ,ruby-nokogiri))) ("ruby-nokogiri" ,ruby-nokogiri)))
(native-inputs (native-inputs
`(("ruby-rspec-2" ,ruby-rspec-2) `(("ruby-rspec" ,ruby-rspec)
("ruby-yard" ,ruby-yard) ("ruby-yard" ,ruby-yard)
("ruby-rubygems-tasks" ,ruby-rubygems-tasks))) ("ruby-rubygems-tasks" ,ruby-rubygems-tasks)))
(synopsis "Calculate the differences between two XML/HTML documents") (synopsis "Calculate the differences between two XML/HTML documents")
@ -2901,7 +2932,7 @@ tree-like structures. It is similar to Ruby's built-in @code{TSort} module.")
"@code{Nokogiri::Diff} adds the ability to calculate the "@code{Nokogiri::Diff} adds the ability to calculate the
differences (added or removed nodes) between two XML/HTML documents.") differences (added or removed nodes) between two XML/HTML documents.")
(home-page "https://github.com/postmodern/nokogiri-diff") (home-page "https://github.com/postmodern/nokogiri-diff")
(license license:expat))) (license license:expat))))
(define-public ruby-rack (define-public ruby-rack
(package (package
@ -3998,7 +4029,7 @@ part of the Prawn PDF generator.")
(define-public ruby-puma (define-public ruby-puma
(package (package
(name "ruby-puma") (name "ruby-puma")
(version "3.6.0") (version "3.9.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -4008,32 +4039,17 @@ part of the Prawn PDF generator.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"08aws79n9slcr50d9lwm011cp1pxvr1409c2jmyjxywvrc0a30v1")) "03pifga841h17brh4vgia8i2ybh3cmsyg0dbybzdf6dq51wzcxdx"))))
;; Ignore broken tests reported upstream.
;; https://github.com/puma/puma/issues/995
;; https://github.com/puma/puma/issues/1044
(patches (search-patches "ruby-puma-ignore-broken-test.patch"))))
(build-system ruby-build-system) (build-system ruby-build-system)
(arguments (arguments
`(#:phases `(#:tests? #f ; Tests require an out-dated version of minitest.
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'delete-integration-tests
(lambda _
;; One broken test in this file cannot be easily removed in
;; isolation, it probably causes race conditions. So we delete
;; the entire file.
(delete-file "test/test_integration.rb")
#t))
(add-before 'build 'fix-gemspec (add-before 'build 'fix-gemspec
(lambda _ (lambda _
(substitute* "puma.gemspec" (substitute* "puma.gemspec"
(("git ls-files") "find * |sort")) (("git ls-files") "find * |sort"))
#t))))) #t)))))
(native-inputs
`(("ruby-hoe" ,ruby-hoe)
("ruby-rake-compiler" ,ruby-rake-compiler)
("ruby-hoe-git" ,ruby-hoe-git)
("ruby-rack" ,ruby-rack)))
(synopsis "Simple, concurrent HTTP server for Ruby/Rack") (synopsis "Simple, concurrent HTTP server for Ruby/Rack")
(description (description
"Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server "Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server

144
gnu/packages/statistics.scm
View File

@ -1031,14 +1031,14 @@ aesthetic attributes.")
(define-public r-gdtools (define-public r-gdtools
(package (package
(name "r-gdtools") (name "r-gdtools")
(version "0.1.4") (version "0.1.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "gdtools" version)) (uri (cran-uri "gdtools" version))
(sha256 (sha256
(base32 (base32
"0l8c4bh6765x9s6rw3mfm1bgicdzdngir1kxh9pxx4sidrdndcip")))) "09y9x09gri33ghhrvjjnj5k5rk0kdpsk3wq02cln8gmywd6728vk"))))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (native-inputs
`(("r-rcpp" ,r-rcpp) `(("r-rcpp" ,r-rcpp)
@ -3280,37 +3280,6 @@ optimized in C++, and the main interface function provides an easy way of
performing parallel computations on multicore machines.") performing parallel computations on multicore machines.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public r-igraph
(package
(name "r-igraph")
(version "1.1.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "igraph" version))
(sha256
(base32
"1v26wyk52snh8z6m5p7yqwcd9dbqifhm57j112i9x53ppi0npcc9"))))
(build-system r-build-system)
(native-inputs
`(("gfortran" ,gfortran)))
(inputs
`(("gmp" ,gmp)
("libxml2" ,libxml2)))
(propagated-inputs
`(("r-irlba" ,r-irlba)
("r-magrittr" ,r-magrittr)
("r-matrix" ,r-matrix)
("r-pkgconfig" ,r-pkgconfig)))
(home-page "http://igraph.org")
(synopsis "Network analysis and visualization")
(description
"This package provides routines for simple graphs and network analysis.
It can handle large graphs very well and provides functions for generating
random and regular graphs, graph visualization, centrality methods and much
more.")
(license license:gpl2+)))
(define-public r-r-methodss3 (define-public r-r-methodss3
(package (package
(name "r-r-methodss3") (name "r-r-methodss3")
@ -4217,13 +4186,13 @@ representation of R code.")
(define-public r-ggbeeswarm (define-public r-ggbeeswarm
(package (package
(name "r-ggbeeswarm") (name "r-ggbeeswarm")
(version "0.5.3") (version "0.6.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "ggbeeswarm" version)) (uri (cran-uri "ggbeeswarm" version))
(sha256 (sha256
(base32 (base32
"1jgp55rvmzc4agcrlsjn8m5lk85di9c4wj94xzikqkql4lvq3qpd")))) "0crk29p5vi1r3a988kms4y7r0iqwgwzsikgvh18r9wbzyr98bb5v"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-beeswarm" ,r-beeswarm) `(("r-beeswarm" ,r-beeswarm)
@ -4632,6 +4601,111 @@ can be efficiently implemented directly in the R language.")
regression methodology including model selections and multivariate statistics.") regression methodology including model selections and multivariate statistics.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public r-pcapp
(package
(name "r-pcapp")
(version "1.9-72")
(source
(origin
(method url-fetch)
(uri (cran-uri "pcaPP" version))
(sha256
(base32
"0i2822bv86dpqmk3q17x61nsp3gjjnn4nr8191rwvbiib7xhpgaq"))))
(properties `((upstream-name . "pcaPP")))
(build-system r-build-system)
(propagated-inputs
`(("r-mvtnorm" ,r-mvtnorm)))
(home-page "http://cran.r-project.org/web/packages/pcaPP")
(synopsis "Robust PCA by projection pursuit")
(description
"This package provides functions for robust @dfn{principal component
analysis} (PCA) by projection pursuit.")
(license license:gpl3+)))
(define-public r-rrcov
(package
(name "r-rrcov")
(version "1.4-3")
(source
(origin
(method url-fetch)
(uri (cran-uri "rrcov" version))
(sha256
(base32
"0kagqggi634mvrhd67ia7mpjrj5v6w2wq0z3kyppg5xkvzh335nq"))))
(build-system r-build-system)
(propagated-inputs
`(("r-cluster" ,r-cluster)
("r-lattice" ,r-lattice)
("r-mvtnorm" ,r-mvtnorm)
("r-pcapp" ,r-pcapp)
("r-robustbase" ,r-robustbase)))
(native-inputs
`(("gfortran" ,gfortran)))
(home-page "http://cran.r-project.org/web/packages/rrcov")
(synopsis "Scalable robust estimators with high breakdown Point")
(description
"This package provides an implementation of robust location and scatter
estimation and robust multivariate analysis with high breakdown point.")
(license license:gpl2+)))
(define-public r-fit-models
(package
(name "r-fit-models")
(version "0.5-14")
(source
(origin
(method url-fetch)
(uri (cran-uri "fit.models" version))
(sha256
(base32
"0vjbzmx0ambm6yzidb4vbgmhclwzwv2iz2cwl54ccdkvx4cx3fck"))))
(properties `((upstream-name . "fit.models")))
(build-system r-build-system)
(propagated-inputs
`(("r-lattice" ,r-lattice)))
(home-page "http://cran.r-project.org/web/packages/fit.models")
(synopsis "Compare fitted models")
(description
"The @code{fit.models} function and its associated methods (coefficients, print,
summary, plot, etc.) were originally provided in the @code{robust} package to
compare robustly and classically fitted model objects. The aim of the
@code{fit.models} package is to separate this fitted model object comparison
functionality from the robust package and to extend it to support fitting
methods (e.g., classical, robust, Bayesian, regularized, etc.) more
generally.")
;; Any version of the GPL
(license (list license:gpl2+ license:gpl3+))))
(define-public r-robust
(package
(name "r-robust")
(version "0.4-18")
(source
(origin
(method url-fetch)
(uri (cran-uri "robust" version))
(sha256
(base32
"1b7qh1aff500nd6dh4y2ipmjgdiq8991shflb63pc39vpc0ny6g4"))))
(build-system r-build-system)
(propagated-inputs
`(("r-fit-models" ,r-fit-models)
("r-lattice" ,r-lattice)
("r-mass" ,r-mass)
("r-robustbase" ,r-robustbase)
("r-rrcov" ,r-rrcov)))
(native-inputs
`(("gfortran" ,gfortran)))
(home-page "http://cran.r-project.org/web/packages/robust")
(synopsis "Port of the S+ \"Robust Library\"")
(description
"This package is a port of the S+ \"Robust Library\". It provides
methods for robust statistics, notably for robust regression and robust
multivariate analysis.")
(license license:gpl2)))
(define-public r-trimcluster (define-public r-trimcluster
(package (package
(name "r-trimcluster") (name "r-trimcluster")

4
gnu/packages/virtualization.scm
View File

@ -478,7 +478,7 @@ virtualization library.")
(define-public virt-manager (define-public virt-manager
(package (package
(name "virt-manager") (name "virt-manager")
(version "1.4.1") (version "1.4.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://virt-manager.org/download/sources" (uri (string-append "https://virt-manager.org/download/sources"
@ -486,7 +486,7 @@ virtualization library.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0i1rkxz730vw1nqghrp189jhhp53pw81k0h71hhxmyqlkyclkig6")))) "0x6mnqw8bng3r69pvmnq9q6yyhicxg22yz62b6dzbb4z16xl1r23"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:python ,python-2 `(#:python ,python-2

9
gnu/services/herd.scm
View File

@ -49,7 +49,8 @@
unload-services unload-services
unload-service unload-service
load-services load-services
start-service)) start-service
stop-service))
;;; Commentary: ;;; Commentary:
;;; ;;;
@ -146,7 +147,7 @@ result. Otherwise return #f."
(force-output sock) (force-output sock)
(match (read sock) (match (read sock)
(('reply ('version 0 _ ...) ('result (result)) ('error #f) (('reply ('version 0 _ ...) ('result result) ('error #f)
('messages messages)) ('messages messages))
(for-each display-message messages) (for-each display-message messages)
(cont result)) (cont result))
@ -222,6 +223,10 @@ returns a shepherd <service> object."
(with-shepherd-action name ('start) result (with-shepherd-action name ('start) result
result)) result))
(define (stop-service name)
(with-shepherd-action name ('stop) result
result))
;; Local Variables: ;; Local Variables:
;; eval: (put 'alist-let* 'scheme-indent-function 2) ;; eval: (put 'alist-let* 'scheme-indent-function 2)
;; eval: (put 'with-shepherd 'scheme-indent-function 1) ;; eval: (put 'with-shepherd 'scheme-indent-function 1)

5
guix/download.scm
View File

@ -67,12 +67,13 @@
,@(map (cut string-append <> "/gcc") gnu-mirrors)) ,@(map (cut string-append <> "/gcc") gnu-mirrors))
(gnupg (gnupg
"http://gd.tuwien.ac.at/privacy/gnupg/" "http://gd.tuwien.ac.at/privacy/gnupg/"
"http://artfiles.org/gnupg.org"
"http://www.crysys.hu/"
"https://gnupg.org/ftp/gcrypt/"
"ftp://mirrors.dotsrc.org/gcrypt/" "ftp://mirrors.dotsrc.org/gcrypt/"
"ftp://mirror.cict.fr/gnupg/" "ftp://mirror.cict.fr/gnupg/"
"http://artfiles.org/gnupg.org"
"ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/" "ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/"
"ftp://ftp.freenet.de/pub/ftp.gnupg.org/gcrypt/" "ftp://ftp.freenet.de/pub/ftp.gnupg.org/gcrypt/"
"http://www.crysys.hu/"
"ftp://ftp.hi.is/pub/mirrors/gnupg/" "ftp://ftp.hi.is/pub/mirrors/gnupg/"
"ftp://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/" "ftp://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/"
"ftp://ftp.bit.nl/mirror/gnupg/" "ftp://ftp.bit.nl/mirror/gnupg/"