wip

deps/suckless-conf/flake.nix

@@ -5,8 +5,7 @@ inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs?rev=442d407992384ed9c0e6d352de75b69079904e4e";
     haskell-flake-utils.url = "github:ivanovs-4/haskell-flake-utils";
 
-    # fuzzy.url =
+    fuzzy-parse.url = "git+http://git.hbs2/GmcLB9gEPT4tbx9eyQiECwsu8oPyEh6qKEpQDtyBWVPA?ref=sexp-parser&rev=bd3a38904864d5cc333974e7b029412607b46871";
-      # "git+http://git.hbs2/GmcLB9gEPT4tbx9eyQiECwsu8oPyEh6qKEpQDtyBWVPA?ref=sexp-parser&rev=bd3a38904864d5cc333974e7b029412607b46871";
       # "git+http://git.hbs2.net/GmcLB9gEPT4tbx9eyQiECwsu8oPyEh6qKEpQDtyBWVPA?tag=0.1.3.1&rev=831879978213a1aed15ac70aa116c33bcbe964b8";
 
 };
@@ -54,7 +53,7 @@ outputs = { self, fuzzy, nixpkgs, haskell-flake-utils, ... }@inputs:
       # Maps to the devShell output. Pass in a shell.nix file or function
 
       haskellFlakes = with inputs; [
-        # fuzzy
+        fuzzy-parse
       ];
 
       # Additional build intputs of the default shell

flake.lock

@@ -83,9 +83,24 @@
         "type": "github"
       }
     },
+    "flake-utils_5": {
+      "locked": {
+        "lastModified": 1644229661,
+        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "fuzzy": {
       "inputs": {
-        "haskell-flake-utils": "haskell-flake-utils_3",
+        "haskell-flake-utils": "haskell-flake-utils_4",
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
@@ -102,6 +117,28 @@
         "url": "http://git.hbs2.net/GmcLB9gEPT4tbx9eyQiECwsu8oPyEh6qKEpQDtyBWVPA?tag=0.1.3.1"
       }
     },
+    "fuzzy-parse": {
+      "inputs": {
+        "haskell-flake-utils": "haskell-flake-utils_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "dir": "deps/fuzzy-parse",
+        "dirtyRev": "5602d256ec57345df5967aa069860593772557db-dirty",
+        "dirtyShortRev": "5602d256-dirty",
+        "lastModified": 1724898068,
+        "narHash": "sha256-Km3RWmxqG96M9/joId6ANDpRF8MN+N8ZFA5Xa7ocTzA=",
+        "type": "git",
+        "url": "file:.?dir=deps/fuzzy-parse"
+      },
+      "original": {
+        "dir": "deps/fuzzy-parse",
+        "type": "git",
+        "url": "file:.?dir=deps/fuzzy-parse"
+      }
+    },
     "haskell-flake-utils": {
       "inputs": {
         "flake-utils": "flake-utils"
@@ -124,6 +161,24 @@
       "inputs": {
         "flake-utils": "flake-utils_2"
       },
+      "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_3": {
+      "inputs": {
+        "flake-utils": "flake-utils_3"
+      },
       "locked": {
         "lastModified": 1698938553,
         "narHash": "sha256-oXpTKXioqFbl2mhhvpJIAvgNd+wYyv4ekI+YnJHEJ6s=",
@@ -139,9 +194,9 @@
         "type": "github"
       }
     },
-    "haskell-flake-utils_3": {
+    "haskell-flake-utils_4": {
       "inputs": {
-        "flake-utils": "flake-utils_3"
+        "flake-utils": "flake-utils_4"
       },
       "locked": {
         "lastModified": 1707809372,
@@ -157,9 +212,9 @@
         "type": "github"
       }
     },
-    "haskell-flake-utils_4": {
+    "haskell-flake-utils_5": {
       "inputs": {
-        "flake-utils": "flake-utils_4"
+        "flake-utils": "flake-utils_5"
       },
       "locked": {
         "lastModified": 1672412555,
@@ -210,7 +265,8 @@
     "root": {
       "inputs": {
         "db-pipe": "db-pipe",
-        "haskell-flake-utils": "haskell-flake-utils_2",
+        "fuzzy-parse": "fuzzy-parse",
+        "haskell-flake-utils": "haskell-flake-utils_3",
         "nixpkgs": "nixpkgs",
         "saltine": "saltine",
         "suckless-conf": "suckless-conf"
@@ -236,7 +292,7 @@
     "suckless-conf": {
       "inputs": {
         "fuzzy": "fuzzy",
-        "haskell-flake-utils": "haskell-flake-utils_4",
+        "haskell-flake-utils": "haskell-flake-utils_5",
         "nixpkgs": [
           "nixpkgs"
         ]

flake.nix

@@ -7,6 +7,9 @@ inputs = {
     # haskell-flake-utils.url = "github:ivanovs-4/haskell-flake-utils";
     haskell-flake-utils.url = "github:ivanovs-4/haskell-flake-utils/master";
 
+    fuzzy-parse.url =  "git+file:.?dir=deps/fuzzy-parse";
+    fuzzy-parse.inputs.nixpkgs.follows = "nixpkgs";
+
     suckless-conf.url =  "git+file:.?dir=deps/suckless-conf";
     suckless-conf.inputs.nixpkgs.follows = "nixpkgs";
 
@@ -67,6 +70,7 @@ outputs = { self, nixpkgs, haskell-flake-utils, ... }@inputs:
    hpPreOverrides = {pkgs, ...}: final: prev: with pkgs; {
      saltine = prev.callCabal2nix "saltine" inputs.saltine { inherit (pkgs) libsodium; };
      scotty = final.callHackage "scotty" "0.21" { };
+     fuzzy-parse = prev.callCabal2nix "fuzzy-parse" inputs.fuzzy-parse {  };
    };
 
    packagePostOverrides = { pkgs }: with pkgs; with haskell.lib; [