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

Merge staging-next-21.05 into staging-21.05

Browse Source
This commit is contained in:
github-actions[bot] 2021-07-21 18:03:05 +00:00 committed by GitHub
commit 0e01d263c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/hugo/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "hugo"; pname = "hugo";
version = "0.84.1"; version = "0.84.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gohugoio"; owner = "gohugoio";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-ULZa0tepq00v2VHDR3+aYYvRfbxYKcjcltRgRmbVmRA="; sha256 = "sha256-NE4vXtczzcL5f0/aDYeGnleBwsDBTzojSaek/LzowFo=";
}; };
vendorSha256 = "sha256-jY/g92ON5OxjuZzPHJNduXYMgPU8/0ioAYvp4iqjGnU="; vendorSha256 = "sha256-ImXTOtN6kQL7Q8IBlmK7+i47cWtyZT0xcnQdCw3NvWM=";
doCheck = false; doCheck = false;

15
pkgs/development/libraries/kde-frameworks/kimageformats.nix
View File

@ -1,5 +1,5 @@
{ {
mkDerivation, lib, mkDerivation, lib, fetchpatch,
extra-cmake-modules, extra-cmake-modules,
ilmbase, karchive, openexr, qtbase ilmbase, karchive, openexr, qtbase
}: }:
@ -8,8 +8,21 @@ let inherit (lib) getDev; in
mkDerivation { mkDerivation {
name = "kimageformats"; name = "kimageformats";
patches = [
(fetchpatch { # included in kimageformats >= 5.82
name = "CVE-2021-36083.patch";
url = "https://invent.kde.org/frameworks/kimageformats/-/commit/297ed9a2fe339bfe36916b9fce628c3242e5be0f.diff";
sha256 = "16axaljgaar0j5796x1mjps93y92393x8zywh3nzw7rm9w2qxzml";
})
];
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ karchive openexr qtbase ]; buildInputs = [ karchive openexr qtbase ];
outputs = [ "out" ]; # plugins only outputs = [ "out" ]; # plugins only
CXXFLAGS = "-I${getDev ilmbase}/include/OpenEXR"; CXXFLAGS = "-I${getDev ilmbase}/include/OpenEXR";
meta = with lib; {
broken = versionOlder qtbase.version "5.14";
};
} }