pkgs/development/haskell-modules/lib.nix: add funky helper function for overriding

pkgs/development/haskell-modules/configuration-common.nix

@@ -1,6 +1,6 @@
 { pkgs }:
 
-with import ./lib.nix;
+with import ./lib.nix { inherit pkgs; };
 
 self: super: {
 

pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix

@@ -1,6 +1,6 @@
 { pkgs }:
 
-with import ./lib.nix;
+with import ./lib.nix { inherit pkgs; };
 
 self: super: {
 

pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix

@@ -1,6 +1,6 @@
 { pkgs }:
 
-with import ./lib.nix;
+with import ./lib.nix { inherit pkgs; };
 
 self: super: {
 

pkgs/development/haskell-modules/configuration-ghc-7.9.x.nix

@@ -1,6 +1,6 @@
 { pkgs }:
 
-with import ./lib.nix;
+with import ./lib.nix { inherit pkgs; };
 
 self: super: {
 

pkgs/development/haskell-modules/configuration-ghcjs.nix

@@ -1,6 +1,6 @@
 { pkgs }:
 
-with import ./lib.nix;
+with import ./lib.nix { inherit pkgs; };
 
 self: super: {
 

pkgs/development/haskell-modules/lib.nix

@@ -1,7 +1,26 @@
-{
+{ pkgs }:
+
+rec {
 
   overrideCabal = drv: f: drv.override (args: args // {
     mkDerivation = drv: args.mkDerivation (drv // f drv);
   });
 
+  doHaddock = drv: overrideCabal drv (drv: { noHaddock = false; });
+  dontHaddock = drv: overrideCabal drv (drv: { noHaddock = true; });
+
+  doJailbreak = drv: overrideCabal drv (drv: { jailbreak = true; });
+  dontJailbreak = drv: overrideCabal drv (drv: { jailbreak = false; });
+
+  doCheck = drv: overrideCabal drv (drv: { doCheck = false; });
+  dontCheck = drv: overrideCabal drv (drv: { doCheck = false; });
+
+  dontDistribute = drv: overrideCabal drv (drv: { hydraPlatforms = []; });
+
+  appendConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = drv.configureFlags or [] ++ [x]; });
+  removeConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = pkgs.stdenv.lib.remove x (drv.configureFlags or []); });
+
+  enableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f-${x}") "-f${x}";
+  disableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f${x}") "-f-${x}";
+
 }

pkgs/top-level/haskell-ng.nix

@@ -2,6 +2,8 @@
 
 rec {
 
+  lib = import ../development/haskell-modules/lib.nix { inherit pkgs; };
+
   compiler = {
 
     ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { gmp = pkgs.gmp4; };