X-Git-Url: http://gitweb.michael.orlitzky.com/?p=hath.git;a=blobdiff_plain;f=hath.cabal;h=81d1ec11c606336b4c8e58cc65b4f53b600a3a01;hp=8b1b4fe71939951f98ab599833c69b633b28ae48;hb=HEAD;hpb=fb9cf285f6823b400f3c3c85907f6f814358421e

diff --git a/hath.cabal b/hath.cabal
index 8b1b4fe..7931597 100644
--- a/hath.cabal
+++ b/hath.cabal
@@ -1,92 +1,42 @@
+cabal-version:  3.0
 name:           hath
-version:        0.5.0
-cabal-version:  >= 1.8
+version:        0.5.8
 author:         Michael Orlitzky
-maintainer:	Michael Orlitzky <michael@orlitzky.com>
-homepage:       http://michael.orlitzky.com/code/hath.xhtml
+maintainer:     Michael Orlitzky <michael@orlitzky.com>
+homepage:       https://michael.orlitzky.com/code/hath.xhtml
+bug-reports:    mailto:michael@orlitzky.com
 category:       Utils
-license:        AGPL-3
+license:        AGPL-3.0-or-later
 license-file:   doc/LICENSE
 build-type:     Simple
 extra-source-files:
+  doc/COPYING
   doc/man1/hath.1
   test/shell/*.test
 synopsis:
-  Hath manipulates network blocks in CIDR notation.
+  Manipulates network blocks in CIDR notation
 description:
   Hath is a Haskell program for working with network blocks in CIDR
   notation. When dealing with blocks of network addresses, there are a
   few things that one usually wants to do with them:
-  .
+
     * Create a regular expression matching the CIDR block(s). This is
       because grep will throw up if you feed it CIDR.
-  .
+
     * Combine small blocks into larger ones. For example, if you have two
       consecutive \/24s, they might combine into a larger \/23.
-  .
+
     * View the result of block combination in a useful way.
-  .
+
     * List them.
-  .
-  Hath has several modes to perform these functions:
-  .
-    [@Regexed@]
-    This computes a (Perl-compatible) regular expression matching
-    the input CIDR blocks. It's the default mode of operation.
-  .
-    [@Reduced@]
-    This combines small blocks into larger ones where possible, and
-    eliminates redundant blocks. The output should be equivalent to
-    the input, though.
-  .
-    [@Duped@]
-    Shows only the blocks that would be removed by reduce; that is, it
-    shows the ones that would get combined into larger blocks or are
-    simply redundant.
-  .
-    [@Diffed@]
-    Shows what would change if you used reduce. Uses diff-like
-    notation.
-  .
-    [@Listed@]
-    List the IP addresses contained within the given CIDRs.
-  .
-  /Examples/:
-  .
-  Compute a (Perl-compatible) regular expression matching
-  the input CIDR blocks. It's the default mode of operation.
-  .
-  @
-  $ echo \"10.0.0.0\/29 10.0.0.8\/29\" | hath
-  ((10)\.(0)\.(0)\.(15|14|13|12|11|10|9|8|7|6|5|4|3|2|1|0))
-  @
-  .
-  Combine two \/24s into a \/23:
-  .
-  @
-  $ echo \"10.0.0.0\/24 10.0.1.0\/24\" | hath reduced
-  10.0.0.0/23
-  @
-  .
-  List the addresses in 192.168.0.240\/29:
-  .
-  @
-  $ echo 192.168.0.240\/29 | hath listed
-  192.168.0.240
-  192.168.0.241
-  192.168.0.242
-  192.168.0.243
-  192.168.0.244
-  192.168.0.245
-  192.168.0.246
-  192.168.0.247
-  @
-  .
-  The command-line syntax and complete set of options are documented in
-  the man page.
+
+  Hath has several modes to perform these functions. The command-line
+  syntax and complete set of options are documented in the man page.
 
 
 executable hath
+  default-language:
+    Haskell2010
 
   main-is:
     Main.hs
@@ -105,8 +55,11 @@ executable hath
     Octet
     Paths_hath
 
+  autogen-modules:
+    Paths_hath
+
   build-depends:
-    base                        >= 4.9 && < 5,
+    base                        >= 4.15 && < 5.0,
     cmdargs                     >= 0.10,
     split                       >= 0.2,
     tasty                       >= 0.8,
@@ -117,6 +70,7 @@ executable hath
 test-suite testsuite
   type: exitcode-stdio-1.0
   hs-source-dirs: src test
+  default-language: Haskell2010
   main-is: TestSuite.hs
 
   other-modules:
@@ -128,8 +82,7 @@ test-suite testsuite
     Octet
 
   build-depends:
-    base                        == 4.*,
-    cmdargs                     >= 0.10,
+    base                        >= 4.15 && < 5.0,
     split                       >= 0.2,
     tasty                       >= 0.8,
     tasty-hunit                 >= 0.8,
@@ -141,14 +94,15 @@ test-suite testsuite
 test-suite shelltests
   type: exitcode-stdio-1.0
   hs-source-dirs: test
+  default-language: Haskell2010
   main-is: ShellTests.hs
 
   build-depends:
-    base                        == 4.*,
+    base                        >= 4.15 && < 5.0,
     process                     >= 1.1
 
 
 source-repository head
   type: git
-  location: http://gitweb.michael.orlitzky.com/hath.git
+  location: https://gitweb.michael.orlitzky.com/hath.git
   branch: master