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

callCabal2nix: Fixed indentation

Browse Source
This commit is contained in:
Will Fancher 2017-03-17 04:32:34 -04:00
parent 24b47526ce
commit 934c8c7a93
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/haskell-modules/default.nix
View File

@ -85,13 +85,13 @@ let
# 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 let
# Filter out files other than the cabal file. This ensures # Filter out files other than the cabal file. This ensures
# that we don't create new derivations even when the cabal # that we don't create new derivations even when the cabal
# file hasn't changed. # file hasn't changed.
justCabal = builtins.filterSource (path: type: pkgs.lib.hasSuffix ".cabal" path) src; justCabal = builtins.filterSource (path: type: pkgs.lib.hasSuffix ".cabal" path) src;
drv = self.callPackage (haskellSrc2nix { inherit name; src = justCabal; }) args; drv = self.callPackage (haskellSrc2nix { inherit name; src = justCabal; }) args;
in overrideCabal drv (drv': { inherit src; }); # Restore the desired src. in overrideCabal drv (drv': { inherit src; }); # Restore the desired src.
ghcWithPackages = selectFrom: withPackages (selectFrom self); ghcWithPackages = selectFrom: withPackages (selectFrom self);