pkgs/applications: rename name to pname&version part 2

7 files changed, 46 insertions, 36 deletions

diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix
index f9cc97893da..fc16423b671 100644
--- a/pkgs/applications/science/logic/aspino/default.nix
+++ b/pkgs/applications/science/logic/aspino/default.nix
@@ -8,7 +8,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "aspino-unstable-2017-03-09";
+  pname = "aspino";
+  version = "unstable-2017-03-09";
 
   src = fetchFromGitHub {
     owner = "alviano";
diff --git a/pkgs/applications/science/logic/gappa/default.nix b/pkgs/applications/science/logic/gappa/default.nix
index be1d6f253bc..af6673caa54 100644
--- a/pkgs/applications/science/logic/gappa/default.nix
+++ b/pkgs/applications/science/logic/gappa/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, gmp, mpfr, boost }:
 
-stdenv.mkDerivation {
-  name = "gappa-1.4.0";
+stdenv.mkDerivation rec {
+  pname = "gappa";
+  version = "1.4.0";
 
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/file/38436/gappa-1.4.0.tar.gz";
+    url = "https://gforge.inria.fr/frs/download.php/file/38436/gappa-${version}.tar.gz";
     sha256 = "12x42z901pr05ldmparqdi8sq9s7fxbavhzk2dbq3l6hy247dwbb";
   };
 
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 24faa98f777..e66fe992e18 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -3,11 +3,11 @@
 let
   load_num =
     if num == null then "" else
-      ''
-        -I ${num}/lib/ocaml/${ocaml.version}/site-lib/num \
-        -I ${num}/lib/ocaml/${ocaml.version}/site-lib/top-num \
-        -I ${num}/lib/ocaml/${ocaml.version}/site-lib/stublibs \
-      '';
+    ''
+      -I ${num}/lib/ocaml/${ocaml.version}/site-lib/num \
+      -I ${num}/lib/ocaml/${ocaml.version}/site-lib/top-num \
+      -I ${num}/lib/ocaml/${ocaml.version}/site-lib/stublibs \
+    '';
 
   start_script =
     ''
@@ -21,19 +21,22 @@ let
 in
 
 stdenv.mkDerivation {
-  name     = "hol_light-2019-10-06";
+  pname = "hol_light";
+  version = "unstable-2019-10-06";
 
   src = fetchFromGitHub {
-    owner  = "jrh13";
-    repo   = "hol-light";
-    rev    = "5c91b2ded8a66db571824ecfc18b4536c103b23e";
+    owner = "jrh13";
+    repo = "hol-light";
+    rev = "5c91b2ded8a66db571824ecfc18b4536c103b23e";
     sha256 = "0sxsk8z08ba0q5aixdyczcx5l29lb51ba4ip3d2fry7y604kjsx6";
   };
 
-  patches = [(fetchpatch {
-    url = "https://salsa.debian.org/ocaml-team/hol-light/-/raw/master/debian/patches/0004-Fix-compilation-with-camlp5-7.11.patch";
-    sha256 = "180qmxbrk3vb1ix7j77hcs8vsar91rs11s5mm8ir5352rz7ylicr";
-  })];
+  patches = [
+    (fetchpatch {
+      url = "https://salsa.debian.org/ocaml-team/hol-light/-/raw/master/debian/patches/0004-Fix-compilation-with-camlp5-7.11.patch";
+      sha256 = "180qmxbrk3vb1ix7j77hcs8vsar91rs11s5mm8ir5352rz7ylicr";
+    })
+  ];
 
   buildInputs = [ ocaml camlp5 ];
   propagatedBuildInputs = [ num ];
@@ -47,9 +50,9 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     description = "Interactive theorem prover based on Higher-Order Logic";
-    homepage    = "http://www.cl.cam.ac.uk/~jrh13/hol-light/";
-    license     = licenses.bsd2;
-    platforms   = platforms.unix;
+    homepage = "http://www.cl.cam.ac.uk/~jrh13/hol-light/";
+    license = licenses.bsd2;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ thoughtpolice maggesi vbgl ];
   };
 }
diff --git a/pkgs/applications/science/logic/open-wbo/default.nix b/pkgs/applications/science/logic/open-wbo/default.nix
index 77db8ae3384..193f603656d 100644
--- a/pkgs/applications/science/logic/open-wbo/default.nix
+++ b/pkgs/applications/science/logic/open-wbo/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitHub, zlib, gmp }:
 
 stdenv.mkDerivation {
-  name = "open-wbo-2.0";
+  pname = "open-wbo";
+  version = "2.0";
 
   src = fetchFromGitHub {
     owner = "sat-group";
diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix
index 7fedca72b69..2f57fca9729 100644
--- a/pkgs/applications/science/logic/prover9/default.nix
+++ b/pkgs/applications/science/logic/prover9/default.nix
@@ -1,7 +1,8 @@
-{lib, stdenv, fetchurl}:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "prover9-2009-11a";
+  pname = "prover9";
+  version = "2009-11a";
 
   src = fetchurl {
     url = "https://www.cs.unm.edu/~mccune/mace4/download/LADR-2009-11A.tar.gz";
@@ -40,6 +41,6 @@ stdenv.mkDerivation {
       the Otter Prover. This is the LADR command-line version.
     '';
     platforms = lib.platforms.linux;
-    maintainers = [];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/science/logic/redprl/default.nix b/pkgs/applications/science/logic/redprl/default.nix
index 43a2ec7e97e..05a7b63f556 100644
--- a/pkgs/applications/science/logic/redprl/default.nix
+++ b/pkgs/applications/science/logic/redprl/default.nix
@@ -1,6 +1,8 @@
 { lib, stdenv, fetchgit, mlton }:
 stdenv.mkDerivation {
-  name = "redprl-2017-03-28";
+  pname = "redprl";
+  version = "unstable-2017-03-28";
+
   src = fetchgit {
     url = "https://github.com/RedPRL/sml-redprl.git";
     rev = "bdf027de732e4a8d10f9f954389dfff0c822f18b";
@@ -18,11 +20,11 @@ stdenv.mkDerivation {
     mkdir -p $out/bin
     mv ./bin/redprl $out/bin
   '';
-  meta = {
+  meta = with lib; {
     description = "A proof assistant for Nominal Computational Type Theory";
     homepage = "http://www.redprl.org/";
-    license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.acowley ];
-    platforms = lib.platforms.unix;
+    license = licenses.mit;
+    maintainers = with maintainers; [ acowley ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/science/logic/sad/default.nix b/pkgs/applications/science/logic/sad/default.nix
index fe0ca1b3017..a509d70ed46 100644
--- a/pkgs/applications/science/logic/sad/default.nix
+++ b/pkgs/applications/science/logic/sad/default.nix
@@ -1,9 +1,10 @@
 { lib, stdenv, fetchurl, haskell, spass }:
 
-stdenv.mkDerivation {
-  name = "system-for-automated-deduction-2.3.25";
+stdenv.mkDerivation rec {
+  pname = "system-for-automated-deduction";
+  version = "2.3.25";
   src = fetchurl {
-    url = "http://nevidal.org/download/sad-2.3-25.tar.gz";
+    url = "http://nevidal.org/download/sad-${version}.tar.gz";
     sha256 = "10jd93xgarik7xwys5lq7fx4vqp7c0yg1gfin9cqfch1k1v8ap4b";
   };
   buildInputs = [ haskell.compiler.ghc844 spass ];
@@ -15,7 +16,7 @@ stdenv.mkDerivation {
   ];
   postPatch = ''
     substituteInPlace Alice/Main.hs --replace init.opt $out/init.opt
-    '';
+  '';
   installPhase = ''
     mkdir -p $out/{bin,provers}
     install alice $out/bin
@@ -23,18 +24,18 @@ stdenv.mkDerivation {
     substituteAll provers/provers.dat $out/provers/provers.dat
     substituteAll init.opt $out/init.opt
     cp -r examples $out
-    '';
+  '';
   inherit spass;
   meta = {
     description = "A program for automated proving of mathematical texts";
     longDescription = ''
       The system for automated deduction is intended for automated processing of formal mathematical texts
       written in a special language called ForTheL (FORmal THEory Language) or in a traditional first-order language
-      '';
+    '';
     license = lib.licenses.gpl3Plus;
     maintainers = [ lib.maintainers.schmitthenner ];
     homepage = "http://nevidal.org/sad.en.html";
     platforms = lib.platforms.linux;
-    broken = true;  # ghc-8.4.4 is gone from Nixpkgs
+    broken = true; # ghc-8.4.4 is gone from Nixpkgs
   };
 }