diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index e723133e256d..f1e2315d7941 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -1,45 +1,35 @@ -a : -let - fetchurl = a.fetchurl; +{ stdenv, fetchurl, sbcl }: + +stdenv.mkDerivation rec { + name = "acl2-${version}"; + version = "v6-5"; - version = a.lib.attrByPath ["version"] "v6-5" a; - buildInputs = with a; [ - sbcl - ]; -in -rec { src = fetchurl { url = "http://www.cs.utexas.edu/users/moore/acl2/${version}/distrib/acl2.tar.gz"; sha256 = "19kfclgpdyms016s06pjf3icj3mx9jlcj8vfgpbx2ac4ls0ir36g"; name = "acl2-${version}.tar.gz"; }; - inherit buildInputs; - configureFlags = []; + buildInputs = [ sbcl ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["doDeploy" "doBuild"]; - - makeFlags = ["LISP='${a.sbcl}/bin/sbcl'"]; + phases = "unpackPhase installPhase"; installSuffix = "acl2"; - doDeploy = (a.simplyShare installSuffix); - doBuild = a.fullDepEntry ('' + + installPhase = '' + mkdir -p $out/share/${installSuffix} + cp -R . $out/share/${installSuffix} cd $out/share/${installSuffix} - make LISP='${a.sbcl}/bin/sbcl --dynamic-space-size 2000' - make LISP='${a.sbcl}/bin/sbcl --dynamic-space-size 2000' regression - mkdir -p "$out/bin" - cp saved_acl2 "$out/bin/acl2" - '') ["doDeploy" "addInputs" "defEnsureDir"]; - - name = "acl2-" + version; + make 'LISP=${sbcl}/bin/sbcl --dynamic-space-size 2000' + make 'LISP=${sbcl}/bin/sbcl --dynamic-space-size 2000' regression + make LISP=${sbcl}/bin/sbcl TAGS + mkdir -p $out/bin + cp saved_acl2 $out/bin/acl2 + ''; + meta = { description = "An interpreter and a prover for a Lisp dialect"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; + maintainers = with stdenv.lib.maintainers; [ raskin ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44167470a99d..a184326c0001 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5083,7 +5083,7 @@ let ### DEVELOPMENT / INTERPRETERS - acl2 = builderDefsPackage (callPackage ../development/interpreters/acl2) { + acl2 = callPackage ../development/interpreters/acl2 { sbcl = sbcl_1_2_0; };