X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=pkgs%2Fwebapps%2Fdavical%2Fdefault.nix;h=045a93bd370aed6cb7efb1bada2f817738341f68;hb=4ec2d441373e1115923e5258659c5a39cafcce4e;hp=fefc00fe46585f9967864fb2150efa137658798c;hpb=452c23140ea93ce301e7fafdc37d28009bd6f613;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/pkgs/webapps/davical/default.nix b/pkgs/webapps/davical/default.nix
index fefc00f..045a93b 100644
--- a/pkgs/webapps/davical/default.nix
+++ b/pkgs/webapps/davical/default.nix
@@ -1,20 +1,23 @@
-{ config ? "/etc/davical/config.php", stdenv, fetchurl, gettext }:
+{ davical_config ? "/etc/davical/config.php", stdenv, fetchurl, gettext }:
 stdenv.mkDerivation rec {
-  version = "1.1.7";
+  version = "1.1.10";
   name = "davical-${version}";
   src = fetchurl {
     url = "https://www.davical.org/downloads/davical_${version}.orig.tar.xz";
-    sha256 = "1ar5m2dxr92b204wkdi8z33ir9vz2jbh5k1p74icpv9ywifvjjp9";
+    sha256 = "1d8zw558qrz2rybdv853ai04ar7v5a2dsypnffapx9ihgnrv4hq3";
   };
   unpackCmd = ''
     tar --one-top-level -xf $curSrc
   '';
   makeFlags = "all";
-  patches = [ ./davical_19eb79ebf9250e5f339675319902458c40ed1755.patch ];
+  patchPhase = ''
+    # https://gitlab.com/davical-project/davical/-/issues/229
+    sed -i -e 's/"newpass1"/"newpass1", "password"/g' htdocs/always.php
+  '';
   installPhase = ''
     mkdir -p $out
     cp -ra config dba docs htdocs inc locale po scripts testing zonedb $out
-    ln -s ${config} $out/config/config.php
+    ln -s ${davical_config} $out/config/config.php
   '';
   buildInputs = [ gettext ];
 }