diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 3e4892fc..60724f77 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -82,4 +82,4 @@ jobs: stack --nix install export PATH="$HOME/.local/bin:$PATH" stack --nix exec -- ihaskell install - stack --nix exec -- jupyter nbconvert --to notebook --execute --inplace ./IHaskell/examples/tutorial-ihaskell-inline-r.ipynb + stack --nix exec -- jupyter nbconvert --to notebook --execute --inplace ./ihaskell-inline-r/examples/tutorial-ihaskell-inline-r.ipynb diff --git a/docs/docs/build-and-install.md b/docs/docs/build-and-install.md index 30bd3fe6..f3916de8 100644 --- a/docs/docs/build-and-install.md +++ b/docs/docs/build-and-install.md @@ -114,10 +114,10 @@ $ stack [--docker|--nix] exec jupyter notebook After launching the Jupyter notebook server you can visit ~~~ -http://localhost:8888/notebooks/IHaskell/examples/tutorial-ihaskell-inline-r.ipynb +http://localhost:8888/notebooks/ihaskell-inline-r/examples/tutorial-ihaskell-inline-r.ipynb ~~~ in your browser for an interactive tutorial, which is available in static form [here][tutorial]. -[tutorial]: https://github.com/tweag/HaskellR/blob/master/IHaskell/examples/tutorial-ihaskell-inline-r.ipynb +[tutorial]: https://github.com/tweag/HaskellR/blob/master/ihaskell-inline-r/examples/tutorial-ihaskell-inline-r.ipynb diff --git a/docs/docs/inline-r-with-IHaskell.md b/docs/docs/inline-r-with-IHaskell.md index 6e8f12a6..d878a7e2 100644 --- a/docs/docs/inline-r-with-IHaskell.md +++ b/docs/docs/inline-r-with-IHaskell.md @@ -8,7 +8,7 @@ the [IHaskell][ihaskell] kernel for interactively authoring notebooks replete with plots, formulas, R code and Haskell code. See "Building and installing" to get started and the -[tutorial notebook](https://github.com/tweag/HaskellR/blob/master/IHaskell/examples/tutorial-ihaskell-inline-r.ipynb) +[tutorial notebook](https://github.com/tweag/HaskellR/blob/master/ihaskell-inline-r/examples/tutorial-ihaskell-inline-r.ipynb) in the repository for a walkthrough. [ihaskell]: https://github.com/gibiansky/IHaskell diff --git a/IHaskell/.gitignore b/ihaskell-inline-r/.gitignore similarity index 100% rename from IHaskell/.gitignore rename to ihaskell-inline-r/.gitignore diff --git a/IHaskell/ChangeLog.markdown b/ihaskell-inline-r/ChangeLog.markdown similarity index 100% rename from IHaskell/ChangeLog.markdown rename to ihaskell-inline-r/ChangeLog.markdown diff --git a/IHaskell/LICENSE b/ihaskell-inline-r/LICENSE similarity index 100% rename from IHaskell/LICENSE rename to ihaskell-inline-r/LICENSE diff --git a/IHaskell/Setup.hs b/ihaskell-inline-r/Setup.hs similarity index 100% rename from IHaskell/Setup.hs rename to ihaskell-inline-r/Setup.hs diff --git a/IHaskell/examples/tutorial-ihaskell-inline-r.ipynb b/ihaskell-inline-r/examples/tutorial-ihaskell-inline-r.ipynb similarity index 100% rename from IHaskell/examples/tutorial-ihaskell-inline-r.ipynb rename to ihaskell-inline-r/examples/tutorial-ihaskell-inline-r.ipynb diff --git a/IHaskell/ihaskell-inline-r.cabal b/ihaskell-inline-r/ihaskell-inline-r.cabal similarity index 98% rename from IHaskell/ihaskell-inline-r.cabal rename to ihaskell-inline-r/ihaskell-inline-r.cabal index 0e170fb6..367f8e56 100644 --- a/IHaskell/ihaskell-inline-r.cabal +++ b/ihaskell-inline-r/ihaskell-inline-r.cabal @@ -33,4 +33,4 @@ library source-repository head type: git location: https://github.com/tweag/HaskellR.git - subdir: IHaskell + subdir: ihaskell-inline-r diff --git a/IHaskell/src/IHaskell/Display/InlineR.hs b/ihaskell-inline-r/src/IHaskell/Display/InlineR.hs similarity index 100% rename from IHaskell/src/IHaskell/Display/InlineR.hs rename to ihaskell-inline-r/src/IHaskell/Display/InlineR.hs diff --git a/shell.nix b/shell.nix index 93e68288..122cb967 100644 --- a/shell.nix +++ b/shell.nix @@ -107,7 +107,7 @@ let rEnv = rWrapper.override { inherit R; - # ggplot2 is required for ./IHaskell/examples/tutorial-ihaskell-inline-r.ipynb + # ggplot2 is required for ./ihaskell-inline-r/examples/tutorial-ihaskell-inline-r.ipynb packages = with rPackages; [ ggplot2 ]; }; diff --git a/stack-lts-19.yaml b/stack-lts-19.yaml index fda205a5..83451a12 100644 --- a/stack-lts-19.yaml +++ b/stack-lts-19.yaml @@ -3,7 +3,7 @@ resolver: lts-19.33 packages: - H - HaskellR-examples -- IHaskell +- ihaskell-inline-r - inline-r extra-deps: diff --git a/stack-lts-20.yaml b/stack-lts-20.yaml index 9121c071..1f864b7a 100644 --- a/stack-lts-20.yaml +++ b/stack-lts-20.yaml @@ -3,7 +3,7 @@ resolver: lts-20.26 packages: - H - HaskellR-examples -- IHaskell +- ihaskell-inline-r - inline-r extra-deps: diff --git a/stack-lts-21.yaml b/stack-lts-21.yaml index c454b82a..d56cf55a 100644 --- a/stack-lts-21.yaml +++ b/stack-lts-21.yaml @@ -3,7 +3,7 @@ resolver: lts-21.25 packages: - H - HaskellR-examples -- IHaskell +- ihaskell-inline-r - inline-r extra-deps: diff --git a/stack.yaml b/stack.yaml index afc359d4..a02607ec 100644 --- a/stack.yaml +++ b/stack.yaml @@ -3,7 +3,7 @@ resolver: lts-22.8 packages: - H - HaskellR-examples -- IHaskell +- ihaskell-inline-r - inline-r extra-deps: