From d846bfaa4d9543758a5a27384e34c0ae2aa84de3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 24 Jan 2021 14:38:23 +0100 Subject: [PATCH] openjpeg_1: drop --- pkgs/development/libraries/openjpeg/1.x.nix | 9 --------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 pkgs/development/libraries/openjpeg/1.x.nix diff --git a/pkgs/development/libraries/openjpeg/1.x.nix b/pkgs/development/libraries/openjpeg/1.x.nix deleted file mode 100644 index beb151f0d2de..000000000000 --- a/pkgs/development/libraries/openjpeg/1.x.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - version = "1.5.2"; - branch = "1.5"; - revision = "version.1.5.2"; - sha256 = "1dvvpvb597i5z8srz2v4c5dsbxb966h125jx3m2z0r2gd2wvpfkp"; - testsSupport = false; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7d3332c3a7c7..26238945bdce 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -401,6 +401,7 @@ mapAliases ({ oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10 opencl-icd = ocl-icd; # added 2017-01-20 openexr_ctl = ctl; # added 2018-04-25 + openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # added 2021-01-24 openjpeg_2_1 = openjpeg_2; # added 2018-10-25 opensans-ttf = open-sans; # added 2018-12-04 openssh_with_kerberos = openssh; # added 2018-01-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3741b957f662..c16e8e033513 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15912,7 +15912,6 @@ in openh264 = callPackage ../development/libraries/openh264 { }; - openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { }; openjpeg_2 = callPackage ../development/libraries/openjpeg/2.x.nix { }; openjpeg = openjpeg_2;