From 369387b65d5f46b3bce28ddec8aa1511ffa65afa Mon Sep 17 00:00:00 2001 From: ng0 Date: Fri, 26 Aug 2016 09:27:22 +0000 Subject: gnu: version-control: Use license: prefix. * gnu/packages/version-control.scm (define-module): Import guix licenses with a prefix. (parted): Use the import prefix. (bazaar): Likewise. (git): Likewise. (libgit2): Likewise. (cgit): Likewise. (shflags): Likewise. (git-flow): Likewise. (gitolite): Likewise. (mercurial): Likewise. (neon): Likewise. (subversion): Likewise. (rcs): Likewise. (cvs): Likewise. (cvs-fast-export): Likewise. (vc-dwim): Likewise. (diffstat): Likewise. (cssc): Likewise. (aegis): Likewise. (reposurgeon): Likewise. (tig): Likewise. (findnewest): Likewise. (myrepos): Likewise. (git-annex-remote-hubic):: Likewise. (fossil): Likewise. Signed-off-by: Leo Famulari --- gnu/packages/version-control.scm | 56 +++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c39368d9ad..a8f57f2499 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2015 Kyle Meyer ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2016 Leo Famulari +;;; Copyright © 2016 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,10 +28,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages version-control) - #:use-module ((guix licenses) - #:select (asl2.0 bsd-2 bsd-3 - gpl1+ gpl2 gpl2+ gpl3+ lgpl2.1 - public-domain x11-style)) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix download) @@ -108,7 +106,7 @@ "GNU Bazaar is a version control system that allows you to record changes to project files over time. It supports both a distributed workflow as well as the classic centralized workflow.") - (license gpl2+))) + (license license:gpl2+))) (define-public git (package @@ -292,7 +290,7 @@ as well as the classic centralized workflow.") (description "Git is a free distributed version control system designed to handle everything from small to very large projects with speed and efficiency.") - (license gpl2) + (license license:gpl2) (home-page "http://git-scm.com/"))) (define-public libgit2 @@ -336,7 +334,7 @@ everything from small to very large projects with speed and efficiency.") provided as a re-entrant linkable library with a solid API, allowing you to write native speed custom Git applications in any language with bindings.") ;; GPLv2 with linking exception - (license gpl2))) + (license license:gpl2))) (define-public cgit (package @@ -397,7 +395,7 @@ write native speed custom Git applications in any language with bindings.") (description "CGit is an attempt to create a fast web interface for the Git SCM, using a built-in cache to decrease server I/O pressure.") - (license gpl2))) + (license license:gpl2))) (define-public shflags (package @@ -441,7 +439,7 @@ different versions of getopt on various OSes make writing portable shell scripts difficult. shFlags instead provides an API that doesn't change across shell and OS versions so the script writer can be confident that the script will work.") - (license lgpl2.1))) + (license license:lgpl2.1))) (define-public git-flow (package @@ -484,7 +482,7 @@ management strategy that helps developers keep track of features, hotfixes, and releases in bigger software projects. The git-flow library of git subcommands helps automate some parts of the flow to make working with it a lot easier.") - (license bsd-2))) + (license license:bsd-2))) (define-public git-test-sequence (let ((commit "48e5a2f5a13a5f30452647237e23362b459b9c76")) @@ -519,7 +517,7 @@ lot easier.") "git-test-sequence is similar to an automated git bisect except it’s linear. It will test every change between two points in the DAG. It will also walk each side of a merge and test those changes individually.") - (license (x11-style "file://LICENSE"))))) + (license (license:x11-style "file://LICENSE"))))) (define-public gitolite (package @@ -575,7 +573,7 @@ also walk each side of a merge and test those changes individually.") (description "Gitolite is an access control layer on top of Git, providing fine access control to Git repositories.") - (license gpl2))) + (license license:gpl2))) (define-public mercurial (package @@ -602,7 +600,7 @@ control to Git repositories.") "Mercurial is a free, distributed source control management tool. It efficiently handles projects of any size and offers an easy and intuitive interface.") - (license gpl2+))) + (license license:gpl2+))) (define-public neon (package @@ -650,7 +648,7 @@ abstract interface to parsing XML using libxml2 or expat, and wrappers for simplifying handling XML HTTP response bodies; WebDAV metadata support, wrappers for PROPFIND and PROPPATCH to simplify property manipulation.") - (license gpl2+))) ; for documentation and tests; source under lgpl2.0+ + (license license:gpl2+))) ; for documentation and tests; source under lgpl2.0+ (define-public subversion (package @@ -717,7 +715,7 @@ centralized version control system characterized by its reliability as a safe haven for valuable data; the simplicity of its model and usage; and its ability to support the needs of a wide variety of users and projects, from individuals to large-scale enterprise operations.") - (license asl2.0))) + (license license:asl2.0))) (define-public rcs (package @@ -740,7 +738,7 @@ file-by-file basis, in contrast to subsequent version control systems such as CVS, Subversion, and Git. This can make it suitable for system administration files, for example, which are often inherently local to one machine.") - (license gpl3+))) + (license license:gpl3+))) (define-public cvs (package @@ -768,7 +766,7 @@ machine.") Configuration Management (SCM). Using it, you can record the history of sources files, and documents. It fills a similar role to the free software RCS, PRCS, and Aegis packages.") - (license gpl1+))) + (license license:gpl1+))) (define-public cvs-fast-export (package @@ -807,7 +805,7 @@ The program can also produce a visualization of the resulting commit directed acyclic graph (DAG) in the input format of @uref{http://www.graphviz.org, Graphviz}. The package also includes @command{cvssync}, a tool for mirroring masters from remote CVS hosts.") - (license gpl2+))) + (license license:gpl2+))) (define-public vc-dwim (package @@ -833,7 +831,7 @@ using version control at the same time, for example by printing a reminder when a file change has been described in the ChangeLog but the file has not been added to the VC. vc-chlog scans changed files and generates standards-compliant ChangeLog entries based on the changes that it detects.") - (license gpl3+))) + (license license:gpl3+))) (define-public diffstat (package @@ -854,7 +852,7 @@ standards-compliant ChangeLog entries based on the changes that it detects.") "Diffstat reads the output of 'diff' and displays a histogram of the insertions, deletions, and modifications per-file. It is useful for reviewing large, complex patch files.") - (license (x11-style "file://COPYING")))) + (license (license:x11-style "file://COPYING")))) (define-public cssc (package @@ -896,7 +894,7 @@ large, complex patch files.") (description "GNU CSSC provides a replacement for the legacy Unix source code control system SCCS. This allows old code still under that system to be accessed and migrated on modern systems.") - (license gpl3+))) + (license license:gpl3+))) ;; This package can unfortunately work only in -TEST mode, since Aegis ;; requires that it is installed setuid root. @@ -980,7 +978,7 @@ changes to a program independently, and Aegis coordinates integrating these changes back into the master source of the program, with as little disruption as possible. Resolution of contention for source files, a major headache for any project with more than one developer, is one of Aegis's major functions.") - (license gpl3+))) + (license license:gpl3+))) (define-public reposurgeon (package @@ -1032,7 +1030,7 @@ and can thus be used to script production of very high-quality conversions from Subversion to any supported Distributed Version Control System (DVCS).") ;; Most files are distributed under bsd-2, except 'repocutter' which is ;; under bsd-3. - (license (list bsd-2 bsd-3)))) + (license (list license:bsd-2 license:bsd-3)))) (define-public tig (package @@ -1058,7 +1056,7 @@ from Subversion to any supported Distributed Version Control System (DVCS).") "Tig is an ncurses text user interface for Git, primarily intended as a history browser. It can also stage hunks for commit, or colorize the output of the 'git' command.") - (license gpl2+))) + (license license:gpl2+))) (define-public findnewest (package @@ -1085,7 +1083,7 @@ output of the 'git' command.") (description "Recursively find the newest file in a file tree and print its modification time.") - (license bsd-2))) + (license license:bsd-2))) (define-public myrepos (package @@ -1114,7 +1112,7 @@ modification time.") fetching updates) over a collection of version control repositories. It supports a large number of version control systems: Git, Subversion, Mercurial, Bazaar, Darcs, CVS, Fossil, and Veracity.") - (license gpl2+))) + (license license:gpl2+))) (define-public git-annex-remote-hubic (package @@ -1145,7 +1143,7 @@ Mercurial, Bazaar, Darcs, CVS, Fossil, and Veracity.") (description "This package allows you to use your hubic account as a \"special repository\" with git-annex.") - (license gpl3+))) + (license license:gpl3+))) (define-public fossil (package @@ -1219,5 +1217,5 @@ repository\" with git-annex.") "Fossil is a distributed source control management system which supports access and administration over HTTP CGI or via a built-in HTTP server. It has a built-in wiki, built-in file browsing, built-in tickets system, etc.") - (license (list public-domain ;src/miniz.c, src/shell.c - bsd-2)))) + (license (list license:public-domain ;src/miniz.c, src/shell.c + license:bsd-2)))) -- cgit v1.2.3 From 1062f2451f2a7851f721eb798f45bdebd99d1d58 Mon Sep 17 00:00:00 2001 From: ng0 Date: Fri, 26 Aug 2016 09:56:29 +0000 Subject: gnu: Add stagit. * gnu/packages/version-control.scm (stagit): New variable. Signed-off-by: Leo Famulari --- gnu/packages/version-control.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index a8f57f2499..e8f4874790 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1219,3 +1219,30 @@ access and administration over HTTP CGI or via a built-in HTTP server. It has a built-in wiki, built-in file browsing, built-in tickets system, etc.") (license (list license:public-domain ;src/miniz.c, src/shell.c license:bsd-2)))) + +(define-public stagit + (package + (name "stagit") + (version "0.4") + (source (origin + (method url-fetch) + (uri (string-append "http://dl.2f30.org/releases/" + name "-" version ".tar.gz")) + (sha256 + (base32 + "0z5r06wqrfnsz24ci4hjqbd62svclvhkgzaq9npsyjcp6jnf7izc")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; No tests + #:make-flags (list "CC=gcc" + (string-append "PREFIX=" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) ; No configure script + (inputs + `(("libgit2" ,libgit2))) + (home-page "http://2f30.org") + (synopsis "Static git page generator") + (description "Stagit creates static pages for git repositories, the results can +be served with a HTTP file server of your choice.") + (license license:expat))) -- cgit v1.2.3 From 29405d882161e8bfa9aadf67bc264c2ee6c74fa4 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sat, 27 Aug 2016 06:11:23 +0200 Subject: gnu: yelp: Update to 3.21.3 * gnu/packages/gnome.scm (yelp): Update to 3.21.3 --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f4488c929b..5ea9714431 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3711,7 +3711,7 @@ to format Docbook and Mallard documents.") (define-public yelp (package (name "yelp") - (version "3.20.1") + (version "3.21.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3719,7 +3719,7 @@ to format Docbook and Mallard documents.") name "-" version ".tar.xz")) (sha256 (base32 - "1hh8yqbv0scn9nksk9mq94cb4sdczlzxplclv2wqr41jmm8v186x")))) + "1x8la7qn0l796p4nhprvkwb6sk6yc39xhq3gabvzrhdlb6mjgmrs")))) (build-system glib-or-gtk-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. -- cgit v1.2.3 From 06550e07797c2eb736214b8ad5a21f96f25602da Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sat, 27 Aug 2016 19:52:12 +0200 Subject: gnu: Add German Aspell dictionary. * gnu/packages/aspell.scm (aspell-dict-de): New variable. --- gnu/packages/aspell.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index 117cd33081..b7024124bd 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2015, 2016 Alex Kost +;;; Copyright ©2016 John Darrington ;;; ;;; This file is part of GNU Guix. ;;; @@ -97,6 +98,13 @@ dictionaries, including personal ones.") (home-page "http://aspell.net/"))) +(define-public aspell-dict-de + (aspell-dictionary "de" "German" + #:version "20030222-1" + #:sha256 + (base32 + "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s"))) + (define-public aspell-dict-en (aspell-dictionary "en" "English" #:version "2016.01.19-0" -- cgit v1.2.3 From 13bef904d763a2d3e5c8abb2c3d669721e8ef95e Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sat, 27 Aug 2016 19:57:22 +0200 Subject: gnu: libtirpc: Remove the --disable-gssapi configure flag. * gnu/packages/onc-rpc.scm (libtirpc)[arguments]: Remove the --disable-gssapi configure flag. [inputs]: Add mit-krb5 --- gnu/packages/onc-rpc.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm index d9b2f9dda0..d5858e836a 100644 --- a/gnu/packages/onc-rpc.scm +++ b/gnu/packages/onc-rpc.scm @@ -20,6 +20,7 @@ #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (gnu packages mit-krb5) #:use-module (guix build-system gnu)) (define-public libtirpc @@ -36,16 +37,14 @@ "18a337wa4amf0k21wnimp3yzs5l3cxqndz4x3x8bm993zhfy5hs5")))) (build-system gnu-build-system) (arguments - '(;; Doesn't work with GNU GSS. - #:configure-flags '("--disable-gssapi") - - #:phases (alist-cons-after + '(#:phases (alist-cons-after 'unpack 'remote-dangling-symlink (lambda _ ;; Remote the dangling symlinks since it breaks the ;; 'patch-source-shebangs' file tree traversal. (delete-file "INSTALL")) %standard-phases))) + (inputs `(("mit-krb5" ,mit-krb5))) (home-page "http://sourceforge.net/projects/libtirpc/") (synopsis "Transport-independent Sun/ONC RPC implementation") (description -- cgit v1.2.3 From 1da82dbb9901704316362943629a20b71ce7c912 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sun, 28 Aug 2016 18:58:16 +0200 Subject: gnu: libtirpc: Use 'modify-phases'. * gnu/packages/onc-rpc.scm (libtirpc)[arguments]: Use 'modify-phases'. --- gnu/packages/onc-rpc.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm index d5858e836a..a819d9e04a 100644 --- a/gnu/packages/onc-rpc.scm +++ b/gnu/packages/onc-rpc.scm @@ -37,13 +37,13 @@ "18a337wa4amf0k21wnimp3yzs5l3cxqndz4x3x8bm993zhfy5hs5")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-cons-after - 'unpack 'remote-dangling-symlink - (lambda _ - ;; Remote the dangling symlinks since it breaks the - ;; 'patch-source-shebangs' file tree traversal. - (delete-file "INSTALL")) - %standard-phases))) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'remote-dangling-symlink + (lambda _ + ;; Remove the dangling symlinks since it breaks the + ;; 'patch-source-shebangs' file tree traversal. + (delete-file "INSTALL")))))) (inputs `(("mit-krb5" ,mit-krb5))) (home-page "http://sourceforge.net/projects/libtirpc/") (synopsis "Transport-independent Sun/ONC RPC implementation") -- cgit v1.2.3 From 594d740d7234bb5297f87b14ae0bf5785999ffbd Mon Sep 17 00:00:00 2001 From: John Darrington Date: Tue, 30 Aug 2016 06:41:55 +0200 Subject: gnu: Add libnfsidmap * gnu/packages/linux.scm (libnfsidmap): New variable. --- gnu/packages/linux.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 07fd6e5b74..ddabb399c4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2016 Nicolas Goaziou ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016 David Craven +;;; Copyright © 2016 John Darrington ;;; ;;; This file is part of GNU Guix. ;;; @@ -198,6 +199,30 @@ `insmod', `lsmod', and more.") (license license:gpl2+))) +(define-public libnfsidmap + (package + (name "libnfsidmap") + (version "0.25") + (source (origin + (method url-fetch) + (uri (string-append + "http://www.citi.umich.edu/projects/nfsv4/linux/" + name "/" name "-" version ".tar.gz")) + (sha256 + (base32 + "1kzgwxzh83qi97rblcm9qj80cdvnv8kml2plz0q103j0hifj8vb5")))) + (build-system gnu-build-system) + (home-page + "http://www.citi.umich.edu/projects/nfsv4/crossrealm/libnfsidmap_config.html") + (synopsis + "NFSv4 support library for name/ID mapping") + (description "Libnfsidmap is a library holding mulitiple methods of +mapping names to ids and visa versa, mainly for NFSv4. It provides an +extensible array of mapping functions, currently consisting of two choices; +the default @code{nsswitch} and the experimental @{umich_ldap}.") + (license (license:non-copyleft "file://COPYING" + "See COPYING in the distribution.")))) + (define %boot-logo-patch ;; Linux-Libre boot logo featuring Freedo and a gnu. (origin -- cgit v1.2.3 From c3336b37ada034620302f3b170208d76b81a1066 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 30 Aug 2016 00:25:17 +0300 Subject: gnu: apl: Update to 1.6. * gnu/packages/apl.scm (apl): Update to 1.6. --- gnu/packages/apl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/apl.scm b/gnu/packages/apl.scm index 7573870a4c..5b55c9cef3 100644 --- a/gnu/packages/apl.scm +++ b/gnu/packages/apl.scm @@ -30,14 +30,14 @@ (define-public apl (package (name "apl") - (version "1.5") + (version "1.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/apl/apl-" version ".tar.gz")) (sha256 (base32 - "0h4diq3wfbdwxp5nm0z4b0p1zq13lwip0y7v28r9v0mbbk8xsfh1")))) + "057zwzvvgcrrwsl52a27w86hgy31jqq6avqq629xj7yq90qah3ay")))) (build-system gnu-build-system) (home-page "http://www.gnu.org/software/apl/") (inputs -- cgit v1.2.3 From b16b16e6c2ba9780ebdf936c325e06ebcc0a950b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 30 Aug 2016 00:33:17 +0300 Subject: gnu: gsl: Update to 2.2. * gnu/packages/maths.scm (gsl): Update to 2.2. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index c8b59dfd2a..9f088c8575 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -185,7 +185,7 @@ semiconductors.") (define-public gsl (package (name "gsl") - (version "2.1") + (version "2.2") (source (origin (method url-fetch) @@ -193,7 +193,7 @@ semiconductors.") version ".tar.gz")) (sha256 (base32 - "0rhcia9jhr3p1f1wybwyllwqfs9bggz99i3mi5lpyqcpff1hdbar")))) + "1pyq2c0j91z955746myn29c89jwkd435s2cbj8ks2hpag6d0mr2d")))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f)) -- cgit v1.2.3 From cc7a5c71d551bb4eef6475f7d1c8da994d678186 Mon Sep 17 00:00:00 2001 From: ng0 Date: Sat, 27 Aug 2016 13:44:28 +0000 Subject: gnu: guile-opengl: Use https URL. * gnu/packages/gl.scm (guile-opengl)[home-page]: Use https URL. --- gnu/packages/gl.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 4b5646eeec..1473b44605 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2013 Joshua Grant ;;; Copyright © 2014, 2016 David Thompson ;;; Copyright © 2014, 2015 Mark H Weaver +;;; Copyright © 2016 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -434,7 +435,7 @@ extension functionality is exposed in a single header file.") (dynamic-link-substitute "glu/runtime.scm" "GLU" "glu") (dynamic-link-substitute "glut/runtime.scm" "glut" "freeglut")))))) - (home-page "http://gnu.org/s/guile-opengl") + (home-page "https://gnu.org/s/guile-opengl") (synopsis "Guile binding for the OpenGL graphics API") (description "Guile-OpenGL is a library for Guile that provides bindings to the -- cgit v1.2.3 From 175b259ccac46f40cfc1e3e49cdfb5dbbf30dc62 Mon Sep 17 00:00:00 2001 From: ng0 Date: Sat, 27 Aug 2016 13:47:19 +0000 Subject: gnu: grub: Use https URL. * gnu/packages/grub.scm (grub)[home-page]: Use https URL. --- gnu/packages/grub.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm index 01f2a8454d..3229b868c5 100644 --- a/gnu/packages/grub.scm +++ b/gnu/packages/grub.scm @@ -129,7 +129,7 @@ ("parted" ,parted) ("qemu" ,qemu-for-tests) ("xorriso" ,xorriso))) - (home-page "http://www.gnu.org/software/grub/") + (home-page "https://www.gnu.org/software/grub/") (synopsis "GRand Unified Boot loader") (description "GRUB is a multiboot bootloader. It is used for initially loading the -- cgit v1.2.3 From cc04b099ca359ca7d701058831064197e8611311 Mon Sep 17 00:00:00 2001 From: ng0 Date: Sat, 27 Aug 2016 13:38:36 +0000 Subject: gnu: guile-gnunet: Use https URL. * gnu/packages/gnunet.scm (guile-gnunet)[home-page]: Use https URL. --- gnu/packages/gnunet.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 525cddc701..cdc9872fef 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -306,7 +306,7 @@ kinds of basic applications for the foundation of a GNU internet.") "This package provides Guile bindings to the client libraries of various GNUnet services, including the @dfn{identity} and @dfn{file sharing} services.") - (home-page "http://gnu.org/software/guix") + (home-page "https://gnu.org/software/guix") (license license:gpl3+)))) ;; FIXME: "gnunet-setup" segfaults under certain conditions and "gnunet-gtk" -- cgit v1.2.3 From e2c1b70c2bf328c79380ef676086ddc59cbee119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 30 Aug 2016 09:59:45 +0200 Subject: gnu: libnfsidmap: Fix Texinfo markup. * gnu/packages/linux.scm (libnfsidmap)[description]: Add missing @code. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ddabb399c4..4e3a22d7a4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -219,7 +219,7 @@ (description "Libnfsidmap is a library holding mulitiple methods of mapping names to ids and visa versa, mainly for NFSv4. It provides an extensible array of mapping functions, currently consisting of two choices; -the default @code{nsswitch} and the experimental @{umich_ldap}.") +the default @code{nsswitch} and the experimental @code{umich_ldap}.") (license (license:non-copyleft "file://COPYING" "See COPYING in the distribution.")))) -- cgit v1.2.3 From ea206df45f32c5277980d24c76d2522a27f1f748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 30 Aug 2016 10:20:02 +0200 Subject: doc: Update '--show' example to use '@' syntax. * doc/guix.texi (Invoking guix package): Use '@' syntax in --show example. --- doc/guix.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index e25cf58a31..b22cf4a094 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -1718,9 +1718,9 @@ version: 3.3.5 You may also specify the full name of a package to only get details about a specific version of it: @example -$ guix package --show=python-3.3.5 | recsel -p name,version +$ guix package --show=python@@3.4 | recsel -p name,version name: python -version: 3.3.5 +version: 3.4.3 @end example -- cgit v1.2.3 From 5b65bcab59c8a6fe26c9b25429e6ec852d87241a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 30 Aug 2016 11:25:13 +0200 Subject: gnu: smalltalk: Use 'license:' prefix. * gnu/packages/smalltalk.scm: Use 'license:' prefix for (guix licenses). --- gnu/packages/smalltalk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/smalltalk.scm b/gnu/packages/smalltalk.scm index 77e033f847..2a74bb1cba 100644 --- a/gnu/packages/smalltalk.scm +++ b/gnu/packages/smalltalk.scm @@ -18,7 +18,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages smalltalk) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) @@ -63,4 +63,4 @@ "GNU Smalltalk is a free implementation of the Smalltalk language. It implements the ANSI standard for the language and also includes extra classes such as ones for networking and GUI programming.") - (license gpl2+))) + (license license:gpl2+))) -- cgit v1.2.3 From ef380d72ced7fe9b2e6417d2263b587b546c8a39 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 24 Aug 2016 22:58:44 +0200 Subject: gnu: Add squeak-vm. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/smalltalk.scm (squeak-vm): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/smalltalk.scm | 71 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/gnu/packages/smalltalk.scm b/gnu/packages/smalltalk.scm index 2a74bb1cba..414c17b46c 100644 --- a/gnu/packages/smalltalk.scm +++ b/gnu/packages/smalltalk.scm @@ -1,6 +1,8 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016 Nicolas Goaziou +;;; Copyright © 2016 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,11 +23,20 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (gnu packages audio) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages gl) + #:use-module (gnu packages glib) #:use-module (gnu packages libffi) #:use-module (gnu packages libsigsegv) + #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pulseaudio) + #:use-module (gnu packages xorg) #:use-module (gnu packages zip)) (define-public smalltalk @@ -64,3 +75,63 @@ implements the ANSI standard for the language and also includes extra classes such as ones for networking and GUI programming.") (license license:gpl2+))) + +(define-public squeak-vm + (package + (name "squeak-vm") + (version "4.10.2.2614") + (source + (origin + (method url-fetch) + (uri (string-append "http://www.squeakvm.org/unix/release/" + "Squeak-" version "-src.tar.gz")) + (sha256 + (base32 + "0bpwbnpy2sb4gylchfx50sha70z36bwgdxraym4vrr93l8pd3dix")))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("dbus" ,dbus) + ("freetype" ,freetype) + ("libffi" ,libffi) + ("libxrender" ,libxrender) + ("mesa" ,mesa) + ("pulseaudio" ,pulseaudio))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ;no check target + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-hardcoded-PATH + (lambda _ + ;; Remove hard-coded FHS PATH entries. + (substitute* '("unix/cmake/squeak.in" + "unix/cmake/squeak.sh.in") + (("^PATH=.*") "")) + #t)) + (add-after 'unpack 'create-build-dir + (lambda _ + (mkdir "bld") + #t)) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (with-directory-excursion "bld" + (zero? + (system* "../unix/cmake/configure" + (string-append "--prefix=" out) + "--without-quartz")))))) + (replace 'build + (lambda _ + (with-directory-excursion "bld" + (zero? (system* "make")))))))) + (synopsis "Smalltalk programming language and environment") + (description "Squeak is a full-featured implementation of the Smalltalk +programming language and environment based on (and largely compatible with) +the original Smalltalk-80 system. Squeak has very powerful 2- and 3-D +graphics, sound, video, MIDI, animation and other multimedia capabilities. It +also includes a customisable framework for creating dynamic HTTP servers and +interactively extensible Web sites.") + (home-page "http://www.squeakvm.org") + (license license:x11))) -- cgit v1.2.3 From 4af1876ebfc1947d154f1cffc3885bb3c732f7ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 30 Aug 2016 12:00:52 +0200 Subject: gnu: squeak-vm: Make builds bit-reproducible. * gnu/packages/smalltalk.scm (squeak-vm)[source]: Add 'snippet'. --- gnu/packages/smalltalk.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/smalltalk.scm b/gnu/packages/smalltalk.scm index 414c17b46c..675ca0ce5e 100644 --- a/gnu/packages/smalltalk.scm +++ b/gnu/packages/smalltalk.scm @@ -87,7 +87,19 @@ such as ones for networking and GUI programming.") "Squeak-" version "-src.tar.gz")) (sha256 (base32 - "0bpwbnpy2sb4gylchfx50sha70z36bwgdxraym4vrr93l8pd3dix")))) + "0bpwbnpy2sb4gylchfx50sha70z36bwgdxraym4vrr93l8pd3dix")) + (modules '((guix build utils))) + (snippet + ;; Make builds bit-reproducible. + '(begin + (substitute* "unix/cmake/verstamp" + (("vm_date=.*") + "vm_date = \"1970-01-01\";\n") + (("ux_version=.*") + "ux_version = \"GNU\";\n")) + (substitute* "unix/vm/config.cmake" + (("\\(VM_BUILD_STRING.*") + "(VM_BUILD_STRING \\\"Built with GNU Guix\\\")")))))) (inputs `(("alsa-lib" ,alsa-lib) ("dbus" ,dbus) -- cgit v1.2.3 From 6a540995fbc1779cfcade0bf6fe67c65d0df6304 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Tue, 30 Aug 2016 18:32:08 +0200 Subject: gnu: libnfsidmap: Correct punctuation * gnu/packages/linux.scm (libnfsidmap)[description]: Replace semicolon with colon. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4e3a22d7a4..c1fdf96b0a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -218,7 +218,7 @@ "NFSv4 support library for name/ID mapping") (description "Libnfsidmap is a library holding mulitiple methods of mapping names to ids and visa versa, mainly for NFSv4. It provides an -extensible array of mapping functions, currently consisting of two choices; +extensible array of mapping functions, currently consisting of two choices: the default @code{nsswitch} and the experimental @code{umich_ldap}.") (license (license:non-copyleft "file://COPYING" "See COPYING in the distribution.")))) -- cgit v1.2.3 From 7a62263ee50c9e2894ea0e746b89f04e3b6484c3 Mon Sep 17 00:00:00 2001 From: ng0 Date: Tue, 30 Aug 2016 12:57:47 +0000 Subject: import: cpan: Use tls to query api.metacpan.org. * guix/import/cpan.scm (module->dist-name, cpan-fetch-module): Use tls for api.metacpan.org. Signed-off-by: Eric Bavier --- guix/import/cpan.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm index 213a155fd6..5b7c47554a 100644 --- a/guix/import/cpan.scm +++ b/guix/import/cpan.scm @@ -83,7 +83,7 @@ "Return the base distribution module for a given module. E.g. the 'ok' module is distributed with 'Test::Simple', so (module->dist-name \"ok\") would return \"Test-Simple\"" - (assoc-ref (json-fetch (string-append "http://api.metacpan.org/module/" + (assoc-ref (json-fetch (string-append "https://api.metacpan.org/module/" module)) "distribution")) @@ -91,7 +91,7 @@ return \"Test-Simple\"" "Return an alist representation of the CPAN metadata for the perl module MODULE, or #f on failure. MODULE should be e.g. \"Test::Script\"" ;; This API always returns the latest release of the module. - (json-fetch (string-append "http://api.metacpan.org/release/" + (json-fetch (string-append "https://api.metacpan.org/release/" ;; XXX: The 'release' api requires the "release" ;; name of the package. This substitution seems ;; reasonably consistent across packages. -- cgit v1.2.3 From 6fb0dd34952ba88f9ef759a289a6a4529dd68338 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 30 Aug 2016 15:21:25 -0400 Subject: gnu: entr: Update to 3.6. Suggested by Matthew O'N.S Jordan . * gnu/packages/entr.scm (entr): Update to 3.6. --- gnu/packages/entr.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/entr.scm b/gnu/packages/entr.scm index 0e0f875267..dfa9274bea 100644 --- a/gnu/packages/entr.scm +++ b/gnu/packages/entr.scm @@ -26,14 +26,14 @@ (define-public entr (package (name "entr") - (version "3.5") + (version "3.6") (source (origin (method url-fetch) (uri (string-append "http://entrproject.org/code/entr-" version ".tar.gz")) (sha256 (base32 - "05k4jyjna0pr2dalwc1l1dhrcyk6pw7hbss7jl4ykwfadcs5br73")))) + "1sy81np6kgmq04kfn2ckf4fp7jcf5d1963shgmapx3al3kc4c9x4")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From f409d0aacf7b99ecd7d4efb9e82089f901ba91dd Mon Sep 17 00:00:00 2001 From: ng0 Date: Sun, 28 Aug 2016 23:29:19 +0000 Subject: gnu: emacs-neotree: Keep downloaded source file format. * gnu/packages/emacs.scm (emacs-neotree)[source]: Keep downloaded file format. --- gnu/packages/emacs.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 4fe9a8aae6..9a77d8ac0a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2977,7 +2977,7 @@ passive voice.") (sha256 (base32 "0cr37pdkwjgfijfws5bjskfh1rq9rfngxblcj6v5383vpmn83q7s")) - (file-name (string-append name "-" version)))) + (file-name (string-append name "-" version ".tar.gz")))) (build-system emacs-build-system) (synopsis "Folder tree view for Emacs") (description "This Emacs package provides a folder tree view.") -- cgit v1.2.3 From 18f747350437136b203ef6400176d1fb07b131ea Mon Sep 17 00:00:00 2001 From: ng0 Date: Tue, 30 Aug 2016 12:08:21 +0000 Subject: import: hackage: Default to https urls. * guix/import/hackage.scm (hackage-source-url, hackage-cabal-url): Use https for hackage.haskell.org. --- guix/import/hackage.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index f07f453e11..9af78ea888 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2016 Eric Bavier +;;; Coypright © 2016 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -74,7 +75,7 @@ (define (hackage-source-url name version) "Given a Hackage package NAME and VERSION, return a url to the source tarball." - (string-append "http://hackage.haskell.org/package/" name + (string-append "https://hackage.haskell.org/package/" name "/" name "-" version ".tar.gz")) (define* (hackage-cabal-url name #:optional version) @@ -82,9 +83,9 @@ tarball." .cabal file on Hackage. If VERSION is #f or missing, the url for the latest version is returned." (if version - (string-append "http://hackage.haskell.org/package/" + (string-append "https://hackage.haskell.org/package/" name "-" version "/" name ".cabal") - (string-append "http://hackage.haskell.org/package/" + (string-append "https://hackage.haskell.org/package/" name "/" name ".cabal"))) (define (hackage-name->package-name name) -- cgit v1.2.3 From ed02e1fec882bb7fb0ce72423c42b7bd245b5ec1 Mon Sep 17 00:00:00 2001 From: David Craven Date: Thu, 25 Aug 2016 17:20:22 +0200 Subject: gnu: qtbase: Add native search paths. * gnu/packages/qt.scm (qtbase)[native-search-paths]: Add QML2_IMPORT_PATH, QT_PLUGIN_PATH, XDG_DATA_DIRS and XDG_CONFIG_DIRS. --- gnu/packages/qt.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index a7eee7c06c..5a93ea22bc 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -474,7 +474,19 @@ developers using C++ or QML, a CSS & JavaScript like language.") (native-search-paths (list (search-path-specification (variable "QMAKEPATH") - (files '(""))))) + (files '(""))) + (search-path-specification + (variable "QML2_IMPORT_PATH") + (files '("qml"))) + (search-path-specification + (variable "QT_PLUGIN_PATH") + (files '("plugins"))) + (search-path-specification + (variable "XDG_DATA_DIRS") + (files '("share"))) + (search-path-specification + (variable "XDG_CONFIG_DIRS") + (files '("etc/xdg"))))) (home-page "https://www.qt.io/") (synopsis "Cross-platform GUI library") (description "Qt is a cross-platform application and UI framework for -- cgit v1.2.3 From 225941b02813364dcba7203d2893adc5e99e1cbc Mon Sep 17 00:00:00 2001 From: David Craven Date: Thu, 25 Aug 2016 20:45:07 +0200 Subject: gnu: Add prefix to license imports in (gnu packages qt). * gnu/packages/qt.scm: Import (guix licenses) with prefix "license:". --- gnu/packages/qt.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 5a93ea22bc..95690fa962 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -20,7 +20,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages qt) - #:use-module ((guix licenses) #:select (bsd-3 gpl2 gpl3 lgpl2.1 lgpl2.1+ lgpl3 x11-style)) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build utils) @@ -206,7 +206,7 @@ (synopsis "Cross-platform GUI library") (description "Qt is a cross-platform application and UI framework for developers using C++ or QML, a CSS & JavaScript like language.") - (license lgpl2.1) + (license license:lgpl2.1) ;; Qt 4: 'QBasicAtomicPointer' leads to build failures on MIPS; ;; see . @@ -491,7 +491,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (synopsis "Cross-platform GUI library") (description "Qt is a cross-platform application and UI framework for developers using C++ or QML, a CSS & JavaScript like language.") - (license (list lgpl2.1 lgpl3)))) + (license (list license:lgpl2.1 license:lgpl3)))) (define-public qtsvg (package (inherit qtbase) @@ -920,7 +920,7 @@ is then compiled to create the bindings extension module. The SIP Python module provides support functions to the automatically generated code.") ;; There is a choice between a python like license, gpl2 and gpl3. ;; For compatibility with pyqt, we need gpl3. - (license gpl3))) + (license license:gpl3))) (define-public python2-sip (package (inherit python-sip) @@ -985,7 +985,7 @@ module provides support functions to the automatically generated code.") "PyQt is a set of Python v2 and v3 bindings for the Qt application framework. The bindings are implemented as a set of Python modules and contain over 620 classes.") - (license gpl3))) + (license license:gpl3))) (define-public python2-pyqt (package (inherit python-pyqt) @@ -1067,7 +1067,7 @@ contain over 620 classes.") "--destdir" lib "--sipdir" sip)))) %standard-phases))) - (license (list gpl2 gpl3)))) ; choice of either license + (license (list license:gpl2 license:gpl3)))) ; choice of either license (define-public qtkeychain (package @@ -1101,4 +1101,4 @@ contain over 620 classes.") (description "QtKeychain is a Qt library to store passwords and other secret data securely. It will not store any data unencrypted unless explicitly requested.") - (license bsd-3))) + (license license:bsd-3))) -- cgit v1.2.3 From 2098d0240e89ec4fae49b33ee0990a7f833576b5 Mon Sep 17 00:00:00 2001 From: David Craven Date: Thu, 25 Aug 2016 23:06:27 +0200 Subject: build: Add wrap-qt-program. * guix/build/qt-utils.scm (wrap-qt-program): New file. * Makefile.am (MODULES): Add it. --- Makefile.am | 1 + guix/build/qt-utils.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 guix/build/qt-utils.scm diff --git a/Makefile.am b/Makefile.am index 8bae85e144..165dfe9727 100644 --- a/Makefile.am +++ b/Makefile.am @@ -107,6 +107,7 @@ MODULES = \ guix/build/emacs-utils.scm \ guix/build/graft.scm \ guix/build/bournish.scm \ + guix/build/qt-utils.scm \ guix/search-paths.scm \ guix/packages.scm \ guix/import/utils.scm \ diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm new file mode 100644 index 0000000000..48a32674e9 --- /dev/null +++ b/guix/build/qt-utils.scm @@ -0,0 +1,40 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016 David Craven +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build qt-utils) + #:use-module (guix build utils) + #:export (wrap-qt-program)) + +(define (wrap-qt-program out program) + (define (suffix env-var path) + (let ((env-val (getenv env-var))) + (if env-val (string-append env-val ":" path) path))) + + (let ((qml-path (suffix "QML2_IMPORT_PATH" + (string-append out "/qml"))) + (plugin-path (suffix "QT_PLUGIN_PATH" + (string-append out "/plugins"))) + (xdg-data-path (suffix "XDG_DATA_DIRS" + (string-append out "/share"))) + (xdg-config-path (suffix "XDG_CONFIG_DIRS" + (string-append out "/etc/xdg")))) + (wrap-program (string-append out "/bin/" program) + `("QML2_IMPORT_PATH" = (,qml-path)) + `("QT_PLUGIN_PATH" = (,plugin-path)) + `("XDG_DATA_DIRS" = (,xdg-data-path)) + `("XDG_CONFIG_DIRS" = (,xdg-config-path))))) -- cgit v1.2.3 From 092ab1c0bcbb5d36f80037367df17a3576952298 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 6 Aug 2016 17:00:10 +0200 Subject: gnu: Add baloo. * gnu/packages/kde-frameworks.scm (baloo): New variable. --- gnu/packages/kde-frameworks.scm | 64 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 6ba454d0ed..1b54285d77 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -30,6 +30,7 @@ #:use-module (gnu packages boost) #:use-module (gnu packages bison) #:use-module (gnu packages compression) + #:use-module (gnu packages databases) #:use-module (gnu packages docbook) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) @@ -1461,3 +1462,66 @@ different physical units. It supports converting different prefixes (e.g. kilo, mega, giga) as well as converting between different unit systems (e.g. liters, gallons).") (license license:lgpl2.1+))) + + +;; Tier 3 +;; +;; Tier 3 frameworks are generally more powerful, comprehensive packages, and +;; consequently have more complex dependencies. + +(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")))) + (build-system cmake-build-system) + (propagated-inputs + `(("kcoreaddons" ,kcoreaddons) + ("kfilemetadata" ,kfilemetadata))) + (native-inputs + `(("dbus" ,dbus) + ("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kbookmarks" ,kbookmarks) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) + ("kidletime" ,kidletime) + ("kio" ,kio) + ("kitemviews" ,kitemviews) + ("ki18n" ,ki18n) + ("kjobwidgets" ,kjobwidgets) + ("kservice" ,kservice) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kxmlgui" ,kxmlgui) + ("lmdb" ,lmdb) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("solid" ,solid))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "HOME" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen") + #t)) + (replace 'check + (lambda _ + (setenv "DBUS_FATAL_WARNINGS" "0") + (zero? (system* "dbus-launch" "ctest" "."))))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "File searching and indexing") + (description "Baloo provides file searching and indexing. It does so by +maintaining an index of the contents of your files.") + ;; dual licensed + (license (list license:gpl2+ license:lgpl2.1+)))) -- cgit v1.2.3 From 88549d2e0c8ab9c9fce221f973bb9102db61f9fc Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 7 Aug 2016 19:00:06 +0200 Subject: gnu: Add kactivities. * gnu/packages/kde-frameworks.scm (kactivities): New variable. --- gnu/packages/kde-frameworks.scm | 46 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 1b54285d77..90c7be6b50 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -29,6 +29,7 @@ #:use-module (gnu packages attr) #:use-module (gnu packages boost) #:use-module (gnu packages bison) + #:use-module (gnu packages boost) #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages docbook) @@ -1525,3 +1526,48 @@ gallons).") maintaining an index of the contents of your files.") ;; dual licensed (license (list license:gpl2+ license:lgpl2.1+)))) + +(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")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("boost" ,boost) + ("kauth" ,kauth) + ("kbookmarks" ,kbookmarks) + ("kcodecs" ,kcodecs) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kio" ,kio) + ("kitemviews" ,kitemviews) + ("kjobwidgets" ,kjobwidgets) + ("kservice" ,kservice) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("solid" ,solid))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Core components for the KDE Activity concept") + (description "KActivities provides the infrastructure needed to manage a +user's activites, allowing them to switch between tasks, and for applications +to update their state to match the user's current activity. This includes a +daemon, a library for interacting with that daemon, and plugins for integration +with other frameworks.") + ;; triple licensed + (license (list license:gpl2+ license:lgpl2.0+ license:lgpl2.1+)))) -- cgit v1.2.3 From fb748c395d7d0bd69161faf86ce70891ba4c2fe2 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 7 Aug 2016 21:18:45 +0200 Subject: gnu: Add kactivities-stats. * gnu/packages/kde-frameworks.scm (kactivities-stats): New variable. Co-authored-by: Hartmut Goebel --- gnu/packages/kde-frameworks.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 90c7be6b50..6503cdcf6c 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1571,3 +1571,35 @@ daemon, a library for interacting with that daemon, and plugins for integration with other frameworks.") ;; triple licensed (license (list license:gpl2+ license:lgpl2.0+ license:lgpl2.1+)))) + +;; NOTE: This package is listed as a tier 2 package even though it requires +;; kactivities - a tier 3 package. +(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")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("boost" ,boost) + ("kactivities" ,kactivities) + ("kconfig" ,kconfig) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Access usage statistics collected by the activity manager") + (description "The KActivitiesStats library provides a querying mechanism for +the data that the activitiy manager collects - which documents have been opened +by which applications, and what documents have been linked to which activity.") + ;; triple licensed + (license (list license:lgpl2.0+ license:lgpl2.1+ license:lgpl3+)))) -- cgit v1.2.3 From 5c63ebb846a6ff2408b76eb5a4c0f67e4fbf8a29 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 7 Aug 2016 20:51:39 +0200 Subject: gnu: Add kbookmarks. * gnu/packages/kde-frameworks.scm (kbookmarks): New variable. --- gnu/packages/kde-frameworks.scm | 42 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 6503cdcf6c..73142cbc20 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1603,3 +1603,45 @@ the data that the activitiy manager collects - which documents have been opened by which applications, and what documents have been linked to which activity.") ;; triple licensed (license (list license:lgpl2.0+ license:lgpl2.1+ license:lgpl3+)))) + +(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")))) + (build-system cmake-build-system) + (propagated-inputs + `(("kwidgetsaddons" ,kwidgetsaddons))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("qttools" ,qttools))) + (inputs + `(("kauth" ,kauth) + ("kcodecs" ,kcodecs) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kiconthemes" ,kiconthemes) + ("kxmlgui" ,kxmlgui) + ("qtbase" ,qtbase))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "HOME" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen") + #t))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Bookmarks management library") + (description "KBookmarks lets you access and manipulate bookmarks stored +using the XBEL format.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 21d381f4ef836b52cd74c81550b32b0d066f55e9 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 7 Aug 2016 20:52:11 +0200 Subject: gnu: Add kcmutils. * gnu/packages/kde-frameworks.scm (kcmutils): New variable. --- gnu/packages/kde-frameworks.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 73142cbc20..927c56aa16 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1645,3 +1645,42 @@ by which applications, and what documents have been linked to which activity.") (description "KBookmarks lets you access and manipulate bookmarks stored using the XBEL format.") (license license:lgpl2.1+))) + +(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")))) + (build-system cmake-build-system) + (propagated-inputs + `(("kconfigwidgets" ,kconfigwidgets) + ("kservice" ,kservice))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kauth" ,kauth) + ("kcodecs" ,kcodecs) + ("kconfig" ,kconfig) + ("kcoreaddons" ,kcoreaddons) + ("kdeclarative" ,kdeclarative) + ("kiconthemes" ,kiconthemes) + ("kitemviews" ,kitemviews) + ("ki18n" ,ki18n) + ("kpackage" ,kpackage) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kxmlgui" ,kxmlgui) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Utilities for KDE System Settings modules") + (description "KCMUtils provides various classes to work with KCModules. +KCModules can be created with the KConfigWidgets framework.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From ccce03edce76b5bbdcf072af02b3297ffc43a8bd Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 7 Aug 2016 20:53:08 +0200 Subject: gnu: Add kconfigwidgets. * gnu/packages/kde-frameworks.scm (kconfigwidgets): New variable. --- gnu/packages/kde-frameworks.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 927c56aa16..3781ed5c82 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1684,3 +1684,44 @@ using the XBEL format.") (description "KCMUtils provides various classes to work with KCModules. KCModules can be created with the KConfigWidgets framework.") (license license:lgpl2.1+))) + +(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")))) + (build-system cmake-build-system) + (propagated-inputs + `(("kauth" ,kauth) + ("kcodecs" ,kcodecs) + ("kconfig" ,kconfig) + ("kwidgetsaddons" ,kwidgetsaddons))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kcoreaddons" ,kcoreaddons) + ("kguiaddons" ,kguiaddons) + ("ki18n" ,ki18n) + ("qtbase" ,qtbase))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen") + #t))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Widgets for configuration dialogs") + (description "KConfigWidgets provides easy-to-use classes to create +configuration dialogs, as well as a set of widgets which uses KConfig to store +their settings.") + ;; dual licensed + (license (list license:gpl2+ license:lgpl2.1+)))) -- cgit v1.2.3 From f422ad12750f98c27f150ad42b7b5f678e21787e Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 7 Aug 2016 20:53:46 +0200 Subject: gnu: Add kdeclarative. * gnu/packages/kde-frameworks.scm (kdeclarative): New variable. --- gnu/packages/kde-frameworks.scm | 60 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 3781ed5c82..adeb9a0c67 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1725,3 +1725,63 @@ configuration dialogs, as well as a set of widgets which uses KConfig to store their settings.") ;; dual licensed (license (list license:gpl2+ license:lgpl2.1+)))) + +(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")))) + (build-system cmake-build-system) + (propagated-inputs + `(("kconfig" ,kconfig) + ("kpackage" ,kpackage))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("xorg-server" ,xorg-server))) + (inputs + `(("kauth" ,kauth) + ("kbookmarks" ,kbookmarks) + ("kcodecs" ,kcodecs) + ("kcompletion" ,kcompletion) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kglobalaccel" ,kglobalaccel) + ("kguiaddons" ,kguiaddons) + ("kiconthemes" ,kiconthemes) + ("kio" ,kio) + ("kitemviews" ,kitemviews) + ("ki18n" ,ki18n) + ("kjobwidgets" ,kjobwidgets) + ("kservice" ,kservice) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("solid" ,solid))) + (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 -screen 0 640x480x24 &")) + (setenv "DISPLAY" ":1") + #t))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Integration of QML and KDE work spaces") + (description "KDeclarative provides integration of QML and KDE work spaces. +It's comprises two parts: a library used by the C++ part of your application to +intergrate QML with KDE Frameworks specific features, and a series of QML imports +that offer bindings to some of the Frameworks.") + ;; dual licensed + (license (list license:gpl2+ license:lgpl2.1+)))) -- cgit v1.2.3 From ef0f84502cc1d32184252529eda8e0c873b4d10c Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 7 Aug 2016 20:54:23 +0200 Subject: gnu: Add kded. * gnu/packages/kde-frameworks.scm (kded): New variable. --- gnu/packages/kde-frameworks.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index adeb9a0c67..0a049db7ef 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1785,3 +1785,36 @@ intergrate QML with KDE Frameworks specific features, and a series of QML import that offer bindings to some of the Frameworks.") ;; dual licensed (license (list license:gpl2+ license:lgpl2.1+)))) + +(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")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kconfig" ,kconfig) + ("kcoreaddons" ,kcoreaddons) + ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) + ("kdoctools" ,kdoctools) + ("kinit" ,kinit) + ("kservice" ,kservice) + ("qtbase" ,qtbase))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Central daemon of KDE work spaces") + (description "KDED stands for KDE Daemon. KDED runs in the background and +performs a number of small tasks. Some of these tasks are built in, others are +started on demand.") + ;; dual licensed + (license (list license:lgpl2.0+ license:lgpl2.1+)))) -- cgit v1.2.3 From d02addd52dbf09961c19eec85d10c93b2cfb6ef8 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 7 Aug 2016 20:55:20 +0200 Subject: gnu: Add kdesignerplugin. * gnu/packages/kde-frameworks.scm (kdesignerplugin): New variable. --- gnu/packages/kde-frameworks.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 0a049db7ef..98c453b85c 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1818,3 +1818,40 @@ performs a number of small tasks. Some of these tasks are built in, others are started on demand.") ;; dual licensed (license (list license:lgpl2.0+ license:lgpl2.1+)))) + +(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")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("qttools" ,qttools))) + (inputs + `(("kconfig" ,kconfig) + ("kcoreaddons" ,kcoreaddons) + ("kdoctools" ,kdoctools) + ("qtbase" ,qtbase))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen") + #t))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Integrating KDE frameworks widgets with Qt Designer") + (description "This framework provides plugins for Qt Designer that allow it +to display the widgets provided by various KDE frameworks, as well as a utility +(kgendesignerplugin) that can be used to generate other such plugins from +ini-style description files.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 40d768485ce2154802d63a2e5e997110df62369c Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 7 Aug 2016 20:55:52 +0200 Subject: gnu: Add kdesu. * gnu/packages/kde-frameworks.scm (kdesu): New variable. --- gnu/packages/kde-frameworks.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 98c453b85c..44a27ed6d8 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1855,3 +1855,34 @@ to display the widgets provided by various KDE frameworks, as well as a utility (kgendesignerplugin) that can be used to generate other such plugins from ini-style description files.") (license license:lgpl2.1+))) + +(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")))) + (build-system cmake-build-system) + (propagated-inputs + `(("kpty" ,kpty))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kconfig" ,kconfig) + ("kcoreaddons" ,kcoreaddons) + ("ki18n" ,ki18n) + ("kservice" ,kservice) + ("qtbase" ,qtbase))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "User interface for running shell commands with root privileges") + (description "KDESU provides functionality for building GUI front ends for +(password asking) console mode programs. kdesu and kdessh use it to interface +with su and ssh respectively.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 3e1ce65be61d322a295c3307ac94dd139d6addef Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 7 Aug 2016 20:14:52 +0200 Subject: gnu: Add kemoticons. * gnu/packages/kde-frameworks.scm (kemoticons): New variable. --- gnu/packages/kde-frameworks.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 44a27ed6d8..449aeee1e1 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1886,3 +1886,43 @@ ini-style description files.") (password asking) console mode programs. kdesu and kdessh use it to interface with su and ssh respectively.") (license license:lgpl2.1+))) + +(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")))) + (build-system cmake-build-system) + (propagated-inputs + `(("kservice" ,kservice))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("karchive" ,karchive) + ("kconfig" ,kconfig) + ("kcoreaddons" ,kcoreaddons) + ("qtbase" ,qtbase))) + (arguments + `(#:tests? #f ; FIXME: 2/2 tests fail. + #:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "HOME" (getcwd)) + (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; Enable debug output + (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Convert text emoticons to graphical emoticons") + (description "KEmoticons converts emoticons from text to a graphical +representation with images in HTML. It supports setting different themes for +emoticons coming from different providers.") + ;; dual licensed, image files are licensed under cc-by-sa4.0 + (license (list license:gpl2+ license:lgpl2.1+ license:cc-by-sa4.0)))) -- cgit v1.2.3 From bdfe11a5e7802cbbe64cdf349b91355baa21883c Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 6 Aug 2016 17:00:57 +0200 Subject: gnu: Add kglobalaccel. * gnu/packages/kde-frameworks.scm (kglobalaccel): New variable. Co-authored-by: Hartmut Goebel --- gnu/packages/kde-frameworks.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 449aeee1e1..673e53ab43 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1926,3 +1926,44 @@ representation with images in HTML. It supports setting different themes for emoticons coming from different providers.") ;; dual licensed, image files are licensed under cc-by-sa4.0 (license (list license:gpl2+ license:lgpl2.1+ license:cc-by-sa4.0)))) + +(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")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("qttools" ,qttools))) + (inputs + `(("kconfig" ,kconfig) + ("kcrash" ,kcrash) + ("kcoreaddons" ,kcoreaddons) + ("kdbusaddons" ,kdbusaddons) + ("kwindowsystem" ,kwindowsystem) + ("libxcb" ,libxcb) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras) + ("xcb-util-keysyms" ,xcb-util-keysyms))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen") + #t))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Global desktop keyboard shortcuts") + (description "KGlobalAccel allows you to have global accelerators that are +independent of the focused window. Unlike regular shortcuts, the application's +window does not need focus for them to be activated.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 612c2545386338220b3bc66358cfbc3e3620da4e Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 7 Aug 2016 20:16:48 +0200 Subject: gnu: Add kiconthemes. * gnu/packages/kde-frameworks.scm (kiconthemes): New variable. --- gnu/packages/kde-frameworks.scm | 47 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 673e53ab43..92cab6b5f4 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1967,3 +1967,50 @@ emoticons coming from different providers.") independent of the focused window. Unlike regular shortcuts, the application's window does not need focus for them to be activated.") (license license:lgpl2.1+))) + +(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")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("shared-mime-info" ,shared-mime-info))) + (inputs + `(("karchive" ,karchive) + ("kauth" ,kauth) + ("kcodecs" ,kcodecs) + ("kcoreaddons" ,kcoreaddons) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("ki18n" ,ki18n) + ("kitemviews" ,kitemviews) + ("kwidgetsaddons" ,kwidgetsaddons) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg))) + (arguments + `(#:tests? #f ; FIXME: Test failure + #:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda* (#:key inputs #:allow-other-keys) + (setenv "XDG_DATA_DIRS" + (string-append (assoc-ref inputs "shared-mime-info") + "/share")) + (setenv "HOME" (getcwd)) + (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; Enable debug output + (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Icon GUI utilities") + (description "This library contains classes to improve the handling of icons +in applications using the KDE Frameworks.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 3d6701902b90419c75bd6eefc8fdf58e19b4bea9 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 7 Aug 2016 20:17:27 +0200 Subject: gnu: Add kinit. * gnu/packages/kde-frameworks.scm (kinit): New variable. --- gnu/packages/kde-frameworks.scm | 44 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 92cab6b5f4..8748e7bd46 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2014,3 +2014,47 @@ window does not need focus for them to be activated.") (description "This library contains classes to improve the handling of icons in applications using the KDE Frameworks.") (license license:lgpl2.1+))) + +(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")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kauth" ,kauth) + ("kbookmarks" ,kbookmarks) + ("kcodecs" ,kcodecs) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kcrash" ,kcrash) + ("kio" ,kio) + ("kitemviews" ,kitemviews) + ("ki18n" ,ki18n) + ("kjobwidgets" ,kjobwidgets) + ("kservice" ,kservice) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("qtbase" ,qtbase) + ("solid" ,solid))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Library to speed up start of applications on KDE workspaces") + (description "Kdeinit is a process launcher similar to init used for booting +UNIX. It launches processes by forking and then loading a dynamic library which +contains a 'kdemain(...)' function. Using kdeinit to launch KDE applications +makes starting KDE applications faster and reduces memory consumption.") + ;; dual licensed + (license (list license:lgpl2.0+ license:lgpl2.1+)))) -- cgit v1.2.3 From 17252110fc76e4b90f8df80d7ce75831150ce0e5 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 7 Aug 2016 20:18:03 +0200 Subject: gnu: Add kio. * gnu/packages/kde-frameworks.scm (kio): New variable. --- gnu/packages/kde-frameworks.scm | 73 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 8748e7bd46..2a6c391026 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -25,6 +25,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (gnu packages acl) #:use-module (gnu packages admin) #:use-module (gnu packages attr) #:use-module (gnu packages boost) @@ -2058,3 +2059,75 @@ contains a 'kdemain(...)' function. Using kdeinit to launch KDE applications makes starting KDE applications faster and reduces memory consumption.") ;; dual licensed (license (list license:lgpl2.0+ license:lgpl2.1+)))) + +(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")))) + (build-system cmake-build-system) + (propagated-inputs + `(("kbookmarks" ,kbookmarks) + ("kconfig" ,kconfig) + ("kcompletion" ,kcompletion) + ("kcoreaddons" ,kcoreaddons) + ("kitemviews" ,kitemviews) + ("kjobwidgets" ,kjobwidgets) + ("kservice" ,kservice) + ("kxmlgui" ,kxmlgui) + ("solid" ,solid))) + (native-inputs + `(("dbus" ,dbus) + ("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("acl" ,acl) + ("karchive" ,karchive) + ("kauth" ,kauth) + ("kcodecs" ,kcodecs) + ("kconfigwidgets" ,kconfigwidgets) + ("kdbusaddons" ,kdbusaddons) + ("kdoctools" ,kdoctools) + ("kiconthemes" ,kiconthemes) + ("ki18n" ,ki18n) + ("knotifications" ,knotifications) + ("ktextwidgets" ,ktextwidgets) + ("kwallet" ,kwallet) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras) + ("sonnet" ,sonnet))) + (arguments + `(#:tests? #f ; FIXME: 41/50 tests fail. + #:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "HOME" (getcwd)) + (setenv "XDG_RUNTIME_DIR" (getcwd)) + (setenv "CTEST_OUTPUT_ON_FAILURE" "1") + (setenv "QT_QPA_PLATFORM" "offscreen")))))) + ;;(replace 'check + ;; (lambda _ + ;; (setenv "DBUS_FATAL_WARNINGS" "0") + ;; (zero? (system* "dbus-launch" "ctest" "."))))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Network transparent access to files and data") + (description "This framework implements a lot of file management functions. +It supports accessing files locally as well as via HTTP and FTP out of the box +and can be extended by plugins to support other protocols as well. There is a +variety of plugins available, e.g. to support access via SSH. The framework can +also be used to bridge a native protocol to a file-based interface. This makes +the data accessible in all applications using the KDE file dialog or any other +KIO enabled infrastructure.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 2ac7e35af2433f96fae8775c6280f708b067b3f4 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 7 Aug 2016 20:18:50 +0200 Subject: gnu: Add knewstuff. * gnu/packages/kde-frameworks.scm (knewstuff): New variable. --- gnu/packages/kde-frameworks.scm | 55 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 2a6c391026..b11f740a80 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2131,3 +2131,58 @@ also be used to bridge a native protocol to a file-based interface. This makes the data accessible in all applications using the KDE file dialog or any other KIO enabled infrastructure.") (license license:lgpl2.1+))) + +(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")))) + (build-system cmake-build-system) + (propagated-inputs + `(("attica" ,attica) + ("kservice" ,kservice) + ("kxmlgui" ,kxmlgui))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("karchive" ,karchive) + ("kauth" ,kauth) + ("kbookmarks" ,kbookmarks) + ("kcodecs" ,kcodecs) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kio" ,kio) + ("kitemviews" ,kitemviews) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kjobwidgets" ,kjobwidgets) + ("ktextwidgets" ,ktextwidgets) + ("kwidgetsaddons" ,kwidgetsaddons) + ("qtbase" ,qtbase) + ("solid" ,solid) + ("sonnet" ,sonnet))) + (arguments + `(#:tests? #f ; FIXME: 1/3 tests fail. + #:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ ; XDG_DATA_DIRS isn't set + (setenv "HOME" (getcwd)) + (setenv "CTEST_OUTPUT_ON_FAILURE" "1") + (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Framework for downloading and sharing additional application data") + (description "The KNewStuff library implements collaborative data sharing +for applications. It uses libattica to support the Open Collaboration Services +specification.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 10ca449af1c2c0f67e5b64ae3a22f596c68a4bd4 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 7 Aug 2016 20:19:53 +0200 Subject: gnu: Add knotifyconfig. * gnu/packages/kde-frameworks.scm (knotifyconfig): New variable. --- gnu/packages/kde-frameworks.scm | 42 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index b11f740a80..60b00cc0c3 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2186,3 +2186,45 @@ KIO enabled infrastructure.") for applications. It uses libattica to support the Open Collaboration Services specification.") (license license:lgpl2.1+))) + +(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")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kauth" ,kauth) + ("kbookmarks" ,kbookmarks) + ("kcodecs" ,kcodecs) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kio" ,kio) + ("kitemviews" ,kitemviews) + ("ki18n" ,ki18n) + ("kjobwidgets" ,kjobwidgets) + ("knotifications" ,knotifications) + ("kservice" ,kservice) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kxmlgui" ,kxmlgui) + ("phonon" ,phonon) + ("qtbase" ,qtbase) + ("solid" ,solid))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Configuration dialog for desktop notifications") + (description "KNotifyConfig provides a configuration dialog for desktop +notifications which can be embedded in your application.") + ;; dual licensed + (license (list license:lgpl2.0+ license:lgpl2.1+)))) -- cgit v1.2.3 From 6609b1a3948f5bd861d895c3297ef4d1768390f3 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 7 Aug 2016 20:21:19 +0200 Subject: gnu: Add kparts. * gnu/packages/kde-frameworks.scm (kparts): New variable. --- gnu/packages/kde-frameworks.scm | 50 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 60b00cc0c3..5a46aee324 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2228,3 +2228,53 @@ specification.") notifications which can be embedded in your application.") ;; dual licensed (license (list license:lgpl2.0+ license:lgpl2.1+)))) + +(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")))) + (build-system cmake-build-system) + (propagated-inputs + `(("kio" ,kio) + ("ktextwidgets" ,ktextwidgets) + ("kxmlgui" ,kxmlgui))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kauth" ,kauth) + ("kbookmarks" ,kbookmarks) + ("kcodecs" ,kcodecs) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kiconthemes" ,kiconthemes) + ("kitemviews" ,kitemviews) + ("ki18n" ,ki18n) + ("kjobwidgets" ,kjobwidgets) + ("kservice" ,kservice) + ("kwidgetsaddons" ,kwidgetsaddons) + ("qtbase" ,qtbase) + ("solid" ,solid) + ("sonnet" ,sonnet))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen") + #t))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Plugin framework for user interface components") + (description "This library implements the framework for KDE parts, which are +widgets with a user-interface defined in terms of actions.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 85e831ec0c05bc4f3f9c9ef010be0a5139187719 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 7 Aug 2016 20:22:15 +0200 Subject: gnu: Add kpeople. * gnu/packages/kde-frameworks.scm (kpeople): New variable. --- gnu/packages/kde-frameworks.scm | 42 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 5a46aee324..11c019321b 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2278,3 +2278,45 @@ notifications which can be embedded in your application.") (description "This library implements the framework for KDE parts, which are widgets with a user-interface defined in terms of actions.") (license license:lgpl2.1+))) + +(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")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kconfig" ,kconfig) + ("kcoreaddons" ,kcoreaddons) + ("kitemviews" ,kitemviews) + ("ki18n" ,ki18n) + ("kservice" ,kservice) + ("kwidgetsaddons" ,kwidgetsaddons) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative))) + (arguments + `(#:tests? #f ; FIXME: 1/3 tests fail. + #:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; Enable debug output + (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (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 +sources, grouping them by person while still exposing all the data. KPeople +also provides facilities to integrate the data provided in user interfaces by +providing QML and Qt Widgets components. The sources are plugin-based, allowing +to easily extend the contacts collection.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From e94177529357b6de9f93d07e21264f81f44d68ef Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 7 Aug 2016 20:23:24 +0200 Subject: gnu: Add krunner. * gnu/packages/kde-frameworks.scm (krunner): New variable. --- gnu/packages/kde-frameworks.scm | 54 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 11c019321b..8154a21fab 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2320,3 +2320,57 @@ also provides facilities to integrate the data provided in user interfaces by providing QML and Qt Widgets components. The sources are plugin-based, allowing to easily extend the contacts collection.") (license license:lgpl2.1+))) + +(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")))) + (build-system cmake-build-system) + (propagated-inputs + `(("plasma-framework" ,plasma-framework))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kauth" ,kauth) + ("kbookmarks" ,kbookmarks) + ("kcodecs" ,kcodecs) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kio" ,kio) + ("kitemviews" ,kitemviews) + ("ki18n" ,ki18n) + ("kjobwidgets" ,kjobwidgets) + ("kpackage" ,kpackage) + ("kservice" ,kservice) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kxmlgui" ,kxmlgui) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("solid" ,solid) + ("threadweaver" ,threadweaver))) + (arguments + `(#:tests? #f ; FIXME: 1/1 tests fail. + #:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; Enable debug output + (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Framework for Plasma runners") + (description "The Plasma workspace provides an application called KRunner +which, among other things, allows one to type into a text area which causes +various actions and information that match the text appear as the text is being +typed.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 12b49b623417acf348502d9a506f0f10af125244 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 7 Aug 2016 20:23:57 +0200 Subject: gnu: Add kservice. * gnu/packages/kde-frameworks.scm (kservice): New variable. --- gnu/packages/kde-frameworks.scm | 43 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 8154a21fab..f5368617c5 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2374,3 +2374,46 @@ which, among other things, allows one to type into a text area which causes various actions and information that match the text appear as the text is being typed.") (license license:lgpl2.1+))) + +(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")))) + (build-system cmake-build-system) + (propagated-inputs + `(("kconfig" ,kconfig) + ("kcoreaddons" ,kcoreaddons))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) + ("kdoctools" ,kdoctools) + ("ki18n" ,ki18n) + ("qtbase" ,qtbase))) + (arguments + `(#:tests? #f ; FIXME: 8/10 tests fail. + #:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "HOME" (getcwd)) + (setenv "CTEST_OUTPUT_ON_FAILURE" "1") + (setenv "QT_QPA_PLATFORM" "offscreen") + #t))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Plugin framework for desktop services") + (description "KService provides a plugin framework for handling desktop +services. Services can be applications or libraries. They can be bound to MIME +types or handled by application specific code.") + ;; triple licensed + (license (list license:gpl2+ license:gpl3+ license:lgpl2.1+)))) -- cgit v1.2.3 From def00811a427db5e65f4cfbdcd2fd41e57a28b2c Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 7 Aug 2016 20:24:49 +0200 Subject: gnu: Add ktexteditor. * gnu/packages/kde-frameworks.scm (ktexteditor): New variable. --- gnu/packages/kde-frameworks.scm | 68 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index f5368617c5..9afbf900c1 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -45,6 +45,7 @@ #:use-module (gnu packages polkit) #:use-module (gnu packages python) #:use-module (gnu packages qt) + #:use-module (gnu packages version-control) #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) @@ -2417,3 +2418,70 @@ services. Services can be applications or libraries. They can be bound to MIME types or handled by application specific code.") ;; triple licensed (license (list license:gpl2+ license:gpl3+ license:lgpl2.1+)))) + +(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")))) + (build-system cmake-build-system) + (propagated-inputs + `(("kparts" ,kparts))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("karchive" ,karchive) + ("kauth" ,kauth) + ("kbookmarks" ,kbookmarks) + ("kcodecs" ,kcodecs) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kguiaddons" ,kguiaddons) + ("kiconthemes" ,kiconthemes) + ("kio" ,kio) + ("kitemviews" ,kitemviews) + ("ki18n" ,ki18n) + ("kjobwidgets" ,kjobwidgets) + ("kservice" ,kservice) + ("ktextwidgets" ,ktextwidgets) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kxmlgui" ,kxmlgui) + ("libgit2" ,libgit2) + ("perl" ,perl) + ("qtbase" ,qtbase) + ("qtscript" ,qtscript) + ("qtxmlpatterns" ,qtxmlpatterns) + ("solid" ,solid) + ("sonnet" ,sonnet))) + (arguments + `(#:tests? #f ; FIXME: 2/54 tests fail: Cannot find fontdirectory qtbase/lib/font + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'setup + (lambda* (#:key inputs #:allow-other-keys) + (setenv "XDG_DATA_DIRS" ; FIXME build phase doesn't find parts.desktop + (string-append (assoc-ref inputs "kparts") "/share")) + #t)) + (add-before 'check 'check-setup + (lambda _ + (setenv "HOME" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "CTEST_OUTPUT_ON_FAILURE" "1") + #t))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Full text editor component") + (description "KTextEditor provides a powerful text editor component that you +can embed in your application, either as a KPart or using the KF5::TextEditor +library.") + ;; triple licensed + (license (list license:gpl2+ license:lgpl2.0+ license:lgpl2.1+)))) -- cgit v1.2.3 From 2128da9a98250881d6796d3b40a18a94f5624724 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 7 Aug 2016 20:25:27 +0200 Subject: gnu: Add ktextwidgets. * gnu/packages/kde-frameworks.scm (ktextwidgets): New variable. --- gnu/packages/kde-frameworks.scm | 45 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 9afbf900c1..17ccafb53a 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2485,3 +2485,48 @@ can embed in your application, either as a KPart or using the KF5::TextEditor library.") ;; triple licensed (license (list license:gpl2+ license:lgpl2.0+ license:lgpl2.1+)))) + +(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")))) + (build-system cmake-build-system) + (propagated-inputs + `(("ki18n" ,ki18n) + ("sonnet" ,sonnet))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kauth" ,kauth) + ("kcodecs" ,kcodecs) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kiconthemes" ,kiconthemes) + ("kservice" ,kservice) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("qtbase" ,qtbase))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen") + #t))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Text editing widgets") + (description "KTextWidgets provides widgets for displaying and editing text. +It supports rich text as well as plain text.") + ;; dual licensed + (license (list license:lgpl2.0+ license:lgpl2.1+)))) -- cgit v1.2.3 From 7ac520dd2257e7903de855aba821a6e061cac0e4 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 7 Aug 2016 20:26:02 +0200 Subject: gnu: Add kwallet. * gnu/packages/kde-frameworks.scm (kwallet): New variable. --- gnu/packages/kde-frameworks.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 17ccafb53a..de6d2cf250 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2530,3 +2530,44 @@ library.") It supports rich text as well as plain text.") ;; dual licensed (license (list license:lgpl2.0+ license:lgpl2.1+)))) + +(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")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("gpgmepp" ,gpgmepp) + ("kauth" ,kauth) + ("kcodecs" ,kcodecs) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kdbusaddons" ,kdbusaddons) + ("kdoctools" ,kdoctools) + ("kiconthemes" ,kiconthemes) + ("ki18n" ,ki18n) + ("knotifications" ,knotifications) + ("kservice" ,kservice) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("libgcrypt" ,libgcrypt) + ("phonon" ,phonon) + ("qtbase" ,qtbase))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Safe desktop-wide storage for passwords") + (description "This framework contains an interface to KWallet, a safe +desktop-wide storage for passwords and the kwalletd daemon used to safely store +the passwords on KDE work spaces.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 469a743cd0e24732f42eea99795837c93d8f0f05 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 7 Aug 2016 20:26:59 +0200 Subject: gnu: Add kxmlgui. * gnu/packages/kde-frameworks.scm (kxmlgui): New variable. --- gnu/packages/kde-frameworks.scm | 52 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index de6d2cf250..9a90adc76b 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2571,3 +2571,55 @@ It supports rich text as well as plain text.") desktop-wide storage for passwords and the kwalletd daemon used to safely store the passwords on KDE work spaces.") (license license:lgpl2.1+))) + +(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")))) + (build-system cmake-build-system) + (propagated-inputs + `(("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("attica" ,attica) + ("kauth", kauth) + ("kcodecs" ,kcodecs) + ("kcoreaddons" ,kcoreaddons) + ("kglobalaccel" ,kglobalaccel) + ("kiconthemes" ,kiconthemes) + ("kitemviews" ,kitemviews) + ("ki18n" ,ki18n) + ("ktextwidgets" ,ktextwidgets) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("qtbase" ,qtbase) + ("sonnet" ,sonnet))) + (arguments + `(#:tests? #f ; FIXME: 1/5 tests fail. + #:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "HOME" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "CTEST_OUTPUT_ON_FAILURE" "1") + #t))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Framework for managing menu and toolbar actions") + (description "KXMLGUI provides a framework for managing menu and toolbar +actions in an abstract way. The actions are configured through a XML description +and hooks in the application code. The framework supports merging of multiple +descriptions for integrating actions from plugins.") + ;; dual licensed + (license (list license:gpl2+ license:lgpl2.1+)))) -- cgit v1.2.3 From 97bb2dbb2a236df179ce95fb3683f71f925cb383 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 7 Aug 2016 20:27:42 +0200 Subject: gnu: Add kxmlrpcclient. * gnu/packages/kde-frameworks.scm (kxmlrpcclient): New variable. --- gnu/packages/kde-frameworks.scm | 43 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 9a90adc76b..745923fcaf 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2623,3 +2623,46 @@ and hooks in the application code. The framework supports merging of multiple descriptions for integrating actions from plugins.") ;; dual licensed (license (list license:gpl2+ license:lgpl2.1+)))) + +(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")))) + (build-system cmake-build-system) + (propagated-inputs + `(("kio" ,kio))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kauth" ,kauth) + ("kbookmarks" ,kbookmarks) + ("kcodecs" ,kcodecs) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kitemviews" ,kitemviews) + ("ki18n" ,ki18n) + ("kjobwidgets" ,kjobwidgets) + ("kservice" ,kservice) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kxmlgui" ,kxmlgui) + ("qtbase" ,qtbase) + ("solid" ,solid))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "XML-RPC client") + (description "This library contains simple XML-RPC Client support. It is a +complete client and is easy to use. Only one interface is exposed, +kxmlrpcclient/client.h and from that interface, you only need to use 3 methods: +setUrl, setUserAgent and call.") + ;; dual licensed + (license (list license:bsd-2 license:lgpl2.1+)))) -- cgit v1.2.3 From 0a7c2d08642460be933c0fe56ad69e03f84513df Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 7 Aug 2016 20:28:06 +0200 Subject: gnu: Add plasma-framework. * gnu/packages/kde-frameworks.scm (plasma-framework): New variable. --- gnu/packages/kde-frameworks.scm | 66 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 745923fcaf..349198bd80 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2666,3 +2666,69 @@ kxmlrpcclient/client.h and from that interface, you only need to use 3 methods: setUrl, setUserAgent and call.") ;; dual licensed (license (list license:bsd-2 license:lgpl2.1+)))) + +(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")))) + (build-system cmake-build-system) + (propagated-inputs + `(("kpackage" ,kpackage) + ("kservice" ,kservice))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kactivities" ,kactivities) + ("karchive" ,karchive) + ("kauth" ,kauth) + ("kbookmarks" ,kbookmarks) + ("kcodecs" ,kcodecs) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kdbusaddons" ,kdbusaddons) + ("kdeclarative" ,kdeclarative) + ("kdoctools" ,kdoctools) + ("kglobalaccel" ,kglobalaccel) + ("kguiaddons" ,kguiaddons) + ("kiconthemes" ,kiconthemes) + ("kitemviews" ,kitemviews) + ("kio" ,kio) + ("ki18n" ,ki18n) + ("kjobwidgets" ,kjobwidgets) + ("knotificantions" ,knotifications) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("phonon" ,phonon) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtsvg" ,qtsvg) + ("qtx11extras" ,qtx11extras) + ("solid" ,solid))) + (arguments + `(#:tests? #f ; FIXME: 13/14 tests fail. + #:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "HOME" (getcwd)) + (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; Enable debug output + (setenv "QT_QPA_PLATFORM" "offscreen") + #t))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Libraries, components and tools of Plasma workspaces") + (description "The plasma framework provides QML components, libplasma and +script engines.") + ;; dual licensed + (license (list license:gpl2+ license:lgpl2.1+)))) -- cgit v1.2.3 From 72783891fea75b49d96c74efb4f16014b249b6dc Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 14 Aug 2016 17:43:02 +0200 Subject: gnu: Add kpmcore. * gnu/packages/kde-frameworks.scm (kpmcore): New variable. --- gnu/packages/kde-frameworks.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 349198bd80..011f9e0deb 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -33,6 +33,7 @@ #:use-module (gnu packages boost) #:use-module (gnu packages compression) #:use-module (gnu packages databases) + #:use-module (gnu packages disk) #:use-module (gnu packages docbook) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) @@ -142,6 +143,38 @@ common build settings used in software produced by the KDE community.") (description "C++ bindings/wrapper for gpgme.") (license license:lgpl2.1+))) +(define-public kpmcore + (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")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("pkg-config" ,pkg-config))) + (inputs + `(("kconfigwidgets" ,kconfigwidgets) + ("kiconthemes" ,kiconthemes) + ("kio" ,kio) + ("ki18n" ,ki18n) + ("kservice" ,kservice) + ("libatasmart" ,libatasmart) + ("parted" ,parted) + ("qtbase" ,qtbase) + ("util-linux" ,util-linux))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Library for managing partitions") + (description "Library for managing partitions.") + (license license:gpl3+))) + ;; Tier 1 ;; -- cgit v1.2.3 From bb8b543a488a46db37211d9b9f2d2e7ea42ed40e Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 29 Aug 2016 12:42:51 -0400 Subject: gnu: Add telepathy-idle. * gnu/packages/freedesktop.scm (telepathy-idle): New variable. --- gnu/packages/freedesktop.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 67f1e1a2c0..ac98769bd1 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2015 David Hashe ;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016 Kei Kebreau ;;; ;;; This file is part of GNU Guix. ;;; @@ -618,6 +619,34 @@ received by the Telepathy framework. It features pluggable backends to log different sorts of messages in different formats.") (license license:lgpl2.1+))) +(define-public telepathy-idle + (package + (name "telepathy-idle") + (version "0.2.0") + (source (origin + (method url-fetch) + (uri (string-append "https://telepathy.freedesktop.org/releases/" + name "/" name "-" version ".tar.bz2")) + (sha256 + (base32 + "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("xsltproc" ,libxslt) + ("python" ,python-2) + ("python-dbus" ,python2-dbus))) + (propagated-inputs + `(("telepathy-glib" ,telepathy-glib))) + (home-page "http://telepathy.freedesktop.org/") + (synopsis "Telepathy IRC connection manager") + (description + "Idle is an IRC connection manager for the Telepathy framework. This +package enables usage of IRC channels and private messages in Telepathy instant +messaging clients such as Empathy, GNOME Shell or KDE Telepathy.") + (license (list license:lgpl2.1 license:lgpl2.1+)))) + (define-public colord-gtk (package (name "colord-gtk") -- cgit v1.2.3 From 7a3f94054152777c5cdf50771febc6bfbc54a3fd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 31 Aug 2016 00:40:05 +0300 Subject: gnu: fossil: Update to 1.35. * gnu/packages/version-control.scm (fossil): Update to 1.35. [source]: Download from fossil-scm.org, remove patch, remove snippet. * gnu/packages/patches/fossil-test-fixes.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/patches/fossil-test-fixes.patch | 189 --------------------------- gnu/packages/version-control.scm | 29 +--- 3 files changed, 4 insertions(+), 215 deletions(-) delete mode 100644 gnu/packages/patches/fossil-test-fixes.patch diff --git a/gnu/local.mk b/gnu/local.mk index d75ab54453..6f600a8638 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -510,7 +510,6 @@ dist_patch_DATA = \ %D%/packages/patches/fltk-xfont-on-demand.patch \ %D%/packages/patches/fontconfig-CVE-2016-5384.patch \ %D%/packages/patches/fontforge-svg-modtime.patch \ - %D%/packages/patches/fossil-test-fixes.patch \ %D%/packages/patches/freeimage-CVE-2015-0852.patch \ %D%/packages/patches/gawk-fts-test.patch \ %D%/packages/patches/gawk-shell.patch \ diff --git a/gnu/packages/patches/fossil-test-fixes.patch b/gnu/packages/patches/fossil-test-fixes.patch deleted file mode 100644 index e6c9f3dd74..0000000000 --- a/gnu/packages/patches/fossil-test-fixes.patch +++ /dev/null @@ -1,189 +0,0 @@ -From upstream commit https://www.fossil-scm.org/fossil/info/19c216391a0ad79e - ---- fossil-src-1.34/test/file1.test -+++ fossil-src-1.34/test/file1.test -@@ -15,10 +15,12 @@ - # - ############################################################################ - # - # File utilities - # -+ -+repo_init - - proc simplify-name {testname args} { - set i 1 - foreach {path result} $args { - fossil test-simplify-name $path -@@ -65,10 +67,13 @@ - - if {$::tcl_platform(os)=="Windows NT"} { - simplify-name 108 //?/a:/a/b a:/a/b //?/UNC/a/b //a/b //?/ {} - simplify-name 109 \\\\?\\a:\\a\\b a:/a/b \\\\?\\UNC\\a\\b //a/b \\\\?\\ {} - } -+ -+# This is needed because we are now running outside of the Fossil checkout. -+file mkdir file1; cd file1 - - # Those directories are only needed for the testcase being able to "--chdir" to it. - file mkdir test1 - file mkdir test1/test2 - -From upstream commit https://www.fossil-scm.org/fossil/info/ad6de6383391bd4d - ---- fossil-src-1.34/test/utf.test -+++ fossil-src-1.34/test/utf.test -@@ -39,26 +39,29 @@ - test utf-check-$testname.$i {$::RESULT eq $result} - incr i - } - } - -+unset -nocomplain enc - array set enc [list \ - 0 binary \ - 1 binary \ - 2 unicode \ - 3 unicode-reverse \ - ] - -+unset -nocomplain bom - array set bom [list \ - 0 "" \ - 1 \xEF\xBB\xBF \ - 2 [expr {$tcl_platform(byteOrder) eq "littleEndian" ? \ - "\xFF\xFE" : "\xFE\xFF"}] \ - 3 [expr {$tcl_platform(byteOrder) eq "littleEndian" ? \ - "\xFE\xFF" : "\xFF\xFE"}] \ - ] - -+unset -nocomplain data - array set data [list \ - 0 "" \ - 1 \r \ - 2 \n \ - 3 \r\n \ -@@ -239,10 +242,11 @@ - 178 \xF4\x90\x80\x80\r \ - 179 \xF4\x90\x80\x80\n \ - 180 \xF4\x90\x80\x80\r\n \ - ] - -+unset -nocomplain extraData - array set extraData [list \ - 0 "" \ - 1 Z \ - ] - -Backport from upstream https://www.fossil-scm.org/fossil/info/60285f5876512817 -with additional non-zero exit in case of failures. - ---- fossil-src-1.34/test/merge6.test -+++ fossil-src-1.34/test/merge6.test -@@ -62,6 +62,6 @@ - fossil ls - - test merge_multi-4 {[normalize_result] eq {f1 - f2 - f3 --f4}} -+f4}} knownBug - ---- fossil-src-1.34/test/merge_renames.test -+++ fossil-src-1.34/test/merge_renames.test -@@ -156,13 +156,13 @@ - } - - if {$deletes!=0} { - # failed - protOut "Error, the merge should not delete any file" -- test merge_renames-2 0 -+ test merge_renames-3 0 - } else { -- test merge_renames-2 1 -+ test merge_renames-3 1 - } - - ###################################### - # Test 4 # - # Reported: Ticket [67176c3aa4] # -@@ -198,14 +198,14 @@ - - fossil ls - - test merge_renames-5 {[normalize_result] eq {f1 - f2 --f3}} -+f3}} knownBug - - ###################################### - # - # Tests for troubles not specifically linked with renames but that I'd like to - # write: - # [c26c63eb1b] - 'merge --backout' does not handle conflicts properly - # [953031915f] - Lack of warning when overwriting extra files - # [4df5f38f1e] - Troubles merging a file delete with a file change - ---- fossil-src-1.34/test/tester.tcl -+++ fossil-src-1.34/test/tester.tcl -@@ -58,10 +58,18 @@ - set VERBOSE 1 - set argv [lreplace $argv $i $i] - } else { - set VERBOSE 0 - } -+ -+set i [lsearch $argv -strict] -+if {$i>=0} { -+ set STRICT 1 -+ set argv [lreplace $argv $i $i] -+} else { -+ set STRICT 0 -+} - - if {[llength $argv]==0} { - foreach f [lsort [glob $testdir/*.test]] { - set base [file root [file tail $f]] - lappend argv $base -@@ -327,20 +335,30 @@ - } - - # Perform a test - # - set test_count 0 --proc test {name expr} { -+proc test {name expr {constraints ""}} { - global bad_test test_count - incr test_count -+ set knownBug [expr {"knownBug" in $constraints}] - set r [uplevel 1 [list expr $expr]] - if {$r} { -- protOut "test $name OK" -+ if {$knownBug && !$::STRICT} { -+ protOut "test $name OK (knownBug)?" -+ } else { -+ protOut "test $name OK" -+ } - } else { -- protOut "test $name FAILED!" -- lappend bad_test $name -- if {$::HALT} exit -+ if {$knownBug && !$::STRICT} { -+ protOut "test $name FAILED (knownBug)!" -+ } else { -+ protOut "test $name FAILED!" -+ if {$::VERBOSE} {protOut "RESULT: $RESULT"} -+ lappend bad_test $name -+ if {$::HALT} exit -+ } - } - } - set bad_test {} - - # Return a random string N characters long. -@@ -445,4 +455,5 @@ - protOut "***** Final result: $nErr errors out of $test_count tests" - if {$nErr>0} { - protOut "***** Failures: $bad_test" -+ exit 1 - } diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index e8f4874790..34cfedf4ed 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1148,37 +1148,16 @@ repository\" with git-annex.") (define-public fossil (package (name "fossil") - (version "1.34") + (version "1.35") (source (origin (method url-fetch) - ;; Upstream source affected by - ;; http://debbugs.gnu.org/cgi/bugreport.cgi?bug=20962 (uri (string-append - "https://web.archive.org/web/20160402202958/" - "https://www.fossil-scm.org/download/fossil-src-" - version ".tar.gz")) + "https://www.fossil-scm.org/index.html/uv/download/" + "fossil-src-" version ".tar.gz")) (sha256 (base32 - "17x4vgjcfihwmq195qg32irp50panvjqfpvhqydfvv4ghwzbi9jk")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Commit 0a2ebe57 on 2015-08-03 18:35:53 changed output formatting - ;; for some commands, but affected tests were not updated. Use - ;; substitute here, which is more concise than patching. - (substitute* "test/clean.test" - (("NEW ") "NEW ")) - (substitute* '("test/revert.test" "test/mv-rm.test") - (("REVERTED:") "REVERT ") - (("DELETE:") "DELETE ") - (("UNMANAGE:") "UNMANAGE ")) - ;; Fix use of __DATE__ and __TIME__ - (substitute* "src/main.c" - (("Compiled on %s %s") "Compiled") - (("__DATE__, __TIME__, ") "")) - #t)) - (patches (list (search-patch "fossil-test-fixes.patch"))))) + "07ds6rhq69bhydpm9a01mgdhxf88p9b6y5hdnhn8gjc7ba92zyf1")))) (build-system gnu-build-system) (native-inputs `(("tcl" ,tcl) ;for configuration only -- cgit v1.2.3 From 82e4557d5650b99192bef55b8c518e6444816282 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Tue, 30 Aug 2016 19:28:48 +0200 Subject: gnu: Add cfitsio * gnu/packages/astronomy.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/local.mk | 1 + gnu/packages/astronomy.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 gnu/packages/astronomy.scm diff --git a/gnu/local.mk b/gnu/local.mk index 6f600a8638..5ec47fc7df 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -42,6 +42,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/apr.scm \ %D%/packages/aspell.scm \ %D%/packages/assembly.scm \ + %D%/packages/astronomy.scm \ %D%/packages/attr.scm \ %D%/packages/audacity.scm \ %D%/packages/audio.scm \ diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm new file mode 100644 index 0000000000..ba1556882d --- /dev/null +++ b/gnu/packages/astronomy.scm @@ -0,0 +1,53 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016 John Darrington +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages astronomy) + #:use-module (guix packages) + #:use-module (guix licenses) + #:use-module (guix download) + #:use-module (guix build-system gnu)) + +(define-public cfitsio + (package + (name "cfitsio") + (version "3390") + (source + (origin + (method url-fetch) + (uri (string-append + "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/" name version + ".tar.gz")) + (sha256 + (base32 "02gllydm63irwbqqisa3mrskw1fphm5rlplglz3mq9whi3rxilv2")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda _ + (substitute* "Makefile.in" (("/bin/") ""))))))) + (home-page "http://heasarc.gsfc.nasa.gov/fitsio/fitsio.html") + (synopsis "Library for reading and writing FITS files") + (description "CFITSIO provides simple high-level routines for reading and +writing FITS (Flexible Image Transport System) files that insulate the +programmer from the internal complexities of the FITS format. CFITSIO also +provides many advanced features for manipulating and filtering the information +in FITS files.") + (license (license:non-copyleft "file://License.txt" + "See License.txt in the distribution.")))) -- cgit v1.2.3 From 2be83f6e8d3678253a1f9c8b0e5fa264ebf81e2a Mon Sep 17 00:00:00 2001 From: John Darrington Date: Tue, 30 Aug 2016 21:08:23 +0200 Subject: gnu: Add wcslib * gnu/packages/astronomy.scm (wcslib): New variable. --- gnu/packages/astronomy.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index ba1556882d..996829397d 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -51,3 +51,30 @@ provides many advanced features for manipulating and filtering the information in FITS files.") (license (license:non-copyleft "file://License.txt" "See License.txt in the distribution.")))) + +(define-public wcslib + (package + (name "wcslib") + (version "5.15") + (source + (origin + (method url-fetch) + (uri (string-append + "ftp://ftp.atnf.csiro.au/pub/software/wcslib/" name "-" version ".tar.bz2")) + (sha256 + (base32 "1s2nig327g4bimd9xshlk11ww09a7mrjmsbpdcd8smsmn2kl1glb")))) + (inputs + `(("cfitsio" ,cfitsio))) + (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'configure 'patch-/bin/sh + (lambda _ + (substitute* "makedefs.in" + (("/bin/sh") "sh"))))))) + (home-page "http://www.atnf.csiro.au/people/mcalabre/WCS") + (synopsis "An implementation of the FITS WCS standard") + (description "The FITS \"World Coordinate System\" (WCS) standard defines +keywords and usage that provide for the description of astronomical coordinate +systems in a FITS image header.") + (license license:lgpl3+))) -- cgit v1.2.3 From c9bd15c1d85781730edd34688007c09faa2952b0 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Tue, 30 Aug 2016 21:09:56 +0200 Subject: gnu: Add gnuastro * gnu/packages/astronomy.scm (gnuastro): New variable. --- gnu/packages/astronomy.scm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 996829397d..f893525fb5 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -18,8 +18,10 @@ (define-module (gnu packages astronomy) #:use-module (guix packages) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) + #:use-module (gnu packages image) + #:use-module (gnu packages maths) #:use-module (guix build-system gnu)) (define-public cfitsio @@ -78,3 +80,27 @@ in FITS files.") keywords and usage that provide for the description of astronomical coordinate systems in a FITS image header.") (license license:lgpl3+))) + +(define-public gnuastro + (package + (name "gnuastro") + (version "0.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gnuastro/gnuastro-" + version ".tar.gz")) + (sha256 + (base32 + "105s007kw8l3jwwhvh8k9lgbpfbf7sqh2wpxmvpv3qdr6nh9lnjg")))) + (inputs + `(("cfitsio" ,cfitsio) + ("gsl" ,gsl) + ("libjpeg" ,libjpeg-8) + ("wcslib" ,wcslib))) + (build-system gnu-build-system) + (home-page "http://www.gnu.org/software/gnuastro") + (synopsis "Astronomical data manipulation programs") + (description "The GNU Astronomy Utilities (Gnuastro) is a suite of +programs for the manipulation and analysis of astronomical data.") + (license license:gpl3+))) -- cgit v1.2.3 From 43043f23f55a6eccae5ed701c678ee48b3109a1c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 31 Aug 2016 08:35:44 +0300 Subject: gnu: alsa-utils: Update to 1.1.2. * gnu/packages/linux.scm (alsa-utils): Update to 1.1.2. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c1fdf96b0a..2fa85f5d79 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -867,14 +867,14 @@ MIDI functionality to the Linux-based operating system.") (define-public alsa-utils (package (name "alsa-utils") - (version "1.1.0") + (version "1.1.2") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.alsa-project.org/pub/utils/" name "-" version ".tar.bz2")) (sha256 (base32 - "1wa88wvqcfhak9x3y65wzzwxmmyxb5bv2gyj7lnm653fnwsk271v")))) + "0wcha78c2sm8qqk5r3w83cvm8fp6fb1zpd35kmcm24kxhz007xks")))) (build-system gnu-build-system) (arguments ;; XXX: Disable man page creation until we have DocBook. -- cgit v1.2.3 From 491651450306b49fb767b505e299b383bcd05754 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 31 Aug 2016 08:37:16 +0300 Subject: gnu: alsa-utils: Use 'modify-phases'. * gnu/packages/linux.scm (alsa-utils)[arguments]: Use 'modify-phases' syntax. --- gnu/packages/linux.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2fa85f5d79..aac2cd19f6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -885,14 +885,15 @@ MIDI functionality to the Linux-based operating system.") (string-append "--with-udev-rules-dir=" (assoc-ref %outputs "out") "/lib/udev/rules.d")) - #:phases (alist-cons-before - 'install 'pre-install - (lambda _ - ;; Don't try to mkdir /var/lib/alsa. - (substitute* "Makefile" - (("\\$\\(MKDIR_P\\) .*ASOUND_STATE_DIR.*") - "true\n"))) - %standard-phases))) + #:phases + (modify-phases %standard-phases + (add-before + 'install 'pre-install + (lambda _ + ;; Don't try to mkdir /var/lib/alsa. + (substitute* "Makefile" + (("\\$\\(MKDIR_P\\) .*ASOUND_STATE_DIR.*") + "true\n"))))))) (inputs `(("libsamplerate" ,libsamplerate) ("ncurses" ,ncurses) -- cgit v1.2.3 From b0488fe54959b04f52e7acab7984c19dd0593791 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 30 Aug 2016 23:40:27 +0300 Subject: gnu: Add bambam. * gnu/packages/games.scm (bambam): New variable. --- gnu/packages/games.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ed5d7fd52e..9e44fbc6b2 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2016 Albin Söderqvist ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2016 Alex Griffin -;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. @@ -103,6 +103,7 @@ #:use-module (gnu packages xdisorg) #:use-module (guix build-system gnu) #:use-module (guix build-system haskell) + #:use-module (guix build-system python) #:use-module (guix build-system cmake) #:use-module (guix build-system trivial)) @@ -2773,3 +2774,55 @@ Your robot ant can be programmed in many languages: OCaml, Python, C, C++, Java, Ruby, Lua, JavaScript, Pascal, Perl, Scheme, Vala, Prolog. Experienced programmers may also add their own favorite language.") (license license:gpl3+))) + +(define-public bambam + (package + (name "bambam") + (version "0.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/porridge/bambam/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "10w110mjdwbvddzihh9rganvvjr5jfiz8cs9n7w12zndwwcc3ria")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2 + #:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (delete 'build) + (add-before 'install 'patch-data-dir-location + (lambda _ + (substitute* "bambam.py" + (("'data'") + "'../share/bambam/data'")) + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (share (string-append out "/share"))) + (mkdir-p bin) + (copy-file "bambam.py" (string-append bin "/bambam")) + (install-file "bambam.6" (string-append share "/man/man6")) + (copy-recursively "data" (string-append share "/bambam/data"))) + #t)) + (add-after 'install 'wrap-binary + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin/bambam"))) + (wrap-program bin + `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))) + #t))))) + (inputs + `(("python-pygame" ,python-pygame))) + (home-page "https://github.com/porridge/bambam") + (synopsis "keyboard mashing and doodling game for babies") + (description "Bambam is a simple baby keyboard (and gamepad) masher +application that locks the keyboard and mouse and instead displays bright +colors, pictures, and sounds.") + (license license:gpl3+))) -- cgit v1.2.3 From 0c4520d686915ca1455405d7a4af69e0f170c40d Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 31 Aug 2016 00:43:09 -0500 Subject: gnu: autojump: Fix failing tests. This is a followup to 1d33b9e; test script was moved in upgrade to version 22.3.4. * gnu/packages/admin.scm (autojump)[arguments]: Adjust unit test script file name. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 05c2895792..474c0d7556 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1415,7 +1415,7 @@ limits.") (replace 'check (lambda _ (zero? - (system* "python" "tests/autojump_utils_test.py")))) + (system* "python" "tests/unit/autojump_utils_test.py")))) (replace 'install ;; The install.py script doesn't allow system installation ;; into an arbitrary prefix, so do our own install. -- cgit v1.2.3 From 7d57ebaa7c4aefec69104fc10e56f04bceb6fe5b Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Wed, 31 Aug 2016 15:52:49 +1000 Subject: gnu: aragorn: Update to 1.2.37. * gnu/packages/bioinformatics.scm (aragorn): Update to 1.2.37. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ed20b562e5..45066de3cb 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -93,7 +93,7 @@ (define-public aragorn (package (name "aragorn") - (version "1.2.36") + (version "1.2.37") (source (origin (method url-fetch) (uri (string-append @@ -101,7 +101,7 @@ version ".tgz")) (sha256 (base32 - "1dg7jlz1qpqy88igjxd6ncs11ccsirb36qv1z01a0np4i4jh61mb")))) + "1c7zxk0h8wsjbix82fmmfyywcq6zn3q9h5y67kcl5y3qal2bv2xr")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; there are no tests -- cgit v1.2.3 From 41392b9a3d715daac76f92092323fdeb8cf8ad3a Mon Sep 17 00:00:00 2001 From: ng0 Date: Sun, 28 Aug 2016 23:25:53 +0000 Subject: gnu: Add emacs-flx. * gnu/packages/emacs.scm (emacs-flx): New variable. Signed-off-by: Alex Kost --- gnu/packages/emacs.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 9a77d8ac0a..6485beef6b 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3002,3 +3002,27 @@ lists, and project planning with a fast and effective plain-text system. It also is an authoring system with unique support for literate programming and reproducible research.") (license license:gpl3+))) + +(define-public emacs-flx + (package + (name "emacs-flx") + (version "0.6.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lewang/" + "flx/archive/v" version ".tar.gz")) + (sha256 + (base32 + "0bkcpnf1j4i2fcc2rllwbz62l00sw2mcia6rm5amgwvlkqavmkv6")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system emacs-build-system) + (home-page "https://github.com/lewang/flx") + (synopsis "Fuzzy matching for Emacs") + (description + "Flx provides fuzzy matching for emacs a la sublime text. +The sorting algorithm is a balance between word beginnings (abbreviation) +and contiguous matches (substring). The longer the substring match, +the higher it scores. This maps well to how we think about matching. +Flx has support for ido (interactively do things) through flx-ido.") + (license license:gpl3+))) -- cgit v1.2.3 From 9657aba4ed92d4965e89122dc086f96f1f06d3fc Mon Sep 17 00:00:00 2001 From: ng0 Date: Sun, 28 Aug 2016 23:46:57 +0000 Subject: gnu: Add emacs-cyberpunk-theme. * gnu/packages/emacs.scm (emacs-cyberpunk-theme): New variable. Signed-off-by: Alex Kost --- gnu/packages/emacs.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6485beef6b..3088c0a566 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3026,3 +3026,24 @@ and contiguous matches (substring). The longer the substring match, the higher it scores. This maps well to how we think about matching. Flx has support for ido (interactively do things) through flx-ido.") (license license:gpl3+))) + +(define-public emacs-cyberpunk-theme + (package + (name "emacs-cyberpunk-theme") + (version "1.17") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/n3mo/cyberpunk-theme.el/" + "archive/" version ".tar.gz")) + (sha256 + (base32 + "068jcn4g1bvwgpcvyfqygzw6ahill51c1sqzyyvj2paxckbd7h51")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system emacs-build-system) + (home-page "https://github.com/n3mo/cyberpunk-theme.el") + (synopsis "Cyberpunk theme for emacs built-in color theme support") + (description + "Cyberpunk color theme for the emacs 24+ built-in color theme support +known loosely as deftheme. Many mode-specific customizations are included.") + (license license:gpl3+))) -- cgit v1.2.3 From 840224aadcc5b4f1b0895ae23ab9810d0b12e9ec Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 29 Aug 2016 00:16:52 +0000 Subject: gnu: Add emacs-auto-complete. * gnu/packages/emacs.scm (emacs-auto-complete): New variable. Signed-off-by: Alex Kost --- gnu/packages/emacs.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 3088c0a566..ad51634f0c 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3047,3 +3047,29 @@ Flx has support for ido (interactively do things) through flx-ido.") "Cyberpunk color theme for the emacs 24+ built-in color theme support known loosely as deftheme. Many mode-specific customizations are included.") (license license:gpl3+))) + +(define-public emacs-auto-complete + (package + (name "emacs-auto-complete") + (version "1.5.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/auto-complete/" + "auto-complete/archive/v" version ".tar.gz")) + (sha256 + (base32 + "1jvq4lj00hwml75lpmlciazy8f3bbg13gffsfnl835p4qd8l7yqv")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-popup" ,emacs-popup))) + (home-page "https://github.com/auto-complete/auto-complete") + (synopsis "Intelligent auto-completion extension for Emacs") + (description + "Auto-Complete is an intelligent auto-completion extension for Emacs. +It extends the standard Emacs completion interface and provides an environment +that allows users to concentrate more on their own work. Its features are: +a visual interface, reduce overhead of completion by using statistic method, +extensibility.") + (license license:gpl3+))) -- cgit v1.2.3 From c180533bb5dc2af653deb074fe9183c4df03be4a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 31 Aug 2016 15:23:03 +0200 Subject: gnu: subread: Update to 1.5.1. * gnu/packages/bioinformatics.scm (subread): Update to 1.5.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 45066de3cb..08c25459c0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4692,14 +4692,14 @@ sequences.") (define-public subread (package (name "subread") - (version "1.4.6-p2") + (version "1.5.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/subread/subread-" version "/subread-" version "-source.tar.gz")) (sha256 (base32 - "06sv9mpcsdj6p68y15d6gi70lca3lxmzk0dn61hg0kfsa7rxmsr3")))) + "0gn5zhbvllks0mmdg3qlmsbg91p2mpdc2wixwfqpi85yzfrh8hcy")))) (build-system gnu-build-system) (arguments `(#:tests? #f ;no "check" target -- cgit v1.2.3 From 1bc4d0c26634163413a8ec12c627367ca5c1bbba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 30 Aug 2016 14:26:47 +0200 Subject: doc: Fix 'ntp-service' typo. Reported by Vincent Legoll . * doc/guix.texi (Networking Services): Change #:name-service to #:servers in 'ntp-service' documentation. --- doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index b22cf4a094..5448c66664 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -7952,7 +7952,7 @@ configure networking." @end deffn @deffn {Scheme Procedure} ntp-service [#:ntp @var{ntp}] @ - [#:name-service @var{%ntp-servers}] + [#:servers @var{%ntp-servers}] Return a service that runs the daemon from @var{ntp}, the @uref{http://www.ntp.org, Network Time Protocol package}. The daemon will keep the system clock synchronized with that of @var{servers}. -- cgit v1.2.3 From 183605c8533ad321ff8bba209b64071a9e84714a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 30 Aug 2016 17:59:15 +0200 Subject: services: herd: Provide objects. * gnu/services/herd.scm (): New record type. (current-services): Change to return a single value: #f or a list of . * guix/scripts/system.scm (call-with-service-upgrade-info): Adjust accordingly. * gnu/tests/base.scm (run-basic-test)["shepherd services"]: Adjust accordingly. --- gnu/services/herd.scm | 37 ++++++++++++++++++++--------------- gnu/tests/base.scm | 12 +++++++----- guix/scripts/system.scm | 51 +++++++++++++++++++++++++++---------------------- 3 files changed, 57 insertions(+), 43 deletions(-) diff --git a/gnu/services/herd.scm b/gnu/services/herd.scm index 7a9db90012..03bfbf1d78 100644 --- a/gnu/services/herd.scm +++ b/gnu/services/herd.scm @@ -17,8 +17,8 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu services herd) - #:use-module (guix combinators) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-9) #:use-module (srfi srfi-11) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) @@ -37,6 +37,11 @@ unknown-shepherd-error? unknown-shepherd-error-sexp + live-service? + live-service-provision + live-service-requirement + live-service-running + current-services unload-services unload-service @@ -165,25 +170,27 @@ of pairs." (let ((key (and=> (assoc-ref alist 'key) car)) ...) exp ...)))) +;; Information about live Shepherd services. +(define-record-type + (live-service provision requirement running) + live-service? + (provision live-service-provision) ;list of symbols + (requirement live-service-requirement) ;list of symbols + (running live-service-running)) ;#f | object + (define (current-services) - "Return two lists: the list of currently running services, and the list of -currently stopped services. Return #f and #f if the list of services could -not be obtained." + "Return the list of currently defined Shepherd services, represented as + objects. Return #f if the list of services could not be +obtained." (with-shepherd-action 'root ('status) services (match services ((('service ('version 0 _ ...) _ ...) ...) - (fold2 (lambda (service running-services stopped-services) - (alist-let* service (provides running) - (if running - (values (cons (first provides) running-services) - stopped-services) - (values running-services - (cons (first provides) stopped-services))))) - '() - '() - services)) + (map (lambda (service) + (alist-let* service (provides requires running) + (live-service provides requires running))) + services)) (x - (values #f #f))))) + #f)))) (define (unload-service service) "Unload SERVICE, a symbol name; return #t on success." diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index ca6f76c0f8..41f50c0e7a 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -122,11 +122,13 @@ info --version") (operating-system-user-accounts os)))))) (test-assert "shepherd services" - (let ((services (marionette-eval '(begin - (use-modules (gnu services herd)) - (call-with-values current-services - append)) - marionette))) + (let ((services (marionette-eval + '(begin + (use-modules (gnu services herd)) + + (map (compose car live-service-provision) + (current-services))) + marionette))) (lset= eq? (pk 'services services) '(root #$@(operating-system-shepherd-service-names os))))) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index a9fe7d5975..55a8e475d4 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -283,29 +283,34 @@ unload." (map (compose first shepherd-service-provision) new-services)) - (let-values (((running stopped) (current-services))) - (if (and running stopped) - (let* ((to-load - ;; Only load services that are either new or currently stopped. - (remove (lambda (service) - (memq (first (shepherd-service-provision service)) - running)) - new-services)) - (to-unload - ;; Unload services that are (1) no longer required, or (2) are - ;; in TO-LOAD. - (remove essential? - (append (remove (lambda (service) - (memq service new-service-names)) - (append running stopped)) - (filter (lambda (service) - (memq service stopped)) - (map shepherd-service-canonical-name - to-load)))))) - (mproc to-load to-unload)) - (with-monad %store-monad - (warning (_ "failed to obtain list of shepherd services~%")) - (return #f))))) + (match (current-services) + ((services ...) + (let* ((running (map (compose first live-service-provision) + (filter live-service-running services))) + (stopped (map (compose first live-service-provision) + (remove live-service-running services))) + (to-load + ;; Only load services that are either new or currently stopped. + (remove (lambda (service) + (memq (first (shepherd-service-provision service)) + running)) + new-services)) + (to-unload + ;; Unload services that are (1) no longer required, or (2) are + ;; in TO-LOAD. + (remove essential? + (append (remove (lambda (service) + (memq service new-service-names)) + (append running stopped)) + (filter (lambda (service) + (memq service stopped)) + (map shepherd-service-canonical-name + to-load)))))) + (mproc to-load to-unload))) + (#f + (with-monad %store-monad + (warning (_ "failed to obtain list of shepherd services~%")) + (return #f))))) (define (upgrade-shepherd-services os) "Upgrade the Shepherd (PID 1) by unloading obsolete services and loading new -- cgit v1.2.3 From b8692e4696d0d2b36466827da1e0d25d69a298af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 30 Aug 2016 22:40:24 +0200 Subject: guix system: Extract and test the service upgrade procedure. * guix/scripts/system.scm (service-upgrade): New procedure, with code from... (call-with-service-upgrade-info): ... here. Use it. * tests/system.scm (live-service, service-upgrade): New variables. ("service-upgrade: nothing to do", "service-upgrade: one unchanged, one upgraded, one new"): New tests. --- guix/scripts/system.scm | 65 +++++++++++++++++++++++++++++-------------------- tests/system.scm | 34 ++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 26 deletions(-) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 55a8e475d4..a006b2d54e 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -272,40 +272,53 @@ on service '~a':~%") ((not error) ;not an error #t))) -(define (call-with-service-upgrade-info new-services mproc) - "Call MPROC, a monadic procedure in %STORE-MONAD, passing it the list of -names of services to load (upgrade), and the list of names of services to -unload." +(define (service-upgrade live target) + "Return two values: the names of the subset of LIVE (a list of +) that needs to be unloaded, and the subset of TARGET (a list of +) that needs to be loaded." (define (essential? service) (memq service '(root shepherd))) (define new-service-names (map (compose first shepherd-service-provision) - new-services)) + target)) + + (define running + (map (compose first live-service-provision) + (filter live-service-running live))) + + (define stopped + (map (compose first live-service-provision) + (remove live-service-running live))) + + (define to-load + ;; Only load services that are either new or currently stopped. + (remove (lambda (service) + (memq (first (shepherd-service-provision service)) + running)) + target)) + + (define to-unload + ;; Unload services that are (1) no longer required, or (2) are in TO-LOAD. + (remove essential? + (append (remove (lambda (service) + (memq service new-service-names)) + (append running stopped)) + (filter (lambda (service) + (memq service stopped)) + (map shepherd-service-canonical-name + to-load))))) + + (values to-unload to-load)) +(define (call-with-service-upgrade-info new-services mproc) + "Call MPROC, a monadic procedure in %STORE-MONAD, passing it the list of +names of services to load (upgrade), and the list of names of services to +unload." (match (current-services) ((services ...) - (let* ((running (map (compose first live-service-provision) - (filter live-service-running services))) - (stopped (map (compose first live-service-provision) - (remove live-service-running services))) - (to-load - ;; Only load services that are either new or currently stopped. - (remove (lambda (service) - (memq (first (shepherd-service-provision service)) - running)) - new-services)) - (to-unload - ;; Unload services that are (1) no longer required, or (2) are - ;; in TO-LOAD. - (remove essential? - (append (remove (lambda (service) - (memq service new-service-names)) - (append running stopped)) - (filter (lambda (service) - (memq service stopped)) - (map shepherd-service-canonical-name - to-load)))))) + (let-values (((to-unload to-load) + (service-upgrade services new-services))) (mproc to-load to-unload))) (#f (with-monad %store-monad diff --git a/tests/system.scm b/tests/system.scm index b5bb9af016..dee6feda2c 100644 --- a/tests/system.scm +++ b/tests/system.scm @@ -19,6 +19,8 @@ (define-module (test-system) #:use-module (gnu) #:use-module (guix store) + #:use-module (gnu services herd) + #:use-module (gnu services shepherd) #:use-module (srfi srfi-1) #:use-module (srfi srfi-64)) @@ -59,6 +61,11 @@ %base-file-systems)) (users %base-user-accounts))) +(define live-service + (@@ (gnu services herd) live-service)) + +(define service-upgrade + (@@ (guix scripts system) service-upgrade)) (test-begin "system") @@ -114,4 +121,31 @@ (type "ext4")) %base-file-systems))))) +(test-equal "service-upgrade: nothing to do" + '(() ()) + (call-with-values + (lambda () + (service-upgrade '() '())) + list)) + +(test-equal "service-upgrade: one unchanged, one upgraded, one new" + '((bar) ;unload + ((bar) (baz))) ;load + (call-with-values + (lambda () + ;; Here 'foo' is not upgraded because it is still running, whereas + ;; 'bar' is upgraded because it is not currently running. 'baz' is + ;; loaded because it's a new service. + (service-upgrade (list (live-service '(foo) '() #t) + (live-service '(bar) '() #f) + (live-service '(root) '() #t)) ;essential! + (list (shepherd-service (provision '(foo)) + (start #t)) + (shepherd-service (provision '(bar)) + (start #t)) + (shepherd-service (provision '(baz)) + (start #t))))) + (lambda (unload load) + (list unload (map shepherd-service-provision load))))) + (test-end) -- cgit v1.2.3 From a5d78eb64bcb87440a0b3ff25eec5568df0bc47c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 31 Aug 2016 12:38:38 +0200 Subject: services: shepherd: Add 'shepherd-service-lookup-procedure'. * gnu/services/shepherd.scm (shepherd-service-lookup-procedure): New procedure. (shepherd-service-back-edges)[provision->service]: Use it. * tests/services.scm ("shepherd-service-lookup-procedure"): New test. --- gnu/services/shepherd.scm | 30 ++++++++++++++++++++---------- tests/services.scm | 11 ++++++++++- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index a14f51592a..3cfca8574e 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -52,6 +52,7 @@ shepherd-service-file + shepherd-service-lookup-procedure shepherd-service-back-edges)) ;;; Commentary: @@ -249,20 +250,29 @@ stored." (gexp->file "shepherd.conf" config))) +(define* (shepherd-service-lookup-procedure services + #:optional + (provision + shepherd-service-provision)) + "Return a procedure that, when passed a symbol, return the item among +SERVICES that provides this symbol. PROVISION must be a one-argument +procedure that takes a service and returns the list of symbols it provides." + (let ((services (fold (lambda (service result) + (fold (cut vhash-consq <> service <>) + result + (provision service))) + vlist-null + services))) + (lambda (name) + (match (vhash-assq name services) + ((_ . service) service) + (#f #f))))) + (define (shepherd-service-back-edges services) "Return a procedure that, when given a from SERVICES, returns the list of that depend on it." (define provision->service - (let ((services (fold (lambda (service result) - (fold (cut vhash-consq <> service <>) - result - (shepherd-service-provision service))) - vlist-null - services))) - (lambda (name) - (match (vhash-assq name services) - ((_ . service) service) - (#f #f))))) + (shepherd-service-lookup-procedure services)) (define edges (fold (lambda (service edges) diff --git a/tests/services.scm b/tests/services.scm index 477a197160..12745c8006 100644 --- a/tests/services.scm +++ b/tests/services.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015 Ludovic Courtès +;;; Copyright © 2015, 2016 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -105,6 +105,15 @@ (fold-services (list s) #:target-type t1) #f))) +(test-assert "shepherd-service-lookup-procedure" + (let* ((s1 (shepherd-service (provision '(s1 s1b)) (start #f))) + (s2 (shepherd-service (provision '(s2 s2b)) (start #f))) + (s3 (shepherd-service (provision '(s3 s3b s3c)) (start #f))) + (lookup (shepherd-service-lookup-procedure (list s1 s2 s3)))) + (and (eq? (lookup 's1) (lookup 's1b) s1) + (eq? (lookup 's2) (lookup 's2b) s2) + (eq? (lookup 's3) (lookup 's3b) s3)))) + (test-assert "shepherd-service-back-edges" (let* ((s1 (shepherd-service (provision '(s1)) (start #f))) (s2 (shepherd-service (provision '(s2)) -- cgit v1.2.3 From f20a7b869668b46a011d22e4c1dcb68f855a1c62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 31 Aug 2016 12:49:45 +0200 Subject: guix system: Use 'shepherd-service-lookup-procedure' in 'service-upgrade'. * guix/scripts/system.scm (service-upgrade)[essential?]: SERVICE is now a . [lookup-target, lookup-live, running?, stopped, obsolete?]: New procedures. [to-load, to-unload]: Use them. TO-UNLOAD is now a list of . (call-with-service-upgrade-info): Extract symbols from TO-UNLOAD. * tests/system.scm ("service-upgrade: one unchanged, one upgraded, one new"): Adjust accordingly. --- guix/scripts/system.scm | 56 +++++++++++++++++++++++++++---------------------- tests/system.scm | 5 +++-- 2 files changed, 34 insertions(+), 27 deletions(-) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index a006b2d54e..80f62fb109 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -273,41 +273,45 @@ on service '~a':~%") #t))) (define (service-upgrade live target) - "Return two values: the names of the subset of LIVE (a list of -) that needs to be unloaded, and the subset of TARGET (a list of -) that needs to be loaded." + "Return two values: the subset of LIVE (a list of ) that needs +to be unloaded, and the subset of TARGET (a list of ) that +needs to be loaded." (define (essential? service) - (memq service '(root shepherd))) + (memq (first (live-service-provision service)) + '(root shepherd))) - (define new-service-names - (map (compose first shepherd-service-provision) - target)) + (define lookup-target + (shepherd-service-lookup-procedure target + shepherd-service-provision)) - (define running - (map (compose first live-service-provision) - (filter live-service-running live))) + (define lookup-live + (shepherd-service-lookup-procedure live + live-service-provision)) - (define stopped - (map (compose first live-service-provision) - (remove live-service-running live))) + (define (running? service) + (and=> (lookup-live (shepherd-service-canonical-name service)) + live-service-running)) + + (define (stopped service) + (match (lookup-live (shepherd-service-canonical-name service)) + (#f #f) + (service (and (not (live-service-running service)) + service)))) + + (define (obsolete? service) + (match (lookup-target (first (live-service-provision service))) + (#f #t) + (_ #f))) (define to-load ;; Only load services that are either new or currently stopped. - (remove (lambda (service) - (memq (first (shepherd-service-provision service)) - running)) - target)) + (remove running? target)) (define to-unload ;; Unload services that are (1) no longer required, or (2) are in TO-LOAD. (remove essential? - (append (remove (lambda (service) - (memq service new-service-names)) - (append running stopped)) - (filter (lambda (service) - (memq service stopped)) - (map shepherd-service-canonical-name - to-load))))) + (append (filter obsolete? live) + (filter-map stopped to-load)))) (values to-unload to-load)) @@ -319,7 +323,9 @@ unload." ((services ...) (let-values (((to-unload to-load) (service-upgrade services new-services))) - (mproc to-load to-unload))) + (mproc to-load + (map (compose first live-service-provision) + to-unload)))) (#f (with-monad %store-monad (warning (_ "failed to obtain list of shepherd services~%")) diff --git a/tests/system.scm b/tests/system.scm index dee6feda2c..eff997062f 100644 --- a/tests/system.scm +++ b/tests/system.scm @@ -129,7 +129,7 @@ list)) (test-equal "service-upgrade: one unchanged, one upgraded, one new" - '((bar) ;unload + '(((bar)) ;unload ((bar) (baz))) ;load (call-with-values (lambda () @@ -146,6 +146,7 @@ (shepherd-service (provision '(baz)) (start #t))))) (lambda (unload load) - (list unload (map shepherd-service-provision load))))) + (list (map live-service-provision unload) + (map shepherd-service-provision load))))) (test-end) -- cgit v1.2.3 From 6673bddc9ae8f8835a8676cfb3ca0f5b9eb29405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 31 Aug 2016 15:16:36 +0200 Subject: services: shepherd: Parameterize 'shepherd-service-back-edges'. * gnu/services/shepherd.scm (shepherd-service-back-edges): Add #:provision and #:requirement parameter. Honor them. --- gnu/services/shepherd.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index 3cfca8574e..426b0e7290 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -268,11 +268,17 @@ procedure that takes a service and returns the list of symbols it provides." ((_ . service) service) (#f #f))))) -(define (shepherd-service-back-edges services) +(define* (shepherd-service-back-edges services + #:key + (provision shepherd-service-provision) + (requirement shepherd-service-requirement)) "Return a procedure that, when given a from SERVICES, -returns the list of that depend on it." +returns the list of that depend on it. + +Use PROVISION and REQUIREMENT as one-argument procedures that return the +symbols provided/required by a service." (define provision->service - (shepherd-service-lookup-procedure services)) + (shepherd-service-lookup-procedure services provision)) (define edges (fold (lambda (service edges) @@ -280,7 +286,7 @@ returns the list of that depend on it." (vhash-consq (provision->service requirement) service edges)) edges - (shepherd-service-requirement service))) + (requirement service))) vlist-null services)) -- cgit v1.2.3 From d4f8884fdb897e648fd7f4262b2142d8c363ac76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 31 Aug 2016 15:23:32 +0200 Subject: guix system: Do not unload services depended on. Reported by Mark H Weaver at . * guix/scripts/system.scm (service-upgrade)[live-service-required?]: New procedure. [obsolete?]: Use it. * tests/system.scm ("service-upgrade: service depended on is not unloaded", "service-upgrade: obsolete services that depend on each other"): New tests. --- guix/scripts/system.scm | 7 ++++++- tests/system.scm | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 80f62fb109..bcf19dbb7e 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -298,9 +298,14 @@ needs to be loaded." (service (and (not (live-service-running service)) service)))) + (define live-service-dependents + (shepherd-service-back-edges live + #:provision live-service-provision + #:requirement live-service-requirement)) + (define (obsolete? service) (match (lookup-target (first (live-service-provision service))) - (#f #t) + (#f (every obsolete? (live-service-dependents service))) (_ #f))) (define to-load diff --git a/tests/system.scm b/tests/system.scm index eff997062f..9c1a13dd9b 100644 --- a/tests/system.scm +++ b/tests/system.scm @@ -149,4 +149,36 @@ (list (map live-service-provision unload) (map shepherd-service-provision load))))) +(test-equal "service-upgrade: service depended on is not unloaded" + '(((baz)) ;unload + ()) ;load + (call-with-values + (lambda () + ;; Service 'bar' is not among the target services; yet, it must not be + ;; unloaded because 'foo' depends on it. + (service-upgrade (list (live-service '(foo) '(bar) #t) + (live-service '(bar) '() #t) ;still used! + (live-service '(baz) '() #t)) + (list (shepherd-service (provision '(foo)) + (start #t))))) + (lambda (unload load) + (list (map live-service-provision unload) + (map shepherd-service-provision load))))) + +(test-equal "service-upgrade: obsolete services that depend on each other" + '(((foo) (bar) (baz)) ;unload + ((qux))) ;load + (call-with-values + (lambda () + ;; 'foo', 'bar', and 'baz' depend on each other, but all of them are + ;; obsolete, and thus should be unloaded. + (service-upgrade (list (live-service '(foo) '(bar) #t) ;obsolete + (live-service '(bar) '(baz) #t) ;obsolete + (live-service '(baz) '() #t)) ;obsolete + (list (shepherd-service (provision '(qux)) + (start #t))))) + (lambda (unload load) + (list (map live-service-provision unload) + (map shepherd-service-provision load))))) + (test-end) -- cgit v1.2.3 From 7b44cae50aed1d6d67337e9eae9f449ccd00a870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 31 Aug 2016 15:40:00 +0200 Subject: services: shepherd: Add 'shepherd-service-upgrade', from 'guix system'. * guix/scripts/system.scm (service-upgrade): Move to... * gnu/services/shepherd.scm (shepherd-service-upgrade): ... here. * tests/system.scm ("service-upgrade: nothing to do", "service-upgrade: one unchanged, one upgraded, one new", "service-upgrade: service depended on is not unloaded", "service-upgrade: obsolete services that depend on each other"): Move to... * tests/services.scm: ... here. Adjust to 'service-upgrade' rename. --- gnu/services/shepherd.scm | 52 ++++++++++++++++++++++++++++++++++- guix/scripts/system.scm | 50 +--------------------------------- tests/services.scm | 68 ++++++++++++++++++++++++++++++++++++++++++++++ tests/system.scm | 69 +---------------------------------------------- 4 files changed, 121 insertions(+), 118 deletions(-) diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index 426b0e7290..3273184b9a 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -25,6 +25,7 @@ #:use-module (guix records) #:use-module (guix derivations) ;imported-modules, etc. #:use-module (gnu services) + #:use-module (gnu services herd) #:use-module (gnu packages admin) #:use-module (ice-9 match) #:use-module (ice-9 vlist) @@ -53,7 +54,8 @@ shepherd-service-file shepherd-service-lookup-procedure - shepherd-service-back-edges)) + shepherd-service-back-edges + shepherd-service-upgrade)) ;;; Commentary: ;;; @@ -293,4 +295,52 @@ symbols provided/required by a service." (lambda (service) (vhash-foldq* cons '() service edges))) +(define (shepherd-service-upgrade live target) + "Return two values: the subset of LIVE (a list of ) that needs +to be unloaded, and the subset of TARGET (a list of ) that +needs to be loaded." + (define (essential? service) + (memq (first (live-service-provision service)) + '(root shepherd))) + + (define lookup-target + (shepherd-service-lookup-procedure target + shepherd-service-provision)) + + (define lookup-live + (shepherd-service-lookup-procedure live + live-service-provision)) + + (define (running? service) + (and=> (lookup-live (shepherd-service-canonical-name service)) + live-service-running)) + + (define (stopped service) + (match (lookup-live (shepherd-service-canonical-name service)) + (#f #f) + (service (and (not (live-service-running service)) + service)))) + + (define live-service-dependents + (shepherd-service-back-edges live + #:provision live-service-provision + #:requirement live-service-requirement)) + + (define (obsolete? service) + (match (lookup-target (first (live-service-provision service))) + (#f (every obsolete? (live-service-dependents service))) + (_ #f))) + + (define to-load + ;; Only load services that are either new or currently stopped. + (remove running? target)) + + (define to-unload + ;; Unload services that are (1) no longer required, or (2) are in TO-LOAD. + (remove essential? + (append (filter obsolete? live) + (filter-map stopped to-load)))) + + (values to-unload to-load)) + ;;; shepherd.scm ends here diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index bcf19dbb7e..953c6243ed 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -272,54 +272,6 @@ on service '~a':~%") ((not error) ;not an error #t))) -(define (service-upgrade live target) - "Return two values: the subset of LIVE (a list of ) that needs -to be unloaded, and the subset of TARGET (a list of ) that -needs to be loaded." - (define (essential? service) - (memq (first (live-service-provision service)) - '(root shepherd))) - - (define lookup-target - (shepherd-service-lookup-procedure target - shepherd-service-provision)) - - (define lookup-live - (shepherd-service-lookup-procedure live - live-service-provision)) - - (define (running? service) - (and=> (lookup-live (shepherd-service-canonical-name service)) - live-service-running)) - - (define (stopped service) - (match (lookup-live (shepherd-service-canonical-name service)) - (#f #f) - (service (and (not (live-service-running service)) - service)))) - - (define live-service-dependents - (shepherd-service-back-edges live - #:provision live-service-provision - #:requirement live-service-requirement)) - - (define (obsolete? service) - (match (lookup-target (first (live-service-provision service))) - (#f (every obsolete? (live-service-dependents service))) - (_ #f))) - - (define to-load - ;; Only load services that are either new or currently stopped. - (remove running? target)) - - (define to-unload - ;; Unload services that are (1) no longer required, or (2) are in TO-LOAD. - (remove essential? - (append (filter obsolete? live) - (filter-map stopped to-load)))) - - (values to-unload to-load)) - (define (call-with-service-upgrade-info new-services mproc) "Call MPROC, a monadic procedure in %STORE-MONAD, passing it the list of names of services to load (upgrade), and the list of names of services to @@ -327,7 +279,7 @@ unload." (match (current-services) ((services ...) (let-values (((to-unload to-load) - (service-upgrade services new-services))) + (shepherd-service-upgrade services new-services))) (mproc to-load (map (compose first live-service-provision) to-unload)))) diff --git a/tests/services.scm b/tests/services.scm index 12745c8006..8993c3dafc 100644 --- a/tests/services.scm +++ b/tests/services.scm @@ -18,12 +18,17 @@ (define-module (test-services) #:use-module (gnu services) + #:use-module (gnu services herd) #:use-module (gnu services shepherd) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-64)) +(define live-service + (@@ (gnu services herd) live-service)) + + (test-begin "services") (test-assert "service-back-edges" @@ -127,4 +132,67 @@ (lset= eq? (e s2) (list s3)) (null? (e s3))))) +(test-equal "shepherd-service-upgrade: nothing to do" + '(() ()) + (call-with-values + (lambda () + (shepherd-service-upgrade '() '())) + list)) + +(test-equal "shepherd-service-upgrade: one unchanged, one upgraded, one new" + '(((bar)) ;unload + ((bar) (baz))) ;load + (call-with-values + (lambda () + ;; Here 'foo' is not upgraded because it is still running, whereas + ;; 'bar' is upgraded because it is not currently running. 'baz' is + ;; loaded because it's a new service. + (shepherd-service-upgrade + (list (live-service '(foo) '() #t) + (live-service '(bar) '() #f) + (live-service '(root) '() #t)) ;essential! + (list (shepherd-service (provision '(foo)) + (start #t)) + (shepherd-service (provision '(bar)) + (start #t)) + (shepherd-service (provision '(baz)) + (start #t))))) + (lambda (unload load) + (list (map live-service-provision unload) + (map shepherd-service-provision load))))) + +(test-equal "shepherd-service-upgrade: service depended on is not unloaded" + '(((baz)) ;unload + ()) ;load + (call-with-values + (lambda () + ;; Service 'bar' is not among the target services; yet, it must not be + ;; unloaded because 'foo' depends on it. + (shepherd-service-upgrade + (list (live-service '(foo) '(bar) #t) + (live-service '(bar) '() #t) ;still used! + (live-service '(baz) '() #t)) + (list (shepherd-service (provision '(foo)) + (start #t))))) + (lambda (unload load) + (list (map live-service-provision unload) + (map shepherd-service-provision load))))) + +(test-equal "shepherd-service-upgrade: obsolete services that depend on each other" + '(((foo) (bar) (baz)) ;unload + ((qux))) ;load + (call-with-values + (lambda () + ;; 'foo', 'bar', and 'baz' depend on each other, but all of them are + ;; obsolete, and thus should be unloaded. + (shepherd-service-upgrade + (list (live-service '(foo) '(bar) #t) ;obsolete + (live-service '(bar) '(baz) #t) ;obsolete + (live-service '(baz) '() #t)) ;obsolete + (list (shepherd-service (provision '(qux)) + (start #t))))) + (lambda (unload load) + (list (map live-service-provision unload) + (map shepherd-service-provision load))))) + (test-end) diff --git a/tests/system.scm b/tests/system.scm index 9c1a13dd9b..ca34409be9 100644 --- a/tests/system.scm +++ b/tests/system.scm @@ -19,8 +19,6 @@ (define-module (test-system) #:use-module (gnu) #:use-module (guix store) - #:use-module (gnu services herd) - #:use-module (gnu services shepherd) #:use-module (srfi srfi-1) #:use-module (srfi srfi-64)) @@ -61,12 +59,7 @@ %base-file-systems)) (users %base-user-accounts))) -(define live-service - (@@ (gnu services herd) live-service)) - -(define service-upgrade - (@@ (guix scripts system) service-upgrade)) - + (test-begin "system") (test-assert "operating-system-store-file-system" @@ -121,64 +114,4 @@ (type "ext4")) %base-file-systems))))) -(test-equal "service-upgrade: nothing to do" - '(() ()) - (call-with-values - (lambda () - (service-upgrade '() '())) - list)) - -(test-equal "service-upgrade: one unchanged, one upgraded, one new" - '(((bar)) ;unload - ((bar) (baz))) ;load - (call-with-values - (lambda () - ;; Here 'foo' is not upgraded because it is still running, whereas - ;; 'bar' is upgraded because it is not currently running. 'baz' is - ;; loaded because it's a new service. - (service-upgrade (list (live-service '(foo) '() #t) - (live-service '(bar) '() #f) - (live-service '(root) '() #t)) ;essential! - (list (shepherd-service (provision '(foo)) - (start #t)) - (shepherd-service (provision '(bar)) - (start #t)) - (shepherd-service (provision '(baz)) - (start #t))))) - (lambda (unload load) - (list (map live-service-provision unload) - (map shepherd-service-provision load))))) - -(test-equal "service-upgrade: service depended on is not unloaded" - '(((baz)) ;unload - ()) ;load - (call-with-values - (lambda () - ;; Service 'bar' is not among the target services; yet, it must not be - ;; unloaded because 'foo' depends on it. - (service-upgrade (list (live-service '(foo) '(bar) #t) - (live-service '(bar) '() #t) ;still used! - (live-service '(baz) '() #t)) - (list (shepherd-service (provision '(foo)) - (start #t))))) - (lambda (unload load) - (list (map live-service-provision unload) - (map shepherd-service-provision load))))) - -(test-equal "service-upgrade: obsolete services that depend on each other" - '(((foo) (bar) (baz)) ;unload - ((qux))) ;load - (call-with-values - (lambda () - ;; 'foo', 'bar', and 'baz' depend on each other, but all of them are - ;; obsolete, and thus should be unloaded. - (service-upgrade (list (live-service '(foo) '(bar) #t) ;obsolete - (live-service '(bar) '(baz) #t) ;obsolete - (live-service '(baz) '() #t)) ;obsolete - (list (shepherd-service (provision '(qux)) - (start #t))))) - (lambda (unload load) - (list (map live-service-provision unload) - (map shepherd-service-provision load))))) - (test-end) -- cgit v1.2.3 From 83ab1a812fc7903abdaabeca2e07bb03f8d25827 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 31 Aug 2016 09:56:00 -0500 Subject: tests: cpan: Fix mock urls. Followup to 7a62263ee5. * tests/cpan.scm (cpan->guix-package): Use "https" in mock urls. --- tests/cpan.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cpan.scm b/tests/cpan.scm index 898081b3e5..80ff044abd 100644 --- a/tests/cpan.scm +++ b/tests/cpan.scm @@ -66,9 +66,9 @@ (lambda () (display (match url - ("http://api.metacpan.org/release/Foo-Bar" + ("https://api.metacpan.org/release/Foo-Bar" test-json) - ("http://api.metacpan.org/module/Test::Script" + ("https://api.metacpan.org/module/Test::Script" "{ \"distribution\" : \"Test-Script\" }") ("http://example.com/Foo-Bar-0.1.tar.gz" test-source) -- cgit v1.2.3 From 46a0622481c398bd9337522e93f6f9082d2b9015 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 31 Aug 2016 12:16:19 -0500 Subject: gnu: bambam: Remove wrap-binary phase. Functionality provided already by python-build-system. * gnu/packages/games.scm (bambam)[arguments]: Remove 'wrap-binary phase. [synopsis]: Capitalize first word. --- gnu/packages/games.scm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 9e44fbc6b2..88330c7293 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2798,8 +2798,7 @@ programmers may also add their own favorite language.") (add-before 'install 'patch-data-dir-location (lambda _ (substitute* "bambam.py" - (("'data'") - "'../share/bambam/data'")) + (("'data'") "'../share/bambam/data'")) #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) @@ -2810,18 +2809,11 @@ programmers may also add their own favorite language.") (copy-file "bambam.py" (string-append bin "/bambam")) (install-file "bambam.6" (string-append share "/man/man6")) (copy-recursively "data" (string-append share "/bambam/data"))) - #t)) - (add-after 'install 'wrap-binary - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/bambam"))) - (wrap-program bin - `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))) #t))))) (inputs `(("python-pygame" ,python-pygame))) (home-page "https://github.com/porridge/bambam") - (synopsis "keyboard mashing and doodling game for babies") + (synopsis "Keyboard mashing and doodling game for babies") (description "Bambam is a simple baby keyboard (and gamepad) masher application that locks the keyboard and mouse and instead displays bright colors, pictures, and sounds.") -- cgit v1.2.3 From a7074f47ad90efc4a0a4b67e64256d3641b59186 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Wed, 31 Aug 2016 20:49:57 +0200 Subject: gnu: wcslib: Correct formatting and grammar. * gnu/packages/astronomy.scm (wcslib): Minor whitespace and grammatical changes. --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index f893525fb5..eaf1598096 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -75,10 +75,10 @@ in FITS files.") (substitute* "makedefs.in" (("/bin/sh") "sh"))))))) (home-page "http://www.atnf.csiro.au/people/mcalabre/WCS") - (synopsis "An implementation of the FITS WCS standard") + (synopsis "Library which implements the FITS WCS standard") (description "The FITS \"World Coordinate System\" (WCS) standard defines keywords and usage that provide for the description of astronomical coordinate -systems in a FITS image header.") +systems in a FITS image header.") (license license:lgpl3+))) (define-public gnuastro -- cgit v1.2.3 From 4493a3c2eff0f9206d04b6375658deb6f84dac5c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 31 Aug 2016 15:37:18 +0100 Subject: gnu: Add xcb-util-xrm. * gnu/packages/xdisorg.scm (xcb-util-xrm): New variable. Signed-off-by: Leo Famulari --- gnu/packages/xdisorg.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index cc83a04679..06ed052cf4 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016 Alex Kost +;;; Copyright © 2016 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -49,6 +50,7 @@ #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages m4) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages python) @@ -1021,3 +1023,42 @@ The taskbar includes transparency and color settings for the font, icons, border, and background. It also supports multihead setups, customized mouse actions, a built-in clock, a battery monitor and a system tray.") (license license:gpl2))) + +(define-public xcb-util-xrm + (package + (name "xcb-util-xrm") + (version "1.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/Airblader/xcb-util-xrm/releases" + "/download/v" version "/xcb-util-xrm-" version ".tar.bz2")) + (sha256 + (base32 + "1h5vxwpd37dqfw9yj1l4zd9c5dj30r3g0szgysr6kd7xrqgaq04l")) + (modules '((guix build utils))) + (snippet + ;; Drop bundled m4. + '(delete-file-recursively "m4")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("m4" ,m4) + ("libx11" ,libx11))) ; for tests + (inputs + `(("libxcb" ,libxcb) + ("xcb-util" ,xcb-util))) + (home-page "https://github.com/Airblader/xcb-util-xrm") + (synopsis "XCB utility functions for the X resource manager") + (description + "The XCB util module provides a number of libraries which sit on +top of libxcb, the core X protocol library, and some of the extension +libraries. These experimental libraries provide convenience functions +and interfaces which make the raw X protocol more usable. Some of the +libraries also provide client-side code which is not strictly part of +the X protocol but which has traditionally been provided by Xlib. + +XCB util-xrm module provides the following libraries: + +- xrm: utility functions for the X resource manager.") + (license license:x11))) -- cgit v1.2.3 From 68c35ba96e41c136da5eabb3b3fa44acbdadc93a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 31 Aug 2016 15:45:06 +0100 Subject: gnu: rofi: Update to 1.2.0. * gnu/packages/xdisorg.scm (rofi): Update to 1.2.0. [inputs]: Drop libx11 and add xcb-util-xrm. Signed-off-by: Leo Famulari --- gnu/packages/xdisorg.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 06ed052cf4..323ff111d4 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -940,7 +940,7 @@ connectivity of the X server running on a particular @code{DISPLAY}.") (define-public rofi (package (name "rofi") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/DaveDavenport/rofi/" @@ -948,17 +948,17 @@ connectivity of the X server running on a particular @code{DISPLAY}.") version "/rofi-" version ".tar.xz")) (sha256 (base32 - "1l8vl0mh7i0b1ycifqpg6392f5i4qxlv003m126skfk6fnlfq8hn")))) + "0xxx0xpxhrhlhi2axq9867zqrhwqavc1qrr833k1xr0pvm5m0aqc")))) (build-system gnu-build-system) (inputs - `(("libx11" ,libx11) - ("pango" ,pango) + `(("pango" ,pango) ("cairo" ,cairo) ("glib" ,glib) ("startup-notification" ,startup-notification) ("libxkbcommon" ,libxkbcommon) ("libxcb" ,libxcb) ("xcb-util" ,xcb-util) + ("xcb-util-xrm" ,xcb-util-xrm) ("xcb-util-wm" ,xcb-util-wm))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 7335ca1d71fb97362170a5ef4bff920e0ce7280a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 31 Aug 2016 16:45:14 -0400 Subject: gnu: icedtea-6: Update to 1.13.12 [security fixes]. Fixes CVE-2016-{3458,3485,3500,3508,3550,3606}. * gnu/packages/java.scm (icedtea-6): Update to 1.13.12. [source]: Remove 'icedtea-remove-overrides' patch. [arguments]: Move ALSA header substitution to 'patch-paths' phase. * gnu/packages/patches/icedtea-remove-overrides.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/java.scm | 24 +- .../patches/icedtea-remove-overrides.patch | 291 --------------------- 3 files changed, 12 insertions(+), 304 deletions(-) delete mode 100644 gnu/packages/patches/icedtea-remove-overrides.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5ec47fc7df..457dc1965d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -576,7 +576,6 @@ dist_patch_DATA = \ %D%/packages/patches/icecat-CVE-2016-2824.patch \ %D%/packages/patches/icecat-CVE-2016-2828.patch \ %D%/packages/patches/icecat-CVE-2016-2831.patch \ - %D%/packages/patches/icedtea-remove-overrides.patch \ %D%/packages/patches/icu4c-CVE-2014-6585.patch \ %D%/packages/patches/icu4c-CVE-2015-1270.patch \ %D%/packages/patches/icu4c-CVE-2015-4760.patch \ diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3e0b034950..7387235c5b 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -337,16 +337,15 @@ build process and its dependencies, whereas Make uses Makefile format.") (define-public icedtea-6 (package (name "icedtea") - (version "1.13.11") + (version "1.13.12") (source (origin (method url-fetch) (uri (string-append "http://icedtea.wildebeest.org/download/source/icedtea6-" version ".tar.xz")) - (patches (search-patches "icedtea-remove-overrides.patch")) (sha256 (base32 - "1grki39a4rf8n74zc0iglcggxxbpniyfh1gk1lb10p63zvvcsvjj")) + "1q5iqm3dzqj8w3dwj6qqhczkkrslrfhmn3110klfwq9kyi2nimj8")) (modules '((guix build utils))) (snippet '(substitute* "Makefile.in" @@ -441,13 +440,7 @@ build process and its dependencies, whereas Make uses Makefile format.") (substitute* '("patches/jtreg-jrunscript.patch" "patches/hotspot/hs23/drop_unlicensed_test.patch") (("#!/bin/sh") (string-append "#!" (which "sh")))) - - ;; fix path to alsa header in patch - (substitute* "patches/openjdk/6799141-split_out_versions.patch" - (("ALSA_INCLUDE=/usr/include/alsa/version.h") - (string-append "ALSA_INCLUDE=" - (assoc-ref %build-inputs "alsa-lib") - "/include/alsa/version.h"))))) + #t)) (add-after 'unpack 'patch-paths (lambda _ ;; buildtree.make generates shell scripts, so we need to replace @@ -475,6 +468,13 @@ build process and its dependencies, whereas Make uses Makefile format.") (("DEF_OBJCOPY *=.*objcopy") (string-append "DEF_OBJCOPY = " (which "objcopy")))) + ;; fix path to alsa header + (substitute* "openjdk.src/jdk/make/common/shared/Sanity.gmk" + (("ALSA_INCLUDE=/usr/include/alsa/version.h") + (string-append "ALSA_INCLUDE=" + (assoc-ref %build-inputs "alsa-lib") + "/include/alsa/version.h"))) + ;; fix hard-coded utility paths (substitute* '("openjdk.src/jdk/make/common/shared/Defs-utils.gmk" "openjdk.src/corba/make/common/shared/Defs-utils.gmk") @@ -764,10 +764,10 @@ build process and its dependencies, whereas Make uses Makefile format.") ("openjdk6-src" ,(origin (method url-fetch) - (uri "https://java.net/downloads/openjdk6/openjdk-6-src-b39-03_may_2016.tar.gz") + (uri "https://java.net/downloads/openjdk6/openjdk-6-src-b40-22_aug_2016.tar.gz") (sha256 (base32 - "1brxbsgwcj4js26y5lk6capc3pvghgjidvv9cavw6z8n7c7aw8af")))) + "01v4q7g9pa6w7m6yxply5yrin08jgv12fck665xnmp09bpxy8sa5")))) ("lcms" ,lcms) ("zlib" ,zlib) ("gtk" ,gtk+-2) diff --git a/gnu/packages/patches/icedtea-remove-overrides.patch b/gnu/packages/patches/icedtea-remove-overrides.patch deleted file mode 100644 index e4d68a9e58..0000000000 --- a/gnu/packages/patches/icedtea-remove-overrides.patch +++ /dev/null @@ -1,291 +0,0 @@ -Upstream patch: -http://icedtea.classpath.org/hg/icedtea6/rev/60be25a84f2d - -Fixes build failure: -http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2954 - -Changes to the files 'NEWS' and 'ChangeLog' are omitted here. - -# HG changeset patch -# User Andrew John Hughes -# Date 1463144538 -3600 -# Node ID 60be25a84f2dd2bce8ff277cc3854cca1b3f7931 -# Parent c23ceebb80a19a33316f1e743eb93bdf79aac220 -PR2954: ecj/override.patch is missing new @Overrides in RMIJRMPServerImpl.java - -2016-05-13 Andrew John Hughes - - PR2954: ecj/override.patch is missing new - @Overrides in RMIJRMPServerImpl.java - * patches/ecj/override.patch: - Add cases in RMIJRMPServerImpl and others - which show up when source/target 5 is - used in the rt-class-files pre-build. - * patches/openjdk/8014205-blank_swing_dialogs_windows.patch: - Remove addition of @Override. - -diff -r c23ceebb80a1 -r 60be25a84f2d patches/ecj/override.patch ---- a/patches/ecj/override.patch Sun May 08 21:28:21 2016 +0100 -+++ b/patches/ecj/override.patch Fri May 13 14:02:18 2016 +0100 -@@ -362,3 +362,240 @@ - public Class run() { - try { - ReflectUtil.checkPackageAccess(className); -+diff -r 545db1dd8c2a src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java -+--- openjdk-ecj/jdk/src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java Wed May 04 23:23:55 2016 +0100 -++++ openjdk-ecj/jdk/src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java Thu May 12 01:30:54 2016 +0100 -+@@ -1870,7 +1870,6 @@ -+ -+ private ModifiableClassLoaderRepository getInstantiatorCLR() { -+ return AccessController.doPrivileged(new PrivilegedAction() { -+- @Override -+ public ModifiableClassLoaderRepository run() { -+ return instantiator != null ? instantiator.getClassLoaderRepository() : null; -+ } -+diff -r 545db1dd8c2a src/share/classes/com/sun/media/sound/Platform.java -+--- openjdk-ecj/jdk/src/share/classes/com/sun/media/sound/Platform.java Wed May 04 23:23:55 2016 +0100 -++++ openjdk-ecj/jdk/src/share/classes/com/sun/media/sound/Platform.java Thu May 12 01:30:54 2016 +0100 -+@@ -160,7 +160,6 @@ -+ try { -+ // load the main library -+ AccessController.doPrivileged(new PrivilegedAction() { -+- @Override -+ public Void run() { -+ System.loadLibrary(libNameMain); -+ return null; -+@@ -182,7 +181,6 @@ -+ final String lib = st.nextToken(); -+ try { -+ AccessController.doPrivileged(new PrivilegedAction() { -+- @Override -+ public Void run() { -+ System.loadLibrary(lib); -+ return null; -+diff -r 545db1dd8c2a src/share/classes/java/awt/EventQueue.java -+--- openjdk-ecj/jdk/src/share/classes/java/awt/EventQueue.java Wed May 04 23:23:55 2016 +0100 -++++ openjdk-ecj/jdk/src/share/classes/java/awt/EventQueue.java Thu May 12 01:30:54 2016 +0100 -+@@ -190,7 +190,6 @@ -+ EventQueue.invokeAndWait(source, r); -+ } -+ -+- @Override -+ public long getMostRecentEventTime(EventQueue eventQueue) { -+ return eventQueue.getMostRecentEventTimeImpl(); -+ } -+diff -r 545db1dd8c2a src/share/classes/java/io/ObjectInputStream.java -+--- openjdk-ecj/jdk/src/share/classes/java/io/ObjectInputStream.java Wed May 04 23:23:55 2016 +0100 -++++ openjdk-ecj/jdk/src/share/classes/java/io/ObjectInputStream.java Thu May 12 01:30:54 2016 +0100 -+@@ -3571,7 +3571,6 @@ -+ } -+ static { -+ SharedSecrets.setJavaObjectInputStreamAccess(new JavaObjectInputStreamAccess() { -+- @Override -+ public void setValidator(ObjectInputStream ois, ObjectStreamClassValidator validator) { -+ ObjectInputStream.setValidator(ois, validator); -+ } -+diff -r 545db1dd8c2a src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java -+--- openjdk-ecj/jdk/src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java Wed May 04 23:23:55 2016 +0100 -++++ openjdk-ecj/jdk/src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java Thu May 12 01:30:54 2016 +0100 -+@@ -64,7 +64,6 @@ -+ final String propName = "sun.rmi.server.invocationhandler.allowFinalizeInvocation"; -+ String allowProp = java.security.AccessController.doPrivileged( -+ new PrivilegedAction() { -+- @Override -+ public String run() { -+ return System.getProperty(propName); -+ } -+diff -r 545db1dd8c2a src/share/classes/sun/awt/image/SunVolatileImage.java -+--- openjdk-ecj/jdk/src/share/classes/sun/awt/image/SunVolatileImage.java Wed May 04 23:23:55 2016 +0100 -++++ openjdk-ecj/jdk/src/share/classes/sun/awt/image/SunVolatileImage.java Thu May 12 01:30:54 2016 +0100 -+@@ -262,7 +262,6 @@ -+ * -+ * @see sun.java2d.DestSurfaceProvider#getDestSurface -+ */ -+- @Override -+ public Surface getDestSurface() { -+ return volSurfaceManager.getPrimarySurfaceData(); -+ } -+diff -r 545db1dd8c2a src/share/classes/sun/java2d/SunGraphics2D.java -+--- openjdk-ecj/jdk/src/share/classes/sun/java2d/SunGraphics2D.java Wed May 04 23:23:55 2016 +0100 -++++ openjdk-ecj/jdk/src/share/classes/sun/java2d/SunGraphics2D.java Thu May 12 01:30:54 2016 +0100 -+@@ -3294,7 +3294,6 @@ -+ * -+ * @see sun.java2d.DestSurfaceProvider#getDestSurface -+ */ -+- @Override -+ public Surface getDestSurface() { -+ return surfaceData; -+ } -+diff -r 545db1dd8c2a src/share/classes/sun/rmi/server/UnicastServerRef.java -+--- openjdk-ecj/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java Wed May 04 23:23:55 2016 +0100 -++++ openjdk-ecj/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java Thu May 12 01:30:54 2016 +0100 -+@@ -630,12 +630,10 @@ -+ this.callID = callID; -+ } -+ -+- @Override -+ public void validateDescriptor(ObjectStreamClass descriptor) { -+ descriptorCheck.check(method, descriptor, parameterIndex, callID); -+ } -+ -+- @Override -+ public void checkProxyInterfaceNames(String[] ifaces) { -+ descriptorCheck.checkProxyClass(method, ifaces, parameterIndex, callID); -+ } -+diff -r 545db1dd8c2a src/share/classes/sun/rmi/transport/Transport.java -+--- openjdk-ecj/jdk/src/share/classes/sun/rmi/transport/Transport.java Wed May 04 23:23:55 2016 +0100 -++++ openjdk-ecj/jdk/src/share/classes/sun/rmi/transport/Transport.java Thu May 12 01:30:54 2016 +0100 -+@@ -133,7 +133,6 @@ -+ */ -+ private static void setContextClassLoader(final ClassLoader ccl) { -+ AccessController.doPrivileged(new PrivilegedAction () { -+- @Override -+ public Void run() { -+ Thread.currentThread().setContextClassLoader(ccl); -+ return null; -+diff -r 545db1dd8c2a src/share/classes/sun/rmi/transport/tcp/TCPTransport.java -+--- openjdk-ecj/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java Wed May 04 23:23:55 2016 +0100 -++++ openjdk-ecj/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java Thu May 12 01:30:54 2016 +0100 -+@@ -676,7 +676,6 @@ -+ connectionCount.incrementAndGet() + -+ ")-" + remoteHost); -+ AccessController.doPrivileged(new PrivilegedAction() { -+- @Override -+ public Void run() { -+ run0(); -+ return null; -+diff -r 545db1dd8c2a src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java -+--- openjdk-ecj/jdk/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java Wed May 04 23:23:55 2016 +0100 -++++ openjdk-ecj/jdk/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java Thu May 12 01:30:54 2016 +0100 -+@@ -92,7 +92,6 @@ -+ return this; -+ } -+ -+- @Override -+ public SurfaceData createManagedSurface(int w, int h, int transparency) { -+ return GLXSurfaceData.createData(this, w, h, -+ getColorModel(transparency), -+@@ -165,12 +164,10 @@ -+ * Returns true if the provided capability bit is present for this config. -+ * See OGLContext.java for a list of supported capabilities. -+ */ -+- @Override -+ public final boolean isCapPresent(int cap) { -+ return ((oglCaps.getCaps() & cap) != 0); -+ } -+ -+- @Override -+ public final long getNativeConfigInfo() { -+ return pConfigInfo; -+ } -+@@ -180,7 +177,6 @@ -+ * -+ * @see sun.java2d.pipe.hw.BufferedContextProvider#getContext -+ */ -+- @Override -+ public final OGLContext getContext() { -+ return context; -+ } -+@@ -394,7 +390,6 @@ -+ * -+ * @see sun.java2d.pipe.hw.AccelGraphicsConfig#createCompatibleVolatileImage -+ */ -+- @Override -+ public VolatileImage -+ createCompatibleVolatileImage(int width, int height, -+ int transparency, int type) -+@@ -434,17 +429,14 @@ -+ * -+ * @see sun.java2d.pipe.hw.AccelGraphicsConfig#getContextCapabilities -+ */ -+- @Override -+ public ContextCapabilities getContextCapabilities() { -+ return oglCaps; -+ } -+ -+- @Override -+ public void addDeviceEventListener(AccelDeviceEventListener l) { -+ AccelDeviceEventNotifier.addListener(l, screen.getScreen()); -+ } -+ -+- @Override -+ public void removeDeviceEventListener(AccelDeviceEventListener l) { -+ AccelDeviceEventNotifier.removeListener(l); -+ } -+diff -r 545db1dd8c2a src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java -+--- openjdk-ecj/jdk/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java Wed May 04 23:23:55 2016 +0100 -++++ openjdk-ecj/jdk/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java Thu May 12 01:51:42 2016 +0100 -+@@ -236,7 +236,6 @@ -+ final MBeanInstantiator fInstantiator = instantiator; -+ this.secureClr = new -+ SecureClassLoaderRepository(AccessController.doPrivileged(new PrivilegedAction() { -+- @Override -+ public ClassLoaderRepository run() { -+ return fInstantiator.getClassLoaderRepository(); -+ } -+@@ -1257,7 +1256,6 @@ -+ ClassLoader myLoader = outerShell.getClass().getClassLoader(); -+ final ModifiableClassLoaderRepository loaders = AccessController.doPrivileged(new PrivilegedAction() { -+ -+- @Override -+ public ModifiableClassLoaderRepository run() { -+ return instantiator.getClassLoaderRepository(); -+ } -+diff -r b72e7b89dda9 src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java -+--- openjdk-ecj/jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java Thu Sep 08 11:00:33 2011 -0700 -++++ openjdk-ecj/jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java Thu May 12 16:39:37 2016 +0100 -+@@ -227,17 +227,14 @@ -+ allowedTypes = credentialsTypes; -+ } -+ -+- @Override -+ public String getVersion() throws RemoteException { -+ return impl.getVersion(); -+ } -+ -+- @Override -+ public RMIConnection newClient(Object credentials) throws IOException { -+ return impl.newClient(credentials); -+ } -+ -+- @Override -+ public void check(Method method, ObjectStreamClass descriptor, -+ int paramIndex, int callID) { -+ -+@@ -247,7 +244,6 @@ -+ } -+ } -+ -+- @Override -+ public void checkProxyClass(Method method, String[] ifaces, -+ int paramIndex, int callID) { -+ if (ifaces != null && ifaces.length > 0) { -+@@ -259,7 +255,6 @@ -+ } -+ } -+ -+- @Override -+ public void end(int callID) { -+ /* Do nothing */ -+ } -diff -r c23ceebb80a1 -r 60be25a84f2d patches/openjdk/8014205-blank_swing_dialogs_windows.patch ---- a/patches/openjdk/8014205-blank_swing_dialogs_windows.patch Sun May 08 21:28:21 2016 +0100 -+++ b/patches/openjdk/8014205-blank_swing_dialogs_windows.patch Fri May 13 14:02:18 2016 +0100 -@@ -116,7 +116,7 @@ - { - if (numBands == 3 && !ccm.hasAlpha()) { - imageType = TYPE_3BYTE_BGR; --@@ -804,6 +801,27 @@ -+@@ -804,6 +801,26 @@ - } // else if ((raster instanceof ByteComponentRaster) && - } - -@@ -129,7 +129,6 @@ - + new PrivilegedAction() - + { - + --+ @Override - + public Boolean run() { - + final ClassLoader std = System.class.getClassLoader(); - + - -- cgit v1.2.3 From 307347fe1b31c961c9a0d7952b2bbc2ca967d3c2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 1 Sep 2016 04:27:08 -0400 Subject: gnu: Fix typo in copyright notice in (gnu packages networking). * gnu/packages/networking.scm: "Coypright" --> "Copyright". --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index bdccccec6f..07f0b9d957 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016 Nicolas Goaziou ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016 ng0 -;;; Coypright © 2016 Arun Isaac +;;; Copyright © 2016 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From 7060b28171d217b8091b87b92ee55c15f887e890 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 1 Sep 2016 13:40:49 +0300 Subject: tests: hackage: Fix mock urls. Followup to 18f747350437136b203ef6400176d1fb07b131ea. * tests/hackage.scm (hackage->guix-package): Use 'https' in mock urls. --- tests/hackage.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/hackage.scm b/tests/hackage.scm index d1ebe37405..a4de8be91e 100644 --- a/tests/hackage.scm +++ b/tests/hackage.scm @@ -110,7 +110,7 @@ library ('origin ('method 'url-fetch) ('uri ('string-append - "http://hackage.haskell.org/package/foo/foo-" + "https://hackage.haskell.org/package/foo/foo-" 'version ".tar.gz")) ('sha256 -- cgit v1.2.3 From 5fd66a37d58aa13091134d5e6e5f8c62f404ebfe Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 31 Aug 2016 14:07:15 +0100 Subject: gnu: slim: Move to display-managers.scm. * gnu/packages/display-managers.scm: New file. * gnu/packages/slim.scm: Delete file. * gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly. * gnu/services/xorg.scm: Likewise. --- gnu/local.mk | 2 +- gnu/packages/display-managers.scm | 95 +++++++++++++++++++++++++++++++++++++++ gnu/packages/slim.scm | 95 --------------------------------------- gnu/services/xorg.scm | 2 +- 4 files changed, 97 insertions(+), 97 deletions(-) create mode 100644 gnu/packages/display-managers.scm delete mode 100644 gnu/packages/slim.scm diff --git a/gnu/local.mk b/gnu/local.mk index 457dc1965d..5b90dfbfdd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -96,6 +96,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/dictionaries.scm \ %D%/packages/dillo.scm \ %D%/packages/disk.scm \ + %D%/packages/display-managers.scm \ %D%/packages/djvu.scm \ %D%/packages/dns.scm \ %D%/packages/docbook.scm \ @@ -320,7 +321,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/skarnet.scm \ %D%/packages/skribilo.scm \ %D%/packages/slang.scm \ - %D%/packages/slim.scm \ %D%/packages/smalltalk.scm \ %D%/packages/speech.scm \ %D%/packages/spice.scm \ diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm new file mode 100644 index 0000000000..579b149a0c --- /dev/null +++ b/gnu/packages/display-managers.scm @@ -0,0 +1,95 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Joshua Grant +;;; Copyright © 2014 Ludovic Courtès +;;; Copyright © 2014 Andreas Enge +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages display-managers) + #:use-module ((guix licenses) #:prefix l:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system cmake) + #:use-module (guix packages) + #:use-module (gnu packages) + #:use-module (gnu packages gl) + #:use-module (gnu packages xorg) + #:use-module (gnu packages image) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages linux)) + +(define-public slim + (package + (name "slim") + (version "1.3.6") + (source (origin + (method url-fetch) + ;; Used to be available from download.berlios.de. + (uri (string-append + "mirror://sourceforge/slim.berlios/slim-" + version ".tar.gz")) + (sha256 + (base32 "1pqhk22jb4aja4hkrm7rjgbgzjyh7i4zswdgf5nw862l2znzxpi1")) + (patches (search-patches "slim-config.patch" + "slim-session.patch" + "slim-sigusr1.patch")))) + (build-system cmake-build-system) + (inputs `(("linux-pam" ,linux-pam) + ("libpng" ,libpng) + ("libjpeg" ,libjpeg) + ("freeglut" ,freeglut) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("freetype" ,freetype) + ("fontconfig" ,fontconfig) + ("libx11" ,libx11) + ("libxft" ,libxft) + ("libxmu" ,libxmu) + ("xauth" ,xauth))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (arguments + '(#:phases (alist-cons-before + 'configure 'set-new-etc-location + (lambda _ + (substitute* "CMakeLists.txt" + (("/etc") + (string-append (assoc-ref %outputs "out") "/etc")) + (("install.*systemd.*") + ;; The build system's logic here is: if "Linux", then + ;; "systemd". Strip that. + ""))) + %standard-phases) + #:configure-flags '("-DUSE_PAM=yes" + "-DUSE_CONSOLEKIT=no") + #:tests? #f)) + + ;; This used to be at . + (home-page "http://sourceforge.net/projects/slim.berlios/") + (synopsis "Desktop-independent graphical login manager for X11") + (description + "SLiM is a Desktop-independent graphical login manager for X11, derived +from Login.app. It aims to be light and simple, although completely +configurable through themes and an option file; is suitable for machines on +which remote login functionalities are not needed. + +Features included: PNG and XFT support for alpha transparency and antialiased +fonts, External themes support, Configurable runtime options: X server -- +login / shutdown / reboot commands, Single (GDM-like) or double (XDM-like) +input control, Can load predefined user at startup, Configurable welcome / +shutdown messages, Random theme selection.") + (license l:gpl2))) diff --git a/gnu/packages/slim.scm b/gnu/packages/slim.scm deleted file mode 100644 index 2328a1aacf..0000000000 --- a/gnu/packages/slim.scm +++ /dev/null @@ -1,95 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Joshua Grant -;;; Copyright © 2014 Ludovic Courtès -;;; Copyright © 2014 Andreas Enge -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages slim) - #:use-module ((guix licenses) #:prefix l:) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system cmake) - #:use-module (guix packages) - #:use-module (gnu packages) - #:use-module (gnu packages gl) - #:use-module (gnu packages xorg) - #:use-module (gnu packages image) - #:use-module (gnu packages fontutils) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages linux)) - -(define-public slim - (package - (name "slim") - (version "1.3.6") - (source (origin - (method url-fetch) - ;; Used to be available from download.berlios.de. - (uri (string-append - "mirror://sourceforge/slim.berlios/slim-" - version ".tar.gz")) - (sha256 - (base32 "1pqhk22jb4aja4hkrm7rjgbgzjyh7i4zswdgf5nw862l2znzxpi1")) - (patches (search-patches "slim-config.patch" - "slim-session.patch" - "slim-sigusr1.patch")))) - (build-system cmake-build-system) - (inputs `(("linux-pam" ,linux-pam) - ("libpng" ,libpng) - ("libjpeg" ,libjpeg) - ("freeglut" ,freeglut) - ("libxrandr" ,libxrandr) - ("libxrender" ,libxrender) - ("freetype" ,freetype) - ("fontconfig" ,fontconfig) - ("libx11" ,libx11) - ("libxft" ,libxft) - ("libxmu" ,libxmu) - ("xauth" ,xauth))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (arguments - '(#:phases (alist-cons-before - 'configure 'set-new-etc-location - (lambda _ - (substitute* "CMakeLists.txt" - (("/etc") - (string-append (assoc-ref %outputs "out") "/etc")) - (("install.*systemd.*") - ;; The build system's logic here is: if "Linux", then - ;; "systemd". Strip that. - ""))) - %standard-phases) - #:configure-flags '("-DUSE_PAM=yes" - "-DUSE_CONSOLEKIT=no") - #:tests? #f)) - - ;; This used to be at . - (home-page "http://sourceforge.net/projects/slim.berlios/") - (synopsis "Desktop-independent graphical login manager for X11") - (description - "SLiM is a Desktop-independent graphical login manager for X11, derived -from Login.app. It aims to be light and simple, although completely -configurable through themes and an option file; is suitable for machines on -which remote login functionalities are not needed. - -Features included: PNG and XFT support for alpha transparency and antialiased -fonts, External themes support, Configurable runtime options: X server -- -login / shutdown / reboot commands, Single (GDM-like) or double (XDM-like) -input control, Can load predefined user at startup, Configurable welcome / -shutdown messages, Random theme selection.") - (license l:gpl2))) diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 905c88ff66..4e311deb84 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -26,7 +26,7 @@ #:use-module (gnu packages guile) #:use-module (gnu packages xorg) #:use-module (gnu packages gl) - #:use-module (gnu packages slim) + #:use-module (gnu packages display-managers) #:use-module (gnu packages gnustep) #:use-module (gnu packages admin) #:use-module (gnu packages bash) -- cgit v1.2.3 From 38c2b503545c7f214ff7670bd9f62bdebb59186d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Sep 2016 14:00:39 +0200 Subject: Reinstate "services: elogind: Provide '%elogind-file-systems' by extension." This reverts commit 17073dafc59d62fb8cbb8b94d61d3ecc488ac59f. --- gnu/services/desktop.scm | 8 +++++++- gnu/system/file-systems.scm | 1 - 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index bf21707bfe..df93bc8e10 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -27,6 +27,8 @@ #:use-module (gnu services avahi) #:use-module (gnu services xorg) #:use-module (gnu services networking) + #:use-module ((gnu system file-systems) + #:select (%elogind-file-systems)) #:use-module (gnu system shadow) #:use-module (gnu system pam) #:use-module (gnu packages glib) @@ -760,7 +762,11 @@ seats.)" ;; Extend PAM with pam_elogind.so. (service-extension pam-root-service-type - pam-extension-procedure))))) + pam-extension-procedure) + + ;; We need /run/user, /run/systemd, etc. + (service-extension file-system-service-type + (const %elogind-file-systems)))))) (define* (elogind-service #:key (config (elogind-configuration))) "Return a service that runs the @command{elogind} login and seat management diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index 116e2813e8..0dc472e3c7 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -257,7 +257,6 @@ TARGET in the other system." (append (list %pseudo-terminal-file-system %shared-memory-file-system %immutable-store) - %elogind-file-systems %control-groups)) ;; File systems for Linux containers differ from %base-file-systems in that -- cgit v1.2.3 From e5cd149f681cc8d285da6c7638b70a43b333f337 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Wed, 31 Aug 2016 09:10:21 +0200 Subject: Update 'TODO'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * TODO: Remove items about guix challenge & guix publish. Signed-off-by: Vincent Legoll Signed-off-by: Ludovic Courtès --- TODO | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/TODO b/TODO index b7c8ca4313..3a8a77b145 100644 --- a/TODO +++ b/TODO @@ -9,13 +9,6 @@ Copyright © 2012, 2013, 2014 Ludovic Courtès are permitted in any medium without royalty provided the copyright notice and this notice are preserved. -* Add `guix publish' to publish the store using Guile's web server - -Generate narinfos and nars on the fly, upon HTTP GET requests. -Ideally, extend .nix-cache-info to include the server's public key, and also -reply to requests for .narinfo.sig. -Optionally, use Guile-Avahi to publish the service. - * MAYBE Add a substituter that uses the GNUnet DHT or [[http://libswift.org][libswift]] Would be neat if binaries could be pushed to and pulled from the GNUnet DHT or @@ -74,11 +67,6 @@ per-package priorities, etc. Tests that need to download stuff or otherwise take a long time would only be run when that is defined. -* add "guix challenge" - -Would download a substitute, and compare its contents against a (hopefully -locally-built) copy. - * guix build utils ** MAYBE Change ‘ld-wrapper’ to add RPATH for libs passed by file name -- cgit v1.2.3 From d62ed73239bf31006ac9a7bcc0887db8696e4f1f Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 29 Aug 2016 16:45:34 +0200 Subject: gnu: Add dtc. * gnu/packages/u-boot.scm (dtc): New variable. * gnu/local.mk (GNU_SYSTEM_MODULES): Add file. Co-authored-by: David Craven --- gnu/local.mk | 1 + gnu/packages/u-boot.scm | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 gnu/packages/u-boot.scm diff --git a/gnu/local.mk b/gnu/local.mk index 5b90dfbfdd..8179920163 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -348,6 +348,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/unrtf.scm \ %D%/packages/upnp.scm \ %D%/packages/uucp.scm \ + %D%/packages/u-boot.scm \ %D%/packages/valgrind.scm \ %D%/packages/version-control.scm \ %D%/packages/video.scm \ diff --git a/gnu/packages/u-boot.scm b/gnu/packages/u-boot.scm new file mode 100644 index 0000000000..83e42f08c3 --- /dev/null +++ b/gnu/packages/u-boot.scm @@ -0,0 +1,60 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016 Danny Milosavljevic +;;; Copyright © 2016 David Craven +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages u-boot) + #:use-module (guix build-system gnu) + #:use-module (guix download) + #:use-module (guix packages) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages bison) + #:use-module (gnu packages flex)) + +(define-public dtc + (package + (name "dtc") + (version "1.4.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://www.kernel.org/pub/software/utils/dtc/" + "dtc-" version ".tar.xz")) + (sha256 + (base32 + "155v52palf5fwfcnq696s41whjk0a5dqx98b7maqzdn7xbc2m6bp")))) + (build-system gnu-build-system) + (native-inputs + `(("bison" ,bison) + ("flex" ,flex))) + (arguments + `(#:make-flags + (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda _ + (substitute* "Makefile" + (("/usr/bin/install") "install")) + (substitute* "Makefile" + (("PREFIX = \\$\\(HOME\\)") "")))) + (delete 'configure)))) + (home-page "https://www.devicetree.org") + (synopsis "Compiles device tree source files") + (description "@command{dtc} compiles device tree source files to device +tree binary files. These are board description files used by Linux and BSD.") + (license license:gpl2+))) -- cgit v1.2.3 From 71d4676069f13155594ef13f5ccc4583a4cf77c2 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 29 Aug 2016 18:11:04 +0200 Subject: gnu: Add u-boot. * gnu/packages/u-boot.scm (u-boot, make-u-boot-package, u-boot-vexpress_ca9x4, u-boot-malta): New variables. Co-authored-by: David Craven --- gnu/packages/u-boot.scm | 79 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/gnu/packages/u-boot.scm b/gnu/packages/u-boot.scm index 83e42f08c3..77e7447bf0 100644 --- a/gnu/packages/u-boot.scm +++ b/gnu/packages/u-boot.scm @@ -22,8 +22,12 @@ #:use-module (guix download) #:use-module (guix packages) #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages) + #:use-module ((gnu packages algebra) #:select (bc)) #:use-module (gnu packages bison) - #:use-module (gnu packages flex)) + #:use-module (gnu packages cross-base) + #:use-module (gnu packages flex) + #:use-module (gnu packages python)) (define-public dtc (package @@ -58,3 +62,76 @@ (description "@command{dtc} compiles device tree source files to device tree binary files. These are board description files used by Linux and BSD.") (license license:gpl2+))) + +(define u-boot + (package + (name "u-boot") + (version "2016.07") + (source (origin + (method url-fetch) + (uri (string-append + "ftp://ftp.denx.de/pub/u-boot/" + "u-boot-" version ".tar.bz2")) + (sha256 + (base32 + "0lqj4ckmfqiap8mc6z2d5albs3g2h5mzccbn60hsgxhabhibfkwp")))) + (native-inputs + `(("bc" ,bc) + ("dtc" ,dtc) + ("python-2" ,python-2))) + (build-system gnu-build-system) + (home-page "http://www.denx.de/wiki/U-Boot/") + (synopsis "ARM bootloader") + (description "U-Boot is a bootloader used mostly for ARM boards. It +also initializes the boards (RAM etc).") + (license license:gpl2+))) + +(define (make-u-boot-package board triplet) + "Returns a u-boot package for BOARD cross-compiled for TRIPLET." + (package + (inherit u-boot) + (name (string-append "u-boot-" (string-downcase board))) + (native-inputs + `(("cross-gcc" ,(cross-gcc triplet)) + ("cross-binutils" ,(cross-binutils triplet)) + ,@(package-native-inputs u-boot))) + (arguments + `(#:test-target "test" + #:make-flags + (list "HOSTCC=gcc" (string-append "CROSS_COMPILE=" ,triplet "-")) + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs make-flags #:allow-other-keys) + (let ((config-name (string-append ,board "_defconfig"))) + (if (file-exists? (string-append "configs/" config-name)) + (zero? (apply system* "make" `(,@make-flags ,config-name))) + (begin + (display "Invalid board name. Valid board names are:") + (let ((dir (opendir "configs")) + (suffix-length (string-length "_defconfig"))) + (do ((file-name (readdir dir) (readdir dir))) + ((eof-object? file-name)) + (when (string-suffix? "_defconfig" file-name) + (format #t "- ~A\n" + (string-drop-right file-name suffix-length)))) + (closedir dir)) + #f))))) + (replace 'install + (lambda* (#:key outputs make-flags #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (libexec (string-append out "/libexec")) + (uboot-files (find-files "." ".*\\.(bin|efi|spl)$"))) + (mkdir-p libexec) + (for-each + (lambda (file) + (let ((target-file (string-append libexec "/" file))) + (mkdir-p (dirname target-file)) + (copy-file file target-file))) + uboot-files))))))))) + +(define-public u-boot-vexpress_ca9x4 + (make-u-boot-package "vexpress_ca9x4" "arm-linux-gnueabihf")) + +(define-public u-boot-malta + (make-u-boot-package "malta" "mips64el-linux-gnuabi64")) -- cgit v1.2.3 From 261b3da532300475f2e1af997db8e327c93def7f Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 30 Aug 2016 17:40:17 -0400 Subject: gnu: Add telepathy-mission-control. * gnu/packages/freedesktop.scm (telepathy-mission-control): New variable. --- gnu/packages/freedesktop.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index ac98769bd1..2032dce66a 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -647,6 +647,37 @@ package enables usage of IRC channels and private messages in Telepathy instant messaging clients such as Empathy, GNOME Shell or KDE Telepathy.") (license (list license:lgpl2.1 license:lgpl2.1+)))) +(define-public telepathy-mission-control + (package + (name "telepathy-mission-control") + (version "5.16.3") + (source (origin + (method url-fetch) + (uri (string-append "https://telepathy.freedesktop.org/releases/" + name "/" name "-" version ".tar.bz2")) + (sha256 + (base32 + "0zcbx69k0d3p2pjh3g7sa3q2zkd5xchxkqsmlfn3fwxaz0pmsmvi")))) + (build-system gnu-build-system) + (native-inputs + `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. + ("pkg-config" ,pkg-config))) + (inputs + `(("dconf" ,dconf) + ("gtk-doc" ,gtk-doc) + ("libgnome-keyring" ,libgnome-keyring) + ("python" ,python-2) + ("xsltproc" ,libxslt))) + (propagated-inputs + `(("telepathy-glib" ,telepathy-glib))) + (home-page "https://telepathy.freedesktop.org/wiki/Components/Mission_Control/") + (synopsis "Telepathy real-time communication framework management daemon") + (description + "Telepathy Mission Control 5 is an account manager and channel dispatcher +for the Telepathy framework, allowing user interfaces and other clients to +share connections to real-time communication services without conflicting.") + (license license:lgpl2.1))) + (define-public colord-gtk (package (name "colord-gtk") -- cgit v1.2.3 From 7e348e6c0d6ca8a2d04434e6e6925777fa317b61 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Thu, 1 Sep 2016 11:30:52 +0200 Subject: gnu: Add rpcbind * gnu/packages/onc-rpc.scm (rpcbind): New variable. --- gnu/packages/onc-rpc.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm index a819d9e04a..549b82307b 100644 --- a/gnu/packages/onc-rpc.scm +++ b/gnu/packages/onc-rpc.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Ludovic Courtès +;;; Copyright © 2016 John Darrington ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (gnu packages mit-krb5) + #:use-module (gnu packages pkg-config) #:use-module (guix build-system gnu)) (define-public libtirpc @@ -52,3 +54,32 @@ procedure calls) protocol in a transport-independent manner. It supports both IPv4 and IPv6. ONC RPC is notably used by the network file system (NFS).") (license bsd-3))) + +(define-public rpcbind + (package + (name "rpcbind") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/" name "/" name "/" + version "/" + name "-" version ".tar.bz2")) + (sha256 + (base32 + "0yyjzv4161rqxrgjcijkrawnk55rb96ha0pav48s03l2klx855wq")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + `("--with-systemdsystemunitdir=no"))) + (inputs + `(("libtirpc" ,libtirpc))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://rpcbind.sourceforge.net/") + (synopsis "Server to convert RPC program numbers into universal addresses") + (description + "@command{Rpcbind} is a server that converts RPC program numbers into +universal addresses.") + (license bsd-3))) + -- cgit v1.2.3 From 705b97147735dd8cb1d3bf74e0f1a91b50cc7f41 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Thu, 1 Sep 2016 11:34:04 +0200 Subject: gnu: Fix typo in description of xfce-desktop-service. * gnu/services/desktop.scm (xfce-desktop-service) abilit --> ability. --- gnu/services/desktop.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index df93bc8e10..8dacf54668 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -829,7 +829,7 @@ and extends polkit with the actions from @code{gnome-settings-daemon}." (define* (xfce-desktop-service #:key (config (xfce-desktop-configuration))) "Return a service that adds the @code{xfce} package to the system profile, -and extends polkit with the abilit for @code{thunar} to manipulate the file +and extends polkit with the ability for @code{thunar} to manipulate the file system as root from within a user session, after the user has authenticated with the administrator's password." (service xfce-desktop-service-type config)) -- cgit v1.2.3 From 2a75b0b63dbf123023c1c7ae99cf01a3866612a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Sep 2016 22:35:35 +0200 Subject: packages: Add 'package-input-rewriting'. * guix/packages.scm (package-input-rewriting): New procedure. * tests/packages.scm ("package-input-rewriting"): New test. * doc/guix.texi (Defining Packages): Document it. (Package Transformation Options): Add cross-reference. --- doc/guix.texi | 42 +++++++++++++++++++++++++++++++++++++++++- guix/packages.scm | 30 ++++++++++++++++++++++++++++++ tests/packages.scm | 25 +++++++++++++++++++++++++ 3 files changed, 96 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 5448c66664..2a7fd4d041 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -2574,6 +2574,45 @@ and operating system, such as @code{"mips64el-linux-gnu"} Configure and Build System}). @end deffn +@cindex package transformations +@cindex input rewriting +@cindex dependency tree rewriting +Packages can be manipulated in arbitrary ways. An example of a useful +transformation is @dfn{input rewriting}, whereby the dependency tree of +a package is rewritten by replacing specific inputs by others: + +@deffn {Scheme Procedure} package-input-rewriting @var{replacements} @ + [@var{rewrite-name}] +Return a procedure that, when passed a package, replaces its direct and +indirect dependencies (but not its implicit inputs) according to +@var{replacements}. @var{replacements} is a list of package pairs; the +first element of each pair is the package to replace, and the second one +is the replacement. + +Optionally, @var{rewrite-name} is a one-argument procedure that takes +the name of a package and returns its new name after rewrite. +@end deffn + +@noindent +Consider this example: + +@example +(define libressl-instead-of-openssl + ;; This is a procedure to replace OPENSSL by LIBRESSL, + ;; recursively. + (package-input-rewriting `((,openssl . ,libressl)))) + +(define git-with-libressl + (libressl-instead-of-openssl git)) +@end example + +@noindent +Here we first define a rewriting procedure that replaces @var{openssl} +with @var{libressl}. Then we use it to define a @dfn{variant} of the +@var{git} package that uses @var{libressl} instead of @var{openssl}. +This is exactly what the @option{--with-input} command-line option does +(@pxref{Package Transformation Options, @option{--with-input}}). + @menu * package Reference :: The package data type. * origin Reference:: The origin data type. @@ -4362,7 +4401,8 @@ This is a recursive, deep replacement. So in this example, both @code{guix} and its dependency @code{guile-json} (which also depends on @code{guile}) get rebuilt against @code{guile-next}. -However, implicit inputs are left unchanged. +This is implemented using the @code{package-input-rewriting} Scheme +procedure (@pxref{Defining Packages, @code{package-input-rewriting}}). @end table @node Additional Build Options diff --git a/guix/packages.scm b/guix/packages.scm index 3646b9ba13..d544c34cf8 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -94,6 +94,7 @@ package-transitive-propagated-inputs package-transitive-native-search-paths package-transitive-supported-systems + package-input-rewriting package-source-derivation package-derivation package-cross-derivation @@ -732,6 +733,35 @@ dependencies are known to build on SYSTEM." "Return the \"target inputs\" of BAG, recursively." (transitive-inputs (bag-target-inputs bag))) +(define* (package-input-rewriting replacements + #:optional (rewrite-name identity)) + "Return a procedure that, when passed a package, replaces its direct and +indirect dependencies (but not its implicit inputs) according to REPLACEMENTS. +REPLACEMENTS is a list of package pairs; the first element of each pair is the +package to replace, and the second one is the replacement. + +Optionally, REWRITE-NAME is a one-argument procedure that takes the name of a +package and returns its new name after rewrite." + (define (rewrite input) + (match input + ((label (? package? package) outputs ...) + (match (assq-ref replacements package) + (#f (cons* label (replace package) outputs)) + (new (cons* label new outputs)))) + (_ + input))) + + (define-memoized/v (replace p) + "Return a variant of P with its inputs rewritten." + (package + (inherit p) + (name (rewrite-name (package-name p))) + (inputs (map rewrite (package-inputs p))) + (native-inputs (map rewrite (package-native-inputs p))) + (propagated-inputs (map rewrite (package-propagated-inputs p))))) + + replace) + ;;; ;;; Package derivations. diff --git a/tests/packages.scm b/tests/packages.scm index e9c8690730..daceea5d62 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -742,6 +742,31 @@ (and (build-derivations %store (list drv)) (file-exists? (string-append out "/bin/make"))))))) +(test-assert "package-input-rewriting" + (let* ((dep (dummy-package "chbouib" + (native-inputs `(("x" ,grep))))) + (p0 (dummy-package "example" + (inputs `(("foo" ,coreutils) + ("bar" ,grep) + ("baz" ,dep))))) + (rewrite (package-input-rewriting `((,coreutils . ,sed) + (,grep . ,findutils)) + (cut string-append "r-" <>))) + (p1 (rewrite p0)) + (p2 (rewrite p0))) + (and (not (eq? p1 p0)) + (eq? p1 p2) ;memoization + (string=? "r-example" (package-name p1)) + (match (package-inputs p1) + ((("foo" dep1) ("bar" dep2) ("baz" dep3)) + (and (eq? dep1 sed) + (eq? dep2 findutils) + (string=? (package-name dep3) "r-chbouib") + (eq? dep3 (rewrite dep)) ;memoization + (match (package-native-inputs dep3) + ((("x" dep)) + (eq? dep findutils))))))))) + (test-eq "fold-packages" hello (fold-packages (lambda (p r) (if (string=? (package-name p) "hello") -- cgit v1.2.3 From 4e49163f76946503121493fafd6c0fe7b5bde030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Sep 2016 22:39:41 +0200 Subject: guix build: Rewrite '--with-input' in terms of 'package-input-rewriting'. * guix/scripts/build.scm (transform-package-inputs): Rewrite in terms of 'package-input-rewriting'. --- guix/scripts/build.scm | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index 9a113b4ebe..86b95b4075 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -193,33 +193,17 @@ of \"guile\"." (map (lambda (spec) (match (string-tokenize spec not-equal) ((old new) - (cons old (specification->package new))) + (cons (specification->package old) + (specification->package new))) (_ (leave (_ "invalid replacement specification: ~s~%") spec)))) replacement-specs)) - (define (rewrite input) - (match input - ((label (? package? package) outputs ...) - (match (assoc-ref replacements (package-name package)) - (#f (cons* label (replace package) outputs)) - (new (cons* label new outputs)))) - (_ - input))) - - (define replace - (memoize ;XXX: use eq? - (lambda (p) - (package - (inherit p) - (inputs (map rewrite (package-inputs p))) - (native-inputs (map rewrite (package-native-inputs p))) - (propagated-inputs (map rewrite (package-propagated-inputs p))))))) - - (lambda (store obj) - (if (package? obj) - (replace obj) - obj))) + (let ((rewrite (package-input-rewriting replacements))) + (lambda (store obj) + (if (package? obj) + (rewrite obj) + obj)))) (define %transformations ;; Transformations that can be applied to things to build. The car is the -- cgit v1.2.3 From f63e5eaaeb2671ec550b0c21f4afe5b277de6a5d Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 2 Sep 2016 00:07:24 +0200 Subject: gnu: dtc: Add missing symbols patch from debian. * gnu/packages/u-boot.scm (dtc)[source]: Add patch. * gnu/packages/patches/dtc-add-missing-symbols-to-lds.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: David Craven --- gnu/local.mk | 1 + .../patches/dtc-add-missing-symbols-to-lds.patch | 59 ++++++++++++++++++++++ gnu/packages/u-boot.scm | 4 +- 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/dtc-add-missing-symbols-to-lds.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8179920163..efb00b9b07 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -483,6 +483,7 @@ dist_patch_DATA = \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ %D%/packages/patches/doxygen-test.patch \ + %D%/packages/patches/dtc-add-missing-symbols-to-lds.patch \ %D%/packages/patches/duplicity-piped-password.patch \ %D%/packages/patches/duplicity-test_selection-tmp.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ diff --git a/gnu/packages/patches/dtc-add-missing-symbols-to-lds.patch b/gnu/packages/patches/dtc-add-missing-symbols-to-lds.patch new file mode 100644 index 0000000000..ccece0f466 --- /dev/null +++ b/gnu/packages/patches/dtc-add-missing-symbols-to-lds.patch @@ -0,0 +1,59 @@ +From a4b093f7366fdb429ca1781144d3985fa50d0fbb Mon Sep 17 00:00:00 2001 +From: Julien Grall +Date: Tue, 17 Mar 2015 16:00:34 +0000 +Subject: [PATCH] libfdt: Add missing functions to shared library + +The commit 4e76ec7 "libfdt: Add fdt_next_subnode() to permit easy +subnode iteration" adds new functions (fdt_{first,next}_subnode) but +forgot to mark them as 'global' in the shared library. + +Signed-off-by: Julien Grall +--- + libfdt/version.lds | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libfdt/version.lds b/libfdt/version.lds +index 80b322b..941208e 100644 +--- a/libfdt/version.lds ++++ b/libfdt/version.lds +@@ -54,6 +54,8 @@ LIBFDT_1.2 { + fdt_get_property_by_offset; + fdt_getprop_by_offset; + fdt_next_property_offset; ++ fdt_first_subnode; ++ fdt_next_subnode; + + local: + *; +From f58799be130e27cc729cb2d45566daa0bb3b8605 Mon Sep 17 00:00:00 2001 +From: David Gibson +Date: Tue, 1 Dec 2015 12:55:21 +1100 +Subject: [PATCH] libfdt: Add some missing symbols to version.lds + +Several functions in the header file were missing from the version.lds +script, meaning that they couldn't be used from a libfdt shared library. + +Reported by Ken Aaker, via github issue tracker. + +Signed-off-by: David Gibson +--- + libfdt/version.lds | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/libfdt/version.lds b/libfdt/version.lds +index f19f157..1f4e1ea 100644 +--- a/libfdt/version.lds ++++ b/libfdt/version.lds +@@ -57,6 +57,10 @@ LIBFDT_1.2 { + fdt_next_property_offset; + fdt_first_subnode; + fdt_next_subnode; ++ fdt_address_cells; ++ fdt_size_cells; ++ fdt_stringlist_contains; ++ fdt_resize; + + local: + *; +-- +2.8.1 diff --git a/gnu/packages/u-boot.scm b/gnu/packages/u-boot.scm index 77e7447bf0..15b24a6056 100644 --- a/gnu/packages/u-boot.scm +++ b/gnu/packages/u-boot.scm @@ -40,7 +40,9 @@ "dtc-" version ".tar.xz")) (sha256 (base32 - "155v52palf5fwfcnq696s41whjk0a5dqx98b7maqzdn7xbc2m6bp")))) + "155v52palf5fwfcnq696s41whjk0a5dqx98b7maqzdn7xbc2m6bp")) + (patches + (search-patches "dtc-add-missing-symbols-to-lds.patch")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) -- cgit v1.2.3 From bb76ef9d8b0cf4d323805c8df57054aaed269f37 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 1 Sep 2016 20:17:01 -0400 Subject: Revert "gnu: gsl: Update to 2.2." This reverts commit b16b16e6c2ba9780ebdf936c325e06ebcc0a950b. Rationale: gsl-2.2 consistently fails its test suite on i686. Inkscape depends on gsl, and the grub background image is converted using inkscape, so i686 systems can no longer be built. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9f088c8575..c8b59dfd2a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -185,7 +185,7 @@ semiconductors.") (define-public gsl (package (name "gsl") - (version "2.2") + (version "2.1") (source (origin (method url-fetch) @@ -193,7 +193,7 @@ semiconductors.") version ".tar.gz")) (sha256 (base32 - "1pyq2c0j91z955746myn29c89jwkd435s2cbj8ks2hpag6d0mr2d")))) + "0rhcia9jhr3p1f1wybwyllwqfs9bggz99i3mi5lpyqcpff1hdbar")))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f)) -- cgit v1.2.3 From d44a618384a639f9207a4fca62b039758d3e9b57 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 1 Sep 2016 21:51:49 +0300 Subject: gnu: python-requests-mock: Update to 1.0.0. * gnu/packages/openstack.scm (python-requests-mock): Update to 1.0.0. [inputs]: Remove python-setuptools. Move python-mock ... [native-inputs]: ... to here. Add python-discover, python-fixtures, python-sphinx, python-testrepostory, python-testtools. [properties]: Add python2-variant. (python2-requests-mock): inherit stripped variant. [native-inputs]: Use python2-setuptools. --- gnu/packages/openstack.scm | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 6ae1275c96..8474904265 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -237,31 +237,42 @@ tested on Python version 3.2, 2.7 and 2.6.") (define-public python-requests-mock (package (name "python-requests-mock") - (version "0.7.0") + (version "1.0.0") (source (origin (method url-fetch) (uri (pypi-uri "requests-mock" version)) (sha256 (base32 - "0s6mrpiv2w0km39qvl1pq2d56xblnm57p369qdp5j1a55ncica7f")))) + "0gcjjwsckhqixyffflc54i59x41jnbb37bli077vabii1bjmkin6")))) (build-system python-build-system) (propagated-inputs - `(("python-requests" ,python-requests) - ("python-six" ,python-six))) + `(("python-requests" ,python-requests) + ("python-six" ,python-six))) (inputs - `(("python-mock" ,python-mock) - ("python-pbr" ,python-pbr) - ("python-setuptools" ,python-setuptools))) + `(("python-pbr" ,python-pbr))) + (native-inputs + `(("python-discover" ,python-discover) + ("python-fixtures" ,python-fixtures) + ("python-mock" ,python-mock) + ("python-sphinx" ,python-sphinx) + ("python-testrepository" ,python-testrepository) + ("python-testtools" ,python-testtools))) (home-page "https://requests-mock.readthedocs.org/") (synopsis "Mock out responses from the requests package") (description "This module provides a building block to stub out the HTTP requests portions of your testing code.") - (license asl2.0))) + (license asl2.0) + (properties `((python2-variant . ,(delay python2-requests-mock)))))) (define-public python2-requests-mock - (package-with-python2 python-requests-mock)) + (let ((base (package-with-python2 + (strip-python2-variant python-requests-mock)))) + (package (inherit base) + (native-inputs + `(("python2-setuptools" ,python2-setuptools) + ,@(package-native-inputs base)))))) (define-public python-stevedore (package -- cgit v1.2.3 From 25a2f81f9b554e600f38ffaa89305cac3653d7a3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 1 Sep 2016 22:44:03 +0300 Subject: gnu: python2-scikit-learn: Use strip-python2-variant. * gnu/packages/python.scm (python2-scikit-learn): Replace package definition with 'package-with-python2', using 'strip-python2-variant' to simplify the package definition. --- gnu/packages/python.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 09fe6273a3..15a2a391db 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2885,18 +2885,11 @@ and is very extensible.") (description "Scikit-learn provides simple and efficient tools for data mining and data analysis.") - (license license:bsd-3))) + (license license:bsd-3) + (properties `((python2-variant . ,(delay python2-scikit-learn)))))) (define-public python2-scikit-learn - (let ((scikit (package-with-python2 python-scikit-learn))) - (package (inherit scikit) - (propagated-inputs - `(("python2-numpy" ,python2-numpy) - ("python2-scipy" ,python2-scipy) - ,@(alist-delete - "python-numpy" - (alist-delete - "python-scipy" (package-propagated-inputs scikit)))))))) + (package-with-python2 (strip-python2-variant python-scikit-learn))) (define-public python-scikit-image (package -- cgit v1.2.3 From 7e21b9fb2625d3d5050acceea0fe433c48c00d76 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 1 Sep 2016 22:46:31 +0300 Subject: gnu: python-scikit-learn: Set source file name. * gnu/packages/python.scm (python-scikit-learn)[source]: Add 'file-name' field. --- gnu/packages/python.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 15a2a391db..06de46b859 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2853,6 +2853,7 @@ and is very extensible.") (uri (string-append "https://github.com/scikit-learn/scikit-learn/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "140skabifgc7lvvj873pnzlwx0ni6q8qkrsyad2ccjb3h8rxzkih")))) -- cgit v1.2.3 From 2b031d3fc109c5b726d0711d948ee465f662f0a4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 1 Sep 2016 23:06:42 +0300 Subject: gnu: python2-scikit-image: Use strip-python2-variant. * gnu/packages/python.scm (python2-scikit-image): Inherit using strip-python2-variant. [propagated-inputs]: Remove work-around for python2-matplotlib, python2-numpy, python2-scipy. --- gnu/packages/python.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 06de46b859..dd59be8f02 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2919,21 +2919,19 @@ mining and data analysis.") (synopsis "Image processing in Python") (description "Scikit-image is a collection of algorithms for image processing.") - (license license:bsd-3))) + (license license:bsd-3) + (properties `((python2-variant . ,(delay python2-scikit-image)))))) (define-public python2-scikit-image - (let ((scikit-image (package-with-python2 python-scikit-image))) + (let ((scikit-image (package-with-python2 + (strip-python2-variant python-scikit-image)))) (package (inherit scikit-image) (native-inputs `(("python2-mock" ,python2-mock) ,@(package-native-inputs scikit-image))) (propagated-inputs `(("python2-pytz" ,python2-pytz) - ("python2-matplotlib" ,python2-matplotlib) - ("python2-numpy" ,python2-numpy) - ("python2-scipy" ,python2-scipy) - ,@(fold alist-delete (package-propagated-inputs scikit-image) - '("python-matplotlib" "python-numpy" "python-scipy"))))))) + ,@(package-propagated-inputs scikit-image)))))) (define-public python-redis (package -- cgit v1.2.3 From fc1a170e65d721ed4cea35fdd4752678c21d5741 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 1 Sep 2016 23:15:53 +0300 Subject: gnu: python2-numexpr: Use strip-python2-variant. * gnu/packages/python.scm (python2-numexpr): Replace package definition with 'package-with-python2', using 'strip-python2-variant'. --- gnu/packages/python.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index dd59be8f02..6e2c865f0e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3303,17 +3303,11 @@ doing the same calculation in Python. In addition, its multi-threaded capabilities can make use of all your cores, which may accelerate computations, most specially if they are not memory-bounded (e.g. those using transcendental functions).") - (license license:expat))) + (license license:expat) + (properties `((python2-variant . ,(delay python2-numexpr)))))) (define-public python2-numexpr - (let ((numexpr (package-with-python2 python-numexpr))) - (package (inherit numexpr) - ;; Make sure to use special packages for Python 2 instead - ;; of those automatically rewritten by package-with-python2. - (propagated-inputs - `(("python2-numpy" ,python2-numpy) - ,@(alist-delete "python-numpy" - (package-propagated-inputs numexpr))))))) + (package-with-python2 (strip-python2-variant python-numexpr))) (define-public python-matplotlib (package -- cgit v1.2.3 From 135ba811c6f55c22bfa8969143d83e7fdf166763 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 1 Sep 2016 23:23:46 +0300 Subject: gnu: python2-ipython: Use strip-python2-variant. * gnu/packages/python.scm (python2-ipython): Inherit using strip-python2-variant. [propagated-inputs]: Remove work-around for python2-terminado. [inputs]: Remove work-around for python2-jsonschema, python2-matplotlib, python2-numpy, python2-requests. (python-inputs)[properties]: New field. --- gnu/packages/python.scm | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6e2c865f0e..8b52548065 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4387,29 +4387,20 @@ without using the configuration machinery.") Powerful interactive shells, a browser-based notebook, support for interactive data visualization, embeddable interpreters and tools for parallel computing.") - (license license:bsd-3))) + (license license:bsd-3) + (properties `((python2-variant . ,(delay python2-ipython)))))) (define-public python2-ipython - (let ((ipython (package-with-python2 python-ipython))) + (let ((ipython (package-with-python2 (strip-python2-variant python-ipython)))) (package (inherit ipython) ;; FIXME: some tests are failing (arguments `(#:tests? #f ,@(package-arguments ipython))) - ;; Make sure we use custom python2-NAME packages. ;; FIXME: add pyreadline once available. - (propagated-inputs - `(("python2-terminado" ,python2-terminado) - ,@(alist-delete "python-terminado" - (package-propagated-inputs ipython)))) (inputs - `(("python2-jsonschema" ,python2-jsonschema) - ("python2-mock" ,python2-mock) - ("python2-matplotlib" ,python2-matplotlib) - ("python2-numpy" ,python2-numpy) - ("python2-requests" ,python2-requests) - ,@(fold alist-delete (package-inputs ipython) - '("python-jsonschema" "python-matplotlib" "python-numpy" "python-requests"))))))) + `(("python2-mock" ,python2-mock) + ,@(package-inputs ipython)))))) (define-public python-isodate (package -- cgit v1.2.3