Merge branch 'staging'
authorMarius Bakke <mbakke@fastmail.com>
Mon, 30 Apr 2018 17:26:03 +0000 (19:26 +0200)
committerMarius Bakke <mbakke@fastmail.com>
Mon, 30 Apr 2018 17:26:03 +0000 (19:26 +0200)
1  2 
gnu/packages/freedesktop.scm
gnu/packages/linux.scm

@@@ -146,14 -146,14 +146,14 @@@ freedesktop.org project."
  (define-public libinput
    (package
      (name "libinput")
-     (version "1.10.2")
+     (version "1.10.3")
      (source (origin
                (method url-fetch)
                (uri (string-append "https://freedesktop.org/software/libinput/"
                                    name "-" version ".tar.xz"))
                (sha256
                 (base32
-                 "1fbv354ii1g4wc4k7d7gbnalqjpzmk9zlpi8linqrzlf6inpc28m"))))
+                 "0002xk9cqzpqrlhgav1wp8nimsbp9d2w8rd8mgygczq2hjar0lhd"))))
      (build-system meson-build-system)
      (arguments
       `(#:configure-flags '("-Ddocumentation=false")))
@@@ -343,7 -343,7 +343,7 @@@ of a the system to know what users are 
  (define-public packagekit
    (package
      (name "packagekit")
 -    (version "1.1.5")
 +    (version "1.1.10")
      (source (origin
               (method url-fetch)
               (uri (string-append
                     "PackageKit-" version ".tar.xz"))
               (sha256
                (base32
 -               "035pqxgkyki813hyw2frrbpfllq113zfk5qcp9wvsq5lsp74ix2h"))))
 +               "1msfmb22cm4s3l6vsbr86b8s0v897sy6gcga3qg87z7640a0di2b"))))
      (build-system gnu-build-system)
      (arguments
       `(#:tests? #f
@@@ -432,14 -432,14 +432,14 @@@ Python."
  (define-public wayland
    (package
      (name "wayland")
-     (version "1.14.0")
+     (version "1.15.0")
      (source (origin
                (method url-fetch)
                (uri (string-append "https://wayland.freedesktop.org/releases/"
                                    name "-" version ".tar.xz"))
                (sha256
                 (base32
-                 "1f3sla6h0bw15fz8pjc67jhwj7pwmfdc7qlj42j5k9v116ycm07d"))))
+                 "1c5fnys8hi71cnzjv5k7j0r8gx80p0yyqlrpmn06mmarhnxvwgzb"))))
      (build-system gnu-build-system)
      (arguments
       `(#:parallel-tests? #f))
@@@ -468,7 -468,7 +468,7 @@@ applications, X servers (rootless or fu
  (define-public wayland-protocols
    (package
      (name "wayland-protocols")
-     (version "1.12")
+     (version "1.13")
      (source (origin
                (method url-fetch)
                (uri (string-append
                      "wayland-protocols-" version ".tar.xz"))
                (sha256
                 (base32
-                 "1cn8ny4zr9xlcdh8qi1qnkmvia8cp4ixnsbhd9sp9571w6lyh69v"))))
+                 "0f4gqvmz53q9d8h0ilhf4z773nb4vskzx11a3d1jycym120bqn07"))))
      (build-system gnu-build-system)
      (inputs
       `(("wayland" ,wayland)))
diff --combined gnu/packages/linux.scm
@@@ -27,7 -27,6 +27,7 @@@
  ;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
  ;;; Copyright © 2017 nee <nee-git@hidamari.blue>
  ;;; Copyright © 2017 Dave Love <fx@gnu.org>
 +;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
