Merge branch 'stackify'

[?]

Mar 4, 2016, 4:40 AM

M4KM76DGO77VC4O6N5FFA5MTZH5GI5AJ3OUJU7INLAOY2M3LRLLAC

Dependencies

[2] KEP5WUFJ Convert project to stack-based build.
[3] EKY7U7SK Finish conversion to stack.
[4] 64C6AWH6 Rename Ananke -> Quixotic, project reboot.
[5] 5W5M56VJ Move library code to 'lib'
[6] MWUPXTBF A few steps down a road to be abandoned.
[7] OBFPJS2G Project successfully builds and tests under nix.
[8] RPAJLHMT Change to use UUIDs instead of ints for primary keys.
[9] 4U7F3CPI THE GREAT RENAMING OF THINGS!
[10] PBD7LZYQ Postgres & auth are beginning to function.
[11] ADMKQQGC Initial empty Snap project.
[12] RSEB2NFG Replacing Snap with Scotty.
[13] EPOYLP7O A little .gitignore cleanup.
[14] RB2ETNIF Add skeletal PureScript client project.
[15] AXKKXBWN Initial attempt at writing down my ideas for a company based on trust.
[16] EQXRXRZD Changed to use tasty instead of test-framework
[17] IZEVQF62 Work in progress replacing sqlite with postgres.
[18] PGZJ736C Update aftok.cfg.example and revise INSTALL instructions
[19] QMRKFEPG Refactor QDB to use a free monad algebra instead.
[20] NTPC7KJE Trivial changes, feature scratchpad.
[21] 2XQD6KKK Add invitation logic and clean up DBProg error handling.
[22] 2Y2QZFVF Switch to more modern cabal2nix-based workflow.
[23] 45AI46JN Move readme to inception.md
[24] NVOCQVAS Initial failing tests.
[25] TLQ72DSJ Lenses, sqlite-simple
[26] QO4NFWIY Added sample config file.
[27] 373LXH2X Add MAYBE.md, update task list.
[28] 4ZLEDBK7 Initial attempts at dockerizing, cabal isn't cooperating.
[29] 7KZP4RHZ Switch from Data.Time to Data.Thyme
[30] T44T2PDL Rename trust.txt to README.md
[31] EZQG2APB Update task list.
[32] 45QJYWN3 Fixing up the README. Still struggling with the ending.
[33] WO2MINIF Auctions now compile!
[34] A6HKMINB Attempting to improve JSON handling.
[35] E2KOBKIJ Add setup script detailing the setup of the docker host.
[36] IRG4KNAE Trivial deletion.
[37] 7HPY3QPF Fix linting errors. (yay hlint!)
[38] ZP62WC47 Begin conversion to build with stack.
[39] LAROLAYU WIP
[40] GCVQD44V Create amends endpoint, switch to UUID primary keys
[41] TNR3TEHK Switch to Postgres + snaplet arch compiles.
[42] DLZRD7VB Add a preliminary, probably somewhat broken set of setup instructions.
[43] 75N3UJ4J More progression toward lenses.

Change contents

file deletion: stack.yaml (----------)

[4.2]→[4.1196:1230](∅→∅),[4.1230]→[4.1050:1050](∅→∅)

flags: {}
packages:
- '.'
extra-deps:
- snaplet-postgresql-simple-0.6.0.4
- resource-pool-catchio-0.2.1.0
resolver: lts-5.3
#allow-newer: true
file deletion: Types.hs (----------)

[4.679]→[4.1016:1048](∅→∅),[4.1048]→[4.802:802](∅→∅)

{-# LANGUAGE GeneralizedNewtypeDeriving #-}

module Aftok.Types where

import Data.Word
import ClassyPrelude

deriving (Show, Eq, Ord, Num, Real, Bounded)

newtype Satoshi = Satoshi { fromSatoshi :: Word64 }
edit in lib/Aftok/Database/PostgreSQL.hs at line 24

[4.1201]→[2.457:476](∅→∅)

import Aftok.Types
edit in lib/Aftok/Database/PostgreSQL.hs at line 72

[4.1546]→[2.477:568](∅→∅)

btcParser :: FieldParser Satoshi
btcParser f v = (Satoshi . fromInteger) <$> fromField f v
resurrect zombie in lib/Aftok/Database/PostgreSQL.hs at line 72

[4.1546]→[4.477:510](∅→∅),[4.1546]→[4.477:510](∅→∅),[4.510]→[3.4:62](∅→∅),[4.510]→[3.4:62](∅→∅)

btcParser :: FieldParser Satoshi
btcParser f v = (Satoshi . fromInteger) <$> fromField f v
edit in lib/Aftok/Database/PostgreSQL.hs at line 87

[4.383]→[2.569:627](∅→∅)

<*> fieldWith uidParser
<*> logEntryParser
edit in lib/Aftok/Database/PostgreSQL.hs at line 93

[4.669]→[3.122:156](∅→∅)

Auction <$> fieldWith btcParser
resolve order conflict in lib/Aftok/Database/PostgreSQL.hs at line 93

[2.662]

[4.2144]
edit in lib/Aftok/Database/PostgreSQL.hs at line 214

[4.3162]→[2.663:760](∅→∅)

(pid ^. _ProjectId, auc ^. (raiseAmount.to fromSatoshi), auc ^. (auctionEnd.to fromThyme))
edit in lib/Aftok/Database/PostgreSQL.hs at line 229

[4.3733]→[3.255:297](∅→∅)

, bid ^. (bidAmount.to fromSatoshi)
resolve order conflict in lib/Aftok/Database/PostgreSQL.hs at line 229

[2.803]

[4.3080]
edit in lib/Aftok/Auction.hs at line 13

[4.775]→[4.246:265](∅→∅)

import Aftok.Types
resolve order conflict in lib/Aftok/Auction.hs at line 13

[2.265]

[4.5213]
edit in lib/Aftok/Auction.hs at line 18

[4.5273]→[2.266:294](∅→∅)

{ _raiseAmount :: Satoshi
edit in lib/Aftok/Auction.hs at line 29

[4.142]→[2.295:322](∅→∅)

, _bidAmount :: Satoshi
edit in lib/Aftok/Auction.hs at line 45

[4.397]→[2.323:374](∅→∅)

let takeWinningBids :: Satoshi -> [Bid] -> [Bid]
edit in lib/Aftok/Auction.hs at line 55

[4.333]→[4.375:454](∅→∅)

winFraction = toRational remainder / toRational (x ^. bidAmount)
resolve order conflict in lib/Aftok/Auction.hs at line 55

[2.454]

[4.64]
edit in aftok.cabal at line 37

[4.316]→[4.15:86](∅→∅)

, aeson == 0.9.*
, attoparsec == 0.13.*
resolve order conflict in aftok.cabal at line 37

[2.86]

[4.387]
edit in aftok.cabal at line 44

[4.494]→[2.87:122](∅→∅)

, errors == 2.1.*
edit in aftok.cabal at line 53

[4.68]→[4.123:206](∅→∅)

, lens >= 4.11
--, network-bitcoin >= 1.8 && < 1.9
resolve order conflict in aftok.cabal at line 53

[2.206]

[4.781]
edit in aftok.cabal at line 54

[4.815]→[2.207:242](∅→∅)

, postgresql-simple == 0.5.*
edit in .gitignore at line 4

[4.27]→[2.1:13](∅→∅)

.stack-work