Skip to content

Commit

Permalink
Bump to support text 2.1
Browse files Browse the repository at this point in the history
Can not release as aeson does not build with 2.1 and need to check what it is going to do
  • Loading branch information
DougBurke committed Aug 28, 2023
1 parent 0903f3c commit dabc9e8
Show file tree
Hide file tree
Showing 6 changed files with 77 additions and 4 deletions.
4 changes: 4 additions & 0 deletions hvega/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
For the latest version of this document, please see
[https://github.com/DougBurke/hvega/blob/master/hvega/CHANGELOG.md](https://github.com/DougBurke/hvega/blob/master/hvega/CHANGELOG.md).

## 0.12.0.6

Bump to support text version 2.1.

## 0.12.0.5

Bump to support bytestring version 0.12.0.0 (only needed if building
Expand Down
25 changes: 25 additions & 0 deletions hvega/flake.lock

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

40 changes: 40 additions & 0 deletions hvega/flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
# inspired by: https://serokell.io/blog/practical-nix-flakes#packaging-existing-applications
description = "hvega: Create Vega-Lite visualizations (version 4) in Haskell";
inputs.nixpkgs.url = "nixpkgs";
outputs = { self, nixpkgs }:
let
supportedSystems = [ "x86_64-linux" "x86_64-darwin" ];
# supportedSystems = [ "x86_64-linux" ];
forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system);
nixpkgsFor = forAllSystems (system: import nixpkgs {
inherit system;
overlays = [ self.overlay ];
});
in
{
overlay = (final: prev: {
hvega = final.haskellPackages.callCabal2nix "hvega" ./. {};
});
packages = forAllSystems (system: {
hvega = nixpkgsFor.${system}.hvega;
});
defaultPackage = forAllSystems (system: self.packages.${system}.hvega);
checks = self.packages;
devShell = forAllSystems (system: let haskellPackages = nixpkgsFor.${system}.haskellPackages;
in haskellPackages.shellFor {
packages = p: [self.packages.${system}.hvega];
withHoogle = true;
buildInputs = with haskellPackages; [
haskell-language-server
hlint
cabal-install
];
# Change the prompt to show that you are in a devShell
shellHook = ''
echo -e "*** \e[1;32mWelcome to hvega\e[0m ***"
export PS1='hvega:\A \e[1;34m\w\e[0m '
'';
});
};
}
4 changes: 2 additions & 2 deletions hvega/hvega.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: hvega
version: 0.12.0.5
version: 0.12.0.6
synopsis: Create Vega-Lite visualizations (version 4) in Haskell.
description: This is based on the elm-vegalite package
(<http://package.elm-lang.org/packages/gicentre/elm-vegalite/latest>)
Expand Down Expand Up @@ -160,7 +160,7 @@ library
Graphics.Vega.VegaLite.Transform
build-depends: base >= 4.9 && < 5
, aeson >= 0.11 && < 2.3
, text >= 1.2 && < 2.1
, text >= 1.2 && < 2.2
, unordered-containers == 0.2.*

default-language: Haskell2010
Expand Down
4 changes: 4 additions & 0 deletions ihaskell-hvega/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
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.5

Support text 2.1 (still not using this, so does it even work?).

## 0.5.0.4

Support aeson 2.2. I have not been using IHaskell recently so I do
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.4
version: 0.5.0.5
synopsis: IHaskell display instance for hvega types.
description: Support Vega-Lite visualizations in IHaskell notebooks.
homepage: https://github.com/DougBurke/hvega
Expand All @@ -25,7 +25,7 @@ library
, aeson >= 0.11 && < 2.3
, hvega < 0.13
, ihaskell >= 0.10 && < 0.11
, text >= 1.2 && < 2.1
, text >= 1.2 && < 2.2

default-language: Haskell2010
ghc-options: -Wall -fno-warn-orphans
Expand Down

0 comments on commit dabc9e8

Please sign in to comment.