diff options
author | Doug Beardsley <mightybyte@gmail.com> | 2018-10-15 16:15:03 -0400 |
---|---|---|
committer | Doug Beardsley <mightybyte@gmail.com> | 2018-10-16 09:38:57 -0400 |
commit | d36c55a530e31955ef9657dab745faf9f315eae8 (patch) | |
tree | 30d002c90457837ae8827443fe8173d784822a26 /pkgs/development/haskell-modules/make-package-set.nix | |
parent | e7864567df80262b2f42b3b9378b1e3763a16238 (diff) | |
download | nixpkgs-d36c55a530e31955ef9657dab745faf9f315eae8.tar nixpkgs-d36c55a530e31955ef9657dab745faf9f315eae8.tar.gz nixpkgs-d36c55a530e31955ef9657dab745faf9f315eae8.tar.bz2 nixpkgs-d36c55a530e31955ef9657dab745faf9f315eae8.tar.lz nixpkgs-d36c55a530e31955ef9657dab745faf9f315eae8.tar.xz nixpkgs-d36c55a530e31955ef9657dab745faf9f315eae8.tar.zst nixpkgs-d36c55a530e31955ef9657dab745faf9f315eae8.zip |
Add name parameter to developPackage
Diffstat (limited to 'pkgs/development/haskell-modules/make-package-set.nix')
-rw-r--r-- | pkgs/development/haskell-modules/make-package-set.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index ef2c33c1091..40046526488 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -194,6 +194,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // { callCabal2nix = name: src: args: self.callCabal2nixWithOptions name src "" args; # : { root : Path + # , name : Defaulted String # , source-overrides : Defaulted (Either Path VersionNumber) # , overrides : Defaulted (HaskellPackageOverrideSet) # , modifier : Defaulted @@ -207,6 +208,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # for nix-build or nix-shell to build that package. developPackage = { root + , name ? builtins.baseNameOf root , source-overrides ? {} , overrides ? self: super: {} , modifier ? drv: drv @@ -216,7 +218,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // { (pkgs.lib.composeExtensions (self.packageSourceOverrides source-overrides) overrides)) - .callCabal2nix (builtins.baseNameOf root) root {}; + .callCabal2nix name root {}; in if returnShellEnv then (modifier drv).env else modifier drv; ghcWithPackages = selectFrom: withPackages (selectFrom self); |