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

Merge branch 'callCabal2nix-retain-ifd'

Browse Source
This commit is contained in:
Shea Levy 2018-03-02 13:22:26 -05:00
commit 3509c4b7bb
No known key found for this signature in database
GPG Key ID: 5C0BD6957D86FE27
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,17 +145,21 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
callHackage = name: version: self.callPackage (self.hackage2nix name version); callHackage = name: version: self.callPackage (self.hackage2nix name version);
# Creates a Haskell package from a source package by calling cabal2nix on the source. # Creates a Haskell package from a source package by calling cabal2nix on the source.
callCabal2nix = name: src: args: callCabal2nix = name: src: args: let
overrideCabal (self.callPackage (haskellSrc2nix { filter = path: type:
pkgs.lib.hasSuffix "${name}.cabal" path ||
baseNameOf path == "package.yaml";
expr = haskellSrc2nix {
inherit name; inherit name;
src = src = if pkgs.lib.canCleanSource src
let filter = path: type: then pkgs.lib.cleanSourceWith { inherit src filter; }
pkgs.lib.hasSuffix "${name}.cabal" path || else src;
baseNameOf path == "package.yaml"; };
in if pkgs.lib.canCleanSource src in overrideCabal (self.callPackage expr args) (orig: {
then pkgs.lib.cleanSourceWith { inherit src filter; } inherit src;
else src; preConfigure =
}) args) (_: { inherit src; }); "# Generated from ${expr}\n${orig.preConfigure or ""}";
});
# : { root : Path # : { root : Path
# , source-overrides : Defaulted (Either Path VersionNumber) # , source-overrides : Defaulted (Either Path VersionNumber)