10 files changed, 24 insertions(+), 32 deletions(-)

M bunkplan/bunkplan.cabal
M cabinsheets/cabinsheets.cabal
M codeworld-raycaster/app/Main.hs
D codeworld-raycaster/codeworld-api-0.3.1-blank-canvas-jailbreak.patch
M codeworld-raycaster/codeworld-raycaster.cabal
M codeworld-raycaster/default.nix
D codeworld-raycaster/nixpkgs-pin.nix
M codeworld-raycaster/shell.nix
M metscrape2/metscrape.cabal
M nix/nixpkgs.json

@@ 15,7 15,7 @@ extra-source-files:  CHANGELOG.md
 
 executable bunkplan
   main-is:             Bunkplan.hs
-  build-depends:       base >= 4.12 && < 4.13
+  build-depends:       base >= 4.12 && < 4.14
                      , containers >= 0.6.0.1 && < 0.7
                      , csv >= 0.1.2 && < 0.2
                      , filepath >= 1.4.2.1 && < 1.5

@@ 15,7 15,7 @@ extra-source-files:  CHANGELOG.md, README
 
 executable cabinsheets
   main-is:             Cabinsheets.hs
-  build-depends:       base >=4.12 && <4.13
+  build-depends:       base >= 4.12 && < 4.14
                      , containers >= 0.6.0.1 && < 0.7
                      , csv >= 0.1.2 && < 0.2
                      , filepath >= 1.4.2.1 && < 1.5

@@ 23,7 23,6 @@ import State (initialState)
 
 main :: IO ()
 main
-  = interactionOf initialState handleTime handleEvent draw
+  = activityOf initialState handleEvent draw
   where
-    handleTime _ s = s
     draw s = render s & coordinatePlane

@@ 1,12 0,0 @@
-diff -uar a/codeworld-api-0.3.1/codeworld-api.cabal b/codeworld-api-0.3.1/codeworld-api.cabal
---- a/codeworld-api.cabal	2019-02-28 02:15:42.000000000 +1000
-+++ b/codeworld-api.cabal	2019-11-02 19:15:58.972474817 +1000
-@@ -51,7 +51,7 @@
-                        ghcjs-dom             >= 0.8 && < 0.9,
-                        transformers
-   else
--    Build-depends:     blank-canvas          >= 0.6 && < 0.7,
-+    Build-depends:     blank-canvas,
-                        time                  >= 1.6.0 && < 1.9
- 
-   Exposed:             True

@@ 1,4 1,4 @@
-cabal-version:       >= 2.0
+cabal-version:       2.2
 
 name:                codeworld-raycaster
 version:             0.1.0.0


@@ 19,7 19,7 @@ library
                      , State
   build-depends:       base >= 4.10 && < 5
                      , array >= 0.5.2.0 && < 0.6
-                     , codeworld-api >= 0.2 && < 0.4
+                     , codeworld-api >= 0.3 && < 0.5
                      , text >= 1.2.2.2 && < 1.3
   hs-source-dirs:      src
   default-language:    Haskell2010


@@ 28,7 28,7 @@ library
 executable codeworld-raycaster
   main-is:             Main.hs
   build-depends:       base >= 4.10 && < 5
-                     , codeworld-api >= 0.2 && < 0.3 || ^>= 0.3.1
+                     , codeworld-api
                      , codeworld-raycaster
   hs-source-dirs:      app
   default-language:    Haskell2010

@@ 1,5 1,5 @@
 { nixpkgs ? import ../nix/nixpkgs.nix
-, compiler ? "default"
+, compiler ? "ghc865"
 , doBenchmark ? false
 }:
 


@@ 12,8 12,17 @@ let
 
   myHaskellPackages = haskellPackages.override {
     overrides = self: super: with pkgs.haskell.lib; {
-      codeworld-api = appendPatch (unmarkBroken super.codeworld-api)
-        ./codeworld-api-0.3.1-blank-canvas-jailbreak.patch;
+      codeworld-api = unmarkBroken super.codeworld-api;
+      patch = dontCheck (unmarkBroken super.patch);
+      reflex = unmarkBroken super.reflex;
+
+      blank-canvas =
+        dontCheck (doJailbreak (super.callHackage "blank-canvas" "0.6.3" {}));
+      colour = dontCheck (super.callHackage "colour" "2.3.4" {});
+      dependent-map = super.callHackage "dependent-map" "0.3.1.0" {};
+      dependent-sum = super.callHackage "dependent-sum" "0.6.1" {};
+      hashable = super.callHackage "hashable" "1.2.7.0" {};
+      witherable = super.callHackage "witherable" "0.3.1" {};
     };
   };
 

@@ 1,4 0,0 @@
-import (fetchTarball {
-  url = "https://github.com/NixOS/nixpkgs/archive/9bc23f31d29138f09db6af52708a9b8b64deec64.tar.gz";
-  sha256 = "0xx7c8pk32l16g3hz40j6nf1ai1ghqgw3g6n73y41dcijjfnmxbj";
-})

@@ 1,5 1,5 @@
 { nixpkgs ? import ../nix/nixpkgs.nix
-, compiler ? "default"
+, compiler ? "ghc865"
 , doBenchmark ? false
 }:
 let

@@ 13,7 13,7 @@ Build-Type:             Simple
 Homepage:               https://git.sr.ht/~jack/misc
 
 Library
-  Build-Depends:        base >= 4.12.0.0 && < 4.13,
+  Build-Depends:        base >= 4.12.0.0 && < 4.14,
                         bytestring >= 0.10.8.2 && < 0.11,
                         containers >= 0.6.0.1 && < 0.7,
                         directory >= 1.3.3.0 && < 1.4,


@@ 21,7 21,7 @@ Library
                         HTTP >= 4000.3.14 && < 4000.4,
                         hxt >= 9.3.1.18 && < 9.4,
                         hxt-http >= 9.1.5.2 && < 9.2,
-                        network >= 2.8.0.1 && < 2.9,
+                        network >= 2.8.0.1 && < 3.1.2,
                         network-uri >= 2.6.1.0 && < 2.7
 
   Exposed-Modules:      Menu,

@@ 1,7 1,7 @@
 {
   "url": "https://github.com/NixOS/nixpkgs",
-  "rev": "47bd85469fbd507c12d8ec7f9650ab6dcbd8c274",
-  "date": "2019-11-02T09:20:40+01:00",
-  "sha256": "13vdwrjyp290z949769cjkfzy2dls00zqg3zyzbhz8y5xhhsq4wn",
+  "rev": "eda60c51a9e6553631f01053bc05d9c914936249",
+  "date": "2020-03-28T23:29:57-04:00",
+  "sha256": "1a26y3r5wcwv5h203jz6j7qsks2qq9s27hk50nl14mjh1abbxyk9",
   "fetchSubmodules": false
 }