summaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/bioinformatics.scm81
-rw-r--r--gnu/packages/bittorrent.scm4
-rw-r--r--gnu/packages/bootstrap.scm1
-rw-r--r--gnu/packages/compression.scm24
-rw-r--r--gnu/packages/dillo.scm63
-rw-r--r--gnu/packages/fltk.scm2
-rw-r--r--gnu/packages/java.scm113
-rw-r--r--gnu/packages/libusb.scm47
-rw-r--r--gnu/packages/linux.scm79
-rw-r--r--gnu/packages/mail.scm4
-rw-r--r--gnu/packages/marst.scm43
-rw-r--r--gnu/packages/maths.scm6
-rw-r--r--gnu/packages/music.scm6
-rw-r--r--gnu/packages/openstack.scm29
-rw-r--r--gnu/packages/patches/openssh-CVE-2015-8325.patch31
-rw-r--r--gnu/packages/patches/python-pandas-fix-tslib-test-failure.patch141
-rw-r--r--gnu/packages/python.scm10
-rw-r--r--gnu/packages/ruby.scm4
-rw-r--r--gnu/packages/ssh.scm3
-rw-r--r--gnu/packages/statistics.scm4
-rw-r--r--gnu/packages/version-control.scm6
-rw-r--r--gnu/packages/video.scm91
-rw-r--r--gnu/packages/webkit.scm8
23 files changed, 706 insertions, 94 deletions
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index b76aadc6a2..c49b0a9e17 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -922,6 +922,75 @@ also includes an interface for tabix.")
(define-public python2-pysam
(package-with-python2 python-pysam))
+(define-public python-twobitreader
+ (package
+ (name "python-twobitreader")
+ (version "3.1.2")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "twobitreader" version))
+ (sha256
+ (base32
+ "0y408fp6psqzwxpcpqn0wp7fr41dwz8d54wpj6j261fj5q8vs169"))))
+ (properties `((python2-variant . ,(delay python2-twobitreader))))
+ (build-system python-build-system)
+ (native-inputs
+ `(("python-sphinx" ,python-sphinx)))
+ (home-page "https://github.com/benjschiller/twobitreader")
+ (synopsis "Python library for reading .2bit files")
+ (description
+ "twobitreader is a Python library for reading .2bit files as used by the
+UCSC genome browser.")
+ (license license:artistic2.0)))
+
+(define-public python2-twobitreader
+ (let ((base (package-with-python2 (strip-python2-variant python-twobitreader))))
+ (package
+ (inherit base)
+ (native-inputs `(("python2-setuptools" ,python2-setuptools)
+ ,@(package-native-inputs base))))))
+
+(define-public python-plastid
+ (package
+ (name "python-plastid")
+ (version "0.4.5")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "plastid" version))
+ (sha256
+ (base32
+ "1nhxw8a5gn9as58i2ih52c5cjwj48ik418pzsjwph3s66mmy9yvq"))))
+ (properties `((python2-variant . ,(delay python2-plastid))))
+ (build-system python-build-system)
+ (arguments
+ ;; Some test files are not included.
+ `(#:tests? #f))
+ (propagated-inputs
+ `(("python-numpy" ,python-numpy)
+ ("python-scipy" ,python-scipy)
+ ("python-pandas" ,python-pandas)
+ ("python-pysam" ,python-pysam)
+ ("python-matplotlib" ,python-matplotlib)
+ ("python-biopython" ,python-biopython)
+ ("python-twobitreader" ,python-twobitreader)))
+ (native-inputs
+ `(("python-cython" ,python-cython)
+ ("python-nose" ,python-nose)))
+ (home-page "https://github.com/joshuagryphon/plastid")
+ (synopsis "Python library for genomic analysis")
+ (description
+ "plastid is a Python library for genomic analysis – in particular,
+high-throughput sequencing data – with an emphasis on simplicity.")
+ (license license:bsd-3)))
+
+(define-public python2-plastid
+ (let ((base (package-with-python2 (strip-python2-variant python-plastid))))
+ (package
+ (inherit base)
+ ;; setuptools is required at runtime
+ (propagated-inputs `(("python2-setuptools" ,python2-setuptools)
+ ,@(package-propagated-inputs base))))))
+
(define-public cd-hit
(package
(name "cd-hit")
@@ -2075,9 +2144,9 @@ HMMs).")
from high-throughput sequencing assays.")
(license license:gpl3+)))
-(define-public htsjdk
+(define-public java-htsjdk
(package
- (name "htsjdk")
+ (name "java-htsjdk")
(version "1.129")
(source (origin
(method url-fetch)
@@ -3012,9 +3081,9 @@ any particular back-end implementation, and supports use of multiple back-ends
simultaneously.")
(license license:public-domain)))
-(define-public ngs-java
+(define-public java-ngs
(package (inherit ngs-sdk)
- (name "ngs-java")
+ (name "java-ngs")
(arguments
`(,@(substitute-keyword-arguments
`(#:modules ((guix build gnu-build-system)
@@ -3077,7 +3146,7 @@ simultaneously.")
(string-append "--with-ngs-sdk-prefix="
(assoc-ref inputs "ngs-sdk"))
(string-append "--with-ngs-java-prefix="
- (assoc-ref inputs "ngs-java"))
+ (assoc-ref inputs "java-ngs"))
(string-append "--with-hdf5-prefix="
(assoc-ref inputs "hdf5"))))))
(alist-cons-after
@@ -3103,7 +3172,7 @@ simultaneously.")
(inputs
`(("libxml2" ,libxml2)
("ngs-sdk" ,ngs-sdk)
- ("ngs-java" ,ngs-java)
+ ("java-ngs" ,java-ngs)
("libmagic" ,file)
("hdf5" ,hdf5)))
(native-inputs `(("perl" ,perl)))
diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index 26b0fc6fdc..d8252c8b37 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -207,7 +207,7 @@ interface, for the Transmission BitTorrent daemon.")
(define-public aria2
(package
(name "aria2")
- (version "1.21.0")
+ (version "1.22.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/tatsuhiro-t/aria2/"
@@ -215,7 +215,7 @@ interface, for the Transmission BitTorrent daemon.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1035rzx9y7qv4p7cv04f461343dxha7ikprch059x2fci8n5yp12"))))
+ "12agwdvvkr34wqhyyfp418dj0k7nbr297qmcd3wj5kkn7brv6gxc"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--enable-libaria2")
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index f5bf069c20..1ada01c904 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -166,6 +166,7 @@ successful, or false to signal an error."
((string=? system "mips64el-linux") "/lib/ld.so.1")
((string=? system "i586-gnu") "/lib/ld.so.1")
((string=? system "i686-gnu") "/lib/ld.so.1")
+ ((string=? system "aarch64-linux") "/lib/ld-linux-aarch64.so.1")
;; XXX: This one is used bare-bones, without a libc, so add a case
;; here just so we can keep going.
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index de5d03af22..8043422f8b 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2015 Jeff Mickey <[email protected]>
;;; Copyright © 2015, 2016 Efraim Flashner <[email protected]>
;;; Copyright © 2016 Ben Woodcroft <[email protected]>
+;;; Copyright © 2016 Danny Milosavljevic <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -731,3 +732,26 @@ similar in speed to deflate but offers denser compression. This package
provides encoder and a decoder libraries: libbrotlienc and libbrotlidec,
respectively, based on the reference implementation from Google.")
(license license:expat))))
+
+(define-public cabextract
+ (package
+ (name "cabextract")
+ (version "1.6")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://cabextract.org.uk/cabextract-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1ysmmz25fjghq7mxb2anyyvr1ljxqxzi4piwjhk0sdamcnsn3rnf"))))
+ (build-system gnu-build-system)
+ (arguments '(#:configure-flags '("--with-external-libmspack")))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("libmspack" ,libmspack)))
+ (home-page "http://www.cabextract.org.uk/")
+ (synopsis "Tool to unpack Cabinet archives")
+ (description "Extracts files out of Microsoft Cabinet (.cab) archives")
+ ;; Some source files specify gpl2+, lgpl2+, however COPYING is gpl3.
+ (license license:gpl3+)))
diff --git a/gnu/packages/dillo.scm b/gnu/packages/dillo.scm
new file mode 100644
index 0000000000..0fd84d9177
--- /dev/null
+++ b/gnu/packages/dillo.scm
@@ -0,0 +1,63 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Kei Yamashita <[email protected]>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages dillo)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix packages)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages compression)
+ #:use-module (gnu packages fltk)
+ #:use-module (gnu packages fontutils)
+ #:use-module (gnu packages perl)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages image)
+ #:use-module (gnu packages tls)
+ #:use-module (gnu packages xorg)
+ #:use-module (guix download)
+ #:use-module (guix build-system gnu))
+
+(define-public dillo
+ (package
+ (name "dillo")
+ (version "3.0.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "http://www.dillo.org/download/"
+ name "-" version ".tar.bz2"))
+ (sha256
+ (base32
+ "12ql8n1lypv3k5zqgwjxlw1md90ixz3ag6j1gghfnhjq3inf26yv"))))
+ (build-system gnu-build-system)
+ (arguments `(#:configure-flags '("--enable-ssl" "--enable-ipv6")))
+ (native-inputs `(("pkg-config" ,pkg-config)))
+ (inputs `(("fltk" ,fltk)
+ ("fontconfig" ,fontconfig)
+ ("libjpeg" ,libjpeg)
+ ("libpng" ,libpng)
+ ("libxcursor" ,libxcursor)
+ ("libxft" ,libxft)
+ ("libxi" ,libxi)
+ ("libxinerama" ,libxinerama)
+ ("openssl" ,openssl)
+ ("perl" ,perl)
+ ("zlib" ,zlib)))
+ (synopsis "Very small and fast graphical web browser")
+ (description "Dillo is a minimalistic web browser particularly intended for
+older or slower computers and embedded systems.")
+ (home-page "http://www.dillo.org")
+ (license license:gpl3+)))
diff --git a/gnu/packages/fltk.scm b/gnu/packages/fltk.scm
index 4dec9bc288..a0180c0432 100644
--- a/gnu/packages/fltk.scm
+++ b/gnu/packages/fltk.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2014 John Darrington <[email protected]>
;;; Copyright © 2015 Eric Bavier <[email protected]>
;;; Copyright © 2015 Ricardo Wurmus <[email protected]>
+;;; Copyright © 2016 Kei Yamashita <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -52,6 +53,7 @@
`(("libjpeg" ,libjpeg-8) ;jpeg_read_header argument error in libjpeg-9
("libpng" ,libpng)
("libx11" ,libx11)
+ ("libxft" ,libxft)
("mesa" ,mesa)
("zlib" ,zlib)))
(arguments
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 9b6a647f25..02131f10d0 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015 Ricardo Wurmus <[email protected]>
+;;; Copyright © 2015, 2016 Ricardo Wurmus <[email protected]>
;;; Copyright © 2016 Leo Famulari <[email protected]>
;;;
;;; This file is part of GNU Guix.
@@ -51,9 +51,9 @@
#:use-module (gnu packages texinfo)
#:use-module ((srfi srfi-1) #:select (fold alist-delete)))
-(define-public swt
+(define-public java-swt
(package
- (name "swt")
+ (name "java-swt")
(version "4.4.2")
(source (origin
(method url-fetch)
@@ -577,7 +577,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
(license license:gpl2+)))
(define-public icedtea-7
- (let* ((version "2.6.4")
+ (let* ((version "2.6.5")
(drop (lambda (name hash)
(origin
(method url-fetch)
@@ -594,7 +594,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
version ".tar.xz"))
(sha256
(base32
- "0r31h8nlsrbfdkgbjbb7phwgcwglc9siznzrr40lqnm9xrgkc2nj"))
+ "1xskigsa1i8hycbagb0f6idyb16x8dkixcdyaacsw4dvjr230lp7"))
(modules '((guix build utils)))
(snippet
'(substitute* "Makefile.in"
@@ -669,6 +669,8 @@ build process and its dependencies, whereas Make uses Makefile format.")
(setenv "CC" "gcc")
(setenv "CPATH"
(string-append gcjinclude ":"
+ (assoc-ref inputs "libxcomposite")
+ "/include/X11/extensions" ":"
(assoc-ref inputs "libxrender")
"/include/X11/extensions" ":"
(assoc-ref inputs "libxtst")
@@ -719,26 +721,111 @@ build process and its dependencies, whereas Make uses Makefile format.")
(native-inputs
`(("openjdk-src"
,(drop "openjdk"
- "1qjjf71nq80ac2d08hbaa8589d31vk313z3rkirnwq5df8cyf0mv"))
+ "1nxb8b0p1v57ix8gp22ifg9vg0p0lhr59g5vi74f7abg3almcvy6"))
("corba-drop"
,(drop "corba"
- "025warxhjal3nr7w1xyd16k0f32fwkchifpaslzyidsga3hgmfr6"))
+ "0zz7gz8fq7qnifzm2jgir2i6rcp0d2h32lcxvlfs24w5szynjya2"))
("jaxp-drop"
,(drop "jaxp"
- "0qiz6swb78w9c0mf88pf0gflgm5rp9k0l6fv6sdl7dki691b0z09"))
+ "0ym3bcril6507bpbw5mkkw0zmfg3s1nkbsvs2lg0c1q8kyyf3dbv"))
("jaxws-drop"
,(drop "jaxws"
- "18fz4gl4fdlcmqvh1mlpd9h0gj0qizpfa7njkax97aysmsm08xns"))
+ "1l16x4dwhgfpnk32xbigb1kzkvgj0b6zzhdg4rpkywa7gvg9lxaf"))
("jdk-drop"
,(drop "jdk"
- "0qsx5d9pgwlz9vbpapw4jwpajqc6rwk1150cjb33i4n3z709jccx"))
+ "1fi18ji83d0dqzg35kcm4bksg2z3fbg772p05wgw4rhh7dai0f6d"))
("langtools-drop"
,(drop "langtools"
- "1k6plx96smf86z303gb30hncssa8f40qdryzsdv349iwqwacxc7r"))
+ "1nbqg8sw7z7f3bhxng0xdp8vl2nc5wqz0xii1j566qdgc1n6fv3c"))
("hotspot-drop"
,(drop "hotspot"
- "0r9ffzyf5vxs8wg732szqcil0ksc8lcxzihdv3viz7d67dy42irp"))
+ "1z0w8h1jjvxlqzlrwasy323fygx90if09rvqjk4ymaqhzcr35623"))
,@(fold alist-delete (package-native-inputs icedtea-6)
- '("openjdk6-src")))))))
+ '("openjdk6-src"))))
+ (inputs
+ `(("libxcomposite" ,libxcomposite)
+ ,@(package-inputs icedtea-6))))))
+
+(define-public icedtea-8
+ (let* ((version "3.0.0")
+ (drop (lambda (name hash)
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://icedtea.classpath.org/download/drops/"
+ "/icedtea8/" version "/" name ".tar.xz"))
+ (sha256 (base32 hash))))))
+ (package (inherit icedtea-7)
+ (version "3.0.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://icedtea.wildebeest.org/download/source/icedtea-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "1a99hvx5d0dcinlixgy0wzv2f7jnzi8jp7hcrf2pd7dqndlxsyll"))
+ (modules '((guix build utils)))
+ (snippet
+ '(substitute* "Makefile.am"
+ ;; do not leak information about the build host
+ (("DISTRIBUTION_ID=\"\\$\\(DIST_ID\\)\"")
+ "DISTRIBUTION_ID=\"\\\"guix\\\"\"")))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments icedtea-7)
+ ((#:configure-flags flags)
+ `(let ((jdk (assoc-ref %build-inputs "jdk")))
+ `(;;"--disable-bootstrap"
+ "--enable-bootstrap"
+ "--enable-nss"
+ "--disable-downloading"
+ "--disable-tests" ;they are run in the check phase instead
+ "--with-openjdk-src-dir=./openjdk.src"
+ ,(string-append "--with-jdk-home=" jdk))))
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (delete 'fix-x11-extension-include-path)
+ (delete 'patch-paths)
+ (delete 'set-additional-paths)
+ (delete 'patch-patches)
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((doc (string-append (assoc-ref outputs "doc")
+ "/share/doc/icedtea"))
+ (jre (assoc-ref outputs "out"))
+ (jdk (assoc-ref outputs "jdk")))
+ (copy-recursively "openjdk.build/docs" doc)
+ (copy-recursively "openjdk.build/images/j2re-image" jre)
+ (copy-recursively "openjdk.build/images/j2sdk-image" jdk)
+ #t)))))))
+ (native-inputs
+ `(("jdk" ,icedtea-7 "jdk")
+ ("openjdk-src"
+ ,(drop "openjdk"
+ "0cchcrkj3pbjw3r6w08d8fkcjp98fyqp15bv88ljakjcsxrjc0sv"))
+ ("corba-drop"
+ ,(drop "corba"
+ "1k5khy8g0bk8yas81infh4l8rradpslzs0bblri0aqn9s3aq0x6p"))
+ ("jaxp-drop"
+ ,(drop "jaxp"
+ "1s167lwh1bxkjmbcyk1pb9r919hfbjgh2shig3d1qmj24r2fbk2c"))
+ ("jaxws-drop"
+ ,(drop "jaxws"
+ "0xphl8127in0634401f8v3b42mh14v1zdzd7ar10h9m5m84hcmgg"))
+ ("jdk-drop"
+ ,(drop "jdk"
+ "1kdi5v0vf7swkh2r4isdibw8zzsp34d1aa1sbxl5ljc9lfmbhx7s"))
+ ("langtools-drop"
+ ,(drop "langtools"
+ "11pa0sr4yi0nnfwhz25410zimc3jm367cvrhg5jm0xc5rykydq70"))
+ ("hotspot-drop"
+ ,(drop "hotspot"
+ "1my0g9snpd6619y82b4m96wc7ncvf1hw5yqrbh3n1pjgm2k7ywbn"))
+ ("nashorn-drop"
+ ,(drop "nashorn"
+ "1h12a61q3bw8zabhpp6aawfg3pwixjcya64595rj07sid619vidl"))
+ ,@(fold alist-delete (package-native-inputs icedtea-7)
+ '("gcj" "openjdk-src" "corba-drop" "jaxp-drop" "jaxws-drop"
+ "jdk-drop" "langtools-drop" "hotspot-drop")))))))
(define-public icedtea icedtea-7)
diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm
index 61136791d3..1e72442c73 100644
--- a/gnu/packages/libusb.scm
+++ b/gnu/packages/libusb.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2012 Nikita Karetnikov <[email protected]>
;;; Copyright © 2015 Andreas Enge <[email protected]>
;;; Copyright © 2015 Andy Wingo <[email protected]>
-;;; Copyright © 2015 Ricardo Wurmus <[email protected]>
+;;; Copyright © 2015, 2016 Ricardo Wurmus <[email protected]>
;;; Copyright © 2016 Efraim Flashner <[email protected]>
;;;
;;; This file is part of GNU Guix.
@@ -28,11 +28,13 @@
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk)
+ #:use-module (guix build-system python)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages gtk)
#:use-module (gnu packages linux)
#:use-module (gnu packages mp3)
#:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages python)
#:use-module (gnu packages xiph))
(define-public libusb
@@ -87,6 +89,49 @@ devices on various operating systems.")
version of libusb to run with newer libusb.")
(license lgpl2.1+)))
+(define-public python-pyusb
+ (package
+ (name "python-pyusb")
+ (version "1.0.0rc1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "pyusb" version))
+ (sha256
+ (base32
+ "07cjq11qhngzjd746k7688s6y2x7lpj669fxqfsiy985rg0jsn7j"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:tests? #f ;no tests
+ #:modules ((srfi srfi-26)
+ (guix build utils)
+ (guix build python-build-system))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-libusb-reference
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "usb/libloader.py"
+ (("lib = locate_library\\(candidates, find_library\\)")
+ (string-append
+ "lib = \""
+ (car (find-files (assoc-ref inputs "libusb")
+ (lambda (file stat)
+ (and ((file-name-predicate
+ "^libusb-.*\\.so\\..*") file stat)
+ (not (symbolic-link? file))))))
+ "\"")))
+ #t)))))
+ (inputs
+ `(("libusb" ,libusb)))
+ (home-page "http://walac.github.io/pyusb/")
+ (synopsis "Python bindings to the libusb library")
+ (description
+ "PyUSB aims to be an easy to use Python module to access USB devices.")
+ (license bsd-3)))
+
+(define-public python2-pyusb
+ (package-with-python2 python-pyusb))
+
(define-public libmtp
(package
(name "libmtp")
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e1a12045df..a26e641342 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -10,6 +10,7 @@
;;; Copyright © 2016 Tobias Geerinckx-Rice <[email protected]>
;;; Copyright © 2016 Alex Kost <[email protected]>
;;; Copyright © 2016 Raymond Nicholson <[email protected]>
+;;; Copyright © 2016 Mathieu Lirzin <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -81,6 +82,7 @@
(cond ((string=? arch "i686") "i386")
((string-prefix? "mips" arch) "mips")
((string-prefix? "arm" arch) "arm")
+ ((string-prefix? "aarch64" arch) "arm64")
(else arch))))
(define (linux-libre-urls version)
@@ -220,7 +222,7 @@ for SYSTEM and optionally VARIANT, or #f if there is no such configuration."
(search-path %load-path file)))
(define-public linux-libre
- (let* ((version "4.5.1")
+ (let* ((version "4.5.2")
(build-phase
'(lambda* (#:key system inputs #:allow-other-keys #:rest args)
;; Avoid introducing timestamps
@@ -298,7 +300,7 @@ for SYSTEM and optionally VARIANT, or #f if there is no such configuration."
(uri (linux-libre-urls version))
(sha256
(base32
- "1x621kvaf842bzpgglfl31zi74ny9w9jgvmkz3z6m3708n8clrdh"))))
+ "0mw8n5pms33k3m3aamlryahrcbhfnqbzvkglgw3j4dhaja3hwr7n"))))
(build-system gnu-build-system)
(supported-systems '("x86_64-linux" "i686-linux"))
(native-inputs `(("perl" ,perl)
@@ -335,13 +337,13 @@ It has been modified to remove all non-free binary blobs.")
(define-public linux-libre-4.4
(package
(inherit linux-libre)
- (version "4.4.7")
+ (version "4.4.8")
(source (origin
(method url-fetch)
(uri (linux-libre-urls version))
(sha256
(base32
- "031wh2k204zvshira28bf33sk1bbk19ilgqmkvkwjp6spk5wmvpq"))))
+ "0zyhdy01gjglgmlrmpqa1sdnm0z91mzwspbksj6zvcamczb8ml53"))))
(native-inputs
(let ((conf (kernel-config (or (%current-target-system)
(%current-system))
@@ -352,13 +354,13 @@ It has been modified to remove all non-free binary blobs.")
(define-public linux-libre-4.1
(package
(inherit linux-libre)
- (version "4.1.21")
+ (version "4.1.22")
(source (origin
(method url-fetch)
(uri (linux-libre-urls version))
(sha256
(base32
- "1gfzwiinpxzhqb5xi7b1iv7ay96nrjlhia6bvcyq8ffkx7a2r715"))))
+ "0bn6qba7q4i3yn3zx2p56gawnb2gczrf4vyrjggirj4d60gvng7y"))))
(native-inputs
(let ((conf (kernel-config (or (%current-target-system)
(%current-system))
@@ -1463,14 +1465,14 @@ system.")
(define-public kbd
(package
(name "kbd")
- (version "2.0.2")
+ (version "2.0.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kernel.org/linux/utils/kbd/kbd-"
version ".tar.xz"))
(sha256
(base32
- "04mrms12nm5sas0nxs94yrr3hz7gmqhnmfgb9ff34bh1jszxmzcx"))
+ "0ppv953gn2zylcagr4z6zg5y2x93dxrml29plypg6xgbq3hrv2bs"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -1484,27 +1486,26 @@ system.")
"tty"))))))
(build-system gnu-build-system)
(arguments
- '(#:phases (alist-cons-before
- 'build 'pre-build
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((gzip (assoc-ref %build-inputs "gzip"))
- (bzip2 (assoc-ref %build-inputs "bzip2")))
- (substitute* "src/libkeymap/findfile.c"
- (("gzip")
- (string-append gzip "/bin/gzip"))
- (("bzip2")
- (string-append bzip2 "/bin/bzip2")))))
- (alist-cons-after
- 'install 'post-install
- (lambda* (#:key outputs #:allow-other-keys)
- ;; Make sure these programs find their comrades.
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin")))
- (for-each (lambda (prog)
- (wrap-program (string-append bin "/" prog)
- `("PATH" ":" prefix (,bin))))
- '("unicode_start" "unicode_stop"))))
- %standard-phases))))
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'pre-build
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((gzip (assoc-ref %build-inputs "gzip"))
+ (bzip2 (assoc-ref %build-inputs "bzip2")))
+ (substitute* "src/libkeymap/findfile.c"
+ (("gzip")
+ (string-append gzip "/bin/gzip"))
+ (("bzip2")
+ (string-append bzip2 "/bin/bzip2"))))))
+ (add-after 'install 'post-install
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Make sure these programs find their comrades.
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin")))
+ (for-each (lambda (prog)
+ (wrap-program (string-append bin "/" prog)
+ `("PATH" ":" prefix (,bin))))
+ '("unicode_start" "unicode_stop"))))))))
(inputs `(("check" ,check)
("gzip" ,gzip)
("bzip2" ,bzip2)
@@ -2104,6 +2105,26 @@ WLAN, Bluetooth and mobile broadband.")
(license (license:non-copyleft "file://COPYING"
"See COPYING in the distribution."))))
+(define-public acpi
+ (package
+ (name "acpi")
+ (version "1.7")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://sourceforge/acpiclient/"
+ name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "01ahldvf0gc29dmbd5zi4rrnrw2i1ajnf30sx2vyaski3jv099fp"))))
+ (build-system gnu-build-system)
+ (home-page "http://acpiclient.sourceforge.net")
+ (synopsis "Display information on ACPI devices")
+ (description "@code{acpi} attempts to replicate the functionality of the
+\"old\" @code{apm} command on ACPI systems, including battery and thermal
+information. It does not support ACPI suspending, only displays information
+about ACPI devices.")
+ (license license:gpl2+)))
+
(define-public acpid
(package
(name "acpid")
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index fd379b7968..56e85712db 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1164,13 +1164,13 @@ maintained.")
(define-public khard
(package
(name "khard")
- (version "0.8.1")
+ (version "0.9.0")
(source (origin
(method url-fetch)
(uri (pypi-uri name version))
(sha256
(base32
- "098gs94qmnspdfn6ar8lycx7dbsz9bcff90aps0cmn47mw7llch0"))))
+ "0y83rji4f270hbb41m4jpr0z3yzvpvbsl32mpg9d38hlydw8fk1s"))))
(build-system python-build-system)
(arguments
`(#:python ,python-2 ; only python-2 is supported.
diff --git a/gnu/packages/marst.scm b/gnu/packages/marst.scm
new file mode 100644
index 0000000000..7d4a4f364d
--- /dev/null
+++ b/gnu/packages/marst.scm
@@ -0,0 +1,43 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright 2016 John Darrington <[email protected]>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages marst)
+ #:use-module (guix packages)
+ #:use-module (guix licenses)
+ #:use-module (guix download)
+ #:use-module (gnu packages compression)
+ #:use-module (guix build-system gnu))
+
+(define-public marst
+ (package
+ (name "marst")
+ (version "2.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://gnu/" name "/" name "-" version
+ ".tar.gz"))
+ (sha256
+ (base32 "0l6swjy8fjrqw89ghc1vvakg21jmpfkpsw92yssrzkg3rg8vkrry"))))
+ (build-system gnu-build-system)
+ (home-page "http://www.gnu.org/software/marst")
+ (synopsis "Algol to C translator")
+ (description "MARST is an Algol-to-C translator. It automatically translates programs
+written on the algorithmic language Algol 60 to the C programming language.")
+ (license gpl3+)))
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index d009905346..7ea4ca3066 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5,7 +5,7 @@
;;; Copyright © 2014, 2015, 2016 Eric Bavier <[email protected]>
;;; Copyright © 2014 Federico Beffa <[email protected]>
;;; Copyright © 2014 Mathieu Lirzin <[email protected]>
-;;; Copyright © 2015 Ricardo Wurmus <[email protected]>
+;;; Copyright © 2015, 2016 Ricardo Wurmus <[email protected]>
;;; Copyright © 2015 Sou Bunnbu <[email protected]>
;;; Copyright © 2015 Mark H Weaver <[email protected]>
;;; Copyright © 2015, 2016 Efraim Flashner <[email protected]>
@@ -1484,14 +1484,14 @@ full text searching.")
(define-public armadillo
(package
(name "armadillo")
- (version "6.400.3")
+ (version "6.700.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/arma/armadillo-"
version ".tar.gz"))
(sha256
(base32
- "0bsgrmldlx77w5x26n3axj1hg6iw6csyw0dwl1flrbdwl51f9701"))))
+ "0dsdjcps5l2nhg0455rrc708inffarzj7n435vj4sm9lxwf21wg9"))))
(build-system cmake-build-system)
(arguments `(#:tests? #f)) ;no test target
(inputs
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 280f3840bb..8f971f3614 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -775,7 +775,7 @@ is subjective.")
(string-append "PREFIX="
(assoc-ref %outputs "out"))
(string-append "SWT_PATH="
- (assoc-ref %build-inputs "swt")
+ (assoc-ref %build-inputs "java-swt")
"/share/java/swt.jar"))
#:tests? #f ;no "check" target
#:parallel-build? #f ;not supported
@@ -790,11 +790,11 @@ is subjective.")
(string-append "GCJFLAGS=-fsource=1.4 -fPIC " rest))
(("PROPERTIES\\?=")
(string-append "PROPERTIES?= -Dswt.library.path="
- (assoc-ref inputs "swt") "/lib"))
+ (assoc-ref inputs "java-swt") "/lib"))
(("\\$\\(GCJ\\) -o") "$(GCJ) $(LDFLAGS) -o"))
#t)))))
(inputs
- `(("swt" ,swt)))
+ `(("java-swt" ,java-swt)))
(native-inputs
`(("gcj" ,gcj)
("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 947abf31a4..780fb7f252 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -137,16 +137,16 @@ guidelines}.")
(define-public python-mox3
(package
(name "python-mox3")
- (version "0.13.0")
+ (version "0.14.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "mox3" version))
(sha256
(base32
- "0hj57374r239cj1zbzpxw7mj0yfblz55jdfrc2p1h8j7xng0319j"))))
+ "0njmh40i1lg5mzn9hc2ax83adj6dli455j6xifilrw27c4wlkjzx"))))
(build-system python-build-system)
- (inputs
+ (native-inputs
`(("python-fixtures" ,python-fixtures)
("python-pbr" ,python-pbr)
("python-setuptools" ,python-setuptools)
@@ -156,11 +156,14 @@ guidelines}.")
(synopsis "Mock object framework for Python")
(description
"Mox3 is an unofficial port of the Google mox framework
-(http://code.google.com/p/pymox/) to Python 3. It was meant to be as compatible
-with mox as possible, but small enhancements have been made. The library was
+(http://code.google.com/p/pymox/) to Python 3. It was meant to be as compatible
+with mox as possible, but small enhancements have been made. The library was
tested on Python version 3.2, 2.7 and 2.6.")
(license asl2.0)))
+(define-public python2-mox3
+ (package-with-python2 python-mox3))
+
(define-public python-os-client-config
(package
(name "python-os-client-config")
@@ -197,9 +200,6 @@ tested on Python version 3.2, 2.7 and 2.6.")
(define-public python2-os-client-config
(package-with-python2 python-os-client-config))
-(define-public python2-mox3
- (package-with-python2 python-mox3))
-
(define-public python-os-testr
(package
(name "python-os-testr")
@@ -266,20 +266,21 @@ portions of your testing code.")
(define-public python-stevedore
(package
(name "python-stevedore")
- (version "1.10.0")
+ (version "1.12.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "stevedore" version))
(sha256
(base32
- "17vpffcnk56sj86d2n3vz5bprcc9bswilgd0awnm7jp073pqkmpm"))))
+ "0999zvawaapzg6givjhn7vjscdwblcs73wf28wq1wb4g5mbb5phv"))))
(build-system python-build-system)
(propagated-inputs
`(("python-six" ,python-six)))
(inputs
- `(("python-pbr" ,python-pbr)
- ("python-setuptools" ,python-setuptools)
+ `(("python-pbr" ,python-pbr)))
+ (native-inputs
+ `(("python-setuptools" ,python-setuptools)
;; Tests
("python-docutils" ,python-docutils)
("python-mock" ,python-mock)
@@ -289,9 +290,9 @@ portions of your testing code.")
(synopsis "Manage dynamic plugins for Python applications")
(description
"Python makes loading code dynamically easy, allowing you to configure
-and extend your application by discovering and loading extensions (“plugins”)
+and extend your application by discovering and loading extensions (\"plugins\")
at runtime. Many applications implement their own library for doing this,
-using __import__ or importlib. stevedore avoids creating yet another extension
+using __import__ or importlib. Stevedore avoids creating yet another extension
mechanism by building on top of setuptools entry points. The code for managing
entry points tends to be repetitive, though, so stevedore provides manager
classes for implementing common patterns for using dynamically loaded
diff --git a/gnu/packages/patches/openssh-CVE-2015-8325.patch b/gnu/packages/patches/openssh-CVE-2015-8325.patch
new file mode 100644
index 0000000000..8063e64ea7
--- /dev/null
+++ b/gnu/packages/patches/openssh-CVE-2015-8325.patch
@@ -0,0 +1,31 @@
+From 85bdcd7c92fe7ff133bbc4e10a65c91810f88755 Mon Sep 17 00:00:00 2001
+From: Damien Miller <[email protected]>
+Date: Wed, 13 Apr 2016 10:39:57 +1000
+Subject: ignore PAM environment vars when UseLogin=yes
+
+If PAM is configured to read user-specified environment variables
+and UseLogin=yes in sshd_config, then a hostile local user may
+attack /bin/login via LD_PRELOAD or similar environment variables
+set via PAM.
+
+CVE-2015-8325, found by Shayan Sadigh, via Colin Watson
+---
+ session.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/session.c b/session.c
+index 4859245..4653b09 100644
+--- a/session.c
++++ b/session.c
+@@ -1322,7 +1322,7 @@ do_setup_env(Session *s, const char *shell)
+ * Pull in any environment variables that may have
+ * been set by PAM.
+ */
+- if (options.use_pam) {
++ if (options.use_pam && !options.use_login) {
+ char **p;
+
+ p = fetch_pam_child_environment();
+--
+cgit v0.11.2
+
diff --git a/gnu/packages/patches/python-pandas-fix-tslib-test-failure.patch b/gnu/packages/patches/python-pandas-fix-tslib-test-failure.patch
new file mode 100644
index 0000000000..62d6a38086
--- /dev/null
+++ b/gnu/packages/patches/python-pandas-fix-tslib-test-failure.patch
@@ -0,0 +1,141 @@
+This patch is required to fix a test failure when python-dateutil version
+2.5.2 or later is used. It is derived from the following commits:
+
+80ef4e06526b9b60cf24268454c9456585a790a3
+845ff974af6f7c3b3067cce8a7149b771c2be87
+
+diff --git a/pandas/tseries/tests/test_tslib.py b/pandas/tseries/tests/test_tslib.py
+index f0d5bf7..863bc6f 100644
+--- a/pandas/tseries/tests/test_tslib.py
++++ b/pandas/tseries/tests/test_tslib.py
+@@ -474,6 +474,11 @@ def test_does_not_convert_mixed_integer(self):
+ good_date_string))
+
+ def test_parsers(self):
++
++ # https://github.com/dateutil/dateutil/issues/217
++ import dateutil
++ yearfirst = dateutil.__version__ >= LooseVersion('2.5.0')
++
+ cases = {'2011-01-01': datetime.datetime(2011, 1, 1),
+ '2Q2005': datetime.datetime(2005, 4, 1),
+ '2Q05': datetime.datetime(2005, 4, 1),
+@@ -527,20 +532,26 @@ def test_parsers(self):
+ }
+
+ for date_str, expected in compat.iteritems(cases):
+- result1, _, _ = tools.parse_time_string(date_str)
+- result2 = to_datetime(date_str)
+- result3 = to_datetime([date_str])
+- result4 = to_datetime(np.array([date_str], dtype=object))
+- result5 = Timestamp(date_str)
+- result6 = DatetimeIndex([date_str])[0]
+- result7 = date_range(date_str, freq='S', periods=1)
++ result1, _, _ = tools.parse_time_string(date_str,
++ yearfirst=yearfirst)
++ result2 = to_datetime(date_str, yearfirst=yearfirst)
++ result3 = to_datetime([date_str], yearfirst=yearfirst)
++ result4 = to_datetime(np.array([date_str], dtype=object),
++ yearfirst=yearfirst)
++ result6 = DatetimeIndex([date_str], yearfirst=yearfirst)[0]
+ self.assertEqual(result1, expected)
+ self.assertEqual(result2, expected)
+ self.assertEqual(result3, expected)
+ self.assertEqual(result4, expected)
+- self.assertEqual(result5, expected)
+ self.assertEqual(result6, expected)
+- self.assertEqual(result7, expected)
++
++ # these really need to have yearfist, but we don't support
++ if not yearfirst:
++ result5 = Timestamp(date_str)
++ self.assertEqual(result5, expected)
++ result7 = date_range(date_str, freq='S', periods=1,
++ yearfirst=yearfirst)
++ self.assertEqual(result7, expected)
+
+ # NaT
+ result1, _, _ = tools.parse_time_string('NaT')
+@@ -589,23 +589,62 @@ def test_parsers_quarter_invalid(self):
+ self.assertRaises(ValueError, tools.parse_time_string, case)
+
+ def test_parsers_dayfirst_yearfirst(self):
++
++ # https://github.com/dateutil/dateutil/issues/217
++ # this issue was closed
++ import dateutil
++ is_compat_version = dateutil.__version__ >= LooseVersion('2.5.2')
++ if is_compat_version:
++ dayfirst_yearfirst1 = datetime.datetime(2010, 12, 11)
++ dayfirst_yearfirst2 = datetime.datetime(2020, 12, 21)
++ else:
++ dayfirst_yearfirst1 = datetime.datetime(2010, 11, 12)
++ dayfirst_yearfirst2 = datetime.datetime(2020, 12, 21)
++
+ # str : dayfirst, yearfirst, expected
+- cases = {'10-11-12': [(False, False, datetime.datetime(2012, 10, 11)),
+- (True, False, datetime.datetime(2012, 11, 10)),
+- (False, True, datetime.datetime(2010, 11, 12)),
+- (True, True, datetime.datetime(2010, 11, 12))],
+- '20/12/21': [(False, False, datetime.datetime(2021, 12, 20)),
+- (True, False, datetime.datetime(2021, 12, 20)),
+- (False, True, datetime.datetime(2020, 12, 21)),
+- (True, True, datetime.datetime(2020, 12, 21))]}
++ cases = {'10-11-12': [(False, False, False,
++ datetime.datetime(2012, 10, 11)),
++ (True, False, False,
++ datetime.datetime(2012, 11, 10)),
++ (False, True, False,
++ datetime.datetime(2010, 11, 12)),
++ (True, True, False, dayfirst_yearfirst1)],
++ '20/12/21': [(False, False, False,
++ datetime.datetime(2021, 12, 20)),
++ (True, False, False,
++ datetime.datetime(2021, 12, 20)),
++ (False, True, False,
++ datetime.datetime(2020, 12, 21)),
++ (True, True, True, dayfirst_yearfirst2)]}
+
+ tm._skip_if_no_dateutil()
+ from dateutil.parser import parse
+ for date_str, values in compat.iteritems(cases):
+- for dayfirst, yearfirst, expected in values:
+- result1, _, _ = tools.parse_time_string(date_str,
+- dayfirst=dayfirst,
+- yearfirst=yearfirst)
++ for dayfirst, yearfirst, is_compat, expected in values:
++
++ f = lambda x: tools.parse_time_string(x,
++ dayfirst=dayfirst,
++ yearfirst=yearfirst)
++
++ # we now have an invalid parse
++ if is_compat and is_compat_version:
++ self.assertRaises(tslib.DateParseError, f, date_str)
++
++ def f(date_str):
++ return to_datetime(date_str, dayfirst=dayfirst,
++ yearfirst=yearfirst)
++
++ self.assertRaises(ValueError, f, date_str)
++
++ def f(date_str):
++ return DatetimeIndex([date_str], dayfirst=dayfirst,
++ yearfirst=yearfirst)[0]
++
++ self.assertRaises(ValueError, f, date_str)
++
++ continue
++
++ result1, _, _ = f(date_str)
+
+ result2 = to_datetime(date_str, dayfirst=dayfirst,
+ yearfirst=yearfirst)
+@@ -614,7 +653,6 @@ def test_parsers_dayfirst_yearfirst(self):
+ yearfirst=yearfirst)[0]
+
+ # Timestamp doesn't support dayfirst and yearfirst
+-
+ self.assertEqual(result1, expected)
+ self.assertEqual(result2, expected)
+ self.assertEqual(result3, expected)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 4238965fd0..0379352f76 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7,7 +7,7 @@
;;; Copyright © 2014, 2015 Federico Beffa <[email protected]>
;;; Copyright © 2015 Omar Radwan <[email protected]>
;;; Copyright © 2015 Pierre-Antoine Rault <[email protected]>
-;;; Copyright © 2015 Ricardo Wurmus <[email protected]>
+;;; Copyright © 2015, 2016 Ricardo Wurmus <[email protected]>
;;; Copyright © 2015, 2016 Christopher Allan Webber <[email protected]>
;;; Copyright © 2015 Eric Dvorsak <[email protected]>
;;; Copyright © 2015, 2016 David Thompson <[email protected]>
@@ -987,7 +987,9 @@ datetime module, available in Python 2.3+.")
(method url-fetch)
(uri (pypi-uri "pandas" version))
(sha256
- (base32 "050qw0ap5bhyv5flp78x3lcq1dlminl3xaj6kbrm0jqmx0672xf9"))))
+ (base32 "050qw0ap5bhyv5flp78x3lcq1dlminl3xaj6kbrm0jqmx0672xf9"))
+ (patches (search-patches
+ "python-pandas-fix-tslib-test-failure.patch"))))
(build-system python-build-system)
(propagated-inputs
`(("python-numpy" ,python-numpy)
@@ -8256,13 +8258,13 @@ introspection of @code{zope.interface} instances in code.")
(define-public python-vobject
(package
(name "python-vobject")
- (version "0.9.1")
+ (version "0.9.2")
(source (origin
(method url-fetch)
(uri (pypi-uri "vobject" version))
(sha256
(base32
- "1cwzjnrdr9yg2x21wbf3kf59ibnchvj33mygd69yzi178a9gs9gz"))))
+ "1qfnwlx8qwkgr6nf5wvl6ff1r3kll53dh3z6nyp173nmlhhhqccb"))))
(build-system python-build-system)
(inputs
`(("python-dateutil-2" ,python-dateutil-2)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 0ca3415a9f..8531b9cf00 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -3528,14 +3528,14 @@ subprocess.")
(define-public ruby-bio-commandeer
(package
(name "ruby-bio-commandeer")
- (version "0.1.2")
+ (version "0.1.3")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "bio-commandeer" version))
(sha256
(base32
- "061jxa6km92qfwzl058r2gp8gfcsbyr7m643nw1pxvmjdswaf6ly"))))
+ "0lin6l99ldqqjc90l9ihcrv882c4xgbgqm16jqkdy6jf955jd9a8"))))
(build-system ruby-build-system)
(arguments
`(#:phases
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index eaf57acb3d..b8f107b111 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -126,7 +126,8 @@ a server that supports the SSH-2 protocol.")
(string-append "http://ftp2.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/"
tail))))
(sha256 (base32
- "132lh9aanb0wkisji1d6cmsxi520m8nh7c7i9wi6m1s3l38q29x7"))))
+ "132lh9aanb0wkisji1d6cmsxi520m8nh7c7i9wi6m1s3l38q29x7"))
+ (patches (search-patches "openssh-CVE-2015-8325.patch"))))
(build-system gnu-build-system)
(inputs `(("groff" ,groff)
("openssl" ,openssl)
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index d820b08eb4..b02ab560c3 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -98,7 +98,7 @@ be output in text, PostScript, PDF or HTML.")
(define-public r
(package
(name "r")
- (version "3.2.3")
+ (version "3.2.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://cran/src/base/R-"
@@ -106,7 +106,7 @@ be output in text, PostScript, PDF or HTML.")
version ".tar.gz"))
(sha256
(base32
- "1hdnv77ralzcx5k5b88jq1r8l6zqnywpq00g2qs949rqh63psfxr"))))
+ "1dc0iybjk9kr1nghz3fpir6mb9hb9rnrz9bgh00w5pg5vir5cx30"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 3be89ce06e..117d01d5d0 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -113,14 +113,14 @@ as well as the classic centralized workflow.")
;; Keep in sync with 'git-manpages'!
(package
(name "git")
- (version "2.7.3")
+ (version "2.7.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kernel.org/software/scm/git/git-"
version ".tar.xz"))
(sha256
(base32
- "1di96q86fq3pdn5d5v4fw9vf58gha5i9b3r880mxlh275n8ngi49"))))
+ "0ys55v2xrhzj74jrrqx75xpr458klnyxshh8d8swfpp0zgg79rfy"))))
(build-system gnu-build-system)
(native-inputs
`(("native-perl" ,perl)
@@ -292,7 +292,7 @@ everything from small to very large projects with speed and efficiency.")
version ".tar.xz"))
(sha256
(base32
- "0va9j0q9h44jqih38h4cmhvbmjppqq7zbiq70220m7hsqqkq824z"))))
+ "09ffk5c0dl1xg7xcvr0kadhspx4fr2spmlmcajzfycmap0ddhkyh"))))
(build-system trivial-build-system)
(arguments
'(#:modules ((guix build utils))
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 7673636b15..6060702022 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -62,6 +62,7 @@
#:use-module (gnu packages ocr)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages popt)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
#:use-module (gnu packages qt)
@@ -535,6 +536,26 @@ convert and stream audio and video. It includes the libavcodec
audio/video codec library.")
(license license:gpl2+)))
+(define-public ffmpeg-2.8
+ (package
+ (inherit ffmpeg)
+ (version "2.8.6")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "1yh7dvm7zwdlsspdaq524s5qaggma5md9h95qc4kvb5dmyyyvg15"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments ffmpeg)
+ ((#:configure-flags flags)
+ `(map (lambda (flag)
+ (if (string=? flag "--disable-mipsdsp")
+ "--disable-mipsdspr1"
+ flag))
+ ,flags))))))
+
(define-public vlc
(package
(name "vlc")
@@ -546,7 +567,14 @@ audio/video codec library.")
version "/vlc-" version ".tar.xz"))
(sha256
(base32
- "1jqzrzrpw6932lbkf863xk8cfmn4z2ngbxz7w8ggmh4f6xz9sgal"))))
+ "1jqzrzrpw6932lbkf863xk8cfmn4z2ngbxz7w8ggmh4f6xz9sgal"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; There are two occurrences where __DATE__ and __TIME__ are
+ ;; used to capture the build time and show it to the user.
+ '(substitute* (find-files "." "help\\.c(pp)?$")
+ (("__DATE__") "\"2016\"")
+ (("__TIME__") "\"00:00\"")))))
(build-system gnu-build-system)
(native-inputs
`(("git" ,git) ; needed for a test
@@ -557,7 +585,7 @@ audio/video codec library.")
("avahi" ,avahi)
("dbus" ,dbus)
("flac" ,flac)
- ("ffmpeg" ,ffmpeg)
+ ("ffmpeg" ,ffmpeg-2.8) ;fails to build against ffmpeg 3.0
("fontconfig" ,fontconfig)
("freetype" ,freetype)
("gnutls" ,gnutls)
@@ -591,7 +619,30 @@ audio/video codec library.")
`("--disable-a52" ; FIXME: reenable once available
,(string-append "LDFLAGS=-Wl,-rpath -Wl,"
(assoc-ref %build-inputs "ffmpeg")
- "/lib")))) ; needed for the tests
+ "/lib")) ;needed for the tests
+
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'regenerate-plugin-cache
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; The 'install-exec-hook' rule in the top-level Makefile.am
+ ;; generates 'lib/vlc/plugins/plugins.dat', a plugin cache, using
+ ;; 'vlc-cache-gen'. This file includes the mtime of the plugins
+ ;; it references. Thus, we first reset the timestamps of all
+ ;; these files, and then regenerate the cache such that the
+ ;; mtimes it includes are always zero instead of being dependent
+ ;; on the build time.
+ (let* ((out (assoc-ref outputs "out"))
+ (pkglibdir (string-append out "/lib/vlc"))
+ (plugindir (string-append pkglibdir "/plugins"))
+ (cachegen (string-append pkglibdir "/vlc-cache-gen")))
+ ;; TODO: Factorize 'reset-timestamps'.
+ (for-each (lambda (file)
+ (let ((s (lstat file)))
+ (unless (eq? (stat:type s) 'symlink)
+ (utime file 0 0 0 0))))
+ (find-files plugindir))
+ (zero? (system* cachegen plugindir))))))))
(home-page "https://www.videolan.org/")
(synopsis "Audio and video framework")
(description "VLC is a cross-platform multimedia player and framework
@@ -696,7 +747,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
(define-public mpv
(package
(name "mpv")
- (version "0.16.0")
+ (version "0.17.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -704,7 +755,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
".tar.gz"))
(sha256
(base32
- "1fiqxx85s418qynq2fp0v7cpzrz8j285hwmc4fqgn5ny1vg1jdpw"))
+ "0vms3viwqcwl1mrgmf2yy4c69fvv7xpbkyrl693l6zpwynqd4b30"))
(file-name (string-append name "-" version ".tar.gz"))))
(build-system waf-build-system)
(native-inputs
@@ -1382,3 +1433,33 @@ present in modern GPUs.")
(description "Vdpauinfo is a tool to query the capabilities of a VDPAU
implementation.")
(license (license:x11-style "file://COPYING"))))
+
+(define-public recordmydesktop
+ (package
+ (name "recordmydesktop")
+ (version "0.3.8.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://sourceforge/" name "/" name "/"
+ version "/recordmydesktop-" version ".tar.gz"))
+ (sha256
+ (base32
+ "133kkl5j0r877d41bzj7kj0vf3xm8x80yyx2n8nqxrva304f58ik"))))
+ (build-system gnu-build-system)
+ (inputs `(("popt" ,popt)
+ ("zlib" ,zlib)
+ ("libx11" ,libx11)
+ ("libice" ,libice)
+ ("libsm" ,libsm)
+ ("libxfixes" ,libxfixes)
+ ("libxdamage" ,libxdamage)
+ ("libxext" ,libxext)
+ ("libvorbis" ,libvorbis)
+ ("libtheora" ,libtheora)))
+ (home-page "http://recordmydesktop.sourceforge.net/")
+ (synopsis "Desktop session video recorder")
+ (description
+ "recordMyDesktop is a command-line tool that captures the activity in
+your graphical desktop and encodes it as a video. This is a useful tool for
+making @dfn{screencasts}.")
+ (license license:gpl2+)))
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 473d2e7cdc..67384b8fed 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -53,14 +53,14 @@
(define-public webkitgtk
(package
(name "webkitgtk")
- (version "2.12.0")
+ (version "2.12.1")
(source (origin
(method url-fetch)
(uri (string-append "http://www.webkitgtk.org/releases/"
name "-" version ".tar.xz"))
(sha256
(base32
- "19jyvyw8ss4bacq3f7ybdb0r16r84q12j2bpciyj9jqvzpw091m6"))))
+ "15p8dbxf8psmzddc21rcgds3b4jg725wcn5jppn3qgsm4x92s6jv"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f ; no tests
@@ -136,14 +136,14 @@ HTML/CSS applications to full-fledged web browsers.")
(define-public webkitgtk-2.4
(package (inherit webkitgtk)
(name "webkitgtk")
- (version "2.4.10")
+ (version "2.4.11")
(source (origin
(method url-fetch)
(uri (string-append "http://www.webkitgtk.org/releases/"
name "-" version ".tar.xz"))
(sha256
(base32
- "0566yx5lxi40g0wpvmwbc8y76akd7zph7flrjdp2vv3z1nra9z9k"))))
+ "1xsvnvyvlywwyf6m9ainpsg87jkxjmd37q6zgz9cxb7v3c2ym2jq"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; no tests
generated by cgit v1.2.3 (git 2.45.2) at 2025-05-26 04:34:34 +0000