diff options
| author | Andreas Enge <andreas@enge.fr> | 2016-02-22 21:05:06 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2016-02-22 21:30:56 +0100 |
| commit | dbbb45dd7318528ea92a56992be789d0b5cf2120 (patch) | |
| tree | d91f6832ec3704de4b84e3bb85ec2a2c44d50cb9 /gnu/packages/qt.scm | |
| parent | 5ad87e5bb5f5fe863c95097d012c0da13d70fbf6 (diff) | |
| download | guix-dbbb45dd7318528ea92a56992be789d0b5cf2120.tar.gz | |
gnu: Remove KDE 4.
* gnu/packages/kde.scm (qjson): Move from here... * gnu/packages/qt.scm (qjson): ...to here. * gnu/packages/pumpio.scm: Drop inclusion of (gnu packages kde). * gnu/packages/kde.scm: Delete file. * gnu-system.am (GNU_SYSTEM_MODULES): Unregister it. * gnu/packages/rdf.scm (soprano): Delete variable. KDE 4 relies on Qt 4, which does not receive security updates any more.
Diffstat (limited to 'gnu/packages/qt.scm')
| -rw-r--r-- | gnu/packages/qt.scm | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index dccc9a2e48..86c0aaafcf 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -20,7 +20,7 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (gnu packages qt) - #:use-module ((guix licenses) #:select (bsd-3 gpl2 gpl3 lgpl2.1 x11-style)) + #:use-module ((guix licenses) #:select (bsd-3 gpl2 gpl3 lgpl2.1 lgpl2.1+ x11-style)) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build utils) @@ -337,6 +337,30 @@ developers using C++ or QML, a CSS & JavaScript like language.") (delete-file-recursively olddoc) #t)))))))) +(define-public qjson + (package + (name "qjson") + (version "0.8.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/flavio/qjson/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "163fspi0xc705irv79qw861fmh68pjyla9vx3kqiq6xrdhb9834j")))) + (build-system cmake-build-system) + (inputs + `(("qt" ,qt-4))) + (arguments + `(#:tests? #f)) ; no test target + (home-page "http://qjson.sourceforge.net/") + (synopsis "Qt-based library for handling JSON") + (description "QJson is a Qt-based library that maps JSON data to QVariant +objects and vice versa. JSON arrays are mapped to QVariantList instances, +while JSON objects are mapped to QVariantMap.") + (license lgpl2.1+))) + (define-public python-sip (package (name "python-sip") |