Unverified Commit 976d3044 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #301882 from wineee/qtc-13 

litehtml: 0.6 -> 0.9; qtcreator: 12.0.2 -> 13.0.0
parents fd5e9374 8802f31f

pkgs/development/libraries/litehtml/default.nix

+5 −3
Original line number Diff line number Diff line
@@ -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; {

pkgs/development/tools/qtcreator/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -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