From 450e8ce0407970bf544dc010107296cccea0842a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Fri, 29 Mar 2019 05:45:10 +0100 Subject: [PATCH] Upgrade taskwarrior web --- nixops/modules/task/default.nix | 8 ++++---- nixops/modules/task/taskwarrior-web.nix | 4 ++-- 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 @@ -{ 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 49d6946..e38ada4 100644 --- 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; -- 2.41.0