Merge pull request #219855 from vbgl/omake-0.10.6

omake: 0.10.5 → 0.10.6

3 files changed, 3 insertions, 86 deletions

diff --git a/pkgs/development/ocaml-modules/camlimages/4.2.4.nix b/pkgs/development/ocaml-modules/camlimages/4.2.4.nix
deleted file mode 100644
index 53115c4ecb8e..000000000000
--- a/pkgs/development/ocaml-modules/camlimages/4.2.4.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{ stdenv
-, lib
-, fetchFromGitLab
-, ocaml
-, findlib
-, omake
-, graphicsmagick
-, libpng
-, libjpeg
-, libexif
-, libtiff
-, libXpm
-, freetype
-, giflib
-, ghostscript
-}:
-
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02" && lib.versionOlder ocaml.version "4.10")
-  "camlimages 4.2.4 is not available for OCaml ${ocaml.version}"
-
-stdenv.mkDerivation rec {
-  name = "ocaml${ocaml.version}-${pname}-${version}";
-  pname = "camlimages";
-  version = "4.2.4";
-
-  src = fetchFromGitLab {
-    owner = "camlspotter";
-    repo = pname;
-    rev = "c4f0ec4178fd18cb85872181965c5f020c349160";
-    sha256 = "17hvsql5dml7ialjcags8wphs7w6z88b2rgjir1382bg8vn62bkr";
-  };
-
-  strictDeps = true;
-
-  nativeBuildInputs = [
-    omake
-    ocaml
-    findlib
-    graphicsmagick
-  ];
-
-  propagatedBuildInputs = [
-    libpng
-    libjpeg
-    libexif
-    libtiff
-    libXpm
-    freetype
-    giflib
-    ghostscript
-  ];
-
-  buildPhase = ''
-    runHook preBuild
-    omake
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    omake install
-    runHook postInstall
-  '';
-
-  createFindlibDestdir = true;
-
-  meta = with lib; {
-    # 4.2.5 requires OCaml >= 4.06
-    branch = "4.2.4";
-    # incompatible with omake >= 0.10
-    broken = true;
-    homepage = "https://gitlab.com/camlspotter/camlimages";
-    description = "OCaml image processing library";
-    license = licenses.lgpl2Only;
-    maintainers = [
-      maintainers.vbgl
-      maintainers.sternenseemann
-    ];
-  };
-}
diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix
index b7d670ce4a7e..32650f80b581 100644
--- a/pkgs/development/tools/ocaml/omake/default.nix
+++ b/pkgs/development/tools/ocaml/omake/default.nix
@@ -1,19 +1,18 @@
-{ lib, stdenv, fetchurl, ocaml, ncurses }:
+{ lib, stdenv, fetchurl, ocaml }:
 
 stdenv.mkDerivation rec {
 
   pname = "omake";
-  version = "0.10.5";
+  version = "0.10.6";
 
   src = fetchurl {
     url = "http://download.camlcity.org/download/${pname}-${version}.tar.gz";
-    sha256 = "sha256-VOFq2KLBbmZCRgHzfpD7p0iyF8yU1tTbyvTiOcpm98Q=";
+    hash = "sha256-AuSZEnybyk8HaDZ7mbwDqjFXMXVQ7TDRuRU/aRY8/yE=";
   };
 
   strictDeps = true;
 
   nativeBuildInputs = [ ocaml ];
-  buildInputs = [ ncurses ];
 
   meta = {
     description = "A build system designed for scalability and portability";
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index b91c1ae009ba..967d61aa0a6c 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -144,8 +144,6 @@ let
       then callPackage ../development/ocaml-modules/camomile { }
       else callPackage ../development/ocaml-modules/camomile/0.8.5.nix { };
 
-    camlimages_4_2_4 = callPackage ../development/ocaml-modules/camlimages/4.2.4.nix { };
-
     camlimages = callPackage ../development/ocaml-modules/camlimages { };
 
     class_group_vdf = callPackage ../development/ocaml-modules/class_group_vdf { };