treewide: remove aidalgol (#448386)
This commit is contained in:
Pol Dellaiera
@@ -832,12 +832,6 @@
|
||||
githubId = 209175;
|
||||
name = "Alesya Huzik";
|
||||
};
|
||||
aidalgol = {
|
||||
email = "aidalgol+nixpkgs@fastmail.net";
|
||||
github = "aidalgol";
|
||||
githubId = 2313201;
|
||||
name = "Aidan Gauland";
|
||||
};
|
||||
aij = {
|
||||
email = "aij+git@mrph.org";
|
||||
github = "aij";
|
||||
|
||||
@@ -127,7 +127,7 @@ In addition to numerous new and updated packages, this release has the following
|
||||
|
||||
- [openvscode-server](https://github.com/gitpod-io/openvscode-server), run VS Code on a remote machine with access through a modern web browser from any device, anywhere. Available as [services.openvscode-server](#opt-services.openvscode-server.enable).
|
||||
|
||||
- [peroxide](https://github.com/ljanyst/peroxide), a fork of the official [ProtonMail bridge](https://github.com/ProtonMail/proton-bridge) that aims to be similar to [Hydroxide](https://github.com/emersion/hydroxide). Available as [services.peroxide](#opt-services.peroxide.enable).
|
||||
- [peroxide](https://github.com/ljanyst/peroxide), a fork of the official [ProtonMail bridge](https://github.com/ProtonMail/proton-bridge) that aims to be similar to [Hydroxide](https://github.com/emersion/hydroxide). Available as [services.peroxide](options.html#opt-services.peroxide.enable).
|
||||
|
||||
- [photoprism](https://photoprism.app/), a AI-powered photos app for the decentralized web. Available as [services.photoprism](options.html#opt-services.photoprism.enable).
|
||||
|
||||
|
||||
@@ -1294,7 +1294,6 @@
|
||||
./services/networking/pangolin.nix
|
||||
./services/networking/pdns-recursor.nix
|
||||
./services/networking/pdnsd.nix
|
||||
./services/networking/peroxide.nix
|
||||
./services/networking/picosnitch.nix
|
||||
./services/networking/pihole-ftl.nix
|
||||
./services/networking/pixiecore.nix
|
||||
|
||||
@@ -1,150 +0,0 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.peroxide;
|
||||
settingsFormat = pkgs.formats.yaml { };
|
||||
stateDir = "peroxide";
|
||||
in
|
||||
{
|
||||
options.services.peroxide = {
|
||||
enable = mkEnableOption "peroxide";
|
||||
|
||||
package = mkPackageOption pkgs "peroxide" {
|
||||
default = [ "peroxide" ];
|
||||
};
|
||||
|
||||
logLevel = mkOption {
|
||||
# https://github.com/sirupsen/logrus#level-logging
|
||||
type = types.enum [
|
||||
"Panic"
|
||||
"Fatal"
|
||||
"Error"
|
||||
"Warning"
|
||||
"Info"
|
||||
"Debug"
|
||||
"Trace"
|
||||
];
|
||||
default = "Warning";
|
||||
example = "Info";
|
||||
description = "Only log messages of this priority or higher.";
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
type = types.submodule {
|
||||
freeformType = settingsFormat.type;
|
||||
|
||||
options = {
|
||||
UserPortImap = mkOption {
|
||||
type = types.port;
|
||||
default = 1143;
|
||||
description = "The port on which to listen for IMAP connections.";
|
||||
};
|
||||
|
||||
UserPortSmtp = mkOption {
|
||||
type = types.port;
|
||||
default = 1025;
|
||||
description = "The port on which to listen for SMTP connections.";
|
||||
};
|
||||
|
||||
ServerAddress = mkOption {
|
||||
type = types.str;
|
||||
default = "[::0]";
|
||||
example = "localhost";
|
||||
description = "The address on which to listen for connections.";
|
||||
};
|
||||
};
|
||||
};
|
||||
default = { };
|
||||
description = ''
|
||||
Configuration for peroxide. See
|
||||
[config.example.yaml](https://github.com/ljanyst/peroxide/blob/master/config.example.yaml)
|
||||
for an example configuration.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.peroxide.settings = {
|
||||
# peroxide deletes the cache directory on startup, which requires write
|
||||
# permission on the parent directory, so we can't use
|
||||
# /var/cache/peroxide
|
||||
CacheDir = "/var/cache/peroxide/cache";
|
||||
X509Key = mkDefault "/var/lib/${stateDir}/key.pem";
|
||||
X509Cert = mkDefault "/var/lib/${stateDir}/cert.pem";
|
||||
CookieJar = "/var/lib/${stateDir}/cookies.json";
|
||||
CredentialsStore = "/var/lib/${stateDir}/credentials.json";
|
||||
};
|
||||
|
||||
users.users.peroxide = {
|
||||
isSystemUser = true;
|
||||
group = "peroxide";
|
||||
};
|
||||
users.groups.peroxide = { };
|
||||
|
||||
systemd.services.peroxide = {
|
||||
description = "Peroxide ProtonMail bridge";
|
||||
requires = [ "network.target" ];
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
restartTriggers = [ config.environment.etc."peroxide.conf".source ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
User = "peroxide";
|
||||
LogsDirectory = "peroxide";
|
||||
LogsDirectoryMode = "0750";
|
||||
# Specify just "peroxide" so that the user has write permission, because
|
||||
# peroxide deletes and recreates the cache directory on startup.
|
||||
CacheDirectory = [
|
||||
"peroxide"
|
||||
"peroxide/cache"
|
||||
];
|
||||
CacheDirectoryMode = "0700";
|
||||
StateDirectory = stateDir;
|
||||
StateDirectoryMode = "0700";
|
||||
ExecStart = "${cfg.package}/bin/peroxide -log-file=/var/log/peroxide/peroxide.log -log-level ${cfg.logLevel}";
|
||||
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||
};
|
||||
|
||||
preStart = ''
|
||||
# Create a self-signed certificate if no certificate exists.
|
||||
if [[ ! -e "${cfg.settings.X509Key}" && ! -e "${cfg.settings.X509Cert}" ]]; then
|
||||
${cfg.package}/bin/peroxide-cfg -action gen-x509 \
|
||||
-x509-org 'N/A' \
|
||||
-x509-cn 'nixos' \
|
||||
-x509-cert "${cfg.settings.X509Cert}" \
|
||||
-x509-key "${cfg.settings.X509Key}"
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
# https://github.com/ljanyst/peroxide/blob/master/peroxide.logrotate
|
||||
services.logrotate.settings.peroxide = {
|
||||
files = "/var/log/peroxide/peroxide.log";
|
||||
rotate = 31;
|
||||
frequency = "daily";
|
||||
compress = true;
|
||||
delaycompress = true;
|
||||
missingok = true;
|
||||
notifempty = true;
|
||||
su = "peroxide peroxide";
|
||||
postrotate = "systemctl reload peroxide";
|
||||
};
|
||||
|
||||
environment.etc."peroxide.conf".source = settingsFormat.generate "peroxide.conf" cfg.settings;
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [
|
||||
aanderse
|
||||
aidalgol
|
||||
];
|
||||
}
|
||||
@@ -21,5 +21,5 @@ in
|
||||
services.dbus.packages = [ cfg.package ];
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ aidalgol ];
|
||||
meta.maintainers = with lib.maintainers; [ jluttine ];
|
||||
}
|
||||
|
||||
@@ -1159,7 +1159,6 @@ in
|
||||
peerflix = runTest ./peerflix.nix;
|
||||
peering-manager = runTest ./web-apps/peering-manager.nix;
|
||||
peertube = handleTestOn [ "x86_64-linux" ] ./web-apps/peertube.nix { };
|
||||
peroxide = runTest ./peroxide.nix;
|
||||
pgadmin4 = runTest ./pgadmin4.nix;
|
||||
pgbackrest = import ./pgbackrest { inherit runTest; };
|
||||
pgbouncer = runTest ./pgbouncer.nix;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
name = "pass-secret-service";
|
||||
meta.maintainers = [ lib.maintainers.aidalgol ];
|
||||
meta.maintainers = [ lib.maintainers.jluttine ];
|
||||
|
||||
nodes.machine =
|
||||
{ nodes, pkgs, ... }:
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
name = "peroxide";
|
||||
meta.maintainers = with lib.maintainers; [ aidalgol ];
|
||||
|
||||
nodes.machine =
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
networking.hostName = "nixos";
|
||||
services.peroxide.enable = true;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("peroxide.service")
|
||||
machine.wait_for_open_port(1143) # IMAP
|
||||
machine.wait_for_open_port(1025) # SMTP
|
||||
'';
|
||||
}
|
||||
@@ -80,7 +80,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
mainProgram = "comet";
|
||||
maintainers = with lib.maintainers; [
|
||||
tomasajt
|
||||
aidalgol
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec {
|
||||
mainProgram = "gogdl";
|
||||
homepage = "https://github.com/Heroic-Games-Launcher/heroic-gogdl";
|
||||
license = with licenses; [ gpl3 ];
|
||||
maintainers = with maintainers; [ aidalgol ];
|
||||
maintainers = with maintainers; [ iedame ];
|
||||
};
|
||||
|
||||
# Upstream no longer create git tags when bumping the version, so we have to
|
||||
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/Etaash-mathamsetty/heroic-epic-integration";
|
||||
changelog = "https://github.com/Etaash-mathamsetty/heroic-epic-integration/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ aidalgol ];
|
||||
maintainers = with lib.maintainers; [ iedame ];
|
||||
};
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
@@ -37,7 +37,7 @@ python3Packages.buildPythonApplication {
|
||||
'';
|
||||
homepage = "https://github.com/Heroic-Games-Launcher/legendary";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ aidalgol ];
|
||||
maintainers = with maintainers; [ iedame ];
|
||||
mainProgram = "legendary";
|
||||
};
|
||||
|
||||
|
||||
@@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher";
|
||||
changelog = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases/tag/v${finalAttrs.version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ aidalgol ];
|
||||
maintainers = with maintainers; [ iedame ];
|
||||
# Heroic may work on nix-darwin, but it needs a dedicated maintainer for the platform.
|
||||
# It may also work on other Linux targets, but all the game stores only
|
||||
# support x86 Linux, so it would require extra hacking to run games via QEMU
|
||||
|
||||
@@ -42,7 +42,6 @@ buildGoModule rec {
|
||||
mainProgram = "jf";
|
||||
maintainers = with lib.maintainers; [
|
||||
detegr
|
||||
aidalgol
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -102,7 +102,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
aidalgol
|
||||
das-g
|
||||
];
|
||||
};
|
||||
|
||||
@@ -48,7 +48,6 @@ python3Packages.buildPythonApplication {
|
||||
mainProgram = "nile";
|
||||
homepage = "https://github.com/imLinguin/nile";
|
||||
license = with licenses; [ gpl3 ];
|
||||
maintainers = with maintainers; [ aidalgol ];
|
||||
};
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
|
||||
@@ -15,7 +15,6 @@ let
|
||||
overrides = {
|
||||
description = "OAuth credential MAnager";
|
||||
homepage = "https://github.com/pdobsan/oama";
|
||||
maintainers = with lib.maintainers; [ aidalgol ];
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
|
||||
@@ -118,7 +118,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "r2modman";
|
||||
maintainers = with lib.maintainers; [
|
||||
aidalgol
|
||||
huantian
|
||||
];
|
||||
inherit (electron.meta) platforms;
|
||||
|
||||
@@ -34,6 +34,5 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
platforms = platforms.linux;
|
||||
license = licenses.unfree; # No license specified.
|
||||
maintainers = with maintainers; [ aidalgol ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -32,7 +32,6 @@ rustPlatform.buildRustPackage {
|
||||
description = "Simple CLI app used to interface with basic Vulkan APIs";
|
||||
homepage = "https://github.com/imLinguin/vulkan-helper-rs";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ aidalgol ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "vulkan-helper";
|
||||
};
|
||||
|
||||
@@ -117,7 +117,6 @@ finalAttrs: prevAttrs: {
|
||||
prevAttrs.meta.badPlatforms or [ ]
|
||||
++ lib.optionals (targetArch == "unsupported") [ hostPlatform.system ];
|
||||
homepage = "https://developer.nvidia.com/tensorrt";
|
||||
maintainers = prevAttrs.meta.maintainers or [ ] ++ [ maintainers.aidalgol ];
|
||||
teams = prevAttrs.meta.teams or [ ];
|
||||
|
||||
# Building TensorRT on Hydra is impossible because of the non-redistributable
|
||||
|
||||
@@ -48,7 +48,6 @@ buildPythonPackage {
|
||||
homepage = "https://developer.nvidia.com/tensorrt";
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ aidalgol ];
|
||||
broken = !(cudaPackages ? tensorrt) || !(cudaPackages ? cudnn);
|
||||
};
|
||||
}
|
||||
|
||||
@@ -33,12 +33,9 @@ let
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://www.nvidia.com/object/unix.html";
|
||||
platforms = nvidia_x11.meta.platforms;
|
||||
maintainers = with maintainers; [
|
||||
aidalgol
|
||||
];
|
||||
};
|
||||
|
||||
libXNVCtrl = stdenv.mkDerivation {
|
||||
|
||||
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
viraptor
|
||||
aidalgol
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
mrkkrp
|
||||
aidalgol
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
happysalada
|
||||
aidalgol
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user