Skip to content

Commit

Permalink
nix: Update nixpkgs, flake-parts, haskell-flake
Browse files Browse the repository at this point in the history
This also brings a new commonmark-* withi 'alerts' parser
  • Loading branch information
srid committed Jan 12, 2024
1 parent 65d1b55 commit fa32bb0
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 16 deletions.
4 changes: 2 additions & 2 deletions emanote/emanote.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.4
name: emanote
version: 1.3.6.0
version: 1.3.6.1
license: AGPL-3.0-only
copyright: 2022 Sridhar Ratnakumar
maintainer: [email protected]
Expand Down Expand Up @@ -100,7 +100,7 @@ common library-common
, commonmark
, commonmark-extensions >=0.2.3.4
, commonmark-pandoc
, commonmark-simple
, commonmark-simple >=0.2
, commonmark-wikilink
, containers
, data-default
Expand Down
4 changes: 4 additions & 0 deletions emanote/src/Emanote/Pandoc/Renderer/Callout.hs
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{-# LANGUAGE RecordWildCards #-}

{- | Obsidian-style callouts
TODO: Should we switch to using the commonmark-hs parser here? cf. https://github.com/jgm/commonmark-hs/pull/135
-}
module Emanote.Pandoc.Renderer.Callout (
calloutResolvingSplice,

Expand Down
41 changes: 29 additions & 12 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
unionmount.url = "github:srid/unionmount";
unionmount.flake = false;

commonmark-simple.url = "github:srid/commonmark-simple";
commonmark-simple.flake = false;

emanote-template.url = "github:srid/emanote-template";
emanote-template.flake = false;
};
Expand Down Expand Up @@ -66,13 +69,15 @@

packages = {
unionmount.source = inputs.unionmount;
commonmark-simple.source = inputs.commonmark-simple;
fsnotify.source = "0.4.1.0"; # Not in nixpkgs, yet.
ghcid.source = "0.8.8";
heist-extra.source = inputs.heist-extra;
};

settings = {
# TODO: Eliminate these after new emanote gets upstreamed to nixpkgs
# Haskell packages in nixpkgs are often broken in many ways; ergo,
# it is our responsibility to fix them here.
fsnotify.check = false;
heist.broken = false;
ixset-typed.broken = false;
Expand All @@ -94,7 +99,7 @@
justStaticExecutables = true;
removeReferencesTo = [
self.pandoc
self.pandoc_3_1_9
self.pandoc_3_1_11
self.pandoc-types
self.warp
];
Expand Down

0 comments on commit fa32bb0

Please sign in to comment.