Merge remote-tracking branch 'prism/master'

2 files changed, 5 insertions, 5 deletions

diff --git a/krebs/5pkgs/haskell/xmonad-stockholm.nix b/krebs/5pkgs/haskell/xmonad-stockholm.nix
index 954cfd76..7f6bb299 100644
--- a/krebs/5pkgs/haskell/xmonad-stockholm.nix
+++ b/krebs/5pkgs/haskell/xmonad-stockholm.nix
@@ -1,16 +1,16 @@
-{ mkDerivation, base, containers, fetchgit, stdenv, X11, X11-xshape
+{ mkDerivation, base, containers, fetchgit, stdenv, X11, X11-xft, X11-xshape
 , xmonad, xmonad-contrib
 }:
 mkDerivation rec {
   pname = "xmonad-stockholm";
-  version = "1.1.1";
+  version = "1.2.0";
   src = fetchgit {
     url = http://cgit.ni.krebsco.de/xmonad-stockholm;
     rev = "refs/tags/v${version}";
-    sha256 = "05nnfg6q35z3qgf507qa80bz32jl4k719dl5phlmchplp3769585";
+    sha256 = "13mvmh3kk9a79l1nii028p0n7l95pb78wz9c4j42l90m02mg6cis";
   };
   libraryHaskellDepends = [
-    base containers X11 X11-xshape xmonad xmonad-contrib
+    base containers X11 X11-xft X11-xshape xmonad xmonad-contrib
   ];
   license = stdenv.lib.licenses.mit;
 }
diff --git a/krebs/5pkgs/simple/Reaktor/plugins.nix b/krebs/5pkgs/simple/Reaktor/plugins.nix
index db578c45..c6e60147 100644
--- a/krebs/5pkgs/simple/Reaktor/plugins.nix
+++ b/krebs/5pkgs/simple/Reaktor/plugins.nix
@@ -165,7 +165,7 @@ rec {
   };
 
   task-delete = buildSimpleReaktorPlugin "task-delete" {
-    pattern = "^task-remove: (?P<args>.*)$$";
+    pattern = "^task-delete: (?P<args>.*)$$";
     script = pkgs.writeDash "task-delete" ''
         ${pkgs.taskwarrior}/bin/task rc:${taskrcFile} delete "$*"
       '';