Merge pull request #7748 from codyopel/libsass

libsass: 3.1.0 -> 3.2.2 & sassc: 3.1.0 -> 3.2.1
This commit is contained in:
Pascal Wittmann 2015-05-07 18:16:45 +02:00
commit e8d3cda337
2 changed files with 22 additions and 30 deletions

View File

@ -1,27 +1,25 @@
{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool }: { stdenv, fetchurl, autoreconfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libsass-${version}"; name = "libsass-${version}";
version = "3.1.0"; version = "3.2.2";
src = fetchFromGitHub { src = fetchurl {
owner = "sass"; url = "https://github.com/sass/libsass/archive/${version}.tar.gz";
repo = "libsass"; sha256 = "022rvsnqslds1ss6ls1x1w93mrhq7nigd00wjlnd07qhfqpbnwax";
rev = version;
sha256 = "1k9a6hiybqk7xx4k2cb9vhdqskrrzhi60dvwp3gx39jhjqjfl96p";
}; };
preConfigure = '' patchPhase = ''
autoreconf --force --install export LIBSASS_VERSION=${version}
''; '';
buildInputs = [ autoconf automake libtool ]; nativeBuildInputs = [ autoreconfHook ];
meta = with lib; { meta = with stdenv.lib; {
description = "A C/C++ implementation of a Sass compiler"; description = "A C/C++ implementation of a Sass compiler";
license = licenses.mit;
homepage = https://github.com/sass/libsass; homepage = https://github.com/sass/libsass;
license = licenses.mit;
maintainers = with maintainers; [ offline ]; maintainers = with maintainers; [ offline ];
platforms = with platforms; unix; platforms = platforms.unix;
}; };
} }

View File

@ -1,32 +1,26 @@
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libsass }: { stdenv, fetchurl, autoreconfHook, libsass }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sassc"; name = "sassc-${version}";
version = "3.1.0"; version = "3.2.1";
src = fetchFromGitHub { src = fetchurl {
owner = "sass"; url = "https://github.com/sass/sassc/archive/${version}.tar.gz";
repo = "sassc"; sha256 = "18pp7ylcwfvfagvnpw660cdvv7cjl7pl9v8x7xr05fp2l6133rxw";
rev = version;
sha256 = "0lpilmsir9b9292a4b8kq3zzg5cfh031p0krgam5rmsn39i6ivs4";
}; };
preConfigure = '' patchPhase = ''
export SASSC_VERSION="3.1.0" export SASSC_VERSION=${version}
autoreconf --force --install
''; '';
buildInputs = [ autoconf automake libtool libsass ]; nativeBuildInputs = [ autoreconfHook ];
installPhase = '' buildInputs = [ libsass ];
mkdir -p $out/bin
cp sassc $out/bin/
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A front-end for libsass"; description = "A front-end for libsass";
license = licenses.mit;
homepage = https://github.com/sass/sassc/; homepage = https://github.com/sass/sassc/;
license = licenses.mit;
maintainers = with maintainers; [ pjones ]; maintainers = with maintainers; [ pjones ];
platforms = platforms.unix; platforms = platforms.unix;
}; };