Move kanboard to overlays

diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix
index 1d459b7fb3cee7e6f9eddb9e83139a07a70d2df5..262e5587ec8b4974440da1906f7dbbe540fadba1 100644 (file)
--- a/nixops/modules/websites/tools/tools/default.nix
+++ b/nixops/modules/websites/tools/tools/default.nix
@@ -14,7 +14,6 @@ let
     };
     rainloop = pkgs.callPackage ./rainloop.nix  {};
     kanboard = pkgs.callPackage ./kanboard.nix  {
-      inherit (mylibs) fetchedGithub;
       env = myconfig.env.tools.kanboard;
     };
     wallabag = pkgs.callPackage ./wallabag.nix { env = myconfig.env.tools.wallabag; };

diff --git a/nixops/modules/websites/tools/tools/kanboard.json b/nixops/modules/websites/tools/tools/kanboard.json
deleted file mode 100644 (file)
index 5b1d115..0000000
--- a/nixops/modules/websites/tools/tools/kanboard.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "tag": "v1.2.9",
-  "meta": {
-    "name": "kanboard",
-    "url": "https://github.com/kanboard/kanboard/",
-    "branch": "refs/tags/v1.2.9"
-  },
-  "github": {
-    "owner": "kanboard",
-    "repo": "kanboard",
-    "rev": "c4152316b14936556edf3bcc4d11f16ba31b8ae7",
-    "sha256": "18bn9zhyfc5x28hwcxss7chdq7c8rshc8jxgai65i5l68iwhvjg7",
-    "fetchSubmodules": true
-  }
-}

diff --git a/nixops/modules/websites/tools/tools/kanboard.nix b/nixops/modules/websites/tools/tools/kanboard.nix
index 37cb8ccfb8a01c5b00dab1168af5cc5aad0c348e..9966a3775831048b1d1bd9c61c6e89c82b94b6b7 100644 (file)
--- a/nixops/modules/websites/tools/tools/kanboard.nix
+++ b/nixops/modules/websites/tools/tools/kanboard.nix
@@ -1,4 +1,4 @@
-{ lib, env, fetchedGithub, writeText, stdenv, fetchurl }:
+{ env, kanboard }:
 rec {
   varDir = "/var/lib/kanboard";
   activationScript = {
@@ -38,15 +38,7 @@ rec {
       ?>
       '';
   }];
-  webRoot = stdenv.mkDerivation (fetchedGithub ./kanboard.json // rec {
-    dontBuild = true;
-    installPhase = ''
-      cp -a . $out
-      ln -s /var/secrets/webapps/tools-kanboard $out/config.php
-      mv $out/data $out/dataold
-      ln -s ${varDir}/data $out/data
-      '';
-  });
+  webRoot = kanboard { kanboard_config = "/var/secrets/webapps/tools-kanboard"; };
   apache = rec {
     user = "wwwrun";
     group = "wwwrun";

diff --git a/overlays/default.nix b/overlays/default.nix
index 9ed703c8b55633036568047e9f2fddd4e1abdc86..501be738d8ca9a823057623b60939e68b834caad 100644 (file)
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -7,6 +7,7 @@
   elinks = import ./elinks;
   gitweb = import ./gitweb;
   goaccess = import ./goaccess;
+  kanboard = import ./kanboard;
   ldapvi = import ./ldapvi;
   lesspipe = import ./lesspipe;
   mysql = import ./databases/mysql;

diff --git a/overlays/kanboard/default.nix b/overlays/kanboard/default.nix
new file mode 100644 (file)
index 0000000..eeae8db
--- /dev/null
+++ b/overlays/kanboard/default.nix
@@ -0,0 +1,19 @@
+self: super: {
+  kanboard = { varDir ? "/var/lib/kanboard", kanboard_config ? "/etc/kanboard/config.php" }:
+    super.kanboard.overrideAttrs(old: rec {
+      name = "kanboard-${version}";
+      version = "1.2.9";
+      src = self.fetchFromGitHub {
+        owner = "kanboard";
+        repo = "kanboard";
+        rev = "c4152316b14936556edf3bcc4d11f16ba31b8ae7";
+        sha256 = "18bn9zhyfc5x28hwcxss7chdq7c8rshc8jxgai65i5l68iwhvjg7";
+      };
+      installPhase = ''
+        cp -a . $out
+        ln -s ${kanboard_config} $out/config.php
+        mv $out/data $out/dataold
+        ln -s ${varDir}/data $out/data
+        '';
+    });
+}