@@@ -392,8 -391,8 +392,8 @@@ It has been modified to remove all non-
  ;; supports qemu "virt" machine and possibly a large number of ARM boards.
  ;; See : https://wiki.debian.org/DebianKernel/ARMMP.
  
 -(define %linux-libre-version "4.16.4")
 -(define %linux-libre-hash "0lq3yv88yd9zcz52bl4hfllb41vy1i826gcim6qjjc88assqib9i")
 +(define %linux-libre-version "4.16.6")
 +(define %linux-libre-hash "069bxqx27xib1gz4aayy8ar2hfp68cpdi8h51g6453k0w14pkchn")
  
  (define-public linux-libre
    (make-linux-libre %linux-libre-version
                      %linux-compatible-systems
                      #:configuration-file kernel-config))
  
 -(define %linux-libre-4.14-version "4.14.36")
 -(define %linux-libre-4.14-hash "03iwsaa5bb43v2yq81n0i9ysj63fik0nnhlrvwq8zsk8ni9sl6yb")
 +(define %linux-libre-4.14-version "4.14.38")
 +(define %linux-libre-4.14-hash "09lmz8zbd3c1qf8z3d2lkhcqcwawajh76s85zdhgqdmd2idpwach")
  
  (define-public linux-libre-4.14
    (make-linux-libre %linux-libre-4.14-version
                      #:configuration-file kernel-config))
  
  (define-public linux-libre-4.9
 -  (make-linux-libre "4.9.96"
 -                    "0w4j8pfpa1qfyv1ipqvdalfydsw2d1ygqd4aj9ls7f16rxq3clw0"
 +  (make-linux-libre "4.9.97"
 +                    "1xc3mj1qi51n1kr5bxmdf1rlpyj78x9imhfc7gihn8qjc6zsf1sp"
                      %intel-compatible-systems
                      #:configuration-file kernel-config))
  
  (define-public linux-libre-4.4
 -  (make-linux-libre "4.4.129"
 -                    "1m4434iabnpn77521lm59wzjprq5brx8vr1952jd5a4gqwilmnnb"
 +  (make-linux-libre "4.4.130"
 +                    "15cayafj7d9y5fs9flg115kzrcrjycbvax9hgfzz6yym94v9k8lk"
                      %intel-compatible-systems
                      #:configuration-file kernel-config))
  
@@@ -995,7 -994,7 +995,7 @@@ intercept and print the system calls ex
  (define-public alsa-lib
    (package
      (name "alsa-lib")
-     (version "1.1.5")
+     (version "1.1.6")
      (source (origin
               (method url-fetch)
               (uri (string-append
                     version ".tar.bz2"))
               (sha256
                (base32
-                "1rhacnlj0grvfagjx5qzsnbhw7m7lyccghqs4jsv0dnsqv9qmxpl"))))
+                "096pwrnhj36yndldvs2pj4r871zhcgisks0is78f1jkjn9sd4b2z"))))
      (build-system gnu-build-system)
      (home-page "https://www.alsa-project.org/")
      (synopsis "The Advanced Linux Sound Architecture libraries")
@@@ -1015,14 -1014,14 +1015,14 @@@ MIDI functionality to the Linux-based o
  (define-public alsa-utils
    (package
      (name "alsa-utils")
-     (version "1.1.5")
+     (version "1.1.6")
      (source (origin
               (method url-fetch)
               (uri (string-append "ftp://ftp.alsa-project.org/pub/utils/"
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "1s727md6mb408y2cfwzjkx23abxhampyrjdkgpyygdhxx62x42rj"))))
+                "0vnkyymgwj9rfdb11nvab30dnfrylmakdfildxl0y8mj836awp0m"))))
      (build-system gnu-build-system)
      (arguments
       ;; XXX: Disable man page creation until we have DocBook.
@@@ -1062,14 -1061,14 +1062,14 @@@ MIDI functionality to the Linux-based o
  (define-public alsa-plugins
    (package
      (name "alsa-plugins")
-     (version "1.1.5")
+     (version "1.1.6")
      (source (origin
               (method url-fetch)
               (uri (string-append "ftp://ftp.alsa-project.org/pub/plugins/"
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "073zpgvj4pldmzqq97l40wngvbqnvrkc8yw153mgny9kypwaazbr"))))
+                "04qcwkisbh0d6lnh0rw1k6n869fbs6zbfq6yvb41rymiwgmk27bg"))))
      (build-system gnu-build-system)
      ;; TODO: Split libavcodec and speex if possible. It looks like they can not
      ;; be split, there are references to both in files.
@@@ -2015,15 -2014,15 +2015,15 @@@ from the module-init-tools project."
    ;; The post-systemd fork, maintained by Gentoo.
    (package
      (name "eudev")
-     (version "3.2.4")
+     (version "3.2.5")
      (source (origin
                (method url-fetch)
                (uri (string-append "https://github.com/gentoo/eudev/archive/v"
-                                   version ".zip"))
-               (file-name (string-append name "-" version ".zip"))
+                                   version ".tar.gz"))
+               (file-name (string-append name "-" version ".tar.gz"))
                (sha256
                 (base32
-                 "1r1ag0snarygrj5qqxi2xdq9w6g3sfjd5jx1b0fl7zmqlsz3vvxx"))
+                 "0dlkcgy7j4fdcksqrpc373zfybiif1bal3n6lpy1kfc5280j02c7"))
                (patches (search-patches "eudev-rules-directory.patch"))))
      (build-system gnu-build-system)
      (arguments
@@@ -4305,20 -4304,20 +4305,20 @@@ available in the kernel Linux."
  (define-public cpuid
    (package
      (name "cpuid")
 -    (version "20170122")
 +    (version "20180419")
      (source (origin
                (method url-fetch)
                (uri (string-append "http://www.etallen.com/cpuid/cpuid-"
                                    version ".src.tar.gz"))
                (sha256
                 (base32
 -                "0ra8ph9m1dckqaikfnbsh408fp2w9k49fkl423fl2hvhwsm14xk6"))))
 +                "0cnxj72pjalsszhn862r6shw64zbrkw0k3mm36fn93bivswjnj12"))))
      (build-system gnu-build-system)
      (arguments
       '(#:make-flags '("CC=gcc")
 -       #:tests? #f ; no tests
 +       #:tests? #f                      ; no tests
         #:phases (modify-phases %standard-phases
 -                  (delete 'configure)
 +                  (delete 'configure)   ; no configure script
                    (add-before 'install 'fix-makefile
                      (lambda* (#:key outputs #:allow-other-keys)
                        (substitute* "Makefile"
@@@ -4632,98 -4631,3 +4632,98 @@@ the @code{coretemp} module and sets th
  module.  It can be executed as a daemon or in the foreground with root
  privileges.")
      (license license:gpl3+)))
 +
 +(define-public psm2
 +  (package
 +    (name "psm2")
 +    (version "10.3-46")
 +    (source (origin
 +              (method git-fetch)
 +              (uri (git-reference
 +                    (url "https://github.com/intel/opa-psm2.git")
 +                    (commit (string-append "PSM2_" version))))
 +              (file-name (git-file-name name version))
 +              (sha256
 +               (base32
 +                "0wadphv4rl5p38x6a3dgpbijlzqdvcn02cfafnp72nh9faz0zvlx"))))
 +    (build-system gnu-build-system)
 +    (arguments
 +     '(#:make-flags
 +       `(,(string-append "LDFLAGS=-Wl,-rpath=" %output "/lib"))
 +       #:tests? #f
 +       #:phases (modify-phases %standard-phases
 +                  (delete 'configure)
 +                  (add-after 'unpack 'patch-Makefiles
 +                    (lambda _
 +                      (substitute* "Makefile"
 +                        (("/lib64") "/lib")
 +                        (("/usr") ""))
 +                      (substitute* "compat/Makefile"
 +                        (("/lib64") "/lib")
 +                        (("/usr") ""))
 +                      #t))
 +                  (replace 'install
 +                    (lambda _
 +                      (setenv "DESTDIR" %output)
 +                      (invoke "make" "install")
 +                      #t)))))
 +    (inputs
 +     `(("rdma-core" ,rdma-core)
 +       ("numactl" ,numactl)))
 +    (synopsis "Intel Performance Scaled Messaging 2 (PSM2) library")
 +    (description
 +     "This package is low-level user-level Intel's communications interface.
 +The PSM2 API is a high-performance vendor-specific protocol that provides a
 +low-level communications interface for the Intel Omni-Path family of
 +high-speed networking devices.")
 +    (home-page "https://github.com/intel/opa-psm2")
 +    ;; Only the x86_64 architecure is supported.
 +    (supported-systems '("x86_64-linux"))
 +    (license (list license:bsd-3 license:gpl2)))) ; dual
 +
 +(define-public libpfm4
 +  (package
 +    (name "libpfm4")
 +    (version "4.9.0")
 +    (source (origin
 +              (method url-fetch)
 +              (uri (string-append "mirror://sourceforge/perfmon2/"
 +                                  name "/libpfm-" version ".tar.gz"))
 +              (sha256
 +               (base32
 +                "1qp4g4n6dw42p2w5rkwzdb7ynk8h7g5vg01ybpmvxncgwa7bw3yv"))))
 +    (build-system gnu-build-system)
 +    (arguments
 +     '(#:modules ((guix build utils)
 +                  (guix build gnu-build-system))
 +       #:phases (modify-phases %standard-phases
 +                  (delete 'configure)
 +                  (delete 'check)
 +                  (replace 'build
 +                    (lambda* (#:key inputs outputs #:allow-other-keys)
 +                      (let* ((out (assoc-ref outputs "out")))
 +                        (setenv "CC" "gcc")
 +                        (invoke "make")
 +                        #t)))
 +                  (replace 'install
 +                    (lambda* (#:key outputs #:allow-other-keys)
 +                      (let* ((out (assoc-ref outputs "out")))
 +                        (invoke "make"
 +                                (string-append "PREFIX=" out)
 +                                "install")
 +                        #t))))))
 +    (synopsis "Performance event monitoring library")
 +    (description
 +     "This package provides a library called libpfm4, which is used to develop
 +monitoring tools exploiting the performance monitoring events such as those
 +provided by the Performance Monitoring Unit (PMU) of modern processors.
 +
 +Libpfm4 helps convert from an event name, expressed as a string, to the event
 +encoding that is either the raw event as documented by the hardware vendor or
 +the OS-specific encoding.  In the latter case, the library is able to prepare
 +the OS-specific data structures needed by the kernel to setup the event.
 +
 +libpfm4 provides support for the @code{perf_events} interface, which was
 +introduced in Linux 2.6.31.")
 +    (home-page "http://perfmon2.sourceforge.net/")
 +    (license license:expat)))