Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b4d7725cfe8e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5e6adf78e964
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 23, 2020

  1. fmt: 6.1.2 -> 6.2.0

    @r-ryantm @jtojnar
    r-ryantm authored and jtojnar committed Apr 23, 2020
    Copy the full SHA
    08d634a View commit details

Commits on Apr 24, 2020

  1. Merge pull request #84771 from r-ryantm/auto-update/fmt

    @jtojnar
    jtojnar authored Apr 24, 2020
    Copy the full SHA
    5e6adf7 View commit details
Showing with 13 additions and 3 deletions.
  1. +13 −3 pkgs/development/libraries/fmt/default.nix
16 changes: 13 additions & 3 deletions pkgs/development/libraries/fmt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
{ stdenv, fetchFromGitHub, cmake }:
{ stdenv, fetchFromGitHub, fetchpatch, cmake }:

stdenv.mkDerivation rec {
pname = "fmt";
version = "6.1.2";
version = "6.2.0";

src = fetchFromGitHub {
owner = "fmtlib";
repo = "fmt";
rev = version;
sha256 = "1ngb2fd7c2jnxi3x5kjgxmpixmyc737f77vibij43dl77ybiaihi";
sha256 = "1vr08a8q94j66gas7ddbpdbq72b2ikd0mkgd5zd3l63610n8qajs";
};

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 = "vdttRGgdltabeRAs4/z0BNtW2dLOhCxtXQFGVFKpEG0=";
})
];

outputs = [ "out" "dev" ];

nativeBuildInputs = [ cmake ];