sourcehut.dispatchsrht: remove
dispatch has been deprecated since August (see https://sourcehut.org/blog/2022-08-01-dispatch-deprecation-plans/).
This commit is contained in:
parent
608eb68fd8
commit
8538873dab
|
@ -573,6 +573,16 @@
|
|||
instead.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>services.sourcehut.dispatch</literal> and the
|
||||
corresponding package
|
||||
(<literal>sourcehut.dispatchsrht</literal>) have been removed
|
||||
due to
|
||||
<link xlink:href="https://sourcehut.org/blog/2022-08-01-dispatch-deprecation-plans/">upstream
|
||||
deprecation</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>p4</literal> package now only includes the
|
||||
|
|
|
@ -186,6 +186,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
|
|||
- `services.hbase` has been renamed to `services.hbase-standalone`.
|
||||
For production HBase clusters, use `services.hadoop.hbase` instead.
|
||||
|
||||
- `services.sourcehut.dispatch` and the corresponding package (`sourcehut.dispatchsrht`) have been removed due to [upstream deprecation](https://sourcehut.org/blog/2022-08-01-dispatch-deprecation-plans/).
|
||||
|
||||
- The `p4` package now only includes the open-source Perforce Helix Core command-line client and APIs. It no longer installs the unfree Helix Core Server binaries `p4d`, `p4broker`, and `p4p`. To install the Helix Core Server binaries, use the `p4d` package instead.
|
||||
|
||||
- The `coq` package and versioned variants starting at `coq_8_14` no
|
||||
|
|
|
@ -88,7 +88,6 @@ let
|
|||
# Sourcehut services
|
||||
srht
|
||||
buildsrht
|
||||
dispatchsrht
|
||||
gitsrht
|
||||
hgsrht
|
||||
hubsrht
|
||||
|
@ -109,13 +108,13 @@ in
|
|||
{
|
||||
options.services.sourcehut = {
|
||||
enable = mkEnableOption (lib.mdDoc ''
|
||||
sourcehut - git hosting, continuous integration, mailing list, ticket tracking,
|
||||
task dispatching, wiki and account management services
|
||||
sourcehut - git hosting, continuous integration, mailing list, ticket tracking, wiki
|
||||
and account management services
|
||||
'');
|
||||
|
||||
services = mkOption {
|
||||
type = with types; listOf (enum
|
||||
[ "builds" "dispatch" "git" "hg" "hub" "lists" "man" "meta" "pages" "paste" "todo" ]);
|
||||
[ "builds" "git" "hg" "hub" "lists" "man" "meta" "pages" "paste" "todo" ]);
|
||||
defaultText = "locally enabled services";
|
||||
description = lib.mdDoc ''
|
||||
Services that may be displayed as links in the title bar of the Web interface.
|
||||
|
@ -301,32 +300,6 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
options."dispatch.sr.ht" = commonServiceSettings "dispatch" // {
|
||||
};
|
||||
options."dispatch.sr.ht::github" = {
|
||||
oauth-client-id = mkOptionNullOrStr "OAuth client id.";
|
||||
oauth-client-secret = mkOptionNullOrStr "OAuth client secret.";
|
||||
};
|
||||
options."dispatch.sr.ht::gitlab" = {
|
||||
enabled = mkEnableOption (lib.mdDoc "GitLab integration");
|
||||
canonical-upstream = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc "Canonical upstream.";
|
||||
default = "gitlab.com";
|
||||
};
|
||||
repo-cache = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc "Repository cache directory.";
|
||||
default = "./repo-cache";
|
||||
};
|
||||
"gitlab.com" = mkOption {
|
||||
type = with types; nullOr str;
|
||||
description = lib.mdDoc "GitLab id and secret.";
|
||||
default = null;
|
||||
example = "GitLab:application id:secret";
|
||||
};
|
||||
};
|
||||
|
||||
options."builds.sr.ht" = commonServiceSettings "builds" // {
|
||||
allow-free = mkEnableOption (lib.mdDoc "nonpaying users to submit builds");
|
||||
redis = mkOption {
|
||||
|
@ -1021,11 +994,6 @@ in
|
|||
];
|
||||
})
|
||||
|
||||
(import ./service.nix "dispatch" {
|
||||
inherit configIniOfService;
|
||||
port = 5005;
|
||||
})
|
||||
|
||||
(import ./service.nix "git" (let
|
||||
baseService = {
|
||||
path = [ cfg.git.package ];
|
||||
|
@ -1416,6 +1384,10 @@ in
|
|||
(mkRenamedOptionModule [ "services" "sourcehut" "address" ]
|
||||
[ "services" "sourcehut" "listenAddress" ])
|
||||
|
||||
(mkRemovedOptionModule [ "services" "sourcehut" "dispatch" ] ''
|
||||
dispatch is deprecated. See https://sourcehut.org/blog/2022-08-01-dispatch-deprecation-plans/
|
||||
for more information.
|
||||
'')
|
||||
];
|
||||
|
||||
meta.doc = ./sourcehut.xml;
|
||||
|
|
|
@ -15,7 +15,6 @@ let
|
|||
srht = self.callPackage ./core.nix { inherit fetchNodeModules; };
|
||||
|
||||
buildsrht = self.callPackage ./builds.nix { };
|
||||
dispatchsrht = self.callPackage ./dispatch.nix { };
|
||||
gitsrht = self.callPackage ./git.nix { };
|
||||
hgsrht = self.callPackage ./hg.nix { };
|
||||
hubsrht = self.callPackage ./hub.nix { };
|
||||
|
@ -33,7 +32,8 @@ with python.pkgs; recurseIntoAttrs {
|
|||
inherit python;
|
||||
coresrht = toPythonApplication srht;
|
||||
buildsrht = toPythonApplication buildsrht;
|
||||
dispatchsrht = toPythonApplication dispatchsrht;
|
||||
# Added 2022-10-29
|
||||
dispatchsrht = throw "dispatch is deprecated. See https://sourcehut.org/blog/2022-08-01-dispatch-deprecation-plans/ for more information.";
|
||||
gitsrht = toPythonApplication gitsrht;
|
||||
hgsrht = toPythonApplication hgsrht;
|
||||
hubsrht = toPythonApplication hubsrht;
|
||||
|
|
|
@ -1,40 +0,0 @@
|
|||
{ lib
|
||||
, fetchFromSourcehut
|
||||
, buildPythonPackage
|
||||
, srht
|
||||
, pyyaml
|
||||
, PyGithub
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dispatchsrht";
|
||||
version = "0.15.34";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "dispatch.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "sha256-bZ4ZKohMozZIyP0TUgxETOECib4XGUv29+Mg8ZsoMf8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
srht
|
||||
pyyaml
|
||||
PyGithub
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
export PKGVER=${version}
|
||||
export SRHT_PATH=${srht}/${python.sitePackages}/srht
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "dispatchsrht" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://git.sr.ht/~sircmpwn/dispatch.sr.ht";
|
||||
description = "Task dispatcher and service integration tool for the sr.ht network";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ eadwu ];
|
||||
};
|
||||
}
|
|
@ -67,7 +67,7 @@ else
|
|||
# because the reported $oldHash to be changed
|
||||
# may not actually be in $default_nix
|
||||
# but in the file of one of its dependencies.
|
||||
services=( "srht" "scmsrht" "buildsrht" "dispatchsrht" "gitsrht" "hgsrht" "hubsrht" "listssrht" "mansrht"
|
||||
services=( "srht" "scmsrht" "buildsrht" "gitsrht" "hgsrht" "hubsrht" "listssrht" "mansrht"
|
||||
"metasrht" "pagessrht" "pastesrht" "todosrht" )
|
||||
fi
|
||||
|
||||
|
|
Loading…
Reference in a new issue