7 files changed, 58 insertions, 23 deletions
diff --git a/pkgs/haskell/blessings.nix b/pkgs/haskell/blessings.nix
new file mode 100644
index 0000000..65661aa
--- /dev/null
+++ b/pkgs/haskell/blessings.nix
@@ -0,0 +1,16 @@
+{ mkDerivation, base, bytestring, fetchgit, hspec, QuickCheck, lib, mylib, text }:
+
+mkDerivation {
+  pname = "blessings";
+  version = "2.3.0";
+  src = fetchgit {
+    url = http://cgit.ni.krebsco.de/blessings;
+    rev = "refs/tags/v2.3.0";
+    hash = "sha256-fS79UOHBMfJHyz7E0Rx4lKZSZOD2G99h2zuDT+SOUJQ=";
+  };
+  libraryHaskellDepends = [ base bytestring text ];
+  testHaskellDepends = [ base hspec QuickCheck ];
+  doHaddock = false;
+  # WTFPL is the true license, which is unknown to cabal.
+  license = lib.licenses.wtfpl;
+}
diff --git a/pkgs/haskell/desktop-pager.nix b/pkgs/haskell/desktop-pager.nix
index 3b96159..8301235 100644
--- a/pkgs/haskell/desktop-pager.nix
+++ b/pkgs/haskell/desktop-pager.nix
@@ -1,15 +1,15 @@
 { mkDerivation, aeson, base, blessings, bytestring, containers
 , data-default, extra, fetchgit, hack, lib, optparse-applicative
-, probability, scanner, speculate, split, terminal-size, text, unix
-, utf8-string, X11
+, probability, speculate, split, terminal-scanner, terminal-size
+, text, unix, utf8-string, X11
 }:
 mkDerivation {
   pname = "desktop-pager";
   version = "1.0.0";
   src = fetchgit {
     url = "https://cgit.krebsco.de/desktop-pager";
-    sha256 = "11v4f2sz6p69fx2804w0akb8xqv56g89chjyx77jhwqcng2bn6pw";
-    rev = "0894fbe50ee2f63b510d32ab8c524134e450f20d";
+    sha256 = "1hb8an31szwx9zixzb1m7219jrz3cdz57phf45r4b3n6qrzcn35l";
+    rev = "3919fb8adc06134a304d4fcbcd192c8707c06cbd";
     fetchSubmodules = true;
   };
   isLibrary = true;
@@ -17,7 +17,7 @@ mkDerivation {
   libraryHaskellDepends = [ base extra utf8-string X11 ];
   executableHaskellDepends = [
     aeson base blessings bytestring containers data-default hack
-    optparse-applicative probability scanner speculate split
+    optparse-applicative probability speculate split terminal-scanner
     terminal-size text unix X11
   ];
   license = lib.licenses.mit;
diff --git a/pkgs/haskell/hack.nix b/pkgs/haskell/hack.nix
index f1b22b5..0eb0232 100644
--- a/pkgs/haskell/hack.nix
+++ b/pkgs/haskell/hack.nix
@@ -1,13 +1,14 @@
 { mkDerivation, base, blessings, containers, data-default, fetchgit
-, lens, lib, mtl, old-locale, process, input-scanner, time, unix, zippers
+, lens, lib, mtl, old-locale, process, terminal-scanner, time, unix
+, zippers
 }:
 mkDerivation {
   pname = "hack";
-  version = "1.0.2";
+  version = "1.0.3";
   src = fetchgit {
     url = "https://cgit.krebsco.de/hack";
-    hash = "sha256-QHSGF4wFwLyn8W8jYbN1QajMnmQqUI+7VWk7yVvJgIg=";
-    rev = "refs/tags/1.0.2";
+    sha256 = "04vxcfm204sxn3v48ch27srgqgpiqbm9i82lrmgp1yyx84wchq32";
+    rev = "a6fc1e51f1f87a7cc485a47000f23f1f054beb95";
     fetchSubmodules = true;
   };
   isLibrary = true;
@@ -15,7 +16,8 @@ mkDerivation {
   libraryHaskellDepends = [ base ];
   executableHaskellDepends = [
     base blessings containers data-default lens mtl old-locale process
-    input-scanner time unix zippers
+    terminal-scanner time unix zippers
   ];
   license = lib.licenses.mit;
+  mainProgram = "hack";
 }
diff --git a/pkgs/haskell/much.nix b/pkgs/haskell/much.nix
index 865294d..9744a25 100644
--- a/pkgs/haskell/much.nix
+++ b/pkgs/haskell/much.nix
@@ -3,17 +3,17 @@
 , containers, data-default, deepseq, directory, either
 , email-header, fetchgit, filepath, friendly-time, http-types
 , hyphenation, lib, linebreak, network, old-locale
-, optparse-applicative, process, random, rosezipper, safe, scanner
-, servant-server, split, terminal-size, text, time, transformers
-, transformers-compat, unix, vector, wai, warp
+, optparse-applicative, process, random, rosezipper, safe
+, servant-server, split, terminal-scanner, terminal-size, text
+, time, transformers, transformers-compat, unix, vector, wai, warp
 }:
 mkDerivation rec {
   pname = "much";
   version = "1.3.2";
   src = fetchgit {
     url = "https://cgit.krebsco.de/much";
-    hash = "sha256-q65EYO1d3NYVv2NECkGWPb1TyHGdARNi/GX4pgQmljc=";
-    rev = "refs/tags/${version}";
+    sha256 = "001lvn4f3pgxwq0fgxvk0jl33r54gvh908r6wx02fw4s6b3sysc0";
+    rev = "3a0fe1da7c33b024128079f5810c6a99b25aebe7";
     fetchSubmodules = true;
   };
   isLibrary = true;
@@ -23,14 +23,15 @@ mkDerivation rec {
     bytestring case-insensitive containers data-default deepseq
     directory either email-header filepath friendly-time http-types
     hyphenation linebreak network old-locale optparse-applicative
-    process random rosezipper safe scanner servant-server split
-    terminal-size text time transformers transformers-compat unix
-    vector wai warp
+    process random rosezipper safe servant-server split
+    terminal-scanner terminal-size text time transformers
+    transformers-compat unix vector wai warp
   ];
   executableHaskellDepends = [
     aeson base blessings bytestring case-insensitive containers
     data-default deepseq directory filepath hyphenation linebreak
-    process rosezipper safe scanner text time transformers unix
+    process rosezipper safe terminal-scanner text time transformers
+    unix
   ];
   license = lib.licenses.mit;
 }
diff --git a/pkgs/haskell/terminal-scanner.nix b/pkgs/haskell/terminal-scanner.nix
new file mode 100644
index 0000000..4801df7
--- /dev/null
+++ b/pkgs/haskell/terminal-scanner.nix
@@ -0,0 +1,13 @@
+{ mkDerivation, base, fetchgit, lib }:
+mkDerivation {
+  pname = "terminal-scanner";
+  version = "1.0.1";
+  src = fetchgit {
+    url = "https://cgit.krebsco.de/terminal-scanner";
+    sha256 = "1ic8j2nlhmy76fnqji277wsl1cikd9y4lwqqcxzldjx1vi61r13r";
+    rev = "3c5301303230f563214c5ff003f9fc8e2e0a7199";
+    fetchSubmodules = true;
+  };
+  libraryHaskellDepends = [ base ];
+  license = lib.licenses.mit;
+}
diff --git a/pkgs/haskell/xmonad-tv/src/main.hs b/pkgs/haskell/xmonad-tv/src/main.hs
index e3090a3..711f9eb 100644
--- a/pkgs/haskell/xmonad-tv/src/main.hs
+++ b/pkgs/haskell/xmonad-tv/src/main.hs
@@ -73,7 +73,8 @@ mainNoArgs = do
     myMasterDelta <- readEnv' (1 / 20) "XMONAD_MASTER_DELTA" :: IO Rational
     myMasterWidth <- readEnv' (1 / 2) "XMONAD_MASTER_WIDTH" :: IO Rational
     myScreenGaps <- readEnv' [] "XMONAD_SCREEN_GAPS" :: IO [Int]
-    myScreenWidth <- readEnv "XMONAD_SCREEN_WIDTH" :: IO Dimension
+    myScreenWidth <-
+      bracket (getEnv "DISPLAY" >>= openDisplay) closeDisplay (return . widthOfScreen . defaultScreenOfDisplay)
     handleShutdownEvent <- newShutdownEventHandler
     config <-
       ewmhExtra
@@ -151,7 +152,9 @@ myKeys conf = Map.fromList $
     , ((_4S , xK_c      ), kill)
 
     , ((_4  , xK_o      ), forkFile {-pkg:fzmenu-}"otpmenu" [] Nothing)
+    , ((_4C , xK_o      ), forkFile {-pkg:fzmenu-}"otpmenu" ["--phase2-method=copy"] Nothing)
     , ((_4  , xK_p      ), forkFile {-pkg:fzmenu-}"passmenu" [] Nothing)
+    , ((_4C , xK_p      ), forkFile {-pkg:fzmenu-}"passmenu" ["--phase2-method=copy"] Nothing)
 
     , ((_4  , xK_x      ), forkFile {-pkg:alacritty-tv-}"alacritty" ["--singleton"] Nothing)
     , ((_4C , xK_x      ), spawnRootTerm)
diff --git a/pkgs/haskell/xoutinfo.nix b/pkgs/haskell/xoutinfo.nix
index 64b6f87..fc983d6 100644
--- a/pkgs/haskell/xoutinfo.nix
+++ b/pkgs/haskell/xoutinfo.nix
@@ -1,11 +1,11 @@
 { mkDerivation, aeson, base, bytestring, fetchgit, lib, X11 }:
 mkDerivation {
   pname = "xoutinfo";
-  version = "0.1.0.0";
+  version = "0.1.1.0";
   src = fetchgit {
     url = "https://cgit.ni.krebsco.de/xoutinfo";
-    sha256 = "1g3s9vyy7bpsl2zjiq6kk16c8hhf3n2yz4lv3ic0qy0n6wn6qqi8";
-    rev = "cf7377886a55e36701bd0d5ce7c723aa6d7bd9bd";
+    hash = "sha256-QSyCal5E7O1JBlZ7OV3aM8j68YozKyKgYhL2HYFTsvg=";
+    rev = "0.1.1.0";
     fetchSubmodules = true;
   };
   isLibrary = false;