diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 5744de96b74..a2f1a7ad8e0 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -355,6 +355,17 @@ services.xserver.displayManager.defaultSession = "xfce+icewm"; now uses the short rather than full version string. + + + Restya-Board has been upgraded from 6.0 to 6.7, improving security and + adding features but with potential incompatibilities. + + + Please note: When upgrading this software, you have to run the database + migration scripts manually. You can find them in the source repository + under /sql. + + diff --git a/pkgs/servers/web-apps/restya-board/default.nix b/pkgs/servers/web-apps/restya-board/default.nix index 5c105e85a87..ca692017b09 100644 --- a/pkgs/servers/web-apps/restya-board/default.nix +++ b/pkgs/servers/web-apps/restya-board/default.nix @@ -15,12 +15,12 @@ let in stdenv.mkDerivation rec { - pname = "rstya-board"; - version = "0.6"; + pname = "restya-board"; + version = "0.6.7"; src = fetchurl { url = "https://github.com/RestyaPlatform/board/releases/download/v${version}/board-v${version}.zip"; - sha256 = "1js8c69qmga7bikp66fqhch3n2vw49918z32q88lz3havqzai8gd"; + sha256 = "07xiakk8fljc79qi80n5945hy2rqrc8kn2i7d49rri2f440wv51i"; }; nativeBuildInputs = [ unzip ]; @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { unzip -d $out $src cd $out - patch -p1 < ${./fix_request-uri.patch} chmod +x $out/server/php/shell/*.sh @@ -41,6 +40,13 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Web-based kanban board"; + longDescription = '' + An open Source Trello-like Kanban-Board based on the Restya platform. + Please note: When updating this software, you have to run the database + migration scripts manually. You can find them at in the source repository + under /sql. More detailed instructions can be found at + https://github.com/RestyaPlatform/board/tree/v0.6.7#upgrade + ''; license = licenses.osl3; homepage = http://restya.com; maintainers = with maintainers; [ tstrobel ]; diff --git a/pkgs/servers/web-apps/restya-board/fix_request-uri.patch b/pkgs/servers/web-apps/restya-board/fix_request-uri.patch deleted file mode 100644 index 9b96756e829..00000000000 --- a/pkgs/servers/web-apps/restya-board/fix_request-uri.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/server/php/R/r.php b/server/php/R/r.php ---- a/server/php/R/r.php -+++ b/server/php/R/r.php -@@ -18,7 +18,7 @@ $r_debug = ''; - $authUser = $client = $form = array(); - $_server_protocol = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') ? 'https' : 'http'; - $_server_domain_url = $_server_protocol . '://' . $_SERVER['HTTP_HOST']; // http://localhost --header('x-response-url:' . $_SERVER[REQUEST_URI]); -+header('x-response-url:' . $_SERVER['REQUEST_URI']); - header('Access-Control-Allow-Origin: *'); - header('Access-Control-Allow-Methods: *'); - require_once '../config.inc.php';