summary refs log tree commit diff
path: root/pkgs/development/libraries/libsass
diff options
context:
space:
mode:
authorR. RyanTM <ryantm-bot@ryantm.com>2019-05-21 19:29:28 -0700
committerMario Rodas <marsam@users.noreply.github.com>2019-05-24 07:04:01 -0500
commit1abbb659310dfbe4509bc1d2d1a017b011a60c7b (patch)
tree72cf6006038b8e030c5411a2c9721c9cada3c368 /pkgs/development/libraries/libsass
parentf7640e352a5fd29e562f0020205b4637d4b86fa3 (diff)
downloadnixpkgs-1abbb659310dfbe4509bc1d2d1a017b011a60c7b.tar
nixpkgs-1abbb659310dfbe4509bc1d2d1a017b011a60c7b.tar.gz
nixpkgs-1abbb659310dfbe4509bc1d2d1a017b011a60c7b.tar.bz2
nixpkgs-1abbb659310dfbe4509bc1d2d1a017b011a60c7b.tar.lz
nixpkgs-1abbb659310dfbe4509bc1d2d1a017b011a60c7b.tar.xz
nixpkgs-1abbb659310dfbe4509bc1d2d1a017b011a60c7b.tar.zst
nixpkgs-1abbb659310dfbe4509bc1d2d1a017b011a60c7b.zip
libsass: 3.5.5 -> 3.6.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libsass/versions
Diffstat (limited to 'pkgs/development/libraries/libsass')
-rw-r--r--pkgs/development/libraries/libsass/default.nix27
1 files changed, 13 insertions, 14 deletions
diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix
index ce43ed73432..957201b83ab 100644
--- a/pkgs/development/libraries/libsass/default.nix
+++ b/pkgs/development/libraries/libsass/default.nix
@@ -1,22 +1,21 @@
-{ stdenv, fetchurl, fetchpatch, autoreconfHook }:
+{ stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "libsass-${version}";
-  version = "3.5.5";
+  pname = "libsass";
+  version = "3.6.0";
 
-  src = fetchurl {
-    url = "https://github.com/sass/libsass/archive/${version}.tar.gz";
-    sha256 = "0w6v1xa00jvfyk4b29ir7dfkhiq72anz015gg580bi7x3n7saz28";
+  src = fetchFromGitHub {
+    owner = "sass";
+    repo = pname;
+    rev = version;
+    sha256 = "0c2cfmxv1h4f258l9ph6jrnk1ip5bngapzbw1x3vsqxw7hy20n4a";
+    # Remove unicode file names which leads to different checksums on HFS+
+    # vs. other filesystems because of unicode normalisation.
+    extraPostFetch = ''
+      rm -r $out/test/e2e/unicode-pwd
+    '';
   };
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2018-19827.patch";
-      url = "https://github.com/sass/libsass/commit/b21fb9f84096d9927780b86fa90629a096af358d.patch";
-      sha256 = "0ix12x9plmpgs3xda2fjdcykca687h16qfwqr57i5qphjr9vp33l";
-    })
-  ];
-
   preConfigure = ''
     export LIBSASS_VERSION=${version}
   '';