Update nixpkgs, etc.

dep/directory-contents/github.json

@@ -1,8 +1,8 @@
 {
   "owner": "srid",
   "repo": "directory-contents",
-  "branch": "sans-tests--pathaIsSymbolicLinkFix--witherable04",
+  "branch": "master",
   "private": false,
-  "rev": "0d3f1d5c86063232a3ccf081d9be143eb2ff1466",
-  "sha256": "1zmxs2acj1nhdwpn62ksrihmpwyf1dza9iiqhkm41c4m025v6q82"
+  "rev": "f8c7148121adcf5bae2f41b8265ce9cc4ed0556b",
+  "sha256": "026in1v0njj53wx60nkbarspw917n4jnh03ss6nk2b2n3kcnx35g"
 }

dep/pandoc-link-context/github.json

@@ -3,6 +3,6 @@
   "repo": "pandoc-link-context",
   "branch": "master",
   "private": false,
-  "rev": "71e4061789884bc3030a9686add9b7fa58aea14e",
-  "sha256": "1ww1ccsmdmx8ljrs911ind86wna2fg471flazblg59ag6xm9k5wc"
+  "rev": "85bd204339aafd309b8a3dd99ebffa6a50776cb6",
+  "sha256": "1iyq4z54cjq4drnv27s69f7m0d75nckg31bm5yf561xpxphc8v7x"
 }

flake.nix

@@ -2,7 +2,7 @@
   description = "Future-proof note-taking and publishing based on Zettelkasten";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/08ef0f28e3a41424b92ba1d203de64257a9fca6a";
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
     flake-compat = {
       url = "github:edolstra/flake-compat";

neuron.cabal

@@ -1,6 +1,6 @@
 cabal-version: 2.4
 name: neuron
-version: 1.9.35.3
+version: 1.9.36.0
 license: AGPL-3.0-only
 copyright: 2020 Sridhar Ratnakumar
 maintainer: [email protected]
@@ -70,7 +70,7 @@ common library-common
     modern-uri,
     mtl,
     optparse-applicative,
-    pandoc-link-context >= 1.2.0,
+    pandoc-link-context >= 1.4.0,
     pandoc-types >= 1.21,
     parsec,
     parser-combinators,

project.nix

@@ -67,7 +67,7 @@ let
   };
 
   haskellOverrides = self: super: with pkgs.haskell.lib; {
-    pandoc-link-context = self.callCabal2nix "pandoc-link-context" sources.pandoc-link-context { };
+    pandoc-link-context = doJailbreak (self.callCabal2nix "pandoc-link-context" sources.pandoc-link-context { });
     reflex-dom-pandoc =
       dontHaddock (self.callCabal2nix "reflex-dom-pandoc" sources.reflex-dom-pandoc { });
     reflex-fsnotify =

src/Neuron/Cache/Type.hs

@@ -43,7 +43,7 @@ instance FromJSON NeuronCache where
 
 reflexDomGetCache ::
   ( DomBuilder t m,
-    Prerender js t m,
+    Prerender t m,
     TriggerEvent t m,
     PerformEvent t m,
     PostBuild t m,

src/Neuron/Frontend/Impulse.hs

@@ -67,7 +67,7 @@ treeMatches :: Tree (Maybe a, b) -> Bool
 treeMatches (Node (mm, _) _) = isJust mm
 
 renderImpulse ::
-  (DomBuilder t m, PostBuild t m, MonadHold t m, MonadFix m, Prerender js t m) =>
+  (DomBuilder t m, PostBuild t m, MonadHold t m, MonadFix m, Prerender t m) =>
   Dynamic t (LoadableData (SiteData, ImpulseData)) ->
   NeuronWebT t m ()
 renderImpulse dataLDyn = do

src/Neuron/Frontend/Static/Html.hs

@@ -25,13 +25,13 @@ import Relude
 
 -- | Render the given route
 renderRoutePage ::
-  forall t m js a.
+  forall t m a.
   ( DomBuilder t m,
     RawBuilder m,
     MonadHold t m,
     PostBuild t m,
     MonadFix m,
-    Prerender js t m,
+    Prerender t m,
     PerformEvent t m,
     TriggerEvent t m
   ) =>

src/Neuron/Frontend/View.hs

@@ -70,8 +70,8 @@ bodyTemplate neuronVersionM w = do
     renderBrandFooter neuronVersionM
 
 renderRouteImpulse ::
-  forall t m js.
-  (DomBuilder t m, PostBuild t m, MonadHold t m, MonadFix m, Prerender js t m) =>
+  forall t m.
+  (DomBuilder t m, PostBuild t m, MonadHold t m, MonadFix m, Prerender t m) =>
   Dynamic t (LoadableData (SiteData, ImpulseData)) ->
   NeuronWebT t m ()
 renderRouteImpulse dataLDyn = do
@@ -83,13 +83,13 @@ renderRouteImpulse dataLDyn = do
       Impulse.renderImpulse dataLDyn
 
 renderRouteZettel ::
-  forall t m js.
+  forall t m.
   ( DomBuilder t m,
     RawBuilder m,
     PostBuild t m,
     MonadHold t m,
     MonadFix m,
-    Prerender js t m
+    Prerender t m
   ) =>
   Dynamic t (LoadableData (SiteData, ZettelData)) ->
   NeuronWebT t m ()

src/Neuron/Frontend/Zettel/View.hs

@@ -45,7 +45,7 @@ renderZettel ::
     PostBuild t m,
     MonadHold t m,
     MonadFix m,
-    Prerender js t m
+    Prerender t m
   ) =>
   SiteData ->
   ZettelData ->

src/Neuron/Plugin.hs

@@ -230,16 +230,16 @@ stripSurroundingContext =
 
 -- | Render a zettel Pandoc content given its zettel data.
 elZettel ::
-  (DomBuilder t m, RawBuilder m, PostBuild t m, Prerender js t m) =>
+  (DomBuilder t m, RawBuilder m, PostBuild t m, Prerender t m) =>
   ZettelData ->
   Pandoc ->
   NeuronWebT t m ()
 elZettel zData =
   elPandoc (mkReflexDomPandocConfig zData)
 
 mkReflexDomPandocConfig ::
-  forall js t m.
-  (DomBuilder t m, RawBuilder m, PostBuild t m, Prerender js t m) =>
+  forall t m.
+  (DomBuilder t m, RawBuilder m, PostBuild t m, Prerender t m) =>
   ZettelData ->
   Config t (NeuronWebT t m) ()
 mkReflexDomPandocConfig x =