public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #104261 from Mic92/spdlog

This commit is contained in:
Jörg Thalheim 2020-11-20 19:01:29 +01:00 committed by GitHub
parent 83cad7d019 a19b005867
commit 5e46d05486
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/development/libraries/fmt/default.nix
View File

@ -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";

4
pkgs/development/libraries/spdlog/default.nix
View File

@ -35,8 +35,8 @@ let
in
{
spdlog_1 = generic {
version = "1.7.0";
sha256 = "1ryaa22ppj60461hcdb8nk7jwj84arp4iw4lyw594py92g4vnx3j";
version = "1.8.1";
sha256 = "sha256-EyZhYgcdtZC+vsOUKShheY57L0tpXltduHWwaoy6G9k=";
};
spdlog_0 = generic {

11
pkgs/top-level/all-packages.nix
View File

@ -12686,8 +12686,7 @@ in
flyway = callPackage ../development/tools/flyway { };
inherit (callPackages ../development/libraries/fmt { })
fmt_6 fmt_7;
inherit (callPackages ../development/libraries/fmt { }) fmt_7;
fmt = fmt_7;
@ -16833,9 +16832,7 @@ in
grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { };
gerbera = callPackage ../servers/gerbera {
fmt = fmt_6;
};
gerbera = callPackage ../servers/gerbera {};
gobetween = callPackage ../servers/gobetween { };
@ -21647,9 +21644,7 @@ in
swaylock-effects = callPackage ../applications/window-managers/sway/lock-effects.nix { };
waybar = callPackage ../applications/misc/waybar {
fmt = fmt_6;
};
waybar = callPackage ../applications/misc/waybar {};
hikari = callPackage ../applications/window-managers/hikari { };