Skip to content

Commit

Permalink
Merge pull request #31 from solomon-b/infra/cabal-version-bounds
Browse files Browse the repository at this point in the history
Updates cabal version bounds
  • Loading branch information
solomon-b committed Jun 26, 2023
2 parents 8b7fef4 + 56d6d0e commit 687c2d4
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 31 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/cabal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
strategy:
matrix:
cabal: ["3.6"]
ghc: ["8.10.7", "9.0.2", "9.2.4"]
ghc: ["8.10.7", "9.0.2", "9.2.4", "9.4.5"]

steps:
- name: Checkout
Expand All @@ -35,6 +35,7 @@ jobs:

- name: Freeze
run: |
cabal update
cabal configure --enable-tests --test-show-details=direct
cabal freeze
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ jobs:
uses: actions/checkout@v2.4.0

- name: Install Nix ❄
uses: cachix/install-nix-action@v15
uses: cachix/install-nix-action@v20
with:
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- name: Link Cachix 🔌
uses: cachix/cachix-action@v10
with:
name: cofree-coffee
name: '${{ vars.CACHIX_CACHE_NAME }}'
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'

- name: Deploy 🚀
Expand Down
32 changes: 25 additions & 7 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 12 additions & 9 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,13 @@
description = "Monoidal Functors";

inputs = {
nixpkgs.url = github:NixOS/nixpkgs/nixos-22.11;

flake-utils = {
url = github:numtide/flake-utils;
inputs.nixpkgs.follows = "nixpkgs";
};
nixpkgs.url = github:NixOS/nixpkgs/nixos-23.05;
flake-utils.url = github:numtide/flake-utils;
};

outputs = { self, nixpkgs, flake-utils }:
let
ghcVersion = "924";
ghcVersion = "945";
compiler = "ghc${ghcVersion}";
# default systems compatible with pre-commit-hooks.nix
# https://github.com/cachix/pre-commit-hooks.nix/pull/122
Expand All @@ -27,10 +23,17 @@
flake-utils.lib.eachSystem defaultSystems (system:
let
pkgs = import nixpkgs { inherit system; };

hsPkgs = pkgs.haskell.packages.${compiler}.override {
overrides = hfinal: hprev: {
overrides = hfinal: hprev: with pkgs.haskell.lib.compose; {
monoidal-functors = hfinal.callCabal2nix "monoidal-functors" ./. { };
assoc = hfinal.assoc_1_1;
bifunctors = hfinal.bifunctors_5_6_1;
foldable1-classes-compat = dontCheck hprev.foldable1-classes-compat;
indexed-traversable-instances = dontCheck hprev.indexed-traversable-instances;
semialign = hfinal.semialign_1_3;
semigroupoids = hfinal.semigroupoids_6_0_0_1;
tagged = hfinal.tagged_0_8_7;
these = hfinal.these_1_2;
};
};
in
Expand Down
25 changes: 13 additions & 12 deletions monoidal-functors.cabal
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cabal-version: 2.4
cabal-version: 3.4
name: monoidal-functors
category: Control, Categories
version: 0.2.1.0
Expand Down Expand Up @@ -47,17 +47,18 @@ common common-extensions
library
import: common-extensions
build-depends:
base >= 4.12 && < 5,
bifunctors >= 5.5.11 && < 5.6,
comonad >= 5.0.8 && < 5.1,
distributive >= 0.6.2 && < 0.7,
tagged >= 0.8.6 && < 0.9,
contravariant >= 1.5.5 && < 1.6,
profunctors >= 5.6.2 && < 5.7,
semialign >= 1.2.0 && < 1.3,
semigroupoids >= 5.3.6 && < 5.4,
these >= 1.1.1 && < 1.2,
transformers >= 0.5.6 && < 0.6,
base >= 4.12 && < 4.18,
bifunctors >= 5.6.1 && < 5.7,
tagged >= 0.8.7 && < 0.9,
transformers >= 0.5.6 && <= 0.6.1.0,
comonad >= 5.0.8 && < 5.1,
distributive >= 0.6.2 && < 0.7,
contravariant >= 1.5.5 && < 1.6,
profunctors >= 5.6.2 && < 5.7,
semialign >= 1.3 && < 1.4,
semigroupoids >= 6.0.0 && < 6.1,
these >= 1.2 && < 1.3,
mtl >= 2.2.2 && <= 2.3.1,

exposed-modules:
Control.Category.Tensor
Expand Down

0 comments on commit 687c2d4

Please sign in to comment.