summaryrefslogtreecommitdiff
path: root/pkgs/webapps/davical
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2020-03-25 11:57:48 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2020-04-25 00:04:53 +0200
commit72300eb8116c960935a462564d96db6fac355bca (patch)
treeda182278dc7b1a39c287cc701cff73df2b44fc52 /pkgs/webapps/davical
parent22e09a87fb538a0eaf81837750b0948f26f79cf1 (diff)
downloadNUR-72300eb8116c960935a462564d96db6fac355bca.tar.gz
NUR-72300eb8116c960935a462564d96db6fac355bca.tar.zst
NUR-72300eb8116c960935a462564d96db6fac355bca.zip
Upgrade nixos
Diffstat (limited to 'pkgs/webapps/davical')
-rw-r--r--pkgs/webapps/davical/davical_19eb79ebf9250e5f339675319902458c40ed1755.patch26
-rw-r--r--pkgs/webapps/davical/default.nix5
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 @@
1diff --git a/inc/ui/collection-edit.php b/inc/ui/collection-edit.php
2index 3af9edd3b8c4ad9074113273175098841af6a28e..8c1d84012b035f7bc7faedcb24916581a02a5d3e 100644
3--- a/inc/ui/collection-edit.php
4+++ b/inc/ui/collection-edit.php
5@@ -190,7 +190,7 @@ $privilege_xlate = array(
6 * @param dbrow $row The row object we read from the database.
7 * @return string The formatted privileges.
8 */
9-function collection_privilege_format_function( $value, $column, $row ) {
10+function collection_privilege_format_function( $value, $column = NULL, $row = NULL ) {
11 global $privilege_xlate;
12
13 $privs = bits_to_privilege($value, 'calendar');
14diff --git a/inc/ui/principal-edit.php b/inc/ui/principal-edit.php
15index 20dee7fa4ca2235ff2f74be0dfb52cbe937ef822..2e37cd596b597bcce1e59d7c02a1c5fc2a7f88ce 100644
16--- a/inc/ui/principal-edit.php
17+++ b/inc/ui/principal-edit.php
18@@ -454,7 +454,7 @@ EOTEMPLATE;
19 * @param dbrow $row The row object we read from the database.
20 * @return string The formatted privileges.
21 */
22-function principal_privilege_format_function( $value, $column, $row ) {
23+function principal_privilege_format_function( $value, $column = NULL, $row = NULL ) {
24 global $privilege_xlate;
25
26 $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 @@
1{ davical_config ? "/etc/davical/config.php", stdenv, fetchurl, gettext }: 1{ davical_config ? "/etc/davical/config.php", stdenv, fetchurl, gettext }:
2stdenv.mkDerivation rec { 2stdenv.mkDerivation rec {
3 version = "1.1.7"; 3 version = "1.1.9.2";
4 name = "davical-${version}"; 4 name = "davical-${version}";
5 src = fetchurl { 5 src = fetchurl {
6 url = "https://www.davical.org/downloads/davical_${version}.orig.tar.xz"; 6 url = "https://www.davical.org/downloads/davical_${version}.orig.tar.xz";
7 sha256 = "1ar5m2dxr92b204wkdi8z33ir9vz2jbh5k1p74icpv9ywifvjjp9"; 7 sha256 = "133p7fl544df2rqw1nbnj5nj6bvb9kng9q0c3iqrqlpawq3a6ilh";
8 }; 8 };
9 unpackCmd = '' 9 unpackCmd = ''
10 tar --one-top-level -xf $curSrc 10 tar --one-top-level -xf $curSrc
11 ''; 11 '';
12 makeFlags = "all"; 12 makeFlags = "all";
13 patches = [ ./davical_19eb79ebf9250e5f339675319902458c40ed1755.patch ];
14 installPhase = '' 13 installPhase = ''
15 mkdir -p $out 14 mkdir -p $out
16 cp -ra config dba docs htdocs inc locale po scripts testing zonedb $out 15 cp -ra config dba docs htdocs inc locale po scripts testing zonedb $out