summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-common.nix
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2023-08-17 10:58:47 +0200
committersternenseemann <sternenseemann@systemli.org>2023-08-17 10:58:47 +0200
commit8d847a62ae0208bba5e0ec46489697af3eb334d0 (patch)
treebfd8a593a46b6ffdf7f2dacefe250e2e0ce7b868 /pkgs/development/haskell-modules/configuration-common.nix
parent0a088cfd184cf2b3f895f112c57024eca21fad7c (diff)
downloadnixpkgs-8d847a62ae0208bba5e0ec46489697af3eb334d0.tar
nixpkgs-8d847a62ae0208bba5e0ec46489697af3eb334d0.tar.gz
nixpkgs-8d847a62ae0208bba5e0ec46489697af3eb334d0.tar.bz2
nixpkgs-8d847a62ae0208bba5e0ec46489697af3eb334d0.tar.lz
nixpkgs-8d847a62ae0208bba5e0ec46489697af3eb334d0.tar.xz
nixpkgs-8d847a62ae0208bba5e0ec46489697af3eb334d0.tar.zst
nixpkgs-8d847a62ae0208bba5e0ec46489697af3eb334d0.zip
haskellPackages.pandoc-cli: reflect updates of dependencies
haskellPackages.pandoc: 3.1.6 -> 3.1.6.1
haskellPackages.tls: 1.7.0 -> 1.7.1
haskellPackages.http-client-tls: 0.3.6.2 -> 0.3.6.2

Stackage LTS updated to skylighting* 0.13.4.1.
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix16
1 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 380d4e94c81..9c9c21311fa 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -312,7 +312,7 @@ self: super: {
 
   # Overriding the version pandoc dependency uses as the latest release has version bounds
   # defined as >= 3.1  && < 3.2, can be removed once pandoc gets bumped by Stackage.
-  patat = super.patat.override { pandoc = self.pandoc_3_1_6; };
+  patat = super.patat.override { pandoc = self.pandoc_3_1_6_1; };
 
   # The latest release on hackage has an upper bound on containers which
   # breaks the build, though it works with the version of containers present
@@ -1918,27 +1918,23 @@ self: super: {
   inherit (let
     pandoc-cli-overlay = self: super: {
       # pandoc-cli requires pandoc >= 3.1
-      pandoc = self.pandoc_3_1_6;
+      pandoc = self.pandoc_3_1_6_1;
 
       # pandoc depends on crypton-connection, which requires tls >= 1.7
-      tls = self.tls_1_7_0;
+      tls = self.tls_1_7_1;
       crypton-connection = unmarkBroken super.crypton-connection;
 
       # pandoc depends on http-client-tls, which only starts depending
       # on crypton-connection in http-client-tls-0.3.6.2.
-      http-client-tls = self.http-client-tls_0_3_6_2;
-
-      # pandoc and skylighting are developed in tandem
-      skylighting-core = self.skylighting-core_0_13_4_1;
-      skylighting = self.skylighting_0_13_4_1;
+      http-client-tls = self.http-client-tls_0_3_6_3;
     };
   in {
     pandoc-cli = super.pandoc-cli.overrideScope pandoc-cli-overlay;
-    pandoc_3_1_6 = doDistribute (super.pandoc_3_1_6.overrideScope pandoc-cli-overlay);
+    pandoc_3_1_6_1 = doDistribute (super.pandoc_3_1_6_1.overrideScope pandoc-cli-overlay);
     pandoc-lua-engine = super.pandoc-lua-engine.overrideScope pandoc-cli-overlay;
   })
     pandoc-cli
-    pandoc_3_1_6
+    pandoc_3_1_6_1
     pandoc-lua-engine
     ;