From 8711680eae1d30412ecdd50ed2292cfb126541d7 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Fri, 23 Jan 2026 20:29:21 +0100 Subject: [PATCH] shaderc: 2025.5 -> 2026.1 Signed-off-by: Marcin Serwin --- .../sh/shaderc/fix-pc-file-generation.patch | 16 +--------------- pkgs/by-name/sh/shaderc/package.nix | 4 ++-- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/sh/shaderc/fix-pc-file-generation.patch b/pkgs/by-name/sh/shaderc/fix-pc-file-generation.patch index cbe0c5ce250a..a016bcee97df 100644 --- a/pkgs/by-name/sh/shaderc/fix-pc-file-generation.patch +++ b/pkgs/by-name/sh/shaderc/fix-pc-file-generation.patch @@ -44,21 +44,7 @@ diff --git a/cmake/write_pkg_config.cmake b/cmake/write_pkg_config.cmake index d367ce3..18502ee 100644 --- a/cmake/write_pkg_config.cmake +++ b/cmake/write_pkg_config.cmake -@@ -16,16 +16,18 @@ - file(STRINGS ${CHANGES_FILE} CHANGES_CONTENT) - string( - REGEX -- MATCH "v[0-9]+(.[0-9]+)?(-dev)? [0-9]+-[0-9]+-[0-9]+" -+ MATCH "v[0-9]+(.[0-9]+)?(-dev)?" - FIRST_VERSION_LINE - ${CHANGES_CONTENT}) - string( - REGEX -- REPLACE "^v([^ ]+) .+$" "\\1" -+ REPLACE "^v([^ ]+)$" "\\1" - CURRENT_VERSION - "${FIRST_VERSION_LINE}") - # If this is a development version, replace "-dev" by ".0" as pkg-config nor +@@ -28,4 +28,6 @@ REGEX # CMake support "-dev" in the version. # If it's not a "-dev" version then ensure it ends with ".1" string(REGEX REPLACE "-dev.1" ".0" CURRENT_VERSION "${CURRENT_VERSION}.1") diff --git a/pkgs/by-name/sh/shaderc/package.nix b/pkgs/by-name/sh/shaderc/package.nix index d9b4f88ba6e1..97e1f69018bf 100644 --- a/pkgs/by-name/sh/shaderc/package.nix +++ b/pkgs/by-name/sh/shaderc/package.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "shaderc"; - version = "2025.5"; + version = "2026.1"; outputs = [ "out" @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "google"; repo = "shaderc"; rev = "v${finalAttrs.version}"; - hash = "sha256-PmGRZDXblrBhZe16QfpHfRdsRhXnGsN7o+qh14nlOUQ="; + hash = "sha256-OiBv18zxeE/gqY4zOMXTsCdkAEWo9BIehdu/adw0+cE="; }; patches = [