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

Merge pull request #101251 from samuelgrf/update-fmt

Browse Source 
fmt: 6.2.1 -> 7.0.3
This commit is contained in:
Lassulus 2020-11-13 10:44:16 +01:00 committed by GitHub
commit 5c816b9f1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 77 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,60 +1,76 @@
{ stdenv, fetchFromGitHub, fetchpatch, cmake, enableShared ? true }: { stdenv, fetchFromGitHub, fetchpatch, cmake, enableShared ? true }:
stdenv.mkDerivation rec { let
pname = "fmt"; generic = { version, sha256, patches ? [ ] }:
version = "6.2.1"; stdenv.mkDerivation {
pname = "fmt";
inherit version;
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fmtlib"; owner = "fmtlib";
repo = "fmt"; repo = "fmt";
rev = version; rev = version;
inherit sha256;
};
inherit patches;
nativeBuildInputs = [ cmake ];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}"
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
];
doCheck = true;
meta = with stdenv.lib; {
description = "Small, safe and fast formatting library";
longDescription = ''
fmt (formerly cppformat) is an open-source formatting library. It can be
used as a fast and safe alternative to printf and IOStreams.
'';
homepage = "http://fmtlib.net/";
downloadPage = "https://github.com/fmtlib/fmt/";
maintainers = [ maintainers.jdehaas ];
license = licenses.bsd2;
platforms = platforms.all;
};
};
in
{
fmt_6 = generic {
version = "6.2.1";
sha256 = "1i6nfxazq4d05r3sxyc3ziwkqq7s8rdbv9p16afv66aqmsbqqqic"; 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";
})
];
}; };
patches = [ fmt_7 = generic {
# Fix BC break breaking Kodi version = "7.0.3";
# https://github.com/xbmc/xbmc/issues/17629 sha256 = "17q2fdzakk5p0s3fx3724gs5k2b5ylp8f1d6j2m3wgvlfldx9k9a";
# 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";
})
];
nativeBuildInputs = [ cmake ];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}"
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
];
doCheck = true;
meta = with stdenv.lib; {
description = "Small, safe and fast formatting library";
longDescription = ''
fmt (formerly cppformat) is an open-source formatting library. It can be
used as a fast and safe alternative to printf and IOStreams.
'';
homepage = "http://fmtlib.net/";
downloadPage = "https://github.com/fmtlib/fmt/";
maintainers = [ maintainers.jdehaas ];
license = licenses.bsd2;
platforms = platforms.all;
}; };
} }

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

@ -12671,7 +12671,10 @@ in
flyway = callPackage ../development/tools/flyway { }; flyway = callPackage ../development/tools/flyway { };
fmt = callPackage ../development/libraries/fmt/default.nix { }; inherit (callPackages ../development/libraries/fmt { })
fmt_6 fmt_7;
fmt = fmt_7;
fplll = callPackage ../development/libraries/fplll {}; fplll = callPackage ../development/libraries/fplll {};
fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {}; fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {};
@ -16806,7 +16809,9 @@ in
grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { };
gerbera = callPackage ../servers/gerbera { }; gerbera = callPackage ../servers/gerbera {
fmt = fmt_6;
};
gobetween = callPackage ../servers/gobetween { }; gobetween = callPackage ../servers/gobetween { };
@ -21614,7 +21619,9 @@ in
swaylock-effects = callPackage ../applications/window-managers/sway/lock-effects.nix { }; swaylock-effects = callPackage ../applications/window-managers/sway/lock-effects.nix { };
waybar = callPackage ../applications/misc/waybar { }; waybar = callPackage ../applications/misc/waybar {
fmt = fmt_6;
};
hikari = callPackage ../applications/window-managers/hikari { }; hikari = callPackage ../applications/window-managers/hikari { };