Author: urkud
Date: Sun Dec 26 17:18:13 2010
New Revision: 25289
URL: https://svn.nixos.org/websvn/nix/?rev=25289&sc=1
Log:
Rename hupnp to herqq
Don't pass it to kdelibs as it breaks kdelibs build
Added:
nixpkgs/trunk/pkgs/development/libraries/herqq/
nixpkgs/trunk/pkgs/development/libraries/herqq/0.7.0.nix
nixpkgs/trunk/pkgs/development/libraries/herqq/0.8.0.nix
nixpkgs/trunk/pkgs/development/libraries/herqq/svn.nix
- copied, changed from r25288,
nixpkgs/trunk/pkgs/development/libraries/hupnp/default.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/hupnp/
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.6/libs/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.6/libs/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.6/libs/default.nix Sun Dec 26
15:27:39 2010 (r25288)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.6/libs/default.nix Sun Dec 26
17:18:13 2010 (r25289)
@@ -2,7 +2,7 @@
, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr,
shared_desktop_ontologies, libXScrnSaver
, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
-, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, hspell, udev, grantlee, hupnp
+, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, hspell, udev, grantlee
}:
kde.package {
@@ -10,13 +10,15 @@
buildInputs = [
cmake perl xz flex bison bzip2 pcre fam libxml2 libxslt shared_mime_info
giflib jasper /*openexr*/ aspell avahi kerberos acl attr libXScrnSaver
- enchant libdbusmenu_qt polkit_qt_1 automoc4 hspell udev grantlee hupnp
+ enchant libdbusmenu_qt polkit_qt_1 automoc4 hspell udev grantlee
];
-# TODO: make sonnet plugins (dictionaries) really work.
-# There are a few hardcoded paths.
-# Let kdelibs find openexr
-# Split plugins from libs?
+# TODO:
+# * make sonnet plugins (dictionaries) really work.
+# There are a few hardcoded paths.
+# * Let kdelibs find openexr
+# * Split plugins from libs?
+# * herqq: kdelibs tries to include HDeviceProxy which was never released
propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2
shared_desktop_ontologies ];
Added: nixpkgs/trunk/pkgs/development/libraries/herqq/0.7.0.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/herqq/0.7.0.nix Sun Dec 26
17:18:13 2010 (r25289)
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, qt4, unzip }:
+
+stdenv.mkDerivation rec {
+ name = "herqq-0.7.0";
+
+
+ buildInputs = [ qt4 unzip ];
+
+ configurePhase = "qmake PREFIX=$out herqq.pro";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/hupnp/${name}.zip";
+ sha256 = "13z6wabakn2j57azhik9nvps50l85hrs028kkhn5cpd0pgcigmqz";
+ };
+
+ meta = {
+ homepage = http://herqq.org;
+ description = "A software library for building UPnP devices and control
points";
+ inherit (qt4.meta) platforms;
+ maintainers = [ stdenv.lib.maintainers.urkud ];
+ };
+}
Added: nixpkgs/trunk/pkgs/development/libraries/herqq/0.8.0.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/herqq/0.8.0.nix Sun Dec 26
17:18:13 2010 (r25289)
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, qt4, unzip }:
+
+stdenv.mkDerivation rec {
+ name = "herqq-0.8.0";
+
+
+ buildInputs = [ qt4 unzip ];
+
+ configurePhase = "qmake PREFIX=$out herqq.pro";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/hupnp/${name}.zip";
+ sha256 = "0z1z9f48fhdif3wd7gn2gj0yxk15f0lpm01q0igsccv8m1y3mphn";
+ };
+
+ meta = {
+ homepage = http://herqq.org;
+ description = "A software library for building UPnP devices and control
points";
+ inherit (qt4.meta) platforms;
+ maintainers = [ stdenv.lib.maintainers.urkud ];
+ };
+}
Copied and modified: nixpkgs/trunk/pkgs/development/libraries/herqq/svn.nix
(from r25288, nixpkgs/trunk/pkgs/development/libraries/hupnp/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/hupnp/default.nix Sun Dec 26
15:27:39 2010 (r25288, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/herqq/svn.nix Sun Dec 26
17:18:13 2010 (r25289)
@@ -1,17 +1,17 @@
{ stdenv, fetchsvn, qt4 }:
stdenv.mkDerivation {
- name = "hupnp-0.8.0-r91";
+ name = "herqq-0.8.0-r91";
buildInputs = [ qt4 ];
- configurePhase = "cd herqq; qmake PREFIX=$out herqq.pro";
+ configurePhase = "qmake PREFIX=$out herqq.pro";
src = fetchsvn {
- url = http://hupnp.svn.sourceforge.net/svnroot/hupnp/trunk;
+ url = http://hupnp.svn.sourceforge.net/svnroot/hupnp/trunk/herqq;
rev = 91;
- sha256 = "1lhg22wy95pkxsvs6yxz4k84sslngphwf2aj5yw1bzrzzc486hqd";
+ sha256 = "122md1kn8b5a1vdpn5kisqi6xklwwa57r4lacm1rxlkq3rpca864";
};
meta = {
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Dec 26 15:27:39
2010 (r25288)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Dec 26 17:18:13
2010 (r25289)
@@ -3186,6 +3186,12 @@
heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
+ herqqSvn = callPackage ../development/libraries/herqq/svn.nix { };
+
+ herqq070 = callPackage ../development/libraries/herqq/0.7.0.nix { };
+
+ herqq080 = callPackage ../development/libraries/herqq/0.8.0.nix { };
+
hspell = callPackage ../development/libraries/hspell { };
hspellDicts = callPackage ../development/libraries/hspell/dicts.nix { };
@@ -3194,8 +3200,6 @@
hunspell = callPackage ../development/libraries/hunspell { };
- hupnp = callPackage ../development/libraries/hupnp { };
-
hwloc = callPackage ../development/libraries/hwloc { };
hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger
{ };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
