release 0.8.2.0

flake.nix

@@ -2,50 +2,58 @@
   description = "Experimental, user-contributed effects and interpreters for polysemy";
 
   inputs = {
-    nixpkgs_2009.url = github:nixos/nixpkgs/release-20.09;
-    nixpkgs_2105.url = github:nixos/nixpkgs/release-21.05;
-    unstable.url = github:nixos/nixpkgs/nixpkgs-unstable;
-    flake-utils.url = github:numtide/flake-utils;
+    nixpkgs.url = "github:nixos/nixpkgs/7e63eed145566cca98158613f3700515b4009ce3";
+    flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { nixpkgs_2009, nixpkgs_2105, unstable, flake-utils, ... }:
+  outputs = { nixpkgs, flake-utils, ... }:
   flake-utils.lib.eachSystem ["x86_64-linux"] (system:
-  with unstable.lib;
   let
-    hsPkgs = nixpkgs: compiler: import ./nix/overlay.nix { inherit system nixpkgs compiler; };
+    inherit (nixpkgs.lib) mapAttrs' nameValuePair composeManyExtensions versionAtLeast optionalAttrs;
 
-    ghcs = {
-      "865" = hsPkgs nixpkgs_2009 "ghc865";
-      "884" = hsPkgs nixpkgs_2105 "ghc884";
-      "8107" = hsPkgs unstable "ghc8107";
-      "901" = hsPkgs unstable "ghc901";
-      "921" = hsPkgs unstable "ghc921";
+    pkgs = import nixpkgs { inherit system; };
+
+    src = pkgs.nix-gitignore.gitignoreSourcePure [./nix/source-filter] ./.;
+
+    basic = self: super: optionalAttrs (versionAtLeast super.ghc.version "9.4") {
+      ghcid = pkgs.haskell.lib.dontCheck super.ghcid;
+    } // {
+      polysemy-zoo = self.callCabal2nix "polysemy-zoo" src {};
     };
 
-    mkPackage = version: {
-      "polysemy-zoo-${version}" = ghcs.${version}.polysemy-zoo;
+    hsPkgs = compiler: overrides: pkgs.haskell.packages.${compiler}.override {
+      overrides = composeManyExtensions ([basic] ++ overrides);
+    };
+
+    ghcs = {
+      "810" = hsPkgs "ghc810" [];
+      "90" = hsPkgs "ghc90" [];
+      "92" = hsPkgs "ghc92" [];
+      "94" = hsPkgs "ghc94" [];
+      default = hsPkgs "ghc94" [(self: super: let
+        hackage = pkg: ver: sha256: self.callHackageDirect { inherit pkg ver sha256; } {};
+      in {
+        polysemy = hackage "polysemy" "1.9.1.0" "05mhzjz6hz0dnxsn3cc0l6yyj5ch35gn8xfnx0a1gn3q8yljfg2a";
+        polysemy-plugin = hackage "polysemy-plugin" "0.4.5.0" "0v2k0l42zaangwv050xfv5jdqfrbvdxfr533291ndsxalv8n3xi8";
+      })];
     };
 
-    packages =
-      foldl' (l: r: l // r) { inherit (ghcs."8107") polysemy-zoo; } (map mkPackage (attrNames ghcs));
+    package = version: ghc: nameValuePair "polysemy-zoo-${version}" ghc.polysemy-zoo;
 
-    mkDevShell = extra: ghc: ghc.shellFor {
+    packages = { inherit (ghcs.default) polysemy-zoo; default = ghcs.default.polysemy-zoo; } // mapAttrs' package ghcs;
+
+    devShell = ghc: ghc.shellFor {
       packages = p: [p.polysemy-zoo];
-      buildInputs = with ghc; [
-        cabal-install
-      ] ++ (if extra then [ghcid haskell-language-server] else []);
-      withHoogle = extra;
+      buildInputs = with ghc; [cabal-install ghcid haskell-language-server];
+      withHoogle = true;
     };
 
-    devShells = mapAttrs' (n: g: nameValuePair "ghc${n}" (mkDevShell (n != "921") g)) ghcs;
+    devShells = mapAttrs' (n: g: nameValuePair "ghc${n}" (devShell g)) ghcs // {
+      default = devShell ghcs.default;
+    };
 
   in {
     inherit packages devShells;
-
-    defaultPackage = packages.polysemy-zoo;
-
-    devShell = devShells.ghc8107;
-
     checks = packages;
   });
 }

package.yaml

@@ -1,9 +1,9 @@
 name:                polysemy-zoo
-version:             0.8.1.0
-github:              "isovector/polysemy-zoo"
+version:             0.8.2.0
+github:              "polysemy-research/polysemy-zoo"
 license:             BSD3
 author:              "Sandy Maguire"
-maintainer:          "[email protected]"
+maintainer:          "https://funprog.zulipchat.com/#narrow/stream/216942-Polysemy"
 copyright:           "2019 Sandy Maguire"
 
 extra-source-files:
@@ -29,9 +29,9 @@ dependencies:
 - polysemy >= 1.4.0.0
 - random >= 1.1 && < 1.3
 - reflection >= 2.1.4 && < 3.0.0
-- transformers >= 0.5.2.0 && < 0.6
-- text >= 1.1.0 && < 1.3
-- ghc-prim >= 0.5.2 && < 0.9
+- transformers >= 0.5.2.0 && < 0.7
+- text >= 1.1.0 && < 2.1
+- ghc-prim >= 0.5.2 && < 0.10
 - async >= 2.2 && < 3
 - streaming >= 0.2 && < 0.3
 - ghc-compact >=0.1.0.0

polysemy-zoo.cabal

@@ -1,18 +1,18 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.7.
+-- This file has been generated from package.yaml by hpack version 0.35.2.
 --
 -- see: https://github.com/sol/hpack
 
 name:           polysemy-zoo
-version:        0.8.1.0
+version:        0.8.2.0
 synopsis:       Experimental, user-contributed effects and interpreters for polysemy
 description:    Please see the README on GitHub at <https://github.com/isovector/polysemy-zoo#readme>
 category:       Polysemy
-homepage:       https://github.com/isovector/polysemy-zoo#readme
-bug-reports:    https://github.com/isovector/polysemy-zoo/issues
+homepage:       https://github.com/polysemy-research/polysemy-zoo#readme
+bug-reports:    https://github.com/polysemy-research/polysemy-zoo/issues
 author:         Sandy Maguire
-maintainer:     [email protected]
+maintainer:     https://funprog.zulipchat.com/#narrow/stream/216942-Polysemy
 copyright:      2019 Sandy Maguire
 license:        BSD3
 license-file:   LICENSE
@@ -23,7 +23,7 @@ extra-source-files:
 
 source-repository head
   type: git
-  location: https://github.com/isovector/polysemy-zoo
+  location: https://github.com/polysemy-research/polysemy-zoo
 
 library
   exposed-modules:
@@ -83,14 +83,14 @@ library
     , contravariant <2
     , exceptions >=0.10.0 && <0.11
     , ghc-compact >=0.1.0.0
-    , ghc-prim >=0.5.2 && <0.9
+    , ghc-prim >=0.5.2 && <0.10
     , mtl >=2.0.1.0 && <3.0.0.0
     , polysemy >=1.4.0.0
     , random >=1.1 && <1.3
     , reflection >=2.1.4 && <3.0.0
     , streaming ==0.2.*
-    , text >=1.1.0 && <1.3
-    , transformers >=0.5.2.0 && <0.6
+    , text >=1.1.0 && <2.1
+    , transformers >=0.5.2.0 && <0.7
   default-language: Haskell2010
 
 test-suite polysemy-zoo-test
@@ -134,7 +134,7 @@ test-suite polysemy-zoo-test
     , contravariant <2
     , exceptions >=0.10.0 && <0.11
     , ghc-compact >=0.1.0.0
-    , ghc-prim >=0.5.2 && <0.9
+    , ghc-prim >=0.5.2 && <0.10
     , hspec >=2.6.0 && <3
     , mtl >=2.0.1.0 && <3.0.0.0
     , polysemy >=1.2.0.0
@@ -143,6 +143,6 @@ test-suite polysemy-zoo-test
     , random >=1.1 && <1.3
     , reflection >=2.1.4 && <3.0.0
     , streaming ==0.2.*
-    , text >=1.1.0 && <1.3
-    , transformers >=0.5.2.0 && <0.6
+    , text >=1.1.0 && <2.1
+    , transformers >=0.5.2.0 && <0.7
   default-language: Haskell2010