Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b71b7ee62234
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dc8c798e5db1
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 5, 2017

  1. haxe: 3.2.1 -> 3.4.2

    @andyli
    andyli committed May 5, 2017
    Copy the full SHA
    56b30bf View commit details

Commits on May 19, 2017

  1. Merge #25538: haxe: 3.2.1 -> 3.4.2

    @vcunat
    vcunat committed May 19, 2017
    Copy the full SHA
    dc8c798 View commit details
Showing with 8 additions and 138 deletions.
  1. +8 −10 pkgs/development/compilers/haxe/default.nix
  2. +0 −128 pkgs/development/compilers/haxe/haxelib-nix.patch
18 changes: 8 additions & 10 deletions pkgs/development/compilers/haxe/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
128 changes: 0 additions & 128 deletions pkgs/development/compilers/haxe/haxelib-nix.patch
View file

This file was deleted.