-
Notifications
You must be signed in to change notification settings - Fork 16
Coaches training re-do #95
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.
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
Open
socksy
wants to merge
11
commits into
master
Choose a base branch
from
discussion-reorderings-etc
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+463
−178
Open
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
0746329
Minor spacing issues
socksy ab55b84
Shorten the intro round
socksy b9036ea
Move CoC stuff to beginning before discussion points
socksy be67fe4
Move discussions to be all together, answers afterwards
socksy 3693eb5
Move CoC violation stuff
socksy a33df41
Cursory curriculum overview
socksy a24d716
Use bundix to allow nix-shell to use jekyll/deck
socksy 5992bb4
Merge branch 'nix-support' into discussion-reorderings-etc
socksy 67d591a
Compiled coaches training changes to HTML
socksy c6492e6
Capitalization typo on 'curriculum'
socksy f6e5a2b
Add restaurant question, and quil mention in curriculum
socksy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| with (import <nixpkgs> {}); | ||
| let | ||
| gems = bundlerEnv { | ||
| name = "clojurebridge-website"; | ||
| inherit ruby; | ||
| gemdir = ./.; | ||
| }; | ||
| in stdenv.mkDerivation { | ||
| name = "clojurebridge-website"; | ||
| buildInputs = [gems ruby]; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,253 @@ | ||
| { | ||
| coderay = { | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "1x6z923iwr1hi04k6kz5a6llrixflz8h5sskl9mhaaxy9jx2x93r"; | ||
| type = "gem"; | ||
| }; | ||
| version = "1.1.1"; | ||
| }; | ||
| colorator = { | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "09zp15hyd9wlbgf1kmrf4rnry8cpvh1h9fj7afarlqcy4hrfdpvs"; | ||
| type = "gem"; | ||
| }; | ||
| version = "0.1"; | ||
| }; | ||
| daemons = { | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "0b839hryy9sg7x3knsa1d6vfiyvn0mlsnhsb6an8zsalyrz1zgqg"; | ||
| type = "gem"; | ||
| }; | ||
| version = "1.2.3"; | ||
| }; | ||
| deckrb = { | ||
| dependencies = ["coderay" "erector" "json" "nokogiri" "rack" "rack-codehighlighter" "redcarpet" "thin" "trollop"]; | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "16qryjk7fvx6p2wcqyk53zj10gbn8z3p38clhqwd42m4ps0v0ckp"; | ||
| type = "gem"; | ||
| }; | ||
| version = "0.5.2"; | ||
| }; | ||
| erector = { | ||
| dependencies = ["treetop"]; | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "0rv5l4wfx8737arxaknh4lhlf5pvmlbps7dbjc4vr35j36sfpz9i"; | ||
| type = "gem"; | ||
| }; | ||
| version = "0.10.0"; | ||
| }; | ||
| eventmachine = { | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "1wgvhzi27zcszp0gbybvmkxby3wxkrwlkicrjrlyidcj6jz6agd2"; | ||
| type = "gem"; | ||
| }; | ||
| version = "1.2.0.1"; | ||
| }; | ||
| ffi = { | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj"; | ||
| type = "gem"; | ||
| }; | ||
| version = "1.9.10"; | ||
| }; | ||
| jekyll = { | ||
| dependencies = ["colorator" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "rouge" "safe_yaml"]; | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "1l1kq96bps29sx1cawbn4p9al4cljkywlr02zwgbcdwrr0211rhp"; | ||
| type = "gem"; | ||
| }; | ||
| version = "3.1.6"; | ||
| }; | ||
| jekyll-sass-converter = { | ||
| dependencies = ["sass"]; | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "095757w0pg6qh3wlfg1j1mw4fsz7s89ia4zai5f2rhx9yxsvk1d8"; | ||
| type = "gem"; | ||
| }; | ||
| version = "1.4.0"; | ||
| }; | ||
| jekyll-watch = { | ||
| dependencies = ["listen"]; | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "15imgkfdzvbsz159bc2aa7a21x3379licrij5g0sdid8bs9rxd4a"; | ||
| type = "gem"; | ||
| }; | ||
| version = "1.4.0"; | ||
| }; | ||
| json = { | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc"; | ||
| type = "gem"; | ||
| }; | ||
| version = "1.8.3"; | ||
| }; | ||
| kramdown = { | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "05ljwi07hjjwgnjg19sg8mkyxf1an5xn8kn1717d5qrrqkzn3zq1"; | ||
| type = "gem"; | ||
| }; | ||
| version = "1.11.1"; | ||
| }; | ||
| liquid = { | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "033png37ym4jrjz5bi7zb4ic4yxacwvnllm1xxmrnr4swgyyygc2"; | ||
| type = "gem"; | ||
| }; | ||
| version = "3.0.6"; | ||
| }; | ||
| listen = { | ||
| dependencies = ["rb-fsevent" "rb-inotify"]; | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "1l0y7hbyfiwpvk172r28hsdqsifq1ls39hsfmzi1vy4ll0smd14i"; | ||
| type = "gem"; | ||
| }; | ||
| version = "3.0.8"; | ||
| }; | ||
| mercenary = { | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a"; | ||
| type = "gem"; | ||
| }; | ||
| version = "0.3.6"; | ||
| }; | ||
| mini_portile2 = { | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb"; | ||
| type = "gem"; | ||
| }; | ||
| version = "2.1.0"; | ||
| }; | ||
| nokogiri = { | ||
| dependencies = ["mini_portile2" "pkg-config"]; | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "17pjhvm4yigriizxbbpx266nnh6nckdm33m3j4ws9dcg99daz91p"; | ||
| type = "gem"; | ||
| }; | ||
| version = "1.6.8"; | ||
| }; | ||
| pkg-config = { | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "0lljiqnm0b4z6iy87lzapwrdfa6ps63x2z5zbs038iig8dqx2g0z"; | ||
| type = "gem"; | ||
| }; | ||
| version = "1.1.7"; | ||
| }; | ||
| polyglot = { | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr"; | ||
| type = "gem"; | ||
| }; | ||
| version = "0.3.5"; | ||
| }; | ||
| rack = { | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5"; | ||
| type = "gem"; | ||
| }; | ||
| version = "1.6.4"; | ||
| }; | ||
| rack-codehighlighter = { | ||
| dependencies = ["nokogiri" "rack"]; | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "00mmprszba2wry4jybj72fms44yk908s3clfd5hqipnhyy8d4rgk"; | ||
| type = "gem"; | ||
| }; | ||
| version = "0.5.1"; | ||
| }; | ||
| rb-fsevent = { | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "1xlkflgxngwkd4nyybccgd1japrba4v3kwnp00alikj404clqx4v"; | ||
| type = "gem"; | ||
| }; | ||
| version = "0.9.7"; | ||
| }; | ||
| rb-inotify = { | ||
| dependencies = ["ffi"]; | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "1yfcp3065n08balljmxn0qzwhdbwwxn2h9z89wmydyfj2gq1p71d"; | ||
| type = "gem"; | ||
| }; | ||
| version = "0.9.7"; | ||
| }; | ||
| redcarpet = { | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "1fghh7n9kz6n6bdhgix5s8lyj5sw6q44zizf4mdgz5xsgwqcr6sw"; | ||
| type = "gem"; | ||
| }; | ||
| version = "2.3.0"; | ||
| }; | ||
| rouge = { | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "0h2z42vm84kj8q2rv7hhhqbavhpwig6acyz2ghzfy4bjmv0yyaik"; | ||
| type = "gem"; | ||
| }; | ||
| version = "1.11.0"; | ||
| }; | ||
| safe_yaml = { | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; | ||
| type = "gem"; | ||
| }; | ||
| version = "1.0.4"; | ||
| }; | ||
| sass = { | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "0dkj6v26fkg1g0majqswwmhxva7cd6p3psrhdlx93qal72dssywy"; | ||
| type = "gem"; | ||
| }; | ||
| version = "3.4.22"; | ||
| }; | ||
| thin = { | ||
| dependencies = ["daemons" "eventmachine" "rack"]; | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "1dq9q7qyjyg4444bmn12r2s0mir8dqnvc037y0zidhbyaavrv95q"; | ||
| type = "gem"; | ||
| }; | ||
| version = "1.7.0"; | ||
| }; | ||
| treetop = { | ||
| dependencies = ["polyglot"]; | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "1lg7j8xf8yxmnz1v8zkwhs4l6j30kq2pxvvrvpah2frlaqz077dh"; | ||
| type = "gem"; | ||
| }; | ||
| version = "1.6.5"; | ||
| }; | ||
| trollop = { | ||
| source = { | ||
| remotes = ["https://rubygems.org"]; | ||
| sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8"; | ||
| type = "gem"; | ||
| }; | ||
| version = "2.1.2"; | ||
| }; | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I thought we will only be using maria for the next workshop. Then this step is not necessary anymore
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My plan, if we decide to have students work with maria.cloud, would be to make a separate PR to change all the materials discussing Nightcode.