From d09961c22ba58e737737c7aa0b9e88b9f15359b4 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 25 Oct 2018 17:28:05 +0000
Subject: [PATCH] openjpeg_2: rename from openjpeg_2_1 at 2.3.0

---
 pkgs/development/libraries/openjpeg/{2.1.nix => 2.x.nix} | 0
 pkgs/top-level/aliases.nix                               | 1 +
 pkgs/top-level/all-packages.nix                          | 4 ++--
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename pkgs/development/libraries/openjpeg/{2.1.nix => 2.x.nix} (100%)

diff --git a/pkgs/development/libraries/openjpeg/2.1.nix b/pkgs/development/libraries/openjpeg/2.x.nix
similarity index 100%
rename from pkgs/development/libraries/openjpeg/2.1.nix
rename to pkgs/development/libraries/openjpeg/2.x.nix
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c5cbc3abce9..4a8c4f1334d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -205,6 +205,7 @@ mapAliases ({
   opencascade_oce = opencascade; # added 2018-04-25
   opencl-icd = ocl-icd; # added 2017-01-20
   openexr_ctl = ctl; # added 2018-04-25
+  openjpeg_2_1 = openjpeg_2; # added 2018-10-25
   openssh_with_kerberos = openssh; # added 2018-01-28
   owncloudclient = owncloud-client;  # added 2016-08
   p11_kit = p11-kit; # added 2018-02-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24d61f87322..8e21829c262 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11590,8 +11590,8 @@ with pkgs;
   openh264 = callPackage ../development/libraries/openh264 { };
 
   openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { };
-  openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { };
-  openjpeg = openjpeg_2_1;
+  openjpeg_2 = callPackage ../development/libraries/openjpeg/2.x.nix { };
+  openjpeg = openjpeg_2;
 
   openpa = callPackage ../development/libraries/openpa { };