JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean-up abc package expressions.

Browse Source
This commit is contained in:
Nicolas B. Pierron 2016-04-02 18:56:32 +02:00 committed by Domen Kožar
parent d6998b0674
commit cbca7d5707
2 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/development/compilers/abc/default.nix
View File

@ -1,23 +1,6 @@
{stdenv, fetchurl, javaCup, jre, apacheAnt, patches} :
let {
body =
stdenv.mkDerivation {
name = "abc-1.2.0";
builder = ./builder.sh;
src = fetchurl {
url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/abc-1.2.0-src.tar.gz;
md5 = "aef9e8eac860f904f2a841e18770dc47";
};
inherit apacheAnt polyglot soot javaCup xact jasmin jre javabdd paddle jedd patches;
meta = {
description = "The AspectBench Compiler for AspectJ";
};
};
{stdenv, fetchurl, javaCup, jre, apacheAnt}:
let
soot =
import ./soot {
inherit stdenv fetchurl apacheAnt polyglot jasmin;
@ -76,4 +59,21 @@ let {
md5 = "9810ad8762101ea691a895f0a6b7a5c3";
};
};
in
stdenv.mkDerivation {
name = "abc-1.2.0";
builder = ./builder.sh;
src = fetchurl {
url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/abc-1.2.0-src.tar.gz;
md5 = "aef9e8eac860f904f2a841e18770dc47";
};
inherit apacheAnt polyglot soot javaCup xact jasmin jre javabdd paddle jedd;
patches = [];
meta = {
description = "The AspectBench Compiler for AspectJ";
};
}

9
pkgs/top-level/all-packages.nix
View File

@ -3924,14 +3924,7 @@ in
### DEVELOPMENT / COMPILERS
abc =
abcPatchable [];
abcPatchable = patches :
callPackage ../development/compilers/abc/default.nix {
inherit patches;
javaCup = callPackage ../development/libraries/java/cup { };
};
abc = callPackage ../development/compilers/abc/default.nix { };
aldor = callPackage ../development/compilers/aldor { };