colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-07-24 12:01:21 +00:00 committed by GitHub
commit 21a6aafb7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 126 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
nixos/modules/config/qt5.nix
View File

@ -45,41 +45,17 @@ in
["lxqt" "lxqt-qtplugin"]
["libsForQt5" "plasma-integration"]
];
description = ''
Selects the platform theme to use for Qt5 applications.</para>
<para>The options are
<variablelist>
<varlistentry>
<term><literal>gtk</literal></term>
<listitem><para>Use GTK theme with
<link xlink:href="https://github.com/qt/qtstyleplugins">qtstyleplugins</link>
</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>gnome</literal></term>
<listitem><para>Use GNOME theme with
<link xlink:href="https://github.com/FedoraQt/QGnomePlatform">qgnomeplatform</link>
</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>lxqt</literal></term>
<listitem><para>Use LXQt style set using the
<link xlink:href="https://github.com/lxqt/lxqt-config">lxqt-config-appearance</link>
application.
</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>qt5ct</literal></term>
<listitem><para>Use Qt style set using the
<link xlink:href="https://sourceforge.net/projects/qt5ct/">qt5ct</link>
application.
</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>kde</literal></term>
<listitem><para>Use Qt settings from Plasma.</para></listitem>
</varlistentry>
</variablelist>
description = lib.mdDoc ''
Selects the platform theme to use for Qt5 applications.
The options are
- `gtk`: Use GTK theme with [qtstyleplugins](https://github.com/qt/qtstyleplugins)
- `gnome`: Use GNOME theme with [qgnomeplatform](https://github.com/FedoraQt/QGnomePlatform)
- `lxqt`: Use LXQt style set using the [lxqt-config-appearance](https://github.com/lxqt/lxqt-config)
application.
- `qt5ct`: Use Qt style set using the [qt5ct](https://sourceforge.net/projects/qt5ct/)
application.
- `kde`: Use Qt settings from Plasma.
'';
};
@ -97,27 +73,14 @@ in
"adwaita-qt"
["libsForQt5" "qtstyleplugins"]
];
description = ''
Selects the style to use for Qt5 applications.</para>
<para>The options are
<variablelist>
<varlistentry>
<term><literal>adwaita</literal></term>
<term><literal>adwaita-dark</literal></term>
<listitem><para>Use Adwaita Qt style with
<link xlink:href="https://github.com/FedoraQt/adwaita-qt">adwaita</link>
</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>cleanlooks</literal></term>
<term><literal>gtk2</literal></term>
<term><literal>motif</literal></term>
<term><literal>plastique</literal></term>
<listitem><para>Use styles from
<link xlink:href="https://github.com/qt/qtstyleplugins">qtstyleplugins</link>
</para></listitem>
</varlistentry>
</variablelist>
description = lib.mdDoc ''
Selects the style to use for Qt5 applications.
The options are
- `adwaita`, `adwaita-dark`: Use Adwaita Qt style with
[adwaita](https://github.com/FedoraQt/adwaita-qt)
- `cleanlooks`, `gtk2`, `motif`, `plastique`: Use styles from
[qtstyleplugins](https://github.com/qt/qtstyleplugins)
'';
};
};

13
nixos/modules/services/networking/murmur.nix
View File

@ -59,6 +59,14 @@ in
description = "If enabled, start the Murmur Mumble server.";
};
openFirewall = mkOption {
type = types.bool;
default = false;
description = ''
Open ports in the firewall for the Murmur Mumble server.
'';
};
autobanAttempts = mkOption {
type = types.int;
default = 10;
@ -291,6 +299,11 @@ in
gid = config.ids.gids.murmur;
};
networking.firewall = mkIf cfg.openFirewall {
allowedTCPPorts = [ cfg.port ];
allowedUDPPorts = [ cfg.port ];
};
systemd.services.murmur = {
description = "Murmur Chat Service";
wantedBy = [ "multi-user.target" ];

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

@ -15,7 +15,7 @@ in
services.resolved.enable = mkOption {
default = false;
type = types.bool;
description = ''
description = lib.mdDoc ''
Whether to enable the systemd DNS resolver daemon.
'';
};
@ -24,7 +24,7 @@ in
default = [ ];
example = [ "8.8.8.8" "2001:4860:4860::8844" ];
type = types.listOf types.str;
description = ''
description = lib.mdDoc ''
A list of IPv4 and IPv6 addresses to use as the fallback DNS servers.
If this option is empty, a compiled-in list of DNS servers is used instead.
'';
@ -35,7 +35,7 @@ in
defaultText = literalExpression "config.networking.search";
example = [ "example.com" ];
type = types.listOf types.str;
description = ''
description = lib.mdDoc ''
A list of domains. These domains are used as search suffixes
when resolving single-label host names (domain names which
contain no dot), in order to qualify them into fully-qualified
@ -43,7 +43,7 @@ in
For compatibility reasons, if this setting is not specified,
the search domains listed in
<filename>/etc/resolv.conf</filename> are used instead, if
{file}`/etc/resolv.conf` are used instead, if
that file exists and any domains are configured in it.
'';
};
@ -52,32 +52,14 @@ in
default = "true";
example = "false";
type = types.enum [ "true" "resolve" "false" ];
description = ''
description = lib.mdDoc ''
Controls Link-Local Multicast Name Resolution support
(RFC 4795) on the local host.
If set to
<variablelist>
<varlistentry>
<term><literal>"true"</literal></term>
<listitem><para>
Enables full LLMNR responder and resolver support.
</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>"false"</literal></term>
<listitem><para>
Disables both.
</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>"resolve"</literal></term>
<listitem><para>
Only resolution support is enabled, but responding is disabled.
</para></listitem>
</varlistentry>
</variablelist>
- `"true"`: Enables full LLMNR responder and resolver support.
- `"false"`: Disables both.
- `"resolve"`: Only resolution support is enabled, but responding is disabled.
'';
};
@ -85,21 +67,14 @@ in
default = "allow-downgrade";
example = "true";
type = types.enum [ "true" "allow-downgrade" "false" ];
description = ''
description = lib.mdDoc ''
If set to
<variablelist>
<varlistentry>
<term><literal>"true"</literal></term>
<listitem><para>
- `"true"`:
all DNS lookups are DNSSEC-validated locally (excluding
LLMNR and Multicast DNS). Note that this mode requires a
DNS server that supports DNSSEC. If the DNS server does
not properly support DNSSEC all validations will fail.
</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>"allow-downgrade"</literal></term>
<listitem><para>
- `"allow-downgrade"`:
DNSSEC validation is attempted, but if the server does not
support DNSSEC properly, DNSSEC mode is automatically
disabled. Note that this mode makes DNSSEC validation
@ -107,22 +82,14 @@ in
be able to trigger a downgrade to non-DNSSEC mode by
synthesizing a DNS response that suggests DNSSEC was not
supported.
</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>"false"</literal></term>
<listitem><para>
DNS lookups are not DNSSEC validated.
</para></listitem>
</varlistentry>
</variablelist>
- `"false"`: DNS lookups are not DNSSEC validated.
'';
};
services.resolved.extraConfig = mkOption {
default = "";
type = types.lines;
description = ''
description = lib.mdDoc ''
Extra config to append to resolved.conf.
'';
};

