Merge master into staging-next

pkgs/applications/emulators/yuzu/sources.nix

@@ -1,19 +1,19 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2023-08-14
+# Last updated: 2023-08-27
 {
   compatList = {
-    rev = "fbecbb568ce45c2d118a76ff41f9e817a8b899e6";
+    rev = "f440391993fe499c79d647ed0a20d117c0db0c27";
     hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1";
   };
 
   mainline = {
-    version = "1522";
-    hash = "sha256:15ka5lg9mdfgwngmsjm3dk74c64hxak2zkf36jdgqcjlwxdx81qk";
+    version = "1538";
+    hash = "sha256:1wynpcx6gwdbahf7nm22jslk9hbcy17nxbr6qnzagndrws30csx5";
   };
 
   ea = {
-    version = "3805";
-    distHash = "sha256:1hxq4aifnncilnxmymgbz73m558y8v5f72cpgdfaqr450vlc5sks";
-    fullHash = "sha256:1psivknzv1kycpnl81g0b9d9ck70lxddkn1gaimic37a7kxpg395";
+    version = "3838";
+    distHash = "sha256:0riwahdlhi4a96ya4pi7g0anwa35z8zhbax87m2mk89vwrjnf2am";
+    fullHash = "sha256:1a1cq4dg624y3ixgc05ihlhy1fnpp98xnc60cssrdmmzyp79hrjp";
   };
 }

pkgs/applications/misc/bottles/default.nix

