dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
	pkgs/development/python-modules/django-rq/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Jonathan Ringer 2021-12-05 22:02:00 -08:00
commit 5263fb820e
No known key found for this signature in database
GPG Key ID: 5C841D3CFDFEC4E0
142 changed files with 808 additions and 322 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/config/fonts/fontdir.nix
View File

@ -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>.

1
nixos/modules/config/gtk/gtk-icon-cache.nix
View File

@ -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.
'';

6
nixos/modules/config/i18n.nix
View File

@ -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.

2
nixos/modules/misc/meta.nix
View File

@ -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.

8
nixos/modules/security/pam.nix
View File

@ -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.

1
nixos/modules/services/audio/icecast.nix
View File

@ -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 = {

2
nixos/modules/services/audio/navidrome.nix
View File

@ -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;

1
nixos/modules/services/audio/ympd.nix
View File

@ -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;
};

3
nixos/modules/services/backup/bacula.nix
View File

@ -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

1
nixos/modules/services/cluster/kubernetes/kubelet.nix
View File

@ -168,6 +168,7 @@ in
hostname = mkOption {
description = "Kubernetes kubelet hostname override.";
default = config.networking.hostName;
defaultText = literalExpression "config.networking.hostName";
type = str;
};

1
nixos/modules/services/cluster/kubernetes/pki.nix
View File

@ -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;
};

1
nixos/modules/services/cluster/kubernetes/proxy.nix
View File

@ -37,6 +37,7 @@ in
hostname = mkOption {
description = "Kubernetes proxy hostname override.";
default = config.networking.hostName;
defaultText = literalExpression "config.networking.hostName";
type = str;
};

1
nixos/modules/services/computing/slurm/slurm.nix
View File

@ -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>).

1
nixos/modules/services/continuous-integration/github-runner.nix
View File

@ -58,6 +58,7 @@ in
'';
example = "nixos";
default = config.networking.hostName;
defaultText = literalExpression "config.networking.hostName";
};
runnerGroup = mkOption {

1
nixos/modules/services/continuous-integration/hydra/default.nix
View File

@ -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.";
};

4
nixos/modules/services/games/factorio.nix
View File

@ -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?

1
nixos/modules/services/logging/journalwatch.nix
View File

@ -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.
'';

1
nixos/modules/services/logging/klogd.nix
View File

@ -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

1
nixos/modules/services/mail/opendkim.nix
View File

@ -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).

1
nixos/modules/services/misc/etcd.nix
View File

@ -17,6 +17,7 @@ in {
name = mkOption {
description = "Etcd unique node name.";
default = config.networking.hostName;
defaultText = literalExpression "config.networking.hostName";
type = types.str;
};

2
nixos/modules/services/misc/gitea.nix
View File

@ -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;

2
nixos/modules/services/misc/gitlab.nix
View File

@ -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 {

3
nixos/modules/services/misc/matrix-appservice-discord.nix
View File

@ -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.

6
nixos/modules/services/misc/matrix-synapse.nix
View File

@ -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.
'';

3
nixos/modules/services/misc/mautrix-telegram.nix
View File

@ -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.
'';

1
nixos/modules/services/misc/moonraker.nix
View File

@ -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.";
};

3
nixos/modules/services/misc/mx-puppet-discord.nix
View File

@ -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.
'';

3
nixos/modules/services/misc/sourcehut/default.nix
View File

@ -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
'';

1
nixos/modules/services/misc/xmrig.nix
View File

@ -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.";
};

1
nixos/modules/services/monitoring/graphite.nix
View File

@ -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;
};

1
nixos/modules/services/monitoring/nagios.nix
View File

@ -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";
};

1
nixos/modules/services/monitoring/parsedmarc.nix
View File

@ -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.

3
nixos/modules/services/monitoring/smartd.nix
View File

@ -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.";
};

5
nixos/modules/services/network-filesystems/ipfs.nix
View File

@ -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";
};

1
nixos/modules/services/networking/bind.nix
View File

@ -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.

1
nixos/modules/services/networking/coturn.nix
View File

@ -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

1
nixos/modules/services/networking/dnscrypt-wrapper.nix
View File

