Merge master into staging-next

vcunat · Jul 26, 2022 · 8aaeccd · 8aaeccd
2 parents 19fd1d7 + 30a1db4
commit 8aaeccd
Show file tree

Hide file tree

Showing 41 changed files with 323 additions and 144 deletions.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -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";

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
@@ -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
  '' +

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

diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
@@ -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"

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
@@ -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 {};

diff --git a/nixos/tests/lighttpd.nix b/nixos/tests/lighttpd.nix
@@ -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}'"
+ '';
+})
diff --git a/pkgs/applications/audio/mopidy/bandcamp.nix b/pkgs/applications/audio/mopidy/bandcamp.nix
@@ -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 ];
+ };
+}
diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
@@ -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 { };

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -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";

diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
@@ -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 = [

diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix
@@ -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 ];

diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix
@@ -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

diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix
@@ -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 ];

diff --git a/pkgs/applications/virtualization/podman-tui/default.nix b/pkgs/applications/virtualization/podman-tui/default.nix
@@ -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";

diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix
@@ -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 = [

diff --git a/pkgs/development/ocaml-modules/metrics/default.nix b/pkgs/development/ocaml-modules/metrics/default.nix
@@ -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 ];

diff --git a/pkgs/development/ocaml-modules/metrics/influx.nix b/pkgs/development/ocaml-modules/metrics/influx.nix
@@ -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";

diff --git a/pkgs/development/ocaml-modules/metrics/lwt.nix b/pkgs/development/ocaml-modules/metrics/lwt.nix
@@ -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";

diff --git a/pkgs/development/ocaml-modules/metrics/mirage.nix b/pkgs/development/ocaml-modules/metrics/mirage.nix
diff --git a/pkgs/development/ocaml-modules/metrics/rusage.nix b/pkgs/development/ocaml-modules/metrics/rusage.nix
@@ -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";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/metrics/unix.nix b/pkgs/development/ocaml-modules/metrics/unix.nix
@@ -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 ];