From 47b9e8c2e8a166528c905a0f8e7ab99a346ba3a0 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 18 Feb 2024 09:25:20 +0000 Subject: [PATCH] libcbor: 0.10.2 -> 0.11.0 Changes: https://github.com/PJK/libcbor/releases/tag/v0.11.0 --- pkgs/development/libraries/libcbor/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix index 43a73d374ea5..349f4589172a 100644 --- a/pkgs/development/libraries/libcbor/default.nix +++ b/pkgs/development/libraries/libcbor/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , cmocka @@ -14,28 +13,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "libcbor"; - version = "0.10.2"; + version = "0.11.0"; src = fetchFromGitHub { owner = "PJK"; repo = "libcbor"; rev = "v${finalAttrs.version}"; - hash = "sha256-eE11hYPsOKqfoX8fx/oYfOAichhUe4mMpNQNVZ6vAUI="; + hash = "sha256-N1xYkZw/6lX/nX/TE6/pVuEFgSyDiUJ50msK42NrKwI="; }; outputs = [ "out" "dev" ]; - patches = [ - # Pull fix pending upstream inclusion to support - # `CMAKE_INSTALL_INCLUDEDIR`: - # https://github.com/PJK/libcbor/pull/297 - (fetchpatch { - name = "includedir.patch"; - url = "https://github.com/PJK/libcbor/commit/d00a63e6d6858a2ed6be9b431b42799ed2c99ad8.patch"; - hash = "sha256-kBCSbAHOCGOs/4Yu6Vh0jcmzA/jYPkkPXPGPrptRfyk="; - }) - ]; - strictDeps = true; nativeBuildInputs = [ cmake ];