diff --git a/flake.lock b/flake.lock index 7e5280e..706d698 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "thax": "thax" }, "locked": { - "lastModified": 1694967996, - "narHash": "sha256-Rbz2k8i0VoC9haYpZtTxvzk9YCyAcDAs0lhrG+Lxdxo=", + "lastModified": 1695065405, + "narHash": "sha256-7YZRGPaFM2coVYtVqnK4ug6/1kXTjwGaVSGgu09ZBsA=", "ref": "refs/heads/main", - "rev": "b39fcf123f66237226e946f51be7d6cf9c092b61", - "revCount": 545, + "rev": "bb0d49863a39b1c2fe7f2c21b05f246c21920862", + "revCount": 550, "type": "git", "url": "https://git.tryp.io/tek/hix" }, @@ -59,17 +59,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1694562957, - "narHash": "sha256-ZvDt5bxX6Ga+TQ6kvK5WEn7OQN87KAsMaRrFSdReIm8=", + "lastModified": 1686582075, + "narHash": "sha256-vtflsfKkHtF8IduxDNtbme4cojiqvlvjp5QNYhvoHXc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f4a33546bdb5f81bd6cceb1b3cb19667145fed83", + "rev": "7e63eed145566cca98158613f3700515b4009ce3", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "f4a33546bdb5f81bd6cceb1b3cb19667145fed83", + "rev": "7e63eed145566cca98158613f3700515b4009ce3", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 0974edd..73fbd25 100644 --- a/flake.nix +++ b/flake.nix @@ -14,19 +14,21 @@ gen-overrides.enable = true; compiler = "ghc94"; - envs.ghc96.overrides = { hackage, ... }: { - polysemy-resume = hackage "0.7.0.0" "1b9agh2qd0nrbd7cc5iabkzjb7g9lnzzy3pprvn33hr54va9p928"; + envs.ghc96.overrides = {unbreak, ...}: { + polysemy-resume = unbreak; }; - envs.ghc94.overrides = { hackage, ... }: { + envs.ghc94.overrides = {hackage, ...}: { + polysemy = hackage "1.9.1.2" "01vkiqxcjvvihgg8dvws76sfg0d98z8xyvpnj3g3nz02i078xf8j"; polysemy-resume = hackage "0.7.0.0" "1b9agh2qd0nrbd7cc5iabkzjb7g9lnzzy3pprvn33hr54va9p928"; }; - envs.ghc92.overrides = { hackage, ... }: { - polysemy-resume = hackage "0.7.0.0" "1b9agh2qd0nrbd7cc5iabkzjb7g9lnzzy3pprvn33hr54va9p928"; + envs.ghc92.overrides = {hackage, unbreak, ...}: { + polysemy = hackage "1.9.1.2" "01vkiqxcjvvihgg8dvws76sfg0d98z8xyvpnj3g3nz02i078xf8j"; + polysemy-resume = unbreak; }; - envs.dev.overrides = { hackage, ... }: { + envs.dev.overrides = {hackage, ...}: { polysemy = hackage "1.9.1.2" "01vkiqxcjvvihgg8dvws76sfg0d98z8xyvpnj3g3nz02i078xf8j"; polysemy-plugin = hackage "0.4.5.1" "0afmx1vdgmvggk4sb4av91qnm8b3hr2kb4adcj9fhzq2w50393bc"; polysemy-resume = hackage "0.8.0.0" "1mh050fxlkvhdd8knf9dlakf3zqij3rxh8ac1zb6mwhp4j6y1dqn"; diff --git a/ops/overrides.nix b/ops/overrides.nix index a921052..9eff452 100644 --- a/ops/overrides.nix +++ b/ops/overrides.nix @@ -142,33 +142,72 @@ mkDerivation { ; }; ghc92 = { - polysemy-resume = { + polysemy = { meta = { - sha256 = "1b9agh2qd0nrbd7cc5iabkzjb7g9lnzzy3pprvn33hr54va9p928"; - ver = "0.7.0.0"; + sha256 = "01vkiqxcjvvihgg8dvws76sfg0d98z8xyvpnj3g3nz02i078xf8j"; + ver = "1.9.1.2"; }; - drv = { mkDerivation, base, incipit-core, lib, polysemy, polysemy-plugin -, polysemy-test, stm, tasty, transformers + drv = { mkDerivation, async, base, Cabal, cabal-doctest, containers +, doctest, first-class-families, hspec, hspec-discover +, inspection-testing, lib, mtl, stm, syb, template-haskell +, th-abstraction, transformers, type-errors, unagi-chan }: mkDerivation { - pname = "polysemy-resume"; - version = "0.7.0.0"; - src = /nix/store/2l5708xrry0mnv5znidx9affjinmpryq-source; + pname = "polysemy"; + version = "1.9.1.2"; + src = /nix/store/anfwczj25hh5zcm9y70vb1221wayi1v0-source; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base incipit-core polysemy transformers + async base containers first-class-families mtl stm syb + template-haskell th-abstraction transformers type-errors unagi-chan ]; testHaskellDepends = [ - base incipit-core polysemy polysemy-plugin polysemy-test stm tasty + async base containers doctest first-class-families hspec + hspec-discover inspection-testing mtl stm syb template-haskell + th-abstraction transformers type-errors unagi-chan ]; - homepage = "https://github.com/tek/polysemy-resume#readme"; - description = "Polysemy error tracking"; - license = "BSD-2-Clause-Patent"; + testToolDepends = [ hspec-discover ]; + homepage = "https://github.com/polysemy-research/polysemy#readme"; + description = "Higher-order, low-boilerplate free monads"; + license = lib.licenses.bsd3; } ; } ; }; ghc94 = { + polysemy = { + meta = { + sha256 = "01vkiqxcjvvihgg8dvws76sfg0d98z8xyvpnj3g3nz02i078xf8j"; + ver = "1.9.1.2"; + }; + drv = { mkDerivation, async, base, Cabal, cabal-doctest, containers +, doctest, first-class-families, hspec, hspec-discover +, inspection-testing, lib, mtl, stm, syb, template-haskell +, th-abstraction, transformers, type-errors, unagi-chan +}: +mkDerivation { + pname = "polysemy"; + version = "1.9.1.2"; + src = /nix/store/anfwczj25hh5zcm9y70vb1221wayi1v0-source; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + async base containers first-class-families mtl stm syb + template-haskell th-abstraction transformers type-errors unagi-chan + ]; + testHaskellDepends = [ + async base containers doctest first-class-families hspec + hspec-discover inspection-testing mtl stm syb template-haskell + th-abstraction transformers type-errors unagi-chan + ]; + testToolDepends = [ hspec-discover ]; + homepage = "https://github.com/polysemy-research/polysemy#readme"; + description = "Higher-order, low-boilerplate free monads"; + license = lib.licenses.bsd3; +} +; +} +; polysemy-resume = { meta = { sha256 = "1b9agh2qd0nrbd7cc5iabkzjb7g9lnzzy3pprvn33hr54va9p928"; @@ -300,31 +339,6 @@ mkDerivation { } ; } -; - polysemy-resume = { - meta = { - sha256 = "1b9agh2qd0nrbd7cc5iabkzjb7g9lnzzy3pprvn33hr54va9p928"; - ver = "0.7.0.0"; - }; - drv = { mkDerivation, base, incipit-core, lib, polysemy, polysemy-plugin -, polysemy-test, stm, tasty, transformers -}: -mkDerivation { - pname = "polysemy-resume"; - version = "0.7.0.0"; - src = /nix/store/2l5708xrry0mnv5znidx9affjinmpryq-source; - libraryHaskellDepends = [ - base incipit-core polysemy transformers - ]; - testHaskellDepends = [ - base incipit-core polysemy polysemy-plugin polysemy-test stm tasty - ]; - homepage = "https://github.com/tek/polysemy-resume#readme"; - description = "Polysemy error tracking"; - license = "BSD-2-Clause-Patent"; -} -; -} ; }; hls = {