Merge staging-next into staging

2022-07-10 06:01:52 +00:00 · 2022-07-10 06:01:52 +00:00 · 4fa8151b9f
commit 4fa8151b9f
parent 12be7ca6e2 e8c24800dc
13 changed files with 85 additions and 31 deletions
--- a/nixos/modules/config/qt5.nix
+++ b/nixos/modules/config/qt5.nix
@ -10,11 +10,13 @@ let
  isQtStyle = cfg.platformTheme == "gtk2" && !(builtins.elem cfg.style ["adwaita" "adwaita-dark"]);
  isQt5ct = cfg.platformTheme == "qt5ct";
  isLxqt = cfg.platformTheme == "lxqt";
+  isKde = cfg.platformTheme == "kde";

  packages = if isQGnome then [ pkgs.qgnomeplatform pkgs.adwaita-qt ]
    else if isQtStyle then [ pkgs.libsForQt5.qtstyleplugins ]
    else if isQt5ct then [ pkgs.libsForQt5.qt5ct ]
    else if isLxqt then [ pkgs.lxqt.lxqt-qtplugin pkgs.lxqt.lxqt-config ]
+    else if isKde then [ pkgs.libsForQt5.plasma-integration pkgs.libsForQt5.systemsettings ]
    else throw "`qt5.platformTheme` ${cfg.platformTheme} and `qt5.style` ${cfg.style} are not compatible.";

 in
@ -33,6 +35,7 @@ in
          "gnome"
          "lxqt"
          "qt5ct"
+          "kde"
        ];
        example = "gnome";
        relatedPackages = [
@ -40,6 +43,7 @@ in
          ["libsForQt5" "qtstyleplugins"]
          ["libsForQt5" "qt5ct"]
          ["lxqt" "lxqt-qtplugin"]
+          ["libsForQt5" "plasma-integration"]
        ];
        description = ''
          Selects the platform theme to use for Qt5 applications.</para>
@ -71,6 +75,10 @@ in
                application.
              </para></listitem>
            </varlistentry>
+            <varlistentry>
+              <term><literal>kde</literal></term>
+              <listitem><para>Use Qt settings from Plasma.</para></listitem>
+            </varlistentry>
          </variablelist>
        '';
      };
@ -119,7 +127,7 @@ in

    environment.variables.QT_QPA_PLATFORMTHEME = cfg.platformTheme;

-    environment.variables.QT_STYLE_OVERRIDE = mkIf (! (isQt5ct || isLxqt)) cfg.style;
+    environment.variables.QT_STYLE_OVERRIDE = mkIf (! (isQt5ct || isLxqt || isKde)) cfg.style;

    environment.systemPackages = packages;

--- a/pkgs/applications/audio/bschaffl/default.nix
+++ b/pkgs/applications/audio/bschaffl/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "bschaffl";
-  version = "1.4.8";
+  version = "1.4.10";

  src = fetchFromGitHub {
    owner = "sjaehn";
    repo = pname;
    rev = version;
-    sha256 = "sha256-zczDqJdUAN2oSyIRt9m3OnwOWXlwL4Yod8UMCXs5zM0=";
+    sha256 = "sha256-zfhPYH4eUNWHV27ZtX2IIvobyPdKs5yGr/ryJRQa6as=";
  };

  nativeBuildInputs = [ pkg-config ];
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@ -20,13 +20,13 @@ with lib.strings;

 let

-  version = "2.40.0";
+  version = "2.41.1";

  src = fetchFromGitHub {
    owner = "grame-cncm";
    repo = "faust";
    rev = version;
-    sha256 = "sha256-IsrLaoMDwrDPxtqCXIy/7tZCdogTUkJ00obSco9SR/A=";
+    sha256 = "sha256-x0nBWyILrNJijs7CIvRrgYG6vgB3UlxLj9i7E4cHr9I=";
    fetchSubmodules = true;
  };

