guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: Merge branch 'master' into core-updates


From: Marius Bakke
Subject: 01/01: Merge branch 'master' into core-updates
Date: Wed, 14 Nov 2018 15:30:50 -0500 (EST)

mbakke pushed a commit to branch core-updates
in repository guix.

commit 79ee97a144aaaa890be0724aaf796e2a771179d7
Merge: 7d9d521 e921993
Author: Marius Bakke <address@hidden>
Date:   Wed Nov 14 21:20:46 2018 +0100

    Merge branch 'master' into core-updates

 doc/guix.texi                                     |  47 +-
 gnu/local.mk                                      |   2 +-
 gnu/packages/admin.scm                            |   4 +-
 gnu/packages/audio.scm                            | 192 +++---
 gnu/packages/backup.scm                           |  19 +-
 gnu/packages/bioconductor.scm                     |  61 ++
 gnu/packages/bioinformatics.scm                   | 127 +++-
 gnu/packages/compression.scm                      |  27 +-
 gnu/packages/cran.scm                             | 451 +++++++++++++-
 gnu/packages/crypto.scm                           |  53 +-
 gnu/packages/databases.scm                        |  21 +-
 gnu/packages/datastructures.scm                   |  24 +
 gnu/packages/emacs.scm                            |  32 +-
 gnu/packages/embedded.scm                         |  13 +-
 gnu/packages/game-development.scm                 |  11 +-
 gnu/packages/geo.scm                              |   4 +-
 gnu/packages/gnustep.scm                          |  19 +-
 gnu/packages/gnuzilla.scm                         |  78 +--
 gnu/packages/golang.scm                           |  49 +-
 gnu/packages/gtk.scm                              |   8 +-
 gnu/packages/guile.scm                            |  74 ++-
 gnu/packages/ibus.scm                             | 683 +++++++++++++++++-----
 gnu/packages/image-viewers.scm                    |   4 +-
 gnu/packages/imagemagick.scm                      |   5 +-
 gnu/packages/linux.scm                            |  49 +-
 gnu/packages/llvm.scm                             |  23 +-
 gnu/packages/lxde.scm                             |   9 +-
 gnu/packages/mail.scm                             |  52 +-
 gnu/packages/messaging.scm                        |  62 +-
 gnu/packages/mtools.scm                           |   6 +-
 gnu/packages/music.scm                            | 126 ++--
 gnu/packages/nano.scm                             |   4 +-
 gnu/packages/package-management.scm               |   6 +-
 gnu/packages/patches/icecat-CVE-2018-12383.patch  | 103 ----
 gnu/packages/patches/poppler-CVE-2018-19149.patch |  80 +++
 gnu/packages/pdf.scm                              |  34 +-
 gnu/packages/php.scm                              |   9 +-
 gnu/packages/python.scm                           |  19 +
 gnu/packages/rdf.scm                              |  20 +-
 gnu/packages/samba.scm                            |   5 +-
 gnu/packages/serialization.scm                    |   8 -
 gnu/packages/shells.scm                           |   7 +-
 gnu/packages/shellutils.scm                       |   5 +-
 gnu/packages/spice.scm                            |   2 +-
 gnu/packages/ssh.scm                              |   8 +-
 gnu/packages/statistics.scm                       |  50 +-
 gnu/packages/syncthing.scm                        |  31 +-
 gnu/packages/telephony.scm                        |  21 +-
 gnu/packages/textutils.scm                        |  51 +-
 gnu/packages/tls.scm                              |   6 +-
 gnu/packages/tor.scm                              |   9 +-
 gnu/packages/video.scm                            |   4 +-
 gnu/packages/vim.scm                              |   4 +-
 gnu/packages/web.scm                              |   6 +-
 gnu/packages/webkit.scm                           |  46 +-
 gnu/packages/wine.scm                             |   6 +-
 gnu/packages/xdisorg.scm                          |  16 +-
 gnu/packages/xorg.scm                             |   4 +-
 gnu/services/base.scm                             |  54 +-
 gnu/services/mail.scm                             |  51 +-
 gnu/services/mcron.scm                            |   2 +-
 gnu/tests/base.scm                                |  14 +
 guix/build/go-build-system.scm                    |   3 +
 guix/ci.scm                                       |  74 ++-
 guix/gexp.scm                                     |   7 +-
 guix/gnu-maintenance.scm                          | 115 +++-
 guix/grafts.scm                                   |   8 +-
 guix/nar.scm                                      |  13 +-
 guix/scripts/package.scm                          |  10 +-
 guix/scripts/system.scm                           |   7 +
 guix/store.scm                                    |  68 ++-
 guix/store/database.scm                           |   6 +
 guix/store/deduplication.scm                      |  12 +-
 guix/tests.scm                                    |  34 ++
 tests/challenge.scm                               |   8 -
 tests/debug-link.scm                              |   8 -
 tests/gexp.scm                                    |   5 -
 tests/guix-package.sh                             |   4 +
 tests/nar.scm                                     |  47 +-
 tests/profiles.scm                                |  11 -
 tests/size.scm                                    |   8 -
 81 files changed, 2463 insertions(+), 1005 deletions(-)

diff --cc gnu/packages/guile.scm
index a77cacf,c41c274..f3eb2dc
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@@ -2244,6 -2273,60 +2230,60 @@@ using S-expressions."
  tracker's SOAP service, such as @url{https://bugs.gnu.org}.";)
      (license license:gpl3+)))
  
