mirror of
https://github.com/polysemy-research/polysemy.git
synced 2024-10-26 10:58:34 +03:00
relax doctest bounds
This commit is contained in:
parent
6dc8ecf6db
commit
9a9ddfa70f
56
flake.lock
56
flake.lock
@ -1,12 +1,15 @@
|
|||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": "systems"
|
||||||
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1659877975,
|
"lastModified": 1692799911,
|
||||||
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
|
"narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
|
"rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -15,59 +18,40 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_2009": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1651477912,
|
"lastModified": 1692794812,
|
||||||
"narHash": "sha256-YDFgJElf0ZL977+fo6ueQAmpb6lwrw1lzDlxLEINVXE=",
|
"narHash": "sha256-lEVkjqiIyjAkkWwP2IadNzKur3NpBrvK6g8tJk1r458=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "66b0db71f463164486a36dded50bedee185e45c2",
|
"rev": "8b5b7def915305c7d4f5cf236c095bf898bc7995",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "release-20.09",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_2105": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1659914493,
|
|
||||||
"narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=",
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nixos",
|
|
||||||
"ref": "release-21.05",
|
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
|
"rev": "8b5b7def915305c7d4f5cf236c095bf898bc7995",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
"nixpkgs_2009": "nixpkgs_2009",
|
"nixpkgs": "nixpkgs"
|
||||||
"nixpkgs_2105": "nixpkgs_2105",
|
|
||||||
"unstable": "unstable"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"unstable": {
|
"systems": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1680728981,
|
"lastModified": 1681028828,
|
||||||
"narHash": "sha256-ZhsViPJJvET7iLyD9ey63q6GwPKquDqIbOn2letvb/A=",
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
"owner": "nixos",
|
"owner": "nix-systems",
|
||||||
"repo": "nixpkgs",
|
"repo": "default",
|
||||||
"rev": "38263d02cf3a22e011e137b8f67cdf8419f28015",
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nix-systems",
|
||||||
"ref": "nixpkgs-unstable",
|
"repo": "default",
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
24
flake.nix
24
flake.nix
@ -2,26 +2,22 @@
|
|||||||
description = "Higher-order, low-boilerplate free monads.";
|
description = "Higher-order, low-boilerplate free monads.";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs_2009.url = github:nixos/nixpkgs/release-20.09;
|
nixpkgs.url = "github:nixos/nixpkgs/8b5b7def915305c7d4f5cf236c095bf898bc7995";
|
||||||
nixpkgs_2105.url = github:nixos/nixpkgs/release-21.05;
|
flake-utils.url = "github:numtide/flake-utils";
|
||||||
unstable.url = github:nixos/nixpkgs/nixpkgs-unstable;
|
|
||||||
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:
|
flake-utils.lib.eachSystem ["x86_64-linux"] (system:
|
||||||
with unstable.lib;
|
with nixpkgs.lib;
|
||||||
let
|
let
|
||||||
hsPkgs = nixpkgs: compiler: import ./nix/overlay.nix { inherit system nixpkgs compiler; };
|
hsPkgs = nixpkgs: compiler: import ./nix/overlay.nix { inherit system nixpkgs compiler; };
|
||||||
|
|
||||||
ghcs = {
|
ghcs = {
|
||||||
"865" = hsPkgs nixpkgs_2009 "ghc865";
|
"810" = hsPkgs nixpkgs "ghc810";
|
||||||
"884" = hsPkgs nixpkgs_2105 "ghc884";
|
"90" = hsPkgs nixpkgs "ghc90";
|
||||||
"810" = hsPkgs unstable "ghc810";
|
"92" = hsPkgs nixpkgs "ghc92";
|
||||||
"90" = hsPkgs unstable "ghc90";
|
"94" = hsPkgs nixpkgs "ghc94";
|
||||||
"92" = hsPkgs unstable "ghc92";
|
"96" = hsPkgs nixpkgs "ghc96";
|
||||||
"94" = hsPkgs unstable "ghc94";
|
|
||||||
"96" = hsPkgs unstable "ghc96";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
mkPackages = version: {
|
mkPackages = version: {
|
||||||
@ -40,7 +36,7 @@
|
|||||||
packages = p: [p.polysemy p.polysemy-plugin];
|
packages = p: [p.polysemy p.polysemy-plugin];
|
||||||
buildInputs = with ghc; [
|
buildInputs = with ghc; [
|
||||||
cabal-install
|
cabal-install
|
||||||
] ++ unstable.lib.optionals (name != "96") [
|
] ++ nixpkgs.lib.optionals (name != "96") [
|
||||||
(ghc.pkgs.haskell.lib.dontCheck ghcid)
|
(ghc.pkgs.haskell.lib.dontCheck ghcid)
|
||||||
haskell-language-server
|
haskell-language-server
|
||||||
];
|
];
|
||||||
|
@ -16,11 +16,7 @@ let
|
|||||||
polysemy = c2n "polysemy" ../.;
|
polysemy = c2n "polysemy" ../.;
|
||||||
polysemy-plugin = c2n "polysemy-plugin" ../polysemy-plugin;
|
polysemy-plugin = c2n "polysemy-plugin" ../polysemy-plugin;
|
||||||
} // pkgs.lib.optionalAttrs (compiler == "ghc96") {
|
} // pkgs.lib.optionalAttrs (compiler == "ghc96") {
|
||||||
type-errors = self.callHackageDirect {
|
type-errors = pkgs.haskell.lib.doJailbreak super.type-errors;
|
||||||
pkg = "type-errors";
|
|
||||||
ver = "0.2.0.2";
|
|
||||||
sha256 = "sha256-z/QANg5jUhSc02IBVQEsg7QemiyV3XdwxN9K1CH2Myc=";
|
|
||||||
} {};
|
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
pkgs.haskell.packages.${compiler}.override { inherit overrides; } // { inherit pkgs; }
|
pkgs.haskell.packages.${compiler}.override { inherit overrides; } // { inherit pkgs; }
|
||||||
|
@ -82,7 +82,7 @@ tests:
|
|||||||
- polysemy
|
- polysemy
|
||||||
- inspection-testing >= 0.4.2 && < 0.6
|
- inspection-testing >= 0.4.2 && < 0.6
|
||||||
- hspec >= 2.6.0 && < 3
|
- hspec >= 2.6.0 && < 3
|
||||||
- doctest >= 0.16.0.1 && < 0.22
|
- doctest >= 0.16.0.1 && < 0.23
|
||||||
- hspec-discover >= 2.0
|
- hspec-discover >= 2.0
|
||||||
generated-other-modules:
|
generated-other-modules:
|
||||||
- Build_doctests
|
- Build_doctests
|
||||||
|
@ -63,7 +63,7 @@ tests:
|
|||||||
- hspec >= 2.6.0 && < 3
|
- hspec >= 2.6.0 && < 3
|
||||||
- should-not-typecheck >= 2.1.0 && < 3
|
- should-not-typecheck >= 2.1.0 && < 3
|
||||||
- inspection-testing >= 0.4.2 && < 0.6
|
- inspection-testing >= 0.4.2 && < 0.6
|
||||||
- doctest >= 0.16.0.1 && < 0.22
|
- doctest >= 0.16.0.1 && < 0.23
|
||||||
generated-other-modules:
|
generated-other-modules:
|
||||||
- Build_doctests
|
- Build_doctests
|
||||||
|
|
||||||
|
@ -111,7 +111,7 @@ test-suite polysemy-plugin-test
|
|||||||
build-depends:
|
build-depends:
|
||||||
base >=4.9 && <5
|
base >=4.9 && <5
|
||||||
, containers >=0.5 && <0.7
|
, containers >=0.5 && <0.7
|
||||||
, doctest >=0.16.0.1 && <0.22
|
, doctest >=0.16.0.1 && <0.23
|
||||||
, ghc >=8.6.5 && <10
|
, ghc >=8.6.5 && <10
|
||||||
, ghc-tcplugins-extra >=0.3 && <0.5
|
, ghc-tcplugins-extra >=0.3 && <0.5
|
||||||
, hspec >=2.6.0 && <3
|
, hspec >=2.6.0 && <3
|
||||||
|
@ -167,7 +167,7 @@ test-suite polysemy-test
|
|||||||
async >=2.2 && <3
|
async >=2.2 && <3
|
||||||
, base >=4.9 && <5
|
, base >=4.9 && <5
|
||||||
, containers >=0.5 && <0.7
|
, containers >=0.5 && <0.7
|
||||||
, doctest >=0.16.0.1 && <0.22
|
, doctest >=0.16.0.1 && <0.23
|
||||||
, first-class-families >=0.5.0.0 && <0.9
|
, first-class-families >=0.5.0.0 && <0.9
|
||||||
, hspec >=2.6.0 && <3
|
, hspec >=2.6.0 && <3
|
||||||
, hspec-discover >=2.0
|
, hspec-discover >=2.0
|
||||||
|
Loading…
Reference in New Issue
Block a user