panamax: update, fix module

nixos/modules/services/cluster/panamax.nix

···
       };
 
       preStart = ''
-        rm -rf ${cfg.dataDir}/state/tmp
         mkdir -p ${cfg.dataDir}/ui/state/{log,tmp}
+        chown -R panamax:panamax ${cfg.dataDir}
       '';
 
       serviceConfig = {
         ExecStart = "${panamax_ui}/bin/bundle exec rails server --binding 127.0.0.1 --port ${toString cfg.UIPort}";
         User = "panamax";
         Group = "panamax";
+        PermissionsStartOnly = true;
       };
     };
 
···
 
     services.journald.enableHttpGateway = mkDefault true;
     services.fleet.enable = mkDefault true;
+    services.cadvisor.enable = mkDefault true;
+    services.cadvisor.port = mkDefault 3002;
     virtualisation.docker.enable = mkDefault true;
 
     environment.systemPackages = [ panamax_api panamax_ui ];

pkgs/applications/networking/cluster/panamax/Gemfile-api.lock pkgs/applications/networking/cluster/panamax/api/Gemfile.lock

···
       faraday (= 0.8.9)
       faraday_middleware (= 0.9.0)
     hike (1.2.3)
-    i18n (0.6.11)
+    i18n (0.7.0)
     its (0.2.0)
       rspec-core
     json (1.8.1)
···
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mime-types (2.4.3)
-    minitest (5.4.3)
+    minitest (5.5.1)
     multi_json (1.10.1)
     multipart-post (1.2.0)
     octokit (3.2.0)
···
     puma (2.8.2)
       rack (>= 1.1, < 2.0)
     rack (1.5.2)
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.1.7)
       actionmailer (= 4.1.7)
···
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.0)
+    sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)

pkgs/applications/networking/cluster/panamax/Gemfile-ui pkgs/applications/networking/cluster/panamax/ui/Gemfile

···
 
 
 group :test, :development do
-  gem 'rspec-rails', '2.14.2'
-  gem 'capybara', '2.3.0'
-  gem 'teaspoon', '0.8.0'
-  gem 'phantomjs', '1.9.7.1'
+  gem 'rspec-rails'
+  gem 'its'
+  gem 'capybara'
+  gem 'teaspoon'
+  gem 'phantomjs'
   gem 'dotenv-rails', '0.11.1'
   gem 'pry'
   gem 'pry-byebug'
···
 end
 
 group :test do
-  gem 'webmock', '1.18.0'
+  gem 'webmock'
   gem 'sinatra', '1.4.5'
   gem 'coveralls', '0.7.0'
 end

pkgs/applications/networking/cluster/panamax/Gemfile-ui.lock pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock

···
       columnize (~> 0.8)
       debugger-linecache (~> 1.2)
       slop (~> 3.6)
-    capybara (2.3.0)
+    capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
···
       thor
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    ctl_base_ui (0.0.4)
+    ctl_base_ui (0.0.5)
       haml (~> 4.0)
       jquery-rails (~> 3.1)
       jquery-ui-rails (~> 4.2)
···
     dotenv-rails (0.11.1)
       dotenv (= 0.11.1)
     erubis (2.7.0)
-    execjs (2.2.1)
+    execjs (2.2.2)
     haml (4.0.5)
       tilt
     hike (1.2.3)
-    i18n (0.6.11)
+    i18n (0.7.0)
+    its (0.2.0)
+      rspec-core
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
-    json (1.8.1)
+    json (1.8.2)
     kramdown (1.4.0)
     libv8 (3.16.14.7)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
     mime-types (2.4.3)
-    mini_portile (0.6.0)
-    minitest (5.4.3)
+    mini_portile (0.6.1)
+    minitest (5.5.1)
     multi_json (1.10.1)
-    nokogiri (1.6.2.1)
-      mini_portile (= 0.6.0)
+    netrc (0.8.0)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
     phantomjs (1.9.7.1)
     pry (0.10.1)
       coderay (~> 1.1.0)
···
     rack (1.5.2)
     rack-protection (1.5.3)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.1.7)
       actionmailer (= 4.1.7)
···
       activesupport (= 4.1.7)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.1)
+    rake (10.4.0)
     ref (1.0.5)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    rspec-rails (2.14.2)
+    rest-client (1.7.2)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-rails (3.1.0)
       actionpack (>= 3.0)
-      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    safe_yaml (1.0.3)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    safe_yaml (1.0.4)
     sass (3.3.9)
     simplecov (0.9.1)
       docile (~> 1.1.0)
···
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.2)
+    sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
···
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
-    tins (1.1.0)
+    tins (1.3.3)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (2.5.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    webmock (1.18.0)
+    webmock (1.20.4)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
     xpath (2.0.0)
···
 
 DEPENDENCIES
   activeresource (= 4.0.0)
-  capybara (= 2.3.0)
+  capybara
   coveralls (= 0.7.0)
   ctl_base_ui
   dotenv-rails (= 0.11.1)
   haml (= 4.0.5)
+  its
   kramdown (= 1.4.0)
-  phantomjs (= 1.9.7.1)
+  phantomjs
   pry
   pry-byebug
   pry-stack_explorer
   puma (= 2.8.2)
   rails (= 4.1.7)
-  rspec-rails (= 2.14.2)
+  rspec-rails
   sass (= 3.3.9)
   sinatra (= 1.4.5)
-  teaspoon (= 0.8.0)
+  teaspoon
   therubyracer (= 0.12.1)
   uglifier (= 2.5.1)
-  webmock (= 1.18.0)
+  webmock
   zeroclipboard-rails

pkgs/applications/networking/cluster/panamax/api.nix pkgs/applications/networking/cluster/panamax/api/default.nix

···
 
 with stdenv.lib;
 
-let
+stdenv.mkDerivation rec {
+  name = "panamax-api-${version}";
+  version = "0.2.16";
+
+  env = bundlerEnv {
+    name = "panamax-api-gems-${version}";
+    inherit ruby;
+    gemset = ./gemset.nix;
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    buildInputs = [ openssl ];
+  };
+  bundler = bundler_HEAD.override { inherit ruby; };
+
   database_yml = builtins.toFile "database.yml" ''
     production:
       adapter: sqlite3
       database: <%= ENV["PANAMAX_DATABASE_PATH"] || "${dataDir}/db/mnt/db.sqlite3" %>
       timeout: 5000
   '';
-  env = bundlerEnv {
-    name = "panamax-api-gems";
-    inherit ruby;
-    gemset = ./gemset-api.nix;
-    gemfile = ./Gemfile-api;
-    lockfile = ./Gemfile-api.lock;
-  };
-  bundler = bundler_HEAD.override { inherit ruby; };
-in stdenv.mkDerivation rec {
-  name = "panamax-api-${version}";
-  version = "0.2.11";
 
   src = fetchgit {
     rev = "refs/tags/v${version}";
     url = "git://github.com/CenturyLinkLabs/panamax-api";
-    sha256 = "01sz7jibn1rqfga85pr4p8wk6jfldzfaxj1726vs6znmcwhfkcgj";
+    sha256 = "1g75y25asj33gcczpb9iwnk6f7afm1xjqyw803rr3y2h7dm6jivy";
   };
 
   buildInputs = [ makeWrapper sqlite openssl env.ruby bundler ];

pkgs/applications/networking/cluster/panamax/gemset-api.nix pkgs/applications/networking/cluster/panamax/api/gemset.nix

···
-let
-  pkgs = import <nixpkgs> { };
-in {
+{
   "actionmailer" = {
     version = "4.1.7";
     source = {
···
     };
   };
   "i18n" = {
-    version = "0.6.11";
+    version = "0.7.0";
     source = {
       type = "gem";
-      sha256 = "0fwjlgmgry2blf8zlxn9c555cf4a16p287l599kz5104ncjxlzdk";
+      sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758";
     };
   };
   "its" = {
···
     };
   };
   "minitest" = {
-    version = "5.4.3";
+    version = "5.5.1";
     source = {
       type = "gem";
-      sha256 = "1ws2cphg9jh45nrvs43s2ww5r14nb026bwlbwwpi0jz6qsqm86x4";
+      sha256 = "1h8jn0rgmwy37jnhfcg55iilw0n370vgp8xnh0g5laa8rhv32fyn";
     };
   };
   "multi_json" = {
···
     dependencies = [
       "rack"
     ];
-    buildInputs = [ pkgs.openssl ];
   };
   "rack" = {
     version = "1.5.2";
···
     };
   };
   "rack-test" = {
-    version = "0.6.2";
+    version = "0.6.3";
     source = {
       type = "gem";
-      sha256 = "01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky";
+      sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z";
     };
     dependencies = [
       "rack"
···
     ];
   };
   "sprockets-rails" = {
-    version = "2.2.0";
+    version = "2.2.4";
     source = {
       type = "gem";
-      sha256 = "042fxqskvaa0wn9kpy02nv6p7sa355py9pi58zw96l30170sd3hl";
+      sha256 = "172cdg38cqsfgvrncjzj0kziz7kv6b1lx8pccd0blyphs25qf4gc";
     };
     dependencies = [
       "actionpack"
···
       "crack"
     ];
   };
-}
+}

pkgs/applications/networking/cluster/panamax/gemset-ui.nix pkgs/applications/networking/cluster/panamax/ui/gemset.nix

···
-let
-  pkgs = import <nixpkgs> { };
-in {
+{
   "actionmailer" = {
     version = "4.1.7";
     source = {
···
     ];
   };
   "capybara" = {
-    version = "2.3.0";
+    version = "2.4.4";
     source = {
       type = "gem";
-      sha256 = "12x24zsn3y7sigmz45ijd9bkq7l14r2a00ay6k9mdgrbncbr3ins";
+      sha256 = "114k4xi4nfbp3jfbxgwa3fksbwsyibx74gbdqpcgg3dxpmzkaa4f";
     };
     dependencies = [
       "mime-types"
···
     ];
   };
   "ctl_base_ui" = {
-    version = "0.0.4";
+    version = "0.0.5";
     source = {
       type = "gem";
-      sha256 = "0h0dbl0mf6cql7yp10jywv22rn0iy2188phdxvr2ladwwn2vxf5d";
+      sha256 = "1pji85xmddgld5lqx52zxi5r2kx6rsjwkqlr26bp62xb29r10x57";
     };
     dependencies = [
       "haml"
···
     };
   };
   "execjs" = {
-    version = "2.2.1";
+    version = "2.2.2";
     source = {
       type = "gem";
-      sha256 = "1s41g9qwq0h4452q4gp934lnkzfkxh4wrg8fd4bcynba86bf3j8b";
+      sha256 = "05m41mnxn4b2p133qzbz5cy9cc5rn57aa0pp2943hxmzbk379z1f";
     };
   };
   "haml" = {
···
     };
   };
   "i18n" = {
-    version = "0.6.11";
+    version = "0.7.0";
     source = {
       type = "gem";
-      sha256 = "0fwjlgmgry2blf8zlxn9c555cf4a16p287l599kz5104ncjxlzdk";
+      sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758";
     };
+  };
+  "its" = {
+    version = "0.2.0";
+    source = {
+      type = "gem";
+      sha256 = "0rxwds9ipqp48mzqcaxzmfcqhawazg0zlhc1avv3i2cmm3np1z8g";
+    };
+    dependencies = [
+      "rspec-core"
+    ];
   };
   "jquery-rails" = {
     version = "3.1.2";
···
     ];
   };
   "json" = {
-    version = "1.8.1";
+    version = "1.8.2";
     source = {
       type = "gem";
-      sha256 = "0002bsycvizvkmk1jyv8px1hskk6wrjfk4f7x5byi8gxm6zzn6wn";
+      sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5";
     };
   };
   "kramdown" = {
···
     };
   };
   "mini_portile" = {
-    version = "0.6.0";
+    version = "0.6.1";
     source = {
       type = "gem";
-      sha256 = "09kcn4g63xrdirgwxgjikqg976rr723bkc9bxfr29pk22cj3wavn";
+      sha256 = "07gah4k84sar9d850v9gip9b323pw74vwwndh3bbzxpw5iiwsd3l";
     };
   };
   "minitest" = {
-    version = "5.4.3";
+    version = "5.5.1";
     source = {
       type = "gem";
-      sha256 = "1ws2cphg9jh45nrvs43s2ww5r14nb026bwlbwwpi0jz6qsqm86x4";
+      sha256 = "1h8jn0rgmwy37jnhfcg55iilw0n370vgp8xnh0g5laa8rhv32fyn";
     };
   };
   "multi_json" = {
···
       sha256 = "1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c";
     };
   };
