From c4dc4466d6012e8f7875beb3e68a7dff8bc13152 Mon Sep 17 00:00:00 2001 From: Sree Harsha Totakura Date: Mon, 24 Feb 2014 18:49:54 +0100 Subject: gnu: Add miniupnpc. * gnu/packages/upnp.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it. Signed-off-by: Andreas Enge --- gnu-system.am | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index d63a80f62a..711687629e 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -206,6 +206,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/tor.scm \ gnu/packages/uucp.scm \ gnu/packages/unrtf.scm \ + gnu/packages/upnp.scm \ gnu/packages/valgrind.scm \ gnu/packages/version-control.scm \ gnu/packages/video.scm \ -- cgit v1.2.3 From 892d8a818b3c0835b9844a7827fc8d5f15bf2ce6 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Sun, 23 Feb 2014 18:25:17 -0500 Subject: gnu: Add libmpdclient. * gnu/packages/mpd.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it. --- gnu-system.am | 1 + gnu/packages/mpd.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 gnu/packages/mpd.scm (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 711687629e..f4b326553c 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -146,6 +146,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/maths.scm \ gnu/packages/mit-krb5.scm \ gnu/packages/moe.scm \ + gnu/packages/mpd.scm \ gnu/packages/mp3.scm \ gnu/packages/multiprecision.scm \ gnu/packages/mtools.scm \ diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm new file mode 100644 index 0000000000..91a33a2001 --- /dev/null +++ b/gnu/packages/mpd.scm @@ -0,0 +1,48 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2014 David Thompson +;;; +;;; 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 mpd) + #:use-module (gnu packages) + #:use-module (guix licenses) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:export (libmpdclient)) + +(define libmpdclient + (package + (name "libmpdclient") + (version "2.9") + (source (origin + (method url-fetch) + (uri + (string-append "http://musicpd.org/download/libmpdclient/" + (car (string-split version #\.)) + "/libmpdclient-" version ".tar.gz")) + (sha256 + (base32 + "0csb9r3nlmbwpiryixjr5k33x3zqd61xjhwmlps3a6prck1n1xw2")))) + (build-system gnu-build-system) + (arguments + ;; FIXME: Needs doxygen. + '(#:configure-flags '("--disable-documentation"))) + (synopsis "Music Player Daemon client library") + (description "A stable, documented, asynchronous API library for +interfacing MPD in the C, C++ & Objective C languages.") + (home-page "http://www.musicpd.org/libs/libmpdclient/") + (license bsd-3))) -- cgit v1.2.3 From 833efa0d3e31ae9efbbc449d7ad3dcc97f7b98cd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 27 Feb 2014 19:49:12 +0100 Subject: gnu: Move libwebsockets to (gnu packages web). * gnu/packages/libwebsockets.scm: Remove. Move libwebsockets package definition to... * gnu/packages/web.scm (libwebsockets): ... here. * gnu-system.am (GNU_SYSTEM_MODULES): Remove libwebsockets.scm. --- gnu-system.am | 1 - gnu/packages/libwebsockets.scm | 83 ------------------------------------------ gnu/packages/web.scm | 60 ++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 84 deletions(-) delete mode 100644 gnu/packages/libwebsockets.scm (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index f4b326553c..ef89b42b23 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -132,7 +132,6 @@ GNU_SYSTEM_MODULES = \ gnu/packages/libunistring.scm \ gnu/packages/libusb.scm \ gnu/packages/libunwind.scm \ - gnu/packages/libwebsockets.scm \ gnu/packages/lightning.scm \ gnu/packages/linux.scm \ gnu/packages/lout.scm \ diff --git a/gnu/packages/libwebsockets.scm b/gnu/packages/libwebsockets.scm deleted file mode 100644 index 3f900aef72..0000000000 --- a/gnu/packages/libwebsockets.scm +++ /dev/null @@ -1,83 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014 Ludovic Courtès -;;; -;;; 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 libwebsockets) - #:use-module (guix packages) - #:use-module (guix git-download) - #:use-module (guix build-system gnu) - #:use-module ((guix licenses) - #:select (lgpl2.1)) - #:use-module (gnu packages autotools) - #:use-module ((gnu packages compression) #:select (zlib)) - #:use-module (gnu packages perl) - #:use-module (gnu packages openssl)) - -(define-public libwebsockets - (package - (name "libwebsockets") - (version "1.2") - (source (origin - ;; The project does not publish tarballs, so we have to take - ;; things from Git. - (method git-fetch) - (uri (git-reference - (url "git://git.libwebsockets.org/libwebsockets") - (commit (string-append "v" version - "-chrome26-firefox18")))) - (sha256 - (base32 - "1293hbz8qj4p27m1qjf8dn97r10xjyiwdpq491m87zi025s558cl")) - (file-name (string-append name "-" version)))) - - ;; The package has both CMake and GNU build systems, but the latter is - ;; apparently better supported (CMake-generated makefiles lack an - ;; 'install' target, for instance.) - (build-system gnu-build-system) - - (arguments - '(#:phases (alist-replace - 'unpack - ;; FIXME: Remove this when gnu-build-system handles that - ;; case correctly. - (lambda* (#:key source #:allow-other-keys) - (mkdir "source") - (chdir "source") - (copy-recursively source ".") - #t) - - (alist-cons-before - 'configure 'bootstrap - (lambda _ - (chmod "libwebsockets-api-doc.html" #o666) - (zero? (system* "./autogen.sh"))) - %standard-phases)))) - (native-inputs `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool "bin") - ("perl" ,perl))) ; to build the HTML doc - (inputs `(("zlib" ,zlib) - ("openssl" ,openssl))) - (synopsis "WebSockets library written in C") - (description - "libwebsockets is a library that allows C programs to establish client -and server WebSockets connections---a protocol layered above HTTP that allows -for efficient socket-like bidirectional reliable communication channels.") - (home-page "http://libwebsockets.org/") - - ;; This is LGPLv2.1-only with extra exceptions specified in 'LICENSE'. - (license lgpl2.1))) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 350781b74b..481dca0c66 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2013 Aljosha Papsch +;;; Copyright © 2014 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,9 +23,12 @@ (define-module (gnu packages web) #:renamer (symbol-prefix-proc 'l:)) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system perl) #:use-module (guix build-system gnu) #:use-module (gnu packages apr) + #:use-module (gnu packages autotools) + #:use-module ((gnu packages compression) #:select (zlib)) #:use-module (gnu packages openssl) #:use-module (gnu packages pcre) #:use-module (gnu packages perl)) @@ -66,6 +70,62 @@ (define-public httpd (license l:asl2.0) (home-page "https://httpd.apache.org/"))) +(define-public libwebsockets + (package + (name "libwebsockets") + (version "1.2") + (source (origin + ;; The project does not publish tarballs, so we have to take + ;; things from Git. + (method git-fetch) + (uri (git-reference + (url "git://git.libwebsockets.org/libwebsockets") + (commit (string-append "v" version + "-chrome26-firefox18")))) + (sha256 + (base32 + "1293hbz8qj4p27m1qjf8dn97r10xjyiwdpq491m87zi025s558cl")) + (file-name (string-append name "-" version)))) + + ;; The package has both CMake and GNU build systems, but the latter is + ;; apparently better supported (CMake-generated makefiles lack an + ;; 'install' target, for instance.) + (build-system gnu-build-system) + + (arguments + '(#:phases (alist-replace + 'unpack + ;; FIXME: Remove this when gnu-build-system handles that + ;; case correctly. + (lambda* (#:key source #:allow-other-keys) + (mkdir "source") + (chdir "source") + (copy-recursively source ".") + #t) + + (alist-cons-before + 'configure 'bootstrap + (lambda _ + (chmod "libwebsockets-api-doc.html" #o666) + (zero? (system* "./autogen.sh"))) + %standard-phases)))) + + (native-inputs `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool "bin") + ("perl" ,perl))) ; to build the HTML doc + (inputs `(("zlib" ,zlib) + ("openssl" ,openssl))) + (synopsis "WebSockets library written in C") + (description + "libwebsockets is a library that allows C programs to establish client +and server WebSockets connections---a protocol layered above HTTP that allows +for efficient socket-like bidirectional reliable communication channels.") + (home-page "http://libwebsockets.org/") + + ;; This is LGPLv2.1-only with extra exceptions specified in 'LICENSE'. + (license l:lgpl2.1))) + (define-public perl-html-tagset (package (name "perl-html-tagset") -- cgit v1.2.3