+ (define-public guile-email
+   (let ((commit "fa52eac55e5946db89621a6c583d2aa357864dee")
+         (revision "1"))
+     (package
+       (name "guile-email")
+       (version (git-version "0.1.0" revision commit))
+       (source
+        (origin
+          (method git-fetch)
+          (uri (git-reference
+                (url "https://git.systemreboot.net/guile-email";)
+                (commit commit)))
+          (file-name (git-file-name name version))
+          (sha256
+           (base32
+            "1037mbz7qd9bzaqp8ysyhnl9ipd97fmj3b9jr8qfzx9179vvsj63"))))
+       (build-system gnu-build-system)
+       (native-inputs
+        `(("pkg-config" ,pkg-config)
+          ("autoconf" ,autoconf)
+          ("automake" ,automake)))
+       (inputs
 -       `(("guile" ,guile-2.2.4)))
++       `(("guile" ,guile-2.2)))
+       (home-page "https://git.systemreboot.net/guile-email";)
+       (synopsis "Guile email parser")
+       (description "This package provides an email parser written in pure
+ Guile.")
+       (license license:agpl3+))))
+ 
+ (define-public guile-debbugs-next
+   (let ((commit "75a331d561c8b6f8efcf16216dab961c17759efe")
+         (revision "1"))
+     (package (inherit guile-debbugs)
+       (name "guile-debbugs")
+       (version (git-version "0.0.3" revision commit))
+       (source (origin
+                 (method git-fetch)
+                 (uri (git-reference
+                       (url 
"https://git.savannah.gnu.org/git/guile-debbugs.git";)
+                       (commit commit)))
+                 (file-name (git-file-name name version))
+                 (sha256
+                  (base32
+                   "0br3mgbw41bpc9x57jlghl0i8dz9nl63r4wzs5l47aqszf84870y"))))
+       (build-system gnu-build-system)
+       (native-inputs
+        `(("pkg-config" ,pkg-config)
+          ("autoconf" ,autoconf)
+          ("automake" ,automake)
+          ("texinfo" ,texinfo)))
+       (inputs
 -       `(("guile" ,guile-2.2.4)
++       `(("guile" ,guile-2.2)
+          ("guile-email" ,guile-email))))))
+ 
  ;; There has not been any release yet.
  (define-public guile-newt
    (let ((commit "4eaa3cf84b9b426cc0ff7bec48b76cca6ca3ec83")
diff --cc gnu/packages/mail.scm
index 35b7d27,fa545da..74b1d48
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@@ -2640,3 -2643,50 +2643,50 @@@ replacement for the @code{urlview} prog
       "TNEF is a tar-like program that unpacks MIME attachments of type
  @code{application/ms-tnef}.")
      (license gpl2+)))
+ 
+ (define-public mumi
+   (let ((commit "bfd96ce76b4600ae232e6548b26c9365095fd174")
+         (revision "2"))
+     (package
+       (name "mumi")
+       (version (git-version "0.0.0" revision commit))
+       (source (origin
+                 (method git-fetch)
+                 (uri (git-reference
+                       (url "https://git.elephly.net/software/mumi.git";)
+                       (commit commit)))
+                 (file-name (git-file-name name version))
+                 (sha256
+                  (base32
+                   "05miwfi1bh0v9x2gvn15bwkb3gn4xy53z506ysjzns2y497zkc5h"))))
+       (build-system gnu-build-system)
+       (arguments
+        `(#:phases
+          (modify-phases %standard-phases
+            (add-after 'install 'wrap-executable
+              (lambda* (#:key outputs #:allow-other-keys)
+                (let* ((out (assoc-ref outputs "out"))
+                       (bin (string-append out "/bin"))
+                       (scm (string-append out "/share/guile/site/2.2"))
+                       (go  (string-append out "/lib/guile/2.2/site-ccache")))
+                  (wrap-program (string-append bin "/mumi")
+                    `("GUILE_LOAD_PATH" ":" prefix
+                      (,scm ,(getenv "GUILE_LOAD_PATH")))
+                    `("GUILE_LOAD_COMPILED_PATH" ":" prefix
+                      (,go ,(getenv "GUILE_LOAD_COMPILED_PATH"))))
+                  #t))))))
+       (inputs
+        `(("guile-debbugs" ,guile-debbugs-next)
+          ("guile-email" ,guile-email)
+          ("guile-fibers" ,guile-fibers)
+          ("guile-json" ,guile-json)
+          ("guile-syntax-highlight" ,guile-syntax-highlight)
 -         ("guile" ,guile-2.2.4)))
++         ("guile" ,guile-2.2)))
+       (native-inputs
+        `(("autoconf" ,autoconf)
+          ("automake" ,automake)
+          ("pkg-config" ,pkg-config)))
+       (home-page "https://git.elephly.net/software/mumi.git";)
+       (synopsis "Debbugs web interface")
+       (description "Mumi is a Debbugs web interface.")
+       (license agpl3+))))
diff --cc gnu/packages/pdf.scm
index 062ef02,9ffc5cb..28737c3
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@@ -82,7 -82,8 +82,8 @@@
  (define-public poppler
    (package
     (name "poppler")
+    (replacement poppler/fixed)
 -   (version "0.63.0")
 +   (version "0.68.0")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://poppler.freedesktop.org/poppler-";



reply via email to

[Prev in Thread] Current Thread [Next in Thread]