Merge commit '2ec5e9595becf05b052ce4c61a05d87ce95d19af'

1 files changed, 28 insertions, 11 deletions

diff --git a/nixpkgs/pkgs/development/ocaml-modules/seq/default.nix b/nixpkgs/pkgs/development/ocaml-modules/seq/default.nix
index f4918b420c40..7a50d1517db8 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/seq/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/seq/default.nix
@@ -1,13 +1,22 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation ({
   version = "0.1";
-  name = "ocaml${ocaml.version}-seq-${version}";
+  name = "ocaml${ocaml.version}-seq-0.1";
+
+  meta = {
+    license = stdenv.lib.licenses.lgpl21;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    homepage = "https://github.com/c-cube/seq";
+    inherit (ocaml.meta) platforms;
+  };
+
+} // (if stdenv.lib.versionOlder ocaml.version "4.07" then {
 
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "seq";
-    rev = version;
+    rev = "0.1";
     sha256 = "1cjpsc7q76yfgq9iyvswxgic4kfq2vcqdlmxjdjgd4lx87zvcwrv";
   };
 
@@ -15,11 +24,19 @@ stdenv.mkDerivation rec {
 
   createFindlibDestdir = true;
 
-  meta = {
-    description = "Compatibility package for OCaml’s standard iterator type starting from 4.07";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
-    inherit (src.meta) homepage;
-    inherit (ocaml.meta) platforms;
-  };
-}
+  meta.description = "Compatibility package for OCaml’s standard iterator type starting from 4.07";
+
+} else {
+
+  src = ./src-base;
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/seq
+    cp META $out/lib/ocaml/${ocaml.version}/site-lib/seq
+  '';
+
+  meta.description = "dummy backward-compatibility package for iterators";
+
+}))