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

ocamlPackages: Use lib.makeScope

Browse Source
This commit is contained in:
pukkamustard 2019-01-03 23:58:36 +01:00 committed by Vincent Laporte
parent 10a12194e3
commit 9211bcc7ea
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/top-level/ocaml-packages.nix
View File

@ -1,16 +1,13 @@
{ lib, callPackage, newScope, pkgs, config }: { lib, newScope, pkgs, config }:
let let
inherit (pkgs.stdenv.hostPlatform) system; inherit (pkgs.stdenv.hostPlatform) system;
mkOcamlPackages = ocaml: overrides: liftJaneStreet = self: super: super.janeStreet // super;
let
packageSet = self:
with self; let inherit (self) callPackage; in
let ocamlPackages =
{
callPackage = newScope self;
mkOcamlPackages = ocaml:
(lib.makeScope newScope (self: with self;
{
inherit ocaml; inherit ocaml;
# Libs # Libs
@ -1062,29 +1059,26 @@ let
camlp5 = callPackage ../development/tools/ocaml/camlp5 { legacy = true; }; camlp5 = callPackage ../development/tools/ocaml/camlp5 { legacy = true; };
}; };
}; })).overrideScope' liftJaneStreet;
in (ocamlPackages.janeStreet // ocamlPackages);
in lib.fix' (lib.extends overrides packageSet); in let inherit (pkgs) callPackage; in rec
in rec
{ {
inherit mkOcamlPackages; ocamlPackages_4_00_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.00.1.nix { });
ocamlPackages_4_00_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.00.1.nix { }) (self: super: { }); ocamlPackages_4_01_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.01.0.nix { });
ocamlPackages_4_01_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.01.0.nix { }) (self: super: { }); ocamlPackages_4_02 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.02.nix { });
ocamlPackages_4_02 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.02.nix { }) (self: super: { }); ocamlPackages_4_03 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.03.nix { });
ocamlPackages_4_03 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.03.nix { }) (self: super: { }); ocamlPackages_4_04 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.04.nix { });
ocamlPackages_4_04 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.04.nix { }) (self: super: { }); ocamlPackages_4_05 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.05.nix { });
ocamlPackages_4_05 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.05.nix { }) (self: super: { }); ocamlPackages_4_06 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.06.nix { });
ocamlPackages_4_06 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.06.nix { }) (self: super: { }); ocamlPackages_4_07 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.07.nix { });
ocamlPackages_4_07 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.07.nix { }) (self: super: { });
ocamlPackages_latest = ocamlPackages_4_07; ocamlPackages_latest = ocamlPackages_4_07;