svn merge ^/nixpkgs/trunk

Conflicts: openssl, libplist

svn path=/nixpkgs/branches/stdenv-updates/; revision=31337

3 files changed, 62 insertions, 4 deletions

diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
new file mode 100644
index 000000000000..924139dc32e8
--- /dev/null
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -0,0 +1,35 @@
+{stdenv, fetchurl, makeWrapper, perl, pkgconfig, webkit, gtk, libX11, libsoup,
+glib_networking}:
+
+stdenv.mkDerivation {
+  name = "vimprobable2-0.9.11.2";
+  src = fetchurl {
+    url = "mirror://sourceforge/vimprobable/vimprobable2_0.9.11.2.tar.bz2";
+    sha256 = "017qwhndchmpsn2g38v85rjx00fss69aa1nmgj3v85k5zskv7z65";
+  };
+  buildInputs = [ makeWrapper perl pkgconfig libX11 libsoup webkit gtk ];
+  installPhase = ''
+    make PREFIX=/ DESTDIR=$out install
+    wrapProgram "$out/bin/vimprobable2" --prefix GIO_EXTRA_MODULES : \
+      ${glib_networking}/lib/gio/modules
+  '';
+
+  meta = {
+    description = ''
+      Vimprobable is a web browser that behaves like the Vimperator plugin
+      available for Mozilla Firefox
+    '';
+    longDescription = ''
+      Vimprobable is a web browser that behaves like the Vimperator plugin
+      available for Mozilla Firefox. It is based on the WebKit engine (using
+      GTK bindings). The goal of Vimprobable is to build a completely
+      keyboard-driven, efficient and pleasurable browsing-experience. Its
+      featureset might be considered "minimalistic", but not as minimalistic as
+      being completely featureless. 
+    '';
+    homepage = "http://sourceforge.net/apps/trac/vimprobable";
+    license = "MIT";
+    maintainers = ["Alexander Foremny <alexanderforemny@googlemail.com>"];
+  };
+}
+
diff --git a/pkgs/applications/office/basket/default.nix b/pkgs/applications/office/basket/default.nix
new file mode 100644
index 000000000000..fff93ba99695
--- /dev/null
+++ b/pkgs/applications/office/basket/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, cmake, gettext, kdelibs, qimageblitz, kdepimlibs, gpgme }:
+
+stdenv.mkDerivation rec {
+  name = "basket-1.81";
+
+  src = fetchurl {
+    url = "http://basket.kde.org/downloads/${name}.tar.bz2";
+    sha256 = "10zxlgz96iwmqz30sw6f20pzjmnjvqhx7b5ihfwz47agyfdb98v0";
+  };
+
+  KDEDIRS = kdepimlibs;
+
+  buildInputs = [ kdelibs qimageblitz kdepimlibs gpgme ];
+
+  buildNativeInputs = [ cmake gettext ];
+  
+  meta = {
+    description = "A multi-purpose note-taking application";
+    homepage = http://basket.kde.org/;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    inherit (kdelibs.meta) platforms;
+  };
+}
diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix
index 1427eec54f6c..db4692683507 100644
--- a/pkgs/applications/window-managers/dwm/default.nix
+++ b/pkgs/applications/window-managers/dwm/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, libX11, libXinerama, patches ? []}:
 
 stdenv.mkDerivation rec {
-  name = "dwm-5.9";
+  name = "dwm-6.0";
  
   src = fetchurl {
     url = "http://dl.suckless.org/dwm/${name}.tar.gz";
-    sha256 = "0cp25zqgaqj5k1mlvgxnc5jqi252chqjc5v0fzpqbhrklaidbk9d";
+    sha256 = "0mpbivy9j80l1jqq4bd4g4z8s5c54fxrjj44avmfwncjwqylifdj";
   };
  
   buildInputs = [ libX11 libXinerama ];
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
  
   meta = {
     homepage = "www.suckless.org";
-    description = "dynamic window manager for X";
-    license="MIT";
+    description = "Dynamic window manager for X";
+    license = "MIT";
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; all;
   };