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

haxe: refactor out of ocamlPackages

Browse Source
This commit is contained in:
Vincent Laporte 2019-10-23 15:54:18 +00:00 committed by Vincent Laporte
parent 7e51c79f17
commit 60f50b69a6
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/haxe/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchgit, coreutils, ocaml, zlib, pcre, neko, camlp4 }:
{ stdenv, fetchgit, coreutils, ocamlPackages, zlib, pcre, neko }:
let inherit (ocamlPackages) ocaml camlp4; in
let
generic = { version, sha256, prePatch }:

4
pkgs/top-level/all-packages.nix
View File

@ -7986,7 +7986,9 @@ in
graphviz = graphviz-nox;
});
inherit (ocaml-ng.ocamlPackages_4_05.haxe) haxe_3_2 haxe_3_4;
inherit (callPackage ../development/compilers/haxe {
ocamlPackages = ocaml-ng.ocamlPackages_4_05;
}) haxe_3_2 haxe_3_4;
haxe = haxe_3_4;
haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { });
inherit (haxePackages) hxcpp;

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

@ -1107,8 +1107,6 @@ let
# Apps / from all-packages
haxe = callPackage ../development/compilers/haxe { };
ocamlnat = callPackage ../development/ocaml-modules/ocamlnat { };
trv = callPackage ../development/tools/misc/trv { };