satallax: 1.4 -> 2.7

pkgs/applications/science/logic/satallax/default.nix

@@ -1,71 +1,66 @@
-x@{builderDefsPackage
+{stdenv, fetchurl, ocaml, zlib, which, eprover, makeWrapper, coq}:
-  , sbcl, zlib
+stdenv.mkDerivation rec {
-  , ...}:
+  name = "satallax-${version}";
-builderDefsPackage
+  version = "2.7";
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
 
-  buildInputs = map (n: builtins.getAttr n x)
+  buildInputs = [ocaml zlib which eprover makeWrapper coq];
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  src = fetchurl {
-  sourceInfo = rec {
-    baseName="satallax";
-    version="1.4";
-    name="${baseName}-${version}";
     url = "http://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${name}.tar.gz";
-    hash="0l8dq4nyfw2bdsyqmgb4v6fjw3739p8nqv4bh2gh2924ibzrq5fc";
+    sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
   };
 
-  inherit (sourceInfo) name version;
+  preConfigure = ''
-  inherit buildInputs;
+    mkdir fake-tools
+    echo "echo 'Nix-build-host.localdomain'" > fake-tools/hostname
+    chmod a+x fake-tools/hostname
+    export PATH="$PATH:$PWD/fake-tools"
 
-  phaseNames = ["doDeployMinisat" "doDeploy"];
-
-  doDeployMinisat = a.fullDepEntry (''
     (
-      cd minisat/simp
+      cd picosat-*
+      ./configure
       make
     )
+    export PATH="$PATH:$PWD/libexec/satallax"
 
-    mkdir -p "$out/bin"
+    mkdir -p "$out/libexec/satallax"
-    cp minisat/simp/minisat "$out/bin"
+    cp picosat-*/picosat picosat-*/picomus "$out/libexec/satallax"
 
-    echo "(setq *minisat-binary* \"$out/bin/minisat\")" > config.lisp
+    ( 
+      cd minisat
+      export MROOT=$PWD
+      cd core
+      make
+      cd ../simp
+      make
+    )
+  '';
 
-  '') ["defEnsureDir" "minInit" "addInputs" "doUnpack"];
+  postBuild = "echo testing; ! (bash ./test | grep ERROR)";
-  doDeploy = a.fullDepEntry (''
-    mkdir -p "$out/share/satallax/build-dir"
-    cp -r * "$out/share/satallax/build-dir"
-    cd  "$out/share/satallax/build-dir"
 
-    sbcl --load make.lisp
+  installPhase = ''
-    ! ( ./test | grep ERROR )
+    mkdir -p "$out/share/doc/satallax" "$out/bin" "$out/lib" "$out/lib/satallax"
+    cp bin/satallax.opt "$out/bin/satallax"
+    wrapProgram "$out/bin/satallax" \
+      --suffix PATH : "${coq}/bin:${eprover}/bin:$out/libexec/satallax" \
+      --add-flags "-M" --add-flags "$out/lib/satallax/modes"
 
-    mkdir -p "$out/bin"
+    cp LICENSE README "$out/share/doc/satallax"
-    cp bin/satallax "$out/bin"
+
-  '') ["defEnsureDir" "minInit" "addInputs" "doUnpack"];
+    cp bin/*.so "$out/lib"
+
+    cp -r modes "$out/lib/satallax/"
+    cp -r problems "$out/lib/satallax/"
+    cp -r coq* "$out/lib/satallax/"
+  '';
 
   meta = {
-    description = "A higher-order logic prover";
+    inherit version;
-    maintainers = with a.lib.maintainers;
+    description = ''Automated theorem prover for higher-order logic'';
-    [
+    license = stdenv.lib.licenses.mit ;
-      raskin
+    maintainers = [stdenv.lib.maintainers.raskin];
-    ];
+    platforms = stdenv.lib.platforms.linux;
-    platforms = with a.lib.platforms;
+    downloadPage = "http://www.ps.uni-saarland.de/~cebrown/satallax/downloads.php";
-      unix;
+    homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/index.php";
-    license = a.lib.licenses.free;
+    updateWalker = true;
-    homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/";
   };
-  passthru = {
+}
-    updateInfo = {
-      downloadPage = "http://www.ps.uni-saarland.de/~cebrown/satallax/";
-    };
-  };
-}) x