Merge pull request #211 from DougBurke/bump-ihaskell-0.12

Bump ihaskell 0.12
DougBurke · Jan 1, 2025 · f7058f1 · f7058f1
2 parents 0b182e5 + 9896e03
commit f7058f1
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 14 deletions.
diff --git 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

diff --git 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/flake.lock b/ihaskell-hvega/flake.lock
diff --git 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 '
 	'';

diff --git 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