diff options
author | Will Fancher <elvishjerricco@gmail.com> | 2017-08-26 11:39:13 -0400 |
---|---|---|
committer | Will Fancher <elvishjerricco@gmail.com> | 2017-08-26 11:39:13 -0400 |
commit | 4d860389d88d35a702f79c0567cb4c6b1ec0deda (patch) | |
tree | 55ab20bfaf5e227ec2ff09317fcf74a11289c8bf /pkgs/development/haskell-modules/make-package-set.nix | |
parent | 05f9db601abd582be51f096affbb97eff49f2ccb (diff) | |
parent | 58dc4a85691343a200c1c4495c1bd839b84c2824 (diff) | |
download | nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar.gz nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar.bz2 nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar.lz nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar.xz nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar.zst nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.zip |
Merge branch 'master' into improved-make-overridable
Diffstat (limited to 'pkgs/development/haskell-modules/make-package-set.nix')
-rw-r--r-- | pkgs/development/haskell-modules/make-package-set.nix | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index b259192ce24f..e53ae797c415 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -1,20 +1,36 @@ # This expression takes a file like `hackage-packages.nix` and constructs # a full package set out of that. -# required dependencies: -{ pkgs, stdenv, all-cabal-hashes }: +{ # package-set used for non-haskell dependencies (all of nixpkgs) + pkgs -# arguments: -# * ghc package to use -# * package-set: a function that takes { pkgs, stdenv, callPackage } as first arg and `self` as second -# * extensible-self: the final, fully overriden package set usable with the nixpkgs fixpoint overriding functionality -{ ghc, package-set, extensible-self }: +, # stdenv to use for building haskell packages + stdenv + +, haskellLib + +, # hashes for downloading Hackage packages + all-cabal-hashes + +, # compiler to use + ghc + +, # A function that takes `{ pkgs, stdenv, callPackage }` as the first arg and `self` + # as second, and returns a set of haskell packages + package-set + +, # The final, fully overriden package set usable with the nixpkgs fixpoint + # overriding functionality + extensible-self +}: # return value: a function from self to the package set -self: let +self: + +let inherit (stdenv.lib) fix' extends makeOverridable callPackageWith; - inherit (import ./lib.nix { inherit pkgs; }) overrideCabal; + inherit (haskellLib) overrideCabal; mkDerivationImpl = pkgs.callPackage ./generic-builder.nix { inherit stdenv; |