From d33322d449502a5e200f876478ae44dcd049eedd Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 15 May 2018 22:02:00 -0700 Subject: [PATCH] haskellPackages.developPackage: Add a defaulted provideDrv argument The purpose of this argument is to allow you to get at the derivation (rather than it's env) even when in the evaluation context of a nix-shell invocation. --- .../haskell-modules/make-package-set.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index bde4f85f678..bbc3d856ff2 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -176,6 +176,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # , source-overrides : Defaulted (Either Path VersionNumber) # , overrides : Defaulted (HaskellPackageOverrideSet) # , modifier : Defaulted + # , returnShellEnv : Defaulted # } -> NixShellAwareDerivation # Given a path to a haskell package directory whose cabal file is # named the same as the directory name, an optional set of @@ -183,11 +184,19 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # function, an optional set of arbitrary overrides, and an optional # haskell package modifier, return a derivation appropriate # for nix-build or nix-shell to build that package. - developPackage = { root, source-overrides ? {}, overrides ? self: super: {}, modifier ? drv: drv }: - let name = builtins.baseNameOf root; - drv = - (extensible-self.extend (pkgs.lib.composeExtensions (self.packageSourceOverrides source-overrides) overrides)).callCabal2nix name root {}; - in if pkgs.lib.inNixShell then (modifier drv).env else modifier drv; + developPackage = + { root + , source-overrides ? {} + , overrides ? self: super: {} + , modifier ? drv: drv + , returnShellEnv ? pkgs.lib.inNixShell }: + let drv = + (extensible-self.extend + (pkgs.lib.composeExtensions + (self.packageSourceOverrides source-overrides) + overrides)) + .callCabal2nix (builtins.baseNameOf root) root {}; + in if returnShellEnv then (modifier drv).env else modifier drv; ghcWithPackages = selectFrom: withPackages (selectFrom self);