diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-13 20:42:33 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-13 20:43:59 +0200 |
commit | 5b0398dc36ce5746d8d54e04a1dfcab25939484a (patch) | |
tree | 35dbf68b90a8b5e2cbbbbc3ccfbc2529d4c5ca23 /pkgs/development/tools/parsing | |
parent | 34baf00b72ad0932f6a2add6cee88d2e8b7bec8e (diff) | |
parent | 249ba3d3ed76e34f61ab7bb2024b013f3feaafb9 (diff) |
Merge branch 'master' into staging-next
Conflicts: gobby and libinfinity - I took the hand-edited versions instead of those resuting from the mass-replacement. Hydra: ?compare=1473190
Diffstat (limited to 'pkgs/development/tools/parsing')
-rw-r--r-- | pkgs/development/tools/parsing/antlr/2.7.7.nix | 1 | ||||
-rw-r--r-- | pkgs/development/tools/parsing/antlr/3.4.nix | 3 | ||||
-rw-r--r-- | pkgs/development/tools/parsing/antlr/3.5.nix | 3 | ||||
-rw-r--r-- | pkgs/development/tools/parsing/antlr/4.7.nix | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix index 519540ef52aef..0c67baa960108 100644 --- a/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation { walk parse trees. ''; homepage = http://www.antlr.org/; + license = licenses.bsd3; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/parsing/antlr/3.4.nix b/pkgs/development/tools/parsing/antlr/3.4.nix index c892b8fa8eab9..8074b7c35ad9e 100644 --- a/pkgs/development/tools/parsing/antlr/3.4.nix +++ b/pkgs/development/tools/parsing/antlr/3.4.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; unpackPhase = "true"; - + installPhase = '' mkdir -p "$out"/{lib/antlr,bin} cp "$src" "$out/lib/antlr/antlr-${version}-complete.jar" @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { walk parse trees. ''; homepage = http://www.antlr.org/; + license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/tools/parsing/antlr/3.5.nix b/pkgs/development/tools/parsing/antlr/3.5.nix index 030a19e994050..35179b336026d 100644 --- a/pkgs/development/tools/parsing/antlr/3.5.nix +++ b/pkgs/development/tools/parsing/antlr/3.5.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; unpackPhase = "true"; - + installPhase = '' mkdir -p "$out"/{lib/antlr,bin} cp "$src" "$out/lib/antlr/antlr-${version}-complete.jar" @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { walk parse trees. ''; homepage = http://www.antlr.org/; + license = licenses.bsd3; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix index 463ea3199b2a8..1ebf7d7dfe241 100644 --- a/pkgs/development/tools/parsing/antlr/4.7.nix +++ b/pkgs/development/tools/parsing/antlr/4.7.nix @@ -28,6 +28,7 @@ let meta = with stdenv.lib; { description = "C++ target for ANTLR 4"; homepage = http://www.antlr.org/; + license = licenses.bsd3; platforms = platforms.unix; }; }; @@ -73,6 +74,7 @@ let walk parse trees. ''; homepage = http://www.antlr.org/; + license = licenses.bsd3; platforms = platforms.unix; }; }; |