diff --git a/flake.lock b/flake.lock index 7b02ce87b..6253c7980 100644 --- a/flake.lock +++ b/flake.lock @@ -169,11 +169,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -187,11 +187,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -205,11 +205,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -277,11 +277,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1708458689, - "narHash": "sha256-wB1E6eO0QskWq3tcttYvkOBM7Can/eZIVZmIpV++6Uw=", + "lastModified": 1711947426, + "narHash": "sha256-dIWf+sQHoMD3Quy3Qrc88g7CXY9OiqOVSA6PPJjl7cM=", "ref": "refs/heads/master", - "rev": "818ef8f57995b9a81740bf3b49fe4335cb0b9e39", - "revCount": 142, + "rev": "838f6b1712a1c80b9ba3ebac3afd6f70f222cb6c", + "revCount": 158, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc-wasm-meta" }, @@ -290,33 +290,33 @@ "url": "https://gitlab.haskell.org/ghc/ghc-wasm-meta" } }, - "ghc98X": { + "ghc910X": { "flake": false, "locked": { - "lastModified": 1696643148, - "narHash": "sha256-E02DfgISH7EvvNAu0BHiPvl1E5FGMDi0pWdNZtIBC9I=", - "ref": "ghc-9.8", - "rev": "443e870d977b1ab6fc05f47a9a17bc49296adbd6", - "revCount": 61642, + "lastModified": 1711543129, + "narHash": "sha256-MUI07CxYOng7ZwHnMCw0ugY3HmWo2p/f4r07CGV7OAM=", + "ref": "ghc-9.10", + "rev": "6ecd5f2ff97af53c7334f2d8581651203a2c6b7d", + "revCount": 62607, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" }, "original": { - "ref": "ghc-9.8", + "ref": "ghc-9.10", "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" } }, - "ghc99": { + "ghc911": { "flake": false, "locked": { - "lastModified": 1701580282, - "narHash": "sha256-drA01r3JrXnkKyzI+owMZGxX0JameMzjK0W5jJE/+V4=", + "lastModified": 1711538967, + "narHash": "sha256-KSdOJ8seP3g30FaC2du8QjU9vumMnmzPR5wfkVRXQMk=", "ref": "refs/heads/master", - "rev": "f5eb0f2982e9cf27515e892c4bdf634bcfb28459", - "revCount": 62197, + "rev": "0acfe391583d77a72051d505f05fab0ada056c49", + "revCount": 62632, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" @@ -389,11 +389,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1708734072, - "narHash": "sha256-LKMCZUK4tvezco8SjtE1hLxn7eVuBAjfu+09HrrI0kU=", + "lastModified": 1712449532, + "narHash": "sha256-scbBPqo1x6/jNMdm5qAsXhLykziRRyP8NX6/iY21dos=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "501a4f008e0173698bcbb7ba929bbb842df56e09", + "rev": "307472a2ac8b8cc7258a415b1c15b251b5f0d88d", "type": "github" }, "original": { @@ -412,14 +412,15 @@ "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks-nix": "pre-commit-hooks-nix" + "pre-commit-hooks-nix": "pre-commit-hooks-nix", + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1711150242, - "narHash": "sha256-rwYvrqq9ii/sY3/mtdFJSvmD5rrczbws3q/mY3ZCNz0=", + "lastModified": 1712336319, + "narHash": "sha256-SctkQIFUIW0VI3YDRJsoHOHmEAuiTcGB0EUl+yyVfyQ=", "owner": "hackworthltd", "repo": "hacknix", - "rev": "0f683b219ed1cc47514a17a505f48d836947e9b8", + "rev": "e16b33b931ca4991b7be2eb6976b8f66fef29ab3", "type": "github" }, "original": { @@ -437,8 +438,8 @@ "cardano-shell": "cardano-shell", "flake-compat": "flake-compat_4", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", - "ghc98X": "ghc98X", - "ghc99": "ghc99", + "ghc910X": "ghc910X", + "ghc911": "ghc911", "hackage": "hackage", "hls-1.10": "hls-1.10", "hls-2.0": "hls-2.0", @@ -450,7 +451,6 @@ "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", - "nix-tools-static": "nix-tools-static", "nixpkgs": [ "haskell-nix", "nixpkgs-unstable" @@ -467,11 +467,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1708735756, - "narHash": "sha256-5qHbJf6RzJsaAYUxV3R+j1payxdWO+3QfsrsU6Gahkw=", + "lastModified": 1712451016, + "narHash": "sha256-sKUl99brqbRBOgFr6SeLZn6VI4q1HmjBDoIEz7wMXvI=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "1aba987c53d4a613f271aca0205589169fb353b3", + "rev": "afa6a504aa525bdfb31a682a55d29492a55bcb64", "type": "github" }, "original": { @@ -641,18 +641,18 @@ "iserv-proxy": { "flake": false, "locked": { - "lastModified": 1691634696, - "narHash": "sha256-MZH2NznKC/gbgBu8NgIibtSUZeJ00HTLJ0PlWKCBHb0=", - "ref": "hkm/remote-iserv", - "rev": "43a979272d9addc29fbffc2e8542c5d96e993d73", - "revCount": 14, - "type": "git", - "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + "lastModified": 1708894040, + "narHash": "sha256-Rv+PajrnuJ6AeyhtqzMN+bcR8z9+aEnrUass+N951CQ=", + "owner": "stable-haskell", + "repo": "iserv-proxy", + "rev": "2f2a318fd8837f8063a0d91f329aeae29055fba9", + "type": "github" }, "original": { - "ref": "hkm/remote-iserv", - "type": "git", - "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + "owner": "stable-haskell", + "ref": "iserv-syms", + "repo": "iserv-proxy", + "type": "github" } }, "lowdown-src": { @@ -697,11 +697,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1710717205, - "narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=", + "lastModified": 1711763326, + "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3", + "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", "type": "github" }, "original": { @@ -710,30 +710,13 @@ "type": "github" } }, - "nix-tools-static": { - "flake": false, - "locked": { - "lastModified": 1706266250, - "narHash": "sha256-9t+GRk3eO9muCtKdNAwBtNBZ5dH1xHcnS17WaQyftwA=", - "owner": "input-output-hk", - "repo": "haskell-nix-example", - "rev": "580cb6db546a7777dad3b9c0fa487a366c045c4e", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "nix", - "repo": "haskell-nix-example", - "type": "github" - } - }, "nixlib": { "locked": { - "lastModified": 1710636348, - "narHash": "sha256-/kB+ZWSdkZjbZ0FTqm0u84sf2jFS+30ysaEajmBjtoY=", + "lastModified": 1711846064, + "narHash": "sha256-cqfX0QJNEnge3a77VnytM0Q6QZZ0DziFXt6tSCV8ZSc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "fa827dda806c5aa98f454da4c567991ab8ce422c", + "rev": "90b1a963ff84dc532db92f678296ff2499a60a87", "type": "github" }, "original": { @@ -751,11 +734,11 @@ ] }, "locked": { - "lastModified": 1711108213, - "narHash": "sha256-Q8cwpA2LQOInqeXVckrfFlbzHB8HOWrYntuOxqn3A3g=", + "lastModified": 1712191720, + "narHash": "sha256-xXtSSnVHURHsxLQO30dzCKW5NJVGV/umdQPmFjPFMVA=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "417a857dfb824e60930881a254dd67d6796f5884", + "rev": "0c15e76bed5432d7775a22e8d22059511f59d23a", "type": "github" }, "original": { @@ -766,11 +749,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708296515, - "narHash": "sha256-FyF489fYNAUy7b6dkYV6rGPyzp+4tThhr80KNAaF/yY=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -895,11 +878,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1706550542, - "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -913,11 +896,11 @@ "nixpkgs-lib_2": { "locked": { "dir": "lib", - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -1050,11 +1033,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1710923068, - "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=", + "lastModified": 1712055707, + "narHash": "sha256-4XLvuSIDZJGS17xEwSrNuJLL7UjDYKGJSbK1WWX2AK8=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673", + "rev": "e35aed5fda3cc79f88ed7f1795021e559582093a", "type": "github" }, "original": { @@ -1105,11 +1088,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1708646943, - "narHash": "sha256-2yKh9HEWW+QvmUClepBuEQY0hgcPvCVoVHgrl3QPg8k=", + "lastModified": 1712448691, + "narHash": "sha256-eRaWJjAvNr0hpIT2XZ/sFF+WIwpJNW4or/q9QDCIunI=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "6cd41c982e508c0ea3bb872ebccfdd7a65a58b2b", + "rev": "bdecf25189e83a178b90be3f9a11502de35a3315", "type": "github" }, "original": { @@ -1162,6 +1145,27 @@ "repo": "default", "type": "github" } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "hacknix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1711963903, + "narHash": "sha256-N3QDhoaX+paWXHbEXZapqd1r95mdshxToGowtjtYkGI=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49dc4a92b02b8e68798abd99184f228243b6e3ac", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/primer-api/primer-api.cabal b/primer-api/primer-api.cabal index 377837295..3c2f4fb81 100644 --- a/primer-api/primer-api.cabal +++ b/primer-api/primer-api.cabal @@ -68,9 +68,11 @@ library primer-api-hedgehog build-depends: , base - , hedgehog ^>=1.4 + , hedgehog ^>=1.4 + , primer , primer-api - , primer:{primer, primer-hedgehog, primer-testlib} + , primer:primer-hedgehog + , primer:primer-testlib library primer-api-testlib visibility: public @@ -95,8 +97,9 @@ library primer-api-testlib build-depends: , base , logging-effect + , primer , primer-api - , primer:{primer, primer-testlib} + , primer:primer-testlib , stm , stm-containers @@ -142,20 +145,22 @@ test-suite primer-api-test , logging-effect , mtl , optics - , pretty-simple ^>=4.1 + , pretty-simple ^>=4.1 + , primer , primer-api , primer-api-testlib - , primer:{primer, primer-hedgehog, primer-testlib} + , primer:primer-hedgehog + , primer:primer-testlib , protolude , stm , stm-containers - , tasty ^>=1.5 + , tasty ^>=1.5 , tasty-discover - , tasty-golden ^>=2.3.5 + , tasty-golden ^>=2.3.5 , tasty-hunit , text , transformers - , uuid-types ^>=1.0.5.1 + , uuid-types ^>=1.0.5.1 --TODO This currently breaks with haskell.nix, so we manually add it to `flake.nix` instead. -- See: https://github.com/input-output-hk/haskell.nix/issues/839 diff --git a/primer-benchmark/primer-benchmark.cabal b/primer-benchmark/primer-benchmark.cabal index 743974997..a100425ec 100644 --- a/primer-benchmark/primer-benchmark.cabal +++ b/primer-benchmark/primer-benchmark.cabal @@ -40,16 +40,17 @@ library hs-source-dirs: src exposed-modules: Benchmarks build-depends: - , aeson >=2.0 && <2.3 - , base >=4.12 && <4.20 - , containers >=0.6.0.1 && <0.7.0 - , criterion ^>=1.6.0.0 - , deepseq ^>=1.5 - , logging-effect ^>=1.4 - , primer:{primer, primer-testlib} - , tasty ^>=1.5 - , tasty-hunit ^>=0.10.0 - , text ^>=2.0 + , aeson >=2.0 && <2.3 + , base >=4.12 && <4.20 + , containers >=0.6.0.1 && <0.7.0 + , criterion ^>=1.6.0.0 + , deepseq ^>=1.5 + , logging-effect ^>=1.4 + , primer + , primer:primer-testlib + , tasty ^>=1.5 + , tasty-hunit ^>=0.10.0 + , text ^>=2.0 benchmark primer-benchmark import: options diff --git a/primer-selda/primer-selda.cabal b/primer-selda/primer-selda.cabal index 5b8619e34..bfe9d1e1c 100644 --- a/primer-selda/primer-selda.cabal +++ b/primer-selda/primer-selda.cabal @@ -112,13 +112,15 @@ test-suite primer-selda-test , exceptions , filepath , logging-effect - , primer-selda:{primer-selda, primer-selda-testlib} - , primer:{primer, primer-testlib} + , primer + , primer-selda + , primer-selda:primer-selda-testlib + , primer:primer-testlib , selda , selda-sqlite - , tasty ^>=1.5 - , tasty-discover ^>=5.0 - , tasty-hunit ^>=0.10.0 + , tasty ^>=1.5 + , tasty-discover ^>=5.0 + , tasty-hunit ^>=0.10.0 , text , time , uuid-types diff --git a/primer-service/primer-service.cabal b/primer-service/primer-service.cabal index 4cc2e3a48..1ce3f8bc6 100644 --- a/primer-service/primer-service.cabal +++ b/primer-service/primer-service.cabal @@ -193,23 +193,27 @@ test-suite primer-service-test , aeson-pretty , base , bytestring - , hedgehog ^>=1.4 - , hedgehog-quickcheck ^>=0.1.1 - , hspec ^>=2.11 + , hedgehog ^>=1.4 + , hedgehog-quickcheck ^>=0.1.1 + , hspec ^>=2.11 , openapi3 - , pretty-simple ^>=4.1 - , primer-api:{primer-api, primer-api-hedgehog} - , primer-selda:{primer-selda, primer-selda-testlib} + , pretty-simple ^>=4.1 + , primer + , primer-api + , primer-api:primer-api-hedgehog + , primer-selda + , primer-selda:primer-selda-testlib , primer-service - , primer:{primer, primer-hedgehog, primer-testlib} - , QuickCheck ^>=2.14.2 + , primer:primer-hedgehog + , primer:primer-testlib + , QuickCheck ^>=2.14.2 , servant-openapi3 - , tasty ^>=1.5 - , tasty-discover ^>=5.0 - , tasty-golden ^>=2.3.5 - , tasty-hedgehog ^>=1.4.0.2 - , tasty-hspec ^>=1.2.0.1 - , tasty-hunit ^>=0.10.0 + , tasty ^>=1.5 + , tasty-discover ^>=5.0 + , tasty-golden ^>=2.3.5 + , tasty-hedgehog ^>=1.4.0.2 + , tasty-hspec ^>=1.2.0.1 + , tasty-hunit ^>=0.10.0 , text , time , uuid-types