diff options
author | Mark H Weaver <mhw@netris.org> | 2018-02-14 03:40:08 -0500 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2018-02-14 03:40:08 -0500 |
commit | 932c98326daa26657c970e38583f7904364cdd66 (patch) | |
tree | ea4b5f9cc2ee4460a119101d83ecfd0a70a44fb7 /gnu | |
parent | 870541d6a7617e127f0aa9f729fba4daa729fd91 (diff) | |
parent | 75538328c292263a0c13bef3b0058aa291aeec48 (diff) |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/packages/bioinformatics.scm | 4 | ||||
-rw-r--r-- | gnu/packages/bootloaders.scm | 1 | ||||
-rw-r--r-- | gnu/packages/freeipmi.scm | 4 | ||||
-rw-r--r-- | gnu/packages/gnuzilla.scm | 7 | ||||
-rw-r--r-- | gnu/packages/image-viewers.scm | 4 | ||||
-rw-r--r-- | gnu/packages/linux.scm | 5 | ||||
-rw-r--r-- | gnu/packages/python.scm | 4 | ||||
-rw-r--r-- | gnu/packages/video.scm | 43 |
8 files changed, 27 insertions, 45 deletions
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0fd97b691e..41b7446915 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6370,7 +6370,7 @@ SELECT or UPDATE queries to an end-point.") (define-public vsearch (package (name "vsearch") - (version "2.6.2") + (version "2.7.0") (source (origin (method url-fetch) @@ -6380,7 +6380,7 @@ SELECT or UPDATE queries to an end-point.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "02khrgh8hm11cgww2f9mqc6886zqli9ss4pd4kfpqzd0d31vbzv5")) + "0523b8xq5fw60ayl0k5m1fm6yrh1932ljrsz1ys67xnki7p7f1d5")) (patches (search-patches "vsearch-unbundle-cityhash.patch")) (snippet '(begin diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index a6f40119dc..59eb22f242 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -409,6 +409,7 @@ also initializes the boards (RAM etc).") (find-files "." ".*\\.(bin|efi|img|spl)$") (find-files "." "^MLO$")))) (mkdir-p libexec) + (install-file ".config" libexec) (for-each (lambda (file) (let ((target-file (string-append libexec "/" file))) diff --git a/gnu/packages/freeipmi.scm b/gnu/packages/freeipmi.scm index 6708092693..77400d51f3 100644 --- a/gnu/packages/freeipmi.scm +++ b/gnu/packages/freeipmi.scm @@ -27,14 +27,14 @@ (define-public freeipmi (package (name "freeipmi") - (version "1.5.7") + (version "1.6.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/freeipmi/freeipmi-" version ".tar.gz")) (sha256 (base32 - "1rdxs33klk6956rg8mn2dxwkk43y5yilvgvbcka8g6v4x0r98v5l")))) + "0jdm1nwsnkj0nzjmcqprmjk25449mhjj25khwzpq3mpjw440wmd2")))) (build-system gnu-build-system) (inputs `(("libgcrypt" ,libgcrypt))) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 3a3f5dceca..8d9573fb81 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -531,7 +531,12 @@ security standards.") (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-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))) (snippet '(begin diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 884aed27f2..f11c56b2d5 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -58,7 +58,7 @@ (define-public feh (package (name "feh") - (version "2.23.1") + (version "2.23.2") (home-page "https://feh.finalrewind.org/") (source (origin (method url-fetch) @@ -66,7 +66,7 @@ name "-" version ".tar.bz2")) (sha256 (base32 - "1gp9szkcx7x0ifxihncbdaf6m075rqnnb8jks8dj0h9xhv869hcv")))) + "1hw9xhhmm404ircmd7aw9n51n23wzjxzmav272ldk1pxb2jk3hcn")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3d038914f2..691990b08c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3788,7 +3788,7 @@ under OpenGL graphics workloads.") (define-public efivar (package (name "efivar") - (version "30") + (version "34") (source (origin (method url-fetch) (uri (string-append "https://github.com/rhinstaller/" name @@ -3796,13 +3796,14 @@ under OpenGL graphics workloads.") "-" version ".tar.bz2")) (sha256 (base32 - "12qjnm44yi55ffqxjpgrxy82s89yjziy84w2rfjjknsd8flj0mqz")))) + "09a31y6sl3b33myy42gl9k732k1f440ycd07l6ac5d5l53kk8zhv")))) (build-system gnu-build-system) (arguments `(;; Tests require a UEFI system and is not detected in the chroot. #:tests? #f #:make-flags (list (string-append "prefix=" %output) (string-append "libdir=" %output "/lib") + "CC_FOR_BUILD=gcc" (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")) #:phases (modify-phases %standard-phases diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6e08e38b45..8c239c3f11 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7030,13 +7030,13 @@ minimal and fast API targeting the following uses: (define-public python-icalendar (package (name "python-icalendar") - (version "4.0.0") + (version "4.0.1") (source (origin (method url-fetch) (uri (pypi-uri "icalendar" version)) (sha256 (base32 - "0jfp93x2pnpsbck92zw22dq7sl4pk0avv0gnb4x9vldrg6vlhyin")))) + "139y79y6ijl39m5bj771r43vpah9s4ly7d1k76la6hrx7l144ak8")))) (build-system python-build-system) (propagated-inputs `(("python-dateutil" ,python-dateutil) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 35478036d5..d945caee12 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014, 2015, 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; 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 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018 Alex Vong <alexvong1995@gmail.com> @@ -377,7 +377,7 @@ and creating Matroska files from other media files (@code{mkvmerge}).") (define-public x265 (package (name "x265") - (version "2.4") + (version "2.6") (source (origin (method url-fetch) @@ -385,7 +385,7 @@ and creating Matroska files from other media files (@code{mkvmerge}).") "x265_" version ".tar.gz")) (sha256 (base32 - "0afp0xlk0fb4q6j4sh3hyvjnjccdp61sn21zg3fyqvwgswcafalw")) + "1gyd94jkwdii9308m07nymsbxrmrcl81c0j8i10zhslr2mj07w0v")) (modules '((guix build utils))) (snippet '(delete-file-recursively "source/compat/getopt")))) @@ -594,14 +594,14 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).") (define-public ffmpeg (package (name "ffmpeg") - (version "3.4.1") + (version "3.4.2") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "1h4iz7q10wj04awr2wvmp60n7b09pfwrgwbbw9sgl7klcf52fxss")))) + "0h6prjn1ijkzzhkyj8mazp0wpx7m0n9ycadjxagf9czqirbyk4ib")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) @@ -1367,7 +1367,7 @@ players, like VLC or MPlayer.") (define-public libdvdread (package (name "libdvdread") - (version "5.0.3") + (version "6.0.0") (source (origin (method url-fetch) (uri (string-append "https://download.videolan.org/videolan/" @@ -1375,7 +1375,7 @@ players, like VLC or MPlayer.") name "-" version ".tar.bz2")) (sha256 (base32 - "0ayqiq0psq18rcp6f5pz82sxsq66v0kwv0y55dbrcg68plnxy71j")))) + "0dgr23fzcjhb7ck54xkr9zmf4jcq3ph0dz3fbyvla1c6ni9ijfxk")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-libdvdcss=yes"))) @@ -1423,7 +1423,7 @@ MPEG-2 stream containing VOB packets.") (define-public libdvdnav (package (name "libdvdnav") - (version "5.0.3") + (version "6.0.0") (source (origin (method url-fetch) (uri (string-append "https://download.videolan.org/videolan/" @@ -1431,7 +1431,7 @@ MPEG-2 stream containing VOB packets.") name "-" version ".tar.bz2")) (sha256 (base32 - "0v8byv5z598k06rqzdmj7739vc86xq3zf79zfr698dib7lz055sh")))) + "062njcksmpgw9yv3737qkf93r2pzhaxi9szqjabpa8d010dp38ph")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -1452,31 +1452,6 @@ DVD virtual machine and internal playback states are completely encapsulated.") (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 (package (name "libdvdcss") |