Skip to content

Commit

Permalink
Disable linear-base integration.
Browse files Browse the repository at this point in the history
Unfortunately, I don't think there's a reasonable way to conditionalize the
linear-base-integration packages until Cabal 3.8 is released. Once nix-flake
integration (#66) is merged, we can perhaps do it for _those_ builds.
  • Loading branch information
sellout committed May 24, 2022
1 parent 70eb0cd commit 98c35c1
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
7 changes: 5 additions & 2 deletions cabal.project
Expand Up @@ -81,8 +81,6 @@ packages:
./integrations/concat-extensions/integration/categorifier-concat-extensions-integration.cabal
./integrations/concat-extensions/integration-test/categorifier-concat-extensions-integration-test.cabal
./integrations/fin/integration/categorifier-fin-integration.cabal
./integrations/linear-base/integration/categorifier-linear-base-integration.cabal
./integrations/linear-base/integration-test/categorifier-linear-base-integration-test.cabal
./integrations/unconcat/category/categorifier-unconcat-category.cabal
./integrations/unconcat/integration/categorifier-unconcat-integration.cabal
./integrations/unconcat/integration-test/categorifier-unconcat-integration-test.cabal
Expand All @@ -91,3 +89,8 @@ packages:
./plugin/categorifier-plugin.cabal
./plugin-test/categorifier-plugin-test.cabal
./th/categorifier-th.cabal
-- __TODO__: Uncomment below once Cabal 3.8 is released.
-- if impl(ghc >= 9.0.0)
-- packages:
-- ./integrations/linear-base/integration/categorifier-linear-base-integration.cabal
-- ./integrations/linear-base/integration-test/categorifier-linear-base-integration-test.cabal
11 changes: 10 additions & 1 deletion flake.nix
Expand Up @@ -84,7 +84,16 @@
};

parseCabalProject = import ./parse-cabal-project.nix;
categorifierPackages = parseCabalProject ./cabal.project;
allCategorifierPackages = parseCabalProject ./cabal.project;
excluded = [];
# if ghcVer == "ghc884" || ghcVer == "ghc8107"
# then
# [ categorifier-linear-base-integration
# categorifier-linear-base-integration-test
# ]
# else [];
categorifierPackages =
builtins.filter ({ name, ... }: !(builtins.elem name excluded)) allCategorifierPackages;
categorifierPackageNames =
builtins.map ({ name, ... }: name) categorifierPackages;
haskellOverlay = self: super:
Expand Down

0 comments on commit 98c35c1

Please sign in to comment.