me/guix
Archived
1
0
Fork 0
Code Activity

Merge branch 'master' into core-updates

Browse source
This commit is contained in:
Ludovic Courtès 2018-07-26 18:15:13 +02:00
commit ac46a1c8e4
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
26 changed files with 554 additions and 409 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/guix.texi
View file

@ -12156,7 +12156,7 @@ secure connections to the print server.
Suppose you want to enable the Web interface of CUPS and also add
support for Epson printers @i{via} the @code{escpr} package and for HP
printers @i{via} the @code{hplip} package. You can do that directly,
printers @i{via} the @code{hplip-minimal} package. You can do that directly,
like this (you need to use the @code{(gnu packages cups)} module):
@example
@ -12164,9 +12164,13 @@ like this (you need to use the @code{(gnu packages cups)} module):
(cups-configuration
(web-interface? #t)
(extensions
(list cups-filters escpr hplip))))
(list cups-filters escpr hplip-minimal))))
@end example
Note: If you wish to use the Qt5 based GUI which comes with the hplip
package then it is suggested that you install the @code{hplip} package,
either in your OS configuration file or as your user.
The available configuration parameters follow. Each parameter
definition is preceded by its type; for example, @samp{string-list foo}
indicates that the @code{foo} parameter should be specified as a list of

3
gnu/local.mk
View file

@ -1046,6 +1046,7 @@ dist_patch_DATA = \
%D%/packages/patches/pybugz-stty.patch \
%D%/packages/patches/pygpgme-disable-problematic-tests.patch \
%D%/packages/patches/pyqt-configure.patch \
%D%/packages/patches/pyqt-public-sip.patch \
%D%/packages/patches/python-2-deterministic-build-info.patch \
%D%/packages/patches/python-2.7-adjust-tests.patch \
%D%/packages/patches/python-2.7-search-paths.patch \
@ -1089,7 +1090,6 @@ dist_patch_DATA = \
%D%/packages/patches/qtoctave-qt-5.11-fix.patch \
%D%/packages/patches/qtscript-disable-tests.patch \
%D%/packages/patches/quagga-reproducible-build.patch \
%D%/packages/patches/quassel-qt-5.11.patch \
%D%/packages/patches/quickswitch-fix-dmenu-check.patch \
%D%/packages/patches/rapicorn-isnan.patch \
%D%/packages/patches/raptor2-heap-overflow.patch \
@ -1133,7 +1133,6 @@ dist_patch_DATA = \
%D%/packages/patches/superlu-dist-scotchmetis.patch \
%D%/packages/patches/swish-e-search.patch \
%D%/packages/patches/swish-e-format-security.patch \
%D%/packages/patches/syncthing-fix-crash.patch \
%D%/packages/patches/synfigstudio-fix-ui-with-gtk3.patch \
%D%/packages/patches/t1lib-CVE-2010-2642.patch \
%D%/packages/patches/t1lib-CVE-2011-0764.patch \

49
gnu/packages/admin.scm
View file

@ -46,6 +46,7 @@
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (guix build-system perl)
#:use-module (guix build-system python)
#:use-module (guix build-system trivial)
@ -1772,27 +1773,18 @@ platform-specific methods.")
(define-public audit
(package
(name "audit")
(version "2.4.5")
(home-page "https://people.redhat.com/sgrubb/audit/")
(version "2.8.4")
(source (origin
(method url-fetch)
(uri (string-append "https://people.redhat.com/sgrubb/audit/"
"audit-" version ".tar.gz"))
(uri (string-append home-page name "-" version ".tar.gz"))
(sha256
(base32
"1q1q51dvxscbi4kbakmd4bn0xrvwwaiwvaya79925cbrqwzxsg77"))))
"0f4ci6ffznnmgblwgv7ich9mjfk3p6y5l6m6h3chhmzw156nj454"))))
(build-system gnu-build-system)
(home-page "https://people.redhat.com/sgrubb/audit/")
(arguments
`(#:configure-flags (list "--with-python=no")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-tests
(lambda _
;; In the build environmnte /etc/passwd does not contain an entry
;; for root/0, so we have to patch the expected value.
(substitute* "auparse/test/auparse_test.ref"
(("=0 \\(root\\)") "=0 (unknown(0))"))
#t)))))
`(#:configure-flags (list "--with-python=no"
"--disable-static")))
(inputs
`(("openldap" ,openldap)
("gnutls" ,gnutls)
@ -2740,3 +2732,30 @@ support forum. It runs with the @code{/exec} command in most IRC clients.")
;; perl-xml-dumper
;; ipmitool
,@(package-inputs inxi-minimal)))))
(define-public pscircle
(package
(name "pscircle")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append
"https://gitlab.com/mildlyparallel/pscircle/-/archive/v"
version "/pscircle-v" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1k757yf2bmgfrjd417l6kpcf83hlvi0z1791vz967mwcklrsb3fj"))))
(build-system meson-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("cairo" ,cairo)
("libpng" ,libpng)
("libx11" ,libx11)))
(home-page "https://gitlab.com/mildlyparallel/pscircle")
(synopsis "Visualize Linux processes in a form of radial tree")
(description
"@code{pscircle} visualizes Linux processes in the form of a radial tree.")
(license license:gpl2+)))

7
gnu/packages/bioinformatics.scm
View file

@ -10,6 +10,7 @@
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -3240,12 +3241,16 @@ VCF.")
(msg (format #f
"\
Class-Path: /~a \
~a/share/java/htsjdk.jar${line.separator}"
~a/share/java/htsjdk.jar${line.separator}${line.separator}"
;; maximum line length is 70
(string-tabulate (const #\b) 57)
(assoc-ref inputs "java-htsjdk"))))
(if (member "manifest" name)
`(,tag ,@kids
(replaceregexp
(@ (file "${manifest.file}")
(match "\\r\\n\\r\\n")
(replace "${line.separator}")))
(echo
(@ (message ,msg)
(file "${manifest.file}")

13
gnu/packages/bootloaders.scm
View file

@ -508,7 +508,18 @@ board-independent tools.")))
(let* ((out (assoc-ref outputs "out"))
(libexec (string-append out "/libexec"))
(uboot-files (append
(find-files "." ".*\\.(bin|efi|img|spl|itb|dtb|rksd)$")
(remove
;; Those would not be reproducible
;; because of the randomness used
;; to produce them.
;; It's expected that the user will
;; use u-boot-tools to generate them
;; instead.
(lambda (name)
(string-suffix?
"sunxi-spl-with-ecc.bin"
name))
(find-files "." ".*\\.(bin|efi|img|spl|itb|dtb|rksd)$"))
(find-files "." "^(MLO|SPL)$"))))
(mkdir-p libexec)
(install-file ".config" libexec)

26
gnu/packages/compression.scm
View file

@ -651,16 +651,17 @@ sfArk file format to the uncompressed sf2 format.")
(define-public libmspack
(package
(name "libmspack")
(version "0.6")
(home-page "https://cabextract.org.uk/libmspack/")
(version "0.7")
(source
(origin
(method url-fetch)
(uri (string-append "http://www.cabextract.org.uk/libmspack/libmspack-"
version "alpha.tar.gz"))
(uri (string-append home-page name "-" version "alpha.tar.gz"))
(sha256
(base32 "08gr2pcinas6bdqz3k0286g5cnksmcx813skmdwyca6bmj1fxnqy"))))
(base32 "0wi7ydq8vjiq0kfnpkj2d6vll2s49x38bywnsdqphqb0vdn53q1n"))))
(build-system gnu-build-system)
(home-page "http://www.cabextract.org.uk/libmspack/")
(arguments
`(#:configure-flags '("--disable-static")))
(synopsis "Compression tools for some formats used by Microsoft")
(description
"The purpose of libmspack is to provide both compression and
@ -1030,21 +1031,26 @@ smaller than those produced by @code{Xdelta}.")
(define-public cabextract
(package
(name "cabextract")
(version "1.6")
(home-page "https://cabextract.org.uk/")
(version "1.7")
(source (origin
(method url-fetch)
(uri (string-append
"http://cabextract.org.uk/cabextract-" version ".tar.gz"))
(uri (string-append home-page name "-" version ".tar.gz"))
(sha256
(base32
"1ysmmz25fjghq7mxb2anyyvr1ljxqxzi4piwjhk0sdamcnsn3rnf"))))
"1g86wmb8lkjiv2jarfz979ngbgg7d3si8x5il4g801604v406wi9"))
(modules '((guix build utils)))
(snippet
'(begin
;; Delete bundled libmspack.
(delete-file-recursively "mspack")
#t))))
(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.

19
gnu/packages/cups.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Mark H Weaver <mhw@netris.org>
@ -46,7 +46,9 @@
#:use-module (guix build-system gnu)
#:use-module (guix download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages))
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (srfi srfi-1))
(define-public cups-filters
(package
@ -506,6 +508,19 @@ device-specific programs to convert and print many types of files.")
`(("perl" ,perl)
("pkg-config" ,pkg-config)))))
(define-public hplip-minimal
(package
(inherit hplip)
(name "hplip-minimal")
(arguments
(substitute-keyword-arguments (package-arguments hplip)
((#:configure-flags cf)
`(delete "--enable-qt5" ,cf))))
(inputs
(fold alist-delete (package-inputs hplip)
'("python-pygobject" "python-pyqt")))
(synopsis "GUI-less version of hplip")))
(define-public foomatic-filters
(package
(name "foomatic-filters")

3
gnu/packages/dictionaries.scm
View file

@ -257,7 +257,8 @@ and a Python library.")
(add-after 'install 'emacs-install
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(dest (string-append out "/share/emacs/site-lisp"))
(dest (string-append out "/share/emacs/site-lisp/guix.d/"
,name "-" ,version))
(emacs (string-append (assoc-ref inputs "emacs") "/bin/emacs")))
(install-file "google-translate-mode.el" dest)
(emacs-generate-autoloads ,name dest)))))

1
gnu/packages/display-managers.scm
View file

@ -6,7 +6,6 @@
;;; Copyright © 2017 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;

5
gnu/packages/image.scm
View file

@ -1226,8 +1226,9 @@ PNG, and performs PNG integrity checks and corrections.")
`(("nasm" ,nasm)))
(arguments
'(#:test-target "test"
#:configure-flags (list "--with-build-date=1970-01-01")))
(home-page "http://www.libjpeg-turbo.org/")
#:configure-flags (list "--with-build-date=1970-01-01"
"--disable-static")))
(home-page "https://libjpeg-turbo.org/")
(synopsis "SIMD-accelerated JPEG image handling library")
(description "libjpeg-turbo is a JPEG image codec that accelerates baseline
JPEG compression and decompression using SIMD instructions: MMX on x86, SSE2 on

1
gnu/packages/irc.scm
View file

@ -74,7 +74,6 @@
(sha256
(base32
"1qkl3sb4ijx4k17m0c42j2p5bc4jymypwhmplm942rbrzm6mg50q"))
(patches (search-patches "quassel-qt-5.11.patch"))
(modules '((guix build utils)))
;; We don't want to install the bundled scripts.
(snippet

46
gnu/packages/java.scm
View file

@ -2537,6 +2537,37 @@ ClasspathX project. It provides implementations of version 3.0 of the servlet
API and version 2.1 of the Java ServerPages API.")
(license license:gpl3+)))
(define-public java-javaee-servletapi
(package
(name "java-javaee-servletapi")
(version "3.1.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/javaee/servlet-spec/"
"archive/" version ".zip"))
(file-name (string-append name "-" version ".zip"))
(sha256
(base32
"0m6p13vgfb1ihich1jp5j6fqlhkjsrkn32c86bsbkryp38ipwg8w"))))
(build-system ant-build-system)
(arguments
`(#:jar-name "javax-servletapi.jar"
;; no tests
#:tests? #f
#:source-dir "src/main/java"))
(native-inputs
`(("unzip" ,unzip)))
(home-page "https://javaee.github.io/servlet-spec/")
(synopsis "Java servlet API")
(description "Java Servlet is the foundation web specification in the
Java Enterprise Platform. Developers can build web applications using the
Servlet API to interact with the request/response workflow. This project
provides information on the continued development of the Java Servlet
specification.")
;; Main code is dual-licensed by Oracle under either GLP2 or CDDL 1.1.
;; Some files are licensed under ASL 2.0.
(license (list license:asl2.0 license:gpl2 license:cddl1.1))))
(define-public java-swt
(package
(name "java-swt")
@ -4449,7 +4480,7 @@ these scripting language engines.")
#:tests? #f
#:source-dir "src/java"))
(inputs
`(("java-tomcat" ,java-tomcat)
`(("servlet" ,java-classpathx-servletapi)
("java-jdom" ,java-jdom)
("java-commons-beanutils" ,java-commons-beanutils)))
(native-inputs
@ -7908,6 +7939,10 @@ the dependency is said to be unsatisfied, and the application is broken.")
(uri (string-append "https://github.com/google/guice/archive/"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(modules '((guix build utils)))
(snippet
`(begin
(for-each delete-file (find-files "." ".*.jar"))))
(sha256
(base32
"0dwmqjzlavb144ywqqglj3h68hqszkff8ai0a42hyb5il0qh4rbp"))))
@ -7940,7 +7975,7 @@ Java 6 and above.")
#:tests? #f)); FIXME: not in a java subdir
(inputs
`(("guice" ,java-guice)
("servlet" ,java-tomcat)
("servlet" ,java-classpathx-servletapi)
,@(package-inputs java-guice)))))
(define-public java-assertj
@ -10109,7 +10144,7 @@ and reporting) project dependencies. It is characterized by the following:
`(("java-guice" ,java-guice)
("java-guice-servlet" ,java-guice-servlet)
("java-javax-inject" ,java-javax-inject)
("java-tomcat" ,java-tomcat)
("java-javaee-servletapi" ,java-javaee-servletapi)
("java-junit" ,java-junit)
("java-slf4j-api" ,java-slf4j-api)
("java-jsr305" ,java-jsr305)
@ -10273,6 +10308,7 @@ static code analysis or code manipulation.")))
(method url-fetch)
(uri (string-append "https://github.com/qos-ch/logback/archive/v_"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1x6ga74yfgm94cfx98gybakbrlilx8i2gn6dx13l40kasmys06mi"))
@ -10303,7 +10339,7 @@ static code analysis or code manipulation.")))
#t)))))
(inputs
`(("java-javax-mail" ,java-javax-mail)
("java-tomcat" ,java-tomcat)
("servlet" ,java-javaee-servletapi)
("java-commons-compiler" ,java-commons-compiler)
("java-janino" ,java-janino)))
(native-inputs
@ -10347,7 +10383,7 @@ This module lays the groundwork for the other two modules.")
(find-files (assoc-ref inputs input)
".*.jar"))
'("java-logback-core" "java-slf4j-api"
"java-commons-compiler" "java-tomcat"
"java-commons-compiler" "servlet"
"groovy")))
":"))
(apply invoke "groovyc" "-d" "build/classes" "-j"

20
gnu/packages/linux.scm
View file

@ -398,8 +398,8 @@ It has been modified to remove all non-free binary blobs.")
;; supports qemu "virt" machine and possibly a large number of ARM boards.
;; See : https://wiki.debian.org/DebianKernel/ARMMP.
(define %linux-libre-version "4.17.9")
(define %linux-libre-hash "1mahjxn4j7sdjdrbkrgal37nfx23njhnmrxcmixmphps8i44rlwm")
(define %linux-libre-version "4.17.10")
(define %linux-libre-hash "1ab349s18avigd2592i11pab4klqzzxy11a1zp16mb842d8chkj2")
(define-public linux-libre
(make-linux-libre %linux-libre-version
@ -407,8 +407,8 @@ It has been modified to remove all non-free binary blobs.")
%linux-compatible-systems
#:configuration-file kernel-config))
(define %linux-libre-4.14-version "4.14.57")
(define %linux-libre-4.14-hash "1qp8g87ss4a3iz6k3k4mkllibvdrixh6ys4a9l7jidp2wmkxj3kc")
(define %linux-libre-4.14-version "4.14.58")
(define %linux-libre-4.14-hash "1ny2b5zmgvbxglpy88aicdxix2ygr1qmar2rgaa336czfjninwr5")
(define-public linux-libre-4.14
(make-linux-libre %linux-libre-4.14-version
@ -417,14 +417,14 @@ It has been modified to remove all non-free binary blobs.")
#:configuration-file kernel-config))
(define-public linux-libre-4.9
(make-linux-libre "4.9.114"
"069ckgck4skzci6sjrpk1sja0h1fdmrlcbpnqwl2844m5vfffzk9"
(make-linux-libre "4.9.115"
"12n3wwfz22hxqqy7bdchl894x5krylcd4vx65837w7rybnb5w2wj"
%intel-compatible-systems
#:configuration-file kernel-config))
(define-public linux-libre-4.4
(make-linux-libre "4.4.143"
"0kawgpmmv37gds3cbww791bbzvwfjg760yg3qw3dk913dawhdmzw"
(make-linux-libre "4.4.144"
"1001nw9d51vbiisrjv5ffqigcwfs0r9gav2f8hkw9hzjw64nhanp"
%intel-compatible-systems
#:configuration-file kernel-config))
@ -1605,7 +1605,7 @@ processes currently causing I/O.")
(define-public fuse
(package
(name "fuse")
(version "2.9.7")
(version "2.9.8")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/libfuse/libfuse/releases/"
@ -1613,7 +1613,7 @@ processes currently causing I/O.")
"/fuse-" version ".tar.gz"))
(sha256
(base32
"0x486nri30f7cgy0acj87v9sjxsjrr0cymrvw4h3r0sgmp8k4943"))
"1qxg1r1mgysfq6qakmvid2njph3lr00w0swvydsfl9ymilfzi12y"))
(patches (search-patches "fuse-overlapping-headers.patch"))))
(build-system gnu-build-system)
(inputs `(("util-linux" ,util-linux)))

2
gnu/packages/maven.scm
View file

@ -428,7 +428,7 @@ artifact and repository handling code.")
("java-eclipse-jetty-server-9.2" ,java-eclipse-jetty-server-9.2)
("java-eclipse-jetty-servlet-9.2" ,java-eclipse-jetty-servlet-9.2)
("java-slf4j-api" ,java-slf4j-api)
("java-tomcat" ,java-tomcat)
("java-javaee-servletapi" ,java-javaee-servletapi)
("maven-wagon-provider-api" ,maven-wagon-provider-api)))
(synopsis "Test classes from maven-wagon")
(description "Maven Wagon is a transport abstraction that is used in Maven's

55
gnu/packages/patches/pyqt-public-sip.patch Normal file
View file

@ -0,0 +1,55 @@
https://sources.debian.org/data/main/p/pyqt5/5.11.2+dfsg-1/debian/patches/public_sip.diff
From: Dmitry Shachnev <mitya57@debian.org>
Date: Tue, 3 Jul 2018 09:46:42 +0300
Subject: Use the public version of sip module
Per https://www.debian.org/doc/debian-policy/#convenience-copies-of-code.
---
configure.py | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/configure.py b/configure.py
index 7c48136..ca23f93 100644
--- a/configure.py
+++ b/configure.py
@@ -642,15 +642,6 @@ class TargetConfiguration:
"Unable to import enum. Please install the enum34 "
"package from PyPI.")
- # Check there is a private copy of the sip module already installed.
- try:
- from PyQt5 import sip
- except ImportError:
- error(
- "Unable to import PyQt5.sip. Make sure you have "
- "configured SIP to create a private copy of the sip "
- "module.")
-
# Get the details of the Python interpreter library.
py_major = self.py_version >> 16
py_minor = (self.py_version >> 8) & 0x0ff
@@ -2438,7 +2429,7 @@ def get_sip_flags(target_config):
the target configuration.
"""
- sip_flags = ['-n', 'PyQt5.sip']
+ sip_flags = ['-n', 'sip']
# If we don't check for signed interpreters, we exclude the 'VendorID'
# feature
@@ -2914,14 +2905,6 @@ def check_sip(target_config):
target_config is the target configuration.
"""
- # Check there is a private copy of the sip module already installed.
- try:
- from PyQt5 import sip
- except ImportError:
- error(
- "Unable to import PyQt5.sip. Make sure you have configured "
- "SIP to create a private copy of the sip module.")
-
if target_config.sip is None:
error(
"Make sure you have a working sip on your PATH or use the "

72
gnu/packages/patches/quassel-qt-5.11.patch
View file

@ -1,72 +0,0 @@
https://github.com/quassel/quassel/commit/92f4dca367c3a6f0536a1e0f3fbb44bb6ed4da62.patch
This can be removed after quassel 0.12.5.
From 92f4dca367c3a6f0536a1e0f3fbb44bb6ed4da62 Mon Sep 17 00:00:00 2001
From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Thu, 3 May 2018 23:19:34 +0200
Subject: [PATCH] cmake: Fix build with Qt 5.11
Qt 5.11 removes the qt5_use_modules function, so add a copy. If
present, the Qt-provided function will be used instead.
Closes GH-355.
---
cmake/QuasselMacros.cmake | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/cmake/QuasselMacros.cmake b/cmake/QuasselMacros.cmake
index 652c0042d..d77ba1cfb 100644
--- a/cmake/QuasselMacros.cmake
+++ b/cmake/QuasselMacros.cmake
@@ -5,6 +5,9 @@
# The qt4_use_modules function was taken from CMake's Qt4Macros.cmake:
# (C) 2005-2009 Kitware, Inc.
#
+# The qt5_use_modules function was taken from Qt 5.10.1 (and modified):
+# (C) 2005-2011 Kitware, Inc.
+#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
@@ -43,6 +46,41 @@ function(qt4_use_modules _target _link_type)
endforeach()
endfunction()
+# Qt 5.11 removed the qt5_use_modules function, so we need to provide it until we can switch to a modern CMake version.
+# If present, the Qt-provided version will be used automatically instead.
+function(qt5_use_modules _target _link_type)
+ if (NOT TARGET ${_target})
+ message(FATAL_ERROR "The first argument to qt5_use_modules must be an existing target.")
+ endif()
+ if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE" )
+ set(_qt5_modules ${ARGN})
+ set(_qt5_link_type ${_link_type})
+ else()
+ set(_qt5_modules ${_link_type} ${ARGN})
+ endif()
+
+ if ("${_qt5_modules}" STREQUAL "")
+ message(FATAL_ERROR "qt5_use_modules requires at least one Qt module to use.")
+ endif()
+ foreach(_module ${_qt5_modules})
+ if (NOT Qt5${_module}_FOUND)
+ find_package(Qt5${_module} PATHS "${_Qt5_COMPONENT_PATH}" NO_DEFAULT_PATH)
+ if (NOT Qt5${_module}_FOUND)
+ message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.")
+ endif()
+ endif()
+ target_link_libraries(${_target} ${_qt5_link_type} ${Qt5${_module}_LIBRARIES})
+ set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${Qt5${_module}_INCLUDE_DIRS})
+ set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${Qt5${_module}_COMPILE_DEFINITIONS})
+ if (Qt5_POSITION_INDEPENDENT_CODE
+ AND (CMAKE_VERSION VERSION_LESS 2.8.12
+ AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
+ OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)))
+ set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ${Qt5_POSITION_INDEPENDENT_CODE})
+ endif()
+ endforeach()
+endfunction()
+
# Some wrappers for simplifying dual-Qt support
function(qt_use_modules)

72
gnu/packages/patches/syncthing-fix-crash.patch
View file

@ -1,72 +0,0 @@
Avoid a crash:
https://github.com/syncthing/syncthing/issues/5002
Patch copied from upstream source repository:
https://github.com/syncthing/syncthing/commit/35a75a95dc6383b2d73ab645f1407f7907ec1a2c
From 35a75a95dc6383b2d73ab645f1407f7907ec1a2c Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@kastelo.net>
Date: Wed, 13 Jun 2018 19:07:52 +0200
Subject: [PATCH] lib/model: Don't panic when rechecking file (fixes #5002)
(#5003)
---
lib/model/model.go | 2 +-
lib/model/model_test.go | 26 ++++++++++++++++++++++++++
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/lib/model/model.go b/lib/model/model.go
index 5a9146e0..302f06c5 100644
--- a/lib/model/model.go
+++ b/lib/model/model.go
@@ -1373,7 +1373,7 @@ func (m *Model) recheckFile(deviceID protocol.DeviceID, folderFs fs.Filesystem,
return
}
- if blockIndex > len(cf.Blocks) {
+ if blockIndex >= len(cf.Blocks) {
l.Debugf("%v recheckFile: %s: %q / %q i=%d: block index too far", m, deviceID, folder, name, blockIndex)
return
}
diff --git a/lib/model/model_test.go b/lib/model/model_test.go
index 295eafc1..456bbc4a 100644
--- a/lib/model/model_test.go
+++ b/lib/model/model_test.go
@@ -3608,6 +3608,32 @@ func TestIssue4903(t *testing.T) {
}
}
+func TestIssue5002(t *testing.T) {
+ // recheckFile should not panic when given an index equal to the number of blocks
+
+ db := db.OpenMemory()
+ m := NewModel(defaultCfgWrapper, protocol.LocalDeviceID, "syncthing", "dev", db, nil)
+ m.AddFolder(defaultFolderConfig)
+ m.StartFolder("default")
+
+ m.ServeBackground()
+ defer m.Stop()
+
+ if err := m.ScanFolder("default"); err != nil {
+ t.Error(err)
+ }
+
+ file, ok := m.CurrentFolderFile("default", "foo")
+ if !ok {
+ t.Fatal("test file should exist")
+ }
+ nBlocks := len(file.Blocks)
+
+ m.recheckFile(protocol.LocalDeviceID, defaultFolderConfig.Filesystem(), "default", "foo", nBlocks-1, []byte{1, 2, 3, 4})
+ m.recheckFile(protocol.LocalDeviceID, defaultFolderConfig.Filesystem(), "default", "foo", nBlocks, []byte{1, 2, 3, 4}) // panic
+ m.recheckFile(protocol.LocalDeviceID, defaultFolderConfig.Filesystem(), "default", "foo", nBlocks+1, []byte{1, 2, 3, 4})
+}
+
func addFakeConn(m *Model, dev protocol.DeviceID) *fakeConnection {
fc := &fakeConnection{id: dev, model: m}
m.AddConnection(fc, protocol.HelloResult{})
--
2.18.0

37
gnu/packages/pdf.scm
View file

@ -169,43 +169,6 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.")
,@(package-inputs poppler)))
(synopsis "Qt5 frontend for the Poppler PDF rendering library")))
(define-public python-poppler-qt4
(package
(name "python-poppler-qt4")
(version "0.24.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://pypi.python.org/packages/source/p"
"/python-poppler-qt4/python-poppler-qt4-"
version ".tar.gz"))
(sha256
(base32
"0x63niylkk4q3h3ay8zrk3m1xiik0x3hlr4gvj7kswx48qi1vb99"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after
'unpack 'patch-poppler-include-paths
(lambda _
(substitute* (find-files "." "poppler-.*\\.sip")
(("qt4/poppler-.*\\.h" header)
(string-append "poppler/" header)))
#t)))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("python-sip" ,python-sip)
("python-pyqt-4" ,python-pyqt-4)
("poppler-qt4" ,poppler-qt4)))
(home-page "https://pypi.python.org/pypi/python-poppler-qt4")
(synopsis "Python bindings for Poppler-Qt4")
(description
"This package provides Python bindings for the Qt4 interface of the
Poppler PDF rendering library.")
(license license:lgpl2.1+)))
(define-public python-poppler-qt5
(package
(name "python-poppler-qt5")

353
gnu/packages/qt.scm
View file

@ -105,7 +105,7 @@ system, and the core design of Django is reused in Grantlee.")
(define-public qt
(package
(name "qt")
(version "5.9.4")
(version "5.11.1")
(outputs '("out" "examples"))
(source (origin
(method url-fetch)
@ -114,11 +114,11 @@ system, and the core design of Django is reused in Grantlee.")
"http://download.qt.io/official_releases/qt/"
(version-major+minor version)
"/" version
"/single/qt-everywhere-opensource-src-"
"/single/qt-everywhere-src-"
version ".tar.xz"))
(sha256
(base32
"1mblh8k04l13nk9fhhrr43h5bcph1gbz94j5y7csx8zvxb5xkb73"))
"0azva1wx298jh0xskymz8jic83yhxs1xfxf321wqd5lwiyq2qq1r"))
(modules '((guix build utils)))
(snippet
'(begin
@ -135,7 +135,7 @@ system, and the core design of Django is reused in Grantlee.")
(lambda (dir)
(delete-file-recursively (string-append "qtbase/src/3rdparty/" dir)))
(list "double-conversion" "freetype" "harfbuzz-ng"
"libpng" "libjpeg" "pcre2" "sqlite" "xcb"
"libpng" "libjpeg" "pcre2" "xcb"
"xkbcommon" "zlib"))
(for-each
(lambda (dir)
@ -143,10 +143,23 @@ system, and the core design of Django is reused in Grantlee.")
(list "qtimageformats/src/3rdparty"
"qtmultimedia/examples/multimedia/spectrum/3rdparty"
"qtwayland/examples"
"qtscxml/tests/3rdparty"
"qtcanvas3d/examples/canvas3d/3rdparty"))
;; Tests depend on this example, which depends on the 3rd party code.
(substitute* "qtmultimedia/examples/multimedia/multimedia.pro"
(("spectrum") "#"))
(substitute* "qtxmlpatterns/tests/auto/auto.pro"
(("qxmlquery") "# qxmlquery")
(("xmlpatterns ") "# xmlpatterns"))
(substitute* "qtwebglplugin/tests/plugins/platforms/platforms.pro"
(("webgl") "# webgl"))
(substitute* "qtscxml/tests/auto/auto.pro"
(("scion") "#"))
(substitute* "qtnetworkauth/tests/auto/auto.pro"
(("oauth1 ") "# oauth1 "))
(substitute* "qtremoteobjects/tests/auto/qml/qml.pro"
(("integration") "# integration")
(("usertypes") "# usertypes"))
#t))))
(build-system gnu-build-system)
(propagated-inputs
@ -193,7 +206,7 @@ system, and the core design of Django is reused in Grantlee.")
("postgresql" ,postgresql)
("pulseaudio" ,pulseaudio)
("pcre2" ,pcre2)
("sqlite" ,sqlite)
;("sqlite" ,sqlite)
("udev" ,eudev)
("unixodbc" ,unixodbc)
("wayland" ,wayland)
@ -213,7 +226,8 @@ system, and the core design of Django is reused in Grantlee.")
("ruby" ,ruby)
("which" ,(@ (gnu packages base) which))))
(arguments
`(#:phases
`(#:parallel-build? #f ; Triggers race condition in qtbase module on Hydra.
#:phases
(modify-phases %standard-phases
(add-after 'configure 'patch-bin-sh
(lambda _
@ -236,16 +250,32 @@ system, and the core design of Django is reused in Grantlee.")
"./configure"
"-verbose"
"-prefix" out
"-examplesdir" examples ; 89MiB
"-docdir" (string-append out "/share/doc/qt5")
"-headerdir" (string-append out "/include/qt5")
"-archdatadir" (string-append out "/lib/qt5")
"-datadir" (string-append out "/share/qt5")
"-examplesdir" (string-append
examples "/share/doc/qt5/examples") ; 151MiB
"-opensource"
"-confirm-license"
;; These features require higher versions of Linux than the
;; minimum version of the glibc. See
;; src/corelib/global/minimum-linux_p.h. By disabling these
;; features Qt5 applications can be used on the oldest
;; kernels that the glibc supports, including the RHEL6
;; (2.6.32) and RHEL7 (3.10) kernels.
"-no-feature-getentropy" ; requires Linux 3.17
"-no-feature-renameat2" ; requires Linux 3.16
;; Do not build examples; for the time being, we
;; prefer to save the space and build time.
"-no-compile-examples"
;; Most "-system-..." are automatic, but some use
;; the bundled copy by default.
"-system-sqlite"
;"-system-sqlite"
"-system-harfbuzz"
"-system-pcre"
;; explicitly link with openssl instead of dlopening it
"-openssl-linked"
;; explicitly link with dbus instead of dlopening it
@ -260,12 +290,92 @@ system, and the core design of Django is reused in Grantlee.")
'()
'("-no-sse2"))
"-no-mips_dsp"
"-no-mips_dspr2"))))))))
(home-page "https://www.qt.io/")
(synopsis "Cross-platform GUI library")
(description "Qt is a cross-platform application and UI framework for
developers using C++ or QML, a CSS & JavaScript like language.")
(license license:lgpl2.1)
"-no-mips_dspr2")))))
(add-after 'install 'patch-mkspecs
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(archdata (string-append out "/lib/qt5"))
(mkspecs (string-append archdata "/mkspecs"))
(qt_config.prf (string-append
mkspecs "/features/qt_config.prf")))
;; For each Qt module, let `qmake' uses search paths in the
;; module directory instead of all in QT_INSTALL_PREFIX.
(substitute* qt_config.prf
(("\\$\\$\\[QT_INSTALL_HEADERS\\]")
"$$clean_path($$replace(dir, mkspecs/modules, ../../include/qt5))")
(("\\$\\$\\[QT_INSTALL_LIBS\\]")
"$$clean_path($$replace(dir, mkspecs/modules, ../../lib))")
(("\\$\\$\\[QT_HOST_LIBS\\]")
"$$clean_path($$replace(dir, mkspecs/modules, ../../lib))")
(("\\$\\$\\[QT_INSTALL_BINS\\]")
"$$clean_path($$replace(dir, mkspecs/modules, ../../bin))"))
;; Searches Qt tools in the current PATH instead of QT_HOST_BINS.
(substitute* (string-append mkspecs "/features/qt_functions.prf")
(("cmd = \\$\\$\\[QT_HOST_BINS\\]/\\$\\$2")
"cmd = $$system(which $${2}.pl 2>/dev/null || which $${2})"))
;; Resolve qmake spec files within qtbase by absolute paths.
(substitute*
(map (lambda (file)
(string-append mkspecs "/features/" file))
'("device_config.prf" "moc.prf" "qt_build_config.prf"
"qt_config.prf" "winrt/package_manifest.prf"))
(("\\$\\$\\[QT_HOST_DATA/get\\]") archdata)
(("\\$\\$\\[QT_HOST_DATA/src\\]") archdata))
#t)))
(add-after 'unpack 'patch-paths
;; Use the absolute paths for dynamically loaded libs, otherwise
;; the lib will be searched in LD_LIBRARY_PATH which typically is
;; not set in guix.
(lambda* (#:key inputs #:allow-other-keys)
;; libresolve
(let ((glibc (assoc-ref inputs ,(if (%current-target-system)
"cross-libc" "libc"))))
(substitute* '("qtbase/src/network/kernel/qdnslookup_unix.cpp"
"qtbase/src/network/kernel/qhostinfo_unix.cpp")
(("^\\s*(lib.setFileName\\(QLatin1String\\(\")(resolv\"\\)\\);)" _ a b)
(string-append a glibc "/lib/lib" b))))
;; X11/locale (compose path)
(substitute* "qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp"
;; Don't search in /usr/…/X11/locale, …
(("^\\s*m_possibleLocations.append\\(QStringLiteral\\(\"/usr/.*/X11/locale\"\\)\\);" line)
(string-append "// " line))
;; … but use libx11's path
(("^\\s*(m_possibleLocations.append\\(QStringLiteral\\()X11_PREFIX \"(/.*/X11/locale\"\\)\\);)" _ a b)
(string-append a "\"" (assoc-ref inputs "libx11") b)))
;; libGL
(substitute* "qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp"
(("^\\s*(QLibrary lib\\(QLatin1String\\(\")(GL\"\\)\\);)" _ a b)
(string-append a (assoc-ref inputs "mesa") "/lib/lib" b)))
;; libXcursor
(substitute* "qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp"
(("^\\s*(QLibrary xcursorLib\\(QLatin1String\\(\")(Xcursor\"\\), 1\\);)" _ a b)
(string-append a (assoc-ref inputs "libxcursor") "/lib/lib" b))
(("^\\s*(xcursorLib.setFileName\\(QLatin1String\\(\")(Xcursor\"\\)\\);)" _ a b)
(string-append a (assoc-ref inputs "libxcursor") "/lib/lib" b)))
#t)))))
(native-search-paths
(list (search-path-specification
(variable "QMAKEPATH")
(files '("lib/qt5")))
(search-path-specification
(variable "QML2_IMPORT_PATH")
(files '("lib/qt5/qml")))
(search-path-specification
(variable "QT_PLUGIN_PATH")
(files '("lib/qt5/plugins")))
(search-path-specification
(variable "XDG_DATA_DIRS")
(files '("share")))
(search-path-specification
(variable "XDG_CONFIG_DIRS")
(files '("etc/xdg")))))
(home-page "https://www.qt.io/")
(synopsis "Cross-platform GUI library")
(description "Qt is a cross-platform application and UI framework for
developers using C++ or QML, a CSS & JavaScript like language.")
(license (list license:lgpl2.1 license:lgpl3))
;; Qt 4: 'QBasicAtomicPointer' leads to build failures on MIPS;
;; see <http://hydra.gnu.org/build/112828>.
@ -373,7 +483,7 @@ developers using C++ or QML, a CSS & JavaScript like language.")
(define-public qtbase
(package
(name "qtbase")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -382,7 +492,7 @@ developers using C++ or QML, a CSS & JavaScript like language.")
version ".tar.xz"))
(sha256
(base32
"0rny87ypnkkvyp9p76nim77v6np0cdf1dbjfmcilklzphkdlcvpd"))
"0ipv18ypbgpxhh49rfplqmflskmnhhwj1bjr5hrwi0jpvar4gl50"))
;; Use TZDIR to avoid depending on package "tzdata".
(patches (search-patches "qtbase-use-TZDIR.patch"))
(modules '((guix build utils)))
@ -616,7 +726,7 @@ developers using C++ or QML, a CSS & JavaScript like language.")
(define-public qtsvg
(package (inherit qtbase)
(name "qtsvg")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -625,7 +735,7 @@ developers using C++ or QML, a CSS & JavaScript like language.")
version ".tar.xz"))
(sha256
(base32
"0m0zglp0m5gv75ivma6l3hm8brb0cf44dhbc6lqwfdwacxhgx3jb"))))
"0drhig0jcss3cf01aqfmafajf8gzf6bh468g1ikyrkh46czgyshx"))))
(propagated-inputs `())
(native-inputs `(("perl" ,perl)))
(inputs
@ -691,7 +801,7 @@ HostData=lib/qt5
(define-public qtimageformats
(package (inherit qtsvg)
(name "qtimageformats")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -700,7 +810,7 @@ HostData=lib/qt5
version ".tar.xz"))
(sha256
(base32
"0w0yy7zzln3v7dm7ksjxkzhq8r0a9nwk823wv4f1x7vsa3pnyh2q"))
"05jnyrq7klr3mdiz0r9c151vl829yc8y9cxfbw5dwbp1rkndwl7b"))
(modules '((guix build utils)))
(snippet
'(begin
@ -722,7 +832,7 @@ support for MNG, TGA, TIFF and WBMP image formats.")))
(define-public qtx11extras
(package (inherit qtsvg)
(name "qtx11extras")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -731,7 +841,7 @@ support for MNG, TGA, TIFF and WBMP image formats.")))
version ".tar.xz"))
(sha256
(base32
"13vbx61wcd8pnpgk3j5r665pm03s7jp2s98apvc6fhp1njlr0rhi"))))
"0rccpmhz48kq4xs441lj9mnwpbi6kxwl8y7dj7w7g5zvpv41kwmw"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -746,7 +856,7 @@ from within Qt 5.")))
(define-public qtxmlpatterns
(package (inherit qtsvg)
(name "qtxmlpatterns")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -755,7 +865,7 @@ from within Qt 5.")))
version ".tar.xz"))
(sha256
(base32
"13nj2pa706sy874bqbv7y94ypicr4k09x6n2jyxkw93flb5pi8qr"))))
"0n5gacpni019i2872m4b1p5qaqibhszsdl3xhw3xsckvr0hf25v1"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:phases phases)
@ -775,7 +885,7 @@ xmlpatternsvalidator.")))
(define-public qtdeclarative
(package (inherit qtsvg)
(name "qtdeclarative")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -784,7 +894,7 @@ xmlpatternsvalidator.")))
version ".tar.xz"))
(sha256
(base32
"1h2pbyr7dnak4q96373xpa6gk6rl528rnqima8xnvhdi2y5kgagf"))))
"0fjg9ii64mhx2ww70rj44cy65rwwkwyjxcm435kwp3v1pzv5xkwy"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -807,7 +917,7 @@ with JavaScript and C++.")))
(define-public qtconnectivity
(package (inherit qtsvg)
(name "qtconnectivity")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -816,7 +926,7 @@ with JavaScript and C++.")))
version ".tar.xz"))
(sha256
(base32
"0wqq5q5saf007aphvpn5pvj6l0qp0z7wxvfba6v9iq5ylyqm6bnd"))))
"0mz6mbf069yqdvi6mcvp6izskcn9wzig4s3dzmygwd430pmx93kk"))))
(native-inputs
`(("perl" ,perl)
("pkg-config" ,pkg-config)
@ -831,7 +941,7 @@ with Bluetooth and NFC.")))
(define-public qtwebsockets
(package (inherit qtsvg)
(name "qtwebsockets")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -840,7 +950,7 @@ with Bluetooth and NFC.")))
version ".tar.xz"))
(sha256
(base32
"1drr6nxxbkwpmz39bhyfmmsqjhy11bj3w1nc3q9dwhpcbf04an3x"))))
"1bj82y3f1nd2adnj3ljfr4vlx4bkgdlm3zvhlsas2lz837vi5aks"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -858,7 +968,7 @@ consume data received from the server, or both.")))
(define-public qtsensors
(package (inherit qtsvg)
(name "qtsensors")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -867,7 +977,7 @@ consume data received from the server, or both.")))
version ".tar.xz"))
(sha256
(base32
"1az22rdkpc1m44qb3dyh7cpiprplkvynzjr629ai05i8ngbfdi0g"))))
"1yn065l6kzs3fn74950pkxxglqi55lzk7alf15klsd1wnxc0zsfb"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:parallel-tests? _ #f) #f) ; can lead to race condition
@ -891,7 +1001,7 @@ recognition API for devices.")))
(define-public qtmultimedia
(package (inherit qtsvg)
(name "qtmultimedia")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -900,7 +1010,7 @@ recognition API for devices.")))
version ".tar.xz"))
(sha256
(base32
"0g4x1w251imq58zp1px6yschwj6icsxzwl3fy7pjfbgd27qjhlzg"))
"0369b0mh7sr718l119b07grb1v8xqlq6l4damyd6lrmlj1wbb2zj"))
(modules '((guix build utils)))
(snippet
'(begin
@ -942,7 +1052,7 @@ set of plugins for interacting with pulseaudio and GStreamer.")))
(define-public qtwayland
(package (inherit qtsvg)
(name "qtwayland")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -951,7 +1061,7 @@ set of plugins for interacting with pulseaudio and GStreamer.")))
version ".tar.xz"))
(sha256
(base32
"09s1ckqj0cgjmmi7jylsf039vgzlq7i9rr4swb590fkz427lx0b8"))
"1sj4lsza48xji1qhmi1wqpx07jgm1mpa95gmd2w1kxw240hbr6p0"))
(modules '((guix build utils)))
(snippet
;; The examples try to build and cause the build to fail
@ -994,7 +1104,7 @@ compositor libraries.")))
(define-public qtserialport
(package (inherit qtsvg)
(name "qtserialport")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1003,7 +1113,7 @@ compositor libraries.")))
version ".tar.xz"))
(sha256
(base32
"1cbf1jsginp5p3y17cyb6dfhsafxal0bn9pya6aybz0q799zgvl5"))))
"18v4pbq7bnmrl81m8s11ksbjlvzbb4kw5py6ji2dhmnm44w9k9sn"))))
(native-inputs `(("perl" ,perl)))
(inputs
`(("qtbase" ,qtbase)
@ -1028,7 +1138,7 @@ interacting with serial ports from within Qt.")))
(define-public qtserialbus
(package (inherit qtsvg)
(name "qtserialbus")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1037,7 +1147,7 @@ interacting with serial ports from within Qt.")))
version ".tar.xz"))
(sha256
(base32
"0r3crk7gw0xs6wk1gvw2k8r9s9vam3sfwrji1njhswavii9fbp85"))))
"0jjmdd6vkvs5izqazp1rsrad0b1fzk6knrbdjl37lvcsawyfxfyk"))))
(inputs
`(("qtbase" ,qtbase)
("qtserialport" ,qtserialport)))
@ -1049,7 +1159,7 @@ and others.")))
(define-public qtwebchannel
(package (inherit qtsvg)
(name "qtwebchannel")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1058,7 +1168,7 @@ and others.")))
version ".tar.xz"))
(sha256
(base32
"05fa5pwvk24cjp8m6pbw3ma95vnls762crpjdgvygfk0h8xilxmh"))))
"11rfjkb4h8dzxfmk889x7kkc73cbk26smc7h62lnh35f2nppd95r"))))
(native-inputs
`(("perl" ,perl)
("qtdeclarative" ,qtdeclarative)
@ -1073,7 +1183,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine.")))
(define-public qtwebglplugin
(package (inherit qtsvg)
(name "qtwebglplugin")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1082,11 +1192,20 @@ popular web engines, Qt WebKit 2 and Qt WebEngine.")))
version ".tar.xz"))
(sha256
(base32
"1al7dv7i9rg4z4p8vnipbjbbgc6113lbfjggxxap3sn6hqs986fm"))))
"108yhi3sj6d1ysmlpka69ivb20mx9h6jpra6yq099i3jw4gc753x"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'disable-network-tests
(lambda _ (substitute* "tests/plugins/platforms/platforms.pro"
(("webgl") "# webgl"))
#t))))))
(native-inputs '())
(inputs
`(("mesa" ,mesa)
("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative)
("qtwebsockets" ,qtwebsockets)))
(synopsis "QPA plugin for running an application via a browser using
streamed WebGL commands")
@ -1099,7 +1218,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements")))
(define-public qtwebview
(package (inherit qtsvg)
(name "qtwebview")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1108,7 +1227,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements")))
version ".tar.xz"))
(sha256
(base32
"0a89v8mj5pb7a7whyhasf4ms0n34ghfmv2qp0pyxnq56f2bsjbl4"))))
"18da6a13wpb23vb6mbg9v75gphdf5mjmch7q3v1qjrv2sdwbpjbp"))))
(native-inputs
`(("perl" ,perl)))
(inputs
@ -1122,7 +1241,7 @@ native APIs where it makes sense.")))
(define-public qtlocation
(package (inherit qtsvg)
(name "qtlocation")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1131,7 +1250,7 @@ native APIs where it makes sense.")))
version ".tar.xz"))
(sha256
(base32
"074cjqhr14mqlsqj9rzagzdcqnayyichp31lq02k05q07wg93xi8"))))
"03vrbymwbn4nqsypcmr4ccqv20nvwdfs9gb01pi3jxr6x0wrlb0p"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -1152,7 +1271,7 @@ positioning and geolocation plugins.")))
(define-public qttools
(package (inherit qtsvg)
(name "qttools")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1161,7 +1280,7 @@ positioning and geolocation plugins.")))
version ".tar.xz"))
(sha256
(base32
"1nb77bfs63nyy0wkhsci9qbqmahncy3sdcrwj4qr1prc4y2cm4wx"))))
"1zhl8p29mbabf07rhaks13qcm45zdckzymvz9qn95nxfj9piiyxp"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -1179,7 +1298,7 @@ that helps in Qt development.")))
(define-public qtscript
(package (inherit qtsvg)
(name "qtscript")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1188,7 +1307,7 @@ that helps in Qt development.")))
version ".tar.xz"))
(sha256
(base32
"1ib8a5gsxarbm2j94j5d097ly3ap4snqkx2imz3sl6xk6gknm4i5"))
"0z6sb4b9ds5lwkr0sxrnx6nim3aq2qx4a8illjy5vclfdv80yhqw"))
(patches (search-patches "qtscript-disable-tests.patch"))))
(native-inputs
`(("perl" ,perl)
@ -1203,7 +1322,7 @@ ECMAScript and Qt.")))
(define-public qtquickcontrols
(package (inherit qtsvg)
(name "qtquickcontrols")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1212,7 +1331,7 @@ ECMAScript and Qt.")))
version ".tar.xz"))
(sha256
(base32
"01ziibf4afdhb5b3gfci8maprmviqwhdvma2z1jlq2ck45cpsqi6"))))
"0mn662j0gkpama7zlrsn4h27sjrk49kpbha1h0zxxyiza5cpzsms"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -1227,7 +1346,7 @@ can be used to build complete interfaces in Qt Quick.")))
(define-public qtquickcontrols2
(package (inherit qtsvg)
(name "qtquickcontrols2")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1236,7 +1355,7 @@ can be used to build complete interfaces in Qt Quick.")))
version ".tar.xz"))
(sha256
(base32
"1hsa8n4dlqpyz9xq2kq1hsxrxsjc7ywzzfhqijylgzzclvlqgb7y"))))
"0hn4kvrkz5ivwrp9p6yzwlw7cn4j72kcpm2nqyi3dbai1px6dc5x"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -1252,7 +1371,7 @@ not available.")))
(define-public qtgraphicaleffects
(package (inherit qtsvg)
(name "qtgraphicaleffects")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1261,7 +1380,7 @@ not available.")))
version ".tar.xz"))
(sha256
(base32
"0xzr4421w7idlgndxnd68wwc2asabycjiskkyl1f8nwqv34lcy3j"))))
"1ws8aj7bq3rxpzjs370dcyqk8a5v1y6fwvrdhf70j8b2d4v75lnr"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -1307,7 +1426,7 @@ backend for QtQuick scene graph.")
(define-public qtgamepad
(package (inherit qtsvg)
(name "qtgamepad")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1316,7 +1435,7 @@ backend for QtQuick scene graph.")
version ".tar.xz"))
(sha256
(base32
"0g52c03gdgz57h7szdxvc5hdy45l7q7m29yfzhwqc57hwdfl98bi"))))
"1n97w9rcbg8mzkvjgn3i8jbfmplp7w0p80ykdchpml47gxk1kwma"))))
(native-inputs
`(("perl" ,perl)
("pkg-config" ,pkg-config)))
@ -1337,7 +1456,7 @@ and mobile applications targeting TV-like form factors.")))
(define-public qtscxml
(package (inherit qtsvg)
(name "qtscxml")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1346,7 +1465,7 @@ and mobile applications targeting TV-like form factors.")))
version ".tar.xz"))
(sha256
(base32
"00wb89ris8fyivhz9qpqn72mzpkh6mqdjss82j3q10g3c142072k"))
"0f1k4fnk2aydagxqvkb636pcsi17sbq2zj2fn0ad50dvq013yiph"))
(modules '((guix build utils)))
(snippet
'(begin
@ -1368,7 +1487,7 @@ also contains functionality to support data models and executable content.")))
(define-public qtpurchasing
(package (inherit qtsvg)
(name "qtpurchasing")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1377,7 +1496,7 @@ also contains functionality to support data models and executable content.")))
version ".tar.xz"))
(sha256
(base32
"1c92yv2yi38sic06nyr9r6zpq3y4sxnasmj14d3jmg50gc1ncqfs"))))
"0crm39fy9aqns10mjlbxvkkna9xklic49zfp3f7v7cwl66wap6dc"))))
(inputs
`(("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative)))
@ -1388,7 +1507,7 @@ purchasing goods and services.")))
(define-public qtcanvas3d
(package (inherit qtsvg)
(name "qtcanvas3d")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1397,7 +1516,7 @@ purchasing goods and services.")))
version ".tar.xz"))
(sha256
(base32
"1kqcaks6lkz8cp9s3pwrvgrr8381rjzf5fbf2bzshdw7psphxiiz"))
"1pif3m1f44jrly2nh0hzid6dmdxqiy5qgx645hz6g5fmpl113d8g"))
(modules '((guix build utils)))
(snippet
'(begin
@ -1427,7 +1546,7 @@ drawing calls from Qt Quick JavaScript.")))
(define-public qtcharts
(package (inherit qtsvg)
(name "qtcharts")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1436,7 +1555,7 @@ drawing calls from Qt Quick JavaScript.")))
version ".tar.xz"))
(sha256
(base32
"0lg39vd6i0l76spjz6bhb1kkpbk2mgc0hxccj7733xxbxaz14vn4"))))
"0avscsni84zrzydilkkp456sbaypyzhkn42qygjdq7wcn045zxk2"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -1454,7 +1573,7 @@ selecting one of the charts themes.")
(define-public qtdatavis3d
(package (inherit qtsvg)
(name "qtdatavis3d")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1463,7 +1582,7 @@ selecting one of the charts themes.")
version ".tar.xz"))
(sha256
(base32
"1s7gmgh6g3aia74yiqahffrc6n8f4491vb7g3i4i10ilandipg34"))))
"0gay0dsz05xfrlx190y95hp9wipzb988h02fqbqvyn00ds3s178w"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -1481,7 +1600,7 @@ customized by using themes or by adding custom items and labels to them.")
(define-public qtnetworkauth
(package (inherit qtsvg)
(name "qtnetworkauth")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1490,7 +1609,7 @@ customized by using themes or by adding custom items and labels to them.")
version ".tar.xz"))
(sha256
(base32
"1kr8hwjsb8a5cypvqj48vrnkcvm2rcni102dh6i909i70a7hcsym"))))
"05p4pvfp3k5612d54anvpj39bgc7v572x6kgk3fy69xgn7lhbd02"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:phases phases)
@ -1510,7 +1629,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt.")))
(define-public qtremoteobjects
(package (inherit qtsvg)
(name "qtremoteobjects")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1519,7 +1638,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt.")))
version ".tar.xz"))
(sha256
(base32
"1chn1xxhapfwvhrlv4chwfgf2dw8x8kn1lssdmpmg5s420z3pbq9"))))
"1yv9f2329nv4viiyqmq7ciz51574wd11grj8s88qm0ndcb36jbgb"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:phases phases)
@ -1528,7 +1647,8 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt.")))
(lambda _
;; This test can't find its imports.
(substitute* "tests/auto/qml/qml.pro"
(("integration") "# integration"))
(("integration") "# integration")
(("usertypes") "# usertypes"))
#t))))))
(inputs
`(("qtbase" ,qtbase)
@ -1542,7 +1662,7 @@ processes or computers.")))
(define-public qtspeech
(package (inherit qtsvg)
(name "qtspeech")
(version "5.11.0")
(version "5.11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1551,7 +1671,10 @@ processes or computers.")))
version ".tar.xz"))
(sha256
(base32
"1bgfg0akqf1nfzm28n8dhvhj0p1niwxrfs763gj7m0g6vpwjbhd1"))))
"1nwvbaijg35i98yaiqgnyn5vv0cn4v3wrxhwi1s0hfv9sv3q5iyw"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(inputs
`(("qtbase" ,qtbase)))
(native-inputs
@ -1571,7 +1694,7 @@ message.")))
(define-public python-sip
(package
(name "python-sip")
(version "4.19.8")
(version "4.19.12")
(source
(origin
(method url-fetch)
@ -1580,7 +1703,7 @@ message.")))
"sip-" version "/sip-" version ".tar.gz"))
(sha256
(base32
"1g4pq9vj753r2s061jc4y9ydzgb48ibhc9bdvmb8mlyllwp7mbvy"))))
"08iqj9qyanc6a4bllbd87gv8pd1gkplw1jhfa1sz0gcq3g1pyq94"))))
(build-system gnu-build-system)
(native-inputs
`(("python" ,python-wrapper)))
@ -1605,11 +1728,10 @@ message.")))
(lib (string-append out "/lib/python"
python-major+minor
"/site-packages")))
(zero?
(system* "python" "configure.py"
"--bindir" bin
"--destdir" lib
"--incdir" include))))))))
(invoke "python" "configure.py"
"--bindir" bin
"--destdir" lib
"--incdir" include)))))))
(home-page "https://www.riverbankcomputing.com/software/sip/intro")
(synopsis "Python binding creator for C and C++ libraries")
(description
@ -1634,7 +1756,7 @@ module provides support functions to the automatically generated code.")
(define-public python-pyqt
(package
(name "python-pyqt")
(version "5.10.1")
(version "5.11.2")
(source
(origin
(method url-fetch)
@ -1644,8 +1766,9 @@ module provides support functions to the automatically generated code.")
version ".tar.gz"))
(sha256
(base32
"1vz9c4v0k8azk2b08swwybrshzw32x8djjpq13mf9v15x1qyjclr"))
(patches (search-patches "pyqt-configure.patch"))))
"00wn9svgyp0fsrkc4ma15zcxg31pw4gsgaz6nwb3fhy3al8miakw"))
(patches (search-patches "pyqt-configure.patch"
"pyqt-public-sip.patch"))))
(build-system gnu-build-system)
(native-inputs
`(("qtbase" ,qtbase))) ; for qmake
@ -1672,12 +1795,6 @@ module provides support functions to the automatically generated code.")
,@%gnu-build-system-modules)
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-build-with-qt-5.11
;; See: https://bugs.gentoo.org/654742
(lambda _
(substitute* "sip/QtTest/qtestmouse.sip"
(("void waitForEvents\\(\\) /ReleaseGIL/;") ""))
#t))
(replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@ -1697,18 +1814,18 @@ module provides support functions to the automatically generated code.")
python-major+minor
"/site-packages"))
(stubs (string-append lib "/PyQt5")))
(zero? (system* "python" "configure.py"
"--confirm-license"
"--bindir" bin
"--destdir" lib
"--designer-plugindir" designer
"--qml-plugindir" qml
; Where to install the PEP 484 Type Hints stub
; files. Without this the stubs are tried to be
; installed into the python package's
; site-package directory, which is read-only.
"--stubsdir" stubs
"--sipdir" sip))))))))
(invoke "python" "configure.py"
"--confirm-license"
"--bindir" bin
"--destdir" lib
"--designer-plugindir" designer
"--qml-plugindir" qml
; Where to install the PEP 484 Type Hints stub
; files. Without this the stubs are tried to be
; installed into the python package's
; site-package directory, which is read-only.
"--stubsdir" stubs
"--sipdir" sip)))))))
(home-page "https://www.riverbankcomputing.com/software/pyqt/intro")
(synopsis "Python bindings for Qt")
(description
@ -1725,11 +1842,12 @@ contain over 620 classes.")
("qtbase" ,qtbase)))
(inputs
`(("python" ,python-2)
("python2-enum34" ,python2-enum34)
,@(alist-delete "python" (package-inputs python-pyqt))))))
(define-public python-pyqt-4
(define-public python2-pyqt-4
(package (inherit python-pyqt)
(name "python-pyqt")
(name "python2-pyqt")
(version "4.12")
(source
(origin
@ -1742,9 +1860,9 @@ contain over 620 classes.")
(base32
"1nw8r88a5g2d550yvklawlvns8gd5slw53yy688kxnsa65aln79w"))))
(native-inputs
`(("python-sip" ,python-sip)
`(("python-sip" ,python2-sip)
("qt" ,qt-4)))
(inputs `(("python" ,python-wrapper)))
(inputs `(("python" ,python-2)))
(arguments
`(#:tests? #f ; no check target
#:modules ((srfi srfi-1)
@ -1773,19 +1891,10 @@ contain over 620 classes.")
"--sipdir" sip))))))))
(license (list license:gpl2 license:gpl3)))) ; choice of either license
(define-public python2-pyqt-4
(package (inherit python-pyqt-4)
(name "python2-pyqt")
(native-inputs
`(("python-sip" ,python2-sip)
("qt" ,qt-4)))
(inputs
`(("python" ,python-2)))))
(define-public qscintilla
(package
(name "qscintilla")
(version "2.10.3")
(version "2.10.7")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/pyqt/QScintilla2/"
@ -1793,7 +1902,7 @@ contain over 620 classes.")
version ".tar.gz"))
(sha256
(base32
"1rw1nlwnyzj5pb86cc5kk56qhrvwvrjvjzgrkwh3g7b9wxl7lrfj"))))
"06hs6civq13dvzlws0spjb7gwyk6kynpnfwg5plhahnxf7g5h137"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@ -1850,6 +1959,10 @@ indicators, code completion and call tips.")
"Qsci/Makefile")
(("\\$\\(INSTALL_ROOT\\)/gnu/store/[^/]+")
(assoc-ref outputs "out")))
;; And fix the installed.txt file
(substitute* "installed.txt"
(("/gnu/store/[^/]+")
(assoc-ref outputs "out")))
#t)))))
(inputs
`(("qscintilla" ,qscintilla)

74
gnu/packages/ruby.scm
View file

@ -446,6 +446,29 @@ outcomes of a code example.")
(propagated-inputs
`(("ruby-diff-lcs" ,ruby-diff-lcs)))))
(define-public ruby-rspec-its
(package
(name "ruby-rspec-its")
(version "1.2.0")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "rspec-its" version))
(sha256
(base32
"1pwphny5jawcm1hda3vs9pjv1cybaxy17dc1s75qd7drrvx697p3"))))
(build-system ruby-build-system)
(arguments
`(#:tests? #f)) ; needs cucumber.
(propagated-inputs
`(("ruby-rspec-core" ,ruby-rspec-core)
("ruby-rspec-expectations" ,ruby-rspec-expectations)))
(synopsis "RSpec extension gem for attribute matching")
(description "@code{rspec-its} is an RSpec extension gem for attribute
matching.")
(home-page "https://github.com/rspec/rspec-its")
(license license:expat)))
(define-public ruby-rspec-mocks
(package
(name "ruby-rspec-mocks")
@ -1826,6 +1849,32 @@ with processes on remote servers, via SSH2.")
(home-page "https://github.com/net-ssh/net-ssh")
(license license:expat)))
(define-public ruby-net-scp
(package
(name "ruby-net-scp")
;; The 1.2.1 release would be incompatible with ruby-net-ssh >= 4.
(version "1.2.2.rc2")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/net-ssh/net-scp/archive/v"
version ".tar.gz"))
(sha256
(base32
"0xyf17mhgvyz54xjj9ria4wnq3x62bhmkfgzqv8jwiip2bplv1nk"))))
(build-system ruby-build-system)
(native-inputs
`(("bundler" ,bundler)
("ruby-test-unit" ,ruby-test-unit)
("ruby-mocha" ,ruby-mocha)))
(propagated-inputs
`(("ruby-net-ssh" ,ruby-net-ssh)))
(synopsis "Pure-Ruby SCP client library")
(description "@code{Net::SCP} is a pure-Ruby implementation of the SCP
client protocol.")
(home-page "https://github.com/net-ssh/net-scp")
(license license:expat)))
(define-public ruby-minitest
(package
(name "ruby-minitest")
@ -4983,3 +5032,28 @@ Markdown.")
in standard Ruby syntax.")
(home-page "https://github.com/ruby/rake")
(license license:expat)))
(define-public ruby-childprocess
(package
(name "ruby-childprocess")
(version "0.9.0")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "childprocess" version))
(sha256
(base32
"0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p"))))
(build-system ruby-build-system)
(arguments
`(#:tests? #f))
(native-inputs
`(("bundler" ,bundler)
("ruby-rspec" ,ruby-rspec)))
(propagated-inputs
`(("ruby-ffi" ,ruby-ffi)))
(synopsis "Control external programs running in the background, in Ruby")
(description "@code{childprocess} provides a gem to control external
programs running in the background, in Ruby.")
(home-page "http://github.com/enkessler/childprocess")
(license license:expat)))

3
gnu/packages/scanner.scm
View file

@ -3,6 +3,7 @@
;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@ -102,7 +103,7 @@ package contains the library, but no drivers.")
(inherit sane-backends-minimal)
(name "sane-backends")
(inputs
`(("hplip" ,(@ (gnu packages cups) hplip))
`(("hplip" ,(@ (gnu packages cups) hplip-minimal))
,@(package-inputs sane-backends-minimal)))
(arguments
(substitute-keyword-arguments (package-arguments sane-backends-minimal)

36
gnu/packages/sync.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org>
@ -45,24 +45,22 @@
(define-public owncloud-client
(package
(name "owncloud-client")
(version "2.3.4")
(version "2.4.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.owncloud.com/desktop/stable/"
"owncloudclient-" version ".tar.xz"))
(sha256
(base32 "1fpi1mlp2b8sx2993b4mava5c6qw794dmlayih430299z1l9wh49"))
(base32 "08xayz0alvypwa1bjmw1rmh4m3sclld4yq7kcbf264983icawqj4"))
(patches (search-patches "owncloud-disable-updatecheck.patch"))
(modules '((guix build utils)))
(snippet
'(begin
;; only allows bundled libcrashreporter-qt
;; libcrashreporter-qt has its own bundled dependencies
(delete-file-recursively "src/3rdparty/libcrashreporter-qt")
;; we already package qtkeychain and sqlite
(delete-file-recursively "src/3rdparty/qtkeychain")
(delete-file-recursively "src/3rdparty/sqlite3")
;; qjson is packaged, qprogessindicator, qlockedfile, qtokenizer and
;; qprogessindicator, qlockedfile, qtokenizer and
;; qtsingleapplication have not yet been packaged, but all are
;; explicitly used from the 3rdparty folder during build.
;; We can also remove the macgoodies folder
@ -72,20 +70,6 @@
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'change-rpath-dirs
(lambda _
(substitute* '("src/libsync/CMakeLists.txt"
"csync/src/CMakeLists.txt")
;; We store the libs in out/lib and not /usr/lib/appname, so we
;; need the executable to point to the libraries in /lib and not
;; in /lib/appname.
(("\\/\\$\\{APPLICATION_EXECUTABLE\\}") ""))
(substitute* '("src/cmd/CMakeLists.txt"
"src/crashreporter/CMakeLists.txt"
"src/gui/CMakeLists.txt")
;; This has the same issue as the substitution above.
(("\\/\\$\\{APPLICATION_EXECUTABLE\\}\\\"") "\""))
#t))
(add-after 'unpack 'delete-failing-tests
;; "Could not create autostart folder"
(lambda _
@ -93,18 +77,18 @@
(("owncloud_add_test\\(Utility \"\"\\)" test)
(string-append "#" test)))
#t)))
#:configure-flags '("-DUNIT_TESTING=ON")))
#:configure-flags '("-DUNIT_TESTING=ON"
;; build without qtwebkit, which causes the
;; package to FTBFS while looking for QWebView.
"-DNO_SHIBBOLETH=1")))
(native-inputs
`(("cmocka" ,cmocka)
("perl" ,perl)
("pkg-config" ,pkg-config)
("qtlinguist" ,qttools)))
(inputs
`(("inotify-tools" ,inotify-tools)
("openssl" ,openssl)
("qtbase" ,qtbase)
`(("qtbase" ,qtbase)
("qtkeychain" ,qtkeychain)
("qtwebkit" ,qtwebkit)
("sqlite" ,sqlite)
("zlib" ,zlib)))
(home-page "https://owncloud.org")

18
gnu/packages/syncthing.scm
View file

@ -30,16 +30,15 @@
(define-public syncthing
(package
(name "syncthing")
(version "0.14.48")
(version "0.14.49")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/syncthing/syncthing"
"/releases/download/v" version
"/syncthing-source-v" version ".tar.gz"))
(patches (search-patches "syncthing-fix-crash.patch"))
(sha256
(base32
"0bxkm5jlj6l4gai23bg0y31brr80r9qllh1rdg29pahjn0c2b4ml"))
"06mzzj5iwgqw3yva7azrsqs9zpl84srbamza4gm03grp7v9gf3sj"))
(modules '((guix build utils)))
;; Delete bundled ("vendored") free software source code.
(snippet '(begin
@ -130,7 +129,6 @@
("go-github-com-golang-groupcache-lru"
,go-github-com-golang-groupcache-lru)
("go-github-com-jackpal-gateway" ,go-github-com-jackpal-gateway)
("go-github-com-kardianos-osext" ,go-github-com-kardianos-osext)
("go-github-com-kballard-go-shellquote"
,go-github-com-kballard-go-shellquote)
("go-github-com-lib-pq" ,go-github-com-lib-pq)
@ -703,11 +701,11 @@ database in Go.")
(license bsd-2))))
(define-public go-github-com-thejerf-suture
(let ((commit "87e298c9891673c9ae76e10c2c9be589127e5f49")
(let ((commit "3f1fb62fe0a3cc6429122d7dc45588a8b59c5bb6")
(revision "0"))
(package
(name "go-github-com-thejerf-suture")
(version (git-version "2.0.1" revision commit))
(version (git-version "2.0.3" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@ -716,7 +714,7 @@ database in Go.")
(file-name (git-file-name name version))
(sha256
(base32
"0srw0g94z6jplvlsjqsr6wf7885alnbb6h4fhvbg2i7q1ia5ldy2"))))
"0mp7gz6bp6xhggkgmbl33vpmrq3a6n2dkgcxbkb7csnpv4r4d59k"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/thejerf/suture"))
@ -1088,8 +1086,8 @@ using sh's word-splitting rules.")
(license expat))))
(define-public go-github-com-syncthing-notify
(let ((commit "b9ceffc925039c77cd9e0d38f248279ccc4399e2")
(revision "0"))
(let ((commit "cdf89c4039d13726e227d0a472053ea19de021b4")
(revision "1"))
(package
(name "go-github-com-syncthing-notify")
(version (git-version "0.0.0" revision commit))
@ -1101,7 +1099,7 @@ using sh's word-splitting rules.")
(file-name (git-file-name name version))
(sha256
(base32
"1scha9b2r35bvqzqx86sarzjxf72ywvj3g6n9pm3xq4i4xzpylxf"))))
"1ra1id9r06i4q8vhrrv1zpybhjxs3361rg35758dxglkyk4pzk6j"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/syncthing/notify"))

28
gnu/packages/web.scm
View file

@ -5712,14 +5712,20 @@ encoder/decoder based on the draft-12 specification for UBJSON.")
(define-public java-tomcat
(package
(name "java-tomcat")
(version "8.5.28")
(version "8.5.32")
(source (origin
(method url-fetch)
(uri (string-append "mirror://apache/tomcat/tomcat-8/v"
version "/src/apache-tomcat-" version "-src.tar.gz"))
(sha256
(base32
"0q2bc3sajrmcx3z3vhhwp78y47ryc2ky8ssbdmfk24zvqdb76hvl"))))
"1qjsr6zmkdciakya4jqz0ssnsk02qlmmd898c05rasfwcrpj0xi6"))
(modules '((guix build utils)))
;; Delete bundled jars.
(snippet
'(begin
(for-each delete-file (find-files "." "\\.jar$"))
#t))))
(build-system ant-build-system)
(inputs
`(("java-eclipse-jdt-core" ,java-eclipse-jdt-core)))
@ -5741,6 +5747,14 @@ encoder/decoder based on the draft-12 specification for UBJSON.")
(("depends=\"validate\"") "depends=\"build-prepare\"")
((",download-validate") ""))
#t))
(add-after 'unpack 'strip-timestamps
(lambda _
(substitute* "build.xml"
(("<filter token=\"YEAR\" value=.*")
"<filter token=\"YEAR\" value=\"1970\"/>")
(("<filter token=\"VERSION_BUILT\" value=.*")
"<filter token=\"VERSION_BUILT\" value=\"Jan 1 1970 00:00:00 UTC\"/>"))
#t))
(add-after 'unpack 'generate-properties
(lambda _
;; This could have been passed to make-flags, but getcwd returns
@ -5938,7 +5952,7 @@ or embedded instantiation. This package provides utility classes.")
#t)))))
(inputs
`(("slf4j" ,java-slf4j-api)
("servlet" ,java-tomcat)
("servlet" ,java-javaee-servletapi)
("util" ,java-eclipse-jetty-util)))
(synopsis "Jetty :: IO Utility")
(description "The Jetty Web Server provides an HTTP server and Servlet
@ -5981,7 +5995,7 @@ or embedded instantiation. This package provides IO-related utility classes."))
#t)))))
(inputs
`(("slf4j" ,java-slf4j-api)
("servlet" ,java-tomcat)
("servlet" ,java-javaee-servletapi)
("io" ,java-eclipse-jetty-io)
("util" ,java-eclipse-jetty-util)))
(synopsis "Jetty :: Http Utility")
@ -6016,7 +6030,7 @@ or embedded instantiation. This package provides HTTP-related utility classes."
#t)))))
(inputs
`(("slf4j" ,java-slf4j-api)
("servlet" ,java-tomcat)
("servlet" ,java-javaee-servletapi)
("util" ,java-eclipse-jetty-util)))
(synopsis "Jetty :: JMX Management")
(description "The Jetty Web Server provides an HTTP server and Servlet
@ -6097,7 +6111,7 @@ or embedded instantiation. This package provides the JMX management.")))
#t)))))
(inputs
`(("slf4j" ,java-slf4j-api)
("servlet" ,java-tomcat)
("servlet" ,java-javaee-servletapi)
("http" ,java-eclipse-jetty-http)
("io" ,java-eclipse-jetty-io)
("jmx" ,java-eclipse-jetty-jmx)
@ -6293,7 +6307,7 @@ container.")))
("java-eclipse-jetty-servlet" ,java-eclipse-jetty-servlet)
("java-eclipse-jetty-security" ,java-eclipse-jetty-security)
("java-eclipse-jetty-xml" ,java-eclipse-jetty-xml)
("java-tomcat" ,java-tomcat)))
("java-javaee-servletapi" ,java-javaee-servletapi)))
(native-inputs
`(("java-eclipse-jetty-io" ,java-eclipse-jetty-io)
,@(package-native-inputs java-eclipse-jetty-util)))))

9
gnu/packages/xml.scm
View file

@ -200,15 +200,6 @@ project (but it is usable outside of the Gnome platform).")
based on libxml for XML parsing, tree manipulation and XPath support.")
(license license:x11)))
(define libxslt/fixed
(package
(inherit libxslt)
(source (origin
(inherit (package-source libxslt))
(patches (search-patches "libxslt-CVE-2016-4738.patch"
"libxslt-CVE-2017-5029.patch"
"libxslt-generated-ids.patch"))))))
(define-public perl-graph-readwrite
(package
(name "perl-graph-readwrite")

3
guix/build/ruby-build-system.scm
View file

@ -78,7 +78,8 @@ operation is not deterministic, we replace it with `find`."
(when (not (gem-archive? source))
(let ((gemspec (first-gemspec)))
(substitute* gemspec
(("`git ls-files`") "`find . -type f |sort`"))))
(("`git ls-files`") "`find . -type f |sort`")
(("`git ls-files -z`") "`find . -type f -print0 |sort -z`"))))
#t)
(define* (extract-gemspec #:key source #:allow-other-keys)