Author: urkud
Date: Sun Oct 10 07:39:01 2010
New Revision: 24192
URL: https://svn.nixos.org/websvn/nix/?rev=24192&sc=1
Log:
Switch to kde-4.5 by default
Modified:
nixpkgs/trunk/pkgs/data/misc/shared-desktop-ontologies/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/data/misc/shared-desktop-ontologies/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/data/misc/shared-desktop-ontologies/default.nix Sun Oct
10 05:03:07 2010 (r24191)
+++ nixpkgs/trunk/pkgs/data/misc/shared-desktop-ontologies/default.nix Sun Oct
10 07:39:01 2010 (r24192)
@@ -1,15 +1,10 @@
-{stdenv, fetchurl, cmake, v ? "0.2"}:
+{stdenv, fetchurl, cmake}:
stdenv.mkDerivation rec {
- name = "shared-desktop-ontologies-${v}";
+ name = "shared-desktop-ontologies-0.5";
src = fetchurl {
url = "mirror://sf/oscaf/${name}.tar.bz2";
- sha256 =
- if v == "0.2" then
- "1w9gfprrp518hb7nm5wspxjd7xx0h08bph6asrx5vrx7j7fzg4m7"
- else if v == "0.5" then
- "1a1gs2b314133rg7vzwvnqbxchf7xgs0jpkydid5l2wz98m7j17r"
- else throw "Unknown version";
+ sha256 = "1a1gs2b314133rg7vzwvnqbxchf7xgs0jpkydid5l2wz98m7j17r";
};
buildInputs = [ cmake ];
meta = with stdenv.lib; {
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Oct 10 05:03:07
2010 (r24191)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Oct 10 07:39:01
2010 (r24192)
@@ -3703,7 +3703,7 @@
mysqlSupport = true;
};
- qt4 = qt46;
+ qt4 = pkgs.kde4.qt4;
qt45 = callPackage ../development/libraries/qt-4.x/4.5 {
inherit (gnome) glib;
@@ -6697,21 +6697,16 @@
kde4 = kde44;
- kde44 = makeOverridable (import ../desktops/kde-4.4) (pkgs // {
- qt4 = pkgs.qt46;
- stdenv = pkgs.stdenv2;
- });
+ kde44 = makeOverridable (import ../desktops/kde-4.4) (
+ applyGlobalOverrides (p: { kde4 = p.kde44; qt4 = p.qt46; }) //
+ { stdenv = pkgs.stdenv2; });
kde45 = callPackage ../desktops/kde-4.5 {
- callPackage = newScope ({
- qjson = pkgs.qjson.override { inherit (pkgs.kde45) qt4; };
- pyqt4 = pkgs.pyqt4.override { inherit (pkgs.kde45) qt4; };
- libdbusmenu_qt = pkgs.libdbusmenu_qt.override { inherit (pkgs.kde45)
qt4; };
- libktorrent = pkgs.libktorrent.override {
- inherit (pkgs.kde45) qt4 kdelibs;
- };
- shared_desktop_ontologies = pkgs.shared_desktop_ontologies.override { v
= "0.5"; };
- } // pkgs.kde45);
+ callPackage =
+ let
+ pkgs_for_45 = (applyGlobalOverrides (p: { kde4 = p.kde45; }));
+ in
+ pkgs_for_45.newScope pkgs_for_45.kde45;
stdenv = pkgs.stdenv2;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
