From 76c7fc436a151236f5e1ff966fd99172d85ee422 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 24 Jan 2018 06:35:29 -0500 Subject: gnu: python-qscintilla: Remove result code plumbing. * gnu/packages/qt.scm (python-qscintilla)[arguments]: In the 'configure' phase, remove result code plumbing that is no longer needed, since 'invoke' never returns #false. --- gnu/packages/qt.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 596006080a..34938b9c02 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1715,15 +1715,14 @@ indicators, code completion and call tips.") (replace 'configure (lambda* (#:key outputs configure-flags #:allow-other-keys) (chdir "Python") - (and (apply invoke "python3" "configure.py" - configure-flags) - ;; Install to the right directory - (begin - (substitute* '("Makefile" - "Qsci/Makefile") - (("\\$\\(INSTALL_ROOT\\)/gnu/store/[^/]+") - (assoc-ref outputs "out"))) - #t))))))) + (apply invoke "python3" "configure.py" + configure-flags) + ;; Install to the right directory + (substitute* '("Makefile" + "Qsci/Makefile") + (("\\$\\(INSTALL_ROOT\\)/gnu/store/[^/]+") + (assoc-ref outputs "out"))) + #t))))) (inputs `(("qscintilla" ,qscintilla) ("python" ,python) -- cgit 1.4.1 From 7081d4e087073753b8d322ca09fd37714b177de2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Jan 2018 14:14:42 +0100 Subject: gnu: Add emacs-emojify. * gnu/packages/emacs.scm (emacs-emojify): New variable. --- gnu/packages/emacs.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 0c3d5139ac..cd32d4eb09 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -6465,6 +6465,40 @@ proficiency is an advantage, since you can transform your numeric range with an elisp expression.") (license license:gpl3+))) +(define-public emacs-emojify + (package + (name "emacs-emojify") + (version "0.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/iqbalansari/emacs-emojify/" + "releases/download/v" version "/emojify-" + version ".tar")) + (sha256 + (base32 + "0k84v2d2bkiwcky9fi1yyprgkj46g7wh6pyl9gzmcd7sqv051d5n")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-data + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively "data" + (string-append (assoc-ref outputs "out") + "/share/emacs/site-lisp/guix.d/" + "emojify-" ,version "/data")) + #t))))) + (propagated-inputs + `(("emacs-ht" ,emacs-ht))) + (home-page "https://github.com/iqbalansari/emacs-emojify") + (synopsis "Display emojis in Emacs") + (description "This package displays emojis in Emacs similar to how Github, +Slack, and other websites do. It can display plain ASCII like @code{:)} as +well as Github-style emojis like @code{:smile:}. It provides a minor mode +@code{emojify-mode} to enable the display of emojis in a buffer.") + (license license:gpl3+))) + (define-public emacs-bash-completion (package (name "emacs-bash-completion") -- cgit 1.4.1 From 9c058ef2f2b8a8049933160a9346ec4b96fe9ead Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Jan 2018 14:15:00 +0100 Subject: gnu: Add emacs-websocket. * gnu/packages/emacs.scm (emacs-websocket): New variable. --- gnu/packages/emacs.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index cd32d4eb09..8c279b63f7 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -6499,6 +6499,28 @@ well as Github-style emojis like @code{:smile:}. It provides a minor mode @code{emojify-mode} to enable the display of emojis in a buffer.") (license license:gpl3+))) +(define-public emacs-websocket + (package + (name "emacs-websocket") + (version "1.8") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/websocket-" + version ".tar")) + (sha256 + (base32 + "0dcxmnnm8z7cvsc7nkb822a1g6w03klp7cijjnfq0pz84p3w9cd9")))) + (build-system emacs-build-system) + (home-page "http://elpa.gnu.org/packages/websocket.html") + (synopsis "Emacs WebSocket client and server") + (description "This is an Elisp library for WebSocket clients to talk to +WebSocket servers, and for WebSocket servers to accept connections from +WebSocket clients. This library is designed to be used by other library +writers, to write applications that use WebSockets, and is not useful by +itself.") + (license license:gpl3+))) + (define-public emacs-bash-completion (package (name "emacs-bash-completion") -- cgit 1.4.1 From a204c14cb587e536870c5294d0536755a2bcb68e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Jan 2018 14:15:10 +0100 Subject: gnu: Add emacs-oauth2. * gnu/packages/emacs.scm (emacs-oauth2): New variable. --- gnu/packages/emacs.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 8c279b63f7..ce4c764708 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -6521,6 +6521,31 @@ writers, to write applications that use WebSockets, and is not useful by itself.") (license license:gpl3+))) +(define-public emacs-oauth2 + (package + (name "emacs-oauth2") + (version "0.11") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/oauth2-" + version ".el")) + (sha256 + (base32 + "0ydkc9jazsnbbvfhd47mql52y7k06n3z7r0naqxkwb99j9blqsmp")))) + (build-system emacs-build-system) + (home-page "http://elpa.gnu.org/packages/oauth2.html") + (synopsis "OAuth 2.0 authorization protocol implementation") + (description + "This package provides an Elisp implementation of the OAuth 2.0 draft. +The main entry point is @code{oauth2-auth-and-store} which will return a token +structure. This token structure can be then used with +@code{oauth2-url-retrieve-synchronously} or @code{oauth2-url-retrieve} to +retrieve any data that need OAuth authentication to be accessed. If the token +needs to be refreshed, the code handles it automatically and stores the new +value of the access token.") + (license license:gpl3+))) + (define-public emacs-bash-completion (package (name "emacs-bash-completion") -- cgit 1.4.1 From 26b388cead0bebb86b50b9cfbc8fbc8661b4811b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Jan 2018 14:15:22 +0100 Subject: gnu: Add emacs-circe. * gnu/packages/emacs.scm (emacs-circe): New variable. --- gnu/packages/emacs.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ce4c764708..590ea802c4 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -6546,6 +6546,33 @@ needs to be refreshed, the code handles it automatically and stores the new value of the access token.") (license license:gpl3+))) +(define-public emacs-circe + (package + (name "emacs-circe") + (version "2.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jorgenschaefer/circe.git") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "19h3983zy3f15cgs86irvbdzz55qyjm48qd7gjlzcxplr7vnnh0j")))) + (build-system emacs-build-system) + ;; In order to securely connect to an IRC server using TLS, Circe requires + ;; the GnuTLS binary. + (propagated-inputs + `(("gnutls" ,gnutls))) + (home-page "https://github.com/jorgenschaefer/circe") + (synopsis "Client for IRC in Emacs") + (description "Circe is a Client for IRC in Emacs. It integrates well with +the rest of the editor, using standard Emacs key bindings and indicating +activity in channels in the status bar so it stays out of your way unless you +want to use it.") + (license license:gpl3+))) + (define-public emacs-bash-completion (package (name "emacs-bash-completion") -- cgit 1.4.1 From 5c8cdd4eb409550a7f17a3d457c9a4be2ae4d625 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Jan 2018 14:16:04 +0100 Subject: gnu: Add emacs-slack. * gnu/packages/emacs.scm (emacs-slack): New variable. --- gnu/packages/emacs.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 590ea802c4..ed95104e00 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -6573,6 +6573,35 @@ activity in channels in the status bar so it stays out of your way unless you want to use it.") (license license:gpl3+))) +(define-public emacs-slack + (let ((commit "58b1309255563819ee8f83f625af49ac0353bed1") + (revision "1")) + (package + (name "emacs-slack") + (version (string-append "0-" revision "." (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/yuya373/emacs-slack.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1bj43ircd9djk4i58qwxvmcbhzybxb954k52l80pk441ffk8v4vx")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-alert" ,emacs-alert) + ("emacs-emojify" ,emacs-emojify) + ("emacs-request" ,emacs-request) + ("emacs-websocket" ,emacs-websocket) + ("emacs-oauth2" ,emacs-oauth2) + ("emacs-circe" ,emacs-circe))) + (home-page "https://github.com/yuya373/emacs-slack") + (synopsis "Slack client for Emacs") + (description "This package provides an Emacs client for the Slack +messaging service.") + (license license:gpl3+)))) + (define-public emacs-bash-completion (package (name "emacs-bash-completion") -- cgit 1.4.1 From 8f4bf6a99065f836858c42ebcd2ee8a6c4482c65 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 24 Jan 2018 15:47:52 +0100 Subject: gnu: liburcu: Update to 0.10.1. * gnu/packages/datastructures.scm (liburcu): Update to 0.10.1. --- gnu/packages/datastructures.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index 0c751f4970..8517654def 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -97,14 +97,14 @@ in between these sequences may be different in both content and length.") (define-public liburcu (package (name "liburcu") - (version "0.10.0") + (version "0.10.1") (source (origin (method url-fetch) (uri (string-append "https://www.lttng.org/files/urcu/" "userspace-rcu-" version ".tar.bz2")) (sha256 (base32 - "141imnd1s4bcd4wz0wk7sp3fj649kp8whp82gw49h48mlmxqmdbw")))) + "01pbg67qy5hcssy2yi0ckqapzfclgdq93li2rmzw4pa3wh5j42cw")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) ; for tests -- cgit 1.4.1 From 2a2060f9b7301a86d70a77975a7ce859f5a2874f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 24 Jan 2018 15:48:44 +0100 Subject: gnu: bind: Update to 9.12.0. * gnu/packages/dns.scm (isc-bind): Update to 9.12.0. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index e7b9b2250b..b9e75f349c 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -99,7 +99,7 @@ and BOOTP/TFTP for network booting of diskless machines.") (define-public isc-bind (package (name "bind") - (version "9.11.2-P1") + (version "9.12.0") (source (origin (method url-fetch) (uri (string-append @@ -107,7 +107,7 @@ and BOOTP/TFTP for network booting of diskless machines.") version ".tar.gz")) (sha256 (base32 - "04hjvwvs7ssgj69lqparx0wj0w3xkc0x8y2iv62kzjighd41bhyf")))) + "10iwkghl5g50b7wc17bsb9wa0dh2gd57bjlk6ynixhywz6dhx1r9")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs -- cgit 1.4.1 From 6b113dad78c383cf9e158ebb2a06900e112217a8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 24 Jan 2018 15:37:21 -0500 Subject: gnu: webkitgtk: Update to 2.18.6 [security fixes]. Fixes CVE-2017-{7153,7160,7161,7165,13884,13885,} and CVE-2018-{4088,4096}. * gnu/packages/webkit.scm (webkitgtk): Update to 2.18.6. --- gnu/packages/webkit.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 2b003f5b3b..340221640c 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -54,14 +54,14 @@ (define-public webkitgtk (package (name "webkitgtk") - (version "2.18.5") + (version "2.18.6") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "1f1rsp14gkb2r1mrrxn2cnbs45vg38da27q4cf02zlxmgv680v8c")))) + "0g5cpdijjv5hlrbi4i4dh97yrh5apnyvm90wpr9f84hgyk12r4ck")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no tests -- cgit 1.4.1 From 3cf3836244c4fc49ff4d4513509b9d9f55ceda66 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 19 Jan 2018 22:58:01 +0300 Subject: gnu: Add python-iso639. * gnu/packages/iso-codes.scm (python-iso639): New public variable. --- gnu/packages/iso-codes.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/iso-codes.scm b/gnu/packages/iso-codes.scm index ccd07706c5..929bb58268 100644 --- a/gnu/packages/iso-codes.scm +++ b/gnu/packages/iso-codes.scm @@ -23,6 +23,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (guix build-system python) #:use-module (gnu packages gettext) #:use-module (gnu packages perl) #:use-module (gnu packages python)) @@ -64,3 +65,25 @@ infrastructure. Moreover, the programmer does not need to follow changes in the ISO standard and will not work with outdated information.") (license license:gpl2+))) ; some bits use the lgpl2 + +(define-public python-iso639 + (package + (name "python-iso639") + (version "0.4.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "iso-639" version)) + (sha256 + (base32 + "0jffmh4m20q8j27xb2fqbnlghjj0cx8pgsbzqisdg65qh2wd976w")))) + (build-system python-build-system) + (home-page "https://github.com/noumar/iso639") + (synopsis "Python library for ISO 639 standard") + (description "This package provides a Python library for ISO 639 standard +that is concerned with representation of names for languages and language +groups.") + (license license:agpl3+))) + +(define-public python2-iso639 + (package-with-python2 python-iso639)) -- cgit 1.4.1 From da061b84d65b6365ae673114fbbd1dd738a9df5b Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 19 Jan 2018 23:09:05 +0300 Subject: gnu: Add python-iso3166. * gnu/packages/iso-codes.scm (python-iso3166): New public variable. --- gnu/packages/iso-codes.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/iso-codes.scm b/gnu/packages/iso-codes.scm index 929bb58268..9f67cf2868 100644 --- a/gnu/packages/iso-codes.scm +++ b/gnu/packages/iso-codes.scm @@ -87,3 +87,23 @@ groups.") (define-public python2-iso639 (package-with-python2 python-iso639)) + +(define-public python-iso3166 + (package + (name "python-iso3166") + (version "0.8") + (source + (origin + (method url-fetch) + (uri (pypi-uri "iso3166" version)) + (sha256 + (base32 + "0cs9w507dj93jj9z9di93lx2fplf8pma4jkrsvvb258dv6z1gszv")))) + (build-system python-build-system) + (home-page "https://github.com/deactivated/python-iso3166") + (synopsis "Self-contained ISO 3166-1 country definitions") + (description "This package provides the ISO 3166-1 country definitions.") + (license license:expat))) + +(define-public python2-iso3166 + (package-with-python2 python-iso3166)) -- cgit 1.4.1 From d32456d5a28ab5982030401ed830088f9d2e8fe4 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 19 Jan 2018 22:58:50 +0300 Subject: gnu: Add python-pycryptodome. * gnu/packages/python-crypto.scm (python-pycryptodome): New public variable. --- gnu/packages/python-crypto.scm | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index a545f0ddcc..7b0054cf8a 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -715,3 +715,46 @@ protocol (Javascript Object Signing and Encryption).") (define-public python2-josepy (package-with-python2 python-josepy)) + +(define-public python-pycryptodome + (package + (name "python-pycryptodome") + (version "3.4.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pycryptodome" version)) + (sha256 + (base32 + "1xrsd6ql4w0ypkxnsg3fivs3r3z6dd93x44lhvam7jzh3gixzn0q")))) + (build-system python-build-system) + (home-page "https://www.pycryptodome.org") + (synopsis "Cryptographic library for Python") + (description "This package provides a cryptographic library for Python. + +It brings the following enhancements with respect to the last official version +of PyCrypto: + +@itemize +@item Authenticated encryption modes (GCM, CCM, EAX, SIV, OCB) +@item Accelerated AES on Intel platforms via AES-NI +@item First class support for PyPy +@item Elliptic curves cryptography (NIST P-256 curve only) +@item Better and more compact API (nonce and iv attributes for ciphers, +automatic generation of random nonces and IVs, simplified CTR cipher mode, and +more) +@item SHA-3 (including SHAKE XOFs) and BLAKE2 hash algorithms +@item Salsa20 and ChaCha20 stream ciphers +@item scrypt and HKDF +@item Deterministic (EC)DSA +@item Password-protected PKCS#8 key containers +@item Shamir’s Secret Sharing scheme +@item Random numbers get sourced directly from the OS (and not from a CSPRNG +in userspace) +@item Cleaner RSA and DSA key generation (largely based on FIPS 186-4) +@item Major clean ups and simplification of the code base +@end itemize\n") + (license license:bsd-2))) + +(define-public python2-pycryptodome + (package-with-python2 python-pycryptodome)) -- cgit 1.4.1 From f48feaa2848d999e100f27301680a01dc3bd7733 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 19 Jan 2018 22:59:12 +0300 Subject: gnu: Add streamlink. * gnu/packages/video.scm (streamlink): New public variable. --- gnu/packages/video.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e7285e50b5..d2599345d4 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -89,6 +89,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) + #:use-module (gnu packages iso-codes) #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) #:use-module (gnu packages lua) @@ -102,6 +103,7 @@ #:use-module (gnu packages popt) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages qt) #:use-module (gnu packages ruby) @@ -1725,6 +1727,35 @@ from various services and pipes them into a video playing application.") (home-page "http://livestreamer.io/") (license license:bsd-2))) +(define-public streamlink + (package + (name "streamlink") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "streamlink" version)) + (sha256 + (base32 + "17299xnd9jzi7m1d2rr4xdlj47q64bzj2957nlsrhw0hskds1s6h")))) + (build-system python-build-system) + (home-page "https://github.com/streamlink/streamlink") + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-mock" ,python-mock) + ("python-requests-mock" ,python-requests-mock))) + (propagated-inputs + `(("python-pysocks" ,python-pysocks) + ("python-websocket-client" ,python-websocket-client) + ("python-iso3166" ,python-iso3166) + ("python-iso639" ,python-iso639) + ("python-pycryptodome" ,python-pycryptodome) + ("python-requests" ,python-requests))) + (synopsis "Extract streams from various services") + (description "Streamlink is command-line utility that extracts streams +from sites like Twitch.tv and pipes them into a video player of choice.") + (license license:bsd-2))) + (define-public mlt (package (name "mlt") -- cgit 1.4.1 From ca56021c2636130244ba41018161ca69805bc6b9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 25 Jan 2018 00:30:37 +0100 Subject: gnu: Update SELinux packages. * gnu/packages/selinux.scm (libsepol): Update to 2.7, release 20170804. [source]: Fetch from git. (checkpolicy)[arguments]: Set LIBSEPOLA. (libselinux)[arguments]: Likewise; remove build phase "patch-libsepol-path". (python-sepolgen)[arguments]: Adjust directory name in "enter-dir". (python-setools): Update to 4.1.1. [source]: Fetch from git. (policycoreutils)[source]: Remove patch. [arguments]: Remove build phases "fix-glib-cflags", "fix-linkage-with-libsepol", "fix-target-paths", and "wrap-python-tools". [inputs]: Remove python-wrapper, python-sepolgen, python-setools, python-ipy, libcap-ng, pcre, dbus, dbus-glib, and glib. * gnu/packages/patches/policycoreutils-make-sepolicy-use-python3.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - ...policycoreutils-make-sepolicy-use-python3.patch | 335 --------------------- gnu/packages/selinux.scm | 126 ++------ 3 files changed, 25 insertions(+), 437 deletions(-) delete mode 100644 gnu/packages/patches/policycoreutils-make-sepolicy-use-python3.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index e86e7dacaf..e96040a4ea 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -989,7 +989,6 @@ dist_patch_DATA = \ %D%/packages/patches/plink-endian-detection.patch \ %D%/packages/patches/plotutils-libpng-jmpbuf.patch \ %D%/packages/patches/polkit-drop-test.patch \ - %D%/packages/patches/policycoreutils-make-sepolicy-use-python3.patch \ %D%/packages/patches/portaudio-audacity-compat.patch \ %D%/packages/patches/portmidi-modular-build.patch \ %D%/packages/patches/procmail-ambiguous-getline-debian.patch \ diff --git a/gnu/packages/patches/policycoreutils-make-sepolicy-use-python3.patch b/gnu/packages/patches/policycoreutils-make-sepolicy-use-python3.patch deleted file mode 100644 index befe9fbb2a..0000000000 --- a/gnu/packages/patches/policycoreutils-make-sepolicy-use-python3.patch +++ /dev/null @@ -1,335 +0,0 @@ -Downloaded from https://anonscm.debian.org/cgit/selinux/policycoreutils.git/plain/debian/patches/policycoreutils-Make-sepolicy-work-with-python3.patch - -From 2d7ca0b862a35196d562f59bd098df011fd7f0e6 Mon Sep 17 00:00:00 2001 -From: Laurent Bigonville -Date: Mon, 7 Nov 2016 10:51:08 +0100 -Subject: [PATCH] policycoreutils: Make sepolicy work with python3 - -Add python3 support for sepolicy - -Signed-off-by: Laurent Bigonville ---- - policycoreutils/sepolicy/selinux_client.py | 6 ++-- - policycoreutils/sepolicy/sepolicy.py | 38 ++++++++++++------------ - policycoreutils/sepolicy/sepolicy/__init__.py | 16 ++++++---- - policycoreutils/sepolicy/sepolicy/communicate.py | 4 +-- - policycoreutils/sepolicy/sepolicy/generate.py | 30 +++++++++---------- - policycoreutils/sepolicy/sepolicy/interface.py | 14 ++++++--- - policycoreutils/sepolicy/sepolicy/manpage.py | 7 +++-- - 7 files changed, 65 insertions(+), 50 deletions(-) - -diff --git a/policycoreutils/sepolicy/selinux_client.py b/policycoreutils/sepolicy/selinux_client.py -index 7f4a91c..dc29f28 100644 ---- a/sepolicy/selinux_client.py -+++ b/sepolicy/selinux_client.py -@@ -39,6 +39,6 @@ if __name__ == "__main__": - try: - dbus_proxy = SELinuxDBus() - resp = dbus_proxy.customized() -- print convert_customization(resp) -- except dbus.DBusException, e: -- print e -+ print(convert_customization(resp)) -+ except dbus.DBusException as e: -+ print(e) -diff --git a/policycoreutils/sepolicy/sepolicy.py b/policycoreutils/sepolicy/sepolicy.py -index 3e502a7..5bf9b52 100755 ---- a/sepolicy/sepolicy.py -+++ b/sepolicy/sepolicy.py -@@ -262,7 +262,7 @@ def _print_net(src, protocol, perm): - if len(portdict) > 0: - bold_start = "\033[1m" - bold_end = "\033[0;0m" -- print "\n" + bold_start + "%s: %s %s" % (src, protocol, perm) + bold_end -+ print("\n" + bold_start + "%s: %s %s" % (src, protocol, perm) + bold_end) - port_strings = [] - boolean_text = "" - for p in portdict: -@@ -275,7 +275,7 @@ def _print_net(src, protocol, perm): - port_strings.append("%s (%s)" % (", ".join(recs), t)) - port_strings.sort(numcmp) - for p in port_strings: -- print "\t" + p -+ print("\t" + p) - - - def network(args): -@@ -286,7 +286,7 @@ def network(args): - if i[0] not in all_ports: - all_ports.append(i[0]) - all_ports.sort() -- print "\n".join(all_ports) -+ print("\n".join(all_ports)) - - for port in args.port: - found = False -@@ -297,18 +297,18 @@ def network(args): - else: - range = "%s-%s" % (i[0], i[1]) - found = True -- print "%d: %s %s %s" % (port, i[2], portrecsbynum[i][0], range) -+ print("%d: %s %s %s" % (port, i[2], portrecsbynum[i][0], range)) - if not found: - if port < 500: -- print "Undefined reserved port type" -+ print("Undefined reserved port type") - else: -- print "Undefined port type" -+ print("Undefined port type") - - for t in args.type: - if (t, 'tcp') in portrecs.keys(): -- print "%s: tcp: %s" % (t, ",".join(portrecs[t, 'tcp'])) -+ print("%s: tcp: %s" % (t, ",".join(portrecs[t, 'tcp']))) - if (t, 'udp') in portrecs.keys(): -- print "%s: udp: %s" % (t, ",".join(portrecs[t, 'udp'])) -+ print( "%s: udp: %s" % (t, ",".join(portrecs[t, 'udp']))) - - for a in args.applications: - d = sepolicy.get_init_transtype(a) -@@ -357,7 +357,7 @@ def manpage(args): - - for domain in test_domains: - m = ManPage(domain, path, args.root, args.source_files, args.web) -- print m.get_man_page_path() -+ print(m.get_man_page_path()) - - if args.web: - HTMLManPages(manpage_roles, manpage_domains, path, args.os) -@@ -418,7 +418,7 @@ def communicate(args): - out = list(set(writable) & set(readable)) - - for t in out: -- print t -+ print(t) - - - def gen_communicate_args(parser): -@@ -445,7 +445,7 @@ def booleans(args): - args.booleans.sort() - - for b in args.booleans: -- print "%s=_(\"%s\")" % (b, boolean_desc(b)) -+ print("%s=_(\"%s\")" % (b, boolean_desc(b))) - - - def gen_booleans_args(parser): -@@ -484,16 +484,16 @@ def print_interfaces(interfaces, args, append=""): - for i in interfaces: - if args.verbose: - try: -- print get_interface_format_text(i + append) -+ print(get_interface_format_text(i + append)) - except KeyError: -- print i -+ print(i) - if args.compile: - try: - interface_compile_test(i) - except KeyError: -- print i -+ print(i) - else: -- print i -+ print(i) - - - def interface(args): -@@ -565,7 +565,7 @@ def generate(args): - if args.policytype in APPLICATIONS: - mypolicy.gen_writeable() - mypolicy.gen_symbols() -- print mypolicy.generate(args.path) -+ print(mypolicy.generate(args.path)) - - - def gen_interface_args(parser): -@@ -698,12 +698,12 @@ if __name__ == '__main__': - args = parser.parse_args(args=parser_args) - args.func(args) - sys.exit(0) -- except ValueError, e: -+ except ValueError as e: - sys.stderr.write("%s: %s\n" % (e.__class__.__name__, str(e))) - sys.exit(1) -- except IOError, e: -+ except IOError as e: - sys.stderr.write("%s: %s\n" % (e.__class__.__name__, str(e))) - sys.exit(1) - except KeyboardInterrupt: -- print "Out" -+ print("Out") - sys.exit(0) -diff --git a/policycoreutils/sepolicy/sepolicy/__init__.py b/policycoreutils/sepolicy/sepolicy/__init__.py -index 8fbd5b4..fee6438 100644 ---- a/sepolicy/sepolicy/__init__.py -+++ b/sepolicy/sepolicy/__init__.py -@@ -695,7 +695,7 @@ def get_methods(): - # List of per_role_template interfaces - ifs = interfaces.InterfaceSet() - ifs.from_file(fd) -- methods = ifs.interfaces.keys() -+ methods = list(ifs.interfaces.keys()) - fd.close() - except: - sys.stderr.write("could not open interface info [%s]\n" % fn) -@@ -752,7 +752,10 @@ def get_all_entrypoint_domains(): - - - def gen_interfaces(): -- import commands -+ try: -+ from commands import getstatusoutput -+ except ImportError: -+ from subprocess import getstatusoutput - ifile = defaults.interface_info() - headers = defaults.headers() - try: -@@ -763,7 +766,7 @@ def gen_interfaces(): - - if os.getuid() != 0: - raise ValueError(_("You must regenerate interface info by running /usr/bin/sepolgen-ifgen")) -- print(commands.getstatusoutput("/usr/bin/sepolgen-ifgen")[1]) -+ print(getstatusoutput("/usr/bin/sepolgen-ifgen")[1]) - - - def gen_port_dict(): -@@ -1085,8 +1088,11 @@ def get_os_version(): - os_version = "" - pkg_name = "selinux-policy" - try: -- import commands -- rc, output = commands.getstatusoutput("rpm -q '%s'" % pkg_name) -+ try: -+ from commands import getstatusoutput -+ except ImportError: -+ from subprocess import getstatusoutput -+ rc, output = getstatusoutput("rpm -q '%s'" % pkg_name) - if rc == 0: - os_version = output.split(".")[-2] - except: -diff --git a/policycoreutils/sepolicy/sepolicy/communicate.py b/policycoreutils/sepolicy/sepolicy/communicate.py -index b96c4b9..299316e 100755 ---- a/sepolicy/sepolicy/communicate.py -+++ b/sepolicy/sepolicy/communicate.py -@@ -34,8 +34,8 @@ def usage(parser, msg): - - def expand_attribute(attribute): - try: -- return sepolicy.info(sepolicy.ATTRIBUTE, attribute)[0]["types"] -- except RuntimeError: -+ return list(next(sepolicy.info(sepolicy.ATTRIBUTE, attribute))["types"]) -+ except StopIteration: - return [attribute] - - -diff --git a/policycoreutils/sepolicy/sepolicy/generate.py b/policycoreutils/sepolicy/sepolicy/generate.py -index 65b33b6..5696110 100644 ---- a/sepolicy/sepolicy/generate.py -+++ b/sepolicy/sepolicy/generate.py -@@ -31,21 +31,21 @@ import time - import types - import platform - --from templates import executable --from templates import boolean --from templates import etc_rw --from templates import unit_file --from templates import var_cache --from templates import var_spool --from templates import var_lib --from templates import var_log --from templates import var_run --from templates import tmp --from templates import rw --from templates import network --from templates import script --from templates import spec --from templates import user -+from .templates import executable -+from .templates import boolean -+from .templates import etc_rw -+from .templates import unit_file -+from .templates import var_cache -+from .templates import var_spool -+from .templates import var_lib -+from .templates import var_log -+from .templates import var_run -+from .templates import tmp -+from .templates import rw -+from .templates import network -+from .templates import script -+from .templates import spec -+from .templates import user - import sepolgen.interfaces as interfaces - import sepolgen.defaults as defaults - -diff --git a/policycoreutils/sepolicy/sepolicy/interface.py b/policycoreutils/sepolicy/sepolicy/interface.py -index c2cb971..8956f39 100644 ---- a/sepolicy/sepolicy/interface.py -+++ b/sepolicy/sepolicy/interface.py -@@ -192,10 +192,13 @@ def generate_compile_te(interface, idict, name="compiletest"): - def get_xml_file(if_file): - """ Returns xml format of interfaces for given .if policy file""" - import os -- import commands -+ try: -+ from commands import getstatusoutput -+ except ImportError: -+ from subprocess import getstatusoutput - basedir = os.path.dirname(if_file) + "/" - filename = os.path.basename(if_file).split(".")[0] -- rc, output = commands.getstatusoutput("python /usr/share/selinux/devel/include/support/segenxml.py -w -m %s" % basedir + filename) -+ rc, output = getstatusoutput("python /usr/share/selinux/devel/include/support/segenxml.py -w -m %s" % basedir + filename) - if rc != 0: - sys.stderr.write("\n Could not proceed selected interface file.\n") - sys.stderr.write("\n%s" % output) -@@ -208,7 +211,10 @@ def interface_compile_test(interface, path="/usr/share/selinux/devel/policy.xml" - exclude_interfaces = ["userdom", "kernel", "corenet", "files", "dev"] - exclude_interface_type = ["template"] - -- import commands -+ try: -+ from commands import getstatusoutput -+ except ImportError: -+ from subprocess import getstatusoutput - import os - policy_files = {'pp': "compiletest.pp", 'te': "compiletest.te", 'fc': "compiletest.fc", 'if': "compiletest.if"} - idict = get_interface_dict(path) -@@ -219,7 +225,7 @@ def interface_compile_test(interface, path="/usr/share/selinux/devel/policy.xml" - fd = open(policy_files['te'], "w") - fd.write(generate_compile_te(interface, idict)) - fd.close() -- rc, output = commands.getstatusoutput("make -f /usr/share/selinux/devel/Makefile %s" % policy_files['pp']) -+ rc, output = getstatusoutput("make -f /usr/share/selinux/devel/Makefile %s" % policy_files['pp']) - if rc != 0: - sys.stderr.write(output) - sys.stderr.write(_("\nCompile test for %s failed.\n") % interface) -diff --git a/policycoreutils/sepolicy/sepolicy/manpage.py b/policycoreutils/sepolicy/sepolicy/manpage.py -index 7365f93..773a9ab 100755 ---- a/sepolicy/sepolicy/manpage.py -+++ b/sepolicy/sepolicy/manpage.py -@@ -27,7 +27,6 @@ __all__ = ['ManPage', 'HTMLManPages', 'manpage_domains', 'manpage_roles', 'gen_d - import string - import selinux - import sepolicy --import commands - import os - import time - -@@ -162,7 +161,11 @@ def get_alphabet_manpages(manpage_list): - - - def convert_manpage_to_html(html_manpage, manpage): -- rc, output = commands.getstatusoutput("/usr/bin/groff -man -Thtml %s 2>/dev/null" % manpage) -+ try: -+ from commands import getstatusoutput -+ except ImportError: -+ from subprocess import getstatusoutput -+ rc, output = getstatusoutput("/usr/bin/groff -man -Thtml %s 2>/dev/null" % manpage) - if rc == 0: - print(html_manpage, "has been created") - fd = open(html_manpage, 'w') --- -2.10.2 - diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index 729ae646b2..99f9e76e29 100644 --- a/gnu/packages/selinux.scm +++ b/gnu/packages/selinux.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017 Ricardo Wurmus +;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +20,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system python) @@ -44,16 +45,17 @@ (define-public libsepol (package (name "libsepol") - (version "2.6") - (source (let ((release "20161014")) + (version "2.7") + (source (let ((release "20170804")) (origin - (method url-fetch) - (uri (string-append "https://github.com/SELinuxProject/selinux/" - "archive/" release ".tar.gz")) - (file-name (string-append "selinux-" release ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/SELinuxProject/selinux.git") + (commit release))) + (file-name (string-append "selinux-" release "-checkout")) (sha256 (base32 - "1dpwynfb6n31928343blac4159g4jbrwxdp61q5yffmxpy3c3czi"))))) + "1l1nn8bx08v4cxkw5kb0wgr61rfqj5ra9dh1dy5jslillj93vivq"))))) (build-system gnu-build-system) (arguments `(#:tests? #f ; tests require checkpolicy, which requires libsepol @@ -92,11 +94,9 @@ boolean settings).") #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "PREFIX=" out) - (string-append "LDLIBS=" + (string-append "LIBSEPOLA=" (assoc-ref %build-inputs "libsepol") - "/lib/libsepol.a " - (assoc-ref %build-inputs "flex") - "/lib/libfl.a") + "/lib/libsepol.a") "CC=gcc")) #:phases (modify-phases %standard-phases @@ -125,6 +125,9 @@ module into a binary representation.") (substitute-keyword-arguments (package-arguments libsepol) ((#:make-flags flags) `(cons* "PYTHON=python3" + (string-append "LIBSEPOLA=" + (assoc-ref %build-inputs "libsepol") + "/lib/libsepol.a") (string-append "PYSITEDIR=" (assoc-ref %outputs "out") "/lib/python" @@ -135,14 +138,6 @@ module into a binary representation.") `(modify-phases ,phases (replace 'enter-dir (lambda _ (chdir ,name) #t)) - ;; libsepol.a is not located in this package's LIBDIR. - (add-after 'enter-dir 'patch-libsepol-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/Makefile" - (("\\$\\(LIBDIR\\)/libsepol.a") - (string-append (assoc-ref inputs "libsepol") - "/lib/libsepol.a"))) - #t)) (add-after 'enter-dir 'remove-Werror (lambda _ ;; GCC complains about the fact that the output does not (yet) @@ -256,7 +251,7 @@ binary policies.") ((#:phases phases) `(modify-phases ,phases (replace 'enter-dir - (lambda _ (chdir "sepolgen") #t)) + (lambda _ (chdir "python/sepolgen") #t)) ;; By default all Python files would be installed to ;; $out/gnu/store/...-python-.../, so we override the ;; PACKAGEDIR to fix this. @@ -297,20 +292,19 @@ based on required access.") ;; GPLv2 only (license license:gpl2))) -;; The latest 4.1.x version does not work with the latest 2.6 release of -;; policycoreutils, so we use the last 4.0.x release. (define-public python-setools (package (name "python-setools") - (version "4.0.1") + (version "4.1.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/TresysTechnology/" - "setools/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/TresysTechnology/setools.git") + (commit version))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1zndpl4ck5c23p7s4sci06db89q1w87jig3jbd4f8s1ggy3lj82c")))) + "0459xxly6zzqc5azcwk3rbbcxvj60dq08f8z6xr05y7dsbb16cg6")))) (build-system python-build-system) (arguments `(#:tests? #f ; the test target causes a rebuild @@ -352,10 +346,6 @@ tools, and libraries designed to facilitate SELinux policy analysis.") (define-public policycoreutils (package (inherit libsepol) (name "policycoreutils") - (source - (origin (inherit (package-source libsepol)) - (patches (search-patches "policycoreutils-make-sepolicy-use-python3.patch")) - (patch-flags '("-p1" "-d" "policycoreutils")))) (arguments `(#:test-target "test" #:make-flags @@ -399,79 +389,13 @@ tools, and libraries designed to facilitate SELinux policy analysis.") (string-append (assoc-ref inputs "pam") file)) (("/usr(/include/libaudit.h)" _ file) (string-append (assoc-ref inputs "audit") file))) - #t)) - (add-after 'enter-dir 'fix-glib-cflags - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "restorecond/Makefile" - (("/usr(/include/glib-2.0|/lib/glib-2.0/include)" _ path) - (string-append (assoc-ref inputs "glib") path)) - (("/usr(/include/dbus-1.0|/lib/dbus-1.0/include)" _ path) - (string-append (assoc-ref inputs "dbus") path - " -I" - (assoc-ref inputs "dbus-glib") path))) - #t)) - (add-after 'enter-dir 'fix-linkage-with-libsepol - (lambda* (#:key inputs #:allow-other-keys) - (substitute* '("semodule_deps/Makefile" - "sepolgen-ifgen/Makefile") - (("\\$\\(LIBDIR\\)") - (string-append (assoc-ref inputs "libsepol") "/lib/"))))) - (add-after 'enter-dir 'fix-target-paths - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* "audit2allow/sepolgen-ifgen" - (("ATTR_HELPER = \"/usr/bin/sepolgen-ifgen-attr-helper\"") - (string-append "ATTR_HELPER = \"" out - "/bin/sepolgen-ifgen-attr-helper\""))) - (substitute* "sepolicy/sepolicy/__init__.py" - (("/usr/bin/sepolgen-ifgen") - (string-append out "/bin/sepolgen-ifgen"))) - (substitute* "sepolicy/Makefile" - ;; By default all Python files would be installed to - ;; $out/gnu/store/...-python-.../. - (("setup.py install.*$") - (string-append "setup.py install --prefix=" out "\n")) - (("\\$\\(DESTDIR\\)/etc") - (string-append out "/etc")) - (("\\$\\(DESTDIR\\)/usr") out))) - #t)) - (add-after 'install 'wrap-python-tools - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (var (string-append out "/lib/python" - ,(version-major+minor (package-version python)) - "/site-packages:" - (getenv "PYTHONPATH")))) - ;; The scripts' shebangs tell Python to ignore the PYTHONPATH, - ;; so we need to patch them before wrapping. - (for-each (lambda (file) - (let ((path (string-append out "/" file))) - (substitute* path - (("bin/python -Es") "bin/python -s")) - (wrap-program path - `("PYTHONPATH" ":" prefix (,var))))) - '("bin/audit2allow" - "bin/chcat" - "bin/sandbox" - "bin/sepolgen-ifgen" - "bin/sepolicy" - "sbin/semanage"))) #t))))) (inputs - `(("python" ,python-wrapper) - ("audit" ,audit) + `(("audit" ,audit) ("pam" ,linux-pam) ("libsepol" ,libsepol) ("libselinux" ,libselinux) - ("libsemanage" ,libsemanage) - ("python-sepolgen" ,python-sepolgen) - ("python-setools" ,python-setools) - ("python-ipy" ,python-ipy) - ("libcap-ng" ,libcap-ng) - ("pcre" ,pcre) - ("dbus" ,dbus) - ("dbus-glib" ,dbus-glib) - ("glib" ,glib))) + ("libsemanage" ,libsemanage))) (native-inputs `(("gettext" ,gettext-minimal))) (synopsis "SELinux core utilities") -- cgit 1.4.1 From 418c62fff2c4298a112d6e9562b016d042a3511d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 25 Jan 2018 07:13:40 +0200 Subject: gnu: qt: Update to 5.9.4. * gnu/packages/qt.scm (qt qtbase qtsvg qtimageformats qtx11extras qtxmlpatterns qtdeclarative qtconnectivity qtwebsockets qtsensors qtmultimedia qtwayland qtserialport qtserialbus qtwebchannel qtlocation qttools qtscript qtquickcontrols qtquickcontrols2 qtgraphicaleffects qtgamepad qtscxml qtpurchasing qtcanvas3d qtnetworkauth qtwebkit): Update to 5.9.4. --- gnu/packages/qt.scm | 124 ++++++++++++++++++++++++++-------------------------- 1 file changed, 62 insertions(+), 62 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 34938b9c02..8bd51ae663 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014, 2015 Andreas Enge ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2015 Ludovic Courtès -;;; Copyright © 2015, 2016, 2017 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Thomas Danckaert ;;; Copyright © 2017 Ricardo Wurmus @@ -103,7 +103,7 @@ system, and the core design of Django is reused in Grantlee.") (define-public qt (package (name "qt") - (version "5.9.3") + (version "5.9.4") (outputs '("out" "examples")) (source (origin (method url-fetch) @@ -115,8 +115,8 @@ system, and the core design of Django is reused in Grantlee.") "/single/qt-everywhere-opensource-src-" version ".tar.xz")) (sha256 - (base32 - "0ik0ikwa0qb7dqcr9knxpnwv50b7m6m2iglzq9yjs3437zqdib2p")) + (base32 + "1mblh8k04l13nk9fhhrr43h5bcph1gbz94j5y7csx8zvxb5xkb73")) (modules '((guix build utils))) (snippet '(begin @@ -369,7 +369,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (define-public qtbase (package (name "qtbase") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -378,7 +378,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") version ".tar.xz")) (sha256 (base32 - "10lrkarvs7dpx9rlj7sjcc0pzi42098x8nqnhmydr4bnbq048z4y")) + "1kq422vb2zaic099pgzwk7c0qzgc3xap6qahw5vklrq0mgivvrk9")) (modules '((guix build utils))) (snippet ;; corelib uses bundled harfbuzz, md4, md5, sha3 @@ -566,7 +566,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (define-public qtsvg (package (inherit qtbase) (name "qtsvg") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -575,7 +575,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") version ".tar.xz")) (sha256 (base32 - "1wjx9ymk2h19l9kk76jh87bnhhj955f9a93akvwwzfwg1jk2hrnz")))) + "0yh3an9rc7fh013cw3bm318ap6428icsmnj38hhg1w6lpwr2gwm2")))) (propagated-inputs `()) (native-inputs `(("perl" ,perl))) (inputs @@ -641,7 +641,7 @@ HostData=lib/qt5 (define-public qtimageformats (package (inherit qtsvg) (name "qtimageformats") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -650,7 +650,7 @@ HostData=lib/qt5 version ".tar.xz")) (sha256 (base32 - "1p95wzm46j49c5br45g0pmlz3n3fl93j1ipzmnpmq9y2pbfhkcyl")) + "1nfxvf96wh1smdmcsk4m9f7zg69fgp844f8772qpv6v4m20p1qb9")) (modules '((guix build utils))) (snippet '(delete-file-recursively "src/3rdparty")))) @@ -670,7 +670,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) (define-public qtx11extras (package (inherit qtsvg) (name "qtx11extras") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -679,7 +679,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) version ".tar.xz")) (sha256 (base32 - "1gpjgca4xvyy0r743kh2ys128r14fh6j8bdphnmmi5v2pf6bzq74")))) + "1a125fi7lbxfps207i12jammm4cjbiawmp4sqa3bxqah8p21i6w7")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -694,7 +694,7 @@ from within Qt 5."))) (define-public qtxmlpatterns (package (inherit qtsvg) (name "qtxmlpatterns") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -703,7 +703,7 @@ from within Qt 5."))) version ".tar.xz")) (sha256 (base32 - "1fphhqr3v3vzjp2vbv16bc1vs879wn7aqlabgcpkhqx92ak6d76g")))) + "0ybz0i3wblvrm958s9ykp3a79bakjbb7k74q71mqaaswkv9imxgs")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -723,7 +723,7 @@ xmlpatternsvalidator."))) (define-public qtdeclarative (package (inherit qtsvg) (name "qtdeclarative") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -732,7 +732,7 @@ xmlpatternsvalidator."))) version ".tar.xz")) (sha256 (base32 - "01wlk17zf47yzx7cc3cp617gj70yadllj2rsfk78879c0v96cpsh")))) + "0r9dhfc6qmxlzn2v9r6z6n2mcq6pv1nmyh91g9hcdlkx40xqlqyw")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -755,7 +755,7 @@ with JavaScript and C++."))) (define-public qtconnectivity (package (inherit qtsvg) (name "qtconnectivity") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -764,7 +764,7 @@ with JavaScript and C++."))) version ".tar.xz")) (sha256 (base32 - "0j86rspn4xgwq1ddc1mpq1kq0ib2c0ag6rsn9ly2xs4iimp1x2g2")))) + "12qckqz6ldvn1czkkigadmgl07yk4gs74hy4ifh4hmpm7cv519yv")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -790,7 +790,7 @@ with Bluetooth and NFC."))) (define-public qtwebsockets (package (inherit qtsvg) (name "qtwebsockets") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -799,7 +799,7 @@ with Bluetooth and NFC."))) version ".tar.xz")) (sha256 (base32 - "1phic630ah85ajxp6iqrw9bpg0y8s88y45ygkc1wcasmbgzrs1nf")))) + "00786d9m8skj68n5x9d8151zmmskx7ckhgcdd08hs9nly04h55vj")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -817,7 +817,7 @@ consume data received from the server, or both."))) (define-public qtsensors (package (inherit qtsvg) (name "qtsensors") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -826,7 +826,7 @@ consume data received from the server, or both."))) version ".tar.xz")) (sha256 (base32 - "1hfsih5iy4fi6mnpw2shf1lzx9hxcdc1arspad1mark17l5s4pmr")))) + "0n6lkkn7c9x8vcplmfvkx7jq6najh2mrwnfb3blrmkmpash3lgvr")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:parallel-tests? _ #f) #f) ; can lead to race condition @@ -849,7 +849,7 @@ recognition API for devices."))) (define-public qtmultimedia (package (inherit qtsvg) (name "qtmultimedia") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -858,7 +858,7 @@ recognition API for devices."))) version ".tar.xz")) (sha256 (base32 - "19iqh8xpspzlmpzh05bx5rchlslbfy2pp00xv52496yf9b95i5g7")) + "0x2f3vpax7rq0lxnncbp5b248bxdicrwn8hv4hsas2g2283s0lj9")) (modules '((guix build utils))) (snippet '(begin @@ -899,7 +899,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) (define-public qtwayland (package (inherit qtsvg) (name "qtwayland") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -908,7 +908,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) version ".tar.xz")) (sha256 (base32 - "0vazcmpqdka3llmyg7m99lw0ngrydmw74p9nd04544xdn128r3ih")) + "0x4q17k23akf14i3pyllr96s8lvprk1x006wp0mi5rhk4199cx1z")) (modules '((guix build utils))) (snippet ;; The examples try to build and cause the build to fail @@ -949,7 +949,7 @@ compositor libraries."))) (define-public qtserialport (package (inherit qtsvg) (name "qtserialport") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -958,7 +958,7 @@ compositor libraries."))) version ".tar.xz")) (sha256 (base32 - "1pxb679cx77vk39ik7j0k91a57wqa63d4g4riw3r2gpcay8kxpac")))) + "172i5cpqnk0c3m0hg08hgj15qvsyd1xvw9yf2dqicg3l10lqwg8c")))) (native-inputs `(("perl" ,perl))) (inputs `(("qtbase" ,qtbase) @@ -970,7 +970,7 @@ interacting with serial ports from within Qt."))) (define-public qtserialbus (package (inherit qtsvg) (name "qtserialbus") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -979,7 +979,7 @@ interacting with serial ports from within Qt."))) version ".tar.xz")) (sha256 (base32 - "0f39qh05mp54frpn5sy9k5vfw5zb2gg72qaqz81mwlck2xg78qpg")))) + "1i6b7w9z30mzzi0dcmrxx1scpzpnnw2fag1igvrnzvw1jwp414ff")))) (inputs `(("qtbase" ,qtbase) ("qtserialport" ,qtserialport))) @@ -991,7 +991,7 @@ and others."))) (define-public qtwebchannel (package (inherit qtsvg) (name "qtwebchannel") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1000,7 +1000,7 @@ and others."))) version ".tar.xz")) (sha256 (base32 - "0n438mk01sh2bbqakc1m3s65qqmi75m4n4hymad8wcgijfr9a9v3")))) + "1acs0fa5rxm3cir0lydc9a8685qagf1786vkssv51wk3v9r3lc4h")))) (native-inputs `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative) @@ -1015,7 +1015,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) (define-public qtlocation (package (inherit qtsvg) (name "qtlocation") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1024,7 +1024,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) version ".tar.xz")) (sha256 (base32 - "1qacqz6l7zljqszblhgzg5y1v4mgki59k45ag7yc2iw7vrf45zc0")))) + "186jzv19v674n8jmm13v5xwv211lygih5657rlvbhc1s4jq6iv9p")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1045,7 +1045,7 @@ positioning and geolocation plugins."))) (define-public qttools (package (inherit qtsvg) (name "qttools") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1054,7 +1054,7 @@ positioning and geolocation plugins."))) version ".tar.xz")) (sha256 (base32 - "1zw4j8ymwcpn7dx1dlbxpmx5lfp26rag7pysap1xry9m7vg3hb24")))) + "11vfk6c8snsqwqj1xk53c0h2mkqr4gfa9kinp8py56x7sn15galm")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1072,7 +1072,7 @@ that helps in Qt development."))) (define-public qtscript (package (inherit qtsvg) (name "qtscript") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1081,7 +1081,7 @@ that helps in Qt development."))) version ".tar.xz")) (sha256 (base32 - "0rjm6nph1nssfpknp4i682bvk7363y4a2f74060vcm7ib2pzl2xq")) + "0lz0iv1baah7cxrpyiqzqp4fxxf75i21qd06ha7r5d80hq3xlia0")) (patches (search-patches "qtscript-disable-tests.patch")))) (native-inputs `(("perl" ,perl) @@ -1096,7 +1096,7 @@ ECMAScript and Qt."))) (define-public qtquickcontrols (package (inherit qtsvg) (name "qtquickcontrols") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1105,7 +1105,7 @@ ECMAScript and Qt."))) version ".tar.xz")) (sha256 (base32 - "09p2q3max4xrlw5svbhn11y9cgrvcjsj88xw4c0kq91cgnyyw3ih")))) + "12yrmv6afjbd1fw3r8zjdrbq5l7cy7k5bxcyiv1m97gykfh0b8hn")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1120,7 +1120,7 @@ can be used to build complete interfaces in Qt Quick."))) (define-public qtquickcontrols2 (package (inherit qtsvg) (name "qtquickcontrols2") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1129,7 +1129,7 @@ can be used to build complete interfaces in Qt Quick."))) version ".tar.xz")) (sha256 (base32 - "0hq888qq8q7dglpyzif64pplqjxfrqjpkvbcx0ycq35darls5ai1")))) + "0334ayansm743kf113rs3k9hi9qb6giscfx9xig3y1z7asisfa0m")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1145,7 +1145,7 @@ not available."))) (define-public qtgraphicaleffects (package (inherit qtsvg) (name "qtgraphicaleffects") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1154,7 +1154,7 @@ not available."))) version ".tar.xz")) (sha256 (base32 - "1nghl39sqsjamjn6pfmxmgga6z9vwzv2zbgc92amrfxxr2dh42vr")))) + "1vxq4j7cb5cya1g234rxhfb361n45gp8c70gj8pc03njswkm7xwp")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1198,7 +1198,7 @@ backend for QtQuick scene graph.") (define-public qtgamepad (package (inherit qtsvg) (name "qtgamepad") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1207,7 +1207,7 @@ backend for QtQuick scene graph.") version ".tar.xz")) (sha256 (base32 - "14vari5cq10a0z02559l2m1v78g7ygnyqf1ilkmy2f0kr36wm7y6")))) + "1ci6aapq0i8qbzkn9xxvxn1n81z3y28yrlyzw0anqzj9qp97cl6f")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config))) @@ -1228,7 +1228,7 @@ and mobile applications targeting TV-like form factors."))) (define-public qtscxml (package (inherit qtsvg) (name "qtscxml") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1237,7 +1237,7 @@ and mobile applications targeting TV-like form factors."))) version ".tar.xz")) (sha256 (base32 - "06x8hs3p7bfgnl6b2fjld4s41acw1rbnxbcgkprgw2fxxnl1zxfq")) + "0x8bjp9jzib4kfn7rbricw4qr259qqsdbrz0dw39453s2m7cbv0x")) (modules '((guix build utils))) (snippet '(begin @@ -1258,7 +1258,7 @@ also contains functionality to support data models and executable content."))) (define-public qtpurchasing (package (inherit qtsvg) (name "qtpurchasing") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1267,7 +1267,7 @@ also contains functionality to support data models and executable content."))) version ".tar.xz")) (sha256 (base32 - "00yfdd00frgf7fs9s0vyn1c6c4abxgld5rfgkzms3y6n6lcphs0j")))) + "08sk8vw16pa1qv36rfr9dsbzlwlv6kznfpsq8wfabhkgbfl6awqs")))) (inputs `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative))) @@ -1278,7 +1278,7 @@ purchasing goods and services."))) (define-public qtcanvas3d (package (inherit qtsvg) (name "qtcanvas3d") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1287,7 +1287,7 @@ purchasing goods and services."))) version ".tar.xz")) (sha256 (base32 - "1g0a606fgal4x17ly0qrj05pb0k8riwh7nj4g3jip05g8iwb2f2y")) + "0agdxgk7knf6zkjdi6316y2k9zq72wcg5zn3cbhw4hzjw81qadgg")) (modules '((guix build utils))) (snippet '(delete-file-recursively "examples/canvas3d/3rdparty")))) @@ -1315,7 +1315,7 @@ drawing calls from Qt Quick JavaScript."))) (define-public qtcharts (package (inherit qtsvg) (name "qtcharts") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1324,7 +1324,7 @@ drawing calls from Qt Quick JavaScript."))) version ".tar.xz")) (sha256 (base32 - "1sb99ncmh84bz0xzq55chgic7jk61awnfvi7ld4gq5ap3nl865zc")))) + "1rykb72gr95rxd0rvbl846ys8xvyyhrms1jz7l4hlwp6zn1jkxvm")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1342,7 +1342,7 @@ selecting one of the charts themes.") (define-public qtdatavis3d (package (inherit qtsvg) (name "qtdatavis3d") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1351,7 +1351,7 @@ selecting one of the charts themes.") version ".tar.xz")) (sha256 (base32 - "0s636ix44akrjx47gv9qj2ac02q8clnwj3acfr28p6pagm46k7vh")))) + "1ggwfnqf17mp5dkfr82q1qrimkb6wv3304vl8mjv1nq0zisckhjv")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1369,7 +1369,7 @@ customized by using themes or by adding custom items and labels to them.") (define-public qtnetworkauth (package (inherit qtsvg) (name "qtnetworkauth") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1378,7 +1378,7 @@ customized by using themes or by adding custom items and labels to them.") version ".tar.xz")) (sha256 (base32 - "0fdz5q47xbiij3mi5lzhvxpq4jp9fm929v9kyvcyadz86mp3f8nz")))) + "0mqcqkp9h5bgzb3wfy239wh1c9s9zxd7mww11c0jyp56wk5balcx")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1398,7 +1398,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) (define-public qtremoteobjects (package (inherit qtsvg) (name "qtremoteobjects") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1407,7 +1407,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) version ".tar.xz")) (sha256 (base32 - "0z6qd381r6a7gdrsknlkkbhq9mmdqi040kfrvgm6mfa69336f4dk")))) + "1wb50dapv0l45c0rfmpiaddvwv9na50lmd5zmm052q9d1xb15f6b")))) (inputs `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative))) @@ -1420,7 +1420,7 @@ processes or computers."))) (define-public qtspeech (package (inherit qtsvg) (name "qtspeech") - (version "5.9.3") + (version "5.9.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1429,7 +1429,7 @@ processes or computers."))) version ".tar.xz")) (sha256 (base32 - "1c4rpf3by620fx8lrvmc38r60cikqczqh2rfcm7ixz3x8cj60lh1")))) + "17h8hrixxcsn7pd5iipbj2hxpp5m2dhfq3w04wkamambb49qs80x")))) (inputs `(("qtbase" ,qtbase))) (native-inputs -- cgit 1.4.1 From 1dba87d7088355d8e52eb362b38773372e31d31e Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 25 Jan 2018 08:31:40 +0100 Subject: gnu: libnftnl: Update to 1.0.9. * gnu/packages/linux.scm (libnftnl): Update to 1.0.9. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 319479d3dd..21249a7eb3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4157,7 +4157,7 @@ re-use code and to avoid re-inventing the wheel.") (define-public libnftnl (package (name "libnftnl") - (version "1.0.8") + (version "1.0.9") (source (origin (method url-fetch) @@ -4165,7 +4165,7 @@ re-use code and to avoid re-inventing the wheel.") "libnftnl-" version ".tar.bz2")) (sha256 (base32 - "0f10cfiyl4c0f8k3brxfrw28x7a6qvrakaslg4jgqncwxycxggg6")))) + "0d9nkdbdck8sg6msysqyv3m9kjr9sjif5amf26dfa0g3mqjdihgy")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit 1.4.1 From 0646461a8c5c24d3493c69ef92aa3ae35028d5ea Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 25 Jan 2018 08:32:13 +0100 Subject: gnu: nftables: Update to 0.8.1. * gnu/packages/linux.scm (nftables): Update to 0.8.1. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 21249a7eb3..82f077668c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4182,7 +4182,7 @@ used by nftables.") (define-public nftables (package (name "nftables") - (version "0.8") + (version "0.8.1") (source (origin (method url-fetch) @@ -4190,7 +4190,7 @@ used by nftables.") "/files/nftables-" version ".tar.bz2")) (sha256 (base32 - "16iq9x0qxikdhp1nan500rk33ycqddl1k57876m4dfv3n7kqhnrz")))) + "1i1gfy8l7qyhc5vlrpp63s0n5kybmc9pi4dywiq8rmkhrrnddsla")))) (build-system gnu-build-system) (inputs `(("bison", bison) ("flex", flex) -- cgit 1.4.1 From 45b486984d8ab092cf002cd0b500df4dc62e186b Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 25 Jan 2018 16:58:35 +0300 Subject: gnu: gource: Fix the hashes of mutated GitHub archives. * gnu/packages/version-control.scm (gource): Fix hash. --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index e646eeec17..976849b184 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1755,8 +1755,8 @@ network protocols, and core version control algorithms.") (source (origin (method url-fetch) (uri (string-append - "https://github.com/acaudwell/Gource/archive/" - "gource-" version ".tar.gz")) + "https://github.com/acaudwell/Gource/releases/download" + "/gource-" version "/gource-" version ".tar.gz")) (sha256 (base32 "1llqwdnfa1pff8bxk27qsqff1fcg0a9kfdib0rn7p28vl21n1cgj")))) -- cgit 1.4.1 From 5ee4cd69c47b77e534654a130b1264ad05809943 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Mon, 15 Jan 2018 09:35:59 +0100 Subject: services: postgresql: Use pg_ctl to start and stop postgres. Fixes . * gnu/services/databases.scm (postgresql-shepherd-service): Replace make-forkexec-constructor and make-kill-destructor with pg_ctl. --- gnu/services/databases.scm | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index 6a01cb1ce6..b34a67aa95 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015, 2016 Ludovic Courtès ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2017 Christopher Baines +;;; Copyright © 2018 Clément Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -147,26 +148,33 @@ host all all ::1/128 trust")) (define postgresql-shepherd-service (match-lambda (($ postgresql port locale config-file data-directory) - (let ((start-script - ;; Wrapper script that switches to the 'postgres' user before - ;; launching daemon. - (program-file "start-postgres" - #~(let ((user (getpwnam "postgres")) - (postgres (string-append #$postgresql - "/bin/postgres"))) - (setgid (passwd:gid user)) - (setuid (passwd:uid user)) - (system* postgres - (string-append "--config-file=" - #$config-file) - "-p" (number->string #$port) - "-D" #$data-directory))))) + (let* ((pg_ctl-wrapper + ;; Wrapper script that switches to the 'postgres' user before + ;; launching daemon. + (program-file + "pg_ctl-wrapper" + #~(begin + (use-modules (ice-9 match) + (ice-9 format)) + (match (command-line) + ((_ mode) + (let ((user (getpwnam "postgres")) + (pg_ctl #$(file-append postgresql "/bin/pg_ctl")) + (options (format #f "--config-file=~a -p ~d" + #$config-file #$port))) + (setgid (passwd:gid user)) + (setuid (passwd:uid user)) + (execl pg_ctl pg_ctl "-D" #$data-directory "-o" options + mode))))))) + (action (lambda args + #~(lambda _ + (invoke #$pg_ctl-wrapper #$@args))))) (list (shepherd-service (provision '(postgres)) (documentation "Run the PostgreSQL daemon.") (requirement '(user-processes loopback syslogd)) - (start #~(make-forkexec-constructor #$start-script)) - (stop #~(make-kill-destructor)))))))) + (start (action "start")) + (stop (action "stop")))))))) (define postgresql-service-type (service-type (name 'postgresql) -- cgit 1.4.1 From 8c71a52cd9a5f379a5101e40349789f27ff2cc06 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 25 Jan 2018 21:00:25 +0300 Subject: gnu: libmusicbrainz: Clean spaces between right parenthesis. * gnu/packages/music.scm (libmusicbrainz): Remove unnecessary spaces between right parenthesis. --- gnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index e399c0293d..f3b5dd451c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3875,7 +3875,7 @@ ISRCs and the MCN (=UPC/EAN) from disc.") version "/libmusicbrainz-" version ".tar.gz")) (sha256 (base32 - "0ikb9igyyk28jm34raxfzkw2qyn4nzzwsymdyprp7cmvi6g2ajb7")) )) + "0ikb9igyyk28jm34raxfzkw2qyn4nzzwsymdyprp7cmvi6g2ajb7")))) (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From 8020ecc756861070a6ace946f7ac22b4c35db6a6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 25 Jan 2018 20:28:20 +0200 Subject: gnu: cobol: Run cobol85 test-suite. * gnu/packages/cobol.scm (gnucobol)[arguments]: Add phase to place test-suite tarball in test directory. Change test target. [native-inputs]: Add perl. [inputs]: Download test-suite tarball. --- gnu/packages/cobol.scm | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cobol.scm b/gnu/packages/cobol.scm index f8f35928a7..752e028374 100644 --- a/gnu/packages/cobol.scm +++ b/gnu/packages/cobol.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017, 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,7 +24,8 @@ #:use-module (guix download) #:use-module (gnu packages databases) #:use-module (gnu packages multiprecision) - #:use-module (gnu packages ncurses)) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages perl)) (define-public gnucobol (package @@ -42,11 +43,26 @@ (arguments '(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") - "/lib")))) + "/lib")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'place-cobol85-test-suite + (lambda* (#:key inputs #:allow-other-keys) + (let ((newcob (assoc-ref inputs "newcob"))) + (copy-file newcob "tests/cobol85/newcob.val.Z"))))) + #:test-target "checkall")) + (native-inputs + `(("perl" ,perl))) (inputs `(("bdb" ,bdb) ("gmp" ,gmp) - ("ncurses" ,ncurses))) + ("ncurses" ,ncurses) + ("newcob" ,(origin + (method url-fetch) + (uri "http://www.itl.nist.gov/div897/ctg/suites/newcob.val.Z") + (sha256 + (base32 + "1yb1plmv4firfnbb119r2vh1hay221w1ya34nyz0qwsxppfr56hy")))))) (build-system gnu-build-system) (home-page "https://savannah.gnu.org/projects/gnucobol/") (synopsis "A modern COBOL compiler") -- cgit 1.4.1 From 238f3a39a0f302e2369a0914add4992ec7e259df Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 25 Jan 2018 13:27:09 -0500 Subject: gnu: dovecot: Fix CVE-2017-15132. * gnu/packages/patches/dovecot-CVE-2017-15132.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/mail.scm (dovecot)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/mail.scm | 1 + gnu/packages/patches/dovecot-CVE-2017-15132.patch | 36 +++++++++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 gnu/packages/patches/dovecot-CVE-2017-15132.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index e96040a4ea..fae837ddaf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -609,6 +609,7 @@ dist_patch_DATA = \ %D%/packages/patches/diffutils-gets-undeclared.patch \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ + %D%/packages/patches/dovecot-CVE-2017-15132.patch \ %D%/packages/patches/doxygen-test.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/eigen-arm-neon-fixes.patch \ diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 24dee8a590..9a398c1831 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1144,6 +1144,7 @@ facilities for checking incoming mail.") (uri (string-append "https://www.dovecot.org/releases/" (version-major+minor version) "/" name "-" version ".tar.gz")) + (patches (search-patches "dovecot-CVE-2017-15132.patch")) (sha256 (base32 "10c5myzgys866c3x6jdr1s9x9pqnjd5vpyz8z384sph21m3wnq6y")))) (build-system gnu-build-system) diff --git a/gnu/packages/patches/dovecot-CVE-2017-15132.patch b/gnu/packages/patches/dovecot-CVE-2017-15132.patch new file mode 100644 index 0000000000..32666b8557 --- /dev/null +++ b/gnu/packages/patches/dovecot-CVE-2017-15132.patch @@ -0,0 +1,36 @@ +Fix CVE-2017-15132: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-15132 + +Patch copied from upstream source repository: + +https://github.com/dovecot/core/commit/1a29ed2f96da1be22fa5a4d96c7583aa81b8b060 + +From 1a29ed2f96da1be22fa5a4d96c7583aa81b8b060 Mon Sep 17 00:00:00 2001 +From: Timo Sirainen +Date: Mon, 18 Dec 2017 16:50:51 +0200 +Subject: [PATCH] lib-auth: Fix memory leak in auth_client_request_abort() + +This caused memory leaks when authentication was aborted. For example +with IMAP: + +a AUTHENTICATE PLAIN +* + +Broken by 9137c55411aa39d41c1e705ddc34d5bd26c65021 +--- + src/lib-auth/auth-client-request.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/lib-auth/auth-client-request.c b/src/lib-auth/auth-client-request.c +index 480fb42b30..046f7c307d 100644 +--- a/src/lib-auth/auth-client-request.c ++++ b/src/lib-auth/auth-client-request.c +@@ -186,6 +186,7 @@ void auth_client_request_abort(struct auth_client_request **_request) + + auth_client_send_cancel(request->conn->client, request->id); + call_callback(request, AUTH_REQUEST_STATUS_ABORT, NULL, NULL); ++ pool_unref(&request->pool); + } + + unsigned int auth_client_request_get_id(struct auth_client_request *request) -- cgit 1.4.1 From f888d5bb8f75d4d4d26763eb5efbff1035c90092 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 25 Jan 2018 14:09:32 -0500 Subject: gnu: gcc@7: Update to 7.3.0. * gnu/packages/gcc.scm (gcc-7): Update to 7.3.0. --- gnu/packages/gcc.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index ad8992289d..48e7b8ee3a 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès -;;; Copyright © 2014, 2015 Mark H Weaver +;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2014, 2015, 2016, 2017 Ricardo Wurmus ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015, 2016, 2017 Efraim Flashner @@ -418,14 +418,14 @@ Go. It also includes runtime support libraries for these languages.") (define-public gcc-7 (package (inherit gcc-6) - (version "7.2.0") + (version "7.3.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gcc/gcc-" version "/gcc-" version ".tar.xz")) (sha256 (base32 - "16j7i0888j2f1yp9l0nhji6cq65dy6y4nwy8868a8njbzzwavxqw")) + "0p71bij6bfhzyrs8676a8jmpjsfz392s2rg862sdnsk30jpacb43")) (patches (search-patches "gcc-strmov-store-file-names.patch" "gcc-5.0-libvtv-runpath.patch")))) (description -- cgit 1.4.1 From dbe64d1029f21ac085fa0d6dc88f8e4896016f18 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 25 Jan 2018 14:13:57 -0500 Subject: gnu: linux-libre: Add retpoline support on x86 [mitigates spectre]. * gnu/packages/linux.scm (make-linux-libre): On x86 systems, build with GCC-7. --- gnu/packages/linux.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 82f077668c..ee7f391b94 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -283,6 +283,14 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." ("bc" ,bc) ("openssl" ,openssl) ("kmod" ,kmod) + ;; On x86, build with GCC-7 for full retpoline support. + ;; FIXME: Remove this when our default compiler has retpoline support. + ,@(match (system->linux-architecture + (or (%current-target-system) (%current-system))) + ((or "x86_64" "i386") + `(("gcc" ,gcc-7))) + (_ + '())) ,@(match (and configuration-file (configuration-file (system->linux-architecture -- cgit 1.4.1 From c2c0d66162152b05fc42fdd1be5f07b9eca3bc66 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 25 Jan 2018 22:42:53 +0300 Subject: gnu: Add cava. * gnu/packages/audio.scm (cava): New public variable. --- gnu/packages/audio.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 0046f9a73d..bd3d139efe 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -3264,3 +3265,54 @@ the following features: transforms (FFTs) of the sound being played, as well as other graphical representations.") (license license:expat))) + +(define-public cava + (package + (name "cava") + (version "0.6.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/karlstav/cava/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1p24lz3h4d0h82ffylqr7mq8a8x1c66flm2r2bsv1liw51n1rma2")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) + (inputs + `(("fftw" ,fftw) + ("ncurses" ,ncurses) + ("pulseaudio" ,pulseaudio))) + (arguments + `(#:configure-flags + (list (string-append "PREFIX=" %output) + (string-append "FONT_DIR=" %output "/usr/share/consolefonts")) + #:make-flags + (let ((lib (string-append %output "/lib"))) + (list (string-append "cava_LDFLAGS = -L" lib " -Wl,-rpath " lib))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'bootstrap + (lambda* (#:key outputs #:allow-other-keys) + (setenv "HOME" (getcwd)) + (invoke "sh" "autogen.sh"))) + (add-before 'build 'make-cava-ldflags + (lambda* (#:key outputs #:allow-other-keys) + (mkdir-p (string-append (assoc-ref outputs "out") "/lib")))) + (add-after 'install 'data + (lambda* (#:key outputs #:allow-other-keys) + (for-each (lambda (file) + (install-file file + (string-append (assoc-ref outputs "out") + "/share/doc/examples"))) + (find-files "example_files"))))))) + (home-page "https://karlstav.github.io/cava/") + (synopsis "Console audio visualizer for ALSA, MPD, and PulseAudio") + (description "C.A.V.A. is a bar audio spectrum visualizer for the terminal +using ALSA, MPD, PulseAudio, or a FIFO buffer as its input.") + (license license:expat))) -- cgit 1.4.1 From ca4c7d4cd44b14b98c8b142c98a80dadd98635d5 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 25 Jan 2018 16:52:25 -0500 Subject: gnu: linux-libre@4.1: Update to 4.1.49. * gnu/packages/linux.scm (linux-libre-4.1): Update to 4.1.49. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ee7f391b94..869b4f752b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -404,8 +404,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.1 - (make-linux-libre "4.1.48" - "13ii6ixcm46hzk1ns6n4hrrv4dyc0n3wvj2qhmxi178akdcgbn8a" + (make-linux-libre "4.1.49" + "0dklmqj6ayjlkz97b811zdvpgb3yppahinji9l9jmkz4ssi7a1gs" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit 1.4.1 From 98a11b7fcea74225c1b35e7f28631d7d22133388 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 19 Jan 2018 02:52:22 +0100 Subject: gnu: Add gcab. * gnu/packages/package-management.scm (gcab): New public variable. --- gnu/packages/package-management.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 782d336eea..ced7642ce0 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -34,6 +34,7 @@ #:use-module (gnu packages databases) #:use-module (gnu packages file) #:use-module (gnu packages gettext) + #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) #:use-module (gnu packages gnuzilla) #:use-module (gnu packages graphviz) @@ -803,3 +804,29 @@ on top of GNU Guix.") ;; the web interface modules in gwl/ are licensed AGPL3+, ;; and the fonts included in this package are licensed OFL1.1. (license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) + +(define-public gcab + (package + (name "gcab") + (version "0.7") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 + "1vxdsiky3492zlyrym02sdwf09y19rl2z5h5iin7qm0wizw5wvm1")))) + (build-system gnu-build-system) + (native-inputs + `(("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (inputs + `(("glib" ,glib) + ("zlib" ,zlib))) + (home-page "https://wiki.gnome.org/msitools") ; no dedicated home page + (synopsis "Microsoft Cabinet file manipulation library") + (description + "The libgcab library provides GObject functions to read, write, and modify +Microsoft cabinet (.@dfn{CAB}) files.") + (license (list license:gpl2+ ; tests/testsuite.at + license:lgpl2.1+)))) ; the rest -- cgit 1.4.1 From cb3909256d42b304cc8f1705d43d98ebeee3f6ad Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 19 Jan 2018 02:52:23 +0100 Subject: gnu: Add msitools. * gnu/packages/package-management.scm (msitools): New public variable. --- gnu/packages/package-management.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index ced7642ce0..a890dca403 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -35,10 +35,12 @@ #:use-module (gnu packages file) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages gnuzilla) #:use-module (gnu packages graphviz) #:use-module (gnu packages guile) + #:use-module (gnu packages linux) #:use-module (gnu packages lisp) #:use-module (gnu packages man) #:use-module (gnu packages nettle) @@ -56,6 +58,7 @@ #:use-module (gnu packages tls) #:use-module (gnu packages vim) #:use-module (gnu packages web) + #:use-module (gnu packages xml) #:use-module (guix build-system emacs) #:use-module (guix build-system gnu) #:use-module (guix build-system python) @@ -830,3 +833,31 @@ on top of GNU Guix.") Microsoft cabinet (.@dfn{CAB}) files.") (license (list license:gpl2+ ; tests/testsuite.at license:lgpl2.1+)))) ; the rest + +(define-public msitools + (package + (name "msitools") + (version "0.97") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 + "0pn6izlgwi4ngpk9jk2n38gcjjpk29nm15aad89bg9z3k9n2hnrs")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("gcab" ,gcab) + ("glib" ,glib) + ("libgsf" ,libgsf) + ("libxml2" ,libxml2) + ("uuid" ,util-linux))) + (home-page "https://wiki.gnome.org/msitools") + (synopsis "Windows Installer file manipulation tool") + (description + "msitools is a collection of command-line tools to inspect, extract, build, +and sign Windows@tie{}Installer (.@dfn{MSI}) files. It aims to be a solution +for packaging and deployment of cross-compiled Windows applications.") + (license license:lgpl2.1+))) -- cgit 1.4.1 From 318bc42946af13e20dc6e4ec4b3e526f68de48f7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 19 Jan 2018 02:52:24 +0100 Subject: gnu: appstream-glib: Update to 0.7.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/glib.scm (appstream-glib): Update to 0.7.4. [build-system]: Switch to meson-build-system. [native-inputs]: Add gettext and glib:bin. [inputs]: Add gcab, gperf, and libyaml. Remove nettle. [arguments]: Adapt #:configure-flags to new build system. Patch fewer tests in ‘patch-tests’ phase. --- gnu/packages/glib.scm | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 3b818164dc..5b1d203e9d 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Petter +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,19 +36,23 @@ #:use-module (gnu packages flex) #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) + #:use-module (gnu packages gperf) #:use-module (gnu packages gtk) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) #:use-module (gnu packages m4) #:use-module (gnu packages nettle) #:use-module (gnu packages pcre) + #:use-module (gnu packages package-management) #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #: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 download) @@ -714,7 +719,7 @@ programming langauage. It also contains the utility (define-public appstream-glib (package (name "appstream-glib") - (version "0.6.7") + (version "0.7.4") (source (origin (method url-fetch) (uri (string-append "https://people.freedesktop.org/~hughsient/" @@ -722,30 +727,35 @@ programming langauage. It also contains the utility "appstream-glib-" version ".tar.xz")) (sha256 (base32 - "08mrf4k0jhnpdd4fig2grmi2vbxkgdhrwk0d0zq0j1wp5ip7arwp")))) - (build-system gnu-build-system) + "09f8lq8nkr3gaws7fc3pzyz12lhz771l1p7lv8ni8z1gi470r7d0")))) + (build-system meson-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") ; for glib-compile-resources + ("pkg-config" ,pkg-config))) (inputs `(("gdk-pixbuf" ,gdk-pixbuf) + ("gcab" ,gcab) ("glib" ,glib) + ("gperf" ,gperf) ("gtk+" ,gtk+) ("json-glib" ,json-glib) ("libarchive" ,libarchive) ("libsoup" ,libsoup) - ("nettle" ,nettle) - ("util-linux" ,util-linux))) + ("libyaml" ,libyaml) + ("util-linux" ,util-linux))) ; for libuuid (arguments `(#:configure-flags - '("--disable-firmware" "--disable-dep11") + (list "-Denable-dep11=false" + "-Denable-introspection=false" ; avoid g-ir-scanner dependency + "-Denable-rpm=false" + "-Denable-stemmer=false") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-tests (lambda _ (substitute* "libappstream-glib/as-self-test.c" - (("g_test_add_func.*as_test_store_local_appdata_func);") "") - (("g_test_add_func.*as_test_store_speed_appdata_func);") "") - (("g_test_add_func.*as_test_store_speed_desktop_func);") "")) + (("g_test_add_func.*as_test_store_local_appdata_func);") "")) #t))))) (home-page "https://github.com/hughsie/appstream-glib") (synopsis "Library for reading and writing AppStream metadata") -- cgit 1.4.1 From 4525e7c7f4b87ddae66d11f0c3d1d507cebaeab4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Jan 2018 06:04:07 +0100 Subject: gnu: nss-mdns: Update to 0.11. * gnu/packages/avahi.scm (nss-mdns): Update to 0.11 [source, home-page]: Use new project URI. --- gnu/packages/avahi.scm | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index 73e63ab0dc..8f87bc40c5 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2017 Ludovic Courtès ;;; Copyright © 2014 Mark H Weaver +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -76,35 +77,22 @@ DNS-SD (for \"DNS-Based Service Discovery\") protocols.") (define-public nss-mdns (package (name "nss-mdns") - (version "0.10") + (version "0.11") (source (origin (method url-fetch) - (uri (list - (string-append - "mirror://debian/pool/main/n/nss-mdns/nss-mdns_" - version ".orig.tar.gz") - "http://pkgs.fedoraproject.org/repo/pkgs/nss-mdns/nss-mdns-0.10.tar.gz/03938f17646efbb50aa70ba5f99f51d7/nss-mdns-0.10.tar.gz" - - ;; This used to be the canonical URL but it vanished. - ;; See . - ;; (string-append - ;; "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-" - ;; version ".tar.gz") - )) + (uri (string-append "https://github.com/lathiat/nss-mdns" + "/releases/download/v" version "/" + name "-" version ".tar.gz")) (sha256 (base32 - "0vgs6j0qsl0mwzh5a0m0bykr7x6bx79vnbyn0r3q289rghp3qs0y")) - (file-name (string-append name "-" version ".tar.gz")))) + "14jwy6mklzgjz3mfmw67mxhszrw9d3d3yjjhg87j4crci6m19i39")))) (build-system gnu-build-system) (arguments ;; The Avahi daemon socket is expected by src/Makefile.am to be at ;; "$(localstatedir)/run/avahi-daemon/socket", so set $(localstatedir) ;; appropriately. '(#:configure-flags '("--localstatedir=/var"))) - - ;; XXX: Stale URL, missing replacement. See . - (home-page "http://0pointer.de/lennart/projects/nss-mdns/") - + (home-page "https://github.com/lathiat/nss-mdns") (synopsis "The mDNS Name Service Switch (NSS) plug-in") (description "Nss-mdns is a plug-in for the Name Service Switch (NSS) functionality -- cgit 1.4.1 From e80611c4550577d7ce0578d79dafe479f8350289 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Jan 2018 06:45:29 +0100 Subject: gnu: nss-mdns: Improve synopsis and description. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/avahi.scm (nss-mdns)[synopis, description]: Edit to appease ‘guix lint’ and, I hope, be a bit more clear. --- gnu/packages/avahi.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index 8f87bc40c5..f4d17c5c15 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -93,10 +93,10 @@ DNS-SD (for \"DNS-Based Service Discovery\") protocols.") ;; appropriately. '(#:configure-flags '("--localstatedir=/var"))) (home-page "https://github.com/lathiat/nss-mdns") - (synopsis "The mDNS Name Service Switch (NSS) plug-in") + (synopsis "Multicast DNS Name Service Switch (@dfn{NSS}) plug-in") (description - "Nss-mdns is a plug-in for the Name Service Switch (NSS) functionality -of the GNU C Library, providing host name resolution via Multicast DNS (mDNS). -It allows for name resolution by programs in the ad-hoc mDNS domain -'.local'.") + "Nss-mdns is a plug-in for the GNU C Library's Name Service Switch +(@dfn{NSS}) that resolves host names via multicast DNS (@dfn{mDNS}). It is +most often used in home and other small networks without a local name server, +to resolve host names in the @samp{.local} top-level domain.") (license lgpl2.1+))) -- cgit 1.4.1 From 218b94f3b8c5a01cd348b125c8d8dcd66225a220 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Jan 2018 02:03:46 +0100 Subject: gnu: reposurgeon: Update to 3.43. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (reposurgeon): Update to 3.43. [source]: Add a patch needed to build the package. [arguments]: Add ‘patch-inputs’ phase. [native-inputs]: Replace docbook-xml-4.1.2 with the latest docbook-xml. [inputs]: Add tzdata. * gnu/packages/patches/reposurgeon-add-missing-docbook-files.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + .../reposurgeon-add-missing-docbook-files.patch | 22 ++++++++++++++++++++++ gnu/packages/version-control.scm | 20 +++++++++++++++----- 3 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/reposurgeon-add-missing-docbook-files.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index fae837ddaf..80d6a8d4c4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1058,6 +1058,7 @@ dist_patch_DATA = \ %D%/packages/patches/readline-link-ncurses.patch \ %D%/packages/patches/readline-6.2-CVE-2014-2524.patch \ %D%/packages/patches/readline-7.0-mingw.patch \ + %D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \ %D%/packages/patches/reptyr-fix-gcc-7.patch \ %D%/packages/patches/ripperx-missing-file.patch \ %D%/packages/patches/rpcbind-CVE-2017-8779.patch \ diff --git a/gnu/packages/patches/reposurgeon-add-missing-docbook-files.patch b/gnu/packages/patches/reposurgeon-add-missing-docbook-files.patch new file mode 100644 index 0000000000..707d032744 --- /dev/null +++ b/gnu/packages/patches/reposurgeon-add-missing-docbook-files.patch @@ -0,0 +1,22 @@ +Author: Tobias Geerinckx-Rice +Upstream issue: + +Two files required to build the documentation (including man pages) are +not included in the latest reposurgeon release, breaking ‘make all’. + +Luckily, they are tiny: + +--- a/docbook-extra.xml 1970-01-01 01:00:00.000000000 +0100 ++++ b/docbook-extra.xml 2018-01-25 00:17:18.236727017 +0100 +@@ -0,0 +1,5 @@ ++ ++ ++ ++1 ++ +diff -Naur reposurgeon-3.43/nofooter.conf reposurgeon-3.43-b/nofooter.conf +--- a/nofooter.conf 1970-01-01 01:00:00.000000000 +0100 ++++ b/nofooter.conf 2018-01-25 00:23:15.384498847 +0100 +@@ -0,0 +1,2 @@ ++[footer-text] ++ diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 976849b184..ded181e8ab 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2015, 2017 Ricardo Wurmus ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016, 2017, 2018 ng0 -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 André @@ -1318,14 +1318,16 @@ any project with more than one developer, is one of Aegis's major functions.") (define-public reposurgeon (package (name "reposurgeon") - (version "3.37") + (version "3.43") (source (origin (method url-fetch) (uri (string-append "http://www.catb.org/~esr/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "14asjg4xy3mhh5z0r3k7c1wv9y803j2zfq32g5q5m95sf7yzygan")))) + "1af0z14wcm4bk5a9ysinbwq2fp3lf5f7i8mvwh7286hr3fnagcaz")) + (patches (search-patches + "reposurgeon-add-missing-docbook-files.patch")))) (build-system gnu-build-system) (arguments `(#:tests? #f ;no test suite distributed @@ -1333,6 +1335,13 @@ any project with more than one developer, is one of Aegis's major functions.") (list (string-append "target=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-inputs + (lambda* (#:key inputs #:allow-other-keys) + (let ((tzdata (assoc-ref inputs "tzdata"))) + (substitute* "reposurgeon" + (("/usr/share/zoneinfo") + (string-append tzdata "/share/zoneinfo"))) + #t))) (delete 'configure) (add-before 'build 'fix-docbook (lambda* (#:key inputs #:allow-other-keys) @@ -1347,10 +1356,11 @@ any project with more than one developer, is one of Aegis's major functions.") (string-append (assoc-ref outputs "out") "/share/emacs/site-lisp"))))))) (inputs - `(("python" ,python-wrapper))) + `(("python" ,python-wrapper) + ("tzdata" ,tzdata))) (native-inputs `(("asciidoc" ,asciidoc) - ("docbook-xml" ,docbook-xml-4.1.2) + ("docbook-xml" ,docbook-xml) ("docbook-xsl" ,docbook-xsl) ("libxml2" ,libxml2) ("xmlto" ,xmlto))) -- cgit 1.4.1 From 33ecc7a4d1144db1acc331bf16819d5cfe990cc9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Jan 2018 02:11:14 +0100 Subject: gnu: reposurgeon: Run the test suite. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (reposurgeon)[arguments]: Run tests. Add #:make-flags and extend the ‘patch-inputs’ phase to find echo. Add new ‘set-up-test-environment’ phase. [native-inputs]: Add cvs, git, mercurial, and subversion. --- gnu/packages/version-control.scm | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index ded181e8ab..a8b06b9ab2 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1330,9 +1330,9 @@ any project with more than one developer, is one of Aegis's major functions.") "reposurgeon-add-missing-docbook-files.patch")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;no test suite distributed - #:make-flags - (list (string-append "target=" (assoc-ref %outputs "out"))) + `(#:make-flags + (list "ECHO=echo" + (string-append "target=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-inputs @@ -1341,8 +1341,10 @@ any project with more than one developer, is one of Aegis's major functions.") (substitute* "reposurgeon" (("/usr/share/zoneinfo") (string-append tzdata "/share/zoneinfo"))) + (substitute* "test/svn-to-svn" + (("/bin/echo") "echo")) #t))) - (delete 'configure) + (delete 'configure) ; no configure script (add-before 'build 'fix-docbook (lambda* (#:key inputs #:allow-other-keys) (substitute* (find-files "." "\\.xml$") @@ -1350,6 +1352,11 @@ any project with more than one developer, is one of Aegis's major functions.") (string-append (assoc-ref inputs "docbook-xml") "/xml/dtd/docbook/docbookx.dtd"))) #t)) + (add-before 'check 'set-up-test-environment + (lambda* (#:key inputs #:allow-other-keys) + (let ((tzdata (assoc-ref inputs "tzdata"))) + (setenv "TZDIR" (string-append tzdata "/share/zoneinfo")) + #t))) (add-after 'install 'install-emacs-data (lambda* (#:key outputs #:allow-other-keys) (install-file "reposurgeon-mode.el" @@ -1359,11 +1366,18 @@ any project with more than one developer, is one of Aegis's major functions.") `(("python" ,python-wrapper) ("tzdata" ,tzdata))) (native-inputs - `(("asciidoc" ,asciidoc) + `( ;; For building documentation. + ("asciidoc" ,asciidoc) ("docbook-xml" ,docbook-xml) ("docbook-xsl" ,docbook-xsl) ("libxml2" ,libxml2) - ("xmlto" ,xmlto))) + ("xmlto" ,xmlto) + + ;; For tests. + ("cvs" ,cvs) + ("git" ,git) + ("mercurial" ,mercurial) + ("subversion" ,subversion))) (home-page "http://www.catb.org/~esr/reposurgeon/") (synopsis "Edit version-control repository history") (description "Reposurgeon enables risky operations that version-control -- cgit 1.4.1 From 2062eae76f89665a2ec12aab3dd1a2196547fd63 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 24 Jan 2018 18:11:09 +0100 Subject: gnu: elfutils: Update to 0.170. * gnu/packages/elf.scm (elfutils): Update to 0.170. --- gnu/packages/elf.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index c81976a479..5cdf9cafa3 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2017 Leo Famulari +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,14 +33,14 @@ (define-public elfutils (package (name "elfutils") - (version "0.169") + (version "0.170") (source (origin (method url-fetch) (uri (string-append "https://sourceware.org/elfutils/ftp/" version "/elfutils-" version ".tar.bz2")) (sha256 (base32 - "1hiv1yqig3292dwqhrwsxwk3qjalxp5fpl8yphwbfwh8ng3zl4ll")) + "0rp0r54z44is49c594qy7hr211nhb00aa5y7z74vsybbaxslg10z")) (patches (search-patches "elfutils-tests-ptrace.patch")))) (build-system gnu-build-system) -- cgit 1.4.1 From 5b707ab60199c34eb9c430460d1ac0dea3dc446d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 24 Jan 2018 18:12:10 +0100 Subject: gnu: elfutils: Mark up description. * gnu/packages/elf.scm (elfutils)[description]: Use @dfn and @command. --- gnu/packages/elf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 5cdf9cafa3..876014a850 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -62,8 +62,8 @@ (synopsis "Linker and ELF manipulation tools") (description "This package provides command-line tools to manipulate binaries in the -Executable and Linkable Format (ELF). This includes ld, ar, objdump, -addr2line, and more.") +Executable and Linkable Format (@dfn{ELF}). This includes @command{ld}, +@command{ar}, @command{objdump}, @command{addr2line}, and more.") ;; Libraries are dual-licensed LGPLv3.0+ | GPLv2, and programs are GPLv3+. (license lgpl3+))) -- cgit 1.4.1 From cd70f9bdb0f46acf3fecb5254b7df46dd258fe5b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Jan 2018 21:03:31 +0100 Subject: gnu: deeptools: Update URI. * gnu/packages/bioinformatics.scm (deeptools)[source, home-page]: Update URI. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c96d462445..4d05aeb4c2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2039,7 +2039,7 @@ with Python.") (version "2.5.1") (source (origin (method url-fetch) - (uri (string-append "https://github.com/fidelram/deepTools/" + (uri (string-append "https://github.com/deeptools/deepTools/" "archive/" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 @@ -2058,7 +2058,7 @@ with Python.") `(("python-mock" ,python-mock) ;for tests ("python-nose" ,python-nose) ;for tests ("python-pytz" ,python-pytz))) ;for tests - (home-page "https://github.com/fidelram/deepTools") + (home-page "https://github.com/deeptools/deepTools") (synopsis "Tools for normalizing and visualizing deep-sequencing data") (description "DeepTools addresses the challenge of handling the large amounts of data -- cgit 1.4.1 From bbf9092b9df0031bb3e903b3614cb73510dc4b91 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Jan 2018 21:13:25 +0100 Subject: gnu: 4store: Update URI. * gnu/packages/databases.scm (4store)[source, home-page]: Update URI. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c0cf41a5bc..4b2bdb6d30 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -112,7 +112,7 @@ (version "1.1.6") (source (origin (method url-fetch) - (uri (string-append "https://github.com/garlik/4store/archive/v" + (uri (string-append "https://github.com/4store/4store/archive/v" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 @@ -145,7 +145,7 @@ (lambda _ (zero? (system* "sh" "autogen.sh"))))))) ;; http://www.4store.org has been down for a while now. - (home-page "https://github.com/garlik/4store") + (home-page "https://github.com/4store/4store") (synopsis "Clustered RDF storage and query engine") (description "4store is a RDF/SPARQL store written in C, supporting either single machines or networked clusters.") -- cgit 1.4.1 From 6d688b6e5e85a6112f78cb214236e4f39deca885 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 26 Jan 2018 00:21:04 +0100 Subject: gnu: keybinder: Update URI. * gnu/packages/wm.scm (keybinder)[source, home-page]: Update URI. --- gnu/packages/wm.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 8098560e4c..75e4bb63fd 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -809,8 +809,8 @@ all of them. Currently supported window managers include: (source (origin (method url-fetch) - (uri (string-append "https://github.com/engla/keybinder/releases/" - "download/v" version "/keybinder-" + (uri (string-append "https://github.com/kupferlauncher/keybinder" + "/releases/download/v" version "/keybinder-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 @@ -828,7 +828,7 @@ all of them. Currently supported window managers include: (description "Keybinder is a library for registering global keyboard shortcuts. Keybinder works with GTK-based applications using the X Window System.") - (home-page "https://github.com/engla/keybinder") + (home-page "https://github.com/kupferlauncher/keybinder") (license license:gpl2+))) (define-public spectrwm -- cgit 1.4.1 From 187e4a4b6d7856dfa70506f2fc4a6e059d9fbd5e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 26 Jan 2018 00:31:18 +0100 Subject: gnu: perl-mime-types: Update to 2.16. * gnu/packages/perl.scm (perl-mime-types): Update to 2.16. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index c1bc776469..f79a11f769 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -4610,7 +4610,7 @@ messages.") (define-public perl-mime-types (package (name "perl-mime-types") - (version "2.14") + (version "2.16") (source (origin (method url-fetch) @@ -4618,7 +4618,7 @@ messages.") "MIME-Types-" version ".tar.gz")) (sha256 (base32 - "0w00fdci07cc6k1v4zaib4icggqjmg8hggpx4lzqj1ajq07wyja0")))) + "0nkv99yd8bxa6h8c52nd07142f0mdzjnhcdw66s3wljmzsi9z8hk")))) (build-system perl-build-system) (home-page "http://search.cpan.org/dist/MIME-Types/") (synopsis "Definition of MIME types") -- cgit 1.4.1 From c92f98ad51f86182a72f30a8d4dd232d67145944 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 26 Jan 2018 00:58:19 +0100 Subject: gnu: conky: Update to 1.10.7. * gnu/packages/conky.scm (conky): Update to 1.10.7. [arguments]: Use pkg-config to find ncurses. [inputs]: Add imlib2 and libxext. --- gnu/packages/conky.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/conky.scm b/gnu/packages/conky.scm index f0f19c5a0e..2301bfbdf1 100644 --- a/gnu/packages/conky.scm +++ b/gnu/packages/conky.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Siniša Biđin +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,15 +25,16 @@ #:use-module (guix build-system cmake) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages fontutils) - #:use-module (gnu packages ncurses) + #:use-module (gnu packages image) #:use-module (gnu packages lua) + #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) #:use-module (gnu packages xorg)) (define-public conky (package (name "conky") - (version "1.10.6") + (version "1.10.7") (source (origin (method url-fetch) @@ -40,15 +42,12 @@ version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1jk0my7z45vz9vd8958d27nkk4kvr53k7wyf6cz2x9xjc0lri02c")))) + (base32 "1b06rigfjxnaidkabkyf8mdh9k3jm11nj547lb5liwi2ql4rdfr3")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; there are no tests #:configure-flags - '("-DRELEASE=true" - ;; XXX: it checks ncurses with pkg-config. - ;; TODO: add 'ncurses.pc' to the ncurses package. - "-DBUILD_NCURSES=false") + (list "-DRELEASE=true") #:phases (modify-phases %standard-phases (add-after 'unpack 'add-freetype-to-search-path @@ -67,12 +66,14 @@ #t))))) (inputs `(("freetype" ,freetype) - ("ncurses" ,ncurses) + ("imlib2" ,imlib2) ("libx11" ,libx11) ("libxdamage" ,libxdamage) + ("libxext" ,libxext) ("libxft" ,libxft) ("libxinerama" ,libxinerama) - ("lua" ,lua))) + ("lua" ,lua) + ("ncurses" ,ncurses))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://github.com/brndnmtthws/conky") -- cgit 1.4.1 From 1b4b6683657abd70ba7810a40038432ec3779364 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 26 Jan 2018 01:03:17 +0100 Subject: gnu: ncdc: Update to 1.20. * gnu/packages/dc.scm (ncdc): Update to 1.20. --- gnu/packages/dc.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dc.scm b/gnu/packages/dc.scm index de4cda1fad..6c6687a951 100644 --- a/gnu/packages/dc.scm +++ b/gnu/packages/dc.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Sree Harsha Totakura +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,14 +33,14 @@ (define-public ncdc (package (name "ncdc") - (version "1.19") + (version "1.20") (source (origin (method url-fetch) (uri (string-append "http://dev.yorhel.nl/download/ncdc-" version ".tar.gz")) (sha256 (base32 - "1wgvqwfxq9kc729h2r528n55821w87sfbm4h21mr6pvkpfw30hf2")))) + "0ccn7dqbqpqsbglqyalz32c20rjvf1pw0zr88jyvd2b2vxbqi6ca")))) (build-system gnu-build-system) (inputs `(("bzip2" ,bzip2) -- cgit 1.4.1 From 98b49626d42dd18c3dcbc49a3f85790c3b1a25b7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 26 Jan 2018 01:03:31 +0100 Subject: gnu: ncdc: Use HTTPS for home page. * gnu/packages/dc.scm (ncdc)[home-page]: Use HTTPS. --- gnu/packages/dc.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/dc.scm b/gnu/packages/dc.scm index 6c6687a951..ae019da6e8 100644 --- a/gnu/packages/dc.scm +++ b/gnu/packages/dc.scm @@ -51,7 +51,7 @@ ("zlib" ,zlib))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://dev.yorhel.nl/ncdc") + (home-page "https://dev.yorhel.nl/ncdc") (synopsis "Lightweight direct connect client with a friendly ncurses interface") (description -- cgit 1.4.1 From 44118720c0f0af0b16ccdf5fd36f03a1ff0677ff Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 26 Jan 2018 01:51:59 +0100 Subject: gnu: gcab: Update to 1.0 [fixes CVE-2018-5345]. * gnu/packages/package-management.scm (gcab): Update to 1.0. [build-system]: Switch to meson-build-system. [native-inputs]: Add glib:bin and vala. [arguments]: Don't build developer documentation. Disable introspection, thanks. --- gnu/packages/package-management.scm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index a890dca403..3b7dfe7d2e 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -61,6 +61,7 @@ #:use-module (gnu packages xml) #:use-module (guix build-system emacs) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (guix download) #:use-module (guix gexp) @@ -811,21 +812,29 @@ on top of GNU Guix.") (define-public gcab (package (name "gcab") - (version "0.7") + (version "1.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1vxdsiky3492zlyrym02sdwf09y19rl2z5h5iin7qm0wizw5wvm1")))) - (build-system gnu-build-system) + "1ji8j8pnxqaycbp9ydi2zq7gcr02c2vw4qnc198i6jwy9zkh2x19")))) + (build-system meson-build-system) (native-inputs - `(("intltool" ,intltool) - ("pkg-config" ,pkg-config))) + `(("glib:bin" ,glib "bin") ; for glib-mkenums + ("intltool" ,intltool) + ("pkg-config" ,pkg-config) + ("vala" ,vala))) (inputs `(("glib" ,glib) ("zlib" ,zlib))) + (arguments + `(#:configure-flags + ;; XXX This ‘documentation’ is for developers, and fails informatively: + ;; Error in gtkdoc helper script: 'gtkdoc-mkhtml' failed with status 5 + (list "-Ddocs=false" + "-Dintrospection=false"))) (home-page "https://wiki.gnome.org/msitools") ; no dedicated home page (synopsis "Microsoft Cabinet file manipulation library") (description -- cgit 1.4.1 From b1de6129e71057cfab6da05bec262fd43e927914 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 26 Jan 2018 02:14:20 +0100 Subject: gnu: appstream-glib: Update to 0.7.5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/glib.scm (appstream-glib): Update to 0.7.5. [arguments]: Drop ‘enable-’ prefix from Meson options. --- gnu/packages/glib.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 5b1d203e9d..2c339c17df 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -719,7 +719,7 @@ programming langauage. It also contains the utility (define-public appstream-glib (package (name "appstream-glib") - (version "0.7.4") + (version "0.7.5") (source (origin (method url-fetch) (uri (string-append "https://people.freedesktop.org/~hughsient/" @@ -727,7 +727,7 @@ programming langauage. It also contains the utility "appstream-glib-" version ".tar.xz")) (sha256 (base32 - "09f8lq8nkr3gaws7fc3pzyz12lhz771l1p7lv8ni8z1gi470r7d0")))) + "0ps80cbqnf3q86rvz3ajqjssdgkjc9kmynqf0wxqfir7ayc9y9ag")))) (build-system meson-build-system) (native-inputs `(("gettext" ,gettext-minimal) @@ -746,10 +746,10 @@ programming langauage. It also contains the utility ("util-linux" ,util-linux))) ; for libuuid (arguments `(#:configure-flags - (list "-Denable-dep11=false" - "-Denable-introspection=false" ; avoid g-ir-scanner dependency - "-Denable-rpm=false" - "-Denable-stemmer=false") + (list "-Ddep11=false" + "-Dintrospection=false" ; avoid g-ir-scanner dependency + "-Drpm=false" + "-Dstemmer=false") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-tests -- cgit 1.4.1 From a81f7eb858bf7e320d4dccde183d303247b6d47a Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Fri, 26 Jan 2018 12:47:02 +1000 Subject: gnu: diamond: Update to 0.9.15. * gnu/packages/bioinformatics.scm (diamond): Update to 0.9.15. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4d05aeb4c2..01f35dbb33 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2074,7 +2074,7 @@ identify enrichments with functional annotations of the genome.") (define-public diamond (package (name "diamond") - (version "0.9.14") + (version "0.9.15") (source (origin (method url-fetch) (uri (string-append @@ -2083,7 +2083,7 @@ identify enrichments with functional annotations of the genome.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "07li3chjdna0wjyh680j3bhwiqh1fbfq9dy9jxxs82mc0rw0m1yy")))) + "0c9v0lddz8df5pnra464832cgn1igzpawgsknly7s1mq0qk9aiqj")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no "check" target -- cgit 1.4.1