summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-06-15 13:08:48 +0200
committerGitHub <noreply@github.com>2019-06-15 13:08:48 +0200
commit395da1280e8146e47eb0dc1c9bc10284fe0334f1 (patch)
tree12053b9a3344c9fa6f01f68ac85657e50ca9f91a
parent3a61b882690c949773fea6cecb1fc961f9119edd (diff)
parent3fabe1accbf44059caa05790c2d1afa0f32dd447 (diff)
Merge pull request #63100 from aanderse/phabricator-remove
drop unmaintained phabricator package, service, and httpd subservice
-rw-r--r--nixos/doc/manual/release-notes/rl-1909.xml6
-rw-r--r--nixos/modules/module-list.nix1
-rw-r--r--nixos/modules/services/misc/phd.nix52
-rw-r--r--nixos/modules/services/web-servers/apache-httpd/phabricator.nix50
-rw-r--r--nixos/tests/phabricator.nix77
-rw-r--r--pkgs/misc/phabricator/default.nix33
-rw-r--r--pkgs/top-level/all-packages.nix2
7 files changed, 6 insertions, 215 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index b92cefa441d8..2a3e565a6f6a 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -283,6 +283,12 @@
so you'll need to set <option>hardware.pulseaudio.daemon.config.resample-method</option> back to <literal>speex-float-1</literal>.
</para>
</listitem>
+ <listitem>
+ <para>
+ The <literal>phabricator</literal> package and associated <literal>httpd.extraSubservice</literal>, as well as the
+ <literal>phd</literal> service have been removed from nixpkgs due to lack of maintainer.
+ </para>
+ </listitem>
</itemizedlist>
</section>
</section>
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index bb33d8e6d95a..50e3078d9770 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -444,7 +444,6 @@
./services/misc/packagekit.nix
./services/misc/paperless.nix
./services/misc/parsoid.nix
- ./services/misc/phd.nix
./services/misc/plex.nix
./services/misc/tautulli.nix
./services/misc/pykms.nix
diff --git a/nixos/modules/services/misc/phd.nix b/nixos/modules/services/misc/phd.nix
deleted file mode 100644
index e605ce5de16e..000000000000
--- a/nixos/modules/services/misc/phd.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
- cfg = config.services.phd;
-
-in
-
-{
-
- ###### interface
-
- options = {
-
- services.phd = {
-
- enable = mkOption {
- default = false;
- description = "
- Enable daemons for phabricator.
- ";
- };
-
- };
-
- };
-
- ###### implementation
-
- config = mkIf cfg.enable {
-
- systemd.services.phd = {
- path = [ pkgs.phabricator pkgs.php pkgs.mercurial pkgs.git pkgs.subversion ];
-
- after = [ "httpd.service" ];
- wantedBy = [ "multi-user.target" ];
-
- serviceConfig = {
- ExecStart = "${pkgs.phabricator}/phabricator/bin/phd start";
- ExecStop = "${pkgs.phabricator}/phabricator/bin/phd stop";
- User = "wwwrun";
- RestartSec = "30s";
- Restart = "always";
- StartLimitInterval = "1m";
- };
- };
-
- };
-
-}
diff --git a/nixos/modules/services/web-servers/apache-httpd/phabricator.nix b/nixos/modules/services/web-servers/apache-httpd/phabricator.nix
deleted file mode 100644
index efd4a7b5f0fb..000000000000
--- a/nixos/modules/services/web-servers/apache-httpd/phabricator.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
- phabricatorRoot = pkgs.phabricator;
-in {
-
- enablePHP = true;
- extraApacheModules = [ "mod_rewrite" ];
- DocumentRoot = "${phabricatorRoot}/phabricator/webroot";
-
- options = {
- git = mkOption {
- default = true;
- description = "Enable git repositories.";
- };
- mercurial = mkOption {
- default = true;
- description = "Enable mercurial repositories.";
- };
- subversion = mkOption {
- default = true;
- description = "Enable subversion repositories.";
- };
- };
-
- extraConfig = ''
- DocumentRoot ${phabricatorRoot}/phabricator/webroot
-
- RewriteEngine on
- RewriteRule ^/rsrc/(.*) - [L,QSA]
- RewriteRule ^/favicon.ico - [L,QSA]
- RewriteRule ^(.*)$ /index.php?__path__=$1 [B,L,QSA]
- '';
-
- extraServerPath = [
- "${pkgs.which}"
- "${pkgs.diffutils}"
- ] ++
- (if config.mercurial then ["${pkgs.mercurial}"] else []) ++
- (if config.subversion then ["${pkgs.subversion.out}"] else []) ++
- (if config.git then ["${pkgs.git}"] else []);
-
- startupScript = pkgs.writeScript "activatePhabricator" ''
- mkdir -p /var/repo
- chown wwwrun /var/repo
- '';
-
-}
diff --git a/nixos/tests/phabricator.nix b/nixos/tests/phabricator.nix
deleted file mode 100644
index db23331842cb..000000000000
--- a/nixos/tests/phabricator.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-import ./make-test.nix ({ pkgs, ... }: {
- name = "phabricator";
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ ];
- };
-
- nodes = {
- storage =
- { ... }:
- { services.nfs.server.enable = true;
- services.nfs.server.exports = ''
- /repos 192.168.1.0/255.255.255.0(rw,no_root_squash)
- '';
- services.nfs.server.createMountPoints = true;
- };
-
- webserver =
- { pkgs, ... }:
- { fileSystems = pkgs.lib.mkVMOverride
- [ { mountPoint = "/repos";
- device = "storage:/repos";
- fsType = "nfs";
- }
- ];
- networking.firewall.enable = false;
- networking.useDHCP = false;
-
- services = {
- httpd = {
- enable = true;
- adminAddr = "root@localhost";
- virtualHosts = [{
- hostName = "phabricator.local";
- extraSubservices = [{serviceType = "phabricator";}];
- }];
- };
-
- phd = {
- enable = true;
- };
-
- mysql = {
- enable = true;
- package = pkgs.mysql;
- extraOptions = ''
- sql_mode=STRICT_ALL_TABLES
- '';
- };
- };
-
- environment.systemPackages = [ pkgs.php ];
- };
-
- client =
- { ... }:
- { imports = [ ./common/x11.nix ];
- services.xserver.desktopManager.plasma5.enable = true;
- };
- };
-
- testScript =
- ''
- startAll;
-
- $client->waitForX;
-
- $webserver->waitForUnit("mysql");
- $webserver->waitForUnit("httpd");
- $webserver->execute("cd /nix/store; less >/repos/log1");
-
- $client->sleep(30); # loading takes a long time
- $client->execute("konqueror http://webserver/ &");
- $client->sleep(90); # loading takes a long time
-
- $client->screenshot("screen");
- '';
-})
diff --git a/pkgs/misc/phabricator/default.nix b/pkgs/misc/phabricator/default.nix
deleted file mode 100644
index 0dde5b2b6d7c..000000000000
--- a/pkgs/misc/phabricator/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, pkgs }:
-
-stdenv.mkDerivation rec {
- version = "2014-07-16";
- name = "phabricator-${version}";
- srcLibphutil = pkgs.fetchgit {
- url = git://github.com/facebook/libphutil.git;
- rev = "48a04395363d6c1dd9f66057bd11fd70d4665ba9";
- sha256 = "198w4kq86py31m86sgpinz2va3m9j8k92q2pa2qzzi0lyf1sb8c3";
- };
- srcArcanist = pkgs.fetchgit {
- url = git://github.com/facebook/arcanist.git;
- rev = "97501da16416fbfdc6e84bd60abcbf5ad9506225";
- sha256 = "1afn25db4pv3amjh06p8jk3s14i5139n59zk3h4awk84d2nj1kzk";
- };
- srcPhabricator = pkgs.fetchgit {
- url = git://github.com/phacility/phabricator.git;
- rev = "7ac5abb97934f7399b67762aa98f59f667711bf3";
- sha256 = "1hk6fnvdfn5w82wnprjdkjm8akzw3zfqm460cjqd8v3q5n21ddpf";
- };
-
- buildCommand = ''
- mkdir -p $out
- cp -R ${srcLibphutil} $out/libphutil
- cp -R ${srcArcanist} $out/arcanist
- cp -R ${srcPhabricator} $out/phabricator
- '';
-
- meta = {
- platforms = stdenv.lib.platforms.unix;
- license = stdenv.lib.licenses.asl20;
- };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7f89d7475ff..bf17ccc91a8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23640,8 +23640,6 @@ in
pgfplots = callPackage ../tools/typesetting/tex/pgfplots { };
- phabricator = callPackage ../misc/phabricator { };
-
physlock = callPackage ../misc/screensavers/physlock { };
pjsip = callPackage ../applications/networking/pjsip { };