github-actions[bot]
2 years ago
committed by
GitHub
commit
2d056a8d99
@ -0,0 +1,579 @@ |
||||
{ lib, pkgs, config, ... }: |
||||
|
||||
with lib; |
||||
|
||||
let |
||||
cfg = config.services.public-inbox; |
||||
stateDir = "/var/lib/public-inbox"; |
||||
|
||||
manref = name: vol: "<citerefentry><refentrytitle>${name}</refentrytitle><manvolnum>${toString vol}</manvolnum></citerefentry>"; |
||||
|
||||
gitIni = pkgs.formats.gitIni { listsAsDuplicateKeys = true; }; |
||||
iniAtom = elemAt gitIni.type/*attrsOf*/.functor.wrapped/*attrsOf*/.functor.wrapped/*either*/.functor.wrapped 0; |
||||
|
||||
useSpamAssassin = cfg.settings.publicinboxmda.spamcheck == "spamc" || |
||||
cfg.settings.publicinboxwatch.spamcheck == "spamc"; |
||||
|
||||
publicInboxDaemonOptions = proto: defaultPort: { |
||||
args = mkOption { |
||||
type = with types; listOf str; |
||||
default = []; |
||||
description = "Command-line arguments to pass to ${manref "public-inbox-${proto}d" 1}."; |
||||
}; |
||||
port = mkOption { |
||||
type = with types; nullOr (either str port); |
||||
default = defaultPort; |
||||
description = '' |
||||
Listening port. |
||||
Beware that public-inbox uses well-known ports number to decide whether to enable TLS or not. |
||||
Set to null and use <code>systemd.sockets.public-inbox-${proto}d.listenStreams</code> |
||||
if you need a more advanced listening. |
||||
''; |
||||
}; |
||||
cert = mkOption { |
||||
type = with types; nullOr str; |
||||
default = null; |
||||
example = "/path/to/fullchain.pem"; |
||||
description = "Path to TLS certificate to use for connections to ${manref "public-inbox-${proto}d" 1}."; |
||||
}; |
||||
key = mkOption { |
||||
type = with types; nullOr str; |
||||
default = null; |
||||
example = "/path/to/key.pem"; |
||||
description = "Path to TLS key to use for connections to ${manref "public-inbox-${proto}d" 1}."; |
||||
}; |
||||
}; |
||||
|
||||
serviceConfig = srv: |
||||
let proto = removeSuffix "d" srv; |
||||
needNetwork = builtins.hasAttr proto cfg && cfg.${proto}.port == null; |
||||
in { |
||||
serviceConfig = { |
||||
# Enable JIT-compiled C (via Inline::C) |
||||
Environment = [ "PERL_INLINE_DIRECTORY=/run/public-inbox-${srv}/perl-inline" ]; |
||||
# NonBlocking is REQUIRED to avoid a race condition |
||||
# if running simultaneous services. |
||||
NonBlocking = true; |
||||
#LimitNOFILE = 30000; |
||||
User = config.users.users."public-inbox".name; |
||||
Group = config.users.groups."public-inbox".name; |
||||
RuntimeDirectory = [ |
||||
"public-inbox-${srv}/perl-inline" |
||||
]; |
||||
RuntimeDirectoryMode = "700"; |
||||
# This is for BindPaths= and BindReadOnlyPaths= |
||||
# to allow traversal of directories they create inside RootDirectory= |
||||
UMask = "0066"; |
||||
StateDirectory = ["public-inbox"]; |
||||
StateDirectoryMode = "0750"; |
||||
WorkingDirectory = stateDir; |
||||
BindReadOnlyPaths = [ |
||||
"/etc" |
||||
"/run/systemd" |
||||
"${config.i18n.glibcLocales}" |
||||
] ++ |
||||
mapAttrsToList (name: inbox: inbox.description) cfg.inboxes ++ |
||||
# Without confinement the whole Nix store |
||||
# is made available to the service |
||||
optionals (!config.systemd.services."public-inbox-${srv}".confinement.enable) [ |
||||
"${pkgs.dash}/bin/dash:/bin/sh" |
||||
builtins.storeDir |
||||
]; |
||||
# The following options are only for optimizing: |
||||
# systemd-analyze security public-inbox-'*' |
||||
AmbientCapabilities = ""; |
||||
CapabilityBoundingSet = ""; |
||||
# ProtectClock= adds DeviceAllow=char-rtc r |
||||
DeviceAllow = ""; |
||||
LockPersonality = true; |
||||
MemoryDenyWriteExecute = true; |
||||
NoNewPrivileges = true; |
||||
PrivateNetwork = mkDefault (!needNetwork); |
||||
ProcSubset = "pid"; |
||||
ProtectClock = true; |
||||
ProtectHome = mkDefault true; |
||||
ProtectHostname = true; |
||||
ProtectKernelLogs = true; |
||||
ProtectProc = "invisible"; |
||||
#ProtectSystem = "strict"; |
||||
RemoveIPC = true; |
||||
RestrictAddressFamilies = [ "AF_UNIX" ] ++ |
||||
optionals needNetwork [ "AF_INET" "AF_INET6" ]; |
||||
RestrictNamespaces = true; |
||||
RestrictRealtime = true; |
||||
RestrictSUIDSGID = true; |
||||
SystemCallFilter = [ |
||||
"@system-service" |
||||
"~@aio" "~@chown" "~@keyring" "~@memlock" "~@resources" |
||||
# Not removing @setuid and @privileged because Inline::C needs them. |
||||
# Not removing @timer because git upload-pack needs it. |
||||
]; |
||||
SystemCallArchitectures = "native"; |
||||
|
||||
# The following options are redundant when confinement is enabled |
||||
RootDirectory = "/var/empty"; |
||||
TemporaryFileSystem = "/"; |
||||
PrivateMounts = true; |
||||
MountAPIVFS = true; |
||||
PrivateDevices = true; |
||||
PrivateTmp = true; |
||||
PrivateUsers = true; |
||||
ProtectControlGroups = true; |
||||
ProtectKernelModules = true; |
||||
ProtectKernelTunables = true; |
||||
}; |
||||
confinement = { |
||||
# Until we agree upon doing it directly here in NixOS |
||||
# https://github.com/NixOS/nixpkgs/pull/104457#issuecomment-1115768447 |
||||
# let the user choose to enable the confinement with: |
||||
# systemd.services.public-inbox-httpd.confinement.enable = true; |
||||
# systemd.services.public-inbox-imapd.confinement.enable = true; |
||||
# systemd.services.public-inbox-init.confinement.enable = true; |
||||
# systemd.services.public-inbox-nntpd.confinement.enable = true; |
||||
#enable = true; |
||||
mode = "full-apivfs"; |
||||
# Inline::C needs a /bin/sh, and dash is enough |
||||
binSh = "${pkgs.dash}/bin/dash"; |
||||
packages = [ |
||||
pkgs.iana-etc |
||||
(getLib pkgs.nss) |
||||
pkgs.tzdata |
||||
]; |
||||
}; |
||||
}; |
||||
in |
||||
|
||||
{ |
||||
options.services.public-inbox = { |
||||
enable = mkEnableOption "the public-inbox mail archiver"; |
||||
package = mkOption { |
||||
type = types.package; |
||||
default = pkgs.public-inbox; |
||||
defaultText = literalExpression "pkgs.public-inbox"; |
||||
description = "public-inbox package to use."; |
||||
}; |
||||
path = mkOption { |
||||
type = with types; listOf package; |
||||
default = []; |
||||
example = literalExpression "with pkgs; [ spamassassin ]"; |
||||
description = '' |
||||
Additional packages to place in the path of public-inbox-mda, |
||||
public-inbox-watch, etc. |
||||
''; |
||||
}; |
||||
inboxes = mkOption { |
||||
description = '' |
||||
Inboxes to configure, where attribute names are inbox names. |
||||
''; |
||||
default = {}; |
||||
type = types.attrsOf (types.submodule ({name, ...}: { |
||||
freeformType = types.attrsOf iniAtom; |
||||
options.inboxdir = mkOption { |
||||
type = types.str; |
||||
default = "${stateDir}/inboxes/${name}"; |
||||
description = "The absolute path to the directory which hosts the public-inbox."; |
||||
}; |
||||
options.address = mkOption { |
||||
type = with types; listOf str; |
||||
example = "example-discuss@example.org"; |
||||
description = "The email addresses of the public-inbox."; |
||||
}; |
||||
options.url = mkOption { |
||||
type = with types; nullOr str; |
||||
default = null; |
||||
example = "https://example.org/lists/example-discuss"; |
||||
description = "URL where this inbox can be accessed over HTTP."; |
||||
}; |
||||
options.description = mkOption { |
||||
type = types.str; |
||||
example = "user/dev discussion of public-inbox itself"; |
||||
description = "User-visible description for the repository."; |
||||
apply = pkgs.writeText "public-inbox-description-${name}"; |
||||
}; |
||||
options.newsgroup = mkOption { |
||||
type = with types; nullOr str; |
||||
default = null; |
||||
description = "NNTP group name for the inbox."; |
||||
}; |
||||
options.watch = mkOption { |
||||
type = with types; listOf str; |
||||
default = []; |
||||
description = "Paths for ${manref "public-inbox-watch" 1} to monitor for new mail."; |
||||
example = [ "maildir:/path/to/test.example.com.git" ]; |
||||
}; |
||||
options.watchheader = mkOption { |
||||
type = with types; nullOr str; |
||||
default = null; |
||||
example = "List-Id:<test@example.com>"; |
||||
description = '' |
||||
If specified, ${manref "public-inbox-watch" 1} will only process |
||||
mail containing a matching header. |
||||
''; |
||||
}; |
||||
options.coderepo = mkOption { |
||||
type = (types.listOf (types.enum (attrNames cfg.settings.coderepo))) // { |
||||
description = "list of coderepo names"; |
||||
}; |
||||
default = []; |
||||
description = "Nicknames of a 'coderepo' section associated with the inbox."; |
||||
}; |
||||
})); |
||||
}; |
||||
imap = { |
||||
enable = mkEnableOption "the public-inbox IMAP server"; |
||||
} // publicInboxDaemonOptions "imap" 993; |
||||
http = { |
||||
enable = mkEnableOption "the public-inbox HTTP server"; |
||||
mounts = mkOption { |
||||
type = with types; listOf str; |
||||
default = [ "/" ]; |
||||
example = [ "/lists/archives" ]; |
||||
description = '' |
||||
Root paths or URLs that public-inbox will be served on. |
||||
If domain parts are present, only requests to those |
||||
domains will be accepted. |
||||
''; |
||||
}; |
||||
args = (publicInboxDaemonOptions "http" 80).args; |
||||
port = mkOption { |
||||
type = with types; nullOr (either str port); |
||||
default = 80; |
||||
example = "/run/public-inbox-httpd.sock"; |
||||
description = '' |
||||
Listening port or systemd's ListenStream= entry |
||||
to be used as a reverse proxy, eg. in nginx: |
||||
<code>locations."/inbox".proxyPass = "http://unix:''${config.services.public-inbox.http.port}:/inbox";</code> |
||||
Set to null and use <code>systemd.sockets.public-inbox-httpd.listenStreams</code> |
||||
if you need a more advanced listening. |
||||
''; |
||||
}; |
||||
}; |
||||
mda = { |
||||
enable = mkEnableOption "the public-inbox Mail Delivery Agent"; |
||||
args = mkOption { |
||||
type = with types; listOf str; |
||||
default = []; |
||||
description = "Command-line arguments to pass to ${manref "public-inbox-mda" 1}."; |
||||
}; |
||||
}; |
||||
postfix.enable = mkEnableOption "the integration into Postfix"; |
||||
nntp = { |
||||
enable = mkEnableOption "the public-inbox NNTP server"; |
||||
} // publicInboxDaemonOptions "nntp" 563; |
||||
spamAssassinRules = mkOption { |
||||
type = with types; nullOr path; |
||||
default = "${cfg.package.sa_config}/user/.spamassassin/user_prefs"; |
||||
defaultText = literalExpression "\${cfg.package.sa_config}/user/.spamassassin/user_prefs"; |
||||
description = "SpamAssassin configuration specific to public-inbox."; |
||||
}; |
||||
settings = mkOption { |
||||
description = '' |
||||
Settings for the <link xlink:href="https://public-inbox.org/public-inbox-config.html">public-inbox config file</link>. |
||||
''; |
||||
default = {}; |
||||
type = types.submodule { |
||||
freeformType = gitIni.type; |
||||
options.publicinbox = mkOption { |
||||
default = {}; |
||||
description = "public inboxes"; |
||||
type = types.submodule { |
||||
freeformType = with types; /*inbox name*/attrsOf (/*inbox option name*/attrsOf /*inbox option value*/iniAtom); |
||||
options.css = mkOption { |
||||
type = with types; listOf str; |
||||
default = []; |
||||
description = "The local path name of a CSS file for the PSGI web interface."; |
||||
}; |
||||
options.nntpserver = mkOption { |
||||
type = with types; listOf str; |
||||
default = []; |
||||
example = [ "nntp://news.public-inbox.org" "nntps://news.public-inbox.org" ]; |
||||
description = "NNTP URLs to this public-inbox instance"; |
||||
}; |
||||
options.wwwlisting = mkOption { |
||||
type = with types; enum [ "all" "404" "match=domain" ]; |
||||
default = "404"; |
||||
description = '' |
||||
Controls which lists (if any) are listed for when the root |
||||
public-inbox URL is accessed over HTTP. |
||||
''; |
||||
}; |
||||
}; |
||||
}; |
||||
options.publicinboxmda.spamcheck = mkOption { |
||||
type = with types; enum [ "spamc" "none" ]; |
||||
default = "none"; |
||||
description = '' |
||||
If set to spamc, ${manref "public-inbox-watch" 1} will filter spam |
||||
using SpamAssassin. |
||||
''; |
||||
}; |
||||
options.publicinboxwatch.spamcheck = mkOption { |
||||
type = with types; enum [ "spamc" "none" ]; |
||||
default = "none"; |
||||
description = '' |
||||
If set to spamc, ${manref "public-inbox-watch" 1} will filter spam |
||||
using SpamAssassin. |
||||
''; |
||||
}; |
||||
options.publicinboxwatch.watchspam = mkOption { |
||||
type = with types; nullOr str; |
||||
default = null; |
||||
example = "maildir:/path/to/spam"; |
||||
description = '' |
||||
If set, mail in this maildir will be trained as spam and |
||||
deleted from all watched inboxes |
||||
''; |
||||
}; |
||||
options.coderepo = mkOption { |
||||
default = {}; |
||||
description = "code repositories"; |
||||
type = types.attrsOf (types.submodule { |
||||
freeformType = types.attrsOf iniAtom; |
||||
options.cgitUrl = mkOption { |
||||
type = types.str; |
||||
description = "URL of a cgit instance"; |
||||
}; |
||||
options.dir = mkOption { |
||||
type = types.str; |
||||
description = "Path to a git repository"; |
||||
}; |
||||
}); |
||||
}; |
||||
}; |
||||
}; |
||||
openFirewall = mkEnableOption "opening the firewall when using a port option"; |
||||
}; |
||||
config = mkIf cfg.enable { |
||||
assertions = [ |
||||
{ assertion = config.services.spamassassin.enable || !useSpamAssassin; |
||||
message = '' |
||||
public-inbox is configured to use SpamAssassin, but |
||||
services.spamassassin.enable is false. If you don't need |
||||
spam checking, set `services.public-inbox.settings.publicinboxmda.spamcheck' and |
||||
`services.public-inbox.settings.publicinboxwatch.spamcheck' to null. |
||||
''; |
||||
} |
||||
{ assertion = cfg.path != [] || !useSpamAssassin; |
||||
message = '' |
||||
public-inbox is configured to use SpamAssassin, but there is |
||||
no spamc executable in services.public-inbox.path. If you |
||||
don't need spam checking, set |
||||
`services.public-inbox.settings.publicinboxmda.spamcheck' and |
||||
`services.public-inbox.settings.publicinboxwatch.spamcheck' to null. |
||||
''; |
||||
} |
||||
]; |
||||
services.public-inbox.settings = |
||||
filterAttrsRecursive (n: v: v != null) { |
||||
publicinbox = mapAttrs (n: filterAttrs (n: v: n != "description")) cfg.inboxes; |
||||
}; |
||||
users = { |
||||
users.public-inbox = { |
||||
home = stateDir; |
||||
group = "public-inbox"; |
||||
isSystemUser = true; |
||||
}; |
||||
groups.public-inbox = {}; |
||||
}; |
||||
networking.firewall = mkIf cfg.openFirewall |
||||
{ allowedTCPPorts = mkMerge |
||||
(map (proto: (mkIf (cfg.${proto}.enable && types.port.check cfg.${proto}.port) [ cfg.${proto}.port ])) |
||||
["imap" "http" "nntp"]); |
||||
}; |
||||
services.postfix = mkIf (cfg.postfix.enable && cfg.mda.enable) { |
||||
# Not sure limiting to 1 is necessary, but better safe than sorry. |
||||
config.public-inbox_destination_recipient_limit = "1"; |
||||
|
||||
# Register the addresses as existing |
||||
virtual = |
||||
concatStringsSep "\n" (mapAttrsToList (_: inbox: |
||||
concatMapStringsSep "\n" (address: |
||||
"${address} ${address}" |
||||
) inbox.address |
||||
) cfg.inboxes); |
||||
|
||||
# Deliver the addresses with the public-inbox transport |
||||
transport = |
||||
concatStringsSep "\n" (mapAttrsToList (_: inbox: |
||||
concatMapStringsSep "\n" (address: |
||||
"${address} public-inbox:${address}" |
||||
) inbox.address |
||||
) cfg.inboxes); |
||||
|
||||
# The public-inbox transport |
||||
masterConfig.public-inbox = { |
||||
type = "unix"; |
||||
privileged = true; # Required for user= |
||||
command = "pipe"; |
||||
args = [ |
||||
"flags=X" # Report as a final delivery |
||||
"user=${with config.users; users."public-inbox".name + ":" + groups."public-inbox".name}" |
||||
# Specifying a nexthop when using the transport |
||||
# (eg. test public-inbox:test) allows to |
||||
# receive mails with an extension (eg. test+foo). |
||||
"argv=${pkgs.writeShellScript "public-inbox-transport" '' |
||||
export HOME="${stateDir}" |
||||
export ORIGINAL_RECIPIENT="''${2:-1}" |
||||
export PATH="${makeBinPath cfg.path}:$PATH" |
||||
exec ${cfg.package}/bin/public-inbox-mda ${escapeShellArgs cfg.mda.args} |
||||
''} \${original_recipient} \${nexthop}" |
||||
]; |
||||
}; |
||||
}; |
||||
systemd.sockets = mkMerge (map (proto: |
||||
mkIf (cfg.${proto}.enable && cfg.${proto}.port != null) |
||||
{ "public-inbox-${proto}d" = { |
||||
listenStreams = [ (toString cfg.${proto}.port) ]; |
||||
wantedBy = [ "sockets.target" ]; |
||||
}; |
||||
} |
||||
) [ "imap" "http" "nntp" ]); |
||||
systemd.services = mkMerge [ |
||||
(mkIf cfg.imap.enable |
||||
{ public-inbox-imapd = mkMerge [(serviceConfig "imapd") { |
||||
after = [ "public-inbox-init.service" "public-inbox-watch.service" ]; |
||||
requires = [ "public-inbox-init.service" ]; |
||||
serviceConfig = { |
||||
ExecStart = escapeShellArgs ( |
||||
[ "${cfg.package}/bin/public-inbox-imapd" ] ++ |
||||
cfg.imap.args ++ |
||||
optionals (cfg.imap.cert != null) [ "--cert" cfg.imap.cert ] ++ |
||||
optionals (cfg.imap.key != null) [ "--key" cfg.imap.key ] |
||||
); |
||||
}; |
||||
}]; |
||||
}) |
||||
(mkIf cfg.http.enable |
||||
{ public-inbox-httpd = mkMerge [(serviceConfig "httpd") { |
||||
after = [ "public-inbox-init.service" "public-inbox-watch.service" ]; |
||||
requires = [ "public-inbox-init.service" ]; |
||||
serviceConfig = { |
||||
ExecStart = escapeShellArgs ( |
||||
[ "${cfg.package}/bin/public-inbox-httpd" ] ++ |
||||
cfg.http.args ++ |
||||
# See https://public-inbox.org/public-inbox.git/tree/examples/public-inbox.psgi |
||||
# for upstream's example. |
||||
[ (pkgs.writeText "public-inbox.psgi" '' |
||||
#!${cfg.package.fullperl} -w |
||||
use strict; |
||||
use warnings; |
||||
use Plack::Builder; |
||||
use PublicInbox::WWW; |
||||
|
||||
my $www = PublicInbox::WWW->new; |
||||
$www->preload; |
||||
|
||||
builder { |
||||
# If reached through a reverse proxy, |
||||
# make it transparent by resetting some HTTP headers |
||||
# used by public-inbox to generate URIs. |
||||
enable 'ReverseProxy'; |
||||
|
||||
# No need to send a response body if it's an HTTP HEAD requests. |
||||
enable 'Head'; |
||||
|
||||
# Route according to configured domains and root paths. |
||||
${concatMapStrings (path: '' |
||||
mount q(${path}) => sub { $www->call(@_); }; |
||||
'') cfg.http.mounts} |
||||
} |
||||
'') ] |
||||
); |
||||
}; |
||||
}]; |
||||
}) |
||||
(mkIf cfg.nntp.enable |
||||
{ public-inbox-nntpd = mkMerge [(serviceConfig "nntpd") { |
||||
after = [ "public-inbox-init.service" "public-inbox-watch.service" ]; |
||||
requires = [ "public-inbox-init.service" ]; |
||||
serviceConfig = { |
||||
ExecStart = escapeShellArgs ( |
||||
[ "${cfg.package}/bin/public-inbox-nntpd" ] ++ |
||||
cfg.nntp.args ++ |
||||
optionals (cfg.nntp.cert != null) [ "--cert" cfg.nntp.cert ] ++ |
||||
optionals (cfg.nntp.key != null) [ "--key" cfg.nntp.key ] |
||||
); |
||||
}; |
||||
}]; |
||||
}) |
||||
(mkIf (any (inbox: inbox.watch != []) (attrValues cfg.inboxes) |
||||
|| cfg.settings.publicinboxwatch.watchspam != null) |
||||
{ public-inbox-watch = mkMerge [(serviceConfig "watch") { |
||||
inherit (cfg) path; |
||||
wants = [ "public-inbox-init.service" ]; |
||||
requires = [ "public-inbox-init.service" ] ++ |
||||
optional (cfg.settings.publicinboxwatch.spamcheck == "spamc") "spamassassin.service"; |
||||
wantedBy = [ "multi-user.target" ]; |
||||
serviceConfig = { |
||||
ExecStart = "${cfg.package}/bin/public-inbox-watch"; |
||||
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; |
||||
}; |
||||
}]; |
||||
}) |
||||
({ public-inbox-init = let |
||||
PI_CONFIG = gitIni.generate "public-inbox.ini" |
||||
(filterAttrsRecursive (n: v: v != null) cfg.settings); |
||||
in mkMerge [(serviceConfig "init") { |
||||
wantedBy = [ "multi-user.target" ]; |
||||
restartIfChanged = true; |
||||
restartTriggers = [ PI_CONFIG ]; |
||||
script = '' |
||||
set -ux |
||||
install -D -p ${PI_CONFIG} ${stateDir}/.public-inbox/config |
||||
'' + optionalString useSpamAssassin '' |
||||
install -m 0700 -o spamd -d ${stateDir}/.spamassassin |
||||
${optionalString (cfg.spamAssassinRules != null) '' |
||||
ln -sf ${cfg.spamAssassinRules} ${stateDir}/.spamassassin/user_prefs |
||||
''} |
||||
'' + concatStrings (mapAttrsToList (name: inbox: '' |
||||
if [ ! -e ${stateDir}/inboxes/${escapeShellArg name} ]; then |
||||
# public-inbox-init creates an inbox and adds it to a config file. |
||||
# It tries to atomically write the config file by creating |
||||
# another file in the same directory, and renaming it. |
||||
# This has the sad consequence that we can't use |
||||
# /dev/null, or it would try to create a file in /dev. |
||||
conf_dir="$(mktemp -d)" |
||||
|
||||
PI_CONFIG=$conf_dir/conf \ |
||||
${cfg.package}/bin/public-inbox-init -V2 \ |
||||
${escapeShellArgs ([ name "${stateDir}/inboxes/${name}" inbox.url ] ++ inbox.address)} |
||||
|
||||
rm -rf $conf_dir |
||||
fi |
||||
|
||||
ln -sf ${inbox.description} \ |
||||
${stateDir}/inboxes/${escapeShellArg name}/description |
||||
|
||||
export GIT_DIR=${stateDir}/inboxes/${escapeShellArg name}/all.git |
||||
if test -d "$GIT_DIR"; then |
||||
# Config is inherited by each epoch repository, |
||||
# so just needs to be set for all.git. |
||||
${pkgs.git}/bin/git config core.sharedRepository 0640 |
||||
fi |
||||
'') cfg.inboxes |
||||
) + '' |
||||
shopt -s nullglob |
||||
for inbox in ${stateDir}/inboxes/*/; do |
||||
# This should be idempotent, but only do it for new |
||||
# inboxes anyway because it's only needed once, and could |
||||
# be slow for large pre-existing inboxes. |
||||
ls -1 "$inbox" | grep -q '^xap' || |
||||
${cfg.package}/bin/public-inbox-index "$inbox" |
||||
done |
||||
''; |
||||
serviceConfig = { |
||||
Type = "oneshot"; |
||||
RemainAfterExit = true; |
||||
StateDirectory = [ |
||||
"public-inbox/.public-inbox" |
||||
"public-inbox/.public-inbox/emergency" |
||||
"public-inbox/inboxes" |
||||
]; |
||||
}; |
||||
}]; |
||||
}) |
||||
]; |
||||
environment.systemPackages = with pkgs; [ cfg.package ]; |
||||
}; |
||||
meta.maintainers = with lib.maintainers; [ julm qyliss ]; |
||||
} |
||||
@ -0,0 +1,227 @@ |
||||
import ./make-test-python.nix ({ pkgs, lib, ... }: |
||||
let |
||||
orga = "example"; |
||||
domain = "${orga}.localdomain"; |
||||
|
||||
tls-cert = pkgs.runCommand "selfSignedCert" { buildInputs = [ pkgs.openssl ]; } '' |
||||
openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -days 36500 \ |
||||
-subj '/CN=machine.${domain}' |
||||
install -D -t $out key.pem cert.pem |
||||
''; |
||||
in |
||||
{ |
||||
name = "public-inbox"; |
||||
|
||||
meta.maintainers = with pkgs.lib.maintainers; [ julm ]; |
||||
|
||||
machine = { config, pkgs, nodes, ... }: let |
||||
inherit (config.services) gitolite public-inbox; |
||||
# Git repositories paths in Gitolite. |
||||
# Only their baseNameOf is used for configuring public-inbox. |
||||
repositories = [ |
||||
"user/repo1" |
||||
"user/repo2" |
||||
]; |
||||
in |
||||
{ |
||||
virtualisation.diskSize = 1 * 1024; |
||||
virtualisation.memorySize = 1 * 1024; |
||||
networking.domain = domain; |
||||
|
||||
security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ]; |
||||
# If using security.acme: |
||||
#security.acme.certs."${domain}".postRun = '' |
||||
# systemctl try-restart public-inbox-nntpd public-inbox-imapd |
||||
#''; |
||||
|
||||
services.public-inbox = { |
||||
enable = true; |
||||
postfix.enable = true; |
||||
openFirewall = true; |
||||
settings.publicinbox = { |
||||
css = [ "href=https://machine.${domain}/style/light.css" ]; |
||||
nntpserver = [ "nntps://machine.${domain}" ]; |
||||
wwwlisting = "match=domain"; |
||||
}; |
||||
mda = { |
||||
enable = true; |
||||
args = [ "--no-precheck" ]; # Allow Bcc: |
||||
}; |
||||
http = { |
||||
enable = true; |
||||
port = "/run/public-inbox-http.sock"; |
||||
#port = 8080; |
||||
args = ["-W0"]; |
||||
mounts = [ |
||||
"https://machine.${domain}/inbox" |
||||
]; |
||||
}; |
||||
nntp = { |
||||
enable = true; |
||||
#port = 563; |
||||
args = ["-W0"]; |
||||
cert = "${tls-cert}/cert.pem"; |
||||
key = "${tls-cert}/key.pem"; |
||||
}; |
||||
imap = { |
||||
enable = true; |
||||
#port = 993; |
||||
args = ["-W0"]; |
||||
cert = "${tls-cert}/cert.pem"; |
||||
key = "${tls-cert}/key.pem"; |
||||
}; |
||||
inboxes = lib.recursiveUpdate (lib.genAttrs (map baseNameOf repositories) (repo: { |
||||
address = [ |
||||
# Routed to the "public-inbox:" transport in services.postfix.transport |
||||
"${repo}@${domain}" |
||||
]; |
||||
description = '' |
||||
${repo}@${domain} : |
||||
discussions about ${repo}. |
||||
''; |
||||
url = "https://machine.${domain}/inbox/${repo}"; |
||||
newsgroup = "inbox.comp.${orga}.${repo}"; |
||||
coderepo = [ repo ]; |
||||
})) |
||||
{ |
||||
repo2 = { |
||||
hide = [ |
||||
"imap" # FIXME: doesn't work for IMAP as of public-inbox 1.6.1 |
||||
"manifest" |
||||
"www" |
||||
]; |
||||
}; |
||||
}; |
||||
settings.coderepo = lib.listToAttrs (map (path: lib.nameValuePair (baseNameOf path) { |
||||
dir = "/var/lib/gitolite/repositories/${path}.git"; |
||||
cgitUrl = "https://git.${domain}/${path}.git"; |
||||
}) repositories); |
||||
}; |
||||
|
||||
# Use gitolite to store Git repositories listed in coderepo entries |
||||
services.gitolite = { |
||||
enable = true; |
||||
adminPubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJmoTOQnGqX+//us5oye8UuE+tQBx9QEM7PN13jrwgqY root@localhost"; |
||||
}; |
||||
systemd.services.public-inbox-httpd = { |
||||
serviceConfig.SupplementaryGroups = [ gitolite.group ]; |
||||
}; |
||||
|
||||
# Use nginx as a reverse proxy for public-inbox-httpd |
||||
services.nginx = { |
||||
enable = true; |
||||
recommendedGzipSettings = true; |
||||
recommendedOptimisation = true; |
||||
recommendedTlsSettings = true; |
||||
recommendedProxySettings = true; |
||||
virtualHosts."machine.${domain}" = { |
||||
forceSSL = true; |
||||
sslCertificate = "${tls-cert}/cert.pem"; |
||||
sslCertificateKey = "${tls-cert}/key.pem"; |
||||
locations."/".return = "302 /inbox"; |
||||
locations."= /inbox".return = "302 /inbox/"; |
||||
locations."/inbox".proxyPass = "http://unix:${public-inbox.http.port}:/inbox"; |
||||
# If using TCP instead of a Unix socket: |
||||
#locations."/inbox".proxyPass = "http://127.0.0.1:${toString public-inbox.http.port}/inbox"; |
||||
# Referred to by settings.publicinbox.css |
||||
# See http://public-inbox.org/meta/_/text/color/ |
||||
locations."= /style/light.css".alias = pkgs.writeText "light.css" '' |
||||
* { background:#fff; color:#000 } |
||||
|
||||
a { color:#00f; text-decoration:none } |
||||
a:visited { color:#808 } |
||||
|
||||
*.q { color:#008 } |
||||
|
||||
*.add { color:#060 } |
||||
*.del {color:#900 } |
||||
*.head { color:#000 } |
||||
*.hunk { color:#960 } |
||||
|
||||
.hl.num { color:#f30 } /* number */ |
||||
.hl.esc { color:#f0f } /* escape character */ |
||||
.hl.str { color:#f30 } /* string */ |
||||
.hl.ppc { color:#c3c } /* preprocessor */ |
||||
.hl.pps { color:#f30 } /* preprocessor string */ |
||||
.hl.slc { color:#099 } /* single-line comment */ |
||||
.hl.com { color:#099 } /* multi-line comment */ |
||||
/* .hl.opt { color:#ccc } */ /* operator */ |
||||
/* .hl.ipl { color:#ccc } */ /* interpolation */ |
||||
|
||||
/* keyword groups kw[a-z] */ |
||||
.hl.kwa { color:#f90 } |
||||
.hl.kwb { color:#060 } |
||||
.hl.kwc { color:#f90 } |
||||
/* .hl.kwd { color:#ccc } */ |
||||
''; |
||||
}; |
||||
}; |
||||
|
||||
services.postfix = { |
||||
enable = true; |
||||
setSendmail = true; |
||||
#sslCert = "${tls-cert}/cert.pem"; |
||||
#sslKey = "${tls-cert}/key.pem"; |
||||
recipientDelimiter = "+"; |
||||
}; |
||||
|
||||
environment.systemPackages = [ |
||||
pkgs.mailutils |
||||
pkgs.openssl |
||||
]; |
||||
|
||||
}; |
||||
|
||||
testScript = '' |
||||
start_all() |
||||
machine.wait_for_unit("multi-user.target") |
||||
machine.wait_for_unit("public-inbox-init.service") |
||||
|
||||
# Very basic check that Gitolite can work; |
||||
# Gitolite is not needed for the rest of this testScript |
||||
machine.wait_for_unit("gitolite-init.service") |
||||
|
||||
# List inboxes through public-inbox-httpd |
||||
machine.wait_for_unit("nginx.service") |
||||
machine.succeed("curl -L https://machine.${domain} | grep repo1@${domain}") |
||||
# The repo2 inbox is hidden |
||||
machine.fail("curl -L https://machine.${domain} | grep repo2@${domain}") |
||||
machine.wait_for_unit("public-inbox-httpd.service") |
||||
|
||||
# Send a mail and read it through public-inbox-httpd |
||||
# Must work too when using a recipientDelimiter. |
||||
machine.wait_for_unit("postfix.service") |
||||
machine.succeed("mail -t <${pkgs.writeText "mail" '' |
||||
Subject: Testing mail |
||||
From: root@localhost |
||||
To: repo1+extension@${domain} |
||||
Message-ID: <repo1@root-1> |
||||
Content-Type: text/plain; charset=utf-8 |
||||
Content-Disposition: inline |
||||
|
||||
This is a testing mail. |
||||
''}") |
||||
machine.sleep(5) |
||||
machine.succeed("curl -L 'https://machine.${domain}/inbox/repo1/repo1@root-1/T/#u' | grep 'This is a testing mail.'") |
||||
|
||||
# Read a mail through public-inbox-imapd |
||||
machine.wait_for_open_port(993) |
||||
machine.wait_for_unit("public-inbox-imapd.service") |
||||
machine.succeed("openssl s_client -ign_eof -crlf -connect machine.${domain}:993 <${pkgs.writeText "imap-commands" '' |
||||
tag login anonymous@${domain} anonymous |
||||
tag SELECT INBOX.comp.${orga}.repo1.0 |
||||
tag FETCH 1 (BODY[HEADER]) |
||||
tag LOGOUT |
||||
''} | grep '^Message-ID: <repo1@root-1>'") |
||||
|
||||
# TODO: Read a mail through public-inbox-nntpd |
||||
#machine.wait_for_open_port(563) |
||||
#machine.wait_for_unit("public-inbox-nntpd.service") |
||||
|
||||
# Delete a mail. |
||||
# Note that the use of an extension not listed in the addresses |
||||
# require to use --all |
||||
machine.succeed("curl -L https://machine.example.localdomain/inbox/repo1/repo1@root-1/raw | sudo -u public-inbox public-inbox-learn rm --all") |
||||
machine.fail("curl -L https://machine.example.localdomain/inbox/repo1/repo1@root-1/T/#u | grep 'This is a testing mail.'") |
||||
''; |
||||
}) |
||||
@ -1 +1 @@ |
||||
{:deps {clojupyter/clojupyter {:mvn/version "0.3.2"}}} |
||||
{:deps {clojupyter/clojupyter {:mvn/version "0.3.3"}}} |
||||
|
||||
@ -0,0 +1,12 @@ |
||||
{ callPackage |
||||
, buildGoModule |
||||
, nvidia_x11 |
||||
, nvidiaGpuSupport |
||||
}: |
||||
|
||||
callPackage ./generic.nix { |
||||
inherit buildGoModule nvidia_x11 nvidiaGpuSupport; |
||||
version = "1.3.0"; |
||||
sha256 = "098sg7jl257r6zfi2fsp9dwm0rrzi8m2k85bb097q14n3p4s3pna"; |
||||
vendorSha256 = "037bdgnyv8gkm2hz7h727ss46adnkywg28j6i1canmdacpi3qv5c"; |
||||
} |
||||
@ -1,85 +1,76 @@ |
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk-doc, intltool |
||||
, audit, glib, libusb1, libxml2 |
||||
, wrapGAppsHook |
||||
, gstreamer |
||||
, gst-plugins-base |
||||
, gst-plugins-good |
||||
, gst-plugins-bad |
||||
, libnotify |
||||
, gnome |
||||
{ lib |
||||
, stdenv |
||||
, fetchFromGitHub |
||||
, meson |
||||
, ninja |
||||
, pkg-config |
||||
, gi-docgen |
||||
, glib |
||||
, libxml2 |
||||
, gobject-introspection |
||||
|
||||
, enableGstPlugin ? true |
||||
, enableViewer ? true |
||||
, gst_all_1 |
||||
, gtk3 |
||||
, wrapGAppsHook |
||||
|
||||
, enableUsb ? true |
||||
, libusb1 |
||||
|
||||
, enablePacketSocket ? true |
||||
, enableViewer ? true |
||||
, enableGstPlugin ? true |
||||
, enableCppTest ? false |
||||
, enableFastHeartbeat ? false |
||||
, enableAsan ? false |
||||
}: |
||||
|
||||
let |
||||
gstreamerAtLeastVersion1 = |
||||
lib.all |
||||
(pkg: pkg != null && lib.versionAtLeast (lib.getVersion pkg) "1.0") |
||||
[ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]; |
||||
in |
||||
assert enableViewer -> enableGstPlugin; |
||||
assert enableViewer -> gstreamerAtLeastVersion1; |
||||
|
||||
stdenv.mkDerivation rec { |
||||
|
||||
pname = "aravis"; |
||||
version = "0.6.4"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "AravisProject"; |
||||
repo = pname; |
||||
rev= "ARAVIS_${builtins.replaceStrings ["."] ["_"] version}"; |
||||
sha256 = "18fnliks661kzc3g8v08hcaj18hjid8b180d6s9gwn0zgv4g374w"; |
||||
}; |
||||
assert enableGstPlugin -> gst_all_1 != null; |
||||
assert enableViewer -> enableGstPlugin; |
||||
assert enableViewer -> gtk3 != null; |
||||
assert enableViewer -> wrapGAppsHook != null; |
||||
|
||||
outputs = [ "bin" "dev" "out" "lib" ]; |
||||
stdenv.mkDerivation rec { |
||||
pname = "aravis"; |
||||
version = "0.8.21"; |
||||
|
||||
nativeBuildInputs = [ |
||||
autoreconfHook |
||||
pkg-config |
||||
intltool |
||||
gtk-doc |
||||
] ++ lib.optional enableViewer wrapGAppsHook; |
||||
src = fetchFromGitHub { |
||||
owner = "AravisProject"; |
||||
repo = pname; |
||||
rev = version; |
||||
sha256 = "sha256-z4fuo8tVyHf2Bw73ZfAEpAYmzbr9UIzEWPC5f95wnD8="; |
||||
}; |
||||
|
||||
buildInputs = |
||||
[ glib libxml2 ] |
||||
++ lib.optional enableUsb libusb1 |
||||
++ lib.optional enablePacketSocket audit |
||||
++ lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ] |
||||
++ lib.optionals (enableViewer) [ libnotify gtk3 gnome.adwaita-icon-theme ]; |
||||
outputs = [ "bin" "dev" "out" "lib" ]; |
||||
|
||||
preAutoreconf = "./autogen.sh"; |
||||
nativeBuildInputs = [ |
||||
meson |
||||
ninja |
||||
pkg-config |
||||
gi-docgen |
||||
] ++ lib.optional enableViewer wrapGAppsHook; |
||||
|
||||
configureFlags = |
||||
lib.optional enableUsb "--enable-usb" |
||||
++ lib.optional enablePacketSocket "--enable-packet-socket" |
||||
++ lib.optional enableViewer "--enable-viewer" |
||||
++ lib.optional enableGstPlugin |
||||
(if gstreamerAtLeastVersion1 then "--enable-gst-plugin" else "--enable-gst-0.10-plugin") |
||||
++ lib.optional enableCppTest "--enable-cpp-test" |
||||
++ lib.optional enableFastHeartbeat "--enable-fast-heartbeat" |
||||
++ lib.optional enableAsan "--enable-asan"; |
||||
buildInputs = |
||||
[ glib libxml2 gobject-introspection ] |
||||
++ lib.optional enableUsb libusb1 |
||||
++ lib.optionals (enableViewer || enableGstPlugin) (with gst_all_1; [ gstreamer gst-plugins-base (gst-plugins-good.override { gtkSupport = true; }) gst-plugins-bad ]) |
||||
++ lib.optionals (enableViewer) [ gtk3 ]; |
||||
|
||||
postPatch = '' |
||||
ln -s ${gtk-doc}/share/gtk-doc/data/gtk-doc.make . |
||||
''; |
||||
mesonFlags = [ |
||||
] ++ lib.optional enableFastHeartbeat "-Dfast-heartbeat=enabled" |
||||
++ lib.optional (!enableGstPlugin) "-Dgst-plugin=disabled" |
||||
++ lib.optional (!enableViewer) "-Dviewer=disabled" |
||||
++ lib.optional (!enableUsb) "-Dviewer=disabled" |
||||
++ lib.optional (!enablePacketSocket) "-Dpacket-socket=disabled"; |
||||
|
||||
doCheck = true; |
||||
doCheck = true; |
||||
|
||||
meta = { |
||||
description = "Library for video acquisition using GenICam cameras"; |
||||
longDescription = '' |
||||
Implements the gigabit ethernet and USB3 protocols used by industrial cameras. |
||||
''; |
||||
homepage = "https://aravisproject.github.io/docs/aravis-0.5"; |
||||
license = lib.licenses.lgpl2; |
||||
maintainers = []; |
||||
platforms = lib.platforms.unix; |
||||
}; |
||||
} |
||||
meta = { |
||||
description = "Library for video acquisition using GenICam cameras"; |
||||
longDescription = '' |
||||
Implements the gigabit ethernet and USB3 protocols used by industrial cameras. |
||||
''; |
||||
# the documentation is the best working homepage that's not the Github repo |
||||
homepage = "https://aravisproject.github.io/docs/aravis-0.8"; |
||||
license = lib.licenses.lgpl2; |
||||
maintainers = with lib.maintainers; [ tpw_rules ]; |
||||
platforms = lib.platforms.unix; |
||||
}; |
||||
} |
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,37 @@ |
||||
{ lib |
||||
, stdenv |
||||
, buildPythonPackage |
||||
, fetchPypi |
||||
, setuptools-scm |
||||
, pytestCheckHook |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "dlinfo"; |
||||
version = "1.2.1"; |
||||
|
||||
format = "setuptools"; |
||||
|
||||
src = fetchPypi { |
||||
inherit pname version; |
||||
sha256 = "5f6f43b47f3aa5fe12bd347cf536dc8fca6068c61a0a260e408bec7f6eb4bd38"; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ |
||||
setuptools-scm |
||||
]; |
||||
|
||||
checkInputs = [ |
||||
pytestCheckHook |
||||
]; |
||||
|
||||
pythonImportsCheck = [ "dlinfo" ]; |
||||
|
||||
meta = { |
||||
description = "Python wrapper for libc's dlinfo and dyld_find on Mac"; |
||||
homepage = "https://github.com/cloudflightio/python-dlinfo"; |
||||
license = lib.licenses.mit; |
||||
maintainers = with lib.maintainers; [ dotlambda ]; |
||||
broken = stdenv.isDarwin; |
||||
}; |
||||
} |
||||
@ -0,0 +1,30 @@ |
||||
{ lib, buildPythonPackage, fetchFromGitLab, pythonOlder, pytestCheckHook, pybind11, numpy }: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "ducc0"; |
||||
version = "0.23.0"; |
||||
|
||||
disabled = pythonOlder "3.7"; |
||||
|
||||
src = fetchFromGitLab { |
||||
domain = "gitlab.mpcdf.mpg.de"; |
||||
owner = "mtr"; |
||||
repo = "ducc"; |
||||
rev = "ducc0_${lib.replaceStrings ["."] ["_"] version}"; |
||||
sha256 = "dOc3TihtoRuLfniC9zQ1MEbnvGJHzFZfZ8+J8Dnw6Lk="; |
||||
}; |
||||
|
||||
buildInputs = [ pybind11 ]; |
||||
propagatedBuildInputs = [ numpy ]; |
||||
|
||||
checkInputs = [ pytestCheckHook ]; |
||||
pytestFlagsArray = [ "python/test" ]; |
||||
pythonImportsCheck = [ "ducc0" ]; |
||||
|
||||
meta = with lib; { |
||||
homepage = "https://gitlab.mpcdf.mpg.de/mtr/ducc"; |
||||
description = "Efficient algorithms for Fast Fourier transforms and more"; |
||||
license = licenses.gpl2Plus; |
||||
maintainers = with maintainers; [ parras ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,31 @@ |
||||
{ lib |
||||
, buildPythonPackage |
||||
, fetchPypi |
||||
, httpie |
||||
, requests_ntlm |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "httpie-ntlm"; |
||||
version = "1.0.2"; |
||||
format = "setuptools"; |
||||
|
||||
src = fetchPypi { |
||||
inherit pname version; |
||||
sha256 = "b1f757180c0bd60741ea16cf91fc53d47df402a5c287c4a61a14b335ea0552b3"; |
||||
}; |
||||
|
||||
propagatedBuildInputs = [ httpie requests_ntlm ]; |
||||
|
||||
# Package have no tests |
||||
doCheck = false; |
||||
|
||||
pythonImportsCheck = [ "httpie_ntlm" ]; |
||||
|
||||
meta = with lib; { |
||||
description = "NTLM auth plugin for HTTPie"; |
||||
homepage = "https://github.com/httpie/httpie-ntlm"; |
||||
license = licenses.bsdOriginal; |
||||
maintainers = with maintainers; [ kfollesdal ]; |
||||
}; |
||||
} |
||||
@ -1,42 +1,18 @@ |
||||
diff --git a/phonemizer/backend/espeak.py b/phonemizer/backend/espeak.py
|
||||
index b4712bf..5628fd5 100644
|
||||
--- a/phonemizer/backend/espeak.py
|
||||
+++ b/phonemizer/backend/espeak.py
|
||||
@@ -82,10 +82,7 @@ class BaseEspeakBackend(BaseBackend):
|
||||
if _ESPEAK_DEFAULT_PATH:
|
||||
return _ESPEAK_DEFAULT_PATH
|
||||
diff --git a/phonemizer/backend/espeak/wrapper.py b/phonemizer/backend/espeak/wrapper.py
|
||||
index 84a79f5..8abcae1 100644
|
||||
--- a/phonemizer/backend/espeak/wrapper.py
|
||||
+++ b/phonemizer/backend/espeak/wrapper.py
|
||||
@@ -143,12 +143,7 @@ class EspeakWrapper:
|
||||
f'is not a readable file')
|
||||
return library.resolve()
|
||||
|
||||
- espeak = distutils.spawn.find_executable('espeak-ng')
|
||||
- if not espeak: # pragma: nocover
|
||||
- espeak = distutils.spawn.find_executable('espeak')
|
||||
- return espeak
|
||||
+ return "@espeak@"
|
||||
- library = (
|
||||
- ctypes.util.find_library('espeak-ng') or
|
||||
- ctypes.util.find_library('espeak'))
|
||||
- if not library: # pragma: nocover
|
||||
- raise RuntimeError(
|
||||
- 'failed to find espeak library')
|
||||
+ library = '@libespeak@'
|
||||
return library
|
||||
|
||||
@classmethod
|
||||
def is_available(cls):
|
||||
diff --git a/phonemizer/backend/festival.py b/phonemizer/backend/festival.py
|
||||
index 3037be5..684ffff 100644
|
||||
--- a/phonemizer/backend/festival.py
|
||||
+++ b/phonemizer/backend/festival.py
|
||||
@@ -80,7 +80,7 @@ class FestivalBackend(BaseBackend):
|
||||
if _FESTIVAL_DEFAULT_PATH:
|
||||
return _FESTIVAL_DEFAULT_PATH
|
||||
|
||||
- return distutils.spawn.find_executable('festival')
|
||||
+ return "@festival@"
|
||||
|
||||
@classmethod
|
||||
def is_available(cls):
|
||||
diff --git a/test/test_punctuation.py b/test/test_punctuation.py
|
||||
index 6ed642a..08060df 100644
|
||||
--- a/test/test_punctuation.py
|
||||
+++ b/test/test_punctuation.py
|
||||
@@ -28,7 +28,7 @@ ESPEAK_143 = (EspeakBackend.version(as_tuple=True) >= (1, 49, 3))
|
||||
ESPEAK_150 = (EspeakBackend.version(as_tuple=True) >= (1, 50))
|
||||
|
||||
# True if we are using festival>=2.5
|
||||
-FESTIVAL_25 = (FestivalBackend.version(as_tuple=True) >= (2, 5))
|
||||
+FESTIVAL_25 = False
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
def _fetch_version_and_path(self):
|
||||
|
||||
@ -0,0 +1,12 @@ |
||||
diff --git a/src/debugger/frames.cpp b/src/debugger/frames.cpp
|
||||
index 534936b..21366f9 100644
|
||||
--- a/src/debugger/frames.cpp
|
||||
+++ b/src/debugger/frames.cpp
|
||||
@@ -9,6 +9,7 @@
|
||||
#include "utils/platform.h"
|
||||
#include "utils/logger.h"
|
||||
#include "utils/torelease.h"
|
||||
+#include <limits>
|
||||
|
||||
namespace netcoredbg
|
||||
{
|
||||
@ -0,0 +1,13 @@ |
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f8ff3c2..689c463 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -538,7 +538,7 @@ endif()
|
||||
#This has to cover the versions not already known by CMake
|
||||
set(Boost_ADDITIONAL_VERSIONS 1.47 1.47.0 1.47.1 1.55.0)
|
||||
|
||||
-set(OD_BOOST_COMPONENTS system filesystem locale program_options thread)
|
||||
+set(OD_BOOST_COMPONENTS system date_time filesystem locale program_options thread)
|
||||
|
||||
if(BUILD_TESTING AND OD_BUILD_TESTING)
|
||||
set(OD_BOOST_COMPONENTS ${OD_BOOST_COMPONENTS} unit_test_framework)
|
||||
@ -1,172 +0,0 @@ |
||||
From c9b5164c954cd0de80d971f1c4ced16bf41ea81b Mon Sep 17 00:00:00 2001
|
||||
From: Eric Wong <e@80x24.org>
|
||||
Date: Fri, 29 Nov 2019 12:25:07 +0000
|
||||
Subject: [PATCH 2/2] msgtime: drop Date::Parse for RFC2822
|
||||
|
||||
Date::Parse is not optimized for RFC2822 dates and isn't
|
||||
packaged on OpenBSD. It's still useful for historical
|
||||
email when email clients were less conformant, but is
|
||||
less relevant for new emails.
|
||||
---
|
||||
lib/PublicInbox/MsgTime.pm | 115 ++++++++++++++++++++++++++++++++-----
|
||||
t/msgtime.t | 6 ++
|
||||
2 files changed, 107 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/lib/PublicInbox/MsgTime.pm b/lib/PublicInbox/MsgTime.pm
|
||||
index 58e11d72..e9b27a49 100644
|
||||
--- a/lib/PublicInbox/MsgTime.pm
|
||||
+++ b/lib/PublicInbox/MsgTime.pm
|
||||
@@ -7,24 +7,114 @@ use strict;
|
||||
use warnings;
|
||||
use base qw(Exporter);
|
||||
our @EXPORT_OK = qw(msg_timestamp msg_datestamp);
|
||||
-use Date::Parse qw(str2time strptime);
|
||||
+use Time::Local qw(timegm);
|
||||
+my @MoY = qw(january february march april may june
|
||||
+ july august september october november december);
|
||||
+my %MoY;
|
||||
+@MoY{@MoY} = (0..11);
|
||||
+@MoY{map { substr($_, 0, 3) } @MoY} = (0..11);
|
||||
+
|
||||
+my %OBSOLETE_TZ = ( # RFC2822 4.3 (Obsolete Date and Time)
|
||||
+ EST => '-0500', EDT => '-0400',
|
||||
+ CST => '-0600', CDT => '-0500',
|
||||
+ MST => '-0700', MDT => '-0600',
|
||||
+ PST => '-0800', PDT => '-0700',
|
||||
+ UT => '+0000', GMT => '+0000', Z => '+0000',
|
||||
+
|
||||
+ # RFC2822 states:
|
||||
+ # The 1 character military time zones were defined in a non-standard
|
||||
+ # way in [RFC822] and are therefore unpredictable in their meaning.
|
||||
+);
|
||||
+my $OBSOLETE_TZ = join('|', keys %OBSOLETE_TZ);
|
||||
|
||||
sub str2date_zone ($) {
|
||||
my ($date) = @_;
|
||||
+ my ($ts, $zone);
|
||||
+
|
||||
+ # RFC822 is most likely for email, but we can tolerate an extra comma
|
||||
+ # or punctuation as long as all the data is there.
|
||||
+ # We'll use '\s' since Unicode spaces won't affect our parsing.
|
||||
+ # SpamAssassin ignores commas and redundant spaces, too.
|
||||
+ if ($date =~ /(?:[A-Za-z]+,?\s+)? # day-of-week
|
||||
+ ([0-9]+),?\s+ # dd
|
||||
+ ([A-Za-z]+)\s+ # mon
|
||||
+ ([0-9]{2,})\s+ # YYYY or YY (or YYY :P)
|
||||
+ ([0-9]+)[:\.] # HH:
|
||||
+ ((?:[0-9]{2})|(?:\s?[0-9])) # MM
|
||||
+ (?:[:\.]((?:[0-9]{2})|(?:\s?[0-9])))? # :SS
|
||||
+ \s+ # a TZ offset is required:
|
||||
+ ([\+\-])? # TZ sign
|
||||
+ [\+\-]* # I've seen extra "-" e.g. "--500"
|
||||
+ ([0-9]+|$OBSOLETE_TZ)(?:\s|$) # TZ offset
|
||||
+ /xo) {
|
||||
+ my ($dd, $m, $yyyy, $hh, $mm, $ss, $sign, $tz) =
|
||||
+ ($1, $2, $3, $4, $5, $6, $7, $8);
|
||||
+ # don't accept non-English months
|
||||
+ defined(my $mon = $MoY{lc($m)}) or return;
|
||||
+
|
||||
+ if (defined(my $off = $OBSOLETE_TZ{$tz})) {
|
||||
+ $sign = substr($off, 0, 1);
|
||||
+ $tz = substr($off, 1);
|
||||
+ }
|
||||
+
|
||||
+ # Y2K problems: 3-digit years, follow RFC2822
|
||||
+ if (length($yyyy) <= 3) {
|
||||
+ $yyyy += 1900;
|
||||
+
|
||||
+ # and 2-digit years from '09 (2009) (0..49)
|
||||
+ $yyyy += 100 if $yyyy < 1950;
|
||||
+ }
|
||||
+
|
||||
+ $ts = timegm($ss // 0, $mm, $hh, $dd, $mon, $yyyy);
|
||||
|
||||
- my $ts = str2time($date);
|
||||
- return undef unless(defined $ts);
|
||||
+ # Compute the time offset from [+-]HHMM
|
||||
+ $tz //= 0;
|
||||
+ my ($tz_hh, $tz_mm);
|
||||
+ if (length($tz) == 1) {
|
||||
+ $tz_hh = $tz;
|
||||
+ $tz_mm = 0;
|
||||
+ } elsif (length($tz) == 2) {
|
||||
+ $tz_hh = 0;
|
||||
+ $tz_mm = $tz;
|
||||
+ } else {
|
||||
+ $tz_hh = $tz;
|
||||
+ $tz_hh =~ s/([0-9]{2})\z//;
|
||||
+ $tz_mm = $1;
|
||||
+ }
|
||||
+ while ($tz_mm >= 60) {
|
||||
+ $tz_mm -= 60;
|
||||
+ $tz_hh += 1;
|
||||
+ }
|
||||
+ $sign //= '+';
|
||||
+ my $off = $sign . ($tz_mm * 60 + ($tz_hh * 60 * 60));
|
||||
+ $ts -= $off;
|
||||
+ $sign = '+' if $off == 0;
|
||||
+ $zone = sprintf('%s%02d%02d', $sign, $tz_hh, $tz_mm);
|
||||
|
||||
- # off is the time zone offset in seconds from GMT
|
||||
- my ($ss,$mm,$hh,$day,$month,$year,$off) = strptime($date);
|
||||
- return undef unless(defined $off);
|
||||
+ # Time::Zone and Date::Parse are part of the same distibution,
|
||||
+ # and we need Time::Zone to deal with tz names like "EDT"
|
||||
+ } elsif (eval { require Date::Parse }) {
|
||||
+ $ts = Date::Parse::str2time($date);
|
||||
+ return undef unless(defined $ts);
|
||||
|
||||
- # Compute the time zone from offset
|
||||
- my $sign = ($off < 0) ? '-' : '+';
|
||||
- my $hour = abs(int($off / 3600));
|
||||
- my $min = ($off / 60) % 60;
|
||||
- my $zone = sprintf('%s%02d%02d', $sign, $hour, $min);
|
||||
+ # off is the time zone offset in seconds from GMT
|
||||
+ my ($ss,$mm,$hh,$day,$month,$year,$off) =
|
||||
+ Date::Parse::strptime($date);
|
||||
+ return undef unless(defined $off);
|
||||
+
|
||||
+ # Compute the time zone from offset
|
||||
+ my $sign = ($off < 0) ? '-' : '+';
|
||||
+ my $hour = abs(int($off / 3600));
|
||||
+ my $min = ($off / 60) % 60;
|
||||
+
|
||||
+ $zone = sprintf('%s%02d%02d', $sign, $hour, $min);
|
||||
+ } else {
|
||||
+ warn "Date::Parse missing for non-RFC822 date: $date\n";
|
||||
+ return undef;
|
||||
+ }
|
||||
|
||||
+ # Note: we've already applied the offset to $ts at this point,
|
||||
+ # but we want to keep "git fsck" happy.
|
||||
# "-1200" is the furthest westermost zone offset,
|
||||
# but git fast-import is liberal so we use "-1400"
|
||||
if ($zone >= 1400 || $zone <= -1400) {
|
||||
@@ -59,9 +149,6 @@ sub msg_date_only ($) {
|
||||
my @date = $hdr->header_raw('Date');
|
||||
my ($ts);
|
||||
foreach my $d (@date) {
|
||||
- # Y2K problems: 3-digit years
|
||||
- $d =~ s!([A-Za-z]{3}) ([0-9]{3}) ([0-9]{2}:[0-9]{2}:[0-9]{2})!
|
||||
- my $yyyy = $2 + 1900; "$1 $yyyy $3"!e;
|
||||
$ts = eval { str2date_zone($d) } and return $ts;
|
||||
if ($@) {
|
||||
my $mid = $hdr->header_raw('Message-ID');
|
||||
diff --git a/t/msgtime.t b/t/msgtime.t
|
||||
index 6b396602..d9643b65 100644
|
||||
--- a/t/msgtime.t
|
||||
+++ b/t/msgtime.t
|
||||
@@ -84,4 +84,10 @@ is_deeply(datestamp('Fri, 28 Jun 2002 12:54:40 -700'), [1025294080, '-0700']);
|
||||
is_deeply(datestamp('Sat, 12 Jan 2002 12:52:57 -200'), [1010847177, '-0200']);
|
||||
is_deeply(datestamp('Mon, 05 Nov 2001 10:36:16 -800'), [1004985376, '-0800']);
|
||||
|
||||
+# obsolete formats described in RFC2822
|
||||
+for (qw(UT GMT Z)) {
|
||||
+ is_deeply(datestamp('Fri, 02 Oct 1993 00:00:00 '.$_), [ 749520000, '+0000']);
|
||||
+}
|
||||
+is_deeply(datestamp('Fri, 02 Oct 1993 00:00:00 EDT'), [ 749534400, '-0400']);
|
||||
+
|
||||
done_testing();
|
||||
--
|
||||
2.24.1
|
||||
|
||||
@ -0,0 +1,26 @@ |
||||
From 72f3fe059f031f24c5ad026cb2fc16318f227c09 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Childs <andrew.childs@bibo.com.ph>
|
||||
Date: Tue, 19 Apr 2022 16:29:58 +0900
|
||||
Subject: [PATCH 1/8] Make gio-2.0 optional when gsettings is disabled
|
||||
|
||||
Derived from https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/654
|
||||
---
|
||||
meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index d7e468cab..f7adf1413 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -614,7 +614,7 @@ if dbus_dep.found()
|
||||
cdata.set('HAVE_DBUS', 1)
|
||||
endif
|
||||
|
||||
-gio_dep = dependency('gio-2.0', version : '>= 2.26.0')
|
||||
+gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : false)
|
||||
if get_option('gsettings').enabled()
|
||||
assert(gio_dep.found(), 'GSettings support needs glib I/O library (GIO)')
|
||||
cdata.set('HAVE_GSETTINGS', 1)
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@ -0,0 +1,27 @@ |
||||
From 39bef695f783614e6175477417298ddf37e2ac13 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Childs <andrew.childs@bibo.com.ph>
|
||||
Date: Tue, 19 Apr 2022 16:58:43 +0900
|
||||
Subject: [PATCH 2/8] Ignore SCM_CREDS on macOS
|
||||
|
||||
It was added for FreeBSD support, but also enables the
|
||||
unsupported[citation needed] feature on macOS.
|
||||
---
|
||||
src/pulsecore/creds.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/pulsecore/creds.h b/src/pulsecore/creds.h
|
||||
index b599b569c..b5b1c9f37 100644
|
||||
--- a/src/pulsecore/creds.h
|
||||
+++ b/src/pulsecore/creds.h
|
||||
@@ -34,7 +34,7 @@
|
||||
typedef struct pa_creds pa_creds;
|
||||
typedef struct pa_cmsg_ancil_data pa_cmsg_ancil_data;
|
||||
|
||||
-#if defined(SCM_CREDENTIALS) || defined(SCM_CREDS)
|
||||
+#if defined(SCM_CREDENTIALS) || (defined(SCM_CREDS) && !defined(__APPLE__))
|
||||
|
||||
#define HAVE_CREDS 1
|
||||
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@ -0,0 +1,26 @@ |
||||
From 3f1abb55f4eb985fd0715b2b2ca45dcce3a56824 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Childs <andrew.childs@bibo.com.ph>
|
||||
Date: Tue, 19 Apr 2022 17:06:50 +0900
|
||||
Subject: [PATCH 3/8] Disable `-z nodelete` on darwin
|
||||
|
||||
Not supported[citation needed].
|
||||
---
|
||||
meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index f7adf1413..d4bece11a 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -404,7 +404,7 @@ cdata.set('MESON_BUILD', 1)
|
||||
# so we request the nodelete flag to be enabled.
|
||||
# On other systems, we don't really know how to do that, but it's welcome if somebody can tell.
|
||||
# Windows doesn't support this flag.
|
||||
-if host_machine.system() != 'windows'
|
||||
+if host_machine.system() != 'windows' and host_machine.system() != 'darwin'
|
||||
nodelete_link_args = ['-Wl,-z,nodelete']
|
||||
else
|
||||
nodelete_link_args = []
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@ -0,0 +1,57 @@ |
||||
From 0bd3b613ac3bf16a73b3223fa1b961da3a0db1b2 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Childs <andrew.childs@bibo.com.ph>
|
||||
Date: Tue, 19 Apr 2022 17:12:52 +0900
|
||||
Subject: [PATCH 4/8] Prefer clock_gettime
|
||||
|
||||
Available in darwin since 10.12 (released in 2016).
|
||||
---
|
||||
src/pulsecore/core-rtclock.c | 26 +++++++++++++-------------
|
||||
1 file changed, 13 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/src/pulsecore/core-rtclock.c b/src/pulsecore/core-rtclock.c
|
||||
index 2c2e28631..a08d4b391 100644
|
||||
--- a/src/pulsecore/core-rtclock.c
|
||||
+++ b/src/pulsecore/core-rtclock.c
|
||||
@@ -65,19 +65,7 @@ pa_usec_t pa_rtclock_age(const struct timeval *tv) {
|
||||
|
||||
struct timeval *pa_rtclock_get(struct timeval *tv) {
|
||||
|
||||
-#if defined(OS_IS_DARWIN)
|
||||
- uint64_t val, abs_time = mach_absolute_time();
|
||||
- Nanoseconds nanos;
|
||||
-
|
||||
- nanos = AbsoluteToNanoseconds(*(AbsoluteTime *) &abs_time);
|
||||
- val = *(uint64_t *) &nanos;
|
||||
-
|
||||
- tv->tv_sec = val / PA_NSEC_PER_SEC;
|
||||
- tv->tv_usec = (val % PA_NSEC_PER_SEC) / PA_NSEC_PER_USEC;
|
||||
-
|
||||
- return tv;
|
||||
-
|
||||
-#elif defined(HAVE_CLOCK_GETTIME)
|
||||
+#if defined(HAVE_CLOCK_GETTIME)
|
||||
struct timespec ts;
|
||||
|
||||
#ifdef CLOCK_MONOTONIC
|
||||
@@ -109,6 +97,18 @@ struct timeval *pa_rtclock_get(struct timeval *tv) {
|
||||
|
||||
return tv;
|
||||
}
|
||||
+#elif defined(OS_IS_DARWIN)
|
||||
+ uint64_t val, abs_time = mach_absolute_time();
|
||||
+ Nanoseconds nanos;
|
||||
+
|
||||
+ nanos = AbsoluteToNanoseconds(*(AbsoluteTime *) &abs_time);
|
||||
+ val = *(uint64_t *) &nanos;
|
||||
+
|
||||
+ tv->tv_sec = val / PA_NSEC_PER_SEC;
|
||||
+ tv->tv_usec = (val % PA_NSEC_PER_SEC) / PA_NSEC_PER_USEC;
|
||||
+
|
||||
+ return tv;
|
||||
+
|
||||
#endif /* HAVE_CLOCK_GETTIME */
|
||||
|
||||
return pa_gettimeofday(tv);
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@ -0,0 +1,24 @@ |
||||
From 8dee473920d3a331b73a415b37e7e0b01f014110 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Childs <andrew.childs@bibo.com.ph>
|
||||
Date: Tue, 19 Apr 2022 17:22:23 +0900
|
||||
Subject: [PATCH 5/8] Include poll-posix.c on darwin
|
||||
|
||||
---
|
||||
src/meson.build | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/meson.build b/src/meson.build
|
||||
index e2860811b..5bd68cb12 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -182,6 +182,7 @@ if host_machine.system() == 'windows'
|
||||
else
|
||||
libpulsecommon_sources += [
|
||||
'pulsecore/mutex-posix.c',
|
||||
+ 'pulsecore/poll-posix.c',
|
||||
'pulsecore/semaphore-posix.c',
|
||||
'pulsecore/thread-posix.c'
|
||||
]
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@ -0,0 +1,29 @@ |
||||
From 419258112b9d90d149ebbd5c657a36d8532b78a2 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Childs <andrew.childs@bibo.com.ph>
|
||||
Date: Tue, 19 Apr 2022 17:31:36 +0900
|
||||
Subject: [PATCH 6/8] Only use version-script on GNU-ish linkers
|
||||
|
||||
---
|
||||
src/pulse/meson.build | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/pulse/meson.build b/src/pulse/meson.build
|
||||
index c2128e087..a5e47867e 100644
|
||||
--- a/src/pulse/meson.build
|
||||
+++ b/src/pulse/meson.build
|
||||
@@ -74,7 +74,11 @@ run_target('update-map-file',
|
||||
command : [ join_paths(meson.source_root(), 'scripts/generate-map-file.sh'), 'map-file',
|
||||
[ libpulse_headers, 'simple.h', join_paths(meson.build_root(), 'src', 'pulse', 'version.h') ] ])
|
||||
|
||||
-versioning_link_args = '-Wl,-version-script=' + join_paths(meson.source_root(), 'src', 'pulse', 'map-file')
|
||||
+if meson.get_compiler('c').get_linker_id().startswith('ld.')
|
||||
+ versioning_link_args = '-Wl,-version-script=' + join_paths(meson.source_root(), 'src', 'pulse', 'map-file')
|
||||
+else
|
||||
+ versioning_link_args = []
|
||||
+endif
|
||||
|
||||
libpulse = shared_library('pulse',
|
||||
libpulse_sources,
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@ -0,0 +1,44 @@ |
||||
From 6f132be835d5acb5db4301ea1818601504e47fae Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Childs <andrew.childs@bibo.com.ph>
|
||||
Date: Tue, 19 Apr 2022 17:41:34 +0900
|
||||
Subject: [PATCH 7/8] Adapt undefined link args per linker
|
||||
|
||||
TODO: Why is this required? Isn't it default?
|
||||
---
|
||||
src/modules/meson.build | 13 ++++++++++++-
|
||||
1 file changed, 12 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/modules/meson.build b/src/modules/meson.build
|
||||
index be72c3b9b..0163b583f 100644
|
||||
--- a/src/modules/meson.build
|
||||
+++ b/src/modules/meson.build
|
||||
@@ -293,6 +293,17 @@ all_modules += [
|
||||
# FIXME: meson doesn't support multiple RPATH arguments currently
|
||||
rpath_dirs = join_paths(privlibdir) + ':' + join_paths(modlibexecdir)
|
||||
|
||||
+if meson.get_compiler('c').get_linker_id().startswith('ld.')
|
||||
+ no_undefined_link_args = [ '-Wl,--no-undefined' ]
|
||||
+elif meson.get_compiler('c').get_linker_id() == 'ld64'
|
||||
+ # TODO: is this required? is this not default?
|
||||
+ no_undefined_link_args = [ '-Wl,-undefined,error' ]
|
||||
+else
|
||||
+ # TODO: what platforms is this? what flag do they use?
|
||||
+ no_undefined_link_args = []
|
||||
+endif
|
||||
+
|
||||
+
|
||||
foreach m : all_modules
|
||||
name = m[0]
|
||||
sources = m[1]
|
||||
@@ -310,7 +321,7 @@ foreach m : all_modules
|
||||
install_rpath : rpath_dirs,
|
||||
install_dir : modlibexecdir,
|
||||
dependencies : [thread_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libintl_dep, platform_dep, platform_socket_dep] + extra_deps,
|
||||
- link_args : [nodelete_link_args, '-Wl,--no-undefined' ],
|
||||
+ link_args : [nodelete_link_args, no_undefined_link_args ],
|
||||
link_with : extra_libs,
|
||||
name_prefix : '',
|
||||
implicit_include_directories : false)
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@ -0,0 +1,31 @@ |
||||
From 1a840b6e517004c902dfbea3d358b344c9588978 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Childs <andrew.childs@bibo.com.ph>
|
||||
Date: Tue, 19 Apr 2022 17:49:08 +0900
|
||||
Subject: [PATCH 8/8] Use correct semaphore on darwin
|
||||
|
||||
---
|
||||
src/meson.build | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/meson.build b/src/meson.build
|
||||
index 5bd68cb12..041e2fab4 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -183,9 +183,13 @@ else
|
||||
libpulsecommon_sources += [
|
||||
'pulsecore/mutex-posix.c',
|
||||
'pulsecore/poll-posix.c',
|
||||
- 'pulsecore/semaphore-posix.c',
|
||||
'pulsecore/thread-posix.c'
|
||||
]
|
||||
+ if host_machine.system() == 'darwin'
|
||||
+ libpulsecommon_sources += [ 'pulsecore/semaphore-osx.c' ]
|
||||
+ else
|
||||
+ libpulsecommon_sources += [ 'pulsecore/semaphore-posix.c' ]
|
||||
+ endif
|
||||
endif
|
||||
# FIXME: Do SIMD things
|
||||
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@ -0,0 +1,17 @@ |
||||
diff --git a/lib/srv/desktop/rdp/rdpclient/client.go b/lib/srv/desktop/rdp/rdpclient/client.go
|
||||
index d191c768f..71117a30d 100644
|
||||
--- a/lib/srv/desktop/rdp/rdpclient/client.go
|
||||
+++ b/lib/srv/desktop/rdp/rdpclient/client.go
|
||||
@@ -56,10 +56,10 @@ package rdpclient
|
||||
#cgo linux,amd64 LDFLAGS: -L${SRCDIR}/../../../../../target/x86_64-unknown-linux-gnu/release
|
||||
#cgo linux,arm LDFLAGS: -L${SRCDIR}/../../../../../target/arm-unknown-linux-gnueabihf/release
|
||||
#cgo linux,arm64 LDFLAGS: -L${SRCDIR}/../../../../../target/aarch64-unknown-linux-gnu/release
|
||||
-#cgo linux LDFLAGS: -l:librdp_client.a -lpthread -ldl -lm
|
||||
+#cgo linux LDFLAGS: -l:librdp_client.a -lpthread -ldl -lm -lssl -lcrypto
|
||||
#cgo darwin,amd64 LDFLAGS: -L${SRCDIR}/../../../../../target/x86_64-apple-darwin/release
|
||||
#cgo darwin,arm64 LDFLAGS: -L${SRCDIR}/../../../../../target/aarch64-apple-darwin/release
|
||||
-#cgo darwin LDFLAGS: -framework CoreFoundation -framework Security -lrdp_client -lpthread -ldl -lm
|
||||
+#cgo darwin LDFLAGS: -framework CoreFoundation -framework Security -lrdp_client -lpthread -ldl -lm -lssl -lcrypto
|
||||
#include <librdprs.h>
|
||||
*/
|
||||
import "C"
|
||||
@ -0,0 +1,38 @@ |
||||
From 0a763a13ef55964395dff60283ececc16f957792 Mon Sep 17 00:00:00 2001
|
||||
From: Derek Kulinski <d@kulinski.us>
|
||||
Date: Sun, 8 May 2022 01:30:39 -0700
|
||||
Subject: [PATCH] Fix Jinja2 3.1.0
|
||||
|
||||
---
|
||||
salt/utils/jinja.py | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py
|
||||
index 0cb70bf64a..322c2f7f46 100644
|
||||
--- a/salt/utils/jinja.py
|
||||
+++ b/salt/utils/jinja.py
|
||||
@@ -25,10 +25,11 @@ import salt.utils.json
|
||||
import salt.utils.stringutils
|
||||
import salt.utils.url
|
||||
import salt.utils.yaml
|
||||
-from jinja2 import BaseLoader, Markup, TemplateNotFound, nodes
|
||||
+from jinja2 import BaseLoader, TemplateNotFound, nodes
|
||||
from jinja2.environment import TemplateModule
|
||||
from jinja2.exceptions import TemplateRuntimeError
|
||||
from jinja2.ext import Extension
|
||||
+from markupsafe import Markup
|
||||
from salt.exceptions import TemplateError
|
||||
from salt.utils.decorators.jinja import jinja_filter, jinja_global, jinja_test
|
||||
from salt.utils.odict import OrderedDict
|
||||
@@ -706,7 +707,7 @@ def method_call(obj, f_name, *f_args, **f_kwargs):
|
||||
return getattr(obj, f_name, lambda *args, **kwargs: None)(*f_args, **f_kwargs)
|
||||
|
||||
|
||||
-@jinja2.contextfunction
|
||||
+@jinja2.pass_context
|
||||
def show_full_context(ctx):
|
||||
return salt.utils.data.simple_types_filter(
|
||||
{key: value for key, value in ctx.items()}
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@ -0,0 +1,67 @@ |
||||
{ stdenv, lib, fetchFromGitHub, installShellFiles }: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "nb"; |
||||
version = "6.10.1"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "xwmx"; |
||||
repo = "nb"; |
||||
rev = version; |
||||
sha256 = "00c0k12yc2vqx0am1mhcjbn7fh3dab2zixslyh1smzcww275rk59"; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ installShellFiles ]; |
||||
|
||||
dontBuild = true; |
||||
|
||||
installPhase = '' |
||||
mkdir -p $out/bin/ |
||||
mv nb $out/bin/ |
||||
runHook postInstall |
||||
''; |
||||
|
||||
postInstall = '' |
||||
installShellCompletion etc/nb-completion.{bash,zsh} |
||||
''; |
||||
|
||||
meta = with lib; { |
||||
description = "A command line note-taking, bookmarking, archiving, and knowledge base application"; |
||||
longDescription = '' |
||||
`nb` creates notes in text-based formats like Markdown, Emacs Org mode, |
||||
and LaTeX, can work with files in any format, can import and export notes |
||||
to many document formats, and can create private, password-protected |
||||
encrypted notes and bookmarks. With `nb`, you can write notes using Vim, |
||||
Emacs, VS Code, Sublime Text, and any other text editor you like. `nb` |
||||
works in any standard Linux / Unix environment, including macOS and |
||||
Windows via WSL. Optional dependencies can be installed to enhance |
||||
functionality, but `nb` works great without them. |
||||
|
||||
`nb` is also a powerful text-based CLI bookmarking system. Page |
||||
information is automatically downloaded, compiled, and saved into normal |
||||
Markdown documents made for humans, so bookmarks are easy to edit just |
||||
like any other note. |
||||
|
||||
`nb` uses Git in the background to automatically record changes and sync |
||||
notebooks with remote repositories. `nb` can also be configured to sync |
||||
notebooks using a general purpose syncing utility like Dropbox so notes |
||||
can be edited in other apps on any device. |
||||
|
||||
`nb` is designed to be portable, future-focused, and vendor independent, |
||||
providing a full-featured and intuitive experience within a highly |
||||
composable user-centric text interface. The entire program is a single |
||||
well-tested shell script that can be installed, copied, or curled almost |
||||
anywhere and just work, using progressive enhancement for various |
||||
experience improvements in more capable environments. `nb` works great |
||||
whether you have one notebook with just a few notes or dozens of |
||||
notebooks containing thousands of notes, bookmarks, and other items. `nb` |
||||
makes it easy to incorporate other tools, writing apps, and workflows. |
||||
`nb` can be used a little, a lot, once in a while, or for just a subset |
||||
of features. `nb` is flexible. |
||||
''; |
||||
homepage = "https://xwmx.github.io/nb/"; |
||||
license = licenses.agpl3Plus; |
||||
maintainers = [ maintainers.toonn ]; |
||||
platforms = platforms.all; |
||||
}; |
||||
} |
||||
@ -1,22 +0,0 @@ |
||||
diff --git a/tests/test_docs.py b/tests/test_docs.py
|
||||
index 340e64d..a6b4dc9 100644
|
||||
--- a/tests/test_docs.py
|
||||
+++ b/tests/test_docs.py
|
||||
@@ -42,15 +42,10 @@ assert filenames
|
||||
# HACK: hardcoded paths, venv should be irrelevant, etc.
|
||||
# TODO: simplify by using the Python API instead of a subprocess
|
||||
# then we wont’t need the paths.
|
||||
-VENV_BIN = Path(__file__).parent.parent / 'venv/bin'
|
||||
-VENV_PYTHON = VENV_BIN / 'python'
|
||||
-VENV_RST2PSEUDOXML = VENV_BIN / 'rst2pseudoxml.py'
|
||||
+VENV_PYTHON = 'python'
|
||||
+VENV_RST2PSEUDOXML = 'rst2pseudoxml.py'
|
||||
|
||||
|
||||
-@pytest.mark.skipif(
|
||||
- not VENV_RST2PSEUDOXML.exists(),
|
||||
- reason='docutils not installed',
|
||||
-)
|
||||
@pytest.mark.parametrize('filename', filenames)
|
||||
def test_rst_file_syntax(filename):
|
||||
p = subprocess.Popen(
|
||||
Loading…
Reference in new issue