@@ -28,13 +28,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "bottles-unwrapped";
-  version = "51.6";
+  version = "51.9";
 
   src = fetchFromGitHub {
     owner = "bottlesdevs";
     repo = "bottles";
     rev = version;
-    sha256 = "sha256-9oEC+ksgHz2HP4jVwTbLzjqc8WG1+S8hmVgl2dcuPB0=";
+    sha256 = "sha256-iZUszwVcbVn6Xsqou6crSp9gJBRmm5vEqxS87h/s3PQ=";
   };
 
   patches = [

pkgs/applications/networking/browsers/brave/default.nix

@@ -91,11 +91,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "brave";
-  version = "1.57.47";
+  version = "1.57.53";
 
   src = fetchurl {
     url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-    sha256 = "sha256-u2xC+Q6tcg989S0zM2flRRiCu7kLSv1/y3N2EvFxiwM=";
+    sha256 = "sha256-vySznLCjEqol3FOZHvDpY9LY1UG2ExOu/shu8suKuoM=";
   };
 
   dontConfigure = true;

pkgs/applications/networking/cluster/ssm-agent/default.nix

@@ -3,7 +3,6 @@
 , buildGoPackage
 , makeWrapper
 , fetchFromGitHub
-, fetchpatch
 , coreutils
 , nettools
 , dmidecode
@@ -28,7 +27,7 @@ let
 in
 buildGoPackage rec {
   pname = "amazon-ssm-agent";
-  version = "3.0.755.0";
+  version = "3.2.1297.0";
 
   goPackagePath = "github.com/aws/${pname}";
 
@@ -38,7 +37,7 @@ buildGoPackage rec {
     rev = version;
     owner = "aws";
     repo = "amazon-ssm-agent";
-    hash = "sha256-yVQJL1MJ1JlAndlrXfEbNLQihlbLhSoQXTKzJMRzhao=";
+    hash = "sha256-zRs7RsShZPH3hb5MsADUNrTfHbJVwCELE9mCqEWaTng=";
   };
 
   patches = [
@@ -48,16 +47,25 @@ buildGoPackage rec {
     # They used constants from another package that I couldn't figure
     # out how to resolve, so hardcoded the constants.
     ./0002-version-gen-don-t-use-unnecessary-constants.patch
+  ];
 
-    (fetchpatch {
-      name = "CVE-2022-29527.patch";
-      url = "https://github.com/aws/amazon-ssm-agent/commit/0fe8ae99b2ff25649c7b86d3bc05fc037400aca7.patch";
-      sha256 = "sha256-5g14CxhsHLIgs1Vkfw8FCKEJ4AebNqZKf3ZzoAN/T9U=";
-    })
+  # See the list https://github.com/aws/amazon-ssm-agent/blob/3.2.1297.0/makefile#L120-L138
+  # The updater is not built because it cannot work on NixOS
+  subPackages = [
+    "core"
+    "agent"
+    "agent/cli-main"
+    "agent/framework/processor/executer/outofproc/worker"
+    "agent/session/logging"
+    "agent/framework/processor/executer/outofproc/sessionworker"
+  ];
+
+  ldflags = [
+    "-s"
+    "-w"
   ];
 
   preConfigure = ''
-    rm -r ./Tools/src/goreportcard
     printf "#!/bin/sh\ntrue" > ./Tools/src/checkstyle.sh
 
     substituteInPlace agent/platform/platform_unix.go \
@@ -78,8 +86,6 @@ buildGoPackage rec {
   '';
 
   preBuild = ''
-    cp -r go/src/${goPackagePath}/vendor/src go
-
     pushd go/src/${goPackagePath}
 
     # Note: if this step fails, please patch the code to fix it! Please only skip
@@ -95,8 +101,6 @@ buildGoPackage rec {
   postBuild = ''
     pushd go/bin
 
-    rm integration-cli versiongenerator generator
-
     mv core amazon-ssm-agent
     mv agent ssm-agent-worker
     mv cli-main ssm-cli

pkgs/applications/networking/instant-messengers/webex/default.nix

@@ -56,11 +56,11 @@
 
 stdenv.mkDerivation rec {
   pname = "webex";
-  version = "43.5.0.26155";
+  version = "43.8.0.26955";
 
   src = fetchurl {
-    url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20230508235734/Webex_ubuntu.7z";
-    sha256 = "94ddd66be3a44eeb6f854d0e02feec2e010d494ff9fcc81663f30fca37da4774";
+    url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20230814223338/Webex_ubuntu.7z";
+    sha256 = "6c754d65fffbcbbb2ca303e1f8c1e5688da190eea3d3b67c77361abc6e2bb85b";
   };
 
   nativeBuildInputs = [

pkgs/data/fonts/hack/default.nix

@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    install -Dm644 *.ttf -t $out/share/fonts/hack
+    install -Dm644 *.ttf -t $out/share/fonts/truetype
 
     runHook postInstall
   '';

pkgs/desktops/plasma-5/plasma-desktop/default.nix

@@ -127,6 +127,7 @@ mkDerivation {
     ./hwclock-path.patch
     ./tzdir.patch
     ./kcm-access.patch
+    ./no-discover-shortcut.patch
   ];
   CXXFLAGS =
     [

pkgs/desktops/plasma-5/plasma-desktop/no-discover-shortcut.patch

@@ -0,0 +1,13 @@
+diff --git a/applets/taskmanager/package/contents/config/main.xml b/applets/taskmanager/package/contents/config/main.xml
+index 6bb27695d..25e621810 100644
+--- a/applets/taskmanager/package/contents/config/main.xml
++++ b/applets/taskmanager/package/contents/config/main.xml
+@@ -85,7 +85,7 @@
+     </entry>
+     <entry name="launchers" type="StringList">
+       <label>The list of launcher tasks on the widget. Usually .desktop file or executable URLs. Special URLs such as preferred://browser that expand to default applications are supported.</label>
+-      <default>applications:systemsettings.desktop,applications:org.kde.discover.desktop,preferred://filemanager,preferred://browser</default>
++      <default>applications:systemsettings.desktop,preferred://filemanager,preferred://browser</default>
+     </entry>
+     <entry name="middleClickAction" type="Enum">
+       <label>What to do on middle-mouse click on a task button.</label>

pkgs/development/libraries/science/math/or-tools/default.nix

@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [
     abseil-cpp
     protobuf
-    python.pkgs.protobuf
+    (python.pkgs.protobuf.override { protobuf = protobuf; })
     python.pkgs.numpy
   ];
   nativeCheckInputs = [

pkgs/development/ocaml-modules/bwd/default.nix

@@ -2,7 +2,7 @@
 
 buildDunePackage rec {
   pname = "bwd";
-  version = "2.1.0";
+  version = "2.2.0";
 
   minimalOCamlVersion = "4.12";
   duneVersion = "3";
@@ -11,7 +11,7 @@ buildDunePackage rec {
     owner = "RedPRL";
     repo = "ocaml-bwd";
     rev = version;
-    hash = "sha256-ucXOBjD1behL2h8CZv64xtRjCPkajZic7G1oxxDmEXY=";
+    hash = "sha256-4DttkEPI9yJtMsqzTNSnoDajcvMQPIiJAHk0kJl540Y=";
   };
 
   doCheck = true;
@@ -19,7 +19,8 @@ buildDunePackage rec {
 
   meta = {
     description = "Backward Lists";
-    inherit (src.meta) homepage;
+    homepage = "https://github.com/RedPRL/ocaml-bwd";
+    changelog = "https://github.com/RedPRL/ocaml-bwd/blob/${version}/CHANGELOG.markdown";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.vbgl ];
   };

pkgs/development/ocaml-modules/zed/default.nix

@@ -5,8 +5,8 @@ let
     if lib.versionAtLeast ocaml.version "4.08"
     then
       {
-        version = "3.2.0";
-        sha256 = "sha256-6yKHE30nVFXo8hGdCx+GO4VYYGbi802aMdN2XuYMJ7w=";
+        version = "3.2.3";
+        sha256 = "sha256-lbhqjZxeUqHdd+yahRO+B6L2mc+h+4T2+qKVgWC2HY8=";
         propagatedBuildInputs = [ react result uchar uutf uucp uuseg ];
       }
     else
@@ -40,7 +40,8 @@ buildDunePackage rec {
 
     To support efficient text edition capabilities, Zed provides macro recording and cursor management facilities.
     '';
-    inherit (src.meta) homepage;
+    homepage = "https://github.com/ocaml-community/zed";
+    changelog = "https://github.com/ocaml-community/zed/blob/${version}/CHANGES.md";
     license = lib.licenses.bsd3;
     maintainers = [
       lib.maintainers.gal_bolle

pkgs/development/python-modules/anthropic/default.nix

@@ -1,7 +1,6 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, fetchpatch
 , poetry-core
 , anyio
 , distro
@@ -17,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "anthropic";
-  version = "0.3.8";
+  version = "0.3.10";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -26,17 +25,9 @@ buildPythonPackage rec {
     owner = "anthropics";
     repo = "anthropic-sdk-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-rNLKIZKX9AI0IKGicozllh+XGU4Ll91EfRaAfJYJtJE=";
+    hash = "sha256-OmT8a588eprCTUnnhLF5+XSOtetiUMouaWz1hrTl1ao=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "support-pytest-asyncio-0.21.0.patch";
-      url = "https://github.com/anthropics/anthropic-sdk-python/commit/1e199aa9b38970c5b5b4492907494ac653a7f756.patch";
-      hash = "sha256-f9KldnvXuRKVgT7Xb/xdhInKOeXvi4g5OxVRD0PMhgQ=";
-    })
-  ];
-
   nativeBuildInputs = [
     poetry-core
   ];
@@ -70,6 +61,5 @@ buildPythonPackage rec {
     changelog = "https://github.com/anthropics/anthropic-sdk-python/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ natsukium ];
-    broken = lib.versionAtLeast pydantic.version "2";
   };
 }

pkgs/development/python-modules/appthreat-vulnerability-db/default.nix

@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "appthreat-vulnerability-db";
-  version = "5.2.1";
+  version = "5.2.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "AppThreat";
     repo = "vulnerability-db";
     rev = "refs/tags/v${version}";
-    hash = "sha256-FSi9fMp9SLnoIVo+Clca6oglroeIb6RbohiSSc6fqxo=";
+    hash = "sha256-HIUBHyuh66PjHRPTFKIq859+tSYnaseQE9GOMduxBP4=";
   };
 
   postPatch = ''

pkgs/development/python-modules/globus-sdk/default.nix

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "globus-sdk";
-  version = "3.26.0";
+  version = "3.27.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "globus";
     repo = "globus-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-L3YwBFpeGDPIixjvU7OLf8kpeYkqcSmLqMzGcSjtMtE=";
+    hash = "sha256-ZgRYwx/vICs1ombD8LGvCr0Wf9TpQurDGBoC2mtbxRs=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/jellyfish/default.nix

@@ -1,10 +1,12 @@
 { lib
+, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
 , pytest
 , unicodecsv
 , rustPlatform
+, libiconv
 }:
 
 buildPythonPackage rec {
@@ -25,6 +27,10 @@ buildPythonPackage rec {
     cargoSetupHook
   ];
 
+  buildInputs = lib.optionals stdenv.isDarwin [
+    libiconv
+  ];
+
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}-rust-dependencies";

pkgs/development/python-modules/pallets-sphinx-themes/default.nix

@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pallets-sphinx-themes";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "pallets";
     repo = "pallets-sphinx-themes";
     rev = "refs/tags/${version}";
-    sha256 = "sha256-u1sHeO0fk11+M5M0yqDcWsMJKBMeAGW+GPOgu1oniok=";
+    sha256 = "sha256-Z03rsqkwF2rYaqRZflf5qc5EdHPIEcEcB1ftYIm5DQs=";
   };
 
   propagatedBuildInputs = [ packaging sphinx ];

pkgs/development/python-modules/plaid-python/default.nix

@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "plaid-python";
-  version = "15.4.0";
+  version = "15.5.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-IO+IIMMJHrpVTS/L/cwwK2UYrYZDDQ0F/AxKITms9+0=";
+    hash = "sha256-zI3fOd1IcnXS5moM3mHl/1qzrAHnxoVrFg1GBCqiA10=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/pyTelegramBotAPI/default.nix

@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pytelegrambotapi";
-  version = "4.12.0";
+  version = "4.13.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "eternnoir";
     repo = "pyTelegramBotAPI";
     rev = "refs/tags/${version}";
-    hash = "sha256-cW9IQy4D2iaoQ6oHQ07f27YQR7q9DBv2JkoukUtPBRQ=";
+    hash = "sha256-5P0DfQL8lwCY4nvp5efB7fO7YyBMTRaB4qflkc+Arso=";
   };
 
   passthru.optional-dependencies = {

pkgs/development/python-modules/pywbem/default.nix

@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "pywbem";
-  version = "1.6.1";
+  version = "1.6.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-q9vWzgi2xZfN1sdzDmtJqELZE/L2s8xitYXFjsPueUU=";
+    hash = "sha256-JugXm8F+MXa0zVdrn1p3MPhI1RvgUTdo/X8x/ZsnCpY=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/recipe-scrapers/default.nix

@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "recipe-scrapers";
-  version = "14.36.1";
+  version = "14.43.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "hhursev";
     repo = "recipe-scrapers";
     rev = "refs/tags/${version}";
-    hash = "sha256-JadtlJMxRib8FpNC4QGYXfUEJGyB1aniDbsbsBYU3no=";
+    hash = "sha256-ik/ADmu6yGY7xWXCAn0kcWJphANIIwM8QKWjm9xoVYQ=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/teslajsonpy/default.nix

@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "teslajsonpy";
-  version = "3.9.2";
+  version = "3.9.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "zabuldon";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-K68UhtPtgTZoAl9NG5ZHOwzsvDl028coXS4ZpmJ0ULs=";
+    hash = "sha256-kA2MFYryz61Mm/sPfH1NuLKnz4whtdNb6hGPYQZgQKQ=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/ytmusicapi/default.nix

@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pythonOlder
 , requests
 , setuptools
@@ -9,14 +9,16 @@
 
 buildPythonPackage rec {
   pname = "ytmusicapi";
-  version = "1.1.1";
+  version = "1.2.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-UCWNub0FErdmF3kGSIJlpIcKdPZdPzJ5y8yx9ZPBUlw=";
+  src = fetchFromGitHub {
+    owner = "sigma67";
+    repo = "ytmusicapi";
+    rev = "refs/tags/${version}";
+    hash = "sha256-YgV3kCvCOLNXb3cWBVXRuzH4guuvPpXVojOnSnrXj20=";
   };
 
   nativeBuildInputs = [
@@ -24,6 +26,8 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
   propagatedBuildInputs = [
     requests
   ];

pkgs/development/python-modules/zephyr-python-api/default.nix

@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+, setuptools
+}:
+
+buildPythonPackage rec {
+  pname = "zephyr-python-api";
+  version = "0.0.3";
+  format = "pyproject";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-M9Kf0RtoSeDFAAgAuks+Ek+Wg5OM8qmd3eDoaAgAa3A=";
+  };
+
+  nativeBuildInputs = [ setuptools ];
+
+  propagatedBuildInputs = [
+    requests
+  ];
+
+  # No tests in archive
+  doCheck = false;
+
+  pythonImportsCheck = [ "zephyr" ];
+
+  meta = {
+    homepage = "https://github.com/nassauwinter/zephyr-python-api";
+    description = "A set of wrappers for Zephyr Scale (TM4J) REST API";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ rapiteanu ];
+  };
+}

pkgs/development/tools/analysis/kcov/default.nix

@@ -17,13 +17,13 @@ let
   self =
     stdenv.mkDerivation rec {
       pname = "kcov";
-      version = "41";
+      version = "42";
 
       src = fetchFromGitHub {
         owner = "SimonKagstrom";
         repo = "kcov";
         rev = "v${version}";
-        sha256 = "sha256-Kit4Yn5Qeg3uAc6+RxwlVEhDKN6at+Uc7V38yhDPrAY=";
+        sha256 = "sha256-8/182RjuNuyFzSyCgyyximGaveDyhStwIQg29S5U/pI=";
       };
 
       preConfigure = "patchShebangs src/bin-to-c-source.py";

pkgs/development/tools/misc/grpc-tools/default.nix

@@ -2,17 +2,18 @@
 , stdenv
 , cmake
 , fetchFromGitHub
+, gitUpdater
 }:
 
 stdenv.mkDerivation rec {
   pname = "grpc-tools";
-  version = "1.11.2";
+  version = "1.12.4";
 
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc-node";
     rev = "grpc-tools@${version}";
-    sha256 = "00432y19pjcimwachjcqpzra21vzmlqchhhlqxnk98bfh25kxdcb";
+    hash = "sha256-708lBIGW5+vvSTrZHl/kc+ck7JKNXElrghIGDrMSyx8=";
     fetchSubmodules = true;
   };
 
@@ -25,6 +26,11 @@ stdenv.mkDerivation rec {
     install -Dm755 -t $out/bin deps/protobuf/protoc
   '';
 
+  passthru.updateScript = gitUpdater {
+    url = "https://github.com/grpc/grpc-node.git";
+    rev-prefix = "grpc-tools@";
+  };
+
   meta = with lib; {
     description = "Distribution of protoc and the gRPC Node protoc plugin for ease of installation with npm";
     longDescription = ''

pkgs/development/tools/vultr-cli/default.nix

@@ -2,20 +2,23 @@
 
 buildGoModule rec {
   pname = "vultr-cli";
-  version = "2.17.0";
+  version = "2.18.2";
 
   src = fetchFromGitHub {
     owner = "vultr";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-z5G7oXthz1oP9h6IwKZrkG0waBurBpbOALGdcAuThnc=";
+    hash = "sha256-RW8t5s28eUxHKEz+UHdeHlRMYprKlA9AdtiEy661des=";
   };
 
-  vendorHash = "sha256-c5FzeqC+uEnVT3TxXHzI4FFIdJvKQ2tgGQAwd1DE5eM=";
+  vendorHash = "sha256-61hdhkFyp4an9KtqDzB4Sd2+t40QEoLgq7MvUBxEQKs=";
+
+  ldflags = [ "-s" "-w" ];
 
   meta = with lib; {
     description = "Official command line tool for Vultr services";
     homepage = "https://github.com/vultr/vultr-cli";
+    changelog = "https://github.com/vultr/vultr-cli/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = with maintainers; [ Br1ght0ne ];
   };

pkgs/games/grapejuice/default.nix

@@ -15,17 +15,18 @@
 , wine
 , glxinfo
 , xrandr
+, bash
 }:
 
 python3Packages.buildPythonApplication rec  {
   pname = "grapejuice";
-  version = "7.8.3";
+  version = "7.14.4";
 
   src = fetchFromGitLab {
     owner = "BrinkerVII";
     repo = "grapejuice";
     rev = "v${version}";
-    sha256 = "sha256-jNh3L6JDuJryFpHQaP8UesBmepmJopoHxb/XUfOwZz4=";
+    hash = "sha256-CWTnofJXx9T/hGXx3rdephXHjpiVRdFEJQ1u2v6n7yo=";
   };
 
   nativeBuildInputs = [
@@ -39,6 +40,7 @@ python3Packages.buildPythonApplication rec  {
     cairo
     gettext
     gtk3
+    bash
   ];
 
   propagatedBuildInputs = with python3Packages; [
@@ -57,7 +59,6 @@ python3Packages.buildPythonApplication rec  {
   dontWrapGApps = true;
 
   makeWrapperArgs = [
-    "\${gappsWrapperArgs[@]}"
     "--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs wine winetricks pciutils glxinfo xrandr ]}"
     # make xdg-open overrideable at runtime
     "--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}"
@@ -77,7 +78,7 @@ python3Packages.buildPythonApplication rec  {
       --replace \$GRAPEJUICE_EXECUTABLE "$out/bin/grapejuice" \
       --replace \$PLAYER_ICON "grapejuice-roblox-player"
 
-    substituteInPlace src/grapejuice_common/assets/desktop/roblox-studio.desktop \
+    substituteInPlace src/grapejuice_common/assets/desktop/roblox-studio.desktop src/grapejuice_common/assets/desktop/roblox-studio-auth.desktop \
       --replace \$GRAPEJUICE_EXECUTABLE "$out/bin/grapejuice" \
       --replace \$STUDIO_ICON "grapejuice-roblox-studio"
 
@@ -86,29 +87,38 @@ python3Packages.buildPythonApplication rec  {
 
     substituteInPlace src/grapejuice_common/models/settings_model.py \
       --replace 'default_wine_home: Optional[str] = ""' 'default_wine_home: Optional[str] = "${wine}"'
+
+    substituteInPlace src/grapejuice_packaging/builders/linux_package_builder.py \
+      --replace '"--no-dependencies",' '"--no-dependencies", "--no-build-isolation",'
+
+    substituteInPlace src/grapejuice_packaging/packaging_resources/bin/grapejuice src/grapejuice_packaging/packaging_resources/bin/grapejuice-gui \
+      --replace "/usr/bin/env python3" "${python3Packages.python.interpreter}"
   '';
 
-  postInstall = ''
-    mkdir -p "$out/share/icons" "$out/share/applications" "$out/share/mime/packages"
-    cp -r src/grapejuice_common/assets/desktop/* $out/share/applications/
-    cp -r src/grapejuice_common/assets/icons $out/share/
-    cp src/grapejuice_common/assets/mime_xml/*.xml $out/share/mime/packages/
+  installPhase = ''
+    runHook preInstall
 
-    # compile locales (*.po -> *.mo)
-    # from https://gitlab.com/brinkervii/grapejuice/-/blob/master/src/grapejuice_common/util/mo_util.py
-    LOCALE_DIR="$out/share/locale"
-    PO_DIR="src/grapejuice_common/assets/po"
-    LINGUAS_FILE="src/grapejuice_common/assets/po/LINGUAS"
+    PYTHONPATH=$(pwd)/src:$PYTHONPATH python3 -m grapejuice_packaging linux_package
 
-    for lang in $(<"$LINGUAS_FILE") # extract langs from LINGUAS_FILE
-    do
-      po_file="$PO_DIR/$lang.po"
-      mo_file_dir="$LOCALE_DIR/$lang/LC_MESSAGES"
+    mkdir -p "$out" "$out/${python3Packages.python.sitePackages}"
+    tar -xvf ./dist/linux_package/grapejuice-''${version}.tar.gz --strip-components=1 -C "$out"
 
-      mkdir -p $mo_file_dir
+    mv "$out/lib/python3/dist-packages/"* "$out/${python3Packages.python.sitePackages}"
+    rmdir --ignore-fail-on-non-empty -p "$out/lib/python3/dist-packages"
 
-      mo_file="$mo_file_dir/grapejuice.mo"
-      msgfmt $po_file -o $mo_file # msgfmt from gettext
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    patchShebangs "$out/bin/grapejuice{,-gui}"
+
+    buildPythonPath "$out $pythonPath"
+
+    for bin in grapejuice grapejuice-gui; do
+    wrapProgram "$out/bin/$bin" \
+      --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)" \
+      ''${makeWrapperArgs[@]} \
+      ''${gappsWrapperArgs[@]}
     done
   '';
 

pkgs/servers/mqtt/mosquitto/default.nix

@@ -28,13 +28,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "mosquitto";
-  version = "2.0.15";
+  version = "2.0.17";
 
   src = fetchFromGitHub {
     owner = "eclipse";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-H2oaTphx5wvwXWDDaf9lLSVfHWmb2rMlxQmyRB4k5eg=";
+    sha256 = "sha256-hOnZ6oHLvunZL6MrCmR5GkROQNww34QQ3m4gYDaSpb4=";
   };
 
   patches = lib.optionals stdenv.isDarwin [

pkgs/servers/nginx-sso/default.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "nginx-sso";
-  version = "0.26.0";
+  version = "0.27.1";
 
   src = fetchFromGitHub {
     owner = "Luzifer";
     repo = "nginx-sso";
     rev = "v${version}";
-    hash = "sha256-vtbomeezW8PMv2lCR6PJqYw+PCFJ3M1SAQPGaIWouXY=";
+    hash = "sha256-mJwUAMjFUSbJZ8o096o2ntfd7c7dNU+LbgbL/l8aDGc=";
   };
 
-  vendorHash = "sha256-THTQhUgIfDDTgnR4qZxWFoGQzvqr3xrrz5ZxnV9ipBM=";
+  vendorHash = "sha256-nyzcFYnUm2xxAdiy16vVyeF57zRI9D+P+/58pP6evDs=";
 
   postInstall = ''
     mkdir -p $out/share

pkgs/tools/networking/getmail6/default.nix

@@ -5,13 +5,15 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "getmail6";
-  version = "6.18.12";
+  version = "6.18.13";
+
+  format = "setuptools";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-b+zDoiOD80BTP5VDpW/swur8zJOqYEWe05e/ZupZjyk=";
+    hash = "sha256-cyX+3LsXqBpAvaOPVpT4EuPzqJm9kki1uNTG+7k3Q28=";
   };
 
   # needs a Docker setup

pkgs/top-level/all-packages.nix

@@ -39377,6 +39377,7 @@ with pkgs;
 
   or-tools = callPackage ../development/libraries/science/math/or-tools {
     python = python3;
+    protobuf = protobuf3_21;
     # or-tools builds with -std=c++20, so abseil-cpp must
     # also be built that way
     abseil-cpp = abseil-cpp_202206.override {

pkgs/top-level/python-packages.nix

@@ -14062,6 +14062,8 @@ self: super: with self; {
     python3 = python;
   })).py;
 
+  zephyr-python-api = callPackage ../development/python-modules/zephyr-python-api { };
+
   zeroc-ice = callPackage ../development/python-modules/zeroc-ice { };
 
   zeroconf = callPackage ../development/python-modules/zeroconf { };