aboutsummaryrefslogtreecommitdiff
path: root/infra/libkookie/nixpkgs/pkgs/servers/web-apps
diff options
context:
space:
mode:
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/servers/web-apps')
-rw-r--r--infra/libkookie/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/servers/web-apps/dokuwiki/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/servers/web-apps/engelsystem/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/servers/web-apps/jirafeau/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/servers/web-apps/moodle/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/servers/web-apps/shaarli/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/servers/web-apps/shaarli/material-theme.nix38
-rw-r--r--infra/libkookie/nixpkgs/pkgs/servers/web-apps/sogo/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix4
10 files changed, 16 insertions, 56 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.nix b/infra/libkookie/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.nix
index 19c034aa78b3..208bb3c72c7f 100644
--- a/infra/libkookie/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.nix
+++ b/infra/libkookie/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.nix
@@ -6,7 +6,7 @@
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
- inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+ inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
diff --git a/infra/libkookie/nixpkgs/pkgs/servers/web-apps/dokuwiki/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/web-apps/dokuwiki/default.nix
index 8177e1d22262..2cb20e4932f5 100644
--- a/infra/libkookie/nixpkgs/pkgs/servers/web-apps/dokuwiki/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/servers/web-apps/dokuwiki/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "splitbrain";
- repo = "${pname}";
+ repo = pname;
rev = "release_stable_${version}";
sha256 = "09swcqyd06l3481k190gmlr3b33dlv1lw1kk9nyh5b4sa5p3k7kk";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/servers/web-apps/engelsystem/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/web-apps/engelsystem/default.nix
index 8ef6a9afa0e8..92d50ff67c8e 100644
--- a/infra/libkookie/nixpkgs/pkgs/servers/web-apps/engelsystem/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/servers/web-apps/engelsystem/default.nix
@@ -11,8 +11,6 @@ in stdenv.mkDerivation rec {
url =
"https://github.com/engelsystem/engelsystem/releases/download/v3.1.0/engelsystem-v3.1.0.zip";
sha256 = "01wra7li7n5kn1l6xkrmw4vlvvyqh089zs43qzn98hj0mw8gw7ai";
- # This is needed, because the zip contains a directory with world write access, which is not allowed in nix
- extraPostFetch = "chmod -R a-w $out";
};
buildInputs = [ phpExt ];
@@ -43,7 +41,7 @@ in stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description =
- "Coordinate your helpers in teams, assign them to work shifts or let them decide for themselves when and where they want to help with what";
+ "Coordinate your volunteers in teams, assign them to work shifts or let them decide for themselves when and where they want to help with what";
license = licenses.gpl2;
homepage = "https://engelsystem.de";
maintainers = with maintainers; [ kloenk ];
diff --git a/infra/libkookie/nixpkgs/pkgs/servers/web-apps/jirafeau/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/web-apps/jirafeau/default.nix
index e0b119da6d86..33cde2c5922c 100644
--- a/infra/libkookie/nixpkgs/pkgs/servers/web-apps/jirafeau/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/servers/web-apps/jirafeau/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitLab {
owner = "mojo42";
repo = "Jirafeau";
- rev = "${version}";
+ rev = version;
sha256 = "09gq5zhynygpqj0skq7ifnn9yjjg7qnc6kjvaas7f53av2707z4c";
};
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "Jirafeau is a web site permitting to upload a file in a simple way and give an unique link to it";
+ description = "Website permitting upload of a file in a simple way and giving a unique link to it";
license = licenses.agpl3;
homepage = "https://gitlab.com/mojo42/Jirafeau";
platforms = platforms.all;
diff --git a/infra/libkookie/nixpkgs/pkgs/servers/web-apps/moodle/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/web-apps/moodle/default.nix
index b9f11b5c1798..da84481c9353 100644
--- a/infra/libkookie/nixpkgs/pkgs/servers/web-apps/moodle/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/servers/web-apps/moodle/default.nix
@@ -1,8 +1,8 @@
{ lib, stdenv, fetchurl, writeText, plugins ? [ ] }:
let
- version = "3.9.2";
- stableVersion = builtins.substring 0 2 (builtins.replaceStrings ["."] [""] version);
+ version = "3.10";
+ stableVersion = lib.concatStrings (lib.take 2 (lib.splitVersion version));
in stdenv.mkDerivation rec {
pname = "moodle";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url =
"https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz";
- sha256 = "ygy9xlYs49Ga3u2Q/vqxhnDnqXsrh6YYTAtcsXF8kNo=";
+ sha256 = "4aYKZmXym1Tq/462PIgJb4sHGUclEkU0Ok1iQJ6u0aw=";
};
phpConfig = writeText "config.php" ''
diff --git a/infra/libkookie/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix
index 432f59564060..13ad9d69ad6b 100644
--- a/infra/libkookie/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rss-bridge";
- version = "2020-02-26";
+ version = "2020-11-10";
src = fetchFromGitHub {
owner = "RSS-Bridge";
repo = "rss-bridge";
- rev = "${version}";
- sha256 = "075k4bylx9308d083ry5a9q4629ccnrnndqqdqp1g42rzlqrw79q";
+ rev = version;
+ sha256 = "00cp61lqvhi7b7j0rglsqg3l7cg8s9b8vq098bgvg5dygyi44hyv";
};
patchPhase = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/servers/web-apps/shaarli/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/web-apps/shaarli/default.nix
index 288c30734fe1..a4374b833908 100644
--- a/infra/libkookie/nixpkgs/pkgs/servers/web-apps/shaarli/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/servers/web-apps/shaarli/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "shaarli";
- version = "0.11.1";
+ version = "0.12.1";
src = fetchurl {
url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz";
- sha256 = "1psijcmi24hk0gxh1zdsm299xj11i7find2045nnx3r96cgnwjpn";
+ sha256 = "02zwfr92bmr8pnkrg6my31wx2qapddcgmfsq44msfpmvvnxfj57n";
};
outputs = [ "out" "doc" ];
diff --git a/infra/libkookie/nixpkgs/pkgs/servers/web-apps/shaarli/material-theme.nix b/infra/libkookie/nixpkgs/pkgs/servers/web-apps/shaarli/material-theme.nix
deleted file mode 100644
index bce08646a3b5..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/servers/web-apps/shaarli/material-theme.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
- pname = "shaarli-material";
- version = "0.10.4";
-
- src = fetchFromGitHub {
- owner = "kalvn";
- repo = "Shaarli-Material";
- rev = "v${version}";
- sha256 = "161kf7linyl2l2d7y60v96xz3fwa572fqm1vbm58mjgkzkfndhrv";
- };
-
- patchPhase = ''
- for f in material/*.html
- do
- substituteInPlace $f \
- --replace '.min.css?v={$version_hash}"' '.min.css#"' \
- --replace '.min.js?v={$version_hash}"' '.min.js#"' \
- --replace '.png"' '.png#"'
- done
- '';
-
- installPhase = ''
- mv material/ $out
- '';
-
- meta = with stdenv.lib; {
- # This package has not been updated for the new build process
- # introduced in 0.10.3 which depends on npm and gulp.
- broken = true;
- description = "A theme base on Google's Material Design for Shaarli, the superfast delicious clone";
- license = licenses.mit;
- homepage = "https://github.com/kalvn/Shaarli-Material";
- maintainers = with maintainers; [ ];
- platforms = platforms.all;
- };
-}
diff --git a/infra/libkookie/nixpkgs/pkgs/servers/web-apps/sogo/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/web-apps/sogo/default.nix
index 2e97ab31725e..aa2a9fc92588 100644
--- a/infra/libkookie/nixpkgs/pkgs/servers/web-apps/sogo/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/servers/web-apps/sogo/default.nix
@@ -67,7 +67,7 @@ with lib; gnustep.stdenv.mkDerivation rec {
'';
meta = {
- description = "SOGo is a very fast and scalable modern collaboration suite (groupware)";
+ description = "A very fast and scalable modern collaboration suite (groupware)";
license = with licenses; [ gpl2 lgpl21 ];
homepage = "https://sogo.nu/";
platforms = platforms.linux;
diff --git a/infra/libkookie/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix
index 019988093471..af2a41202671 100644
--- a/infra/libkookie/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wordpress";
- version = "5.5.1";
+ version = "5.5.3";
src = fetchurl {
url = "https://wordpress.org/${pname}-${version}.tar.gz";
- sha256 = "15cjp48q23fw8ryy39mlxi4rd3rha2yqyrnk5mhx0h72ygawx8k6";
+ sha256 = "sTkmdr9Mulw7XwNEMJBU81rwNV/agNpBjCznGuObrtQ=";
};
installPhase = ''