summary refs log tree commit diff
diff options
context:
space:
mode:
authorEvgeny Egorochkin <phreedom@yandex.ru>2014-02-18 02:58:56 +0200
committerEvgeny Egorochkin <phreedom@yandex.ru>2014-02-18 02:59:13 +0200
commit5174a694006ef1bf338e53163273088da3e12a41 (patch)
tree65362deaffbd64f290acdf42986e8d3f32ac8468
parent53b6744646ecf850de545da5bdb2192b0a911883 (diff)
downloadnixlib-5174a694006ef1bf338e53163273088da3e12a41.tar
nixlib-5174a694006ef1bf338e53163273088da3e12a41.tar.gz
nixlib-5174a694006ef1bf338e53163273088da3e12a41.tar.bz2
nixlib-5174a694006ef1bf338e53163273088da3e12a41.tar.lz
nixlib-5174a694006ef1bf338e53163273088da3e12a41.tar.xz
nixlib-5174a694006ef1bf338e53163273088da3e12a41.tar.zst
nixlib-5174a694006ef1bf338e53163273088da3e12a41.zip
KDE 4.10: add branch info
-rw-r--r--pkgs/desktops/kde-4.10/default.nix5
-rw-r--r--pkgs/desktops/kde-4.10/kde-package/default.nix3
-rw-r--r--pkgs/desktops/kde-4.10/l10n/default.nix3
3 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/desktops/kde-4.10/default.nix b/pkgs/desktops/kde-4.10/default.nix
index f56e64e2d158..feb6ed21409d 100644
--- a/pkgs/desktops/kde-4.10/default.nix
+++ b/pkgs/desktops/kde-4.10/default.nix
@@ -1,9 +1,10 @@
 { callPackage, callPackageOrig, stdenv, qt48, release ? "4.10.5" }:
 
 let
+  branch = "4.10";
   # Need callPackageOrig to avoid infinite cycle
   kde = callPackageOrig ./kde-package {
-    inherit release ignoreList extraSubpkgs callPackage;
+    inherit release branch ignoreList extraSubpkgs callPackage;
   };
 
   # The list of igored individual modules
@@ -64,7 +65,7 @@ kde.modules // kde.individual //
   full = stdenv.lib.attrValues kde.modules;
 
   l10n = callPackage ./l10n {
-    inherit release;
+    inherit release branch;
     inherit (kde.manifest) stable;
   };
 }
diff --git a/pkgs/desktops/kde-4.10/kde-package/default.nix b/pkgs/desktops/kde-4.10/kde-package/default.nix
index 8a6e8e167517..9424a762c8f2 100644
--- a/pkgs/desktops/kde-4.10/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.10/kde-package/default.nix
@@ -1,5 +1,5 @@
 { callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
-, release, ignoreList, extraSubpkgs
+, release, branch, ignoreList, extraSubpkgs
 }:
 
 let
@@ -19,6 +19,7 @@ rec {
   # Default meta attribute
   defMeta = {
     homepage = http://www.kde.org;
+    inherit branch;
     platforms = stdenv.lib.platforms.linux;
     inherit (qt4.meta) maintainers;
   };
diff --git a/pkgs/desktops/kde-4.10/l10n/default.nix b/pkgs/desktops/kde-4.10/l10n/default.nix
index c9fab80bffb4..fa6406043b1b 100644
--- a/pkgs/desktops/kde-4.10/l10n/default.nix
+++ b/pkgs/desktops/kde-4.10/l10n/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kdelibs, gettext, release, stable }:
+{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }:
 
 let
 
@@ -22,6 +22,7 @@ let
 
       meta = {
         description = "KDE translation for ${lang}";
+        inherit branch;
         license = "GPL";
         platforms = stdenv.lib.platforms.linux;
         inherit (kdelibs.meta) maintainers homepage;