ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 20:34:52 +03:00
Code Issues Projects Releases Wiki Activity

haxe: 3.1.3 -> 3.2.1

Browse Source
This commit is contained in:
Alexei Boronine 2016-12-16 21:53:35 +08:00
parent 38ea64e867
commit 0a1278a679
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,17 +1,17 @@
{ stdenv, fetchgit, ocaml, zlib, neko, camlp4 }: { stdenv, fetchgit, ocaml, zlib, neko, camlp4 }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "haxe-3.1.3"; name = "haxe-3.2.1";
buildInputs = [ocaml zlib neko camlp4]; buildInputs = [ocaml zlib neko camlp4];
src = fetchgit { src = fetchgit {
url = "https://github.com/HaxeFoundation/haxe.git"; url = "https://github.com/HaxeFoundation/haxe.git";
sha256 = "0d8s9yqsqcbr2lfw4xnmg7vzgb6k1jq6hlwwaf1kmn9wxpvcc6x9"; sha256 = "1x9ay5a2llq46fww3k07jxx8h1vfpyxb522snc6702a050ki5vz3";
fetchSubmodules = true; fetchSubmodules = true;
# Tag 3.1.3 # Tag 3.2.1
rev = "7be30670b2f1f9b6082499c8fb9e23c0a6df6c28"; rev = "deab4424399b520750671e51e5f5c2684e942c17";
}; };
prePatch = '' prePatch = ''

34
pkgs/development/compilers/haxe/haxelib-nix.patch
View File

@ -1,10 +1,10 @@
diff --git a/extra/haxelib_src/src/tools/haxelib/Main.hx b/extra/haxelib_src/src/tools/haxelib/Main.hx diff --git a/src/tools/haxelib/Main.hx b/src/tools/haxelib/Main.hx
index a44a785..0eb811a 100644 index dc18815..def5231 100644
--- a/extra/haxelib_src/src/tools/haxelib/Main.hx --- a/extra/haxelib_src/src/tools/haxelib/Main.hx
+++ b/extra/haxelib_src/src/tools/haxelib/Main.hx +++ b/extra/haxelib_src/src/tools/haxelib/Main.hx
@@ -996,21 +996,26 @@ class Main { @@ -1301,21 +1301,26 @@ class Main {
} }
function checkRec( prj : String, version : String, l : List<{ project : String, version : String, info : Infos }> ) { function checkRec( prj : String, version : String, l : List<{ project : String, version : String, info : Infos }> ) {
- var pdir = getRepository() + Data.safe(prj); - var pdir = getRepository() + Data.safe(prj);
- if( !FileSystem.exists(pdir) ) - if( !FileSystem.exists(pdir) )
@ -44,7 +44,7 @@ index a44a785..0eb811a 100644
var json = try File.getContent(vdir+"/"+Data.JSON) catch( e : Dynamic ) null; var json = try File.getContent(vdir+"/"+Data.JSON) catch( e : Dynamic ) null;
var inf = Data.readData(json,false); var inf = Data.readData(json,false);
l.add({ project : prj, version : version, info: inf }); l.add({ project : prj, version : version, info: inf });
@@ -1025,15 +1030,21 @@ class Main { @@ -1330,15 +1335,21 @@ class Main {
var a = args[argcur++].split(":"); var a = args[argcur++].split(":");
checkRec(a[0],a[1],list); checkRec(a[0],a[1],list);
} }
@ -73,10 +73,10 @@ index a44a785..0eb811a 100644
var ndir = dir + "ndll"; var ndir = dir + "ndll";
if( FileSystem.exists(ndir) ) { if( FileSystem.exists(ndir) ) {
var sysdir = ndir+"/"+Sys.systemName(); var sysdir = ndir+"/"+Sys.systemName();
@@ -1153,21 +1164,39 @@ class Main { @@ -1491,23 +1502,43 @@ class Main {
print(' Path: $devPath'); );
} }
+ function getNixLib(project:String):Null<String> + function getNixLib(project:String):Null<String>
+ { + {
+ var hlibPath = Sys.getEnv("HAXELIB_PATH"); + var hlibPath = Sys.getEnv("HAXELIB_PATH");
@ -91,7 +91,7 @@ index a44a785..0eb811a 100644
+ } + }
+ return null; + return null;
+ } + }
+
function run() { function run() {
- var rep = getRepository(); - var rep = getRepository();
var project = param("Library"); var project = param("Library");
@ -103,10 +103,10 @@ index a44a785..0eb811a 100644
- pdir += "/"; - pdir += "/";
- var version = temp[1] != null ? temp[1] : getCurrent(pdir); - var version = temp[1] != null ? temp[1] : getCurrent(pdir);
- var dev = try getDev(pdir) catch ( e : Dynamic ) null; - var dev = try getDev(pdir) catch ( e : Dynamic ) null;
- var vdir = dev!=null ? dev : pdir + Data.safe(version); - var vdir = dev != null ? dev : pdir + Data.safe(version);
- var rdir = vdir + "/run.n";
- if( !FileSystem.exists(rdir) ) args.push(cli.cwd);
- throw "Library "+project+" version "+version+" does not have a run script"; +
+ var vdir = this.getNixLib(project); + var vdir = this.getNixLib(project);
+ if (vdir == null) { + if (vdir == null) {
+ var rep = getRepository(); + var rep = getRepository();
@ -121,6 +121,8 @@ index a44a785..0eb811a 100644
+ if( !FileSystem.exists(rdir) ) + if( !FileSystem.exists(rdir) )
+ throw "Library "+project+" version "+version+" does not have a run script"; + throw "Library "+project+" version "+version+" does not have a run script";
+ } + }
args.push(Sys.getCwd()); cli.cwd = vdir;
Sys.setCwd(vdir); -
var cmd = "neko run.n"; var callArgs =
switch try [Data.readData(File.getContent(vdir + '/haxelib.json'), false), null] catch (e:Dynamic) [null, e] {
case [null, e]: