diff --git a/cabal.project b/cabal.project index 3fb1311fc..c68249699 100644 --- a/cabal.project +++ b/cabal.project @@ -1,4 +1,4 @@ -index-state: 2024-11-02T00:00:00Z +index-state: 2024-12-10T00:00:00Z jobs: $ncpus @@ -94,13 +94,6 @@ if arch(wasm32) tag: 2631c542b57abc9bc9e92db273ab8e80ae88048c --sha256: sha256-M6zLBUjVFacCyDm4oxjQ0gVn1J0BmKWOy3MFfUzWJN8= - -- Upstream uses custom setup, which breaks on Wasm. - source-repository-package - type: git - location: https://github.com/cdepillabout/pretty-simple - tag: 6fb9b281800ad045925c7344ceb9fd293d86c3b9 - --sha256: sha256-1gsYj/iznEUCeQ1f5Xk7w54h9FLJSNrIR9V3p4eaRYk= - -- Upstream doesn't want to support Wasm while it's "experimental." source-repository-package type: git diff --git a/flake.lock b/flake.lock index 1b710d78e..77e4c1c38 100644 --- a/flake.lock +++ b/flake.lock @@ -86,11 +86,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -102,11 +102,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -169,11 +169,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -187,11 +187,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -259,11 +259,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1732309291, - "narHash": "sha256-W+wOHnaXFSzkFo3o7lXuKJBws82DOgYvX2R4SP66UOQ=", + "lastModified": 1733768658, + "narHash": "sha256-f19c5KH/tvukOvtGV6ntVZ3tpcNb/eGsAJJM8wX8CQM=", "ref": "refs/heads/master", - "rev": "0e24705041ef93c10728d03f8c3d25b30121660f", - "revCount": 207, + "rev": "f4de630ddcbae2379dba498c73f15d2829fd09aa", + "revCount": 225, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc-wasm-meta" }, @@ -334,11 +334,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1732321731, - "narHash": "sha256-aZ7k1nJ+20d0TdQc/IUa7NGKaYXS3eHqstAMeVyHA9k=", + "lastModified": 1733790640, + "narHash": "sha256-6/dGbBWBaPJgjEFvRSmvjO1i1XzZ+a4Zj/AAH/z8GRs=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "f98da3ea2d14f57da85692404cd61e925ff97660", + "rev": "8a2cc7041b866e14f1bb183d82f37e8d6e34f8d6", "type": "github" }, "original": { @@ -361,11 +361,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1730552175, - "narHash": "sha256-6Rxe+s1BqnDYHRsHzSoZPR3KmnkV7aCjBu+KOKKItdQ=", + "lastModified": 1733666480, + "narHash": "sha256-HfPcQYHk0Ba8YirKluZQfLYdzVHmhrnXXRUJz/RIYc8=", "owner": "hackworthltd", "repo": "hacknix", - "rev": "a4eb48ebfb3752deacbcbdc1f30dbc4ea264684a", + "rev": "40ff9d306845880e28c0ceed35ad689f717d08a4", "type": "github" }, "original": { @@ -414,11 +414,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1732323070, - "narHash": "sha256-VMqrGcPnpfV2IE8Uf8ZbSoliu4yY965eIYxB1Wb+nag=", + "lastModified": 1733791914, + "narHash": "sha256-vauQWCKtR7r4UBOmdXyIVAa19Ct7O8MSxI8ZNSmxDMs=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "9507fd272055a1aa2719ef1035cf68be8643ac1f", + "rev": "ed1653d026dd24f4905a57c10dc2b7d0859eafda", "type": "github" }, "original": { @@ -695,11 +695,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1730448474, - "narHash": "sha256-qE/cYKBhzxHMtKtLK3hlSR3uzO1pWPGLrBuQK7r0CHc=", + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "683d0c4cd1102dcccfa3f835565378c7f3cbe05e", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", "type": "github" }, "original": { @@ -710,11 +710,11 @@ }, "nixlib": { "locked": { - "lastModified": 1729386149, - "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", + "lastModified": 1733015484, + "narHash": "sha256-qiyO0GrTvbp869U4VGX5GhAZ00fSiPXszvosY1AgKQ8=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "cce4521b6df014e79a7b7afc58c703ed683c916e", + "rev": "0e4fdd4a0ab733276b6d2274ff84ae353f17129e", "type": "github" }, "original": { @@ -732,11 +732,11 @@ ] }, "locked": { - "lastModified": 1729472750, - "narHash": "sha256-s93LPHi5BN7I2xSGNAFWiYb8WRsPvT1LE9ZjZBrpFlg=", + "lastModified": 1733360821, + "narHash": "sha256-bNXO+OGxrOjAxv/Lnyj84tNDicJ/FdLyLJHzOKSzYU8=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565", + "rev": "8cdaf8885c9c85d9d27b594dbe882406aadfe00e", "type": "github" }, "original": { @@ -747,11 +747,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1733581040, + "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", "type": "github" }, "original": { @@ -891,26 +891,26 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1730504152, - "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", + "lastModified": 1733096140, + "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" } }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1727825735, - "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", + "lastModified": 1733096140, + "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" } }, "nixpkgs-regression": { @@ -931,11 +931,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { @@ -1035,11 +1035,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1730302582, - "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", + "lastModified": 1733665616, + "narHash": "sha256-+XTFXYlFJBxohhMGLDpYdEnhUNdxN8dyTA8WAd+lh2A=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", + "rev": "d8c02f0ffef0ef39f6063731fc539d8c71eb463a", "type": "github" }, "original": { @@ -1091,11 +1091,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1732320735, - "narHash": "sha256-rO3+Nj3zQTC9VVlO5nOwKhqLQS9RyPh9Rp22uVep5g0=", + "lastModified": 1733789551, + "narHash": "sha256-0tSxhYw3RqNEHYFYIwJZ99mFDpGr8Dekf+p2ZCEygYY=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "41ed1977fa47fa0a3458b807c9699f39e0819f3c", + "rev": "db7b3e7ae59867ce0ba21df45f57ea38f57710ab", "type": "github" }, "original": { @@ -1142,11 +1142,11 @@ ] }, "locked": { - "lastModified": 1730321837, - "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", + "lastModified": 1733662930, + "narHash": "sha256-9qOp6jNdezzLMxwwXaXZWPXosHbNqno+f7Ii/xftqZ8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", + "rev": "357cda84af1d74626afb7fb3bc12d6957167cda9", "type": "github" }, "original": { @@ -1162,11 +1162,11 @@ ] }, "locked": { - "lastModified": 1732292307, - "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=", + "lastModified": 1733761991, + "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "705df92694af7093dfbb27109ce16d828a79155f", + "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", "type": "github" }, "original": { diff --git a/primer-api/primer-api.cabal b/primer-api/primer-api.cabal index 867a78e7f..e0b92b702 100644 --- a/primer-api/primer-api.cabal +++ b/primer-api/primer-api.cabal @@ -145,7 +145,7 @@ test-suite primer-api-test , logging-effect , mtl , optics - , pretty-simple ^>=4.1 + , pretty-simple ^>=4.1.3.0 , primer , primer-api , primer-api-testlib diff --git a/primer-service/primer-service.cabal b/primer-service/primer-service.cabal index a66d3975c..dd86ebb55 100644 --- a/primer-service/primer-service.cabal +++ b/primer-service/primer-service.cabal @@ -198,7 +198,7 @@ test-suite primer-service-test , hedgehog-quickcheck ^>=0.1.1 , hspec ^>=2.11 , openapi3 - , pretty-simple ^>=4.1 + , pretty-simple ^>=4.1.3.0 , primer , primer-api , primer-api:primer-api-hedgehog diff --git a/primer/primer.cabal b/primer/primer.cabal index 9638df937..982fdd60c 100644 --- a/primer/primer.cabal +++ b/primer/primer.cabal @@ -288,7 +288,7 @@ test-suite primer-test , logging-effect , mtl , optics - , pretty-simple ^>=4.1 + , pretty-simple ^>=4.1.3.0 , prettyprinter , prettyprinter-ansi-terminal , primer