From 342b5a8b854633fe32d09837d4105d640138a235 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Thu, 30 Nov 2023 16:49:50 +0100 Subject: [PATCH 01/22] sshd: fix shellcheck warnings in prestart script --- nixos/modules/services/networking/ssh/sshd.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 0d127a6544c0..26ca39f73d39 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -585,7 +585,8 @@ in if ! [ -h "${k.path}" ]; then rm -f "${k.path}" fi - mkdir -m 0755 -p "$(dirname '${k.path}')" + mkdir -p "$(dirname '${k.path}')" + chmod 0755 "$(dirname '${k.path}')" ssh-keygen \ -t "${k.type}" \ ${lib.optionalString (k ? bits) "-b ${toString k.bits}"} \ From a236941ad0379faf5436305643ad46bc3312a893 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Thu, 30 Nov 2023 16:52:03 +0100 Subject: [PATCH 02/22] systemd/initrd: fix shellcheck issues --- nixos/modules/system/boot/systemd/initrd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 2ccc964820fe..3897bb5eca5f 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -538,7 +538,7 @@ in { for o in $(< /proc/cmdline); do case $o in init=*) - IFS== read -r -a initParam <<< "$o" + IFS="=" read -r -a initParam <<< "$o" closure="''${initParam[1]}" ;; esac @@ -574,7 +574,7 @@ in { # Initialize the system export IN_NIXOS_SYSTEMD_STAGE1=true - exec chroot /sysroot $closure/prepare-root + exec chroot /sysroot "$closure/prepare-root" ''; }; From 7d664c0ac14df7ed4223d04fe0579662bd88c53a Mon Sep 17 00:00:00 2001 From: r-vdp Date: Mon, 4 Dec 2023 16:47:22 +0100 Subject: [PATCH 03/22] growpart: shellcheck fixes --- nixos/modules/system/boot/grow-partition.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/grow-partition.nix b/nixos/modules/system/boot/grow-partition.nix index 4f8a2273a7ac..1910ff52eac8 100644 --- a/nixos/modules/system/boot/grow-partition.nix +++ b/nixos/modules/system/boot/grow-partition.nix @@ -43,7 +43,7 @@ with lib; while [ "''${parentDevice%[0-9]}" != "''${parentDevice}" ]; do parentDevice="''${parentDevice%[0-9]}"; done - partNum="''${rootDevice#''${parentDevice}}" + partNum="''${rootDevice#"''${parentDevice}"}" if [ "''${parentDevice%[0-9]p}" != "''${parentDevice}" ] && [ -b "''${parentDevice%p}" ]; then parentDevice="''${parentDevice%p}" fi From 02309d707e3e8f72457bf35b1ef92f1ef7598d74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Sep 2024 07:49:31 +0000 Subject: [PATCH 04/22] fabric-ai: 1.4.14 -> 1.4.26 --- pkgs/by-name/fa/fabric-ai/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix index 8b25b890e24d..9622ac2c598f 100644 --- a/pkgs/by-name/fa/fabric-ai/package.nix +++ b/pkgs/by-name/fa/fabric-ai/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "fabric-ai"; - version = "1.4.14"; + version = "1.4.26"; src = fetchFromGitHub { owner = "danielmiessler"; repo = "fabric"; rev = "v${version}"; - hash = "sha256-syQVGtEFCC7ZVcs6ZIJgH0EXItclV2rPO7xTfsG2g7Q="; + hash = "sha256-KoGulBnQDLpRWB+Bogu+bvXDJ98ImyzTZrvoEaVh5BQ="; }; - vendorHash = "sha256-CHgeHumWtNt8SrbzzCWqBdLxTmmyDD2bfLkriPeez2E="; + vendorHash = "sha256-uWq+S6J/RInAaQOO0T3LkpQ89mHq0Wj+wXw+Tioxy70="; ldflags = [ "-s" From 80931ba844da56228943f61b655a061f7f8a06a3 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 27 Sep 2024 10:46:35 +0200 Subject: [PATCH 05/22] tmux: 3.4 -> 3.5 Patches were removed, as they seem to be applied: * https://github.com/tmux/tmux/pull/3840 * https://github.com/tmux/tmux/pull/3933 * https://github.com/tmux/tmux/commit/aa17f0e0c1c8b3f1d6fc8617613c74f07de66fae * https://github.com/tmux/tmux/commit/3823fa2c577d440649a84af660e4d3b0c095d248 Signed-off-by: Matthias Beyer --- pkgs/tools/misc/tmux/default.nix | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index d8b40913c9c8..e1b7d4dd6371 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "tmux"; - version = "3.4"; + version = "3.5"; outputs = [ "out" "man" ]; @@ -35,33 +35,9 @@ stdenv.mkDerivation (finalAttrs: { owner = "tmux"; repo = "tmux"; rev = finalAttrs.version; - hash = "sha256-RX3RZ0Mcyda7C7im1r4QgUxTnp95nfpGgQ2HRxr0s64="; + hash = "sha256-8CRZj7UyBhuB5QO27Y+tHG62S/eGxPOHWrwvh1aBqq0="; }; - patches = [ - (fetchpatch { - url = "https://github.com/tmux/tmux/commit/2d1afa0e62a24aa7c53ce4fb6f1e35e29d01a904.diff"; - hash = "sha256-mDt5wy570qrUc0clGa3GhZFTKgL0sfnQcWJEJBKAbKs="; - }) - # this patch is designed for android but FreeBSD exhibits the same error for the same reason - (fetchpatch { - url = "https://github.com/tmux/tmux/commit/4f5a944ae3e8f7a230054b6c0b26f423fa738e71.patch"; - hash = "sha256-HlUeU5ZicPe7Ya8A1HpunxfVOE2BF6jOHq3ZqTuU5RE="; - }) - # https://github.com/tmux/tmux/issues/3983 - # fix tmux crashing when neovim is used in a ssh session - (fetchpatch { - url = "https://github.com/tmux/tmux/commit/aa17f0e0c1c8b3f1d6fc8617613c74f07de66fae.patch"; - hash = "sha256-jhWGnC9tsGqTTA5tU+i4G3wlwZ7HGz4P0UHl17dVRU4="; - }) - # https://github.com/tmux/tmux/issues/3905 - # fix tmux hanging on shutdown - (fetchpatch { - url = "https://github.com/tmux/tmux/commit/3823fa2c577d440649a84af660e4d3b0c095d248.patch"; - hash = "sha256-FZDy/ZgVdwUAam8g5SfGBSnMhp2nlHHfrO9eJNIhVPo="; - }) - ]; - nativeBuildInputs = [ pkg-config autoreconfHook From d0e35ece0fccd654135b59685af15b5b38e348c2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 27 Sep 2024 23:48:34 +0200 Subject: [PATCH 06/22] python312Packages.publicsuffixlist: 1.0.2.20240920 -> 1.0.2.20240927 Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20240927-gha/CHANGES.md --- pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 3103506106df..f341ea7a4288 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20240920"; + version = "1.0.2.20240927"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LZDAepnKR2/BfU/grBE1Aw3wXwt9atAPu3dfh9KZ9tE="; + hash = "sha256-nelIcgIsZNa7sqIT7AyA3eZqBpkSZisn/3osvqaBhNk="; }; build-system = [ setuptools ]; From 17254a0bd40f4cba5d1b7582098993cd56d64130 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 27 Sep 2024 23:58:30 +0200 Subject: [PATCH 07/22] python312Packages.aiowithings: 3.0.3 -> 3.1.0 Diff: https://github.com/joostlek/python-withings/compare/refs/tags/v3.0.3...v3.1.0 Changelog: https://github.com/joostlek/python-withings/releases/tag/v3.1.0 --- .../python-modules/aiowithings/default.nix | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aiowithings/default.nix b/pkgs/development/python-modules/aiowithings/default.nix index e2794d241193..85af5993d8e4 100644 --- a/pkgs/development/python-modules/aiowithings/default.nix +++ b/pkgs/development/python-modules/aiowithings/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiowithings"; - version = "3.0.3"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-withings"; rev = "refs/tags/v${version}"; - hash = "sha256-YM+7raD5Wp+pC+R4DV92QN5E+TlNoMnt5M+n6Ax0W9k="; + hash = "sha256-pTDHbnL5MfcsQFiaRnKTDAoJ1JwwxRUTB6fQsXjIFl0="; }; postPatch = '' @@ -31,9 +31,9 @@ buildPythonPackage rec { --replace "--cov" "" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp yarl ]; @@ -47,6 +47,29 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiowithings" ]; + pytestFlagsArray = [ "--snapshot-update" ]; + + disabledTests = [ + # Tests require network access + "test_creating_own_session" + "test_error_codes" + "test_get_activities" + "test_get_devices" + "test_get_goals" + "test_get_measurement" + "test_get_new_device" + "test_get_sleep_summary" + "test_get_sleep" + "test_get_workouts" + "test_list_all_subscriptions" + "test_list_subscriptions" + "test_putting_in_own_session" + "test_revoking" + "test_subscribing" + "test_timeout" + "test_unexpected_server_response" + ]; + meta = with lib; { description = "Module to interact with Withings"; homepage = "https://github.com/joostlek/python-withings"; From 2f6bd555eef686f8ca922bd435cf9f4dbfade946 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Sep 2024 22:33:52 +0000 Subject: [PATCH 08/22] renode-unstable: 1.15.2+20240914gitcb658f346 -> 1.15.3+20240927gitbb819bb49 --- pkgs/by-name/re/renode-unstable/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index 5717f5905b1a..5f2d0f79be04 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -5,11 +5,11 @@ renode.overrideAttrs (finalAttrs: _: { pname = "renode-unstable"; - version = "1.15.2+20240914gitcb658f346"; + version = "1.15.3+20240927gitbb819bb49"; src = fetchurl { url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz"; - hash = "sha256-DkS635epflnbjYc/y4IgGgrIkRHKtuKxtebH6kdRYTw="; + hash = "sha256-IcQKAslgmN+ChYJLsS0umR1/FSAicWyP6Ek/v668+40="; }; passthru.updateScript = From cafe86fdac1df6761bb38f7445f9e40fa7187aef Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 28 Sep 2024 01:20:31 +0200 Subject: [PATCH 09/22] python312Packages.zlib-ng: 0.5.0 -> 0.5.1 https://github.com/pycompression/python-zlib-ng/blob/v0.5.1/CHANGELOG.rst --- pkgs/development/python-modules/zlib-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zlib-ng/default.nix b/pkgs/development/python-modules/zlib-ng/default.nix index 697a8405ecbd..77b3743c0137 100644 --- a/pkgs/development/python-modules/zlib-ng/default.nix +++ b/pkgs/development/python-modules/zlib-ng/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "zlib-ng"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; src = fetchFromGitHub { owner = "pycompression"; repo = "python-zlib-ng"; rev = "v${version}"; - hash = "sha256-H8Niz6BbmNCccNKHBfRma4SUt0RY846fCiHidEvcd5E="; + hash = "sha256-UsdZgpRI7h6GemT1+1g/cP/8uhLykZ//saH4JMwwlY4="; }; patches = [ From 77df1b52bc44e66c3a31cfb0491d35b012cc1fe6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 28 Sep 2024 01:21:16 +0200 Subject: [PATCH 10/22] python312Packages.isal: 1.7.0 -> 1.7.1 https://github.com/pycompression/python-isal/blob/v1.7.1/CHANGELOG.rst --- pkgs/development/python-modules/isal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/isal/default.nix b/pkgs/development/python-modules/isal/default.nix index 3a7ca9a07a2b..0594330edaf8 100644 --- a/pkgs/development/python-modules/isal/default.nix +++ b/pkgs/development/python-modules/isal/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "isal"; - version = "1.7.0"; + version = "1.7.1"; pyproject = true; src = fetchFromGitHub { owner = "pycompression"; repo = "python-isal"; rev = "v${version}"; - hash = "sha256-wasybbNWBa6Zd0JI2/lBNUkvEOY3/iBqsVWh/4WPM2s="; + hash = "sha256-KLnSE7QLM3q8DdoWnCEN6dOxsMr8eSH9k3FqFquZFlE="; }; patches = [ From e44cb862ce2d721299c4c82f0c2ef1ea8dcf0120 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Sep 2024 02:20:26 +0000 Subject: [PATCH 11/22] lime3ds: 2118 -> 2118.2 --- pkgs/by-name/li/lime3ds/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/lime3ds/package.nix b/pkgs/by-name/li/lime3ds/package.nix index 87a0a895fab7..8dae667a6b54 100644 --- a/pkgs/by-name/li/lime3ds/package.nix +++ b/pkgs/by-name/li/lime3ds/package.nix @@ -41,11 +41,11 @@ inherit (lib) optional optionals cmakeBool optionalString getLib makeLibraryPath; in stdenv.mkDerivation (finalAttrs: { pname = "lime3ds"; - version = "2118"; + version = "2118.2"; src = fetchzip { url = "https://github.com/Lime3DS/Lime3DS/releases/download/${finalAttrs.version}/lime3ds-unified-source-${finalAttrs.version}.tar.xz"; - hash = "sha256-Dt0YKWj+yLUic1F7uOxfWPYlPda3snTUPwFbn23i2rY="; + hash = "sha256-DovVkk5QolOizV3mfxtMNMeIJWYs3xAu96icrTcQN68="; }; nativeBuildInputs = [ From 8e9a6862d73568a7de5c7a87b32bba22610fdf00 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 27 Sep 2024 22:29:26 -0400 Subject: [PATCH 12/22] protobuf_28: fix cross compilation by only building tests when necessary --- .../libraries/protobuf/generic.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 4c03454c432c..459f54b2457a 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -76,18 +76,20 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals enableShared [ "-Dprotobuf_BUILD_SHARED_LIBS=ON" ] - # Tests fail to build on 32-bit platforms; fixed in 22.x - # https://github.com/protocolbuffers/protobuf/issues/10418 - ++ lib.optionals (stdenv.hostPlatform.is32bit && lib.versionOlder version "22") [ + ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ "-Dprotobuf_BUILD_TESTS=OFF" ]; - # FIXME: investigate. 24.x and 23.x have different errors. - # At least some of it is not reproduced on some other machine; example: - # https://hydra.nixos.org/build/235677717/nixlog/4/tail - # Also AnyTest.TestPackFromSerializationExceedsSizeLimit fails on 32-bit platforms - # https://github.com/protocolbuffers/protobuf/issues/8460 - doCheck = !(stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "23") && !stdenv.hostPlatform.is32bit; + doCheck = + # FIXME: investigate. 24.x and 23.x have different errors. + # At least some of it is not reproduced on some other machine; example: + # https://hydra.nixos.org/build/235677717/nixlog/4/tail + !(stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "23") + # Tests fail to build on 32-bit platforms; fixed in 22.x + # https://github.com/protocolbuffers/protobuf/issues/10418 + # Also AnyTest.TestPackFromSerializationExceedsSizeLimit fails on 32-bit platforms + # https://github.com/protocolbuffers/protobuf/issues/8460 + && !stdenv.hostPlatform.is32bit; passthru = { tests = { From ac0d413f5b52af2a1f6f4fce4fd33249dd5a61cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Sep 2024 03:28:58 +0000 Subject: [PATCH 13/22] minijinja: 2.3.0 -> 2.3.1 --- pkgs/by-name/mi/minijinja/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix index 9f4eabc4886e..f88c314b693f 100644 --- a/pkgs/by-name/mi/minijinja/package.nix +++ b/pkgs/by-name/mi/minijinja/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "minijinja"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "minijinja"; rev = version; - hash = "sha256-SZWVvj/tGpoC740An/sgdPVg+uV39QBj7qbjK0lSYdo="; + hash = "sha256-fASPxNSkSQtg05hmSK48AAEd9MpcoFqCt5hkk2vIR2A="; }; - cargoHash = "sha256-OVpqfwu5x/XfqgB8xJY+qZYQUgsa2QO9FZ+/KVYZxgE="; + cargoHash = "sha256-dPNWeuBAWV7ynh9t+DEaR0xb0cAa27Pp44Hm68mWTwI="; # The tests relies on the presence of network connection doCheck = false; From e4eaf7c77640cc6de7849ba3a2696b5de912c366 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Sep 2024 03:45:40 +0000 Subject: [PATCH 14/22] raspberrypi-eeprom: 2024.09.10-2712 -> 2024.09.23-2712 --- pkgs/by-name/ra/raspberrypi-eeprom/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix index 5d4580e46f25..db4d4cac9296 100644 --- a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix +++ b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix @@ -12,13 +12,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "raspberrypi-eeprom"; - version = "2024.09.10-2712"; + version = "2024.09.23-2712"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "rpi-eeprom"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-SLPLZzSRsPDxGtFnFFu99z3HqGDLDNuMWbgUKdeJyuI="; + hash = "sha256-5qqcHMoRT5XfhIX392j4Q1DcKjYGq6NMqy1VrWxg5+4="; }; buildInputs = [ python3 ]; From 252c5eb57c73a630250e8d50aff03412ba8c3f9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Sep 2024 04:24:03 +0000 Subject: [PATCH 15/22] git-workspace: 1.5.0 -> 1.6.0 --- .../version-management/git-workspace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-workspace/default.nix b/pkgs/applications/version-management/git-workspace/default.nix index 8ed00127fdbb..c7af04adcb9f 100644 --- a/pkgs/applications/version-management/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-workspace/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "git-workspace"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "orf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qAJv4iCw9gkO9yPVQUqla7UWpNkPjPBa4IGQfOyd8k0="; + sha256 = "sha256-Xf3uR+MG8vRBcad5n5k9NKyfC6v0y3BCz0CfDORsy/Q="; }; - cargoHash = "sha256-p+mZN0TXxntT22vp6uBRc6kBTzVN3/Oy7D4v3ihwV8Y="; + cargoHash = "sha256-oywwbDwg6O4pdqRJAM+IAt65DV6IkpMec8v4PY1RoZU="; nativeBuildInputs = [ pkg-config ]; From 9793b135a60299d21920915f5510612e00ac162b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Sep 2024 04:39:16 +0000 Subject: [PATCH 16/22] tippecanoe: 2.62.3 -> 2.62.4 --- pkgs/by-name/ti/tippecanoe/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ti/tippecanoe/package.nix b/pkgs/by-name/ti/tippecanoe/package.nix index f869dd452325..00e211a20277 100644 --- a/pkgs/by-name/ti/tippecanoe/package.nix +++ b/pkgs/by-name/ti/tippecanoe/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.62.3"; + version = "2.62.4"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; rev = finalAttrs.version; - hash = "sha256-1rj2nfp18EZL9aSiUs1ASJnAqHyM9lztsfkak7Ipy6o="; + hash = "sha256-mHeBzXJ4d60tJ1xAN8YldP94GCE8Ch1cvJqMD0ZaV34="; }; buildInputs = [ sqlite zlib ]; From e19ebda61408afbe1ed4a7e165dec3830357c9e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Sep 2024 23:02:20 +0000 Subject: [PATCH 17/22] buildbot: 4.0.2 -> 4.0.3 --- .../buildbot/master.nix | 4 ++-- .../buildbot/plugins.nix | 22 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index a9e3b01e07e6..904c5af636d1 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -71,7 +71,7 @@ let in buildPythonApplication rec { pname = "buildbot"; - version = "4.0.2"; + version = "4.0.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -80,7 +80,7 @@ buildPythonApplication rec { owner = "buildbot"; repo = "buildbot"; rev = "v${version}"; - hash = "sha256-0ctOInVRJqjmcqy67PTriRmqo3fz1qMEVV+K5lXvZ6k="; + hash = "sha256-4jxA8qvLX53cLooCpkn9hvcz4SFGc29TKxUah80Ufp4="; }; build-system = [ diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix index 530b46d26337..94564ce36853 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix @@ -8,7 +8,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-TU5/0KQQbNDpxuntIwQvxGp/7PvBb+iMiAOJA3EAAAA="; + hash = "sha256-wBwJXDR52jDRd+8efIjQ+ncWe708k1F21MuvBwhjEwc="; }; # Remove unnecessary circular dependency on buildbot @@ -35,7 +35,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-EtG4vlsoyIDcfKWvkL7ei/BGVItF5wkWPhq4aHfmJ24="; + hash = "sha256-JJK1vmTdOImKIM1glrTjo2E0KnotU2QJVc2OIzVQQ1Y="; }; # Remove unnecessary circular dependency on buildbot @@ -62,7 +62,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-gNei1LZXV7G+8u0AtNDSsj98LprsbyIFR94N4+AXO54="; + hash = "sha256-kzj4IPNn/cUW7nidOLyO7AD98uXxWcqvMxaOhXhFn74="; }; buildInputs = [ buildbot-pkg ]; @@ -84,7 +84,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-CJ14Se4Wlpb7jt5u1VVmd0MnUdO2l7KfQyVQbO7hMhA="; + hash = "sha256-4quLblPknI/vrCNF7Frl5+UlY50vuspW0XmMJubvVXI="; }; buildInputs = [ buildbot-pkg ]; @@ -106,7 +106,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-lY8ljjGaZ0i7aY1rR//7M7H83ZTSQj9CnTafWXner94="; + hash = "sha256-VC84rftiA7/x0X3lJfHTrEZve/ZDncVDuq6fisEI8nc="; }; buildInputs = [ buildbot-pkg ]; @@ -128,7 +128,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-XZAInGgM/hm4Rxk0usH0NRiCuq19XJeYuwJNF2gtn3M="; + hash = "sha256-2HZBnVvxPhU6rLmG6l9hX51zm8pvA5amsjExGx65+OQ="; }; buildInputs = [ buildbot-pkg ]; @@ -150,7 +150,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-RRdHvlm+98Cu+qiIhDMx6W65bQ30ULTKZrz05Xm32gg="; + hash = "sha256-IwTANqPNGon4lvT2ASpguEf8GcD1hz/7flNBml0NTdc="; }; buildInputs = [ buildbot-pkg ]; @@ -172,7 +172,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-sg/40zP3YMF8e3GsL+A9gtCUlhoqKqHNeFUycQrQNJc="; + hash = "sha256-SQiaIcupEtNePr4LUzwYm3RRKT9xa7RnHUaiE8EaRzQ="; }; buildInputs = [ buildbot-pkg ]; @@ -194,7 +194,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-pE6wDMLYGtDgaRjqv/SS9bm6F58molO9oQI3XklcWfg="; + hash = "sha256-dzK4WvBRxWoAfhsdKoYUnsG97OKmM8Jgr4Uv7NPpiVk="; }; buildInputs = [ buildbot-pkg ]; @@ -216,7 +216,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-ZgnfiQtKCs1Ui9KiUMaSbtaMnCgSgH+IzJTXWYcG/fE="; + hash = "sha256-vytU7WRdXWHazc/LYZSWlslkOb3lnTitEW3UZQ/VmTU="; }; buildInputs = [ buildbot-pkg ]; @@ -238,7 +238,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-yxbLY3LiT0qmRiz7+/F/TuODiSnteq0891fxAGSU7yY="; + hash = "sha256-O71qB9uIigYcK/t2t+481oktHjF5up1nk1dS4eEMb3A="; }; buildInputs = [ buildbot-pkg ]; From b7d7bc37f71e18777983df09d530b02399b63e70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Sep 2024 07:32:54 +0000 Subject: [PATCH 18/22] qq: 3.2.12-2024.9.2 -> 3.2.12-2024.9.27 --- pkgs/by-name/qq/qq/sources.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix index d3bfb154a3e5..f3783a8ba511 100644 --- a/pkgs/by-name/qq/qq/sources.nix +++ b/pkgs/by-name/qq/qq/sources.nix @@ -1,9 +1,9 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2024-09-06 +# Last updated: 2024-09-28 { - version = "3.2.12-2024.9.2"; - amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240902_amd64_01.deb"; - arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240902_arm64_01.deb"; - arm64_hash = "sha256-V+lsBgwhpvVNYGm1d0DD9x/wD7/+bIDON8DAAABA42c="; - amd64_hash = "sha256-NHK50KR2WuUm+HO//sFBUkhJPk6F45j5ShuaWksV1O4="; + version = "3.2.12-2024.9.27"; + amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240927_amd64_01.deb"; + arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240927_arm64_01.deb"; + arm64_hash = "sha256-VfM+p2cTNkDZc7sTftfTuRSMKVWwE6TerW25pA1MIR0="; + amd64_hash = "sha256-xBGSSxXDu+qUwj203i3iAkfI97iLtGOuGMGfEU6kCyQ="; } From b46e7ab3b3d432554395f15b15babe7966e1b5eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Sep 2024 07:57:05 +0000 Subject: [PATCH 19/22] androidStudioPackages.canary: 2024.2.2.2 -> 2024.2.2.4 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index a053707f7612..dab779c23fbf 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -17,8 +17,8 @@ let sha256Hash = "sha256-YNUtRsKwXHfb7McJmTTT39/wW1rHjzw4kFQRwa12kJE="; }; latestVersion = { - version = "2024.2.2.2"; # "Android Studio Ladybug Feature Drop | 2024.2.2 Canary 2" - sha256Hash = "sha256-TSjKJ4gAqZlycMP1or8MV+Il+KOQJL/F1kUKQr6/rSw="; + version = "2024.2.2.4"; # "Android Studio Ladybug Feature Drop | 2024.2.2 Canary 4" + sha256Hash = "sha256-Rw+smKU2F11ZpK6lWb3VyLGTKt3qWFoUqnfcs5OXBcU="; }; in { # Attributes are named by their corresponding release channels From 7ca16574873321f1550d9c519726f175be4d6c50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Sep 2024 08:00:22 +0000 Subject: [PATCH 20/22] android-studio: 2024.1.2.12 -> 2024.1.2.13 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index a053707f7612..0b6164d20815 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,8 +9,8 @@ let inherit tiling_wm; }; stableVersion = { - version = "2024.1.2.12"; # "Android Studio Koala Feature Drop | 2024.1.2" - sha256Hash = "sha256-dFFogg6YmpCF/4QtR85UFAfbCd97irIHcPbqieQabpI="; + version = "2024.1.2.13"; # "Android Studio Koala Feature Drop | 2024.1.2 Patch 1" + sha256Hash = "sha256-aIxlXCMPKYZ6Eq44LMJuxnBr9/ML1Nl/LxXI+WDLG5s="; }; betaVersion = { version = "2024.2.1.7"; # "Android Studio Ladybug | 2024.2.1 Beta 2" From 26c47c2eeaf67c153098a0ffe71a3a88d9a01e4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Sep 2024 08:15:35 +0000 Subject: [PATCH 21/22] phraze: 0.3.14 -> 0.3.15 --- pkgs/by-name/ph/phraze/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ph/phraze/package.nix b/pkgs/by-name/ph/phraze/package.nix index 8f5664d5c2a5..aba0a4013b40 100644 --- a/pkgs/by-name/ph/phraze/package.nix +++ b/pkgs/by-name/ph/phraze/package.nix @@ -10,18 +10,18 @@ rustPlatform.buildRustPackage rec { pname = "phraze"; - version = "0.3.14"; + version = "0.3.15"; src = fetchFromGitHub { owner = "sts10"; repo = "phraze"; rev = "v${version}"; - hash = "sha256-wfvnzKoxFgIizbPrt8v9na6n/qjnjS368P1iOEh5VNw="; + hash = "sha256-gpdXgR7TK3xJHHXcZdfMZApA3SvtNmCroi/5ChfrQOs="; }; doCheck = true; - cargoHash = "sha256-HEsXGlNpr/1NiJobjtwftI8HIfz0AnRtxMvh3Pf2gDo="; + cargoHash = "sha256-tYQ/kcwCNAcgEUmwrrdogLd1AugBnVfqaLX9fjjpOUE="; nativeBuildInputs = [ installShellFiles ]; From 373008cf868e08c4c06599c524d9365314a4a9bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Sep 2024 08:25:28 +0000 Subject: [PATCH 22/22] nixd: 2.3.2 -> 2.4.0 --- pkgs/development/tools/language-servers/nixd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index b4736c0b6173..ffa06bb33933 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -21,13 +21,13 @@ let common = rec { - version = "2.3.2"; + version = "2.4.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixd"; rev = version; - hash = "sha256-ffHLKHpqgVlYLGQ/Dc/6hW/inA98QdMJiv/fT2IrH7c="; + hash = "sha256-8F97zAu+icDC9ZYS7m+Y58oZQ7R3gVuXMvzAfgkVmJo="; }; nativeBuildInputs = [