From 038de4c5b185d450b2326af5cec24c5d6969dd02 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 11 Jan 2021 02:04:20 +0100 Subject: [PATCH] ufraw: remove This is broken and unmaintained. nufraw seems to be a drop-in alternative, but is currently broken (see https://github.com/NixOS/nixpkgs/pull/108993#issuecomment-757988146). Using Darktable seems to be the reasonable choice for now. Closes https://github.com/NixOS/nixpkgs/issues/97946. --- .../graphics/gimp/plugins/default.nix | 2 - pkgs/applications/graphics/ufraw/default.nix | 88 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 - 4 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 pkgs/applications/graphics/ufraw/default.nix diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 7ea76c9a824..c2e8a47420e 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -167,8 +167,6 @@ in variant = "gimp"; }; - ufraw = pkgs.ufraw.gimpPlugin; - gimplensfun = pluginDerivation rec { version = "unstable-2018-10-21"; name = "gimplensfun-${version}"; diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix deleted file mode 100644 index c30aeb15a0c..00000000000 --- a/pkgs/applications/graphics/ufraw/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub - -, autoconf -, automake -, autoreconfHook -, bzip2 -, cfitsio -, exiv2 -, gettext -, gimp ? null -, gtk2 -, gtkimageview -, lcms2 -, lensfun -, libjpeg -, libtiff -, perl -, pkgconfig -, zlib - -, withGimpPlugin ? true -}: - -assert withGimpPlugin -> gimp != null; - -stdenv.mkDerivation { - pname = "ufraw"; - version = "unstable-2019-06-12"; - - # The original ufraw repo is unmaintained and broken; - # this is a fork that collects patches - src = fetchFromGitHub { - owner = "sergiomb2"; - repo = "ufraw"; - rev = "c65b4237dcb430fb274e4778afaf5df9a18e04e6"; - sha256 = "02icn67bsinvgliy62qa6v7gmwgp2sh15jvm8iiz3c7g1h74f0b7"; - }; - - outputs = [ "out" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin"; - - nativeBuildInputs = [ autoconf automake autoreconfHook gettext perl pkgconfig ]; - - buildInputs = [ - bzip2 - cfitsio - exiv2 - gtk2 - gtkimageview - lcms2 - lensfun - libjpeg - libtiff - zlib - ] ++ stdenv.lib.optional withGimpPlugin gimp; - - configureFlags = [ - "--enable-contrast" - "--enable-dst-correction" - ] ++ stdenv.lib.optional withGimpPlugin "--with-gimp"; - - postInstall = stdenv.lib.optionalString withGimpPlugin '' - moveToOutput "lib/gimp" "$gimpPlugin" - ''; - - meta = with lib; { - homepage = "https://github.com/sergiomb2/ufraw"; - - broken = true; # https://github.com/NixOS/nixpkgs/issues/97946 - - description = "Utility to read and manipulate raw images from digital cameras"; - - longDescription = - '' The Unidentified Flying Raw (UFRaw) is a utility to read and - manipulate raw images from digital cameras. It can be used on its - own or as a Gimp plug-in. It reads raw images using Dave Coffin's - raw conversion utility - DCRaw. UFRaw supports color management - workflow based on Little CMS, allowing the user to apply ICC color - profiles. For Nikon users UFRaw has the advantage that it can read - the camera's tone curves. - ''; - - license = licenses.gpl2Plus; - - maintainers = with maintainers; [ gloaming ]; - platforms = with platforms; all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 01e4df315bc..8191f99e0d1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -668,6 +668,7 @@ mapAliases ({ uberwriter = apostrophe; # added 2020-04-23 ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 ucsFonts = ucs-fonts; # added 2016-07-15 + ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now."; # 2020-01-11 ultrastardx-beta = ultrastardx; # added 2017-08-12 unicorn-emu = unicorn; # added 2020-10-29 unifiStable = unifi6; # added 2020-12-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b4e7b7b3f1..d085b38ddf0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8156,10 +8156,6 @@ in udptunnel = callPackage ../tools/networking/udptunnel { }; - ufraw = callPackage ../applications/graphics/ufraw { - stdenv = gcc6Stdenv; # doesn't build with gcc7 - }; - uftrace = callPackage ../development/tools/uftrace { }; uget = callPackage ../tools/networking/uget { };