@ -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.

3
nixos/modules/services/networking/flannel.nix
View File

@ -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";
};

1
nixos/modules/services/networking/ncdns.nix
View File

@ -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

1
nixos/modules/services/networking/nsd.nix
View File

@ -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

1
nixos/modules/services/networking/ntp/chrony.nix
View File

@ -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.

1
nixos/modules/services/networking/ntp/ntpd.nix
View File

@ -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.

1
nixos/modules/services/networking/ntp/openntpd.nix
View File

@ -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;
};

1
nixos/modules/services/networking/resilio.nix
View File

@ -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.
'';

1
nixos/modules/services/networking/seafile.nix
View File

@ -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 {

1
nixos/modules/services/networking/skydns.nix
View File

@ -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"];

6
nixos/modules/services/networking/smokeping.nix
View File

@ -241,6 +241,12 @@ in
+ FPing
binary = ${config.security.wrapperDir}/fping
'';
defaultText = literalExpression ''
'''
+ FPing
binary = ''${config.security.wrapperDir}/fping
'''
'';
description = "Probe configuration";
};
sendmail = mkOption {

1
nixos/modules/services/networking/soju.nix
View File

@ -43,6 +43,7 @@ in
hostName = mkOption {
type = types.str;
default = config.networking.hostName;
defaultText = literalExpression "config.networking.hostName";
description = "Server hostname.";
};

1
nixos/modules/services/security/oauth2_proxy_nginx.nix
View File

@ -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
'';

1
nixos/modules/services/security/torsocks.nix
View File

@ -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.

2
nixos/modules/services/video/epgstation/default.nix
View File

@ -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;

2
nixos/modules/services/video/mirakurun.nix
View File

@ -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;

1
nixos/modules/services/web-apps/ihatemoney/default.nix
View File

@ -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";
};
};

1
nixos/modules/services/web-apps/openwebrx.nix
View File

@ -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";
};
};

1
nixos/modules/services/web-apps/peertube.nix
View File

@ -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.";
};
};

2
nixos/modules/services/web-servers/uwsgi.nix
View File

@ -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";
};
};
}

1
nixos/modules/services/web-servers/varnish/default.nix
View File

@ -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.
";

2
nixos/modules/system/activation/activation-script.nix
View File

@ -150,7 +150,7 @@ in
example = literalExpression ''
{ plasmaSetup = {
text = '''
${pkgs.libsForQt5.kservice}/bin/kbuildsycoca5"
''${pkgs.libsForQt5.kservice}/bin/kbuildsycoca5"
''';
deps = [];
};

1
nixos/modules/system/activation/top-level.nix
View File

@ -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.

1
nixos/modules/system/boot/loader/grub/grub.nix
View File

@ -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.

1
nixos/modules/system/boot/resolved.nix
View File

@ -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 = ''

2
nixos/modules/system/boot/timesyncd.nix
View File

@ -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.

3
nixos/modules/virtualisation/amazon-options.nix
View File

@ -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.

2
nixos/modules/virtualisation/qemu-vm.nix
View File

@ -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

4
pkgs/applications/audio/ashuffle/default.nix
View File

@ -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;
};

6
pkgs/applications/audio/spot/default.nix
View File

@ -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 = [

4
pkgs/applications/graphics/ImageMagick/7.0.nix
View File

@ -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

4
pkgs/applications/graphics/viewnior/default.nix
View File

@ -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 = [

8
pkgs/applications/misc/dbeaver/default.nix
View File

@ -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

6
pkgs/applications/misc/hugo/default.nix
View File

@ -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;

5
pkgs/applications/misc/jrnl/default.nix
View File

@ -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
];

4
pkgs/applications/misc/wike/default.nix
View File

@ -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 = [

8
pkgs/applications/misc/zola/default.nix
View File

@ -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

12
pkgs/applications/networking/cluster/arkade/default.nix
View File

@ -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"
];
};
}

1
pkgs/applications/networking/instant-messengers/zulip-term/default.nix
View File

@ -29,6 +29,7 @@ python3.pkgs.buildPythonApplication rec {
lxml
typing-extensions
python-dateutil
pytz
tzlocal
];

