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

fmt_6, fmt_7: init

Browse Source
This commit is contained in:
Samuel Gräfenstein 2020-10-23 15:39:26 +02:00
parent 67f70f9bcf
commit 0c10d50caa
No known key found for this signature in database
GPG Key ID: EF76A063F15C63C8
2 changed files with 73 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,10 @@
{ stdenv, fetchFromGitHub, fetchpatch, cmake, enableShared ? true }: { stdenv, fetchFromGitHub, fetchpatch, cmake, enableShared ? true }:
stdenv.mkDerivation rec { let
generic = { version, sha256, patches ? [ ] }:
stdenv.mkDerivation {
pname = "fmt"; pname = "fmt";
version = "7.0.3"; inherit version;
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -10,9 +12,11 @@ stdenv.mkDerivation rec {
owner = "fmtlib"; owner = "fmtlib";
repo = "fmt"; repo = "fmt";
rev = version; rev = version;
sha256 = "17q2fdzakk5p0s3fx3724gs5k2b5ylp8f1d6j2m3wgvlfldx9k9a"; inherit sha256;
}; };
inherit patches;
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
cmakeFlags = [ cmakeFlags = [
@ -34,4 +38,39 @@ stdenv.mkDerivation rec {
license = licenses.bsd2; license = licenses.bsd2;
platforms = platforms.all; platforms = platforms.all;
}; };
};
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";
};
} }

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

@ -12461,7 +12461,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 {};