diff options
| author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-04-02 18:56:32 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-04-02 17:56:32 +0100 |
| commit | cbca7d5707cc409c60cfc517feb679a80c82e5e2 (patch) | |
| tree | 4bfcd529b5294eac2abda8d5eaaa5b12163bab01 | |
| parent | d6998b06744064deb7ed6ea38a062c51638d33bc (diff) | |
| download | nixlib-cbca7d5707cc409c60cfc517feb679a80c82e5e2.tar nixlib-cbca7d5707cc409c60cfc517feb679a80c82e5e2.tar.gz nixlib-cbca7d5707cc409c60cfc517feb679a80c82e5e2.tar.bz2 nixlib-cbca7d5707cc409c60cfc517feb679a80c82e5e2.tar.lz nixlib-cbca7d5707cc409c60cfc517feb679a80c82e5e2.tar.xz nixlib-cbca7d5707cc409c60cfc517feb679a80c82e5e2.tar.zst nixlib-cbca7d5707cc409c60cfc517feb679a80c82e5e2.zip | |
Clean-up abc package expressions.
| -rw-r--r-- | pkgs/development/compilers/abc/default.nix | 38 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
2 files changed, 20 insertions, 27 deletions
diff --git a/pkgs/development/compilers/abc/default.nix b/pkgs/development/compilers/abc/default.nix index 1a71b808827e..1340e8b5c1a0 100644 --- a/pkgs/development/compilers/abc/default.nix +++ b/pkgs/development/compilers/abc/default.nix @@ -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"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7df281904f29..ae800662444a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |