From 89c813612006c915af2ad0fc86c81887cf198422 Mon Sep 17 00:00:00 2001 From: Douglas Burke Date: Wed, 1 Jan 2025 16:57:19 -0500 Subject: [PATCH 1/4] Update ihaskell-hvega flake --- ihaskell-hvega/flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ihaskell-hvega/flake.lock b/ihaskell-hvega/flake.lock index 6bc678b5..440da493 100644 --- a/ihaskell-hvega/flake.lock +++ b/ihaskell-hvega/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1731890469, - "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", + "lastModified": 1735617354, + "narHash": "sha256-5zJyv66q68QZJZsXtmjDBazGnF0id593VSy+8eSckoo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5083ec887760adfe12af64830a66807423a859a7", + "rev": "69b9a8c860bdbb977adfa9c5e817ccb717884182", "type": "github" }, "original": { From ceac2390f81e9b28a3eed11470134618426f716c Mon Sep 17 00:00:00 2001 From: Douglas Burke Date: Wed, 1 Jan 2025 16:57:27 -0500 Subject: [PATCH 2/4] ihaskell-hvega ensure jupyter is installed in nix develop This should probaly use jupyterenv or something similar but I can never work out how to combine things in nix. --- ihaskell-hvega/flake.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/ihaskell-hvega/flake.nix b/ihaskell-hvega/flake.nix index e1e838a3..44aeaff3 100644 --- a/ihaskell-hvega/flake.nix +++ b/ihaskell-hvega/flake.nix @@ -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 ' ''; From a66939f4de3885e65906f3e440ef4a13a21dbb19 Mon Sep 17 00:00:00 2001 From: Douglas Burke Date: Wed, 1 Jan 2025 17:02:18 -0500 Subject: [PATCH 3/4] ihaskell-hvega release 0.5.0.6 --- ihaskell-hvega/CHANGELOG.md | 5 +++++ ihaskell-hvega/ihaskell-hvega.cabal | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ihaskell-hvega/CHANGELOG.md b/ihaskell-hvega/CHANGELOG.md index 9b7033a5..f40ef424 100644 --- a/ihaskell-hvega/CHANGELOG.md +++ b/ihaskell-hvega/CHANGELOG.md @@ -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 diff --git a/ihaskell-hvega/ihaskell-hvega.cabal b/ihaskell-hvega/ihaskell-hvega.cabal index 30f7f292..363b2ad2 100644 --- a/ihaskell-hvega/ihaskell-hvega.cabal +++ b/ihaskell-hvega/ihaskell-hvega.cabal @@ -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 @@ -8,7 +8,7 @@ license: BSD3 license-file: LICENSE author: Douglas Burke maintainer: dburke.gw@gmail.com -copyright: 2018-2023 Douglas Burke +copyright: 2018-2025 Douglas Burke category: Development build-type: Simple extra-source-files: README.md From 9896e0382ab9afe2988ce3a5e348af8fc9176683 Mon Sep 17 00:00:00 2001 From: Douglas Burke Date: Wed, 1 Jan 2025 17:23:02 -0500 Subject: [PATCH 4/4] Fixup GitHub actions --- .github/workflows/hvega-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/hvega-ci.yml b/.github/workflows/hvega-ci.yml index c2314e57..d876d28d 100644 --- a/.github/workflows/hvega-ci.yml +++ b/.github/workflows/hvega-ci.yml @@ -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