From 17dc76ca7c280e6ec46e5fd27ba059ed269bc6cd Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 27 Apr 2021 09:56:50 +0200 Subject: [PATCH] ocamlPackages.camlimages_4_1_2: remove at 4.1.2 This was only used for glsurf which no longer needs it. --- .../ocaml-modules/camlimages/4.1.2.nix | 37 ------------------- pkgs/top-level/ocaml-packages.nix | 7 ---- 2 files changed, 44 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/camlimages/4.1.2.nix diff --git a/pkgs/development/ocaml-modules/camlimages/4.1.2.nix b/pkgs/development/ocaml-modules/camlimages/4.1.2.nix deleted file mode 100644 index dba303afdf2..00000000000 --- a/pkgs/development/ocaml-modules/camlimages/4.1.2.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, fetchpatch, omake, ocaml, findlib -, graphicsmagick, ghostscript -, freetype, giflib, libjpeg, libpng, libtiff, libXpm -}: - -stdenv.mkDerivation rec { - pname = "camlimages"; - version = "4.1.2"; - - src = fetchFromGitLab { - owner = "camlspotter"; - repo = "camlimages"; - rev = "98661d507e12ce91a51295a50f244cb8265b4439"; # no tag - sha256 = "0kpxj8wm2m17wjq217jzjpfgv1d7sp4w1yd1gi8ipn5rj4sid2j8"; - }; - - buildInputs = [ ocaml omake findlib graphicsmagick ghostscript ]; - propagatedBuildInputs = [ libtiff libjpeg libpng giflib freetype libXpm ]; - - createFindlibDestdir = true; - - buildPhase = '' - omake - ''; - - installPhase = '' - omake install - ''; - - meta = with lib; { - branch = "4.1"; - homepage = "https://gitlab.com/camlspotter/camlimages"; - description = "OCaml image processing library"; - license = licenses.lgpl2; - maintainers = [ maintainers.vbgl ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d30be3da6fa..6a48ff172b7 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -118,13 +118,6 @@ let then callPackage ../development/ocaml-modules/camomile { } else callPackage ../development/ocaml-modules/camomile/0.8.5.nix { }; - camlimages_4_1_2 = - if lib.versionOlder "4.02" ocaml.version - then null - else callPackage ../development/ocaml-modules/camlimages/4.1.2.nix { - libpng = pkgs.libpng12; - }; - camlimages_4_2_4 = callPackage ../development/ocaml-modules/camlimages/4.2.4.nix { }; camlimages = callPackage ../development/ocaml-modules/camlimages { };