mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-22 05:19:00 +02:00
Merge pull request #23982 from ElvishJerricco/callCabal2nix-dont-rebuild-cabalfile
callCabal2nix: Fixed indentation
This commit is contained in:
commit
8c00f3432a
|
@ -85,13 +85,13 @@ let
|
|||
|
||||
# Creates a Haskell package from a source package by calling cabal2nix on the source.
|
||||
callCabal2nix = name: src: args:
|
||||
let
|
||||
# Filter out files other than the cabal file. This ensures
|
||||
# that we don't create new derivations even when the cabal
|
||||
# file hasn't changed.
|
||||
justCabal = builtins.filterSource (path: type: pkgs.lib.hasSuffix ".cabal" path) src;
|
||||
drv = self.callPackage (haskellSrc2nix { inherit name; src = justCabal; }) args;
|
||||
in overrideCabal drv (drv': { inherit src; }); # Restore the desired src.
|
||||
let
|
||||
# Filter out files other than the cabal file. This ensures
|
||||
# that we don't create new derivations even when the cabal
|
||||
# file hasn't changed.
|
||||
justCabal = builtins.filterSource (path: type: pkgs.lib.hasSuffix ".cabal" path) src;
|
||||
drv = self.callPackage (haskellSrc2nix { inherit name; src = justCabal; }) args;
|
||||
in overrideCabal drv (drv': { inherit src; }); # Restore the desired src.
|
||||
|
||||
ghcWithPackages = selectFrom: withPackages (selectFrom self);
|
||||
|
||||
|
|
Loading…
Reference in a new issue