Skip to content

Commit c72768c

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 7f9c38b + 7db1b7b commit c72768c

File tree

6 files changed

+16
-6
lines changed

6 files changed

+16
-6
lines changed

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.stack-work

Diff for: Concurrenncy.hs renamed to app/Concurrency.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module Concurrenncy (workForever) where
1+
module Concurrency (workForever) where
22

33
import Control.Applicative
44
import Control.Arrow ((&&&), (***))

Diff for: Logging.hs renamed to app/Logging.hs

File renamed without changes.

Diff for: Main.hs renamed to app/Main.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import Text.Regex.Posix (getAllTextMatches, (=~))
1111

1212
import Options (parse, Options (..))
1313
import Logging (showLog, showLogPlain, LogMsg (..))
14-
import Concurrenncy (workForever)
14+
import Concurrency (workForever)
1515

1616
submitFlag :: String -> String -> IO LogMsg
1717
submitFlag s f = do

Diff for: Options.hs renamed to app/Options.hs

File renamed without changes.

Diff for: farm-hs.cabal

+13-4
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ name: farm-hs
1111
-- | | +----- non-breaking API additions
1212
-- | | | +--- code changes with no API change
1313
version: 0.1.0.0
14+
homepage: https://github.com/gnull/farm-hs
1415

1516
-- A short (one-line) description of the package.
16-
-- synopsis:
17+
synopsis: Helper program for executing exploits at classic CTF competitions
1718

1819
-- A longer description of the package.
1920
-- description:
@@ -52,18 +53,26 @@ executable farm-hs
5253
ghc-options:
5354
-O2
5455
-threaded
56+
-- This line will compile static executable:
57+
-- -static -optc-static -optl-static
5558

5659
-- Modules included in this executable, other than Main.
57-
other-modules: Options Concurrenncy Logging
60+
other-modules: Options Concurrency Logging
5861

5962
-- LANGUAGE extensions used by modules in this package.
6063
-- other-extensions:
6164

6265
-- Other library packages from which modules are imported.
63-
build-depends: base >=4.6, optparse-applicative >=0.13, semigroups >=0.18, async >=2.1, process >=1.2, regex-posix >=0.95, ansi-wl-pprint >=0.6
66+
build-depends: base >=4.6
67+
, optparse-applicative >=0.13
68+
, semigroups >=0.18
69+
, async >=2.1
70+
, process >=1.2
71+
, regex-posix >=0.95
72+
, ansi-wl-pprint >=0.6
6473

6574
-- Directories containing source files.
66-
-- hs-source-dirs:
75+
hs-source-dirs: app
6776

6877
-- Base language which the package is written in.
6978
default-language: Haskell2010

0 commit comments

Comments
 (0)