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

Merge branch 'master' into haskell-extensible

Browse Source
This commit is contained in:
Peter Simons
2017-02-28 09:14:50 +01:00
committed by GitHub
parent 65a228a2b1 0d31a76813
commit e1908d4e21
568 changed files with 19970 additions and 9184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,12 +6,13 @@
let
inherit (stdenv.lib) fix' extends makeExtensible;
inherit (stdenv.lib) fix' extends makeOverridable makeExtensible;
inherit (import ./lib.nix { inherit pkgs; }) overrideCabal;
haskellPackages = self:
let
mkDerivation = pkgs.callPackage ./generic-builder.nix {
mkDerivationImpl = pkgs.callPackage ./generic-builder.nix {
inherit stdenv;
inherit (pkgs) fetchurl pkgconfig glibcLocales coreutils gnugrep gnused;
jailbreak-cabal = if (self.ghc.cross or null) != null
@@ -37,9 +38,7 @@ let
});
};
overrideCabal = drv: f: drv.override (args: args // {
mkDerivation = drv: args.mkDerivation (drv // f drv);
});
mkDerivation = makeOverridable mkDerivationImpl;
callPackageWithScope = scope: drv: args: (stdenv.lib.callPackageWith scope drv args) // {
overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args;