git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #63949 from aanderse/foswiki

foswiki: drop package & httpd subservice

commite61dd66eb41900cf3346810c7e584e7be2acccb8 authorAaron Andersen <aaron@fosslib.net> dateThu 11 Jul 2019, 20:02 (7 years ago) parent4346674649ec93
4 files changed+6−124
nixos/doc/manual/release-notes/rl-1909.xml+6 nixos/modules/services/web-servers/apache-httpd/foswiki.nix−78 pkgs/servers/foswiki/default.nix−44 pkgs/top-level/all-packages.nix−2
nixos/doc/manual/release-notes/rl-1909.xml+6
@@ -323,6 +323,12 @@
323323 The <literal>trac</literal> <literal>httpd.extraSubservice</literal> has been removed from nixpkgs because it was unmaintained.
324324 </para>
325325 </listitem>
326+ <listitem>
327+ <para>
328+ The <literal>foswiki</literal> package and associated <literal>httpd.extraSubservice</literal> have been removed
329+ from nixpkgs due to lack of maintainer.
330+ </para>
331+ </listitem>
326332 </itemizedlist>
327333 </section>
328334</section>
nixos/modules/services/web-servers/apache-httpd/foswiki.nixdeleted−78
@@ -1,78 +0,0 @@
1−{ config, pkgs, lib, serverInfo, ... }:
2−let
3− inherit (pkgs) foswiki;
4− inherit (serverInfo.serverConfig) user group;
5− inherit (config) vardir;
6−in
7−{
8− options.vardir = lib.mkOption {
9− type = lib.types.path;
10− default = "/var/www/foswiki";
11− description = "The directory where variable foswiki data will be stored and served from.";
12− };
13−
14− # TODO: this will probably need to be better customizable
15− extraConfig =
16− let httpd-conf = pkgs.runCommand "foswiki-httpd.conf"
17− { preferLocalBuild = true; }
18− ''
19− substitute '${foswiki}/foswiki_httpd_conf.txt' "$out" \
20− --replace /var/www/foswiki/ "${vardir}/"
21− '';
22− in
23− ''
24− RewriteEngine on
25− RewriteRule /foswiki/(.*) ${vardir}/$1
26−
27− <Directory "${vardir}">
28− Require all granted
29− </Directory>
30−
31− Include ${httpd-conf}
32− <Directory "${vardir}/pub">
33− Options FollowSymlinks
34− </Directory>
35− '';
36−
37− /** This handles initial setup and updates.
38− It will probably need some tweaking, maybe per-site. */
39− startupScript = pkgs.writeScript "foswiki_startup.sh" (
40− let storeLink = "${vardir}/package"; in
41− ''
42− [ -e '${storeLink}' ] || needs_setup=1
43− mkdir -p '${vardir}'
44− cd '${vardir}'
45− ln -sf -T '${foswiki}' '${storeLink}'
46−
47− if [ -n "$needs_setup" ]; then # do initial setup
48− mkdir -p bin lib
49− # setup most of data/ as copies only
50− cp -r '${foswiki}'/data '${vardir}/'
51− rm -r '${vardir}'/data/{System,mime.types}
52− ln -sr -t '${vardir}/data/' '${storeLink}'/data/{System,mime.types}
53−
54− ln -sr '${storeLink}/locale' .
55−
56− mkdir pub
57− ln -sr '${storeLink}/pub/System' pub/
58−
59− mkdir templates
60− ln -sr '${storeLink}'/templates/* templates/
61−
62− ln -sr '${storeLink}/tools' .
63−
64− mkdir -p '${vardir}'/working/{logs,tmp}
65− ln -sr '${storeLink}/working/README' working/ # used to check dir validity
66−
67− chown -R '${user}:${group}' .
68− chmod +w -R .
69− fi
70−
71− # bin/* and lib/* shall always be overwritten, in case files are added
72− ln -srf '${storeLink}'/bin/* '${vardir}/bin/'
73− ln -srf '${storeLink}'/lib/* '${vardir}/lib/'
74− ''
75− /* Symlinking bin/ one-by-one ensures that ${vardir}/lib/LocalSite.cfg
76− is used instead of ${foswiki}/... */
77− );
78−}
pkgs/servers/foswiki/default.nixdeleted−44
@@ -1,44 +0,0 @@
1−{ stdenv, fetchurl, perlPackages }:
2−
3−perlPackages.buildPerlPackage rec {
4− pname = "foswiki";
5− version = "2.1.0";
6−
7− src = fetchurl {
8− url = "mirror://sourceforge/foswiki/${version}/Foswiki-${version}.tgz";
9− sha256 = "03286pb966h99zgickm2f20rgnqwp9wga5wfkdvirv084kjdh8vp";
10− };
11−
12− outputs = [ "out" ];
13−
14− buildInputs = with perlPackages; [
15− # minimum requirements from INSTALL.html#System_Requirements
16− AlgorithmDiff ArchiveTar AuthenSASL CGI CGISession CryptPasswdMD5
17− EmailMIME Encode Error FileCopyRecursive HTMLParser HTMLTree
18− IOSocketSSL JSON
19− LocaleMaketextLexicon LocaleMsgfmt
20− LWP URI perlPackages.Version
21− /*# optional dependencies
22− libapreq2 DBI DBDmysql DBDPg DBDSQLite FCGI FCGIProcManager
23− CryptSMIME CryptX509 ConvertPEM
24− */
25− ];
26−
27− preConfigure = ''
28− touch Makefile.PL
29− patchShebangs .
30− '';
31− configureScript = "bin/configure";
32−
33− # there's even no makefile
34− doCheck = false;
35− installPhase = ''cp -r . "$out" '';
36−
37− meta = with stdenv.lib; {
38− description = "An open, programmable collaboration platform";
39− homepage = http://foswiki.org;
40− license = licenses.gpl2Plus;
41− platforms = platforms.linux;
42− };
43−}
44−
pkgs/top-level/all-packages.nix−2
@@ -14281,8 +14281,6 @@ in
1428114281 firebird = callPackage ../servers/firebird { icu = null; stdenv = gcc5Stdenv; };
1428214282 firebirdSuper = firebird.override { icu = icu58; superServer = true; stdenv = gcc5Stdenv; };
1428314283
14284− foswiki = callPackage ../servers/foswiki { };
14285−
1428614284 frab = callPackage ../servers/web-apps/frab { };
1428714285
1428814286 freepops = callPackage ../servers/mail/freepops { };