From affd0de2bef98e99ad0f2397c26fa3bcc5577bf3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 11 Mar 2023 21:01:28 +0100 Subject: [PATCH] ocamlPackages.gmetadom: remove at 0.2.6 --- .../ocaml-modules/gmetadom/default.nix | 39 ------------------- .../ocaml-modules/gmetadom/gcc-4.3.patch | 18 --------- pkgs/top-level/ocaml-packages.nix | 2 - 3 files changed, 59 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/gmetadom/default.nix delete mode 100644 pkgs/development/ocaml-modules/gmetadom/gcc-4.3.patch diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/pkgs/development/ocaml-modules/gmetadom/default.nix deleted file mode 100644 index 6f2c52b5eb5a..000000000000 --- a/pkgs/development/ocaml-modules/gmetadom/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{stdenv, lib, fetchurl, ocaml, findlib, gdome2, libxslt, pkg-config}: - -let - pname = "gmetadom"; -in - -lib.throwIf (lib.versionAtLeast ocaml.version "4.14") - "${pname} is not available for OCaml ${ocaml.version}" - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "0.2.6"; - - src = fetchurl { - url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "0skmlv0pnqvg99wzzzi1h4zhwzd82xg7xpkj1kwpfy7bzinjh7ig"; - }; - - patches = [ ./gcc-4.3.patch ]; - - dontDisableStatic = true; - - preConfigure='' - configureFlags="--with-ocaml-lib-prefix=$out/lib/ocaml/${ocaml.version}/site-lib" - ''; - - nativeBuildInputs = [ pkg-config ocaml findlib ]; - buildInputs = [ libxslt ]; - propagatedBuildInputs = [ gdome2 ]; - - strictDeps = true; - - meta = { - homepage = "https://gmetadom.sourceforge.net/"; - description = "A collection of librares, each library providing a DOM implementation"; - license = lib.licenses.lgpl21Plus; - maintainers = [ lib.maintainers.roconnor ]; - }; -} diff --git a/pkgs/development/ocaml-modules/gmetadom/gcc-4.3.patch b/pkgs/development/ocaml-modules/gmetadom/gcc-4.3.patch deleted file mode 100644 index d8d1d4631632..000000000000 --- a/pkgs/development/ocaml-modules/gmetadom/gcc-4.3.patch +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## gcc-4.3.dpatch by Stefano Zacchiroli -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: ensure sources build with gcc-4.3 - -@DPATCH@ -diff -urNad trunk~/src/shared/Traits.hh.in trunk/src/shared/Traits.hh.in ---- trunk~/src/shared/Traits.hh.in 2003-01-14 12:41:55.000000000 +0100 -+++ trunk/src/shared/Traits.hh.in 2008-05-01 15:45:39.000000000 +0200 -@@ -26,6 +26,7 @@ - */ - - #include -+#include - - #include "@DOM_NAMESPACE@Char.hh" - diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ac8af28fbcc8..4015e0013201 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -615,8 +615,6 @@ let git-binary = pkgs.git; }; - gmetadom = callPackage ../development/ocaml-modules/gmetadom { }; - graphics = if lib.versionOlder "4.09" ocaml.version then callPackage ../development/ocaml-modules/graphics { }