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.

Sign up for GitHub

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

[WIP] Nix support #1523

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

[WIP] Nix support #1523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5a3b4d3
work-in-progress Nix support
peterbecich Sep 14, 2021
06de444
build subset of packages with ghcjs and Nix
peterbecich Oct 18, 2021
e596c20
include `codeworld-available-pkgs` in `cabal.project`
peterbecich Oct 31, 2021
310b198
Merge branch 'master' of github.com:google/codeworld into nix-support
peterbecich Oct 31, 2021
47082fc
re-enable all packages
peterbecich Oct 31, 2021
b0febbd
Merge branch 'update-cabal-project' into nix-support
peterbecich Oct 31, 2021
b4f03ad
test
peterbecich Nov 6, 2021
0a2709b
test
peterbecich Nov 6, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml → .github/workflows/Cabal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# modified from https://github.com/jgm/pandoc/blob/master/.github/workflows/ci.yml
name: CI
name: Cabal

on:
push:
Expand Down
27 changes: 27 additions & 0 deletions .github/workflows/Nix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Nix

on:
push:
branches:
- '**'
paths-ignore: []
pull_request:
paths-ignore: []

jobs:
linux:

runs-on: ubuntu-20.04
strategy:
fail-fast: false
steps:
- uses: actions/checkout@v2

# https://github.com/marketplace/actions/install-nix
- name: Install Nix
uses: cachix/install-nix-action@v14
with:
extra_nix_config: |
trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
substituters = https://hydra.iohk.io https://cache.nixos.org/
- run: nix build --extra-experimental-features nix-command -f default.nix
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ CodeWorld
=========

[![Build Status](https://travis-ci.org/google/codeworld.svg?branch=master)](https://travis-ci.org/google/codeworld)
[![Build status](https://github.com/google/codeworld/actions/workflows/ci.yml/badge.svg)](https://github.com/google/codeworld/actions/workflows/ci.yml)
[![Build status](https://github.com/google/codeworld/actions/workflows/Cabal.yml/badge.svg)](https://github.com/google/codeworld/actions/workflows/Cabal.yml)
[![Build status](https://github.com/google/codeworld/actions/workflows/Nix.yml/badge.svg)](https://github.com/google/codeworld/actions/workflows/Nix.yml)

CodeWorld is an educational environment using Haskell. It provides a simple
mathematical model for geometric figures, animations, and interactive and
Expand Down
22 changes: 21 additions & 1 deletion cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,32 @@
profiling: false
packages:
codeworld-account/
codeworld-api/
codeworld-auth/
-- codeworld-available-pkgs/
codeworld-base/
codeworld-compiler/
codeworld-error-sanitizer/
codeworld-game-api/
codeworld-game-server/
codeworld-prediction/
codeworld-server/
codeworld-base/
funblocks-client/

source-repository-package
type: git
location: https://github.com/peterbecich/hgeometry.git
tag: f898c5580c609320f0c7cc776e80f609711d19c5
subdir: hgeometry
--sha256: 0bmcb3dh1sfz6k7i30czcqqvarm1mzn55xdnimpnp19kj8v5g8nj

source-repository-package
type: git
location: https://github.com/peterbecich/hgeometry.git
tag: f898c5580c609320f0c7cc776e80f609711d19c5
subdir: hgeometry-combinatorial
--sha256: 0bmcb3dh1sfz6k7i30czcqqvarm1mzn55xdnimpnp19kj8v5g8nj

allow-newer:
reflex:witherable
, patch:witherable
12 changes: 6 additions & 6 deletions codeworld-api/codeworld-api.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,19 @@ Library
mtl >= 2.2.1 && < 2.3,
random >= 1.1 && < 1.2,
ref-tf >= 0.4 && < 0.5,
reflex >= 0.6.3 && < 0.7,
reflex >= 0.6.3,
template-haskell >= 2.8 && < 2.18,
text >= 1.2.2 && < 1.3,
time >= 1.8 && < 2.0,
witherable >= 0.3 && < 0.4
witherable >= 0.3

if impl(ghcjs)
Js-sources: jsbits/sim_fp.js
Build-depends: ghcjs-base,
ghcjs-prim,
codeworld-game-api,
codeworld-prediction,
ghcjs-dom >= 0.9 && < 0.9.4,
ghcjs-dom >= 0.9,
transformers
else
Build-depends: blank-canvas >= 0.6 && < 0.8,
Expand Down Expand Up @@ -122,19 +122,19 @@ Test-suite unit-tests
mtl >= 2.2.1 && < 2.3,
random >= 1.1 && < 1.2,
ref-tf >= 0.4 && < 0.5,
reflex >= 0.6.3 && < 0.7,
reflex >= 0.6.3,
template-haskell >= 2.8 && < 2.18,
text >= 1.2.2 && < 1.3,
time >= 1.8 && < 2.0,
witherable >= 0.3 && < 0.4
witherable >= 0.3

if impl(ghcjs)
Js-sources: jsbits/sim_fp.js
Build-depends: ghcjs-base,
ghcjs-prim,
codeworld-game-api,
codeworld-prediction,
ghcjs-dom >= 0.9 && < 0.9.4,
ghcjs-dom >= 0.9,
transformers
else
Build-depends: blank-canvas >= 0.6 && < 0.8,
Expand Down
Loading