From 60785fe4dbedc4fd2a4a4980c59357a27b57aabf Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 26 Feb 2021 17:35:41 +0100
Subject: ocamlPackages.dune: rename into dune_1

---
 pkgs/development/tools/ocaml/dune/1.nix       | 32 +++++++++++++++++++++++++++
 pkgs/development/tools/ocaml/dune/default.nix | 32 ---------------------------
 2 files changed, 32 insertions(+), 32 deletions(-)
 create mode 100644 pkgs/development/tools/ocaml/dune/1.nix
 delete mode 100644 pkgs/development/tools/ocaml/dune/default.nix

(limited to 'pkgs/development/tools/ocaml')

diff --git a/pkgs/development/tools/ocaml/dune/1.nix b/pkgs/development/tools/ocaml/dune/1.nix
new file mode 100644
index 00000000000..bbdbc45270d
--- /dev/null
+++ b/pkgs/development/tools/ocaml/dune/1.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, fetchurl, ocaml, findlib }:
+
+if !lib.versionAtLeast ocaml.version "4.02"
+then throw "dune is not available for OCaml ${ocaml.version}"
+else
+
+stdenv.mkDerivation rec {
+  pname = "dune";
+  version = "1.11.4";
+  src = fetchurl {
+    url = "https://github.com/ocaml/dune/releases/download/${version}/dune-build-info-${version}.tbz";
+    sha256 = "1rkc8lqw30ifjaz8d81la6i8j05ffd0whpxqsbg6dci16945zjvp";
+  };
+
+  buildInputs = [ ocaml findlib ];
+
+  buildFlags = [ "release" ];
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "LIBDIR=$(OCAMLFIND_DESTDIR)"
+  ];
+
+  dontAddPrefix = true;
+
+  meta = with lib; {
+    homepage = "https://dune.build/";
+    description = "A composable build system";
+    maintainers = [ maintainers.vbgl maintainers.marsam ];
+    license = licenses.mit;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix
deleted file mode 100644
index bbdbc45270d..00000000000
--- a/pkgs/development/tools/ocaml/dune/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, lib, fetchurl, ocaml, findlib }:
-
-if !lib.versionAtLeast ocaml.version "4.02"
-then throw "dune is not available for OCaml ${ocaml.version}"
-else
-
-stdenv.mkDerivation rec {
-  pname = "dune";
-  version = "1.11.4";
-  src = fetchurl {
-    url = "https://github.com/ocaml/dune/releases/download/${version}/dune-build-info-${version}.tbz";
-    sha256 = "1rkc8lqw30ifjaz8d81la6i8j05ffd0whpxqsbg6dci16945zjvp";
-  };
-
-  buildInputs = [ ocaml findlib ];
-
-  buildFlags = [ "release" ];
-  makeFlags = [
-    "PREFIX=${placeholder "out"}"
-    "LIBDIR=$(OCAMLFIND_DESTDIR)"
-  ];
-
-  dontAddPrefix = true;
-
-  meta = with lib; {
-    homepage = "https://dune.build/";
-    description = "A composable build system";
-    maintainers = [ maintainers.vbgl maintainers.marsam ];
-    license = licenses.mit;
-    inherit (ocaml.meta) platforms;
-  };
-}
-- 
cgit 1.4.1