Merge pull request #647 from fosskers/colin/nocheck

Pass --nocheck to makepkg

aura/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Aura Changelog
 
+## Unreleased
+
+#### Added
+
+- `--nocheck` will be passed down to `makepkg` to avoid calling the `check()`
+  function during the build process. [#647]
+
+[#647]: https://github.com/fosskers/aura/pull/647
+
 ## 3.1.9 (2020-09-11)
 
 #### Added

aura/exec/Aura/Flags.hs

@@ -381,11 +381,12 @@ viewconf = flag' ViewConf (long "viewconf" <> help "View the Pacman config file.
 
 buildConfig :: Parser BuildConfig
 buildConfig = BuildConfig <$> makepkg <*> bp <*> bu <*> asp <*> vp <*> trunc <*> buildSwitches
-  where makepkg = S.fromList <$> many (ia <|> as <|> si <|> sp)
+  where makepkg = S.fromList <$> many (ia <|> as <|> si <|> sp <|> nc)
         ia      = flag' IgnoreArch (long "ignorearch" <> hidden <> help "Exposed makepkg flag.")
         as      = flag' AllSource (long "allsource" <> hidden <> help "Exposed makepkg flag.")
         si      = flag' SkipInteg (long "skipinteg" <> hidden <> help "Skip all makepkg integrity checks.")
         sp      = flag' SkipPGP (long "skippgpcheck" <> hidden <> help "Skip all makepkg PGP checks.")
+        nc      = flag' NoCheck (long "nocheck" <> hidden <> help "Don't run the `check()` function, nor consider checkdeps.")
         bp      = optional $ option (eitherReader absFilePath) (long "build" <> metavar "PATH" <> hidden <> help "Directory in which to build packages.")
         bu      = optional $ User <$> strOption (long "builduser" <> metavar "USER" <> hidden <> help "User account to build as.")
         asp     = optional $ option (eitherReader absFilePath) (long "allsourcepath" <> metavar "PATH" <> hidden <> help "Directory in which to store the output of --allsource.")

aura/exec/Aura/Settings/Runtime.hs

@@ -75,7 +75,7 @@ withEnv (Program op co bc lng ll) f = do
           , isTerminal     = isTerm
           , ignoresOf      = getIgnoredPkgs confFile <> fromGroups <> ign
           , commonConfigOf =
-              -- | These maintain the precedence order: flags, config file entry, default
+              -- These maintain the precedence order: flags, config file entry, default
               co & cachePathOfL . _Left %~ (\x -> fromMaybe x $ getCachePath confFile)
                  & logPathOfL   . _Left %~ (\x -> fromMaybe x $ getLogFilePath confFile)
           , buildConfigOf =

aura/lib/Aura/Settings.hs

@@ -39,13 +39,15 @@ import qualified RIO.Text as T
 data Truncation = None | Head !Word | Tail !Word deriving (Eq, Show)
 
 -- | CLI flags that will be passed down to @makepkg@ when building packages.
-data Makepkg = IgnoreArch | AllSource | SkipInteg | SkipPGP deriving (Eq, Ord, Show)
+data Makepkg = IgnoreArch | AllSource | SkipInteg | SkipPGP | NoCheck
+  deriving (Eq, Ord, Show)
 
 instance Flagable Makepkg where
   asFlag IgnoreArch = ["--ignorearch"]
   asFlag AllSource  = ["--allsource"]
   asFlag SkipInteg  = ["--skipinteg"]
   asFlag SkipPGP    = ["--skippgpcheck"]
+  asFlag NoCheck    = ["--nocheck"]
 
 -- | Flags that are common to both Aura and Pacman.
 -- Aura will react to them, but also pass them through to `pacman`

stack.yaml

@@ -1,7 +1,7 @@
-resolver: lts-16.13
+resolver: lts-16.17
 
 ghc-options:
-  $everything: -split-sections
+  $everything: -split-sections -haddock
   $locals: -fwrite-ide-info -hiedir=.hie -fmax-relevant-binds=0
 
 nix:

stack.yaml.lock

@@ -6,7 +6,7 @@
 packages: []
 snapshots:
 - completed:
-    size: 532381
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/13.yaml
-    sha256: 6ee17f7996e5bc75ae4406250841f1362ad4196418a4d90a0615ff4f26ac98df
-  original: lts-16.13
+    size: 532386
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/17.yaml
+    sha256: d3ee1ae797cf63189c95cf27f00700304946c5cb3c1e6a82001cd6584a221e1b
+  original: lts-16.17