From 8d1ba999cb1a82a61c70d6176407c1c4c0d29df1 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Wed, 19 Dec 2018 14:42:32 +0100 Subject: [PATCH] tesseract: rename to tesseract4, add alias This is more consistent with the naming of the most popular versioned pkgs. --- nixos/lib/testing.nix | 2 +- pkgs/applications/graphics/tesseract/default.nix | 2 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 0bb3fd53e853..f9430886f7c7 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -116,7 +116,7 @@ in rec { vms = map (m: m.config.system.build.vm) (lib.attrValues nodes); - ocrProg = tesseract_4.override { enableLanguages = [ "eng" ]; }; + ocrProg = tesseract4.override { enableLanguages = [ "eng" ]; }; imagemagick_tiff = imagemagick_light.override { inherit libtiff; }; diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index 969402bf7c59..1b6a5556c78c 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -11,7 +11,7 @@ in languages = languages.v3; }; - tesseract_4 = lowPrio (callPackage ./wrapper.nix { + tesseract4 = lowPrio (callPackage ./wrapper.nix { tesseractBase = base4; languages = languages.v4; }); diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8d29370c8763..2c66878ba812 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -303,6 +303,7 @@ mapAliases ({ terraform-provider-ibm = terraform-providers.ibm; # added 2018-09-28 terraform-provider-libvirt = terraform-providers.libvirt; # added 2018-09-28 terraform-provider-nixos = terraform-providers.nixos; # added 2018-09-28 + tesseract_4 = tesseract4; # added 2018-12-19 tex-gyre-bonum-math = tex-gyre-math.bonum; # added 2018-04-03 tex-gyre-pagella-math = tex-gyre-math.pagella; # added 2018-04-03 tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1205b36b0a4..c886f62aa189 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19487,7 +19487,7 @@ in inherit (callPackage ../applications/graphics/tesseract {}) tesseract - tesseract_4; + tesseract4; tetraproc = callPackage ../applications/audio/tetraproc { };