From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Wed, 23 Jan 2019 19:36:38 +0000 (+0100)
Subject: Upgrade wallabag
X-Git-Tag: nur_publish~303
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=commitdiff_plain;h=03525bd497437a156958a19652587733301c0a8a

Upgrade wallabag
---

diff --git a/virtual/modules/websites/tools/tools/wallabag.nix b/virtual/modules/websites/tools/tools/wallabag.nix
index 22089da..03291dc 100644
--- a/virtual/modules/websites/tools/tools/wallabag.nix
+++ b/virtual/modules/websites/tools/tools/wallabag.nix
@@ -57,13 +57,14 @@ let
           ldap_enabled_attribute: null
       '';
     webappDir = stdenv.mkDerivation rec {
+      __noChroot = true;
       # Beware when upgrading, I probably messed up with the migrations table
       # (due to a psql bug in wallabag)
-      version = "2.3.2";
+      version = "2.3.6";
       name = "wallabag-${version}";
       src = fetchurl {
         url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz";
-        sha256 = "17yczdvgl43j6wa7hksxi2b51afvyd56vdya6hbbv68iiba4jyh4";
+        sha256 = "0m0dy3r94ks5pfxyb9vbgrsm0vrwdl3jd5wqwg4f5vd107lq90q1";
       };
       patches = [ ./wallabag_ldap.patch ];
       dontBuild = "true";
@@ -87,8 +88,8 @@ let
       if [ ! -f "${varDir}/currentWebappDir" -o \
           "${webappDir}" != "$(cat ${varDir}/currentWebappDir 2>/dev/null)" ]; then
         pushd ${webappDir} > /dev/null
-        $wrapperDir/sudo -u wwwrun ./bin/console --env=prod doctrine:migrations:migrate --no-interaction
         $wrapperDir/sudo -u wwwrun ./bin/console --env=prod cache:clear
+        $wrapperDir/sudo -u wwwrun ./bin/console --env=prod doctrine:migrations:migrate --no-interaction
         popd > /dev/null
         echo -n "${webappDir}" > ${varDir}/currentWebappDir
       fi