Merge staging-next into staging

2024-10-20 20:19:39 +03:00 · 2023-05-09 06:01:52 +00:00 · 2023-05-09 06:01:52 +00:00 · b872b6b45c
commit b872b6b45c
parent 5b562cf621 fd245628bc
22 changed files with 620 additions and 466 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -579,6 +579,12 @@
    githubId = 20405311;
    name = "Aksh Gupta";
  };
+  alanpearce = {
+    email = "alan@alanpearce.eu";
+    github = "alanpearce";
+    githubId = 850317;
+    name = "Alan Pearce";
+  };
  alapshin = {
    email = "alapshin@fastmail.com";
    github = "alapshin";
--- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix
+++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
@ -6,10 +6,12 @@ let
  cfg = config.services.prometheus.alertmanager;
  mkConfigFile = pkgs.writeText "alertmanager.yml" (builtins.toJSON cfg.configuration);

-  checkedConfig = file: pkgs.runCommand "checked-config" { buildInputs = [ cfg.package ]; } ''
-    ln -s ${file} $out
-    amtool check-config $out
-  '';
+  checkedConfig = file:
+    if cfg.checkConfig then
+      pkgs.runCommand "checked-config" { buildInputs = [ cfg.package ]; } ''
+        ln -s ${file} $out
+        amtool check-config $out
+      '' else file;

  alertmanagerYml = let
    yml = if cfg.configText != null then
@ -70,6 +72,20 @@ in {
        '';
      };

+      checkConfig = mkOption {
+        type = types.bool;
+        default = true;
+        description = lib.mdDoc ''
+          Check configuration with `amtool check-config`. The call to `amtool` is
+          subject to sandboxing by Nix.
+
+          If you use credentials stored in external files
+          (`environmentFile`, etc),
+          they will not be visible to `amtool`
+          and it will report errors, despite a correct configuration.
+        '';
+      };
+
      logFormat = mkOption {
        type = types.nullOr types.str;
        default = null;
--- a/pkgs/applications/misc/ticker/default.nix
+++ b/pkgs/applications/misc/ticker/default.nix
@ -5,13 +5,13 @@

 buildGoModule rec {
  pname = "ticker";
-  version = "4.5.6";
+  version = "4.5.10";

  src = fetchFromGitHub {
    owner = "achannarasappa";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-h7k/zAYqpCAGn2dW+a3gOF/BN5ywjy/2Yx6THK9zk6k=";
+    hash = "sha256-2CELRY6V7/6PcC5s4XjOqadxXc5SbS0vstqLEej3xnI=";
  };

  vendorHash = "sha256-c7wU9LLRlS9kOhE4yAiKAs/npQe8lvSwPcd+/D8o9rk=";
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@ -3,10 +3,10 @@
 {
  firefox = buildMozillaMach rec {
    pname = "firefox";
-    version = "112.0.2";
+    version = "113.0";
    src = fetchurl {
      url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "2cd7adeb6c9a39ad4c5366982e0e58382d7f205e6f2cee02b8ec2867034d1c0c884eeeb870a35db35cba60fa9c84aea73f8c77cfd9f36b5146dde06464aaabd1";
+      sha512 = "96b0f0774083270f4fcce06085b177ced25ba05da7291d777f1da1d5bbad30721bc6363b76e06ccb64fc092778c8326a426a8bfdfa3cbaafd4f1169b924744a5";
    };

    meta = {
@ -85,11 +85,11 @@

  firefox-esr-102 = buildMozillaMach rec {
    pname = "firefox-esr-102";
-    version = "102.10.0esr";
+    version = "102.11.0esr";
    applicationName = "Mozilla Firefox ESR";
    src = fetchurl {
      url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "f2b53c35bdd22a3de6f32699b832babcbf499667197c02dd50cf0b6cd956e0f4471f420938c2ab72f0a0686ed99fe74e3184afe9b5f7169130879b8f8fd99f0b";
+      sha512 = "fdfed404c87f33001c0ab50f9899fa80c897fac645be8ed832e426f412aafbf1468b1c8301bad463b3f5535b6d6f2005a96a748b6e2d6bf5afbc3b5bc10983d6";
    };

    meta = {
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@ -1,37 +1,40 @@
-{ mkDerivation
-, stdenv
+{ stdenv
 , lib
 , fetchFromGitHub
 , cmake
-, qtquickcontrols
+, wrapQtAppsHook
+, qtbase
 , qtquickcontrols2
 , qtkeychain
 , qtmultimedia
 , qttools
 , libquotient
 , libsecret
+, olm
 }:

-mkDerivation rec {
+stdenv.mkDerivation {
  pname = "quaternion";
-  version = "0.0.95.1";
+  version = "0.0.95.81";

  src = fetchFromGitHub {
    owner = "QMatrixClient";
    repo = "Quaternion";
-    rev = version;
-    sha256 = "sha256-6FLj/hVY13WO7sMgHCHV57eMJu39cwQHXQX7m0lmv4I=";
+    rev = "5f639d8c84ed1475057b2cb3f7d0cb0abe77203b";
+    hash = "sha256-/1fich97oqSSDpfOjaYghYzHfu3MDrh77nanbIN/v/w=";
  };

  buildInputs = [
-    qtmultimedia
-    qtquickcontrols2
-    qtkeychain
    libquotient
    libsecret
+    olm
+    qtbase
+    qtkeychain
+    qtmultimedia
+    qtquickcontrols2
  ];

-  nativeBuildInputs = [ cmake qttools ];
+  nativeBuildInputs = [ cmake qttools wrapQtAppsHook ];

  postInstall =
    if stdenv.isDarwin then ''
--- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
+++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
@ -65,7 +65,7 @@ def _get_values(attribute, text):

    :returns: List of matches.
    """
-    regex = '{}\s+=\s+"(.*)";'.format(re.escape(attribute))
+    regex = fr'{re.escape(attribute)}\s+=\s+"(.*)";'
    regex = re.compile(regex)
    values = regex.findall(text)
    return values
@ -430,7 +430,7 @@ def _update_package(path, target):
    if fetcher == 'fetchFromGitHub':
        # in the case of fetchFromGitHub, it's common to see `rev = version;` or `rev = "v${version}";`
        # in which no string value is meant to be substituted. However, we can just overwrite the previous value.
-        regex = '(rev\s+=\s+[^;]*;)'
+        regex = r'(rev\s+=\s+[^;]*;)'
        regex = re.compile(regex)
        matches = regex.findall(text)
        n = len(matches)
@ -519,7 +519,7 @@ environment variables:

    if len(packages) > 1:
        global BULK_UPDATE
-        BULK_UPDATE = true
+        BULK_UPDATE = True

    logging.info("Updating packages...")

--- a/pkgs/development/libraries/libquotient/default.nix
+++ b/pkgs/development/libraries/libquotient/default.nix
@ -1,17 +1,17 @@
-{ mkDerivation, lib, fetchFromGitHub, cmake, olm, openssl, qtmultimedia, qtkeychain }:
+{ stdenv, lib, fetchFromGitHub, cmake, olm, openssl, qtbase, qtmultimedia, qtkeychain }:

-mkDerivation rec {
+stdenv.mkDerivation rec {
  pname = "libquotient";
-  version = "0.7.1";
+  version = "0.7.2";

  src = fetchFromGitHub {
    owner = "quotient-im";
    repo = "libQuotient";
    rev = version;
-    hash = "sha256-3xnv1dcyeX3Kl5EH2Tlf6nXobLG1zXsFmYstnvmSAXA=";
+    hash = "sha256-Lq404O2VjZ8vlXOW+rhsvWDvZsNd3APNbv6AadQCjhk=";
  };

-  buildInputs = [ olm openssl qtmultimedia qtkeychain ];
+  buildInputs = [ olm openssl qtbase qtmultimedia qtkeychain ];

  nativeBuildInputs = [ cmake ];

@ -26,6 +26,8 @@ mkDerivation rec {
      --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
  '';

+  dontWrapQtApps = true;
+
  meta = with lib; {
    description = "A Qt5/Qt6 library to write cross-platform clients for Matrix";
    homepage = "https://matrix.org/docs/projects/sdk/quotient";
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@ -149,7 +149,9 @@ let

      qt3d = callPackage ../modules/qt3d.nix {};
      qtcharts = callPackage ../modules/qtcharts.nix {};
-      qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
+      qtconnectivity = callPackage ../modules/qtconnectivity.nix {
+        inherit (darwin.apple_sdk_11_0.frameworks) IOBluetooth;
+      };
      qtdatavis3d = callPackage ../modules/qtdatavis3d.nix {};
      qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
      qtdoc = callPackage ../modules/qtdoc.nix {};
--- a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix
@ -1,8 +1,9 @@
-{ qtModule, lib, stdenv, qtbase, qtdeclarative, bluez }:
+{ qtModule, lib, stdenv, qtbase, qtdeclarative, bluez, IOBluetooth }:

 qtModule {
  pname = "qtconnectivity";
  qtInputs = [ qtbase qtdeclarative ];
  buildInputs = lib.optional stdenv.isLinux bluez;
+  propagatedBuildInputs = lib.optionals stdenv.isDarwin [ IOBluetooth ];
  outputs = [ "out" "dev" "bin" ];
 }
--- a/pkgs/development/libraries/qtkeychain/default.nix
+++ b/pkgs/development/libraries/qtkeychain/default.nix
@ -1,11 +1,18 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qtbase, qttools
-, CoreFoundation, Security
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, qtbase
+, qttools
+, CoreFoundation
+, Security
 , libsecret
 }:

 stdenv.mkDerivation rec {
  pname = "qtkeychain";
-  version = "0.12.0";            # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/`
+  version = "0.12.0";

  src = fetchFromGitHub {
    owner = "frankosterfeld";
@ -18,7 +25,10 @@ stdenv.mkDerivation rec {

  patches = [ ./0002-Fix-install-name-Darwin.patch ];

-  cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ];
+  cmakeFlags = [
+    "-DBUILD_WITH_QT6=${if lib.versions.major qtbase.version == "6" then "ON" else "OFF"}"
+    "-DQT_TRANSLATIONS_DIR=share/qt/translations"
+  ];

  nativeBuildInputs = [ cmake ]
    ++ lib.optionals (!stdenv.isDarwin) [ pkg-config ] # for finding libsecret
@ -27,9 +37,22 @@ stdenv.mkDerivation rec {
  buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ]
    ++ [ qtbase qttools ]
    ++ lib.optionals stdenv.isDarwin [
-      CoreFoundation Security
-    ]
-  ;
+    CoreFoundation
+    Security
+  ];
+
+  doInstallCheck = true;
+
+  # we previously had a note in here saying to run this check manually, so we might as
+  # well do it automatically. It seems like a perfectly valid sanity check, but I
+  # have no idea *why* we might need it
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    grep --quiet -R 'set(PACKAGE_VERSION "${version}"' .
+
+    runHook postInstallCheck
+  '';

  meta = {
    description = "Platform-independent Qt API for storing passwords securely";
--- a/pkgs/development/python-modules/afdko/default.nix
+++ b/pkgs/development/python-modules/afdko/default.nix
@ -107,6 +107,7 @@ buildPythonPackage rec {
    # https://github.com/adobe-type-tools/afdko/issues/1425
    "test_spec"
  ] ++ lib.optionals (stdenv.hostPlatform.isi686) [
+    "test_dump_option"
    "test_type1mm_inputs"
  ];

--- a/pkgs/development/python-modules/m3u8/default.nix
+++ b/pkgs/development/python-modules/m3u8/default.nix
@ -1,32 +1,40 @@
-{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, requests, iso8601, bottle, pytestCheckHook }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, iso8601
+, bottle
+, pytestCheckHook
+}:

 buildPythonPackage rec {
  pname = "m3u8";
-  version = "0.9.0";
+  version = "3.4.0";

  src = fetchFromGitHub {
    owner = "globocom";
    repo = pname;
    rev = version;
-    hash = "sha256-EfHhmV2otEgEy2OVohS+DF7dk97GFdWZ4cFCERZBmlA=";
+    hash = "sha256-jfCmvAb7bF6nYFNUPXVG61x0RiO4vcyR+x7WzgPRLxI=";
  };

-  patches = [
-    # Fix hardcoded /tmp dir (fix build on Hydra)
-    (fetchpatch {
-      url = "https://github.com/globocom/m3u8/commit/cf7ae5fda4681efcea796cd7c51c02f152c36009.patch";
-      hash = "sha256-SEETpIJQddid8D//6DVrSGs/BqDeMOzufE0bBrm+/xY=";
-    })
+  propagatedBuildInputs = [
+    iso8601
  ];

-  propagatedBuildInputs = [ requests iso8601 ];
+  nativeCheckInputs = [
+    bottle
+    pytestCheckHook
+  ];

-  nativeCheckInputs = [ bottle pytestCheckHook ];
+  disabledTests = [
+    # Tests require network access
+    "test_load_should_create_object_from_uri"
+    "test_load_should_create_object_from_uri_with_relative_segments"
+    "test_load_should_remember_redirect"
+  ];

-  pytestFlagsArray = [
-    "tests/test_parser.py"
-    "tests/test_model.py"
-    "tests/test_variant_m3u8.py"
+  pythonImportsCheck = [
+    "m3u8"
  ];

  meta = with lib; {
@ -36,4 +44,3 @@ buildPythonPackage rec {
    maintainers = with maintainers; [ Scriptkiddi ];
  };
 }
-
--- a/pkgs/development/python-modules/mobly/default.nix
+++ b/pkgs/development/python-modules/mobly/default.nix
@ -17,14 +17,14 @@

 buildPythonPackage rec {
  pname = "mobly";
-  version = "1.12.1";
+  version = "1.12.2";
  format = "setuptools";

  src = fetchFromGitHub {
    owner = "google";
    repo = "mobly";
    rev = "refs/tags/${version}";
-    hash = "sha256-8ZcjxxAv+x8vTsgVKLFb55M02gElkZcZo/nrLwG7k6k=";
+    hash = "sha256-leUOC8AQwbuPNphDg4bIFWW+9tTnYvM3/ejHgZDMR44=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/tlds/default.nix
+++ b/pkgs/development/python-modules/tlds/default.nix
@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+}:
+
+buildPythonPackage rec {
+  pname = "tlds";
+  version = "2023050800";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "mweinelt";
+    repo = "python-tlds";
+    rev = "refs/tags/${version}";
+    hash = "sha256-uXYRkalJGJ2o8ptvKCkMBc/U+9DpgPGxINM8w21ZIKM=";
+  };
+
+  pythonImportsCheck = [
+    "tlds"
+  ];
+
+  # no tests
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Automatically updated list of valid TLDs taken directly from IANA";
+    homepage = "https://github.com/mweinelt/tlds";
+    license = licenses.mit;
+    maintainers = with maintainers; [ hexa ];
+  };
+}
--- a/pkgs/servers/search/qdrant/Cargo.lock
+++ b/pkgs/servers/search/qdrant/Cargo.lock
@ -426,7 +426,7 @@ checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"

 [[package]]
 name = "api"
-version = "1.1.1"
+version = "1.1.3"
 dependencies = [
 "chrono",
 "env_logger",
@ -1758,9 +1758,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"

 [[package]]
 name = "h2"
-version = "0.3.15"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4"
+checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f"
 dependencies = [
 "bytes",
 "fnv",
@ -2981,7 +2981,7 @@ dependencies = [

 [[package]]
 name = "qdrant"
-version = "1.1.1"
+version = "1.1.3"
 dependencies = [
 "actix-cors",
 "actix-files",
--- a/pkgs/servers/search/qdrant/default.nix
+++ b/pkgs/servers/search/qdrant/default.nix
@ -5,18 +5,19 @@
 , stdenv
 , pkg-config
 , openssl
+, nix-update-script
 , Security
 }:

 rustPlatform.buildRustPackage rec {
  pname = "qdrant";
-  version = "1.1.1";
+  version = "1.1.3";

  src = fetchFromGitHub {
    owner = "qdrant";
    repo = "qdrant";
    rev = "refs/tags/v${version}";
-    sha256 = "sha256-Kjao5TjVT8QVV2tKt7TTt9cYmYXRl/oPLi8UK1tc/nA=";
+    sha256 = "sha256-CGGJLyhhwQvW9AIzA7Fg85CvPbnuyELR+mmhoc4hJtk=";
  };

  cargoLock = {
@ -42,6 +43,10 @@ rustPlatform.buildRustPackage rec {

  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation";

+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
  meta = with lib; {
    description = "Vector Search Engine for the next generation of AI applications";
    longDescription = ''
--- a/pkgs/tools/networking/hblock/default.nix
+++ b/pkgs/tools/networking/hblock/default.nix
@ -0,0 +1,39 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, makeWrapper
+, coreutils
+, gawk
+, curl
+, gnugrep
+}:
+
+stdenv.mkDerivation rec {
+  pname = "hblock";
+  version = "3.4.1";
+
+  src = fetchFromGitHub {
+    owner = "hectorm";
+    repo = "hblock";
+    rev = "v${version}";
+    hash = "sha256-yOX/CsWs5HVH9s0KCzZm6PPqlDJHxz46jJB6KKC7Hsg=";
+  };
+
+  buildInputs = [ coreutils curl gnugrep gawk ];
+  nativeBuildInputs = [ makeWrapper ];
+
+  installFlags = [
+    "prefix=$(out)"
+  ];
+  postInstall = ''
+    wrapProgram "$out/bin/hblock" \
+      --prefix PATH : ${lib.makeBinPath [ coreutils curl gnugrep gawk ]}
+  '';
+
+  meta = with lib; {
+    description = "Improve your security and privacy by blocking ads, tracking and malware domains";
+    homepage = "https://github.com/hectorm/hblock";
+    license = licenses.mit;
+    maintainers = with maintainers; [ alanpearce ];
+  };
+}
--- a/pkgs/tools/package-management/harmonia/default.nix
+++ b/pkgs/tools/package-management/harmonia/default.nix
@ -10,16 +10,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "harmonia";
-  version = "0.6.2";
+  version = "0.6.3";

  src = fetchFromGitHub {
    owner = "nix-community";
    repo = pname;
    rev = "refs/tags/${pname}-v${version}";
-    hash = "sha256-mMwKth54SCy7Acuhf4D04XP070Zf1mzCR+s7cvpsnQE=";
+    hash = "sha256-erBmPXMyIYxRLbYG35vH67MypJoXomUEFOVu6IhmEWs=";
  };

-  cargoHash = "sha256-XwfSTaw98xB6bRFIBS4FmLp7aoEGKAbKzbWS32l5C9Y=";
+  cargoHash = "sha256-Gq7U+Uy3psuPVY0wGM90KA5u5Wc2s4hVJma7B11Ag5g=";

  nativeBuildInputs = [
    pkg-config nix
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -1567,6 +1567,8 @@ with pkgs;

  fwbuilder = libsForQt5.callPackage ../tools/security/fwbuilder { };

+  hblock = callPackage ../tools/networking/hblock { };
+
  headsetcontrol = callPackage ../tools/audio/headsetcontrol { };

  headset-charge-indicator = callPackage ../tools/audio/headset-charge-indicator { };
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -11955,6 +11955,8 @@ self: super: with self; {

  tld = callPackage ../development/python-modules/tld { };

+  tlds = callPackage ../development/python-modules/tlds { };
+
  tldextract = callPackage ../development/python-modules/tldextract { };

  tlsh = callPackage ../development/python-modules/tlsh { };
--- a/pkgs/top-level/qt6-packages.nix
+++ b/pkgs/top-level/qt6-packages.nix
@ -31,6 +31,10 @@ in

  inherit (kdeFrameworks) kcoreaddons;

+  qtkeychain = callPackage ../development/libraries/qtkeychain {
+    inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security;
+  };
+
  qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { };

  quazip = callPackage ../development/libraries/quazip { };