mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-11 21:59:08 -05:00
Merge branch 'master' into core-updates
This commit is contained in:
Leo Famulari
commit
e081e2dd0b
13 changed files with 149 additions and 64 deletions
|
|
@ -499,7 +499,7 @@ (define-public isc-dhcp
|
|||
(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 @@ (define-public isc-dhcp
|
|||
"/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.
|
||||
|
|
|
|||
|
|
@ -263,7 +263,7 @@ (define-public static-bash
|
|||
(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 @@ (define-public bash-completion
|
|||
version "/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1vx5bjasi0y3iwhgy2v72bdrsprkw8zjc9s8qd1l8rxil0nnbyv1"))
|
||||
"07j484vb3k90f4989xh1g1x99g01akrp69p3dml4lza27wnqkfj1"))
|
||||
(patches
|
||||
(search-patches "bash-completion-directories.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym@scratchpost.org>
|
||||
;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
|
||||
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -263,7 +264,7 @@ (define-public dtc
|
|||
(define u-boot
|
||||
(package
|
||||
(name "u-boot")
|
||||
(version "2017.03")
|
||||
(version "2017.07")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -271,7 +272,7 @@ (define u-boot
|
|||
"u-boot-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0gqihplap05dlpwdb971wsqyv01nz2vabwq5g5649gr5jczsyjzm"))))
|
||||
"1zzywk0fgngm1mfnhkp8d0v57rs51zr1y6rp4p03i6nbibfbyx2k"))))
|
||||
(native-inputs
|
||||
`(("bc" ,bc)
|
||||
("dtc" ,dtc)
|
||||
|
|
@ -336,3 +337,6 @@ (define-public u-boot-malta
|
|||
|
||||
(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"))
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ (define-public catch-framework
|
|||
(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 @@ (define-public cmocka
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0c0k8ax16fgh39nsva09q4jsh83g9nxihkwj9d5666763fzx6q79"))))
|
||||
"1283zi9qf5613g8iadm1fxmjh4rzxqd5np2j3lcpgairf25g8bph"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ; No test target
|
||||
|
|
|
|||
|
|
@ -769,14 +769,14 @@ (define-public sqlite
|
|||
(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
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ (define-public dnsmasq
|
|||
(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 @@ (define-public isc-bind
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"19gyh7yij6cpvk5b199ghhns5wmsz67d2rpgvl91dbkm2m1wclxz"))))
|
||||
"1x6cfwkcv6nwc0mh5fzv70f38nl04yhgq90gr5nrjiif8dsnwhjj"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs `("out" "utils"))
|
||||
(inputs
|
||||
|
|
|
|||
|
|
@ -342,7 +342,7 @@ (define* (make-linux-libre version hash supported-systems
|
|||
(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$"))
|
||||
|
|
@ -3011,18 +3011,6 @@ (define-public gpm
|
|||
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")
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ (define-module (gnu packages ncurses)
|
|||
#: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
|
||||
|
|
@ -189,6 +190,19 @@ (define package.pc
|
|||
(license x11)
|
||||
(home-page "https://www.gnu.org/software/ncurses/")))
|
||||
|
||||
(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")
|
||||
|
|
|
|||
|
|
@ -3945,7 +3945,7 @@ (define-public python2-pygit2
|
|||
(define-public python-pyparsing
|
||||
(package
|
||||
(name "python-pyparsing")
|
||||
(version "2.0.3")
|
||||
(version "2.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -3954,31 +3954,29 @@ (define-public python-pyparsing
|
|||
"/pyparsing-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0kw4py7gn45j93q8r7bzajfrjdc3xlsn2yzln41lf9zmrghjkrq6"))))
|
||||
"016b9gh606aa44sq92jslm89bg874ia0yyiyb643fa6dgbsbqch8"))))
|
||||
(build-system python-build-system)
|
||||
(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
|
||||
|
|
@ -4121,16 +4119,14 @@ (define-public python2-colorspacious
|
|||
(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)
|
||||
|
|
@ -4366,16 +4362,14 @@ (define-public python2-rpy2
|
|||
(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)
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
|
||||
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
|
||||
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -29,6 +30,7 @@ (define-module (gnu packages samba)
|
|||
#: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)
|
||||
|
|
@ -219,14 +221,14 @@ (define-public samba
|
|||
(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
|
||||
|
|
@ -294,14 +296,14 @@ (define-public talloc/static
|
|||
(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
|
||||
|
|
@ -329,14 +331,14 @@ (define-public tevent
|
|||
(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 @@ (define-public ldb
|
|||
"/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.
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
;;; Copyright © 2016 Ivan Vilata i Balaguer <ivan@selidor.net>
|
||||
;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com>
|
||||
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -382,6 +383,39 @@ (define-public xmonad
|
|||
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")
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
|
||||
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
|
||||
;;; Copyright © 2015 Cyrill Schenkel <cyrill.schenkel@gmail.com>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
|
||||
;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2016 David Craven <david@craven.ch>
|
||||
|
|
@ -2727,6 +2727,53 @@ (define-public xf86-video-fbdev
|
|||
(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")
|
||||
|
|
|
|||
|
|
@ -392,6 +392,7 @@ (define* (system-linux-image-file-name #:optional (system (%current-system)))
|
|||
(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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue