Merge pull request #43 from Liqwid-Labs/jhodgdev/apropos-bump

Bumped apropos

agora-test/Spec/Model/MultiSig.hs

@@ -53,7 +53,7 @@ import Apropos (
 import Apropos.Gen (Gen, choice, int, linear, list)
 import Apropos.LogicalModel (Enumerable)
 import Apropos.LogicalModel.Enumerable (Enumerable (enumerated))
-import Apropos.Script (HasScriptRunner (expect, runScriptTestsWhere, script))
+import Apropos.Script (ScriptModel (expect, runScriptTestsWhere, script))
 import Test.Tasty (TestTree, testGroup)
 import Test.Tasty.Hedgehog (fromGroup)
 
@@ -157,7 +157,7 @@ instance HasParameterisedGenerator MultiSigProp MultiSigModel where
     -- Return the generated model.
     pure (MultiSigModel msig ctx)
 
-instance HasScriptRunner MultiSigProp MultiSigModel where
+instance ScriptModel MultiSigProp MultiSigModel where
   -- When the script runs, we want the model to meet the minimum signatures.
   expect :: (MultiSigModel :+ MultiSigProp) -> Formula MultiSigProp
   expect Apropos = Var MeetsMinSigs
@@ -182,7 +182,7 @@ genTests =
               Yes
           ]
 
--- | Tests for the 'HasScriptRunner' instance of 'MultiSigModel'
+-- | Tests for the 'ScriptModel' instance of 'MultiSigModel'
 plutarchTests :: TestTree
 plutarchTests =
   testGroup "plutarchTests" $

agora.cabal

@@ -108,6 +108,7 @@ common deps
 
 common test-deps
   build-depends:
+    , apropos
     , apropos-tx
     , QuickCheck
     , quickcheck-instances

flake.lock

@@ -32,6 +32,22 @@
         "type": "github"
       }
     },
+    "HTTP_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1451647621,
+        "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=",
+        "owner": "phadej",
+        "repo": "HTTP",
+        "rev": "9bc0996d412fef1787449d841277ef663ad9a915",
+        "type": "github"
+      },
+      "original": {
+        "owner": "phadej",
+        "repo": "HTTP",
+        "type": "github"
+      }
+    },
     "Shrinker": {
       "flake": false,
       "locked": {
@@ -48,11 +64,37 @@
         "type": "github"
       }
     },
-    "apropos-tx": {
+    "apropos": {
       "inputs": {
         "flake-compat": "flake-compat",
         "flake-compat-ci": "flake-compat-ci",
         "haskell-nix": "haskell-nix",
+        "nixpkgs": [
+          "apropos",
+          "haskell-nix",
+          "nixpkgs-unstable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1647683439,
+        "narHash": "sha256-r76rHhZSZsazHxTBHbqK7zlMB9rjjGmGWOUbR0fuxn8=",
+        "owner": "jhodgdev",
+        "repo": "apropos",
+        "rev": "c6c580aeab8b5c2a6512a49823dd17936e87b70a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "jhodgdev",
+        "repo": "apropos",
+        "rev": "c6c580aeab8b5c2a6512a49823dd17936e87b70a",
+        "type": "github"
+      }
+    },
+    "apropos-tx": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "flake-compat-ci": "flake-compat-ci_2",
+        "haskell-nix": "haskell-nix_2",
         "nixpkgs": [
           "plutarch",
           "haskell-nix",
@@ -61,17 +103,17 @@
         "plutus": "plutus"
       },
       "locked": {
-        "lastModified": 1646436508,
+        "lastModified": 1647684164,
-        "narHash": "sha256-4QevdgeSSHfOyJEqdiNx6SovGpLZv1vw9i6r0XbpQ3U=",
+        "narHash": "sha256-spKe45P4XNJ6iZvSb2ircBh1OlF95o+im+Se2hlCbkQ=",
-        "owner": "mlabs-haskell",
+        "owner": "jhodgdev",
         "repo": "apropos-tx",
-        "rev": "5b74ba897a6f02718c163bf588a08c5e3e9de204",
+        "rev": "582496d0dfb88ce007bb0d2a2dcbc72ea0bb1cd1",
         "type": "github"
       },
       "original": {
-        "owner": "mlabs-haskell",
+        "owner": "jhodgdev",
         "repo": "apropos-tx",
-        "rev": "5b74ba897a6f02718c163bf588a08c5e3e9de204",
+        "rev": "582496d0dfb88ce007bb0d2a2dcbc72ea0bb1cd1",
         "type": "github"
       }
     },
@@ -110,6 +152,23 @@
       }
     },
     "cabal-32_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1603716527,
+        "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=",
+        "owner": "haskell",
+        "repo": "cabal",
+        "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee",
+        "type": "github"
+      },
+      "original": {
+        "owner": "haskell",
+        "ref": "3.2",
+        "repo": "cabal",
+        "type": "github"
+      }
+    },
+    "cabal-32_3": {
       "flake": false,
       "locked": {
         "lastModified": 1603716527,
@@ -144,6 +203,23 @@
       }
     },
     "cabal-34_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1640353650,
+        "narHash": "sha256-N1t6M3/wqj90AEdRkeC8i923gQYUpzSr8b40qVOZ1Rk=",
+        "owner": "haskell",
+        "repo": "cabal",
+        "rev": "942639c18c0cd8ec53e0a6f8d120091af35312cd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "haskell",
+        "ref": "3.4",
+        "repo": "cabal",
+        "type": "github"
+      }
+    },
+    "cabal-34_3": {
       "flake": false,
       "locked": {
         "lastModified": 1622475795,
@@ -178,6 +254,23 @@
       }
     },
     "cabal-36_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1641652457,
+        "narHash": "sha256-BlFPKP4C4HRUJeAbdembX1Rms1LD380q9s0qVDeoAak=",
+        "owner": "haskell",
+        "repo": "cabal",
+        "rev": "f27667f8ec360c475027dcaee0138c937477b070",
+        "type": "github"
+      },
+      "original": {
+        "owner": "haskell",
+        "ref": "3.6",
+        "repo": "cabal",
+        "type": "github"
+      }
+    },
+    "cabal-36_3": {
       "flake": false,
       "locked": {
         "lastModified": 1640163203,
@@ -308,6 +401,22 @@
         "type": "github"
       }
     },
+    "cardano-shell_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1608537748,
+        "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=",
+        "owner": "input-output-hk",
+        "repo": "cardano-shell",
+        "rev": "9392c75087cb9a3d453998f4230930dea3a95725",
+        "type": "github"
+      },
+      "original": {
+        "owner": "input-output-hk",
+        "repo": "cardano-shell",
+        "type": "github"
+      }
+    },
     "cryptonite": {
       "flake": false,
       "locked": {
@@ -371,6 +480,21 @@
         "type": "github"
       }
     },
+    "flake-compat-ci_3": {
+      "locked": {
+        "lastModified": 1641672839,
+        "narHash": "sha256-Bdwv+DKeEMlRNPDpZxSz0sSrqQBvdKO5fZ8LmvrgCOU=",
+        "owner": "hercules-ci",
+        "repo": "flake-compat-ci",
+        "rev": "e832114bc18376c0f3fa13c19bf5ff253cc6570a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-compat-ci",
+        "type": "github"
+      }
+    },
     "flake-compat_2": {
       "flake": false,
       "locked": {
@@ -388,6 +512,22 @@
       }
     },
     "flake-compat_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1641205782,
+        "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_4": {
       "flake": false,
       "locked": {
         "lastModified": 1606424373,
@@ -404,7 +544,7 @@
         "type": "github"
       }
     },
-    "flake-compat_4": {
+    "flake-compat_5": {
       "flake": false,
       "locked": {
         "lastModified": 1606424373,
@@ -436,6 +576,21 @@
       }
     },
     "flake-utils_2": {
+      "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_3": {
       "locked": {
         "lastModified": 1623875721,
         "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",
@@ -518,6 +673,23 @@
         "type": "github"
       }
     },
+    "ghc-8.6.5-iohk_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1600920045,
+        "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=",
+        "owner": "input-output-hk",
+        "repo": "ghc",
+        "rev": "95713a6ecce4551240da7c96b6176f980af75cae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "input-output-hk",
+        "ref": "release/8.6.5-iohk",
+        "repo": "ghc",
+        "type": "github"
+      }
+    },
     "gitignore-nix": {
       "flake": false,
       "locked": {
@@ -599,6 +771,22 @@
       }
     },
     "hackage_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1646270198,
+        "narHash": "sha256-SakG546Zr9RuNPs5mhtT7CYPpvEDMGrWisWK/VpCvr0=",
+        "owner": "input-output-hk",
+        "repo": "hackage.nix",
+        "rev": "4cf90b36955597d0151940eabfb1b61a8ec42256",
+        "type": "github"
+      },
+      "original": {
+        "owner": "input-output-hk",
+        "repo": "hackage.nix",
+        "type": "github"
+      }
+    },
+    "hackage_3": {
       "flake": false,
       "locked": {
         "lastModified": 1642554756,
@@ -677,9 +865,9 @@
         "hpc-coveralls": "hpc-coveralls",
         "nix-tools": "nix-tools",
         "nixpkgs": [
-          "apropos-tx",
+          "apropos",
           "haskell-nix",
-          "nixpkgs-unstable"
+          "nixpkgs-2105"
         ],
         "nixpkgs-2003": "nixpkgs-2003",
         "nixpkgs-2105": "nixpkgs-2105",
@@ -703,7 +891,29 @@
       }
     },
     "haskell-nix_2": {
-      "flake": false,
+      "inputs": {
+        "HTTP": "HTTP_2",
+        "cabal-32": "cabal-32_2",
+        "cabal-34": "cabal-34_2",
+        "cabal-36": "cabal-36_2",
+        "cardano-shell": "cardano-shell_2",
+        "flake-utils": "flake-utils_2",
+        "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_2",
+        "hackage": "hackage_2",
+        "hpc-coveralls": "hpc-coveralls_2",
+        "nix-tools": "nix-tools_2",
+        "nixpkgs": [
+          "apropos-tx",
+          "haskell-nix",
+          "nixpkgs-2105"
+        ],
+        "nixpkgs-2003": "nixpkgs-2003_2",
+        "nixpkgs-2105": "nixpkgs-2105_2",
+        "nixpkgs-2111": "nixpkgs-2111_2",
+        "nixpkgs-unstable": "nixpkgs-unstable_2",
+        "old-ghc-nix": "old-ghc-nix_2",
+        "stackage": "stackage_2"
+      },
       "locked": {
         "lastModified": 1646278384,
         "narHash": "sha256-Gv1Ws3vAojjvjATcsvwAOTuOhzpxwt6tBci7EBaXxU4=",
@@ -719,28 +929,44 @@
       }
     },
     "haskell-nix_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1646278384,
+        "narHash": "sha256-Gv1Ws3vAojjvjATcsvwAOTuOhzpxwt6tBci7EBaXxU4=",
+        "owner": "input-output-hk",
+        "repo": "haskell.nix",
+        "rev": "7e06e14ae1b894445254fe41288bfa7dd4ccbc6f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "input-output-hk",
+        "repo": "haskell.nix",
+        "type": "github"
+      }
+    },
+    "haskell-nix_4": {
       "inputs": {
-        "HTTP": "HTTP_2",
+        "HTTP": "HTTP_3",
-        "cabal-32": "cabal-32_2",
+        "cabal-32": "cabal-32_3",
-        "cabal-34": "cabal-34_2",
+        "cabal-34": "cabal-34_3",
-        "cabal-36": "cabal-36_2",
+        "cabal-36": "cabal-36_3",
-        "cardano-shell": "cardano-shell_2",
+        "cardano-shell": "cardano-shell_3",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
-        "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_2",
+        "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_3",
-        "hackage": "hackage_2",
+        "hackage": "hackage_3",
-        "hpc-coveralls": "hpc-coveralls_2",
+        "hpc-coveralls": "hpc-coveralls_3",
-        "nix-tools": "nix-tools_2",
+        "nix-tools": "nix-tools_3",
         "nixpkgs": [
           "plutarch",
           "haskell-nix",
           "nixpkgs-2111"
         ],
-        "nixpkgs-2003": "nixpkgs-2003_2",
+        "nixpkgs-2003": "nixpkgs-2003_3",
-        "nixpkgs-2105": "nixpkgs-2105_2",
+        "nixpkgs-2105": "nixpkgs-2105_3",
-        "nixpkgs-2111": "nixpkgs-2111_3",
+        "nixpkgs-2111": "nixpkgs-2111_4",
-        "nixpkgs-unstable": "nixpkgs-unstable_2",
+        "nixpkgs-unstable": "nixpkgs-unstable_3",
-        "old-ghc-nix": "old-ghc-nix_2",
+        "old-ghc-nix": "old-ghc-nix_3",
-        "stackage": "stackage_2"
+        "stackage": "stackage_3"
       },
       "locked": {
         "lastModified": 1642811877,
@@ -757,7 +983,7 @@
         "type": "github"
       }
     },
-    "haskell-nix_4": {
+    "haskell-nix_5": {
       "flake": false,
       "locked": {
         "lastModified": 1629380841,
@@ -775,7 +1001,7 @@
     },
     "hercules-ci-agent": {
       "inputs": {
-        "flake-compat": "flake-compat_4",
+        "flake-compat": "flake-compat_5",
         "nix-darwin": "nix-darwin",
         "nixos-20_09": "nixos-20_09",
         "nixos-unstable": "nixos-unstable",
@@ -798,7 +1024,7 @@
     },
     "hercules-ci-effects": {
       "inputs": {
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_4",
         "hercules-ci-agent": "hercules-ci-agent",
         "nixpkgs": "nixpkgs_3",
         "nixpkgs-nixops": "nixpkgs-nixops"
@@ -849,6 +1075,22 @@
         "type": "github"
       }
     },
+    "hpc-coveralls_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1607498076,
+        "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=",
+        "owner": "sevanspowell",
+        "repo": "hpc-coveralls",
+        "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sevanspowell",
+        "repo": "hpc-coveralls",
+        "type": "github"
+      }
+    },
     "hs-memory": {
       "flake": false,
       "locked": {
@@ -949,6 +1191,22 @@
       }
     },
     "nix-tools_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1644395812,
+        "narHash": "sha256-BVFk/BEsTLq5MMZvdy3ZYHKfaS3dHrsKh4+tb5t5b58=",
+        "owner": "input-output-hk",
+        "repo": "nix-tools",
+        "rev": "d847c63b99bbec78bf83be2a61dc9f09b8a9ccc1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "input-output-hk",
+        "repo": "nix-tools",
+        "type": "github"
+      }
+    },
+    "nix-tools_3": {
       "flake": false,
       "locked": {
         "lastModified": 1636018067,
@@ -1045,6 +1303,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-2003_3": {
+      "locked": {
+        "lastModified": 1620055814,
+        "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-20.03-darwin",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-2105": {
       "locked": {
         "lastModified": 1642244250,
@@ -1062,6 +1336,22 @@
       }
     },
     "nixpkgs-2105_2": {
+      "locked": {
+        "lastModified": 1642244250,
+        "narHash": "sha256-vWpUEqQdVP4srj+/YLJRTN9vjpTs4je0cdWKXPbDItc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "0fd9ee1aa36ce865ad273f4f07fdc093adeb5c00",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-21.05-darwin",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-2105_3": {
       "locked": {
         "lastModified": 1640283157,
         "narHash": "sha256-6Ddfop+rKE+Gl9Tjp9YIrkfoYPzb8F80ergdjcq3/MY=",
@@ -1094,6 +1384,22 @@
       }
     },
     "nixpkgs-2111_2": {
+      "locked": {
+        "lastModified": 1644510859,
+        "narHash": "sha256-xjpVvL5ecbyi0vxtVl/Fh9bwGlMbw3S06zE5nUzFB8A=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "0d1d5d7e3679fec9d07f2eb804d9f9fdb98378d3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-21.11-darwin",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-2111_3": {
       "locked": {
         "lastModified": 1647902355,
         "narHash": "sha256-SySJ8IRaogpc/BPOkysA+kzq9URvXthoeKIemaTKCiM=",
@@ -1109,7 +1415,7 @@
         "type": "github"
       }
     },
-    "nixpkgs-2111_3": {
+    "nixpkgs-2111_4": {
       "locked": {
         "lastModified": 1640283207,
         "narHash": "sha256-SCwl7ZnCfMDsuSYvwIroiAlk7n33bW8HFfY8NvKhcPA=",
@@ -1125,7 +1431,7 @@
         "type": "github"
       }
     },
-    "nixpkgs-2111_4": {
+    "nixpkgs-2111_5": {
       "locked": {
         "lastModified": 1644510859,
         "narHash": "sha256-xjpVvL5ecbyi0vxtVl/Fh9bwGlMbw3S06zE5nUzFB8A=",
@@ -1174,6 +1480,22 @@
       }
     },
     "nixpkgs-unstable_2": {
+      "locked": {
+        "lastModified": 1644486793,
+        "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable_3": {
       "locked": {
         "lastModified": 1641285291,
         "narHash": "sha256-KYaOBNGar3XWTxTsYPr9P6u74KAqNq0wobEC236U+0c=",
@@ -1270,6 +1592,23 @@
         "type": "github"
       }
     },
+    "old-ghc-nix_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1631092763,
+        "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=",
+        "owner": "angerman",
+        "repo": "old-ghc-nix",
+        "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "angerman",
+        "ref": "master",
+        "repo": "old-ghc-nix",
+        "type": "github"
+      }
+    },
     "plutarch": {
       "inputs": {
         "Shrinker": "Shrinker",
@@ -1278,12 +1617,12 @@
         "cardano-crypto": "cardano-crypto",
         "cardano-prelude": "cardano-prelude",
         "cryptonite": "cryptonite",
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat_3",
-        "flake-compat-ci": "flake-compat-ci_2",
+        "flake-compat-ci": "flake-compat-ci_3",
         "flat": "flat",
         "foundation": "foundation",
         "haskell-language-server": "haskell-language-server_2",
-        "haskell-nix": "haskell-nix_3",
+        "haskell-nix": "haskell-nix_4",
         "hercules-ci-effects": "hercules-ci-effects",
         "hs-memory": "hs-memory",
         "iohk-nix": "iohk-nix_2",
@@ -1292,7 +1631,7 @@
           "haskell-nix",
           "nixpkgs-unstable"
         ],
-        "nixpkgs-2111": "nixpkgs-2111_4",
+        "nixpkgs-2111": "nixpkgs-2111_5",
         "plutus": "plutus_2",
         "protolude": "protolude",
         "safe-coloured-text": "safe-coloured-text",
@@ -1322,7 +1661,7 @@
         "gitignore-nix": "gitignore-nix",
         "hackage-nix": "hackage-nix",
         "haskell-language-server": "haskell-language-server",
-        "haskell-nix": "haskell-nix_2",
+        "haskell-nix": "haskell-nix_3",
         "iohk-nix": "iohk-nix",
         "nixpkgs": "nixpkgs",
         "pre-commit-hooks-nix": "pre-commit-hooks-nix",
@@ -1349,7 +1688,7 @@
         "gitignore-nix": "gitignore-nix_2",
         "hackage-nix": "hackage-nix_2",
         "haskell-language-server": "haskell-language-server_3",
-        "haskell-nix": "haskell-nix_4",
+        "haskell-nix": "haskell-nix_5",
         "iohk-nix": "iohk-nix_3",
         "nixpkgs": "nixpkgs_4",
         "pre-commit-hooks-nix": "pre-commit-hooks-nix_3",
@@ -1438,6 +1777,7 @@
     },
     "root": {
       "inputs": {
+        "apropos": "apropos",
         "apropos-tx": "apropos-tx",
         "haskell-nix": [
           "plutarch",
@@ -1447,7 +1787,7 @@
           "plutarch",
           "nixpkgs"
         ],
-        "nixpkgs-2111": "nixpkgs-2111_2",
+        "nixpkgs-2111": "nixpkgs-2111_3",
         "plutarch": "plutarch"
       }
     },
@@ -1566,6 +1906,22 @@
       }
     },
     "stackage_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1646270328,
+        "narHash": "sha256-WFzBTbZW9zKnZtHLBLGui9F1tBDKX7ixBtaQOG5SK/M=",
+        "owner": "input-output-hk",
+        "repo": "stackage.nix",
+        "rev": "b3171527569b52b3924d8e70e0aed753d3f55cc4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "input-output-hk",
+        "repo": "stackage.nix",
+        "type": "github"
+      }
+    },
+    "stackage_3": {
       "flake": false,
       "locked": {
         "lastModified": 1642468901,

flake.nix

@@ -11,11 +11,18 @@
   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:mlabs-haskell/apropos-tx?rev=5b74ba897a6f02718c163bf588a08c5e3e9de204";
+    "github:jhodgdev/apropos-tx?rev=582496d0dfb88ce007bb0d2a2dcbc72ea0bb1cd1";
   inputs.apropos-tx.inputs.nixpkgs.follows =
     "plutarch/haskell-nix/nixpkgs-unstable";
+  inputs.apropos.url =
+    "github:jhodgdev/apropos?rev=c6c580aeab8b5c2a6512a49823dd17936e87b70a";
+
 
   outputs = inputs@{ self, nixpkgs, haskell-nix, plutarch, ... }:
     let
@@ -55,6 +62,10 @@
               src = inputs.apropos-tx;
               subdirs = [ "." ];
             }
+            {
+              src = inputs.apropos;
+              subdirs = [ "." ];
+            }
           ];
           modules = [ (plutarch.haskellModule system) ];
           shell = {
@@ -85,6 +96,7 @@
               ps.plutarch-extra
               ps.plutarch-numeric
               ps.plutarch-test
+              ps.apropos
             ];
           };
         };