From 99ff06be3e18511d1e46c8833bc1a6feb99bd46f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Aug 2011 09:08:57 +0000 Subject: [PATCH] * KDE 4.5 needs an older version of shared-desktop-ontologies. svn path=/nixpkgs/branches/kde-4.7/; revision=28103 --- pkgs/desktops/kde-4.5/default.nix | 2 ++ pkgs/desktops/kde-4.5/pim-runtime/default.nix | 4 ++-- pkgs/desktops/kde-4.5/pim/default.nix | 4 ++-- .../shared-desktop-ontologies/default.nix | 22 +++++++++++++++++++ 4 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 pkgs/desktops/kde-4.5/support/shared-desktop-ontologies/default.nix diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix index a4b5d8fb467..e8cb4ab56d3 100644 --- a/pkgs/desktops/kde-4.5/default.nix +++ b/pkgs/desktops/kde-4.5/default.nix @@ -26,6 +26,8 @@ recurseIntoAttrs rec { ffmpeg = ffmpeg_0_6_90; + shared_desktop_ontologies = callPackage ./support/shared-desktop-ontologies { }; + kde = callPackage ./kde-package { inherit release; }; ### SUPPORT diff --git a/pkgs/desktops/kde-4.5/pim-runtime/default.nix b/pkgs/desktops/kde-4.5/pim-runtime/default.nix index d92f1eecc73..6fb6a44d38d 100644 --- a/pkgs/desktops/kde-4.5/pim-runtime/default.nix +++ b/pkgs/desktops/kde-4.5/pim-runtime/default.nix @@ -12,7 +12,7 @@ kde.package rec { src = fetchurl { url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.name}-${meta.kde.version}.tar.bz2"; - sha256 = "029a0i83b2yrc1xn9as7gc9rakpxjh5cjmqcmhrrj0xwalqz490n"; + sha256 = "0w99jv0lzajmz9gvgss8gkgffm0lpqv3r6pzfsnqhrdhcf6h853y"; }; meta = { @@ -21,7 +21,7 @@ kde.package rec { license = "GPL"; kde = { name = "kdepim-runtime"; - version = "4.4.8"; + version = "4.4.9"; }; }; } diff --git a/pkgs/desktops/kde-4.5/pim/default.nix b/pkgs/desktops/kde-4.5/pim/default.nix index cdcc3dc023d..5f7d5e06c48 100644 --- a/pkgs/desktops/kde-4.5/pim/default.nix +++ b/pkgs/desktops/kde-4.5/pim/default.nix @@ -16,7 +16,7 @@ kde.package rec { src = fetchurl { url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.name}-${meta.kde.version}.tar.bz2"; - sha256 = "02nbdn8s4504ljqz0qylm1jyw4hpg5fjw3vi6sbzm522xvkax4wh"; + sha256 = "0pr1n6k51aadi8fsk7rkv0vrfl4y6llywxjkzci6if7g300yd8r8"; }; meta = { @@ -28,7 +28,7 @@ kde.package rec { homepage = http://pim.kde.org; kde = { name = "kdepim"; - version = "4.4.8"; + version = "4.4.9"; }; }; } diff --git a/pkgs/desktops/kde-4.5/support/shared-desktop-ontologies/default.nix b/pkgs/desktops/kde-4.5/support/shared-desktop-ontologies/default.nix new file mode 100644 index 00000000000..b4713794a03 --- /dev/null +++ b/pkgs/desktops/kde-4.5/support/shared-desktop-ontologies/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, cmake}: + +stdenv.mkDerivation rec { + name = "shared-desktop-ontologies-0.5"; + src = fetchurl { + url = "mirror://sf/oscaf/${name}.tar.bz2"; + sha256 = "1a1gs2b314133rg7vzwvnqbxchf7xgs0jpkydid5l2wz98m7j17r"; + }; + buildInputs = [ cmake ]; + meta = with stdenv.lib; { + description = "Ontologies necessary for the Nepomuk semantic desktop"; + longDescription = '' + The shared-desktop-ontologies package brings the semantic web to the + desktop in terms of vocabulary. It contains the well known core + ontologies such as RDF and RDFS as well as the Nepomuk ontologies which + are used by projects like KDE or Strigi. + ''; + platforms = platforms.all; + maintainers = [ maintainers.sander maintainers.urkud ]; + }; +} +