From d4509553e6d28ce28289f06646041e94ef954fea Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 7 Jan 2012 00:02:23 +0000 Subject: [PATCH 1/3] Fix oxygen-icons outputHash svn path=/nixpkgs/trunk/; revision=31387 --- pkgs/desktops/kde-4.8/oxygen-icons.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/kde-4.8/oxygen-icons.nix b/pkgs/desktops/kde-4.8/oxygen-icons.nix index f2a5e666232..6297a55df76 100644 --- a/pkgs/desktops/kde-4.8/oxygen-icons.nix +++ b/pkgs/desktops/kde-4.8/oxygen-icons.nix @@ -3,7 +3,7 @@ kde { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0c12c72bcf41cfaf03f85fc1ae27e44d8cecac3deb504ab1de4c30f4fc9e3cd0"; + outputHash = "ca03ee0a7bbd35ee70f84d32b6f861ee8c019473f16c6ecf6309885317bcfe51"; buildNativeInputs = [ cmake ]; From 50de8e181fd7b9a57e595c1f4605eff4e0fb1618 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 7 Jan 2012 00:02:28 +0000 Subject: [PATCH 2/3] Fix kde48.kdelibs evaluation error Will write kactivities.nix when hydra will build kde48.kdelibs svn path=/nixpkgs/trunk/; revision=31388 --- pkgs/desktops/kde-4.8/kde-package/4.7.97.nix | 8 +------- pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh | 1 + 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix b/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix index f793597544e..8a805708276 100644 --- a/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix +++ b/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix @@ -116,13 +116,6 @@ modules=[ { name="svgpart"; } ]; } -{ - module="kdelibs"; - split=true; - pkgs=[ - { name="kactivities"; } - ]; -} { module="kdeutils"; split=true; @@ -208,6 +201,7 @@ sane="kde_baseapps"; split=true; { name="konsole"; } ]; } +{ module="kactivities"; split=false;} { module="kdeadmin"; split=false; pkgs=[ { name="strigi-analyzer"; sane="strigi_analyzer";} diff --git a/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh index 910394fb6a3..ef8189cb7c5 100755 --- a/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh +++ b/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh @@ -34,6 +34,7 @@ fi eval `xsltproc kde-submodules.xslt kde_projects.xml` module[kde-baseapps]=kde-baseapps +unset module[kactivities] print_sane() { echo "Called print_sane $1" >&2 From 1f0c154676f05c3144bf557fbea0aef71bd5f72b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 7 Jan 2012 00:02:36 +0000 Subject: [PATCH 3/3] Make test-eval-release happy svn path=/nixpkgs/trunk/; revision=31389 --- pkgs/desktops/kde-4.8/kactivities.nix | 9 +++++++++ pkgs/desktops/kde-4.8/kde-package/4.7.97.nix | 1 - pkgs/desktops/kde-4.8/kdeedu/analitza.nix | 8 ++++++++ .../desktops/kde-4.8/kdesdk/dolphin-plugins-bazaar.nix | 10 ++++++++++ pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-hg.nix | 10 ++++++++++ pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix | 9 +++++++++ 6 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/kde-4.8/kactivities.nix create mode 100644 pkgs/desktops/kde-4.8/kdeedu/analitza.nix create mode 100644 pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-bazaar.nix create mode 100644 pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-hg.nix create mode 100644 pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix diff --git a/pkgs/desktops/kde-4.8/kactivities.nix b/pkgs/desktops/kde-4.8/kactivities.nix new file mode 100644 index 00000000000..67ff8cd8984 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kactivities.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + propagatedBuildInputs = [ kdelibs ]; + + meta = { + description = "KDE activities library and daemon"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix b/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix index 8a805708276..b833ba6fc40 100644 --- a/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix +++ b/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix @@ -229,7 +229,6 @@ sane="kde_baseapps"; split=true; ]; } -{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;} { module="kdegames"; split=false;} { module="kdelibs"; split=false;} { module="kdemultimedia"; split=false;} diff --git a/pkgs/desktops/kde-4.8/kdeedu/analitza.nix b/pkgs/desktops/kde-4.8/kdeedu/analitza.nix new file mode 100644 index 00000000000..74c3a1ebb20 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeedu/analitza.nix @@ -0,0 +1,8 @@ +{ kde, kdelibs, readline }: +kde { + buildInputs = [ kdelibs readline ]; + + meta = { + description = "Library part of KAlgebra"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-bazaar.nix b/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-bazaar.nix new file mode 100644 index 00000000000..8032b89ff54 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-bazaar.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, kde_baseapps }: + +kde { + # Needs kdebase for libkonq + buildInputs = [ kdelibs kde_baseapps ]; + + meta = { + description = "Svn plugin for dolphin"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-hg.nix b/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-hg.nix new file mode 100644 index 00000000000..8032b89ff54 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-hg.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, kde_baseapps }: + +kde { + # Needs kdebase for libkonq + buildInputs = [ kdelibs kde_baseapps ]; + + meta = { + description = "Svn plugin for dolphin"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix b/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix new file mode 100644 index 00000000000..be562db9277 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, qca2 }: + +kde { + buildInputs = [ kdelibs qca2 ]; + + meta = { + description = "KDE implementation of SecretsService"; + }; +}