Author: eelco
Date: Mon Jul 11 10:49:21 2011
New Revision: 27702
URL: https://svn.nixos.org/websvn/nix/?rev=27702&sc=1
Log:
* Update a bunch of dependencies of kdelibs.
Added:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/herqq/default.nix
- copied, changed from r27618,
nixpkgs/branches/kde-4.7/pkgs/development/libraries/herqq/0.8.0.nix
nixpkgs/branches/kde-4.7/pkgs/development/libraries/librdf/raptor2.nix
- copied, changed from r27618,
nixpkgs/branches/kde-4.7/pkgs/development/libraries/librdf/raptor.nix
Deleted:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/herqq/0.7.0.nix
nixpkgs/branches/kde-4.7/pkgs/development/libraries/herqq/0.8.0.nix
nixpkgs/branches/kde-4.7/pkgs/development/libraries/herqq/svn.nix
Modified:
nixpkgs/branches/kde-4.7/pkgs/data/misc/shared-desktop-ontologies/default.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libs/default.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/support/soprano/default.nix
nixpkgs/branches/kde-4.7/pkgs/development/libraries/librdf/rasqal.nix
nixpkgs/branches/kde-4.7/pkgs/development/libraries/qca2/default.nix
nixpkgs/branches/kde-4.7/pkgs/development/libraries/redland/1.0.10.nix
nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/kde-4.7/pkgs/data/misc/shared-desktop-ontologies/default.nix
==============================================================================
---
nixpkgs/branches/kde-4.7/pkgs/data/misc/shared-desktop-ontologies/default.nix
Mon Jul 11 07:17:53 2011 (r27701)
+++
nixpkgs/branches/kde-4.7/pkgs/data/misc/shared-desktop-ontologies/default.nix
Mon Jul 11 10:49:21 2011 (r27702)
@@ -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 = ''
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libs/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libs/default.nix Mon Jul
11 07:17:53 2011 (r27701)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libs/default.nix Mon Jul
11 10:49:21 2011 (r27702)
@@ -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
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/support/soprano/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/support/soprano/default.nix
Mon Jul 11 07:17:53 2011 (r27701)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/support/soprano/default.nix
Mon Jul 11 10:49:21 2011 (r27702)
@@ -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/;
Copied and modified:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/herqq/default.nix (from
r27618, nixpkgs/branches/kde-4.7/pkgs/development/libraries/herqq/0.8.0.nix)
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/development/libraries/herqq/0.8.0.nix Thu Jul
7 11:28:53 2011 (r27618, copy source)
+++ nixpkgs/branches/kde-4.7/pkgs/development/libraries/herqq/default.nix
Mon Jul 11 10:49:21 2011 (r27702)
@@ -1,8 +1,7 @@
{ stdenv, fetchurl, qt4, unzip }:
stdenv.mkDerivation rec {
- name = "herqq-0.8.0";
-
+ name = "herqq-1.0.0";
buildInputs = [ qt4 unzip ];
@@ -10,7 +9,7 @@
src = fetchurl {
url = "mirror://sourceforge/hupnp/${name}.zip";
- sha256 = "0z1z9f48fhdif3wd7gn2gj0yxk15f0lpm01q0igsccv8m1y3mphn";
+ sha256 = "13klwszi7h7mvdz2ap0ac4dp7lc0gswp8lzzlwidhqfmf9pwgkyb";
};
meta = {
Copied and modified:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/librdf/raptor2.nix (from
r27618, nixpkgs/branches/kde-4.7/pkgs/development/libraries/librdf/raptor.nix)
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/development/libraries/librdf/raptor.nix
Thu Jul 7 11:28:53 2011 (r27618, copy source)
+++ nixpkgs/branches/kde-4.7/pkgs/development/libraries/librdf/raptor2.nix
Mon Jul 11 10:49:21 2011 (r27702)
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, libxml2, curl }:
+{ stdenv, fetchurl, libxml2, libxslt, curl }:
stdenv.mkDerivation rec {
- name = "raptor-1.4.21";
+ name = "raptor2-2.0.3";
src = fetchurl {
url = "http://download.librdf.org/source/${name}.tar.gz";;
- sha256 =
"db3172d6f3c432623ed87d7d609161973d2f7098e3d2233d0702fbcc22cfd8ca";
+ sha256 = "1icfg01zx3d3czqz774ar2mmnp8a9m248y5zvi5yn0fzs0nyc8g2";
};
- buildInputs = [ libxml2 curl ];
+ buildInputs = [ libxml2 libxslt ];
+
+ postInstall = "rm -rf $out/share/gtk-doc";
meta = {
description = "The RDF Parser Toolkit";
Modified: nixpkgs/branches/kde-4.7/pkgs/development/libraries/librdf/rasqal.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/development/libraries/librdf/rasqal.nix
Mon Jul 11 07:17:53 2011 (r27701)
+++ nixpkgs/branches/kde-4.7/pkgs/development/libraries/librdf/rasqal.nix
Mon Jul 11 10:49:21 2011 (r27702)
@@ -8,12 +8,10 @@
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";;
Modified: nixpkgs/branches/kde-4.7/pkgs/development/libraries/qca2/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/development/libraries/qca2/default.nix
Mon Jul 11 07:17:53 2011 (r27701)
+++ nixpkgs/branches/kde-4.7/pkgs/development/libraries/qca2/default.nix
Mon Jul 11 10:49:21 2011 (r27702)
@@ -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";
Modified: nixpkgs/branches/kde-4.7/pkgs/development/libraries/redland/1.0.10.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/development/libraries/redland/1.0.10.nix
Mon Jul 11 07:17:53 2011 (r27701)
+++ nixpkgs/branches/kde-4.7/pkgs/development/libraries/redland/1.0.10.nix
Mon Jul 11 10:49:21 2011 (r27702)
@@ -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 ];
-
- propagatedBuildInputs = [
- bdb openssl libxslt perl mysql postgresql sqlite curl pcre libxml2
- librdf_raptor librdf_rasqal
- ];
-
- preConfigure = ''
- export NIX_LDFLAGS="$NIX_LDFLAGS -lrasqal -lraptor"
- '';
-
+ buildInputs =
+ [ pkgconfig bdb openssl libxslt perl mysql postgresql sqlite curl
+ pcre libxml2
+ ];
+
+ 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/;
+ };
}
Modified: nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix Mon Jul 11
07:17:53 2011 (r27701)
+++ nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix Mon Jul 11
10:49:21 2011 (r27702)
@@ -3446,11 +3446,7 @@
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 @@
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 @@
redland = callPackage ../development/libraries/redland/1.0.10.nix {
bdb = db4;
postgresql = null;
+ mysql = null;
};
rhino = callPackage ../development/libraries/java/rhino {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
