From d0df602d3f4f787638e1f84bda88655c2f0f5ab1 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Wed, 6 Apr 2022 15:17:27 -0400 Subject: [PATCH 01/10] Update nixpkgs, and other inputs --- flake.lock | 20 ++++++++++---------- flake.nix | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 2d70ea28..6ff534bc 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1606424373, - "narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=", + "lastModified": 1648199409, + "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", "owner": "edolstra", "repo": "flake-compat", - "rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf", + "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", "type": "github" }, "original": { @@ -18,11 +18,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1617631617, - "narHash": "sha256-PARRCz55qN3gy07VJZIlFeOX420d0nGF0RzGI/9hVlw=", + "lastModified": 1648297722, + "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b2c27d1a81b0dc266270fa8aeecebbd1807fc610", + "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", "type": "github" }, "original": { @@ -33,17 +33,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1630140382, - "narHash": "sha256-ntXepAHFlAEtaYIU5EzckRUODeeMgpu1u2Yug+4LFNc=", + "lastModified": 1649225869, + "narHash": "sha256-u1zLtPmQzhT9mNXyM8Ey9pk7orDrIKdwooeGDEXm5xM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "08ef0f28e3a41424b92ba1d203de64257a9fca6a", + "rev": "b6966d911da89e5a7301aaef8b4f0a44c77e103c", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "08ef0f28e3a41424b92ba1d203de64257a9fca6a", + "rev": "b6966d911da89e5a7301aaef8b4f0a44c77e103c", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 39ef4287..adf4c41e 100644 --- a/flake.nix +++ b/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/b6966d911da89e5a7301aaef8b4f0a44c77e103c"; flake-utils.url = "github:numtide/flake-utils"; flake-compat = { url = "github:edolstra/flake-compat"; From 9d56c8a653a41632d68954141bca53f2787be68f Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Wed, 6 Apr 2022 15:22:24 -0400 Subject: [PATCH 02/10] Apparently nixpkgs is on ghc 9 now? --- project.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.nix b/project.nix index 26317eea..3b5af9ce 100644 --- a/project.nix +++ b/project.nix @@ -109,7 +109,7 @@ let neuronFlags; }; - haskellPackages = pkgs.haskellPackages.override { + haskellPackages = pkgs.haskell.packages.ghc8107.override { overrides = haskellOverrides; }; From b0de169fffb8dd5bf9458cb41c998ba6ceb086a5 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Wed, 6 Apr 2022 16:32:18 -0400 Subject: [PATCH 03/10] Use a slightly older nixpkgs that has 8.10 in cache --- flake.lock | 8 ++++---- flake.nix | 2 +- project.nix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 6ff534bc..12d30f9b 100644 --- a/flake.lock +++ b/flake.lock @@ -33,17 +33,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1649225869, - "narHash": "sha256-u1zLtPmQzhT9mNXyM8Ey9pk7orDrIKdwooeGDEXm5xM=", + "lastModified": 1646470760, + "narHash": "sha256-dQISyucVCCPaFioUhy5ZgfBz8rOMKGI8k13aPDFTqEs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b6966d911da89e5a7301aaef8b4f0a44c77e103c", + "rev": "1fc7212a2c3992eedc6eedf498955c321ad81cc2", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "b6966d911da89e5a7301aaef8b4f0a44c77e103c", + "rev": "1fc7212a2c3992eedc6eedf498955c321ad81cc2", "type": "github" } }, diff --git a/flake.nix b/flake.nix index adf4c41e..3eba04d5 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Future-proof note-taking and publishing based on Zettelkasten"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/b6966d911da89e5a7301aaef8b4f0a44c77e103c"; + nixpkgs.url = "github:nixos/nixpkgs/1fc7212a2c3992eedc6eedf498955c321ad81cc2"; flake-utils.url = "github:numtide/flake-utils"; flake-compat = { url = "github:edolstra/flake-compat"; diff --git a/project.nix b/project.nix index 3b5af9ce..26317eea 100644 --- a/project.nix +++ b/project.nix @@ -109,7 +109,7 @@ let neuronFlags; }; - haskellPackages = pkgs.haskell.packages.ghc8107.override { + haskellPackages = pkgs.haskellPackages.override { overrides = haskellOverrides; }; From 05405e91da447287c4a967a80caa6baf699ee8be Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Wed, 6 Apr 2022 16:39:55 -0400 Subject: [PATCH 04/10] Use new Prerender --- neuron.cabal | 2 +- src/Neuron/Cache/Type.hs | 2 +- src/Neuron/Frontend/Impulse.hs | 2 +- src/Neuron/Frontend/Static/Html.hs | 4 ++-- src/Neuron/Frontend/View.hs | 8 ++++---- src/Neuron/Frontend/Zettel/View.hs | 2 +- src/Neuron/Plugin.hs | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/neuron.cabal b/neuron.cabal index fbf8c159..85b4fcd6 100644 --- a/neuron.cabal +++ b/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: srid@srid.ca diff --git a/src/Neuron/Cache/Type.hs b/src/Neuron/Cache/Type.hs index bd35333f..b8d6a3a9 100644 --- a/src/Neuron/Cache/Type.hs +++ b/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, diff --git a/src/Neuron/Frontend/Impulse.hs b/src/Neuron/Frontend/Impulse.hs index 99bc32c6..6553dd14 100644 --- a/src/Neuron/Frontend/Impulse.hs +++ b/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 diff --git a/src/Neuron/Frontend/Static/Html.hs b/src/Neuron/Frontend/Static/Html.hs index 3a2c9165..764a9184 100644 --- a/src/Neuron/Frontend/Static/Html.hs +++ b/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 ) => diff --git a/src/Neuron/Frontend/View.hs b/src/Neuron/Frontend/View.hs index ddb85042..b908c7d7 100644 --- a/src/Neuron/Frontend/View.hs +++ b/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 () diff --git a/src/Neuron/Frontend/Zettel/View.hs b/src/Neuron/Frontend/Zettel/View.hs index 2ea7461a..ada9c73d 100644 --- a/src/Neuron/Frontend/Zettel/View.hs +++ b/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 -> diff --git a/src/Neuron/Plugin.hs b/src/Neuron/Plugin.hs index 6d450602..3bb07f15 100644 --- a/src/Neuron/Plugin.hs +++ b/src/Neuron/Plugin.hs @@ -230,7 +230,7 @@ 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 () @@ -238,8 +238,8 @@ 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 = From 7be465954f70f8d2b9bca939f25cef114a3e9fb0 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Wed, 6 Apr 2022 16:55:11 -0400 Subject: [PATCH 05/10] Revert "Use new Prerender" This reverts commit 05405e91da447287c4a967a80caa6baf699ee8be. --- neuron.cabal | 2 +- src/Neuron/Cache/Type.hs | 2 +- src/Neuron/Frontend/Impulse.hs | 2 +- src/Neuron/Frontend/Static/Html.hs | 4 ++-- src/Neuron/Frontend/View.hs | 8 ++++---- src/Neuron/Frontend/Zettel/View.hs | 2 +- src/Neuron/Plugin.hs | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/neuron.cabal b/neuron.cabal index 85b4fcd6..fbf8c159 100644 --- a/neuron.cabal +++ b/neuron.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: neuron -version: 1.9.36.0 +version: 1.9.35.3 license: AGPL-3.0-only copyright: 2020 Sridhar Ratnakumar maintainer: srid@srid.ca diff --git a/src/Neuron/Cache/Type.hs b/src/Neuron/Cache/Type.hs index b8d6a3a9..bd35333f 100644 --- a/src/Neuron/Cache/Type.hs +++ b/src/Neuron/Cache/Type.hs @@ -43,7 +43,7 @@ instance FromJSON NeuronCache where reflexDomGetCache :: ( DomBuilder t m, - Prerender t m, + Prerender js t m, TriggerEvent t m, PerformEvent t m, PostBuild t m, diff --git a/src/Neuron/Frontend/Impulse.hs b/src/Neuron/Frontend/Impulse.hs index 6553dd14..99bc32c6 100644 --- a/src/Neuron/Frontend/Impulse.hs +++ b/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 t m) => + (DomBuilder t m, PostBuild t m, MonadHold t m, MonadFix m, Prerender js t m) => Dynamic t (LoadableData (SiteData, ImpulseData)) -> NeuronWebT t m () renderImpulse dataLDyn = do diff --git a/src/Neuron/Frontend/Static/Html.hs b/src/Neuron/Frontend/Static/Html.hs index 764a9184..3a2c9165 100644 --- a/src/Neuron/Frontend/Static/Html.hs +++ b/src/Neuron/Frontend/Static/Html.hs @@ -25,13 +25,13 @@ import Relude -- | Render the given route renderRoutePage :: - forall t m a. + forall t m js a. ( DomBuilder t m, RawBuilder m, MonadHold t m, PostBuild t m, MonadFix m, - Prerender t m, + Prerender js t m, PerformEvent t m, TriggerEvent t m ) => diff --git a/src/Neuron/Frontend/View.hs b/src/Neuron/Frontend/View.hs index b908c7d7..ddb85042 100644 --- a/src/Neuron/Frontend/View.hs +++ b/src/Neuron/Frontend/View.hs @@ -70,8 +70,8 @@ bodyTemplate neuronVersionM w = do renderBrandFooter neuronVersionM renderRouteImpulse :: - forall t m. - (DomBuilder t m, PostBuild t m, MonadHold t m, MonadFix m, Prerender t m) => + forall t m js. + (DomBuilder t m, PostBuild t m, MonadHold t m, MonadFix m, Prerender js 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. + forall t m js. ( DomBuilder t m, RawBuilder m, PostBuild t m, MonadHold t m, MonadFix m, - Prerender t m + Prerender js t m ) => Dynamic t (LoadableData (SiteData, ZettelData)) -> NeuronWebT t m () diff --git a/src/Neuron/Frontend/Zettel/View.hs b/src/Neuron/Frontend/Zettel/View.hs index ada9c73d..2ea7461a 100644 --- a/src/Neuron/Frontend/Zettel/View.hs +++ b/src/Neuron/Frontend/Zettel/View.hs @@ -45,7 +45,7 @@ renderZettel :: PostBuild t m, MonadHold t m, MonadFix m, - Prerender t m + Prerender js t m ) => SiteData -> ZettelData -> diff --git a/src/Neuron/Plugin.hs b/src/Neuron/Plugin.hs index 3bb07f15..6d450602 100644 --- a/src/Neuron/Plugin.hs +++ b/src/Neuron/Plugin.hs @@ -230,7 +230,7 @@ stripSurroundingContext = -- | Render a zettel Pandoc content given its zettel data. elZettel :: - (DomBuilder t m, RawBuilder m, PostBuild t m, Prerender t m) => + (DomBuilder t m, RawBuilder m, PostBuild t m, Prerender js t m) => ZettelData -> Pandoc -> NeuronWebT t m () @@ -238,8 +238,8 @@ elZettel zData = elPandoc (mkReflexDomPandocConfig zData) mkReflexDomPandocConfig :: - forall t m. - (DomBuilder t m, RawBuilder m, PostBuild t m, Prerender t m) => + forall js t m. + (DomBuilder t m, RawBuilder m, PostBuild t m, Prerender js t m) => ZettelData -> Config t (NeuronWebT t m) () mkReflexDomPandocConfig x = From cf6e5554ea915fcdd61854a327d7da25763579ac Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Mon, 25 Apr 2022 20:29:02 -0400 Subject: [PATCH 06/10] update things --- dep/directory-contents/github.json | 4 ++-- dep/pandoc-link-context/github.json | 4 ++-- flake.lock | 8 ++++---- flake.nix | 2 +- neuron.cabal | 4 ++-- project.nix | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dep/directory-contents/github.json b/dep/directory-contents/github.json index a2ea1180..8fd0502f 100644 --- a/dep/directory-contents/github.json +++ b/dep/directory-contents/github.json @@ -3,6 +3,6 @@ "repo": "directory-contents", "branch": "sans-tests--pathaIsSymbolicLinkFix--witherable04", "private": false, - "rev": "0d3f1d5c86063232a3ccf081d9be143eb2ff1466", - "sha256": "1zmxs2acj1nhdwpn62ksrihmpwyf1dza9iiqhkm41c4m025v6q82" + "rev": "684ddb23e4093a8b49c151d48a7f28559127b3c1", + "sha256": "" } diff --git a/dep/pandoc-link-context/github.json b/dep/pandoc-link-context/github.json index c1908f6a..d14297b7 100644 --- a/dep/pandoc-link-context/github.json +++ b/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" } diff --git a/flake.lock b/flake.lock index 12d30f9b..aa43aaa9 100644 --- a/flake.lock +++ b/flake.lock @@ -33,17 +33,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1646470760, - "narHash": "sha256-dQISyucVCCPaFioUhy5ZgfBz8rOMKGI8k13aPDFTqEs=", + "lastModified": 1650882267, + "narHash": "sha256-BFKiz8srATQIBuFEN2HgS2EHisK29EjZ/HV34wSr2lU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1fc7212a2c3992eedc6eedf498955c321ad81cc2", + "rev": "2ea2f7b6d0cb7ce0712f2aa80303cda08deb0de2", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "1fc7212a2c3992eedc6eedf498955c321ad81cc2", + "rev": "2ea2f7b6d0cb7ce0712f2aa80303cda08deb0de2", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 3eba04d5..067959dc 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Future-proof note-taking and publishing based on Zettelkasten"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/1fc7212a2c3992eedc6eedf498955c321ad81cc2"; + nixpkgs.url = "github:nixos/nixpkgs/2ea2f7b6d0cb7ce0712f2aa80303cda08deb0de2"; flake-utils.url = "github:numtide/flake-utils"; flake-compat = { url = "github:edolstra/flake-compat"; diff --git a/neuron.cabal b/neuron.cabal index fbf8c159..c27f0711 100644 --- a/neuron.cabal +++ b/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: srid@srid.ca @@ -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, diff --git a/project.nix b/project.nix index 26317eea..b2b676c8 100644 --- a/project.nix +++ b/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 = From 2334caafab6f2ccef47055ad55d4bf55ec00d9f4 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Mon, 25 Apr 2022 20:29:14 -0400 Subject: [PATCH 07/10] Revert "Revert "Use new Prerender"" This reverts commit 7be465954f70f8d2b9bca939f25cef114a3e9fb0. --- src/Neuron/Cache/Type.hs | 2 +- src/Neuron/Frontend/Impulse.hs | 2 +- src/Neuron/Frontend/Static/Html.hs | 4 ++-- src/Neuron/Frontend/View.hs | 8 ++++---- src/Neuron/Frontend/Zettel/View.hs | 2 +- src/Neuron/Plugin.hs | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Neuron/Cache/Type.hs b/src/Neuron/Cache/Type.hs index bd35333f..b8d6a3a9 100644 --- a/src/Neuron/Cache/Type.hs +++ b/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, diff --git a/src/Neuron/Frontend/Impulse.hs b/src/Neuron/Frontend/Impulse.hs index 99bc32c6..6553dd14 100644 --- a/src/Neuron/Frontend/Impulse.hs +++ b/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 diff --git a/src/Neuron/Frontend/Static/Html.hs b/src/Neuron/Frontend/Static/Html.hs index 3a2c9165..764a9184 100644 --- a/src/Neuron/Frontend/Static/Html.hs +++ b/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 ) => diff --git a/src/Neuron/Frontend/View.hs b/src/Neuron/Frontend/View.hs index ddb85042..b908c7d7 100644 --- a/src/Neuron/Frontend/View.hs +++ b/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 () diff --git a/src/Neuron/Frontend/Zettel/View.hs b/src/Neuron/Frontend/Zettel/View.hs index 2ea7461a..ada9c73d 100644 --- a/src/Neuron/Frontend/Zettel/View.hs +++ b/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 -> diff --git a/src/Neuron/Plugin.hs b/src/Neuron/Plugin.hs index 6d450602..3bb07f15 100644 --- a/src/Neuron/Plugin.hs +++ b/src/Neuron/Plugin.hs @@ -230,7 +230,7 @@ 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 () @@ -238,8 +238,8 @@ 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 = From 6b27b90d2762f4ed7546e0a6b2a6f6d1809c190e Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Mon, 25 Apr 2022 20:30:26 -0400 Subject: [PATCH 08/10] Specify directory-contents hash --- dep/directory-contents/github.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dep/directory-contents/github.json b/dep/directory-contents/github.json index 8fd0502f..b5280f6b 100644 --- a/dep/directory-contents/github.json +++ b/dep/directory-contents/github.json @@ -4,5 +4,5 @@ "branch": "sans-tests--pathaIsSymbolicLinkFix--witherable04", "private": false, "rev": "684ddb23e4093a8b49c151d48a7f28559127b3c1", - "sha256": "" + "sha256": "00sfbnm2ab90z11klx01sy0qj641zw7bkbr41ksld4pmryfsqnyr" } From 65fb8ee4b7f3c1025a07fa0058f28c620a7d4614 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Thu, 7 Jul 2022 22:20:42 -0400 Subject: [PATCH 09/10] Update nixpkgs --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index aa43aaa9..826e61fe 100644 --- a/flake.lock +++ b/flake.lock @@ -33,17 +33,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1650882267, - "narHash": "sha256-BFKiz8srATQIBuFEN2HgS2EHisK29EjZ/HV34wSr2lU=", + "lastModified": 1657208011, + "narHash": "sha256-BlIFwopAykvdy1DYayEkj6ZZdkn+cVgPNX98QVLc0jM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2ea2f7b6d0cb7ce0712f2aa80303cda08deb0de2", + "rev": "2770cc0b1e8faa0e20eb2c6aea64c256a706d4f2", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", - "rev": "2ea2f7b6d0cb7ce0712f2aa80303cda08deb0de2", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 067959dc..5a3bad89 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Future-proof note-taking and publishing based on Zettelkasten"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/2ea2f7b6d0cb7ce0712f2aa80303cda08deb0de2"; + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; flake-utils.url = "github:numtide/flake-utils"; flake-compat = { url = "github:edolstra/flake-compat"; From 4939d20cdad9430b0d428abc9dba8d741e7d4d20 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Thu, 7 Jul 2022 22:26:24 -0400 Subject: [PATCH 10/10] Update directory-contents (no tests) --- dep/directory-contents/github.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dep/directory-contents/github.json b/dep/directory-contents/github.json index b5280f6b..0f2d6516 100644 --- a/dep/directory-contents/github.json +++ b/dep/directory-contents/github.json @@ -1,8 +1,8 @@ { "owner": "srid", "repo": "directory-contents", - "branch": "sans-tests--pathaIsSymbolicLinkFix--witherable04", + "branch": "master", "private": false, - "rev": "684ddb23e4093a8b49c151d48a7f28559127b3c1", - "sha256": "00sfbnm2ab90z11klx01sy0qj641zw7bkbr41ksld4pmryfsqnyr" + "rev": "f8c7148121adcf5bae2f41b8265ce9cc4ed0556b", + "sha256": "026in1v0njj53wx60nkbarspw917n4jnh03ss6nk2b2n3kcnx35g" }