From 68427627c4f8b6987073e5856f0ce4efbc30a8a2 Mon Sep 17 00:00:00 2001 From: azahi Date: Thu, 22 Nov 2018 11:38:54 +0300 Subject: Bump stack and apply styling on cabal file --- stack.yaml | 2 +- vendor/xmonad | 2 +- vendor/xmonad-contrib | 2 +- xmonad-ng.cabal | 88 +++++++++++++++++++++++++-------------------------- 4 files changed, 46 insertions(+), 48 deletions(-) diff --git a/stack.yaml b/stack.yaml index 5745134..9700dbb 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-12.17 +resolver: lts-12.19 packages: - . - ./vendor/xmonad diff --git a/vendor/xmonad b/vendor/xmonad index 67d3bb8..554b6a8 160000 --- a/vendor/xmonad +++ b/vendor/xmonad @@ -1 +1 @@ -Subproject commit 67d3bb84792e467c135cc2751a95d80425d32abb +Subproject commit 554b6a8d0c7cbbb65dcf1c55f51bc90873b69e29 diff --git a/vendor/xmonad-contrib b/vendor/xmonad-contrib index 554e635..cb2ab67 160000 --- a/vendor/xmonad-contrib +++ b/vendor/xmonad-contrib @@ -1 +1 @@ -Subproject commit 554e635799986ac30795e97f4e45f84b92e467b3 +Subproject commit cb2ab671590c578f956c9fb8b31597f381fcf241 diff --git a/xmonad-ng.cabal b/xmonad-ng.cabal index a4c7e2a..ad775bb 100644 --- a/xmonad-ng.cabal +++ b/xmonad-ng.cabal @@ -1,58 +1,56 @@ name: xmonad-ng version: 0.15.2 -synopsis: azahi's XMonad configuration -description: azahi's XMonad configuration based on stolen code and bad Haskell knowledge -homepage: https://github.com/azahi/xmonad-ng +synopsis: XMonad configuration +description: XMonad configuration hacked together via stolen code and bad Haskell + knowledge license: BSD3 license-file: LICENSE +copyright: Copyright (c) 2018 azahi author: azahi@teknik.io maintainer: azahi@teknik.io -copyright: Copyright (c) 2018 azahi +stability: experimental category: System +homepage: https://github.com/azahi/xmonad-ng build-type: Simple -stability: experimental cabal-version: >= 1.10 source-repository head - type: git - location: https://github.com/azahi/xmonad-ng + type: git + location: https://github.com/azahi/xmonad-ng executable xmonad-ng - main-is: Main.hs - ghc-options: -Wall - hs-source-dirs: src - default-language: Haskell2010 - - other-extensions: CPP - , DeriveDataTypeable - , LambdaCase - , MultiParamTypeClasses - , TypeSynonymInstances - - other-modules: XMonad.Actions.FloatSnapSpaced - , XMonad.Actions.PerConditionKeys - , XMonad.Custom.Bindings - , XMonad.Custom.Event - , XMonad.Custom.Layout - , XMonad.Custom.Log - , XMonad.Custom.Manage - , XMonad.Custom.Misc - , XMonad.Custom.Navigation - , XMonad.Custom.Projects - , XMonad.Custom.Scratchpads - , XMonad.Custom.Startup - , XMonad.Custom.Theme - , XMonad.Custom.Workspaces - , XMonad.Util.ALSA - - build-depends: X11 >= 1.9 && < 1.10 - , alsa-mixer >= 0.2 && < 0.3 - , base >= 4.11 && < 4.12 - , containers >= 0.5 && < 0.6 - , directory >= 1.3 && < 1.4 - , filepath >= 1.4 && < 1.5 - , mtl >= 2.2 && < 2.3 - , text >= 1.2 && < 1.3 - , time >= 1.8 && < 1.9 - , xmonad >= 0.15 && < 0.16 - , xmonad-contrib >= 0.15 && < 0.16 + main-is: Main.hs + other-modules: XMonad.Actions.FloatSnapSpaced + XMonad.Actions.PerConditionKeys + XMonad.Custom.Bindings + XMonad.Custom.Event + XMonad.Custom.Layout + XMonad.Custom.Log + XMonad.Custom.Manage + XMonad.Custom.Misc + XMonad.Custom.Navigation + XMonad.Custom.Projects + XMonad.Custom.Scratchpads + XMonad.Custom.Startup + XMonad.Custom.Theme + XMonad.Custom.Workspaces + XMonad.Util.ALSA + hs-source-dirs: src + build-depends: base >= 4.11 && < 4.12 + , X11 >= 1.9 && < 1.10 + , alsa-mixer >= 0.2 && < 0.3 + , containers >= 0.5 && < 0.6 + , directory >= 1.3 && < 1.4 + , filepath >= 1.4 && < 1.5 + , mtl >= 2.2 && < 2.3 + , text >= 1.2 && < 1.3 + , time >= 1.8 && < 1.9 + , xmonad >= 0.15 && < 0.16 + , xmonad-contrib >= 0.15 && < 0.16 + default-language: Haskell2010 + other-extensions: MultiParamTypeClasses + CPP + TypeSynonymInstances + DeriveDataTypeable + LambdaCase + ghc-options: -Wall -- cgit 1.4.1