+  "netrc" = {
+    version = "0.8.0";
+    source = {
+      type = "gem";
+      sha256 = "1j4jbdvd19kq34xiqx1yqb4wmcywyrlaky8hrh09c1hz3c0v5dkb";
+    };
+  };
   "nokogiri" = {
-    version = "1.6.2.1";
+    version = "1.6.5";
     source = {
       type = "gem";
-      sha256 = "0dj8ajm9hlfpa71qz1xn5prqy5qdi32ll74qh8ssjwknp1a35cnz";
+      sha256 = "1xmxz6fa0m4p7c7ngpgz6gjgv65lzz63dsf0b6vh7gs2fkiw8j7l";
     };
     dependencies = [
       "mini_portile"
···
     dependencies = [
       "rack"
     ];
-    buildInputs = [ pkgs.openssl ];
   };
   "rack" = {
     version = "1.5.2";
···
     ];
   };
   "rack-test" = {
-    version = "0.6.2";
+    version = "0.6.3";
     source = {
       type = "gem";
-      sha256 = "01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky";
+      sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z";
     };
     dependencies = [
       "rack"
···
     ];
   };
   "rake" = {
-    version = "10.4.1";
+    version = "10.4.0";
     source = {
       type = "gem";
-      sha256 = "1446zzdpwpvwkd0zk19b2smmmvdiarh4b26cdbcw4fy5p67wxkw2";
+      sha256 = "0a10xzqc1lh6gjkajkslr0n40wjrniyiyzxkp9m5fc8wf7b74zw8";
     };
   };
   "ref" = {
···
     };
   };
   "rest-client" = {
-    version = "1.6.7";
+    version = "1.7.2";
     source = {
       type = "gem";
-      sha256 = "0nn7zalgidz2yj0iqh3xvzh626krm2al79dfiij19jdhp0rk8853";
+      sha256 = "0h8c0prfi2v5p8iim3wm60xc4yripc13nqwq601bfl85k4gf25i0";
     };
     dependencies = [
       "mime-types"
+      "netrc"
     ];
   };
   "rspec-core" = {
-    version = "2.14.8";
+    version = "3.1.7";
     source = {
       type = "gem";
-      sha256 = "0psjy5kdlz3ph39br0m01w65i1ikagnqlg39f8p65jh5q7dz8hwc";
+      sha256 = "01bawvln663gffljwzpq3mrpa061cghjbvfbq15jvhmip3csxqc9";
     };
+    dependencies = [
+      "rspec-support"
+    ];
   };
   "rspec-expectations" = {
-    version = "2.14.5";
+    version = "3.1.2";
     source = {
       type = "gem";
-      sha256 = "1ni8kw8kjv76jvwjzi4jba00k3qzj9f8wd94vm6inz0jz3gwjqf9";
+      sha256 = "0m8d36wng1lpbcs54zhg1rxh63rgj345k3p0h0c06lgknz339nzh";
     };
     dependencies = [
       "diff-lcs"
+      "rspec-support"
     ];
   };
   "rspec-mocks" = {
-    version = "2.14.6";
+    version = "3.1.3";
     source = {
       type = "gem";
-      sha256 = "1fwsmijd6w6cmqyh4ky2nq89jrpzh56hzmndx9wgkmdgfhfakv30";
+      sha256 = "0gxk5w3klia4zsnp0svxck43xxwwfdqvhr3srv6p30f3m5q6rmzr";
     };
+    dependencies = [
+      "rspec-support"
+    ];
   };
   "rspec-rails" = {
-    version = "2.14.2";
+    version = "3.1.0";
     source = {
       type = "gem";
-      sha256 = "1j9nbha6p12kwy9c5g3lw541xg20yzk95lzgmsq7kvngiqz88p57";
+      sha256 = "1b1in3n1dc1bpf9wb3p3b2ynq05iacmr48jxzc73lj4g44ksh3wq";
     };
     dependencies = [
       "actionpack"
-      "activemodel"
       "activesupport"
       "railties"
       "rspec-core"
       "rspec-expectations"
       "rspec-mocks"
+      "rspec-support"
     ];
   };
+  "rspec-support" = {
+    version = "3.1.2";
+    source = {
+      type = "gem";
+      sha256 = "14y6v9r9lrh91ry9r79h85v0f3y9ja25w42nv5z9n0bipfcwhprb";
+    };
+  };
   "safe_yaml" = {
-    version = "1.0.3";
+    version = "1.0.4";
     source = {
       type = "gem";
-      sha256 = "063bykyk40s3rhy1dxfbvl69s179n1iny418z4wqjbvhrmjn18wl";
+      sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
     };
   };
   "sass" = {
···
     ];
   };
   "sprockets-rails" = {
-    version = "2.2.2";
+    version = "2.2.4";
     source = {
       type = "gem";
-      sha256 = "192d4vfl1gjz6phli6sqk98364x6v4jkpl5imajvimsinvgyv81b";
+      sha256 = "172cdg38cqsfgvrncjzj0kziz7kv6b1lx8pccd0blyphs25qf4gc";
     };
     dependencies = [
       "actionpack"
···
     };
   };
   "tins" = {
-    version = "1.1.0";
+    version = "1.3.3";
     source = {
       type = "gem";
-      sha256 = "0jddc40lw8lzn421p6pjvvs7b37qyd8jgsl5nrq16rc46wgx2r2r";
+      sha256 = "14jnsg15wakdk1ljh2iv9yvzk8nb7gpzd2zw4yvjikmffqjyqvna";
     };
   };
   "tzinfo" = {
···
     ];
   };
   "webmock" = {
-    version = "1.18.0";
+    version = "1.20.4";
     source = {
       type = "gem";
-      sha256 = "1r21a4x7dljb3cqxp7w7mdq5a1xvw9kn6m3gldsldsfza5b4hq03";
+      sha256 = "01cz13ybxbbvkpl21bcfv0p9ir8m2zcplx93ps01ma54p25z4mxr";
     };
     dependencies = [
       "addressable"
···
       "railties"
     ];
   };
