Author: urkud
Date: Mon Sep 13 14:22:51 2010
New Revision: 23752
URL: https://svn.nixos.org/websvn/nix/?rev=23752&sc=1
Log:
Upgrade&split kdeartwork
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/aurorae.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/color-schemes.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/desktop-themes.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/emoticons.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/high-resolution-wallpapers.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/nuvola-icon-theme.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/phase-style.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/sounds.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/wallpapers.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/weather-wallpapers.nix
Deleted:
nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/default.nix
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/kde-package/manifest.nix
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/aurorae.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/aurorae.nix Mon Sep 13
14:22:51 2010 (r23752)
@@ -0,0 +1,14 @@
+{ cmake, kde, automoc4, kdelibs }:
+
+kde.package rec {
+ name = "aurorae-themes-${meta.kde.version}";
+
+ buildInputs = [ cmake automoc4 kdelibs ];
+ meta = {
+ kde = {
+ name = "aurorae";
+ module = "kdeartwork";
+ version = "4.5.1";
+ };
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/color-schemes.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/color-schemes.nix Mon Sep
13 14:22:51 2010 (r23752)
@@ -0,0 +1,15 @@
+{ cmake, kde, automoc4, kdelibs }:
+
+kde.package rec {
+ name = "kde-color-schemes-${meta.kde.version}";
+
+ buildInputs = [ cmake automoc4 kdelibs ];
+ meta = {
+ description = "Additional KDE color schemes";
+ kde = {
+ name = "ColorSchemes";
+ module = "kdeartwork";
+ version = "4.5.1";
+ };
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/desktop-themes.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/desktop-themes.nix Mon Sep
13 14:22:51 2010 (r23752)
@@ -0,0 +1,15 @@
+{ cmake, kde, automoc4, kdelibs }:
+
+kde.package rec {
+ name = "kde-desktop-themes-${meta.kde.version}";
+
+ buildInputs = [ cmake automoc4 kdelibs ];
+ meta = {
+ description = "Additional KDE desktop themes";
+ kde = {
+ name = "desktopthemes";
+ module = "kdeartwork";
+ version = "4.5.1";
+ };
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/emoticons.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/emoticons.nix Mon Sep 13
14:22:51 2010 (r23752)
@@ -0,0 +1,15 @@
+{ cmake, kde, automoc4, kdelibs }:
+
+kde.package rec {
+ name = "kde-emotion-icons-${meta.kde.version}";
+
+ buildInputs = [ cmake automoc4 kdelibs ];
+ meta = {
+ description = "Additional KDE emotion icons (smiles)";
+ kde = {
+ name = "emoticons";
+ module = "kdeartwork";
+ version = "4.5.1";
+ };
+ };
+}
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/high-resolution-wallpapers.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/high-resolution-wallpapers.nix
Mon Sep 13 14:22:51 2010 (r23752)
@@ -0,0 +1,15 @@
+{ cmake, kde, automoc4, kdelibs }:
+
+kde.package rec {
+ name = "kde-wallpapers-high-resolution-${meta.kde.version}";
+
+ buildInputs = [ cmake automoc4 kdelibs ];
+ meta = {
+ description = "KDE wallpapers in high resolution";
+ kde = {
+ name = "HighResolutionWallpapers";
+ module = "kdeartwork";
+ version = "4.5.1";
+ };
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix Mon Sep
13 14:22:51 2010 (r23752)
@@ -0,0 +1,14 @@
+{ cmake, kde, automoc4, kdelibs, xscreensaver, kdebase_workspace, eigen }:
+
+kde.package rec {
+ buildInputs = [ cmake automoc4 kdelibs xscreensaver kdebase_workspace ];
+ meta = {
+ description = "KDE screen saver and savers";
+ kde = {
+ name = "kscreensaver";
+ module = "kdeartwork";
+ version = "1.0";
+ release = "4.5.1";
+ };
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/nuvola-icon-theme.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/nuvola-icon-theme.nix Mon Sep
13 14:22:51 2010 (r23752)
@@ -0,0 +1,16 @@
+{ cmake, kde, automoc4, kdelibs }:
+
+kde.package rec {
+ name = "nuvola-icon-theme-${meta.kde.version}";
+# Sources contain primary and kdeclassic as well but they're not installed
+
+ buildInputs = [ cmake automoc4 kdelibs ];
+ meta = {
+ description = "KDE nuvola icon theme";
+ kde = {
+ name = "IconThemes";
+ module = "kdeartwork";
+ version = "4.5.1";
+ };
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/phase-style.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/phase-style.nix Mon Sep 13
14:22:51 2010 (r23752)
@@ -0,0 +1,15 @@
+{ cmake, kde, automoc4, kdelibs }:
+
+kde.package rec {
+ name = "kde-style-phase-${meta.kde.version}";
+
+ buildInputs = [ cmake automoc4 kdelibs ];
+ meta = {
+ description = "KDE phase style. Clean classical look";
+ kde = {
+ name = "styles";
+ module = "kdeartwork";
+ version = "4.5.1";
+ };
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/sounds.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/sounds.nix Mon Sep 13
14:22:51 2010 (r23752)
@@ -0,0 +1,15 @@
+{ cmake, kde, automoc4, kdelibs }:
+
+kde.package rec {
+ name = "kde-sounds-${meta.kde.version}";
+
+ buildInputs = [ cmake automoc4 kdelibs ];
+ meta = {
+ description = "New login/logout sounds";
+ kde = {
+ name = "sounds";
+ module = "kdeartwork";
+ version = "4.5.1";
+ };
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/wallpapers.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/wallpapers.nix Mon Sep 13
14:22:51 2010 (r23752)
@@ -0,0 +1,15 @@
+{ cmake, kde, automoc4, kdelibs }:
+
+kde.package rec {
+ name = "kde-wallpapers-${meta.kde.version}";
+
+ buildInputs = [ cmake automoc4 kdelibs ];
+ meta = {
+ description = "Additional KDE wallpapers";
+ kde = {
+ name = "wallpapers";
+ module = "kdeartwork";
+ version = "4.5.1";
+ };
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/weather-wallpapers.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/weather-wallpapers.nix Mon Sep
13 14:22:51 2010 (r23752)
@@ -0,0 +1,15 @@
+{ cmake, kde, automoc4, kdelibs }:
+
+kde.package rec {
+ name = "kde-weather-wallpapers-${meta.kde.version}";
+
+ buildInputs = [ cmake automoc4 kdelibs ];
+ meta = {
+ description = "Additional KDE wallpapers (weather)";
+ kde = {
+ name = "WeatherWallpapers";
+ module = "kdeartwork";
+ version = "4.5.1";
+ };
+ };
+}
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Mon Sep 13 14:22:43
2010 (r23751)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Mon Sep 13 14:22:51
2010 (r23752)
@@ -60,7 +60,20 @@
};
kdeadmin = callPackage ./admin { };
- kdeartwork = callPackage ./artwork { };
+ kdeartwork = {
+ recurseForDerivations = true;
+ aurorae = callPackage ./artwork/aurorae.nix { };
+ colorSchemes = callPackage ./artwork/color-schemes.nix { };
+ desktop_themes = callPackage ./artwork/desktop-themes.nix { };
+ emoticons = callPackage ./artwork/emoticons.nix { };
+ high_resolution_wallpapers = callPackage
./artwork/high-resolution-wallpapers.nix { };
+ wallpapers = callPackage ./artwork/wallpapers.nix { };
+ nuvola_icon_theme = callPackage ./artwork/nuvola-icon-theme.nix { };
+ sounds = callPackage ./artwork/sounds.nix { };
+ weather_wallpapers = callPackage ./artwork/weather-wallpapers.nix { };
+ phase_style = callPackage ./artwork/phase-style.nix { };
+ kscreensaver = callPackage ./artwork/kscreensaver.nix { };
+ };
kdeedu = callPackage ./edu { };
kdegames = callPackage ./games { };
kdegraphics = callPackage ./graphics { };
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/kde-package/manifest.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/kde-package/manifest.nix Mon Sep
13 14:22:43 2010 (r23751)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/kde-package/manifest.nix Mon Sep
13 14:22:51 2010 (r23752)
@@ -124,4 +124,8 @@
name = "kdebindings-4.5.1.tar.bz2";
value = "1j8bf7lwb70jc0m8d2hh6c1z6vgpxbqf47w5pkq58kgan8y3zcsw";
}
+{
+ name = "kdeartwork-4.5.1.tar.bz2";
+ value = "0fjcx6wwgzxl64s62wv2sf15plx49fck86nwzfbgbmdha1ra2gmi";
+}
]
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
