diff --git a/cabal.project b/cabal.project index e23d8cda..ed1a356d 100644 --- a/cabal.project +++ b/cabal.project @@ -3,7 +3,7 @@ packages: **/*.cabal allow-newer: all -constraints: pandoc ==3.1.11 +constraints: pandoc ==3.1.11, suckless-conf ==0.1.2.0 -- executable-static: True -- profiling: True diff --git a/examples/refchan-qblf/app/RefChanQBLFMain.hs b/examples/refchan-qblf/app/RefChanQBLFMain.hs index bbb82ad1..730d7313 100644 --- a/examples/refchan-qblf/app/RefChanQBLFMain.hs +++ b/examples/refchan-qblf/app/RefChanQBLFMain.hs @@ -687,7 +687,7 @@ runMe conf = withLogging $ flip runReaderT conf do Just val -> do pure val -type Config = [Syntax MegaParsec] +type Config = [Syntax C] main :: IO () main = join . customExecParser (prefs showHelpOnError) $ diff --git a/flake.lock b/flake.lock index d7ecbed7..9804c87d 100644 --- a/flake.lock +++ b/flake.lock @@ -22,83 +22,10 @@ "url": "https://git.hbs2.net/5xrwbTzzweS9yeJQnrrUY9gQJfhJf84pbyHhF2MMmSft" } }, - "db-pipe_2": { + "fixme": { "inputs": { "haskell-flake-utils": "haskell-flake-utils_2", "nixpkgs": [ - "fixme", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713359411, - "narHash": "sha256-BzOZ6xU+Li5nIe71Wy4p+lOEQlYK/e94T0gBcP8IKgE=", - "ref": "generic-sql", - "rev": "03635c54b2e2bd809ec1196bc9082447279f6f24", - "revCount": 9, - "type": "git", - "url": "https://git.hbs2.net/5xrwbTzzweS9yeJQnrrUY9gQJfhJf84pbyHhF2MMmSft" - }, - "original": { - "ref": "generic-sql", - "type": "git", - "url": "https://git.hbs2.net/5xrwbTzzweS9yeJQnrrUY9gQJfhJf84pbyHhF2MMmSft" - } - }, - "db-pipe_3": { - "inputs": { - "haskell-flake-utils": "haskell-flake-utils_4", - "nixpkgs": [ - "fixme", - "hbs2", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1708680396, - "narHash": "sha256-ZPwDreNdnyCS/hNdaE0OqVhytm+SzZGRfGRTRvBuSzE=", - "ref": "refs/heads/master", - "rev": "221fde04a00a9c38d2f6c0d05b1e1c3457d5a827", - "revCount": 7, - "type": "git", - "url": "https://git.hbs2.net/5xrwbTzzweS9yeJQnrrUY9gQJfhJf84pbyHhF2MMmSft" - }, - "original": { - "type": "git", - "url": "https://git.hbs2.net/5xrwbTzzweS9yeJQnrrUY9gQJfhJf84pbyHhF2MMmSft" - } - }, - "fixme": { - "inputs": { - "db-pipe": "db-pipe_2", - "haskell-flake-utils": "haskell-flake-utils_3", - "hbs2": "hbs2", - "nixpkgs": [ - "nixpkgs" - ], - "suckless-conf": "suckless-conf_3" - }, - "locked": { - "lastModified": 1714278626, - "narHash": "sha256-Kfp858qHdnNbMv1hjMMy95bN5oQWmtKnVqG8zcCJhpk=", - "ref": "dev-0.2", - "rev": "611cbbf46af307d2032af7864be183e8afdbe55d", - "revCount": 149, - "type": "git", - "url": "file:///home/dmz/w/fixme" - }, - "original": { - "ref": "dev-0.2", - "type": "git", - "url": "file:///home/dmz/w/fixme" - } - }, - "fixme_2": { - "inputs": { - "haskell-flake-utils": "haskell-flake-utils_5", - "nixpkgs": [ - "fixme", - "hbs2", "nixpkgs" ], "suckless-conf": "suckless-conf" @@ -132,96 +59,6 @@ "type": "github" } }, - "flake-utils_10": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_11": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_12": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_13": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_14": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_15": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flake-utils_2": { "locked": { "lastModified": 1644229661, @@ -344,7 +181,7 @@ }, "fuzzy": { "inputs": { - "haskell-flake-utils": "haskell-flake-utils_11", + "haskell-flake-utils": "haskell-flake-utils_4", "nixpkgs": [ "nixpkgs" ] @@ -363,6 +200,27 @@ "url": "http://git.hbs2/GmcLB9gEPT4tbx9eyQiECwsu8oPyEh6qKEpQDtyBWVPA" } }, + "fuzzy_2": { + "inputs": { + "haskell-flake-utils": "haskell-flake-utils_8", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1715856223, + "narHash": "sha256-Q9I6YbvzGuV9yHtxGxxU10LMQf9AdcsecSszPT7PDuc=", + "ref": "sexp-parser", + "rev": "b0a7f96d6569d16b0d27c2f9477d94e5ee39df66", + "revCount": 62, + "type": "git", + "url": "http://git.hbs2/GmcLB9gEPT4tbx9eyQiECwsu8oPyEh6qKEpQDtyBWVPA" + }, + "original": { + "ref": "sexp-parser", + "rev": "b0a7f96d6569d16b0d27c2f9477d94e5ee39df66", + "type": "git", + "url": "http://git.hbs2/GmcLB9gEPT4tbx9eyQiECwsu8oPyEh6qKEpQDtyBWVPA" + } + }, "haskell-flake-utils": { "inputs": { "flake-utils": "flake-utils" @@ -381,126 +239,16 @@ "type": "github" } }, - "haskell-flake-utils_10": { - "inputs": { - "flake-utils": "flake-utils_10" - }, - "locked": { - "lastModified": 1672412555, - "narHash": "sha256-Kaa8F7nQFR3KuS6Y9WRUxeJeZlp6CCubyrRfmiEsW4k=", - "owner": "ivanovs-4", - "repo": "haskell-flake-utils", - "rev": "896219e5bde6efac72198550454e9dd9b5ed9ac9", - "type": "github" - }, - "original": { - "owner": "ivanovs-4", - "repo": "haskell-flake-utils", - "type": "github" - } - }, - "haskell-flake-utils_11": { - "inputs": { - "flake-utils": "flake-utils_11" - }, - "locked": { - "lastModified": 1707809372, - "narHash": "sha256-wfTL9PlCSOqSSyU4eenFFI7pHrV21gba4GEILnI4nAU=", - "owner": "ivanovs-4", - "repo": "haskell-flake-utils", - "rev": "3cbdc5d6093e8b4464ae64097e0c8c61e4414ff2", - "type": "github" - }, - "original": { - "owner": "ivanovs-4", - "repo": "haskell-flake-utils", - "type": "github" - } - }, - "haskell-flake-utils_12": { - "inputs": { - "flake-utils": "flake-utils_12" - }, - "locked": { - "lastModified": 1698938553, - "narHash": "sha256-oXpTKXioqFbl2mhhvpJIAvgNd+wYyv4ekI+YnJHEJ6s=", - "owner": "ivanovs-4", - "repo": "haskell-flake-utils", - "rev": "19b273b5dc401a0a565e7f75cf50a593871b80c9", - "type": "github" - }, - "original": { - "owner": "ivanovs-4", - "ref": "master", - "repo": "haskell-flake-utils", - "type": "github" - } - }, - "haskell-flake-utils_13": { - "inputs": { - "flake-utils": "flake-utils_13" - }, - "locked": { - "lastModified": 1672412555, - "narHash": "sha256-Kaa8F7nQFR3KuS6Y9WRUxeJeZlp6CCubyrRfmiEsW4k=", - "owner": "ivanovs-4", - "repo": "haskell-flake-utils", - "rev": "896219e5bde6efac72198550454e9dd9b5ed9ac9", - "type": "github" - }, - "original": { - "owner": "ivanovs-4", - "repo": "haskell-flake-utils", - "rev": "896219e5bde6efac72198550454e9dd9b5ed9ac9", - "type": "github" - } - }, - "haskell-flake-utils_14": { - "inputs": { - "flake-utils": "flake-utils_14" - }, - "locked": { - "lastModified": 1698938553, - "narHash": "sha256-oXpTKXioqFbl2mhhvpJIAvgNd+wYyv4ekI+YnJHEJ6s=", - "owner": "ivanovs-4", - "repo": "haskell-flake-utils", - "rev": "19b273b5dc401a0a565e7f75cf50a593871b80c9", - "type": "github" - }, - "original": { - "owner": "ivanovs-4", - "repo": "haskell-flake-utils", - "type": "github" - } - }, - "haskell-flake-utils_15": { - "inputs": { - "flake-utils": "flake-utils_15" - }, - "locked": { - "lastModified": 1672412555, - "narHash": "sha256-Kaa8F7nQFR3KuS6Y9WRUxeJeZlp6CCubyrRfmiEsW4k=", - "owner": "ivanovs-4", - "repo": "haskell-flake-utils", - "rev": "896219e5bde6efac72198550454e9dd9b5ed9ac9", - "type": "github" - }, - "original": { - "owner": "ivanovs-4", - "repo": "haskell-flake-utils", - "type": "github" - } - }, "haskell-flake-utils_2": { "inputs": { "flake-utils": "flake-utils_2" }, "locked": { - "lastModified": 1698938553, - "narHash": "sha256-oXpTKXioqFbl2mhhvpJIAvgNd+wYyv4ekI+YnJHEJ6s=", + "lastModified": 1672412555, + "narHash": "sha256-Kaa8F7nQFR3KuS6Y9WRUxeJeZlp6CCubyrRfmiEsW4k=", "owner": "ivanovs-4", "repo": "haskell-flake-utils", - "rev": "19b273b5dc401a0a565e7f75cf50a593871b80c9", + "rev": "896219e5bde6efac72198550454e9dd9b5ed9ac9", "type": "github" }, "original": { @@ -532,11 +280,11 @@ "flake-utils": "flake-utils_4" }, "locked": { - "lastModified": 1698938553, - "narHash": "sha256-oXpTKXioqFbl2mhhvpJIAvgNd+wYyv4ekI+YnJHEJ6s=", + "lastModified": 1707809372, + "narHash": "sha256-wfTL9PlCSOqSSyU4eenFFI7pHrV21gba4GEILnI4nAU=", "owner": "ivanovs-4", "repo": "haskell-flake-utils", - "rev": "19b273b5dc401a0a565e7f75cf50a593871b80c9", + "rev": "3cbdc5d6093e8b4464ae64097e0c8c61e4414ff2", "type": "github" }, "original": { @@ -550,15 +298,16 @@ "flake-utils": "flake-utils_5" }, "locked": { - "lastModified": 1672412555, - "narHash": "sha256-Kaa8F7nQFR3KuS6Y9WRUxeJeZlp6CCubyrRfmiEsW4k=", + "lastModified": 1698938553, + "narHash": "sha256-oXpTKXioqFbl2mhhvpJIAvgNd+wYyv4ekI+YnJHEJ6s=", "owner": "ivanovs-4", "repo": "haskell-flake-utils", - "rev": "896219e5bde6efac72198550454e9dd9b5ed9ac9", + "rev": "19b273b5dc401a0a565e7f75cf50a593871b80c9", "type": "github" }, "original": { "owner": "ivanovs-4", + "ref": "master", "repo": "haskell-flake-utils", "type": "github" } @@ -578,6 +327,7 @@ "original": { "owner": "ivanovs-4", "repo": "haskell-flake-utils", + "rev": "896219e5bde6efac72198550454e9dd9b5ed9ac9", "type": "github" } }, @@ -595,7 +345,6 @@ }, "original": { "owner": "ivanovs-4", - "ref": "master", "repo": "haskell-flake-utils", "type": "github" } @@ -605,17 +354,16 @@ "flake-utils": "flake-utils_8" }, "locked": { - "lastModified": 1672412555, - "narHash": "sha256-Kaa8F7nQFR3KuS6Y9WRUxeJeZlp6CCubyrRfmiEsW4k=", + "lastModified": 1707809372, + "narHash": "sha256-wfTL9PlCSOqSSyU4eenFFI7pHrV21gba4GEILnI4nAU=", "owner": "ivanovs-4", "repo": "haskell-flake-utils", - "rev": "896219e5bde6efac72198550454e9dd9b5ed9ac9", + "rev": "3cbdc5d6093e8b4464ae64097e0c8c61e4414ff2", "type": "github" }, "original": { "owner": "ivanovs-4", "repo": "haskell-flake-utils", - "rev": "896219e5bde6efac72198550454e9dd9b5ed9ac9", "type": "github" } }, @@ -637,60 +385,9 @@ "type": "github" } }, - "hbs2": { - "inputs": { - "db-pipe": "db-pipe_3", - "fixme": "fixme_2", - "haskell-flake-utils": "haskell-flake-utils_7", - "hspup": "hspup", - "nixpkgs": [ - "fixme", - "nixpkgs" - ], - "saltine": "saltine", - "suckless-conf": "suckless-conf_2" - }, - "locked": { - "lastModified": 1712029190, - "narHash": "sha256-rniTdzPvHeiqVtFvsUIXvh4f1dirz1hV0lXRC93qTuw=", - "ref": "0.24.1", - "rev": "d2082de4bf54b54095eecd121727d89e936089ed", - "revCount": 975, - "type": "git", - "url": "http://git.hbs2/BTThPdHKF8XnEq4m6wzbKHKA6geLFK4ydYhBXAqBdHSP" - }, - "original": { - "ref": "0.24.1", - "type": "git", - "url": "http://git.hbs2/BTThPdHKF8XnEq4m6wzbKHKA6geLFK4ydYhBXAqBdHSP" - } - }, "hspup": { "inputs": { - "haskell-flake-utils": "haskell-flake-utils_8", - "nixpkgs": [ - "fixme", - "hbs2", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1679933705, - "narHash": "sha256-UOd70L+FKQLmGjA3IqjFaBpaS/dZMSABtRgVDY3lBCg=", - "owner": "voidlizard", - "repo": "hspup", - "rev": "6b969a9de1f9800ebfc61c51252b8647123c51bb", - "type": "github" - }, - "original": { - "owner": "voidlizard", - "repo": "hspup", - "type": "github" - } - }, - "hspup_2": { - "inputs": { - "haskell-flake-utils": "haskell-flake-utils_13", + "haskell-flake-utils": "haskell-flake-utils_6", "nixpkgs": [ "nixpkgs" ] @@ -711,7 +408,7 @@ }, "lsm": { "inputs": { - "haskell-flake-utils": "haskell-flake-utils_14", + "haskell-flake-utils": "haskell-flake-utils_7", "nixpkgs": [ "nixpkgs" ] @@ -746,17 +443,33 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1707451808, + "narHash": "sha256-UwDBUNHNRsYKFJzyTMVMTF5qS4xeJlWoeyJf+6vvamU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "442d407992384ed9c0e6d352de75b69079904e4e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "442d407992384ed9c0e6d352de75b69079904e4e", + "type": "github" + } + }, "root": { "inputs": { "db-pipe": "db-pipe", "fixme": "fixme", "fuzzy": "fuzzy", - "haskell-flake-utils": "haskell-flake-utils_12", - "hspup": "hspup_2", + "haskell-flake-utils": "haskell-flake-utils_5", + "hspup": "hspup", "lsm": "lsm", "nixpkgs": "nixpkgs", - "saltine": "saltine_2", - "suckless-conf": "suckless-conf_4" + "saltine": "saltine", + "suckless-conf": "suckless-conf_2" } }, "saltine": { @@ -776,29 +489,10 @@ "type": "github" } }, - "saltine_2": { - "flake": false, - "locked": { - "lastModified": 1651348885, - "narHash": "sha256-0guvfkdOrofElDildQWE8QDwh+T/u2WY3HVYmOu4g3w=", - "owner": "tel", - "repo": "saltine", - "rev": "3d3a54cf46f78b71b4b55653482fb6f4cee6b77d", - "type": "github" - }, - "original": { - "owner": "tel", - "repo": "saltine", - "rev": "3d3a54cf46f78b71b4b55653482fb6f4cee6b77d", - "type": "github" - } - }, "suckless-conf": { "inputs": { - "haskell-flake-utils": "haskell-flake-utils_6", + "haskell-flake-utils": "haskell-flake-utils_3", "nixpkgs": [ - "fixme", - "hbs2", "fixme", "nixpkgs" ] @@ -819,68 +513,24 @@ }, "suckless-conf_2": { "inputs": { + "fuzzy": "fuzzy_2", "haskell-flake-utils": "haskell-flake-utils_9", "nixpkgs": [ - "fixme", - "hbs2", "nixpkgs" ] }, "locked": { - "lastModified": 1704001322, - "narHash": "sha256-D7T/8wAg5J4KkRw0uB90w3+adY11aQaX7rjmQPXkkQc=", + "lastModified": 1715860766, + "narHash": "sha256-GklvSI6ANQaZlj8yrVhvDP5O8KS/zra4WLkDP5jQKP8=", "ref": "refs/heads/master", - "rev": "8cfc1272bb79ef6ad62ae6a625f21e239916d196", - "revCount": 28, - "type": "git", - "url": "https://git.hbs2.net/JAuk1UJzZfbDGKVazSQU5yYQ3NGfk4gVeZzBCduf5TgQ" - }, - "original": { - "type": "git", - "url": "https://git.hbs2.net/JAuk1UJzZfbDGKVazSQU5yYQ3NGfk4gVeZzBCduf5TgQ" - } - }, - "suckless-conf_3": { - "inputs": { - "haskell-flake-utils": "haskell-flake-utils_10", - "nixpkgs": [ - "fixme", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713519386, - "narHash": "sha256-rbJSdeeP2lBLbSG0l37FeqzrdJtEjp4igVG6Vi+hJFA=", - "ref": "refs/heads/master", - "rev": "426e2ae123bc840fe3a05f46627b3493bab0d936", + "rev": "0c5c235ed2bc6218d24a50aded412876a8fabb65", "revCount": 29, "type": "git", - "url": "https://git.hbs2.net/JAuk1UJzZfbDGKVazSQU5yYQ3NGfk4gVeZzBCduf5TgQ" + "url": "https://git.hbs2.net/JAuk1UJzZfbDGKVazSQU5yYQ3NGfk4gVeZzBCduf5TgQ?tag=0.1.2.0" }, "original": { "type": "git", - "url": "https://git.hbs2.net/JAuk1UJzZfbDGKVazSQU5yYQ3NGfk4gVeZzBCduf5TgQ" - } - }, - "suckless-conf_4": { - "inputs": { - "haskell-flake-utils": "haskell-flake-utils_15", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1704001322, - "narHash": "sha256-D7T/8wAg5J4KkRw0uB90w3+adY11aQaX7rjmQPXkkQc=", - "ref": "refs/heads/master", - "rev": "8cfc1272bb79ef6ad62ae6a625f21e239916d196", - "revCount": 28, - "type": "git", - "url": "https://git.hbs2.net/JAuk1UJzZfbDGKVazSQU5yYQ3NGfk4gVeZzBCduf5TgQ" - }, - "original": { - "type": "git", - "url": "https://git.hbs2.net/JAuk1UJzZfbDGKVazSQU5yYQ3NGfk4gVeZzBCduf5TgQ" + "url": "https://git.hbs2.net/JAuk1UJzZfbDGKVazSQU5yYQ3NGfk4gVeZzBCduf5TgQ?tag=0.1.2.0" } } }, diff --git a/flake.nix b/flake.nix index 8a458440..35545934 100644 --- a/flake.nix +++ b/flake.nix @@ -9,11 +9,13 @@ inputs = { hspup.url = "github:voidlizard/hspup"; hspup.inputs.nixpkgs.follows = "nixpkgs"; - # fixme.url = "git+https://git.hbs2.net/Fujv1Uy4W5d9Z7REEArMxbXSJ8nLLn4dYuvaAs8b86hr"; - fixme.url = "git+file:///home/dmz/w/fixme?ref=dev-0.2"; + fixme.url = "git+https://git.hbs2.net/Fujv1Uy4W5d9Z7REEArMxbXSJ8nLLn4dYuvaAs8b86hr"; + #fixme.url = "git+file:///home/dmz/w/fixme?ref=dev-0.2"; fixme.inputs.nixpkgs.follows = "nixpkgs"; - suckless-conf.url = "git+https://git.hbs2.net/JAuk1UJzZfbDGKVazSQU5yYQ3NGfk4gVeZzBCduf5TgQ"; + suckless-conf.url = + "git+https://git.hbs2.net/JAuk1UJzZfbDGKVazSQU5yYQ3NGfk4gVeZzBCduf5TgQ?tag=0.1.2.0"; + suckless-conf.inputs.nixpkgs.follows = "nixpkgs"; db-pipe.url = "git+https://git.hbs2.net/5xrwbTzzweS9yeJQnrrUY9gQJfhJf84pbyHhF2MMmSft?ref=generic-sql"; @@ -55,7 +57,6 @@ outputs = { self, nixpkgs, haskell-flake-utils, ... }@inputs: haskellFlakes = with inputs; [ suckless-conf db-pipe - fixme ]; inherit packageNames; diff --git a/hbs2-fixer/app/Main.hs b/hbs2-fixer/app/Main.hs index 2d658dd6..e454f681 100644 --- a/hbs2-fixer/app/Main.hs +++ b/hbs2-fixer/app/Main.hs @@ -135,7 +135,7 @@ instance MonadIO m => HasConf (FixerM m) where debugPrefix = toStdout . logPrefix "[debug] " -readConf :: MonadIO m => FilePath -> m [Syntax MegaParsec] +readConf :: MonadIO m => FilePath -> m [Syntax C] readConf fn = liftIO (readFile fn) <&> parseTop <&> fromRight mempty withConfig :: MonadUnliftIO m => Maybe FilePath -> FixerM m () -> FixerM m () diff --git a/hbs2-keyman/src/HBS2/KeyMan/Config.hs b/hbs2-keyman/src/HBS2/KeyMan/Config.hs index 6d71bc8d..c2089ef1 100644 --- a/hbs2-keyman/src/HBS2/KeyMan/Config.hs +++ b/hbs2-keyman/src/HBS2/KeyMan/Config.hs @@ -14,6 +14,7 @@ import Data.Config.Suckless import System.Directory import System.FilePath import Control.Exception +import Data.Text.IO qualified as Text import Data.Either import Data.Set (Set) @@ -32,12 +33,12 @@ getStatePath = liftIO (getXdgDirectory XdgData keymanAppName) <&> ( "state.db readConfig :: MonadIO m => m [Syntax C] readConfig = do - liftIO $ try @IOError (getConfigPath >>= readFile) + liftIO $ try @IOError (getConfigPath >>= Text.readFile) <&> fromRight "" <&> parseTop <&> fromRight mempty -instance HasConf m => HasCfgKey KeyFilesOpt (Set String) m where +instance HasCfgKey KeyFilesOpt (Set String) where key = "key-files" diff --git a/hbs2-peer/lib/HBS2/Peer/CLI/Detect.hs b/hbs2-peer/lib/HBS2/Peer/CLI/Detect.hs index 79b02be1..f5134b04 100644 --- a/hbs2-peer/lib/HBS2/Peer/CLI/Detect.hs +++ b/hbs2-peer/lib/HBS2/Peer/CLI/Detect.hs @@ -12,6 +12,6 @@ detectRPC :: MonadIO m => m (Maybe FilePath) detectRPC = do (_, o, _) <- readProcess (shell "hbs2-peer poke") - let answ = parseTop (LBS.unpack o) & fromRight mempty + let answ = parseTop (fromString $ LBS.unpack o) & fromRight mempty pure (headMay [ Text.unpack r | ListVal (Key "rpc:" [LitStrVal r]) <- answ ]) diff --git a/hbs2-peer/lib/HBS2/Peer/RPC/Internal/Types.hs b/hbs2-peer/lib/HBS2/Peer/RPC/Internal/Types.hs index b02e2986..d67e0608 100644 --- a/hbs2-peer/lib/HBS2/Peer/RPC/Internal/Types.hs +++ b/hbs2-peer/lib/HBS2/Peer/RPC/Internal/Types.hs @@ -26,7 +26,7 @@ import UnliftIO data RPC2Context = RPC2Context - { rpcConfig :: [Syntax MegaParsec] + { rpcConfig :: [Syntax C] , rpcMessaging :: MessagingUnix , rpcPokeAnswer :: String , rpcPeerEnv :: PeerEnv L4Proto