cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-06-27 06:01:11 +00:00 committed by GitHub
commit 058fe905b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 179 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
View file

@ -2784,6 +2784,12 @@ sudo cp /var/lib/redis/dump.rdb /var/lib/redis-peertube/dump.rdb
runs a PostgreSQL server for the duration of package checks.
</para>
</listitem>
<listitem>
<para>
<literal>zfs</literal> was updated from 2.1.4 to 2.1.5,
enabling it to be used with Linux kernel 5.18.
</para>
</listitem>
<listitem>
<para>
<literal>stdenv.mkDerivation</literal> now supports a

6
nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
View file

@ -296,12 +296,6 @@
and require manual remediation.
</para>
</listitem>
<listitem>
<para>
<literal>zfs</literal> was updated from 2.1.4 to 2.1.5,
enabling it to be used with Linux kernel 5.18.
</para>
</listitem>
<listitem>
<para>
memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2.

2
nixos/doc/manual/release-notes/rl-2205.section.md
View file

@ -974,6 +974,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The new [`postgresqlTestHook`](https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook) runs a PostgreSQL server for the duration of package checks.
- `zfs` was updated from 2.1.4 to 2.1.5, enabling it to be used with Linux kernel 5.18.
- `stdenv.mkDerivation` now supports a self-referencing `finalAttrs:` parameter
containing the final `mkDerivation` arguments including overrides.
`drv.overrideAttrs` now supports two parameters `finalAttrs: previousAttrs:`.

2
nixos/doc/manual/release-notes/rl-2211.section.md
View file

@ -112,8 +112,6 @@ Use `configure.packages` instead.
- Matrix Synapse now requires entries in the `state_group_edges` table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was restored multiple times). If your Synapse database already has duplicate rows in this table, this could fail with an error and require manual remediation.
- `zfs` was updated from 2.1.4 to 2.1.5, enabling it to be used with Linux kernel 5.18.
- memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2. It is now the upstream version from https://www.memtest.org/, as coreboot's fork is no longer available.
- There is a new module for the `thunar` program (the Xfce file manager), which depends on the `xfconf` dbus service, and also has a dbus service and a systemd unit. The option `services.xserver.desktopManager.xfce.thunarPlugins` has been renamed to `programs.thunar.plugins`, and in a future release it may be removed.

1
nixos/tests/all-tests.nix
View file

