fix(box): wallabag is working again!!!

pkgs/default.nix

@@ -8,6 +8,10 @@
   kobopatch = pkgs.callPackage ./kobopatch.nix { };
   my-mautrix-discord = pkgs.callPackage ./mautrix-discord.nix { }; # Handled by matrix-appservices input
   ulogger-server = pkgs.callPackage ./ulogger.nix { };
+  # Wallabag is now an overlay
+  # TODO: we still use the patch from this folder though
   my-wallabag = pkgs.callPackage ./wallabag.nix { };
   mautrix-slack = pkgs.callPackage ./mautrix-slack.nix { }; 
+  gpodder2go = pkgs.callPackage ./gpodder2go.nix { }; 
+  ghost = pkgs.callPackage ./ghost { };
 }

pkgs/wallabag-data.patch

@@ -1,26 +1,55 @@
 diff --git a/app/AppKernel.php b/app/AppKernel.php
-index 61b734e06..d25d1aaa3 100644
+index 61b734e06..0902c20fc 100644
 --- a/app/AppKernel.php
 +++ b/app/AppKernel.php
-@@ -62,14 +62,19 @@ class AppKernel extends Kernel
-         return $bundles;
-     }
+@@ -64,12 +64,12 @@ class AppKernel extends Kernel
  
-+    public function getProjectDir()
-+    {
-+        return getenv('WALLABAG_DATA') ?: dirname(__DIR__);
-+    }
-+
      public function getCacheDir()
      {
 -        return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment();
-+        return $this->getProjectDir() . '/var/cache/' . $this->getEnvironment();
++        return getenv('CACHE_DIRECTORY') . '/' . $this->getEnvironment();
      }
  
      public function getLogDir()
      {
 -        return dirname(__DIR__) . '/var/logs';
-+        return $this->getProjectDir() . '/var/logs';
++        return getenv('LOGS_DIRECTORY');
      }
  
      public function registerContainerConfiguration(LoaderInterface $loader)
+diff --git a/app/config/config.yml b/app/config/config.yml
+index 7f0a4ca6c..77b5175c8 100644
+--- a/app/config/config.yml
++++ b/app/config/config.yml
+@@ -1,5 +1,7 @@
+ imports:
+-    - { resource: parameters.yml }
++    # Unfortunately, we cannot use %env(string:CONFIGURATION_DIRECTORY)%. Hardcoding the path for simplicity.
++    # https://symfony.com/doc/current/service_container/import.html#importing-configuration-with-imports
++    - { resource: '/etc/wallabag/parameters.yml' }
+     - { resource: security.yml }
+     - { resource: services.yml }
+     - { resource: wallabag.yml }
+@@ -28,7 +30,7 @@ framework:
+     session:
+         # handler_id set to null will use default session handler from php.ini
+         handler_id: session.handler.native_file
+-        save_path: "%kernel.project_dir%/var/sessions/%kernel.environment%"
++        save_path: "%env(string:CACHE_DIRECTORY)%/sessions/%kernel.environment%"
+         cookie_secure: auto
+     fragments: ~
+     http_method_override: true
+diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml
+index bd57d6377..8e1cd0970 100644
+--- a/app/config/wallabag.yml
++++ b/app/config/wallabag.yml
+@@ -35,7 +35,7 @@ wallabag_core:
+     fetching_error_message: |
+         wallabag can't retrieve contents for this article. Please <a href="https://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
+     api_limit_mass_actions: 10
+-    encryption_key_path: "%kernel.project_dir%/data/site-credentials-secret-key.txt"
++    encryption_key_path: "%env(string:STATE_DIRECTORY)%/site-credentials-secret-key.txt"
+     default_internal_settings:
+         -
+             name: share_public
+

pkgs/wallabag.nix

@@ -15,7 +15,7 @@
 
 let
   pname = "wallabag";
-  version = "2.6.8";
+  version = "2.6.9";
 in
 stdenv.mkDerivation {
   inherit pname version;
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   # Release tarball includes vendored files
   src = fetchurl {
     url = "https://github.com/wallabag/wallabag/releases/download/${version}/wallabag-${version}.tar.gz";
-    hash = "sha256-pmQXafqpd5rTwBIYG9NnwIIPta6Ek7iYaPaHvz1s550=";
+    hash = "sha256-V4s5/y9fFAmZ+WnUxU03UyRivEihD1ZUKQOOq4TLEKw=";
   };
 
   patches = [