Merge commit 'b3c692172e5b5241b028a98e1977f9fb12eeaf42'

2 files changed, 17 insertions, 18 deletions

diff --git a/nixpkgs/pkgs/applications/science/logic/why3/default.nix b/nixpkgs/pkgs/applications/science/logic/why3/default.nix
index 924ff3fd9fd2..b9f14332f9d8 100644
--- a/nixpkgs/pkgs/applications/science/logic/why3/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/why3/default.nix
@@ -1,12 +1,12 @@
 { callPackage, fetchurl, fetchpatch, lib, stdenv
 , ocamlPackages, coqPackages, rubber, hevea, emacs }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "why3";
   version = "1.4.0";
 
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/file/38425/why3-1.4.0.tar.gz";
+    url = "https://gforge.inria.fr/frs/download.php/file/38425/why3-${version}.tar.gz";
     sha256 = "0lw0cpx347zz9vvwqibmbxgs80fsd16scgk3isscvwxnajpc3rv8";
   };
 
diff --git a/nixpkgs/pkgs/applications/science/logic/why3/with-provers.nix b/nixpkgs/pkgs/applications/science/logic/why3/with-provers.nix
index d4fdbfd6937c..fc08f5d7c85e 100644
--- a/nixpkgs/pkgs/applications/science/logic/why3/with-provers.nix
+++ b/nixpkgs/pkgs/applications/science/logic/why3/with-provers.nix
@@ -1,31 +1,30 @@
 { stdenv, makeWrapper, runCommand, symlinkJoin, why3 }:
 provers:
 let configAwkScript = runCommand "why3-conf.awk" { inherit provers; }
-    ''
-      for p in $provers; do
-        for b in $p/bin/*; do
-          BASENAME=$(basename $b)
-          echo "/^command =/{ gsub(\"$BASENAME\", \"$b\") }" >> $out
-        done
+  ''
+    for p in $provers; do
+      for b in $p/bin/*; do
+        BASENAME=$(basename $b)
+        echo "/^command =/{ gsub(\"$BASENAME\", \"$b\") }" >> $out
       done
-      echo '{ print }' >> $out
-    '';
-in stdenv.mkDerivation {
+    done
+    echo '{ print }' >> $out
+  '';
+in
+stdenv.mkDerivation {
   name = "${why3.name}-with-provers";
 
-  phases = [ "buildPhase" "installPhase" ];
-
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ why3 ] ++ provers;
 
   buildPhase = ''
-      mkdir -p $out/share/why3/
-      why3 config --detect-provers -C $out/share/why3/why3.conf
-      awk -i inplace -f ${configAwkScript} $out/share/why3/why3.conf
+    mkdir -p $out/share/why3/
+    why3 config --detect-provers -C $out/share/why3/why3.conf
+    awk -i inplace -f ${configAwkScript} $out/share/why3/why3.conf
   '';
 
   installPhase = ''
-      mkdir -p $out/bin
-      makeWrapper ${why3}/bin/why3 $out/bin/why3 --add-flags "--extra-config $out/share/why3/why3.conf"
+    mkdir -p $out/bin
+    makeWrapper ${why3}/bin/why3 $out/bin/why3 --add-flags "--extra-config $out/share/why3/why3.conf"
   '';
 }