Upgrade nixos

2 files changed, 2 insertions, 29 deletions

diff --git a/pkgs/webapps/davical/davical_19eb79ebf9250e5f339675319902458c40ed1755.patch b/pkgs/webapps/davical/davical_19eb79ebf9250e5f339675319902458c40ed1755.patch
deleted file mode 100644
index 2a08a5c1..00000000
--- a/pkgs/webapps/davical/davical_19eb79ebf9250e5f339675319902458c40ed1755.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/inc/ui/collection-edit.php b/inc/ui/collection-edit.php
-index 3af9edd3b8c4ad9074113273175098841af6a28e..8c1d84012b035f7bc7faedcb24916581a02a5d3e 100644
---- a/inc/ui/collection-edit.php
-+++ b/inc/ui/collection-edit.php
-@@ -190,7 +190,7 @@ $privilege_xlate = array(
- * @param dbrow $row The row object we read from the database.
- * @return string The formatted privileges.
- */
--function collection_privilege_format_function( $value, $column, $row ) {
-+function collection_privilege_format_function( $value, $column = NULL, $row = NULL ) {
-   global $privilege_xlate;
- 
-   $privs = bits_to_privilege($value, 'calendar');
-diff --git a/inc/ui/principal-edit.php b/inc/ui/principal-edit.php
-index 20dee7fa4ca2235ff2f74be0dfb52cbe937ef822..2e37cd596b597bcce1e59d7c02a1c5fc2a7f88ce 100644
---- a/inc/ui/principal-edit.php
-+++ b/inc/ui/principal-edit.php
-@@ -454,7 +454,7 @@ EOTEMPLATE;
- * @param dbrow $row The row object we read from the database.
- * @return string The formatted privileges.
- */
--function principal_privilege_format_function( $value, $column, $row ) {
-+function principal_privilege_format_function( $value, $column = NULL, $row = NULL ) {
-   global $privilege_xlate;
- 
-   $privs = bits_to_privilege($value,'*');
diff --git a/pkgs/webapps/davical/default.nix b/pkgs/webapps/davical/default.nix
index 52d87366..67355539 100644
--- a/pkgs/webapps/davical/default.nix
+++ b/pkgs/webapps/davical/default.nix
@@ -1,16 +1,15 @@
 { davical_config ? "/etc/davical/config.php", stdenv, fetchurl, gettext }:
 stdenv.mkDerivation rec {
-  version = "1.1.7";
+  version = "1.1.9.2";
   name = "davical-${version}";
   src = fetchurl {
     url = "https://www.davical.org/downloads/davical_${version}.orig.tar.xz";
-    sha256 = "1ar5m2dxr92b204wkdi8z33ir9vz2jbh5k1p74icpv9ywifvjjp9";
+    sha256 = "133p7fl544df2rqw1nbnj5nj6bvb9kng9q0c3iqrqlpawq3a6ilh";
   };
   unpackCmd = ''
     tar --one-top-level -xf $curSrc
   '';
   makeFlags = "all";
-  patches = [ ./davical_19eb79ebf9250e5f339675319902458c40ed1755.patch ];
   installPhase = ''
     mkdir -p $out
     cp -ra config dba docs htdocs inc locale po scripts testing zonedb $out