Merge branch 'master' of github.com:Liqwid-Labs/agora into jhodgdev/fix-apropos-dep

flake.nix

@@ -11,11 +11,19 @@
   inputs.plutarch.inputs.nixpkgs.follows =
     "plutarch/haskell-nix/nixpkgs-unstable";
 
-  # https://github.com/mlabs-haskell/apropos-tx/pull/28
+  # Follows jhodgdev's forks of apropos and apropos-tx, as these
+  # are not constrained to `base ^>= 4.14`. Once these are merged
+  # to their respective master branches, we should change the
+  # inputs to follow a commit on those master branches. For more
+  # info, see: https://github.com/mlabs-haskell/apropos-tx/pull/37
   inputs.apropos-tx.url =
     "github:jhodgdev/apropos-tx?rev=4eca3fac23c339caee04ea6176e641a4b3857a25";
   inputs.apropos-tx.inputs.nixpkgs.follows =
     "plutarch/haskell-nix/nixpkgs-unstable";
+  inputs.apropos.url =
+    "github:jhodgdev/apropos?rev=c6c580aeab8b5c2a6512a49823dd17936e87b70a";
+  inputs.apropos.inputs.nixpkgs.follows =
+    "plutarch/haskell-nix/nixpkgs-unstable";
 
   inputs.apropos.url =
     "github:mlabs-haskell/apropos?rev=3734bb3baa297ed990725a5ef14efcbb6a1c1c23";
@@ -93,6 +101,7 @@
               ps.plutarch-extra
               ps.plutarch-numeric
               ps.plutarch-test
+              ps.apropos
             ];
           };
         };