summary refs log tree commit diff
path: root/pkgs/development/libraries/libsass
diff options
context:
space:
mode:
authorSilvan Mosberger <infinisil@icloud.com>2018-07-20 17:43:03 +0200
committerSilvan Mosberger <infinisil@icloud.com>2018-07-20 17:46:45 +0200
commitb5b23b39bebb8f4efe9d2448a10ab9bbfef62683 (patch)
tree1d9a416b21fe731933f702c2cae160b47a5ab901 /pkgs/development/libraries/libsass
parent7981d0ee6f15225ded72742b76f5c4dc374d7da1 (diff)
downloadnixpkgs-b5b23b39bebb8f4efe9d2448a10ab9bbfef62683.tar
nixpkgs-b5b23b39bebb8f4efe9d2448a10ab9bbfef62683.tar.gz
nixpkgs-b5b23b39bebb8f4efe9d2448a10ab9bbfef62683.tar.bz2
nixpkgs-b5b23b39bebb8f4efe9d2448a10ab9bbfef62683.tar.lz
nixpkgs-b5b23b39bebb8f4efe9d2448a10ab9bbfef62683.tar.xz
nixpkgs-b5b23b39bebb8f4efe9d2448a10ab9bbfef62683.tar.zst
nixpkgs-b5b23b39bebb8f4efe9d2448a10ab9bbfef62683.zip
libsass: Fix CVE-2018-11693
See https://github.com/sass/libsass/pull/2676

For https://github.com/NixOS/nixpkgs/issues/43846
Diffstat (limited to 'pkgs/development/libraries/libsass')
-rw-r--r--pkgs/development/libraries/libsass/default.nix12
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix
index 8168ff0edae..38ba93d4f7c 100644
--- a/pkgs/development/libraries/libsass/default.nix
+++ b/pkgs/development/libraries/libsass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ stdenv, fetchurl, fetchpatch, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "libsass-${version}";
@@ -9,7 +9,15 @@ stdenv.mkDerivation rec {
     sha256 = "0w47hvzmbdpbjx8j83wn8dwcvglpab8abkszf9xfzrpqvb6wnqaz";
   };
 
-  patchPhase = ''
+  patches = [
+    # CVE-2018-11693, is in master but no release yet
+    (fetchpatch {
+      url = "https://github.com/sass/libsass/commit/af0e12cdf09d43dbd1fc11e3f64b244277cc1a1e.patch";
+      sha256 = "1y8yvjvvz91lcr1kpq2pw8729xhdgp15mbldcw392pfzdlliwdyl";
+    })
+  ];
+
+  preConfigure = ''
     export LIBSASS_VERSION=${version}
   '';