ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-27 13:09:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into core-updates

Browse source
This commit is contained in:
Mark H Weaver 2018-02-14 03:40:08 -05:00
commit 932c98326d
No known key found for this signature in database
GPG key ID: 7CEF29847562C516
10 changed files with 32 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -47,6 +47,7 @@
/doc/os-config-desktop.texi /doc/os-config-desktop.texi
/doc/stamp-vti /doc/stamp-vti
/doc/version.texi /doc/version.texi
/etc/guix-daemon.cil
/etc/guix-daemon.conf /etc/guix-daemon.conf
/etc/guix-daemon.service /etc/guix-daemon.service
/etc/guix-publish.conf /etc/guix-publish.conf

6
doc/guix.texi
View file

@ -12297,8 +12297,10 @@ The desktop environments in Guix use the Xorg display server by
default. If you'd like to use the newer display server protocol default. If you'd like to use the newer display server protocol
called Wayland, you need to use the @code{sddm-service} instead of the called Wayland, you need to use the @code{sddm-service} instead of the
@code{slim-service} for the graphical login manager. You should then @code{slim-service} for the graphical login manager. You should then
select the ``GNOME (Wayland)'' session in SDDM. Currently only GNOME select the ``GNOME (Wayland)'' session in SDDM. Alternatively you can
has support for Wayland. also try starting GNOME on Wayland manually from a TTY with the
command ``XDG_SESSION_TYPE=wayland exec dbus-run-session
gnome-session``. Currently only GNOME has support for Wayland.
@deffn {Scheme Procedure} gnome-desktop-service @deffn {Scheme Procedure} gnome-desktop-service
Return a service that adds the @code{gnome} package to the system Return a service that adds the @code{gnome} package to the system

4
gnu/packages/bioinformatics.scm
View file

