From c189ea39cf9b6b609c1d241e7b2083e6d2d482a0 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 26 May 2022 02:33:06 +0200 Subject: [PATCH] scantailor: remove alias to scantailor-advanced, which supports qt5 and is maintained --- .../graphics/scantailor/default.nix | 26 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 pkgs/applications/graphics/scantailor/default.nix diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix deleted file mode 100644 index 3e2037f6d45d..000000000000 --- a/pkgs/applications/graphics/scantailor/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, qt4, cmake, libjpeg, libtiff, boost }: - -stdenv.mkDerivation rec { - pname = "scantailor"; - version = "0.9.12.1"; - - src = fetchFromGitHub { - owner = "scantailor"; - repo = "scantailor"; - rev = "RELEASE_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-Jn8+X737vwaE0ZPYdQv/1SocmWFA74XL90IW8yNiafA="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ qt4 libjpeg libtiff boost ]; - - meta = { - homepage = "https://scantailor.org/"; - description = "Interactive post-processing tool for scanned pages"; - - license = lib.licenses.gpl3Plus; - - maintainers = [ lib.maintainers.viric ]; - platforms = lib.platforms.gnu ++ lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b3abf143b6dd..fd2fb5038cb3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1582,6 +1582,7 @@ mapAliases ({ saneFrontends = throw "'saneFrontends' has been renamed to/replaced by 'sane-frontends'"; # Converted to throw 2022-02-22 scaff = throw "scaff is deprecated - replaced by https://gitlab.com/jD91mZM2/inc (not in nixpkgs yet)"; # Added 2020-03-01 scallion = throw "scallion has been removed, because it is currently unmaintained upstream"; # added 2021-12-15 + scantailor = scantailor-advanced; # Added 2022-05-26 scim = throw "'scim' has been renamed to/replaced by 'sc-im'"; # Converted to throw 2022-02-22 scollector = throw "'scollector' has been renamed to/replaced by 'bosun'"; # Converted to throw 2022-02-22 scribusUnstable = throw "'scribusUnstable' has been renamed to 'scribus'"; # Added 2022-05-13 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6bcd3f2b7b2..84358488af89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35415,8 +35415,6 @@ with pkgs; sbagen = callPackage ../applications/misc/sbagen { }; - scantailor = callPackage ../applications/graphics/scantailor { }; - scantailor-advanced = libsForQt5.callPackage ../applications/graphics/scantailor/advanced.nix { }; sc-im = callPackage ../applications/misc/sc-im { };