Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump ihaskell 0.12 #211

Merged
merged 4 commits into from
Jan 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/hvega-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ jobs:
cabal: ["latest"]

os: [ubuntu-latest]
ghc-version: ["9.10", "9.8", "9.6", "9.4"]
ghc: ["9.10", "9.8", "9.6", "9.4"]

include:
- os: macOS-latest
ghc-version: '9.6'
ghc: '9.6'
- os: windows-latest
ghc-version: '9.6'
ghc: '9.6'

steps:
- uses: actions/checkout@v4
Expand Down
5 changes: 5 additions & 0 deletions ihaskell-hvega/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
For the latest version of this document, please see
[https://github.com/DougBurke/hvega/blob/master/ihaskell-hvega/CHANGELOG.md](https://github.com/DougBurke/hvega/blob/master/ihaskell-hvega/CHANGELOG.md).

## 0.5.0.6

Allow building with IHaskell 0.12 (still not managed to get my
setup working so I haven't been able to actually test this).

## 0.5.0.5

Support text 2.1 and IHaskell 0.11 (I am still not using IHaskell
Expand Down
6 changes: 3 additions & 3 deletions ihaskell-hvega/flake.lock

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

20 changes: 14 additions & 6 deletions ihaskell-hvega/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,30 @@
});
defaultPackage = forAllSystems (system: self.packages.${system}.ihaskell-hvega);
checks = self.packages;
devShell = forAllSystems (system: let haskellPackages = nixpkgsFor.${system}.haskellPackages;
devShell = forAllSystems (system:
let haskellPackages = nixpkgsFor.${system}.haskellPackages;
hPackages = with haskellPackages; [
# haskell-language-server
hlint
cabal-install
];
pPackages = nixpkgsFor.${system}.python3.withPackages (
ps: with ps; [
ipython
jupyter
]);
in haskellPackages.shellFor {
packages = p: [self.packages.${system}.ihaskell-hvega];
# withHoogle = true;
withHoogle = false;
buildInputs = with haskellPackages; [
haskell-language-server
hlint
cabal-install
];
buildInputs = hPackages ++ [pPackages];
# Change the prompt to show that you are in a devShell
shellHook = ''
echo -e "*** \e[1;32mWelcome to ihaskell-hvega\e[0m ***"
ghc --version
cabal --version
hlint --version
jupyter --version
echo -e ""
export PS1='ihaskell-hvega:\A \e[1;34m\w\e[0m '
'';
Expand Down
4 changes: 2 additions & 2 deletions ihaskell-hvega/ihaskell-hvega.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: ihaskell-hvega
version: 0.5.0.5
version: 0.5.0.6
synopsis: IHaskell display instance for hvega types.
description: Support Vega-Lite visualizations in IHaskell notebooks.
homepage: https://github.com/DougBurke/hvega
Expand All @@ -8,7 +8,7 @@ license: BSD3
license-file: LICENSE
author: Douglas Burke
maintainer: [email protected]
copyright: 2018-2023 Douglas Burke
copyright: 2018-2025 Douglas Burke
category: Development
build-type: Simple
extra-source-files: README.md
Expand Down
Loading