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

pkgs/development/haskell-modules: simplify use of standard fix' and extends functions

Browse Source 
My original version of 'extend' had its arguments flipped compared to the one
we now have in stdenv.lib.
This commit is contained in:
Peter Simons 2015-11-24 13:06:58 +01:00
parent 89a5717c7a
commit 69add60b5c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,9 +6,7 @@
let
fix = stdenv.lib.fix';
extend = stdenv.lib.flip stdenv.lib.extends;
inherit (stdenv.lib) fix' extends;
haskellPackages = self:
let
@ -41,7 +39,7 @@ let
});
callPackageWithScope = scope: drv: args: (stdenv.lib.callPackageWith scope drv args) // {
overrideScope = f: callPackageWithScope (mkScope (fix (extend scope.__unfix__ f))) drv args;
overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args;
};
mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome // scope;
@ -78,4 +76,8 @@ let
in
fix (extend (extend (extend (extend haskellPackages commonConfiguration) compilerConfig) packageSetConfig) overrides)
fix'
(extends overrides
(extends packageSetConfig
(extends compilerConfig
(extends commonConfiguration haskellPackages))))