dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

* Update a bunch of dependencies of kdelibs.

Browse Source 
svn path=/nixpkgs/branches/kde-4.7/; revision=27702
This commit is contained in:
Eelco Dolstra 2011-07-11 10:49:21 +00:00
parent 22ab3fe1ab
commit 76ec0dd430
11 changed files with 85 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/data/misc/shared-desktop-ontologies/default.nix
View File

@ -1,12 +1,15 @@
{stdenv, fetchurl, cmake}:
{ stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec {
name = "shared-desktop-ontologies-0.5";
name = "shared-desktop-ontologies-0.7.1";
src = fetchurl {
url = "mirror://sf/oscaf/${name}.tar.bz2";
sha256 = "1a1gs2b314133rg7vzwvnqbxchf7xgs0jpkydid5l2wz98m7j17r";
url = "mirror://sourceforge/oscaf/${name}.tar.bz2";
sha256 = "1b38amxr4b0n6cyy9l3lgzyjsky172cjphjr0iscahrlrc0h4phy";
};
buildInputs = [ cmake ];
meta = with stdenv.lib; {
description = "Ontologies necessary for the Nepomuk semantic desktop";
longDescription = ''

16
pkgs/desktops/kde-4.7/libs/default.nix
View File

@ -3,24 +3,18 @@
, xz, openexr, 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
, getopt, udev
, getopt, udev, herqq
}:
kde.package {
buildInputs =
[ acl attr attica automoc4 avahi bzip2 cmake
enchant fam getopt giflib jasper libdbusmenu_qt libXScrnSaver libxslt pcre perl perl polkit_qt_1
qt4 shared_mime_info strigi udev
xz
[ acl attr attica automoc4 avahi bzip2 cmake enchant fam getopt
giflib herqq jasper libdbusmenu_qt libXScrnSaver libxslt pcre
perl perl polkit_qt_1 qca2 qt4 shared_desktop_ontologies
shared_mime_info soprano strigi udev xz
];
#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
#];
# TODO: make sonnet plugins (dictionaries) really work.
# There are a few hardcoded paths.
# Let kdelibs find openexr

8
pkgs/desktops/kde-4.7/support/soprano/default.nix
View File

@ -1,15 +1,15 @@
{stdenv, fetchurl, cmake, qt4, cluceneCore, redland, libiodbc}:
{ stdenv, fetchurl, cmake, qt4, clucene_core, redland, libiodbc }:
stdenv.mkDerivation rec {
name = "soprano-2.5.3";
name = "soprano-2.6.51";
src = fetchurl {
url = "mirror://sourceforge/soprano/${name}.tar.bz2";
sha256 = "0hxc6jnbh0529jsc0ixvy8pshnffrpgsadinhk9navkpyn5xg4l9";
sha256 = "0sj0cklxahlhig29d0b1a3hr1p2z1xfar7j1slj2klbcy3qn47i0";
};
# We disable the Java backend, since we do not need them and they make the closure size much bigger
buildInputs = [ cmake qt4 cluceneCore redland libiodbc ];
buildInputs = [ cmake qt4 clucene_core redland libiodbc ];
meta = {
homepage = http://soprano.sourceforge.net/;

22
pkgs/development/libraries/herqq/0.8.0.nix
View File

@ -1,22 +0,0 @@
{ 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 ];
};
}

5
pkgs/development/libraries/herqq/0.7.0.nix → pkgs/development/libraries/herqq/default.nix
View File

@ -1,8 +1,7 @@
{ stdenv, fetchurl, qt4, unzip }:
stdenv.mkDerivation rec {
name = "herqq-0.7.0";
name = "herqq-1.0.0";
buildInputs = [ qt4 unzip ];
@ -10,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/hupnp/${name}.zip";
sha256 = "13z6wabakn2j57azhik9nvps50l85hrs028kkhn5cpd0pgcigmqz";
sha256 = "13klwszi7h7mvdz2ap0ac4dp7lc0gswp8lzzlwidhqfmf9pwgkyb";
};
meta = {

23
pkgs/development/libraries/herqq/svn.nix
View File

@ -1,23 +0,0 @@
{ stdenv, fetchsvn, qt4 }:
stdenv.mkDerivation {
name = "herqq-0.8.0-r91";
buildInputs = [ qt4 ];
configurePhase = "qmake PREFIX=$out herqq.pro";
src = fetchsvn {
url = http://hupnp.svn.sourceforge.net/svnroot/hupnp/trunk/herqq;
rev = 91;
sha256 = "122md1kn8b5a1vdpn5kisqi6xklwwa57r4lacm1rxlkq3rpca864";
};
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 ];
};
}

22
pkgs/development/libraries/librdf/raptor2.nix Normal file
View File

@ -0,0 +1,22 @@
{ stdenv, fetchurl, libxml2, libxslt, curl }:
stdenv.mkDerivation rec {
name = "raptor2-2.0.3";
src = fetchurl {
url = "http://download.librdf.org/source/${name}.tar.gz";
sha256 = "1icfg01zx3d3czqz774ar2mmnp8a9m248y5zvi5yn0fzs0nyc8g2";
};
buildInputs = [ libxml2 libxslt ];
postInstall = "rm -rf $out/share/gtk-doc";
meta = {
description = "The RDF Parser Toolkit";
homepage = "http://librdf.org/raptor";
license = "LGPL-2.1 Apache-2.0";
maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux;
};
}

8
pkgs/development/libraries/librdf/rasqal.nix
View File

@ -8,12 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "a042846e8b7af52d9d66fba788c9d579e58c535cfaf80d33dc0bd69bf6ffeb08";
};
buildInputs = [ librdf_raptor gmp /*or mpfr*/ pkgconfig pcre libxml2 ];
preConfigure = ''
export NIX_LDFLAGS="$NIX_LDFLAGS -lraptor"
'';
buildInputs = [ pkgconfig librdf_raptor gmp pcre libxml2 ];
postInstall = "rm -rf $out/share/gtk-doc";
meta = {
description = "Library that handles Resource Description Framework (RDF)";
homepage = "http://librdf.org/rasqal";

32
pkgs/development/libraries/qca2/default.nix
View File

@ -1,22 +1,30 @@
{stdenv, fetchurl, which, qt4}:
{ stdenv, fetchurl, which, qt4 }:
stdenv.mkDerivation {
name = "qca-2.0.2";
stdenv.mkDerivation rec {
name = "qca-2.0.3";
src = fetchurl {
url = http://delta.affinix.com/download/qca/2.0/qca-2.0.2.tar.bz2;
sha256 = "49b5474450104a2298747c243de1451ab7a6aeed4bf7df43ffa4b7128a2837b8";
url = "http://delta.affinix.com/download/qca/2.0/${name}.tar.bz2";
sha256 = "0pw9fkjga8vxj465wswxmssxs4wj6zpxxi6kzkf4z5chyf4hr8ld";
};
buildInputs = [ qt4 ];
buildNativeInputs = [ which ];
preBuild = ''
sed -i include/QtCrypto/qca_publickey.h -e '/EMSA3_Raw/a,\
EMSA3_SHA224, ///< SHA224, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
EMSA3_SHA256, ///< SHA256, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
EMSA3_SHA384, ///< SHA384, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
EMSA3_SHA512 ///< SHA512, with EMSA3 (ie PKCS#1 Version 1.5) encoding'
'';
preBuild =
''
sed -i include/QtCrypto/qca_publickey.h -e '/EMSA3_Raw/a,\
EMSA3_SHA224, ///< SHA224, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
EMSA3_SHA256, ///< SHA256, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
EMSA3_SHA384, ///< SHA384, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
EMSA3_SHA512 ///< SHA512, with EMSA3 (ie PKCS#1 Version 1.5) encoding'
'';
configureFlags = "--no-separate-debug-info";
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Qt Cryptographic Architecture";
license = "LGPL";

31
pkgs/development/libraries/redland/1.0.10.nix
View File

@ -4,27 +4,32 @@
}:
stdenv.mkDerivation rec {
name = "redland-1.0.10";
name = "redland-1.0.10";
src = fetchurl {
url = "mirror://sf/librdf/${name}.tar.gz";
url = "http://download.librdf.org/source/${name}.tar.gz";
sha256 = "05cq722qvw5sq08qbydzjv5snqk402cbdsy8s6qjzir7vq2hs1p3";
};
buildInputs = [ pkgconfig ];
buildInputs =
[ pkgconfig bdb openssl libxslt perl mysql postgresql sqlite curl
pcre libxml2
];
propagatedBuildInputs = [
bdb openssl libxslt perl mysql postgresql sqlite curl pcre libxml2
librdf_raptor librdf_rasqal
];
preConfigure = ''
export NIX_LDFLAGS="$NIX_LDFLAGS -lrasqal -lraptor"
'';
propagatedBuildInputs = [ librdf_raptor librdf_rasqal ];
preConfigure =
''
export NIX_LDFLAGS="$NIX_LDFLAGS -lrasqal -lraptor"
'';
postInstall = "rm -rf $out/share/gtk-doc";
configureFlags =
[ "--with-threads" ]
++ stdenv.lib.optional (bdb != null) "--with-bdb=${bdb}";
patchPhase ="sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl";
meta = {
homepage = http://librdf.org/;
};
}

9
pkgs/top-level/all-packages.nix
View File

@ -3446,11 +3446,7 @@ let
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 { };
herqq = callPackage ../development/libraries/herqq { };
hspell = callPackage ../development/libraries/hspell { };
@ -4205,6 +4201,8 @@ let
librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { };
librdf_raptor2 = callPackage ../development/libraries/librdf/raptor2.nix { };
librdf_rasqal = callPackage ../development/libraries/librdf/rasqal.nix { };
librdf = callPackage ../development/libraries/librdf { };
@ -4214,6 +4212,7 @@ let
redland = callPackage ../development/libraries/redland/1.0.10.nix {
bdb = db4;
postgresql = null;
mysql = null;
};
rhino = callPackage ../development/libraries/java/rhino {