103
nixos/modules/virtualisation/oci-containers.nix
View File

@ -14,18 +14,18 @@ let
image = mkOption {
type = with types; str;
description = "OCI image to run.";
description = lib.mdDoc "OCI image to run.";
example = "library/hello-world";
};
imageFile = mkOption {
type = with types; nullOr package;
default = null;
description = ''
description = lib.mdDoc ''
Path to an image file to load before running the image. This can
be used to bypass pulling the image from the registry.
The <literal>image</literal> attribute must match the name and
The `image` attribute must match the name and
tag of the image contained in this file, as they will be used to
run the container with that image. If they do not match, the
image will be pulled from the registry as usual.
@ -38,20 +38,20 @@ let
username = mkOption {
type = with types; nullOr str;
default = null;
description = "Username for login.";
description = lib.mdDoc "Username for login.";
};
passwordFile = mkOption {
type = with types; nullOr str;
default = null;
description = "Path to file containing password.";
description = lib.mdDoc "Path to file containing password.";
example = "/etc/nixos/dockerhub-password.txt";
};
registry = mkOption {
type = with types; nullOr str;
default = null;
description = "Registry where to login to.";
description = lib.mdDoc "Registry where to login to.";
example = "https://docker.pkg.github.com";
};
@ -60,7 +60,7 @@ let
cmd = mkOption {
type = with types; listOf str;
default = [];
description = "Commandline arguments to pass to the image's entrypoint.";
description = lib.mdDoc "Commandline arguments to pass to the image's entrypoint.";
example = literalExpression ''
["--port=9000"]
'';
@ -68,7 +68,7 @@ let
entrypoint = mkOption {
type = with types; nullOr str;
description = "Override the default entrypoint of the image.";
description = lib.mdDoc "Override the default entrypoint of the image.";
default = null;
example = "/bin/my-app";
};
@ -76,7 +76,7 @@ let
environment = mkOption {
type = with types; attrsOf str;
default = {};
description = "Environment variables to set for this container.";
description = lib.mdDoc "Environment variables to set for this container.";
example = literalExpression ''
{
DATABASE_HOST = "db.example.com";
@ -88,7 +88,7 @@ let
environmentFiles = mkOption {
type = with types; listOf path;
default = [];
description = "Environment files for this container.";
description = lib.mdDoc "Environment files for this container.";
example = literalExpression ''
[
/path/to/.env
@ -100,15 +100,15 @@ let
log-driver = mkOption {
type = types.str;
default = "journald";
description = ''
description = lib.mdDoc ''
Logging driver for the container. The default of
<literal>"journald"</literal> means that the container's logs will be
`"journald"` means that the container's logs will be
handled as part of the systemd unit.
For more details and a full list of logging drivers, refer to respective backends documentation.
For Docker:
<link xlink:href="https://docs.docker.com/engine/reference/run/#logging-drivers---log-driver">Docker engine documentation</link>
[Docker engine documentation](https://docs.docker.com/engine/reference/run/#logging-drivers---log-driver)
For Podman:
Refer to the docker-run(1) man page.
@ -118,49 +118,27 @@ let
ports = mkOption {
type = with types; listOf str;
default = [];
description = ''
description = lib.mdDoc ''
Network ports to publish from the container to the outer host.
Valid formats:
- `<ip>:<hostPort>:<containerPort>`
- `<ip>::<containerPort>`
- `<hostPort>:<containerPort>`
- `<containerPort>`
<itemizedlist>
<listitem>
<para>
<literal>&lt;ip&gt;:&lt;hostPort&gt;:&lt;containerPort&gt;</literal>
</para>
</listitem>
<listitem>
<para>
<literal>&lt;ip&gt;::&lt;containerPort&gt;</literal>
</para>
</listitem>
<listitem>
<para>
<literal>&lt;hostPort&gt;:&lt;containerPort&gt;</literal>
</para>
</listitem>
<listitem>
<para>
<literal>&lt;containerPort&gt;</literal>
</para>
</listitem>
</itemizedlist>
Both <literal>hostPort</literal> and
<literal>containerPort</literal> can be specified as a range of
Both `hostPort` and `containerPort` can be specified as a range of
ports. When specifying ranges for both, the number of container
ports in the range must match the number of host ports in the
range. Example: <literal>1234-1236:1234-1236/tcp</literal>
range. Example: `1234-1236:1234-1236/tcp`
When specifying a range for <literal>hostPort</literal> only, the
<literal>containerPort</literal> must <emphasis>not</emphasis> be a
range. In this case, the container port is published somewhere
within the specified <literal>hostPort</literal> range. Example:
<literal>1234-1236:1234/tcp</literal>
When specifying a range for `hostPort` only, the `containerPort`
must *not* be a range. In this case, the container port is published
somewhere within the specified `hostPort` range.
Example: `1234-1236:1234/tcp`
Refer to the
<link xlink:href="https://docs.docker.com/engine/reference/run/#expose-incoming-ports">
Docker engine documentation</link> for full details.
[Docker engine documentation](https://docs.docker.com/engine/reference/run/#expose-incoming-ports) for full details.
'';
example = literalExpression ''
[
@ -172,7 +150,7 @@ let
user = mkOption {
type = with types; nullOr str;
default = null;
description = ''
description = lib.mdDoc ''
Override the username or UID (and optionally groupname or GID) used
in the container.
'';
@ -182,16 +160,15 @@ let
volumes = mkOption {
type = with types; listOf str;
default = [];
description = ''
description = lib.mdDoc ''
List of volumes to attach to this container.
Note that this is a list of <literal>"src:dst"</literal> strings to
allow for <literal>src</literal> to refer to
<literal>/nix/store</literal> paths, which would be difficult with an
attribute set. There are also a variety of mount options available
as a third field; please refer to the
<link xlink:href="https://docs.docker.com/engine/reference/run/#volume-shared-filesystems">
docker engine documentation</link> for details.
Note that this is a list of `"src:dst"` strings to
allow for `src` to refer to `/nix/store` paths, which
would be difficult with an attribute set. There are
also a variety of mount options available as a third
field; please refer to the
[docker engine documentation](https://docs.docker.com/engine/reference/run/#volume-shared-filesystems) for details.
'';
example = literalExpression ''
[
@ -204,17 +181,17 @@ let
workdir = mkOption {
type = with types; nullOr str;
default = null;
description = "Override the default working directory for the container.";
description = lib.mdDoc "Override the default working directory for the container.";
example = "/var/lib/hello_world";
};
dependsOn = mkOption {
type = with types; listOf str;
default = [];
description = ''
description = lib.mdDoc ''
Define which other containers this one depends on. They will be added to both After and Requires for the unit.
Use the same name as the attribute under <literal>virtualisation.oci-containers.containers</literal>.
Use the same name as the attribute under `virtualisation.oci-containers.containers`.
'';
example = literalExpression ''
virtualisation.oci-containers.containers = {
@ -229,7 +206,7 @@ let
extraOptions = mkOption {
type = with types; listOf str;
default = [];
description = "Extra options for <command>${defaultBackend} run</command>.";
description = lib.mdDoc "Extra options for {command}`${defaultBackend} run`.";
example = literalExpression ''
["--network=host"]
'';
@ -238,7 +215,7 @@ let
autoStart = mkOption {
type = types.bool;
default = true;
description = ''
description = lib.mdDoc ''
When enabled, the container is automatically started on boot.
If this option is set to false, the container has to be started on-demand via its service.
'';
@ -339,13 +316,13 @@ in {
backend = mkOption {
type = types.enum [ "podman" "docker" ];
default = if versionAtLeast config.system.stateVersion "22.05" then "podman" else "docker";
description = "The underlying Docker implementation to use.";
description = lib.mdDoc "The underlying Docker implementation to use.";
};
containers = mkOption {
default = {};
type = types.attrsOf (types.submodule containerOptions);
description = "OCI (Docker) containers to run as systemd services.";
description = lib.mdDoc "OCI (Docker) containers to run as systemd services.";
};
};

2
nixos/tests/signal-desktop.nix
View File

@ -60,7 +60,7 @@ in {
)
# Only SQLCipher should be able to read the encrypted DB:
machine.fail(
"su - alice -c 'sqlite3 ~/.config/Signal/sql/db.sqlite .databases'"
"su - alice -c 'sqlite3 ~/.config/Signal/sql/db.sqlite .tables'"
)
print(machine.succeed(
"su - alice -c 'sqlcipher ~/.config/Signal/sql/db.sqlite'"

10
pkgs/applications/blockchains/bitcoin-unlimited/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, openssl, db48, boost
{ lib, stdenv, fetchFromGitLab, pkg-config, autoreconfHook, openssl, db48, boost
, zlib, miniupnpc, util-linux, protobuf, qrencode, libevent, python3
, withGui, wrapQtAppsHook ? null, qtbase ? null, qttools ? null
, Foundation, ApplicationServices, AppKit }:
@ -7,13 +7,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "bitcoin" + optionalString (!withGui) "d" + "-unlimited";
version = "1.9.2.0";
version = "1.10.0.0";
src = fetchFromGitHub {
src = fetchFromGitLab {
owner = "bitcoinunlimited";
repo = "bitcoinunlimited";
repo = "BCHUnlimited";
rev = "BCHunlimited${version}";
sha256 = "sha256-qUf/GWZHpI57ATTlvRhjDtAjRa8a4uvUb0G9Xcf0j7w=";
sha256 = "sha256-d+giTXq/6HpysRAPT7yOl/B1x4zie9irs4O7cJsBqHg=";
};
nativeBuildInputs = [ pkg-config autoreconfHook python3 ]

4
pkgs/applications/blockchains/ergo/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ergo";
version = "4.0.30";
version = "4.0.34";
src = fetchurl {
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
sha256 = "sha256-Jeufmt2Dso13Z/TQnSA8IPNxTfha+wcklKZb+BF/dNE=";
sha256 = "sha256-VFzjoa9TdFMSdWtYvpW1ZfECEmuj25yCXIV99/lzZwI=";
};
nativeBuildInputs = [ makeWrapper ];

7
pkgs/development/interpreters/lua-5/default.nix
View File

@ -17,6 +17,13 @@ rec {
extraPrefix = "src/";
excludes = [ "src/testes/*" ];
})
(fetchpatch {
name = "CVE-2022-33099.patch";
url = "https://github.com/lua/lua/commit/42d40581dd919fb134c07027ca1ce0844c670daf.patch";
sha256 = "sha256-qj1Dq1ojVoknALSa67jhgH3G3Kk4GtJP6ROFElVF+D0=";
stripLen = 1;
extraPrefix = "src/";
})
];
};

4
pkgs/development/libraries/intel-media-driver/default.nix
View File

@ -14,7 +14,7 @@
stdenv.mkDerivation rec {
pname = "intel-media-driver";
version = "22.4.3";
version = "22.5.0";
outputs = [ "out" "dev" ];
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "intel";
repo = "media-driver";
rev = "intel-media-${version}";
sha256 = "sha256-NcbtgJjDAHRv7Qs6fPRwScMBPLXci6e2oLxm8DC2nnw=";
sha256 = "sha256-8E3MN4a+k8YA+uuUPApYFvT82bgJHE1cnPyuAO6R1tA=";
};
patches = [

2
pkgs/development/ocaml-modules/qcheck/alcotest.nix
View File

@ -3,7 +3,7 @@
buildDunePackage {
pname = "qcheck-alcotest";
inherit (qcheck-core) version useDune2 src;
inherit (qcheck-core) version src;
propagatedBuildInputs = [ qcheck-core alcotest ];

6
pkgs/development/ocaml-modules/qcheck/core.nix
View File

@ -2,9 +2,7 @@
buildDunePackage rec {
pname = "qcheck-core";
version = "0.18";
useDune2 = true;
version = "0.19.1";
minimalOCamlVersion = "4.08";
@ -12,7 +10,7 @@ buildDunePackage rec {
owner = "c-cube";
repo = "qcheck";
rev = "v${version}";
sha256 = "1s652hrj2sxqj30dfl300zjvvqk3r62a1bnzqw1hqyf6pi88qn8x";
sha256 = "sha256-AZ1Ww6CWt3X1bXXcofMe14rTlMTC9hmohcKdZLUKEvE=";
};
meta = {

2
pkgs/development/ocaml-modules/qcheck/default.nix
View File

@ -3,7 +3,7 @@
buildDunePackage {
pname = "qcheck";
inherit (qcheck-ounit) version useDune2 src;
inherit (qcheck-ounit) version src;
propagatedBuildInputs = [ qcheck-ounit ];

2
pkgs/development/ocaml-modules/qcheck/ounit.nix
View File

@ -3,7 +3,7 @@
buildDunePackage {
pname = "qcheck-ounit";
inherit (qcheck-core) version useDune2 src;
inherit (qcheck-core) version src;
propagatedBuildInputs = [ qcheck-core ounit ];

10
pkgs/development/python-modules/grpcio/default.nix
View File

@ -1,5 +1,6 @@
{ lib, stdenv
, buildPythonPackage
, fetchpatch
, grpc
, six
, protobuf
@ -17,6 +18,15 @@ buildPythonPackage rec {
inherit (grpc) src version;
pname = "grpcio";
patches = [
# Fix build on armv6l
# https://github.com/grpc/grpc/pull/30401
(fetchpatch {
url = "https://github.com/grpc/grpc/commit/65dc9f3edeee4c2d0e9b30d5a3ee63175437bea3.patch";
hash = "sha256-pS4FsCcSjmjSs3J5Y96UonkxqPwfpkyhrEM0t6HaMd0=";
})
];
outputs = [ "out" "dev" ];
nativeBuildInputs = [ cython pkg-config ];

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

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "jc";
version = "1.20.2";
version = "1.20.3";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "kellyjonbrazil";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ZhDk6JxgRASSezRkQ5KnRHKhQBykeZUpGCLW5zzLBSM=";
sha256 = "sha256-1HrXPqUeWtMkPD+wr5nKO9HLZQIqzCzs5j2pp/WNFGc=";
};
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];

6
pkgs/development/tools/continuous-integration/fly/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fly";
version = "7.8.1";
version = "7.8.2";
src = fetchFromGitHub {
owner = "concourse";
repo = "concourse";
rev = "v${version}";
sha256 = "sha256-A37XTLL6BcltKofriqai8RX+VQ4jcFRHriP4sUZ5g2c=";
sha256 = "sha256-Lgsn5k3ITJnRnOXXZjfjlEEG+OvTZjFq+LB3Us3DH8k=";
};
vendorSha256 = "sha256-aYu5K6pK6Q0Fmagr91i6nc3t55nUjn5vasIO+kUXWrs=";
vendorSha256 = "sha256-91N6AOxXFOI6AM28avlInseAeZkqE9IfybJAX31tPDg=";
subPackages = [ "fly" ];

4
pkgs/tools/misc/wsl-open/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "wsl-open";
version = "2.1.1";
version = "2.2.1";
src = fetchFromGitHub {
owner = "4U6U57";
repo = "wsl-open";
rev = "v${version}";
sha256 = "1mwak846zh47p3pp4q5f54cw8d9qk61zn43q81j2pkcm35mv9lzg";
sha256 = "sha256-amqkDXdgIqGjRZMkltwco0UAI++G0RY/MxLXwtlxogE=";
};
nativeBuildInputs = [ installShellFiles ];

2
pkgs/top-level/all-packages.nix
View File

@ -35145,6 +35145,8 @@ with pkgs;
OSCAR = qt5.callPackage ../applications/misc/OSCAR { };
parsedmarc = with python3Packages; toPythonApplication parsedmarc;
pgmanage = callPackage ../applications/misc/pgmanage { };
pgadmin4 = callPackage ../tools/admin/pgadmin { };