From 8665f3888b00a2073a9b29ac06cb3bf030bcc4ee Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 3 Jan 2022 17:16:28 -0300 Subject: [PATCH] castxml: 0.4.3 -> 0.4.4 --- pkgs/development/tools/castxml/default.nix | 18 +++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix index a233288a28e8..17be341f4499 100644 --- a/pkgs/development/tools/castxml/default.nix +++ b/pkgs/development/tools/castxml/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "CastXML"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-MschwCEkZrZmNgr8a1ocdukjXzHbXl2gmkPmygJaA6k="; + hash = "sha256-VtkMjZOcF5OAHkezlupXOpNwqUD1oKHdRbtG2FZBRL4="; }; nativeBuildInputs = [ @@ -30,23 +30,23 @@ stdenv.mkDerivation rec { sphinx ]; - cmakeFlags = [ - "-DCLANG_RESOURCE_DIR=${libclang.dev}/" - "-DSPHINX_HTML=${if withHTML then "ON" else "OFF"}" - "-DSPHINX_MAN=${if withManual then "ON" else "OFF"}" - ]; - buildInputs = [ + libclang libffi libxml2 zlib - libclang ]; propagatedBuildInputs = [ libclang ]; + cmakeFlags = [ + "-DCLANG_RESOURCE_DIR=${libclang.dev}/" + "-DSPHINX_HTML=${if withHTML then "ON" else "OFF"}" + "-DSPHINX_MAN=${if withManual then "ON" else "OFF"}" + ]; + # 97% tests passed, 97 tests failed out of 2881 # mostly because it checks command line and nix append -isystem and all doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 612619c45a3a..099ddf10bdee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -244,7 +244,7 @@ with pkgs; castxml = callPackage ../development/tools/castxml { inherit (llvmPackages) libclang llvm; - inherit (python3Packages) sphinx; + inherit (python3.pkgs) sphinx; }; catatonit = callPackage ../applications/virtualization/catatonit { };