Merge pull request #63100 from aanderse/phabricator-remove
drop unmaintained phabricator package, service, and httpd subservice
This commit is contained in:
Frederik Rietdijk
GitHub
commit
395da1280e
@ -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>
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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";
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
@ -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
|
||||
'';
|
||||
|
||||
}
|
||||
@ -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");
|
||||
'';
|
||||
})
|
||||
@ -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;
|
||||
};
|
||||
}
|
||||
@ -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 { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user