diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-06-06 14:10:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-06 14:10:58 -0400 |
| commit | c1728ad3c70c8e26ec65c65e8f558dbde1594c3e (patch) | |
| tree | 92656d43c3e8baa7f25515a52eaf22170d169344 /pkgs/top-level | |
| parent | a4e5664f4ef51eac4aad28b2ddab18c5efe6e2bd (diff) | |
| parent | 88f5f970b4b4599fcb2d8e8a1f12ae37880a810b (diff) | |
| download | nixlib-c1728ad3c70c8e26ec65c65e8f558dbde1594c3e.tar nixlib-c1728ad3c70c8e26ec65c65e8f558dbde1594c3e.tar.gz nixlib-c1728ad3c70c8e26ec65c65e8f558dbde1594c3e.tar.bz2 nixlib-c1728ad3c70c8e26ec65c65e8f558dbde1594c3e.tar.lz nixlib-c1728ad3c70c8e26ec65c65e8f558dbde1594c3e.tar.xz nixlib-c1728ad3c70c8e26ec65c65e8f558dbde1594c3e.tar.zst nixlib-c1728ad3c70c8e26ec65c65e8f558dbde1594c3e.zip | |
Merge pull request #89550 from prusnak/drop-libjpeg-drop
libjpeg_drop: remove
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1004a444469e..03b03ff2a842 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -247,6 +247,7 @@ mapAliases ({ libgumbo = gumbo; # added 2018-01-21 libGL_driver = mesa.drivers; libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 + libjpeg_drop = libjpeg_original; # added 2020-06-05 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 liblapackWithoutAtlas = lapack-reference; # added 2018-11-05 liblrdf = lrdf; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd298ce24ea2..dc2a3d436dce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13184,7 +13184,6 @@ in libjpeg_original = callPackage ../development/libraries/libjpeg { }; # also known as libturbojpeg libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; - libjpeg_drop = callPackage ../development/libraries/libjpeg-drop { }; libjpeg = libjpeg_turbo; libjreen = callPackage ../development/libraries/libjreen { }; |