4
pkgs/applications/system/pantheon-tweaks/default.nix
View File

@ -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 = [

6
pkgs/applications/version-management/git-and-tools/delta/default.nix
View File

@ -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 ];

6
pkgs/applications/window-managers/afterstep/default.nix
View File

@ -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 = ''

6
pkgs/applications/window-managers/i3/wmfocus.nix
View File

@ -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 ];

4
pkgs/desktops/cinnamon/xviewer/default.nix
View File

@ -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 = [

109
pkgs/desktops/gnome/extensions/extensions.json
View File

File diff suppressed because one or more lines are too long

4
pkgs/development/compilers/gcc-arm-embedded/6/default.nix
View File

@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
subdir = "6-2017q2";
suffix = {
aarch64-darwin = "mac"; # use intel binaries via rosetta
x86_64-darwin = "mac";
x86_64-linux = "linux";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@ -19,6 +20,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2";
sha256 = {
aarch64-darwin = "0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x";
x86_64-darwin = "0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x";
x86_64-linux = "1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@ -48,6 +50,6 @@ stdenv.mkDerivation rec {
homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
maintainers = with maintainers; [ prusnak ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
};
}

4
pkgs/development/compilers/gcc-arm-embedded/7/default.nix
View File

@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
subdir = "7-2018q2";
suffix = {
aarch64-darwin = "mac"; # use intel binaries via rosetta
x86_64-darwin = "mac";
x86_64-linux = "linux";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@ -19,6 +20,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2";
sha256 = {
aarch64-darwin = "0nc7m0mpa39qyhfyydxkkyqm7spfc27xf6ygi2vd2aym4r9azi61";
x86_64-darwin = "0nc7m0mpa39qyhfyydxkkyqm7spfc27xf6ygi2vd2aym4r9azi61";
x86_64-linux = "0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@ -48,6 +50,6 @@ stdenv.mkDerivation rec {
homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
maintainers = with maintainers; [ prusnak ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
};
}

4
pkgs/development/compilers/gcc-arm-embedded/8/default.nix
View File

@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
subdir = "8-2019q3/RC1.1";
suffix = {
aarch64-darwin = "mac"; # use intel binaries via rosetta
x86_64-darwin = "mac";
x86_64-linux = "linux";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@ -19,6 +20,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2";
sha256 = {
aarch64-darwin = "fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085";
x86_64-darwin = "fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085";
x86_64-linux = "b50b02b0a16e5aad8620e9d7c31110ef285c1dde28980b1a9448b764d77d8f92";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@ -48,6 +50,6 @@ stdenv.mkDerivation rec {
homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
maintainers = with maintainers; [ prusnak ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
};
}

4
pkgs/development/interpreters/clojure/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "clojure";
version = "1.10.3.1029";
version = "1.10.3.1040";
src = fetchurl {
# https://clojure.org/releases/tools
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "14c08xva1r6sl3h78vhckwx5dd8kqwi7457prygh9330b7r8caa2";
sha256 = "+21o3usbxeOoac7umPzZaDNVify1fjHuTujgNKtNeXc=";
};
nativeBuildInputs = [

10
pkgs/development/interpreters/python/default.nix
View File

@ -252,15 +252,15 @@ in {
inherit (darwin.apple_sdk.frameworks) Security;
};
pypy37 = callPackage ./pypy {
self = pypy37;
pypy38 = callPackage ./pypy {
self = pypy38;
sourceVersion = {
major = "7";
minor = "3";
patch = "5";
patch = "7";
};
sha256 = "sha256-2SD+QJqeytnQdKqFaMpfPtNYG+ZvZuXYmIt+xm5tmaI=";
pythonVersion = "3.7";
sha256 = "sha256-Ia4zn09QFtbKcwAwXz47VUNzg1yzw5qQQf4w5oEcgMY=";
pythonVersion = "3.8";
db = db.override { dbmSupport = !stdenv.isDarwin; };
python = python27;
inherit passthruFun;

4
pkgs/development/interpreters/rakudo/zef.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zef";
version = "0.13.0";
version = "0.13.4";
src = fetchFromGitHub {
owner = "ugexe";
repo = "zef";
rev = "v${version}";
sha256 = "sha256-4B0xhEBjIPFXyT/SdT5qeDNnpntk2nd/zYwgt35sD+s=";
sha256 = "sha256-zTgXMICuLn612bmL5e6GP5aBQ4uOcSLfce0PCRYGob0=";
};
nativeBuildInputs = [ makeWrapper ];

8
pkgs/development/interpreters/wasmer/default.nix
View File

@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "wasmer";
version = "2.0.0";
version = "2.1.0";
src = fetchFromGitHub {
owner = "wasmerio";
repo = pname;
rev = version;
sha256 = "191f60db2y1f3xw1x81mw88vclf1c4kgvnfv74g5vb3vn7n57c5j";
sha256 = "sha256-8aNJDu3MuXWcPp/nW1ly9+82YSfiMWc75Q4nQD6eUaA=";
fetchSubmodules = true;
};
cargoSha256 = "0hhwixqhrl79hpzmvq7ga3kp2cfrwr4i8364cwnr7195xwnfxb0k";
cargoSha256 = "sha256-l/Se0ijSX5zkAoedorsJvj5EhCuwgI4jE+S8lHZh6+4=";
nativeBuildInputs = [ cmake pkg-config ];
@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
];
# Can't use test-jit:
# error: Package `wasmer-workspace v2.0.0 (/build/source)` does not have the feature `test-jit`
# error: Package `wasmer-workspace v2.1.0 (/build/source)` does not have the feature `test-jit`
checkFeatures = [ "test-cranelift" ];
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";

10
pkgs/development/libraries/capnproto/default.nix
View File

@ -1,15 +1,19 @@
{ lib, stdenv, fetchFromGitHub, capnproto, cmake }:
{ lib
, stdenv
, fetchFromGitHub
, capnproto
, cmake }:
stdenv.mkDerivation rec {
pname = "capnproto";
version = "0.9.0";
version = "0.9.1";
# release tarballs are missing some ekam rules
src = fetchFromGitHub {
owner = "capnproto";
repo = "capnproto";
rev = "v${version}";
sha256 = "038i40apywn8sg95kwld4mg9p9m08izcw5xj7mwkmshycmqw65na";
sha256 = "0cbiwkmd29abih8rjjm35dfkrkr8c6axbzq3fkryay6jyvpi42c5";
};
nativeBuildInputs = [ cmake ]

87
pkgs/development/libraries/gaia/default.nix
View File

@ -1,87 +0,0 @@
{ stdenv
, lib
, fetchFromGitHub
, libyaml
, swig
, eigen
, pkg-config
, python2
, wafHook
, makeWrapper
, qt4
, pythonPackages ? null
, pythonSupport ? false
# Default to false since it breaks the build, see https://github.com/MTG/gaia/issues/11
, stlfacadeSupport ? false
, assertsSupport ? true
, cyclopsSupport ? true
}:
assert pythonSupport -> pythonPackages != null;
stdenv.mkDerivation rec {
pname = "gaia";
version = "2.4.6";
src = fetchFromGitHub {
owner = "MTG";
repo = "gaia";
rev = "v${version}";
sha256 = "03vmdq7ca4f7zp2f4sxyqa8sdpdma3mn9fz4z7d93qryl0bhi7z3";
};
# Fix installation error when waf tries to put files in /etc/
prePatch = "" + lib.optionalString cyclopsSupport ''
substituteInPlace src/wscript \
--replace "/etc/cyclops" "$out/etc/cyclops" \
--replace "/etc/init.d" "$out/etc/init.d"
'';
nativeBuildInputs = [
pkg-config
python2 # For wafHook
swig
wafHook
]
# The gaiafusion binary inside $out/bin needs a shebangs patch, and
# wrapping with the appropriate $PYTHONPATH
++ lib.optionals (pythonSupport) [
pythonPackages.wrapPython
]
;
buildInputs = [
libyaml
eigen
qt4
];
propagatedBuildInputs = []
++ lib.optionals (pythonSupport) [
# This is not exactly specified in upstream's README but it's needed by the
# resulting $out/bin/gaiafusion script
pythonPackages.pyyaml
]
;
wafConfigureFlags = []
++ lib.optionals (pythonSupport) [ "--with-python-bindings" ]
++ lib.optionals (stlfacadeSupport) [ "--with-stlfacade" ]
++ lib.optionals (assertsSupport) [ "--with-asserts" ]
++ lib.optionals (cyclopsSupport) [ "--with-cyclops" ]
;
postFixup = ""
+ lib.optionalString pythonSupport ''
wrapPythonPrograms
''
;
meta = with lib; {
homepage = "https://github.com/MTG/gaia";
description = "General library to work with points in a semimetric space";
maintainers = with maintainers; [ doronbehar ];
platforms = platforms.x86; # upstream assume SSE2 / fails on ARM
license = licenses.agpl3;
};
}

4
pkgs/development/libraries/libargs/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "args";
version = "6.2.6";
version = "6.2.7";
src = fetchFromGitHub {
owner = "Taywee";
repo = pname;
rev = version;
sha256 = "sha256-g5OXuZNi5bkWuSg7SNmhA6vyHUOFU8suYkH8nGx6tvg=";
sha256 = "sha256-I297qPXs8Fj7Ibq2PN6y/Eas3DiW5Ecvqot0ePwFNTI=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/python-modules/bitlist/default.nix
View File

@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "bitlist";
version = "0.6.0";
version = "0.6.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-LTrn+PCaqob0EGyyv1V1uCBeDQZvIYE1hNPqi4y/zfc=";
sha256 = "sha256-PL1ZT1LJCTtUILwenfA6Xk59/LjFISPaCw3IhXFe72o=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/clickhouse-driver/default.nix
View File

@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "clickhouse-driver";
version = "0.2.0";
version = "0.2.2";
# pypi source doesn't contain tests
src = fetchFromGitHub {
owner = "mymarilyn";
repo = "clickhouse-driver";
rev = "96b7ba448c63ca2670cc9aa70d4a0e08826fb650";
sha256 = "sha256-HFKUxJOlBCVlu7Ia8heGpwX6+HdKuwSy92s3v+GKGwE=";
rev = version;
sha256 = "0sx4jbadx9frzhqnj8b9w9l508x1r7j7b9883h7xq93lf00rxkfz";
};
propagatedBuildInputs = [

2
pkgs/development/python-modules/django-rq/default.nix
View File

@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "rq";
repo = pname;
rev = "v${version}";
sha256 = "169mj0i8x9184ggks2l6ck669b2kxg75na1a09kqk3rzrb6kg1z2";
sha256 = "sha256-4oc3zco/j4lnAiooW87rU6xkzGSGCj3fIyikjiKQNZk=";
};
propagatedBuildInputs = [

18
pkgs/development/python-modules/exchangelib/skip_failing_test.patch
View File

@ -1,18 +0,0 @@
--- ./tests/__init__.py 1980-01-02 00:00:00.000000000 +0000
+++ ./tests/__init__.py 1980-01-02 00:00:00.000000000 +0000
@@ -301,6 +301,7 @@
self.assertEqual(id(base_p.thread_pool), id(p.thread_pool))
self.assertEqual(id(base_p._session_pool), id(p._session_pool))
+ @unittest.skip("no network connection inside the Nix sandbox")
def test_close(self):
proc = psutil.Process()
ip_addresses = {info[4][0] for info in socket.getaddrinfo(
@@ -1257,6 +1258,7 @@
)
+@unittest.skip("no network connection inside the Nix sandbox")
class EWSTest(unittest.TestCase):
@classmethod
def setUpClass(cls):

6
pkgs/development/python-modules/jupytext/default.nix
View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "jupytext";
version = "1.13.2";
version = "1.13.3";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "mwouts";
repo = pname;
rev = "v${version}";
sha256 = "sha256-S2SKAC2oT4VIVMMDbu/Puo87noAgnQs1hh88JphutA8=";
sha256 = "sha256-HzWAEy7z3qi+lSD3yVBGYclfvKTkG1fTsG29NlKPgQw=";
};
buildInputs = [
@ -52,7 +52,7 @@ buildPythonPackage rec {
postPatch = ''
# https://github.com/mwouts/jupytext/pull/885
substituteInPlace setup.py \
--replace "markdown-it-py[plugins]>=1.0.0b3,<2.0.0" "markdown-it-py[plugins]>=1.0"
--replace "markdown-it-py~=1.0" "markdown-it-py>=1.0.0,<3.0.0"
'';
preCheck = ''

4
pkgs/development/python-modules/meshtastic/default.nix
View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "meshtastic";
version = "1.2.43";
version = "1.2.44";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-nGbULY/QJUv3sk8vYXvh/fhkab/vB3lGGhXRTjt8anI=";
sha256 = "f99e076dde0db86a5ba734b48257ffc7355a2b4729cea1ff5cd7638ca93dbd90";
};
propagatedBuildInputs = [

40
pkgs/development/python-modules/mouseinfo/default.nix Normal file
View File

@ -0,0 +1,40 @@
{ lib
, buildPythonPackage
, pyperclip
, fetchFromGitHub
, xlib
, pillow
}:
buildPythonPackage rec {
pname = "MouseInfo";
version = "0.1.3";
src = fetchFromGitHub {
owner = "asweigart";
repo = "mouseinfo";
rev = "1876ad5cd311b4352d46bc64a12edfb4da49974e";
sha256 = "sha256-UTaHTJE0xFihN9r+DY/WhekZ7S/CXtMFbqAayzexRxk=";
};
patches = [
./fix-xlib-version.patch
./pillow-version.patch
];
doCheck = false;
# Mouseinfo requires a X server running to import succesfully
# pythonImportsCheck = [ "mouseinfo" ];
propagatedBuildInputs = [
pyperclip
xlib
pillow
];
meta = with lib; {
description = "An application to display XY position and RGB color information for the pixel currently under the mouse. Works on Python 2 and 3.";
homepage = "https://github.com/asweigart/mouseinfo";
license = licenses.gpl3;
maintainers = with maintainers; [ lucasew ];
};
}

14
pkgs/development/python-modules/mouseinfo/fix-xlib-version.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/setup.py b/setup.py
index 37d5f77..894fe78 100644
--- a/setup.py
+++ b/setup.py
@@ -31,8 +31,7 @@ setup(
test_suite='tests',
# NOTE: Update the python_version info for Pillow as Pillow supports later versions of Python.
install_requires=['rubicon-objc;platform_system=="Darwin"',
- 'python3-Xlib;platform_system=="Linux" and python_version>="3.0"',
- 'Xlib;platform_system=="Linux" and python_version<"3.0"',
+ 'python-Xlib;platform_system=="Linux"',
'pyperclip',
'Pillow >= 6.2.1; python_version == "3.8"',
'Pillow >= 5.2.0; python_version == "3.7"',

20
pkgs/development/python-modules/mouseinfo/pillow-version.patch Normal file
View File

@ -0,0 +1,20 @@
diff --git a/setup.py b/setup.py
index 894fe78..ac580a6 100644
--- a/setup.py
+++ b/setup.py
@@ -33,14 +33,7 @@ setup(
install_requires=['rubicon-objc;platform_system=="Darwin"',
'python-Xlib;platform_system=="Linux"',
'pyperclip',
- 'Pillow >= 6.2.1; python_version == "3.8"',
- 'Pillow >= 5.2.0; python_version == "3.7"',
- 'Pillow >= 4.0.0; python_version == "3.6"',
- 'Pillow >= 3.2.0; python_version == "3.5"',
- 'Pillow <= 5.4.1, >= 2.5.0; python_version == "3.4"',
- 'Pillow <= 4.3.0, >= 2.0.0; python_version == "3.3"',
- 'Pillow <= 3.4.2, >= 2.0.0; python_version == "3.2"',
- 'Pillow >= 2.0.0; python_version == "2.7"',
+ 'Pillow',
],
keywords='',
classifiers=[

Some files were not shown because too many files have changed in this diff Show More