moved to new suckless-conf

cabal.project

@@ -3,7 +3,7 @@ packages: **/*.cabal
 
 allow-newer: all
 
-constraints: pandoc ==3.1.11, suckless-conf ==0.1.2.1
+constraints: pandoc ==3.1.11, suckless-conf >= 0.1.2.6
 
 
 -- executable-static: True

fixme-new/fixme.cabal

@@ -58,7 +58,7 @@ common shared-properties
       , hbs2-keyman
       , hbs2-git
       , db-pipe
-      , suckless-conf
+      , suckless-conf >= 0.1.2.6
       , fuzzy-parse
 
       , aeson

fixme-new/lib/Fixme/State.hs

@@ -484,7 +484,7 @@ where
   {fst predic}
   )
 
-order by f0.ts nulls first
+order by f0.ts asc nulls first
 
   |]
 

fixme-new/lib/Fixme/Types.hs

@@ -300,7 +300,7 @@ commentKey fp =
     "" -> takeFileName fp
     xs -> xs
 
-type ContextShit c = (Data c, Data (Context c), IsContext c)
+type ContextShit c = (Data c, Data (Context c), IsContext c, Data (Syntax c))
 
 mksym :: FixmeAttrName -> Id
 mksym (k :: FixmeAttrName) = Id ("$" <> coerce k)

flake.lock

@@ -206,19 +206,18 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1715856223,
-        "narHash": "sha256-Q9I6YbvzGuV9yHtxGxxU10LMQf9AdcsecSszPT7PDuc=",
-        "ref": "sexp-parser",
-        "rev": "b0a7f96d6569d16b0d27c2f9477d94e5ee39df66",
-        "revCount": 62,
+        "lastModified": 1715918584,
+        "narHash": "sha256-moioa3ixAZb0y/xxyxUVjSvXoSiDGXy/vAx6B70d2yM=",
+        "ref": "refs/heads/master",
+        "rev": "831879978213a1aed15ac70aa116c33bcbe964b8",
+        "revCount": 63,
         "type": "git",
-        "url": "http://git.hbs2/GmcLB9gEPT4tbx9eyQiECwsu8oPyEh6qKEpQDtyBWVPA"
+        "url": "http://git.hbs2/GmcLB9gEPT4tbx9eyQiECwsu8oPyEh6qKEpQDtyBWVPA?tag=0.1.3.1"
       },
       "original": {
-        "ref": "sexp-parser",
-        "rev": "b0a7f96d6569d16b0d27c2f9477d94e5ee39df66",
+        "rev": "831879978213a1aed15ac70aa116c33bcbe964b8",
         "type": "git",
-        "url": "http://git.hbs2/GmcLB9gEPT4tbx9eyQiECwsu8oPyEh6qKEpQDtyBWVPA"
+        "url": "http://git.hbs2/GmcLB9gEPT4tbx9eyQiECwsu8oPyEh6qKEpQDtyBWVPA?tag=0.1.3.1"
       }
     },
     "haskell-flake-utils": {
@@ -520,18 +519,18 @@
         ]
       },
       "locked": {
-        "lastModified": 1715866786,
-        "narHash": "sha256-Pl4JDMBw1kzdcK/g2yA/BGu97dMRkQ2hJHi09PLbeq8=",
+        "lastModified": 1715919707,
+        "narHash": "sha256-lbvrCqJHC//NJgfvsy15+Evup5CS+CE50NolDwPIh94=",
         "ref": "refs/heads/master",
-        "rev": "864b359f44a4824f2a7b3dd49a37356c05f3ceff",
-        "revCount": 31,
+        "rev": "41830ea2f2e9bb589976f0433207a8f1b73b0b01",
+        "revCount": 35,
         "type": "git",
-        "url": "https://git.hbs2.net/JAuk1UJzZfbDGKVazSQU5yYQ3NGfk4gVeZzBCduf5TgQ"
+        "url": "https://git.hbs2.net/JAuk1UJzZfbDGKVazSQU5yYQ3NGfk4gVeZzBCduf5TgQ?tag=0.1.2.6"
       },
       "original": {
-        "rev": "864b359f44a4824f2a7b3dd49a37356c05f3ceff",
+        "rev": "41830ea2f2e9bb589976f0433207a8f1b73b0b01",
         "type": "git",
-        "url": "https://git.hbs2.net/JAuk1UJzZfbDGKVazSQU5yYQ3NGfk4gVeZzBCduf5TgQ"
+        "url": "https://git.hbs2.net/JAuk1UJzZfbDGKVazSQU5yYQ3NGfk4gVeZzBCduf5TgQ?tag=0.1.2.6"
       }
     }
   },

flake.nix

@@ -14,7 +14,7 @@ inputs = {
     fixme.inputs.nixpkgs.follows = "nixpkgs";
 
     suckless-conf.url =
-      "git+https://git.hbs2.net/JAuk1UJzZfbDGKVazSQU5yYQ3NGfk4gVeZzBCduf5TgQ?rev=864b359f44a4824f2a7b3dd49a37356c05f3ceff";
+      "git+https://git.hbs2.net/JAuk1UJzZfbDGKVazSQU5yYQ3NGfk4gVeZzBCduf5TgQ?rev=41830ea2f2e9bb589976f0433207a8f1b73b0b01&tag=0.1.2.6";
 
     suckless-conf.inputs.nixpkgs.follows = "nixpkgs";
 

hbs2-peer/app/CheckBlockAnnounce.hs

@@ -13,8 +13,8 @@ import HBS2.Net.Proto.Types
 import PeerTypes
 import PeerConfig
 import CheckPeer (peerBanned)
-import BlockDownload
-import DownloadQ
+import BlockDownload()
+import DownloadQ()
 
 import Control.Monad.Trans.Maybe
 import Control.Monad.Reader
@@ -38,7 +38,7 @@ instance Pretty AcceptAnnounce where
 
 
 
-instance HasCfgKey PeerAcceptAnnounceKey AcceptAnnounce m where
+instance HasCfgKey PeerAcceptAnnounceKey AcceptAnnounce where
   key = "accept-block-announce"
 
 instance (Monad m, HasConf m) => HasCfgValue PeerAcceptAnnounceKey AcceptAnnounce m where
@@ -51,7 +51,7 @@ instance (Monad m, HasConf m) => HasCfgValue PeerAcceptAnnounceKey AcceptAnnounc
                 catMaybes [ fromStringMay @(PubKey 'Sign (Encryption L4Proto)) (Text.unpack e)
                           | ListVal (Key s [LitStrVal e]) <- syn, s == kk
                           ]
-      kk = key @PeerAcceptAnnounceKey @AcceptAnnounce @m
+      kk = key @PeerAcceptAnnounceKey @AcceptAnnounce
 
 
 acceptAnnouncesFromPeer :: forall e m . ( MonadIO m

hbs2-peer/app/CheckPeer.hs

@@ -16,10 +16,10 @@ import Lens.Micro.Platform
 data PeerBlackListKey
 data PeerWhiteListKey
 
-instance PeerBlackListKey (Set String) where
+instance HasCfgKey PeerBlackListKey (Set String) where
   key = "blacklist"
 
-instance PeerWhiteListKey (Set String) where
+instance HasCfgKey PeerWhiteListKey (Set String) where
   key = "whitelist"
 
 peerBanned :: forall e m . ( Monad m

hbs2-peer/app/PeerConfig.hs

@@ -70,7 +70,7 @@ instance {-# OVERLAPPABLE #-} (HasConf m, HasCfgKey a b) => HasCfgValue a Featur
   cfgValue = lastDef FeatureOff . val <$> getConf
     where
       val syn = [ if e == "on" then FeatureOn else FeatureOff
-                | ListVal (Key s [SymbolVal e]) <- syn, s == key @a @b @m
+                | ListVal (Key s [SymbolVal e]) <- syn, s == key @a @b
                 ]
 
 cfgName :: FilePath