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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-07-26 06:02:16 +00:00 committed by GitHub
commit 8aaeccd647
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
41 changed files with 323 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
maintainers/maintainer-list.nix
View File

@ -3138,6 +3138,13 @@
githubId = 1311761;
name = "Didier J. Devroye";
};
desttinghim = {
email = "opensource@louispearson.work";
matrix = "@desttinghim:matrix.org";
github = "desttinghim";
githubId = 10042482;
name = "Louis Pearson";
};
devhell = {
email = ''"^"@regexmail.net'';
github = "devhell";

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

@ -482,10 +482,10 @@ let
(let p11 = config.security.pam.p11; in optionalString cfg.p11Auth ''
auth ${p11.control} ${pkgs.pam_p11}/lib/security/pam_p11.so ${pkgs.opensc}/lib/opensc-pkcs11.so
'') +
(let u2f = config.security.pam.u2f; in optionalString cfg.u2fAuth ''
(let u2f = config.security.pam.u2f; in optionalString cfg.u2fAuth (''
auth ${u2f.control} ${pkgs.pam_u2f}/lib/security/pam_u2f.so ${optionalString u2f.debug "debug"} ${optionalString (u2f.authFile != null) "authfile=${u2f.authFile}"} ''
+ ''${optionalString u2f.interactive "interactive"} ${optionalString u2f.cue "cue"} ${optionalString (u2f.appId != null) "appid=${u2f.appId}"} ${optionalString (u2f.origin != null) "origin=${u2f.origin}"}
'') +
'')) +
optionalString cfg.usbAuth ''
auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so
'' +

2
nixos/modules/services/networking/ssh/sshd.nix
View File

@ -442,7 +442,9 @@ in
${flip concatMapStrings cfg.hostKeys (k: ''
if ! [ -s "${k.path}" ]; then
if ! [ -h "${k.path}" ]; then
rm -f "${k.path}"
fi
ssh-keygen \
-t "${k.type}" \
${if k ? bits then "-b ${toString k.bits}" else ""} \

7
nixos/modules/system/boot/networkd.nix
View File

@ -452,6 +452,7 @@ let
"AllMulticast"
"Unmanaged"
"RequiredForOnline"
"RequiredFamilyForOnline"
"ActivationPolicy"
])
(assertMacAddress "MACAddress")
@ -471,6 +472,12 @@ let
"enslaved"
"routable"
]))
(assertValueOneOf "RequiredFamilyForOnline" [
"ipv4"
"ipv6"
"both"
"any"
])
(assertValueOneOf "ActivationPolicy" ([
"up"
"always-up"

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

@ -282,6 +282,7 @@ in {
libuiohook = handleTest ./libuiohook.nix {};
lidarr = handleTest ./lidarr.nix {};
lightdm = handleTest ./lightdm.nix {};
lighttpd = handleTest ./lighttpd.nix {};
limesurvey = handleTest ./limesurvey.nix {};
litestream = handleTest ./litestream.nix {};
locate = handleTest ./locate.nix {};

21
nixos/tests/lighttpd.nix Normal file
View File

@ -0,0 +1,21 @@
import ./make-test-python.nix ({ lib, pkgs, ... }: {
name = "lighttpd";
meta.maintainers = with lib.maintainers; [ bjornfor ];
nodes = {
server = {
services.lighttpd.enable = true;
services.lighttpd.document-root = pkgs.runCommand "document-root" {} ''
mkdir -p "$out"
echo "hello nixos test" > "$out/file.txt"
'';
};
};
testScript = ''
start_all()
server.wait_for_unit("lighttpd.service")
res = server.succeed("curl --fail http://localhost/file.txt")
assert "hello nixos test" in res, f"bad server response: '{res}'"
'';
})

19
pkgs/applications/audio/mopidy/bandcamp.nix Normal file
View File

@ -0,0 +1,19 @@
{ lib, python3Packages, mopidy }:
python3Packages.buildPythonApplication rec {
pname = "Mopidy-Bandcamp";
version = "1.1.5";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "sha256-wg9zcOKfZQRhpyA1Cu5wvdwKpmrlcr2m9mrqBHgUXAQ=";
};
propagatedBuildInputs = with python3Packages; [ mopidy pykka ];
meta = with lib; {
description = "Mopidy extension for playing music from bandcamp";
homepage = "https://github.com/impliedchaos/mopidy-bandcamp";
license = licenses.mit;
maintainers = with maintainers; [ desttinghim ];
};
}

2
pkgs/applications/audio/mopidy/default.nix
View File

@ -7,6 +7,8 @@ lib.makeScope newScope (self: with self; {
mopidy = callPackage ./mopidy.nix { };
mopidy-bandcamp = callPackage ./bandcamp.nix { };
mopidy-iris = callPackage ./iris.nix { };
mopidy-jellyfin = callPackage ./jellyfin.nix { };

15
pkgs/applications/editors/vscode/extensions/default.nix
View File

@ -13,7 +13,7 @@
, jq
, shellcheck
, moreutils
, racket-minimal
, racket
, clojure-lsp
, alejandra
}:
@ -901,17 +901,18 @@ let
mktplcRef = {
name = "magic-racket";
publisher = "evzen-wybitul";
version = "0.5.7";
sha256 = "sha256-34/H0WgM73yzuOGU2w6Ipq7KuEBuN1bykcLGuvzY3mU=";
version = "0.6.4";
sha256 = "sha256-Hxa4VPm3QvJICzpDyfk94fGHu1hr+YN9szVBwDB8X4U=";
};
nativeBuildInputs = [ jq moreutils ];
postInstall = ''
cd "$out/$installPrefix"
jq '.contributes.configuration.properties."magic-racket.general.racketPath".default = "${racket-minimal}/bin/racket"' package.json | sponge package.json
jq '.contributes.configuration.properties."magicRacket.general.racketPath".default = "${racket}/bin/racket"' package.json | sponge package.json
jq '.contributes.configuration.properties."magicRacket.general.racoPath".default = "${racket}/bin/raco"' package.json | sponge package.json
'';
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/evzen-wybitul.magic-racket/changelog";
description = "The best coding experience for Racket in VS Code ";
description = "The best coding experience for Racket in VS Code";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=evzen-wybitul.magic-racket";
homepage = "https://github.com/Eugleo/magic-racket";
license = licenses.agpl3Only;
@ -1330,8 +1331,8 @@ let
mktplcRef = {
name = "latex-workshop";
publisher = "James-Yu";
version = "8.27.2";
sha256 = "sha256-scvT6cjlMrfG4yrhWlUwGM7ozu1E0xAryPRpV7FGCas=";
version = "8.28.0";
sha256 = "sha256-ZH2n/r4iKNxf6QETmNnGc5KIAIE0hcAReX3p2MDkve8=";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog";

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

@ -23,16 +23,16 @@
inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix)
}) rec {
pname = "dbeaver";
version = "22.1.2"; # When updating also update mvnSha256
version = "22.1.3"; # When updating also update mvnSha256
src = fetchFromGitHub {
owner = "dbeaver";
repo = "dbeaver";
rev = version;
sha256 = "sha256-iADQls//lgoq+IY4mzy/emyraFAJidHn46dMeAy5k6k=";
sha256 = "sha256-QrocrH/orgXvg0vNelm1hK4dHeDsxe3ZaVb3Q2FgYSo=";
};
mvnSha256 = "cTFeH9MxPnF1vaV+Q5/7HfIsO5eEbNDIsyekHsFH9vw=";
mvnSha256 = "U+RqrXtwFrku4b5d47WrFLmrlfqBs8YVif/qGf5CXqQ=";
mvnParameters = "-P desktop,all-platforms";
nativeBuildInputs = [

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

@ -2,12 +2,12 @@
stdenvNoCC.mkDerivation rec {
pname = "fluidd";
version = "1.17.2";
version = "1.19.0";
src = fetchurl {
name = "fluidd-v${version}.zip";
url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip";
sha256 = "sha256-kb7t3H2gpiN6/N/LxyG/Vu5Cp/zytAePsXmacxVyWCk=";
sha256 = "sha256-KFWjpJ7nYAvEwaI1yeBV+Zvj+uaS2Myw1Szkb/2VZe4=";
};
nativeBuildInputs = [ unzip ];

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

@ -22,6 +22,7 @@
, setuptools
, git
, withPcap ? true, dpkt, dnslib
, withXclip ? stdenv.isLinux, xclip
}:
buildPythonApplication rec {
pname = "visidata";
@ -63,7 +64,8 @@ buildPythonApplication rec {
zstandard
odfpy
setuptools
] ++ lib.optionals withPcap [ dpkt dnslib ];
] ++ lib.optionals withPcap [ dpkt dnslib ]
++ lib.optional withXclip xclip;
checkInputs = [
git

4
pkgs/applications/virtualization/conmon/default.nix
View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "conmon";
version = "2.1.2";
version = "2.1.3";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
sha256 = "sha256-KDAm+Djk1AaA3zXhxywT6HknT0tVCEZLS27nO9j/WgM=";
sha256 = "sha256-/5HYEcJzdGAiaMAh82vlDjzwEc7bf9gAYOAz7fkysR0=";
};
nativeBuildInputs = [ pkg-config ];

17
pkgs/applications/virtualization/podman-tui/default.nix
View File

@ -2,6 +2,7 @@
, stdenv
, pkg-config
, fetchFromGitHub
, fetchpatch
, buildGoModule
, btrfs-progs
, gpgme
@ -12,15 +13,23 @@
}:
buildGoModule rec {
pname = "podman-tui";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "containers";
repo = "podman-tui";
rev = "v${version}";
sha256 = "sha256-2WugN5JdTkz3OOt3ggzT7HwMXy1jxn85RwF7409D8m8=";
sha256 = "sha256-XLC1DqOME9xMF4z+cOPe5H60JnxU9gGaSOQQIofdtj8=";
};
patches = [
# Fix flaky tests. See https://github.com/containers/podman-tui/pull/129.
(fetchpatch {
url = "https://github.com/containers/podman-tui/commit/7fff27e95a3891163da79d86bbc796f29b523f80.patch";
sha256 = "sha256-mETDXoMLq7vb8Qhpz/CmNG1LmY2DTaogI10Qav/qN9Q=";
})
];
vendorSha256 = null;
nativeBuildInputs = [ pkg-config ];
@ -30,6 +39,10 @@ buildGoModule rec {
ldflags = [ "-s" "-w" ];
preCheck = ''
export HOME=/home/$(whoami)
'';
passthru.tests.version = testers.testVersion {
package = podman-tui;
command = "podman-tui version";

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

@ -31,6 +31,12 @@ stdenv.mkDerivation rec {
url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/master/debian/patches/0002-Remove-settings-based-on-ARCH.patch";
sha256 = "sha256-f4M0CPtAVf5l2ZwfgTaoPw7sPuAP/Uxhm5JSHEGhKT0=";
})
# fix compilation on i686-linux
(fetchpatch {
url = "https://github.com/intel/media-driver/commit/5ee502b84eb70f0d677a3b49d624c356b3f0c2b1.patch";
revert = true;
sha256 = "sha256-yRS10BKD5IkW8U0PxmyB7ryQiLwrqeetm0NivnoM224=";
})
];
cmakeFlags = [

10
pkgs/development/ocaml-modules/metrics/default.nix
View File

@ -2,15 +2,13 @@
buildDunePackage rec {
pname = "metrics";
version = "0.2.0";
version = "0.4.0";
useDune2 = true;
minimumOCamlVersion = "4.04";
minimalOCamlVersion = "4.04";
src = fetchurl {
url = "https://github.com/mirage/metrics/releases/download/${version}/metrics-${version}.tbz";
sha256 = "0j215cji3n78lghzi9m6kgr3r1s91v681hfnn7cgybb31d7gjkqg";
url = "https://github.com/mirage/metrics/releases/download/v${version}/metrics-${version}.tbz";
sha256 = "sha256-kbh1WktQkDcXE8O1WRm+vtagVfSql8S5gr0bXn/jia8=";
};
propagatedBuildInputs = [ fmt ];

6
pkgs/development/ocaml-modules/metrics/influx.nix
View File

@ -1,12 +1,12 @@
{ buildDunePackage, metrics
, astring, duration, fmt, lwt
, duration, fmt, lwt
}:
buildDunePackage rec {
pname = "metrics-influx";
inherit (metrics) version useDune2 src;
inherit (metrics) version src;
propagatedBuildInputs = [ astring duration fmt lwt metrics ];
propagatedBuildInputs = [ duration fmt lwt metrics ];
meta = metrics.meta // {
description = "Influx reporter for the Metrics library";

6
pkgs/development/ocaml-modules/metrics/lwt.nix
View File

@ -1,11 +1,11 @@
{ buildDunePackage, logs, ocaml_lwt, metrics }:
{ buildDunePackage, logs, lwt, metrics }:
buildDunePackage {
pname = "metrics-lwt";
inherit (metrics) version useDune2 src;
inherit (metrics) version src;
propagatedBuildInputs = [ logs ocaml_lwt metrics ];
propagatedBuildInputs = [ logs lwt metrics ];
meta = metrics.meta // {
description = "Lwt backend for the Metrics library";

14
pkgs/development/ocaml-modules/metrics/mirage.nix
View File

@ -1,14 +0,0 @@
{ buildDunePackage, metrics, metrics-influx
, cstruct, ipaddr, logs, lwt, mirage-clock, mirage-stack
}:
buildDunePackage {
pname = "metrics-mirage";
inherit (metrics) version useDune2 src;
propagatedBuildInputs = [ cstruct ipaddr logs lwt metrics metrics-influx mirage-clock mirage-stack ];
meta = metrics.meta // {
description = "Mirage backend for the Metrics library";
};
}

18
pkgs/development/ocaml-modules/metrics/rusage.nix Normal file
View File

@ -0,0 +1,18 @@
{ lib, buildDunePackage, metrics
, fmt, logs
}:
buildDunePackage {
pname = "metrics-rusage";
inherit (metrics) src version;
minimalOCamlVersion = "4.08";
propagatedBuildInputs = [ fmt logs metrics ];
doCheck = true;
meta = metrics.meta // {
description = "Resource usage (getrusage) sources for the Metrics library";
};
}

6
pkgs/development/ocaml-modules/metrics/unix.nix
View File

@ -1,12 +1,12 @@
{ buildDunePackage, gnuplot, ocaml_lwt, metrics, metrics-lwt, mtime, uuidm }:
{ buildDunePackage, gnuplot, lwt, metrics, metrics-lwt, mtime, uuidm }:
buildDunePackage rec {
pname = "metrics-unix";
inherit (metrics) version useDune2 src;
inherit (metrics) version src;
propagatedBuildInputs = [ gnuplot ocaml_lwt metrics mtime uuidm ];
propagatedBuildInputs = [ gnuplot lwt metrics mtime uuidm ];
checkInputs = [ metrics-lwt ];

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

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

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

@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "pywlroots";
version = "0.15.18";
version = "0.15.19";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "ZKWA0pRrh/nP1D8wUHNhM+R53l5PCKO1tnqbMfMd2WE=";
sha256 = "sha256-Ch8ddN9J8STw3qjAwP9sAta5YBgEg/2wSYgDyWEAXhU=";
};
nativeBuildInputs = [ pkg-config ];

5
pkgs/development/ruby-modules/bundler-app/default.nix
View File

@ -42,7 +42,10 @@ let
nativeBuildInputs = nativeBuildInputs ++ lib.optionals (scripts != []) [ makeWrapper ];
meta = { platforms = ruby.meta.platforms; } // meta;
meta = {
mainProgram = pname;
inherit (ruby.meta) platforms;
} // meta;
passthru = basicEnv.passthru // {
inherit basicEnv;
inherit (basicEnv) env;

43
pkgs/development/tools/bpf-linker/default.nix Normal file
View File

@ -0,0 +1,43 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, llvmPackages_14
, zlib
, ncurses
, libxml2
}:
rustPlatform.buildRustPackage rec {
pname = "bpf-linker";
version = "0.9.4";
src = fetchFromGitHub {
owner = "aya-rs";
repo = pname;
rev = "v${version}";
hash = "sha256-jYuBk78aGQLUeNF6d6kjGPuMxEF22XJquHcs23WVGm0=";
};
cargoHash = "sha256-X8EVpOxDHwE/wj/gly/wdZ6tsrMrz3kkDe9gEPbk6iw=";
buildNoDefaultFeatures = true;
buildFeatures = [ "system-llvm" ];
nativeBuildInputs = [ llvmPackages_14.llvm ];
buildInputs = [ zlib ncurses libxml2 ];
# fails with: couldn't find crate `core` with expected target triple bpfel-unknown-none
# rust-src and `-Z build-std=core` are required to properly run the tests
doCheck = false;
meta = with lib; {
description = "Simple BPF static linker";
homepage = "https://github.com/aya-rs/bpf-linker";
license = with licenses; [ asl20 mit ];
maintainers = with maintainers; [ nickcao ];
# llvm-sys crate locates llvm by calling llvm-config
# which is not available when cross compiling
broken = stdenv.buildPlatform != stdenv.hostPlatform;
};
}

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

@ -1,7 +1,7 @@
{ lib, buildGoModule, fetchFromGitLab, fetchurl }:
let
version = "15.1.0";
version = "15.2.0";
in
buildGoModule rec {
inherit version;
@ -14,13 +14,13 @@ buildGoModule rec {
"-X ${commonPackagePath}.REVISION=v${version}"
];
vendorSha256 = "sha256-5MzhDBCsgcACzImnfvetr3Z6SO+fHozChIhvZG0JwBc=";
vendorSha256 = "sha256-0lp4Hd6j7G59clWxLfz8GfQEmpXmhuGzmgX2ws/VJeQ=";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
sha256 = "sha256-G6V0l9kzbpl9XEYiiVBYjY7xOHemtOrb1xyB1HjhhTc=";
sha256 = "sha256-1OflKz8AV8vSCkNBWGteIbXqbueAYNeAdp9nL3lgD8A=";
};
patches = [

4
pkgs/development/tools/skaffold/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "skaffold";
version = "1.38.0";
version = "1.39.1";
src = fetchFromGitHub {
owner = "GoogleContainerTools";
repo = "skaffold";
rev = "v${version}";
sha256 = "sha256-Sy8DpCZEFps6Z4x57ESofNm2EZsPUCHzLz1icl1MOVE=";
sha256 = "sha256-InC4cfDQCwc6+4hPUsRitP7/uuOyBgbQjZhe3lGqlDw=";
};
vendorSha256 = "sha256-RA2KgUjYB3y6sOQdnLSZjr52VosZSaRrVU0BXZvjB1M=";

4
pkgs/development/tools/skopeo/default.nix
View File

@ -15,13 +15,13 @@
buildGoModule rec {
pname = "skopeo";
version = "1.9.0";
version = "1.9.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "containers";
repo = "skopeo";
sha256 = "sha256-z+jrDbXtcx4dH5n4X3WDHSIzmRP09cpO/WIAU3Ewas0=";
sha256 = "sha256-oNTGFoz/5KaxniA0+HfyGAFIt42a8YLdI3eeARWx2uA=";
};
outputs = [ "out" "man" ];

15
pkgs/os-specific/linux/irqbalance/default.nix
View File

@ -2,27 +2,16 @@
stdenv.mkDerivation rec {
pname = "irqbalance";
version = "1.8.0";
version = "1.9.0";
src = fetchFromGitHub {
owner = "irqbalance";
repo = "irqbalance";
rev = "v${version}";
sha256 = "sha256-K+Nv6HqBZb0pwfNV127QDq+suaUD7TTV413S6j8NdUU=";
sha256 = "sha256-OifGlOUT/zFz5gussEmLL24w4AovGeyNfbg/yCfzerw=";
};
patches = [
# pull pending upstream inclusion fix for ncurses-6.3:
# https://github.com/Irqbalance/irqbalance/pull/194
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/Irqbalance/irqbalance/commit/f8bdd0e64284d841544fd3ebe22f4652902ba8d2.patch";
sha256 = "sha256-QJIXr8BiKmn/81suuhNJsBRhY2as19/e480lsp2wd6g=";
})
];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ glib ncurses libcap_ng ];
LDFLAGS = "-lncurses";

4
pkgs/os-specific/linux/kernel/zen-kernels.nix
View File

@ -12,8 +12,8 @@ let
# ./update-zen.py lqx
lqxVariant = {
version = "5.18.14"; #lqx
suffix = "lqx1"; #lqx
sha256 = "1k1if1w1fiislj85311f5c6nw7w2l4lgkjk0m3b2nja05vy5i5gk"; #lqx
suffix = "lqx2"; #lqx
sha256 = "0g45y0rhbwpz12cbrh486vqxpzwdm0w5j7h3nxr0dr2ij8qzrr5p"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

6
pkgs/servers/headscale/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "headscale";
version = "0.15.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "juanfont";
repo = "headscale";
rev = "v${version}";
sha256 = "sha256-ZgChln6jcxyEHbCy89kNnwd9qWcB0yDq05xFkM69WLs=";
sha256 = "sha256-IP54zRbSUKxHr41OADKRfQIHEYBjrGs0fMyCxL0Yn6o=";
};
vendorSha256 = "sha256-0jZ37tmBG8E0HS/wbQyQvAKo1UKQdaZDa+OTGfGDAi4=";
vendorSha256 = "sha256-b9C6F+7N0ecW0HiTx+rztZnxb+n6U6YTSOJvp3GqnWQ=";
ldflags = [ "-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}" ];

5
pkgs/servers/http/lighttpd/default.nix
View File

@ -10,6 +10,7 @@
, enableWebDAV ? false, sqlite, libuuid
, enableExtendedAttrs ? false, attr
, perl
, nixosTests
}:
stdenv.mkDerivation rec {
@ -72,6 +73,10 @@ stdenv.mkDerivation rec {
rm "$out/share/lighttpd/doc/config/vhosts.d/Makefile"*
'';
passthru.tests = {
inherit (nixosTests) lighttpd;
};
meta = with lib; {
description = "Lightweight high-performance web server";
homepage = "http://www.lighttpd.net/";

6
pkgs/servers/monitoring/prometheus/influxdb-exporter.nix
View File

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "influxdb_exporter";
version = "0.8.0";
version = "0.10.0";
rev = "v${version}";
src = fetchFromGitHub {
inherit rev;
owner = "prometheus";
repo = "influxdb_exporter";
sha256 = "sha256-aNj4ru3yDet+jdcEpckFVaymmjWmKzTMPcTxPMNFbgo=";
sha256 = "sha256-AK1vlaYd2/+8/1rpzT1lKvTgybgxoL7gFqZIadfEUQY=";
};
vendorSha256 = null;
vendorSha256 = "sha256-xTxSKeCTkWKl70wm+5htFncMW6SdzbA4zW9tjKE9vDM=";
ldflags = [
"-s"

10
pkgs/servers/web-apps/matomo/default.nix
View File

@ -3,16 +3,16 @@
let
versions = {
matomo = {
version = "4.5.0";
sha256 = "sha256-OyjdzY+ENYxOTVjDLjj2unJbpaGODIH2I5Acmt45HDA=";
version = "4.10.1";
sha256 = "sha256-TN2xy3YHhtuewmi7h9vtMKElRI8uWOvnYzG1RlIGT3U=";
};
matomo-beta = {
version = "4.6.0";
version = "4.11.0";
# `beta` examples: "b1", "rc1", null
# when updating: use null if stable version is >= latest beta or release candidate
beta = "b2";
sha256 = "sha256-7p/ZPtr5a/tBjrM27ILF3rNfxDIWuzWKCXNom3HlyL8=";
beta = "rc2";
sha256 = "sha256-PYzv4OJYI4Zf7LMXQvX7fhvXryS6XPbmA0pTesF1vQ8=";
};
};
common = pname: { version, sha256, beta ? null }:

2
pkgs/tools/audio/beets/common.nix
View File

@ -137,6 +137,8 @@ python3Packages.buildPythonApplication rec {
runHook postCheck
'';
passthru.plugins = allPlugins;
meta = with lib; {
description = "Music tagger and library organizer";
homepage = "https://beets.io";

11
pkgs/tools/filesystems/glusterfs/default.nix
View File

@ -65,6 +65,17 @@ in stdenv.mkDerivation rec {
};
inherit buildInputs propagatedBuildInputs;
patches = [
# Upstream invokes `openssl version -d` to derive the canonical system path
# for certificates, which resolves to a nix store path, so this patch
# statically sets the configure.ac value. There's probably a less-brittle
# way to do this! (this will likely fail on a version bump)
# References:
# - https://github.com/gluster/glusterfs/issues/3234
# - https://github.com/gluster/glusterfs/commit/a7dc43f533ad4b8ff68bf57704fefc614da65493
./ssl_cert_path.patch
];
postPatch = ''
sed -e '/chmod u+s/d' -i contrib/fuse-util/Makefile.am
substituteInPlace libglusterfs/src/glusterfs/lvm-defaults.h \

23
pkgs/tools/filesystems/glusterfs/ssl_cert_path.patch Normal file
View File

@ -0,0 +1,23 @@
diff --git a/configure.ac b/configure.ac
index fb8db11e9e..4c40683057 100644
--- a/configure.ac
+++ b/configure.ac
@@ -766,14 +766,10 @@ AS_IF([test "x$enable_fuse_notifications" != "xno"], [
dnl Find out OpenSSL trusted certificates path
AC_MSG_CHECKING([for OpenSSL trusted certificates path])
-SSL_CERT_PATH=$(openssl version -d | sed -e 's|OPENSSLDIR: "\(.*\)".*|\1|')
-if test -d $SSL_CERT_PATH 1>/dev/null 2>&1; then
- AC_MSG_RESULT([$SSL_CERT_PATH])
- AC_DEFINE_UNQUOTED(SSL_CERT_PATH, ["$SSL_CERT_PATH"], [Path to OpenSSL trusted certificates.])
- AC_SUBST(SSL_CERT_PATH)
-else
- AC_MSG_ERROR([Unable to detect path to OpenSSL trusted certificates])
-fi
+SSL_CERT_PATH=/etc/ssl
+AC_MSG_RESULT([$SSL_CERT_PATH])
+AC_DEFINE_UNQUOTED(SSL_CERT_PATH, ["$SSL_CERT_PATH"], [Path to OpenSSL trusted certificates.])
+AC_SUBST(SSL_CERT_PATH)
AC_CHECK_LIB([ssl], TLS_method, [HAVE_OPENSSL_1_1="yes"], [HAVE_OPENSSL_1_1="no"])
if test "x$HAVE_OPENSSL_1_1" = "xyes"; then

5
pkgs/tools/security/pass/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, pkgs, fetchurl, buildEnv
, coreutils, findutils, gnugrep, gnused, getopt, git, tree, gnupg, openssl
, which, procps , qrencode , makeWrapper, pass, symlinkJoin
, which, openssh, procps, qrencode, makeWrapper, pass, symlinkJoin
, xclip ? null, xdotool ? null, dmenu ? null
, x11Support ? !stdenv.isDarwin , dmenuSupport ? (x11Support || waylandSupport)
@ -91,8 +91,9 @@ stdenv.mkDerivation rec {
gnused
tree
which
qrencode
openssh
procps
qrencode
] ++ optional stdenv.isDarwin openssl
++ optional x11Support xclip
++ optional waylandSupport wl-clipboard

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

@ -23433,6 +23433,8 @@ with pkgs;
bolt = callPackage ../os-specific/linux/bolt { };
bpf-linker = callPackage ../development/tools/bpf-linker { };
bpfmon = callPackage ../os-specific/linux/bpfmon { };
bridge-utils = callPackage ../os-specific/linux/bridge-utils { };
@ -28886,6 +28888,7 @@ with pkgs;
inherit (mopidyPackages)
mopidy
mopidy-bandcamp
mopidy-iris
mopidy-jellyfin
mopidy-local

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

@ -801,7 +801,7 @@ let
metrics-lwt = callPackage ../development/ocaml-modules/metrics/lwt.nix { };
metrics-mirage = callPackage ../development/ocaml-modules/metrics/mirage.nix { };
metrics-rusage = callPackage ../development/ocaml-modules/metrics/rusage.nix { };
metrics-unix = callPackage ../development/ocaml-modules/metrics/unix.nix {
inherit (pkgs) gnuplot;

124
pkgs/top-level/perl-packages.nix
View File

@ -6234,10 +6234,10 @@ let
DBDMariaDB = buildPerlPackage {
pname = "DBD-MariaDB";
version = "1.21";
version = "1.22";
src = fetchurl {
url = "mirror://cpan/authors/id/P/PA/PALI/DBD-MariaDB-1.21.tar.gz";
sha256 = "068l4ybja5mmy89lwgzl9c1xs37f4fgvf7j7n8k4f78dg8rjp5zm";
url = "mirror://cpan/authors/id/P/PA/PALI/DBD-MariaDB-1.22.tar.gz";
sha256 = "sha256-C2j9VCuWU/FbIFhXgZhjSNcehafjhD8JGZdwR6F5scY=";
};
buildInputs = [ pkgs.mariadb-connector-c DevelChecklib TestDeep TestDistManifest TestPod ];
propagatedBuildInputs = [ DBI ];
@ -11910,10 +11910,10 @@ let
JSONValidator = buildPerlPackage {
pname = "JSON-Validator";
version = "4.16";
version = "5.08";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-4.16.tar.gz";
sha256 = "0mhdczx2pxzi4lrrzkxl2a3r0s2b79ffsrar6g2l01idfpri6gi2";
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-5.08.tar.gz";
sha256 = "sha256-QPaWjtcfxv1Ij6Q1Ityhk5NDhUCSth/eZgHwcWZHeFg=";
};
buildInputs = [ TestDeep ];
propagatedBuildInputs = [ DataValidateDomain DataValidateIP Mojolicious NetIDNEncode YAMLLibYAML ];
@ -14081,12 +14081,12 @@ let
Minion = buildPerlPackage {
pname = "Minion";
version = "10.14";
version = "10.25";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SR/SRI/Minion-10.14.tar.gz";
sha256 = "1xs0z61p42qqzqwlag4fci40lzxfy6pdccijgf8wswb2vk6xambg";
url = "mirror://cpan/authors/id/S/SR/SRI/Minion-10.25.tar.gz";
sha256 = "sha256-C+CoN1N2iJ2gRgRpY4TAz5iyYh0mUNnrAwf25LlAra0=";
};
propagatedBuildInputs = [ Mojolicious ];
propagatedBuildInputs = [ Mojolicious YAMLLibYAML ];
meta = {
homepage = "https://github.com/mojolicious/minion";
description = "A high performance job queue for Perl";
@ -14097,10 +14097,10 @@ let
MinionBackendSQLite = buildPerlModule {
pname = "Minion-Backend-SQLite";
version = "5.0.4";
version = "5.0.6";
src = fetchurl {
url = "mirror://cpan/authors/id/D/DB/DBOOK/Minion-Backend-SQLite-v5.0.4.tar.gz";
sha256 = "0xhcsxm3x5v9azmyy12wiwlbpiisq06hgj3yf9ggqx8fp9jqppb1";
url = "mirror://cpan/authors/id/D/DB/DBOOK/Minion-Backend-SQLite-v5.0.6.tar.gz";
sha256 = "sha256-/uDUEe9WsAkru8BTN5InaH3hQZUoy2t0T3U9vcH7FNk=";
};
buildInputs = [ ModuleBuildTiny ];
propagatedBuildInputs = [ Minion MojoSQLite ];
@ -14114,10 +14114,10 @@ let
MinionBackendmysql = buildPerlPackage {
pname = "Minion-Backend-mysql";
version = "0.21";
version = "1.000";
src = fetchurl {
url = "mirror://cpan/authors/id/P/PR/PREACTION/Minion-Backend-mysql-0.21.tar.gz";
sha256 = "0dbq0pmyjcrmdjpsrkr1pxvzvdphn6mb6lk5yyyhm380prwrjahn";
url = "mirror://cpan/authors/id/P/PR/PREACTION/Minion-Backend-mysql-1.000.tar.gz";
sha256 = "sha256-cGS+CHHxmbSwTl1yQprfNbLkr2qHGorM0Mm1wqP9E00=";
};
buildInputs = [ Testmysqld ];
propagatedBuildInputs = [ Minion Mojomysql ];
@ -14757,10 +14757,10 @@ let
Mojolicious = buildPerlPackage {
pname = "Mojolicious";
version = "9.19";
version = "9.26";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.19.tar.gz";
sha256 = "15qs99sl3ckzqwpqk4kawhamdm6160bzxyikf3blym4fn1k6s1a5";
url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.26.tar.gz";
sha256 = "sha256-nkKMVRJpjwXhUTONj6Eq7eKHqzpeQp7D04yApKgsjYg=";
};
meta = {
homepage = "https://mojolicious.org";
@ -14820,10 +14820,10 @@ let
MojoliciousPluginOpenAPI = buildPerlPackage {
pname = "Mojolicious-Plugin-OpenAPI";
version = "4.02";
version = "5.05";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-4.02.tar.gz";
sha256 = "0rkkkcd3y3gjj0kis0hrab6mz8rk1qd57nz4npy39bag6h1kpyfv";
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-5.05.tar.gz";
sha256 = "sha256-xH+I0c434/YT9uizV9grenEEX/wKSXOVUS67zahlYV0=";
};
propagatedBuildInputs = [ JSONValidator ];
meta = {
@ -14852,10 +14852,10 @@ let
MojoliciousPluginSyslog = buildPerlPackage {
pname = "Mojolicious-Plugin-Syslog";
version = "0.05";
version = "0.06";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-Syslog-0.05.tar.gz";
sha256 = "sha256-G5Ur6EJ00gAeawLkqw93Et8O4wiPk2qFRlQofh0BPp8=";
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-Syslog-0.06.tar.gz";
sha256 = "sha256-IuxL9TYwDseyAYuoV3C9g2ZFDBAwVDZ9srFp9Mh3QRM=";
};
propagatedBuildInputs = [ Mojolicious ];
meta = {
@ -14900,10 +14900,10 @@ let
MojoRedis = buildPerlPackage {
pname = "Mojo-Redis";
version = "3.25";
version = "3.29";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojo-Redis-3.25.tar.gz";
sha256 = "17xxhfavj9j1pzjpxf1j72rq3vm2vj0j4h62088l64v11cs86zig";
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojo-Redis-3.29.tar.gz";
sha256 = "sha256-oDMZpF0uYTpsfS1ZrAD9SwtHiGVi5ish3pG0r4llgII=";
};
propagatedBuildInputs = [ Mojolicious ProtocolRedisFaster ];
meta = {
@ -14949,10 +14949,10 @@ let
Mojomysql = buildPerlPackage rec {
pname = "Mojo-mysql";
version = "1.20";
version = "1.25";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojo-mysql-1.20.tar.gz";
sha256 = "efc0927d3b479b71b4d1e6b476c2b81e01404134cc5d919ac902207e0a219c67";
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojo-mysql-1.25.tar.gz";
sha256 = "sha256-YC14GXw0HdCPLLH1XZg31P3gFHQz1k2+vxloaAtVzMs=";
};
propagatedBuildInputs = [ DBDmysql Mojolicious SQLAbstract ];
buildInputs = [ TestDeep ];
@ -14983,10 +14983,10 @@ let
MojoIOLoopForkCall = buildPerlModule {
pname = "Mojo-IOLoop-ForkCall";
version = "0.20";
version = "0.21";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JB/JBERGER/Mojo-IOLoop-ForkCall-0.20.tar.gz";
sha256 = "2b9962244c25a71e4757356fb3e1237cf869e26d1c27215115ba7b057a81f1a6";
url = "mirror://cpan/authors/id/J/JB/JBERGER/Mojo-IOLoop-ForkCall-0.21.tar.gz";
sha256 = "sha256-8dpdh4RxvdhvAcQjhQgAgE9ttCtUU8IW8Jslt5RYS3g=";
};
propagatedBuildInputs = [ IOPipely Mojolicious MojoIOLoopDelay ];
preBuild = ''
@ -15021,12 +15021,12 @@ let
MojoPg = buildPerlPackage {
pname = "Mojo-Pg";
version = "4.22";
version = "4.27";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SR/SRI/Mojo-Pg-4.22.tar.gz";
sha256 = "11s3f3km6i3in9wx9q4rkxgvj9rc6w8pdahrc19hi6zkxz3i87nr";
url = "mirror://cpan/authors/id/S/SR/SRI/Mojo-Pg-4.27.tar.gz";
sha256 = "sha256-oyLI3wDj5WVf300LernXmSiTIOKfZP6ZrHrxJEhO+dg=";
};
propagatedBuildInputs = [ DBDPg Mojolicious SQLAbstract ];
propagatedBuildInputs = [ DBDPg Mojolicious SQLAbstractPg ];
buildInputs = [ TestDeep ];
meta = {
homepage = "https://github.com/mojolicious/mojo-pg";
@ -15038,10 +15038,10 @@ let
MojoUserAgentCached = buildPerlPackage {
pname = "Mojo-UserAgent-Cached";
version = "1.16";
version = "1.19";
src = fetchurl {
url = "mirror://cpan/authors/id/N/NI/NICOMEN/Mojo-UserAgent-Cached-1.16.tar.gz";
sha256 = "17gp1kn97s1wv973w0g92alx13lmcvdan794471sfq2is6s6v1qd";
url = "mirror://cpan/authors/id/N/NI/NICOMEN/Mojo-UserAgent-Cached-1.19.tar.gz";
sha256 = "sha256-wlmZ2qqCHkZUhLWjINFVqlJZAMh4Ml2aiSAfSnWBxd8=";
};
buildInputs = [ ModuleInstall ];
propagatedBuildInputs = [ AlgorithmLCSS CHI DataSerializer DevelStackTrace Mojolicious Readonly StringTruncate ];
@ -17310,10 +17310,10 @@ let
OpenAPIClient = buildPerlPackage rec {
pname = "OpenAPI-Client";
version = "1.00";
version = "1.04";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/OpenAPI-Client-1.00.tar.gz";
sha256 = "41bcf211c1123fbfb844413aa53f97061410b592591367b61273a206865991f7";
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/OpenAPI-Client-1.04.tar.gz";
sha256 = "sha256-szo5AKzdLO5hAHu5MigNjDzslJkpnUNyud+Yd0vXTAo=";
};
propagatedBuildInputs = [ MojoliciousPluginOpenAPI ];
meta = {
@ -20186,12 +20186,12 @@ let
SQLAbstract = buildPerlPackage {
pname = "SQL-Abstract";
version = "1.87";
version = "2.000001";
src = fetchurl {
url = "mirror://cpan/authors/id/I/IL/ILMARI/SQL-Abstract-1.87.tar.gz";
sha256 = "e926a0a83da7efa18e57e5b2952a2ab3b7563a51733fc6dd5c89f12156481c4a";
url = "mirror://cpan/authors/id/M/MS/MSTROUT/SQL-Abstract-2.000001.tar.gz";
sha256 = "sha256-NaZCZiw0lCDUS+bg732HZep0PrEq0UOZqjojK7lObpo=";
};
buildInputs = [ TestDeep TestException TestWarn ];
buildInputs = [ DataDumperConcise TestDeep TestException TestWarn ];
propagatedBuildInputs = [ HashMerge MROCompat Moo ];
meta = {
description = "Generate SQL from Perl data structures";
@ -20216,15 +20216,31 @@ let
SQLAbstractLimit = buildPerlPackage {
pname = "SQL-Abstract-Limit";
version = "0.142";
version = "0.143";
src = fetchurl {
url = "mirror://cpan/authors/id/A/AS/ASB/SQL-Abstract-Limit-0.142.tar.gz";
sha256 = "0y2q7mxngm9m2kvr6isvxra4frb1cjbiplp381p6hhifn7xfz8fl";
url = "mirror://cpan/authors/id/A/AS/ASB/SQL-Abstract-Limit-0.143.tar.gz";
sha256 = "sha256-0Yr9eIk72DC6JGXArmozQlRgFZADhk3tO1rc9RGJyuk=";
};
propagatedBuildInputs = [ DBI SQLAbstract ];
buildInputs = [ TestDeep TestException ];
};
SQLAbstractPg = buildPerlPackage {
pname = "SQL-Abstract-Pg";
version = "1.0";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SR/SRI/SQL-Abstract-Pg-1.0.tar.gz";
sha256 = "sha256-Pic2DfN7jYjzxS2smwNJP5vT7v9sjYj5sIbScRVT9Uc=";
};
buildInputs = [ TestDeep ];
propagatedBuildInputs = [ SQLAbstract ];
meta = {
homepage = "https://github.com/mojolicious/sql-abstract-pg";
description = "PostgreSQL features for SQL::Abstract";
license = lib.licenses.artistic2;
};
};
SQLSplitStatement = buildPerlPackage {
pname = "SQL-SplitStatement";
version = "1.00020";
@ -25880,10 +25896,10 @@ let
YAMLLibYAML = buildPerlPackage {
pname = "YAML-LibYAML";
version = "0.82";
version = "0.83";
src = fetchurl {
url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.82.tar.gz";
sha256 = "0j7yhxkaasccynl5iq1cqpf4x253p4bi5wsq6qbwwv2wjsiwgd02";
url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.83.tar.gz";
sha256 = "sha256-tHF1tP85etdaT3eB09g8CGN9pv8LrjJq87OJ2FS+xJA=";
};
};