From d90b0f22cf327959e9868aa75af2ff97e49e5e6b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 10 Dec 2020 21:40:32 +0100
Subject: wallabag: 2.3.8 -> 2.4.0

https://github.com/wallabag/wallabag/releases/tag/2.4.0
---
 pkgs/servers/web-apps/wallabag/default.nix         | 10 ++--------
 pkgs/servers/web-apps/wallabag/wallabag-data.patch | 12 +++++++++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix
index 48afdc5c01da..c552f25261f9 100644
--- a/pkgs/servers/web-apps/wallabag/default.nix
+++ b/pkgs/servers/web-apps/wallabag/default.nix
@@ -2,25 +2,19 @@
 
 stdenv.mkDerivation rec {
   pname = "wallabag";
-  version = "2.3.8";
+  version = "2.4.0";
 
   # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur
 
   src = fetchurl {
     url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz";
-    sha256 = "1sr62hfk2f2rl5by48dg8yd1gchngjnc850as17wr3w287p1kwsq";
+    sha256 = "11vda7aqq82kpr88v4hr7zg19zfq970n3z4qp25my8b1fvlgdjhi";
   };
 
   outputs = [ "out" ];
 
   patches = [
     ./wallabag-data.patch # exposes $WALLABAG_DATA
-    (fetchurl {
-      # Fixes "Uncaught RuntimeException: Setting "piwik_enabled" couldn't be found."; https://github.com/wallabag/wallabag/issues/3662
-      # Remove >= 2.4.0
-      url = "https://github.com/wallabag/wallabag/pull/3868.patch";
-      sha256 = "0pfxsv8ncaxkjkybim3v3iswmfv1vbjlzmvj50nn9blvjwc9gxjg";
-    })
   ];
 
   dontBuild = true;
diff --git a/pkgs/servers/web-apps/wallabag/wallabag-data.patch b/pkgs/servers/web-apps/wallabag/wallabag-data.patch
index 086e93959800..f70ffce29052 100644
--- a/pkgs/servers/web-apps/wallabag/wallabag-data.patch
+++ b/pkgs/servers/web-apps/wallabag/wallabag-data.patch
@@ -1,9 +1,9 @@
 diff --git a/app/AppKernel.php b/app/AppKernel.php
-index 40726f05..7d44e600 100644
+index 347197e..902b558 100644
 --- a/app/AppKernel.php
 +++ b/app/AppKernel.php
-@@ -58,14 +58,19 @@ class AppKernel extends Kernel
-         return $bundles;
+@@ -69,19 +69,24 @@ class AppKernel extends Kernel
+         return __DIR__;
      }
  
 +    public function getProjectDir()
@@ -24,3 +24,9 @@ index 40726f05..7d44e600 100644
      }
  
      public function registerContainerConfiguration(LoaderInterface $loader)
+     {
+-        $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml');
++        $loader->load($this->getProjectDir() . '/app/config/config_' . $this->getEnvironment() . '.yml');
+ 
+         $loader->load(function ($container) {
+             if ($container->getParameter('use_webpack_dev_server')) {
-- 
cgit v1.2.3