From 1f9be66ae0a4510f3564c8ed2add9b0228407f01 Mon Sep 17 00:00:00 2001
From: Théo Zimmermann
Date: Thu, 5 Jul 2018 09:46:26 +0200
Subject: [pkg:nix] Pass through the ocamlPackages version used to build.

This will be useful for users wanting to build a plugin using this package.
---
 default.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index 1be2740817..c791706db4 100644
--- a/default.nix
+++ b/default.nix
@@ -86,4 +86,18 @@ stdenv.mkDerivation rec {
 
   installCheckTarget = [ "check" ];
 
+  passthru = { inherit ocamlPackages; };
+
+  meta = {
+    description = "Coq proof assistant";
+    longDescription = ''
+      Coq is a formal proof management system.  It provides a formal language
+      to write mathematical definitions, executable algorithms and theorems
+      together with an environment for semi-interactive development of
+      machine-checked proofs.
+    '';
+    homepage = http://coq.inria.fr;
+    license = licenses.lgpl21;
+  };
+
 }
-- 
cgit v1.2.3


From 42774708bafe48aefe411fab4ca4d75407f9d1d6 Mon Sep 17 00:00:00 2001
From: Théo Zimmermann
Date: Thu, 5 Jul 2018 11:44:43 +0200
Subject: [pkg:nix] Stop using lib.inNixShell.

---
 default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index c791706db4..d9317bccaf 100644
--- a/default.nix
+++ b/default.nix
@@ -30,6 +30,9 @@
 , buildIde ? true
 , buildDoc ? true
 , doInstallCheck ? true
+, shell ? false
+  # We don't use lib.inNixShell because that would also apply
+  # when in a nix-shell of some package depending on this one.
 }:
 
 with pkgs;
@@ -58,13 +61,13 @@ stdenv.mkDerivation rec {
     optional (!versionAtLeast ocaml.version "4.07") ncurses
     ++ [ ocamlPackages.ounit rsync which ]
   )
-  ++ optionals lib.inNixShell (
+  ++ optionals shell (
     [ jq curl git gnupg ] # Dependencies of the merging script
     ++ (with ocamlPackages; [ merlin ocp-indent ocp-index ]) # Dev tools
   );
 
   src =
-    if lib.inNixShell then null
+    if shell then null
     else
       with builtins; filterSource
         (path: _:
-- 
cgit v1.2.3