From bf6d796a2763f2f58c8e04f9505478d478de0e97 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 21 Apr 2018 19:37:49 +0200 Subject: [PATCH] haskell: allow overriding all package sets at once Setting haskell.packageOverrides like so: haskell = super.haskell // { packageOverrides = self: super: { my-package = ...; my-other-package = ...; }; }; causes all compiler-specific package sets to be overridden with those overrides. --- doc/languages-frameworks/haskell.section.md | 50 +++++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 8 +++- 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 1623e0d276f..3b8971c295b 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -666,6 +666,56 @@ prefer one built with GHC 7.8.x in the first place. However, for users who cannot use GHC 7.10.x at all for some reason, the approach of downgrading to an older version might be useful. +### How to override packages in all compiler-specific package sets + +In the previous section we learned how to override a package in a single +compiler-specific package set. You may have some overrides defined that you want +to use across multiple package sets. To accomplish this you could use the +technique that we learned in the previous section by repeating the overrides for +all the compiler-specific package sets. For example: + +```nix +{ + packageOverrides = super: let self = super.pkgs; in + { + haskell = super.haskell // { + packages = super.haskell.packages // { + ghc784 = super.haskell.packages.ghc784.override { + overrides = self: super: { + my-package = ...; + my-other-package = ...; + }; + }; + ghc822 = super.haskell.packages.ghc784.override { + overrides = self: super: { + my-package = ...; + my-other-package = ...; + }; + }; + ... + }; + }; + }; +} +``` + +However there's a more convenient way to override all compiler-specific package +sets at once: + +```nix +{ + packageOverrides = super: let self = super.pkgs; in + { + haskell = super.haskell // { + packageOverrides = self: super: { + my-package = ...; + my-other-package = ...; + }; + }; + }; +} +``` + ### How to recover from GHC's infamous non-deterministic library ID bug GHC and distributed build farms don't get along well: diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f9cd2eb9433..48980e48f1d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -19,7 +19,10 @@ let inherit pkgs; }; - callPackage = newScope { inherit haskellLib; }; + callPackage = newScope { + inherit haskellLib; + overrides = pkgs.haskell.packageOverrides; + }; bootstrapPackageSet = self: super: { mkDerivation = drv: super.mkDerivation (drv // { @@ -99,6 +102,9 @@ in rec { (name: compiler."${name}".override { enableIntegerSimple = true; })); }; + # Default overrides that are applied to all package sets. + packageOverrides = self : super : {}; + # Always get compilers from `buildPackages` packages = let bh = buildPackages.haskell; in {