--- a/pkgs/applications/audio/faust/faustlive.nix
+++ b/pkgs/applications/audio/faust/faustlive.nix
@ -5,12 +5,12 @@

 stdenv.mkDerivation rec {
  pname = "faustlive";
-  version = "2.5.10";
+  version = "2.5.11";
  src = fetchFromGitHub {
    owner = "grame-cncm";
    repo = "faustlive";
    rev = version;
-    sha256 = "sha256-yLpIJr6A+NIX9RSGfQXT0O0USuRr0Ni9aUA+mbk31/o=";
+    sha256 = "sha256-ldn6st3/iIABjEfAwodOnPrI97DygWbnYmvMktlOgrk=";
    fetchSubmodules = true;
  };

--- a/pkgs/applications/blockchains/erigon.nix
+++ b/pkgs/applications/blockchains/erigon.nix
@ -2,17 +2,17 @@

 buildGoModule rec {
  pname = "erigon";
-  version = "2022.07.01";
+  version = "2022.07.02";

  src = fetchFromGitHub {
    owner = "ledgerwatch";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-UoK6pPGVeIrubM6vdZBQCE+lgcFthOxZXviyLD86wxg=";
+    sha256 = "sha256-/aT8E60dCk5spj5l5Zw/8FL1LfzXWYi7agiLflLYI5c=";
    fetchSubmodules = true;
  };

-  vendorSha256 = "sha256-lIukjt/QtidijB1KmWQBlSFZqdh1PwhZNP2U73/beiU=";
+  vendorSha256 = "sha256-NBWK0wsUbv4bFbmW3xGaQ7LCgmgfRF5zbc/awm8ZZZY=";
  proxyVendor = true;

  # Build errors in mdbx when format hardening is enabled:
--- a/pkgs/development/python-modules/myst-docutils/default.nix
+++ b/pkgs/development/python-modules/myst-docutils/default.nix
@ -0,0 +1,46 @@
+{ lib
+, buildPythonPackage
+, docutils
+, fetchPypi
+, flit-core
+, jinja2
+, markdown-it-py
+, mdit-py-plugins
+, pythonOlder
+, pyyaml
+, typing-extensions
+}:
+
+buildPythonPackage rec {
+  pname = "myst-docutils";
+  version = "0.17.2";
+  format = "pyproject";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-Of3AVM0OsspcmvRAEXbfu2+V3ju6yqb2sFBexkbmNIU=";
+  };
+
+  nativeBuildInputs = [
+    flit-core
+  ];
+
+  propagatedBuildInputs = [
+    docutils
+    jinja2
+    markdown-it-py
+    mdit-py-plugins
+    pyyaml
+    typing-extensions
+  ];
+
+  pythonImportsCheck = [ "myst_parser" ];
+
+  meta = with lib; {
+    description = "An extended commonmark compliant parser, with bridges to docutils/sphinx.";
+    homepage = "https://github.com/executablebooks/MyST-Parser";
+    license = licenses.mit;
+    maintainers = with maintainers; [ dpausp ];
+    broken = pythonOlder "3.8"; # dependency networkx requires 3.8
+  };
+}
--- a/pkgs/development/tools/bazel-gazelle/default.nix
+++ b/pkgs/development/tools/bazel-gazelle/default.nix
@ -5,13 +5,13 @@

 buildGoModule rec {
  pname = "bazel-gazelle";
-  version = "0.25.0";
+  version = "0.26.0";

  src = fetchFromGitHub {
    owner = "bazelbuild";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-wMhFhJruXHuAq81A4efxvR9eJ5YTp7QTnr1gj8RrIX8=";
+    sha256 = "sha256-f+4XeH282VbasY6ShSNLsesn1OR8wb6kePU808UQWpw=";
  };

  vendorSha256 = null;
--- a/pkgs/development/tools/database/clickhouse-backup/default.nix
+++ b/pkgs/development/tools/database/clickhouse-backup/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "clickhouse-backup";
-  version = "1.4.0";
+  version = "1.4.7";

  src = fetchFromGitHub {
    owner = "AlexAkulov";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-NlOYRgCsReEeP/X98fddVRLnTnkqsiwpCg6MpdRcfZ0=";
+    sha256 = "sha256-1lkG8Rboq6t/hRrdAweo3Kxz9IkukQ39sQSpidFTElw=";
  };

-  vendorSha256 = "sha256-F+FfZESB/m/2m4RnYzFPs0PL5+8lyxzEwAdHMykrFsw=";
+  vendorSha256 = "sha256-N4zAdylb7etNknR0/VjIVkuI6kTWlk137HNT03Y2gWs=";

  postConfigure = ''
    export CGO_ENABLED=0
--- a/pkgs/tools/misc/goreleaser/default.nix
+++ b/pkgs/tools/misc/goreleaser/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "goreleaser";
-  version = "1.10.1";
+  version = "1.10.2";

  src = fetchFromGitHub {
    owner = "goreleaser";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-m42Gu1ExHs29cCTWo8V2q67bXBJ4kyn2ElR9kqVREjU=";
+    sha256 = "sha256-v9/zy7wHqZexaIn3iVDvr3RQNGncnNqqcl88kNDBAfQ=";
  };

-  vendorSha256 = "sha256-/fZbKLmGhB8b33NqLkETtYa664ZEq+KY8GJ4pOZJhLo=";
+  vendorSha256 = "sha256-sJHq2ZSeCpUXhcF5HZQxIE0Jkutnc/m86NcaDNs7a7A=";

  ldflags = [
    "-s"
--- a/pkgs/tools/security/kbs2/default.nix
+++ b/pkgs/tools/security/kbs2/default.nix
@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "kbs2";
-  version = "0.5.1";
+  version = "0.6.0";

  src = fetchFromGitHub {
    owner = "woodruffw";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-GKjumkeo7aAYaECa6NoXCiXU2kqekBX3wCysRz8seW4=";
+    sha256 = "sha256-clbd4xHHGpFIr4s3Jocw4oQ3GbyGWMxZEVgj6JpVK94=";
  };

-  cargoSha256 = "sha256-rJ110kd18V2VGj0AHix3/vI09FG2kJ+TTOYKIthIrjQ=";
+  cargoSha256 = "sha256-gfrC9TOs/Vz3K1gVr6MJ1QAKCE5WOD8VZ/tjOw3Y1uI=";

  nativeBuildInputs = [ installShellFiles ]
    ++ lib.optionals stdenv.isLinux [ python3 ];
@ -30,10 +30,10 @@ rustPlatform.buildRustPackage rec {
  postInstall = ''
    mkdir -p $out/share/kbs2
    cp -r contrib/ $out/share/kbs2
-    for shell in bash fish zsh; do
-      $out/bin/kbs2 --completions $shell > kbs2.$shell
-      installShellCompletion kbs2.$shell
-    done
+    installShellCompletion --cmd kbs2 \
+      --bash <($out/bin/kbs2 --completions bash) \
+      --fish <($out/bin/kbs2 --completions fish) \
+      --zsh <($out/bin/kbs2 --completions zsh)
  '';

  meta = with lib; {
--- a/pkgs/tools/text/difftastic/default.nix
+++ b/pkgs/tools/text/difftastic/default.nix
@ -9,13 +9,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "difftastic";
-  version = "0.29.1";
+  version = "0.30.0";

  src = fetchFromGitHub {
    owner = "wilfred";
    repo = pname;
    rev = version;
-    sha256 = "sha256-eOW+cNIE/H4VtwqbWLGSmS/UAbKMoHFBFcUaLpcPHfw=";
+    sha256 = "sha256-7uVrE+HDEtZsbXI/PSZOAIbAs3spSkcm+1RGrcFxKLM=";
  };

  depsExtraArgs = {
@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
      popd
    '';
  };
-  cargoSha256 = "sha256-/z+jimIDNej1vottvqmG3exd5BpOBUfmx1qaILhLKJU=";
+  cargoSha256 = "sha256-SQSshOJ3+z+jHXSjWv31tsGivE4ESMHW1h58vuacQ3U=";

  passthru.tests.version = testers.testVersion { package = difftastic; };

--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -34467,9 +34467,7 @@ with pkgs;

  faust1 = callPackage ../applications/audio/faust/faust1.nix { };

-  faust2 = callPackage ../applications/audio/faust/faust2.nix {
-    llvm = llvm_10;
-  };
+  faust2 = callPackage ../applications/audio/faust/faust2.nix { };

  faust2alqt = callPackage ../applications/audio/faust/faust2alqt.nix { };

--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -5688,6 +5688,8 @@ in {

  mysql-connector = callPackage ../development/python-modules/mysql-connector { };

+  myst-docutils = callPackage ../development/python-modules/myst-docutils { };
+
  myst-nb = callPackage ../development/python-modules/myst-nb { };

  myst-parser = callPackage ../development/python-modules/myst-parser { };