@ -6370,7 +6370,7 @@ (define-public r-sparql
(define-public vsearch (define-public vsearch
(package (package
(name "vsearch") (name "vsearch")
(version "2.6.2") (version "2.7.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -6380,7 +6380,7 @@ (define-public vsearch
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"02khrgh8hm11cgww2f9mqc6886zqli9ss4pd4kfpqzd0d31vbzv5")) "0523b8xq5fw60ayl0k5m1fm6yrh1932ljrsz1ys67xnki7p7f1d5"))
(patches (search-patches "vsearch-unbundle-cityhash.patch")) (patches (search-patches "vsearch-unbundle-cityhash.patch"))
(snippet (snippet
'(begin '(begin

1
gnu/packages/bootloaders.scm
View file

@ -409,6 +409,7 @@ (define (make-u-boot-package board triplet)
(find-files "." ".*\\.(bin|efi|img|spl)$") (find-files "." ".*\\.(bin|efi|img|spl)$")
(find-files "." "^MLO$")))) (find-files "." "^MLO$"))))
(mkdir-p libexec) (mkdir-p libexec)
(install-file ".config" libexec)
(for-each (for-each
(lambda (file) (lambda (file)
(let ((target-file (string-append libexec "/" file))) (let ((target-file (string-append libexec "/" file)))

4
gnu/packages/freeipmi.scm
View file

@ -27,14 +27,14 @@ (define-module (gnu packages freeipmi)
(define-public freeipmi (define-public freeipmi
(package (package
(name "freeipmi") (name "freeipmi")
(version "1.5.7") (version "1.6.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/freeipmi/freeipmi-" (uri (string-append "mirror://gnu/freeipmi/freeipmi-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1rdxs33klk6956rg8mn2dxwkk43y5yilvgvbcka8g6v4x0r98v5l")))) "0jdm1nwsnkj0nzjmcqprmjk25449mhjj25khwzpq3mpjw440wmd2"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("libgcrypt" ,libgcrypt))) `(("libgcrypt" ,libgcrypt)))

7
gnu/packages/gnuzilla.scm
View file

@ -531,7 +531,12 @@ (define-public icecat
(mozilla-patch "icecat-CVE-2018-5089-pt18.patch" "fe271a2b9503" "11wr8mdxw01dlmzkq55hf0qd52cwmx4vk96cff66d4kkl1dbj6qn") (mozilla-patch "icecat-CVE-2018-5089-pt18.patch" "fe271a2b9503" "11wr8mdxw01dlmzkq55hf0qd52cwmx4vk96cff66d4kkl1dbj6qn")
(mozilla-patch "icecat-CVE-2018-5089-pt19.patch" "410da936a1e8" "14dvaysz0svlh50kdabjhd2s5avz6p93sbyqhwik5rlvcg5ax5zp") (mozilla-patch "icecat-CVE-2018-5089-pt19.patch" "410da936a1e8" "14dvaysz0svlh50kdabjhd2s5avz6p93sbyqhwik5rlvcg5ax5zp")
(mozilla-patch "icecat-CVE-2018-5089-pt20.patch" "8368a9a379e3" "0fqq01ms7m4kb9b10n8gy5n9n4x43crz2gn1r6c4ny52wzgm3j6f") (mozilla-patch "icecat-CVE-2018-5089-pt20.patch" "8368a9a379e3" "0fqq01ms7m4kb9b10n8gy5n9n4x43crz2gn1r6c4ny52wzgm3j6f")
(mozilla-patch "icecat-CVE-2018-5089-pt21.patch" "a7c8e85285e2" "1caa2w5r8rqb1qrk4mgf2vw1k592idvqmgs8qfz2dp2744kk6z98"))) (mozilla-patch "icecat-CVE-2018-5089-pt21.patch" "a7c8e85285e2" "1caa2w5r8rqb1qrk4mgf2vw1k592idvqmgs8qfz2dp2744kk6z98")
(mozilla-patch "icecat-bug-1375217.patch" "00fc630c9a46" "17pcprp452nslk6sac6sili0p74zh8w3g0v1wsdn0ikm9xmnphhv")
(mozilla-patch "icecat-bug-1261175.patch" "f0ec180993d2" "0jiazxcwki83wr00fyh2g518ynsd33p7nk65zk4d1682gn22lc8v")
(mozilla-patch "icecat-bug-1433005.patch" "a6a9e26688c1" "0cvizvilb4k422j2gzqcbakznvsffmk6n6xn1ayj5rgxfaizkkqk")
(mozilla-patch "icecat-bug-1434580.patch" "198ad052621e" "1721zx8hifdlflrhvw6hmkdgjbvsmxl9n84iji5qywhlp2krdk9r")
(mozilla-patch "icecat-bug-1426087.patch" "391ea77ebfdb" "1fhkvd0z6mvdkj7m0d3jlj42rsdw5r4x122c1wb1i428228ifw6n")))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

4
gnu/packages/image-viewers.scm
View file

@ -58,7 +58,7 @@ (define-module (gnu packages image-viewers)
(define-public feh (define-public feh
(package (package
(name "feh") (name "feh")
(version "2.23.1") (version "2.23.2")
(home-page "https://feh.finalrewind.org/") (home-page "https://feh.finalrewind.org/")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -66,7 +66,7 @@ (define-public feh
name "-" version ".tar.bz2")) name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1gp9szkcx7x0ifxihncbdaf6m075rqnnb8jks8dj0h9xhv869hcv")))) "1hw9xhhmm404ircmd7aw9n51n23wzjxzmav272ldk1pxb2jk3hcn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (modify-phases %standard-phases (delete 'configure)) '(#:phases (modify-phases %standard-phases (delete 'configure))

5
gnu/packages/linux.scm
View file

@ -3788,7 +3788,7 @@ (define-public radeontop
(define-public efivar (define-public efivar
(package (package
(name "efivar") (name "efivar")
(version "30") (version "34")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/rhinstaller/" name (uri (string-append "https://github.com/rhinstaller/" name
@ -3796,13 +3796,14 @@ (define-public efivar
"-" version ".tar.bz2")) "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"12qjnm44yi55ffqxjpgrxy82s89yjziy84w2rfjjknsd8flj0mqz")))) "09a31y6sl3b33myy42gl9k732k1f440ycd07l6ac5d5l53kk8zhv"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(;; Tests require a UEFI system and is not detected in the chroot. `(;; Tests require a UEFI system and is not detected in the chroot.
#:tests? #f #:tests? #f
#:make-flags (list (string-append "prefix=" %output) #:make-flags (list (string-append "prefix=" %output)
(string-append "libdir=" %output "/lib") (string-append "libdir=" %output "/lib")
"CC_FOR_BUILD=gcc"
(string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")) (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases

4
gnu/packages/python.scm
View file

@ -7030,13 +7030,13 @@ (define-public python2-execnet
(define-public python-icalendar (define-public python-icalendar
(package (package
(name "python-icalendar") (name "python-icalendar")
(version "4.0.0") (version "4.0.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "icalendar" version)) (uri (pypi-uri "icalendar" version))
(sha256 (sha256
(base32 (base32
"0jfp93x2pnpsbck92zw22dq7sl4pk0avv0gnb4x9vldrg6vlhyin")))) "139y79y6ijl39m5bj771r43vpah9s4ly7d1k76la6hrx7l144ak8"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("python-dateutil" ,python-dateutil) `(("python-dateutil" ,python-dateutil)

43
gnu/packages/video.scm
View file

@ -3,7 +3,7 @@
;;; Copyright © 2014, 2015, 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2014, 2015, 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015 Andy Patterson <ajpatter@uwaterloo.ca> ;;; Copyright © 2015 Andy Patterson <ajpatter@uwaterloo.ca>
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2015, 2016, 2017, 2018 Alex Vong <alexvong1995@gmail.com>
@ -377,7 +377,7 @@ (define-public mkvtoolnix
(define-public x265 (define-public x265
(package (package
(name "x265") (name "x265")
(version "2.4") (version "2.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -385,7 +385,7 @@ (define-public x265
"x265_" version ".tar.gz")) "x265_" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0afp0xlk0fb4q6j4sh3hyvjnjccdp61sn21zg3fyqvwgswcafalw")) "1gyd94jkwdii9308m07nymsbxrmrcl81c0j8i10zhslr2mj07w0v"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(delete-file-recursively "source/compat/getopt")))) '(delete-file-recursively "source/compat/getopt"))))
@ -594,14 +594,14 @@ (define-public libva
(define-public ffmpeg (define-public ffmpeg
(package (package
(name "ffmpeg") (name "ffmpeg")
(version "3.4.1") (version "3.4.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://ffmpeg.org/releases/ffmpeg-" (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1h4iz7q10wj04awr2wvmp60n7b09pfwrgwbbw9sgl7klcf52fxss")))) "0h6prjn1ijkzzhkyj8mazp0wpx7m0n9ycadjxagf9czqirbyk4ib"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("fontconfig" ,fontconfig) `(("fontconfig" ,fontconfig)
@ -1367,7 +1367,7 @@ (define-public libbluray
(define-public libdvdread (define-public libdvdread
(package (package
(name "libdvdread") (name "libdvdread")
(version "5.0.3") (version "6.0.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.videolan.org/videolan/" (uri (string-append "https://download.videolan.org/videolan/"
@ -1375,7 +1375,7 @@ (define-public libdvdread
name "-" version ".tar.bz2")) name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0ayqiq0psq18rcp6f5pz82sxsq66v0kwv0y55dbrcg68plnxy71j")))) "0dgr23fzcjhb7ck54xkr9zmf4jcq3ph0dz3fbyvla1c6ni9ijfxk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags '("--with-libdvdcss=yes"))) `(#:configure-flags '("--with-libdvdcss=yes")))
@ -1423,7 +1423,7 @@ (define-public dvdauthor
(define-public libdvdnav (define-public libdvdnav
(package (package
(name "libdvdnav") (name "libdvdnav")
(version "5.0.3") (version "6.0.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.videolan.org/videolan/" (uri (string-append "https://download.videolan.org/videolan/"
@ -1431,7 +1431,7 @@ (define-public libdvdnav
name "-" version ".tar.bz2")) name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0v8byv5z598k06rqzdmj7739vc86xq3zf79zfr698dib7lz055sh")))) "062njcksmpgw9yv3737qkf93r2pzhaxi9szqjabpa8d010dp38ph"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -1452,31 +1452,6 @@ (define-public libdvdnav
encapsulated.") encapsulated.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public libdvdnav-4
(package
(inherit libdvdnav)
(version "4.2.1")
(source (origin
(method url-fetch)
(uri
(string-append
"https://download.videolan.org/videolan/libdvdnav/libdvdnav-"
version ".tar.xz"))
(sha256
(base32
"0wi3gy408c8xj0ism0hckv5jbfh3lg4pmgxv87gbch9jrhp2gjkz"))))
(native-inputs
`(("pkg-config" ,pkg-config)
("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)))
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'autoreconf
(lambda _
(zero? (system* "autoreconf" "-vif")))))))))
(define-public libdvdcss (define-public libdvdcss
(package (package
(name "libdvdcss") (name "libdvdcss")