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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-04-05 00:16:41 +00:00 committed by GitHub
commit 0269017eb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 141 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/monitoring/prometheus/exporters.nix
View File

@ -28,6 +28,7 @@ let
"blackbox"
"collectd"
"dnsmasq"
"domain"
"dovecot"
"fritzbox"
"json"

19
nixos/modules/services/monitoring/prometheus/exporters/domain.nix Normal file
View File

@ -0,0 +1,19 @@
{ config, lib, pkgs, options }:
with lib;
let
cfg = config.services.prometheus.exporters.domain;
in
{
port = 9222;
serviceOpts = {
serviceConfig = {
ExecStart = ''
${pkgs.prometheus-domain-exporter}/bin/domain_exporter \
--bind ${cfg.listenAddress}:${toString cfg.port} \
${concatStringsSep " \\\n " cfg.extraFlags}
'';
};
};
}

6
nixos/modules/services/web-servers/nginx/default.nix
View File

@ -154,9 +154,9 @@ let
${optionalString (cfg.recommendedProxySettings) ''
proxy_redirect off;
proxy_connect_timeout 90;
proxy_send_timeout 90;
proxy_read_timeout 90;
proxy_connect_timeout 60;
proxy_send_timeout 60;
proxy_read_timeout 60;
proxy_http_version 1.0;
include ${recommendedProxyConfig};
''}

16
nixos/tests/prometheus-exporters.nix
View File

