diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/libupnp.scm | 53 | ||||
| -rw-r--r-- | gnu/packages/upnp.scm | 30 |
3 files changed, 30 insertions, 54 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 3dae58f82f..8fa155924e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -252,7 +252,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/libunistring.scm \ %D%/packages/libusb.scm \ %D%/packages/libunwind.scm \ - %D%/packages/libupnp.scm \ %D%/packages/lighting.scm \ %D%/packages/linux.scm \ %D%/packages/lirc.scm \ diff --git a/gnu/packages/libupnp.scm b/gnu/packages/libupnp.scm deleted file mode 100644 index 3d5110c918..0000000000 --- a/gnu/packages/libupnp.scm +++ /dev/null @@ -1,53 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> -;;; -;;; 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 <http://www.gnu.org/licenses/>. - -(define-module (gnu packages libupnp) - #:use-module (gnu packages) - #:use-module (guix licenses) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system gnu)) - -(define-public libupnp - (package - (name "libupnp") - (version "1.6.24") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/pupnp/pupnp/libUPnP%20" - version "/" name "-" version ".tar.bz2")) - (sha256 - (base32 - "15ngi1i7cvsv7g15fb9bkswvi99d1plz52x5qgjn4h5vyfddg0vx")))) - (build-system gnu-build-system) - (arguments - ;; The tests require a network device capable of multicasting which is - ;; not available in the build environment. See - ;; https://lists.gnu.org/archive/html/guix-devel/2015-01/msg00312.html. - `(#:tests? #f - #:configure-flags '("--enable-ipv6"))) - (home-page "http://pupnp.sourceforge.net") - (synopsis "Portable SDK for UPnP Devices") - (description - "The portable SDK for UPnP Devices (libupnp) provides developers with an -API and code for building control points, devices, and bridges that are -compliant with Version 1.0 of the Universal Plug and Play Device Architecture -Specification and support several operating systems like Linux, *BSD, Solaris -and others.") - (license bsd-3))) diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index f2669f11a8..41f9411281 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in> +;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. @@ -74,3 +75,32 @@ include peer-to-peer applications, active-mode FTP clients, DCC file transfers over IRC, instant messaging, network games, and most server software.") (license (x11-style "file://LICENSE" "See 'LICENSE' file in the distribution")))) + +(define-public libupnp + (package + (name "libupnp") + (version "1.6.24") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/pupnp/pupnp/libUPnP%20" + version "/" name "-" version ".tar.bz2")) + (sha256 + (base32 + "15ngi1i7cvsv7g15fb9bkswvi99d1plz52x5qgjn4h5vyfddg0vx")))) + (build-system gnu-build-system) + (arguments + ;; The tests require a network device capable of multicasting which is + ;; not available in the build environment. See + ;; https://lists.gnu.org/archive/html/guix-devel/2015-01/msg00312.html. + `(#:tests? #f + #:configure-flags '("--enable-ipv6"))) + (home-page "http://pupnp.sourceforge.net") + (synopsis "Portable SDK for UPnP Devices") + (description + "The portable SDK for UPnP Devices (libupnp) provides developers with an +API and code for building control points, devices, and bridges that are +compliant with Version 1.0 of the Universal Plug and Play Device Architecture +Specification and support several operating systems like Linux, *BSD, Solaris +and others.") + (license bsd-3))) |