@ -458,6 +458,7 @@ in {
proxy = handleTest ./proxy.nix {};
prowlarr = handleTest ./prowlarr.nix {};
pt2-clone = handleTest ./pt2-clone.nix {};
pykms = handleTest ./pykms.nix {};
public-inbox = handleTest ./public-inbox.nix {};
pulseaudio = discoverTests (import ./pulseaudio.nix);
qboot = handleTestOn ["x86_64-linux" "i686-linux"] ./qboot.nix {};

14
nixos/tests/pykms.nix Normal file
View file

@ -0,0 +1,14 @@
import ./make-test-python.nix ({ pkgs, ... }:
{
name = "pykms-test";
meta.maintainers = with pkgs.lib.maintainers; [ zopieux ];
nodes.machine = { config, lib, pkgs, ... }: {
services.pykms.enable = true;
};
testScript = ''
machine.wait_for_unit("pykms.service")
machine.succeed("${pkgs.pykms}/bin/client")
'';
})

2
pkgs/applications/blockchains/lndconnect/default.nix
View file

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, testVersion, lndconnect }:
{ lib, buildGoModule, fetchFromGitHub, lndconnect }:
buildGoModule rec {
pname = "lndconnect";
version = "0.2.1";

4
pkgs/applications/graphics/mcomix/default.nix
View file

@ -5,7 +5,7 @@
, gtk3
, mcomix
, python3
, testVersion
, testers
, wrapGAppsHook
# Recommended Dependencies:
@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication rec {
)
'';
passthru.tests.version = testVersion {
passthru.tests.version = testers.testVersion {
package = mcomix;
};

11
pkgs/applications/networking/cluster/cilium/default.nix
View file

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "cilium-cli";
@ -20,7 +20,6 @@ buildGoModule rec {
"-X github.com/cilium/cilium-cli/internal/cli/cmd.Version=${version}"
];
# Required to workaround install check error:
# 2022/06/25 10:36:22 Unable to start gops: mkdir /homeless-shelter: permission denied
HOME = "$TMPDIR";
@ -30,6 +29,14 @@ buildGoModule rec {
$out/bin/cilium version | grep ${version} > /dev/null
'';
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installShellCompletion --cmd cilium \
--bash <($out/bin/cilium completion bash) \
--fish <($out/bin/cilium completion fish) \
--zsh <($out/bin/cilium completion zsh)
'';
meta = with lib; {
description = "CLI to install, manage & troubleshoot Kubernetes clusters running Cilium";
license = licenses.asl20;

31
pkgs/applications/networking/cluster/hubble/default.nix
View file

@ -1,8 +1,8 @@
{ stdenv, lib, buildGoModule, fetchFromGitHub }:
{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "hubble";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "cilium";
@ -13,11 +13,36 @@ buildGoModule rec {
vendorSha256 = null;
ldflags = [
"-s" "-w"
"-X github.com/cilium/hubble/pkg.GitBranch=none"
"-X github.com/cilium/hubble/pkg.GitHash=none"
"-X github.com/cilium/hubble/pkg.Version=${version}"
];
# Test fails at Test_getFlowsRequestWithInvalidRawFilters in github.com/cilium/hubble/cmd/observe
# https://github.com/NixOS/nixpkgs/issues/178976
# https://github.com/cilium/hubble/pull/656
# https://github.com/cilium/hubble/pull/655
doCheck = false;
doInstallCheck = true;
installCheckPhase = ''
$out/bin/hubble version | grep ${version} > /dev/null
'';
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installShellCompletion --cmd hubble \
--bash <($out/bin/hubble completion bash) \
--fish <($out/bin/hubble completion fish) \
--zsh <($out/bin/hubble completion zsh)
'';
meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
description = "Network, Service & Security Observability for Kubernetes using eBPF";
license = licenses.asl20;
homepage = "https://github.com/cilium/hubble/";
maintainers = with maintainers; [ humancalico ];
maintainers = with maintainers; [ humancalico bryanasdev000 ];
};
}

4
pkgs/applications/networking/cluster/roxctl/default.nix
View file

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testVersion, roxctl }:
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, roxctl }:
buildGoModule rec {
pname = "roxctl";
@ -30,7 +30,7 @@ buildGoModule rec {
--zsh <($out/bin/roxctl completion zsh)
'';
passthru.tests.version = testVersion {
passthru.tests.version = testers.testVersion {
package = roxctl;
command = "roxctl version";
};

10
pkgs/applications/networking/cluster/terraform-providers/default.nix
View file

@ -1,4 +1,5 @@
{ lib
, stdenv
, buildGoModule
, buildGo118Module
, fetchFromGitHub
@ -59,6 +60,15 @@ let
special-providers =
{
brightbox = automated-providers.brightbox.override { mkProviderGoModule = buildGo118Module; };
# remove with >= 1.6.0
# https://github.com/equinix/terraform-provider-equinix/commit/5b4d6415d23dc2ee56988c4b1458fbb51c8cc750
equinix = automated-providers.equinix.overrideAttrs (a: {
src = a.src.overrideAttrs (a: {
postFetch = (a.postFetch or "") + lib.optionalString (!stdenv.isDarwin) ''
rm $out/cmd/migration-tool/README.md
'';
});
});
# mkisofs needed to create ISOs holding cloud-init data,
# and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630
libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; });

9
pkgs/applications/networking/cluster/terraform-providers/providers.json
View file

@ -363,6 +363,15 @@
"vendorSha256": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=",
"version": "2.0.2"
},
"equinix": {
"owner": "equinix",
"provider-source-address": "registry.terraform.io/equinix/equinix",
"repo": "terraform-provider-equinix",
"rev": "v1.5.0",
"sha256": "sha256-+NrEP5x9/ymNb2qSdMyHNu7rjUtYxDT5Nv70vMxfTJw=",
"vendorSha256": "sha256-5MSZ4Mw6P5cI+COOq5SLTXqaVTr+zOix+w983rgcS+g=",
"version": "1.5.0"
},
"exoscale": {
"owner": "exoscale",
"provider-source-address": "registry.terraform.io/exoscale/exoscale",

4
pkgs/applications/version-management/git-and-tools/gfold/default.nix
View file

@ -7,7 +7,7 @@
, rustPlatform
, Security
, stdenv
, testVersion
, testers
}:
let
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
passthru.tests.version = testVersion {
passthru.tests.version = testers.testVersion {
package = gfold;
command = "gfold --version";
inherit version;

8
pkgs/data/documentation/scheme-manpages/default.nix
View file

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "scheme-manpages-unstable";
version = "2022-04-21";
pname = "scheme-manpages";
version = "unstable-2022-05-14";
src = fetchFromGitHub {
owner = "schemedoc";
repo = "manpages";
rev = "e3faaa1b80b3493ee644958a105f84f2995a0436";
sha256 = "sha256-28e6tFRTqX/PWMhdoUZ4nQU1e/JL2uR+NjVXGBwogMM=";
rev = "e4d8e389312a865e350ef88f3e9d69be290705c7";
sha256 = "sha256-bYg8XSycbQIaZDsE0G5Xy0bd2JNWHwYEnyL6ThN7XS4=";
};
dontBuild = true;

65
pkgs/development/ocaml-modules/mldoc/default.nix Normal file
View file

@ -0,0 +1,65 @@
{ lib
, buildDunePackage
, fetchFromGitHub
, fetchpatch
, angstrom
, cmdliner
, core
, core_bench
, js_of_ocaml
, js_of_ocaml-ppx
, ppx_deriving_yojson
, uri
, yojson
, lwt
, xmlm
}:
let
angstrom' = angstrom.overrideAttrs (attrs: {
patches = attrs.patches or [ ] ++ [
# mldoc requires Angstrom to expose `unsafe_lookahead`
(fetchpatch {
url = "https://github.com/logseq/angstrom/commit/bbe36c99c13678937d4c983a427e02a733d6cc24.patch";
sha256 = "sha256-RapY1QJ8U0HOqJ9TFDnCYB4tFLFuThESzdBZqjYuDUA=";
})
];
});
uri' = uri.override { angstrom = angstrom'; };
in
buildDunePackage rec {
pname = "mldoc";
version = "1.3.9";
minimalOCamlVersion = "4.10";
src = fetchFromGitHub {
owner = "logseq";
repo = "mldoc";
rev = "v${version}";
sha256 = "sha256-C5SeG10EoZixCWeBxw7U+isAR8UWd1jzHLdmbp//gAs=";
};
buildInputs = [
cmdliner
core
core_bench
js_of_ocaml
js_of_ocaml-ppx
lwt
];
propagatedBuildInputs = [
angstrom'
uri'
yojson
ppx_deriving_yojson
xmlm
];
meta = with lib; {
homepage = "https://github.com/logseq/mldoc";
description = "Another Emacs Org-mode and Markdown parser";
license = licenses.agpl3Only;
maintainers = with maintainers; [ marsam ];
};
}

4
pkgs/development/python-modules/nibabel/default.nix
View file

@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "nibabel";
version = "4.0.0";
version = "4.0.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-bVvOqRGZYn1KEAhmzVfmR5Nkh3MAJ5Evl1z59us4AYA=";
sha256 = "sha256-Ih83OjgAWpEcViOWBw1ngu3zTuNsVguWrj/m3Q7VxGI=";
};
propagatedBuildInputs = [ numpy scipy h5py packaging pydicom ];

4
pkgs/development/python-modules/pubnub/default.nix
View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pubnub";
version = "6.3.2";
version = "6.3.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = pname;
repo = "python";
rev = "refs/tags/v${version}";
hash = "sha256-xSPsBcbttADgaetkTIFSYSoEl3lWfdhechpkzQEmcag=";
hash = "sha256-OVciXd1u112h9tPNW5XpT7aDknpMGEYroe4m7HxBqaw=";
};
propagatedBuildInputs = [

4
pkgs/development/tools/jira-cli-go/default.nix
View file

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, less, more, installShellFiles, testVersion, jira-cli-go }:
{ lib, buildGoModule, fetchFromGitHub, less, more, installShellFiles, testers, jira-cli-go }:
buildGoModule rec {
pname = "jira-cli-go";
@ -22,7 +22,7 @@ buildGoModule rec {
checkInputs = [ less more ]; # Tests expect a pager in $PATH
passthru.tests.version = testVersion {
passthru.tests.version = testers.testVersion {
package = jira-cli-go;
command = "jira version";
inherit version;

6
pkgs/development/tools/metal-cli/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "metal-cli";
version = "0.7.4";
version = "0.9.0";
src = fetchFromGitHub {
owner = "equinix";
repo = pname;
rev = "v${version}";
sha256 = "sha256-muhHBUb5Ttj4n6fJzIJMqics5rKupeSBZAd4JxZUe64=";
sha256 = "sha256-ivO4YFFDTza20WgTGEaSGUcIEvXVtwKKVGyKWe8d9bA=";
};
vendorSha256 = "sha256-F8d5i9jvjY11Pv6w0ZXI3jr0Wix++B/w9oRTuJGpQfE=";
vendorSha256 = "sha256-rf0EWMVvuoPUMTQKi/FnUbE2ZAs0C7XosHAzCgwB5wg=";
ldflags = [
"-s" "-w"

4
pkgs/servers/sql/mariadb/galera/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "mariadb-galera";
version = "26.4.11";
version = "26.4.12";
src = fetchFromGitHub {
owner = "codership";
repo = "galera";
rev = "release_${version}";
sha256 = "sha256-zAS/YCUNSgkjehUXJpa+FyPC6zHnx3Nmlx0m7hbuZo0=";
sha256 = "sha256-1Jw99Eo8xhCNLd2XHm9M6DatzBl0w5VvgUahvKs4glg=";
fetchSubmodules = true;
};

17
pkgs/tools/networking/pykms/default.nix
View file

@ -37,15 +37,15 @@ pypkgs.buildPythonApplication rec {
version = "unstable-2021-01-25";
src = fetchFromGitHub {
owner = "SystemRage";
owner = "Py-KMS-Organization";
repo = "py-kms";
rev = "a3b0c85b5b90f63b33dfa5ae6085fcd52c6da2ff";
sha256 = "sha256-u0R0uJMQxHnJUDenxglhQkZza3/1DcyXCILcZVceygA=";
rev = "1435c86fe4f11aa7fd42d77fa61715ca3015eeab";
hash = "sha256-9KiMbS0uKTbWSZVIv5ziIeR9c8+EKfKd20yPmjCX7GQ=";
};
sourceRoot = "source/py-kms";
propagatedBuildInputs = with pypkgs; [ systemd pytz tzlocal ];
propagatedBuildInputs = with pypkgs; [ systemd pytz tzlocal dnspython ];
postPatch = ''
siteDir=$out/${python3.sitePackages}
@ -64,11 +64,14 @@ pypkgs.buildPythonApplication rec {
mkdir -p $siteDir
PYTHONPATH="$PYTHONPATH:$siteDir"
mv * $siteDir
for b in Client Server ; do
makeWrapper ${python3.interpreter} $out/bin/''${b,,} \
--argv0 pykms-''${b,,} \
--add-flags $siteDir/pykms_$b.py
--add-flags $siteDir/pykms_$b.py \
--set PYTHONPATH $PYTHONPATH
done
install -Dm755 ${dbScript} $out/libexec/create_pykms_db.sh
@ -82,8 +85,8 @@ pypkgs.buildPythonApplication rec {
meta = with lib; {
description = "Windows KMS (Key Management Service) server written in Python";
homepage = "https://github.com/SystemRage/py-kms";
homepage = "https://github.com/Py-KMS-Organization/py-kms";
license = licenses.unlicense;
maintainers = with maintainers; [ peterhoeg ];
maintainers = with maintainers; [ peterhoeg zopieux ];
};
}

2
pkgs/top-level/ocaml-packages.nix
View file

@ -899,6 +899,8 @@ let
mirage-vnetif = callPackage ../development/ocaml-modules/mirage-vnetif { };
mldoc = callPackage ../development/ocaml-modules/mldoc { };
mlgmp = callPackage ../development/ocaml-modules/mlgmp { };
mlgmpidl = callPackage ../development/ocaml-modules/mlgmpidl { };