Merge pull request #194038 from sternenseemann/harfbuzz-5.2.0

Changed files
+7 -18
pkgs
development
libraries
fcft
harfbuzz
+2 -2
pkgs/development/libraries/fcft/default.nix
···
stdenv.mkDerivation rec {
pname = "fcft";
-
version = "3.1.4";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "dnkl";
repo = "fcft";
rev = version;
-
sha256 = "sha256-kSzUZR/5PcYTxPWNh/zAwLQbfeW/44u2elEmGR3NYcM=";
};
depsBuildBuild = [ pkg-config ];
···
stdenv.mkDerivation rec {
pname = "fcft";
+
version = "3.1.5";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "dnkl";
repo = "fcft";
rev = version;
+
sha256 = "sha256-3gsaXnflGiGOpIkqDQe5u6x8d18x67/dc4Hh1iU89+o=";
};
depsBuildBuild = [ pkg-config ];
+5 -16
pkgs/development/libraries/harfbuzz/default.nix
···
{ lib
, stdenv
-
, fetchFromGitHub
-
, fetchpatch
, pkg-config
, glib
, freetype
···
}:
let
-
version = "5.1.0";
inherit (lib) optional optionals optionalString;
mesonFeatureFlag = opt: b:
"-D${opt}=${if b then "enabled" else "disabled"}";
···
pname = "harfbuzz${optionalString withIcu "-icu"}";
inherit version;
-
src = fetchFromGitHub {
-
owner = "harfbuzz";
-
repo = "harfbuzz";
-
rev = version;
-
sha256 = "sha256-K6iScmg1vNfwb1UYqtXsnijLVpcC+am2ZL+W5bLFzsI=";
};
-
-
patches = [
-
(fetchpatch {
-
name = "aarch64-test-narrowing.diff";
-
url = "https://github.com/harfbuzz/harfbuzz/commit/04d28d94e576aab099891e6736fd0088dfac3366.diff";
-
sha256 = "sha256-099GP8t1G0kyYl79A6xJhfyrs3WXYitvn+He7sEz+Oo=";
-
})
-
];
postPatch = ''
patchShebangs src/*.py test
···
{ lib
, stdenv
+
, fetchurl
, pkg-config
, glib
, freetype
···
}:
let
+
version = "5.2.0";
inherit (lib) optional optionals optionalString;
mesonFeatureFlag = opt: b:
"-D${opt}=${if b then "enabled" else "disabled"}";
···
pname = "harfbuzz${optionalString withIcu "-icu"}";
inherit version;
+
src = fetchurl {
+
url = "https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz";
+
sha256 = "0b4lpkidwx0lf8slczjji652yll6g5zgmm5lmisnb4s7gf8r8nkk";
};
postPatch = ''
patchShebangs src/*.py test