Upgrade taskwarrior web

diff --git a/nixops/modules/task/default.nix b/nixops/modules/task/default.nix
index 0b8d2d743f079b8fb520fd28675a9467b7c6b062..cda2302b542705a5047aa397041fba536778f908 100644 (file)
--- a/nixops/modules/task/default.nix
+++ b/nixops/modules/task/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, pkgsPrevious, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig, mylibs, ... }:
 let
   cfg = config.services.myTasks;
   vardir = config.services.taskserver.dataDir;
@@ -40,7 +40,7 @@ let
     chmod a+x $out/bin/taskserver-user-certs
     patchShebangs $out/bin/taskserver-user-certs
     '';
-  taskwarrior-web = pkgsPrevious.callPackage ./taskwarrior-web.nix {
+  taskwarrior-web = pkgs.callPackage ./taskwarrior-web.nix {
     inherit (mylibs) fetchedGithub;
     inherit env;
   };
@@ -292,12 +292,12 @@ in {
         path = [ pkgs.taskwarrior ];
 
         environment.TASKRC = taskrc;
-        environment.BUNDLE_PATH = "${taskwarrior-web.gems}/lib/ruby/gems/2.5.0";
+        environment.BUNDLE_PATH = "${taskwarrior-web.gems}/${taskwarrior-web.gems.ruby.gemPath}";
         environment.BUNDLE_GEMFILE = "${taskwarrior-web.gems.confFiles}/Gemfile";
         environment.LC_ALL = "fr_FR.UTF-8";
 
         script = ''
-          exec ${taskwarrior-web.gems}/lib/ruby/gems/2.5.0/bin/bundle exec thin start -R config.ru -S ${taskwarrior-web.socketsDir}/${name}.sock
+          exec ${taskwarrior-web.gems}/${taskwarrior-web.gems.ruby.gemPath}/bin/bundle exec thin start -R config.ru -S ${taskwarrior-web.socketsDir}/${name}.sock
         '';
 
         serviceConfig = {

diff --git a/nixops/modules/task/taskwarrior-web.nix b/nixops/modules/task/taskwarrior-web.nix
index 49d6946c8ee7509b024b73ef940d4bdb5993c932..e38ada4e5b3fd4bac9efc3025ce4fcdec788da54 100644 (file)
--- a/nixops/modules/task/taskwarrior-web.nix
+++ b/nixops/modules/task/taskwarrior-web.nix
@@ -1,4 +1,4 @@
-{ env, ruby_2_5, bundlerEnv, defaultGemConfig, fetchedGithub, stdenv, writeText, pkgs }:
+{ env, ruby_2_6, bundlerEnv, defaultGemConfig, fetchedGithub, stdenv, writeText, pkgs }:
 let
   varDir = "/var/lib/taskwarrior-web";
   socketsDir = "/run/taskwarrior-web";
@@ -12,7 +12,7 @@ let
   });
   gems = bundlerEnv {
     name = "taskwarrior-web-env";
-    ruby = ruby_2_5;
+    ruby = ruby_2_6;
     pname = "taskwarrior-web";
     gemset = ./gemset.nix;
     gemdir = rubyRoot.out;