nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-21 05:04:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

haskellPackages.pandoc-cli: reflect updates of dependencies

Browse Source 
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.
This commit is contained in:
sternenseemann 2023-08-17 10:58:47 +02:00
parent 0a088cfd18
commit 8d847a62ae
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -312,7 +312,7 @@ self: super: {
# Overriding the version pandoc dependency uses as the latest release has version bounds # 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. # 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 # The latest release on hackage has an upper bound on containers which
# breaks the build, though it works with the version of containers present # breaks the build, though it works with the version of containers present
@ -1918,27 +1918,23 @@ self: super: {
inherit (let inherit (let
pandoc-cli-overlay = self: super: { pandoc-cli-overlay = self: super: {
# pandoc-cli requires pandoc >= 3.1 # 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 # 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; crypton-connection = unmarkBroken super.crypton-connection;
# pandoc depends on http-client-tls, which only starts depending # pandoc depends on http-client-tls, which only starts depending
# on crypton-connection in http-client-tls-0.3.6.2. # on crypton-connection in http-client-tls-0.3.6.2.
http-client-tls = self.http-client-tls_0_3_6_2; http-client-tls = self.http-client-tls_0_3_6_3;
# pandoc and skylighting are developed in tandem
skylighting-core = self.skylighting-core_0_13_4_1;
skylighting = self.skylighting_0_13_4_1;
}; };
in { in {
pandoc-cli = super.pandoc-cli.overrideScope pandoc-cli-overlay; 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-lua-engine = super.pandoc-lua-engine.overrideScope pandoc-cli-overlay;
}) })
pandoc-cli pandoc-cli
pandoc_3_1_6 pandoc_3_1_6_1
pandoc-lua-engine pandoc-lua-engine
; ;

2
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
View File

@ -2364,7 +2364,7 @@ dont-distribute-packages:
- htsn-import - htsn-import
- http-client-auth - http-client-auth
- http-client-rustls - http-client-rustls
- http-client-tls_0_3_6_2 - http-client-tls_0_3_6_3
- http-conduit_2_3_8_3 - http-conduit_2_3_8_3
- http-enumerator - http-enumerator
- http2-client-grpc - http2-client-grpc