public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wallabag: 2.3.8 -> 2.4.0

Browse Source 
https://github.com/wallabag/wallabag/releases/tag/2.4.0
This commit is contained in:
Martin Weinelt 2020-12-10 21:40:32 +01:00
parent 5ba85d6b34
commit d90b0f22cf
No known key found for this signature in database
GPG Key ID: 87C1E9888F856759
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/servers/web-apps/wallabag/default.nix
View File

@ -2,25 +2,19 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wallabag"; pname = "wallabag";
version = "2.3.8"; version = "2.4.0";
# remember to rm -r var/cache/* after a rebuild or unexpected errors will occur # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur
src = fetchurl { src = fetchurl {
url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz";
sha256 = "1sr62hfk2f2rl5by48dg8yd1gchngjnc850as17wr3w287p1kwsq"; sha256 = "11vda7aqq82kpr88v4hr7zg19zfq970n3z4qp25my8b1fvlgdjhi";
}; };
outputs = [ "out" ]; outputs = [ "out" ];
patches = [ patches = [
./wallabag-data.patch # exposes $WALLABAG_DATA ./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; dontBuild = true;

12
pkgs/servers/web-apps/wallabag/wallabag-data.patch
View File

@ -1,9 +1,9 @@
diff --git a/app/AppKernel.php b/app/AppKernel.php diff --git a/app/AppKernel.php b/app/AppKernel.php
index 40726f05..7d44e600 100644 index 347197e..902b558 100644
--- a/app/AppKernel.php --- a/app/AppKernel.php
+++ b/app/AppKernel.php +++ b/app/AppKernel.php
@@ -58,14 +58,19 @@ class AppKernel extends Kernel @@ -69,19 +69,24 @@ class AppKernel extends Kernel
return $bundles; return __DIR__;
} }
+ public function getProjectDir() + public function getProjectDir()
@ -24,3 +24,9 @@ index 40726f05..7d44e600 100644
} }
public function registerContainerConfiguration(LoaderInterface $loader) 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')) {