From 028d8794b38536f11e878f7f0d370df10b586f9d Mon Sep 17 00:00:00 2001 From: nek0 Date: Sat, 31 Aug 2024 02:07:57 +0200 Subject: [PATCH] touch --- .gitignore | 2 ++ flake.lock | 12 ++++++------ mateamt.cabal | 24 +++++++++++++++++++++--- src/Control/Meta.hs | 2 ++ 4 files changed, 31 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index e9c99d0..c6265cd 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ report.html *.save* .envrc .direnv/ +.hie/ +stan.html diff --git a/flake.lock b/flake.lock index e022533..7b844a0 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709116111, - "narHash": "sha256-V7BbC39cGDOzJsCsmg+hCdBu1Tuhqs7kLcPxw86STh4=", + "lastModified": 1725059563, + "narHash": "sha256-laJvLHrSU5M9zWlejH7H67HdpLhcUI6uPDa4rX7eUuE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b84d9f029fa675d5ef312f032f322889149daa82", + "rev": "0abfc619bcb605299a0f3f01c1887bb65db61a6b", "type": "github" }, "original": { diff --git a/mateamt.cabal b/mateamt.cabal index f3f26aa..064e45e 100644 --- a/mateamt.cabal +++ b/mateamt.cabal @@ -72,10 +72,22 @@ library -- Modules included in this library but not exported. -- other-modules: + default-extensions: + StrictData other-extensions: - DataKinds TypeOperators FlexibleInstances MultiParamTypeClasses - RankNTypes ScopedTypeVariables FlexibleContexts OverloadedStrings - Arrows CPP LambdaCase DeriveGeneric TypeFamilies + DataKinds + TypeOperators + FlexibleInstances + MultiParamTypeClasses + RankNTypes + ScopedTypeVariables + FlexibleContexts + OverloadedStrings + Arrows + CPP + LambdaCase + DeriveGeneric + TypeFamilies TypeSynonymInstances build-depends: @@ -116,6 +128,8 @@ library hs-source-dirs: src default-language: Haskell2010 ghc-options: -Wall + -fwrite-ide-info + -hiedir=.hie executable mateamt main-is: Main.hs @@ -126,6 +140,8 @@ executable mateamt AppTypes.Configuration Janitor Paths_mateamt + default-extensions: + StrictData other-extensions: DataKinds TypeOperators FlexibleInstances MultiParamTypeClasses RankNTypes ScopedTypeVariables FlexibleContexts OverloadedStrings @@ -169,6 +185,8 @@ executable mateamt hs-source-dirs: app default-language: Haskell2010 ghc-options: -Wall + -fwrite-ide-info + -hiedir=.hie -- test-suite mateamt-test -- default-language: Haskell2010 diff --git a/src/Control/Meta.hs b/src/Control/Meta.hs index fb70c5f..ded4457 100644 --- a/src/Control/Meta.hs +++ b/src/Control/Meta.hs @@ -11,8 +11,10 @@ metaGet :: MateHandler MetaInformation metaGet = do symbol <- asks rsCurrencySymbol version <- asks rsSoftwareVersion + decimals <- asks rsCurrencyFraction return (MetaInformation { metaInfoVersion = version , metaInfoCurrency = symbol + , metaInfoDecimals = fromIntegral decimals } )