From 803aea3d3c36d0bc601ca13e9cbc084d63c6a1fa Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 26 Dec 2021 12:41:04 +0100 Subject: [PATCH] haskellPackages.polysemy-{resume,conc,mocks}: downgrade to unbreak These packages are not in Stackage LTS, but depend on package in Stackage LTS, so we need to downgrade them to keep them working. --- .../configuration-hackage2nix/broken.yaml | 1 - .../configuration-hackage2nix/main.yaml | 4 ++ .../haskell-modules/hackage-packages.nix | 58 ++++++++++++++++++- 3 files changed, 61 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index e6c50d359ebe..e873fff6dd97 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3791,7 +3791,6 @@ broken-packages: - polydata-core - polynom - polynomial - - polysemy-mocks - polysemy-zoo - polytypeable - pomaps diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 35858999a920..bca6360dca2c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -126,6 +126,10 @@ default-package-overrides: - brittany < 0.14 # 1.2.0.0: “Dropped support for GHC <9.2 (might readd it later)” - retrie < 1.2.0.0 + # Compat with polysemy in Stackage LTS 18 + - polysemy-resume < 0.1.0.2 + - polysemy-conc < 0.5 + - polysemy-mocks < 0.2 extra-packages: - base16-bytestring < 1 # required for cabal-install etc. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 431c9ee69e80..93fad526d33d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -214222,6 +214222,28 @@ self: { }) {}; "polysemy-conc" = callPackage + ({ mkDerivation, async, base, containers, polysemy, polysemy-test + , polysemy-time, relude, stm, stm-chans, string-interpolate, tasty + , template-haskell, text, time, unagi-chan, unix + }: + mkDerivation { + pname = "polysemy-conc"; + version = "0.4.0.1"; + sha256 = "1wf24837p5bk6p6p2d3bqwyrj93ls7kndvzr9qa8w8g46fv1ryp4"; + libraryHaskellDepends = [ + async base containers polysemy polysemy-time relude stm stm-chans + string-interpolate template-haskell text time unagi-chan unix + ]; + testHaskellDepends = [ + base polysemy polysemy-test polysemy-time stm tasty time unagi-chan + unix + ]; + description = "Polysemy Effects for Concurrency"; + license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "polysemy-conc_0_5_1_1" = callPackage ({ mkDerivation, async, base, containers, data-default, polysemy , polysemy-plugin, polysemy-test, polysemy-time, relude, stm , stm-chans, tasty, template-haskell, text, time, torsor @@ -214481,6 +214503,21 @@ self: { }) {}; "polysemy-mocks" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, polysemy + , template-haskell + }: + mkDerivation { + pname = "polysemy-mocks"; + version = "0.1.0.1"; + sha256 = "0jd8x47mdx9fyn65ra0y1m05myf2m2bhz3ykg1i3818ixwd93xvl"; + libraryHaskellDepends = [ base polysemy template-haskell ]; + testHaskellDepends = [ base hspec polysemy ]; + testToolDepends = [ hspec-discover ]; + description = "Mocking framework for polysemy effects"; + license = lib.licenses.bsd3; + }) {}; + + "polysemy-mocks_0_2_0_0" = callPackage ({ mkDerivation, base, hspec, hspec-discover, polysemy , template-haskell }: @@ -214494,7 +214531,6 @@ self: { description = "Mocking framework for polysemy effects"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy-optics" = callPackage @@ -214629,6 +214665,26 @@ self: { }) {}; "polysemy-resume" = callPackage + ({ mkDerivation, base, hedgehog, polysemy, polysemy-plugin + , polysemy-test, relude, tasty, tasty-hedgehog, text, transformers + }: + mkDerivation { + pname = "polysemy-resume"; + version = "0.1.0.1"; + sha256 = "1pgirh7sz1lx45pkss1a4w7xgy7gcxmm7i2vz9hf0z7qdj9wfn8i"; + libraryHaskellDepends = [ + base polysemy polysemy-plugin relude transformers + ]; + testHaskellDepends = [ + base hedgehog polysemy polysemy-plugin polysemy-test relude tasty + tasty-hedgehog text transformers + ]; + description = "Polysemy error tracking"; + license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "polysemy-resume_0_2_0_0" = callPackage ({ mkDerivation, base, hedgehog, polysemy, polysemy-plugin , polysemy-test, relude, tasty, tasty-hedgehog, text, transformers }: