X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=pkgs%2Fwebapps%2Ftaskwarrior-web%2Fdefault.nix;fp=nixops%2Fmodules%2Ftask%2Ftaskwarrior-web.nix;h=d5368c58c32580f57ccdbbe08935c1178e86d538;hp=e38ada4e5b3fd4bac9efc3025ce4fcdec788da54;hb=2977fd8fdfc55dd42837e3dd56c77d36097ef607;hpb=598aaa373c359046ee08ab5e7576ebaa4f0331e0

diff --git a/nixops/modules/task/taskwarrior-web.nix b/pkgs/webapps/taskwarrior-web/default.nix
similarity index 54%
rename from nixops/modules/task/taskwarrior-web.nix
rename to pkgs/webapps/taskwarrior-web/default.nix
index e38ada4..d5368c5 100644
--- a/nixops/modules/task/taskwarrior-web.nix
+++ b/pkgs/webapps/taskwarrior-web/default.nix
@@ -1,24 +1,22 @@
-{ env, ruby_2_6, bundlerEnv, defaultGemConfig, fetchedGithub, stdenv, writeText, pkgs }:
+{ ruby_2_6, bundlerEnv, mylibs, stdenv }:
 let
-  varDir = "/var/lib/taskwarrior-web";
-  socketsDir = "/run/taskwarrior-web";
-  rubyRoot = stdenv.mkDerivation (fetchedGithub ./taskwarrior-web.json // rec {
-    phases = [ "unpackPhase" "patchPhase" "installPhase" ];
-    patches = [ ./fixes.patch ./thin.patch ];
-    installPhase = ''
-      cp -a . $out
-      cp ${./Gemfile.lock} $out/Gemfile.lock
-      '';
-  });
   gems = bundlerEnv {
     name = "taskwarrior-web-env";
     ruby = ruby_2_6;
     pname = "taskwarrior-web";
     gemset = ./gemset.nix;
-    gemdir = rubyRoot.out;
+    gemdir = package.out;
     groups = [ "default" "local" "development" ];
   };
-in
-  {
-    inherit gems varDir socketsDir rubyRoot;
-  }
+  package = stdenv.mkDerivation (mylibs.fetchedGithub ./taskwarrior-web.json // rec {
+    phases = [ "unpackPhase" "patchPhase" "installPhase" ];
+    patches = [ ./fixes.patch ./thin.patch ];
+    installPhase = ''
+      cp -a . $out
+      cp ${./Gemfile.lock} $out/Gemfile.lock
+      '';
+    passthru = {
+      inherit gems;
+    };
+  });
+in package