From bb0d2a305cf772a79d2a570d1355f14cd4a4f7da Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Fri, 13 May 2022 20:45:06 -0500 Subject: [PATCH] ctl: remove --- pkgs/development/libraries/ctl/default.nix | 41 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 pkgs/development/libraries/ctl/default.nix diff --git a/pkgs/development/libraries/ctl/default.nix b/pkgs/development/libraries/ctl/default.nix deleted file mode 100644 index 0a9f50a6aaa..00000000000 --- a/pkgs/development/libraries/ctl/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, ilmbase, libtiff, openexr }: - -stdenv.mkDerivation rec { - pname = "ctl"; - version = "1.5.2"; - - src = fetchFromGitHub { - owner = "ampas"; - repo = pname; - rev = "${pname}-${version}"; - sha256 = "0a698rd1cmixh3mk4r1xa6rjli8b8b7dbx89pb43xkgqxy67glwx"; - }; - - patches = [ - (fetchpatch { - name = "ctl-1.5.2-ilm_230.patch"; - url = "https://src.fedoraproject.org/rpms/CTL/raw/9d7c15a91bccdc0a9485d463bf2789be72e6b17d/f/ctl-1.5.2-ilm_230.patch"; - sha256 = "0mdx7llwrm0q8ai53zhyxi40i9h5s339dbkqpqv30yzi2xpnfj3d"; - }) - ]; - - postPatch = '' - # Fix include guard name - substituteInPlace lib/dpx/dpx_raw.hh \ - --replace CRL_DPX_RAW_INTERNAL_INCLUDE CTL_DPX_RAW_INTERNAL_INCLUDE - - # Fix undefined symbols (link with Imath) - substituteInPlace lib/IlmCtlMath/CMakeLists.txt \ - --replace "( IlmCtlMath IlmCtl )" "( IlmCtlMath IlmCtl Imath)" - ''; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libtiff ilmbase openexr ]; - - meta = with lib; { - description = "Color Transformation Language"; - homepage = "https://github.com/ampas/CTL"; - license = "A.M.P.A.S"; # BSD-derivative, free but GPL incompatible - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9bd5066863d..b6a629aed10 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -205,6 +205,7 @@ mapAliases ({ cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # Added 2022-01-07 crafty = throw "crafty has been removed: deleted by upstream"; # Added 2022-01-07 cryptol = throw "cryptol was removed due to prolonged broken build"; # Added 2020-08-21 + ctl = throw "ctl has been removed: abandoned by upstream"; # Added 2022-05-13 # CUDA Toolkit cudatoolkit_6 = throw "cudatoolkit_6 has been removed in favor of newer versions"; # Added 2021-02-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3226537e8b..1ea92bcdb51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16880,8 +16880,6 @@ with pkgs; python-cosmopolitan = callPackage ../development/interpreters/python-cosmopolitan { }; - ctl = callPackage ../development/libraries/ctl { }; - ctpp2 = callPackage ../development/libraries/ctpp2 { }; ctpl = callPackage ../development/libraries/ctpl { };