From 56b30bf98a41c5ed8d33fafaa2c8b1243d7a9d8e Mon Sep 17 00:00:00 2001 From: Andy Li Date: Tue, 2 May 2017 17:01:22 +0800 Subject: haxe: 3.2.1 -> 3.4.2 --- pkgs/development/compilers/haxe/default.nix | 18 ++- pkgs/development/compilers/haxe/haxelib-nix.patch | 128 ---------------------- 2 files changed, 8 insertions(+), 138 deletions(-) delete mode 100644 pkgs/development/compilers/haxe/haxelib-nix.patch (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index a4077408ef00..684c6d25daad 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -1,25 +1,23 @@ -{ stdenv, fetchgit, ocaml, zlib, neko, camlp4 }: +{ stdenv, fetchgit, ocaml, zlib, pcre, neko, camlp4 }: stdenv.mkDerivation { - name = "haxe-3.2.1"; + name = "haxe-3.4.2"; - buildInputs = [ocaml zlib neko camlp4]; + buildInputs = [ocaml zlib pcre neko camlp4]; src = fetchgit { url = "https://github.com/HaxeFoundation/haxe.git"; - sha256 = "1x9ay5a2llq46fww3k07jxx8h1vfpyxb522snc6702a050ki5vz3"; + sha256 = "1m5fp183agqv8h3ynhxw4kndkpq2d6arysmirv3zl3vz5crmpwqd"; fetchSubmodules = true; - # Tag 3.2.1 - rev = "deab4424399b520750671e51e5f5c2684e942c17"; + # Tag 3.4.2 + rev = "890f8c70cf23ce6f9fe0fdd0ee514a9699433ca7"; }; prePatch = '' - sed -i -e 's|com.class_path <- \[|&"'"$out/lib/haxe/std/"'";|' main.ml + sed -i -e 's|"/usr/lib/haxe/std/";|"'"$out/lib/haxe/std/"'";\n&|g' src/main.ml ''; - patches = [ ./haxelib-nix.patch ]; - buildFlags = [ "all" "tools" ]; installPhase = '' @@ -34,7 +32,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++"; - homepage = http://haxe.org; + homepage = https://haxe.org; license = with licenses; [ gpl2 bsd2 /*?*/ ]; # -> docs/license.txt maintainers = [ maintainers.marcweber ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/compilers/haxe/haxelib-nix.patch b/pkgs/development/compilers/haxe/haxelib-nix.patch deleted file mode 100644 index ed370e8efd12..000000000000 --- a/pkgs/development/compilers/haxe/haxelib-nix.patch +++ /dev/null @@ -1,128 +0,0 @@ -diff --git a/src/tools/haxelib/Main.hx b/src/tools/haxelib/Main.hx -index dc18815..def5231 100644 ---- a/extra/haxelib_src/src/tools/haxelib/Main.hx -+++ b/extra/haxelib_src/src/tools/haxelib/Main.hx -@@ -1301,21 +1301,26 @@ class Main { - } - - function checkRec( prj : String, version : String, l : List<{ project : String, version : String, info : Infos }> ) { -- var pdir = getRepository() + Data.safe(prj); -- if( !FileSystem.exists(pdir) ) -- throw "Library "+prj+" is not installed : run 'haxelib install "+prj+"'"; -- var version = if( version != null ) version else getCurrent(pdir); -- var vdir = pdir + "/" + Data.safe(version); -- if( vdir.endsWith("dev") ) -- vdir = getDev(pdir); -- if( !FileSystem.exists(vdir) ) -- throw "Library "+prj+" version "+version+" is not installed"; -- for( p in l ) -- if( p.project == prj ) { -- if( p.version == version ) -- return; -- throw "Library "+prj+" has two version included "+version+" and "+p.version; -- } -+ var vdir = this.getNixLib(prj); -+ if (vdir == null) { -+ var pdir = getRepository() + Data.safe(prj); -+ if( !FileSystem.exists(pdir) ) -+ throw "Library "+prj+" is not installed : run 'haxelib install "+prj+"'"; -+ var version = if( version != null ) version else getCurrent(pdir); -+ var vdir = pdir + "/" + Data.safe(version); -+ if( vdir.endsWith("dev") ) -+ vdir = getDev(pdir); -+ if( !FileSystem.exists(vdir) ) -+ throw "Library "+prj+" version "+version+" is not installed"; -+ for( p in l ) -+ if( p.project == prj ) { -+ if( p.version == version ) -+ return; -+ throw "Library "+prj+" has two version included "+version+" and "+p.version; -+ } -+ } else { -+ version = null; -+ } - var json = try File.getContent(vdir+"/"+Data.JSON) catch( e : Dynamic ) null; - var inf = Data.readData(json,false); - l.add({ project : prj, version : version, info: inf }); -@@ -1330,15 +1335,21 @@ class Main { - var a = args[argcur++].split(":"); - checkRec(a[0],a[1],list); - } -- var rep = getRepository(); - for( d in list ) { -- var pdir = Data.safe(d.project)+"/"+Data.safe(d.version)+"/"; -- var dir = rep + pdir; -- try { -- dir = getDev(rep+Data.safe(d.project)); -+ var dir = this.getNixLib(d.project); -+ var pdir = Data.safe(d.project)+"/"; -+ if (dir == null) { -+ var rep = getRepository(); -+ pdir += Data.safe(d.version)+"/"; -+ dir = rep + pdir; -+ try { -+ dir = getDev(rep+Data.safe(d.project)); -+ dir = Path.addTrailingSlash(dir); -+ pdir = dir; -+ } catch( e : Dynamic ) {} -+ } else { - dir = Path.addTrailingSlash(dir); -- pdir = dir; -- } catch( e : Dynamic ) {} -+ } - var ndir = dir + "ndll"; - if( FileSystem.exists(ndir) ) { - var sysdir = ndir+"/"+Sys.systemName(); -@@ -1491,23 +1502,43 @@ class Main { - ); - } - -+ function getNixLib(project:String):Null -+ { -+ var hlibPath = Sys.getEnv("HAXELIB_PATH"); -+ if (hlibPath != null) { -+ for (libDir in hlibPath.split(":")) { -+ var fullpath = libDir; -+ fullpath += libDir.substr(-1, 1) == "/" ? "" : "/"; -+ fullpath += Data.safe(project); -+ if (FileSystem.exists(fullpath)) -+ return fullpath; -+ } -+ } -+ return null; -+ } - - function run() { -- var rep = getRepository(); - var project = param("Library"); - var temp = project.split(":"); - project = temp[0]; -- var pdir = rep + Data.safe(project); -- if( !FileSystem.exists(pdir) ) -- throw "Library "+project+" is not installed"; -- pdir += "/"; -- var version = temp[1] != null ? temp[1] : getCurrent(pdir); -- var dev = try getDev(pdir) catch ( e : Dynamic ) null; -- var vdir = dev != null ? dev : pdir + Data.safe(version); - - args.push(cli.cwd); -+ -+ var vdir = this.getNixLib(project); -+ if (vdir == null) { -+ var rep = getRepository(); -+ var pdir = rep + Data.safe(project); -+ if( !FileSystem.exists(pdir) ) -+ throw "Library "+project+" is not installed"; -+ pdir += "/"; -+ var version = temp[1] != null ? temp[1] : getCurrent(pdir); -+ var dev = try getDev(pdir) catch ( e : Dynamic ) null; -+ vdir = dev!=null ? dev : pdir + Data.safe(version); -+ var rdir = vdir + "/run.n"; -+ if( !FileSystem.exists(rdir) ) -+ throw "Library "+project+" version "+version+" does not have a run script"; -+ } - cli.cwd = vdir; -- - var callArgs = - switch try [Data.readData(File.getContent(vdir + '/haxelib.json'), false), null] catch (e:Dynamic) [null, e] { - case [null, e]: -- cgit 1.4.1 From 8633aba1e1915560beee92ed14800c3a3bba4b14 Mon Sep 17 00:00:00 2001 From: Andrew Miloradovsky Date: Fri, 19 May 2017 09:30:05 +0000 Subject: dale: 20170419 -> 20170519 Includes some stability/predictability and portability improvements. --- pkgs/development/compilers/dale/default.nix | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix index 358bb060e48a..6d9adaa15181 100644 --- a/pkgs/development/compilers/dale/default.nix +++ b/pkgs/development/compilers/dale/default.nix @@ -1,19 +1,27 @@ -{ stdenv, fetchFromGitHub, cmake, libffi, llvm_35, perl }: +{ stdenv +, fetchFromGitHub +, cmake +, pkgconfig +, libffi +, llvm_35 +, doCheck ? false +, perl +}: + +let version = "20170519"; -let version = "20170419"; - doCheck = false; in stdenv.mkDerivation { name = "dale-${version}"; src = fetchFromGitHub { owner = "tomhrr"; repo = "dale"; - rev = "64e072d0520a134b9ae8038104fa977776b6e0af"; - sha256 = "1apvq3v6ra8x0sj8gg9yavqsyxiggh2wnh1zbw2ccpg723bssl4a"; + rev = "39e16d8e89fa070de65a673d4462e783d530f95a"; + sha256 = "0dc5cjahv7lzlp92hidlh83rwgrpgb6xz2pnba2pm5xrv2pnsskl"; }; - buildInputs = [ cmake libffi llvm_35 ] ++ - stdenv.lib.optional doCheck perl; + buildInputs = [ cmake pkgconfig libffi llvm_35 ] + ++ stdenv.lib.optional doCheck perl; inherit doCheck; -- cgit 1.4.1 From 458895db332d394bfadc05404a020ea0b4b1ee7f Mon Sep 17 00:00:00 2001 From: Willi Butz Date: Thu, 11 May 2017 17:46:17 +0200 Subject: go: add dependencies for go get go get expects git, subversion, mercurial and bazaar to be in PATH when needed. (https://github.com/golang/go/wiki/GoGetTools) --- pkgs/development/compilers/go/1.8.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 0be559da79c6..24a40ca0ba0c 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, fetchpatch , pcre, cacert, llvm -, Security, Foundation, bash }: +, Security, Foundation, bash +, makeWrapper, git, subversion, mercurial, bazaar }: let @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { }; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch ]; + nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ]; buildInputs = [ pcre ] ++ optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ]; propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; @@ -148,6 +149,9 @@ stdenv.mkDerivation rec { installPhase = '' cp -r . $GOROOT ( cd $GOROOT/src && ./all.bash ) + + # (https://github.com/golang/go/wiki/GoGetTools) + wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}" ''; preFixup = '' -- cgit 1.4.1