From 8f155e3cff0c6ffed5f0b91e9fc9c1bf98a8c6b6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Jul 2017 11:05:54 +0300 Subject: gnu: bash-completion: Update to 2.7. * gnu/packages/bash.scm (bash-completion): Update to 2.7. --- gnu/packages/bash.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 34cfa08944..9e93dfc491 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -263,7 +263,7 @@ without modification.") (define-public bash-completion (package (name "bash-completion") - (version "2.6") + (version "2.7") (source (origin (method url-fetch) (uri (string-append @@ -271,7 +271,7 @@ without modification.") version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1vx5bjasi0y3iwhgy2v72bdrsprkw8zjc9s8qd1l8rxil0nnbyv1")) + "07j484vb3k90f4989xh1g1x99g01akrp69p3dml4lza27wnqkfj1")) (patches (search-patches "bash-completion-directories.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From 6e864d0081779f4bde3607fa7ea02bbb52f7ce3f Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 23 Jul 2017 21:31:51 +0300 Subject: gnu: Add xmobar. gnu/packages/wm.scm (xmobar): New variable. Signed-off-by: Leo Famulari --- gnu/packages/wm.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 4250f7d16b..6e458bfdef 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2016 Ivan Vilata i Balaguer ;;; Copyright © 2017 Mekeor Melire ;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -382,6 +383,39 @@ used on each workspace. Xinerama is fully supported, allowing windows to be tiled on several screens.") (license license:bsd-3))) +(define-public xmobar + (package + (name "xmobar") + (version "0.24.5") + (source (origin + (method url-fetch) + (uri (string-append "mirror://hackage/package/xmobar/" + name "-" version ".tar.gz")) + (sha256 + (base32 + "0sdzfj2wa4wpig1i2i5n9qpwm90jp88qifsmaa7j37yhhs6snfir")))) + (build-system haskell-build-system) + (inputs + `(("ghc-http" ,ghc-http) + ("ghc-parsec" ,ghc-parsec) + ("ghc-regex-compat" ,ghc-regex-compat) + ("ghc-stm" ,ghc-stm) + ("ghc-x11-xft" ,ghc-x11-xft) + ("ghc-hinotify" ,ghc-hinotify) + ("libxpm" ,libxpm) + ("wireless-tools" ,wireless-tools))) + (arguments + `(#:configure-flags + '("--flags=with_utf8 with_xft with_xpm with_inotify with_iwlib"))) + (home-page "http://xmobar.org") + (synopsis "Minimalistic text based status bar") + (description + "@code{xmobar} is a lightweight, text-based, status bar written in +Haskell. It was originally designed to be used together with Xmonad, but it +is also usable with any other window manager. While xmobar is written in +Haskell, no knowledge of the language is required to install and use it.") + (license license:bsd-3))) + (define-public ghc-xmonad-contrib (package (name "ghc-xmonad-contrib") -- cgit v1.2.3 From 007176e7103fc25bca295c7b09578a37f5d635c7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 22 Jul 2017 15:24:54 +0200 Subject: gnu: python-pyparsing: Use 'modify-phases' syntax. * gnu/packages/python.scm (python-pyparsing)[arguments]<#:phases>: Use 'modify-phases'. --- gnu/packages/python.scm | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e7a40dfcdd..a8e3186bec 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3955,26 +3955,24 @@ library, libgit2 implements Git plumbing.") (outputs '("out" "doc")) (arguments `(#:tests? #f ; no test target - #:modules ((guix build python-build-system) - (guix build utils)) #:phases - (alist-cons-after - 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((doc (string-append (assoc-ref outputs "doc") - "/share/doc/" ,name "-" ,version)) - (html-doc (string-append doc "/html")) - (examples (string-append doc "/examples"))) - (mkdir-p html-doc) - (mkdir-p examples) - (for-each - (lambda (dir tgt) - (map (lambda (file) - (install-file file tgt)) - (find-files dir ".*"))) - (list "docs" "htmldoc" "examples") - (list doc html-doc examples)))) - %standard-phases))) + (modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((doc (string-append (assoc-ref outputs "doc") + "/share/doc/" ,name "-" ,version)) + (html-doc (string-append doc "/html")) + (examples (string-append doc "/examples"))) + (mkdir-p html-doc) + (mkdir-p examples) + (for-each + (lambda (dir tgt) + (map (lambda (file) + (install-file file tgt)) + (find-files dir ".*"))) + (list "docs" "htmldoc" "examples") + (list doc html-doc examples)) + #t)))))) (home-page "http://pyparsing.wikispaces.com") (synopsis "Python parsing class library") (description -- cgit v1.2.3 From 9e5ee6b60cb7d2a0bc0281634e3e434c885877a6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 22 Jul 2017 15:30:34 +0200 Subject: gnu: python-pyparsing: Update to 2.2.0. * gnu/packages/python.scm (python-pyparsing, python2-pyparsing): Update to 2.2.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a8e3186bec..6d9963dec4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3941,7 +3941,7 @@ library, libgit2 implements Git plumbing.") (define-public python-pyparsing (package (name "python-pyparsing") - (version "2.0.3") + (version "2.2.0") (source (origin (method url-fetch) @@ -3950,7 +3950,7 @@ library, libgit2 implements Git plumbing.") "/pyparsing-" version ".tar.gz")) (sha256 (base32 - "0kw4py7gn45j93q8r7bzajfrjdc3xlsn2yzln41lf9zmrghjkrq6")))) + "016b9gh606aa44sq92jslm89bg874ia0yyiyb643fa6dgbsbqch8")))) (build-system python-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From 71d20587a5c8e1d8c5025322e27f9312586e9b99 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 22 Jul 2017 15:50:42 +0200 Subject: gnu: python-matplotlib: Update to 2.0.2. * gnu/packages/python.scm (python-matplotlib): Update to 2.0.2. [source]: Use 'pypi-uri'. --- gnu/packages/python.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6d9963dec4..698fb605fd 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4115,16 +4115,14 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc. (define-public python-matplotlib (package (name "python-matplotlib") - (version "2.0.0") + (version "2.0.2") (source (origin (method url-fetch) - (uri (string-append - "https://github.com/matplotlib/matplotlib/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (pypi-uri "matplotlib" version)) (sha256 (base32 - "0w3k5m5qb3wsd7yhvmg042xddvligklvcq2visk2c5wnph3hhsln")))) + "1w8z2a1l7s72p1byfz7g03wqhygqxi8w82619dqb3a1lm97w9yqg")))) (build-system python-build-system) (propagated-inputs ; the following packages are all needed at run time `(("python-cycler" ,python-cycler) -- cgit v1.2.3 From 09efef338430d1f3bc2473f05f0c30ae3070e60e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 22 Jul 2017 18:58:29 +0200 Subject: gnu: python-scipy: Update to 0.19.1. * gnu/packages/python.scm (python-scipy): Update to 0.19.1. [source]: Use 'pypi-uri'. --- gnu/packages/python.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 698fb605fd..ae7ab6eb57 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4358,16 +4358,14 @@ functions.") (define-public python-scipy (package (name "python-scipy") - (version "0.18.1") + (version "0.19.1") (source (origin (method url-fetch) - (uri (string-append "https://github.com/scipy/scipy/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (pypi-uri "scipy" version)) (sha256 (base32 - "17slsrfawjp7if6qrlx03zhgp05350ginxx8ddpw9zqx43x905sn")))) + "1rl411bvla6q7qfdb47fpdnyjhfgzl6smpha33n9ar1klykjr6m1")))) (build-system python-build-system) (propagated-inputs `(("python-numpy" ,python-numpy) -- cgit v1.2.3 From 38bb9df150e8bce33b6f1e067ac3b013ffd95faa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 23 Jul 2017 14:17:33 +0200 Subject: gnu: tdb: Update to 1.3.14. * gnu/packages/databases.scm (tdb): Update to 1.3.14. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index d0b9ac73de..ee340505e6 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -769,14 +769,14 @@ is in the public domain.") (define-public tdb (package (name "tdb") - (version "1.3.11") + (version "1.3.14") (source (origin (method url-fetch) (uri (string-append "https://www.samba.org/ftp/tdb/tdb-" version ".tar.gz")) (sha256 (base32 - "0i1l38h0vyck6zkcj4fn2l03spadlmyr1qa1xpdp9dy2ccbm3s1r")))) + "1sfbia8xyaywgx9zy7x618vrvyx9gc3cgqf763shsii9javlnz9s")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 17c3f1fb6792c684a4655c6310ae887e12fa003a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 23 Jul 2017 14:21:07 +0200 Subject: gnu: cmocka: Update to 1.1.1. * gnu/packages/check.scm (cmocka): Update to 1.1.1. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 4b59ac567d..2ab5c01359 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -157,7 +157,7 @@ multi-paradigm automated test framework for C++ and Objective-C.") (define-public cmocka (package (name "cmocka") - (version "1.1.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append "https://cmocka.org/files/" @@ -165,7 +165,7 @@ multi-paradigm automated test framework for C++ and Objective-C.") version ".tar.xz")) (sha256 (base32 - "0c0k8ax16fgh39nsva09q4jsh83g9nxihkwj9d5666763fzx6q79")))) + "1283zi9qf5613g8iadm1fxmjh4rzxqd5np2j3lcpgairf25g8bph")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; No test target -- cgit v1.2.3 From fbed15013398f468bfc8cf857b9359fb6c235cff Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 23 Jul 2017 14:24:28 +0200 Subject: gnu: ldb: Update to 1.1.31. * gnu/packages/samba.scm (ldb): Update to 1.1.31. [native-inputs]: Add CMOCKA. --- gnu/packages/samba.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 4e0121040e..9cf0afd6fe 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Adonay "adfeno" Felipe Nogueira ;;; Copyright © 2017 Thomas Danckaert +;;; Copyright © 2017 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,6 +30,7 @@ #:use-module (gnu packages acl) #:use-module (gnu packages admin) #:use-module (gnu packages autotools) + #:use-module (gnu packages check) #:use-module (gnu packages crypto) #:use-module (gnu packages cups) #:use-module (gnu packages databases) @@ -329,14 +331,14 @@ many event types, including timers, signals, and the classic file descriptor eve (define-public ldb (package (name "ldb") - (version "1.1.27") + (version "1.1.31") (source (origin (method url-fetch) (uri (string-append "https://www.samba.org/ftp/ldb/ldb-" version ".tar.gz")) (sha256 (base32 - "1b1mkl5p8swb67s9aswavhzswlib34hpgsv66zgns009paf2df6d")))) + "0ipbz9m50dkancq0dbz12q815nkknbsp2i3sxpsqhmmknlm3xm84")))) (build-system gnu-build-system) (arguments '(#:phases @@ -351,7 +353,8 @@ many event types, including timers, signals, and the classic file descriptor eve "/lib/ldb/modules") "--bundled-libraries=NONE")))))))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("cmocka" ,cmocka) + ("pkg-config" ,pkg-config) ("python" ,python-2))) (propagated-inputs ;; ldb.pc refers to all these. -- cgit v1.2.3 From 85a5800e52da736c828577807e74846d1a3c6193 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 23 Jul 2017 14:25:50 +0200 Subject: gnu: talloc: Update to 2.1.10. * gnu/packages/samba.scm (talloc): Update to 2.1.10. --- gnu/packages/samba.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 9cf0afd6fe..41b1b52388 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -221,14 +221,14 @@ Desktops into Active Directory environments using the winbind daemon.") (define-public talloc (package (name "talloc") - (version "2.1.9") + (version "2.1.10") (source (origin (method url-fetch) (uri (string-append "https://www.samba.org/ftp/talloc/talloc-" version ".tar.gz")) (sha256 (base32 - "0qhhf4ib9k65sri2ky115iya6j7dgg0dsdi1r03j4cm3i35x9aph")))) + "06gn45if56g81vbj3841fzdjsahrrczwqpfrydm2zv6nxd5yk1f9")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 846cb73865c13d063862268ed74513c1d9f70fc9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 23 Jul 2017 14:26:24 +0200 Subject: gnu: tevent: Update to 0.9.33. * gnu/packages/samba.scm (tevent): Update to 0.9.33. --- gnu/packages/samba.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 41b1b52388..4a7880cfe5 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -296,14 +296,14 @@ destructors. It is the core memory allocator used in Samba.") (define-public tevent (package (name "tevent") - (version "0.9.31") + (version "0.9.33") (source (origin (method url-fetch) (uri (string-append "https://www.samba.org/ftp/tevent/tevent-" version ".tar.gz")) (sha256 (base32 - "1z1bij9gccps34q8zakr1k7k3gpqs25jas20x1hch16qd8jz44sa")))) + "1p0vxmldk99xpp7i4y6kpb75f8m7hxyv5bzkspy9hhpxh7ljww92")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 13136283393c19c6bbbcd8bbb5dc158ee7b24fdb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 21 Jul 2017 15:41:41 +0300 Subject: gnu: u-boot: Update to 2017.07. * gnu/packages/bootloaders.scm (u-boot): Update to 2017.07. --- gnu/packages/bootloaders.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 802e8ab8dc..1527cd35de 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -263,7 +263,7 @@ tree binary files. These are board description files used by Linux and BSD.") (define u-boot (package (name "u-boot") - (version "2017.03") + (version "2017.07") (source (origin (method url-fetch) (uri (string-append @@ -271,7 +271,7 @@ tree binary files. These are board description files used by Linux and BSD.") "u-boot-" version ".tar.bz2")) (sha256 (base32 - "0gqihplap05dlpwdb971wsqyv01nz2vabwq5g5649gr5jczsyjzm")))) + "1zzywk0fgngm1mfnhkp8d0v57rs51zr1y6rp4p03i6nbibfbyx2k")))) (native-inputs `(("bc" ,bc) ("dtc" ,dtc) -- cgit v1.2.3 From 4adeb3f6e60432e2125e70cbd76c9b47c34cf3a9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 21 Jul 2017 15:42:57 +0300 Subject: gnu: Add u-boot-odroid-c2. * gnu/packages/bootloaders.scm (u-boot-odroid-c2): New variable. --- gnu/packages/bootloaders.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 1527cd35de..299a569595 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016, 2017 Marius Bakke ;;; Copyright © 2016, 2017 Danny Milosavljevic ;;; Copyright © 2016, 2017 David Craven +;;; Copyright © 2017 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -336,3 +337,6 @@ also initializes the boards (RAM etc).") (define-public u-boot-beagle-bone-black (make-u-boot-package "am335x_boneblack" "arm-linux-gnueabihf")) + +(define-public u-boot-odroid-c2 + (make-u-boot-package "odroid-c2" "aarch64-linux-gnu")) -- cgit v1.2.3 From 826adfdb37656a5191a617c9eb6c8e8f80de0df8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 21 Jul 2017 15:43:52 +0300 Subject: gnu: Add xf86-video-freedreno. * gnu/packages/xorg.scm (xf86-video-freedreno): New variable. --- gnu/packages/xorg.scm | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 6adf2e2fc0..1fe9a328d0 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2016 Mathieu Lirzin ;;; Copyright © 2015 Cyrill Schenkel -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016 David Craven @@ -2705,6 +2705,53 @@ framebuffer device.") (license license:x11))) +(define-public xf86-video-freedreno + (let ((commit "ccba8f89995de7d5e1b216e580b789c4cda05035")) + (package + (name "xf86-video-freedreno") + (version (string-append "1.4.0-1-" (string-take commit 7))) + (source + (origin + ;; there's no current tarball + (method git-fetch) + (uri (git-reference + (url (string-append "https://anongit.freedesktop.org/git/xorg/" + "driver/xf86-video-freedreno.git")) + (commit commit))) + (sha256 + (base32 + "0bl9m1agi793lcddv94j8afzw1xc9w810q91mbq0n3dscbbcr9nh")) + (file-name (string-append name "-" version)))) + (build-system gnu-build-system) + (inputs + `(("libdrm" ,libdrm) + ("mesa" ,mesa) + ("udev" ,eudev) + ("xorg-server" ,xorg-server))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) + ;; This driver is only supported on ARM systems. + (supported-systems '("armhf-linux" "aarch64-linux")) + (arguments + `(#:configure-flags + (list (string-append "--with-xorg-conf-dir=" + (assoc-ref %outputs "out") + "/share/X11/xorg.conf.d")) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'bootstrap + (lambda _ + (zero? (system* "autoreconf" "-vfi"))))))) + (home-page "https://www.x.org/wiki/") + (synopsis "Adreno video driver for X server") + (description + "xf86-video-freedreno is a 2D graphics driver for the Xorg X server. +It supports a variety of Adreno graphics chipsets.") + (license license:x11)))) + + (define-public xf86-video-geode (package (name "xf86-video-geode") -- cgit v1.2.3 From fd900d68a519938e4a5064fcede5da81728d32b1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 21 Jul 2017 18:07:19 +0300 Subject: gnu: Add support for aarch64's compiled kernel. * gnu/packages/linux.scm (linux-libre)[arguments]: Add to the regex to find and install the aarch64-linux kernel. * gnu/system.scm (system-linux-image-file-name): Add entry for aarch64. --- gnu/packages/linux.scm | 2 +- gnu/system.scm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 94314d3f09..c116716e6e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -340,7 +340,7 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." (kmod (assoc-ref (or native-inputs inputs) "kmod"))) ;; Install kernel image, kernel configuration and link map. (for-each (lambda (file) (install-file file out)) - (find-files "." "^(\\.config|bzImage|zImage|vmlinuz|System\\.map)$")) + (find-files "." "^(\\.config|bzImage|zImage|Image|vmlinuz|System\\.map)$")) ;; Install device tree files (for-each (lambda (file) (install-file file dtbdir)) (find-files "." "\\.dtb$")) diff --git a/gnu/system.scm b/gnu/system.scm index 998bd68396..746c511187 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -392,6 +392,7 @@ from the initrd." (cond ((string-prefix? "arm" (%current-system)) "zImage") ((string-prefix? "mips" (%current-system)) "vmlinuz") + ((string-prefix? "aarch64" (%current-system)) "Image") (else "bzImage"))) (define (operating-system-kernel-file os) -- cgit v1.2.3 From c67d80563fc7021484602889454de534469f2785 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 23 Jul 2017 17:04:51 -0400 Subject: gnu: ncurses/gpm: Move to (gnu packages ncurses). This is needed to avoid compilation problems caused by the cyclic dependency between (gnu packages ncurses) and (gnu packages linux). * gnu/packages/linux.scm (ncurses/gpm): Move to ... * gnu/packages/ncurses.scm (ncurses/gpm): ... here. Fix misleading indentation. Add (gnu packages linux) to the module imports. --- gnu/packages/linux.scm | 12 ------------ gnu/packages/ncurses.scm | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c116716e6e..456909a940 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3013,18 +3013,6 @@ applications running on the Linux console. It allows users to select items and copy/paste text in the console and in xterm.") (license license:gpl2+))) -(define-public ncurses/gpm - (package/inherit ncurses - (name "ncurses-with-gpm") - (arguments - (substitute-keyword-arguments (package-arguments ncurses) - ((#:configure-flags cf) - `(cons (string-append "--with-gpm=" - (assoc-ref %build-inputs "gpm") - "/lib/libgpm.so.2") ,cf)))) - (inputs - `(("gpm" ,gpm))))) - (define-public btrfs-progs (package (name "btrfs-progs") diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm index 0b23baf129..7899f19128 100644 --- a/gnu/packages/ncurses.scm +++ b/gnu/packages/ncurses.scm @@ -32,6 +32,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages swig) + #:use-module (gnu packages linux) #:use-module (guix utils)) (define-public ncurses @@ -200,6 +201,19 @@ ncursesw library provides wide character support.") (origin-patches (package-source ncurses)) (search-patches "ncurses-CVE-2017-10684-10685.patch"))))))) +(define-public ncurses/gpm + (package/inherit ncurses + (name "ncurses-with-gpm") + (arguments + (substitute-keyword-arguments (package-arguments ncurses) + ((#:configure-flags cf) + `(cons (string-append "--with-gpm=" + (assoc-ref %build-inputs "gpm") + "/lib/libgpm.so.2") + ,cf)))) + (inputs + `(("gpm" ,gpm))))) + (define-public dialog (package (name "dialog") -- cgit v1.2.3 From 5391c6c9d224bba4732d91471da6d314bc90dd01 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 23 Jul 2017 18:34:30 -0400 Subject: gnu: bind: Update to 9.11.1-P3. This fixes a regression introduced in the fix for CVE-2017-3142, in BIND 9.11.1-P2, commit faa1369e3cb72bda4ba8b63029d0ad780df9cf78. See 'CHANGELOG' in the source distribution for more information. * gnu/packages/dns.scm (isc-bind): Update to 9.11.1-P3. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index ccb13d4fec..e29708a3a6 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -99,7 +99,7 @@ and BOOTP/TFTP for network booting of diskless machines.") (define-public isc-bind (package (name "bind") - (version "9.11.1-P2") + (version "9.11.1-P3") (source (origin (method url-fetch) (uri (string-append @@ -107,7 +107,7 @@ and BOOTP/TFTP for network booting of diskless machines.") version ".tar.gz")) (sha256 (base32 - "19gyh7yij6cpvk5b199ghhns5wmsz67d2rpgvl91dbkm2m1wclxz")))) + "1x6cfwkcv6nwc0mh5fzv70f38nl04yhgq90gr5nrjiif8dsnwhjj")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs -- cgit v1.2.3 From 2472f7a8f1343ff11bb14e7135faddac3fc38e20 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 23 Jul 2017 18:36:30 -0400 Subject: gnu: isc-dhcp: Update bundled bind to 9.9.10-P3. This fixes a regression introduced in the fix for CVE-2017-3142, in BIND 9.9.10-P2, commit ecb232bdfcb2718de5944bcf4d9c4e288ec41519. See 'CHANGELOG' in the source distribution for more information. * gnu/packages/admin.scm (isc-dhcp): Update bundled bind to 9.9.10-P3. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 319a34ae8b..8e9b9828ec 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -499,7 +499,7 @@ connection alive.") (bind-minor-version "9") (bind-patch-version "10") (bind-release-type "-P") ; for patch release, use "-P" - (bind-release-version "2") ; for patch release, e.g. "6" + (bind-release-version "3") ; for patch release, e.g. "6" (bind-version (string-append bind-major-version "." bind-minor-version @@ -615,7 +615,7 @@ connection alive.") "/bind-" bind-version ".tar.gz")) (sha256 (base32 - "19yl7axphmpm4n2ggb7j5irw4c655yifa1bnlckg6qiyv8dr8n7b")))) + "00yh1d5shrq7y0kfwacax4f8dc0akaa2fha430j92n7mshms65m1")))) ;; When cross-compiling, we need the cross Coreutils and sed. ;; Otherwise just use those from %FINAL-INPUTS. -- cgit v1.2.3