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

Merge pull request #48564 from kadena-io/master

Browse Source 
Add name parameter to developPackage
This commit is contained in:
Ryan Mulligan 2018-10-17 12:54:43 -07:00 committed by GitHub
commit 0c72f4c517
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,19 +194,21 @@ 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
# , returnShellEnv : Defaulted # , returnShellEnv : Defaulted
# } -> NixShellAwareDerivation # } -> NixShellAwareDerivation
# Given a path to a haskell package directory whose cabal file is # Given a path to a haskell package directory, an optional package name
# named the same as the directory name, an optional set of # which defaults to the base name of the path, an optional set of source
# source overrides as appropriate for the 'packageSourceOverrides' # overrides as appropriate for the 'packageSourceOverrides' function, an
# function, an optional set of arbitrary overrides, and an optional # optional set of arbitrary overrides, and an optional haskell package
# haskell package modifier, return a derivation appropriate # modifier, return a derivation appropriate for nix-build or nix-shell to
# for nix-build or nix-shell to build that package. # 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);