fix the build

Author: clayrat

optparse.nix

@@ -1,14 +1,14 @@
-{ build-idris-package, fetchFromGitHub, lens, wl-pprint/*, lib*/}:
+{ build-idris-package, fetchFromGitHub, lens, contrib /*, lib*/}:
 build-idris-package {
   name = "optparse";
-  version = "2019-06-03";
+  version = "2019-07-02";
   src = fetchFromGitHub {
     owner = "statebox";
     repo = "optparse-idris";
-    rev = "bd5d52097f5f414be0f710f2a0cffb01a04e95fd";
-    sha256 = "0nr0hgmndnwsd65r9g49zgkdqsryrzg3c86pv5w2q88ybxplm0ap"; # lib.fakeSha256; # This makes nix error out and give you the correct hash in stderr
+    rev = "f5611b1c695299ff0d528cdfc53fd5c51b7fdd84";
+    sha256 = "1r49476sds7sw5x0z0ya4h2xd2g23a0wx8in219j8ngkihcw10hn"; # lib.fakeSha256; # This makes nix error out and give you the correct hash in stderr
   };
-  idrisDeps = [ lens wl-pprint ];
+  idrisDeps = [ lens contrib ];
 
   meta = {
     description = "Minimal port of optparse-applicative to idris";

parser.js/ParserJS.idr renamed to parser.js/Main.idr

@@ -1,4 +1,4 @@
-module ParserJS
+module Main
 
 import Text.PrettyPrint.WL
 import TParsec

parser/Parser.idr renamed to parser/Main.idr

@@ -1,4 +1,4 @@
-module Parser
+module Main
 
 import Typedefs
 import Parse
@@ -9,6 +9,8 @@ import CommandLine
 
 import Text.PrettyPrint.WL
 import Options.Applicative
+import Control.Lens.Setter
+import TParsec.Result
 
 processArgs : List String -> Either ParseError CommandLineOpts
 processArgs (_ :: opts) = runParserFully parseProgramOptions opts
@@ -32,8 +34,8 @@ runWithOptions (MkTypedefOpts input output) = do
   Right typedef <- getInput input
     | Left err => putStrLn ("Filesystem error: " ++ show err)
   case parseAndGenerateTDef typedef of
-       Nothing => putStrLn ("Typedef error: " ++ "could not generate typedef")
-       Just tdef => writeOutput output tdef
+    Left err => putStrLn ("Typedef error: " ++ err)
+    Right tdef => writeOutput output tdef
 
 partial
 main : IO ()

typedefs-parser-js.ipkg

@@ -1,10 +1,10 @@
 package typedefs-parser-js
 
-modules = ParserJS
+modules = Main
 
 executable = typedefs_parser.js
 
-main = ParserJS
+main = Main
 
 sourcedir = parser.js
 

typedefs-parser.ipkg

@@ -1,11 +1,11 @@
 package typedefs-parser
 
-modules = Parser
+modules = CommandLine, Main
 
 executable = typedefs_parser
 
-main = Parser
+main = Main
 
 sourcedir = parser
 
-pkgs = typedefs, contrib, optparse
+pkgs = typedefs, contrib, optparse, lens, tparsec

typedefs-parser.nix

@@ -1,4 +1,4 @@
-{ build-idris-package, typedefs, optparse, }:
+{ build-idris-package, typedefs, optparse }:
 
 build-idris-package {
   name = "typedefs-parser";