From e9ed8dd78ea0804d0cb5c6d27d5728f3c8dbd4dd Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Sun, 13 May 2018 12:17:05 +0200 Subject: [PATCH] sass: 3.4.22 -> 3.5.6 --- pkgs/development/tools/sass/Gemfile.lock | 12 +++++-- pkgs/development/tools/sass/default.nix | 11 +++---- pkgs/development/tools/sass/gemset.nix | 41 ++++++++++++++++++++++-- 3 files changed, 53 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/sass/Gemfile.lock b/pkgs/development/tools/sass/Gemfile.lock index 82dcddb9ece1..ecd1404e3398 100644 --- a/pkgs/development/tools/sass/Gemfile.lock +++ b/pkgs/development/tools/sass/Gemfile.lock @@ -1,7 +1,15 @@ GEM remote: https://rubygems.org/ specs: - sass (3.4.22) + ffi (1.9.23) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + sass (3.5.6) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) PLATFORMS ruby @@ -10,4 +18,4 @@ DEPENDENCIES sass BUNDLED WITH - 1.11.2 + 1.14.6 diff --git a/pkgs/development/tools/sass/default.nix b/pkgs/development/tools/sass/default.nix index cfeb3ccc0f9d..96354acaec48 100644 --- a/pkgs/development/tools/sass/default.nix +++ b/pkgs/development/tools/sass/default.nix @@ -1,14 +1,13 @@ -{ lib, bundlerEnv, ruby }: +{ lib, bundlerApp }: -bundlerEnv { - name = "sass-3.4.22"; - - inherit ruby; +bundlerApp { + pname = "sass"; gemdir = ./.; + exes = [ "sass" "sass-convert" "scss" ]; meta = with lib; { description = "Tools and Ruby libraries for the CSS3 extension languages: Sass and SCSS"; - homepage = http://sass-lang.com/; + homepage = https://sass-lang.com; license = licenses.mit; maintainers = [ maintainers.romildo ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/sass/gemset.nix b/pkgs/development/tools/sass/gemset.nix index 31e4e6ab6d37..bd25281f14fc 100644 --- a/pkgs/development/tools/sass/gemset.nix +++ b/pkgs/development/tools/sass/gemset.nix @@ -1,10 +1,45 @@ { - sass = { + ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0dkj6v26fkg1g0majqswwmhxva7cd6p3psrhdlx93qal72dssywy"; + sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr"; type = "gem"; }; - version = "3.4.22"; + version = "1.9.23"; + }; + rb-fsevent = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; + type = "gem"; + }; + version = "0.10.3"; + }; + rb-inotify = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; + type = "gem"; + }; + version = "0.9.10"; + }; + sass = { + dependencies = ["sass-listen"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag"; + type = "gem"; + }; + version = "3.5.6"; + }; + sass-listen = { + dependencies = ["rb-fsevent" "rb-inotify"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; + type = "gem"; + }; + version = "4.0.0"; }; } \ No newline at end of file