Merge branch 'master' into core-updates
authorRicardo Wurmus <rekado@elephly.net>
Sun, 6 Oct 2019 20:02:20 +0000 (22:02 +0200)
committerRicardo Wurmus <rekado@elephly.net>
Sun, 6 Oct 2019 20:02:20 +0000 (22:02 +0200)
30 files changed:
1  2 
Makefile.am
doc/guix.texi
gnu/local.mk
gnu/packages/bioinformatics.scm
gnu/packages/dictionaries.scm
gnu/packages/emacs-xyz.scm
gnu/packages/finance.scm
gnu/packages/games.scm
gnu/packages/gl.scm
gnu/packages/graphics.scm
gnu/packages/java.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/mail.scm
gnu/packages/music.scm
gnu/packages/networking.scm
gnu/packages/perl.scm
gnu/packages/python-xyz.scm
gnu/packages/serialization.scm
gnu/packages/tls.scm
gnu/packages/video.scm
gnu/packages/web-browsers.scm
gnu/packages/web.scm
gnu/packages/wm.scm
gnu/packages/xfce.scm
gnu/packages/xml.scm
gnu/services/base.scm
gnu/system.scm
guix/gexp.scm
guix/scripts/environment.scm

diff --cc Makefile.am
Simple merge
diff --cc doc/guix.texi
Simple merge
diff --cc gnu/local.mk
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -201,12 -193,8 +204,13 @@@ language."
      (inputs
       `(("classpath" ,classpath-bootstrap)
         ("jikes" ,jikes)
+        ("libffi" ,libffi)
         ("zlib" ,zlib)))
 +    ;; When built with a recent GCC and glibc the configure step of icedtea-6
 +    ;; fails with an invalid instruction error.
 +    (native-inputs
 +     `(("gcc" ,gcc-5)
 +       ("libc" ,glibc-2.28)))
      (home-page "http://jamvm.sourceforge.net/")
      (synopsis "Small Java Virtual Machine")
      (description "JamVM is a Java Virtual Machine conforming to the JVM
@@@ -418,10 -434,14 +433,15 @@@ corresponding UPSTREAM-SOURCE (an origi
      (patches (append (origin-patches source)
                       patches))))
  
+ (define-public linux-libre-5.3-source
+   (source-with-patches linux-libre-5.3-pristine-source
+                        (list %boot-logo-patch
+                              %linux-libre-arm-export-__sync_icache_dcache-patch)))
  (define-public linux-libre-5.2-source
    (source-with-patches linux-libre-5.2-pristine-source
 -                       (list %boot-logo-patch
 +                       (list (search-patch "linux-libre-active-entropy.patch")
 +                             %boot-logo-patch
                               %linux-libre-arm-export-__sync_icache_dcache-patch)))
  
  (define-public linux-libre-4.19-source
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc gnu/system.scm
Simple merge
diff --cc guix/gexp.scm
Simple merge
Simple merge