aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nixops/modules/task/default.nix8
-rw-r--r--nixops/modules/task/taskwarrior-web.nix4
2 files changed, 6 insertions, 6 deletions
diff --git a/nixops/modules/task/default.nix b/nixops/modules/task/default.nix
index 0b8d2d7..cda2302 100644
--- a/nixops/modules/task/default.nix
+++ b/nixops/modules/task/default.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, pkgsPrevious, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, mylibs, ... }:
2let 2let
3 cfg = config.services.myTasks; 3 cfg = config.services.myTasks;
4 vardir = config.services.taskserver.dataDir; 4 vardir = config.services.taskserver.dataDir;
@@ -40,7 +40,7 @@ let
40 chmod a+x $out/bin/taskserver-user-certs 40 chmod a+x $out/bin/taskserver-user-certs
41 patchShebangs $out/bin/taskserver-user-certs 41 patchShebangs $out/bin/taskserver-user-certs
42 ''; 42 '';
43 taskwarrior-web = pkgsPrevious.callPackage ./taskwarrior-web.nix { 43 taskwarrior-web = pkgs.callPackage ./taskwarrior-web.nix {
44 inherit (mylibs) fetchedGithub; 44 inherit (mylibs) fetchedGithub;
45 inherit env; 45 inherit env;
46 }; 46 };
@@ -292,12 +292,12 @@ in {
292 path = [ pkgs.taskwarrior ]; 292 path = [ pkgs.taskwarrior ];
293 293
294 environment.TASKRC = taskrc; 294 environment.TASKRC = taskrc;
295 environment.BUNDLE_PATH = "${taskwarrior-web.gems}/lib/ruby/gems/2.5.0"; 295 environment.BUNDLE_PATH = "${taskwarrior-web.gems}/${taskwarrior-web.gems.ruby.gemPath}";
296 environment.BUNDLE_GEMFILE = "${taskwarrior-web.gems.confFiles}/Gemfile"; 296 environment.BUNDLE_GEMFILE = "${taskwarrior-web.gems.confFiles}/Gemfile";
297 environment.LC_ALL = "fr_FR.UTF-8"; 297 environment.LC_ALL = "fr_FR.UTF-8";
298 298
299 script = '' 299 script = ''
300 exec ${taskwarrior-web.gems}/lib/ruby/gems/2.5.0/bin/bundle exec thin start -R config.ru -S ${taskwarrior-web.socketsDir}/${name}.sock 300 exec ${taskwarrior-web.gems}/${taskwarrior-web.gems.ruby.gemPath}/bin/bundle exec thin start -R config.ru -S ${taskwarrior-web.socketsDir}/${name}.sock
301 ''; 301 '';
302 302
303 serviceConfig = { 303 serviceConfig = {
diff --git a/nixops/modules/task/taskwarrior-web.nix b/nixops/modules/task/taskwarrior-web.nix
index 49d6946..e38ada4 100644
--- a/nixops/modules/task/taskwarrior-web.nix
+++ b/nixops/modules/task/taskwarrior-web.nix
@@ -1,4 +1,4 @@
1{ env, ruby_2_5, bundlerEnv, defaultGemConfig, fetchedGithub, stdenv, writeText, pkgs }: 1{ env, ruby_2_6, bundlerEnv, defaultGemConfig, fetchedGithub, stdenv, writeText, pkgs }:
2let 2let
3 varDir = "/var/lib/taskwarrior-web"; 3 varDir = "/var/lib/taskwarrior-web";
4 socketsDir = "/run/taskwarrior-web"; 4 socketsDir = "/run/taskwarrior-web";
@@ -12,7 +12,7 @@ let
12 }); 12 });
13 gems = bundlerEnv { 13 gems = bundlerEnv {
14 name = "taskwarrior-web-env"; 14 name = "taskwarrior-web-env";
15 ruby = ruby_2_5; 15 ruby = ruby_2_6;
16 pname = "taskwarrior-web"; 16 pname = "taskwarrior-web";
17 gemset = ./gemset.nix; 17 gemset = ./gemset.nix;
18 gemdir = rubyRoot.out; 18 gemdir = rubyRoot.out;