compass: use bundlerApp, cleanup

4 files changed, 77 insertions, 62 deletions

diff --git a/pkgs/development/tools/compass/Gemfile b/pkgs/development/tools/compass/Gemfile
index e85f28cbaff..66a29975e7d 100644
--- a/pkgs/development/tools/compass/Gemfile
+++ b/pkgs/development/tools/compass/Gemfile
@@ -1,3 +1,3 @@
-source "https://rubygems.org"
-
-gem 'compass'
+source "https://rubygems.org" do
+  gem 'compass'
+end
diff --git a/pkgs/development/tools/compass/Gemfile.lock b/pkgs/development/tools/compass/Gemfile.lock
index 9aebd2b15ce..43790d9e7a1 100644
--- a/pkgs/development/tools/compass/Gemfile.lock
+++ b/pkgs/development/tools/compass/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    chunky_png (1.3.4)
+    chunky_png (1.3.11)
     compass (1.0.3)
       chunky_png (~> 1.2)
       compass-core (~> 1.0.2)
@@ -14,15 +14,18 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    ffi (1.9.8)
-    multi_json (1.11.0)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    sass (3.4.13)
+    ffi (1.10.0)
+    multi_json (1.13.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    sass (3.4.25)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  compass
+  compass!
+
+BUNDLED WITH
+   1.17.2
diff --git a/pkgs/development/tools/compass/default.nix b/pkgs/development/tools/compass/default.nix
index 3e3e239fbfb..c47bddd4d9c 100644
--- a/pkgs/development/tools/compass/default.nix
+++ b/pkgs/development/tools/compass/default.nix
@@ -1,16 +1,15 @@
-{ lib, bundlerEnv, ruby }:
+{ lib, bundlerApp }:
 
-bundlerEnv {
-  name = "compass-1.0.3";
-
-  inherit ruby;
+bundlerApp {
+  pname = "compass";
   gemdir = ./.;
+  exes = [ "compass" ];
 
   meta = with lib; {
     description = "Stylesheet Authoring Environment that makes your website design simpler to implement and easier to maintain";
     homepage    = https://github.com/Compass/compass;
     license     = with licenses; mit;
-    maintainers = with maintainers; [ offline ];
+    maintainers = with maintainers; [ offline manveru ];
     platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/compass/gemset.nix b/pkgs/development/tools/compass/gemset.nix
index aaf74f3f33c..1beb3d3fec0 100644
--- a/pkgs/development/tools/compass/gemset.nix
+++ b/pkgs/development/tools/compass/gemset.nix
@@ -1,83 +1,96 @@
 {
-  "chunky_png" = {
-    version = "1.3.4";
+  chunky_png = {
+    groups = ["default"];
+    platforms = [];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "124najs9prqzrzk49h53kap992rmqxj0wni61z2hhsn7mwmgdp9d";
       type = "gem";
-      sha256 = "0n5xhkj3vffihl3h9s8yjzazqaqcm4p1nyxa1w2dk3fkpzvb0wfw";
     };
+    version = "1.3.11";
   };
-  "compass" = {
-    version = "1.0.3";
+  compass = {
+    dependencies = ["chunky_png" "compass-core" "compass-import-once" "rb-fsevent" "rb-inotify" "sass"];
+    groups = ["default"];
+    platforms = [];
     source = {
-      type = "gem";
+      remotes = ["https://rubygems.org"];
       sha256 = "0lfi83w8z75czr0pf0rmj9hda22082h3cmvczl8r1ma9agf88y2c";
+      type = "gem";
     };
-    dependencies = [
-      "chunky_png"
-      "compass-core"
-      "compass-import-once"
-      "rb-fsevent"
-      "rb-inotify"
-      "sass"
-    ];
-  };
-  "compass-core" = {
     version = "1.0.3";
+  };
+  compass-core = {
+    dependencies = ["multi_json" "sass"];
+    groups = ["default"];
+    platforms = [];
     source = {
-      type = "gem";
+      remotes = ["https://rubygems.org"];
       sha256 = "0yaspqwdmzwdcqviclbs3blq7an16pysrfzylz8q1gxmmd6bpj3a";
+      type = "gem";
     };
-    dependencies = [
-      "multi_json"
-      "sass"
-    ];
+    version = "1.0.3";
   };
-  "compass-import-once" = {
-    version = "1.0.5";
+  compass-import-once = {
+    dependencies = ["sass"];
+    groups = ["default"];
+    platforms = [];
     source = {
-      type = "gem";
+      remotes = ["https://rubygems.org"];
       sha256 = "0bn7gwbfz7jvvdd0qdfqlx67fcb83gyvxqc7dr9fhcnks3z8z5rq";
+      type = "gem";
     };
-    dependencies = [
-      "sass"
-    ];
+    version = "1.0.5";
   };
-  "ffi" = {
-    version = "1.9.8";
+  ffi = {
+    groups = ["default"];
+    platforms = [];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
       type = "gem";
-      sha256 = "0ph098bv92rn5wl6rn2hwb4ng24v4187sz8pa0bpi9jfh50im879";
     };
+    version = "1.10.0";
   };
-  "multi_json" = {
-    version = "1.11.0";
+  multi_json = {
+    groups = ["default"];
+    platforms = [];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
       type = "gem";
-      sha256 = "1mg3hp17ch8bkf3ndj40s50yjs0vrqbfh3aq5r02jkpjkh23wgxl";
     };
+    version = "1.13.1";
   };
-  "rb-fsevent" = {
-    version = "0.9.4";
+  rb-fsevent = {
+    groups = ["default"];
+    platforms = [];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";
       type = "gem";
-      sha256 = "12if5xsik64kihxf5awsyavlp595y47g9qz77vfp2zvkxgglaka7";
     };
+    version = "0.10.3";
   };
-  "rb-inotify" = {
-    version = "0.9.5";
+  rb-inotify = {
+    dependencies = ["ffi"];
+    groups = ["default"];
+    platforms = [];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4";
       type = "gem";
-      sha256 = "0kddx2ia0qylw3r52nhg83irkaclvrncgy2m1ywpbhlhsz1rymb9";
     };
-    dependencies = [
-      "ffi"
-    ];
+    version = "0.10.0";
   };
-  "sass" = {
-    version = "3.4.13";
+  sass = {
+    groups = ["default"];
+    platforms = [];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0kfpcwh8dgw4lc81qglkvjl73689jy3g7196zkxm4fpskg1p5lkw";
       type = "gem";
-      sha256 = "0wxkjm41xr77pnfi06cbwv6vq0ypbni03jpbpskd7rj5b0zr27ig";
     };
+    version = "3.4.25";
   };
 }
\ No newline at end of file