summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2020-09-11 20:54:54 +0200
committerPeter Simons <simons@cryp.to>2020-09-11 20:54:54 +0200
commit0e8da16ac7d21039b64a8db0dadd18592264ea0c (patch)
tree3e157e7d24567ba75c87aa217aea4372e32119ad
parent10ec99b0de6446a3d2a64564019e912d15132142 (diff)
Enable meta.hydraPlatforms for Haskell overrides to the latest version.
We distribute some packages in their respective latest version even though
Stackage LTS says that we should use an older one. These packages need to have
their meta.hydraPlatforms attribute populated or Nixpkgs will fail to build it
release tarball. This happened most recently with Pandoc, which was updated
to the latest 2.10.1 version without fixing up meta.hydraPlatforms.
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix16
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f3c30f7fa9b29..dd9a9463b3c44 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1459,16 +1459,16 @@ self: super: {
 
   # We want the latest version of cryptonite. This is a first step towards
   # resolving https://github.com/NixOS/nixpkgs/issues/81915.
-  cryptonite = self.cryptonite_0_27;
+  cryptonite = doDistribute self.cryptonite_0_27;
 
   # We want the latest version of Pandoc.
-  hslua = self.hslua_1_1_2;
-  jira-wiki-markup = self.jira-wiki-markup_1_3_2;
-  pandoc = self.pandoc_2_10_1;
-  pandoc-citeproc = self.pandoc-citeproc_0_17_0_2;
-  pandoc-plot = self.pandoc-plot_0_9_2_0;
-  pandoc-types = self.pandoc-types_1_21;
-  rfc5051 = self.rfc5051_0_2;
+  hslua = doDistribute self.hslua_1_1_2;
+  jira-wiki-markup = doDistribute self.jira-wiki-markup_1_3_2;
+  pandoc = doDistribute self.pandoc_2_10_1;
+  pandoc-citeproc = doDistribute self.pandoc-citeproc_0_17_0_2;
+  pandoc-plot = doDistribute self.pandoc-plot_0_9_2_0;
+  pandoc-types = doDistribute self.pandoc-types_1_21;
+  rfc5051 = doDistribute self.rfc5051_0_2;
 
   # INSERT NEW OVERRIDES ABOVE THIS LINE