From 5251f45babcb841beda3e2aa5a5494c68a58f66c Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 6 Apr 2024 00:51:17 +0800 Subject: [PATCH 1/2] litehtml: 0.6 -> 0.9 --- pkgs/development/libraries/litehtml/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/litehtml/default.nix b/pkgs/development/libraries/litehtml/default.nix index b1864f6497a9..b7626733210d 100644 --- a/pkgs/development/libraries/litehtml/default.nix +++ b/pkgs/development/libraries/litehtml/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "litehtml"; - version = "0.6"; + version = "0.9"; src = fetchFromGitHub { owner = "litehtml"; repo = "litehtml"; rev = "v${finalAttrs.version}"; - hash = "sha256-9571d3k8RkzEpMWPuIejZ7njLmYstSwFUaSqT3sk6uQ="; + hash = "sha256-ZE/HKzo3ejKpW/ih3sJwn2hzCtsBhAXeJWGezYd6Yc4"; }; # Don't search for non-existant gumbo cmake config @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { # Affects build of pkgs that depend on litehtml postPatch = '' substituteInPlace cmake/litehtmlConfig.cmake \ - --replace "find_dependency(gumbo)" "" + --replace-fail "find_dependency(gumbo)" "" ''; nativeBuildInputs = [ @@ -34,6 +34,8 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DEXTERNAL_GUMBO=ON" + # BuildTesting need to download test data online + "-DLITEHTML_BUILD_TESTING=OFF" ]; meta = with lib; { From 8802f31ff4146d4009e2913285975cbcb882fe12 Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 6 Apr 2024 00:51:43 +0800 Subject: [PATCH 2/2] qtcreator: 12.0.2 -> 13.0.0 --- pkgs/development/tools/qtcreator/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index 65e3dc1266fa..3843a989ec0b 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -20,6 +20,7 @@ , wrapQtAppsHook , yaml-cpp , litehtml +, libsecret , gumbo , llvmPackages , rustc-demangle @@ -29,11 +30,11 @@ stdenv.mkDerivation rec { pname = "qtcreator"; - version = "12.0.2"; + version = "13.0.0"; src = fetchurl { url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - hash = "sha256-rOgRrDrum/vRpV62y0lHmkgj6tbznyA1cenXdkhFA4E="; + hash = "sha256-7BTwXycHFEVaLw1AuKqwLtkkHU+k8D6lOb/sWBnp4DY="; }; nativeBuildInputs = [ @@ -59,6 +60,7 @@ stdenv.mkDerivation rec { qtquicktimeline yaml-cpp litehtml + libsecret gumbo llvmPackages.libclang llvmPackages.llvm