commit dc8c798e5db19534e0a9549b7b2c4e76ccf6b8c3 · pyrox.dev/nixpkgs

+8 -10

pkgs/development/compilers/haxe/default.nix

···

       1
       1
       -
       { stdenv, fetchgit, ocaml, zlib, neko, camlp4 }:

     

       1
       1
       +
       { stdenv, fetchgit, ocaml, zlib, pcre, neko, camlp4 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
       -
         name = "haxe-3.2.1";

     

       4
       4
       +
         name = "haxe-3.4.2";

     

       5
       5
        
       

     

       6
       6
       -
         buildInputs = [ocaml zlib neko camlp4];

     

       6
       6
       +
         buildInputs = [ocaml zlib pcre neko camlp4];

     

       7
       7
        
       

     

       8
       8
        
         src = fetchgit {

     

       9
       9
        
           url = "https://github.com/HaxeFoundation/haxe.git";

     

       10
       10
       -
           sha256 = "1x9ay5a2llq46fww3k07jxx8h1vfpyxb522snc6702a050ki5vz3";

     

       10
       10
       +
           sha256 = "1m5fp183agqv8h3ynhxw4kndkpq2d6arysmirv3zl3vz5crmpwqd";

     

       11
       11
        
           fetchSubmodules = true;

     

       12
       12
        
       

     

       13
       13
       -
           # Tag 3.2.1

     

       14
       14
       -
           rev = "deab4424399b520750671e51e5f5c2684e942c17";

     

       13
       13
       +
           # Tag 3.4.2

     

       14
       14
       +
           rev = "890f8c70cf23ce6f9fe0fdd0ee514a9699433ca7";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         prePatch = ''

     

       18
       18
       -
           sed -i -e 's|com.class_path <- \[|&"'"$out/lib/haxe/std/"'";|' main.ml

     

       18
       18
       +
           sed -i -e 's|"/usr/lib/haxe/std/";|"'"$out/lib/haxe/std/"'";\n&|g' src/main.ml

     

       19
       19
        
         '';

     

       20
       20
       -
       

     

       21
       21
       -
         patches = [ ./haxelib-nix.patch ];

     

       22
       20
        
       

     

       23
       21
        
         buildFlags = [ "all" "tools" ];

     

       24
       22
        
       

     
···

       34
       32
        
       

     

       35
       33
        
         meta = with stdenv.lib; {

     

       36
       34
        
           description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++";

     

       37
       37
       -
           homepage = http://haxe.org;

     

       35
       35
       +
           homepage = https://haxe.org;

     

       38
       36
        
           license = with licenses; [ gpl2 bsd2 /*?*/ ];  # -> docs/license.txt

     

       39
       37
        
           maintainers = [ maintainers.marcweber ];

     

       40
       38
        
           platforms = platforms.linux ++ platforms.darwin;

-128

pkgs/development/compilers/haxe/haxelib-nix.patch

···

       1
       1
       -
       diff --git a/src/tools/haxelib/Main.hx b/src/tools/haxelib/Main.hx

     

       2
       2
       -
       index dc18815..def5231 100644

     

       3
       3
       -
       --- a/extra/haxelib_src/src/tools/haxelib/Main.hx

     

       4
       4
       -
       +++ b/extra/haxelib_src/src/tools/haxelib/Main.hx

     

       5
       5
       -
       @@ -1301,21 +1301,26 @@ class Main {

     

       6
       6
       -
        	}

     

       7
       7
       -
       

     

       8
       8
       -
        	function checkRec( prj : String, version : String, l : List<{ project : String, version : String, info : Infos }> ) {

     

       9
       9
       -
       -		var pdir = getRepository() + Data.safe(prj);

     

       10
       10
       -
       -		if( !FileSystem.exists(pdir) )

     

       11
       11
       -
       -			throw "Library "+prj+" is not installed : run 'haxelib install "+prj+"'";

     

       12
       12
       -
       -		var version = if( version != null ) version else getCurrent(pdir);

     

       13
       13
       -
       -		var vdir = pdir + "/" + Data.safe(version);

     

       14
       14
       -
       -		if( vdir.endsWith("dev") )

     

       15
       15
       -
       -			vdir = getDev(pdir);

     

       16
       16
       -
       -		if( !FileSystem.exists(vdir) )

     

       17
       17
       -
       -			throw "Library "+prj+" version "+version+" is not installed";

     

       18
       18
       -
       -		for( p in l )

     

       19
       19
       -
       -			if( p.project == prj ) {

     

       20
       20
       -
       -				if( p.version == version )

     

       21
       21
       -
       -					return;

     

       22
       22
       -
       -				throw "Library "+prj+" has two version included "+version+" and "+p.version;

     

       23
       23
       -
       -			}

     

       24
       24
       -
       +		var vdir = this.getNixLib(prj);

     

       25
       25
       -
       +		if (vdir == null) {

     

       26
       26
       -
       +			var pdir = getRepository() + Data.safe(prj);

     

       27
       27
       -
       +			if( !FileSystem.exists(pdir) )

     

       28
       28
       -
       +				throw "Library "+prj+" is not installed : run 'haxelib install "+prj+"'";

     

       29
       29
       -
       +			var version = if( version != null ) version else getCurrent(pdir);

     

       30
       30
       -
       +			var vdir = pdir + "/" + Data.safe(version);

     

       31
       31
       -
       +			if( vdir.endsWith("dev") )

     

       32
       32
       -
       +				vdir = getDev(pdir);

     

       33
       33
       -
       +			if( !FileSystem.exists(vdir) )

     

       34
       34
       -
       +				throw "Library "+prj+" version "+version+" is not installed";

     

       35
       35
       -
       +			for( p in l )

     

       36
       36
       -
       +				if( p.project == prj ) {

     

       37
       37
       -
       +					if( p.version == version )

     

       38
       38
       -
       +						return;

     

       39
       39
       -
       +					throw "Library "+prj+" has two version included "+version+" and "+p.version;

     

       40
       40
       -
       +				}

     

       41
       41
       -
       +		} else {

     

       42
       42
       -
       +			version = null;

     

       43
       43
       -
       +		}

     

       44
       44
       -
        		var json = try File.getContent(vdir+"/"+Data.JSON) catch( e : Dynamic ) null;

     

       45
       45
       -
        		var inf = Data.readData(json,false);

     

       46
       46
       -
        		l.add({ project : prj, version : version, info: inf });

     

       47
       47
       -
       @@ -1330,15 +1335,21 @@ class Main {

     

       48
       48
       -
        			var a = args[argcur++].split(":");

     

       49
       49
       -
        			checkRec(a[0],a[1],list);

     

       50
       50
       -
        		}

     

       51
       51
       -
       -		var rep = getRepository();

     

       52
       52
       -
        		for( d in list ) {

     

       53
       53
       -
       -			var pdir = Data.safe(d.project)+"/"+Data.safe(d.version)+"/";

     

       54
       54
       -
       -			var dir = rep + pdir;

     

       55
       55
       -
       -			try {

     

       56
       56
       -
       -				dir = getDev(rep+Data.safe(d.project));

     

       57
       57
       -
       +			var dir = this.getNixLib(d.project);

     

       58
       58
       -
       +			var pdir = Data.safe(d.project)+"/";

     

       59
       59
       -
       +			if (dir == null) {

     

       60
       60
       -
       +				var rep = getRepository();

     

       61
       61
       -
       +				pdir += Data.safe(d.version)+"/";

     

       62
       62
       -
       +				dir = rep + pdir;

     

       63
       63
       -
       +				try {

     

       64
       64
       -
       +					dir = getDev(rep+Data.safe(d.project));

     

       65
       65
       -
       +					dir = Path.addTrailingSlash(dir);

     

       66
       66
       -
       +					pdir = dir;

     

       67
       67
       -
       +				} catch( e : Dynamic ) {}

     

       68
       68
       -
       +			} else {

     

       69
       69
       -
        				dir = Path.addTrailingSlash(dir);

     

       70
       70
       -
       -				pdir = dir;

     

       71
       71
       -
       -			} catch( e : Dynamic ) {}

     

       72
       72
       -
       +			}

     

       73
       73
       -
        			var ndir = dir + "ndll";

     

       74
       74
       -
        			if( FileSystem.exists(ndir) ) {

     

       75
       75
       -
        				var sysdir = ndir+"/"+Sys.systemName();

     

       76
       76
       -
       @@ -1491,23 +1502,43 @@ class Main {

     

       77
       77
       -
        			);

     

       78
       78
       -
        	}

     

       79
       79
       -
       

     

       80
       80
       -
       +	function getNixLib(project:String):Null<String>

     

       81
       81
       -
       +	{

     

       82
       82
       -
       +		var hlibPath = Sys.getEnv("HAXELIB_PATH");

     

       83
       83
       -
       +		if (hlibPath != null) {

     

       84
       84
       -
       +			for (libDir in hlibPath.split(":")) {

     

       85
       85
       -
       +				var fullpath = libDir;

     

       86
       86
       -
       +				fullpath += libDir.substr(-1, 1) == "/" ? "" : "/";

     

       87
       87
       -
       +				fullpath += Data.safe(project);

     

       88
       88
       -
       +				if (FileSystem.exists(fullpath))

     

       89
       89
       -
       +					return fullpath;

     

       90
       90
       -
       +			}

     

       91
       91
       -
       +		}

     

       92
       92
       -
       +		return null;

     

       93
       93
       -
       +	}

     

       94
       94
       -
       

     

       95
       95
       -
        	function run() {

     

       96
       96
       -
       -		var rep = getRepository();

     

       97
       97
       -
        		var project = param("Library");

     

       98
       98
       -
        		var temp = project.split(":");

     

       99
       99
       -
        		project = temp[0];

     

       100
       100
       -
       -		var pdir = rep + Data.safe(project);

     

       101
       101
       -
       -		if( !FileSystem.exists(pdir) )

     

       102
       102
       -
       -			throw "Library "+project+" is not installed";

     

       103
       103
       -
       -		pdir += "/";

     

       104
       104
       -
       -		var version = temp[1] != null ? temp[1] : getCurrent(pdir);

     

       105
       105
       -
       -		var dev = try getDev(pdir) catch ( e : Dynamic ) null;

     

       106
       106
       -
       -		var vdir = dev != null ? dev : pdir + Data.safe(version);

     

       107
       107
       -
       

     

       108
       108
       -
        		args.push(cli.cwd);

     

       109
       109
       -
       +

     

       110
       110
       -
       +		var vdir = this.getNixLib(project);

     

       111
       111
       -
       +		if (vdir == null) {

     

       112
       112
       -
       +			var rep = getRepository();

     

       113
       113
       -
       +			var pdir = rep + Data.safe(project);

     

       114
       114
       -
       +			if( !FileSystem.exists(pdir) )

     

       115
       115
       -
       +				throw "Library "+project+" is not installed";

     

       116
       116
       -
       +			pdir += "/";

     

       117
       117
       -
       +			var version = temp[1] != null ? temp[1] : getCurrent(pdir);

     

       118
       118
       -
       +			var dev = try getDev(pdir) catch ( e : Dynamic ) null;

     

       119
       119
       -
       +			vdir = dev!=null ? dev : pdir + Data.safe(version);

     

       120
       120
       -
       +			var rdir = vdir + "/run.n";

     

       121
       121
       -
       +			if( !FileSystem.exists(rdir) )

     

       122
       122
       -
       +				throw "Library "+project+" version "+version+" does not have a run script";

     

       123
       123
       -
       +		}

     

       124
       124
       -
        		cli.cwd = vdir;

     

       125
       125
       -
       -

     

       126
       126
       -
        		var callArgs =

     

       127
       127
       -
        			switch try [Data.readData(File.getContent(vdir + '/haxelib.json'), false), null] catch (e:Dynamic) [null, e] {

     

       128
       128
       -
        				case [null, e]: