diff --git a/app/Main.hs b/app/Main.hs index 0238396..72acf8a 100644 --- a/app/Main.hs +++ b/app/Main.hs @@ -1,8 +1,9 @@ module Main where import qualified MyLib (defaultMain) +import System.Environment (getArgs) main :: IO () main = do - putStrLn "Hello, Haskell!" - MyLib.defaultMain + [path] <- getArgs + MyLib.defaultMain path diff --git a/flake.lock b/flake.lock index bb124cd..9c5a949 100644 --- a/flake.lock +++ b/flake.lock @@ -2,7 +2,9 @@ "nodes": { "easy-hls": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1637250802, @@ -34,21 +36,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1615055905, - "narHash": "sha256-Ig7CXgE5C3mwtTVBl8nSTessa1oMAm6Pm/p+T6iAJD8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "f3fc074642a25ef5a1423412f09946149237e338", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1644453163, "narHash": "sha256-VPlXtIsShceYHUspnJSvuvucrX1OWVFmrqiofn69yCM=", @@ -66,7 +53,7 @@ "inputs": { "easy-hls": "easy-hls", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index d950729..1a35f41 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,10 @@ description = "A very basic flake"; inputs = { - easy-hls = { url = "github:jkachmar/easy-hls-nix"; }; + easy-hls = { + url = "github:jkachmar/easy-hls-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; flake-utils = { url = "github:numtide/flake-utils"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/src/MyLib.hs b/src/MyLib.hs index 2bbedeb..7f9f732 100644 --- a/src/MyLib.hs +++ b/src/MyLib.hs @@ -67,9 +67,9 @@ amqpPublisher sqlConn channel exchange = Publish $ \msg -> do , msgDeliveryMode = Just Persistent } -defaultMain :: IO () -defaultMain = do - conf <- readConfig "./config.dhall" +defaultMain :: FilePath -> IO () +defaultMain path = do + conf <- readConfig path let rabbitConnect = openConnection (conf ^. amqp . host . T.unpacked) (conf ^. amqp . vhost)