From d395dbee943550a1b637e3b7551c9d166620cea6 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 12 Aug 2023 13:54:11 +0200 Subject: [PATCH 01/31] ssm-agent: 3.0.755.0 -> 3.2.1297.0 Release notes: https://github.com/aws/amazon-ssm-agent/blob/3.2.1297.0/RELEASENOTES.md Fixes #226907 --- .../networking/cluster/ssm-agent/default.nix | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/applications/networking/cluster/ssm-agent/default.nix index baf85847875c..5a0dc0d2d97e 100644 --- a/pkgs/applications/networking/cluster/ssm-agent/default.nix +++ b/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 From dc340b88601fa927baa84bfc3854134a1c3ad639 Mon Sep 17 00:00:00 2001 From: TheNexusAvenger <13441476+TheNexusAvenger@users.noreply.github.com> Date: Fri, 18 Aug 2023 20:05:39 -0400 Subject: [PATCH 02/31] grapejuice: 7.8.3 -> 7.14.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update Grapejuice for easy release channel changing (mainly zintegration). Changelogs: https://gitlab.com/brinkervii/grapejuice/-/tags Co-authored-by: éclairevoyant <848000+eclairevoyant@users.noreply.github.com> --- pkgs/games/grapejuice/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/games/grapejuice/default.nix b/pkgs/games/grapejuice/default.nix index 629ecac05647..bd1c7218e793 100644 --- a/pkgs/games/grapejuice/default.nix +++ b/pkgs/games/grapejuice/default.nix @@ -19,13 +19,13 @@ 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 = [ @@ -86,6 +86,16 @@ python3Packages.buildPythonApplication rec { substituteInPlace src/grapejuice_common/models/settings_model.py \ --replace 'default_wine_home: Optional[str] = ""' 'default_wine_home: Optional[str] = "${wine}"' + + # Removed in 7.10.3. Required to set up the binary files. + substituteInPlace setup.py \ + --replace 'install_requires=install_requires(),' 'install_requires=install_requires(), + entry_points={ + "console_scripts": [ + "grapejuice=grapejuice.cli.main:easy_install_main", + "grapejuice-gui=grapejuice.cli.gui:easy_install_main" + ] + },' ''; postInstall = '' From b33de2708f7edfaac2f6d9c3fea72912fe17b9ec Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 19 Aug 2023 22:03:15 +0300 Subject: [PATCH 03/31] grapejuice: use upstream installation script https://gitlab.com/brinkervii/grapejuice/-/blob/master/src/grapejuice_packaging/builders/linux_package_builder.py --- pkgs/games/grapejuice/default.nix | 56 +++++++++++++++---------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/pkgs/games/grapejuice/default.nix b/pkgs/games/grapejuice/default.nix index bd1c7218e793..9d401cb6162d 100644 --- a/pkgs/games/grapejuice/default.nix +++ b/pkgs/games/grapejuice/default.nix @@ -15,6 +15,7 @@ , wine , glxinfo , xrandr +, bash }: python3Packages.buildPythonApplication rec { @@ -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" @@ -87,38 +88,37 @@ python3Packages.buildPythonApplication rec { substituteInPlace src/grapejuice_common/models/settings_model.py \ --replace 'default_wine_home: Optional[str] = ""' 'default_wine_home: Optional[str] = "${wine}"' - # Removed in 7.10.3. Required to set up the binary files. - substituteInPlace setup.py \ - --replace 'install_requires=install_requires(),' 'install_requires=install_requires(), - entry_points={ - "console_scripts": [ - "grapejuice=grapejuice.cli.main:easy_install_main", - "grapejuice-gui=grapejuice.cli.gui:easy_install_main" - ] - },' + 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 ''; From c58bcce320396b4ed24c6c15d63e7a8e94a8f3b0 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Tue, 22 Aug 2023 21:20:51 -0400 Subject: [PATCH 04/31] or-tools: use protobuf 3.21 OR-Tools 9.4 is not compatible with Protobuf 3.23. 9.7 is the latest version, but it requires quite a bit of work to package, so we should just pin Protobuf 3.21 for now to get things building again. --- pkgs/development/libraries/science/math/or-tools/default.nix | 2 +- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 92588307ca57..55438c63a5e0 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/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 = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 274311f5b4d5..24cb1cdc2160 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39271,6 +39271,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 { From bd3ea9f72a245fe22c2f3b56eac5f9d4904aa89d Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Wed, 23 Aug 2023 11:56:34 +0200 Subject: [PATCH 05/31] bottles: 51.6 -> 51.9 Diff: https://github.com/bottlesdevs/bottles/compare/51.6...51.9 --- pkgs/applications/misc/bottles/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 64f0df2e4a7f..eb0c6a841425 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/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 = [ From 2b657cc32e775adce9f83e11b648f1a86181c612 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Wed, 23 Aug 2023 12:27:31 +0200 Subject: [PATCH 06/31] mosquitto: 2.0.15 -> 2.0.17 --- pkgs/servers/mqtt/mosquitto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 152332538ff9..48058cf0d211 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/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 [ From 8b681cd6c3ae50c324e454c578f03bb70c307144 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Wed, 23 Aug 2023 15:33:41 -0400 Subject: [PATCH 07/31] brave: 1.57.47 -> 1.57.53 https://community.brave.com/t/release-channel-1-57-53/502801/1 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 9c8f07d79253..42726bebb22f 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/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; From 48f8d976866e9f2a8b81462717fe42564cb173ca Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 24 Aug 2023 23:34:32 +0900 Subject: [PATCH 08/31] python310Packages.anthropic: 0.3.8 -> 0.3.10 Diff: https://github.com/anthropics/anthropic-sdk-python/compare/refs/tags/v0.3.8...v0.3.10 Changelog: https://github.com/anthropics/anthropic-sdk-python/releases/tag/v0.3.10 --- .../python-modules/anthropic/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index a7bbb6fb2bd6..911361f82b8a 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/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"; }; } From 9cf3fb698d25af5e0fed289c0823449a3e409cf9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Aug 2023 07:34:06 +0000 Subject: [PATCH 09/31] kcov: 41 -> 42 --- pkgs/development/tools/analysis/kcov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index 95838c9c27fd..473dc9d7a4bb 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/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"; From fbf2a55563efa85c8a98386a87130dfdc7dbe2a5 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Sat, 26 Aug 2023 10:59:40 +0300 Subject: [PATCH 10/31] hack-font: unify output directory with other fonts --- pkgs/data/fonts/hack/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix index 6c6bd1918dbf..e39815a2e153 100644 --- a/pkgs/data/fonts/hack/default.nix +++ b/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 ''; From 95b25f7803e17ae71ec4783f5b2ae18f6da109a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 26 Aug 2023 12:33:42 -0700 Subject: [PATCH 11/31] getmail6: 6.18.12 -> 6.18.13 Diff: https://github.com/getmail6/getmail6/compare/refs/tags/v6.18.12...v6.18.13 Changelog: https://github.com/getmail6/getmail6/blob/refs/tags/v6.18.13/docs/CHANGELOG --- pkgs/tools/networking/getmail6/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/getmail6/default.nix b/pkgs/tools/networking/getmail6/default.nix index 2c52f055575a..cf3d5402898e 100644 --- a/pkgs/tools/networking/getmail6/default.nix +++ b/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 From 0a246323595425d59028bdbc22f672f742764b7a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Aug 2023 19:57:24 +0000 Subject: [PATCH 12/31] python310Packages.pywbem: 1.6.1 -> 1.6.2 --- pkgs/development/python-modules/pywbem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index 73376122eb1d..a77764d344ba 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/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 = [ From 7beff147aea303296111272c7f59b61acb25f050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 26 Aug 2023 12:55:57 -0700 Subject: [PATCH 13/31] python310Packages.ytmusicapi: 1.1.1 -> 1.2.1 Changelog: https://github.com/sigma67/ytmusicapi/releases/tag/1.2.1 --- .../python-modules/ytmusicapi/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 72d5e4035519..8334fba45ffb 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/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 ]; From 6623889d4aa8854b458f2dcd99ac6796018c8968 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Aug 2023 22:39:00 +0000 Subject: [PATCH 14/31] nginx-sso: 0.26.0 -> 0.27.1 --- pkgs/servers/nginx-sso/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix index 3b3dd52be6ef..25b58d88b3c7 100644 --- a/pkgs/servers/nginx-sso/default.nix +++ b/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 From 776cca2395ff005229567d9220c1cdd7027bef74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Aug 2023 01:19:45 +0000 Subject: [PATCH 15/31] python310Packages.plaid-python: 15.4.0 -> 15.5.0 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 99fbb98703bf..a449edd308b6 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/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 = [ From c1a045e556bdd46bd1e962d302b1526fc628b681 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Aug 2023 01:34:18 +0000 Subject: [PATCH 16/31] python310Packages.pytelegrambotapi: 4.12.0 -> 4.13.0 --- pkgs/development/python-modules/pyTelegramBotAPI/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 6d9ea5ddf2ed..951d5d849714 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/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 = { From e9f719a2aa9c5a69b6ec1eb331ef9a70844a4635 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 27 Aug 2023 04:20:00 +0000 Subject: [PATCH 17/31] grpc-tools: add passthru.updateScript --- pkgs/development/tools/misc/grpc-tools/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/tools/misc/grpc-tools/default.nix b/pkgs/development/tools/misc/grpc-tools/default.nix index 8a44d484ddde..c4f2bf7d29e8 100644 --- a/pkgs/development/tools/misc/grpc-tools/default.nix +++ b/pkgs/development/tools/misc/grpc-tools/default.nix @@ -2,6 +2,7 @@ , stdenv , cmake , fetchFromGitHub +, gitUpdater }: stdenv.mkDerivation rec { @@ -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 = '' From bda115030dfc94b17c5063f87ea06bba4ccc48e6 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 27 Aug 2023 04:20:00 +0000 Subject: [PATCH 18/31] grpc-tools: 1.11.2 -> 1.12.4 --- pkgs/development/tools/misc/grpc-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/grpc-tools/default.nix b/pkgs/development/tools/misc/grpc-tools/default.nix index c4f2bf7d29e8..5c21f8a0f415 100644 --- a/pkgs/development/tools/misc/grpc-tools/default.nix +++ b/pkgs/development/tools/misc/grpc-tools/default.nix @@ -7,13 +7,13 @@ 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; }; From 871c30c1c56cf9c97a85ed6763f7b7effc40e30d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 27 Aug 2023 04:20:00 +0000 Subject: [PATCH 19/31] vultr-cli: 2.17.0 -> 2.18.2 Diff: https://github.com/vultr/vultr-cli/compare/v2.17.0...v2.18.2 Changelog: https://github.com/vultr/vultr-cli/blob/v2.18.2/CHANGELOG.md --- pkgs/development/tools/vultr-cli/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index 4a962a1585a0..5399293424b1 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/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 ]; }; From 91f17d3ec8ba92c4709d4cb88c5c4b913f41d032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?= Date: Thu, 20 Jul 2023 17:37:23 +0300 Subject: [PATCH 20/31] python3Packages.zephyr-python-api: init at 0.0.3 Add Python package zephyr-python-api. Homepage: https://github.com/nassauwinter/zephyr-python-api This is a set of wrappers for Zephyr Scale (TM4J) REST API. This means you can interact with Zephyr Scale without GUI, access it with python code and create automation scripts for your every day interactions. --- .../zephyr-python-api/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/zephyr-python-api/default.nix diff --git a/pkgs/development/python-modules/zephyr-python-api/default.nix b/pkgs/development/python-modules/zephyr-python-api/default.nix new file mode 100644 index 000000000000..07cc6a2b7a19 --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b90d9089561c..b30d4da1282a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14046,6 +14046,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 { }; From b294823df8dc844450448e9085ac94714fee5894 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Aug 2023 04:44:35 +0000 Subject: [PATCH 21/31] python310Packages.teslajsonpy: 3.9.2 -> 3.9.3 --- pkgs/development/python-modules/teslajsonpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 5ce4c59490da..9e33acfc991e 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/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 = [ From 21d85b1a2f372ecabf72e596eb68c9a71c1c25b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Aug 2023 05:50:22 +0000 Subject: [PATCH 22/31] python310Packages.appthreat-vulnerability-db: 5.2.1 -> 5.2.3 --- .../python-modules/appthreat-vulnerability-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 29afbf63e1bc..08c5ec156b22 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/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 = '' From 5d6f8daf25ac860de2d14308ab001b5a7bb52dda Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 26 Aug 2023 22:55:29 -0700 Subject: [PATCH 23/31] python310Packages.jellyfish: link to libiconv on darwin --- pkgs/development/python-modules/jellyfish/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix index 26f34fd5f13a..5afe54567cb4 100644 --- a/pkgs/development/python-modules/jellyfish/default.nix +++ b/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"; From 451bf60c09ef15119832788922e6778c69b9d971 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Aug 2023 06:04:29 +0000 Subject: [PATCH 24/31] python310Packages.globus-sdk: 3.26.0 -> 3.27.0 --- pkgs/development/python-modules/globus-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 110dddeb47b0..e96d6dff8e42 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/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 = [ From 702419396a9e3c96bbee40632664fc9e3216aa65 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 26 Aug 2023 04:20:00 +0000 Subject: [PATCH 25/31] ocamlPackages.zed: 3.2.0 -> 3.2.3 Diff: https://github.com/ocaml-community/zed/compare/3.2.0...3.2.3 Changelog: https://github.com/ocaml-community/zed/blob/3.2.3/CHANGES.md --- pkgs/development/ocaml-modules/zed/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix index 2922a57244b9..882dfb23996e 100644 --- a/pkgs/development/ocaml-modules/zed/default.nix +++ b/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 From 3005e695d4eb4b072bfc4b631fe1277a7d71a997 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 26 Aug 2023 04:20:00 +0000 Subject: [PATCH 26/31] ocamlPackages.bwd: 2.1.0 -> 2.2.0 Diff: https://github.com/RedPRL/ocaml-bwd/compare/2.1.0...2.2.0 Changelog: https://github.com/RedPRL/ocaml-bwd/blob/2.2.0/CHANGELOG.markdown --- pkgs/development/ocaml-modules/bwd/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/bwd/default.nix b/pkgs/development/ocaml-modules/bwd/default.nix index bff1de9bc865..8f3d4fd54175 100644 --- a/pkgs/development/ocaml-modules/bwd/default.nix +++ b/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 ]; }; From 89c4fdc1abe35924aeff30ff3fdc0afe0af0c284 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Aug 2023 07:12:04 +0000 Subject: [PATCH 27/31] webex: 43.5.0.26155 -> 43.8.0.26955 --- .../networking/instant-messengers/webex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/webex/default.nix b/pkgs/applications/networking/instant-messengers/webex/default.nix index 5f7956290fcb..fcb59900ff00 100644 --- a/pkgs/applications/networking/instant-messengers/webex/default.nix +++ b/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 = [ From c9e235a6669eb22ec46f7b920d21046834e76cc9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Aug 2023 07:36:49 +0000 Subject: [PATCH 28/31] python310Packages.recipe-scrapers: 14.36.1 -> 14.43.0 --- pkgs/development/python-modules/recipe-scrapers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/recipe-scrapers/default.nix b/pkgs/development/python-modules/recipe-scrapers/default.nix index 10e5a4ff34e3..f2a9f17ab670 100644 --- a/pkgs/development/python-modules/recipe-scrapers/default.nix +++ b/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 = [ From e256002eb7c9c7a9f142ca80a5e14d548e8f1a69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Aug 2023 07:39:25 +0000 Subject: [PATCH 29/31] python310Packages.pallets-sphinx-themes: 2.1.0 -> 2.1.1 --- .../python-modules/pallets-sphinx-themes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pallets-sphinx-themes/default.nix b/pkgs/development/python-modules/pallets-sphinx-themes/default.nix index be4329a41334..460d99575b9e 100644 --- a/pkgs/development/python-modules/pallets-sphinx-themes/default.nix +++ b/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 ]; From a4f237ccbce9b1c0c0d71a4b6895588d76d2c1aa Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 27 Aug 2023 11:52:41 +0300 Subject: [PATCH 30/31] yuzu: 1522 -> 1538, yuzu-ea: 3805 -> 3838 --- pkgs/applications/emulators/yuzu/sources.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/emulators/yuzu/sources.nix b/pkgs/applications/emulators/yuzu/sources.nix index d417dc6f035f..9322090e7941 100644 --- a/pkgs/applications/emulators/yuzu/sources.nix +++ b/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"; }; } From 8aad9cf7f553f0cd9e64f01057d49a922f666f0a Mon Sep 17 00:00:00 2001 From: Nadim Kobeissi Date: Sun, 27 Aug 2023 11:44:01 +0200 Subject: [PATCH 31/31] plasma-desktop: remove Discover from default panel This commit removes shortcuts to KDE Discover from the default menus of the default Plasma Desktop installation in NixOS. Right now, in for example the official NixOS 23.05 Plasma Desktop ISO (as well as other installation vectors), a broken KDE Discover link is included in the default toolbar and other places, leading to a worse user experience, since NixOS intentionally does not ship the Plasma Desktop with KDE Discover. Confirmed working through building an ISO. --- pkgs/desktops/plasma-5/plasma-desktop/default.nix | 1 + .../plasma-desktop/no-discover-shortcut.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/desktops/plasma-5/plasma-desktop/no-discover-shortcut.patch diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 28dfa434f7b0..aaf1519ceaeb 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/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 = [ diff --git a/pkgs/desktops/plasma-5/plasma-desktop/no-discover-shortcut.patch b/pkgs/desktops/plasma-5/plasma-desktop/no-discover-shortcut.patch new file mode 100644 index 000000000000..f186671c9cc5 --- /dev/null +++ b/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 @@ + + + +- applications:systemsettings.desktop,applications:org.kde.discover.desktop,preferred://filemanager,preferred://browser ++ applications:systemsettings.desktop,preferred://filemanager,preferred://browser + + +