mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
Merge staging-next into staging
This commit is contained in:
commit
2aa3af36ca
|
@ -7238,6 +7238,12 @@
|
|||
githubId = 623509;
|
||||
name = "Martijn Vermaat";
|
||||
};
|
||||
martinetd = {
|
||||
email = "f.ktfhrvnznqxacf@noclue.notk.org";
|
||||
github = "martinetd";
|
||||
githubId = 1729331;
|
||||
name = "Dominique Martinet";
|
||||
};
|
||||
martingms = {
|
||||
email = "martin@mg.am";
|
||||
github = "martingms";
|
||||
|
|
|
@ -66,6 +66,15 @@
|
|||
<literal>enableParallelBuilding=false</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>pkgs.claws-mail-gtk2</literal>, representing Claws
|
||||
Mail’s older release version three, was removed in order to
|
||||
get rid of Python 2. Please switch to
|
||||
<literal>claws-mail</literal>, which is Claws Mail’s latest
|
||||
release based on GTK+3 and Python 3.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-22.05-notable-changes">
|
||||
|
|
|
@ -29,4 +29,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- The `wafHook` hook now honors `NIX_BUILD_CORES` when `enableParallelBuilding` is not set explicitly. Packages can restore the old behaviour by setting `enableParallelBuilding=false`.
|
||||
|
||||
- `pkgs.claws-mail-gtk2`, representing Claws Mail's older release version three, was removed in order to get rid of Python 2.
|
||||
Please switch to `claws-mail`, which is Claws Mail's latest release based on GTK+3 and Python 3.
|
||||
|
||||
## Other Notable Changes {#sec-release-22.05-notable-changes}
|
||||
|
|
|
@ -39,6 +39,7 @@ in
|
|||
decompressFonts = mkOption {
|
||||
type = types.bool;
|
||||
default = config.programs.xwayland.enable;
|
||||
defaultText = literalExpression "config.programs.xwayland.enable";
|
||||
description = ''
|
||||
Whether to decompress fonts in
|
||||
<filename>/run/current-system/sw/share/X11/fonts</filename>.
|
||||
|
|
|
@ -6,6 +6,7 @@ with lib;
|
|||
gtk.iconCache.enable = mkOption {
|
||||
type = types.bool;
|
||||
default = config.services.xserver.enable;
|
||||
defaultText = literalExpression "config.services.xserver.enable";
|
||||
description = ''
|
||||
Whether to build icon theme caches for GTK applications.
|
||||
'';
|
||||
|
|
|
@ -14,6 +14,12 @@ with lib;
|
|||
allLocales = any (x: x == "all") config.i18n.supportedLocales;
|
||||
locales = config.i18n.supportedLocales;
|
||||
};
|
||||
defaultText = literalExpression ''
|
||||
pkgs.buildPackages.glibcLocales.override {
|
||||
allLocales = any (x: x == "all") config.i18n.supportedLocales;
|
||||
locales = config.i18n.supportedLocales;
|
||||
}
|
||||
'';
|
||||
example = literalExpression "pkgs.glibcLocales";
|
||||
description = ''
|
||||
Customized pkg.glibcLocales package.
|
||||
|
|
|
@ -37,7 +37,7 @@ in
|
|||
type = listOfMaintainers;
|
||||
internal = true;
|
||||
default = [];
|
||||
example = [ lib.maintainers.all ];
|
||||
example = literalExpression ''[ lib.maintainers.all ]'';
|
||||
description = ''
|
||||
List of maintainers of each module. This option should be defined at
|
||||
most once per module.
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
{ config, lib, ... }:
|
||||
{ config, pkgs, lib, ... }:
|
||||
{
|
||||
options.programs.bcc.enable = lib.mkEnableOption "bcc";
|
||||
|
||||
config = lib.mkIf config.programs.bcc.enable {
|
||||
environment.systemPackages = [ config.boot.kernelPackages.bcc ];
|
||||
boot.extraModulePackages = [ config.boot.kernelPackages.bcc ];
|
||||
environment.systemPackages = [ pkgs.bcc ];
|
||||
boot.extraModulePackages = [ pkgs.bcc ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -38,6 +38,7 @@ let
|
|||
|
||||
p11Auth = mkOption {
|
||||
default = config.security.pam.p11.enable;
|
||||
defaultText = literalExpression "config.security.pam.p11.enable";
|
||||
type = types.bool;
|
||||
description = ''
|
||||
If set, keys listed in
|
||||
|
@ -49,6 +50,7 @@ let
|
|||
|
||||
u2fAuth = mkOption {
|
||||
default = config.security.pam.u2f.enable;
|
||||
defaultText = literalExpression "config.security.pam.u2f.enable";
|
||||
type = types.bool;
|
||||
description = ''
|
||||
If set, users listed in
|
||||
|
@ -61,6 +63,7 @@ let
|
|||
|
||||
yubicoAuth = mkOption {
|
||||
default = config.security.pam.yubico.enable;
|
||||
defaultText = literalExpression "config.security.pam.yubico.enable";
|
||||
type = types.bool;
|
||||
description = ''
|
||||
If set, users listed in
|
||||
|
@ -83,6 +86,7 @@ let
|
|||
|
||||
usbAuth = mkOption {
|
||||
default = config.security.pam.usb.enable;
|
||||
defaultText = literalExpression "config.security.pam.usb.enable";
|
||||
type = types.bool;
|
||||
description = ''
|
||||
If set, users listed in
|
||||
|
@ -93,6 +97,7 @@ let
|
|||
|
||||
otpwAuth = mkOption {
|
||||
default = config.security.pam.enableOTPW;
|
||||
defaultText = literalExpression "config.security.pam.enableOTPW";
|
||||
type = types.bool;
|
||||
description = ''
|
||||
If set, the OTPW system will be used (if
|
||||
|
@ -126,6 +131,7 @@ let
|
|||
|
||||
fprintAuth = mkOption {
|
||||
default = config.services.fprintd.enable;
|
||||
defaultText = literalExpression "config.services.fprintd.enable";
|
||||
type = types.bool;
|
||||
description = ''
|
||||
If set, fingerprint reader will be used (if exists and
|
||||
|
@ -135,6 +141,7 @@ let
|
|||
|
||||
oathAuth = mkOption {
|
||||
default = config.security.pam.oath.enable;
|
||||
defaultText = literalExpression "config.security.pam.oath.enable";
|
||||
type = types.bool;
|
||||
description = ''
|
||||
If set, the OATH Toolkit will be used.
|
||||
|
@ -249,6 +256,7 @@ let
|
|||
|
||||
pamMount = mkOption {
|
||||
default = config.security.pam.mount.enable;
|
||||
defaultText = literalExpression "config.security.pam.mount.enable";
|
||||
type = types.bool;
|
||||
description = ''
|
||||
Enable PAM mount (pam_mount) system to mount fileystems on user login.
|
||||
|
|
|
@ -50,6 +50,7 @@ in {
|
|||
type = types.nullOr types.str;
|
||||
description = "DNS name or IP address that will be used for the stream directory lookups or possibily the playlist generation if a Host header is not provided.";
|
||||
default = config.networking.domain;
|
||||
defaultText = literalExpression "config.networking.domain";
|
||||
};
|
||||
|
||||
admin = {
|
||||
|
|
|
@ -9,7 +9,7 @@ in {
|
|||
options = {
|
||||
services.navidrome = {
|
||||
|
||||
enable = mkEnableOption pkgs.navidrome.meta.description;
|
||||
enable = mkEnableOption "Navidrome music server";
|
||||
|
||||
settings = mkOption rec {
|
||||
type = settingsFormat.type;
|
||||
|
|
|
@ -31,6 +31,7 @@ in {
|
|||
port = mkOption {
|
||||
type = types.int;
|
||||
default = config.services.mpd.network.port;
|
||||
defaultText = literalExpression "config.services.mpd.network.port";
|
||||
description = "The port where MPD is listening.";
|
||||
example = 6600;
|
||||
};
|
||||
|
|
|
@ -302,6 +302,7 @@ in {
|
|||
|
||||
name = mkOption {
|
||||
default = "${config.networking.hostName}-fd";
|
||||
defaultText = literalExpression ''"''${config.networking.hostName}-fd"'';
|
||||
type = types.str;
|
||||
description = ''
|
||||
The client name that must be used by the Director when connecting.
|
||||
|
@ -364,6 +365,7 @@ in {
|
|||
|
||||
name = mkOption {
|
||||
default = "${config.networking.hostName}-sd";
|
||||
defaultText = literalExpression ''"''${config.networking.hostName}-sd"'';
|
||||
type = types.str;
|
||||
description = ''
|
||||
Specifies the Name of the Storage daemon.
|
||||
|
@ -439,6 +441,7 @@ in {
|
|||
|
||||
name = mkOption {
|
||||
default = "${config.networking.hostName}-dir";
|
||||
defaultText = literalExpression ''"''${config.networking.hostName}-dir"'';
|
||||
type = types.str;
|
||||
description = ''
|
||||
The director name used by the system administrator. This directive is
|
||||
|
|
|
@ -168,6 +168,7 @@ in
|
|||
hostname = mkOption {
|
||||
description = "Kubernetes kubelet hostname override.";
|
||||
default = config.networking.hostName;
|
||||
defaultText = literalExpression "config.networking.hostName";
|
||||
type = str;
|
||||
};
|
||||
|
||||
|
|
|
@ -98,6 +98,7 @@ in
|
|||
the public and private keys respectively.
|
||||
'';
|
||||
default = "${config.services.cfssl.dataDir}/ca";
|
||||
defaultText = literalExpression ''"''${config.services.cfssl.dataDir}/ca"'';
|
||||
type = str;
|
||||
};
|
||||
|
||||
|
|
|
@ -37,6 +37,7 @@ in
|
|||
hostname = mkOption {
|
||||
description = "Kubernetes proxy hostname override.";
|
||||
default = config.networking.hostName;
|
||||
defaultText = literalExpression "config.networking.hostName";
|
||||
type = str;
|
||||
};
|
||||
|
||||
|
|
|
@ -80,6 +80,7 @@ in
|
|||
dbdHost = mkOption {
|
||||
type = types.str;
|
||||
default = config.networking.hostName;
|
||||
defaultText = literalExpression "config.networking.hostName";
|
||||
description = ''
|
||||
Hostname of the machine where <literal>slurmdbd</literal>
|
||||
is running (i.e. name returned by <literal>hostname -s</literal>).
|
||||
|
|
|
@ -58,6 +58,7 @@ in
|
|||
'';
|
||||
example = "nixos";
|
||||
default = config.networking.hostName;
|
||||
defaultText = literalExpression "config.networking.hostName";
|
||||
};
|
||||
|
||||
runnerGroup = mkOption {
|
||||
|
|
|
@ -203,6 +203,7 @@ in
|
|||
buildMachinesFiles = mkOption {
|
||||
type = types.listOf types.path;
|
||||
default = optional (config.nix.buildMachines != []) "/etc/nix/machines";
|
||||
defaultText = literalExpression ''optional (config.nix.buildMachines != []) "/etc/nix/machines"'';
|
||||
example = [ "/etc/nix/machines" "/var/lib/hydra/provisioner/machines" ];
|
||||
description = "List of files containing build machines.";
|
||||
};
|
||||
|
|
|
@ -75,8 +75,8 @@ in
|
|||
description = ''
|
||||
The name of the savegame that will be used by the server.
|
||||
|
||||
When not present in ${stateDir}/saves, a new map with default
|
||||
settings will be generated before starting the service.
|
||||
When not present in /var/lib/''${config.services.factorio.stateDirName}/saves,
|
||||
a new map with default settings will be generated before starting the service.
|
||||
'';
|
||||
};
|
||||
# TODO Add more individual settings as nixos-options?
|
||||
|
|
|
@ -74,6 +74,7 @@ in {
|
|||
mailFrom = mkOption {
|
||||
type = types.str;
|
||||
default = "journalwatch@${config.networking.hostName}";
|
||||
defaultText = literalExpression ''"journalwatch@''${config.networking.hostName}"'';
|
||||
description = ''
|
||||
Mail address to send journalwatch reports from.
|
||||
'';
|
||||
|
|
|
@ -10,6 +10,7 @@ with lib;
|
|||
services.klogd.enable = mkOption {
|
||||
type = types.bool;
|
||||
default = versionOlder (getVersion config.boot.kernelPackages.kernel) "3.5";
|
||||
defaultText = literalExpression ''versionOlder (getVersion config.boot.kernelPackages.kernel) "3.5"'';
|
||||
description = ''
|
||||
Whether to enable klogd, the kernel log message processing
|
||||
daemon. Since systemd handles logging of kernel messages on
|
||||
|
|
|
@ -55,6 +55,7 @@ in {
|
|||
domains = mkOption {
|
||||
type = types.str;
|
||||
default = "csl:${config.networking.hostName}";
|
||||
defaultText = literalExpression ''"csl:''${config.networking.hostName}"'';
|
||||
example = "csl:example.com,mydomain.net";
|
||||
description = ''
|
||||
Local domains set (see <literal>opendkim(8)</literal> for more information on datasets).
|
||||
|
|
|
@ -17,6 +17,7 @@ in {
|
|||
name = mkOption {
|
||||
description = "Etcd unique node name.";
|
||||
default = config.networking.hostName;
|
||||
defaultText = literalExpression "config.networking.hostName";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
|
|
|
@ -299,7 +299,7 @@ in
|
|||
ENABLED = true;
|
||||
MAILER_TYPE = "sendmail";
|
||||
FROM = "do-not-reply@example.org";
|
||||
SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail";
|
||||
SENDMAIL_PATH = "''${pkgs.system-sendmail}/bin/sendmail";
|
||||
};
|
||||
other = {
|
||||
SHOW_FOOTER_VERSION = false;
|
||||
|
|
|
@ -475,6 +475,7 @@ in {
|
|||
host = mkOption {
|
||||
type = types.str;
|
||||
default = config.networking.hostName;
|
||||
defaultText = literalExpression "config.networking.hostName";
|
||||
description = "GitLab host name. Used e.g. for copy-paste URLs.";
|
||||
};
|
||||
|
||||
|
@ -534,6 +535,7 @@ in {
|
|||
host = mkOption {
|
||||
type = types.str;
|
||||
default = config.services.gitlab.host;
|
||||
defaultText = literalExpression "config.services.gitlab.host";
|
||||
description = "GitLab container registry host name.";
|
||||
};
|
||||
port = mkOption {
|
||||
|
|
|
@ -98,6 +98,9 @@ in {
|
|||
serviceDependencies = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = optional config.services.matrix-synapse.enable "matrix-synapse.service";
|
||||
defaultText = literalExpression ''
|
||||
optional config.services.matrix-synapse.enable "matrix-synapse.service"
|
||||
'';
|
||||
description = ''
|
||||
List of Systemd services to require and wait for when starting the application service,
|
||||
such as the Matrix homeserver if it's running on the same host.
|
||||
|
|
|
@ -227,6 +227,7 @@ in {
|
|||
type = types.str;
|
||||
example = "example.com";
|
||||
default = config.networking.hostName;
|
||||
defaultText = literalExpression "config.networking.hostName";
|
||||
description = ''
|
||||
The domain name of the server, with optional explicit port.
|
||||
This is used by remote servers to look up the server address.
|
||||
|
@ -379,6 +380,11 @@ in {
|
|||
default = if versionAtLeast config.system.stateVersion "18.03"
|
||||
then "psycopg2"
|
||||
else "sqlite3";
|
||||
defaultText = literalExpression ''
|
||||
if versionAtLeast config.system.stateVersion "18.03"
|
||||
then "psycopg2"
|
||||
else "sqlite3"
|
||||
'';
|
||||
description = ''
|
||||
The database engine name. Can be sqlite or psycopg2.
|
||||
'';
|
||||
|
|
|
@ -108,6 +108,9 @@ in {
|
|||
serviceDependencies = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = optional config.services.matrix-synapse.enable "matrix-synapse.service";
|
||||
defaultText = literalExpression ''
|
||||
optional config.services.matrix-synapse.enable "matrix-synapse.service"
|
||||
'';
|
||||
description = ''
|
||||
List of Systemd services to require and wait for when starting the application service.
|
||||
'';
|
||||
|
|
|
@ -18,6 +18,7 @@ in {
|
|||
klipperSocket = mkOption {
|
||||
type = types.path;
|
||||
default = config.services.klipper.apiSocket;
|
||||
defaultText = literalExpression "config.services.klipper.apiSocket";
|
||||
description = "Path to Klipper's API socket.";
|
||||
};
|
||||
|
||||
|
|
|
@ -67,6 +67,9 @@ in {
|
|||
serviceDependencies = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = optional config.services.matrix-synapse.enable "matrix-synapse.service";
|
||||
defaultText = literalExpression ''
|
||||
optional config.services.matrix-synapse.enable "matrix-synapse.service"
|
||||
'';
|
||||
description = ''
|
||||
List of Systemd services to require and wait for when starting the application service.
|
||||
'';
|
||||
|
|
|
@ -71,6 +71,9 @@ in
|
|||
originBase = mkOption {
|
||||
type = types.str;
|
||||
default = with config.networking; hostName + lib.optionalString (domain != null) ".${domain}";
|
||||
defaultText = literalExpression ''
|
||||
with config.networking; hostName + optionalString (domain != null) ".''${domain}"
|
||||
'';
|
||||
description = ''
|
||||
Host name used by reverse-proxy and for default settings. Will host services at git."''${originBase}". For example: git.sr.ht
|
||||
'';
|
||||
|
|
|
@ -18,6 +18,7 @@ with lib;
|
|||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.xmrig;
|
||||
defaultText = literalExpression "pkgs.xmrig";
|
||||
example = literalExpression "pkgs.xmrig-mo";
|
||||
description = "XMRig package to use.";
|
||||
};
|
||||
|
|
|
@ -324,6 +324,7 @@ in {
|
|||
|
||||
mongoUrl = mkOption {
|
||||
default = "mongodb://${config.services.mongodb.bind_ip}:27017/seyren";
|
||||
defaultText = literalExpression ''"mongodb://''${config.services.mongodb.bind_ip}:27017/seyren"'';
|
||||
description = "Mongodb connection string.";
|
||||
type = types.str;
|
||||
};
|
||||
|
|
|
@ -131,6 +131,7 @@ in
|
|||
validateConfig = mkOption {
|
||||
type = types.bool;
|
||||
default = pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform;
|
||||
defaultText = literalExpression "pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform";
|
||||
description = "if true, the syntax of the nagios configuration file is checked at build time";
|
||||
};
|
||||
|
||||
|
|
|
@ -93,6 +93,7 @@ in
|
|||
dashboard = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = config.services.grafana.enable;
|
||||
defaultText = lib.literalExpression "config.services.grafana.enable";
|
||||
description = ''
|
||||
Whether the official parsedmarc grafana dashboard should
|
||||
be provisioned to the local grafana instance.
|
||||
|
|
|
@ -125,6 +125,7 @@ in
|
|||
mail = {
|
||||
enable = mkOption {
|
||||
default = config.services.mail.sendmailSetuidWrapper != null;
|
||||
defaultText = literalExpression "config.services.mail.sendmailSetuidWrapper != null";
|
||||
type = types.bool;
|
||||
description = "Whenever to send e-mail notifications.";
|
||||
};
|
||||
|
@ -169,12 +170,14 @@ in
|
|||
x11 = {
|
||||
enable = mkOption {
|
||||
default = config.services.xserver.enable;
|
||||
defaultText = literalExpression "config.services.xserver.enable";
|
||||
type = types.bool;
|
||||
description = "Whenever to send X11 xmessage notifications.";
|
||||
};
|
||||
|
||||
display = mkOption {
|
||||
default = ":${toString config.services.xserver.display}";
|
||||
defaultText = literalExpression ''":''${toString config.services.xserver.display}"'';
|
||||
type = types.str;
|
||||
description = "DISPLAY to send X11 notifications to.";
|
||||
};
|
||||
|
|
|
@ -79,6 +79,11 @@ in
|
|||
if versionAtLeast config.system.stateVersion "17.09"
|
||||
then "/var/lib/ipfs"
|
||||
else "/var/lib/ipfs/.ipfs";
|
||||
defaultText = literalExpression ''
|
||||
if versionAtLeast config.system.stateVersion "17.09"
|
||||
then "/var/lib/ipfs"
|
||||
else "/var/lib/ipfs/.ipfs"
|
||||
'';
|
||||
description = "The data dir for IPFS";
|
||||
};
|
||||
|
||||
|
|
|
@ -144,6 +144,7 @@ in
|
|||
|
||||
forwarders = mkOption {
|
||||
default = config.networking.nameservers;
|
||||
defaultText = literalExpression "config.networking.nameservers";
|
||||
type = types.listOf types.str;
|
||||
description = "
|
||||
List of servers we should forward requests to.
|
||||
|
|
|
@ -193,6 +193,7 @@ in {
|
|||
realm = mkOption {
|
||||
type = types.str;
|
||||
default = config.networking.hostName;
|
||||
defaultText = literalExpression "config.networking.hostName";
|
||||
example = "example.com";
|
||||
description = ''
|
||||
The default realm to be used for the users when no explicit
|
||||
|
|
|
@ -145,6 +145,7 @@ in {
|
|||
providerName = mkOption {
|
||||
type = types.str;
|
||||
default = "2.dnscrypt-cert.${config.networking.hostName}";
|
||||
defaultText = literalExpression ''"2.dnscrypt-cert.''${config.networking.hostName}"'';
|
||||
example = "2.dnscrypt-cert.myresolver";
|
||||
description = ''
|
||||
The name that will be given to this DNSCrypt resolver.
|
||||
|
|
|
@ -93,6 +93,9 @@ in {
|
|||
'';
|
||||
type = types.nullOr types.str;
|
||||
default = with config.networking; (hostName + optionalString (domain != null) ".${domain}");
|
||||
defaultText = literalExpression ''
|
||||
with config.networking; (hostName + optionalString (domain != null) ".''${domain}")
|
||||
'';
|
||||
example = "node1.example.com";
|
||||
};
|
||||
|
||||
|
|
|
@ -76,6 +76,7 @@ in
|
|||
identity.hostname = mkOption {
|
||||
type = types.str;
|
||||
default = config.networking.hostName;
|
||||
defaultText = literalExpression "config.networking.hostName";
|
||||
example = "example.com";
|
||||
description = ''
|
||||
The hostname of this ncdns instance, which defaults to the machine
|
||||
|
|
|
@ -603,6 +603,7 @@ in
|
|||
reuseport = mkOption {
|
||||
type = types.bool;
|
||||
default = pkgs.stdenv.isLinux;
|
||||
defaultText = literalExpression "pkgs.stdenv.isLinux";
|
||||
description = ''
|
||||
Whether to enable SO_REUSEPORT on all used sockets. This lets multiple
|
||||
processes bind to the same port. This speeds up operation especially
|
||||
|
|
|
@ -52,6 +52,7 @@ in
|
|||
|
||||
servers = mkOption {
|
||||
default = config.networking.timeServers;
|
||||
defaultText = literalExpression "config.networking.timeServers";
|
||||
type = types.listOf types.str;
|
||||
description = ''
|
||||
The set of NTP servers from which to synchronise.
|
||||
|
|
|
@ -77,6 +77,7 @@ in
|
|||
|
||||
servers = mkOption {
|
||||
default = config.networking.timeServers;
|
||||
defaultText = literalExpression "config.networking.timeServers";
|
||||
type = types.listOf types.str;
|
||||
description = ''
|
||||
The set of NTP servers from which to synchronise.
|
||||
|
|
|
@ -23,6 +23,7 @@ in
|
|||
|
||||
servers = mkOption {
|
||||
default = config.services.ntp.servers;
|
||||
defaultText = literalExpression "config.services.ntp.servers";
|
||||
type = types.listOf types.str;
|
||||
inherit (options.services.ntp.servers) description;
|
||||
};
|
||||
|
|
|
@ -58,6 +58,7 @@ in
|
|||
type = types.str;
|
||||
example = "Voltron";
|
||||
default = config.networking.hostName;
|
||||
defaultText = literalExpression "config.networking.hostName";
|
||||
description = ''
|
||||
Name of the Resilio Sync device.
|
||||
'';
|
||||
|
|
|
@ -124,6 +124,7 @@ in {
|
|||
type = types.package;
|
||||
description = "Which package to use for the seafile server.";
|
||||
default = pkgs.seafile-server;
|
||||
defaultText = literalExpression "pkgs.seafile-server";
|
||||
};
|
||||
|
||||
seahubExtraConf = mkOption {
|
||||
|
|
|
@ -49,6 +49,7 @@ in {
|
|||
|
||||
nameservers = mkOption {
|
||||
default = map (n: n + ":53") config.networking.nameservers;
|
||||
defaultText = literalExpression ''map (n: n + ":53") config.networking.nameservers'';
|
||||
type = types.listOf types.str;
|
||||
description = "Skydns list of nameservers to forward DNS requests to when not authoritative for a domain.";
|
||||
example = ["8.8.8.8:53" "8.8.4.4:53"];
|
||||
|
|
|
@ -241,6 +241,12 @@ in
|
|||
+ FPing
|
||||
binary = ${config.security.wrapperDir}/fping
|
||||
'';
|
||||
defaultText = literalExpression ''
|
||||
'''
|
||||
+ FPing
|
||||
binary = ''${config.security.wrapperDir}/fping
|
||||
'''
|
||||
'';
|
||||
description = "Probe configuration";
|
||||
};
|
||||
sendmail = mkOption {
|
||||
|
|
|
@ -43,6 +43,7 @@ in
|
|||
hostName = mkOption {
|
||||
type = types.str;
|
||||
default = config.networking.hostName;
|
||||
defaultText = literalExpression "config.networking.hostName";
|
||||
description = "Server hostname.";
|
||||
};
|
||||
|
||||
|
|
|
@ -8,6 +8,7 @@ in
|
|||
proxy = mkOption {
|
||||
type = types.str;
|
||||
default = config.services.oauth2_proxy.httpAddress;
|
||||
defaultText = literalExpression "config.services.oauth2_proxy.httpAddress";
|
||||
description = ''
|
||||
The address of the reverse proxy endpoint for oauth2_proxy
|
||||
'';
|
||||
|
|
|
@ -37,6 +37,7 @@ in
|
|||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = config.services.tor.enable && config.services.tor.client.enable;
|
||||
defaultText = literalExpression "config.services.tor.enable && config.services.tor.client.enable";
|
||||
description = ''
|
||||
Whether to build <literal>/etc/tor/torsocks.conf</literal>
|
||||
containing the specified global torsocks configuration.
|
||||
|
|
|
@ -48,7 +48,7 @@ let
|
|||
in
|
||||
{
|
||||
options.services.epgstation = {
|
||||
enable = mkEnableOption pkgs.epgstation.meta.description;
|
||||
enable = mkEnableOption "EPGStation: DTV Software in Japan";
|
||||
|
||||
usePreconfiguredStreaming = mkOption {
|
||||
type = types.bool;
|
||||
|
|
|
@ -24,7 +24,7 @@ in
|
|||
{
|
||||
options = {
|
||||
services.mirakurun = {
|
||||
enable = mkEnableOption mirakurun.meta.description;
|
||||
enable = mkEnableOption "the Mirakurun DVR Tuner Server";
|
||||
|
||||
port = mkOption {
|
||||
type = with types; nullOr port;
|
||||
|
|
|
@ -79,6 +79,7 @@ in
|
|||
email = mkOption {
|
||||
type = types.str;
|
||||
default = "ihatemoney@${config.networking.hostName}";
|
||||
defaultText = literalExpression ''"ihatemoney@''${config.networking.hostName}"'';
|
||||
description = "The email of the sender of ihatemoney emails";
|
||||
};
|
||||
};
|
||||
|
|
|
@ -9,6 +9,7 @@ in
|
|||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.openwebrx;
|
||||
defaultText = literalExpression "pkgs.openwebrx";
|
||||
description = "OpenWebRX package to use for the service";
|
||||
};
|
||||
};
|
||||
|
|
|
@ -234,6 +234,7 @@ in {
|
|||
package = lib.mkOption {
|
||||
type = lib.types.package;
|
||||
default = pkgs.peertube;
|
||||
defaultText = lib.literalExpression "pkgs.peertube";
|
||||
description = "Peertube package to use.";
|
||||
};
|
||||
};
|
||||
|
|
|
@ -121,7 +121,7 @@ in {
|
|||
moin = {
|
||||
type = "normal";
|
||||
pythonPackages = self: with self; [ moinmoin ];
|
||||
socket = "${config.services.uwsgi.runDir}/uwsgi.sock";
|
||||
socket = "''${config.services.uwsgi.runDir}/uwsgi.sock";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -42,6 +42,7 @@ in
|
|||
stateDir = mkOption {
|
||||
type = types.path;
|
||||
default = "/var/spool/varnish/${config.networking.hostName}";
|
||||
defaultText = literalExpression ''"/var/spool/varnish/''${config.networking.hostName}"'';
|
||||
description = "
|
||||
Directory holding all state for Varnish to run.
|
||||
";
|
||||
|
|
|
@ -150,7 +150,7 @@ in
|
|||
example = literalExpression ''
|
||||
{ plasmaSetup = {
|
||||
text = '''
|
||||
${pkgs.libsForQt5.kservice}/bin/kbuildsycoca5"
|
||||
''${pkgs.libsForQt5.kservice}/bin/kbuildsycoca5"
|
||||
''';
|
||||
deps = [];
|
||||
};
|
||||
|
|
|
@ -201,6 +201,7 @@ in
|
|||
system.boot.loader.kernelFile = mkOption {
|
||||
internal = true;
|
||||
default = pkgs.stdenv.hostPlatform.linux-kernel.target;
|
||||
defaultText = literalExpression "pkgs.stdenv.hostPlatform.linux-kernel.target";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Name of the kernel file to be passed to the bootloader.
|
||||
|
|
|
@ -99,6 +99,7 @@ in
|
|||
|
||||
enable = mkOption {
|
||||
default = !config.boot.isContainer;
|
||||
defaultText = literalExpression "!config.boot.isContainer";
|
||||
type = types.bool;
|
||||
description = ''
|
||||
Whether to enable the GNU GRUB boot loader.
|
||||
|
|
|
@ -32,6 +32,7 @@ in
|
|||
|
||||
services.resolved.domains = mkOption {
|
||||
default = config.networking.search;
|
||||
defaultText = literalExpression "config.networking.search";
|
||||
example = [ "example.com" ];
|
||||
type = types.listOf types.str;
|
||||
description = ''
|
||||
|
|
|
@ -9,6 +9,7 @@ with lib;
|
|||
services.timesyncd = {
|
||||
enable = mkOption {
|
||||
default = !config.boot.isContainer;
|
||||
defaultText = literalExpression "!config.boot.isContainer";
|
||||
type = types.bool;
|
||||
description = ''
|
||||
Enables the systemd NTP client daemon.
|
||||
|
@ -16,6 +17,7 @@ with lib;
|
|||
};
|
||||
servers = mkOption {
|
||||
default = config.networking.timeServers;
|
||||
defaultText = literalExpression "config.networking.timeServers";
|
||||
type = types.listOf types.str;
|
||||
description = ''
|
||||
The set of NTP servers from which to synchronise.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
inherit (lib) types;
|
||||
inherit (lib) literalExpression types;
|
||||
in {
|
||||
options = {
|
||||
ec2 = {
|
||||
|
@ -50,6 +50,7 @@ in {
|
|||
};
|
||||
efi = lib.mkOption {
|
||||
default = pkgs.stdenv.hostPlatform.isAarch64;
|
||||
defaultText = literalExpression "pkgs.stdenv.hostPlatform.isAarch64";
|
||||
internal = true;
|
||||
description = ''
|
||||
Whether the EC2 instance is using EFI.
|
||||
|
|
|
@ -329,6 +329,7 @@ in
|
|||
mkOption {
|
||||
type = types.str;
|
||||
default = "./${config.system.name}.qcow2";
|
||||
defaultText = literalExpression ''"./''${config.system.name}.qcow2"'';
|
||||
description =
|
||||
''
|
||||
Path to the disk image containing the root filesystem.
|
||||
|
@ -678,6 +679,7 @@ in
|
|||
mkOption {
|
||||
type = types.str;
|
||||
default = "./${config.system.name}-efi-vars.fd";
|
||||
defaultText = literalExpression ''"./''${config.system.name}-efi-vars.fd"'';
|
||||
description =
|
||||
''
|
||||
Path to nvram image containing UEFI variables. The will be created
|
||||
|
|
|
@ -44,6 +44,7 @@ in
|
|||
boot-stage1 = handleTest ./boot-stage1.nix {};
|
||||
borgbackup = handleTest ./borgbackup.nix {};
|
||||
botamusique = handleTest ./botamusique.nix {};
|
||||
bpf = handleTestOn ["x86_64-linux" "aarch64-linux"] ./bpf.nix {};
|
||||
btrbk = handleTest ./btrbk.nix {};
|
||||
buildbot = handleTest ./buildbot.nix {};
|
||||
buildkite-agents = handleTest ./buildkite-agents.nix {};
|
||||
|
|
25
nixos/tests/bpf.nix
Normal file
25
nixos/tests/bpf.nix
Normal file
|
@ -0,0 +1,25 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "bpf";
|
||||
meta.maintainers = with pkgs.lib.maintainers; [ martinetd ];
|
||||
|
||||
machine = { pkgs, ... }: {
|
||||
programs.bcc.enable = true;
|
||||
environment.systemPackages = with pkgs; [ bpftrace ];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
## bcc
|
||||
# syscount -d 1 stops 1s after probe started so is good for that
|
||||
print(machine.succeed("syscount -d 1"))
|
||||
|
||||
## bpftrace
|
||||
# list probes
|
||||
machine.succeed("bpftrace -l")
|
||||
# simple BEGIN probe (user probe on bpftrace itself)
|
||||
print(machine.succeed("bpftrace -e 'BEGIN { print(\"ok\"); exit(); }'"))
|
||||
# tracepoint
|
||||
print(machine.succeed("bpftrace -e 'tracepoint:syscalls:sys_enter_* { print(probe); exit(); }'"))
|
||||
# kprobe
|
||||
print(machine.succeed("bpftrace -e 'kprobe:schedule { print(probe); exit() }'"))
|
||||
'';
|
||||
})
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ashuffle";
|
||||
version = "3.12.3";
|
||||
version = "3.12.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joshkunz";
|
||||
repo = "ashuffle";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-y2DH8SjSZ8hV6DAC4uDw5Wn7O0oj/WIhIr4BE/+jUxM=";
|
||||
sha256 = "sha256-dPgv6EzRxRdHkGvys601Bkg9Srd8oEjoE9jbAin74Vk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -21,19 +21,19 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spot";
|
||||
version = "0.2.0";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xou816";
|
||||
repo = "spot";
|
||||
rev = version;
|
||||
sha256 = "16pri0in514xzy21bsijyvyyjwa0f6lg4zyizmdcmcdw4glrs11m";
|
||||
hash = "sha256-g0oVhlfez9i+Vv8lt/aNftCVqdgPMDySBBeLyOv7Zl8=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
sha256 = "1fvnidxh4rnkzqg3qjk3zlkp2d41qdamm0bfavk8jrazw8sgih84";
|
||||
hash = "sha256-n10aYzkRqEe1h2WPAfARjH79Npvv+3fdX9jCtxv2a34=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -18,13 +18,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.0-16";
|
||||
version = "7.1.0-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
rev = version;
|
||||
sha256 = "sha256-souH5Fop4ss1ysaYylHcykoeB0HvMtqU51xggKoRFDM=";
|
||||
sha256 = "sha256-P6w7dDDvY8r55qN3hnsuzO8kp85gxp2t6vShmhoPOgs=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
|
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "viewnior";
|
||||
version = "1.7";
|
||||
version = "1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hellosiyan";
|
||||
repo = "Viewnior";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "0y4hk3vq8psba5k615w18qj0kbdfp5w0lm98nv5apy6hmcpwfyig";
|
||||
sha256 = "sha256-LTahMmcAqgqviUxR624kTozJGTniAAGWKo1ZqXjoG5M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -14,6 +14,8 @@
|
|||
, libXtst
|
||||
, zlib
|
||||
, maven
|
||||
, webkitgtk
|
||||
, glib-networking
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -69,6 +71,9 @@ stdenv.mkDerivation rec {
|
|||
libXrender
|
||||
libXtst
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
webkitgtk
|
||||
glib-networking
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
|
@ -130,7 +135,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \
|
||||
--prefix PATH : ${jdk}/bin \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst ])} \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk glib-networking ])} \
|
||||
--prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
|
||||
|
||||
mkdir -p $out/share/pixmaps
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hugo";
|
||||
version = "0.88.1";
|
||||
version = "0.89.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yuFFp/tgyziR4SXul2PlMhKmRl7C7OSrW8/kCCUpzI0=";
|
||||
sha256 = "sha256-yXOe+SCMvr3xi0kd2AuWm1CzzBuODCED6p7kaWGXvpM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-VX+oIz5wAyEQ4nky3kXmJZbMF0MvfAKdEAMLnS0hXc8=";
|
||||
vendorSha256 = "sha256-NqWi9n8H5IeMmkBwTX3HN1RLLtWA5sM1iy1L2BZCH7M=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -16,6 +16,11 @@ python3.pkgs.buildPythonApplication rec {
|
|||
sha256 = "sha256-+kPr7ndY6u1HMw6m0UZJ5jxVIPNjlTfQt7OYEdZkHBE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'tzlocal = ">2.0, <3.0"' 'tzlocal = ">2.0, !=3.0"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
];
|
||||
|
|
|
@ -14,13 +14,13 @@ let
|
|||
]);
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "wike";
|
||||
version = "1.5.7";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hugolabe";
|
||||
repo = "Wike";
|
||||
rev = version;
|
||||
sha256 = "sha256-SB+ApuSovqQCaZYPhH+duf+c07JDSSCRz8hTVhEa4gY=";
|
||||
sha256 = "sha256-23tmp0Cyr6O7Z2loLI0PHOxJGyE27RNmY7PoKBctt44=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -13,16 +13,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zola";
|
||||
version = "0.14.1";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getzola";
|
||||
repo = pname;
|
||||
repo = "zola";
|
||||
rev = "v${version}";
|
||||
sha256 = "1cvvxiginwf1rldijzwk9gh63qc0ls5d7j3j8ri7yhk21pz9f6bi";
|
||||
sha256 = "152ydi2gxfhyqsw6i79f9h1xwvwfq729likbagjy5z2bv822m44v";
|
||||
};
|
||||
|
||||
cargoSha256 = "1hg8j9a8c6c3ap24jd96y07rlp4f0s2mkyx5034nlnkm3lj4q42n";
|
||||
cargoSha256 = "0bv2yyqy9l896p0dk1668ayw3xf71h9ddyymimx44j6nw389fxx3";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lagrange";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skyjake";
|
||||
repo = "lagrange";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-T4LZcdQHqykcv1HnTHMt5LE/1gwKPjN3f0ZmqSCID/A=";
|
||||
sha256 = "sha256-5mZbx9L7YDG2VwrF/iFhYCw8R/0FOnZz9cRkA5Wl9MA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "arkade";
|
||||
version = "0.8.9";
|
||||
version = "0.8.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexellis";
|
||||
repo = "arkade";
|
||||
rev = version;
|
||||
sha256 = "0jv6pip3ywx8bx7m25fby6kl5irnjxvlpss2wkm615gv9ari21aq";
|
||||
sha256 = "0mdi5cjcs0qzj238lfjqbjgi131r2vxj810zx1gv1lc9y0aq0hkl";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
@ -52,5 +52,13 @@ buildGoModule rec {
|
|||
description = "Open Source Kubernetes Marketplace";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ welteki ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"x86_64-darwin"
|
||||
"aarch64-linux"
|
||||
"aarch64-darwin"
|
||||
"armv7l-linux"
|
||||
"armv6l-linux"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cilium-cli";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cilium";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vIm5PkRyh41jtvDrLDxFVzSkhFipYYYEEY0/qxbOXGE=";
|
||||
sha256 = "sha256-t4Im3/2qcKnDDcKWmUUa/lsZszDDlos+uTERKxd7x1c=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "whatsapp-for-linux";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eneshecan";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VdkCjzmZqP/ZVY1H9FxBGe5rN0nZEPZbMp3MVKL6WLc=";
|
||||
sha256 = "sha256-TX6fMuhe6VHbhWJSsPM0iOV4CuCfULD5McJyHuTW4lI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -29,6 +29,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
lxml
|
||||
typing-extensions
|
||||
python-dateutil
|
||||
pytz
|
||||
tzlocal
|
||||
];
|
||||
|
||||
|
|
|
@ -1,10 +1,7 @@
|
|||
{ stdenv, lib, fetchgit, fetchpatch, wrapGAppsHook, autoreconfHook, bison, flex
|
||||
, curl, gtk2, gtk3, pkg-config, python2, python3, shared-mime-info
|
||||
, curl, gtk3, pkg-config, python3, shared-mime-info
|
||||
, glib-networking, gsettings-desktop-schemas
|
||||
|
||||
# Selector between the GTK+ 3 and GTK+ 2 releases.
|
||||
, useGtk3
|
||||
|
||||
# Package compatibility: old parameters whose name were not directly derived
|
||||
, enablePgp ? true
|
||||
, enablePluginNotificationDialogs ? true
|
||||
|
@ -34,14 +31,14 @@
|
|||
, enablePluginBsfilter ? true
|
||||
, enablePluginClamd ? true
|
||||
, enablePluginDillo ? true
|
||||
, enablePluginFancy ? useGtk3, libsoup, webkitgtk
|
||||
, enablePluginFancy ? true, libsoup, webkitgtk
|
||||
, enablePluginFetchInfo ? true
|
||||
, enablePluginLibravatar ? enablePluginRavatar
|
||||
, enablePluginLitehtmlViewer ? true, gumbo
|
||||
, enablePluginMailmbox ? true
|
||||
, enablePluginManageSieve ? true
|
||||
, enablePluginNewMail ? true
|
||||
, enablePluginNotification ? (enablePluginNotificationDialogs || enablePluginNotificationSounds), libcanberra-gtk2, libcanberra-gtk3, libnotify
|
||||
, enablePluginNotification ? (enablePluginNotificationDialogs || enablePluginNotificationSounds), libcanberra-gtk3, libnotify
|
||||
, enablePluginPdfViewer ? enablePluginPdf, poppler
|
||||
, enablePluginPerl ? true, perl
|
||||
, enablePluginPython ? true
|
||||
|
@ -57,23 +54,7 @@
|
|||
with lib;
|
||||
|
||||
let
|
||||
# Last release and hash for both the GTK+ 3 and GTK+ 2 version.
|
||||
version = if useGtk3 then "4.0.0" else "3.18.0";
|
||||
|
||||
gtk2src = {
|
||||
sha256 = "1vsiy3xsppw4d8ylsz70wsyrvmgy88lp2hj7vrc353ckny80r9lh";
|
||||
};
|
||||
|
||||
gtk3src = {
|
||||
sha256 = "0mwnjiqg2sj61va0y9yi3v52iyr5kzmbnvsqxav3a48m2f8p27qn";
|
||||
};
|
||||
|
||||
python = if useGtk3 then python3 else python2;
|
||||
pythonPkgs = if useGtk3
|
||||
then
|
||||
with python.pkgs; [ python wrapPython pygobject3 ]
|
||||
else
|
||||
with python.pkgs; [ python wrapPython pygtk pygobject2 ];
|
||||
pythonPkgs = with python3.pkgs; [ python3 wrapPython pygobject3 ];
|
||||
|
||||
features = [
|
||||
{ flags = [ "acpi_notifier-plugin" ]; enabled = enablePluginAcpiNotifier; }
|
||||
|
@ -99,7 +80,7 @@ let
|
|||
{ flags = [ "managesieve-plugin" ]; enabled = enablePluginManageSieve; }
|
||||
{ flags = [ "networkmanager" ]; enabled = enableNetworkManager; deps = [ networkmanager ]; }
|
||||
{ flags = [ "newmail-plugin" ]; enabled = enablePluginNewMail; }
|
||||
{ flags = [ "notification-plugin" ]; enabled = enablePluginNotification; deps = [ libnotify ] ++ [(if useGtk3 then libcanberra-gtk3 else libcanberra-gtk2)]; }
|
||||
{ flags = [ "notification-plugin" ]; enabled = enablePluginNotification; deps = [ libnotify ] ++ [libcanberra-gtk3]; }
|
||||
{ flags = [ "pdf_viewer-plugin" ]; enabled = enablePluginPdfViewer; deps = [ poppler ]; }
|
||||
{ flags = [ "perl-plugin" ]; enabled = enablePluginPerl; deps = [ perl ]; }
|
||||
{ flags = [ "pgpcore-plugin" "pgpinline-plugin" "pgpmime-plugin" ]; enabled = enablePluginPgp; deps = [ gnupg gpgme ]; }
|
||||
|
@ -115,12 +96,13 @@ let
|
|||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "claws-mail";
|
||||
inherit version;
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchgit ({
|
||||
src = fetchgit {
|
||||
rev = version;
|
||||
url = "git://git.claws-mail.org/claws.git";
|
||||
} // (if useGtk3 then gtk3src else gtk2src));
|
||||
sha256 = "0mwnjiqg2sj61va0y9yi3v52iyr5kzmbnvsqxav3a48m2f8p27qn";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
@ -140,7 +122,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
preConfigure = ''
|
||||
# autotools check tries to dlopen libpython as a requirement for the python plugin
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${python}/lib
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${python3}/lib
|
||||
# generate version without .git
|
||||
[ -e version ] || echo "echo ${version}" > version
|
||||
'';
|
||||
|
@ -154,8 +136,7 @@ in stdenv.mkDerivation rec {
|
|||
propagatedBuildInputs = pythonPkgs;
|
||||
|
||||
buildInputs =
|
||||
[ curl gsettings-desktop-schemas glib-networking ]
|
||||
++ [(if useGtk3 then gtk3 else gtk2)]
|
||||
[ curl gsettings-desktop-schemas glib-networking gtk3 ]
|
||||
++ concatMap (f: optionals f.enabled f.deps) (filter (f: f ? deps) features)
|
||||
;
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
"hledger-check-fancyassertions"
|
||||
{
|
||||
libraries = with haskellPackages; [
|
||||
base base-compat base-compat-batteries filepath hledger-lib_1_23
|
||||
base base-compat base-compat-batteries filepath hledger-lib_1_24
|
||||
megaparsec microlens optparse-applicative string-qq text time
|
||||
transformers
|
||||
];
|
||||
|
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pantheon-tweaks";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pantheon-tweaks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-2spZ6RQ5PhBNrv/xG1TNbYsJrmuRpaZ72CeH2s8+P8g=";
|
||||
sha256 = "sha256-Pn/MIJ/WS/TY5bemM77B37E0KFRlDUfrOl1XS2yJlGk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "delta";
|
||||
version = "0.10.3";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dandavison";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-LABadIux5YId62+t8qXJvBTvB5Beu4u4D0HebNJibxY=";
|
||||
sha256 = "sha256-gurF1vJwxmUi64Gf8m8W2cWyk/SmCNmaDo+jmYWu5fM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-W2OBvVFCaykT/GRIUASsyNlkOk2Bp8yufoMXPX4oryA=";
|
||||
cargoSha256 = "sha256-rMxIzh8dhzSF66feQSooodrxxiwEDjAT9Z35cFlA6XI=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
@ -198,10 +198,10 @@ in stdenv.mkDerivation {
|
|||
'' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
||||
# Need these tools on the build system when cross compiling,
|
||||
# hacky, but have found no other way.
|
||||
CXX=${stdenv.cc.targetPrefix}c++ LD=ld make -C tools/depends/native/JsonSchemaBuilder
|
||||
CXX=$CXX_FOR_BUILD LD=ld make -C tools/depends/native/JsonSchemaBuilder
|
||||
cmakeFlags+=" -DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin"
|
||||
|
||||
CXX=${stdenv.cc.targetPrefix}c++ LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker
|
||||
CXX=$CXX_FOR_BUILD LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker
|
||||
cmakeFlags+=" -DWITH_TEXTUREPACKER=$PWD/tools/depends/native/TexturePacker/bin"
|
||||
'';
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ buildEnv {
|
|||
paths = [ kodi ] ++ addons;
|
||||
pathsToLink = [ "/share" ];
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postBuild = ''
|
||||
mkdir $out/bin
|
||||
|
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "runc";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencontainers";
|
||||
repo = "runc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-l+Uq7aiXFrI+qbKSOZpYFIXz0VJBBR7ZZxlAJeGb7K4=";
|
||||
sha256 = "sha256-Tl/JKbIpao+FCjngPzaVkxse50zo3XQ9Mg/AdkblMcI=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
@ -48,6 +48,12 @@ stdenv.mkDerivation rec {
|
|||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config dbus-1 --cflags)"
|
||||
'';
|
||||
|
||||
# Parallel build fails due to missing dependencies between private libaries:
|
||||
# ld: cannot find ../libAfterConf/libAfterConf.a: No such file or directory
|
||||
# Let's disable parallel builds until it's fixed upstream:
|
||||
# https://github.com/afterstep/afterstep/issues/8
|
||||
enableParallelBuilding = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A NEXTStep-inspired window manager";
|
||||
longDescription = ''
|
||||
|
|
|
@ -3,16 +3,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wmfocus";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "svenstaro";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fZbsKu7C+rqggaFVSDNIGDAgn23M7mi+1jhV85s1Co8=";
|
||||
sha256 = "sha256-HrS+C/6KDG2Rn/3u/mMmp4vzQ5YAHUFL4HFecteuzsc=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-ejzVJdtOXBPe+14g4aJFBMCvXkmNia9dNAk/BVQ2ZSQ=";
|
||||
cargoSha256 = "sha256-EzgYnfUgwK2ldzrlqe9N9jeGgK+RzQPjbOjJCGEkcwE=";
|
||||
|
||||
nativeBuildInputs = [ python3 pkg-config ];
|
||||
buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ];
|
||||
|
|
|
@ -1,14 +1,12 @@
|
|||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, python2
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "conway_polynomials";
|
||||
version = "0.5";
|
||||
|
||||
pythonEnv = python2.withPackages (ps: with ps; [ six ]);
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sageupstream/conway_polynomials/conway_polynomials-${version}.tar.bz2";
|
||||
sha256 = "05zb1ly9x2bbscqv0jgc45g48xx77mfs7qdbqhn4ihmihn57iwnq";
|
||||
|
@ -16,8 +14,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Script that creates the "database" (nested python array) and pickles it
|
||||
spkg-install = fetchurl {
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/conway_polynomials/spkg-install.py?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
|
||||
sha256 = "0m12nfb37j3bn4bp06ddgnyp2d6z0hg5f83pbbjszxw7vxs33a82";
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/conway_polynomials/spkg-install.py?id=9.2";
|
||||
sha256 = "1bwnqasnyv793hxg29viing4dnliz29grkhldsirq19d509yk1fs";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
@ -31,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
export SAGE_SHARE="$out/share"
|
||||
export PYTHONPATH=$PWD
|
||||
|
||||
${pythonEnv.interpreter} ${spkg-install}
|
||||
${python3.interpreter} ${spkg-install}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, python2
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
export SAGE_SHARE="$out/share"
|
||||
export PYTHONPATH=$PWD
|
||||
|
||||
${python2.interpreter} ${spkg-install}
|
||||
${python3.interpreter} ${spkg-install}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"commit": "5ac4efab1c8e40b19b0bc4ba833477a4abc75358",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/5ac4efab1c8e40b19b0bc4ba833477a4abc75358.tar.gz",
|
||||
"sha256": "0xnrdwmc646ghwzp61jp376s9fkpcd74slxc39law7akfp77v4ls",
|
||||
"msg": "Update from Hackage at 2021-11-18T20:32:52Z"
|
||||
"commit": "d859530d8342c52d09a73d1d125c144725b5945d",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d859530d8342c52d09a73d1d125c144725b5945d.tar.gz",
|
||||
"sha256": "0gjahsqqq99dc4bjcx9p3z8adpwy51w3mzrf57nib856jlvlfmv5",
|
||||
"msg": "Update from Hackage at 2021-12-02T21:05:02Z"
|
||||
}
|
||||
|
|
|
@ -26,13 +26,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xviewer";
|
||||
version = "3.0.2";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-hvoTb9afyVdcm5suB1ZxkxUyNFSVRFjYuNVc0jE3RF0=";
|
||||
sha256 = "sha256-9SUpJ76s3gf1852xnJh3Sz6SeuKhcGHtv+woiXztCS4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -29,11 +29,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-maps";
|
||||
version = "41.1";
|
||||
version = "41.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-XtyUpXlHDO1HztKSxUq6Z8vnBIGOF0BsCQwB1Dlb4a0=";
|
||||
sha256 = "sha256-gYIbTK/GQc1QDXOzMMY85aBahPBDBxbWPoizyuqs/Qw=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
@ -68,11 +68,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-control-center";
|
||||
version = "41.1";
|
||||
version = "41.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-6gxxSExlzizBE3b5sB5iEfpKf/0zT0MH/FLJPw/d1Mc=";
|
||||
sha256 = "sha256-gnH8azPsJBileDBN0+V9Zl8NfMcGqZqXvkGYSGGP4kg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -35,11 +35,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-initial-setup";
|
||||
version = "41.0";
|
||||
version = "41.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "R/ZHW2bIQ+fVPZC6Dns5SHYt8VFjSkNvaMK5u6BQVgo=";
|
||||
sha256 = "GTr79qMILaCjKncU8ejVKo20Vycpde0vNlQ2SjM5Gz8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue