pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #106597 from mweinelt/wallabag

wallabag: 2.3.8 -> 2.4.0

authored by

Martin Weinelt and committed by
GitHub 6867c3b3 5f9ed981

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