From 9c234ddcef6d0e1a63e3bba8ee0e3e9397063de4 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 16 Jan 2024 21:46:46 +0100 Subject: [PATCH] libsass: 3.6.5 -> 3.6.6 No real changes outside of the security patch we were already using. Changes: https://github.com/sass/libsass/compare/3.6.5...3.6.6 --- pkgs/development/libraries/libsass/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 57e58adb8c7e..005e74289df7 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook , testers @@ -13,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsass"; - version = "3.6.5"; # also check sassc for updates + version = "3.6.6"; # also check sassc for updates src = fetchFromGitHub { owner = "sass"; repo = finalAttrs.pname; rev = finalAttrs.version; - sha256 = "1cxj6r85d5f3qxdwzxrmkx8z875hig4cr8zsi30w6vj23cyds3l2"; + hash = "sha256-FkLL3OAJXDptRQY6ZkYbss2pcc40f/wasIvEIyHRQFo="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -27,14 +26,6 @@ stdenv.mkDerivation (finalAttrs: { ''; }; - patches = [ - (fetchpatch { - name = "CVE-2022-26592.CVE-2022-43357.CVE-2022-43358.patch"; - url = "https://github.com/sass/libsass/pull/3184/commits/5bb0ea0c4b2ebebe542933f788ffacba459a717a.patch"; - hash = "sha256-DR6pKFWL70uJt//drzq34LeTzT8rUqgUTpgfUHpD2s4="; - }) - ]; - preConfigure = '' export LIBSASS_VERSION=${finalAttrs.version} '';