diff --git a/pkgs/by-name/pa/pandoc/package.nix b/pkgs/by-name/pa/pandoc/package.nix
index 341edadd2617..6c0081ae32fd 100644
--- a/pkgs/by-name/pa/pandoc/package.nix
+++ b/pkgs/by-name/pa/pandoc/package.nix
@@ -39,6 +39,9 @@ in
       remove-references-to \
         -t ${pandoc-cli.scope.pandoc} \
         $out/bin/pandoc
+      remove-references-to \
+        -t ${pandoc-cli.scope.typst} \
+        $out/bin/pandoc
     '' + lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) ''
       mkdir -p $out/share/bash-completion/completions
       $out/bin/pandoc --bash-completion > $out/share/bash-completion/completions/pandoc
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6953d87acff6..36a5285a6482 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2004,17 +2004,22 @@ self: super: {
   # https://github.com/NixOS/nixpkgs/pull/349683
   pandoc-cli_3_6 = super.pandoc-cli_3_6.overrideScope (
     self: super: {
+      commonmark-extensions = self.commonmark-extensions_0_2_5_6;
+      commonmark-pandoc = self.commonmark-pandoc_0_2_2_3;
       doclayout = self.doclayout_0_5;
       hslua-module-doclayout = self.hslua-module-doclayout_1_2_0;
       lpeg = self.lpeg_1_1_0;
       pandoc = self.pandoc_3_6;
       pandoc-lua-engine = self.pandoc-lua-engine_0_4;
+      pandoc-lua-marshal = self.pandoc-lua-marshal_0_3_0;
       pandoc-server = self.pandoc-server_0_1_0_10;
+      skylighting = self.skylighting_0_14_5;
+      skylighting-core = self.skylighting-core_0_14_5;
       texmath = self.texmath_0_12_8_12;
       tls = self.tls_2_0_6;
       toml-parser = self.toml-parser_2_0_1_0;
       typst = self.typst_0_6_1;
-      typst-symbols = self.typst-symbols_0_1_6;
+      typst-symbols = self.typst-symbols_0_1_7;
     }
   );
 
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 42e07f4fa4a8..447df2a7ce02 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -116,7 +116,6 @@ extra-packages:
   - tls < 2.1.0                         # 2024-07-19: requested by darcs == 2.18.3
   - extensions == 0.1.0.2               # 2024-10-20: for GHC 9.10/Cabal 3.12
   - network-run == 0.4.0                # 2024-10-20: for GHC 9.10/network == 3.1.*
-  - typst-symbols >=0.1.6 && <0.1.7     # 2024-11-20: for pandoc 3.5 and quarto
   - ghc-source-gen < 0.4.6.0            # 2024-12-31: support GHC < 9.0
 
 package-maintainers:
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 36cf7f46bd80..2be1a3cd0e20 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -260442,6 +260442,7 @@ self: {
        description = "Anonymous extensible records";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "rawstring-qm" = callPackage
@@ -323218,18 +323219,6 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "typst-symbols_0_1_6" = callPackage
-    ({ mkDerivation, base, text }:
-     mkDerivation {
-       pname = "typst-symbols";
-       version = "0.1.6";
-       sha256 = "17a2grflk67vs68b2pxygvk7p50rj9fb3ri7fcwa19j9jnhg4zwl";
-       libraryHaskellDepends = [ base text ];
-       description = "Symbol and emoji lookup for typst language";
-       license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
   "typst-symbols_0_1_7" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {