Author: maggesi
Date: Wed Sep 15 19:39:48 2010
New Revision: 23813
URL: https://svn.nixos.org/websvn/nix/?rev=23813&sc=1

Log:
Change the name of the coq derivation to coq-devel-8.3pre1
i.e., remove the version from the name.  Nix has its own mechanism to
prevent a packages to be upgraded.  Instead we distinguish development
version (coq-dev-VERSION) from stable versions (coq-VERSION).

Also remove derivation for coq-8.3-beta0-1 which is now superseded by
coq-devel-8.3pre1.

Deleted:
   nixpkgs/trunk/pkgs/applications/science/logic/coq/beta.nix
   nixpkgs/trunk/pkgs/applications/science/logic/coq/coq-8.3-beta0-1.patch
Modified:
   nixpkgs/trunk/pkgs/applications/science/logic/coq/8.3rc1.nix
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Modified: nixpkgs/trunk/pkgs/applications/science/logic/coq/8.3rc1.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/science/logic/coq/8.3rc1.nix        Wed Sep 
15 18:52:07 2010        (r23812)
+++ nixpkgs/trunk/pkgs/applications/science/logic/coq/8.3rc1.nix        Wed Sep 
15 19:39:48 2010        (r23813)
@@ -5,7 +5,7 @@
 {stdenv, fetchurl, ocaml, camlp5, lablgtk, ncurses}:
 
 stdenv.mkDerivation {
-  name = "coq8.3-8.3pre1";
+  name = "coq-devel-8.3pre1";
 
   src = fetchurl {
     url = http://coq.inria.fr/distrib/V8.3-rc1/files/coq-8.3-rc1.tar.gz;
@@ -40,7 +40,7 @@
   buildFlags = "world"; # Debug with "world VERBOSE=1";
 
   meta = {
-    description = "Coq proof assistant";
+    description = "Coq proof assistant (development version)";
     longDescription = ''
       Coq is a formal proof management system.  It provides a formal language
       to write mathematical definitions, executable algorithms and theorems

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix       Wed Sep 15 18:52:07 
2010        (r23812)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix       Wed Sep 15 19:39:48 
2010        (r23813)
@@ -6675,11 +6675,7 @@
     camlp5 = camlp5_transitional;
   };
 
-  coq8_3 = callPackage ../applications/science/logic/coq/8.3rc1.nix {
-    camlp5 = camlp5_transitional;
-  };
-
-  coq_beta = callPackage ../applications/science/logic/coq/beta.nix {
+  coq_devel = callPackage ../applications/science/logic/coq/8.3rc1.nix {
     camlp5 = camlp5_transitional;
   };
 
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to