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

Add name parameter to developPackage

Browse Source
This commit is contained in:
Doug Beardsley 2018-10-15 16:15:03 -04:00
parent e7864567df
commit d36c55a530
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,6 +194,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
callCabal2nix = name: src: args: self.callCabal2nixWithOptions name src "" args; callCabal2nix = name: src: args: self.callCabal2nixWithOptions name src "" args;
# : { root : Path # : { root : Path
# , name : Defaulted String
# , source-overrides : Defaulted (Either Path VersionNumber) # , source-overrides : Defaulted (Either Path VersionNumber)
# , overrides : Defaulted (HaskellPackageOverrideSet) # , overrides : Defaulted (HaskellPackageOverrideSet)
# , modifier : Defaulted # , modifier : Defaulted
@ -207,6 +208,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
# for nix-build or nix-shell to build that package. # for nix-build or nix-shell to build that package.
developPackage = developPackage =
{ root { root
, name ? builtins.baseNameOf root
, source-overrides ? {} , source-overrides ? {}
, overrides ? self: super: {} , overrides ? self: super: {}
, modifier ? drv: drv , modifier ? drv: drv
@ -216,7 +218,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
(pkgs.lib.composeExtensions (pkgs.lib.composeExtensions
(self.packageSourceOverrides source-overrides) (self.packageSourceOverrides source-overrides)
overrides)) overrides))
.callCabal2nix (builtins.baseNameOf root) root {}; .callCabal2nix name root {};
in if returnShellEnv then (modifier drv).env else modifier drv; in if returnShellEnv then (modifier drv).env else modifier drv;
ghcWithPackages = selectFrom: withPackages (selectFrom self); ghcWithPackages = selectFrom: withPackages (selectFrom self);