Merge branch 'master' into x-updates

Conflicts (easy): pkgs/desktops/xfce/core/xfdesktop.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/pango/default.nix
2013-03-17 11:28:28 +01:00
parent 516133a4fd 8acaea6d57
commit b1eeae8cac
108 changed files with 1216 additions and 365 deletions
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
  p_name  = "xfdesktop";
  ver_maj = "4.10";
-  ver_min = "1";
+  ver_min = "2";

  src = fetchurl {
    url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "1bfl2xzmci7vqwwz2k2gp7ykysjnq9dcwpnzkwbpv5hv3qwgx0r8";
+    sha256 = "0zbrvfj4fxnjz593brxjsjy9pv5bbf12jnbydy4pwc1ya6zf19j9";
  };
  name = "${p_name}-${ver_maj}.${ver_min}";