Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #34405 from pjan/developPackage-modifier

Adds modifier option to developPackage

authored by Peter Simons and committed by GitHub ade2840f 7e747729

+6 -5
+6 -5
pkgs/development/haskell-modules/make-package-set.nix
··· 161 161 # : { root : Path 162 162 # , source-overrides : Defaulted (Either Path VersionNumber) 163 163 # , overrides : Defaulted (HaskellPackageOverrideSet) 164 + # , modifier : Defaulted 164 165 # } -> NixShellAwareDerivation 165 166 # Given a path to a haskell package directory whose cabal file is 166 167 # named the same as the directory name, an optional set of 167 168 # source overrides as appropriate for the 'packageSourceOverrides' 168 - # function, and an optional set of arbitrary overrides, 169 - # return a derivation appropriate for nix-build or nix-shell 170 - # to build that package. 171 - developPackage = { root, source-overrides ? {}, overrides ? self: super: {} }: 169 + # function, an optional set of arbitrary overrides, and an optional 170 + # haskell package modifier, return a derivation appropriate 171 + # for nix-build or nix-shell to build that package. 172 + developPackage = { root, source-overrides ? {}, overrides ? self: super: {}, modifier ? drv: drv }: 172 173 let name = builtins.baseNameOf root; 173 174 drv = 174 175 (extensible-self.extend (pkgs.lib.composeExtensions (self.packageSourceOverrides source-overrides) overrides)).callCabal2nix name root {}; 175 - in if pkgs.lib.inNixShell then drv.env else drv; 176 + in if pkgs.lib.inNixShell then (modifier drv).env else modifier drv; 176 177 177 178 ghcWithPackages = selectFrom: withPackages (selectFrom self); 178 179