public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskellPackages.developPackage: Add overrides argument

Browse Source
This commit is contained in:
Shea Levy 2017-06-12 19:29:46 -04:00
parent 76430ecd9f
commit b349d4b899
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/haskell-modules/make-package-set.nix
View File

@ -129,16 +129,20 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
else self.callHackage; else self.callHackage;
in generateExprs name src {}) overrides; in generateExprs name src {}) overrides;
# : { root : Path, source-overrides : Defaulted (Either Path VersionNumber } -> NixShellAwareDerivation # : { root : Path
# , source-overrides : Defaulted (Either Path VersionNumber
# , overrides : Defaulted (HaskellPackageOverrideSet)
# } -> NixShellAwareDerivation
# Given a path to a haskell package directory whose cabal file is # Given a path to a haskell package directory whose cabal file is
# named the same as the directory name, and an optional set of # named the same as the directory name, an optional set of
# source overrides as appropriate for the 'packageSourceOverrides' # source overrides as appropriate for the 'packageSourceOverrides'
# function, return a derivation appropriate for nix-build or nix-shell # function, and an optional set of arbitrary overrides,
# return a derivation appropriate for nix-build or nix-shell
# to build that package. # to build that package.
developPackage = { root, source-overrides ? {} }: developPackage = { root, source-overrides ? {}, overrides ? self: super: {} }:
let name = builtins.baseNameOf root; let name = builtins.baseNameOf root;
drv = drv =
(extensible-self.extend (self.packageSourceOverrides source-overrides)).callCabal2nix name root {}; (extensible-self.extend (pkgs.lib.composeExtensions (self.packageSourceOverrides source-overrides) overrides)).callCabal2nix name root {};
in if pkgs.lib.inNixShell then drv.env else drv; in if pkgs.lib.inNixShell then drv.env else drv;
ghcWithPackages = selectFrom: withPackages (selectFrom self); ghcWithPackages = selectFrom: withPackages (selectFrom self);