diff --git a/pkgs/development/coq-modules/smtcoq/default.nix b/pkgs/development/coq-modules/smtcoq/default.nix
new file mode 100644
index 000000000000..416b8d1bb58c
--- /dev/null
+++ b/pkgs/development/coq-modules/smtcoq/default.nix
@@ -0,0 +1,26 @@
+{ lib, stdenv, mkCoqDerivation, coq, trakt, cvc4, veriT, version ? null }:
+with lib;
+
+mkCoqDerivation {
+  pname = "smtcoq";
+  owner = "smtcoq";
+
+  release."itp22".rev    = "1d60d37558d85a4bfd794220ec48849982bdc979";
+  release."itp22".sha256 = "sha256-CdPfgDfeJy8Q6ZlQeVCSR/x8ZlJ2kSEF6F5UnAespnQ=";
+
+  inherit version;
+  defaultVersion = with versions; switch [ coq.version mathcomp.version ] [
+    { cases = [ (isGe "8.13") ]; out = "itp22"; }
+  ] null;
+
+  propagatedBuildInputs = [ trakt cvc4 ] ++ lib.optionals (!stdenv.isDarwin) [ veriT ];
+  extraNativeBuildInputs = with coq.ocamlPackages; [ ocaml ocamlbuild ];
+  extraBuildInputs = with coq.ocamlPackages; [ findlib num zarith ];
+
+  meta = {
+    description = "Communication between Coq and SAT/SMT solvers ";
+    maintainers = with maintainers; [ siraben ];
+    license = licenses.cecill-b;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/coq-modules/trakt/default.nix b/pkgs/development/coq-modules/trakt/default.nix
new file mode 100644
index 000000000000..671fc4013695
--- /dev/null
+++ b/pkgs/development/coq-modules/trakt/default.nix
@@ -0,0 +1,24 @@
+{ lib, mkCoqDerivation, coq, coq-elpi, version ? null }:
+with lib;
+
+mkCoqDerivation {
+  pname = "trakt";
+  owner = "ecranceMERCE";
+
+  release."1.0".rev    = "d1c9daba8fe0584b526047862dd27ddf836dbbf2";
+  release."1.0".sha256 = "sha256-Qhw5fWFYxUFO2kIWWz/og+4fuy9aYG27szfNk3IglhY=";
+
+  inherit version;
+  defaultVersion = with versions; switch [ coq.version ] [
+    { cases = [ (isGe "8.13") ]; out = "1.0"; }
+  ] null;
+
+  propagatedBuildInputs = [ coq-elpi ];
+
+  meta = {
+    description = "A generic goal preprocessing tool for proof automation tactics in Coq";
+    maintainers = with maintainers; [ siraben ];
+    license = licenses.cecill-b;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix
index 23bbd84a2096..5c5edea0faec 100644
--- a/pkgs/development/libraries/cln/default.nix
+++ b/pkgs/development/libraries/cln/default.nix
@@ -1,12 +1,13 @@
-{ lib, stdenv, fetchurl, gmp }:
+{ lib, stdenv, fetchgit, gmp }:
 
 stdenv.mkDerivation rec {
   pname = "cln";
   version = "1.3.6";
 
-  src = fetchurl {
-    url = "${meta.homepage}${pname}-${version}.tar.bz2";
-    sha256 = "0jlq9l4hphk7qqlgqj9ihjp4m3rwjbhk6q4v00lsbgbri07574pl";
+  src = fetchgit {
+    url = "git://www.ginac.de/cln.git";
+    rev = "cln_${builtins.replaceStrings [ "." ] [ "-" ] version}";
+    sha256 = "sha256-P32F4TIDhE2Dwzydq8iFK6ch3kICJcXeeXHs5PBQG88=";
   };
 
   buildInputs = [ gmp ];
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index b5b7158de647..c71ec2acf944 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -91,10 +91,12 @@ let
       serapi = callPackage ../development/coq-modules/serapi {};
       simple-io = callPackage ../development/coq-modules/simple-io { };
       smpl = callPackage ../development/coq-modules/smpl { };
+      smtcoq = callPackage ../development/coq-modules/smtcoq { };
       stdpp = callPackage ../development/coq-modules/stdpp { };
       StructTact = callPackage ../development/coq-modules/StructTact {};
       tlc = callPackage ../development/coq-modules/tlc {};
       topology = callPackage ../development/coq-modules/topology {};
+      trakt = callPackage ../development/coq-modules/trakt {};
       Velisarios = callPackage ../development/coq-modules/Velisarios {};
       Verdi = callPackage ../development/coq-modules/Verdi {};
       VST = callPackage ../development/coq-modules/VST {};