diff --git a/flake.lock b/flake.lock index 518596b..706dd5c 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1718321387, - "narHash": "sha256-nGQjKK1f4MtPneUZ0pFLdoL2wYpsEoi9vKNmbplP4HU=", + "lastModified": 1718397410, + "narHash": "sha256-u8o3a4MbrJUDK+T/noTNvep9Pu5ZFakEri5VaLEV5as=", "ref": "refs/heads/main", - "rev": "267445867962f02df80044207db26d69df9739c3", - "revCount": 766, + "rev": "d56d218d303fb03a70a2420118d1a894c8ace5f8", + "revCount": 769, "type": "git", "url": "https://git.tryp.io/tek/hix" }, diff --git a/ops/managed.nix b/ops/managed.nix index 4864bd9..f444bc9 100644 --- a/ops/managed.nix +++ b/ops/managed.nix @@ -27,7 +27,7 @@ }; tasty = { lower = "1.4.0.3"; - upper = "1.5"; + upper = "1.6"; }; tasty-hedgehog = { lower = "1.1.0.0"; @@ -47,7 +47,7 @@ hedgehog = "1.4"; incipit-base = "0.6.0.0"; parsec = "3.1.17.0"; - tasty = "1.4.3"; + tasty = "1.5"; tasty-hedgehog = "1.4.0.2"; template-haskell = "2.21.0.0"; }; @@ -80,6 +80,22 @@ version = "0.6.0.0"; hash = "1hck35yfy0dcgimgnd90w02zvv7x7k456bljrbx2mwxalnhav9gf"; }; + indexed-traversable-instances = { + version = "0.1.1.2"; + hash = "1mmkklfpagv855p12dqq0r6xwg0v6dc1gj1n3nvzzy4b909ajgd0"; + }; + tasty = { + version = "1.5"; + hash = "0v2xrmrxss6zkrny5zlxjanhp4a3zwsx7v9iszj62wqgcc13zva9"; + }; + tasty-hedgehog = { + version = "1.4.0.2"; + hash = "04kg2qdnsqzzmj3xggy2jcgidlp21lsjkz4sfnbq7b1yhrv2vbbc"; + }; + time-compat = { + version = "1.9.6.1"; + hash = "0ika8xx9zff8rwaabs17q5c30c1b9ii89jhbvahi5nk7rs0cd5fs"; + }; }; lower = { OneTuple = { diff --git a/ops/overrides.nix b/ops/overrides.nix index accb71e..51a0973 100644 --- a/ops/overrides.nix +++ b/ops/overrides.nix @@ -33,6 +33,107 @@ mkDerivation { } ; } +; + indexed-traversable-instances = { + meta = { + sha256 = "1mmkklfpagv855p12dqq0r6xwg0v6dc1gj1n3nvzzy4b909ajgd0"; + ver = "0.1.1.2"; + }; + drv = { mkDerivation, base, containers, indexed-traversable, lib +, OneTuple, QuickCheck, quickcheck-instances, tagged, tasty +, tasty-quickcheck, transformers, unordered-containers, vector +}: +mkDerivation { + pname = "indexed-traversable-instances"; + version = "0.1.1.2"; + src = /nix/store/v0g4ddbkq1d9frb9j4pc0ga1vs6dlm2b-source; + libraryHaskellDepends = [ + base indexed-traversable OneTuple tagged unordered-containers + vector + ]; + testHaskellDepends = [ + base containers indexed-traversable OneTuple QuickCheck + quickcheck-instances tasty tasty-quickcheck transformers + unordered-containers vector + ]; + description = "More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; + license = lib.licenses.bsd2; +} +; +} +; + tasty = { + meta = { + sha256 = "0v2xrmrxss6zkrny5zlxjanhp4a3zwsx7v9iszj62wqgcc13zva9"; + ver = "1.5"; + }; + drv = { mkDerivation, ansi-terminal, base, containers, lib +, optparse-applicative, stm, tagged, transformers, unix +}: +mkDerivation { + pname = "tasty"; + version = "1.5"; + src = /nix/store/z745l4r4wk305rfiz8wpc3f89288fi8r-source; + libraryHaskellDepends = [ + ansi-terminal base containers optparse-applicative stm tagged + transformers unix + ]; + homepage = "https://github.com/UnkindPartition/tasty"; + description = "Modern and extensible testing framework"; + license = lib.licenses.mit; +} +; +} +; + tasty-hedgehog = { + meta = { + sha256 = "04kg2qdnsqzzmj3xggy2jcgidlp21lsjkz4sfnbq7b1yhrv2vbbc"; + ver = "1.4.0.2"; + }; + drv = { mkDerivation, base, hedgehog, lib, tagged, tasty +, tasty-expected-failure +}: +mkDerivation { + pname = "tasty-hedgehog"; + version = "1.4.0.2"; + src = /nix/store/b9mxq4fh65sif22q9a4g041jvp847cyc-source; + libraryHaskellDepends = [ base hedgehog tagged tasty ]; + testHaskellDepends = [ + base hedgehog tasty tasty-expected-failure + ]; + homepage = "https://github.com/qfpl/tasty-hedgehog"; + description = "Integration for tasty and hedgehog"; + license = lib.licenses.bsd3; +} +; +} +; + time-compat = { + meta = { + sha256 = "0ika8xx9zff8rwaabs17q5c30c1b9ii89jhbvahi5nk7rs0cd5fs"; + ver = "1.9.6.1"; + }; + drv = { mkDerivation, base, base-compat, base-orphans, deepseq, hashable +, HUnit, lib, QuickCheck, tagged, tasty, tasty-hunit +, tasty-quickcheck, time +}: +mkDerivation { + pname = "time-compat"; + version = "1.9.6.1"; + src = /nix/store/r5pf6kwybjyjpwh4knlr4j6vr2lz5nym-source; + libraryHaskellDepends = [ + base base-orphans deepseq hashable time + ]; + testHaskellDepends = [ + base base-compat deepseq hashable HUnit QuickCheck tagged tasty + tasty-hunit tasty-quickcheck time + ]; + homepage = "https://github.com/haskellari/time-compat"; + description = "Compatibility package for time"; + license = lib.licenses.bsd3; +} +; +} ; }; lower = { diff --git a/packages/exon/exon.cabal b/packages/exon/exon.cabal index ae8083b..cbeddfa 100644 --- a/packages/exon/exon.cabal +++ b/packages/exon/exon.cabal @@ -148,7 +148,7 @@ test-suite exon-test , exon , hedgehog >=1.1 && <1.5 , incipit-base >=0.5.0.0 && <0.7 - , tasty >=1.4.0.3 && <1.5 + , tasty >=1.4.0.3 && <1.6 , tasty-hedgehog >=1.1.0.0 && <1.5 , template-haskell >=2.18.0.0 && <2.22 mixins: