diff options
| author | azahi <azahi@teknik.io> | 2019-10-13 00:37:18 +0300 |
|---|---|---|
| committer | azahi <azahi@teknik.io> | 2019-10-13 00:37:18 +0300 |
| commit | 9d4ef5a7da43808ee659caa4e4df4d53497bd53a (patch) | |
| tree | 806b8891a290ab5462e6f270a0b592655d1456b9 | |
| parent | Add build scripts (diff) | |
fix build script error and update stack
| -rwxr-xr-x[l---------] | build | 19 | ||||
| -rw-r--r-- | stack.yaml | 2 | ||||
| -rw-r--r-- | xmonad-ng.cabal | 12 |
3 files changed, 25 insertions, 8 deletions
diff --git a/build b/build index 38d2cab..aa11764 120000..100755 --- a/build +++ b/build @@ -1 +1,18 @@ -build-scripts/build-cabal \ No newline at end of file +#!/bin/sh -eu + +SRC_DIR="$HOME/.xmonad" +EXE_NAME="xmonad-ng" +OUT="$1" + +shift + +cd "$SRC_DIR" || exit 1 + +cabal new-configure \ + --enable-optimization \ + --enable-executable-stripping + +cabal new-build + +find "$SRC_DIR"/dist-newstyle -type f -executable -name "$EXE_NAME" \ + -exec mv -u '{}' "$OUT" ';' diff --git a/stack.yaml b/stack.yaml index e18ff0c..63d3376 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-13.19 +resolver: lts-14.8 packages: - . - ./vendor/xmonad diff --git a/xmonad-ng.cabal b/xmonad-ng.cabal index cb104c6..9f91a14 100644 --- a/xmonad-ng.cabal +++ b/xmonad-ng.cabal @@ -1,5 +1,5 @@ name: xmonad-ng -version: 0.15.4 +version: 0.15.5 synopsis: XMonad configuration description: XMonad configuration hacked together using stolen code and bad Haskell license: BSD3 @@ -9,13 +9,13 @@ author: Azat Bahawi <azahi@teknik.io> maintainer: Azat Bahawi <azahi@teknik.io> stability: experimental category: System -homepage: https://git.systemd.club/xmonad-config +homepage: https://github.com/azahi/xmonad-config build-type: Simple cabal-version: >= 2.0 source-repository head type: git - location: https://git.systemd.club/xmonad-config + location: https://github.com/azahi/xmonad-config executable xmonad-ng main-is: Main.hs @@ -34,8 +34,8 @@ executable xmonad-ng XMonad.Custom.Theme XMonad.Custom.Workspaces hs-source-dirs: src - build-depends: base >= 4.12 && < 4.13 - , X11 >= 1.9 && < 1.10 + build-depends: X11 >= 1.9 && < 1.10 + , base >= 4.12 && < 4.13 , containers >= 0.6 && < 0.7 , directory >= 1.3 && < 1.4 , filepath >= 1.4 && < 1.5 @@ -43,7 +43,7 @@ executable xmonad-ng , text >= 1.2 && < 1.3 , time >= 1.8 && < 1.9 , xmonad >= 0.15 && < 0.16 - , xmonad-contrib >= 0.15 && < 0.16 + , xmonad-contrib >= 0.16 && < 0.17 default-language: Haskell2010 other-extensions: MultiParamTypeClasses CPP |