diff options
| author | maralorn <mail@maralorn.de> | 2023-10-06 19:16:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-06 19:16:47 +0200 |
| commit | ee59e1036266fc6ab4e22c3fe770d998ead2d147 (patch) | |
| tree | 01996478222d43dd9df059f9839f13a6f7dca5f0 /pkgs/development/haskell-modules | |
| parent | 00c05bbc65cfdabb7ab09a2e37c78b86381e94ab (diff) | |
| parent | d5b241bd378ffa8469b52ccaf7160347dd9d0b91 (diff) | |
Merge pull request #259408 from dalpd/fix-patat-build-5
haskellPackages.patat: Remove patch failing the build
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5a222fa1e6854..82853bf9d6393 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -316,12 +316,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. - # - # The patch can be removed once the commit being pulled is in a release. - patat = appendPatch (fetchpatch { - url = "https://github.com/jaspervdj/patat/pull/143/commits/cb5d5b6439204b5bd52939e42a11518ac81139fe.patch"; - sha256 = "sha256-EPiyxziPtn2fAExKknI2uKUGahWCFnv7K8bpVkAgezQ="; - }) (super.patat.override { pandoc = self.pandoc_3_1_8; }); + patat = super.patat.override { pandoc = self.pandoc_3_1_8; }; # http2 also overridden in all-packages.nix for mailctl. # twain is currently only used by mailctl, so the .overrideScope shouldn't |