diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-13 06:01:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-13 06:01:45 +0000 |
| commit | 49523dec152f68f48ee65b5612d6b6df035f1ecf (patch) | |
| tree | ffa8eb3b1d6b4bb454dea8ef2a04a078d530bcdb /pkgs/data | |
| parent | 183df628daa5a3cd433490fbb3e6bcafc814ef26 (diff) | |
| parent | 8a68e0b5f5b066adcf26558a383580da64e71456 (diff) | |
| download | nixlib-49523dec152f68f48ee65b5612d6b6df035f1ecf.tar nixlib-49523dec152f68f48ee65b5612d6b6df035f1ecf.tar.gz nixlib-49523dec152f68f48ee65b5612d6b6df035f1ecf.tar.bz2 nixlib-49523dec152f68f48ee65b5612d6b6df035f1ecf.tar.lz nixlib-49523dec152f68f48ee65b5612d6b6df035f1ecf.tar.xz nixlib-49523dec152f68f48ee65b5612d6b6df035f1ecf.tar.zst nixlib-49523dec152f68f48ee65b5612d6b6df035f1ecf.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/documentation/zeal/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/data/fonts/font-awesome/default.nix | 8 |
2 files changed, 15 insertions, 4 deletions
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 7d8adf6cc018..462b06054f3f 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch2 , cmake , extra-cmake-modules , pkg-config @@ -30,6 +31,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-s1FaazHVtWE697BO0hIOgZVowdkq68R9x327ZnJRnlo="; }; + patches = [ + # fix build with qt 6.6.0 + # treewide: replace deprecated qAsConst with std::as_const() + # https://github.com/zealdocs/zeal/pull/1565 + (fetchpatch2 { + url = "https://github.com/zealdocs/zeal/commit/d50a0115d58df2b222ede4c3a76b9686f4716465.patch"; + hash = "sha256-Ub6RCZGpLSOjvK17Jrm+meZuZGXcC4kI3QYl5HbsLWU="; + }) + ]; + postPatch = '' substituteInPlace CMakeLists.txt \ --replace 'ZEAL_VERSION_SUFFIX "-dev"' 'ZEAL_VERSION_SUFFIX ""' diff --git a/pkgs/data/fonts/font-awesome/default.nix b/pkgs/data/fonts/font-awesome/default.nix index a6f748f2f07f..dfc808971b67 100644 --- a/pkgs/data/fonts/font-awesome/default.nix +++ b/pkgs/data/fonts/font-awesome/default.nix @@ -44,11 +44,11 @@ in hash = "sha256-LL9zWFC+76wH74nqKszPQf2ZDfXq8BiH6tuiK43wYHA="; }; v5 = font-awesome { - version = "5.15.3"; - hash = "sha256-CFXGsl70o/gXUCEKu8Wkv4EBRhrrcMIq8NpfWzcxEus="; + version = "5.15.4"; + hash = "sha256-gd23ZplNY56sm1lfkU3kPXUOmNmY5SRnT0qlQZRNuBo="; }; v6 = font-awesome { - version = "6.1.1"; - hash = "sha256-rujqhKI33Pi2xugMKGoTJDkPkCDK407+Da6yNJP2yAc="; + version = "6.4.2"; + hash = "sha256-/utIhn7CWxlWXshcCUj57WuObRmLTGhTfQo7L6FDHqA="; }; } |