From 91d2796882cbe5325e2ad51e35ae0265e6b763d8 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 28 Feb 2017 19:44:51 -0800 Subject: [PATCH] [XMonad] Fix stack build --- dotfiles/xmonad/build | 3 +++ dotfiles/xmonad/imalison-xmonad.cabal | 6 +++--- dotfiles/xmonad/stack.yaml | 7 +++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dotfiles/xmonad/build b/dotfiles/xmonad/build index 15db2531..3159b712 100755 --- a/dotfiles/xmonad/build +++ b/dotfiles/xmonad/build @@ -12,5 +12,8 @@ output_file=$1; shift ################################################################################ cd $SRC_DIR +stack install alex +stack install gtk2hs-buildtools + stack build mv -u `stack path --dist-dir`/build/$EXE_NAME/$EXE_NAME $output_file diff --git a/dotfiles/xmonad/imalison-xmonad.cabal b/dotfiles/xmonad/imalison-xmonad.cabal index b0f439ee..e1de8db6 100644 --- a/dotfiles/xmonad/imalison-xmonad.cabal +++ b/dotfiles/xmonad/imalison-xmonad.cabal @@ -13,7 +13,7 @@ cabal-version: >=1.10 executable imalison-xmonad main-is: xmonad.hs - build-depends: X11>=1.7, + build-depends: X11>=1.8, aeson>=0.11.2.1, base >=4.9 && <4.10, bytestring>=0.10.8.1, @@ -25,7 +25,7 @@ executable imalison-xmonad multimap>=1.2.1, taffybar>=0.4.6, transformers>=0.5.2.0, - xmonad-contrib>=0.12, - xmonad>=0.12 + xmonad-contrib>=0.13, + xmonad>=0.13 hs-source-dirs: . default-language: Haskell2010 diff --git a/dotfiles/xmonad/stack.yaml b/dotfiles/xmonad/stack.yaml index c1f1c317..4e30ac50 100644 --- a/dotfiles/xmonad/stack.yaml +++ b/dotfiles/xmonad/stack.yaml @@ -4,7 +4,7 @@ packages: - '.' - location: git: git@github.com:IvanMalison/xmonad.git - commit: f2da028ff96698289a31a44bdbaea97c53aa01aa + commit: 76f4a162587a8c6b58afe3d76341336cfe3c9aa3 - location: git: git@github.com:IvanMalison/xmonad-contrib.git commit: 5ec639b4dbc359634e893bcae59dae3b71b2e34a @@ -12,7 +12,10 @@ packages: git: git@github.com:IvanMalison/taffybar.git commit: 3570bdbd87a5464d7280d8750c5c153cf3dcc637 extra-deps: -- X11-1.7 +- X11-1.8 - X11-xft-0.3.1 - gtk-traymanager-0.1.6 +- xmonad-0.13 +- xmonad-contrib-0.13 +- taffybar-0.4.6 resolver: lts-7.5