[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: |
Fri, 5 Oct 2018 13:55:34 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit cf6db76d2af2f287f12928df160447ab4165b3e5
Merge: e65b218 a679821
Author: Marius Bakke <address@hidden>
Date: Fri Oct 5 19:15:39 2018 +0200
Merge branch 'master' into core-updates
.dir-locals.el | 1 +
Makefile.am | 2 +
doc/guix.texi | 110 +-
gnu/local.mk | 7 +-
gnu/packages/admin.scm | 11 +-
gnu/packages/agda.scm | 51 +-
gnu/packages/audio.scm | 27 +-
gnu/packages/aux-files/linux-libre/4.18-i686.conf | 6 +-
.../aux-files/linux-libre/4.18-x86_64.conf | 6 +-
gnu/packages/bioinformatics.scm | 219 +-
gnu/packages/ci.scm | 6 +-
gnu/packages/code.scm | 13 +-
gnu/packages/cran.scm | 361 ++++
gnu/packages/cups.scm | 10 +-
gnu/packages/databases.scm | 14 +-
gnu/packages/dico.scm | 11 +-
gnu/packages/dictionaries.scm | 3 +-
gnu/packages/disk.scm | 5 +-
gnu/packages/dns.scm | 75 +-
gnu/packages/emacs.scm | 124 +-
gnu/packages/embedded.scm | 39 +
gnu/packages/emulators.scm | 17 +-
gnu/packages/enlightenment.scm | 29 +-
gnu/packages/file-systems.scm | 4 +-
gnu/packages/fonts.scm | 4 +-
gnu/packages/freedesktop.scm | 4 +-
gnu/packages/game-development.scm | 17 +-
gnu/packages/games.scm | 81 +-
gnu/packages/geo.scm | 230 ++-
gnu/packages/gnome.scm | 6 +-
gnu/packages/gnuzilla.scm | 98 +-
gnu/packages/golang.scm | 4 +-
gnu/packages/graph.scm | 1 +
gnu/packages/gtk.scm | 58 +-
gnu/packages/guile.scm | 16 +-
gnu/packages/hardware.scm | 114 +-
gnu/packages/haskell-check.scm | 107 +-
gnu/packages/haskell-crypto.scm | 127 +-
gnu/packages/haskell-web.scm | 169 +-
gnu/packages/haskell.scm | 2177 ++++++++++++--------
gnu/packages/hexedit.scm | 23 +-
gnu/packages/idris.scm | 62 +-
gnu/packages/image-processing.scm | 8 +-
gnu/packages/java.scm | 128 ++
gnu/packages/kde.scm | 4 +-
gnu/packages/libreoffice.scm | 10 +-
gnu/packages/license.scm | 4 +-
gnu/packages/linux.scm | 47 +-
gnu/packages/mail.scm | 15 +-
gnu/packages/maths.scm | 17 +-
gnu/packages/messaging.scm | 4 +-
gnu/packages/mpi.scm | 5 +-
gnu/packages/mtools.scm | 5 +-
gnu/packages/music.scm | 4 +-
gnu/packages/networking.scm | 8 +-
gnu/packages/nickle.scm | 4 +-
gnu/packages/opencl.scm | 8 +-
gnu/packages/package-management.scm | 38 +-
.../patches/ghc-haddock-library-unbundle.patch | 86 +
.../patches/icecat-avoid-bundled-libraries.patch | 14 +
.../icecat-use-system-graphite2+harfbuzz.patch | 226 ++
.../patches/icecat-use-system-graphite2.patch | 248 ---
.../patches/icecat-use-system-harfbuzz.patch | 279 ---
.../patches/icecat-use-system-media-libs.patch | 381 ++++
...pat-getopt-fix-option-with-nondigit-param.patch | 45 +
.../quilt-compat-getopt-fix-second-separator.patch | 58 +
gnu/packages/patches/quilt-test-fix-regex.patch | 41 +
gnu/packages/patchutils.scm | 22 +-
gnu/packages/python.scm | 2 +-
gnu/packages/re2c.scm | 5 +-
gnu/packages/sdl.scm | 92 +
gnu/packages/syncthing.scm | 62 +-
gnu/packages/syndication.scm | 4 +-
gnu/packages/textutils.scm | 4 +-
gnu/packages/tls.scm | 36 +-
gnu/packages/version-control.scm | 61 +-
gnu/packages/video.scm | 8 +-
gnu/packages/vpn.scm | 10 +
gnu/packages/web.scm | 51 +-
gnu/packages/wine.scm | 6 +-
gnu/packages/wm.scm | 13 +-
gnu/packages/xml.scm | 11 +-
gnu/services/admin.scm | 6 +-
gnu/services/base.scm | 32 +-
gnu/services/herd.scm | 20 +
gnu/services/networking.scm | 16 +-
gnu/services/shepherd.scm | 39 +-
gnu/services/version-control.scm | 180 +-
gnu/system.scm | 2 +-
gnu/tests/version-control.scm | 114 +-
gnu/tests/web.scm | 1 +
guix/build-system/haskell.scm | 32 +-
guix/build/download.scm | 33 +-
guix/build/haskell-build-system.scm | 12 +
guix/build/lisp-utils.scm | 7 +-
guix/import/stackage.scm | 11 +-
guix/progress.scm | 110 +-
guix/scripts/build.scm | 13 +-
guix/scripts/environment.scm | 116 +-
guix/scripts/pack.scm | 142 +-
guix/scripts/package.scm | 25 +-
guix/scripts/perform-download.scm | 17 +-
guix/scripts/pull.scm | 66 +-
guix/scripts/substitute.scm | 42 +-
guix/scripts/system.scm | 36 +-
guix/status.scm | 501 +++++
guix/store.scm | 81 +-
guix/ui.scm | 122 +-
nix/libstore/build.cc | 27 +-
nix/libstore/builtins.cc | 5 +-
nix/libstore/globals.cc | 9 -
nix/libstore/globals.hh | 12 -
nix/libstore/worker-protocol.hh | 2 +-
nix/libutil/archive.cc | 31 +-
nix/libutil/archive.hh | 5 -
po/guix/POTFILES.in | 1 +
tests/gexp.scm | 4 +
tests/services.scm | 30 +-
tests/status.scm | 115 ++
119 files changed, 5973 insertions(+), 2567 deletions(-)
diff --cc gnu/packages/guile.scm
index 39d1ebe,1d33066..83cb75d
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@@ -285,10 -287,39 +285,10 @@@ without requiring the source code to b
(max-silent-time . 36000))))) ;10 hours (needed on ARM
; when heavily loaded)
-(define-public guile-2.2.2
- ;; Keep it so that, when 'guix' runs on 2.2.2, 'guix pull' compiles objects
- ;; with 2.2.2, thereby avoiding the ABI incompatibility issues described in
- ;; <https://bugs.gnu.org/29570>.
- (package
- (inherit guile-2.2)
- (version "2.2.2")
- (source (origin
- (inherit (package-source guile-2.2))
- (uri (string-append "mirror://gnu/guile/guile-" version
- ".tar.xz"))
- (sha256
- (base32
- "1azm25zcmxif0skxfrp11d2wc89nrzpjaann9yxdw6pvjxhs948w"))))))
-
-(define-public guile-2.2.4
- ;; This version contains important bug fixes, in particular wrt. to crashes
- ;; of multi-threaded code as used by 'guix pull' and grafting.
- (package
- (inherit guile-2.2)
- (version "2.2.4")
- (source (origin
- (inherit (package-source guile-2.2))
- (uri (string-append "mirror://gnu/guile/guile-" version
- ".tar.xz"))
- (sha256
- (base32
- "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r"))))))
-
(define-public guile-next
;; This is the upcoming Guile 3.0, with JIT support.
- (let ((commit "a74b4a45fab1a78e34954bce5f031e8a9765f827")
- (revision "0"))
+ (let ((commit "6f3357b0df64c4be17e72079864c09a542f1c779")
+ (revision "1"))
(package
(inherit guile-2.2)
(name "guile-next")
diff --cc guix/build/haskell-build-system.scm
index 5a72d22,be4f5b5..72714a2
--- a/guix/build/haskell-build-system.scm
+++ b/guix/build/haskell-build-system.scm
@@@ -262,12 -262,23 +263,23 @@@ given Haskell package.
(define* (haddock #:key outputs haddock? haddock-flags #:allow-other-keys)
"Run the test suite of a given Haskell package."
- (if haddock?
- (run-setuphs "haddock" haddock-flags)
- #t))
+ (when haddock?
+ (run-setuphs "haddock" haddock-flags))
+ #t)
+ (define* (patch-cabal-file #:key cabal-revision #:allow-other-keys)
+ (when cabal-revision
+ ;; Cabal requires there to be a single file with the suffix ".cabal".
+ (match (scandir "." (cut string-suffix? ".cabal" <>))
+ ((original)
+ (format #t "replacing ~s with ~s~%" original cabal-revision)
+ (copy-file cabal-revision original))
+ (_ (error "Could not find a Cabal file to patch."))))
+ #t)
+
(define %standard-phases
(modify-phases gnu:%standard-phases
+ (add-after 'unpack 'patch-cabal-file patch-cabal-file)
(delete 'bootstrap)
(add-before 'configure 'setup-compiler setup-compiler)
(add-before 'install 'haddock haddock)