From a19b005867b65f5f41175d6b63db222b6edd0ade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 19 Nov 2020 13:58:53 +0100 Subject: [PATCH] fmt_6: remove --- pkgs/development/libraries/fmt/default.nix | 28 ---------------------- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 6cb3ec5a2b30..3b2a061153f2 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -41,34 +41,6 @@ let }; in { - fmt_6 = generic { - version = "6.2.1"; - sha256 = "1i6nfxazq4d05r3sxyc3ziwkqq7s8rdbv9p16afv66aqmsbqqqic"; - - patches = [ - # Fix BC break breaking Kodi - # https://github.com/xbmc/xbmc/issues/17629 - # https://github.com/fmtlib/fmt/issues/1620 - (fetchpatch { - url = "https://github.com/fmtlib/fmt/commit/7d01859ef16e6b65bc023ad8bebfedecb088bf81.patch"; - sha256 = "0v8hm5958ih1bmnjr16fsbcmdnq4ykyf6b0hg6dxd5hxd126vnxx"; - }) - - # Fix paths in pkg-config file - # https://github.com/fmtlib/fmt/pull/1657 - (fetchpatch { - url = "https://github.com/fmtlib/fmt/commit/78f041ab5b40a1145ba686aeb8013e8788b08cd2.patch"; - sha256 = "1hqp96zl9l3qyvsm7pxl6ah8c26z035q2mz2pqhqa0wvzd1klcc6"; - }) - - # Fix cmake config paths. - (fetchpatch { - url = "https://github.com/fmtlib/fmt/pull/1702.patch"; - sha256 = "18cadqi7nac37ymaz3ykxjqs46rvki396g6qkqwp4k00cmic23y3"; - }) - ]; - }; - fmt_7 = generic { version = "7.0.3"; sha256 = "17q2fdzakk5p0s3fx3724gs5k2b5ylp8f1d6j2m3wgvlfldx9k9a"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93b44d2a3a66..591f7e9d7379 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12686,8 +12686,7 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix { flyway = callPackage ../development/tools/flyway { }; - inherit (callPackages ../development/libraries/fmt { }) - fmt_6 fmt_7; + inherit (callPackages ../development/libraries/fmt { }) fmt_7; fmt = fmt_7;