-}
+}

pkgs/applications/networking/cluster/panamax/ui.nix pkgs/applications/networking/cluster/panamax/ui/default.nix

···
 
 with stdenv.lib;
 
-let
+stdenv.mkDerivation rec {
+  name = "panamax-ui-${version}";
+  version = "0.2.14";
+
   env = bundlerEnv {
-    name = "panamax-api-gems";
+    name = "panamax-ui-gems-${version}";
     inherit ruby;
-    gemset = ./gemset-ui.nix;
-    gemfile = ./Gemfile-ui;
-    lockfile = ./Gemfile-ui.lock;
+    gemset = ./gemset.nix;
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    buildInputs = [ openssl ];
   };
+
   bundler = bundler_HEAD.override { inherit ruby; };
-in
-stdenv.mkDerivation rec {
-  name = "panamax-ui-${version}";
-  version = "0.2.11";
 
   src = fetchgit {
     rev = "refs/tags/v${version}";
     url = "git://github.com/CenturyLinkLabs/panamax-ui";
-    sha256 = "17j5ac8fzp377bzg7f239jdcc9j0c63bkx0ill5nl10i3h05z7jh";
+    sha256 = "0vwy0gazfx3zkf2bx862jspidgn5p97d3jaq99x38qfhxp554sn9";
   };
 
   buildInputs = [ makeWrapper env.ruby openssl sqlite bundler ];

pkgs/top-level/all-packages.nix

···
     withSidebar = true;
   };
 
-  panamax_api = callPackage ../applications/networking/cluster/panamax/api.nix {
+  panamax_api = callPackage ../applications/networking/cluster/panamax/api {
     ruby = ruby_2_1;
   };
-  panamax_ui = callPackage ../applications/networking/cluster/panamax/ui.nix {
+  panamax_ui = callPackage ../applications/networking/cluster/panamax/ui {
     ruby = ruby_2_1;
   };