From a9afb956b3232ccfb7deaf3feed02b60a12d65bf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 27 Oct 2016 14:14:40 +0100 Subject: gnu: vim: Update to 8.0.0051. * gnu/packages/vim.scm (vim): Update to 8.0.0051. [source]: Change to github release archive. --- gnu/packages/vim.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 4ee8c7d9fc..d1aebd666c 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -48,14 +48,15 @@ (define-public vim (package (name "vim") - (version "8.0") + (version "8.0.0051") (source (origin (method url-fetch) - (uri (string-append "ftp://ftp.vim.org/pub/vim/unix/vim-" - version ".tar.bz2")) + (uri (string-append "https://github.com/vim/vim/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1s34rf8089klsbdx5l0iw7vjymir0kzfrx8wb30s31wygnq29axc")))) + "18b0mb5kbv61a299y8y6kvm0fg7nrcgrzd1jk3n4863dbkv7hsnz")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From fba78d18c2fe0e30464cdc57e929c123e1e22a19 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Fri, 28 Oct 2016 15:42:11 -0500 Subject: gnu: mumps: Upgrade to 5.0.2. * gnu/packages/maths.scm (mumps): Upgrade to 5.0.2. [arguments]: Properly return boolean from install phase. --- gnu/packages/maths.scm | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0fa97327da..64e53e2dd7 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1225,7 +1225,7 @@ arising after the discretization of partial differential equations.") (define-public mumps (package (name "mumps") - (version "5.0.1") + (version "5.0.2") (source (origin (method url-fetch) @@ -1233,7 +1233,7 @@ arising after the discretization of partial differential equations.") version ".tar.gz")) (sha256 (base32 - "1820jfp3mbl7n85765v5mp6p0gzqpgr4d2lrnhwj4gl7cwp5ndah")) + "0igyc1pfzxdhpbad3v3lb86ixkdbqa1a8gbs15b04r2294h2nabp")) (patches (search-patches "mumps-build-parallelism.patch")))) (build-system gnu-build-system) (inputs @@ -1250,8 +1250,7 @@ arising after the discretization of partial differential equations.") ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases - (replace - 'configure + (replace 'configure (lambda* (#:key inputs #:allow-other-keys) (call-with-output-file "Makefile.inc" (lambda (port) @@ -1312,15 +1311,13 @@ IORDERINGSC = $(IPORD) $(IMETIS) $(ISCOTCH)" `((,ptscotch "-lptesmumps -lptscotch -lptscotcherr " "-Dptscotch"))))))))) - (replace - 'build + (replace 'build ;; By default only the d-precision library is built. Make with "all" ;; target so that all precision libraries and examples are built. (lambda _ (zero? (system* "make" "all" (format #f "-j~a" (parallel-job-count)))))) - (replace - 'check + (replace 'check ;; Run the simple test drivers, which read test input from stdin: ;; from the "real" input for the single- and double-precision ;; testers, and from the "cmplx" input for complex-precision @@ -1343,15 +1340,15 @@ IORDERINGSC = $(IPORD) $(IMETIS) $(ISCOTCH)" (zero? (close-pipe tester))))) '("s" "d" "c" "z") '("real" "real" "cmplx" "cmplx"))))) - (replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (copy-recursively "lib" (string-append out "/lib")) - (copy-recursively "include" (string-append out "/include")) - (when (file-exists? "libseq/libmpiseq.a") - (copy-file "libseq/libmpiseq.a" - (string-append out "/lib/libmpiseq.a"))))))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (libdir (string-append out "/lib"))) + (copy-recursively "lib" libdir) + (copy-recursively "include" (string-append out "/include")) + (when (file-exists? "libseq/libmpiseq.a") + (install-file "libseq/libmpiseq.a" libdir)) + #t)))))) (home-page "http://mumps.enseeiht.fr") (synopsis "Multifrontal sparse direct solver") (description -- cgit v1.2.3 From a56b3229f4c3dd3937ea578e8bf5c6c486861b8e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 28 Oct 2016 20:09:02 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.28. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.28. --- 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 3db3a58a02..c97f4baa2b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -330,8 +330,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.27" - "07g0y8zbspw8d65386llcsnqlbv2s24dxvvbwm9kwm87rk3vin1r" + (make-linux-libre "4.4.28" + "1yn74vci0bygn5bi9mcgx1zz8xw9m3jb6j260wqsgkv1hbksa2yp" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From b8df914f370eacf728cfe9969440e6963172517b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 28 Oct 2016 20:11:20 -0400 Subject: gnu: linux-libre: Update to 4.8.5. * gnu/packages/linux.scm (%linux-libre-version, %linux-libre-hash) (linux-libre): Update to 4.8.5. --- gnu/packages/linux.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c97f4baa2b..934a67f182 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -324,8 +324,8 @@ It has been modified to remove all non-free binary blobs.") (define %intel-compatible-systems '("x86_64-linux" "i686-linux")) (define-public linux-libre - (make-linux-libre "4.8.4" - "06fb2b1y7w0ixq4savn3hddp326mmzmg3400dpr8lyg919bwck3x" + (make-linux-libre "4.8.5" + "124sf2jvckn0afy1zfyaqgr1679qsx3fnylw1wpl7p5298hwyf9m" %intel-compatible-systems #:configuration-file kernel-config)) @@ -342,8 +342,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) ;; Avoid rebuilding kernel variants when there is a minor version bump. -(define %linux-libre-version "4.8.4") -(define %linux-libre-hash "06fb2b1y7w0ixq4savn3hddp326mmzmg3400dpr8lyg919bwck3x") +(define %linux-libre-version "4.8.5") +(define %linux-libre-hash "124sf2jvckn0afy1zfyaqgr1679qsx3fnylw1wpl7p5298hwyf9m") (define-public linux-libre-arm-generic (make-linux-libre %linux-libre-version -- cgit v1.2.3 From 58c4f11e43c22180043d9f2954b4deb39265570c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 28 Oct 2016 00:56:10 +0200 Subject: gnu: Add radeontop. * gnu/packages/linux.scm (radeontop): New variable. --- gnu/packages/linux.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 934a67f182..8f0a9ab0e4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -70,6 +70,8 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) #:use-module (gnu packages xml) + #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xorg) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python) @@ -3073,3 +3075,44 @@ interface that should be familiar to, and easily adopted by, application developers.") (home-page "https://github.com/seccomp/libseccomp") (license license:lgpl2.1))) + +(define-public radeontop + (package + (name "radeontop") + (version "0.9") + (home-page "https://github.com/clbr/radeontop/") + (source (origin + (method url-fetch) + (uri (string-append home-page "/archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "07fnimn6wwablmdjw0av11hk9a6xilbryh09izq4b2ic4b8md2p7")))) + (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + ;; getver.sh uses ‘git --describe’, isn't worth an extra git + ;; dependency, and doesn't even work on release(!) tarballs. + (add-after 'unpack 'report-correct-version + (lambda _ (substitute* "getver.sh" + (("ver=unknown") + (string-append "ver=" ,version))))) + (delete 'configure)) ; no configure script + #:make-flags (list "CC=gcc" + (string-append "PREFIX=" %output)) + #:tests? #f)) ; no tests + (native-inputs + `(("gnu-gettext" ,gnu-gettext) + ("pkg-config" ,pkg-config))) + (inputs + `(("libdrm" ,libdrm) + ("libpciaccess" ,libpciaccess) + ("ncurses" ,ncurses))) + (synopsis "Usage monitor for AMD Radeon graphics") + (description "RadeonTop monitors resource consumption on supported AMD +Radeon Graphics Processing Units (GPUs), either in real time as bar graphs on +a terminal or saved to a file for further processing. It measures both the +activity of the GPU as a whole, which is also accurate during OpenCL +computations, as well as separate component statistics that are only meaningful +under OpenGL graphics workloads.") + (license license:gpl3))) -- cgit v1.2.3 From dadf6622e937d897e6f447d43170a16886179c9f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 29 Oct 2016 14:24:51 +0200 Subject: gnu: borg: Update to 1.0.8. * gnu/packages/backup.scm (borg): Update to 1.0.8. --- gnu/packages/backup.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 81925ab3ef..44435f8cd6 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -413,13 +413,13 @@ detection, and lossless compression.") (define-public borg (package (name "borg") - (version "1.0.7") + (version "1.0.8") (source (origin (method url-fetch) (uri (pypi-uri "borgbackup" version)) (sha256 (base32 - "1l9iw55w5x51yxl3q89cf6avg80lajxvc8qz584hrsmnk6i56cr0")) + "1fdfi0yzzdrrlml6780n4fh61sqm7pw6fcd1y67kfkvw8hy5c0k9")) (modules '((guix build utils))) (snippet '(for-each -- cgit v1.2.3 From a7e75125c8f400b9d17825d85c7761641e5fbc91 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 29 Oct 2016 20:04:57 +0100 Subject: gnu: vim: Update to 8.0.0054. * gnu/packages/vim.scm (vim): Update to 8.0.0054. --- gnu/packages/vim.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index d1aebd666c..c14fa4cbbe 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -48,7 +48,7 @@ (define-public vim (package (name "vim") - (version "8.0.0051") + (version "8.0.0054") (source (origin (method url-fetch) (uri (string-append "https://github.com/vim/vim/archive/v" @@ -56,7 +56,7 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "18b0mb5kbv61a299y8y6kvm0fg7nrcgrzd1jk3n4863dbkv7hsnz")))) + "018my9vmvflww9yzrrzgdbja8j075yxqj0czg351r6wrndqiv9vq")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 4d73cb54411a6dcaec5e9d4cebe31b31512e0fce Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Oct 2016 19:28:01 +0300 Subject: gnu: chess: Update to 6.2.4. * gnu/packages/games.scm (chess): Update to 6.2.4. [home-page]: Use https. --- gnu/packages/games.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 365cf5b4b1..e209cfbdbe 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -329,7 +329,7 @@ asynchronously and at a user-defined speed.") (define-public chess (package (name "chess") - (version "6.2.3") + (version "6.2.4") (source (origin (method url-fetch) @@ -337,9 +337,9 @@ asynchronously and at a user-defined speed.") ".tar.gz")) (sha256 (base32 - "10hvnfhj9bkpz80x20jgxyqvgvrcgfdp8sfcbcrf1dgjn9v936bq")))) + "1vw2w3jwnmn44d5vsw47f8y70xvxcsz9m5msq9fgqlzjch15qhiw")))) (build-system gnu-build-system) - (home-page "http://www.gnu.org/software/chess") + (home-page "https://www.gnu.org/software/chess") (synopsis "Full chess implementation") (description "GNU Chess is a chess engine. It allows you to compete against the computer in a game of chess, either through the default terminal -- cgit v1.2.3 From 812de5bf1edba68909117f15aeba2ec07e4af181 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Oct 2016 19:32:19 +0300 Subject: gnu: offlineimap: Update to 7.0.9. * gnu/packages/mail.scm (offlineimap): Update to 7.0.9. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index e1b490e51d..1408e2e030 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -311,7 +311,7 @@ and corrections. It is based on a Bayesian filter.") (define-public offlineimap (package (name "offlineimap") - (version "7.0.8") + (version "7.0.9") (source (origin (method url-fetch) (uri (string-append "https://github.com/OfflineIMAP/offlineimap/" @@ -319,7 +319,7 @@ and corrections. It is based on a Bayesian filter.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0smxh5ag3cbn92kp49jq950j5m2pivs9kr04prpd1lw62hy7gnhr")))) + "04kapx0ddz7ccwhcjshkml2y916wcan3rl28mpmq25p4gywlkhxf")))) (build-system python-build-system) (native-inputs `(("asciidoc" ,asciidoc) -- cgit v1.2.3 From 0b37c4cda79bf07ac43d0b711f4a0f4467ed341f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Oct 2016 20:45:29 +0300 Subject: gnu: vapoursynth: Update to 35. * gnu/packages/video.scm (vapoursynth): Update to 35. --- gnu/packages/video.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index acf50f3e99..e7e112353a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1286,16 +1286,16 @@ capabilities.") (define-public vapoursynth (package (name "vapoursynth") - (version "34") + (version "35") (source (origin (method url-fetch) (uri (string-append "https://github.com/vapoursynth/vapoursynth/archive/R" version ".tar.gz")) - (file-name (string-append name "-" version)) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0rfldphg4gy3sdfffi5yzklqz93vsj2j6nny8snjbavnf161blyi")))) + "0629ys2lf618n9cc644xlvx0vx52v2fp3sx14p4mx5rg9nlasb3n")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 603d55de4ab14f7e410cec7a215982ac2430cc58 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Oct 2016 22:16:03 +0300 Subject: gnu: ffmpeg: Update to 3.2. * gnu/packages/video.scm (ffmpeg): Update to 3.2. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e7e112353a..6ce03f7bcc 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -434,14 +434,14 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).") (define-public ffmpeg (package (name "ffmpeg") - (version "3.1.5") + (version "3.2") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "16mqb1fs6ahqqv6a64dk4d8rp75ixdsipfzsz0vmc749yw2k3k29")))) + "1nnmd3h9pr2zic08isjcm1cmvcyd0aimpayb9r4qy45bihdhrxw8")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) -- cgit v1.2.3 From 7dd55dfecad00cadb91e6efe09a442cdfc51798d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Oct 2016 22:54:43 +0300 Subject: gnu: python-waf: Update to 1.9.5. * gnu/packages/python.scm (python-waf): Update to 1.9.5. [arguments]: Shorten custom build phase. [source]: Use http. [home-page]: Use http. --- gnu/packages/python.scm | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f7485ad014..45e683c009 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5236,30 +5236,28 @@ connection to each user.") (define-public python-waf (package (name "python-waf") - (version "1.9.1") + (version "1.9.5") (source (origin (method url-fetch) - (uri (string-append "https://waf.io/" + (uri (string-append "http://waf.io/" "waf-" version ".tar.bz2")) (sha256 (base32 - "1nc4qaqx2vsanlpp9mcwvf91xjqpkvcc6fcxd5sb4fwvaxamw5v6")))) + "1sl3ipi2czds57rlzjnpdzqa0skx8asfvmh3qmibpvdwf15rpppg")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases (replace 'build - (lambda _ - (zero? (begin - (system* "python" "waf-light" "configure") - (system* "python" "waf-light" "build"))))) + (lambda _ + (zero? (system* "python" "waf-light" "configure" "build")))) (replace 'check - (lambda _ - (zero? (system* "python" "waf" "--version")))) + (lambda _ + (zero? (system* "python" "waf" "--version")))) (replace 'install - (lambda _ - (copy-file "waf" %output)))))) - (home-page "https://waf.io/") + (lambda _ + (copy-file "waf" %output)))))) + (home-page "http://waf.io/") (synopsis "Python-based build system") (description "Waf is a Python-based framework for configuring, compiling and installing -- cgit v1.2.3 From 8f210c0e0e3386920aaf125371cb7aa1420f761f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Oct 2016 23:08:28 +0300 Subject: gnu: ccache: Update to 3.3.3. * gnu/packages/ccache.scm (ccache): Update to 3.3.3. --- gnu/packages/ccache.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ccache.scm b/gnu/packages/ccache.scm index 15a20ff08b..181fba2fd0 100644 --- a/gnu/packages/ccache.scm +++ b/gnu/packages/ccache.scm @@ -29,7 +29,7 @@ (define-public ccache (package (name "ccache") - (version "3.3.2") + (version "3.3.3") (source (origin (method url-fetch) @@ -37,7 +37,7 @@ version ".tar.xz")) (sha256 (base32 - "0c25l78hi36682l9cyxca78i8sdkmgmv9afip1s21y6q4g5qaxlh")))) + "1v04ky2mhvx8gnqfbs9x2vvf4i9mzph4fwdg72s9xyhwv92sf0iv")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ;for test.sh ("which" ,(@ (gnu packages base) which)))) -- cgit v1.2.3 From ee5fb7ee5013a9033fc572d8c7cfec7047b58c33 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Sat, 29 Oct 2016 18:10:00 +0800 Subject: gnu: Add python2-rpython. * gnu/packages/python.scm (python2-rpython): New variable. --- gnu/packages/python.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 45e683c009..f05690617a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2016 Marius Bakke ;;; Copyright © 2016 Stefan Reichoer ;;; Copyright © 2016 Dylan Jeffers +;;; Copyright © 2016 Alex Vong ;;; ;;; This file is part of GNU Guix. ;;; @@ -3150,6 +3151,30 @@ writing C extensions for Python as easy as Python itself.") (inputs `(("python-2" ,python-2))))) ; this is not automatically changed +;; The RPython toolchain currently does not support Python 3. +(define-public python2-rpython + (package + (name "python2-rpython") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "rpython" version)) + (sha256 + (base32 + "07pps06fq4c4wmi5ii0sgh9zgwniz5y7frqhm28g3a154l163fxc")))) + (build-system python-build-system) + (arguments `(#:python ,python-2)) + (native-inputs + `(("python2-pytest" ,python2-pytest) ; needed for running tests + ("python2-setuptools" ,python2-setuptools))) + (home-page "https://rpython.readthedocs.org") + (synopsis "Framework for implementing interpreters and virtual machines") + (description "RPython is a translation and support framework for +producing implementations of dynamic languages, emphasizing a clean separation +between language specification and implementation aspects.") + (license license:expat))) + ;; This version of numpy is missing the documentation and is only used to ;; build matplotlib which is required to build numpy's documentation. (define python-numpy-bootstrap -- cgit v1.2.3 From b68bf48af9eaceb3ab672745960e97881f40b6c1 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:39:58 +0200 Subject: gnu: Add flex-2.6.1. * gnu/packages/flex.scm (flex-2.6.1): New variable. --- gnu/packages/flex.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm index 20aff196e9..c0c7fa9425 100644 --- a/gnu/packages/flex.scm +++ b/gnu/packages/flex.scm @@ -78,3 +78,22 @@ regular expressions for each rule. Whenever it finds a match, it executes the corresponding C code.") (license (non-copyleft "file://COPYING" "See COPYING in the distribution.")))) + +(define-public flex-2.6.1 + ;; The kservice and solid packages use flex. extra-cmake-modules + ;; forces C89 for all C files for compatibility with windows. + ;; Flex 2.6.0 generates a lexer containing a single line comment. Single + ;; line comments are part of the C99 standard, so the lexer won't compile + ;; if C89 is used. + (package + (inherit flex) + (version "2.6.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/westes/flex" + "/releases/download/v" version "/" + "flex-" version ".tar.gz")) + (sha256 + (base32 + "0fy14c35yz2m1n1m4f02by3501fn0cca37zn7jp8lpp4b3kgjhrw")))))) -- cgit v1.2.3 From 1c484e980f812a7456ecd00a84a2b3ad8845e32d Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:43:13 +0200 Subject: gnu: extra-cmake-modules: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (extra-cmake-modules): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 011f9e0deb..04cb6e89cf 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -54,16 +54,16 @@ (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "01m12ml529pwr2sal951r5z6yb1rwbpid1y4k14nlk3xqgmdakwa")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0n7vw2a4kxdgpsc1wn9f1d0y01p6qfk8ac360rq329bvdpigxmnj")))) (build-system cmake-build-system) (native-inputs `(("qtbase" ,qtbase))) ; For tests (needs qmake) -- cgit v1.2.3 From 443a60aaae5ee68b0eb2ee6fce2945296cffd97b Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:45:02 +0200 Subject: gnu: gpgmepp: Update to 16.08.2. * gnu/packages/kde-frameworks (gpgmepp): Update to 16.08.2. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 04cb6e89cf..f5a8b632fd 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -120,16 +120,16 @@ common build settings used in software produced by the KDE community.") (define-public gpgmepp (package (name "gpgmepp") - (version "16.04.3") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/applications" - "/" version "/src/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1850pdysi7c1w0nxnhcbrhnkrfqyrcl0laxyjcw1g1ln764pwcmj")))) + (version "16.08.2") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/applications" + "/" version "/src/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0828qlhdi1i26n2xgyb01c0q77m6jlppbxv6mprryxq0ma88940a")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) -- cgit v1.2.3 From bd0fc238f8cb5367165f78a39d004918a98b2685 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:47:07 +0200 Subject: gnu: kpmcore: Fix indentation. * gnu/packages/kde-frameworks.scm (kpmcore): Fix indentation. --- gnu/packages/kde-frameworks.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index f5a8b632fd..da0de95526 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -147,15 +147,15 @@ common build settings used in software produced by the KDE community.") (package (name "kpmcore") (version "2.2.1") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/kpmcore" - "/" version "/src/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1blila6ncqbmzhycx3szrbkxc000pzh62956mw5ihxvhrqpncg2p")))) + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/kpmcore" + "/" version "/src/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1blila6ncqbmzhycx3szrbkxc000pzh62956mw5ihxvhrqpncg2p")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) -- cgit v1.2.3 From 84dee852912790d3dfe44cc46f169ab5d453b0f3 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:47:46 +0200 Subject: gnu: phonon: Fix indentation. * gnu/packages/kde-frameworks.scm (phonon): Fix indentation. --- gnu/packages/kde-frameworks.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index da0de95526..ae3161a103 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -94,15 +94,15 @@ common build settings used in software produced by the KDE community.") (package (name "phonon") (version "4.9.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/phonon" - "/" version "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1q5hvsk4sfcb91625wcmldy7kgjmfpmpmkgzi6mxkqdd307v8x5v")))) + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/phonon" + "/" version "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1q5hvsk4sfcb91625wcmldy7kgjmfpmpmkgzi6mxkqdd307v8x5v")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) -- cgit v1.2.3 From 5eb1b33b6b8de3888907bce832a64781e58da11d Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: attica: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (attica): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index ae3161a103..653e8fbc40 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -184,16 +184,16 @@ common build settings used in software produced by the KDE community.") (define-public attica (package (name "attica") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0d368gmds7m7k5pnn625wqsij38cvxk1gkm4zv24phnk9f67v7cw")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0w6dwq83vj70m8rf52x60a64f6s6h0y7c948j3hddfql7s3ghha7")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) -- cgit v1.2.3 From bfa96eba569bbc4b6c772ce0298c1e98b8ab5c22 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: bluez-qt: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (bluez-qt): Update to 5.27.0 and fix indentation. --- gnu/packages/kde-frameworks.scm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 653e8fbc40..ba22f89651 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -216,16 +216,16 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") (define-public bluez-qt (package (name "bluez-qt") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0gy0m7lcwwklf021l5i3v7j0cl7qz7cgvzrwpj87ix3kyw5xs80z")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "111gqxw1bvazdhxk5rcfhi438i6bd92r3wvlkxsdqrp7ypcqdpig")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -234,13 +234,13 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") `(("qtbase" ,qtbase))) (arguments `(#:configure-flags - '("-DINSTALL_UDEV_RULE:BOOL=OFF") + '("-DINSTALL_UDEV_RULE:BOOL=OFF") #:phases - (modify-phases %standard-phases - (replace 'check - (lambda* _ - (setenv "DBUS_FATAL_WARNINGS" "0") - (zero? (system* "dbus-launch" "ctest" "."))))))) + (modify-phases %standard-phases + (replace 'check + (lambda _ + (setenv "DBUS_FATAL_WARNINGS" "0") + (zero? (system* "dbus-launch" "ctest" "."))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "QML wrapper for BlueZ") (description "bluez-qt is a Qt-style library for accessing the bluez -- cgit v1.2.3 From 02dc8847c8bdb1866cd51b0570a641fc138cb497 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: breeze-icons: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (breeze-icons): Update to 5.27.0. [native-inputs]: Add fduptes and libxml2. [arguments]: Disable tests. --- gnu/packages/kde-frameworks.scm | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index ba22f89651..c72546110d 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -250,21 +250,28 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") (define-public breeze-icons (package (name "breeze-icons") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1dh7bijx99sdb3vn6394wmm5cq0fvvmz8h17sx4hakmbga849cx2")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "12awfvka9sgdgh7dyg7cw7myw7fxrx1w93s1gyhdq2drjsdbghgz")))) (build-system cmake-build-system) (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules))) + `(("extra-cmake-modules" ,extra-cmake-modules) + ("fdupes" ,fdupes) + ("libxml2" ,libxml2))) (inputs `(("qtbase" ,qtbase))) + ;; FIXME: Dupes test fails. Issue is fixed upstream + ;; Remove when updating to 5.28. + ;; https://github.com/KDE/breeze-icons/commit/22b383359e3a0e02d4828e6fa8ed8a3d213440b1 + (arguments + `(#:tests? #f)) (home-page "https://community.kde.org/Frameworks") (synopsis "Default KDE Plasma 5 icon theme") (description "Breeze provides a freedesktop.org compatible icon theme. -- cgit v1.2.3 From 8fea1a2378d653a1d92cd62c34e107e7da143a80 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kapidox: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kapidox): Update to 5.27.0 and fix indentation. --- gnu/packages/kde-frameworks.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index c72546110d..029b390512 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -284,16 +284,16 @@ It is the default icon theme for the KDE Plasma 5 desktop.") (define-public kapidox (package (name "kapidox") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "19a7alvn71nxflsyi7y3hghx1iw04qqc77qy54mcxcpkiyvpsggf")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "193m0qpcqdkspdcwc8cwabjjcqyd9d0m5kl53mycyiv1m220x11l")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; has no test target @@ -311,7 +311,6 @@ It is the default icon theme for the KDE Plasma 5 desktop.") `(("qtbase" ,qtbase))) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE Doxygen Tools") - (description "This framework contains scripts and data for building API documentation (dox) in a standard format and style for KDE. -- cgit v1.2.3 From ea95b701dcaad8c24b3f4af16fff6ece49a9d265 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: karchive: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (karchive): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 029b390512..2ee18a8472 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -326,16 +326,16 @@ documentation.") (define-public karchive (package (name "karchive") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1n5nfhrfvqnrdjgjjy7arqik4fya5bp3dvxa16mlhqr19azkavzq")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1c7bifmzyr398p1qx9qfxp893wbr44sjn3sda9q0hdpmw2i7yf3z")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) -- cgit v1.2.3 From 78fc358f3e153c8a8677e50302c99f3eced0b76b Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kcodecs: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kcodecs): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 2ee18a8472..68b54360bd 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -360,16 +360,16 @@ GZip format, via a subclass of QIODevice.") (define-public kcodecs (package (name "kcodecs") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1qpzjh3qc2zz80j2bmlinipbispms14k9bmqw8v61zhi6in9z14c")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0f4k276sm0svh5y8yyq8hfc5vy60cpsrwany7kswyh22m57v5j8a")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) -- cgit v1.2.3 From a6fec16590bf9f018e7f7136412e21852af8164e Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kconfig: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kconfig): Update to 5.27.0 and fix indentation. --- gnu/packages/kde-frameworks.scm | 42 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 68b54360bd..784868fcc1 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -395,16 +395,16 @@ Internet).") (define-public kconfig (package (name "kconfig") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1dc2i6icyigw1j6qxgdza6j2g8afh390qmxsa2a54mwl84fkfmxv")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "18dpm0r4nnvmxrask6rv5dkniwna9hh72ffdnvjgrh8p5djs9szi")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -415,18 +415,18 @@ Internet).") `(("qtbase" ,qtbase))) (arguments `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda* _ - (setenv "HOME" (getcwd)) - (setenv "TMPDIR" (getcwd)) + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "HOME" (getcwd)) + (setenv "TMPDIR" (getcwd)) #t)) - (add-before 'check 'start-xorg-server - (lambda* (#:key inputs #:allow-other-keys) - ;; The test suite requires a running X server. - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 &")) - (setenv "DISPLAY" ":1") + (add-before 'check 'start-xorg-server + (lambda* (#:key inputs #:allow-other-keys) + ;; The test suite requires a running X server. + (system (string-append (assoc-ref inputs "xorg-server") + "/bin/Xvfb :1 &")) + (setenv "DISPLAY" ":1") #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Kconfiguration settings framework for Qt") -- cgit v1.2.3 From b69b81ca2e73e9dc7979facc36a993ec0b6fa1d1 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kcoreaddons: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kcoreaddons): Update to 5.27.0 and fix indentation. --- gnu/packages/kde-frameworks.scm | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 784868fcc1..18868c5c7d 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -462,16 +462,16 @@ propagate their changes to their respective configuration files.") (define-public kcoreaddons (package (name "kcoreaddons") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "06sx7by3nvaridnavj5p0bxv4nh47n708jlacfw8ydaikmd9i03h")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0rzpxajv041kdbk92rwxq1qnvzyrxfjy154d8257yj2fj76w1gnw")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -482,12 +482,13 @@ propagate their changes to their respective configuration files.") (arguments `(#:tests? #f ; FIXME: Test failure caused by stout/stderr being interleaved. #:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda* _ - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; enable debug output - (setenv "HOME" (getcwd)) - (setenv "TMPDIR" (getcwd))))))) + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; enable debug output + (setenv "HOME" (getcwd)) + (setenv "TMPDIR" (getcwd)) + #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Qt addon library with a collection of non-GUI utilities") (description "KCoreAddons provides classes built on top of QtCore to -- cgit v1.2.3 From e361ff6a2eaa5bc3840e48d44d67db92d6b5e740 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kdbusaddons: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kdbusaddons): Update to 5.27.0 and fix indentation. --- gnu/packages/kde-frameworks.scm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 18868c5c7d..ff848c4338 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -501,16 +501,16 @@ many more.") (define-public kdbusaddons (package (name "kdbusaddons") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "183nxqrhz4qk4qfp1w4an0scp2dvfqcaqbpg4cgbgk0z590q0pkk")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1vgdl9z5xyfr2b5z7n2vdh0s6zab6ccxp30p1cy8hhhrsf04663m")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -521,11 +521,11 @@ many more.") ("qtx11extras" ,qtx11extras))) (arguments `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* _ - (setenv "DBUS_FATAL_WARNINGS" "0") - (zero? (system* "dbus-launch" "ctest" "."))))))) + (modify-phases %standard-phases + (replace 'check + (lambda _ + (setenv "DBUS_FATAL_WARNINGS" "0") + (zero? (system* "dbus-launch" "ctest" "."))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Convenience classes for DBus") (description "KDBusAddons provides convenience classes on top of QtDBus, -- cgit v1.2.3 From ce45f9ef7bdeb6aea25993e163b8ba4aa7290699 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kdnssd: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kdnssd): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index ff848c4338..168381cc9f 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -537,16 +537,16 @@ as well as an API to create KDED modules.") (define-public kdnssd (package (name "kdnssd") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "01b650g031apxc3vd2m91g2fxqk9l8ap67z6rafniphfwy8i0d5m")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0dq2i4f4ny5cwgd41mjw5i7cf23ns55s2m13cjvxvy90nwhlymqp")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) -- cgit v1.2.3 From ee6cebf6a97d9f0818590cb1841e13b089543d02 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kguiaddons: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kguiaddons): Update to 5.27.0 and fix indentation. --- gnu/packages/kde-frameworks.scm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 168381cc9f..619479b3bf 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -564,16 +564,16 @@ infrastructure.") (define-public kguiaddons (package (name "kguiaddons") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0ig96ah20ybg5rwpswj9va2klvkh2q4amwxmgy3z4niwfsm2g3ic")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1skvlcj0fgb4am02vlm4fyd52f9yn4y0aj5arcfz3qps5cjzr6xg")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -582,11 +582,11 @@ infrastructure.") `(("qtbase" ,qtbase))) (arguments `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda* _ - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen") + #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Utilities for graphical user interfaces") (description "The KDE GUI addons provide utilities for graphical user -- cgit v1.2.3 From e751556a14f80d029de8cf579b9344843a57cc03 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: ki18n: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (ki18n): Update to 5.27.0 and fix indentation. --- gnu/packages/kde-frameworks.scm | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 619479b3bf..1535307dbe 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -596,16 +596,16 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") (define-public ki18n (package (name "ki18n") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0cw24spmwsqa3ppkw03cm6yjd3sfll0dbbk2ya76fd4nw9hb00dv")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0a66z325bvdv7g6ysml2bf8559nkjhv2fxwj1ja6vsxkn95d54ff")))) (build-system cmake-build-system) (propagated-inputs `(("gettext" ,gnu-gettext) @@ -618,10 +618,11 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") ("qtscript" ,qtscript))) (arguments `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda* _ - (setenv "HOME" (getcwd))))))) + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "HOME" (getcwd)) + #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE Gettext-based UI text internationalization") (description "KI18n provides functionality for internationalizing user -- cgit v1.2.3 From bdf84c9e2f344aec63126d527bbbbf0ad47057f5 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kidletime: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kidletime): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 1535307dbe..c98c96a89e 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -639,16 +639,16 @@ translation scripting.") (define-public kidletime (package (name "kidletime") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "09jsj0pj27h93nr8v46savs6b93h8frydinfr7wlijkvpsl02jb4")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1cv6d2vylz7vymn4v0brv2jp1kzscvm9wh1ylp3wyi1jqyblgjfw")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) -- cgit v1.2.3 From 110e4bea7a37303eaacb99a331c1be752948d2cc Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kitemmodels: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kitemmodels): Update to 5.27.0 and fix indentation. --- gnu/packages/kde-frameworks.scm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index c98c96a89e..90adc447c3 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -666,16 +666,16 @@ or user activity.") (define-public kitemmodels (package (name "kitemmodels") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1s1p4nw1pqdzbdwvjnka17p9avf00wadr437p4f96md1lvh3sh69")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "00qgp5i35r7k9gy43wypn9fa7zxiqqip89dzbw8r6rabinihqzy2")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -684,13 +684,13 @@ or user activity.") `(("qtbase" ,qtbase))) (arguments `(#:phases - (modify-phases %standard-phases - (add-before 'check 'start-xorg-server - (lambda* (#:key inputs #:allow-other-keys) - ;; The test suite requires a running X server. - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 &")) - (setenv "DISPLAY" ":1") + (modify-phases %standard-phases + (add-before 'check 'start-xorg-server + (lambda* (#:key inputs #:allow-other-keys) + ;; The test suite requires a running X server. + (system (string-append (assoc-ref inputs "xorg-server") + "/bin/Xvfb :1 &")) + (setenv "DISPLAY" ":1") #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Set of item models extending the Qt model-view framework") -- cgit v1.2.3 From 701d7a9b50d8645bb725c7b28e2399ce8101acff Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kitemviews: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kitemviews): Update to 5.27.0 and fix indentation. --- gnu/packages/kde-frameworks.scm | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 90adc447c3..6aaf8c16a8 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -727,16 +727,16 @@ model to observers (define-public kitemviews (package (name "kitemviews") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0y3fx9hk1x27arrmwfzq783a44cs7p8dpmhxrwzh0di4mwa8jafw")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1469i10y2c3i1pdhzl9nk177y4n1mlc7p5w7kivdcrvf9ilxvbkx")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -746,16 +746,17 @@ model to observers `(("qtbase" ,qtbase))) (arguments `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda* _ - (setenv "DBUS_FATAL_WARNINGS" "0"))) - (add-before 'check 'start-xorg-server - (lambda* (#:key inputs #:allow-other-keys) - ;; The test suite requires a running X server. - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 &")) - (setenv "DISPLAY" ":1") + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "DBUS_FATAL_WARNINGS" "0") + #t)) + (add-before 'check 'start-xorg-server + (lambda* (#:key inputs #:allow-other-keys) + ;; The test suite requires a running X server. + (system (string-append (assoc-ref inputs "xorg-server") + "/bin/Xvfb :1 &")) + (setenv "DISPLAY" ":1") #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Set of item views extending the Qt model-view framework") -- cgit v1.2.3 From a7ec016cd54294f8426033215cb517f9d4481e1f Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kplotting: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kplotting): Update to 5.27.0 and fix indentation. --- gnu/packages/kde-frameworks.scm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 6aaf8c16a8..ef77d8d127 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -768,16 +768,16 @@ to flat and hierarchical lists.") (define-public kplotting (package (name "kplotting") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0gpypq9kh4b5s6dc7py3m117k3nbxczsfkxgxd9zxvr35kig7ya2")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1qp9q8g9yxy359bylyqyqxjq9wjismajrg4xhxx5xn4s6znyrxny")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -786,13 +786,13 @@ to flat and hierarchical lists.") `(("qtbase" ,qtbase))) (arguments `(#:phases - (modify-phases %standard-phases - (add-before 'check 'start-xorg-server - (lambda* (#:key inputs #:allow-other-keys) - ;; The test suite requires a running X server. - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 &")) - (setenv "DISPLAY" ":1") + (modify-phases %standard-phases + (add-before 'check 'start-xorg-server + (lambda* (#:key inputs #:allow-other-keys) + ;; The test suite requires a running X server. + (system (string-append (assoc-ref inputs "xorg-server") + "/bin/Xvfb :1 &")) + (setenv "DISPLAY" ":1") #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Data plotting library") -- cgit v1.2.3 From 3dfcaf33c8649a3593617c6fc36e9c3af3adb792 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kwayland: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kwayland): Update to 5.27.0 and fix indentation. --- gnu/packages/kde-frameworks.scm | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index ef77d8d127..bf61f67003 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -806,16 +806,16 @@ pixel units.") (define-public kwayland (package (name "kwayland") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1h5anbqrxcl1s8kx1l53vcsfr8ifamcjqd47dk8a7lwr1ga6myq2")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0va1kmki2xr4mx2918h333mfkqs5v1mhbzyf71hq190izdz0jdss")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -827,10 +827,11 @@ pixel units.") `(#:tests? #f ; FIXME tests require weston to run ; weston requires wayland flags in mesa #:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda* _ - (setenv "XDG_RUNTIME_DIR" "/tmp")))))) + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "XDG_RUNTIME_DIR" "/tmp") + #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Qt-style API to interact with the wayland client and server") (description "As the names suggest they implement a Client respectively a -- cgit v1.2.3 From 5a3f0709311c66108b58c0579360187afcfc3009 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kwidgetsaddons: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kwidgetsaddons): Update to 5.27.0 and fix indentation. --- gnu/packages/kde-frameworks.scm | 54 ++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index bf61f67003..450b2380be 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -845,16 +845,16 @@ represented by a QPoint or a QSize.") (define-public kwidgetsaddons (package (name "kwidgetsaddons") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1kppx0ppfhnb6q6sijs2dffyar86wkkx8miqavsjsgw1l2wiymcx")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0p9gxna7y7nigpi0ri7k45g4pf1svq0kxrhk4wf7rj58rilhcfrl")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -865,23 +865,23 @@ represented by a QPoint or a QSize.") (arguments `(#:tests? #f ; FIXME: Regression after update to qt 5.7 #:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - (setenv "QT_QPA_PLATFORM" "offscreen") ; a better solution to Xvfb - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; enable debug info - (setenv "DBUS_FATAL_WARNINGS" "0") - #t)) - (add-before 'check 'start-xorg-server - (lambda* (#:key inputs #:allow-other-keys) - ;; The test suite requires a running X server. - ;; Xvfb doesn't have proper glx support and needs a pixeldepth - ;; of 24 bit to avoid "libGL error: failed to load driver: swrast" - ;; "Could not initialize GLX" - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 -screen 0 640x480x24 &")) - (setenv "DISPLAY" ":1") - #t))))) + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen") ; a better solution to Xvfb + (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; enable debug info + (setenv "DBUS_FATAL_WARNINGS" "0") + #t)) + (add-before 'check 'start-xorg-server + (lambda* (#:key inputs #:allow-other-keys) + ;; The test suite requires a running X server. + ;; Xvfb doesn't have proper glx support and needs a pixeldepth + ;; of 24 bit to avoid "libGL error: failed to load driver: swrast" + ;; "Could not initialize GLX" + (system (string-append (assoc-ref inputs "xorg-server") + "/bin/Xvfb :1 -screen 0 640x480x24 &")) + (setenv "DISPLAY" ":1") + #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Large set of desktop widgets") (description "Provided are action classes that can be added to toolbars or -- cgit v1.2.3 From 48311df9497150b199b933633984198fee65052a Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kwindowsystem: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kwindowsystem): Update to 5.27.0 and fix indentation. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 450b2380be..82aead41f9 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -893,16 +893,16 @@ configuration pages, message boxes, and password requests.") (define-public kwindowsystem (package (name "kwindowsystem") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0w5ym8msl80v3q65253pdpj9f1fmb658rnndlbkrgpmm1rv1n6dz")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0w49lpwicl71gyyf2aisvmfjpvjl3w1rqpx4a42ph0aywjihjmhx")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) -- cgit v1.2.3 From 48e789daa80db67b3825fa82f6c039a8e847e211 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: modemmanager-qt: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (modemmanager-qt): Update to 5.27.0 and fix indentation. --- gnu/packages/kde-frameworks.scm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 82aead41f9..5d6872f01e 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -933,33 +933,33 @@ lower level classes for interaction with the X Windowing System.") (define-public modemmanager-qt (package (name "modemmanager-qt") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0khz5bf84xxa8aqpzwb6x839xx6dbiadwqhyj7cvgha65fh2xinh")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1zw5frscvbsp0jpb071ssqgvm097ylw3zy69y7f0dybhps6lv2jv")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("dbus" ,dbus) ("pkg-config" ,pkg-config))) (propagated-inputs - ; Headers contain #include + ;; Headers contain #include `(("modem-manager", modem-manager))) (inputs `(("qtbase" ,qtbase))) (arguments `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* _ - (setenv "DBUS_FATAL_WARNINGS" "0") - (zero? (system* "dbus-launch" "ctest" "."))))))) + (modify-phases %standard-phases + (replace 'check + (lambda _ + (setenv "DBUS_FATAL_WARNINGS" "0") + (zero? (system* "dbus-launch" "ctest" "."))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Qt wrapper for ModemManager DBus API") (description "ModemManagerQt provides access to all ModemManager features -- cgit v1.2.3 From c3fefc81ce94d2edc1de4d907dfe5c12ed46be6c Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: networkmanager-qt: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (networkmanager-qt): Update to 5.27.0 and fix indentation. --- gnu/packages/kde-frameworks.scm | 64 ++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 5d6872f01e..99cfe885ac 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -971,41 +971,41 @@ messages.") (define-public networkmanager-qt (package (name "networkmanager-qt") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "11wy0ds0hqbba900ggkcxjfqc9n65xlzc3h1zv9433nn5d75v6fy")))) - (build-system cmake-build-system) - (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules) - ("dbus" ,dbus) - ("pkg-config" ,pkg-config))) - (propagated-inputs - ; Headers contain #include and - ; #include - `(("network-manager" ,network-manager))) - (inputs - `(("qtbase" ,qtbase))) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* _ - (setenv "DBUS_FATAL_WARNINGS" "0") - (zero? (system* "dbus-launch" "ctest" "."))))))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Qt wrapper for NetworkManager DBus API") - (description "NetworkManagerQt provides access to all NetworkManager + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0fnj0b2j4v51f12b3v59psdza2krdkidj22b9a9jwn224lg4852y")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("dbus" ,dbus) + ("pkg-config" ,pkg-config))) + (propagated-inputs + ;; Headers contain #include and + ;; #include + `(("network-manager" ,network-manager))) + (inputs + `(("qtbase" ,qtbase))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (setenv "DBUS_FATAL_WARNINGS" "0") + (zero? (system* "dbus-launch" "ctest" "."))))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Qt wrapper for NetworkManager DBus API") + (description "NetworkManagerQt provides access to all NetworkManager features exposed on DBus. It allows you to manage your connections and control your network devices and also provides a library for parsing connection settings which are used in DBus communication.") - (license license:lgpl2.1+))) + (license license:lgpl2.1+))) (define-public oxygen-icons (package -- cgit v1.2.3 From beb21382d30ced80b783060e4db8aadda18b1ef3 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: oxygen-icons: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (oxygen-icons): Update to 5.27.0. [native-inputs]: Add fdupes. --- gnu/packages/kde-frameworks.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 99cfe885ac..fcdf0341b1 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1010,19 +1010,20 @@ which are used in DBus communication.") (define-public oxygen-icons (package (name "oxygen-icons") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "5" "-" version ".tar.xz")) - (sha256 - (base32 - "1c7spjbzk04725vv0ly7vmyvwa96mfa5ki2pm146ld4888a896wm")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "5" "-" version ".tar.xz")) + (sha256 + (base32 + "1lb09ykj5ayj5lv7w2k2pqis7z61clr3gkinf6n7jghnlc96222g")))) (build-system cmake-build-system) (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules))) + `(("extra-cmake-modules" ,extra-cmake-modules) + ("fdupes" ,fdupes))) (inputs `(("qtbase" ,qtbase))) (home-page "https://community.kde.org/Frameworks") -- cgit v1.2.3 From 6ad3befef2f405c3b0866f43cd155175c29e5a3f Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: solid: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (solid): Update to 5.27.0. [native-inputs]: Add flex-2.6.1. --- gnu/packages/kde-frameworks.scm | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index fcdf0341b1..6fa4215996 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -35,6 +35,7 @@ #:use-module (gnu packages databases) #:use-module (gnu packages disk) #:use-module (gnu packages docbook) + #:use-module (gnu packages flex) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -1034,20 +1035,25 @@ which are used in DBus communication.") (define-public solid (package (name "solid") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "00wvsxcnvhdx7ijzpcz5wny2ypkxr1drdpr4yvawgpwa678l1107")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "01qlfj30n8sr8xd8l8fimg7hs7h70ynhalk2m9l8dz2qay2pdl27")))) (build-system cmake-build-system) (native-inputs `(("bison" ,bison) ("extra-cmake-modules" ,extra-cmake-modules) + ;; extra-cmake-modules forces C89 for all C files for compatibility with + ;; Windows. Flex 2.6.0 generates a lexer containing a single line + ;; comment. Single line comments are part of the C99 standard, so the + ;; lexer won't compile if C89 is used. + ("flex" ,flex-2.6.1) ("qttools" ,qttools))) (inputs `(("qtbase" ,qtbase) -- cgit v1.2.3 From 71b37f7ab6128a1821a85a2f16e19404fa3ed129 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: sonnet: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (sonnet): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 6fa4215996..73fcea15ae 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1068,16 +1068,16 @@ system.") (define-public sonnet (package (name "sonnet") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "152xz7fb1iwhb5w1n4xqvc648iaxi0inrl4kavxcsir61das1xyl")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "07i3gng309vsf5kp5dlwca0lpi3iqc0lp0ixdvx75q832gk8ivrv")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) -- cgit v1.2.3 From 01fc411d96764c288c02a483313dc0ac123f3285 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: threadweaver: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (threadweaver): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 73fcea15ae..4fc0f2baa4 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1094,16 +1094,16 @@ ASpell and HUNSPELL.") (define-public threadweaver (package (name "threadweaver") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "02g60zr9cc4bg1p90giich4n0qvqaiakz0y94qrnyj9f7fg0yksl")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0mg5i125b008x6162a5h2q14fg81m17md00017n09xljw3099kqy")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) -- cgit v1.2.3 From 62dee732f4666d3cbc013cc748dc1067762e3948 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kauth: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kauth): Update to 5.27.0 and fix indentation. --- gnu/packages/kde-frameworks.scm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 4fc0f2baa4..67db4ab6a0 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1124,16 +1124,16 @@ uses a job-based interface to queue tasks and execute them in an efficient way." (define-public kauth (package (name "kauth") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "14sjjfgl3arqyqcr77w9qhpnd8mrnh53r5rfss6bvlk26bmihs49")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "17z6dh1qdpd490z84g6ynl8bcrr9naalvh34ybnpipvx3qs50kwl")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -1145,11 +1145,11 @@ uses a job-based interface to queue tasks and execute them in an efficient way." ("qtbase" ,qtbase))) (arguments `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* _ - (setenv "DBUS_FATAL_WARNINGS" "0") - (zero? (system* "dbus-launch" "ctest" "."))))))) + (modify-phases %standard-phases + (replace 'check + (lambda _ + (setenv "DBUS_FATAL_WARNINGS" "0") + (zero? (system* "dbus-launch" "ctest" "."))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Execute actions as privileged user") (description "KAuth provides a convenient, system-integrated way to offload -- cgit v1.2.3 From 17b5144a1872cd6282b0c933b146fec4ea81f55e Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kcompletion: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kcompletion): Update to 5.27.0 and fix indentation. --- gnu/packages/kde-frameworks.scm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 67db4ab6a0..ab0ceb8f26 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1160,16 +1160,16 @@ utilities.") (define-public kcompletion (package (name "kcompletion") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1qln0v31gn86kzwhnkijr1ydf129n32jmiybbckrp4w6hyx6xfxv")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1mb64ii4ilhqhy9p6cl3phs17bg3lr4b60jkkm71yn2wnd4wl47s")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1181,11 +1181,11 @@ utilities.") ("qtbase" ,qtbase))) (arguments `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen") + #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Powerful autocompletion framework and widgets") (description "This framework helps implement autocompletion in Qt-based -- cgit v1.2.3 From 075eeb355b3970cb14b391df28760d6c4ae051f6 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kcrash: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kcrash): Update to 5.27.0 and fix indentation. --- gnu/packages/kde-frameworks.scm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index ab0ceb8f26..7c37f5f6dd 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1196,16 +1196,16 @@ integrated it into your application's other widgets.") (define-public kcrash (package (name "kcrash") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1lahgfwlp9b5rsl244kzp7rsl4ybv1q4qlvpv0xxz5ygssk48l0w")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "09wf4dzckc9l8dyl8qs1wc54h4rm38i2blzyyicm4iazi420lysk")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1217,13 +1217,13 @@ integrated it into your application's other widgets.") ("qtx11extras" ,qtx11extras))) (arguments `(#:phases - (modify-phases %standard-phases - (add-before 'check 'start-xorg-server - (lambda* (#:key inputs #:allow-other-keys) - ;; The test suite requires a running X server. - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 &")) - (setenv "DISPLAY" ":1") + (modify-phases %standard-phases + (add-before 'check 'start-xorg-server + (lambda* (#:key inputs #:allow-other-keys) + ;; The test suite requires a running X server. + (system (string-append (assoc-ref inputs "xorg-server") + "/bin/Xvfb :1 &")) + (setenv "DISPLAY" ":1") #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Graceful handling of application crashes") -- cgit v1.2.3 From f5dae6aec133f9d99a9a527b86a866410bf22161 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kdoctools: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kdoctools): Update to 5.27.0 and fix indentation. --- gnu/packages/kde-frameworks.scm | 47 +++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 23 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 7c37f5f6dd..71c9d8af75 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1234,16 +1234,16 @@ application crashes.") (define-public kdoctools (package (name "kdoctools") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1r129kpq0d11b9l87cqbal6fm5ycwhsps1g3r1a7jsxz70scz4ri")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1hgg19da0918mx8z2614qljvj9j8bny78mwlyljf42814f3ycpam")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1259,19 +1259,20 @@ application crashes.") ("qtbase" ,qtbase))) (arguments `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'cmake-find-docbook - (lambda* (#:key inputs #:allow-other-keys) - (substitute* (find-files "cmake" "\\.cmake$") - (("CMAKE_SYSTEM_PREFIX_PATH") - "CMAKE_PREFIX_PATH")) - (substitute* "cmake/FindDocBookXML4.cmake" - (("^.*xml/docbook/schema/dtd.*$") - "xml/dtd/docbook\n")) - (substitute* "cmake/FindDocBookXSL.cmake" - (("^.*xml/docbook/stylesheet.*$") - (string-append "xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) "\n")))))))) + (modify-phases %standard-phases + (add-after 'unpack 'cmake-find-docbook + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "cmake" "\\.cmake$") + (("CMAKE_SYSTEM_PREFIX_PATH") + "CMAKE_PREFIX_PATH")) + (substitute* "cmake/FindDocBookXML4.cmake" + (("^.*xml/docbook/schema/dtd.*$") + "xml/dtd/docbook\n")) + (substitute* "cmake/FindDocBookXSL.cmake" + (("^.*xml/docbook/stylesheet.*$") + (string-append "xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) "\n"))) + #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Create documentation from DocBook") (description "Provides tools to generate documentation in various format -- cgit v1.2.3 From 3f34662b12a5508f0aee4c2f0d9857fcc8f24905 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kfilemetadata: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kfilemetadata): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 71c9d8af75..3951dd30e1 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1282,16 +1282,16 @@ from DocBook files.") (define-public kfilemetadata (package (name "kfilemetadata") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "02n9qhpr0jlwdgdbid0k34abhs3bzhlsa56ybl5dq1aib6izk1sy")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1la6h05izgnps10py2gcn4xnwz3fm7dyswib57flc8phzipxbg5q")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) -- cgit v1.2.3 From 2d64fdb15705ab159b1e19b0720520100c31c412 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kimageformats: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kimageformats): Update to 5.27.0 and fix indentation. --- gnu/packages/kde-frameworks.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 3951dd30e1..b9f9914da7 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1312,16 +1312,16 @@ by applications to write metadata.") (define-public kimageformats (package (name "kimageformats") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "12mhgckmhnvcnm8k7mk15mipxrnm7i9ip7ykbjh8nxjiwyk1pmwc")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0ijy7di9p37l6fjrmsday402vq4zibq1m37jghkvdymawxcrd22h")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1337,7 +1337,7 @@ by applications to write metadata.") (system (string-append (assoc-ref inputs "xorg-server") "/bin/Xvfb :1 &")) (setenv "DISPLAY" ":1") - #t))))) + #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Plugins to allow QImage to support extra file formats") (description "This framework provides additional image format plugins for -- cgit v1.2.3 From 4a9f3bf33bf69c3193ee8dc473533977f150a12d Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kjobwidgets: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kjobwidgets): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index b9f9914da7..669ed7c548 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1349,16 +1349,16 @@ formats.") (define-public kjobwidgets (package (name "kjobwidgets") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1mcvrz66xcqjgbp08zpqsf943cm462wbqm5gh719p9s25hx8hwrc")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "05c6jzl2a37bfz5i7hzsjmrhh8ajx1gbz7j05wgal811m5m4ww8l")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) -- cgit v1.2.3 From 7507399846237ae0c18510b4afef256d299cfa9a Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: knotifications: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (knotifications): Update to 5.27.0 and fix indentation. --- gnu/packages/kde-frameworks.scm | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 669ed7c548..147ecd058d 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1377,16 +1377,16 @@ asynchronous jobs.") (define-public knotifications (package (name "knotifications") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0qryp41phnpx4r9wa6rfhmnzy7nxl0ijnyrafadf2n2xb53ipkpa")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "09v122nxfgqjzr2azfn2nh4q9l22i5wnsz9prs0i7s3m7y0d7pxn")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1404,10 +1404,11 @@ asynchronous jobs.") `(#:phases (modify-phases %standard-phases (add-before 'check 'check-setup - (lambda* _ - (setenv "HOME" (getcwd)))) + (lambda _ + (setenv "HOME" (getcwd)) + #t)) (replace 'check - (lambda* _ + (lambda _ (setenv "DBUS_FATAL_WARNINGS" "0") (zero? (system* "dbus-launch" "ctest" "."))))))) (home-page "https://community.kde.org/Frameworks") -- cgit v1.2.3 From 0e6c3057480d8fa728798b3fb783a3cff2467a48 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kpackage: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kpackage): Update to 5.27.0 and fix indentation. --- gnu/packages/kde-frameworks.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 147ecd058d..97ac8569f6 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1420,16 +1420,16 @@ covers feedback and persistent events.") (define-public kpackage (package (name "kpackage") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "03aqzkpqz3c1v4qgwfbs3ncdbapiyg7psrkhxqv3z48rklavk1ri")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0y07zh8ryibm69ljp9f169qfal6r4lngz1ljxgrr6qw15cjkjygk")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1444,9 +1444,10 @@ covers feedback and persistent events.") #:phases (modify-phases %standard-phases (add-before 'check 'check-setup - (lambda* _ + (lambda _ (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; enable debug output - (setenv "HOME" (getcwd))))))) + (setenv "HOME" (getcwd)) + #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Installation and loading of additional content as packages") (description "The Package framework lets the user install and load packages -- cgit v1.2.3 From 84164f7ff88f4469145557bcde93fe97796517f5 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kpty: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kpty): Update to 5.27.0 and fix indentation. --- gnu/packages/kde-frameworks.scm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 97ac8569f6..d25f7e8e95 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1458,16 +1458,16 @@ were traditional plugins.") (define-public kpty (package (name "kpty") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1ybvdzqpa53kkki9p5da0ff9x3c63rmksk7865wqwlgy8apzi2fs")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "06pka8cbw6a9rk2j5pkz34rfy10bv6il3wqyf7ala32ynv5rcgc3")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1480,11 +1480,11 @@ were traditional plugins.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-tests - (lambda _ - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") - (substitute* "autotests/kptyprocesstest.cpp" - (("/bin/bash") (which "bash"))) - #t))))) + (lambda _ + (setenv "CTEST_OUTPUT_ON_FAILURE" "1") + (substitute* "autotests/kptyprocesstest.cpp" + (("/bin/bash") (which "bash"))) + #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Interfacing with pseudo terminal devices") (description "This library provides primitives to interface with pseudo -- cgit v1.2.3 From f7c2026feae0e10e3684e7b279de90cea976dc6e Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kunitconversion: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kunitconversion): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index d25f7e8e95..3918229ba7 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1495,16 +1495,16 @@ and communicating with them using a pty.") (define-public kunitconversion (package (name "kunitconversion") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "03dfjn4lm6sl2zcdrvw0b9irzvkyc2w2j5xixag5j8nw373742h8")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "11rn6813jz7clb6fjp9nbdg1c350zh0yiprbr053wkdjrb3aca7c")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) -- cgit v1.2.3 From 442f2beae05d79a0dcc9d1a091ce20f5372843ad Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: baloo: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (baloo): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 3918229ba7..a51d26cd7d 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1528,16 +1528,16 @@ gallons).") (define-public baloo (package (name "baloo") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1ayfdg6j9lvas17ryjdv4a0kaj6vw3bxfy2x9nadl0gkc9pak4nh")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0dqa5sxz2z440h6zry7s1x0r1d919qky69i5fv2nir7y844xx2cc")))) (build-system cmake-build-system) (propagated-inputs `(("kcoreaddons" ,kcoreaddons) -- cgit v1.2.3 From 04fb93e0e3e30f248b2765e1e6e0aaad01bb65ed Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kactivities: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kactivities): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index a51d26cd7d..18cf0779ca 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1585,16 +1585,16 @@ maintaining an index of the contents of your files.") (define-public kactivities (package (name "kactivities") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0s8g43zk6h35bq1am1nnhj0qvmhd6kz42gs8l7ybga0367jghzhf")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "08x07rlf2gff1j9jahznz2838919vab1ay8jppz3bp5kywx104yk")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) -- cgit v1.2.3 From 4902494f6d8637b3fb15dcaa706841984efb4c8e Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kactivities-stats: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kactivities-stats): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 18cf0779ca..4e80f052aa 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1632,16 +1632,16 @@ with other frameworks.") (define-public kactivities-stats (package (name "kactivities-stats") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1z3xvpifxbd05b2xaxxyiypcpid7jgjb1qpwiyjj1gnfp4rjmzpc")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "134a3zgasza9wghp1lkiaar3sakag7vn82pm2kcrmr420a0jigsw")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) -- cgit v1.2.3 From b58e9bea2efa6181bcd92897419ae417597fe56b Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kbookmarks: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kbookmarks): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 4e80f052aa..1f5452a30c 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1662,16 +1662,16 @@ by which applications, and what documents have been linked to which activity.") (define-public kbookmarks (package (name "kbookmarks") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "10d8dnhvbrwp0dbmz93cqfdff6ir8iy3yiwaf9ihj6ma124qlyjn")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1lb20yn8s27h0965yf6w4v4wwlm80bl24mpsksp01z9f0711j8vm")))) (build-system cmake-build-system) (propagated-inputs `(("kwidgetsaddons" ,kwidgetsaddons))) -- cgit v1.2.3 From 8ed8a9f53addf4cd1473e321284c5aa4cea6fa4b Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kcmutils: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kcmutils): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 1f5452a30c..b10485ef12 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1704,16 +1704,16 @@ using the XBEL format.") (define-public kcmutils (package (name "kcmutils") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0aws1c76s6wbp0xpr6qv6cfwq8dw82v00pkf9gy84sbxknwjnizk")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "04nbd0836azs2i0pq8hq8ljnmfc45mqs022zdn84xd2q3npl3hfx")))) (build-system cmake-build-system) (propagated-inputs `(("kconfigwidgets" ,kconfigwidgets) -- cgit v1.2.3 From 986d0eae6594977eedc91929e552b3d58cc890c6 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kconfigwidgets: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kconfigwidgets): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index b10485ef12..432902b220 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1743,16 +1743,16 @@ KCModules can be created with the KConfigWidgets framework.") (define-public kconfigwidgets (package (name "kconfigwidgets") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0v25r50gh5i984lzlv0rradghglcfqf0gsfmnkn23h87b86fm9l2")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0sbhirfsjmsxiwaqqh5jh85bhwmij93gj5knnb0bs0al4hy29918")))) (build-system cmake-build-system) (propagated-inputs `(("kauth" ,kauth) -- cgit v1.2.3 From 46e1ac0be8bfea886d7a846e188657dc140792d6 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kdeclarative: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kdeclarative): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 432902b220..83b5af0704 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1784,16 +1784,16 @@ their settings.") (define-public kdeclarative (package (name "kdeclarative") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "00ik9q1r6y6g5rkdq96yczgrxmcg85x00lipyljvc3x6xw6bixbz")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1a8pqwrwgmzarinhr9xxviqh9417p8icj8lwqg9ly0q0j3yv20dh")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) -- cgit v1.2.3 From 8e963d123ca13a077e7e81fdc4ea17013754446c Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kded: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kded): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 83b5af0704..9b5e9cd0d0 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1844,16 +1844,16 @@ that offer bindings to some of the Frameworks.") (define-public kded (package (name "kded") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0ngpxdxb596myn5r4kjxahx195bwklq33yvgjvcbxi2clg2wccaj")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "14f4qxia9p3vynv2ch9rs67zaxn9kpbas0fn0vwag1ikxb8qz0c2")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) -- cgit v1.2.3 From 9caef00bd1aee7eb0e57c283bf8f1b721cbb142e Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kdesignerplugin: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kdesignerplugin): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 9b5e9cd0d0..20ff29a1b8 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1877,16 +1877,16 @@ started on demand.") (define-public kdesignerplugin (package (name "kdesignerplugin") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0i0s8pwwhwh5hyyvkv0cnj0yyv0g5bnm5xw18knv2yagiy4bvb2j")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "157lny5v8js63nvw2iyc9j4cinqmyj75a389s46n8wqyygrz5v0v")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) -- cgit v1.2.3 From aa072198c6e387fb01b6c43440245cb62416ed14 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kdesu: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kdesu): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 20ff29a1b8..bce3bebef3 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1914,16 +1914,16 @@ ini-style description files.") (define-public kdesu (package (name "kdesu") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1ivcnhgvq75xvl0w9g7m45qzallz42ijaq0n1ap09lpdfmjbnrxk")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1l501z102ygibz4000jnngm0cggh2kaf6hzra1ngv5nxqxzkh31a")))) (build-system cmake-build-system) (propagated-inputs `(("kpty" ,kpty))) -- cgit v1.2.3 From 25ebad65bf86ff9b01a50be5de7a3c948910c39a Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kemoticons: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kemoticons): Update to 5.27.0. [arguments]: Return #t. --- gnu/packages/kde-frameworks.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index bce3bebef3..92530a539e 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1945,16 +1945,16 @@ with su and ssh respectively.") (define-public kemoticons (package (name "kemoticons") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0gmc52k5jb553jvzxwsq79v5y87kgav8i5qqv4bqc9yl7p866zhn")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0rjw2g3lfdxiy56x61d0sdcmcs8rml6h29a05fp6xww2bqcvr9wq")))) (build-system cmake-build-system) (propagated-inputs `(("kservice" ,kservice))) @@ -1973,7 +1973,8 @@ with su and ssh respectively.") (lambda _ (setenv "HOME" (getcwd)) (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; Enable debug output - (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (setenv "QT_QPA_PLATFORM" "offscreen") + #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Convert text emoticons to graphical emoticons") (description "KEmoticons converts emoticons from text to a graphical -- cgit v1.2.3 From 2b677becbd32dd7f513b87373225f5176f340dfe Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kglobalaccel: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kglobalaccel): Update to 5.27.0. [inputs]: Add kservice. --- gnu/packages/kde-frameworks.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 92530a539e..a8791c31eb 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1986,16 +1986,16 @@ emoticons coming from different providers.") (define-public kglobalaccel (package (name "kglobalaccel") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "123v0ld1q88hbm3d0mqgq6lcivfkqh7pbz4hb4n76ab5v43qc15c")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1z2knfxcla1f191cifij1fzw88b076yx6qjxraqfsmkc6g6i2bmj")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2005,6 +2005,7 @@ emoticons coming from different providers.") ("kcrash" ,kcrash) ("kcoreaddons" ,kcoreaddons) ("kdbusaddons" ,kdbusaddons) + ("kservice" ,kservice) ("kwindowsystem" ,kwindowsystem) ("libxcb" ,libxcb) ("qtbase" ,qtbase) -- cgit v1.2.3 From c8ddc56e6c53740ccecbb2eecf4d0dab3f6e7fbd Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kiconthemes: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kiconthemes): Update to 5.27.0. [arguments]: Return #t. --- gnu/packages/kde-frameworks.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index a8791c31eb..e77ff33473 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2028,16 +2028,16 @@ window does not need focus for them to be activated.") (define-public kiconthemes (package (name "kiconthemes") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1k5zig2n6wzfyv6pc8dpas2862mxjyxxza00m31myrfw5i1a1h6m")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0m70vcrxp0vvqw5grlsn19d2hgdhky8iv2pr0xwzw8v5yrnl1hh2")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2065,7 +2065,8 @@ window does not need focus for them to be activated.") "/share")) (setenv "HOME" (getcwd)) (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; Enable debug output - (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (setenv "QT_QPA_PLATFORM" "offscreen") + #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Icon GUI utilities") (description "This library contains classes to improve the handling of icons -- cgit v1.2.3 From 89d522a3602d87802a4236b7009b9c13a89d9d7d Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kinit: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kinit): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index e77ff33473..c94e0d0811 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2076,16 +2076,16 @@ in applications using the KDE Frameworks.") (define-public kinit (package (name "kinit") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1i7l6gid5hrrfglw1c461gpjg51dwz7cl4lx7ll8vz2ha8mz4d3n")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0sbpl1sp1ajarjmnvx2l3dr09afsay28kp2sf4yacrm4lrmhwzip")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) -- cgit v1.2.3 From ed3634e7565258cd2fc5e32d8c468a34d39376fc Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kio: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kio): Update to 5.27.0. [arguments]: Return #t. --- gnu/packages/kde-frameworks.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index c94e0d0811..d33ece9110 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2120,16 +2120,16 @@ makes starting KDE applications faster and reduces memory consumption.") (define-public kio (package (name "kio") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0zncj9yf8zaylazlwvirylpk9vki3j889b1x2s0aav54vvj7vdi5")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "129sglaw1480v3i1xdyv6k1w3spbj8s00rkdr5mzlcdaqiig69rn")))) (build-system cmake-build-system) (propagated-inputs `(("kbookmarks" ,kbookmarks) @@ -2173,7 +2173,8 @@ makes starting KDE applications faster and reduces memory consumption.") (setenv "HOME" (getcwd)) (setenv "XDG_RUNTIME_DIR" (getcwd)) (setenv "CTEST_OUTPUT_ON_FAILURE" "1") - (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (setenv "QT_QPA_PLATFORM" "offscreen") + #t))))) ;;(replace 'check ;; (lambda _ ;; (setenv "DBUS_FATAL_WARNINGS" "0") -- cgit v1.2.3 From 7064ad3fca367a6631e7a85523600439a0fe59f5 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: knewstuff: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (knewstuff): Update to 5.27.0. [arguments]: Return #t. --- gnu/packages/kde-frameworks.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index d33ece9110..af55c31754 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2193,16 +2193,16 @@ KIO enabled infrastructure.") (define-public knewstuff (package (name "knewstuff") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0xdv3wh3100vzsx8p2zihy1dvh0wzfmrjkjq71v8igwz5d291zsj")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "05ikb7cvyx3cmrrjh2ss6439a49vmzbi3chjj23ffdz2nd2k7r2f")))) (build-system cmake-build-system) (propagated-inputs `(("attica" ,attica) @@ -2237,7 +2237,8 @@ KIO enabled infrastructure.") (lambda _ ; XDG_DATA_DIRS isn't set (setenv "HOME" (getcwd)) (setenv "CTEST_OUTPUT_ON_FAILURE" "1") - (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (setenv "QT_QPA_PLATFORM" "offscreen") + #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Framework for downloading and sharing additional application data") (description "The KNewStuff library implements collaborative data sharing -- cgit v1.2.3 From 59cb98e1351ff4945ae67ee94febaab9fb4cf8e4 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: knotifyconfig: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (knotifyconfig): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index af55c31754..b8903e04fb 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2249,16 +2249,16 @@ specification.") (define-public knotifyconfig (package (name "knotifyconfig") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1dij841fnqia4p44x2wnpdvl8cn3nkj833y0fah50fmipjc8r70b")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "088p19ynjs79zf7mq3gkds93dg72jj8pfya53xyhzdg8s6vyns9n")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) -- cgit v1.2.3 From 33fa4658bdd6f45602cb29789fad34dbbbba1f78 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kparts: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kparts): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index b8903e04fb..61e4c0cebb 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2291,16 +2291,16 @@ notifications which can be embedded in your application.") (define-public kparts (package (name "kparts") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0z7qr93aq02i7g7cxgypx2rzlnsvbsx9cjblb0ijmad1nb8w3mix")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0rfsyr96s59ljp3jgmcwlvwzbgmlx7fvr62xswwmsnb8ah14k5rh")))) (build-system cmake-build-system) (propagated-inputs `(("kio" ,kio) -- cgit v1.2.3 From 3a1e972d50eea0230b7af29c08027d8b0fc55e71 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kpeople: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kpeople): Update to 5.27.0. [arguments]: Return #t. --- gnu/packages/kde-frameworks.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 61e4c0cebb..1d3e48baae 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2341,16 +2341,16 @@ widgets with a user-interface defined in terms of actions.") (define-public kpeople (package (name "kpeople") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0iknzkj23y927xh24kw5sjxyirhy6pkmfcmmgwzd78rba8a54qp2")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1w6sbd6djcpv36m9my4drqkrs1l3cryshpz1dx9z8p7afr296n8j")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2370,7 +2370,8 @@ widgets with a user-interface defined in terms of actions.") (add-before 'check 'check-setup (lambda _ (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; Enable debug output - (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (setenv "QT_QPA_PLATFORM" "offscreen") + #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Provides access to all contacts and aggregates them by person") (description "KPeople offers unified access to our contacts from different -- cgit v1.2.3 From dc219cc6da2a27d5212a5b91939c74d83852e1c6 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: krunner: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (krunner): Update to 5.27.0. [arguments]: Return #t. --- gnu/packages/kde-frameworks.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 1d3e48baae..a55be6ec37 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2384,16 +2384,16 @@ to easily extend the contacts collection.") (define-public krunner (package (name "krunner") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0ff87ijjd47jxf6zw2ggqgngnbyx1rj59wdfgy5wbi3acws6bafl")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1yyxyippmn0d9ycj1hdjvhl1zd31yxwg89a9zwmj8v8gdfr9flj9")))) (build-system cmake-build-system) (propagated-inputs `(("plasma-framework" ,plasma-framework))) @@ -2426,7 +2426,8 @@ to easily extend the contacts collection.") (add-before 'check 'check-setup (lambda _ (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; Enable debug output - (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (setenv "QT_QPA_PLATFORM" "offscreen") + #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Framework for Plasma runners") (description "The Plasma workspace provides an application called KRunner -- cgit v1.2.3 From 886d8155c1a4fee91bd8896a193df0abcd00cf72 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kservice: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kservice): Update to 5.27.0. [native-inputs]: Add bison and flex-2.6.1. --- gnu/packages/kde-frameworks.scm | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index a55be6ec37..bbd09b0912 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2439,22 +2439,28 @@ typed.") (define-public kservice (package (name "kservice") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0w0nsg64d6xhgijr2vh0j5p544qi0q55jpqa9v9mv956zrrdssdk")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "129bjdr272qkz2inmagy8jnxasifrl4d82x8rp9akfar29qsj6x6")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) ("kcoreaddons" ,kcoreaddons))) (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules))) + `(("bison" ,bison) + ("extra-cmake-modules" ,extra-cmake-modules) + ;; extra-cmake-modules forces C89 for all C files for compatibility with + ;; Windows. Flex 2.6.0 generates a lexer containing a single line + ;; comment. Single line comments are part of the C99 standard, so the + ;; lexer won't compile if C89 is used. + ("flex" ,flex-2.6.1))) (inputs `(("kcrash" ,kcrash) ("kdbusaddons" ,kdbusaddons) -- cgit v1.2.3 From b0791cf9aaf8efe4d3d72429e45f3500fe499887 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: ktexteditor: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (ktexteditor): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index bbd09b0912..2ff96cc78b 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2488,16 +2488,16 @@ types or handled by application specific code.") (define-public ktexteditor (package (name "ktexteditor") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1ykj1kvm7k1vxb1w235d5hp2swwdqjyp2y4c3pxbvkn999h9x5q5")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "127wp4dg72skd6abn2vqffxg91bn59z8yxwy6lxyzvck2pc5v1ss")))) (build-system cmake-build-system) (propagated-inputs `(("kparts" ,kparts))) -- cgit v1.2.3 From f07f67093db94fb00a518617e853a167c3adf8c3 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: ktextwidgets: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (ktextwidgets): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 2ff96cc78b..1c8a862055 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2555,16 +2555,16 @@ library.") (define-public ktextwidgets (package (name "ktextwidgets") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1q10xav2gkii6s3m31c9xvxf1988l7k2lpib6pyhgsidflmwjm02")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0aq2qx64wylxj5q5sr0dxv9h8bmn725llxyi7iwz31dg2ngfr7m4")))) (build-system cmake-build-system) (propagated-inputs `(("ki18n" ,ki18n) -- cgit v1.2.3 From 8b9b0e5eb7e73619958198310f08519d7f30435c Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kwallet: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kwallet): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 1c8a862055..b28eb01d5d 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2600,16 +2600,16 @@ It supports rich text as well as plain text.") (define-public kwallet (package (name "kwallet") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0zad5h4vsvcl2xv3vxsjwh42b71xbp6x6rj8cvmw8szr2rzz9gsx")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1mlrkzvbqk6r43yqrvv6jsc66brzjd321fp7mg7g3ny47va7hbc2")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) -- cgit v1.2.3 From 19fbf93f348d2baf30df23ac2edde2d5c93113ed Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kxmlgui: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kxmlgui): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index b28eb01d5d..2e2e71cc4b 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2641,16 +2641,16 @@ the passwords on KDE work spaces.") (define-public kxmlgui (package (name "kxmlgui") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1qhixldhhcbklmrpjh67440h1rrzqy70h57hw6ialjdsr3pl6ihp")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0hf55ip2irbsbg59r36njgb0h5ygpaspa4x6jfyi4bxj852c3hw1")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) -- cgit v1.2.3 From 6c6e8b19e47ae35f6fb7250645c7f966af127f25 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: kxmlrpcclient: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (kxmlrpcclient): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 2e2e71cc4b..cdd0cdbc46 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2693,16 +2693,16 @@ descriptions for integrating actions from plugins.") (define-public kxmlrpcclient (package (name "kxmlrpcclient") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "06ap6ipzqimz1rfrcr7z8zc7idy7sg4a97dws7h52i34ms7jqnc8")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "17bavm8qj4r1kc67x5g20v1pl8arjqpn69hg7icp2b1b0vnfvav1")))) (build-system cmake-build-system) (propagated-inputs `(("kio" ,kio))) -- cgit v1.2.3 From 9efa472fba3d2bd98b7df3b82fb372f71206f199 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 29 Oct 2016 18:48:28 +0200 Subject: gnu: plasma-framework: Update to 5.27.0. * gnu/packages/kde-frameworks.scm (plasma-framework): Update to 5.27.0. --- gnu/packages/kde-frameworks.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index cdd0cdbc46..69ea9e6234 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2736,16 +2736,16 @@ setUrl, setUserAgent and call.") (define-public plasma-framework (package (name "plasma-framework") - (version "5.24.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0981vm00541dzihlr1fsax05biwp2ddpwjrmvnfysx5jagdc65cb")))) + (version "5.27.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "11apg7h636dshswikjpz0qkapv8izqjjz47k7vs49x0byp802s5i")))) (build-system cmake-build-system) (propagated-inputs `(("kpackage" ,kpackage) -- cgit v1.2.3 From 8ed14711dce1baeb0eccab680e259fba845bea89 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 29 Oct 2016 21:30:16 +0200 Subject: gnu: hplip: Update to 3.16.10. * gnu/packages/cups.scm (hplip): Update to 3.16.10. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index e51dcb5e8c..354fcd62c4 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -303,14 +303,14 @@ device-specific programs to convert and print many types of files.") (define-public hplip (package (name "hplip") - (version "3.16.8") + (version "3.16.10") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/hplip/hplip/" version "/hplip-" version ".tar.gz")) (sha256 (base32 - "1svcalf2nc7mvxndp9zz3xp43w66z45rrsr5syl8fx61a6p6gnm9")))) + "117f1p0splg51ljn4nn97c0mbl0jba440ahb3d8njq7p6h1lxd25")))) (build-system gnu-build-system) (home-page "http://hplipopensource.com/") (synopsis "HP Printer Drivers") -- cgit v1.2.3 From 6cf626e8b3f0c34db7ce7b27cb75da6ad1183120 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 21 Sep 2016 03:45:18 +0200 Subject: gnu: Add yadifa. * gnu/packages/dns.scm (yadifa): New variable. --- gnu/packages/dns.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index e15ebed887..f60f1d1c54 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 John Darrington ;;; Copyright © 2016 ng0 +;;; Copyright © 2016 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,6 +24,7 @@ (define-module (gnu packages dns) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) #:use-module (gnu packages databases) #:use-module (gnu packages groff) #:use-module (gnu packages linux) @@ -161,3 +163,40 @@ asynchronous fashion.") license:bsd-3 (license:non-copyleft "file://LICENSE") ; includes.h license:openssl)))) + +(define-public yadifa + (package + (name "yadifa") + (version "2.2.1-6281") + (source + (origin + (method url-fetch) + (uri (string-append "http://cdn.yadifa.eu/sites/default/files/releases/" + name "-" version ".tar.gz")) + (sha256 + (base32 + "0vj71z7i9lfbnp93k28aplwldp5mfli0kvrbwmha6fjha6kcr910")))) + (build-system gnu-build-system) + (native-inputs + `(("which" ,which))) + (inputs + `(("openssl" ,openssl))) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'configure 'omit-example-configurations + (lambda _ (substitute* "Makefile.in" + ((" (etc|var)") ""))))) + #:configure-flags (list "--sysconfdir=/etc" "--localstatedir=/var" + "--enable-shared" "--disable-static" + "--enable-messages" "--enable-ctrl" + ;; NSID is a rarely-used debugging aid, that also + ;; causes the build to fail. Just disable it. + "--disable-nsid"))) + (home-page "http://www.yadifa.eu/") + (synopsis "Authoritative DNS name server") + (description "YADIFA is an authorative name server for the Domain Name +System (DNS). It aims for both higher performance and a smaller memory +footprint than other implementations, while remaining fully RFC-compliant. +YADIFA supports dynamic record updates and the Domain Name System Security +Extensions (DNSSEC).") + (license license:bsd-3))) -- cgit v1.2.3 From 225d6c049ea36724f80db44f0c4f73b0b740978d Mon Sep 17 00:00:00 2001 From: David Craven Date: Tue, 4 Oct 2016 22:27:05 +0200 Subject: gnu: sdcc: Enable ucsim. * gnu/packages/sdcc.scm (arguments)[configure-flags]: Add --enable-ucsim. --- gnu/packages/sdcc.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/sdcc.scm b/gnu/packages/sdcc.scm index c3d4bced26..331425d98f 100644 --- a/gnu/packages/sdcc.scm +++ b/gnu/packages/sdcc.scm @@ -49,7 +49,7 @@ (arguments `(;; gputils is required for PIC ports #:configure-flags - '("--disable-pic14-port" "--disable-pic16-port") + '("--disable-pic14-port" "--disable-pic16-port" "--enable-ucsim") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-makefile -- cgit v1.2.3 From eaf72e218e38c0c908ee30c914ab7d9c0c0389b8 Mon Sep 17 00:00:00 2001 From: David Craven Date: Wed, 26 Oct 2016 14:27:15 +0200 Subject: gnu: icecat: Enable gtk3 support. * gnu/packages/gnuzilla.scm (icecat)[inputs]: Add gtk+. [arguments]: Use --enable-default-toolkit=cairo-gtk3. --- gnu/packages/gnuzilla.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 4927a516e2..d4dbefa88f 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -410,7 +410,8 @@ standards.") ("glib" ,glib) ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) - ("gtk+" ,gtk+-2) + ("gtk+" ,gtk+) + ("gtk+-2" ,gtk+-2) ("pango" ,pango) ("freetype" ,freetype) ("hunspell" ,hunspell) @@ -468,7 +469,7 @@ standards.") ;; practice somehow. See . #:validate-runpath? #f - #:configure-flags '("--enable-default-toolkit=cairo-gtk2" + #:configure-flags '("--enable-default-toolkit=cairo-gtk3" "--enable-pango" "--enable-gio" "--enable-svg" -- cgit v1.2.3 From 94f36a4f5e101dc7d4f65224b1d3f0abebe643af Mon Sep 17 00:00:00 2001 From: Theodoros Foradis Date: Fri, 28 Oct 2016 20:36:04 +0300 Subject: gnu: Add gdb-arm-none-eabi. * gnu/packages/embedded.scm (gdb-arm-none-eabi): New variable. --- gnu/packages/embedded.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index a7af69f609..0b4f9abc1e 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -31,6 +31,7 @@ #:use-module (gnu packages cross-base) #:use-module (gnu packages flex) #:use-module (gnu packages gcc) + #:use-module (gnu packages gdb) #:use-module (gnu packages perl) #:use-module (gnu packages texinfo)) @@ -223,3 +224,15 @@ languages are C and C++.") (define-public arm-none-eabi-nano-toolchain-6 (arm-none-eabi-toolchain gcc-arm-none-eabi-6 newlib-nano-arm-none-eabi)) + +(define-public gdb-arm-none-eabi + (package + (inherit gdb) + (name "gdb-arm-none-eabi") + (arguments + `(#:configure-flags '("--target=arm-none-eabi" + "--enable-multilib" + "--enable-interwork" + "--enable-languages=c,c++" + "--disable-nls") + ,@(package-arguments gdb))))) -- cgit v1.2.3 From 3d74f12e63f7f94e2609b7bb028c3153df05c9bb Mon Sep 17 00:00:00 2001 From: Theodoros Foradis Date: Fri, 28 Oct 2016 20:36:05 +0300 Subject: gnu: Add hidapi. * gnu/packages/libusb.scm (hidapi): New variable. --- gnu/packages/libusb.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index 0071f4f119..fe1bed1768 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2015 Andy Wingo ;;; Copyright © 2015, 2016 Ricardo Wurmus ;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016 Theodoros Foradis ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,6 +30,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system python) + #:use-module (gnu packages autotools) #:use-module (gnu packages gnupg) #:use-module (gnu packages gtk) #:use-module (gnu packages linux) @@ -201,3 +203,39 @@ proposed for standardization.") (MTP), which allows media files to be transferred to and from many portable devices.") (license bsd-3))) + +(define-public hidapi + (package + (name "hidapi") + (version "0.8.0-rc1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/signal11/hidapi/archive/hidapi-" + version ".tar.gz")) + (sha256 + (base32 + "0qdgyj9rgb7n0nk3ghfswrhzzknxqn4ibn3wj8g4r828pw07451w")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'configure 'bootstrap + (lambda _ + (zero? (system* "autoreconf" "-vfi"))))))) + (inputs + `(("libusb" ,libusb) + ("udev" ,eudev))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (home-page "http://www.signal11.us/oss/hidapi/") + (synopsis "HID API library") + (description + "HIDAPI is a library which allows an application to interface with USB and Bluetooth +HID-Class devices.") + ;; HIDAPI can be used under one of three licenses. + (license (list gpl3 + bsd-3 + non-copyleft "file://LICENSE-orig.txt")))) -- cgit v1.2.3 From e5e45c067db1ff80d2f1d90cc0fef0420fc22733 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 30 Oct 2016 02:21:41 +0100 Subject: gnu: Add libjaylink. * gnu/packages/embedded.scm (libjaylink): New variable. --- gnu/packages/embedded.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 0b4f9abc1e..960c0590ba 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016 Theodoros Foradis +;;; Copyright © 2016 David Craven ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,11 +29,14 @@ #:use-module (guix build-system trivial) #:use-module (guix build utils) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages cross-base) #:use-module (gnu packages flex) #:use-module (gnu packages gcc) #:use-module (gnu packages gdb) + #:use-module (gnu packages libusb) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages texinfo)) ;; We must not use the released GCC sources here, because the cross-compiler @@ -236,3 +240,40 @@ languages are C and C++.") "--enable-languages=c,c++" "--disable-nls") ,@(package-arguments gdb))))) + +(define-public libjaylink + ;; No release tarballs available. + (let ((commit "faa2a433fdd3de211728f3da5921133214af9dd3") + (revision "1")) + (package + (name "libjaylink") + (version (string-append "0.1.0-" revision "." + (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://git.zapb.de/libjaylink.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "02crr56csz8whq3q4mrmdzzgwp5b0qvxm0fb18drclc3zj44yxl2")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (inputs + `(("libusb" ,libusb))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'autoreconf + (lambda _ + (zero? (system* "autoreconf" "-vfi"))))))) + (home-page "http://repo.or.cz/w/libjaylink.git") + (synopsis "Library to interface Segger J-Link devices") + (description "libjaylink is a shared library written in C to access +SEGGER J-Link and compatible devices.") + (license license:gpl2+)))) -- cgit v1.2.3 From 91ba69358691d25f4bf6dc831c0bb782a1f89e2c Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 30 Oct 2016 02:22:30 +0100 Subject: gnu: Add jimtcl. * gnu/packages/embedded.scm (jimtcl): New variable. --- gnu/packages/embedded.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 960c0590ba..7c771524db 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -277,3 +277,32 @@ languages are C and C++.") (description "libjaylink is a shared library written in C to access SEGGER J-Link and compatible devices.") (license license:gpl2+)))) + +(define-public jimtcl + (package + (name "jimtcl") + (version "0.77") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/msteveb/jimtcl" + "/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1cmk3qscqckg70chjyimzxa2qcka4qac0j4wq908kiijp45cax08")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Doesn't use autoconf. + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (zero? (system* "./configure" + (string-append "--prefix=" out))))))))) + (home-page "http://jim.tcl.tk") + (synopsis "Small footprint Tcl implementation") + (description "Jim is a small footprint implementation of the Tcl programming +language.") + (license license:bsd-2))) -- cgit v1.2.3 From 5b83b7b854054900abe7fef699d81943892e6e7a Mon Sep 17 00:00:00 2001 From: Theodoros Foradis Date: Fri, 28 Oct 2016 20:36:06 +0300 Subject: gnu: Add openocd. * gnu/packages/embedded.scm (openocd): New variable. * gnu/packages/patches/openocd-nrf52.patch: New file. * gnu/local.mk (dist_patch_DATA): Add the patch. --- gnu/local.mk | 1 + gnu/packages/embedded.scm | 56 ++ gnu/packages/patches/openocd-nrf52.patch | 843 +++++++++++++++++++++++++++++++ 3 files changed, 900 insertions(+) create mode 100644 gnu/packages/patches/openocd-nrf52.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index a64b7ec04b..8ee8b8c66c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -742,6 +742,7 @@ dist_patch_DATA = \ %D%/packages/patches/openjpeg-CVE-2016-5157.patch \ %D%/packages/patches/openjpeg-CVE-2016-7163.patch \ %D%/packages/patches/openjpeg-use-after-free-fix.patch \ + %D%/packages/patches/openocd-nrf52.patch \ %D%/packages/patches/openssh-memory-exhaustion.patch \ %D%/packages/patches/openssl-runpath.patch \ %D%/packages/patches/openssl-1.1.0-c-rehash-in.patch \ diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 7c771524db..11df32a6f2 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -34,6 +34,7 @@ #:use-module (gnu packages flex) #:use-module (gnu packages gcc) #:use-module (gnu packages gdb) + #:use-module (gnu packages libftdi) #:use-module (gnu packages libusb) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -306,3 +307,58 @@ SEGGER J-Link and compatible devices.") (description "Jim is a small footprint implementation of the Tcl programming language.") (license license:bsd-2))) + +(define-public openocd + ;; FIXME: Use tarball release after nrf52 patch is merged. + (let ((commit "674141e8a7a6413cb803d90c2a20150260015f81") + (revision "1")) + (package + (name "openocd") + (version (string-append "0.9.0-" revision "." + (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://git.code.sf.net/p/openocd/code.git") + (commit commit))) + (sha256 + (base32 + "1i86jp0wawq78d73z8hp7q1pn7lmlvhjjr19f7299h4w40a5jf8j")) + (file-name (string-append name "-" version "-checkout")) + (patches + (search-patches "openocd-nrf52.patch")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (inputs + `(("hidapi" ,hidapi) + ("jimtcl" ,jimtcl) + ("libftdi" ,libftdi) + ("libjaylink" ,libjaylink) + ("libusb-compat" ,libusb-compat))) + (arguments + '(#:configure-flags + (append (list "--disable-werror" + "--disable-internal-jimtcl" + "--disable-internal-libjaylink") + (map (lambda (programmer) + (string-append "--enable-" programmer)) + '("amtjtagaccel" "armjtagew" "buspirate" "ftdi" + "gw16012" "jlink" "oocd_trace" "opendous" "osbdm" + "parport" "aice" "cmsis-dap" "dummy" "jtag_vpi" + "remote-bitbang" "rlink" "stlink" "ti-icdi" "ulink" + "usbprog" "vsllink" "usb-blaster-2" "usb_blaster" + "presto" "openjtag"))) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'autoreconf + (lambda _ + (zero? (system* "autoreconf" "-vfi"))))))) + (home-page "http://openocd.org") + (synopsis "On-Chip Debugger") + (description "OpenOCD provides on-chip programming and debugging support +with a layered architecture of JTAG interface and TAP support.") + (license license:gpl2)))) diff --git a/gnu/packages/patches/openocd-nrf52.patch b/gnu/packages/patches/openocd-nrf52.patch new file mode 100644 index 0000000000..792575df78 --- /dev/null +++ b/gnu/packages/patches/openocd-nrf52.patch @@ -0,0 +1,843 @@ +This patch adds support for nRF52 series devices. It is patchset 7 from +, which has been tested, but not +merged yet in master. + +From: Michael Dietz +Date: Mon, 30 May 2016 12:50:44 +0000 (-0700) +Subject: Added support for nRF52 Series Devices. +X-Git-Url: http://openocd.zylin.com/gitweb?p=openocd.git;a=commitdiff_plain;h=9ba15633e221d9d72e320372ba8f49d3f30d4bce + +Added support for nRF52 Series Devices. + +Both nrf52.c and nrf52.cfg are based off of previous nRF51 files. +- Some possible race conditions with NVMC have been fixed in nRF52.c +- Removed nrf51_get_probed_chip_if_halted() as the core does not have to be halted to perform operations where it is called. +- Only registers that are needed by openOCD are defined, some registers in nRF51 don't exist in nRF52 and are removed. +- Some all around cleanup has been done. +- The protection mechanism is completely different on nRF52 and this has not been implemented yet - just prints a warning and returns for now. + +Change-Id: I4dd42c86f33f450709bb981806c2655f04aa6201 +Signed-off-by: Michael Dietz +--- + +diff --git a/src/flash/nor/Makefile.am b/src/flash/nor/Makefile.am +index c167e8f..b6a2be3 100644 +--- a/src/flash/nor/Makefile.am ++++ b/src/flash/nor/Makefile.am +@@ -37,6 +37,7 @@ NOR_DRIVERS = \ + niietcm4.c \ + non_cfi.c \ + nrf51.c \ ++ nrf52.c \ + numicro.c \ + ocl.c \ + pic32mx.c \ +diff --git a/src/flash/nor/drivers.c b/src/flash/nor/drivers.c +index 56a5cb2..3e071bd 100644 +--- a/src/flash/nor/drivers.c ++++ b/src/flash/nor/drivers.c +@@ -48,6 +48,7 @@ extern struct flash_driver mdr_flash; + extern struct flash_driver mrvlqspi_flash; + extern struct flash_driver niietcm4_flash; + extern struct flash_driver nrf51_flash; ++extern struct flash_driver nrf52_flash; + extern struct flash_driver numicro_flash; + extern struct flash_driver ocl_flash; + extern struct flash_driver pic32mx_flash; +@@ -100,6 +101,7 @@ static struct flash_driver *flash_drivers[] = { + &mrvlqspi_flash, + &niietcm4_flash, + &nrf51_flash, ++ &nrf52_flash, + &numicro_flash, + &ocl_flash, + &pic32mx_flash, +diff --git a/src/flash/nor/nrf52.c b/src/flash/nor/nrf52.c +new file mode 100644 +index 0000000..7f2bd35 +--- /dev/null ++++ b/src/flash/nor/nrf52.c +@@ -0,0 +1,733 @@ ++/*************************************************************************** ++ * Copyright (C) 2013 Synapse Product Development * ++ * Andrey Smirnov * ++ * Angus Gratton * ++ * Erdem U. Altunyurt * ++ * * ++ * This program is free software; you can redistribute it and/or modify * ++ * it under the terms of the GNU General Public License as published by * ++ * the Free Software Foundation; either version 2 of the License, or * ++ * (at your option) any later version. * ++ * * ++ * This program is distributed in the hope that it will be useful, * ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of * ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * ++ * GNU General Public License for more details. * ++ * * ++ * You should have received a copy of the GNU General Public License * ++ * along with this program. If not, see . * ++ ***************************************************************************/ ++ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ ++#include ++ ++#include "imp.h" ++#include ++#include ++#include ++ ++/* nRF52 Register addresses used by openOCD. */ ++#define NRF52_FLASH_BASE_ADDR (0x0) ++ ++#define NRF52_FICR_BASE_ADDR (0x10000000) ++#define NRF52_FICR_CODEPAGESIZE_ADDR (NRF52_FICR_BASE_ADDR | 0x010) ++#define NRF52_FICR_CODESIZE_ADDR (NRF52_FICR_BASE_ADDR | 0x014) ++ ++#define NRF52_UICR_BASE_ADDR (0x10001000) ++ ++#define NRF52_NVMC_BASE_ADDR (0x4001E000) ++#define NRF52_NVMC_READY_ADDR (NRF52_NVMC_BASE_ADDR | 0x400) ++#define NRF52_NVMC_CONFIG_ADDR (NRF52_NVMC_BASE_ADDR | 0x504) ++#define NRF52_NVMC_ERASEPAGE_ADDR (NRF52_NVMC_BASE_ADDR | 0x508) ++#define NRF52_NVMC_ERASEALL_ADDR (NRF52_NVMC_BASE_ADDR | 0x50C) ++#define NRF52_NVMC_ERASEUICR_ADDR (NRF52_NVMC_BASE_ADDR | 0x514) ++ ++/* nRF52 bit fields. */ ++enum nrf52_nvmc_config_bits { ++ NRF52_NVMC_CONFIG_REN = 0x0, ++ NRF52_NVMC_CONFIG_WEN = 0x01, ++ NRF52_NVMC_CONFIG_EEN = 0x02 ++}; ++ ++enum nrf52_nvmc_ready_bits { ++ NRF52_NVMC_BUSY = 0x0, ++ NRF52_NVMC_READY = 0x01 ++}; ++ ++/* nRF52 state information. */ ++struct nrf52_info { ++ uint32_t code_page_size; /* Size of FLASH page in bytes. */ ++ uint32_t code_memory_size; /* Size of Code FLASH region in bytes. */ ++ ++ struct { ++ bool probed; ++ int (*write) (struct flash_bank *bank, ++ struct nrf52_info *chip, ++ const uint8_t *buffer, uint32_t offset, uint32_t count); ++ } bank[2]; /* There are two regions in nRF52 FLASH - Code and UICR. */ ++ struct target *target; ++}; ++ ++static int nrf52_protect_check(struct flash_bank *bank); ++ ++static int nrf52_probe(struct flash_bank *bank) ++{ ++ int res; ++ struct nrf52_info *chip = bank->driver_priv; ++ assert(chip != NULL); ++ ++ res = target_read_u32(chip->target, ++ NRF52_FICR_CODEPAGESIZE_ADDR, ++ &chip->code_page_size); ++ if (res != ERROR_OK) { ++ LOG_ERROR("Couldn't read code page size"); ++ return res; ++ } ++ ++ res = target_read_u32(chip->target, ++ NRF52_FICR_CODESIZE_ADDR, ++ &chip->code_memory_size); ++ if (res != ERROR_OK) { ++ LOG_ERROR("Couldn't read code memory size"); ++ return res; ++ } ++ ++ chip->code_memory_size = chip->code_memory_size * chip->code_page_size; ++ ++ if (bank->base == NRF52_FLASH_BASE_ADDR) { ++ bank->size = chip->code_memory_size; ++ bank->num_sectors = bank->size / chip->code_page_size; ++ bank->sectors = calloc(bank->num_sectors, ++ sizeof((bank->sectors)[0])); ++ if (!bank->sectors) ++ return ERROR_FLASH_BANK_NOT_PROBED; ++ ++ /* Fill out the sector information: All nRF51 sectors are the same size. */ ++ for (int i = 0; i < bank->num_sectors; i++) { ++ bank->sectors[i].size = chip->code_page_size; ++ bank->sectors[i].offset = i * chip->code_page_size; ++ ++ /* Mark as unknown. */ ++ bank->sectors[i].is_erased = -1; ++ bank->sectors[i].is_protected = -1; ++ } ++ ++ nrf52_protect_check(bank); ++ ++ chip->bank[0].probed = true; ++ } else { /* This is the UICR bank. */ ++ bank->size = chip->code_page_size; ++ bank->num_sectors = 1; ++ bank->sectors = calloc(bank->num_sectors, ++ sizeof((bank->sectors)[0])); ++ if (!bank->sectors) ++ return ERROR_FLASH_BANK_NOT_PROBED; ++ ++ bank->sectors[0].size = bank->size; ++ bank->sectors[0].offset = 0; ++ ++ bank->sectors[0].is_erased = -1; ++ bank->sectors[0].is_protected = -1; ++ ++ chip->bank[1].probed = true; ++ } ++ ++ return ERROR_OK; ++} ++ ++static int nrf52_bank_is_probed(struct flash_bank *bank) ++{ ++ struct nrf52_info *chip = bank->driver_priv; ++ assert(chip != NULL); ++ ++ return chip->bank[bank->bank_number].probed; ++} ++ ++static int nrf52_auto_probe(struct flash_bank *bank) ++{ ++ if (!nrf52_bank_is_probed(bank)) ++ return nrf52_probe(bank); ++ else ++ return ERROR_OK; ++} ++ ++static int nrf52_wait_for_nvmc(struct nrf52_info *chip) ++{ ++ int res; ++ uint32_t ready; ++ int timeout = 100; ++ ++ do { ++ res = target_read_u32(chip->target, NRF52_NVMC_READY_ADDR, &ready); ++ if (res != ERROR_OK) { ++ LOG_ERROR("Couldn't read NVMC_READY register"); ++ return res; ++ } ++ ++ if (ready == NRF52_NVMC_READY) ++ return ERROR_OK; ++ ++ alive_sleep(1); ++ } while (timeout--); ++ ++ LOG_DEBUG("Timed out waiting for the NVMC to be ready"); ++ return ERROR_FLASH_BUSY; ++} ++ ++static int nrf52_nvmc_erase_enable(struct nrf52_info *chip) ++{ ++ int res; ++ ++ res = nrf52_wait_for_nvmc(chip); ++ if (res != ERROR_OK) ++ return res; ++ ++ res = target_write_u32(chip->target, ++ NRF52_NVMC_CONFIG_ADDR, ++ NRF52_NVMC_CONFIG_EEN); ++ if (res != ERROR_OK) { ++ LOG_ERROR("Failed to configure the NVMC for erasing"); ++ return res; ++ } ++ ++ return res; ++} ++ ++static int nrf52_nvmc_write_enable(struct nrf52_info *chip) ++{ ++ int res; ++ ++ res = nrf52_wait_for_nvmc(chip); ++ if (res != ERROR_OK) ++ return res; ++ ++ res = target_write_u32(chip->target, ++ NRF52_NVMC_CONFIG_ADDR, ++ NRF52_NVMC_CONFIG_WEN); ++ if (res != ERROR_OK) { ++ LOG_ERROR("Failed to configure the NVMC for writing"); ++ return res; ++ } ++ ++ return res; ++} ++ ++static int nrf52_nvmc_read_only(struct nrf52_info *chip) ++{ ++ int res; ++ ++ res = nrf52_wait_for_nvmc(chip); ++ if (res != ERROR_OK) ++ return res; ++ ++ res = target_write_u32(chip->target, ++ NRF52_NVMC_CONFIG_ADDR, ++ NRF52_NVMC_CONFIG_REN); ++ if (res != ERROR_OK) { ++ LOG_ERROR("Failed to configure the NVMC for read-only"); ++ return res; ++ } ++ ++ return res; ++} ++ ++static int nrf52_nvmc_generic_erase(struct nrf52_info *chip, ++ uint32_t erase_register, ++ uint32_t erase_value) ++{ ++ int res; ++ ++ res = nrf52_nvmc_erase_enable(chip); ++ if (res != ERROR_OK) ++ return res; ++ ++ res = target_write_u32(chip->target, ++ erase_register, ++ erase_value); ++ if (res != ERROR_OK) ++ LOG_ERROR("Failed to write NVMC erase register"); ++ ++ return nrf52_nvmc_read_only(chip); ++} ++ ++static int nrf52_protect_check(struct flash_bank *bank) ++{ ++ LOG_WARNING("nrf52_protect_check() is not implemented for nRF52 series devices yet"); ++ return ERROR_OK; ++} ++ ++static int nrf52_protect(struct flash_bank *bank, int set, int first, int last) ++{ ++ LOG_WARNING("nrf52_protect() is not implemented for nRF52 series devices yet"); ++ return ERROR_OK; ++} ++ ++static struct flash_sector *nrf52_find_sector_by_address(struct flash_bank *bank, uint32_t address) ++{ ++ struct nrf52_info *chip = bank->driver_priv; ++ assert(chip != NULL); ++ ++ for (int i = 0; i < bank->num_sectors; i++) ++ if (bank->sectors[i].offset <= address && ++ address < (bank->sectors[i].offset + chip->code_page_size)) { ++ return &bank->sectors[i]; ++ } ++ ++ return NULL; ++} ++ ++static int nrf52_erase_all(struct nrf52_info *chip) ++{ ++ LOG_DEBUG("Erasing all non-volatile memory"); ++ return nrf52_nvmc_generic_erase(chip, ++ NRF52_NVMC_ERASEALL_ADDR, ++ 0x01); ++} ++ ++static int nrf52_erase_page(struct flash_bank *bank, ++ struct nrf52_info *chip, ++ struct flash_sector *sector) ++{ ++ int res; ++ ++ LOG_DEBUG("Erasing page at 0x%"PRIx32, sector->offset); ++ if (sector->is_protected == 1) { ++ LOG_ERROR("Cannot erase protected sector at 0x%" PRIx32, sector->offset); ++ return ERROR_FAIL; ++ } ++ ++ if (bank->base == NRF52_UICR_BASE_ADDR) { ++ res = nrf52_nvmc_generic_erase(chip, ++ NRF52_NVMC_ERASEUICR_ADDR, ++ 0x00000001); ++ } else { ++ res = nrf52_nvmc_generic_erase(chip, ++ NRF52_NVMC_ERASEPAGE_ADDR, ++ sector->offset); ++ } ++ ++ if (res == ERROR_OK) ++ sector->is_erased = 1; ++ return res; ++} ++ ++static const uint8_t nrf52_flash_write_code[] = { ++ /* See contrib/loaders/flash/cortex-m0.S */ ++ /* : */ ++ 0x0d, 0x68, /* ldr r5, [r1, #0] */ ++ 0x00, 0x2d, /* cmp r5, #0 */ ++ 0x0b, 0xd0, /* beq.n 1e */ ++ 0x4c, 0x68, /* ldr r4, [r1, #4] */ ++ 0xac, 0x42, /* cmp r4, r5 */ ++ 0xf9, 0xd0, /* beq.n 0 */ ++ 0x20, 0xcc, /* ldmia r4!, {r5} */ ++ 0x20, 0xc3, /* stmia r3!, {r5} */ ++ 0x94, 0x42, /* cmp r4, r2 */ ++ 0x01, 0xd3, /* bcc.n 18 */ ++ 0x0c, 0x46, /* mov r4, r1 */ ++ 0x08, 0x34, /* adds r4, #8 */ ++ /* : */ ++ 0x4c, 0x60, /* str r4, [r1, #4] */ ++ 0x04, 0x38, /* subs r0, #4 */ ++ 0xf0, 0xd1, /* bne.n 0 */ ++ /* : */ ++ 0x00, 0xbe /* bkpt 0x0000 */ ++}; ++ ++ ++/* Start a low level flash write for the specified region */ ++static int nrf52_ll_flash_write(struct nrf52_info *chip, uint32_t offset, const uint8_t *buffer, uint32_t bytes) ++{ ++ struct target *target = chip->target; ++ uint32_t buffer_size = 8192; ++ struct working_area *write_algorithm; ++ struct working_area *source; ++ uint32_t address = NRF52_FLASH_BASE_ADDR + offset; ++ struct reg_param reg_params[4]; ++ struct armv7m_algorithm armv7m_info; ++ int retval = ERROR_OK; ++ ++ LOG_DEBUG("Writing buffer to flash offset=0x%"PRIx32" bytes=0x%"PRIx32, offset, bytes); ++ assert(bytes % 4 == 0); ++ ++ /* allocate working area with flash programming code */ ++ if (target_alloc_working_area(target, sizeof(nrf52_flash_write_code), ++ &write_algorithm) != ERROR_OK) { ++ LOG_WARNING("no working area available, falling back to slow memory writes"); ++ ++ for (; bytes > 0; bytes -= 4) { ++ retval = target_write_memory(chip->target, ++ offset, 4, 1, buffer); ++ if (retval != ERROR_OK) ++ return retval; ++ ++ retval = nrf52_wait_for_nvmc(chip); ++ if (retval != ERROR_OK) ++ return retval; ++ ++ offset += 4; ++ buffer += 4; ++ } ++ ++ return ERROR_OK; ++ } ++ ++ LOG_WARNING("using fast async flash loader. This is currently supported"); ++ LOG_WARNING("only with ST-Link and CMSIS-DAP. If you have issues, add"); ++ LOG_WARNING("\"set WORKAREASIZE 0\" before sourcing nrf52.cfg to disable it"); ++ ++ retval = target_write_buffer(target, write_algorithm->address, ++ sizeof(nrf52_flash_write_code), ++ nrf52_flash_write_code); ++ if (retval != ERROR_OK) ++ return retval; ++ ++ /* memory buffer */ ++ while (target_alloc_working_area(target, buffer_size, &source) != ERROR_OK) { ++ buffer_size /= 2; ++ buffer_size &= ~3UL; /* Make sure it's 4 byte aligned */ ++ if (buffer_size <= 256) { ++ /* free working area, write algorithm already allocated */ ++ target_free_working_area(target, write_algorithm); ++ ++ LOG_WARNING("No large enough working area available, can't do block memory writes"); ++ return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; ++ } ++ } ++ ++ armv7m_info.common_magic = ARMV7M_COMMON_MAGIC; ++ armv7m_info.core_mode = ARM_MODE_THREAD; ++ ++ init_reg_param(®_params[0], "r0", 32, PARAM_IN_OUT); /* byte count */ ++ init_reg_param(®_params[1], "r1", 32, PARAM_OUT); /* buffer start */ ++ init_reg_param(®_params[2], "r2", 32, PARAM_OUT); /* buffer end */ ++ init_reg_param(®_params[3], "r3", 32, PARAM_IN_OUT); /* target address */ ++ ++ buf_set_u32(reg_params[0].value, 0, 32, bytes); ++ buf_set_u32(reg_params[1].value, 0, 32, source->address); ++ buf_set_u32(reg_params[2].value, 0, 32, source->address + source->size); ++ buf_set_u32(reg_params[3].value, 0, 32, address); ++ ++ retval = target_run_flash_async_algorithm(target, buffer, bytes/4, 4, ++ 0, NULL, ++ 4, reg_params, ++ source->address, source->size, ++ write_algorithm->address, 0, ++ &armv7m_info); ++ ++ target_free_working_area(target, source); ++ target_free_working_area(target, write_algorithm); ++ ++ destroy_reg_param(®_params[0]); ++ destroy_reg_param(®_params[1]); ++ destroy_reg_param(®_params[2]); ++ destroy_reg_param(®_params[3]); ++ ++ return retval; ++} ++ ++/* Check and erase flash sectors in specified range, then start a low level page write. ++ start/end must be sector aligned. ++*/ ++static int nrf52_write_pages(struct flash_bank *bank, uint32_t start, uint32_t end, const uint8_t *buffer) ++{ ++ int res; ++ uint32_t offset; ++ struct flash_sector *sector; ++ struct nrf52_info *chip = bank->driver_priv; ++ assert(chip != NULL); ++ ++ assert(start % chip->code_page_size == 0); ++ assert(end % chip->code_page_size == 0); ++ ++ /* Erase all sectors */ ++ for (offset = start; offset < end; offset += chip->code_page_size) { ++ sector = nrf52_find_sector_by_address(bank, offset); ++ ++ if (sector == NULL) { ++ LOG_ERROR("Invalid sector @ 0x%08"PRIx32, offset); ++ return ERROR_FLASH_SECTOR_INVALID; ++ } ++ ++ if (sector->is_protected == 1) { ++ LOG_ERROR("Can't erase protected sector @ 0x%08"PRIx32, offset); ++ return ERROR_FAIL; ++ } ++ ++ if (sector->is_erased != 1) { /* 1 = erased, 0= not erased, -1 = unknown */ ++ res = nrf52_erase_page(bank, chip, sector); ++ if (res != ERROR_OK) { ++ LOG_ERROR("Failed to erase sector @ 0x%08"PRIx32, sector->offset); ++ return res; ++ } ++ } ++ sector->is_erased = 1; ++ } ++ ++ res = nrf52_nvmc_write_enable(chip); ++ if (res != ERROR_OK) ++ return res; ++ ++ res = nrf52_ll_flash_write(chip, start, buffer, (end - start)); ++ if (res != ERROR_OK) { ++ LOG_ERROR("Failed to write FLASH"); ++ nrf52_nvmc_read_only(chip); ++ return res; ++ } ++ ++ return nrf52_nvmc_read_only(chip); ++} ++ ++static int nrf52_erase(struct flash_bank *bank, int first, int last) ++{ ++ int res = ERROR_OK; ++ struct nrf52_info *chip = bank->driver_priv; ++ assert(chip != NULL); ++ ++ /* For each sector to be erased */ ++ for (int s = first; s <= last && res == ERROR_OK; s++) ++ res = nrf52_erase_page(bank, chip, &bank->sectors[s]); ++ ++ return res; ++} ++ ++static int nrf52_code_flash_write(struct flash_bank *bank, ++ struct nrf52_info *chip, ++ const uint8_t *buffer, uint32_t offset, uint32_t count) ++{ ++ int res; ++ /* Need to perform reads to fill any gaps we need to preserve in the first page, ++ before the start of buffer, or in the last page, after the end of buffer */ ++ uint32_t first_page = offset / chip->code_page_size; ++ uint32_t last_page = DIV_ROUND_UP(offset+count, chip->code_page_size); ++ ++ uint32_t first_page_offset = first_page * chip->code_page_size; ++ uint32_t last_page_offset = last_page * chip->code_page_size; ++ ++ LOG_DEBUG("Padding write from 0x%08"PRIx32"-0x%08"PRIx32" as 0x%08"PRIx32"-0x%08"PRIx32, ++ offset, offset+count, first_page_offset, last_page_offset); ++ ++ uint32_t page_cnt = last_page - first_page; ++ uint8_t buffer_to_flash[page_cnt * chip->code_page_size]; ++ ++ /* Fill in any space between start of first page and start of buffer */ ++ uint32_t pre = offset - first_page_offset; ++ if (pre > 0) { ++ res = target_read_memory(bank->target, first_page_offset, 1, pre, buffer_to_flash); ++ if (res != ERROR_OK) ++ return res; ++ } ++ ++ /* Fill in main contents of buffer */ ++ memcpy(buffer_to_flash + pre, buffer, count); ++ ++ /* Fill in any space between end of buffer and end of last page */ ++ uint32_t post = last_page_offset - (offset + count); ++ if (post > 0) { ++ /* Retrieve the full row contents from Flash */ ++ res = target_read_memory(bank->target, offset + count, 1, post, buffer_to_flash + pre + count); ++ if (res != ERROR_OK) ++ return res; ++ } ++ ++ return nrf52_write_pages(bank, first_page_offset, last_page_offset, buffer_to_flash); ++} ++ ++static int nrf52_uicr_flash_write(struct flash_bank *bank, ++ struct nrf52_info *chip, ++ const uint8_t *buffer, uint32_t offset, uint32_t count) ++{ ++ int res; ++ uint32_t nrf52_uicr_size = chip->code_page_size; ++ uint8_t uicr[nrf52_uicr_size]; ++ struct flash_sector *sector = &bank->sectors[0]; ++ ++ if ((offset + count) > nrf52_uicr_size) ++ return ERROR_FAIL; ++ ++ res = target_read_memory(bank->target, NRF52_UICR_BASE_ADDR, 1, nrf52_uicr_size, uicr); ++ ++ if (res != ERROR_OK) ++ return res; ++ ++ if (sector->is_erased != 1) { ++ res = nrf52_erase_page(bank, chip, sector); ++ if (res != ERROR_OK) ++ return res; ++ } ++ ++ memcpy(&uicr[offset], buffer, count); ++ ++ res = nrf52_nvmc_write_enable(chip); ++ if (res != ERROR_OK) ++ return res; ++ ++ res = nrf52_ll_flash_write(chip, NRF52_UICR_BASE_ADDR, uicr, nrf52_uicr_size); ++ if (res != ERROR_OK) { ++ nrf52_nvmc_read_only(chip); ++ return res; ++ } ++ ++ return nrf52_nvmc_read_only(chip); ++} ++ ++ ++static int nrf52_write(struct flash_bank *bank, const uint8_t *buffer, ++ uint32_t offset, uint32_t count) ++{ ++ struct nrf52_info *chip = bank->driver_priv; ++ assert(chip != NULL); ++ ++ return chip->bank[bank->bank_number].write(bank, chip, buffer, offset, count); ++} ++ ++ ++FLASH_BANK_COMMAND_HANDLER(nrf52_flash_bank_command) ++{ ++ static struct nrf52_info *chip; ++ ++ assert(bank != NULL); ++ ++ switch (bank->base) { ++ case NRF52_FLASH_BASE_ADDR: ++ bank->bank_number = 0; ++ break; ++ case NRF52_UICR_BASE_ADDR: ++ bank->bank_number = 1; ++ break; ++ default: ++ LOG_ERROR("Invalid bank address 0x%08" PRIx32, bank->base); ++ return ERROR_FAIL; ++ } ++ ++ if (!chip) { ++ /* Create a new chip */ ++ chip = calloc(1, sizeof(*chip)); ++ assert(chip != NULL); ++ ++ chip->target = bank->target; ++ } ++ ++ switch (bank->base) { ++ case NRF52_FLASH_BASE_ADDR: ++ chip->bank[bank->bank_number].write = nrf52_code_flash_write; ++ break; ++ case NRF52_UICR_BASE_ADDR: ++ chip->bank[bank->bank_number].write = nrf52_uicr_flash_write; ++ break; ++ } ++ ++ chip->bank[bank->bank_number].probed = false; ++ bank->driver_priv = chip; ++ ++ return ERROR_OK; ++} ++ ++COMMAND_HANDLER(nrf52_handle_mass_erase_command) ++{ ++ int res; ++ struct flash_bank *bank = NULL; ++ struct target *target = get_current_target(CMD_CTX); ++ ++ res = get_flash_bank_by_addr(target, NRF52_FLASH_BASE_ADDR, true, &bank); ++ if (res != ERROR_OK) ++ return res; ++ ++ assert(bank != NULL); ++ ++ struct nrf52_info *chip = bank->driver_priv; ++ assert(chip != NULL); ++ ++ res = nrf52_erase_all(chip); ++ if (res != ERROR_OK) { ++ LOG_ERROR("Failed to erase the chip"); ++ nrf52_protect_check(bank); ++ return res; ++ } ++ ++ for (int i = 0; i < bank->num_sectors; i++) ++ bank->sectors[i].is_erased = 1; ++ ++ res = nrf52_protect_check(bank); ++ if (res != ERROR_OK) { ++ LOG_ERROR("Failed to check chip's write protection"); ++ return res; ++ } ++ ++ res = get_flash_bank_by_addr(target, NRF52_UICR_BASE_ADDR, true, &bank); ++ if (res != ERROR_OK) ++ return res; ++ ++ bank->sectors[0].is_erased = 1; ++ ++ return ERROR_OK; ++} ++ ++static int nrf52_info(struct flash_bank *bank, char *buf, int buf_size) ++{ ++ int res; ++ uint32_t ficr[2]; ++ struct nrf52_info *chip = bank->driver_priv; ++ assert(chip != NULL); ++ ++ res = target_read_u32(chip->target, NRF52_FICR_CODEPAGESIZE_ADDR, &ficr[0]); ++ if (res != ERROR_OK) { ++ LOG_ERROR("Couldn't read NVMC_READY register"); ++ return res; ++ } ++ ++ res = target_read_u32(chip->target, NRF52_FICR_CODESIZE_ADDR, &ficr[1]); ++ if (res != ERROR_OK) { ++ LOG_ERROR("Couldn't read NVMC_READY register"); ++ return res; ++ } ++ ++ snprintf(buf, buf_size, ++ "\n--------nRF52 Series Device--------\n\n" ++ "\n[factory information control block]\n" ++ "code page size: %"PRIu32"B\n" ++ "code memory size: %"PRIu32"kB\n", ++ ficr[0], ++ (ficr[1] * ficr[0]) / 1024); ++ ++ return ERROR_OK; ++} ++ ++static const struct command_registration nrf52_exec_command_handlers[] = { ++ { ++ .name = "mass_erase", ++ .handler = nrf52_handle_mass_erase_command, ++ .mode = COMMAND_EXEC, ++ .help = "Erase all flash contents of the chip.", ++ }, ++ COMMAND_REGISTRATION_DONE ++}; ++ ++static const struct command_registration nrf52_command_handlers[] = { ++ { ++ .name = "nrf52", ++ .mode = COMMAND_ANY, ++ .help = "nrf52 flash command group", ++ .usage = "", ++ .chain = nrf52_exec_command_handlers, ++ }, ++ COMMAND_REGISTRATION_DONE ++}; ++ ++struct flash_driver nrf52_flash = { ++ .name = "nrf52", ++ .commands = nrf52_command_handlers, ++ .flash_bank_command = nrf52_flash_bank_command, ++ .info = nrf52_info, ++ .erase = nrf52_erase, ++ .protect = nrf52_protect, ++ .write = nrf52_write, ++ .read = default_flash_read, ++ .probe = nrf52_probe, ++ .auto_probe = nrf52_auto_probe, ++ .erase_check = default_flash_blank_check, ++ .protect_check = nrf52_protect_check, ++}; +diff --git a/tcl/target/nrf52.cfg b/tcl/target/nrf52.cfg +index c1cbf1a..a2567ff 100644 +--- a/tcl/target/nrf52.cfg ++++ b/tcl/target/nrf52.cfg +@@ -5,15 +5,22 @@ + source [find target/swj-dp.tcl] + + if { [info exists CHIPNAME] } { +- set _CHIPNAME $CHIPNAME ++ set _CHIPNAME $CHIPNAME + } else { +- set _CHIPNAME nrf52 ++ set _CHIPNAME nrf52 ++} ++ ++# Work-area is a space in RAM used for flash programming, by default use 16kB. ++if { [info exists WORKAREASIZE] } { ++ set _WORKAREASIZE $WORKAREASIZE ++} else { ++ set _WORKAREASIZE 0x4000 + } + + if { [info exists CPUTAPID] } { +- set _CPUTAPID $CPUTAPID ++ set _CPUTAPID $CPUTAPID + } else { +- set _CPUTAPID 0x2ba01477 ++ set _CPUTAPID 0x2ba01477 + } + + swj_newdap $_CHIPNAME cpu -expected-id $_CPUTAPID +@@ -21,8 +28,15 @@ swj_newdap $_CHIPNAME cpu -expected-id $_CPUTAPID + set _TARGETNAME $_CHIPNAME.cpu + target create $_TARGETNAME cortex_m -chain-position $_TARGETNAME + +-adapter_khz 10000 ++$_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 0 + +-if { ![using_hla] } { +- cortex_m reset_config sysresetreq ++if {![using_hla]} { ++ cortex_m reset_config sysresetreq + } ++ ++flash bank $_CHIPNAME.flash nrf52 0x00000000 0 1 1 $_TARGETNAME ++flash bank $_CHIPNAME.uicr nrf52 0x10001000 0 1 1 $_TARGETNAME ++ ++adapter_khz 1000 ++ ++$_TARGETNAME configure -event reset-end {} -- cgit v1.2.3 From a2eab4223d8940d9903b73b13bc4f70c418d35f7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 29 Oct 2016 21:01:58 -0400 Subject: gnu: python-pyechonest: Remove package. * gnu/packages/music.scm (python-pyechonest): Remove variable. --- gnu/packages/music.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index caa91c4ff4..1c50182b37 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1772,9 +1772,9 @@ MusicBrainz database.") (define-public python2-musicbrainzngs (package-with-python2 python-musicbrainzngs)) -(define-public python-pyechonest +(define-public python2-pyechonest (package - (name "python-pyechonest") + (name "python2-pyechonest") (version "9.0.0") (source (origin (method url-fetch) @@ -1783,6 +1783,11 @@ MusicBrainz database.") (base32 "1584nira3rkiman9dm81kdshihmkj21s8navndz2l8spnjwb790x")))) (build-system python-build-system) + (arguments + `(;; Python 3 is not supported: + ;; https://github.com/echonest/pyechonest/issues/42 + #:python ,python-2)) + (native-inputs `(("python2-setuptools" ,python2-setuptools))) (home-page "https://github.com/echonest/pyechonest") (synopsis "Python interface to The Echo Nest APIs") (description "Pyechonest is a Python library for the Echo Nest API. With @@ -1799,13 +1804,7 @@ hotttnesss, audio_summary, or tracks. about the track including key, duration, mode, tempo, time signature along with detailed track info including timbre, pitch, rhythm and loudness information. @end enumerate\n") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-pyechonest)))))) - -(define-public python2-pyechonest - (package (inherit (package-with-python2 - (strip-python2-variant python-pyechonest))) - (native-inputs `(("python2-setuptools" ,python2-setuptools))))) + (license license:bsd-3))) (define-public python-pylast (package -- cgit v1.2.3 From 10797a0ae0b57502ca3c4c8d98c6f0e062aacf8f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 29 Oct 2016 21:05:15 -0400 Subject: gnu: python-publicsuffix2: Disable the test suite. The tests were silently skipped with Python 3.4. With Python 3.5, this caused the build of python-publicsuffix2 to fail. * gnu/packages/python.scm (python-publicsuffix2, python2-publicsuffix2) [arguments]: Disable the tests. --- gnu/packages/python.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f05690617a..a25d3bca4c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10618,6 +10618,8 @@ List.") (base32 "06lx603gdwad5hc3hmn763ngq0rq9bzz1ni3ga72nzk5n872arkd")))) (build-system python-build-system) + (arguments + '(#:tests? #f)) ; The test suite requires network access. (home-page "https://github.com/pombredanne/python-publicsuffix2") (synopsis "Get a public suffix for a domain name using the Public Suffix List") (description "Get a public suffix for a domain name using the Public Suffix -- cgit v1.2.3 From bae187105907a1fe94fb2f6a661920299b9cd877 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 29 Oct 2016 21:08:30 -0400 Subject: gnu: python-prompt-toolkit: Disable the test suite. The tests were silently skipped with Python 3.4. With Python 3.5, this caused the build of python-prompt-toolkit to fail. * gnu/packages/python.scm (python-prompt-toolkit, python2-prompt-toolkit)[arguments]: Disable the tests. --- gnu/packages/python.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a25d3bca4c..55efd4d4c0 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10151,6 +10151,8 @@ implementation for Python.") (base32 "1vyjd0b7wciv55i19l44zy0adx8q7ss79lhy2r9d1rwz2y4822zg")))) (build-system python-build-system) + (arguments + '(#:tests? #f)) ; The test suite uses some Windows-specific data types. (inputs `(("python-wcwidth" ,python-wcwidth) ("python-pygments" ,python-pygments))) (native-inputs `(("python-six" ,python-six))) -- cgit v1.2.3 From 329b4b3b69380b232129fcd65f9f41c195aa336d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 29 Oct 2016 21:32:55 -0400 Subject: gnu: Add python-pyev. * gnu/packages/python.scm (python-pyev, python2-pyev): New variables. --- gnu/packages/python.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 55efd4d4c0..dcc72b33d2 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11376,3 +11376,36 @@ useful as a validator for JSON data.") (description "This package adds SQLAlchemy support to your Flask application.") (license license:bsd-3))) + +(define-public python-pyev + (package + (name "python-pyev") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyev" version)) + (sha256 + (base32 + "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx")))) + (build-system python-build-system) + (arguments + `(#:tests? #f ; no test suite + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda* (#:key inputs #:allow-other-keys) + (let ((libev (string-append (assoc-ref inputs "libev") + "/lib/libev.so.4"))) + (substitute* "setup.py" + (("libev_dll_name = find_library\\(\\\"ev\\\"\\)") + (string-append "libev_dll_name = \"" libev "\""))))))))) + (inputs + `(("libev" ,libev))) + (home-page "http://pythonhosted.org/pyev/") + (synopsis "Python libev interface") + (description "Pyev provides a Python interface to libev.") + (license license:gpl3))) + +(define-public python2-pyev + (package-with-python2 python-pyev)) -- cgit v1.2.3 From 269d9172ff037bd41bee3777166b3bc14d93f745 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 29 Oct 2016 21:34:32 -0400 Subject: gnu: python-pika: Add inputs for test suite. * gnu/packages/python.scm (python-pika, python2-pika)[native-inputs]: Add python-pyev, python-tornado. --- gnu/packages/python.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index dcc72b33d2..7cfbd997d8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9589,7 +9589,9 @@ focus on event-based network programming and multiprotocol integration.") "0nb4h08di432lv7dy2v9kpwgk0w92f24sqc2hw2s9vwr5b8v8xvj")))) (build-system python-build-system) (native-inputs - `(("python-twisted" ,python-twisted))) + `(("python-pyev" ,python-pyev) + ("python-tornado" ,python-tornado) + ("python-twisted" ,python-twisted))) (home-page "https://pika.readthedocs.org") (synopsis "Pure Python AMQP Client Library") (description -- cgit v1.2.3