From ab98a1be65369ae3c06de8f6219275e882f08fa7 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 2 Nov 2017 21:43:32 +0100
Subject: tv: RIP wvdial

---
 tv/5pkgs/default.nix | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'tv/5pkgs')

diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 261871e6..82474ade 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -33,13 +33,4 @@ foldl' mergeAttrs {}
   '';
 
   gnupg = self.gnupg22;
-
-  # https://github.com/NixOS/nixpkgs/issues/16113
-  wvdial = let
-    nixpkgs-1509 = import (self.fetchFromGitHub {
-      owner = "NixOS"; repo = "nixpkgs-channels";
-      rev = "91371c2bb6e20fc0df7a812332d99c38b21a2bda";
-      sha256 = "1as1i0j9d2n3iap9b471y4x01561r2s3vmjc5281qinirlr4al73";
-    }) {};
-  in nixpkgs-1509.wvdial;
 }
-- 
cgit v1.2.3


From 2409647272b5c1c332b48ba8263bd237296f2c69 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 11 Nov 2017 23:47:52 +0100
Subject: tv xmonad: make XMONAD_STARTUP_HOOK optional

---
 tv/5pkgs/simple/xmonad-tv/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'tv/5pkgs')

diff --git a/tv/5pkgs/simple/xmonad-tv/default.nix b/tv/5pkgs/simple/xmonad-tv/default.nix
index f73175bb..94554f57 100644
--- a/tv/5pkgs/simple/xmonad-tv/default.nix
+++ b/tv/5pkgs/simple/xmonad-tv/default.nix
@@ -3,6 +3,7 @@ pkgs.writeHaskell "xmonad-tv" {
   executables.xmonad = {
     extra-depends = [
       "containers"
+      "extra"
       "unix"
       "X11"
       "xmonad"
@@ -19,11 +20,12 @@ pkgs.writeHaskell "xmonad-tv" {
 module Main where
 
 import Control.Exception
+import Control.Monad.Extra (whenJustM)
 import Graphics.X11.ExtraTypes.XF86
 import Text.Read (readEither)
 import XMonad
 import System.IO (hPutStrLn, stderr)
-import System.Environment (getArgs, withArgs, getEnv, getEnvironment)
+import System.Environment (getArgs, withArgs, getEnv, getEnvironment, lookupEnv)
 import System.Posix.Process (executeFile)
 import XMonad.Actions.DynamicWorkspaces ( addWorkspacePrompt, renameWorkspace
                                         , removeEmptyWorkspace)
@@ -84,9 +86,9 @@ mainNoArgs = do
             -- , handleEventHook   = myHandleEventHooks <+> handleTimerEvent
             --, handleEventHook   = handleTimerEvent
             , manageHook        = placeHook (smart (1,0)) <+> floatNextHook
-            , startupHook = do
-                path <- liftIO (getEnv "XMONAD_STARTUP_HOOK")
-                forkFile path [] Nothing
+            , startupHook =
+                whenJustM (liftIO (lookupEnv "XMONAD_STARTUP_HOOK"))
+                          (\path -> forkFile path [] Nothing)
             , normalBorderColor  = "#1c1c1c"
             , focusedBorderColor = "#f000b0"
             , handleEventHook = handleShutdownEvent
-- 
cgit v1.2.3