@ -201,6 +201,22 @@ let
'';
};
# Access to WHOIS server is required to properly test this exporter, so
# just perform basic sanity check that the exporter is running and returns
# a failure.
domain = {
exporterConfig = {
enable = true;
};
exporterTest = ''
wait_for_unit("prometheus-domain-exporter.service")
wait_for_open_port(9222)
succeed(
"curl -sSf 'http://localhost:9222/probe?target=nixos.org' | grep -q 'domain_probe_success 0'"
)
'';
};
dovecot = {
exporterConfig = {
enable = true;

2
pkgs/applications/audio/apple-music-electron/default.nix
View File

@ -18,7 +18,7 @@ in appimageTools.wrapType2 {
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=$out/bin/apple-music-electron'
--replace "Exec=AppRun" "Exec=$out/bin/apple-music-electron"
cp -r ${appimageContents}/usr/share/icons $out/share
'';

1
pkgs/applications/radio/gnuradio/3.8.nix
View File

@ -1,6 +1,5 @@
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
# Remove gcc and python references
, removeReferencesTo

53
pkgs/applications/virtualization/cloud-hypervisor/cargo-lock-vendor-fix.patch
View File

@ -1,53 +0,0 @@
diff --git a/Cargo.lock b/Cargo.lock
index e566ed25..a661a963 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -689,7 +689,7 @@ dependencies = [
"serde",
"serde_derive",
"serde_json",
- "vfio-bindings 0.2.0 (git+https://github.com/rust-vmm/vfio-bindings)",
+ "vfio-bindings",
"vfio-ioctls",
"vm-allocator",
"vm-device",
@@ -1346,17 +1346,12 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
[[package]]
name = "vfio-bindings"
version = "0.2.0"
-source = "git+https://github.com/rust-vmm/vfio-bindings#f08cbcbf4041c981441d9c036c49ebad5098ed1c"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a21f546f2bda37f5a8cfb138c87f95b8e34d2d78d6a7a92ba3785f4e08604a7"
dependencies = [
"vmm-sys-util",
]
-[[package]]
-name = "vfio-bindings"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a21f546f2bda37f5a8cfb138c87f95b8e34d2d78d6a7a92ba3785f4e08604a7"
-
[[package]]
name = "vfio-ioctls"
version = "0.1.0"
@@ -1366,7 +1361,7 @@ dependencies = [
"kvm-bindings",
"kvm-ioctls",
"log 0.4.8",
- "vfio-bindings 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vfio-bindings",
"vm-memory",
"vmm-sys-util",
]
diff --git a/pci/Cargo.toml b/pci/Cargo.toml
index 9c6955c7..4ecf8e6b 100644
--- a/pci/Cargo.toml
+++ b/pci/Cargo.toml
@@ -23,5 +23,5 @@ vm-memory = "0.2.1"
vm-migration = { path = "../vm-migration" }
[dependencies.vfio-bindings]
-git = "https://github.com/rust-vmm/vfio-bindings"
+version = "0.2.0"
features = ["fam-wrappers"]

15
pkgs/applications/virtualization/cloud-hypervisor/default.nix
View File

@ -1,28 +1,27 @@
{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl }:
{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, dtc, openssl }:
rustPlatform.buildRustPackage rec {
pname = "cloud-hypervisor";
version = "0.8.0";
version = "0.14.1";
src = fetchFromGitHub {
owner = "cloud-hypervisor";
repo = pname;
rev = "v${version}";
sha256 = "h2aWWjycTm84TS89/vhqnAvwOqeeSDtvvCt+Is6I0eI=";
sha256 = "0pnfg6dzpz8v40cwg3dmlj52x8pblavv7mkczar814dwbk01y7vr";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc;
cargoPatches = [ ./cargo-lock-vendor-fix.patch ];
cargoSha256 = "fOIB+qVDqAAgQPW3bK2NfST24GzYJeRXgaMFXyNPcPQ=";
cargoSha256 = "0dbjds40znly11i0ssfv66w82ynxp00ixw1349m5ln9i9ms94sr4";
meta = with lib; {
homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor";
description = "Open source Virtual Machine Monitor (VMM) that runs on top of KVM";
changelog = "https://github.com/cloud-hypervisor/cloud-hypervisor/releases/tag/v${version}";
license = with licenses; [ asl20 bsd3 ];
maintainers = with maintainers; [ offline ];
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ offline qyliss ];
platforms = [ "aarch64-linux" "x86_64-linux" ];
};
}

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

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "coordgenlibs";
version = "2.0.0";
version = "2.0.2";
src = fetchFromGitHub {
owner = "schrodinger";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lfA0y/tT64C/7NjBff4HEzIfhZ3piFBkQjX5xVbFXFc=";
sha256 = "sha256-BcDqrOotqRPMnzvfjzbeCf8gT3yQzKihywKrpah1D7w=";
};
nativeBuildInputs = [ cmake ];

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

@ -8,6 +8,7 @@
, pytz
, pytestCheckHook
, urllib3
, certifi
}:
buildPythonPackage rec {
@ -26,6 +27,7 @@ buildPythonPackage rec {
python-dateutil
pytz
urllib3
certifi
];
checkInputs = [ faker mock nose pytestCheckHook ];

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

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "pysmappee";
version = "0.2.17";
version = "0.2.18";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "smappee";
repo = pname;
rev = version;
sha256 = "00274fbclj5kmwxi2bfx4913r4l0y8qvkfcc9d7ryalvf8jq24k6";
sha256 = "sha256-DnRtKr8aGZ6rcN/wTpcFNaI+EJm07nObfWyBpLkQF38=";
};
propagatedBuildInputs = [

6
pkgs/development/tools/rust/cargo-make/default.nix
View File

@ -4,11 +4,11 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.32.15";
version = "0.32.16";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-BvZe2+PwradByyDeqhs3u42tbLrR5UMyUhJVSlX/U+w=";
sha256 = "sha256-FrrQcZHy5WjNYCod2TBWVAj4clNWPLWLIR2/Kvkz4q0=";
};
nativeBuildInputs = [ pkg-config ];
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
cargoSha256 = "sha256-eA1cyffQAmSN3jQo5k8H6eYrS23qUxsiAqWzwrYmh3o=";
cargoSha256 = "sha256-QEHl/Hhug0Ua/SZV0iq1jc6QGGxA1NwheEgGBZRYunI=";
# Some tests fail because they need network access.
# However, Travis ensures a proper build.

28
pkgs/development/tools/shellharden/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "shellharden";
version = "4.1.2";
src = fetchFromGitHub {
owner = "anordal";
repo = pname;
rev = "v${version}";
sha256 = "1003kgnql0z158d3rzz8s3i7s7rx9hjqqvp3li8xhzrgszvkgqk4";
};
cargoSha256 = "1h4wp9xs9nq90ml2km9gd0afrzri6fbgskz6d15jqykm2fw72l88";
postPatch = "patchShebangs moduletests/run";
meta = with lib; {
description = "The corrective bash syntax highlighter";
longDescription = ''
Shellharden is a syntax highlighter and a tool to semi-automate the
rewriting of scripts to ShellCheck conformance, mainly focused on quoting.
'';
homepage = "https://github.com/anordal/shellharden";
license = licenses.mpl20;
maintainers = with maintainers; [ oxzi ];
};
}

16
pkgs/games/devilutionx/default.nix
View File

@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }:
stdenv.mkDerivation rec {
version = "1.0.1";
pname = "devilutionx";
version = "2020-10-20";
pname = "devilutionx-unstable";
src = fetchFromGitHub {
owner = "diasurgical";
repo = "devilutionX";
rev = version;
sha256 = "1jvjlch9ql5s5jx9g5y5pkc2xn62199qylsmzpqzx1jc3k2vmw5i";
rev = "432fbc8ef7b98e567b08e44ce91b198374a5ff01";
sha256 = "03w3bgmzwsbycx3fzvn47fsmabl069gw77yn2fqg89wlgaw1yrr9";
};
NIX_CFLAGS_COMPILE = [
@ -15,6 +15,12 @@ stdenv.mkDerivation rec {
''-DTTF_FONT_PATH="${placeholder "out"}/share/fonts/truetype/CharisSILB.ttf"''
];
cmakeFlags = [
"-DBINARY_RELEASE=ON"
];
enableParallelBuilding = true;
nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ libsodium SDL2 SDL2_mixer SDL2_ttf ];
@ -40,6 +46,6 @@ stdenv.mkDerivation rec {
longDescription = "In order to play this game a copy of diabdat.mpq is required. Place a copy of diabdat.mpq in ~/.local/share/diasurgical/devilution before executing the game.";
license = licenses.unlicense;
maintainers = [ maintainers.karolchmist ];
platforms = platforms.linux ++ platforms.darwin ++ platforms.windows;
platforms = platforms.linux ++ platforms.windows;
};
}

1
pkgs/servers/home-assistant/default.nix
View File

@ -314,6 +314,7 @@ in with py.pkgs; buildPythonApplication rec {
"sensor"
"smarttub"
"smtp"
"smappee"
"solaredge"
"sonos"
"spotify"

26
pkgs/servers/monitoring/prometheus/domain-exporter.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
buildGoModule rec {
pname = "domain-exporter";
version = "1.10.0";
src = fetchFromGitHub {
owner = "caarlos0";
repo = "domain_exporter";
rev = "v${version}";
sha256 = "0pvz5vx9jvxdrkmzqzh7dfi09sb55j6zpx5728m5v38p8cl8vyh6";
};
vendorSha256 = "02m2mnx93xq6cl54waazgxq6vqbswfn9aafz0h694n6rskvdn784";
doCheck = false; # needs internet connection
passthru.tests = { inherit (nixosTests.prometheus-exporters) domain; };
meta = with lib; {
homepage = "https://github.com/caarlos0/domain_exporter";
description = "Exports the expiration time of your domains as prometheus metrics";
license = licenses.mit;
maintainers = with maintainers; [ mmilata prusnak ];
};
}

14
pkgs/shells/dash/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, buildPackages, autoreconfHook, fetchurl }:
{ lib, stdenv, buildPackages, autoreconfHook, fetchurl, libedit }:
stdenv.mkDerivation rec {
pname = "dash";
@ -11,7 +11,6 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
# Temporary fix until a proper one is accepted upstream
patches = [
(fetchurl {
# Dash executes code when noexec ("-n") is specified
@ -19,9 +18,18 @@ stdenv.mkDerivation rec {
url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=29d6f2148f10213de4e904d515e792d2cf8c968e";
sha256 = "08q90bx36ixwlcj331dh7420qyj8i0qh1cc1gljrhd83fhl9w0y5";
})
] ++ lib.optional stdenv.isDarwin ./0001-fix-dirent64-et-al-on-darwin.patch;
] ++ lib.optionals stdenv.isDarwin [
# Temporary fix until a proper one is accepted upstream
./0001-fix-dirent64-et-al-on-darwin.patch
];
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook;
buildInputs = [ libedit ];
configureFlags = [ "--with-libedit" ];
enableParallelBuilding = true;
meta = with lib; {
homepage = "http://gondor.apana.org.au/~herbert/dash/";

4
pkgs/tools/misc/chezmoi/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "chezmoi";
version = "2.0.7";
version = "2.0.8";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
sha256 = "sha256-mJJtkJ57rYEe1BWK3TWAMOar/IUUC9ybiccx81puHsE=";
sha256 = "sha256-bGrGekZLystw3AvQP9bdFGlxteGCzwrhamaO8WLKf7U=";
};
vendorSha256 = "sha256-YU+t8GVsLYWONezUIB4NUrVxtYOmf/2b5v4v3VSYtBU=";

6
pkgs/tools/misc/fselect/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "fselect";
version = "0.7.3";
version = "0.7.4";
src = fetchFromGitHub {
owner = "jhspetersson";
repo = "fselect";
rev = version;
sha256 = "sha256-udHSyw7tf1toB+v67BvJ49INFJdNR2BjQuHEzQJyIoU=";
sha256 = "sha256-gwFX5c5y4bL+KhPDnvCbDco1ORYyqZYFsetMrmOATZU=";
};
cargoSha256 = "sha256-vVIanMkc0sPzu0L48oOh8wEEUOckR/AYkz81u4OR+fE=";
cargoSha256 = "sha256-2cs+5UL3tNfUzjlFIdsG05moiOktXSJOZJlgo/rZINw=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optional stdenv.isDarwin libiconv;

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

@ -13232,6 +13232,8 @@ in
shellcheck = callPackage ../development/tools/shellcheck {};
shellharden = callPackage ../development/tools/shellharden {};
schemaspy = callPackage ../development/tools/database/schemaspy { };
shncpd = callPackage ../tools/networking/shncpd { };
@ -18870,6 +18872,7 @@ in
prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { };
prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { };
prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { };
prometheus-domain-exporter = callPackage ../servers/monitoring/prometheus/domain-exporter.nix { };
prometheus-flow-exporter = callPackage ../servers/monitoring/prometheus/flow-exporter.nix { };
prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { };
prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { };