From d7b5e1a95a54abc72005bd45ea55b774cae20d81 Mon Sep 17 00:00:00 2001 From: toonn Date: Thu, 23 Jan 2025 16:50:30 +0100 Subject: [PATCH 001/305] wire-desktop: Add versions.json to enable updateScript --- pkgs/by-name/wi/wire-desktop/package.nix | 20 ++++++++------------ pkgs/by-name/wi/wire-desktop/versions.json | 10 ++++++++++ 2 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 pkgs/by-name/wi/wire-desktop/versions.json diff --git a/pkgs/by-name/wi/wire-desktop/package.nix b/pkgs/by-name/wi/wire-desktop/package.nix index 0f89a5bb4881..e3138a19d99a 100644 --- a/pkgs/by-name/wi/wire-desktop/package.nix +++ b/pkgs/by-name/wi/wire-desktop/package.nix @@ -26,25 +26,21 @@ let pname = "wire-desktop"; + versions = builtins.fromJSON (builtins.readFile ./versions.json); + version = - let - x86_64-darwin = "3.39.5211"; - in { - inherit x86_64-darwin; - aarch64-darwin = x86_64-darwin; - x86_64-linux = "3.39.3653"; + x86_64-darwin = versions.macos.version; + aarch64-darwin = versions.macos.version; + x86_64-linux = versions.linux.version; } .${system} or throwSystem; hash = - let - x86_64-darwin = "sha256-k6CIqHt67AFL70zdK0/91aQcpbb00OIggk5TF7y1IOY="; - in { - inherit x86_64-darwin; - aarch64-darwin = x86_64-darwin; - x86_64-linux = "sha256-BbY+7fGAWW5CR/z4GeoBl5aOewCRuWzQjpQX4x1rzls="; + x86_64-darwin = versions.macos.hash; + aarch64-darwin = versions.macos.hash; + x86_64-linux = versions.linux.hash; } .${system} or throwSystem; diff --git a/pkgs/by-name/wi/wire-desktop/versions.json b/pkgs/by-name/wi/wire-desktop/versions.json new file mode 100644 index 000000000000..c346a28aa85f --- /dev/null +++ b/pkgs/by-name/wi/wire-desktop/versions.json @@ -0,0 +1,10 @@ +{ + "linux": { + "version": "3.39.3653", + "hash": "sha256-BbY+7fGAWW5CR/z4GeoBl5aOewCRuWzQjpQX4x1rzls=" + }, + "macos": { + "version": "3.39.5211", + "hash": "sha256-k6CIqHt67AFL70zdK0/91aQcpbb00OIggk5TF7y1IOY=" + } +} From cf36c820c542b992f0635435b34b5ce516fd5cfa Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 31 Dec 2024 14:01:07 +0100 Subject: [PATCH 002/305] wire-desktop: Add updateScript --- pkgs/by-name/wi/wire-desktop/package.nix | 22 +++++- pkgs/by-name/wi/wire-desktop/update.sh | 86 ++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 2 deletions(-) create mode 100755 pkgs/by-name/wi/wire-desktop/update.sh diff --git a/pkgs/by-name/wi/wire-desktop/package.nix b/pkgs/by-name/wi/wire-desktop/package.nix index e3138a19d99a..d7092b4afeca 100644 --- a/pkgs/by-name/wi/wire-desktop/package.nix +++ b/pkgs/by-name/wi/wire-desktop/package.nix @@ -71,8 +71,21 @@ let hydraPlatforms = [ ]; }; + passthru.updateScript = { + command = [ + ./update.sh + ./. + ]; + supportedFeatures = [ "commit" ]; + }; + linux = stdenv.mkDerivation rec { - inherit pname version meta; + inherit + pname + version + meta + passthru + ; src = fetchurl { url = "https://wire-app.wire.com/linux/debian/pool/main/Wire-${version}_amd64.deb"; @@ -147,7 +160,12 @@ let }; darwin = stdenv.mkDerivation { - inherit pname version meta; + inherit + pname + version + meta + passthru + ; src = fetchurl { url = "https://github.com/wireapp/wire-desktop/releases/download/macos%2F${version}/Wire.pkg"; diff --git a/pkgs/by-name/wi/wire-desktop/update.sh b/pkgs/by-name/wi/wire-desktop/update.sh new file mode 100755 index 000000000000..baf3477b30b8 --- /dev/null +++ b/pkgs/by-name/wi/wire-desktop/update.sh @@ -0,0 +1,86 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq + +set -e + +cd $1 + +releases=$(curl -L \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + "https://api.github.com/repos/wireapp/wire-desktop/releases" \ +) + +latest=$(jq --argjson suffix '{ "linux": ".deb", "macos": ".pkg" }' \ + --slurpfile versions versions.json ' + def platform_latest(platform): + map(select(.tag_name | startswith(platform))) + | max_by(.tag_name) + | { version: .tag_name | ltrimstr(platform + "/") + , url: .assets.[] + | .browser_download_url + | select(endswith($suffix.[platform])) + }; + + . as $releases + | $versions.[] as $old + | $old + | with_entries( .key as $key + | { key: $key, value: $releases | platform_latest($key) } + | select(.value.version != $old.[$key].version) + ) +' <<< "$releases" +) + +urlHashes=$( + printf '{ ' + function entries () { + local sep='' + for url in $(jq --raw-output '.[].url' <<< "$latest"); do + printf '%s"%s": "%s"\n' "$sep" "$url" \ + "$(nix-hash --to-sri --type sha256 $(nix-prefetch-url $url))" + sep=', ' + done + } + entries + printf '}' +) + +commit=$(jq --arg versionJSON "$(printf '%s/versions.json' "$1")" \ + --slurpfile versions versions.json ' + $versions.[] as $old + | to_entries + | map("\(.key) \($old.[.key].version) -> \(.value.version)") + | join(", ") + | [ if . == "" + then empty + else { attrPath: "wire-desktop" + , oldVersion: "A" + , newVersion: "B" + , files: [ $versionJSON ] + , commitMessage: "wire-desktop: \(.)" + } + end + ] +' <<< "$latest" +) + +tempfile=$(mktemp) + +updated=$(jq --argjson hashes "$urlHashes" --slurpfile versions versions.json ' + $versions.[] as $old + | $old + map_values(with_entries(if .key == "url" + then { key: "hash" + , value: $hashes.[.value] + } + else . + end + ) + ) +' <<< "$latest" > $tempfile +) + +mv $tempfile versions.json + +printf '%s' "$commit" +exit 0 From f17eea9f30683576834589fe6bd6e396a687f90e Mon Sep 17 00:00:00 2001 From: toonn Date: Thu, 9 Jan 2025 14:57:24 +0100 Subject: [PATCH 003/305] wire-desktop: Add empty hash check --- pkgs/by-name/wi/wire-desktop/update.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wi/wire-desktop/update.sh b/pkgs/by-name/wi/wire-desktop/update.sh index baf3477b30b8..65fb554d6aab 100755 --- a/pkgs/by-name/wi/wire-desktop/update.sh +++ b/pkgs/by-name/wi/wire-desktop/update.sh @@ -37,8 +37,11 @@ urlHashes=$( function entries () { local sep='' for url in $(jq --raw-output '.[].url' <<< "$latest"); do - printf '%s"%s": "%s"\n' "$sep" "$url" \ - "$(nix-hash --to-sri --type sha256 $(nix-prefetch-url $url))" + hash=$(nix-hash --to-sri --type sha256 $(nix-prefetch-url $url)) + if [ -z "$hash" ]; then + printf 'Failed to retrieve hash for %s\n' "$url" 2>&1 + fi + printf '%s"%s": "%s"\n' "$sep" "$url" "$hash" sep=', ' done } From 5d21839349aebbbd71b611cbaa485d94284186f6 Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 15 Apr 2025 16:58:08 +0000 Subject: [PATCH 004/305] wire-desktop: linux 3.39.3653 -> 3.40.3718, macos 3.39.5211 -> 3.40.5285 --- pkgs/by-name/wi/wire-desktop/versions.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/wi/wire-desktop/versions.json b/pkgs/by-name/wi/wire-desktop/versions.json index c346a28aa85f..3ef3c71d0589 100644 --- a/pkgs/by-name/wi/wire-desktop/versions.json +++ b/pkgs/by-name/wi/wire-desktop/versions.json @@ -1,10 +1,10 @@ { "linux": { - "version": "3.39.3653", - "hash": "sha256-BbY+7fGAWW5CR/z4GeoBl5aOewCRuWzQjpQX4x1rzls=" + "version": "3.40.3718", + "hash": "sha256-1jBhF+Rnys8C3DaVbCKHDiylox2WG1qRvwnDbQrp1Mk=" }, "macos": { - "version": "3.39.5211", - "hash": "sha256-k6CIqHt67AFL70zdK0/91aQcpbb00OIggk5TF7y1IOY=" + "version": "3.40.5285", + "hash": "sha256-pcWB3irdPyDj55dWmNyc+oThVGgHtIu//EAk1k/56is=" } } From 15a8c6739ace8be4ff2d1c3fe43dcb3af337e2f9 Mon Sep 17 00:00:00 2001 From: misilelab Date: Sun, 29 Jun 2025 17:32:02 +0900 Subject: [PATCH 005/305] git-lfs: 3.6.1 -> 3.7.0 https://github.com/git-lfs/git-lfs/releases/tag/v3.7.0 Signed-off-by: misilelab --- pkgs/by-name/gi/git-lfs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/git-lfs/package.nix b/pkgs/by-name/gi/git-lfs/package.nix index 42d7b2b17abc..c834a9851eb6 100644 --- a/pkgs/by-name/gi/git-lfs/package.nix +++ b/pkgs/by-name/gi/git-lfs/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "git-lfs"; - version = "3.6.1"; + version = "3.7.0"; src = fetchFromGitHub { owner = "git-lfs"; repo = "git-lfs"; tag = "v${version}"; - hash = "sha256-zZ9VYWVV+8G3gojj1m74syvsYM1mX0YT4hKnpkdMAQk="; + hash = "sha256-EFuuyD83aYe6XMKbRfAykVMfGFOQ4I6ORvMRm0Q8vfM="; }; - vendorHash = "sha256-JT0r/hs7ZRtsYh4aXy+v8BjwiLvRJ10e4yRirqmWVW0="; + vendorHash = "sha256-6H0KpLin+DqwEg5bdzaxj2CoNSneZ/ET43MTrrdF3h8="; nativeBuildInputs = [ asciidoctor From cea6d77f662d2b06b714c44d5df4a7eae7df9ed7 Mon Sep 17 00:00:00 2001 From: "Berk D. Demir" Date: Fri, 4 Jul 2025 13:59:34 -0700 Subject: [PATCH 006/305] _1password-gui{,-beta}: Re-enable Wayland support - Gate Electron's Ozone platform hint behind NIXOS_OZONE_WL env var. - No need to gate on WAYLAND_DISPLAY because Electron will first check XDG_SESSION_TYPE==wayland [^1], if it fails, then it will check for WAYLAND_DISPLAY[^2], even setting it to `wayland-0` if it finds a `wayland-0` socket under $XDG_SESSION_DIR. - No need to restore `--enable-features=WaylandWindowDecorations` switch as it's been enabled by default since Aug 2023. https://github.com/electron/electron/pull/39644/files - No point in passing --enable-wayland-ime=true, which requires GTK4 but 1Password ships linking only against GTK3. [^1] linux/display_server_utils.cc:MaybeFixPlatformName - https://source.chromium.org/chromium/chromium/src/+/main:ui/linux/display_server_utils.cc;l=72-74;drc=3a35ef8d20836722c95b230f7248c73faea599e7;bpv=0;bpt=1 [^2] linux/display_server_utils.cc:InspectWaylandDisplay - https://source.chromium.org/chromium/chromium/src/+/main:ui/linux/display_server_utils.cc;l=34-51;drc=3a35ef8d20836722c95b230f7248c73faea599e7;bpv=1;bpt=1 --- pkgs/by-name/_1/_1password-gui/linux.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/_1/_1password-gui/linux.nix b/pkgs/by-name/_1/_1password-gui/linux.nix index 03fec5bd4922..009608d5f77e 100644 --- a/pkgs/by-name/_1/_1password-gui/linux.nix +++ b/pkgs/by-name/_1/_1password-gui/linux.nix @@ -146,12 +146,8 @@ stdenv.mkDerivation { makeShellWrapper $out/share/1password/1password $out/bin/1password \ "''${gappsWrapperArgs[@]}" \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} - # Currently half broken on wayland (e.g. no copy functionality) - # See: https://github.com/NixOS/nixpkgs/pull/232718#issuecomment-1582123406 - # Remove this comment when upstream fixes: - # https://1password.community/discussion/comment/624011/#Comment_624011 - #--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} \ + --add-flags "\''${NIXOS_OZONE_WL:+--ozone-platform-hint=auto}" ''; passthru.updateScript = ./update.sh; From 7cc37f1c7023de827d6066ffcbbd98b8f79afd5d Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Wed, 16 Jul 2025 13:20:47 +0200 Subject: [PATCH 007/305] mautrix-gmessages: 0.6.3 -> 0.6.4 --- pkgs/by-name/ma/mautrix-gmessages/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mautrix-gmessages/package.nix b/pkgs/by-name/ma/mautrix-gmessages/package.nix index 48e41c595bbf..037c43dd5dc5 100644 --- a/pkgs/by-name/ma/mautrix-gmessages/package.nix +++ b/pkgs/by-name/ma/mautrix-gmessages/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "mautrix-gmessages"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "mautrix"; repo = "gmessages"; tag = "v${version}"; - hash = "sha256-s6d0fUH0md4oHWDGFDRR3SKbJBCH6qJIk4En6J53yIM="; + hash = "sha256-J0nlO4jYa9QjkiZTHduzTjrkw5wG/0GD1y60cwgQfZ4="; }; - vendorHash = "sha256-d6UVKu9Al445JqwhPXSlQDs0hOTom56p+hVZN2C4S0M="; + vendorHash = "sha256-b+FUXQhNIymZLZw0NJLHK+Ka/kbpLO3Z56IlhmLmuVs="; ldflags = [ "-s" From 1d45f884d3a11025e09012bfe1b66a832a9a6967 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sat, 16 Aug 2025 18:50:40 +0200 Subject: [PATCH 008/305] boost189: init at 1.89.0 --- pkgs/development/libraries/boost/1.89.nix | 19 +++++++++++++++++++ pkgs/development/libraries/boost/default.nix | 1 + pkgs/top-level/all-packages.nix | 1 + 3 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/boost/1.89.nix diff --git a/pkgs/development/libraries/boost/1.89.nix b/pkgs/development/libraries/boost/1.89.nix new file mode 100644 index 000000000000..4a6611faa3af --- /dev/null +++ b/pkgs/development/libraries/boost/1.89.nix @@ -0,0 +1,19 @@ +{ callPackage, fetchurl, ... }@args: + +callPackage ./generic.nix ( + args + // rec { + version = "1.89.0"; + + src = fetchurl { + urls = [ + "mirror://sourceforge/boost/boost_${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.bz2" + "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${ + builtins.replaceStrings [ "." ] [ "_" ] version + }.tar.bz2" + ]; + # SHA256 from http://www.boost.org/users/history/version_1_89_0.html + sha256 = "85a33fa22621b4f314f8e85e1a5e2a9363d22e4f4992925d4bb3bc631b5a0c7a"; + }; + } +) diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix index 02fa12706ccf..db7a48fc3aa5 100644 --- a/pkgs/development/libraries/boost/default.nix +++ b/pkgs/development/libraries/boost/default.nix @@ -30,4 +30,5 @@ in boost186 = makeBoost ./1.86.nix; boost187 = makeBoost ./1.87.nix; boost188 = makeBoost ./1.88.nix; + boost189 = makeBoost ./1.89.nix; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be7f042314fa..fac2d4c50cd2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7635,6 +7635,7 @@ with pkgs; boost186 boost187 boost188 + boost189 ; boost = boost187; From bfce999b9d397a87db0d403b767e0380bf72f5a8 Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Sat, 16 Aug 2025 21:14:55 +0200 Subject: [PATCH 009/305] handheld-daemon: Fix chmod path in udev rules --- pkgs/by-name/ha/handheld-daemon/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix index a85dc8fdf190..4c06d473ee3e 100644 --- a/pkgs/by-name/ha/handheld-daemon/package.nix +++ b/pkgs/by-name/ha/handheld-daemon/package.nix @@ -70,6 +70,9 @@ python3Packages.buildPythonApplication rec { substituteInPlace src/hhd/plugins/plugin.py \ --replace-fail '"id"' '"${lib.getExe' coreutils "id"}"' + + substituteInPlace usr/lib/udev/rules.d/83-hhd.rules \ + --replace-fail '/bin/chmod' '${lib.getExe' coreutils "chmod"}' ''; build-system = with python3Packages; [ @@ -89,8 +92,8 @@ python3Packages.buildPythonApplication rec { doCheck = false; postInstall = '' - install -Dm644 $src/usr/lib/udev/rules.d/83-hhd.rules -t $out/lib/udev/rules.d/ - install -Dm644 $src/usr/lib/udev/hwdb.d/83-hhd.hwdb -t $out/lib/udev/hwdb.d/ + install -Dm644 usr/lib/udev/rules.d/83-hhd.rules -t $out/lib/udev/rules.d/ + install -Dm644 usr/lib/udev/hwdb.d/83-hhd.hwdb -t $out/lib/udev/hwdb.d/ ''; meta = { From c5906cc638ac55d695a1872d71a49aea1c6a50f8 Mon Sep 17 00:00:00 2001 From: Rein Date: Sun, 17 Aug 2025 22:47:08 +0200 Subject: [PATCH 010/305] maintainers: add rein --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 16e01024e300..bf48145227c4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21371,6 +21371,15 @@ githubId = 337811; name = "Rehno Lindeque"; }; + rein = { + email = "rein@rein.icu"; + github = "re1n0"; + githubId = 227051429; + name = "rein"; + keys = [ + { fingerprint = "66A8 1706 2227 9BD9 586A CEDD 5B29 A881 3F47 65C4"; } + ]; + }; relrod = { email = "ricky@elrod.me"; github = "relrod"; From 92769b79e6950e0f06df1dd40aa476d7e8b5b19e Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Sun, 17 Aug 2025 23:20:17 +0200 Subject: [PATCH 011/305] mautrix-gmessages: 0.6.4 -> 0.6.5 --- pkgs/by-name/ma/mautrix-gmessages/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mautrix-gmessages/package.nix b/pkgs/by-name/ma/mautrix-gmessages/package.nix index 037c43dd5dc5..13cbbf768df3 100644 --- a/pkgs/by-name/ma/mautrix-gmessages/package.nix +++ b/pkgs/by-name/ma/mautrix-gmessages/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "mautrix-gmessages"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "mautrix"; repo = "gmessages"; tag = "v${version}"; - hash = "sha256-J0nlO4jYa9QjkiZTHduzTjrkw5wG/0GD1y60cwgQfZ4="; + hash = "sha256-AIw7Grh4BEDT33N4004XjOtIepguO2SbdUmTHGJ1A2M="; }; - vendorHash = "sha256-b+FUXQhNIymZLZw0NJLHK+Ka/kbpLO3Z56IlhmLmuVs="; + vendorHash = "sha256-73a+OyauFJv2Rx6tbjwN9SBaXu4ZL5qM5xFt5m8a7c4="; ldflags = [ "-s" From 62674262590cc7b17b56e5f08ee6a52899a44616 Mon Sep 17 00:00:00 2001 From: Rein Date: Sun, 17 Aug 2025 22:47:42 +0200 Subject: [PATCH 012/305] tukai: init at 0.2.3 --- pkgs/by-name/tu/tukai/package.nix | 46 +++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/tu/tukai/package.nix diff --git a/pkgs/by-name/tu/tukai/package.nix b/pkgs/by-name/tu/tukai/package.nix new file mode 100644 index 000000000000..580514d0333d --- /dev/null +++ b/pkgs/by-name/tu/tukai/package.nix @@ -0,0 +1,46 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + writableTmpDirAsHomeHook, + versionCheckHook, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "tukai"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "hlsxx"; + repo = "tukai"; + tag = "v${finalAttrs.version}"; + hash = "sha256-YJtna4NIk9mmwymepFSZB8viUSPDU4XouRE5GCujSmk="; + }; + + cargoHash = "sha256-1V1DrewPGDJWmOoYdtK1HS/t83zFac/tgatfDTKxAmA="; + + nativeBuildInputs = [ + pkg-config + writableTmpDirAsHomeHook + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Terminal-based touch typing application"; + homepage = "https://github.com/hlsxx/tukai"; + changelog = "https://github.com/hlsxx/tukai/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + rein + ]; + mainProgram = "tukai"; + }; +}) From be1d19b458f8314d8989f971b1120028047e2e65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 19 Aug 2025 20:20:05 -0700 Subject: [PATCH 013/305] python3Packages.simsimd: 6.5.0 -> 6.5.1 Diff: https://github.com/ashvardanian/simsimd/compare/v6.5.0...v6.5.1 Changelog: https://github.com/ashvardanian/SimSIMD/releases/tag/v6.5.1 --- pkgs/development/python-modules/simsimd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simsimd/default.nix b/pkgs/development/python-modules/simsimd/default.nix index 6e7e889d9d10..23e66622b24f 100644 --- a/pkgs/development/python-modules/simsimd/default.nix +++ b/pkgs/development/python-modules/simsimd/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "simsimd"; - version = "6.5.0"; + version = "6.5.1"; pyproject = true; src = fetchFromGitHub { owner = "ashvardanian"; repo = "simsimd"; tag = "v${version}"; - hash = "sha256-un3Wyvj1vwhDiai2FSflkEYOpLbeH7aFznDilB7cupU="; + hash = "sha256-y7HCz3Lmlc0674VTMPXQGS7H9PMW+oeSvsYNsJq1MvI="; }; build-system = [ From 90e377d0f78c01af9715fcd5f263539b8d40fe24 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Wed, 20 Aug 2025 23:18:12 -0400 Subject: [PATCH 014/305] xbill: fix build on darwin; test that binary exists --- pkgs/by-name/xb/xbill/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/xb/xbill/package.nix b/pkgs/by-name/xb/xbill/package.nix index 0663503c3162..ac0711f07820 100644 --- a/pkgs/by-name/xb/xbill/package.nix +++ b/pkgs/by-name/xb/xbill/package.nix @@ -62,10 +62,17 @@ stdenv.mkDerivation rec { }) ]; + makeFlags = "-B"; + postInstall = '' install -Dm644 pixmaps/icon.xpm $out/share/pixmaps/xbill.xpm ''; + doInstallCheck = true; + postInstallCheck = '' + $out/bin/xbill --version + ''; + meta = { description = "Protect a computer network from getting infected"; homepage = "http://www.xbill.org/"; From c11cf2be5a4b32b16b71d919d996d87cc8290939 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 23 Aug 2025 08:18:48 +0800 Subject: [PATCH 015/305] wire: 0.6.0 -> 0.7.0 --- pkgs/by-name/wi/wire/go-modules.patch | 79 --------------------------- pkgs/by-name/wi/wire/package.nix | 24 +++----- 2 files changed, 9 insertions(+), 94 deletions(-) delete mode 100644 pkgs/by-name/wi/wire/go-modules.patch diff --git a/pkgs/by-name/wi/wire/go-modules.patch b/pkgs/by-name/wi/wire/go-modules.patch deleted file mode 100644 index cc6facd4d2d0..000000000000 --- a/pkgs/by-name/wi/wire/go-modules.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/go.mod b/go.mod -index 944aef0..ee579ff 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,6 +1,6 @@ - module github.com/google/wire - --go 1.12 -+go 1.18 - - require ( - github.com/google/go-cmp v0.2.0 -@@ -8,3 +8,5 @@ require ( - github.com/pmezard/go-difflib v1.0.0 - golang.org/x/tools v0.17.0 - ) -+ -+require golang.org/x/mod v0.14.0 // indirect -diff --git a/go.sum b/go.sum -index 8da3aae..fbca3c1 100644 ---- a/go.sum -+++ b/go.sum -@@ -4,56 +4,8 @@ github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN - github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= - github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= - github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= --github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= --golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= --golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= --golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= --golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= --golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= --golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= --golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= - golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= - golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= --golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= --golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= --golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= --golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= --golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= --golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= --golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= --golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= - golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= --golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= --golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= --golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= --golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= --golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= --golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= --golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= --golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= --golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= --golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= --golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= --golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= --golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= --golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= --golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= --golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= --golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= --golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= --golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= --golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= --golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= - golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= - golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= --golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/pkgs/by-name/wi/wire/package.nix b/pkgs/by-name/wi/wire/package.nix index de9274ebed35..ba932e591654 100644 --- a/pkgs/by-name/wi/wire/package.nix +++ b/pkgs/by-name/wi/wire/package.nix @@ -4,24 +4,18 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "wire"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "google"; repo = "wire"; - rev = "v${version}"; - hash = "sha256-bV/bb577JzGF37HmvRprxr+GWcLLiFRisURwtGDbqko="; + tag = "v${finalAttrs.version}"; + hash = "sha256-pKWi5qRCSgWdGwEzoV0nx2t1HUODBaC6ELyf//+fPog="; }; - patches = [ - # Bump the minimum version of Go required to compile packages in this module, - # as `golang.org/x/tools` requires go1.18 or later. - ./go-modules.patch - ]; - - vendorHash = "sha256-7IW97ZvCGlKCiVh8mKQutTdAxih7oFkXrKo4h3Pl9YY="; + vendorHash = "sha256-pUzYfFrKV0M1j1P6DVIGCe6FaY+OPbn5VNLHP0Xu2R0="; subPackages = [ "cmd/wire" ]; @@ -30,11 +24,11 @@ buildGoModule rec { "-w" ]; - meta = with lib; { + meta = { homepage = "https://github.com/google/wire"; description = "Code generation tool that automates connecting components using dependency injection"; mainProgram = "wire"; - license = licenses.asl20; - maintainers = with maintainers; [ svrana ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ svrana ]; }; -} +}) From 81b728b3eb6c9a03663ac98d0dee6df9a86cd6e5 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sat, 23 Aug 2025 01:46:37 -0400 Subject: [PATCH 016/305] virt-top: fix build for gettext 0.25 --- pkgs/applications/virtualization/virt-top/default.nix | 4 ++++ .../virtualization/virt-top/gettext-0.25.patch | 10 ++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/applications/virtualization/virt-top/gettext-0.25.patch diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix index 732aa7d11b08..2a29b0db8b2a 100644 --- a/pkgs/applications/virtualization/virt-top/default.nix +++ b/pkgs/applications/virtualization/virt-top/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { hash = "sha256-C1a47pWtjb38bnwmZ2Zq7/LlW3+BF5BGNMRFi97/ngU="; }; + patches = [ + ./gettext-0.25.patch + ]; + strictDeps = true; nativeBuildInputs = [ diff --git a/pkgs/applications/virtualization/virt-top/gettext-0.25.patch b/pkgs/applications/virtualization/virt-top/gettext-0.25.patch new file mode 100644 index 000000000000..476dbf7d722c --- /dev/null +++ b/pkgs/applications/virtualization/virt-top/gettext-0.25.patch @@ -0,0 +1,10 @@ +--- a/configure.ac.orig 2025-08-23 01:41:53 ++++ b/configure.ac 2025-08-23 01:42:14 +@@ -123,6 +123,7 @@ + + dnl Check for gettext. + AM_GNU_GETTEXT([external]) ++AM_GNU_GETTEXT_VERSION([0.25]) + + dnl Write gettext modules for the programs. + dnl http://www.le-gall.net/sylvain+violaine/documentation/ocaml-gettext/html/reference-manual/ch03s04.html From 2cddeeb21195301e2d8c36a4b3dcbb2d1c5e60c7 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 23 Aug 2025 09:50:42 +0200 Subject: [PATCH 017/305] lxterminal: small cleanup --- pkgs/by-name/lx/lxterminal/package.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/lx/lxterminal/package.nix b/pkgs/by-name/lx/lxterminal/package.nix index 9fb97945ae4e..e698ad2c501a 100644 --- a/pkgs/by-name/lx/lxterminal/package.nix +++ b/pkgs/by-name/lx/lxterminal/package.nix @@ -2,8 +2,7 @@ lib, stdenv, fetchFromGitHub, - automake, - autoconf, + autoreconfHook, intltool, pkg-config, gtk3, @@ -26,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "lxde"; repo = "lxterminal"; tag = finalAttrs.version; - sha256 = "sha256-oDWh0U4QWJ84hTfq1oaAmDJM+IY0eJqOUey0qBgZN5U="; + hash = "sha256-oDWh0U4QWJ84hTfq1oaAmDJM+IY0eJqOUey0qBgZN5U="; }; configureFlags = [ @@ -35,8 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ - automake - autoconf + autoreconfHook intltool pkg-config wrapGAppsHook3 @@ -57,10 +55,6 @@ stdenv.mkDerivation (finalAttrs: { ./respect-xml-catalog-files-var.patch ]; - preConfigure = '' - ./autogen.sh - ''; - doCheck = true; passthru.tests.test = nixosTests.terminal-emulators.lxterminal; From 1109cc1a416659de71fa2fedfcdbfc404f545254 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 21 May 2025 12:42:07 +0200 Subject: [PATCH 018/305] python313Packages.asyncinotify: 4.2.0 -> 4.2.1 Diff: https://github.com/absperf/asyncinotify/compare/refs/tags/v4.2.0...refs/tags/v4.2.1 Changelog: https://github.com/absperf/asyncinotify/releases/tag/v4.2.1 --- pkgs/development/python-modules/asyncinotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncinotify/default.nix b/pkgs/development/python-modules/asyncinotify/default.nix index 5855175d28b8..8be4b38815f1 100644 --- a/pkgs/development/python-modules/asyncinotify/default.nix +++ b/pkgs/development/python-modules/asyncinotify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asyncinotify"; - version = "4.2.0"; + version = "4.2.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "absperf"; repo = "asyncinotify"; tag = "v${version}"; - hash = "sha256-RHzjUoVhDxI7kYD5HWkb0f8X6BjjTTCAvSvASPy6FGk="; + hash = "sha256-X7R35LyrJaGJ70Houenpag0IMbqdsh+Sg9wMdzZmGfk="; }; build-system = [ flit-core ]; From ba6c6c9b05fe7b2776fb6615fde83946b9e972db Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 23 Aug 2025 09:32:49 +0200 Subject: [PATCH 019/305] lxde.lxrandr: 0.3.2 -> 0.3.3 --- pkgs/desktops/lxde/core/lxrandr/default.nix | 42 +++++++++++++------ .../respect-xml-catalog-files-var.patch | 15 +++++++ 2 files changed, 45 insertions(+), 12 deletions(-) create mode 100644 pkgs/desktops/lxde/core/lxrandr/respect-xml-catalog-files-var.patch diff --git a/pkgs/desktops/lxde/core/lxrandr/default.nix b/pkgs/desktops/lxde/core/lxrandr/default.nix index 2e395e8c10fa..2399a5c327d9 100644 --- a/pkgs/desktops/lxde/core/lxrandr/default.nix +++ b/pkgs/desktops/lxde/core/lxrandr/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, pkg-config, intltool, gtk2, @@ -9,35 +9,53 @@ xrandr, withGtk3 ? false, gtk3, + autoreconfHook, + libxslt, + docbook_xsl, + docbook_xml_dtd_412, + libxml2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lxrandr"; - version = "0.3.2"; + version = "0.3.3"; - src = fetchurl { - url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz"; - sha256 = "04n3vgh3ix12p8jfs4w0dyfq3anbjy33h7g53wbbqqc0f74xyplb"; + src = fetchFromGitHub { + owner = "lxde"; + repo = "lxrandr"; + tag = finalAttrs.version; + hash = "sha256-EGUnvV1FqQUJkjGwxgVecXOohAu8Qa8Prgk6xZfJBe4="; }; - configureFlags = lib.optional withGtk3 "--enable-gtk3"; + configureFlags = [ + "--enable-man" + ] + ++ lib.optional withGtk3 "--enable-gtk3"; nativeBuildInputs = [ + autoreconfHook pkg-config intltool + libxslt + libxml2 + docbook_xml_dtd_412 + docbook_xsl ]; + + patches = [ ./respect-xml-catalog-files-var.patch ]; + buildInputs = [ libX11 xrandr (if withGtk3 then gtk3 else gtk2) ]; - meta = with lib; { + meta = { description = "Standard screen manager of LXDE"; mainProgram = "lxrandr"; homepage = "https://lxde.org/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ rawkode ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ rawkode ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/desktops/lxde/core/lxrandr/respect-xml-catalog-files-var.patch b/pkgs/desktops/lxde/core/lxrandr/respect-xml-catalog-files-var.patch new file mode 100644 index 000000000000..598f506118f2 --- /dev/null +++ b/pkgs/desktops/lxde/core/lxrandr/respect-xml-catalog-files-var.patch @@ -0,0 +1,15 @@ +diff --git a/acinclude.m4 b/acinclude.m4 +index be626c5..b449b1b 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG], + [ + AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl + AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog]) +- if $jh_found_xmlcatalog && \ +- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then ++ # empty argument forces libxml to use XML_CATALOG_FILES variable ++ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then + AC_MSG_RESULT([found]) + ifelse([$3],,,[$3 + ])dnl From e8d7b1bee572a205919be9ccc4f5d80561c8c5f9 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 23 Aug 2025 10:02:54 +0200 Subject: [PATCH 020/305] lxde.lxpanel: change upstream source --- pkgs/desktops/lxde/core/lxpanel/default.nix | 23 ++++++++++----------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix index fa3f77840c45..f2ae37e93620 100644 --- a/pkgs/desktops/lxde/core/lxpanel/default.nix +++ b/pkgs/desktops/lxde/core/lxpanel/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, - fetchurl, - fetchpatch2, + fetchFromGitHub, + autoreconfHook, pkg-config, gettext, m4, @@ -34,9 +34,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "lxpanel"; version = "0.10.1"; - src = fetchurl { - url = "mirror://sourceforge/lxde/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-HjGPV9fja2HCOlBNA9JDDHja0ULBgERRBh8bPqVEHug="; + src = fetchFromGitHub { + owner = "lxde"; + repo = "lxpanel"; + tag = finalAttrs.version; + hash = "sha256-YUoDFO+Ip6uWjXMP+PTJqcfiGPAE4EfjQz8F4M0FxZM="; }; patches = [ @@ -48,13 +50,17 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + enableParallelBuilding = true; + nativeBuildInputs = [ + autoreconfHook pkg-config gettext m4 intltool libxmlxx ]; + buildInputs = [ (if withGtk3 then keybinder3 else keybinder) (if withGtk3 then gtk3 else gtk2) @@ -74,13 +80,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional supportAlsa alsa-lib; - postPatch = '' - substituteInPlace src/Makefile.in \ - --replace "@PACKAGE_CFLAGS@" "@PACKAGE_CFLAGS@ -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0" - substituteInPlace plugins/Makefile.in \ - --replace "@PACKAGE_CFLAGS@" "@PACKAGE_CFLAGS@ -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0" - ''; - configureFlags = lib.optional withGtk3 "--enable-gtk3"; meta = { From abe24880dcb8c8f22fd204d7cd477e0eee12f9dc Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 23 Aug 2025 10:05:44 +0200 Subject: [PATCH 021/305] lxde.lxpanel: 0.10.1 -> 0.11.1 --- pkgs/desktops/lxde/core/lxpanel/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix index f2ae37e93620..c970ea9e4ac3 100644 --- a/pkgs/desktops/lxde/core/lxpanel/default.nix +++ b/pkgs/desktops/lxde/core/lxpanel/default.nix @@ -32,24 +32,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "lxpanel"; - version = "0.10.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "lxde"; repo = "lxpanel"; tag = finalAttrs.version; - hash = "sha256-YUoDFO+Ip6uWjXMP+PTJqcfiGPAE4EfjQz8F4M0FxZM="; + hash = "sha256-jpe5AfRkyTVKQ9biOJiWKv0OVqP8gRCzfhSLDjnrEPc="; }; - patches = [ - # fix build with gcc14 - # https://github.com/lxde/lxpanel/commit/0853b0fc981285ebd2ac52f8dfc2a09b1090748c - (fetchpatch2 { - url = "https://github.com/lxde/lxpanel/commit/0853b0fc981285ebd2ac52f8dfc2a09b1090748c.patch?full_index=1"; - hash = "sha256-lj4CWdiUQhEc9J8UNKcP7/tmsGnPjA5pwXAok5YFW4M="; - }) - ]; - enableParallelBuilding = true; nativeBuildInputs = [ @@ -88,5 +79,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.ryneeverett ]; platforms = lib.platforms.linux; + mainProgram = "lxpanel"; }; }) From db00f84b57848a24dba7e1b75628db9075e65763 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 23 Aug 2025 10:25:07 +0200 Subject: [PATCH 022/305] lxde.lxtask: cleanup --- pkgs/desktops/lxde/core/lxtask/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix index 84e1b76ad428..4f83726c5b43 100644 --- a/pkgs/desktops/lxde/core/lxtask/default.nix +++ b/pkgs/desktops/lxde/core/lxtask/default.nix @@ -10,14 +10,14 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lxtask"; version = "0.1.12"; src = fetchFromGitHub { owner = "lxde"; repo = "lxtask"; - rev = version; + tag = finalAttrs.version; hash = "sha256-BI50jV/17jGX91rcmg98+gkoy35oNpdSSaVDLyagbIc="; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { homepage = "https://lxde.sourceforge.net/"; description = "Lightweight and desktop independent task manager"; mainProgram = "lxtask"; @@ -47,8 +47,8 @@ stdenv.mkDerivation rec { Desktop Environment, it's totally desktop independent and only requires pure GTK. ''; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; -} +}) From d85a0bbe79b3fb5661369b76735eac51ff8ddd79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 25 Aug 2025 00:43:49 +0200 Subject: [PATCH 023/305] nixos/rspamd: add and use package option --- nixos/modules/services/mail/rspamd.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index 6795de0c868c..5b09cfb217fb 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -304,8 +304,8 @@ in options = { services.rspamd = { - enable = mkEnableOption "rspamd, the Rapid spam filtering system"; + package = lib.mkPackageOption pkgs "rspamd" { }; debug = mkOption { type = types.bool; @@ -458,7 +458,7 @@ in }; # Allow users to run 'rspamc' and 'rspamadm'. - environment.systemPackages = [ pkgs.rspamd ]; + environment.systemPackages = [ cfg.package ]; users.users.${cfg.user} = { description = "rspamd daemon"; @@ -480,7 +480,7 @@ in restartTriggers = [ rspamdDir ]; serviceConfig = { - ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} -c /etc/rspamd/rspamd.conf -f"; + ExecStart = "${cfg.package}/bin/rspamd ${optionalString cfg.debug "-d"} -c /etc/rspamd/rspamd.conf -f"; Restart = "always"; User = "${cfg.user}"; From c5ad55629128935845fc5719acf2e08b1ce94ce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 20 Aug 2025 12:42:31 -0700 Subject: [PATCH 024/305] python3Packages.pytest-services: modernize --- .../development/python-modules/pytest-services/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix index c45a7649629f..edc37a706137 100644 --- a/pkgs/development/python-modules/pytest-services/default.nix +++ b/pkgs/development/python-modules/pytest-services/default.nix @@ -6,7 +6,6 @@ pylibmc, pytest, pytestCheckHook, - pythonOlder, requests, setuptools-scm, toml, @@ -19,8 +18,6 @@ buildPythonPackage rec { version = "2.2.2"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-services"; @@ -28,14 +25,14 @@ buildPythonPackage rec { hash = "sha256-kWgqb7+3/hZKUz7B3PnfxHZq6yU3JUeJ+mruqrMD/NE="; }; - nativeBuildInputs = [ + build-system = [ setuptools-scm toml ]; buildInputs = [ pytest ]; - propagatedBuildInputs = [ + dependencies = [ requests psutil zc-lockfile From 44b2c28900a9b4cf56d0e851f1c5a1d4335b0af4 Mon Sep 17 00:00:00 2001 From: Rebecca Kelly Date: Mon, 25 Aug 2025 19:10:45 -0400 Subject: [PATCH 025/305] tic-80: use lua5_3_compat instead of lua5_3 This is an alternate build of lua 5.3 that enables (at compile time) backwards compatibility for some 5.1/5.2 features that are otherwise removed in 5.3. TIC-80 expects these compatibility shims to be present and some TIC-80 games require them to function. The normal TIC-80 build enables this in its vendored copy of lua, but the Nix build turns on `PREFER_SYSTEM_LIBRARIES`, which means we need to enable the compatibility shims in the Lua package we pass to it. --- pkgs/by-name/ti/tic-80/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ti/tic-80/package.nix b/pkgs/by-name/ti/tic-80/package.nix index c42152b9f97b..d2bf8d043fb5 100644 --- a/pkgs/by-name/ti/tic-80/package.nix +++ b/pkgs/by-name/ti/tic-80/package.nix @@ -11,7 +11,7 @@ libGLU, libX11, janet, - lua5_3, + lua5_3_compat, quickjs, SDL2, # Whether to build TIC-80's "Pro" version, which is an incentive to support the project financially, @@ -85,7 +85,7 @@ stdenv.mkDerivation { libGLU libX11 janet - (lua5_3.withPackages (ps: [ ps.fennel ])) + (lua5_3_compat.withPackages (ps: [ ps.fennel ])) quickjs SDL2 ]; From dde48aff8993a9ae5f08a311eb871ad1ef3ffb6e Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 26 Aug 2025 10:55:54 +0800 Subject: [PATCH 026/305] temporal-cli: tweak update script --- pkgs/by-name/te/temporal-cli/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/te/temporal-cli/package.nix b/pkgs/by-name/te/temporal-cli/package.nix index f2d4c63c15af..ea43d1df4d01 100644 --- a/pkgs/by-name/te/temporal-cli/package.nix +++ b/pkgs/by-name/te/temporal-cli/package.nix @@ -56,7 +56,12 @@ buildGoModule (finalAttrs: { __darwinAllowLocalNetworking = true; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^v(\\d+\\.\\d+\\.\\d+)$" + ]; + }; meta = { description = "Command-line interface for running Temporal Server and interacting with Workflows, Activities, Namespaces, and other parts of Temporal"; From efeacf485257148762598ee3b5b60f08026fd2fe Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Tue, 26 Aug 2025 15:25:29 +0000 Subject: [PATCH 027/305] mealie: add 'pytest-asyncio' --- pkgs/by-name/me/mealie/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix index cd20fb65b996..4865bd59a9f5 100644 --- a/pkgs/by-name/me/mealie/package.nix +++ b/pkgs/by-name/me/mealie/package.nix @@ -102,7 +102,10 @@ pythonpkgs.buildPythonApplication rec { --set OUT "$out" ''; - nativeCheckInputs = with pythonpkgs; [ pytestCheckHook ]; + nativeCheckInputs = with pythonpkgs; [ + pytestCheckHook + pytest-asyncio + ]; # Needed for tests preCheck = '' From 557ff730dd5431eb1b2825c081b67ff74cf6617c Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sun, 24 Aug 2025 13:35:44 -0400 Subject: [PATCH 028/305] python313Packages.docling-jobkit: fix build --- pkgs/development/python-modules/docling-jobkit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/docling-jobkit/default.nix b/pkgs/development/python-modules/docling-jobkit/default.nix index 43bc73a5c1fe..423c92b124e4 100644 --- a/pkgs/development/python-modules/docling-jobkit/default.nix +++ b/pkgs/development/python-modules/docling-jobkit/default.nix @@ -76,6 +76,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "boto3" + "pandas" "pyarrow" ]; From de82920a5bcf9b7941c41cc1c8faa59b18a44dff Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Tue, 26 Aug 2025 15:32:44 +0000 Subject: [PATCH 029/305] mealie: 3.0.2 -> 3.1.2 --- pkgs/by-name/me/mealie/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix index 4865bd59a9f5..bed561c1c343 100644 --- a/pkgs/by-name/me/mealie/package.nix +++ b/pkgs/by-name/me/mealie/package.nix @@ -11,12 +11,12 @@ }: let - version = "3.0.2"; + version = "3.1.2"; src = fetchFromGitHub { owner = "mealie-recipes"; repo = "mealie"; tag = "v${version}"; - hash = "sha256-0GlHfyoVEqmfTDSN9BGXrLRkStRjWjv2qzZac2oYu7Q="; + hash = "sha256-8ZLXXA4NKR7GaCdgk8XDMjAssQsKP1wZpEZPYWpglwk="; }; frontend = callPackage (import ./mealie-frontend.nix src version) { }; From 1084d9612d699068964588aea0d6c1da7573e3fe Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 26 Aug 2025 17:48:45 +0200 Subject: [PATCH 030/305] python3Packages.greenlet: fix loongarch64-linux build --- pkgs/development/python-modules/greenlet/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index 03638e41377b..bde1bee459cd 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -37,7 +37,9 @@ let ]; # https://github.com/python-greenlet/greenlet/issues/395 - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isPower64 "-fomit-frame-pointer"; + env.NIX_CFLAGS_COMPILE = lib.optionalString ( + stdenv.hostPlatform.isPower64 || stdenv.hostPlatform.isLoongArch64 + ) "-fomit-frame-pointer"; preCheck = '' pushd ${placeholder "out"}/${python.sitePackages} From 81d0aed5d0bcf64b87a3dc20ca7c6da3750a97f3 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Tue, 26 Aug 2025 18:39:43 +0200 Subject: [PATCH 031/305] rgp: 2.3 -> 2.5 Changelog: https://github.com/GPUOpen-Tools/radeon_gpu_profiler/releases/tag/v2.5 --- pkgs/development/tools/rgp/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix index aaccbdba360f..57239437c85b 100644 --- a/pkgs/development/tools/rgp/default.nix +++ b/pkgs/development/tools/rgp/default.nix @@ -5,6 +5,7 @@ fetchurl, autoPatchelfHook, dbus, + directx-shader-compiler, fontconfig, freetype, glib, @@ -18,21 +19,23 @@ libxcb, libXi, libxkbcommon, + libxml2_13, ncurses, wayland, + xcbutil, zlib, }: let - buildNum = "2024-09-26-1411"; + buildNum = "2025-06-12-1681"; in stdenv.mkDerivation { pname = "rgp"; - version = "2.3"; + version = "2.5"; src = fetchurl { url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz"; - hash = "sha256-mgIFDStgat4E+67TaSLrcwgWTu7zLf7Nkn6zBlgeVcQ="; + hash = "sha256-e7IxoaZi77klrihRO6vDh1o2Clj5lNsVlzQ7btgLsu4="; }; nativeBuildInputs = [ @@ -42,6 +45,7 @@ stdenv.mkDerivation { buildInputs = [ dbus + directx-shader-compiler fontconfig freetype glib @@ -55,8 +59,10 @@ stdenv.mkDerivation { libxcb libXi libxkbcommon + libxml2_13 ncurses wayland + xcbutil zlib ]; From b80fccf9acd5f64c17b91e071355233b26263361 Mon Sep 17 00:00:00 2001 From: qbisi Date: Sun, 6 Jul 2025 14:43:03 +0800 Subject: [PATCH 032/305] python3Packages.mpi4py: skip spawn related tests for openmpi --- pkgs/development/python-modules/mpi4py/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index 202ba506dfe1..42422d61a0d7 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -54,6 +54,10 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; + # skip spawn related tests for openmpi implemention + # see https://github.com/mpi4py/mpi4py/issues/545#issuecomment-2343011460 + env.MPI4PY_TEST_SPAWN = if mpi.pname == "openmpi" then 0 else 1; + passthru = { inherit mpi; }; From 45fcd358c88d136fd5bd3d10bf42f8fc54477d7a Mon Sep 17 00:00:00 2001 From: qzylinra Date: Wed, 27 Aug 2025 07:03:07 +0800 Subject: [PATCH 033/305] rpi-imager: 1.9.4 -> 1.9.6 --- pkgs/by-name/rp/rpi-imager/package.nix | 47 +- .../remove-vendoring-and-lsblk-check.patch | 575 ------------------ .../rp/rpi-imager/remove-vendoring.patch | 94 +++ 3 files changed, 115 insertions(+), 601 deletions(-) delete mode 100644 pkgs/by-name/rp/rpi-imager/remove-vendoring-and-lsblk-check.patch create mode 100644 pkgs/by-name/rp/rpi-imager/remove-vendoring.patch diff --git a/pkgs/by-name/rp/rpi-imager/package.nix b/pkgs/by-name/rp/rpi-imager/package.nix index 286e1b74063a..d502c1ec40f1 100644 --- a/pkgs/by-name/rp/rpi-imager/package.nix +++ b/pkgs/by-name/rp/rpi-imager/package.nix @@ -10,7 +10,7 @@ qt6, wrapGAppsHook4, testers, - util-linux, + writeShellScriptBin, xz, gnutls, zstd, @@ -20,35 +20,35 @@ stdenv.mkDerivation (finalAttrs: { pname = "rpi-imager"; - version = "1.9.4"; + version = "1.9.6"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "rpi-imager"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ih7FeAKTKSvuwsrMgKQ0VEUYHHT6L99shxfAIjAzErk="; + hash = "sha256-HJLl0FOseZgW3DMi8M3SqIN/UHBDkIc09vKcenhSnO8="; }; - sourceRoot = "${finalAttrs.src.name}/src"; - - # By default, the builder checks for JSON support in lsblk by running "lsblk --json", - # but that throws an error, as /sys/dev doesn't exist in the sandbox. - # This patch removes the check. - # remove-vendoring.patch from - # https://gitlab.archlinux.org/archlinux/packaging/packages/rpi-imager/-/raw/main/remove-vendoring.patch - patches = [ ./remove-vendoring-and-lsblk-check.patch ]; + patches = [ ./remove-vendoring.patch ]; postPatch = '' - substituteInPlace ../debian/org.raspberrypi.rpi-imager.desktop \ + substituteInPlace debian/org.raspberrypi.rpi-imager.desktop \ --replace-fail "/usr/bin/" "" ''; + preConfigure = '' + cd src + ''; + nativeBuildInputs = [ cmake pkg-config qt6.wrapQtAppsHook wrapGAppsHook4 - util-linux + # Fool upstream's cmake lsblk check a bit + (writeShellScriptBin "lsblk" '' + echo "our lsblk has --json support but it doesn't work in our sandbox" + '') ]; buildInputs = [ @@ -67,16 +67,11 @@ stdenv.mkDerivation (finalAttrs: { qt6.qtwayland ]; - cmakeFlags = - # Disable vendoring - [ - (lib.cmakeBool "ENABLE_VENDORING" false) - ] - # Disable telemetry and update check. - ++ lib.optionals (!enableTelemetry) [ - (lib.cmakeBool "ENABLE_CHECK_VERSION" false) - (lib.cmakeBool "ENABLE_TELEMETRY" false) - ]; + cmakeFlags = [ + # Isn't relevant for Nix + (lib.cmakeBool "ENABLE_CHECK_VERSION" false) + (lib.cmakeBool "ENABLE_TELEMETRY" enableTelemetry) + ]; qtWrapperArgs = [ "--unset QT_QPA_PLATFORMTHEME" @@ -105,8 +100,8 @@ stdenv.mkDerivation (finalAttrs: { ymarkus anthonyroussel ]; - platforms = lib.platforms.all; - # does not build on darwin - broken = stdenv.hostPlatform.isDarwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + # could not find xz + badPlatforms = lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/rp/rpi-imager/remove-vendoring-and-lsblk-check.patch b/pkgs/by-name/rp/rpi-imager/remove-vendoring-and-lsblk-check.patch deleted file mode 100644 index b4db2c0efc91..000000000000 --- a/pkgs/by-name/rp/rpi-imager/remove-vendoring-and-lsblk-check.patch +++ /dev/null @@ -1,575 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -4,6 +4,7 @@ - cmake_minimum_required(VERSION 3.22) - OPTION (ENABLE_CHECK_VERSION "Check for version updates" ON) - OPTION (ENABLE_TELEMETRY "Enable sending telemetry" ON) -+OPTION (ENABLE_VENDORING "Use vendored dependencies" ON) - - # We use FetchContent_Populate() instead of FetchContent_MakeAvailable() to allow EXCLUDE_FROM_ALL - # This prevents the dependencies from being built by default, which is our desired behavior -@@ -58,410 +59,156 @@ if (APPLE) - endforeach() - endif(APPLE) - -+## Preferentially build the bundled code. Full vendoring is to follow in a later version. -+ - # Bundled code will occasionally use identical options - eg, BUILD_TESTING. - set(BUILD_TESTING OFF) - set(BUILD_STATIC_LIBS ON) - set(BUILD_SHARED_LIBS OFF) - --include(FetchContent) -- --# Bundled liblzma --set(LIBLZMA_VERSION "5.8.1") --FetchContent_Declare(xz -- GIT_REPOSITORY https://github.com/tukaani-project/xz.git -- GIT_TAG v${LIBLZMA_VERSION} -- ${USE_OVERRIDE_FIND_PACKAGE} --) --set(XZ_MICROLZMA_DECODER OFF CACHE BOOL "" FORCE) --set(XZ_MICROLZMA_ENCODER OFF CACHE BOOL "" FORCE) --set(XZ_LZIP_DECODER OFF CACHE BOOL "" FORCE) --set(XZ_ENABLE_SANDBOX OFF CACHE BOOL "" FORCE) --set(XZ_BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE) --set(XZ_ENABLE_DOXYGEN OFF CACHE BOOL "" FORCE) --set(XZ_DECODERS -- lzma1 -- lzma2 -- delta --) --set(XZ_ENCODERS -- lzma1 -- lzma2 -- delta --) --set(CREATE_LZMA_SYMLINKS OFF CACHE BOOL "" FORCE) --set(CREATE_XZ_SYMLINKS OFF CACHE BOOL "" FORCE) --FetchContent_GetProperties(xz) --if(NOT xz_POPULATED) -- FetchContent_Populate(xz) -- add_subdirectory(${xz_SOURCE_DIR} ${xz_BINARY_DIR} EXCLUDE_FROM_ALL) --endif() --unset(XZ_MICROLZMA_DECODER) --unset(XZ_MICROLZMA_ENCODER) --unset(XZ_LZIP_DECODER) --unset(XZ_ENABLE_SANDBOX) --unset(XZ_BUILD_SHARED_LIBS) --unset(XZ_ENABLE_DOXYGEN) --unset(CREATE_LZMA_SYMLINKS) --unset(CREATE_XZ_SYMLINKS) --set(LIBLZMA_FOUND true CACHE BOOL "" FORCE) --set(LIBLZMA_INCLUDE_DIR ${xz_SOURCE_DIR}/src/liblzma/api CACHE PATH "" FORCE) --set(LIBLZMA_INCLUDE_DIRS ${xz_SOURCE_DIR}/src/liblzma/api CACHE PATH "" FORCE) --set(LIBLZMA_LIBRARY liblzma CACHE FILEPATH "" FORCE) --set(LIBLZMA_LIBRARIES ${xz_BINARY_DIR}/liblzma.a CACHE FILEPATH "" FORCE) --set(LIBLZMA_HAS_AUTO_DECODER true CACHE BOOL "" FORCE) --set(LIBLZMA_HAS_EASY_ENCODER true CACHE BOOL "" FORCE) --set(LIBLZMA_HAS_LZMA_PRESET true CACHE BOOL "" FORCE) -- --# Bundled zstd --set(ZSTD_VERSION "1.5.7") --FetchContent_Declare(zstd -- GIT_REPOSITORY https://github.com/facebook/zstd.git -- GIT_TAG v${ZSTD_VERSION} -- SOURCE_SUBDIR build/cmake -- ${USE_OVERRIDE_FIND_PACKAGE} --) --set(ZSTD_BUILD_PROGRAMS OFF CACHE BOOL "" FORCE) --set(ZSTD_BUILD_SHARED OFF CACHE BOOL "" FORCE) --set(ZSTD_BUILD_STATIC ON CACHE BOOL "" FORCE) --set(ZSTD_BUILD_TESTS OFF CACHE BOOL "" FORCE) --set(ZSTD_BUILD_DICTBUILDER OFF CACHE BOOL "" FORCE) --FetchContent_GetProperties(zstd) --if(NOT zstd_POPULATED) -- FetchContent_Populate(zstd) -- add_subdirectory(${zstd_SOURCE_DIR}/build/cmake ${zstd_BINARY_DIR} EXCLUDE_FROM_ALL) --endif() --unset(ZSTD_BUILD_PROGRAMS) --unset(ZSTD_BUILD_SHARED) --unset(ZSTD_BUILD_STATIC) --unset(ZSTD_BUILD_TESTS) --unset(ZSTD_BUILD_DICTBUILDER) --set(ZSTD_FOUND true CACHE BOOL "" FORCE) --set(Zstd_VERSION ${ZSTD_VERSION} CACHE STRING "" FORCE) --set(Zstd_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "" FORCE) --set(ZSTD_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "" FORCE) --set(Zstd_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "" FORCE) --set(ZSTD_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "" FORCE) --set(Zstd_LIBRARIES libzstd_static CACHE FILEPATH "" FORCE) --set(ZSTD_LIBRARIES libzstd_static CACHE FILEPATH "" FORCE) --set(ZSTD_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-build/lib/libzstd.a CACHE FILEPATH "" FORCE) -- --# Remote nghttp2 --set(NGHTTP2_VERSION "1.65.0") --FetchContent_Declare(nghttp2 -- GIT_REPOSITORY https://github.com/nghttp2/nghttp2.git -- GIT_TAG v${NGHTTP2_VERSION} -- ${USE_OVERRIDE_FIND_PACKAGE} --) --set(BUILD_EXAMPLES OFF) --set(ENABLE_LIB_ONLY ON) --set(ENABLE_FAILMALLOC OFF) --FetchContent_GetProperties(nghttp2) --if(NOT nghttp2_POPULATED) -- FetchContent_Populate(nghttp2) -- add_subdirectory(${nghttp2_SOURCE_DIR} ${nghttp2_BINARY_DIR} EXCLUDE_FROM_ALL) --endif() --unset(ENABLE_LIB_ONLY) --unset(ENABLE_FAILMALLOC) --unset(BUILD_EXAMPLES) --set(NGHTTP2_LIBRARIES nghttp2_static CACHE FILEPATH "" FORCE) --set(NGHTTP2_LIBRARY nghttp2_static CACHE FILEPATH "" FORCE) --set(NGHTTP2_INCLUDE_DIR ${nghttp2_SOURCE_DIR}/lib CACHE PATH "" FORCE) --set(NGHTTP2_INCLUDE_DIRS ${nghttp2_SOURCE_DIR}/lib CACHE PATH "" FORCE) --set(NGHTTP2_FOUND true CACHE BOOL "" FORCE) -- -- --# Bundled zlib --set(ZLIB_VERSION "1.4.1.1") --set(ZLIB_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) --set(ZLIB_BUILD_SHARED OFF CACHE BOOL "" FORCE) --set(ZLIB_BUILD_STATIC ON CACHE BOOL "" FORCE) --set(ZLIB_BUILD_TESTS OFF CACHE BOOL "" FORCE) --set(SKIP_INSTALL_ALL ON CACHE BOOL "" FORCE) --FetchContent_Declare(zlib -- GIT_REPOSITORY https://github.com/madler/zlib.git -- GIT_TAG 5a82f71ed1dfc0bec044d9702463dbdf84ea3b71 # v1.4.1.1, as of 27/05/2025 -- ${USE_OVERRIDE_FIND_PACKAGE} --) --FetchContent_GetProperties(zlib) --if(NOT zlib_POPULATED) -- FetchContent_Populate(zlib) -- add_subdirectory(${zlib_SOURCE_DIR} ${zlib_BINARY_DIR} EXCLUDE_FROM_ALL) --endif() --unset(ZLIB_BUILD_EXAMPLES) --unset(ZLIB_BUILD_SHARED) --unset(ZLIB_BUILD_STATIC) --unset(ZLIB_BUILD_TESTS) --unset(SKIP_INSTALL_ALL) --# Set zlib variables that libarchive's CMake will use --set(ZLIB_USE_STATIC_LIBS ON CACHE BOOL "" FORCE) # This is to help FindZlib.cmake find the static library over the shared one --set(ZLIB_ROOT ${zlib_SOURCE_DIR} CACHE PATH "" FORCE) -- --# On Windows with MinGW, zlib builds with .a extension, not .lib --# Set the correct library path before find_package --if (WIN32 AND CMAKE_COMPILER_IS_GNUCXX) -- set(ZLIB_LIBRARY ${zlib_BINARY_DIR}/libzlibstatic.a CACHE FILEPATH "" FORCE) -- set(ZLIB_LIBRARIES ${zlib_BINARY_DIR}/libzlibstatic.a CACHE STRING "" FORCE) --else() -- set(ZLIB_LIBRARY ${zlib_BINARY_DIR}/libz.a CACHE FILEPATH "" FORCE) -- set(ZLIB_LIBRARIES ${zlib_BINARY_DIR}/libz.a CACHE STRING "" FORCE) --endif() -- --# Since we're building zlib ourselves with EXCLUDE_FROM_ALL, we don't need find_package --# Instead, we'll create the ZLIB::ZLIB target manually and set all required variables --set(ZLIB_INCLUDE_DIR ${zlib_SOURCE_DIR} CACHE PATH "" FORCE) --set(ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR} CACHE PATH "" FORCE) -- --# Create ZLIB::ZLIB target manually since we're not using find_package --# Set zlib variables that other packages expect --set(ZLIB_FOUND TRUE CACHE BOOL "" FORCE) --add_library(ZLIB::ZLIB STATIC IMPORTED) --if (WIN32 AND CMAKE_COMPILER_IS_GNUCXX) -- set_target_properties(ZLIB::ZLIB PROPERTIES -- IMPORTED_LOCATION "${zlib_BINARY_DIR}/libzlibstatic.a" -- INTERFACE_INCLUDE_DIRECTORIES "${zlib_SOURCE_DIR};${zlib_BINARY_DIR}" -- ) -- add_dependencies(ZLIB::ZLIB zlibstatic) --else() -- set_target_properties(ZLIB::ZLIB PROPERTIES -- IMPORTED_LOCATION "${zlib_BINARY_DIR}/libz.a" -- INTERFACE_INCLUDE_DIRECTORIES "${zlib_SOURCE_DIR};${zlib_BINARY_DIR}" -+if(ENABLE_VENDORING) -+ # Bundled liblzma -+ set(XZ_MICROLZMA_DECODER OFF) -+ set(XZ_MICROLZMA_ENCODER OFF) -+ set(XZ_LZIP_DECODER OFF) -+ set(XZ_ENABLE_SANDBOX OFF) -+ set(XZ_BUILD_SHARED_LIBS OFF) -+ set(XZ_ENABLE_DOXYGEN OFF) -+ set(XZ_DECODERS -+ lzma1 -+ lzma2 -+ delta - ) -- add_dependencies(ZLIB::ZLIB zlibstatic) --endif() -- --# Debug output --message(STATUS "ZLIB_LIBRARY set to: ${ZLIB_LIBRARY}") --message(STATUS "ZLIB_LIBRARIES set to: ${ZLIB_LIBRARIES}") --message(STATUS "ZLIB_INCLUDE_DIRS set to: ${ZLIB_INCLUDE_DIRS}") -- --# Bundled libarchive -- --set(ENABLE_WERROR OFF CACHE BOOL "") --set(ENABLE_INSTALL OFF CACHE BOOL "") --set(ENABLE_TEST OFF CACHE BOOL "") --set(ENABLE_CNG OFF CACHE BOOL "") --set(ENABLE_MBEDTLS OFF CACHE BOOL "") --set(ENABLE_NETTLE OFF CACHE BOOL "") --set(ENABLE_OPENSSL OFF CACHE BOOL "") --# Configure libarchive with explicit zlib support --set(ENABLE_ZLIB ON CACHE BOOL "") --set(ENABLE_BZip2 OFF CACHE BOOL "") --set(ENABLE_LZ4 OFF CACHE BOOL "") --set(ENABLE_LZO OFF CACHE BOOL "") --set(ENABLE_LIBB2 OFF CACHE BOOL "") --set(ENABLE_LIBXML2 OFF CACHE BOOL "") --set(ENABLE_EXPAT OFF CACHE BOOL "") --set(ENABLE_PCREPOSIX OFF CACHE BOOL "") --set(ENABLE_PCRE2POSIX OFF CACHE BOOL "") --set(ENABLE_LIBGCC OFF CACHE BOOL "") --set(ENABLE_TAR OFF CACHE BOOL "") --set(ENABLE_CPIO OFF CACHE BOOL "") --set(ENABLE_CAT OFF CACHE BOOL "") --set(BUILD_SHARED_LIBS OFF CACHE BOOL "") --set(ARCHIVE_BUILD_STATIC_LIBS ON CACHE BOOL "") --set(ARCHIVE_BUILD_EXAMPLES OFF CACHE BOOL "") --set(ENABLE_ZSTD ON CACHE BOOL "") --set(POSIX_REGEX_LIB "libc" CACHE STRING "" FORCE) --set(LIBARCHIVE_VERSION "3.8.0") -- --# Create a patch script to fix ZSTD detection in libarchive --set(LIBARCHIVE_PATCH_FILE "${CMAKE_CURRENT_BINARY_DIR}/libarchive_zstd_patch.cmake") --file(WRITE ${LIBARCHIVE_PATCH_FILE} " --# Read the original CMakeLists.txt --file(READ \"\${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt\" CONTENT) -- --# Find the start and end of the ZSTD section --string(FIND \"\${CONTENT}\" \"IF(ZSTD_FOUND)\" ZSTD_START) --string(FIND \"\${CONTENT}\" \"MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR)\" ZSTD_END) -- --if(ZSTD_START GREATER -1 AND ZSTD_END GREATER -1) -- # Calculate positions -- math(EXPR ZSTD_END \"\${ZSTD_END} + 40\") # Length of \"MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR)\" -- -- # Extract parts before and after the ZSTD section -- string(SUBSTRING \"\${CONTENT}\" 0 \${ZSTD_START} BEFORE_ZSTD) -- string(SUBSTRING \"\${CONTENT}\" \${ZSTD_END} -1 AFTER_ZSTD) -- -- # Create the new ZSTD section -- set(NEW_ZSTD_SECTION \"IF(ZSTD_FOUND) -- SET(HAVE_ZSTD_H 1) -- INCLUDE_DIRECTORIES(\\\${ZSTD_INCLUDE_DIR}) -- LIST(APPEND ADDITIONAL_LIBS \\\${ZSTD_LIBRARY}) -- -- # Check if ZSTD variables were provided externally (indicating static build) -- get_property(ZSTD_LIB_IS_CACHE CACHE ZSTD_LIBRARY PROPERTY TYPE) -- get_property(ZSTD_INC_IS_CACHE CACHE ZSTD_INCLUDE_DIR PROPERTY TYPE) -- if(ZSTD_LIB_IS_CACHE AND ZSTD_INC_IS_CACHE) -- # Skip function checks for static builds and assume all functions are available -- message(STATUS \\\"Using provided ZSTD library: \\\${ZSTD_LIBRARY}\\\") -- SET(HAVE_LIBZSTD 1) -- SET(HAVE_ZSTD_compressStream 1) -- SET(HAVE_ZSTD_minCLevel 1) -- else() -- # Original function checks for dynamic builds -- CMAKE_PUSH_CHECK_STATE() -- SET(CMAKE_REQUIRED_LIBRARIES \\\${ZSTD_LIBRARY}) -- SET(CMAKE_REQUIRED_INCLUDES \\\${ZSTD_INCLUDE_DIR}) -- CHECK_FUNCTION_EXISTS(ZSTD_decompressStream HAVE_LIBZSTD) -- CHECK_FUNCTION_EXISTS(ZSTD_compressStream HAVE_ZSTD_compressStream) -- CHECK_FUNCTION_EXISTS(ZSTD_minCLevel HAVE_ZSTD_minCLevel) -- CMAKE_POP_CHECK_STATE() -- endif() --ENDIF(ZSTD_FOUND) --MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR)\") -- -- # Combine the parts -- set(NEW_CONTENT \"\${BEFORE_ZSTD}\${NEW_ZSTD_SECTION}\") -- -- # Write the modified content back -- file(WRITE \"\${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt\" \"\${NEW_CONTENT}\${AFTER_ZSTD}\") -- message(STATUS \"Patched libarchive CMakeLists.txt for static ZSTD support\") --else() -- message(WARNING \"Could not find ZSTD section in libarchive CMakeLists.txt\") --endif() --") -- --FetchContent_Declare(libarchive -- GIT_REPOSITORY https://github.com/libarchive/libarchive.git -- GIT_TAG v${LIBARCHIVE_VERSION} -- PATCH_COMMAND ${CMAKE_COMMAND} -P ${LIBARCHIVE_PATCH_FILE} -- ${USE_OVERRIDE_FIND_PACKAGE} --) --FetchContent_GetProperties(libarchive) --if(NOT libarchive_POPULATED) -- FetchContent_Populate(libarchive) -- add_subdirectory(${libarchive_SOURCE_DIR} ${libarchive_BINARY_DIR} EXCLUDE_FROM_ALL) --endif() -- --# Ensure libarchive is built after zlib --if (TARGET archive_static AND TARGET ZLIB::ZLIB) -- add_dependencies(archive_static ZLIB::ZLIB) --endif() -- --unset(POSIX_REGEX_LIB) --unset(ENABLE_WERROR) --unset(ENABLE_INSTALL) --unset(ENABLE_TEST) --unset(ENABLE_CNG) --unset(ENABLE_MBEDTLS) --unset(ENABLE_NETTLE) --unset(ENABLE_OPENSSL) --unset(ENABLE_ZLIB) --unset(ENABLE_BZip2) --unset(ENABLE_LZ4) --unset(ENABLE_LZO) --unset(ENABLE_LIBB2) --unset(ENABLE_LIBXML2) --unset(ENABLE_EXPAT) --unset(ENABLE_PCREPOSIX) --unset(ENABLE_PCRE2POSIX) --unset(ENABLE_LIBGCC) --unset(ENABLE_TAR) --unset(ENABLE_CPIO) --unset(ENABLE_CAT) --unset(ARCHIVE_BUILD_SHARED_LIBS) --unset(ENABLE_ZSTD) --set(LibArchive_FOUND true CACHE BOOL "" FORCE) --set(LibArchive_LIBRARIES archive_static CACHE FILEPATH "" FORCE) --set(LibArchive_INCLUDE_DIR ${libarchive_SOURCE_DIR}/libarchive CACHE PATH "" FORCE) --set(LibArchive_INCLUDE_DIRS ${libarchive_SOURCE_DIR}/libarchive CACHE PATH "" FORCE) -- --# Bundled libcurl --set(CURL_VERSION "8.13.0") --string(REPLACE "." "_" CURL_TAG ${CURL_VERSION}) --FetchContent_Declare(curl -- GIT_REPOSITORY https://github.com/curl/curl.git -- GIT_TAG curl-${CURL_TAG} -- ${USE_OVERRIDE_FIND_PACKAGE} --) --set(BUILD_CURL_EXE OFF CACHE BOOL "" FORCE) --set(BUILD_LIBCURL_DOCS OFF CACHE BOOL "" FORCE) --set(BUILD_MISC_DOCS OFF CACHE BOOL "" FORCE) --set(ENABLE_CURL_MANUAL OFF CACHE BOOL "" FORCE) --set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) --set(CURL_USE_LIBPSL OFF CACHE BOOL "" FORCE) --set(CURL_USE_LIBSSH2 OFF CACHE BOOL "" FORCE) --set(CURL_DISABLE_ALTSVC ON CACHE BOOL "" FORCE) --set(CURL_DISABLE_KERBEROS_AUTH ON CACHE BOOL "" FORCE) --set(CURL_DISABLE_DICT ON CACHE BOOL "" FORCE) --set(CURL_DISABLE_DISABLE_FORM_API ON CACHE BOOL "" FORCE) --set(CURL_DISABLE_FTP ON CACHE BOOL "" FORCE) --set(CURL_DISABLE_GOPHER ON CACHE BOOL "" FORCE) --set(CURL_DISABLE_IMAP ON CACHE BOOL "" FORCE) --set(CURL_DISABLE_LDAP ON CACHE BOOL "" FORCE) --set(CURL_DISABLE_LDAPS ON CACHE BOOL "" FORCE) --set(CURL_DISABLE_MQTT ON CACHE BOOL "" FORCE) --set(CURL_DISABLE_NETRC ON CACHE BOOL "" FORCE) --set(CURL_DISABLE_POP3 ON CACHE BOOL "" FORCE) --set(CURL_DISABLE_RTSP ON CACHE BOOL "" FORCE) --set(CURL_DISABLE_SMTP ON CACHE BOOL "" FORCE) --set(CURL_DISABLE_TELNET ON CACHE BOOL "" FORCE) --set(CURL_DISABLE_TFTP ON CACHE BOOL "" FORCE) --set(CURL_ZSTD ON) --set(CURL_ENABLE_EXPORT_TARGET OFF CACHE BOOL "" FORCE) --set(CURL_DISABLE_INSTALL ON) --if (APPLE) -- # TODO: SecureTransport is a deprecated API in macOS, supporting -- # only up to TLS v1.2. cURL has not implemented the replacement, -- # Network.framework, and so we will need to select an alternative. -- # Best recommendation: Libressl, as used by Apple in the curl binary -- # on macOS. -- set(CURL_USE_SECTRANSP ON) -- set(CURL_DEFAULT_SSL_BACKEND "secure-transport") -- set(USE_APPLE_IDN ON) --else() -- if (WIN32) -- set(CURL_USE_SCHANNEL ON) -- set(CURL_DEFAULT_SSL_BACKEND "schannel") -- else () -- set(CURL_USE_GNUTLS ON) -- set(CURL_DEFAULT_SSL_BACKEND "gnutls") -- endif(WIN32) --endif(APPLE) -- --FetchContent_GetProperties(curl) --if(NOT curl_POPULATED) -- FetchContent_Populate(curl) -- add_subdirectory(${curl_SOURCE_DIR} ${curl_BINARY_DIR} EXCLUDE_FROM_ALL) -+ set(XZ_ENCODERS "") -+ set(CREATE_LZMA_SYMLINKS OFF) -+ set(CREATE_XZ_SYMLINKS OFF) -+ add_subdirectory(dependencies/xz-5.8.1) -+ set(LIBLZMA_FOUND true) -+ set(LIBLZMA_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/xz-5.8.1/src/liblzma/api FORCE) -+ set(LIBLZMA_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/xz-5.8.1/src/liblzma/api FORCE) -+ set(LIBLZMA_LIBRARY liblzma) -+ set(LIBLZMA_LIBRARIES liblzma) -+ -+ # Bundled zstd -+ set(ZSTD_BUILD_PROGRAMS OFF CACHE BOOL "" FORCE) -+ set(ZSTD_BUILD_SHARED OFF CACHE BOOL "" FORCE) -+ set(ZSTD_BUILD_TESTS OFF CACHE BOOL "" FORCE) -+ set(ZSTD_BUILD_DICTBUILDER OFF CACHE BOOL "" FORCE) -+ add_subdirectory(dependencies/zstd-1.5.7/build/cmake) -+ set(Zstd_FOUND true) -+ set(ZSTD_FOUND true) -+ set(Zstd_VERSION "1.5.7") -+ set(ZSTD_VERSION "1.5.7") -+ set(Zstd_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.7/lib) -+ set(ZSTD_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.7/lib) -+ set(Zstd_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.7/lib) -+ set(ZSTD_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.7/lib) -+ set(Zstd_LIBRARIES libzstd_static) -+ set(ZSTD_LIBRARIES libzstd_static) -+ set(ZSTD_LIBRARY libzstd_static) -+ -+ # Bundled zlib -+ set(ZLIB_BUILD_EXAMPLES OFF) -+ set(SKIP_INSTALL_ALL ON) -+ add_subdirectory(dependencies/zlib-1.4.1.1) -+ set(ZLIB_FOUND TRUE) -+ set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/zlib-1.4.1.1 CACHE PATH "zlib include dir") -+ set(ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/zlib-1.4.1.1 CACHE PATH "zlib include dir") -+ set(ZLIB_LIBRARY zlibstatic) -+ set(ZLIB_LIBRARIES zlibstatic) -+ -+ # Bundled libarchive -+ set(ARCHIVE_ENABLE_WERROR OFF CACHE BOOL "") -+ set(ARCHIVE_ENABLE_INSTALL OFF CACHE BOOL "") -+ set(ARCHIVE_ENABLE_TEST OFF CACHE BOOL "") -+ set(ARCHIVE_ENABLE_CNG OFF CACHE BOOL "") -+ set(ARCHIVE_ENABLE_MBEDTLS OFF CACHE BOOL "") -+ set(ARCHIVE_ENABLE_NETTLE OFF CACHE BOOL "") -+ set(ARCHIVE_ENABLE_OPENSSL OFF CACHE BOOL "") -+ set(ARCHIVE_ENABLE_BZip2 OFF CACHE BOOL "") -+ set(ARCHIVE_ENABLE_LZ4 OFF CACHE BOOL "") -+ set(ARCHIVE_ENABLE_LZO OFF CACHE BOOL "") -+ set(ARCHIVE_ENABLE_LIBB2 OFF CACHE BOOL "") -+ set(ARCHIVE_ENABLE_LIBXML2 OFF CACHE BOOL "") -+ set(ARCHIVE_ENABLE_EXPAT OFF CACHE BOOL "") -+ set(ARCHIVE_ENABLE_PCREPOSIX OFF CACHE BOOL "") -+ set(ARCHIVE_ENABLE_PCRE2POSIX OFF CACHE BOOL "") -+ set(ARCHIVE_ENABLE_LIBGCC OFF CACHE BOOL "") -+ set(ARCHIVE_ENABLE_TAR OFF CACHE BOOL "") -+ set(ARCHIVE_ENABLE_CPIO OFF CACHE BOOL "") -+ set(ARCHIVE_ENABLE_CAT OFF CACHE BOOL "") -+ set(ARCHIVE_BUILD_SHARED_LIBS OFF CACHE BOOL "") -+ add_subdirectory(dependencies/libarchive-3.7.7) -+ set(LibArchive_FOUND true) -+ set(LibArchive_LIBRARIES archive_static) -+ set(LibArchive_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/libarchive-3.7.8/libarchive) -+ -+ # Bundled libcurl -+ set(CMAKE_CURL_INCLUDES) -+ set(BUILD_CURL_EXE OFF CACHE BOOL "" FORCE) -+ set(BUILD_LIBCURL_DOCS OFF CACHE BOOL "" FORCE) -+ set(ENABLE_CURL_MANUAL OFF CACHE BOOL "" FORCE) -+ set(CURL_USE_LIBPSL OFF) -+ set(CURL_USE_LIBSSH2 OFF) -+ set(CURL_DISABLE_ALTSVC ON) -+ set(CURL_DISABLE_KERBEROS_AUTH ON) -+ set(CURL_DISABLE_DICT ON) -+ set(CURL_DISABLE_DISABLE_FORM_API ON) -+ set(CURL_DISABLE_FTP ON) -+ set(CURL_DISABLE_GOPHER ON) -+ set(CURL_DISABLE_IMAP ON) -+ set(CURL_DISABLE_LDAP ON) -+ set(CURL_DISABLE_LDAPS ON) -+ set(CURL_DISABLE_MQTT ON) -+ set(CURL_DISABLE_NETRC ON) -+ set(CURL_DISABLE_POP3 ON) -+ set(CURL_DISABLE_RTSP ON) -+ set(CURL_DISABLE_SMTP ON) -+ set(CURL_DISABLE_TELNET ON) -+ set(CURL_DISABLE_TFTP ON) -+ set(CURL_ZSTD ON) -+ set(CURL_ENABLE_EXPORT_TARGET OFF CACHE BOOL "" FORCE) -+ set(CURL_DISABLE_INSTALL ON) -+ if (APPLE) -+ # TODO: SecureTransport is a deprecated API in macOS, supporting -+ # only up to TLS v1.2. cURL has not implemented the replacement, -+ # Network.framework, and so we will need to select an alternative. -+ # Best recommendation: Libressl, as used by Apple in the curl binary -+ # on macOS. -+ set(CURL_USE_SECTRANSP ON) -+ set(CURL_DEFAULT_SSL_BACKEND "secure-transport") -+ set(USE_APPLE_IDN ON) -+ else() -+ if (WIN32) -+ set(CURL_USE_SCHANNEL ON) -+ set(CURL_DEFAULT_SSL_BACKEND "schannel") -+ else () -+ set(CURL_USE_GNUTLS ON) -+ set(CURL_DEFAULT_SSL_BACKEND "gnutls") -+ endif(WIN32) -+ endif(APPLE) -+ -+ add_subdirectory(dependencies/curl-8.13.0) -+ set(CURL_FOUND true) -+ set(CURL_LIBRARIES libcurl_static) -+ set(CURL_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/curl-8.13.0/include) -+ set(CURL_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/curl-8.13.0/include) -+ -+elseif (NOT ENABLE_VENDORING AND UNIX) -+ # Find the libraries that were subject to vendoring in the system instead, -+ # To keep the possibility of delivery via Linux distro packages -+ find_package(ZLIB) -+ if(ZLIB_FOUND) -+ set(EXTRALIBS ${EXTRALIBS} ZLIB::ZLIB) -+ endif() -+ find_package(LibLZMA) -+ if(LIBLZMA_FOUND) -+ set(EXTRALIBS ${EXTRALIBS} LibLZMA::LibLZMA) -+ endif() -+ find_package(CURL 8.13.0 REQUIRED) -+ find_package(LibArchive 3.7.8 REQUIRED) - endif() - --unset(BUILD_CURL_EXE) --unset(BUILD_LIBCURL_DOCS) --unset(BUILD_MISC_DOCS) --unset(ENABLE_CURL_MANUAL) --unset(BUILD_EXAMPLES) --unset(CURL_USE_LIBPSL) --unset(CURL_USE_LIBSSH2) --unset(CURL_DISABLE_ALTSVC) --unset(CURL_DISABLE_KERBEROS_AUTH) --unset(CURL_DISABLE_DICT) --unset(CURL_DISABLE_DISABLE_FORM_API) --unset(CURL_DISABLE_FTP) --unset(CURL_DISABLE_GOPHER) --unset(CURL_DISABLE_IMAP) --unset(CURL_DISABLE_LDAP) --unset(CURL_DISABLE_LDAPS) --unset(CURL_DISABLE_MQTT) --unset(CURL_DISABLE_NETRC) --unset(CURL_DISABLE_POP3) --unset(CURL_DISABLE_RTSP) --unset(CURL_DISABLE_SMTP) --unset(CURL_DISABLE_TELNET) --unset(CURL_DISABLE_TFTP) --unset(CURL_ZSTD) --unset(CURL_ENABLE_EXPORT_TARGET) --unset(CURL_DISABLE_INSTALL) --unset(CURL_USE_SECTRANSP) --unset(CURL_DEFAULT_SSL_BACKEND) --unset(USE_APPLE_IDN) --unset(CURL_USE_SCHANNEL) --unset(CURL_USE_GNUTLS) -- --set(CURL_FOUND true CACHE BOOL "" FORCE) --set(CURL_LIBRARIES libcurl_static CACHE FILEPATH "" FORCE) --set(CURL_INCLUDE_DIR ${curl_SOURCE_DIR}/include CACHE PATH "" FORCE) --set(CURL_INCLUDE_DIRS ${curl_SOURCE_DIR}/include CACHE PATH "" FORCE) -- - # Adding headers explicity so they are displayed in Qt Creator - set(HEADERS config.h imagewriter.h networkaccessmanagerfactory.h nan.h drivelistitem.h drivelistmodel.h drivelistmodelpollthread.h driveformatthread.h powersaveblocker.h cli.h - devicewrapper.h devicewrapperblockcacheentry.h devicewrapperpartition.h devicewrapperstructs.h devicewrapperfatpartition.h wlancredentials.h -@@ -928,11 +675,6 @@ else() - if (NOT LSBLK) - message(FATAL_ERROR "Unable to locate lsblk (used for disk enumeration)") - endif() -- -- execute_process(COMMAND "${LSBLK}" "--json" OUTPUT_QUIET RESULT_VARIABLE ret) -- if (ret EQUAL "1") -- message(FATAL_ERROR "util-linux package too old. lsblk does not support --json (used for disk enumeration)") -- endif() - endif() - - install(TARGETS ${PROJECT_NAME} DESTINATION bin) diff --git a/pkgs/by-name/rp/rpi-imager/remove-vendoring.patch b/pkgs/by-name/rp/rpi-imager/remove-vendoring.patch new file mode 100644 index 000000000000..10906221599f --- /dev/null +++ b/pkgs/by-name/rp/rpi-imager/remove-vendoring.patch @@ -0,0 +1,94 @@ +diff --git c/src/CMakeLists.txt w/src/CMakeLists.txt +index f9e020ce..c5f71914 100644 +--- c/src/CMakeLists.txt ++++ w/src/CMakeLists.txt +@@ -68,6 +68,10 @@ set(BUILD_SHARED_LIBS OFF) + + include(FetchContent) + ++find_package(LibLZMA) ++if(LIBLZMA_FOUND) ++ set(EXTRALIBS ${EXTRALIBS} LibLZMA::LibLZMA) ++else() + # Bundled liblzma + set(LIBLZMA_VERSION "5.8.1") + FetchContent_Declare(xz +@@ -114,7 +118,10 @@ set(LIBLZMA_LIBRARIES ${xz_BINARY_DIR}/liblzma.a CACHE FILEPATH "" FORCE) + set(LIBLZMA_HAS_AUTO_DECODER true CACHE BOOL "" FORCE) + set(LIBLZMA_HAS_EASY_ENCODER true CACHE BOOL "" FORCE) + set(LIBLZMA_HAS_LZMA_PRESET true CACHE BOOL "" FORCE) ++endif() + ++find_package(zstd ${ZSTD_VERSION}) ++if(NOT zstd_FOUND) + # Bundled zstd + set(ZSTD_VERSION "1.5.7") + FetchContent_Declare(zstd +@@ -147,32 +154,12 @@ set(ZSTD_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH + set(Zstd_LIBRARIES libzstd_static CACHE FILEPATH "" FORCE) + set(ZSTD_LIBRARIES libzstd_static CACHE FILEPATH "" FORCE) + set(ZSTD_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-build/lib/libzstd.a CACHE FILEPATH "" FORCE) +- +-# Remote nghttp2 +-set(NGHTTP2_VERSION "1.66.0") +-FetchContent_Declare(nghttp2 +- GIT_REPOSITORY https://github.com/nghttp2/nghttp2.git +- GIT_TAG v${NGHTTP2_VERSION} +- ${USE_OVERRIDE_FIND_PACKAGE} +-) +-set(BUILD_EXAMPLES OFF) +-set(ENABLE_LIB_ONLY ON) +-set(ENABLE_FAILMALLOC OFF) +-FetchContent_GetProperties(nghttp2) +-if(NOT nghttp2_POPULATED) +- FetchContent_Populate(nghttp2) +- add_subdirectory(${nghttp2_SOURCE_DIR} ${nghttp2_BINARY_DIR} EXCLUDE_FROM_ALL) + endif() +-unset(ENABLE_LIB_ONLY) +-unset(ENABLE_FAILMALLOC) +-unset(BUILD_EXAMPLES) +-set(NGHTTP2_LIBRARIES nghttp2_static CACHE FILEPATH "" FORCE) +-set(NGHTTP2_LIBRARY nghttp2_static CACHE FILEPATH "" FORCE) +-set(NGHTTP2_INCLUDE_DIR ${nghttp2_SOURCE_DIR}/lib CACHE PATH "" FORCE) +-set(NGHTTP2_INCLUDE_DIRS ${nghttp2_SOURCE_DIR}/lib CACHE PATH "" FORCE) +-set(NGHTTP2_FOUND true CACHE BOOL "" FORCE) +- + ++find_package(ZLIB) ++if(ZLIB_FOUND) ++ set(EXTRALIBS ${EXTRALIBS} ZLIB::ZLIB) ++else() + # Bundled zlib + set(ZLIB_VERSION "1.4.1.1") + set(ZLIB_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) +@@ -236,7 +223,10 @@ endif() + message(STATUS "ZLIB_LIBRARY set to: ${ZLIB_LIBRARY}") + message(STATUS "ZLIB_LIBRARIES set to: ${ZLIB_LIBRARIES}") + message(STATUS "ZLIB_INCLUDE_DIRS set to: ${ZLIB_INCLUDE_DIRS}") ++endif() + ++find_package(LibArchive) ++if(NOT LibArchive_FOUND) + # Bundled libarchive + + set(ENABLE_WERROR OFF CACHE BOOL "") +@@ -368,8 +358,11 @@ set(LibArchive_FOUND true CACHE BOOL "" FORCE) + set(LibArchive_LIBRARIES archive_static CACHE FILEPATH "" FORCE) + set(LibArchive_INCLUDE_DIR ${libarchive_SOURCE_DIR}/libarchive CACHE PATH "" FORCE) + set(LibArchive_INCLUDE_DIRS ${libarchive_SOURCE_DIR}/libarchive CACHE PATH "" FORCE) ++endif() + + # Bundled libcurl ++find_package(CURL) ++if(NOT CURL_FOUND) + set(CURL_VERSION "8.14.1") + string(REPLACE "." "_" CURL_TAG ${CURL_VERSION}) + FetchContent_Declare(curl +@@ -516,6 +509,7 @@ set(CURL_FOUND true CACHE BOOL "" FORCE) + set(CURL_LIBRARIES libcurl_static CACHE FILEPATH "" FORCE) + set(CURL_INCLUDE_DIR ${curl_SOURCE_DIR}/include CACHE PATH "" FORCE) + set(CURL_INCLUDE_DIRS ${curl_SOURCE_DIR}/include CACHE PATH "" FORCE) ++endif() + + # Adding headers explicity so they are displayed in Qt Creator + set(HEADERS config.h imagewriter.h networkaccessmanagerfactory.h nan.h drivelistitem.h drivelistmodel.h drivelistmodelpollthread.h driveformatthread.h powersaveblocker.h cli.h From 27b23c793a053b3cb802100a15a82d714c17629c Mon Sep 17 00:00:00 2001 From: kyehn Date: Tue, 26 Aug 2025 23:40:48 +0000 Subject: [PATCH 034/305] flutter335: 3.35.1 -> 3.35.2 --- .../compilers/flutter/versions/3_35/data.json | 78 +++++++++---------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/pkgs/development/compilers/flutter/versions/3_35/data.json b/pkgs/development/compilers/flutter/versions/3_35/data.json index 683e5ea6230b..94de9bf9b4d5 100644 --- a/pkgs/development/compilers/flutter/versions/3_35/data.json +++ b/pkgs/development/compilers/flutter/versions/3_35/data.json @@ -1,17 +1,17 @@ { - "version": "3.35.1", - "engineVersion": "1e9a811bf8e70466596bcf0ea3a8b5adb5f17f7f", + "version": "3.35.2", + "engineVersion": "a8bfdfc394deaed5c57bd45a64ac4294dc976a72", "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=", "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416", "channel": "stable", "engineHashes": { "aarch64-linux": { - "aarch64-linux": "sha256-A25De1Xqz5Tx63hx43xt+r/cH4TEbaSMMSxu3J114n4=", - "x86_64-linux": "sha256-A25De1Xqz5Tx63hx43xt+r/cH4TEbaSMMSxu3J114n4=" + "aarch64-linux": "sha256-igJHgYBcmd7H9wkfe1lD5dAPio+Ivf5yXqV9E3xEtSY=", + "x86_64-linux": "sha256-igJHgYBcmd7H9wkfe1lD5dAPio+Ivf5yXqV9E3xEtSY=" }, "x86_64-linux": { - "aarch64-linux": "sha256-0XT18p8kcfepSG84p8Un0I71pLwJyBlH3wscCmJ9z2Q=", - "x86_64-linux": "sha256-0XT18p8kcfepSG84p8Un0I71pLwJyBlH3wscCmJ9z2Q=" + "aarch64-linux": "sha256-rJSkU4oRGdIgJUbplvMjWzHC1vEAljmbQPHr43hM25w=", + "x86_64-linux": "sha256-rJSkU4oRGdIgJUbplvMjWzHC1vEAljmbQPHr43hM25w=" } }, "dartVersion": "3.9.0", @@ -21,53 +21,53 @@ "x86_64-darwin": "sha256-JNN27p/a9+7xcIkrLLM2Tuyih5R2Q0YibXqcm3QXc8U=", "aarch64-darwin": "sha256-VG0o4b0dPTXQmABr3+iO+xv/2IcXFt018CQYnD4kXAs=" }, - "flutterHash": "sha256-1G7PZLMm0VsT0CWygxOk0GGiXbtJGIBBvccQcaqV+EQ=", + "flutterHash": "sha256-g9g10WVf7CNoXYN8DVsWRK9N2Gz/2iQufMiQkJC35ZA=", "artifactHashes": { "android": { - "aarch64-darwin": "sha256-CEf/NUC06z7IhB4tSzIV6jia/3OElUaqNgYM9P6emQM=", - "aarch64-linux": "sha256-7q/ewvhysJ5SVdkILK0qkX1fw4GKi/U82sRq6JX6fzA=", - "x86_64-darwin": "sha256-CEf/NUC06z7IhB4tSzIV6jia/3OElUaqNgYM9P6emQM=", - "x86_64-linux": "sha256-7q/ewvhysJ5SVdkILK0qkX1fw4GKi/U82sRq6JX6fzA=" + "aarch64-darwin": "sha256-niFZajz1h1MsHxb6aqJuc3uQC269Y1/D9TzS38+wkaA=", + "aarch64-linux": "sha256-BTcZlYd4LtSIlE25m0Lwde36Uhg0j4I9AhB10V6RiFY=", + "x86_64-darwin": "sha256-niFZajz1h1MsHxb6aqJuc3uQC269Y1/D9TzS38+wkaA=", + "x86_64-linux": "sha256-BTcZlYd4LtSIlE25m0Lwde36Uhg0j4I9AhB10V6RiFY=" }, "fuchsia": { - "aarch64-darwin": "sha256-gFqWUHEGh1fpyuiDRYOzEG2mKbDfBxP0TAfJ7nU0D+s=", - "aarch64-linux": "sha256-gFqWUHEGh1fpyuiDRYOzEG2mKbDfBxP0TAfJ7nU0D+s=", - "x86_64-darwin": "sha256-gFqWUHEGh1fpyuiDRYOzEG2mKbDfBxP0TAfJ7nU0D+s=", - "x86_64-linux": "sha256-gFqWUHEGh1fpyuiDRYOzEG2mKbDfBxP0TAfJ7nU0D+s=" + "aarch64-darwin": "sha256-e6IrgTD8fCM6+buSkQNl9nXbWKm4cRCFamWqXiFLcLo=", + "aarch64-linux": "sha256-e6IrgTD8fCM6+buSkQNl9nXbWKm4cRCFamWqXiFLcLo=", + "x86_64-darwin": "sha256-e6IrgTD8fCM6+buSkQNl9nXbWKm4cRCFamWqXiFLcLo=", + "x86_64-linux": "sha256-e6IrgTD8fCM6+buSkQNl9nXbWKm4cRCFamWqXiFLcLo=" }, "ios": { - "aarch64-darwin": "sha256-h0fXGxzmzikdYdTrbG4+kzxj/kX5/Pz70SEcAK/KKTs=", - "aarch64-linux": "sha256-h0fXGxzmzikdYdTrbG4+kzxj/kX5/Pz70SEcAK/KKTs=", - "x86_64-darwin": "sha256-h0fXGxzmzikdYdTrbG4+kzxj/kX5/Pz70SEcAK/KKTs=", - "x86_64-linux": "sha256-h0fXGxzmzikdYdTrbG4+kzxj/kX5/Pz70SEcAK/KKTs=" + "aarch64-darwin": "sha256-li5fk3EaAUwoTh65pY6UlqXuPSxmV0BvESHshMKayew=", + "aarch64-linux": "sha256-li5fk3EaAUwoTh65pY6UlqXuPSxmV0BvESHshMKayew=", + "x86_64-darwin": "sha256-li5fk3EaAUwoTh65pY6UlqXuPSxmV0BvESHshMKayew=", + "x86_64-linux": "sha256-li5fk3EaAUwoTh65pY6UlqXuPSxmV0BvESHshMKayew=" }, "linux": { - "aarch64-darwin": "sha256-DqDfJGNm91wT927OoBYO+h5biif/993ebrPj+I8sMrg=", - "aarch64-linux": "sha256-DqDfJGNm91wT927OoBYO+h5biif/993ebrPj+I8sMrg=", - "x86_64-darwin": "sha256-7AWtDjucIOEHc77Ff2FUoh09GUbMzwZQ9r2MAv9atQs=", - "x86_64-linux": "sha256-7AWtDjucIOEHc77Ff2FUoh09GUbMzwZQ9r2MAv9atQs=" + "aarch64-darwin": "sha256-8q40JUNVYSdsKBbvdrcB/5OxjR5ZcLheGTHFja/We4U=", + "aarch64-linux": "sha256-8q40JUNVYSdsKBbvdrcB/5OxjR5ZcLheGTHFja/We4U=", + "x86_64-darwin": "sha256-B8j4FoHyQXY+/EcV9WHE+Lo6E27+uOnfCmDYggRCFKI=", + "x86_64-linux": "sha256-B8j4FoHyQXY+/EcV9WHE+Lo6E27+uOnfCmDYggRCFKI=" }, "macos": { - "aarch64-darwin": "sha256-x/6qDRviSVg0Z3fPN/c9iJn75csvuxJj1ytONcQ7ueo=", - "aarch64-linux": "sha256-x/6qDRviSVg0Z3fPN/c9iJn75csvuxJj1ytONcQ7ueo=", - "x86_64-darwin": "sha256-x/6qDRviSVg0Z3fPN/c9iJn75csvuxJj1ytONcQ7ueo=", - "x86_64-linux": "sha256-x/6qDRviSVg0Z3fPN/c9iJn75csvuxJj1ytONcQ7ueo=" + "aarch64-darwin": "sha256-QQ+17TPTB0FTogOkyPRQkII65t03+xVJ3q7CnIhw5vA=", + "aarch64-linux": "sha256-QQ+17TPTB0FTogOkyPRQkII65t03+xVJ3q7CnIhw5vA=", + "x86_64-darwin": "sha256-QQ+17TPTB0FTogOkyPRQkII65t03+xVJ3q7CnIhw5vA=", + "x86_64-linux": "sha256-QQ+17TPTB0FTogOkyPRQkII65t03+xVJ3q7CnIhw5vA=" }, "universal": { - "aarch64-darwin": "sha256-+EfVH+XpI4d/UlFs6rZKdfK00IzDFz9o4CuzJRdDNfw=", - "aarch64-linux": "sha256-1jYtJ/toFDfUG2HIKyM1XT9rl0Fzl3or67q9ZVl1vDg=", - "x86_64-darwin": "sha256-nACkicnu+Pkimpyx3q/uxUcLz/xAExLbXHl+Ex4kFzA=", - "x86_64-linux": "sha256-XGxRc2LOqgxd8Zbd2XWhA6yj39WJCa5DC5UGYIiw4RY=" + "aarch64-darwin": "sha256-Nv36HXVFlpGTmWlobDiMJczVIgUShvoVi8dqAWpbkJM=", + "aarch64-linux": "sha256-SlB09ZiXtz3DJSiv9gTy4ogHpJ9JRVzgy2nmqqmGMYs=", + "x86_64-darwin": "sha256-yZbzy+DNREPxzZ/F6BdjmQoOrUE+5rIw6E4CuUePPWQ=", + "x86_64-linux": "sha256-AdA1xjD5nkBTzp7k1FLe218FD9o1aSJHZx1nOyhneGY=" }, "web": { - "aarch64-darwin": "sha256-dltAxQPWbNoVDxz7qEc0NnE1xjDeB7r3eAwQU2iH1Vs=", - "aarch64-linux": "sha256-dltAxQPWbNoVDxz7qEc0NnE1xjDeB7r3eAwQU2iH1Vs=", - "x86_64-darwin": "sha256-dltAxQPWbNoVDxz7qEc0NnE1xjDeB7r3eAwQU2iH1Vs=", - "x86_64-linux": "sha256-dltAxQPWbNoVDxz7qEc0NnE1xjDeB7r3eAwQU2iH1Vs=" + "aarch64-darwin": "sha256-kq7rn++V7zp78DszHBQuMUB/qpsbwt2kSscSJPnL1KQ=", + "aarch64-linux": "sha256-kq7rn++V7zp78DszHBQuMUB/qpsbwt2kSscSJPnL1KQ=", + "x86_64-darwin": "sha256-kq7rn++V7zp78DszHBQuMUB/qpsbwt2kSscSJPnL1KQ=", + "x86_64-linux": "sha256-kq7rn++V7zp78DszHBQuMUB/qpsbwt2kSscSJPnL1KQ=" }, "windows": { - "x86_64-darwin": "sha256-D/B3prbqobFlHO0dvq8fKcavqXxrvX3kqfDpma7QfNQ=", - "x86_64-linux": "sha256-D/B3prbqobFlHO0dvq8fKcavqXxrvX3kqfDpma7QfNQ=" + "x86_64-darwin": "sha256-Q6Afxmf3j6SJFhWXRnyVrf4n3+hQ6baWPAoxi4eyY5o=", + "x86_64-linux": "sha256-Q6Afxmf3j6SJFhWXRnyVrf4n3+hQ6baWPAoxi4eyY5o=" } }, "pubspecLock": { @@ -346,11 +346,11 @@ "dependency": "direct main", "description": { "name": "dwds", - "sha256": "b14203ae57d2ef575d115e30a303c7fe643c5e6af5acfb1330d4c57091ee11c6", + "sha256": "b2f7e3241de2adbd5caa87ae9d05a0f9c59b9cbb8c77aeaeebf6c277821f25d5", "url": "https://pub.dev" }, "source": "hosted", - "version": "24.4.0" + "version": "24.4.0+1" }, "extension_discovery": { "dependency": "direct main", From 76a1e5dea8ef0106eb65f1aeb32a82e353ec74d6 Mon Sep 17 00:00:00 2001 From: George Huebner Date: Wed, 2 Apr 2025 14:30:23 -0500 Subject: [PATCH 035/305] nethack: automatically recover from crashes, pass arguments to game --- pkgs/games/nethack/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index c9f804c43e15..3b26417034a7 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -193,7 +193,12 @@ stdenv.mkDerivation rec { for i in $out/games/lib/nethackdir/*; do ln -s \$i \$(basename \$i) done - $out/games/nethack + set +e + $out/games/nethack "\$@" + if [[ \$? -gt 128 ]]; then + echo "nethack exited abnormally, attempting to recover save file..." + ./recover -d . ?lock.0 + fi EOF chmod +x $out/bin/nethack ${lib.optionalString x11Mode "mv $out/bin/nethack $out/bin/nethack-x11"} From 6bd33a77040c7dee5c72b09ef1d853ddd1ddd194 Mon Sep 17 00:00:00 2001 From: George Huebner Date: Wed, 2 Apr 2025 15:01:51 -0500 Subject: [PATCH 036/305] nethack: fix build in darwin sandbox --- pkgs/games/nethack/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index 3b26417034a7..cd13c26accf3 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -120,6 +120,7 @@ stdenv.mkDerivation rec { -e 's,^HACKDIR=.*$,HACKDIR=\$(PREFIX)/games/lib/\$(GAME)dir,' \ -e 's,^SHELLDIR=.*$,SHELLDIR=\$(PREFIX)/games,' \ -e 's,^CFLAGS=-g,CFLAGS=,' \ + -e 's,/usr/bin/true,${coreutils}/bin/true,g' \ -i sys/unix/hints/macosx10.14 sed -e '/define CHDIR/d' -i include/config.h ${lib.optionalString qtMode '' From 255fca4d8b37766f250c1b337ba95f30b4407789 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Aug 2025 04:54:01 +0000 Subject: [PATCH 037/305] debian-devscripts: 2.25.18 -> 2.25.15+deb13u1 --- pkgs/by-name/de/debian-devscripts/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/debian-devscripts/package.nix b/pkgs/by-name/de/debian-devscripts/package.nix index d211a934998b..089ea98cbbfe 100644 --- a/pkgs/by-name/de/debian-devscripts/package.nix +++ b/pkgs/by-name/de/debian-devscripts/package.nix @@ -30,14 +30,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "debian-devscripts"; - version = "2.25.18"; + version = "2.25.15+deb13u1"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "devscripts"; tag = "v${finalAttrs.version}"; - hash = "sha256-POmUwNYKfdWda80T44S6x2Dg2TpezMirXuiI95Z077Q="; + hash = "sha256-szyVLpeIQozPXwBgL4nIYog4znUzweIt8q7nczo5q+g="; }; patches = [ From db86cf426260aa78e016c0664de995f666e08b46 Mon Sep 17 00:00:00 2001 From: Alex James Date: Wed, 27 Aug 2025 00:04:49 -0500 Subject: [PATCH 038/305] neofetch: default x11Support to true on Linux only neofetch currently fails to build on platforms other than Linux with x11Support = true as ueberzug 18.3.1 only works on Linux (see #437381). Only set x11Support to true for Linux. Other platforms could be supported by switching to ueberzugpp. Fixes: #436876 --- pkgs/by-name/ne/neofetch/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ne/neofetch/package.nix b/pkgs/by-name/ne/neofetch/package.nix index f4ba8f9ec05c..54f1f0884324 100644 --- a/pkgs/by-name/ne/neofetch/package.nix +++ b/pkgs/by-name/ne/neofetch/package.nix @@ -5,7 +5,7 @@ bash, makeWrapper, pciutils, - x11Support ? !stdenvNoCC.hostPlatform.isOpenBSD, + x11Support ? stdenvNoCC.hostPlatform.isLinux, ueberzug, fetchpatch, }: From e6dd01d44cfc2b6fa6b59a68bda98ec8bdaa18db Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Wed, 27 Aug 2025 20:26:32 +0900 Subject: [PATCH 039/305] typescript-go: 0-unstable-2025-08-12 -> 0-unstable-2025-08-26 This version requires go 1.25 or higher. Therefore bumped and pined to buildGo125Module. ref: https://github.com/microsoft/typescript-go/commit/cc3d47d62c01981794e33d89e93dd0186336c004 --- pkgs/by-name/ty/typescript-go/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix index d8c840508d98..d19bcbc56f1e 100644 --- a/pkgs/by-name/ty/typescript-go/package.nix +++ b/pkgs/by-name/ty/typescript-go/package.nix @@ -1,19 +1,22 @@ { lib, - buildGoModule, + buildGo125Module, fetchFromGitHub, nix-update-script, }: +let + buildGoModule = buildGo125Module; +in buildGoModule { pname = "typescript-go"; - version = "0-unstable-2025-08-12"; + version = "0-unstable-2025-08-26"; src = fetchFromGitHub { owner = "microsoft"; repo = "typescript-go"; - rev = "1ee2ba99609ae66af1e7ec4a4770482d7eeaeb43"; - hash = "sha256-5xSQaQ1ntFmwLzdkqEi9GORRJ9bYHsTCW+3JAi76Fh0="; + rev = "d85436e9a34a27ed2c3dd77767574717e22ccf85"; + hash = "sha256-3uD9vo/Gg4YjLSrGT3x+XfkVOseV9+JN07TxzVOv/5w="; fetchSubmodules = false; }; From 5618a1e49af4930cb8f1d4c75b0cccca40915274 Mon Sep 17 00:00:00 2001 From: Ruby Iris Juric Date: Wed, 27 Aug 2025 23:02:18 +1000 Subject: [PATCH 040/305] python3Packages.rtslib-fb: fix build failures --- pkgs/development/python-modules/rtslib-fb/default.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/development/python-modules/rtslib-fb/default.nix b/pkgs/development/python-modules/rtslib-fb/default.nix index 5704aec8ddb7..18544ca09c3f 100644 --- a/pkgs/development/python-modules/rtslib-fb/default.nix +++ b/pkgs/development/python-modules/rtslib-fb/default.nix @@ -16,12 +16,6 @@ buildPythonPackage rec { version = "2.2.3"; pyproject = true; - # TypeError: 'method' object does not support the context manager protocol - postPatch = '' - substituteInPlace rtslib/root.py \ - --replace-fail "Path(restore_file).open" "Path(restore_file).open('r')" - ''; - src = fetchFromGitHub { owner = "open-iscsi"; repo = "rtslib-fb"; @@ -38,10 +32,6 @@ buildPythonPackage rec { pyudev ]; - postInstall = '' - install -Dm555 scripts/targetctl -t $out/bin - ''; - # No tests doCheck = false; From 839a5f97f785fe06778e81e00ede9e2ecb94ed3f Mon Sep 17 00:00:00 2001 From: yadokani389 Date: Wed, 27 Aug 2025 22:25:11 +0900 Subject: [PATCH 041/305] python3Packages.ultralytics: disable test_grayscale that requires network --- pkgs/development/python-modules/ultralytics/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/ultralytics/default.nix b/pkgs/development/python-modules/ultralytics/default.nix index 04048239733f..869cc9b58dc5 100644 --- a/pkgs/development/python-modules/ultralytics/default.nix +++ b/pkgs/development/python-modules/ultralytics/default.nix @@ -102,6 +102,7 @@ buildPythonPackage rec { "test_yolov10" "test_yoloe" "test_multichannel" + "test_grayscale" ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # Fatal Python error: Aborted From 7d6f95d252d6238d423ae5a96e53aa76d83dd7d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 27 Aug 2025 15:59:28 +0200 Subject: [PATCH 042/305] python3Packages.feedgenerator: 2.2.0 -> 2.2.1 --- pkgs/development/python-modules/feedgenerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix index 0f79decf5377..0ae83f0514d9 100644 --- a/pkgs/development/python-modules/feedgenerator/default.nix +++ b/pkgs/development/python-modules/feedgenerator/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "feedgenerator"; - version = "2.2.0"; + version = "2.2.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-KXb2zMWYmpZyAto0PqFFwhrtq74ANccIjWS6CqlyWmA="; + hash = "sha256-DqqVXx8Ly1uHrBla90Dwb/n/9KQO0wuKfGu+uyZNTdE="; }; build-system = [ hatchling ]; From 392d256429a46badb213afba4f26272190bacd5f Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 23 Aug 2025 10:39:59 +0200 Subject: [PATCH 043/305] lxde.lxappearance: change upstream source --- .../lxde/core/lxappearance/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix index f7d297f0f423..e0c3f44d67a4 100644 --- a/pkgs/desktops/lxde/core/lxappearance/default.nix +++ b/pkgs/desktops/lxde/core/lxappearance/default.nix @@ -1,29 +1,39 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, + autoreconfHook, intltool, pkg-config, libX11, gtk2, gtk3, + libxslt, + docbook_xsl, wrapGAppsHook3, withGtk3 ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lxappearance"; version = "0.6.3"; - src = fetchurl { - url = "mirror://sourceforge/project/lxde/LXAppearance/${pname}-${version}.tar.xz"; - sha256 = "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj"; + src = fetchFromGitHub { + owner = "lxde"; + repo = "lxappearance"; + tag = finalAttrs.version; + hash = "sha256-YxU6jikCRmV2b+080nyMFU9FCMlz77KIqJqoCHVjp8M="; }; + enableParallelBuilding = true; + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook3 + autoreconfHook + libxslt + docbook_xsl ]; buildInputs = [ @@ -35,6 +45,8 @@ stdenv.mkDerivation rec { ./lxappearance-0.6.3-xdg.system.data.dirs.patch ]; + env.XSLTPROC = lib.getExe' libxslt "xsltproc"; + configureFlags = lib.optional withGtk3 "--enable-gtk3"; meta = with lib; { @@ -45,4 +57,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; -} +}) From 3c2a77a54aa84534e7197be456869c51a8c3498c Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 23 Aug 2025 10:41:17 +0200 Subject: [PATCH 044/305] lxde.lxappearance: 0.6.3 -> 0.6.4 --- pkgs/desktops/lxde/core/lxappearance/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix index e0c3f44d67a4..4897e6613d8a 100644 --- a/pkgs/desktops/lxde/core/lxappearance/default.nix +++ b/pkgs/desktops/lxde/core/lxappearance/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lxappearance"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "lxde"; repo = "lxappearance"; tag = finalAttrs.version; - hash = "sha256-YxU6jikCRmV2b+080nyMFU9FCMlz77KIqJqoCHVjp8M="; + hash = "sha256-t5P3JYGZzhTaJ3s23r6yrAQoFcCV5uteHh67sWY1KrI="; }; enableParallelBuilding = true; @@ -49,12 +49,12 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = lib.optional withGtk3 "--enable-gtk3"; - meta = with lib; { + meta = { description = "Lightweight program for configuring the theme and fonts of gtk applications"; mainProgram = "lxappearance"; homepage = "https://lxde.org/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ romildo ]; }; }) From 12683a1aebd93c6f356e572403af8e8dc1090cfe Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 23 Aug 2025 10:52:43 +0200 Subject: [PATCH 045/305] libfm: change upstream source --- pkgs/by-name/li/libfm/package.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/li/libfm/package.nix b/pkgs/by-name/li/libfm/package.nix index f536195d36e5..b7ea50a6e8c7 100644 --- a/pkgs/by-name/li/libfm/package.nix +++ b/pkgs/by-name/li/libfm/package.nix @@ -1,8 +1,10 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, fetchpatch, + autoreconfHook, + gtk-doc, glib, intltool, menu-cache, @@ -23,9 +25,11 @@ stdenv.mkDerivation (finalAttrs: { pname = if extraOnly then "libfm-extra" else "libfm"; version = "1.3.2"; - src = fetchurl { - url = "mirror://sourceforge/pcmanfm/libfm-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-pQQmMDBM+OXYz/nVZca9VG8ii0jJYBU+02ajTofK0eU="; + src = fetchFromGitHub { + owner = "lxde"; + repo = "libfm"; + tag = finalAttrs.version; + hash = "sha256-SQHV4kv8Fz24x7g2G8qc+uJR9qeN1Ez1KHnKK9YULY0="; }; patches = [ @@ -37,9 +41,11 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ + autoreconfHook vala pkg-config intltool + gtk-doc ]; buildInputs = [ glib @@ -56,11 +62,6 @@ stdenv.mkDerivation (finalAttrs: { installFlags = [ "sysconfdir=${placeholder "out"}/etc" ]; - postPatch = '' - # Ensure the files are re-generated from Vala sources. - rm src/actions/*.c - ''; - # libfm-extra is pulled in by menu-cache and thus leads to a collision for libfm postInstall = optionalString (!extraOnly) '' rm $out/lib/libfm-extra.so $out/lib/libfm-extra.so.* $out/lib/libfm-extra.la $out/lib/pkgconfig/libfm-extra.pc From 2e1742e6dadb9702dac4684af8667260cb3f1ce0 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 23 Aug 2025 10:59:44 +0200 Subject: [PATCH 046/305] libfm: 1.3.2 -> 1.4.0 --- pkgs/by-name/li/libfm/package.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/li/libfm/package.nix b/pkgs/by-name/li/libfm/package.nix index b7ea50a6e8c7..6b2eacdc2b2c 100644 --- a/pkgs/by-name/li/libfm/package.nix +++ b/pkgs/by-name/li/libfm/package.nix @@ -23,23 +23,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = if extraOnly then "libfm-extra" else "libfm"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxde"; repo = "libfm"; tag = finalAttrs.version; - hash = "sha256-SQHV4kv8Fz24x7g2G8qc+uJR9qeN1Ez1KHnKK9YULY0="; + hash = "sha256-dmu5ygPuZe2YWAzIVPx5zskQeB51hXcLbMczxWgCr78="; }; - patches = [ - # Add casts to fix -Werror=incompatible-pointer-types - (fetchpatch { - url = "https://github.com/lxde/libfm/commit/fbcd183335729fa3e8dd6a837c13a23ff3271000.patch"; - hash = "sha256-RbX8jkP/5ao6NWEnv8Pgy4zwZaiDsslGlRRWdoV3enA="; - }) - ]; - nativeBuildInputs = [ autoreconfHook vala From a017e7294e63c35a000a7495dd41492dddcacfb3 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 23 Aug 2025 11:06:15 +0200 Subject: [PATCH 047/305] menu-cache: change upstream url --- pkgs/by-name/me/menu-cache/package.nix | 30 ++++++++++++++++---------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/me/menu-cache/package.nix b/pkgs/by-name/me/menu-cache/package.nix index 0994473826e1..80c3a52db9ae 100644 --- a/pkgs/by-name/me/menu-cache/package.nix +++ b/pkgs/by-name/me/menu-cache/package.nix @@ -1,20 +1,24 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, fetchpatch, glib, pkg-config, libfm-extra, + autoreconfHook, + gtk-doc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "menu-cache"; version = "1.1.0"; - src = fetchurl { - url = "mirror://sourceforge/lxde/menu-cache-${version}.tar.xz"; - sha256 = "1iry4zlpppww8qai2cw4zid4081hh7fz8nzsp5lqyffbkm2yn0pd"; + src = fetchFromGitHub { + owner = "lxde"; + repo = "menu-cache"; + tag = finalAttrs.version; + hash = "sha256-UPSBAoDjI4nwyDsGK5yIrAR03WhGMSxv1IePSQ3SzxE="; }; patches = [ @@ -27,18 +31,22 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + gtk-doc + ]; buildInputs = [ glib libfm-extra ]; - meta = with lib; { + meta = { description = "Library to read freedesktop.org menu files"; homepage = "https://blog.lxde.org/tag/menu-cache/"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.ttuegel ]; - platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.ttuegel ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) From b9ba33feba13c14c20821e1c4166545dd81bcd54 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 23 Aug 2025 11:07:54 +0200 Subject: [PATCH 048/305] menu-cache: 1.1.0 -> 1.1.1 --- pkgs/by-name/me/menu-cache/package.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/me/menu-cache/package.nix b/pkgs/by-name/me/menu-cache/package.nix index 80c3a52db9ae..34e522e6f797 100644 --- a/pkgs/by-name/me/menu-cache/package.nix +++ b/pkgs/by-name/me/menu-cache/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, glib, pkg-config, libfm-extra, @@ -12,25 +11,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "menu-cache"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "lxde"; repo = "menu-cache"; tag = finalAttrs.version; - hash = "sha256-UPSBAoDjI4nwyDsGK5yIrAR03WhGMSxv1IePSQ3SzxE="; + hash = "sha256-5Vp2btrflimy+Hq+3MLpic/quZMJ3uwsMq12G7s4DGI="; }; - patches = [ - # Pull patch pending upstream inclusion for -fno-common toolchain support: - # https://github.com/lxde/menu-cache/pull/19 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/lxde/menu-cache/commit/1ce739649b4d66339a03fc0ec9ee7a2f7c141780.patch"; - sha256 = "08x3h0w2pl8ifj83v9jkf4j3zxcwsyzh251divlhhnwx0rw1pyn7"; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkg-config From 536fb0739327136cf02f1fe04b1ab754e0cb3f08 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 23 Aug 2025 11:17:21 +0200 Subject: [PATCH 049/305] lxde.lxmenu-data: change upstream source --- .../lxde/core/lxmenu-data/default.nix | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/lxde/core/lxmenu-data/default.nix b/pkgs/desktops/lxde/core/lxmenu-data/default.nix index a53885f33ed7..7021a8b2acfb 100644 --- a/pkgs/desktops/lxde/core/lxmenu-data/default.nix +++ b/pkgs/desktops/lxde/core/lxmenu-data/default.nix @@ -1,20 +1,30 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, + autoreconfHook, intltool, + pkg-config, + glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lxmenu-data"; version = "0.1.5"; - src = fetchurl { - url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz"; - sha256 = "9fe3218d2ef50b91190162f4f923d6524c364849f87bcda8b4ed8eb59b80bab8"; + src = fetchFromGitHub { + owner = "lxde"; + repo = "lxmenu-data"; + tag = finalAttrs.version; + hash = "sha256-gWuhE6U33gAzlp21PGZ9qzC3bwi1nXO+WNMNj5xB6SE="; }; - nativeBuildInputs = [ intltool ]; + nativeBuildInputs = [ + autoreconfHook + intltool + pkg-config + glib + ]; meta = { homepage = "https://lxde.org/"; @@ -22,4 +32,4 @@ stdenv.mkDerivation rec { description = "Freedesktop.org desktop menus for LXDE"; platforms = lib.platforms.linux; }; -} +}) From fd0e9bfac685c4c041e92d4ee64616632765c51d Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 23 Aug 2025 11:20:12 +0200 Subject: [PATCH 050/305] lxde.lxmenu-data: 0.1.5 -> 0.1.6 --- pkgs/desktops/lxde/core/lxmenu-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxde/core/lxmenu-data/default.nix b/pkgs/desktops/lxde/core/lxmenu-data/default.nix index 7021a8b2acfb..a1679bd8a700 100644 --- a/pkgs/desktops/lxde/core/lxmenu-data/default.nix +++ b/pkgs/desktops/lxde/core/lxmenu-data/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lxmenu-data"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "lxde"; repo = "lxmenu-data"; tag = finalAttrs.version; - hash = "sha256-gWuhE6U33gAzlp21PGZ9qzC3bwi1nXO+WNMNj5xB6SE="; + hash = "sha256-5QdQ+7nzj7wDrfdt4GT8VW4+sHgZdE7h3cReY2pmcak="; }; nativeBuildInputs = [ From 7d92766509bac98d1e07ed65dab41666a7cf4396 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 24 Aug 2025 00:52:25 +0200 Subject: [PATCH 051/305] lxde.lxsession: 0.5.5 -> 0.5.6 --- pkgs/desktops/lxde/core/lxsession/default.nix | 49 +++++++------------ .../repect-xml-catalog-file-var.patch | 13 +++++ .../core/lxsession/xmlcatalog_patch.patch | 23 --------- 3 files changed, 32 insertions(+), 53 deletions(-) create mode 100644 pkgs/desktops/lxde/core/lxsession/repect-xml-catalog-file-var.patch delete mode 100644 pkgs/desktops/lxde/core/lxsession/xmlcatalog_patch.patch diff --git a/pkgs/desktops/lxde/core/lxsession/default.nix b/pkgs/desktops/lxde/core/lxsession/default.nix index ab6b77429d9a..2395e96c45db 100644 --- a/pkgs/desktops/lxde/core/lxsession/default.nix +++ b/pkgs/desktops/lxde/core/lxsession/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, - fetchpatch, fetchFromGitHub, - autoconf, - automake, + autoreconfHook, docbook_xml_dtd_412, docbook_xsl, intltool, @@ -18,39 +16,26 @@ vala, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lxsession"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "lxde"; repo = "lxsession"; - rev = version; - sha256 = "17sqsx57ymrimm5jfmcyrp7b0nzi41bcvpxsqckmwbhl19g6c17d"; + tag = finalAttrs.version; + hash = "sha256-3RnRF4oMCtZbIraHVqEPnkviAkELq7uYqyHY0uCf/lU="; }; - patches = [ - ./xmlcatalog_patch.patch - - # lxsession compilation is broken upstream as of GCC 14 - # https://sourceforge.net/p/lxde/bugs/973/ - (fetchpatch { - name = "0001-Fix-build-on-GCC-14.patch"; - url = "https://sourceforge.net/p/lxde/bugs/973/attachment/0001-Fix-build-on-GCC-14.patch"; - hash = "sha256-lxF3HZy5uLK7Cfu8W1A03syZf7OWXpHiU2Fk+xBl39g="; - }) - ]; - nativeBuildInputs = [ - autoconf - automake - docbook_xml_dtd_412 - docbook_xsl + autoreconfHook intltool libxml2 libxslt pkg-config wrapGAppsHook3 + docbook_xml_dtd_412 + docbook_xsl ]; buildInputs = [ @@ -64,16 +49,20 @@ stdenv.mkDerivation rec { "--enable-man" "--disable-buildin-clipboard" "--disable-buildin-polkit" - "--with-xml-catalog=${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml" ]; - preConfigure = "./autogen.sh"; + postPatch = '' + mkdir -p m4 + ''; - meta = with lib; { + patches = [ ./repect-xml-catalog-file-var.patch ]; + + meta = { homepage = "https://wiki.lxde.org/en/LXSession"; description = "Classic LXDE session manager"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.shamilton ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.shamilton ]; + platforms = lib.platforms.linux; + mainProgram = "lxsession"; }; -} +}) diff --git a/pkgs/desktops/lxde/core/lxsession/repect-xml-catalog-file-var.patch b/pkgs/desktops/lxde/core/lxsession/repect-xml-catalog-file-var.patch new file mode 100644 index 000000000000..330bdcb72550 --- /dev/null +++ b/pkgs/desktops/lxde/core/lxsession/repect-xml-catalog-file-var.patch @@ -0,0 +1,13 @@ +--- a/acinclude.m4 2025-08-24 00:39:08.807857027 +0200 ++++ b/acinclude.m4 2025-08-24 00:49:23.043780737 +0200 +@@ -40,8 +40,8 @@ + [ + AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl + AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog]) +- if $jh_found_xmlcatalog && \ +- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then ++ # empty argument forces libxml to use XML_CATALOG_FILES variable ++ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then + AC_MSG_RESULT([found]) + ifelse([$3],,,[$3 + ])dnl diff --git a/pkgs/desktops/lxde/core/lxsession/xmlcatalog_patch.patch b/pkgs/desktops/lxde/core/lxsession/xmlcatalog_patch.patch deleted file mode 100644 index 644518a6eb2a..000000000000 --- a/pkgs/desktops/lxde/core/lxsession/xmlcatalog_patch.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --color -ur a/configure.ac b/configure.ac ---- a/configure.ac 2021-01-18 12:39:19.556844678 +0100 -+++ b/configure.ac 2021-01-18 17:26:47.989410501 +0100 -@@ -167,18 +167,7 @@ - AM_GLIB_GNU_GETTEXT - AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) - --if test x"$enable_man" = x"yes"; then -- AC_PATH_PROG([XSLTPROC], [xsltproc]) -- if test -z "$XSLTPROC"; then -- enable_man=no -- fi -- -- dnl check for DocBook DTD and stylesheets in the local catalog. -- JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN], -- [DocBook XML DTD V4.1.2], [], enable_man=no) -- JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl], -- [DocBook XSL Stylesheets >= 1.70.1], [], enable_man=no) --fi -+AC_PATH_PROG([XSLTPROC], [xsltproc]) - - AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test "x$enable_man" != "xno") - From 5089eee572708d31674643e1dbd2b6c77b5dce57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaakko=20Sir=C3=A9n?= <33450373+Jaakkonen@users.noreply.github.com> Date: Wed, 27 Aug 2025 18:25:35 +0300 Subject: [PATCH 052/305] pdm: use tag instead of rev for overwritten resolvelib version Resolvelib currently uses `tag` for its version. --- pkgs/by-name/pd/pdm/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix index c561562a50d8..3f7c847cfd00 100644 --- a/pkgs/by-name/pd/pdm/package.nix +++ b/pkgs/by-name/pd/pdm/package.nix @@ -15,7 +15,7 @@ let resolvelib = super.resolvelib.overridePythonAttrs (old: rec { version = "1.1.0"; src = old.src.override { - rev = version; + tag = version; hash = "sha256-UBdgFN+fvbjz+rp8+rog8FW2jwO/jCfUPV7UehJKiV8="; }; }); From 7d8634cea12a2727b5c05b6b3ee4b3d868ebda7e Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Wed, 27 Aug 2025 17:25:42 +0200 Subject: [PATCH 053/305] proton-ge-bin: GE-Proton10-13 -> GE-Proton10-15 --- pkgs/by-name/pr/proton-ge-bin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index 8e989f315667..0e73a2a7d840 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; - version = "GE-Proton10-13"; + version = "GE-Proton10-15"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; - hash = "sha256-HjCsnPX3TwUroVj8RnQ0k6unU2Ou/E5PogRIElDWjgE="; + hash = "sha256-VS9oFut8Wz2sbMwtX5tZkeusLDcZP3FOLUsQRabaZ0c="; }; dontUnpack = true; From 34b9180a4d43d694040ef6caa5d8c9a1b37b50c9 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Wed, 27 Aug 2025 19:31:01 +0200 Subject: [PATCH 054/305] visidata: migrate to by-name --- .../vi/visidata/package.nix} | 159 +++++++----------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 63 insertions(+), 98 deletions(-) rename pkgs/{applications/misc/visidata/default.nix => by-name/vi/visidata/package.nix} (60%) diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/by-name/vi/visidata/package.nix similarity index 60% rename from pkgs/applications/misc/visidata/default.nix rename to pkgs/by-name/vi/visidata/package.nix index 0abc8a4d6cc7..ef923e097cd0 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/by-name/vi/visidata/package.nix @@ -1,55 +1,17 @@ { - stdenv, lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, - # python requirements - beautifulsoup4, - boto3, - faker, - fonttools, - h5py, - importlib-metadata, - lxml, - matplotlib, - numpy, - odfpy, - openpyxl, - pandas, - pdfminer-six, - praw, - psutil, - psycopg2, - pyarrow, - pyshp, - pypng, - msgpack, - brotli, - python-dateutil, - pyyaml, - requests, - seaborn, - setuptools, - sh, - tabulate, - urllib3, - vobject, - wcwidth, - xlrd, - xlwt, - zstandard, - zulip, # other gitMinimal, withPcap ? true, - dpkt, - dnslib, withXclip ? stdenv.hostPlatform.isLinux, xclip, testers, visidata, + stdenv, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "visidata"; version = "3.2"; format = "setuptools"; @@ -61,64 +23,69 @@ buildPythonApplication rec { hash = "sha256-kOg9OypWNGStNYFctPIwzVa1CsZBySY2IpA3eDrS7eY="; }; - propagatedBuildInputs = [ - # from visidata/requirements.txt - # packages not (yet) present in nixpkgs are commented - python-dateutil - pandas - requests - lxml - openpyxl - xlrd - xlwt - h5py - psycopg2 - boto3 - pyshp - #mapbox-vector-tile - pypng - #pyconll - msgpack - brotli - #fecfile - fonttools - #sas7bdat - #xport - #savReaderWriter - pyyaml - #namestand - #datapackage - pdfminer-six - #tabula - vobject - tabulate - wcwidth - zstandard - odfpy - urllib3 - pyarrow - seaborn - matplotlib - sh - psutil - numpy + propagatedBuildInputs = + with python3Packages; + [ + # from visidata/requirements.txt + # packages not (yet) present in nixpkgs are commented + python-dateutil + pandas + requests + lxml + openpyxl + xlrd + xlwt + h5py + psycopg2 + boto3 + pyshp + #mapbox-vector-tile + pypng + #pyconll + msgpack + brotli + #fecfile + fonttools + #sas7bdat + #xport + #savReaderWriter + pyyaml + #namestand + #datapackage + pdfminer-six + #tabula + vobject + tabulate + wcwidth + zstandard + odfpy + urllib3 + pyarrow + seaborn + matplotlib + sh + psutil + numpy - #requests_cache - beautifulsoup4 + #requests_cache + beautifulsoup4 - faker - praw - zulip - #pyairtable + faker + praw + zulip + #pyairtable - setuptools - importlib-metadata - ] - ++ lib.optionals withPcap [ - dpkt - dnslib - ] - ++ lib.optional withXclip xclip; + setuptools + importlib-metadata + ] + ++ lib.optionals withPcap ( + with python3Packages; + [ + dpkt + dnslib + ] + ) + ++ lib.optional withXclip xclip; nativeCheckInputs = [ gitMinimal diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 780faa072ac8..68ee3210537b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4383,8 +4383,6 @@ with pkgs; vimwiki-markdown = python3Packages.callPackage ../tools/misc/vimwiki-markdown { }; - visidata = python3Packages.callPackage ../applications/misc/visidata { }; - vkbasalt = callPackage ../tools/graphics/vkbasalt { vkbasalt32 = pkgsi686Linux.vkbasalt; }; From db1c469ba9bebe3b50bc8d818169050d8e267421 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 25 Aug 2025 18:14:00 -0700 Subject: [PATCH 055/305] =?UTF-8?q?dprint:=20Fix=20build=20failure=20with?= =?UTF-8?q?=20Rust=20=E2=89=A5=201.89.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg --- pkgs/by-name/dp/dprint/package.nix | 8 +- pkgs/by-name/dp/dprint/upgrade-wasmer.patch | 161 ++++++++++++++++++++ 2 files changed, 168 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/dp/dprint/upgrade-wasmer.patch diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix index 88e4c321e238..feb40041f445 100644 --- a/pkgs/by-name/dp/dprint/package.nix +++ b/pkgs/by-name/dp/dprint/package.nix @@ -24,7 +24,13 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-Lt6CzSzppu5ULhzYN5FTCWtWK3AA4/8jRzXgQkU4Tco="; }; - cargoHash = "sha256-1opQaR3vbm/DpDY5oQ1VgA4nf0nCBknxfgOSPZQbtV4="; + cargoPatches = [ + # Upgrade wasmer to 6.1.0-rc.3 to fix build failure with Rust ≥ 1.89.0 + # https://github.com/dprint/dprint/pull/1021 + ./upgrade-wasmer.patch + ]; + + cargoHash = "sha256-RUWyR1Yr9G2xBMigDa9+LQyaU5on85xkRQYTLH9JOPg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/dp/dprint/upgrade-wasmer.patch b/pkgs/by-name/dp/dprint/upgrade-wasmer.patch new file mode 100644 index 000000000000..6c92628aebd2 --- /dev/null +++ b/pkgs/by-name/dp/dprint/upgrade-wasmer.patch @@ -0,0 +1,161 @@ +From 379cf407bfc07380dad24aefb2db40f6852f32ed Mon Sep 17 00:00:00 2001 +From: Anders Kaseorg +Date: Mon, 25 Aug 2025 18:01:57 -0700 +Subject: [PATCH] Upgrade wasmer to 6.1.0-rc.3 + +Signed-off-by: Anders Kaseorg +--- + Cargo.lock | 41 ++++++++++++++++++++-------------------- + crates/dprint/Cargo.toml | 4 ++-- + 2 files changed, 22 insertions(+), 23 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 9a1bc870..bff2c81b 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -455,9 +455,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + + [[package]] + name = "corosensei" +-version = "0.2.1" ++version = "0.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ad067b451c08956709f8762dba86e049c124ea52858e3ab8d076ba2892caa437" ++checksum = "5d1ea1c2a2f898d2a6ff149587b8a04f41ee708d248c723f01ac2f0f01edc0b3" + dependencies = [ + "autocfg", + "cfg-if", +@@ -776,18 +776,18 @@ dependencies = [ + + [[package]] + name = "derive_more" +-version = "1.0.0" ++version = "2.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" ++checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" + dependencies = [ + "derive_more-impl", + ] + + [[package]] + name = "derive_more-impl" +-version = "1.0.0" ++version = "2.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" ++checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" + dependencies = [ + "proc-macro2", + "quote", +@@ -3256,16 +3256,15 @@ dependencies = [ + + [[package]] + name = "wasmer" +-version = "6.0.1" ++version = "6.1.0-rc.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f25dccc6251837449135914ee1978731c2c3df9fc727088eb7e098736c0f15d1" ++checksum = "1e588d83a5ac7eb5e6af54ac4d34183442e4dd2a7358d2a11793b17c03b7df0b" + dependencies = [ + "bindgen", + "bytes", + "cfg-if", + "cmake", +- "derive_more 1.0.0", +- "idna_adapter", ++ "derive_more 2.0.1", + "indexmap", + "js-sys", + "more-asserts", +@@ -3278,7 +3277,6 @@ dependencies = [ + "target-lexicon", + "thiserror 1.0.61", + "tracing", +- "ureq", + "wasm-bindgen", + "wasmer-compiler", + "wasmer-compiler-cranelift", +@@ -3292,9 +3290,9 @@ dependencies = [ + + [[package]] + name = "wasmer-compiler" +-version = "6.0.1" ++version = "6.1.0-rc.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6f35baeb0d5b20710b5b9c59477dbf813b1ac53da33ee46cb22f8c4190e3986e" ++checksum = "c9542eb21b9a0f7811101e26e40e360a9ac02d093e3089c8fa62dfa102478edb" + dependencies = [ + "backtrace", + "bytes", +@@ -3323,9 +3321,9 @@ dependencies = [ + + [[package]] + name = "wasmer-compiler-cranelift" +-version = "6.0.1" ++version = "6.1.0-rc.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6d657a96003ce3f54a3cbbf681fcd782b983f9362c97cfbbe243cbf66790e004" ++checksum = "a69f548bcccd4791b2647e0d748eb8ddd4d0856233778867c8b0db3781a82ca1" + dependencies = [ + "cranelift-codegen", + "cranelift-entity", +@@ -3343,9 +3341,9 @@ dependencies = [ + + [[package]] + name = "wasmer-derive" +-version = "6.0.1" ++version = "6.1.0-rc.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "62b57be80a67de03c2a02d697bfd763e097546b11f0020cf9930ebaa4f8cf965" ++checksum = "8db532c73814748214276f878b8382a8885769fdd86d0bee2792c438b0d28c62" + dependencies = [ + "proc-macro-error2", + "proc-macro2", +@@ -3355,9 +3353,9 @@ dependencies = [ + + [[package]] + name = "wasmer-types" +-version = "6.0.1" ++version = "6.1.0-rc.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1b8424d15f5c19a8df972fc9367d75ba3b87af63b279208d50a32e9a298d944b" ++checksum = "81b900743ecb272e8e8a760a42e069f19d158d9fd03c6ac256026407bdc91833" + dependencies = [ + "bytecheck 0.6.11", + "enum-iterator", +@@ -3375,9 +3373,9 @@ dependencies = [ + + [[package]] + name = "wasmer-vm" +-version = "6.0.1" ++version = "6.1.0-rc.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "faabfffefc6fc350bb5b07301f05ba604a18c3d2d97c6354183f15792577056d" ++checksum = "40956bcf167d5bed1a940649f638e2d610e5a066863b4ab6c1ab1341fef97a9a" + dependencies = [ + "backtrace", + "cc", +@@ -3394,6 +3392,7 @@ dependencies = [ + "memoffset", + "more-asserts", + "region", ++ "rustversion", + "scopeguard", + "thiserror 1.0.61", + "wasmer-types", +diff --git a/crates/dprint/Cargo.toml b/crates/dprint/Cargo.toml +index 44d107d4..af733e83 100644 +--- a/crates/dprint/Cargo.toml ++++ b/crates/dprint/Cargo.toml +@@ -58,8 +58,8 @@ webpki-roots = "=0.26.7" + # patch version increases of rkyv may cause panics when deserializing + # data serialized with older versions + rkyv = "=0.8.10" +-wasmer = "=6.0.1" +-wasmer-compiler = "=6.0.1" ++wasmer = "=6.1.0-rc.3" ++wasmer-compiler = "=6.1.0-rc.3" + + [target.'cfg(windows)'.dependencies] + winreg = "=0.55.0" From 75d291325e739dbd7998636ac57ab6efcae311b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 27 Aug 2025 13:17:42 -0700 Subject: [PATCH 056/305] python3Packages.stix2-patterns: mark broken --- pkgs/development/python-modules/stix2-patterns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stix2-patterns/default.nix b/pkgs/development/python-modules/stix2-patterns/default.nix index e80cb12df7a3..7daafa73233b 100644 --- a/pkgs/development/python-modules/stix2-patterns/default.nix +++ b/pkgs/development/python-modules/stix2-patterns/default.nix @@ -1,6 +1,5 @@ { lib, - antlr4_9, antlr4-python3-runtime, buildPythonPackage, fetchFromGitHub, @@ -27,7 +26,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; dependencies = [ - (antlr4-python3-runtime.override { antlr4 = antlr4_9; }) + antlr4-python3-runtime six ]; @@ -36,6 +35,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "stix2patterns" ]; meta = with lib; { + broken = lib.versionAtLeast antlr4-python3-runtime.version "4.10"; description = "Validate patterns used to express cyber observable content in STIX Indicators"; mainProgram = "validate-patterns"; homepage = "https://github.com/oasis-open/cti-pattern-validator"; From eff121af83efc73d9ecd6293e5f0a9c034131272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 27 Aug 2025 16:40:15 -0700 Subject: [PATCH 057/305] python3Packages.nhc: 0.4.12 -> 0.4.13 Diff: https://github.com/vandeurenglenn/nhc/compare/0.4.12...0.4.13 Changelog: https://github.com/VandeurenGlenn/nhc/blob/0.4.13/CHANGELOG.md --- pkgs/development/python-modules/nhc/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nhc/default.nix b/pkgs/development/python-modules/nhc/default.nix index 58d8304856ec..660c8a3bf09d 100644 --- a/pkgs/development/python-modules/nhc/default.nix +++ b/pkgs/development/python-modules/nhc/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "nhc"; - version = "0.4.12"; + version = "0.4.13"; pyproject = true; src = fetchFromGitHub { owner = "vandeurenglenn"; repo = "nhc"; - tag = "v${version}"; - hash = "sha256-DXtAfKAtkOO7VvtnQyCXxh2PDlJJRQWzGhYQHbTJUME="; + tag = version; + hash = "sha256-g9uSAk1YTBDnGRfQQkEu1XMMN3MYYDWJoOJ+Ga7jXRw="; }; build-system = [ setuptools ]; @@ -25,6 +25,7 @@ buildPythonPackage rec { doCheck = false; meta = { + changelog = "https://github.com/VandeurenGlenn/nhc/blob/${src.tag}/CHANGELOG.md"; description = "SDK for Niko Home Control"; homepage = "https://github.com/vandeurenglenn/nhc"; license = lib.licenses.mit; From 198ebdb2108b814c58fa3491593f25729f2ce588 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Thu, 28 Aug 2025 08:10:32 +0200 Subject: [PATCH 058/305] yt-dlp: 2025.08.22 -> 2025.08.27 Changelog: https://github.com/yt-dlp/yt-dlp/releases/tag/2025.08.27 Diff: https://github.com/yt-dlp/yt-dlp/compare/2025.08.22...2025.08.27 --- pkgs/by-name/yt/yt-dlp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix index 803a3cbce898..f49335d36e26 100644 --- a/pkgs/by-name/yt/yt-dlp/package.nix +++ b/pkgs/by-name/yt/yt-dlp/package.nix @@ -19,14 +19,14 @@ python3Packages.buildPythonApplication rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2025.08.22"; + version = "2025.08.27"; pyproject = true; src = fetchFromGitHub { owner = "yt-dlp"; repo = "yt-dlp"; tag = version; - hash = "sha256-58Qj+Bt4GEGgWpqAuMVemixm5AUcqS+e2Sajoeun8KY="; + hash = "sha256-E8++/gK/SpY93UW/9U266Qj1Kkn6CeNou7bKTqpCgFw="; }; postPatch = '' From 2a8910c3afdb721a514c9be5c27b3840590a0527 Mon Sep 17 00:00:00 2001 From: qbisi Date: Thu, 28 Aug 2025 14:35:41 +0800 Subject: [PATCH 059/305] Revert: "python3Packages.firedrake: 2025.4.2 -> 20250331.0" --- pkgs/development/python-modules/firedrake/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/firedrake/default.nix b/pkgs/development/python-modules/firedrake/default.nix index 63977170c065..b223e632552c 100644 --- a/pkgs/development/python-modules/firedrake/default.nix +++ b/pkgs/development/python-modules/firedrake/default.nix @@ -57,14 +57,14 @@ let in buildPythonPackage rec { pname = "firedrake"; - version = "20250331.0"; + version = "2025.4.2"; pyproject = true; src = fetchFromGitHub { owner = "firedrakeproject"; repo = "firedrake"; - tag = "Firedrake_${version}"; - hash = "sha256-J0oAZWkzcrgbry5OTG8hKrIgHcwJtzaDw8staOLM9u4="; + tag = version; + hash = "sha256-bAGmXoHPAdMYJMMQYVq98LYro1Vd+o9pfvXC3BsQUf0="; }; postPatch = From 7a61001ecb7410f83dcd6985a511a8b176e08fc3 Mon Sep 17 00:00:00 2001 From: qbisi Date: Thu, 28 Aug 2025 15:05:27 +0800 Subject: [PATCH 060/305] python3Packages.firedrake: skip bulk update --- pkgs/development/python-modules/firedrake/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/firedrake/default.nix b/pkgs/development/python-modules/firedrake/default.nix index b223e632552c..d46edecae34f 100644 --- a/pkgs/development/python-modules/firedrake/default.nix +++ b/pkgs/development/python-modules/firedrake/default.nix @@ -170,6 +170,9 @@ buildPythonPackage rec { ''; passthru = { + # python updater script sets the wrong tag + skipBulkUpdate = true; + tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { mpich = firedrake.override { petsc4py = petsc4py.override { mpi = mpich; }; From 5023dcd34040918f7b61a0cd53a785211afc1dae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Aug 2025 02:03:36 +0000 Subject: [PATCH 061/305] vectorcode: 0.7.7 -> 0.7.14 --- pkgs/by-name/ve/vectorcode/package.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ve/vectorcode/package.nix b/pkgs/by-name/ve/vectorcode/package.nix index 385a55f6dfa9..959d04e3b753 100644 --- a/pkgs/by-name/ve/vectorcode/package.nix +++ b/pkgs/by-name/ve/vectorcode/package.nix @@ -93,14 +93,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "vectorcode"; - version = "0.7.7"; + version = "0.7.14"; pyproject = true; src = fetchFromGitHub { owner = "Davidyz"; repo = "VectorCode"; tag = version; - hash = "sha256-c8Wp/bP5KHDN/i2bMyiOQgnHDw8tPbg4IZIQ5Ut4SIo="; + hash = "sha256-jzNeAsL4kMGRhD9MftOL1UrM7GX8AYCab+nosptsqLY="; }; build-system = with python.pkgs; [ @@ -109,6 +109,7 @@ python.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "posthog" + "wheel" ]; dependencies = with python.pkgs; @@ -176,15 +177,28 @@ python.pkgs.buildPythonApplication rec { ++ (with python.pkgs; [ mcp pygls + pytest-asyncio pytestCheckHook ]); versionCheckProgramArg = "version"; disabledTests = [ # Require internet access + "test_chunked_add" + "test_chunked_add_empty_file" + "test_chunked_add_truncated" + "test_chunked_add_update_existing" + "test_chunked_add_with_existing" "test_get_embedding_function" "test_get_embedding_function_fallback" + "test_get_query_reranker_initialisation_error" + "test_get_query_result_chunks_with_query_exclude" + "test_get_query_result_files_include_chunk" + "test_get_query_result_files_multiple_queries" + "test_get_query_result_files_query_error" + "test_get_query_result_files_with_query_exclude" "test_get_reranker" + "test_query_tool_success" "test_supported_rerankers_initialization" ]; From 8e09120de4c7ddf5d0f456ef2f9f7f1903a2742f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Aug 2025 10:31:38 +0000 Subject: [PATCH 062/305] rustical: 0.8.6 -> 0.9.1 --- pkgs/by-name/ru/rustical/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/rustical/package.nix b/pkgs/by-name/ru/rustical/package.nix index 48d0f4a3b684..8a54772c43b7 100644 --- a/pkgs/by-name/ru/rustical/package.nix +++ b/pkgs/by-name/ru/rustical/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rustical"; - version = "0.8.6"; + version = "0.9.1"; src = fetchFromGitHub { owner = "lennart-k"; repo = "rustical"; tag = "v${finalAttrs.version}"; - hash = "sha256-Z5bGAmMPZlLk5gXnl+aozeGEIbMsa554PWSVXtG6bHs="; + hash = "sha256-Kp1s9c1GCvz5aCbjjIHtIxhbgOgrWFG2TUg6bDSm3ZA="; }; - cargoHash = "sha256-g8nIM54uHdDIfnZ2JV93ILVKkrMqKlia64pEwZ8/CzQ="; + cargoHash = "sha256-Fvstze4YfBcbBQiVXjxtPo+h6GGcfmiCNuvtfviyP2o="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; From 512b29d3f95f9fe38ba405c9f64dc3605d7863d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Aug 2025 12:01:06 +0000 Subject: [PATCH 063/305] vue-language-server: 3.0.5 -> 3.0.6 --- pkgs/by-name/vu/vue-language-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix index 882de193bc37..a120e28a8f23 100644 --- a/pkgs/by-name/vu/vue-language-server/package.nix +++ b/pkgs/by-name/vu/vue-language-server/package.nix @@ -9,19 +9,19 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vue-language-server"; - version = "3.0.5"; + version = "3.0.6"; src = fetchFromGitHub { owner = "vuejs"; repo = "language-tools"; rev = "v${finalAttrs.version}"; - hash = "sha256-NTMJYxnX0R41b/+RK+XFQJB/R5rjEF/BIury2hey770="; + hash = "sha256-APzsrj/Ap6bSVw6atKYK4mndw2JJLZ8aNlaZL+GYLSM="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-5t4HpJlSqEt04AoPnfXNB9lS9BXfMa1l7Y56VhkShPY="; + hash = "sha256-cgFA2yhq/gjjJFrTzg5QKdk8Lt+BYUo/qFpe6ZSon+k="; }; nativeBuildInputs = [ From 27489d44efd7eb685773901b047f84486eeae777 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Aug 2025 12:15:33 +0000 Subject: [PATCH 064/305] postgresqlPackages.pg_net: 0.19.5 -> 0.19.7 --- pkgs/servers/sql/postgresql/ext/pg_net.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix index 7c006b68b24f..7682d8f2119a 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_net.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix @@ -8,13 +8,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "pg_net"; - version = "0.19.5"; + version = "0.19.7"; src = fetchFromGitHub { owner = "supabase"; repo = "pg_net"; tag = "v${finalAttrs.version}"; - hash = "sha256-Cpi2iASi1QJoED0Qs1dANqg/BNZTsz5S+pw8iYyW03Y="; + hash = "sha256-HQiFD8vhox7SmjJIDyVnnwt8DCENKABIZTMfTjGElwU="; }; buildInputs = [ curl ]; From 68e789f04a850dfdbdea1af4cd140b429a6fb37f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Aug 2025 12:35:46 +0000 Subject: [PATCH 065/305] terraform-ls: 0.36.5 -> 0.37.0 --- pkgs/by-name/te/terraform-ls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/terraform-ls/package.nix b/pkgs/by-name/te/terraform-ls/package.nix index 84306c5bdf33..f40a7914df4e 100644 --- a/pkgs/by-name/te/terraform-ls/package.nix +++ b/pkgs/by-name/te/terraform-ls/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.36.5"; + version = "0.37.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "terraform-ls"; rev = "v${version}"; - hash = "sha256-oSrv0Ct60nN2AVihtcQcIWVpLFDra2Jv3bjjlM6pn9E="; + hash = "sha256-oEOxkkpciFs2XwdTpp22vfGzfxWxo66BzajINXhLliA="; }; - vendorHash = "sha256-Q2a6rCyx59cRaUBTzkKH6OgB9DRlkQSTgAI7WKDCbCI="; + vendorHash = "sha256-CEivl34R3UptmiE+0oo69RGaU2sxL2fyQjqoL8cArDU="; ldflags = [ "-s" From 0a93b45e9ec64c9618c34f3293854959142c94d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Aug 2025 12:57:28 +0000 Subject: [PATCH 066/305] twilio-cli: 6.1.0 -> 6.1.1 --- pkgs/by-name/tw/twilio-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tw/twilio-cli/package.nix b/pkgs/by-name/tw/twilio-cli/package.nix index fe5b6a936370..d0f917933d07 100644 --- a/pkgs/by-name/tw/twilio-cli/package.nix +++ b/pkgs/by-name/tw/twilio-cli/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "6.1.0"; + version = "6.1.1"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - hash = "sha256-pJi7MwJy8bnhshRRIJtyXFXBklCXRAk5UY53EF2p4m8="; + hash = "sha256-jlxHJRJp8ZzTRn6P/GffBPWlgRsboTYLi9/Rh/XQZGU="; }; buildInputs = [ nodejs-slim ]; From 05bb1e2da761d0e07f7fd2a1bd0795d68a2c4529 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Aug 2025 15:07:55 +0000 Subject: [PATCH 067/305] kubernetes-controller-tools: 0.18.0 -> 0.19.0 --- pkgs/by-name/ku/kubernetes-controller-tools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubernetes-controller-tools/package.nix b/pkgs/by-name/ku/kubernetes-controller-tools/package.nix index 31322c65353b..0c6064b4695a 100644 --- a/pkgs/by-name/ku/kubernetes-controller-tools/package.nix +++ b/pkgs/by-name/ku/kubernetes-controller-tools/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "controller-tools"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "controller-tools"; tag = "v${version}"; - sha256 = "sha256-zrh6GWFivs1fqkvaN6MSiYoCuPbiTQ6mJz4d69Wb7lo="; + sha256 = "sha256-NPyX89Hr1MAUdMafEEvcf/geQD1PxkDFSRPCFZBh29g="; }; - vendorHash = "sha256-criu2UyNkGaVQnIxrjzIU4D389DbCcjG/kn3kfoD5yE="; + vendorHash = "sha256-97FtwBaN8rMTsz9XbTEB1PSC454N2SLSWyOzXSWld9Y="; ldflags = [ "-s" From 1d1439fc12efbd5ca178f0e85aa778fcfb1cd018 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 28 Aug 2025 17:24:31 +0200 Subject: [PATCH 068/305] libunwind: remove obsolete aarch64 musl CFLAGS This doesn't seem to have been necessary since 8a82e6fade76 ("libunwind: 1.7.2 -> 1.8.0"). --- pkgs/development/libraries/libunwind/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 6e04c94e78d7..fdd972ef46d7 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -45,10 +45,6 @@ stdenv.mkDerivation (finalAttrs: { # Without latex2man, no man pages are installed despite being # prebuilt in the source tarball. "LATEX2MAN=${buildPackages.coreutils}/bin/true" - ] - # See https://github.com/libunwind/libunwind/issues/693 - ++ lib.optionals (with stdenv.hostPlatform; isAarch64 && isMusl && !isStatic) [ - "CFLAGS=-mno-outline-atomics" ]; propagatedBuildInputs = [ xz ]; From a56ed509d57a55ea6d5d2d6f1e54a862b382f288 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Aug 2025 17:41:30 +0000 Subject: [PATCH 069/305] python3Packages.yara-x: 0.15.0 -> 1.5.0 --- pkgs/development/python-modules/yara-x/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/yara-x/default.nix b/pkgs/development/python-modules/yara-x/default.nix index 701ba5dad028..72799b762d41 100644 --- a/pkgs/development/python-modules/yara-x/default.nix +++ b/pkgs/development/python-modules/yara-x/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { pname = "yara-x"; - version = "0.15.0"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,14 +18,14 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = "yara-x"; tag = "v${version}"; - hash = "sha256-fbuh/SMfOygnuvG9zTZqem4oLaS+5uXScXPhU3aVDjM="; + hash = "sha256-YZmhwHA6PnQb3QXhbWK8cbV0CScbiD5k+HceDcV6iCI="; }; buildAndTestSubdir = "py"; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname src version; - hash = "sha256-+dPIujaxDJ7JrtNvX4VjGHFmgtCb1BJpFQL4c3E1/GY="; + hash = "sha256-8LofNTLa3a2dDH72T54HJR/+qArXt+X6OMJIQwmjQIQ="; }; nativeBuildInputs = [ From 0c83469d75d62a1a0185d7744ff1f8b05be9bb7e Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Mon, 11 Aug 2025 16:00:00 +0200 Subject: [PATCH 070/305] humility: don't build xtask --- pkgs/by-name/hu/humility/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/hu/humility/package.nix b/pkgs/by-name/hu/humility/package.nix index ce6ac688a24b..4a33c1058933 100644 --- a/pkgs/by-name/hu/humility/package.nix +++ b/pkgs/by-name/hu/humility/package.nix @@ -30,6 +30,9 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-GZkHPoDKiqTVwRAWXXbELXC1I/KRO+9sshY8/rGbA4A="; + # Prevent building and installing xtask, as it's a developer utility not intended for the end user + cargoBuildFlags = [ "-p humility-cli" ]; + meta = with lib; { description = "Debugger for Hubris"; mainProgram = "humility"; From 0460cec1055d558106a7864ce52c784941d32379 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Aug 2025 18:01:03 +0000 Subject: [PATCH 071/305] go-mockery: 3.5.3 -> 3.5.4 --- pkgs/by-name/go/go-mockery/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/go-mockery/package.nix b/pkgs/by-name/go/go-mockery/package.nix index 5ef5b5ddc923..1bd71db76364 100644 --- a/pkgs/by-name/go/go-mockery/package.nix +++ b/pkgs/by-name/go/go-mockery/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "go-mockery"; - version = "3.5.3"; + version = "3.5.4"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; tag = "v${finalAttrs.version}"; - hash = "sha256-SKENyw4kZ+qZ3GV+BdDhwtb8AUs4Mc2ix1YWIgV6ZIg="; + hash = "sha256-G2ROYZlIsl8sVpA41EYUxbNImxxC5vxj5SQZJB9BF/E="; }; proxyVendor = true; From 74076d6d0b155a7ab24446f46f62412ee807e4d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Aug 2025 18:05:29 +0000 Subject: [PATCH 072/305] openvr: 2.12.1 -> 2.12.14 --- pkgs/by-name/op/openvr/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openvr/package.nix b/pkgs/by-name/op/openvr/package.nix index 9966f945141e..8d2b2b094ec1 100644 --- a/pkgs/by-name/op/openvr/package.nix +++ b/pkgs/by-name/op/openvr/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openvr"; - version = "2.12.1"; + version = "2.12.14"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = "openvr"; rev = "v${finalAttrs.version}"; - hash = "sha256-SdCN1BmYa2XyBi+aIKrk7RQBRG9+NeEpO7RsEmEBRjc="; + hash = "sha256-G+xoFIabSbYEaWATGSzHP3SWkaqQhQQ6kMkYfjBXBUU="; }; patches = [ From 9d4a49898affe96313a5602cde6b93319be6fcbd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Aug 2025 18:47:48 +0000 Subject: [PATCH 073/305] baidupcs-go: 3.9.7 -> 3.9.8 --- pkgs/by-name/ba/baidupcs-go/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/baidupcs-go/package.nix b/pkgs/by-name/ba/baidupcs-go/package.nix index 6c2e7b191c7c..420fd341dd1e 100644 --- a/pkgs/by-name/ba/baidupcs-go/package.nix +++ b/pkgs/by-name/ba/baidupcs-go/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "baidupcs-go"; - version = "3.9.7"; + version = "3.9.8"; src = fetchFromGitHub { owner = "qjfoidnh"; repo = "BaiduPCS-Go"; rev = "v${version}"; - hash = "sha256-C88q2tNNuX+tIvYKHbRE76xfPe81UHqfezyRXzrxzlc="; + hash = "sha256-iQ28wDrkd0mralgsBgCZ+MCkPR7x42tFVqFGNm/m1d0="; }; - vendorHash = "sha256-msTlXtidxLTe3xjxTOWCqx/epFT0XPdwGPantDJUGpc="; + vendorHash = "sha256-hW+IrzS5+DublQUIIcecL08xoauTjba9qnAtpzNeDXw="; doCheck = false; From add6f258559119d90001049476cf3db19ec2bf74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Aug 2025 19:44:33 +0000 Subject: [PATCH 074/305] python3Packages.keystoneauth1: 5.11.1 -> 5.12.0 --- pkgs/development/python-modules/keystoneauth1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix index f726932bc7a9..9fa03f7c7158 100644 --- a/pkgs/development/python-modules/keystoneauth1/default.nix +++ b/pkgs/development/python-modules/keystoneauth1/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "keystoneauth1"; - version = "5.11.1"; + version = "5.12.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-gG8SxJt/SyytP1pGD3vdgeQkfIG2BCWWp/6oV19lkfM="; + hash = "sha256-3RE8Lz3LQY2fdhxzuM1DqW3fqKYStRxXaCI4HznKSug="; }; build-system = [ setuptools ]; From 0fcf86e24dd3e3ed6034f352e88c0e2112a03b2c Mon Sep 17 00:00:00 2001 From: kyehn Date: Fri, 29 Aug 2025 04:06:31 +0800 Subject: [PATCH 075/305] xc: 0.8.5 -> 0.8.6 Changelog: https://github.com/joerdav/xc/releases/tag/v0.8.6 --- pkgs/by-name/xc/xc/package.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/xc/xc/package.nix b/pkgs/by-name/xc/xc/package.nix index d38e8070f544..0fd8c4647601 100644 --- a/pkgs/by-name/xc/xc/package.nix +++ b/pkgs/by-name/xc/xc/package.nix @@ -6,26 +6,31 @@ versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "xc"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "joerdav"; repo = "xc"; - tag = "v${version}"; - sha256 = "sha256-eaFHK7VsfLSgSJehv4urxq8qMPT+zzs2tRypz4q+MLc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Q17ldwHp1Wp/u0BkUZiA1pRJaFpo/5iDW011k9qkIEA="; }; vendorHash = "sha256-EbIuktQ2rExa2DawyCamTrKRC1yXXMleRB8/pcKFY5c="; + subPackages = [ "cmd/xc" ]; + ldflags = [ "-s" "-w" - "-X=main.version=${version}" + "-X=main.version=${finalAttrs.version}" ]; nativeInstallCheckInputs = [ versionCheckHook ]; + + versionCheckProgramArg = "-version"; + doInstallCheck = true; postInstallCheck = '' cp ${./example.md} example.md @@ -42,11 +47,11 @@ buildGoModule rec { description = "Markdown defined task runner"; mainProgram = "xc"; homepage = "https://xcfile.dev/"; - changelog = "https://github.com/joerdav/xc/releases/tag/${src.tag}"; + changelog = "https://github.com/joerdav/xc/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ figsoda joerdav ]; }; -} +}) From 939bb00de4074f2e326176bbaa3ac2ec3844f376 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Aug 2025 21:35:29 +0000 Subject: [PATCH 076/305] zoekt: 3.7.2-2-unstable-2025-08-18 -> 3.7.2-2-unstable-2025-08-21 --- pkgs/by-name/zo/zoekt/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix index 2d4b3f507a0a..1b2351db4d42 100644 --- a/pkgs/by-name/zo/zoekt/package.nix +++ b/pkgs/by-name/zo/zoekt/package.nix @@ -8,16 +8,16 @@ buildGoModule { pname = "zoekt"; - version = "3.7.2-2-unstable-2025-08-18"; + version = "3.7.2-2-unstable-2025-08-21"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "zoekt"; - rev = "69b7ba714f8ab8f2083731464f169e7ca8234acd"; - hash = "sha256-CnjIP7+HeZEfG9b2UyC1mms2CSIijZC6Y4Gu1r1AXyU="; + rev = "fb492e2d3a2d0857e9d219fd2f7b12c7403876bb"; + hash = "sha256-FIc8YViahZs5r0FBMJR+Io/dkUSE4S9pwC9fqZODlGE="; }; - vendorHash = "sha256-Yc1NZKb1V9NaZddnTnNOaqdNxOHKagl7Xpxj+mZf81I="; + vendorHash = "sha256-urXYBv8+C2jwnr5PjXz7nUyX/Gz4wmtS76UTXFqfQFk="; nativeCheckInputs = [ gitMinimal From 23822bc18c00fdb0025b04891852f238b61c80c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Aug 2025 21:44:18 +0000 Subject: [PATCH 077/305] python3Packages.pylibdmtx: 0.1.10 -> 0.1.11 --- pkgs/development/python-modules/pylibdmtx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylibdmtx/default.nix b/pkgs/development/python-modules/pylibdmtx/default.nix index a74e24e0be39..93bcd8b2f53a 100644 --- a/pkgs/development/python-modules/pylibdmtx/default.nix +++ b/pkgs/development/python-modules/pylibdmtx/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pylibdmtx"; - version = "0.1.10"; + version = "0.1.11"; format = "setuptools"; src = fetchFromGitHub { owner = "NaturalHistoryMuseum"; repo = "pylibdmtx"; rev = "v${version}"; - hash = "sha256-vNWzhO4V0mj4eItZ0Z5UG9RBCqprIcgMGNyIe1+mXWY="; + hash = "sha256-HSHh80iRCbDM/eihepEzY7KCLAfgTSZS3PP1Q9JFNPo="; }; # Change: From 1dc8e0f02289f65a47c1e8b35bad0e1cf6ec6d14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Aug 2025 22:34:59 +0000 Subject: [PATCH 078/305] python3Packages.zodb: 6.0 -> 6.0.1 --- pkgs/development/python-modules/zodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index 82c7423e02ba..ed00f0677ca1 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "zodb"; - version = "6.0"; + version = "6.0.1"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zodb"; tag = version; - hash = "sha256-AFlRDci/OnRDGVNHAMAssefZshaGT0XlkhaO/Aee2Ao="; + hash = "sha256-2OK1ezHFEpOMOrpB8Nzf/6+4AlV3S7p11dQHkeMqhoo="; }; # remove broken test From f8da33f83ed4739c16e9f94ce2860577f5eb94db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Aug 2025 23:47:30 +0000 Subject: [PATCH 079/305] python3Packages.qutip: 5.2.0 -> 5.2.1 --- pkgs/development/python-modules/qutip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index 0da2792baee6..548b77f632ef 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "qutip"; - version = "5.2.0"; + version = "5.2.1"; pyproject = true; src = fetchFromGitHub { owner = "qutip"; repo = "qutip"; tag = "v${version}"; - hash = "sha256-jH/kpiR0cTIJraMU/ddZe7xX3CMYIV93oyfHfaKxif4="; + hash = "sha256-iM+RptMvLFF51v7OJPESYFB4WaYF5HxnfpqjYWAjAKU="; }; postPatch = From c7b139fe23bdc8caca59aecb61c3490c65d4c568 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Aug 2025 23:50:20 +0000 Subject: [PATCH 080/305] libretro-shaders-slang: 0-unstable-2025-08-14 -> 0-unstable-2025-08-26 --- pkgs/by-name/li/libretro-shaders-slang/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix index fbb2db132742..5a904afae721 100644 --- a/pkgs/by-name/li/libretro-shaders-slang/package.nix +++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "libretro-shaders-slang"; - version = "0-unstable-2025-08-14"; + version = "0-unstable-2025-08-26"; src = fetchFromGitHub { owner = "libretro"; repo = "slang-shaders"; - rev = "69e3dbb8947e749156ff1f70e32c88f3c37e6793"; - hash = "sha256-C+qO/B3Lb8vtQUV3u6ZqiVZlg2prytR+9IbTnvyQGMg="; + rev = "c9303dcc4d11fe5d37db9ef9a24c8eab4087c0c3"; + hash = "sha256-k/th5Ze/x48mTFZxEsSWCE4STnMSFXl3I0uMVmdMSxc="; }; dontConfigure = true; From bd8c23b83caa8120cd9be6052a038970264b8f00 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 00:26:14 +0000 Subject: [PATCH 081/305] asn: 0.78.6 -> 0.79.0 --- pkgs/by-name/as/asn/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/as/asn/package.nix b/pkgs/by-name/as/asn/package.nix index 023ef0cbbff5..29af1e63f98e 100644 --- a/pkgs/by-name/as/asn/package.nix +++ b/pkgs/by-name/as/asn/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "asn"; - version = "0.78.6"; + version = "0.79.0"; src = fetchFromGitHub { owner = "nitefood"; repo = "asn"; tag = "v${version}"; - hash = "sha256-IcAXcsmzxzDUPJp2ieouxfkpdwpOZP6IBTPdm3C5/k4="; + hash = "sha256-bQX5Kk48ydimQj/Ewo+7HmTBQBDo0LOi1KqX/syRAfQ="; }; nativeBuildInputs = [ From ce35dc0ffc0cc0257378e3a42a35d33b3eacbc55 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 01:17:47 +0000 Subject: [PATCH 082/305] python3Packages.pyoxigraph: 0.4.9 -> 0.4.11 --- pkgs/development/python-modules/pyoxigraph/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyoxigraph/default.nix b/pkgs/development/python-modules/pyoxigraph/default.nix index 0bb9f10008d9..3c9246ac1e0b 100644 --- a/pkgs/development/python-modules/pyoxigraph/default.nix +++ b/pkgs/development/python-modules/pyoxigraph/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "pyoxigraph"; pyproject = true; - version = "0.4.9"; + version = "0.4.11"; src = fetchFromGitHub { owner = "oxigraph"; repo = "oxigraph"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-sv9LpAoPQ4oFrGI6j6NgVZwEwpM1wt93lHkUwnvmhIY="; + hash = "sha256-M5C+SNZYXKfcosnRe9a+Zicyjuo6wli2uWv/SJxufJc="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-nVlvmYOxZDMLvxP8JaKTyKMgW6+48B8B+UzlwgthJS0="; + hash = "sha256-TgeHmCMwXK+OlTGIyzus/N+MY29lgK+JuzUBwVFbpsI="; }; buildAndTestSubdir = "python"; From c438ad461b0825df1a0b6d3e104a4569d724d1a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 02:00:00 +0000 Subject: [PATCH 083/305] hermitcli: 0.44.12 -> 0.45.0 --- pkgs/by-name/he/hermitcli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/he/hermitcli/package.nix b/pkgs/by-name/he/hermitcli/package.nix index 3f2808d7bc7f..ecc43c649cad 100644 --- a/pkgs/by-name/he/hermitcli/package.nix +++ b/pkgs/by-name/he/hermitcli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hermit"; - version = "0.44.12"; + version = "0.45.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "cashapp"; repo = "hermit"; - hash = "sha256-duIIZsLTeHqL0ipK8lFYgK+2talXMaazMWIWrl6I1WQ="; + hash = "sha256-Dk+m/23d5CMwjOXoD3mDs5fB7KgWfmX6BjrS3h/HB7w="; }; - vendorHash = "sha256-DT7Jv5VkqHPqJgi1n4wEa3z59il1mdp8JKjFs26fC2A="; + vendorHash = "sha256-bko9N3dbxe4K98BdG78lYYipAgAtGntrEAgoLeOY1NM="; subPackages = [ "cmd/hermit" ]; From bd91000abcf04a90b14d26bbbb304d610adb8b67 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Thu, 28 Aug 2025 19:25:27 -0700 Subject: [PATCH 084/305] python3Packages.ziggo-mediabox-xl: init at 1.1.0 --- .../ziggo-mediabox-xl/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/ziggo-mediabox-xl/default.nix diff --git a/pkgs/development/python-modules/ziggo-mediabox-xl/default.nix b/pkgs/development/python-modules/ziggo-mediabox-xl/default.nix new file mode 100644 index 000000000000..9ec4c1cfd4e7 --- /dev/null +++ b/pkgs/development/python-modules/ziggo-mediabox-xl/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + requests, + setuptools, +}: + +buildPythonPackage rec { + pname = "ziggo-mediabox-xl"; + version = "1.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "b10m"; + repo = "ziggo_mediabox_xl"; + tag = version; + hash = "sha256-ElULsHfZXYTZ1cFEdAjhURWGOmJw2uJWMy49whGAV7g="; + }; + + build-system = [ setuptools ]; + + dependencies = [ requests ]; + + # Tests require network access + doCheck = false; + + pythonImportsCheck = [ "ziggo_mediabox_xl" ]; + + meta = { + description = "Python interface to Ziggo's Mediabox XL"; + homepage = "https://github.com/b10m/ziggo_mediabox_xl"; + changelog = "https://github.com/b10m/ziggo_mediabox_xl/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e722cfc7ae0c..d5f3f6a9f62e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20354,6 +20354,8 @@ self: super: with self; { zict = callPackage ../development/python-modules/zict { }; + ziggo-mediabox-xl = callPackage ../development/python-modules/ziggo-mediabox-xl { }; + zigpy = callPackage ../development/python-modules/zigpy { }; zigpy-cc = callPackage ../development/python-modules/zigpy-cc { }; From 23448002b87c6cc5473fff2a37a6372901c2136d Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Thu, 28 Aug 2025 19:26:15 -0700 Subject: [PATCH 085/305] home-assistant: update component packages --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index dbb703a754e6..057986ce681b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -6881,7 +6881,8 @@ ]; "ziggo_mediabox_xl" = ps: with ps; [ - ]; # missing inputs: ziggo-mediabox-xl + ziggo-mediabox-xl + ]; "zimi" = ps: with ps; [ zcc-helper From 2a2894e1fdc93f3047df904010a1b20f425751d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 02:33:33 +0000 Subject: [PATCH 086/305] python3Packages.markups: 4.1.0 -> 4.1.1 --- pkgs/development/python-modules/markups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/markups/default.nix b/pkgs/development/python-modules/markups/default.nix index bac7b1332995..82189a623df6 100644 --- a/pkgs/development/python-modules/markups/default.nix +++ b/pkgs/development/python-modules/markups/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "markups"; - version = "4.1.0"; + version = "4.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "retext-project"; repo = "pymarkups"; tag = version; - hash = "sha256-7/pXCSbVhLeX7PhacMQYwYMT7Og/tZplPPCvWDxJFck="; + hash = "sha256-kQ1L8l/ONT4qOA/xfx85WyA7pDveaKoXWGZbljYxO/4="; }; build-system = [ setuptools ]; From 676c3b592e8e71f26f12b0feec73368e621d798f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 03:13:30 +0000 Subject: [PATCH 087/305] tile38: 1.36.0 -> 1.36.1 --- pkgs/by-name/ti/tile38/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ti/tile38/package.nix b/pkgs/by-name/ti/tile38/package.nix index b35432d91348..5fd0424d0965 100644 --- a/pkgs/by-name/ti/tile38/package.nix +++ b/pkgs/by-name/ti/tile38/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "tile38"; - version = "1.36.0"; + version = "1.36.1"; src = fetchFromGitHub { owner = "tidwall"; repo = "tile38"; tag = version; - hash = "sha256-FJ1I82ECCit6FV0F5VfY5xa6qCEqZo47KdnY0vwRGzg="; + hash = "sha256-65zUbnnksLCWCsOjO8xzyhJ2IKhPg6tttywvApzf7mw="; }; - vendorHash = "sha256-hpqH/+MlXPz3NZ0ooyWwf1Rg2UeKW49xQ0KbCFIi7jc="; + vendorHash = "sha256-J8kWsbU8onvXeVLGGBX9P6hYuGy50fG+m1nFg6phBMk="; subPackages = [ "cmd/tile38-cli" From 430ca53b6e6abfb089816e19e51b2d8774ef9a4f Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Thu, 28 Aug 2025 20:16:27 -0700 Subject: [PATCH 088/305] python3Packages.tellcore-net: init at 0.4 --- .../python-modules/tellcore-net/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/tellcore-net/default.nix diff --git a/pkgs/development/python-modules/tellcore-net/default.nix b/pkgs/development/python-modules/tellcore-net/default.nix new file mode 100644 index 000000000000..4e513953e9da --- /dev/null +++ b/pkgs/development/python-modules/tellcore-net/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, +}: + +buildPythonPackage rec { + pname = "tellcore-net"; + version = "0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "tellcore-net"; + tag = version; + hash = "sha256-yMNAu8iSFB2UDqJR3u2XFelpGRKzi/3HyuEbrZK6v8g="; + }; + + build-system = [ setuptools ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "tellcorenet" ]; + + meta = { + description = "Python module that allows to run tellcore over TCP/IP"; + homepage = "https://github.com/home-assistant-libs/tellcore-net"; + changelog = "https://github.com/home-assistant-libs/tellcore-net/releases/tag/${version}"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e722cfc7ae0c..09a2c7a229a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17907,6 +17907,8 @@ self: super: with self; { telfhash = callPackage ../development/python-modules/telfhash { }; + tellcore-net = callPackage ../development/python-modules/tellcore-net { }; + tellduslive = callPackage ../development/python-modules/tellduslive { }; temescal = callPackage ../development/python-modules/temescal { }; From db325c065859b0c95fe115083a658d57a5a7cf0a Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Thu, 28 Aug 2025 20:16:56 -0700 Subject: [PATCH 089/305] python3Packages.tellcore-py: init at 1.1.3 --- .../python-modules/tellcore-py/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/tellcore-py/default.nix diff --git a/pkgs/development/python-modules/tellcore-py/default.nix b/pkgs/development/python-modules/tellcore-py/default.nix new file mode 100644 index 000000000000..968c3d56e51a --- /dev/null +++ b/pkgs/development/python-modules/tellcore-py/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "tellcore-py"; + version = "1.1.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "erijo"; + repo = "tellcore-py"; + tag = "v${version}"; + hash = "sha256-AcdYMzd3Ln65PZ+weSxyR+CwXmdi2A+wSE6B/4hepE0="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "tellcore" ]; + + meta = { + description = "Python wrapper for Telldus' home automation library"; + homepage = "https://github.com/erijo/tellcore-py"; + changelog = "https://github.com/erijo/tellcore-py/releases/tag/v${version}"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 09a2c7a229a3..6c916ba09ced 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17909,6 +17909,8 @@ self: super: with self; { tellcore-net = callPackage ../development/python-modules/tellcore-net { }; + tellcore-py = callPackage ../development/python-modules/tellcore-py { }; + tellduslive = callPackage ../development/python-modules/tellduslive { }; temescal = callPackage ../development/python-modules/temescal { }; From bfb0361829f61ee9c4b611f20c52c151bccfce12 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Thu, 28 Aug 2025 20:17:07 -0700 Subject: [PATCH 090/305] home-assistant: update component packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index dbb703a754e6..ec913f2487a1 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -5927,7 +5927,9 @@ ]; "tellstick" = ps: with ps; [ - ]; # missing inputs: tellcore-net tellcore-py + tellcore-net + tellcore-py + ]; "telnet" = ps: with ps; [ ]; From 6341ee1ce0701e0f3b38eab16e9871af2e4d13b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 03:24:38 +0000 Subject: [PATCH 091/305] twitch-hls-client: 1.4.3 -> 1.5.0 --- pkgs/by-name/tw/twitch-hls-client/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tw/twitch-hls-client/package.nix b/pkgs/by-name/tw/twitch-hls-client/package.nix index 745bc8c8c9f4..982ef9919ca4 100644 --- a/pkgs/by-name/tw/twitch-hls-client/package.nix +++ b/pkgs/by-name/tw/twitch-hls-client/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "twitch-hls-client"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "2bc4"; repo = "twitch-hls-client"; rev = version; - hash = "sha256-UOXz1Gbo1alBnnwOWKlP5ZtaaTYr+Bqxe/+Y5A5B4Eg="; + hash = "sha256-B/gOqgn5g3L8Qs7a6vvjdHX4s+5KW2zg2z9mkzsdQqA="; }; - cargoHash = "sha256-0bcnObIBsjgzmIrKaypb/iXnloHCRXpJtVXXl2Agk94="; + cargoHash = "sha256-5LEMYUwPu6ydmL0mZVgXHKGkjnamvhw9e6II/xEnr04="; meta = with lib; { description = "Minimal CLI client for watching/recording Twitch streams"; From 019a6d8c5d66ebc8b04cef7ce4c53f1525182d09 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 04:00:24 +0000 Subject: [PATCH 092/305] python3Packages.edk2-pytool-library: 0.23.7 -> 0.23.8 --- .../python-modules/edk2-pytool-library/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index e562ba4de484..d90b312b155b 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.23.7"; + version = "0.23.8"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "tianocore"; repo = "edk2-pytool-library"; tag = "v${version}"; - hash = "sha256-NxGLxHs6OVHB3S3B/1qyAgqrS+aiRmt/yx7itWtlumo="; + hash = "sha256-JSOijiH/de/bItNt7yNu8+P21rI7YqiTf54zV2Ij5Gs="; }; build-system = [ From a804db4435c95084b6dc89f876452beb64719244 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 04:33:02 +0000 Subject: [PATCH 093/305] discord: 0.0.104 -> 0.0.107 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index a9b27084feca..cf639b34ae8c 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -9,7 +9,7 @@ let versions = if stdenv.hostPlatform.isLinux then { - stable = "0.0.104"; + stable = "0.0.107"; ptb = "0.0.156"; canary = "0.0.745"; development = "0.0.84"; @@ -26,7 +26,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-4w8C9YHRNTgkUBzqkW1IywKtRHvtlkihjo3/shAgPac="; + hash = "sha256-uL923Fc8Io0GUnQjaAl7sRahL6CO/qzNzkqk/oKkZCo="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; From 69b45f95c10c2b3438f212b02e9e81b0c8299ee0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 05:12:04 +0000 Subject: [PATCH 094/305] fcitx5-bamboo: 1.0.7 -> 1.0.8 --- pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix index 4ae81bfb001d..2a5b87847c56 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fcitx5-bamboo"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-bamboo"; rev = finalAttrs.version; - hash = "sha256-yvyJHIXUYpOIeiSQasSRKTbN4Z0BAjohz8VlZKqMg0Q="; + hash = "sha256-cnrW25M9nluBLa+9Mynzkn/6AiGccSbtjS8p+L4ZDKM="; fetchSubmodules = true; }; From e6c2c9bcc08b31998b6cc703144236ce87cd1c87 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 05:31:34 +0000 Subject: [PATCH 095/305] xcp: 0.24.1 -> 0.24.2 --- pkgs/by-name/xc/xcp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xc/xcp/package.nix b/pkgs/by-name/xc/xcp/package.nix index 0ef12c99381d..df3bf25ee049 100644 --- a/pkgs/by-name/xc/xcp/package.nix +++ b/pkgs/by-name/xc/xcp/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "xcp"; - version = "0.24.1"; + version = "0.24.2"; src = fetchFromGitHub { owner = "tarka"; repo = "xcp"; tag = "v${finalAttrs.version}"; - hash = "sha256-TI9lveFJsb/OgGQRiPW5iuatB8dsc7yxBs1rb148nEY="; + hash = "sha256-ojk2khNLKhnAbWlBG2QEhcVrXz5wuC92IOEG3o58E3A="; }; - cargoHash = "sha256-9cNu0cgoo0/41daJwy/uWIXa2wFhYkcPhJfA/69DVx0="; + cargoHash = "sha256-uJVm9nxXXfn4ZEIYoX2XMhZN7Oduwi1D8wZmv64mx60="; nativeBuildInputs = [ installShellFiles ]; From 02c06a92bbb1d853421d375aafe1ac3649ae4d45 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 06:12:24 +0000 Subject: [PATCH 096/305] terraform-providers.bitwarden: 0.15.0 -> 0.16.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0d3334b085bf..1994f726d04e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -198,13 +198,13 @@ "vendorHash": "sha256-ok73U0WWFGXp5TJ7sp7U9umq7DlChCw7fSyFmbifwKE=" }, "bitwarden": { - "hash": "sha256-yq45SlP8x/jMSuhgrIIAM+hWa4tcp2d871uoLy+iIZM=", + "hash": "sha256-dYWiz5DjkMQliUpvapKANj45vUyiPaE6GeP/HOBrKt8=", "homepage": "https://registry.terraform.io/providers/maxlaverse/bitwarden", "owner": "maxlaverse", "repo": "terraform-provider-bitwarden", - "rev": "v0.15.0", + "rev": "v0.16.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-oQ7rOrWS2cJtAOwO+tQ9aB27DyHMhf5FYpDvJVsLe/k=" + "vendorHash": "sha256-I8yMdS+yOk5doWGU9VPdl5ITGNrPhs5tGwluwXSrnI0=" }, "brightbox": { "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=", From 64e3381410fa118f4abf747e6d7045470bc199a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 08:00:58 +0000 Subject: [PATCH 097/305] cargo-tally: 1.0.68 -> 1.0.69 --- pkgs/by-name/ca/cargo-tally/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-tally/package.nix b/pkgs/by-name/ca/cargo-tally/package.nix index 2b0bf29e67a8..14d00be1c4d4 100644 --- a/pkgs/by-name/ca/cargo-tally/package.nix +++ b/pkgs/by-name/ca/cargo-tally/package.nix @@ -6,14 +6,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.68"; + version = "1.0.69"; src = fetchCrate { inherit pname version; - hash = "sha256-OJI0GDQqf15dFC9ckQDg43QQzowI5R6iMEMwfadzRZU="; + hash = "sha256-ZAayOuuCncjQ3+RGega/aQW/s14QB9541EFB7f6CWxE="; }; - cargoHash = "sha256-UrMdyFcvBXsRJfIuDOKVIIkoOnwjJZPbAptusG8Tgwo="; + cargoHash = "sha256-XLnmx84OP3bwhuRfezczKMJsyc95ClK4yC/RqPe9AB8="; meta = { description = "Graph the number of crates that depend on your crate over time"; From 6a072391f0eae838730ad98395483e463ac3e423 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 08:01:13 +0000 Subject: [PATCH 098/305] apko: 0.30.5 -> 0.30.6 --- pkgs/by-name/ap/apko/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix index f0d0411adf42..7a88fe508045 100644 --- a/pkgs/by-name/ap/apko/package.nix +++ b/pkgs/by-name/ap/apko/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "apko"; - version = "0.30.5"; + version = "0.30.6"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = "apko"; tag = "v${finalAttrs.version}"; - hash = "sha256-FYbk61+gVFmTynn2wywtiDIsTfMKWWO+WrZVPgV8KaU="; + hash = "sha256-xzXx+pe1WUe0Bxlig04fwgXF/ewKaehezQk4npJ/zic="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; From 5218f86dbca9373a79785415745b5fd64f2cdd94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Fri, 29 Aug 2025 11:21:26 +0300 Subject: [PATCH 099/305] openboard: switch to qt6 and remove obsolete importer --- pkgs/by-name/op/openboard/package.nix | 47 +++++++++------------------ 1 file changed, 16 insertions(+), 31 deletions(-) diff --git a/pkgs/by-name/op/openboard/package.nix b/pkgs/by-name/op/openboard/package.nix index bce3f0317938..0fc368b5539a 100644 --- a/pkgs/by-name/op/openboard/package.nix +++ b/pkgs/by-name/op/openboard/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, cmake, pkg-config, - libsForQt5, + qt6Packages, libGL, fontconfig, openssl, @@ -27,28 +27,15 @@ }: let - importer = stdenv.mkDerivation { - pname = "openboard-importer"; - version = "0-unstable-2016-10-08"; - - src = fetchFromGitHub { - owner = "OpenBoard-org"; - repo = "OpenBoard-Importer"; - rev = "47927bda021b4f7f1540b794825fb0d601875e79"; - sha256 = "19zhgsimy0f070caikc4vrrqyc8kv2h6rl37sy3iggks8z0g98gf"; - }; - - nativeBuildInputs = [ - libsForQt5.qmake - libsForQt5.wrapQtAppsHook - ]; - buildInputs = [ libsForQt5.qtbase ]; - dontWrapQtApps = true; - - installPhase = '' - install -Dm755 OpenBoardImporter $out/bin/OpenBoardImporter - ''; - }; + inherit (qt6Packages) + qtbase + qttools + qtmultimedia + qtwebengine + qmake + wrapQtAppsHook + quazip + ; in stdenv.mkDerivation (finalAttrs: { pname = "openboard"; @@ -76,14 +63,14 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config - libsForQt5.wrapQtAppsHook + wrapQtAppsHook ]; buildInputs = [ - libsForQt5.qtbase - libsForQt5.qtxmlpatterns - libsForQt5.qttools - libsForQt5.qtwebengine + qtbase + qttools + qtwebengine + qtmultimedia libGL fontconfig openssl @@ -101,13 +88,11 @@ stdenv.mkDerivation (finalAttrs: { lame fdk_aac libass - libsForQt5.quazip + quazip libXext libXfixes ]; - propagatedBuildInputs = [ importer ]; - meta = with lib; { description = "Interactive whiteboard application"; homepage = "https://openboard.ch/"; From 5822db93d214233a7319452a04ef5634da22260c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 08:22:52 +0000 Subject: [PATCH 100/305] serie: 0.4.7 -> 0.5.0 --- pkgs/by-name/se/serie/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix index 56fd963ddbd2..4dc696af3d2c 100644 --- a/pkgs/by-name/se/serie/package.nix +++ b/pkgs/by-name/se/serie/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "serie"; - version = "0.4.7"; + version = "0.5.0"; src = fetchFromGitHub { owner = "lusingander"; repo = "serie"; rev = "v${version}"; - hash = "sha256-BzawNeRdZ6YfjHwnGzKTJYc6mmRBOADGo86ebKY3xbo="; + hash = "sha256-1MDVoMaxd4ufJeI7D/2d6M1hxiB1J3ALNEbNDoffcs8="; }; - cargoHash = "sha256-UpJoNfDPugcPXkJR/zBslemnzaA54Mt1Q1BZerryQSs="; + cargoHash = "sha256-FQdCOI/KW+CbIxzQ5W2d53xSOvScpKRtnN+1RehEu0Q="; nativeCheckInputs = [ gitMinimal ]; From 09e0394a71d2852fa0004ed30920a8f63d7affe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Fri, 29 Aug 2025 09:54:30 +0100 Subject: [PATCH 101/305] codex: 0.25.0 -> 0.27.0 --- pkgs/by-name/co/codex/package.nix | 65 +++++-------------------------- 1 file changed, 9 insertions(+), 56 deletions(-) diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index 4edb56c03e3b..7eea7b883c9b 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -3,7 +3,6 @@ stdenv, rustPlatform, fetchFromGitHub, - gitMinimal, installShellFiles, nix-update-script, pkg-config, @@ -13,13 +12,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.25.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-a/cUg8yLW4vGPiTtqhyUdkV79JbOB40N4V7Asney7sk="; + hash = "sha256-vsZmHkph2rrb0K+ZRymweRculh+SIASCJCRP3V09hKU="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; @@ -33,59 +32,13 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ openssl ]; - nativeCheckInputs = [ gitMinimal ]; - - __darwinAllowLocalNetworking = true; - preCheck = '' - # Disables sandbox tests which want to access /usr/bin/touch - export CODEX_SANDBOX=seatbelt - # Skips tests that require networking - export CODEX_SANDBOX_NETWORK_DISABLED=1 - # Required by ui_snapshot_add_details and ui_snapshot_update_details_with_rename - export TERM=dumb - # Required by azure_overrides_assign_properties_used_for_responses_url and env_var_overrides_loaded_auth - export USER=test - ''; - checkFlags = [ - # Wants to access unix sockets - "--skip=allow_unix_socketpair_recvfrom" - # Needs access to python3. However, adding python3 to nativeCheckInputs doesn't resolve the issue - "--skip=exec_command::session_manager::tests::session_manager_streams_and_truncates_from_now" - "--skip=python_multiprocessing_lock_works_under_sandbox" - # Version 0.0.0 hardcoded - "--skip=test_conversation_create_and_send_message_ok" - "--skip=test_send_message_session_not_found" - "--skip=test_send_message_success" - "--skip=suite::auth::get_auth_status_no_auth" - "--skip=suite::auth::get_auth_status_with_api_key" - "--skip=suite::auth::get_auth_status_with_api_key_no_include_token" - "--skip=suite::login::login_and_cancel_chatgpt" - "--skip=suite::login::logout_chatgpt_removes_auth" - # Tests fail - "--skip=diff_render::tests::ui_snapshot_add_details" - "--skip=diff_render::tests::ui_snapshot_update_details_with_rename" - "--skip=diff_render::tests::ui_snapshot_blank_context_line" - "--skip=diff_render::tests::ui_snapshot_single_line_replacement_counts" - "--skip=diff_render::tests::ui_snapshot_vertical_ellipsis_between_hunks" - # Needs acces to sleep. However, adding coreutils to nativeCheckInputs doesn't resolve the issue - "--skip=suite::exec_stream_events::test_aggregated_output_interleaves_in_order" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Wants to access /bin/zsh - "--skip=shell::tests::test_run_with_profile_escaping_and_execution" - # Requires access to the Apple system configuration - "--skip=azure_overrides_assign_properties_used_for_responses_url" - "--skip=env_var_overrides_loaded_auth" - "--skip=includes_base_instructions_override_in_request" - "--skip=includes_user_instructions_message_in_request" - "--skip=originator_config_override_is_used" - "--skip=per_turn_overrides_keep_cached_prefix_and_key_constant" - "--skip=overrides_turn_context_but_keeps_cached_prefix_and_key_constant" - "--skip=prefixes_context_and_instructions_once_and_consistently_across_requests" - "--skip=test_apply_patch_tool" - "--skip=suite::prompt_caching::codex_mini_latest_tools" - "--skip=suite::prompt_caching::prompt_tools_are_consistent_across_requests" - ]; + # NOTE: part of the test suite requires access to networking, local shells, + # apple system configuration, etc. since this is a very fast moving target + # (for now), with releases happening every other day, constantly figuring out + # which tests need to be skipped, or finding workarounds, was too burdensome, + # and in practice not adding any real value. this decision may be reversed in + # the future once this software stabilizes. + doCheck = false; postInstall = lib.optionalString installShellCompletions '' installShellCompletion --cmd codex \ From 50a40de93f5ed9efdfd1bfc150c733d8839a2e47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 09:07:02 +0000 Subject: [PATCH 102/305] tutanota-desktop: 301.250806.1 -> 304.250825.0 --- pkgs/by-name/tu/tutanota-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix index 6daf0ed79700..269c7a249b27 100644 --- a/pkgs/by-name/tu/tutanota-desktop/package.nix +++ b/pkgs/by-name/tu/tutanota-desktop/package.nix @@ -8,11 +8,11 @@ appimageTools.wrapType2 rec { pname = "tutanota-desktop"; - version = "301.250806.1"; + version = "304.250825.0"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-vnHw1cOvLuJZYxisVaF6sh5XBqlDiaCS3PLugbbNaKk="; + hash = "sha256-5nEC9zTmPhlv8+7a2UAuZpGSmOC+lMPzCbc2InvAo2k="; }; extraPkgs = pkgs: [ pkgs.libsecret ]; From 543daa48625890ec51e8ee6ebdb8851713eb0040 Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Fri, 29 Aug 2025 12:33:11 +0300 Subject: [PATCH 103/305] python3Packages.protobuf5: 5.29.4 -> 5.29.5 https://github.com/protocolbuffers/protobuf/compare/v5.29.4...v5.29.5 --- pkgs/development/python-modules/protobuf/5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/protobuf/5.nix b/pkgs/development/python-modules/protobuf/5.nix index c71acbec7717..8ea371e836c9 100644 --- a/pkgs/development/python-modules/protobuf/5.nix +++ b/pkgs/development/python-modules/protobuf/5.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "protobuf"; - version = "5.29.4"; + version = "5.29.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Tx3815l7Me+PU+yCeB/0NKKL9x2RAt3eFNB2rc/HjJk="; + hash = "sha256-vBRjuv1LCSkhbDX0N6jihzGit/49mLt3pgDvztWhXIQ="; }; build-system = [ setuptools ]; From 7d49bc91c27ac9a1fb15763cc5bb3c24d6ef9a00 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 09:37:48 +0000 Subject: [PATCH 104/305] python3Packages.elevenlabs: 2.12.0 -> 2.12.1 --- pkgs/development/python-modules/elevenlabs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix index cd51ec1ec705..b31863614ba7 100644 --- a/pkgs/development/python-modules/elevenlabs/default.nix +++ b/pkgs/development/python-modules/elevenlabs/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.12.0"; + version = "2.12.1"; tag = "v${version}"; in buildPythonPackage { @@ -25,7 +25,7 @@ buildPythonPackage { owner = "elevenlabs"; repo = "elevenlabs-python"; inherit tag; - hash = "sha256-vxr4KB6N46TS9i0XlXwVf3x5flGVSb+sIH0uhtVvLd0="; + hash = "sha256-61MxA0xnXhfzvIpLtL0SA0aXdwF3tzIy+/TsJRaS2mM="; }; build-system = [ poetry-core ]; From fb1f34806a6e19fac9aba752c073b05f90ad2699 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 09:43:58 +0000 Subject: [PATCH 105/305] textcompare: 0.1.5 -> 0.1.6 --- pkgs/by-name/te/textcompare/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/textcompare/package.nix b/pkgs/by-name/te/textcompare/package.nix index 44c94228ab14..6d023297bc15 100644 --- a/pkgs/by-name/te/textcompare/package.nix +++ b/pkgs/by-name/te/textcompare/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "textcompare"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "josephmawa"; repo = "TextCompare"; tag = "v${finalAttrs.version}"; - hash = "sha256-PFQbaztaRErXHVLErVE/bBAsItNfp3DSbfx83omB04g="; + hash = "sha256-KWW83866dZRpuJzzYwk2X1/6OoD4gPnm2LD6IlP3fps="; }; strictDeps = true; From 2d68564b252982d97632052fd45c3b43110c0c32 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 09:53:17 +0000 Subject: [PATCH 106/305] dysk: 3.0.0 -> 3.1.0 --- pkgs/by-name/dy/dysk/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dy/dysk/package.nix b/pkgs/by-name/dy/dysk/package.nix index 261dc50b2238..0ed880346f7a 100644 --- a/pkgs/by-name/dy/dysk/package.nix +++ b/pkgs/by-name/dy/dysk/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "dysk"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "Canop"; repo = "dysk"; rev = "v${version}"; - hash = "sha256-aQbvuLcgZX+bLegGhwrlO2unOFXi2MIGHjSvdhzxhYM="; + hash = "sha256-2YqKKgNOx5+DLzIEkJTYqTAuxmKMhpCb79w7qLabvOk="; }; - cargoHash = "sha256-6/nIktM0E5MHo3Badrt0nMq5EFcK/LUS9k81Cjq7NSU="; + cargoHash = "sha256-2raAjpHh49ifZQfG2/WK94gR0lQzF/5cgmUzd69Kh3o="; nativeBuildInputs = [ installShellFiles From 4e639fb6d9e6234cb1ad543cb44e376b09434015 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 29 Aug 2025 11:07:24 +0200 Subject: [PATCH 107/305] dbx: fix build --- pkgs/by-name/db/dbx/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/db/dbx/package.nix b/pkgs/by-name/db/dbx/package.nix index b27f0ccfff09..53efc27c49db 100644 --- a/pkgs/by-name/db/dbx/package.nix +++ b/pkgs/by-name/db/dbx/package.nix @@ -33,6 +33,12 @@ let # Tests require langchain-openai which is incompatible with pydantic_1 doCheck = false; }); + + versioningit = super.versioningit.overridePythonAttrs (old: { + # Tests fail with pydantic_1 + # AttributeError: type object 'CaseDetails' has no attribute 'model_validate_... + doCheck = false; + }); }; }; in @@ -129,8 +135,13 @@ python.pkgs.buildPythonApplication rec { # Fails because of dbfs CLI wrong call "test_dbfs_unknown_user" "test_dbfs_no_root" + # Requires pylint, prospector, pydocstyle "test_python_basic_sanity_check" + + # FileNotFoundError: [Errno 2] No such file or directory: '/build/tmph3veuluv... + "test_load_file" + "test_storage_serde" ]; disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ From 4db8ccb60dd60d395c31ad1c0b6bb42dae600205 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 10:44:50 +0000 Subject: [PATCH 108/305] python3Packages.llama-index-readers-file: 0.5.0 -> 0.5.2 --- .../python-modules/llama-index-readers-file/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index 8c055851158a..028cf5eb648d 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "llama-index-readers-file"; - version = "0.5.0"; + version = "0.5.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_file"; inherit version; - hash = "sha256-8yRhe/xNmzITbSX/U1G5K8C1aaKWFz7iqFkcH4hu/ww="; + hash = "sha256-BJ2XGsTJNu2/SDKRW6cSjP7o9erUNSZnkrce3Yf1MFw="; }; pythonRelaxDeps = [ From 5fcc3c1df9a96b33b2c66424a5ee1585f0782a28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 10:45:40 +0000 Subject: [PATCH 109/305] tflint-plugins.tflint-ruleset-google: 0.34.0 -> 0.35.0 --- .../tools/analysis/tflint-plugins/tflint-ruleset-google.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix index db8914968e05..d7fe84fec3ee 100644 --- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix +++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "tflint-ruleset-google"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - hash = "sha256-rbV7eNQAN4RjhsIUfxIFCPdcAAehuWv5iGwCxEFKhsU="; + hash = "sha256-7olOS0vYfYaEIr4Tba3Cp5cc7fmJU+TJjom6ZvWIYzc="; }; - vendorHash = "sha256-cDKcBbyF7iizJ9j5qAMME7WlsP1UJ7Ti9W1hzA3XfV0="; + vendorHash = "sha256-9WI3mPZIM2+EEisliRWtq6ZKLjOVFWpLTYD7jwvataY="; # upstream Makefile also does a go test $(go list ./... | grep -v integration) preCheck = '' From 2a78913d50922ca773697749381bfe01a927738d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 11:09:51 +0000 Subject: [PATCH 110/305] python3Packages.pysequoia: 0.1.28 -> 0.1.29 --- pkgs/development/python-modules/pysequoia/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pysequoia/default.nix b/pkgs/development/python-modules/pysequoia/default.nix index 1075019cae39..3512f078ec48 100644 --- a/pkgs/development/python-modules/pysequoia/default.nix +++ b/pkgs/development/python-modules/pysequoia/default.nix @@ -8,17 +8,17 @@ buildPythonPackage rec { pname = "pysequoia"; - version = "0.1.28"; + version = "0.1.29"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-ixTszL2IN50SDYTDZqzlMI1nY6yNkEUnK5VxCoAG0jk="; + hash = "sha256-PWzXXBAKrVZaFtZCYOyMHX5DIickqN9eR6DYhDNBoJo="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-cq55j3wNcV8CRbnqZPV8zrRzvUud5RXJDX1oh7WZoiU="; + hash = "sha256-sZTbPlfkZLWcRmdOWLBw8k0pIukAjQ53C8Zs9gLEW+I="; }; nativeBuildInputs = [ From 888c19a0e859227d01d158d6d3f7e7fc91d81ddd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 11:22:20 +0000 Subject: [PATCH 111/305] rqlite: 8.43.3 -> 8.43.4 --- pkgs/by-name/rq/rqlite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix index 32edb0ef3617..ef8fc048cf96 100644 --- a/pkgs/by-name/rq/rqlite/package.nix +++ b/pkgs/by-name/rq/rqlite/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "rqlite"; - version = "8.43.3"; + version = "8.43.4"; src = fetchFromGitHub { owner = "rqlite"; repo = "rqlite"; tag = "v${finalAttrs.version}"; - hash = "sha256-nueJOmb/xjslkp+W95HacBRIRCuG00iAz3sNl3gJ1ww="; + hash = "sha256-2lCMRKGsDfwvXX1iCXfvVj4xcZT9IWRl8jWTpsIOkkw="; }; - vendorHash = "sha256-ioXNmVqYfje1Lg0mI4XofnD8CuHkU3+3uFQCzuQn998="; + vendorHash = "sha256-Xytvin7YX3eIPE5aw38PzLxhUPwoOZswAntEwCP6Toc="; subPackages = [ "cmd/rqlite" From d264d89a13644cde8941534e02a60674f10a4b33 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 29 Aug 2025 13:44:59 +0200 Subject: [PATCH 112/305] bacon: 3.17.0 -> 3.18.0 Diff: https://github.com/Canop/bacon/compare/v3.17.0...v3.18.0 Changelog: https://github.com/Canop/bacon/blob/v3.18.0/CHANGELOG.md --- pkgs/by-name/ba/bacon/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix index 7ff7d625d536..4ae74b7d1470 100644 --- a/pkgs/by-name/ba/bacon/package.nix +++ b/pkgs/by-name/ba/bacon/package.nix @@ -27,16 +27,16 @@ in rustPlatform.buildRustPackage (finalAttrs: { pname = "bacon"; - version = "3.17.0"; + version = "3.18.0"; src = fetchFromGitHub { owner = "Canop"; repo = "bacon"; tag = "v${finalAttrs.version}"; - hash = "sha256-pXdwcihl3fXv9vn6YiU+Da/LL3ImDiDPDnghM/NA1mc="; + hash = "sha256-YdlNJWsKGkXvpcA8un3eNfLVBlU6nalVyO/dhDAQF9k="; }; - cargoHash = "sha256-GHJqgVa7yym1B1s6rZ2/0FbJ0ZJck76FFHqzcgWhFt0="; + cargoHash = "sha256-vGrWs8OkoqPO/oEiGZXrMxIKVA3u4gsaXgF1QUQT3kw="; buildFeatures = lib.optionals withSound [ "sound" From 269101a6a7d752a15f0a9fef49ae05987288034c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 29 Aug 2025 13:50:39 +0200 Subject: [PATCH 113/305] python3Packages.pytorch-lightning: 2.5.3 -> 2.5.4 Diff: https://github.com/Lightning-AI/pytorch-lightning/compare/2.5.3...2.5.4 Changelog: https://github.com/Lightning-AI/pytorch-lightning/releases/tag/2.5.4 --- pkgs/development/python-modules/pytorch-lightning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index d1c9b0fdd4c0..52642bddcc25 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "2.5.3"; + version = "2.5.4"; pyproject = true; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; tag = version; - hash = "sha256-xLm8t1A6mwIyX5WCkhdt9D9/PsomkSTCAxIGBQlFGxY="; + hash = "sha256-BScZ1JlJeJ067C5AwWnD0thJvUcsCryp3k/oZsWlwJ8="; }; preConfigure = '' From cb1721bc870ea1cf3dd1dc7e39d2801110e1143b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 12:01:56 +0000 Subject: [PATCH 114/305] thunderbird-latest-bin-unwrapped: 141.0 -> 142.0 --- .../thunderbird-bin/release_sources.nix | 794 +++++++++--------- 1 file changed, 397 insertions(+), 397 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 2f90284ae933..f04042847e05 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,1193 +1,1193 @@ { - version = "141.0"; + version = "142.0"; sources = [ { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/af/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/af/thunderbird-142.0.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "12a07f29d6e64e18caeef13b7c218863239ea90bde62325811af7699b85fe196"; + sha256 = "7584382539cc901039cc2b1ba2b93ad5b9b57537c73f96c3da2f914ea130571b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ar/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/ar/thunderbird-142.0.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "f3074263a05af16b520b90d858247d9be1c97881641291b7077908d4c76e01a1"; + sha256 = "1ba796338fa9eb6319f9181c6a9d11108d1ed7c1eac6558af084ca3406bdbd13"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ast/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/ast/thunderbird-142.0.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "8942892fee9178594f84ddadaade8425594ad147d433e2d7e6a766ad37eec733"; + sha256 = "99bb4c86802bb37b29b8385b78014caf2f0a6bdd4a81abed8c6e27ee5a388952"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/be/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/be/thunderbird-142.0.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "b175ded9c9c7e3dfc1ab15848cd4d07fd59bd795c22ba3825d9e27905085a3cd"; + sha256 = "54f49c84c7fbaa3aada5a679cd00a5f4be9fdd883189777cf7fd5cb0f55ca385"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/bg/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/bg/thunderbird-142.0.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "b05a569ddce271e89844a39affd9f4d4a53f6e4bd2fc6b5eca414564d3a6563e"; + sha256 = "664bf9c0e8a790f256eeb2cb0ef077aac5beb958196585bb206071cf0b3972c5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/br/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/br/thunderbird-142.0.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "6276bf47b6bf727c7e863954d6ae02b034f8d1a6a1c283dde581c61d6d69585f"; + sha256 = "80b175d0dedf0f06207690502d03d2cc95e205357745b54608fef031a16d2d11"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ca/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/ca/thunderbird-142.0.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "eaa3ee617f1335ef235ed8d0e257900a4f1fb31b89a1b0febd54cd79a0548f71"; + sha256 = "e7c05eb1c13a35429f67b0030b118921cebf92aacbc28a0d2222b1c1d6e75c09"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/cak/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/cak/thunderbird-142.0.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "bc7a232696d1b4d933a936262d54dc156a938ead5c5e3ecaa472223fc97dea1c"; + sha256 = "b3e5e9f6ea28e8eb038d80f264e745fc527628cd7d5235b29ebfd13cf0257576"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/cs/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/cs/thunderbird-142.0.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "2500647f557ea8f53b015349c69b483042a3c14d913c873a74b7cdd7252d6ab2"; + sha256 = "67c968a6569ff0fe177f8b323a5c79f8c26aecf141d634af5aa284c17456d4bf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/cy/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/cy/thunderbird-142.0.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "606bcdae313e03f073e3223ddbd36ebfada6577f99b218f24e03a0dd04c0cb4f"; + sha256 = "e79baa1bd4ac938137e3773725bba59b7dba807ca2f0cf426072fb81247e7d56"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/da/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/da/thunderbird-142.0.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "a4b9a1561bea4216d3a54f944dfdcb66ac9e89fc7fc4035d6c0da0a65326e26a"; + sha256 = "2cd0caec716abc92e8a88eb802e760b0240842be00a509f59c3d70a330f77d8b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/de/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/de/thunderbird-142.0.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "8472f7039cb6de2ac5728f0f41059820df6fc4a0fb5627f09137e148839bc449"; + sha256 = "70ae29b40d337b8a33e13f1d3cc83936e8798451b1f760741cbf3eaa57ead4c8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/dsb/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/dsb/thunderbird-142.0.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "75e83573db6977179b728f1b0ed90bb41f8e719addef349395c3091682e16964"; + sha256 = "db75331a67281ea55be2aa3b6454c1b4858cf10d6676d2ebc9f5694379fd3b6c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/el/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/el/thunderbird-142.0.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "bbbd69e89f6049d0c0f0afb7ddf66ce50237fdeb724f2efb47e1c455eb5f502d"; + sha256 = "a75c809fd3081de7684447b519c0e8d2e99f256871ecab8fa62cdaab609637a0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/en-CA/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/en-CA/thunderbird-142.0.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "6fd325aa2528917e5c62a843dbae4af1d8afc0bf548e0590922f29c04fddfd6d"; + sha256 = "bab20e3c71201bbfb31261f0c3c18c1102e095131c82ed5da8d3f7bafbcd50d7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/en-GB/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/en-GB/thunderbird-142.0.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "3ce3f1ebf25552679da4d043afb7c3d4a2f17fdb5d6e17303b3d1c4aa29ffe13"; + sha256 = "a1771872f9b0faa42afdb30db8286abbc6076c37a69d7d1f2cebeb1f3c60f9b0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/en-US/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/en-US/thunderbird-142.0.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "137a75c034b8bda7cbe546555f384e19eba82e51ed531577d5e5d178718568f4"; + sha256 = "2ab423122393b8640e72178d7c690ce50a920ccb8fbd1206f367813e6ea54574"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/es-AR/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/es-AR/thunderbird-142.0.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "7656269ab07ed2495565087a9c743b919b84139dda833e098d96d6d68f826a30"; + sha256 = "09e3c907372ba6adb7a064673a67d4d202a48a139ce1cbe884711f7506cb040d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/es-ES/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/es-ES/thunderbird-142.0.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "460f8649656a9c37f4b89f0c85b44d1fe0236fdeef1b0bff69b2a36cd998fa36"; + sha256 = "e6b55e77ee66f2bc7f18c791c718420dd08c4f03ae3d79409028232fdfe8adad"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/es-MX/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/es-MX/thunderbird-142.0.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "e5187639f7df8e74419de3d2e5eae2c8b9646e16f91c9b666518952d023f07ca"; + sha256 = "faa7716c695bdd70b75192d1e9cb91783179f64f8ecb67623f47d77e20d300e9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/et/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/et/thunderbird-142.0.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "c9c1ac8e2ef246c93407b2cb80022ec95e69d66581a2efbbafb5cad09b987abb"; + sha256 = "6d1b33eaf4e699dbf6dfd4fb70272585a9c3a7783acf80c13bab030c733188fc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/eu/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/eu/thunderbird-142.0.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "59f896bdb415984c597fcef8ef75e38ab4b31584058f0efce0023a1aad9c95b6"; + sha256 = "fee0ae2420b6371fab0c3444793092c26ee52ab073f8430cc01aa49960cfb2a7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/fi/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/fi/thunderbird-142.0.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "014fe15360acb7ccac8d1247eba6a2f731022715e13fb34aac547c4217107772"; + sha256 = "ab6d4bff39581ad5c0af8f4bbcb70eefda66629f54f0dd9287cd8f31c83beecc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/fr/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/fr/thunderbird-142.0.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "57ea66a729e1336547c4351505aade3fac0f187f0f2a0a7a0a74de50743873a7"; + sha256 = "8f05ccae325f72a3ec6a56104d739214735ae57f0704f27d2b7fc5185329cade"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/fy-NL/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/fy-NL/thunderbird-142.0.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "0767b0c838f914d9a6ee56fe7c1eed13ad199f859103332f5f021e1ac1ef4764"; + sha256 = "3d7330fdcc8cf72ae9f3e8d3e975f240d8006700cb22bc28a3ff5738dad5ad81"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ga-IE/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/ga-IE/thunderbird-142.0.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "bd893cc9a078b28a096055a86774106af486562c579be05fd4e4ae2ceb00938a"; + sha256 = "1fbed44afd618c6e977e585c6ebf482c1ea71a870540995940be280eded9f48e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/gd/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/gd/thunderbird-142.0.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a57ec4d39156edbd29a88271be0ade2f8875154fb6aadc333a3c949844b8167f"; + sha256 = "04ce78891781680ca04d20787617783cca3dd158e1a2ea684758326d6f9a1c62"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/gl/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/gl/thunderbird-142.0.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "5599fc5e63aa2de6acd3f8aed8f6f838be013d9f23d9a7df0e1be2e919f060f7"; + sha256 = "d663a43296bc0c3201c7de82c11bf2767a255896e529e6507c8fbf263bcc9f0f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/he/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/he/thunderbird-142.0.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "197368781e1a15d577c74bf0a5360348461175b5d6f46ff3343a29d5b22c2f70"; + sha256 = "5922e533ddcc82cfcd55aab0eef4bb9267b00f4a2ddcc4b4f69a0938b73b46d0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/hr/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/hr/thunderbird-142.0.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "6aa86889764f4a18ed7090efa63b77ff2dfbd684783578421f94dc70dd58798e"; + sha256 = "23c7a4cd27f4f9fbfb0151aaf79dae8efdd0c78da10bbefd93e5cef0ebedb90d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/hsb/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/hsb/thunderbird-142.0.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "7db7bef60c0e41bfddca6373de34016b666bb481ccaad3e9449e6ad64f7c9288"; + sha256 = "a423192c4a9f61b978033f7983e9df4e10ffc89ebf6c8141184481a76ed73cd9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/hu/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/hu/thunderbird-142.0.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "200221f75f7aa6646bbdcdbc25c73c49b8345abaf57fab856d901e8f0df12e4f"; + sha256 = "ccecfbcf118d0b8df392c2209022d910417b1c22f0a97678c0afa56919aa662e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/hy-AM/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/hy-AM/thunderbird-142.0.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "7acfab29e0e99507bc6197fcb3d02a04280724d55e2f17f704a0c931127bd348"; + sha256 = "cea3716b612f440c8b80002acafe59ec0f8dc0050ea7c51bf14e59925c689bd5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/id/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/id/thunderbird-142.0.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "0d4bf93498ad5d775431da619ffbd7d9371e6cc9aa18f821911f7dfcf5ba395c"; + sha256 = "7560b1ce742436123e09f35912f4614c8a109c9ece5a7fda37e9cde8b3e68ae5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/is/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/is/thunderbird-142.0.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "c5fde012142d8b5213b93c151e26af4185d84b7595638b4b645faff6fc9f704e"; + sha256 = "1bf8298707e6a70d605f81b1190519dd5c6817e3c08044467fec1d1bf9449933"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/it/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/it/thunderbird-142.0.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "9ad8b05d4c7401943b875c48303742901d4c6567ee4e2f896630072a97e19d9d"; + sha256 = "fbe2677e167d648e09a6d90bb07096775c9b5a753073b8dc1e55d52cccc8c88d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ja/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/ja/thunderbird-142.0.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "90dbe368a05cd2d61dea9582b3caee3bd0906c5d21c15aeb7b379fc9fe5a65c5"; + sha256 = "724a27215a71ba2298e66d16205e05f47a602134af087ece9508d2c016799bdb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ka/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/ka/thunderbird-142.0.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "0d7241cf64fe4af358a33080ed219324f108447841cc3908b78501b437949caa"; + sha256 = "e48f8556f11ef66663773b0115fea569dbc659fb8eed240a8521821fb3047509"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/kab/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/kab/thunderbird-142.0.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "3cb1d38b267b5be1ed9fd5484cda1fbdfaa5079f9777aec75bcfe489453b6068"; + sha256 = "6a6b4e2fa1b6f1e26864d207a2b18a9aa3984cd16c5c22719a09701ce118e8d3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/kk/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/kk/thunderbird-142.0.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "e12a3941f96e0e9c03a24d07d0a6ea021340630d911e12d36c977f86c50fd7a4"; + sha256 = "e88bc78ffbcd7a5e44a7423f0d82a491011c5b25fefdf51983289ff00bfc80dc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ko/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/ko/thunderbird-142.0.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "8a1acf214638d6a7c45a15fc5cd4fddd43295367272e41421db66a8f2cddafc6"; + sha256 = "1352bec2110010b2fb44a34f5aac188437f662113fca98fad465fd827699d3c5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/lt/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/lt/thunderbird-142.0.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "4571815d4706e4078fc7e282ff599aae167cbb73f9b66955d10d140c02d54767"; + sha256 = "cabe33f1dca87c35e57e15c661de37be7e13b3b59dee5de09ae4afb015c900fb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/lv/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/lv/thunderbird-142.0.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "3231a11ff7eefad38900246c6b479d1b3951f4964645cfbfe792ccaf15149fba"; + sha256 = "c76551cf878d75e0aa7b9ed38542a0b4a4ea51e0f33951fe35b2e761e0503ae6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ms/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/ms/thunderbird-142.0.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "5c4a036a3ba062d56a3f35d6f8b0cc1faca10f6417625a14e5b6904997137057"; + sha256 = "8f607f791d1bf497e4b003edf94aa6759e80532f612fbeb5d3ae4613a1e20d3c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/nb-NO/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/nb-NO/thunderbird-142.0.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "9c9eea4f434f627fe034b547dfc668ebfba7021bdbcb52466d2e7a2034200011"; + sha256 = "8692c53feba0aa96cdf73f0eb85ca46e9cf4e090aab3a68d96292173d630eacd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/nl/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/nl/thunderbird-142.0.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "168506024b490696695e34d1de583529d7de6c5583dc2fbd651a996456c5bdbf"; + sha256 = "b5785e5245e429cda130fbda75eee77af6a395ec4d954544a2d5e22c693795b2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/nn-NO/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/nn-NO/thunderbird-142.0.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "4981de7c3d0d846fa87a679ab252759793e83de7cf373f9acbfcc9fa5834dd9e"; + sha256 = "e4a4bf70ad8e8db06b715fc6fcb020749e7207b6b87ef9004ab8d08d1260efe5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/pa-IN/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/pa-IN/thunderbird-142.0.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "1d65f8e68d077991ef767aea301cd314e730b58f365ed4524e787d5d23e729ab"; + sha256 = "4119336f1b93f7a2bfcaf213e605b7bd5b0443ccef6932976733c3b37b204f23"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/pl/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/pl/thunderbird-142.0.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "7f2583df51e7cb6a799475d96b0a82ab336a92758fbd8ff33742b92eae171614"; + sha256 = "795ae6778941b54014919da7ecb48b441dd251dd51e932a0b4d119687879a052"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/pt-BR/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/pt-BR/thunderbird-142.0.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "4883c44d4687b3ad1e8df66eab25649136d6f91ba4ab6d0a5ee1bf9c4c7c7a7a"; + sha256 = "1b468b5ab147d94c08cfe9b69fe154aee64d10cddaa3afd71a6ffb8f0782cb18"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/pt-PT/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/pt-PT/thunderbird-142.0.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "b92df862f1f24abe469d5cc3f8c7704410132e3f25b7daef77857daefdddf9ba"; + sha256 = "41e2e652dd5c91adbff544c5d8f66c000ed0ae92711c5515c4a372ec82b896c6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/rm/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/rm/thunderbird-142.0.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "4f556836064f9e5b8eff914c8d8572b1daaa9953baa8804680add31fcc237e47"; + sha256 = "f6950edd168609f7fed813ac5280d2a87ed674e15a40b2bb6c04389e509c6013"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ro/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/ro/thunderbird-142.0.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "1de4b62551f3b1530da6f2baf44bea383dea33105ce2c0c8daa71323f72b4357"; + sha256 = "a1fdce11310d5377988f7e72d6d971447b3fbf1d02b17f4aef1d29ba61a50a4d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ru/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/ru/thunderbird-142.0.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "e5451585cfe66fa4d43ce66e18d654cdeefb315095c572c091b7c5645c4e35e0"; + sha256 = "b593c14e63f8b6f00d917d6cf60772f1c81a2345c8a8d2af4202830d53bb4d06"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/sk/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/sk/thunderbird-142.0.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "8c268e9915fd986fc27bc92eb2713d9a35b1cc3db8d22c1824133651c7b291fe"; + sha256 = "28865c29f9ada3db4cbee7915cafc8170999c4e125caca0cd9694c4c44557dd4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/sl/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/sl/thunderbird-142.0.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "31a8e92ec301d3f2d7d2ac02be2d8b0fc234dab2bd57fdb9d329d2cdedae9ef4"; + sha256 = "81fc90fc7ff73c8b4888a9fc6e64ce663e115668551f88e8e5a37a24a1e764d4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/sq/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/sq/thunderbird-142.0.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "ae6f4fd26beb85747290fbbbba101c4e11b458b6ed41717ca940eee0d6d61936"; + sha256 = "27efe6221aaaae5943c038a5559d2fd808cd8927550fa9d6c7902eca88765276"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/sr/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/sr/thunderbird-142.0.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "0990c2494451f1ae4e4880bc52b716829ba94126a90dc2ad88baeb48c89fa922"; + sha256 = "f584d49153ac9b10ac62559b49c76b821f6f8b0281fcb2773851be4acc892da2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/sv-SE/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/sv-SE/thunderbird-142.0.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "c64c573a8970a98e6b2a8f1849700a45ea177de9c0bb57fda192bd72217ea340"; + sha256 = "005a82f5ba02b678613fc5482371b59d363ad82cb9c303781c5264e8f71eb779"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/th/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/th/thunderbird-142.0.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "0d22da6a81b939cdf92c82b44c9bcbb4beb01f9543b0a9bb5ee81f6c3452ff64"; + sha256 = "f8a9e5f74e024addbad75e3b0e9160a046c9f9180b3c040d4e15f7b5e1496ba1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/tr/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/tr/thunderbird-142.0.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "bef86e532b9fb09848183034eafaa08b6349a1eaf589124dd9d5dbcc0be458b0"; + sha256 = "08e33709b4426be38afe70292ddb49cd71302139746757a83b8825f5447b155e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/uk/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/uk/thunderbird-142.0.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "3363d6ba532843d48e9c26316018bb823cf22aad130481f4ba74f38647173685"; + sha256 = "39a0d29213c3115b7bb4c64b71e205a20a7730b64b911159e05cf432e4d6fb1e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/uz/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/uz/thunderbird-142.0.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "3663ec3a5678512f98759b7a3ba4dab507f64ff2ebe87594477cb201d67c744f"; + sha256 = "95ce6fe500c3f799fc9d61e5a898cfe9f324358be2130216b914e6a0495681ba"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/vi/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/vi/thunderbird-142.0.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "8000fd383af142c427321ec4d97b075101161fd1a9edad646a690d4f82ad159d"; + sha256 = "87ebd2443a11ec4e63996e9f83598808535d2f01889d7ae3e3f9fce738945256"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/zh-CN/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/zh-CN/thunderbird-142.0.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "d5264bf3ebce9f4e587116e20f4f2f1ef296da16aa75c813096b0873cffb55b0"; + sha256 = "7348bf4e8ce8280a3bbc65100baa3f38a3bb95b6042750e538506751b3584259"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/zh-TW/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/zh-TW/thunderbird-142.0.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "32703742ed8d6f48a805ce94a0f8da4a1d26398a84b3cae956f78d08bf557e0c"; + sha256 = "bab8f2e08d981ebc22cb8681386b7802379e2ced45ae7f6e3f5cc21e9ddb34b0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/af/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/af/thunderbird-142.0.tar.xz"; locale = "af"; arch = "linux-i686"; - sha256 = "21617d50e6e6af5126392f9f26a639697e1728238e2183d41babd95aa9705a71"; + sha256 = "ef18aa87b2fa6ff35e5bb0df808970e25930582b48c141be86ab0807412c0b06"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ar/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/ar/thunderbird-142.0.tar.xz"; locale = "ar"; arch = "linux-i686"; - sha256 = "1fba0dd1249e5517486500e0cf09ece01946ea59a2c68a713ce4e7e2f33bdaaa"; + sha256 = "a0054159f2c8c54733883925005f02bad0e116f8e909268f68e91ef0221dec1b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ast/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/ast/thunderbird-142.0.tar.xz"; locale = "ast"; arch = "linux-i686"; - sha256 = "9802ca51c834621167e977076d880ede40ed077a1de45b6b0594f667f9cda60d"; + sha256 = "f7aa9cad3146e5ff71e80dd2c967c95133f248162e3168ddb62311fc29695e03"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/be/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/be/thunderbird-142.0.tar.xz"; locale = "be"; arch = "linux-i686"; - sha256 = "efb049dd180e5a93da077554d29ed5bc6a14b2cd4638fd3d447ef036c0f3b6fd"; + sha256 = "7c83326d83baac13fa60eb43bcfa7bd7eb81204d4db5e3301785a2f52768af23"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/bg/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/bg/thunderbird-142.0.tar.xz"; locale = "bg"; arch = "linux-i686"; - sha256 = "183334edac2cde1ff6ce76579200acf521b053f2b8da6f4a522122e3dd60f7bf"; + sha256 = "395cbd838617958ff57bb5570e35c659c0d0cbfa3990ce059f25941d04adfbac"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/br/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/br/thunderbird-142.0.tar.xz"; locale = "br"; arch = "linux-i686"; - sha256 = "67471a0fd6e89fb209914da4b403d6d7f2a5dfd41fb5ef9571a03338153cb25a"; + sha256 = "9ac3674fbe234d0ce082c072a6a38c7fa6f27899a971c1ceb2947523bf3e12f4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ca/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/ca/thunderbird-142.0.tar.xz"; locale = "ca"; arch = "linux-i686"; - sha256 = "67259da0f6df52767f34c8243a8a4e56ed3208db5a378d76c551a5b61874522f"; + sha256 = "a1ebe4dce78c5bb3f1e707f5d8feb5ab0257bed8f544dd5eabb2da0d077063e9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/cak/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/cak/thunderbird-142.0.tar.xz"; locale = "cak"; arch = "linux-i686"; - sha256 = "33fa9550865a1dfc6963cfe15dcea85388b4c4bb67301e366ac8306b97420090"; + sha256 = "5bee45024425be2fca5bda451678be5f3e769e32a4372edd5b3e3be7bbf0a565"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/cs/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/cs/thunderbird-142.0.tar.xz"; locale = "cs"; arch = "linux-i686"; - sha256 = "d60350104021df12d813c0007431053f0d68ecaaf177d2f42e00340b079bc604"; + sha256 = "029e504d5fcfab2cac1d3b7f09e59a9e4322f8e0c2307f33d3ecb88587d4fa83"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/cy/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/cy/thunderbird-142.0.tar.xz"; locale = "cy"; arch = "linux-i686"; - sha256 = "c86e1fd052d4d256b67d30cd2e6f0c2e14a60e84c5669bee1602c02b598cbd0a"; + sha256 = "be6cf7b36693ed848b0640d14449cd5ab26c33e0d28a548043dcf69fc6e695d7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/da/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/da/thunderbird-142.0.tar.xz"; locale = "da"; arch = "linux-i686"; - sha256 = "5cdf12d7ed7660c40977c7e8643b63bc4f85a22892f3a7c3ae5514d665e04d5a"; + sha256 = "0ad566a6f1a2ce45400d6725f91183e3e6d80bcd277da4e35243d1a68d081e40"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/de/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/de/thunderbird-142.0.tar.xz"; locale = "de"; arch = "linux-i686"; - sha256 = "092f158999a774e0fea988765f6499d71fedc6bbd0cfe5d5ca4d7c65e904704c"; + sha256 = "9ee7ccb69c78b324c311f43020ec75dd9b769fdbdbc4301497bb3ba661294dc0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/dsb/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/dsb/thunderbird-142.0.tar.xz"; locale = "dsb"; arch = "linux-i686"; - sha256 = "ea6d93d1a72c5e18c327e3483845f40153e075835756e376594fedb60ed7c764"; + sha256 = "4fd231ec3d60eafa788876484a5e2894196e70f7d70ae970f6f5189c62731478"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/el/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/el/thunderbird-142.0.tar.xz"; locale = "el"; arch = "linux-i686"; - sha256 = "e9871e4d548d6bfd39788dc068d7c42c1fccd72479d879334b718251ae43c1f1"; + sha256 = "4515f3fcd3420dcac60872b7dbb73113a528fadcf06b0408078002b99a949531"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/en-CA/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/en-CA/thunderbird-142.0.tar.xz"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "abcaab4b2f7976a8be35372ba18d9afee272602c8109f036d4a809d87c653a80"; + sha256 = "047f6bb26f080e82cbf444476fe68deb6c61a2c8cff80995eb7ff69c0c69eb62"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/en-GB/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/en-GB/thunderbird-142.0.tar.xz"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "769fa9d8f8747ca579a0636187684573ba23011ea96e97879437f09b4b53b5c2"; + sha256 = "aac687a9cf3d4aa8aa1e9f031c22ebcef53b61c822cba4ecdd2becd8b879fedc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/en-US/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/en-US/thunderbird-142.0.tar.xz"; locale = "en-US"; arch = "linux-i686"; - sha256 = "0cf4ab947913d9ad12be79a95d0c59a79d423e57fd280ced3b6c48a9eb7651d0"; + sha256 = "92527f71f881a8c12476c7096971f10522361947e912491dc1799393c332aa79"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/es-AR/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/es-AR/thunderbird-142.0.tar.xz"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "f43e5e7987070f65e3d5f0078af3561993e8113c3412609ab2f07dfee2a87663"; + sha256 = "a3e8868f5dbc32cbf6ba9cf0f6d70005e5f78f1d89d4f39c7ae06db08cb8c83c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/es-ES/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/es-ES/thunderbird-142.0.tar.xz"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "d37b0103365429ce88f5b2374112b565a27bcbdc5fd3d0170253415540b15afa"; + sha256 = "c4bea8514312506138e1bd1de2a58459cc2f6cae0aaea12f2ce1db9ea985ecb9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/es-MX/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/es-MX/thunderbird-142.0.tar.xz"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "cfc7056d0680d00bd557a11d691f161b275cea391831640863def54c42558abb"; + sha256 = "f784949fbadccece26ad851cadf18179829bb4b70e39811ae344c825e9bf371f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/et/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/et/thunderbird-142.0.tar.xz"; locale = "et"; arch = "linux-i686"; - sha256 = "0decb7ad2ef248825f5a6f5aa963f8e1e0e729e17a8af19fa305b73ce86c4e4c"; + sha256 = "db76afc86587362e77952f58bd491b02c557c40c62249a52b5cb406ae3d866d3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/eu/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/eu/thunderbird-142.0.tar.xz"; locale = "eu"; arch = "linux-i686"; - sha256 = "a89d54b323f28640ff2e5d9e6662e36997c3893a8d253d68faa6a20b9dbbe3d9"; + sha256 = "19dd04a682218bcfc5e4fc9fe7a110c6a47c424753e13599164f4caf1d22efab"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/fi/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/fi/thunderbird-142.0.tar.xz"; locale = "fi"; arch = "linux-i686"; - sha256 = "ed600927b528b2cf66221d61d9e85df403636ed777f3e908cce5c379f7ba961b"; + sha256 = "f46fe95e1b3504396fb174737d4486ff5087f327215ffcd41bb1d8518a9d820c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/fr/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/fr/thunderbird-142.0.tar.xz"; locale = "fr"; arch = "linux-i686"; - sha256 = "4b772ba4360fb7121c7cd9919205733f0f1757861ac8ac2885fd8233b12a7f17"; + sha256 = "c159152ddcff8af3e69e55d2bc86c9ba24760c1d09055b625ed9b4dc2cc00645"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/fy-NL/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/fy-NL/thunderbird-142.0.tar.xz"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "42fcad05bed4ff5b98a808dea5df8e8b2341ef73cff48df18c6fee7577a331d9"; + sha256 = "ce0c2ce18c9a762da3f28e4b61d83b913d0a026a0bbe177d41358b7355691422"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ga-IE/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/ga-IE/thunderbird-142.0.tar.xz"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "dccec52dcfa6c8b7f82a8319d1487e42320b5d8791f87d4128f617165f2583f3"; + sha256 = "1254f54c845af46fa1030940ecbbc702db897571c13c043e08eb8c0712817018"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/gd/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/gd/thunderbird-142.0.tar.xz"; locale = "gd"; arch = "linux-i686"; - sha256 = "dc8245299c8e8824486531fb75fb2a6967a7d0ed5ad182295eee87a00fc840ef"; + sha256 = "5d1b030bbd0c0c2c0b65e55add37aece953930f53d7777209deef83fac06dbbf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/gl/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/gl/thunderbird-142.0.tar.xz"; locale = "gl"; arch = "linux-i686"; - sha256 = "5d39a48dc096b7f10c29ec701199493f2d404e840ed6fac295b3a697048f9cd2"; + sha256 = "3beb3764e7664760628fff1881d9b85915cc520dd039d624bb6447ac7e6b5f14"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/he/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/he/thunderbird-142.0.tar.xz"; locale = "he"; arch = "linux-i686"; - sha256 = "42038d36f46a6d9eaf270363e7e9c9aa1585944b7c96ef46bfe7f4f8bdd519eb"; + sha256 = "4b717d6222d0033154ae7a37933e528bc939663af5e1d217f6f8c3f23e8a128a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/hr/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/hr/thunderbird-142.0.tar.xz"; locale = "hr"; arch = "linux-i686"; - sha256 = "33534695537b19839df43931238903a8f37cd771167411aadc4aa29919e67cc7"; + sha256 = "5308e22dfda577604f051a546d52aba14f2c14859af06ca3efda2e5571f6bd5c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/hsb/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/hsb/thunderbird-142.0.tar.xz"; locale = "hsb"; arch = "linux-i686"; - sha256 = "d77e2ac787cdf5dcecb3c7309bdf00fd30e22c23c0314814c56f2dbf6df14f8f"; + sha256 = "3c455e64ead028b528287dc10df61e4eab4d92a10e397e535bf0a5836c1fe827"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/hu/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/hu/thunderbird-142.0.tar.xz"; locale = "hu"; arch = "linux-i686"; - sha256 = "6c08eb0640e47164d3c7f20ef1b6e29c6a6b2c40ec220f015afdc73da8b40670"; + sha256 = "965747a8f71123862383d16e3695bd79757ce32559891e377bcced59f0e83873"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/hy-AM/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/hy-AM/thunderbird-142.0.tar.xz"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "9f78144eef1482fdb8e921087f65de39d9f3c31e185939f5ee084945439d565a"; + sha256 = "f4d9d785fd8fd5721b3888c80003563d555ce6b28d33ed58c1653f568fcefad2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/id/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/id/thunderbird-142.0.tar.xz"; locale = "id"; arch = "linux-i686"; - sha256 = "0191e770a3c2717f0ea1239ef14b6d8c347f8a66a068f9ef26b3646423bbd036"; + sha256 = "5d5afd403e361900a7909b3cec56bca207c7388d2e6436eeeadab93acaa2d9d5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/is/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/is/thunderbird-142.0.tar.xz"; locale = "is"; arch = "linux-i686"; - sha256 = "4eddf2d7cdd7d1a851fb2acb231aafc0840d8bc18989a545d0909512285a6df4"; + sha256 = "98017023f16b6fecc000cf5788d688b76cb6b9e4267d210c8bc6a35010331e63"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/it/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/it/thunderbird-142.0.tar.xz"; locale = "it"; arch = "linux-i686"; - sha256 = "d660d9c7ab79c5012e5aa4cab0d71d1f0bcaf9f82f2ce0c3acabd5fb028ea75c"; + sha256 = "daa80d09f8f62a902ba59e0df1ca28e8c8f9c70b79025a9ecf9790a06b999a80"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ja/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/ja/thunderbird-142.0.tar.xz"; locale = "ja"; arch = "linux-i686"; - sha256 = "4e721ed8e738172868f04f7dea80970b1ad736a347b4eca53ee1313e4229d1f2"; + sha256 = "42132ba6687e44d9dde5d473c9c58d36e8099a5239fe09559df8b2b07e609e03"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ka/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/ka/thunderbird-142.0.tar.xz"; locale = "ka"; arch = "linux-i686"; - sha256 = "ea509083f195f7445ee4000f40f536d13d78b49e137e7505b0a17d7b8a5a4bf0"; + sha256 = "dbfb575fbbb281c34d5339859a58cc8cbef4dbcdc9bd96682618b69af41d55c2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/kab/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/kab/thunderbird-142.0.tar.xz"; locale = "kab"; arch = "linux-i686"; - sha256 = "3b5c98f3ee02c783a225877adccfa48bb1b8bc43f09daea2f9d698ccb6622537"; + sha256 = "305bcabd26d29c2f8132b86ffe8824bed035211c1363299cf851c80742506863"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/kk/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/kk/thunderbird-142.0.tar.xz"; locale = "kk"; arch = "linux-i686"; - sha256 = "65d68cc95e32662777ef78a95877b2ba13e14e2b3825d1759be784e48d1719bc"; + sha256 = "abed5d8bb7271114277ca909f843bd7a060d471b21fdf01d8e69fd7b91e649d8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ko/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/ko/thunderbird-142.0.tar.xz"; locale = "ko"; arch = "linux-i686"; - sha256 = "86d98e73c60846a0ff7bb342221567d6ea13c0fdd0f1a6f9b2409fac2dee48c3"; + sha256 = "80e1b8081d4e9dce849c5e86753c0bde7dddf76a92c711c1e5fb8e8ac2361042"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/lt/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/lt/thunderbird-142.0.tar.xz"; locale = "lt"; arch = "linux-i686"; - sha256 = "83abeb626dc7366cc05589e63a7fd9a66315709bd6774456cc7f07d34c3657ad"; + sha256 = "b570ce25736f9b10d1159ff4ebb18aae69763f8e0aa30e95716e2ac10628f6cb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/lv/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/lv/thunderbird-142.0.tar.xz"; locale = "lv"; arch = "linux-i686"; - sha256 = "2b4d4bd4b407a24dfc077ec78e3355983751d69262f8c4456fb19d1151f76d99"; + sha256 = "e8dcf7dd10c7caef0fec0708cd2ef61cf35d768ce77bc0f6a2f42efd4a07fabc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ms/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/ms/thunderbird-142.0.tar.xz"; locale = "ms"; arch = "linux-i686"; - sha256 = "4696e7b5d6acf46398c68794d27ff2128849b029c6f435e29d617bbc29d83fc4"; + sha256 = "db9852a4ee0d0240a6f643a33e3e206be8e96635a425f416016b86e40d809123"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/nb-NO/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/nb-NO/thunderbird-142.0.tar.xz"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "96a1eadce6db4ab879c4a898c2612155b3b149ea2a6a2f44c179700600a59349"; + sha256 = "e9ceaa86646fceb9e79c5cc5f3405f5260fdb606bb8cca4c5ef58ab08a86d247"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/nl/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/nl/thunderbird-142.0.tar.xz"; locale = "nl"; arch = "linux-i686"; - sha256 = "2a191eef47a2ecab3c374b2253a139990af1b4b8cedd60b723e9347be90283fb"; + sha256 = "b3f74e24f1ac01fa7d9b8bce450bcfc9cdd310ab387060a11700439a8ca04e7b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/nn-NO/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/nn-NO/thunderbird-142.0.tar.xz"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "46eec712da7acfa9440b71879b830d3af9ec8d57f7388b533b1fc7437e4fdc03"; + sha256 = "22dad7b627c13dae77b63ff5ef8bc720f462c89d5ddcfa315a777a69d26b98a6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/pa-IN/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/pa-IN/thunderbird-142.0.tar.xz"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "da50cf2d1d9edfab0d01abf6218457d8c37c13e2742680f4eb2e18332f770750"; + sha256 = "1874bb06c226f52d3c289a9f8802acfeaf85deb604e4694393f99799d0da34f3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/pl/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/pl/thunderbird-142.0.tar.xz"; locale = "pl"; arch = "linux-i686"; - sha256 = "3159f77c31fab656d9ae26326c3616a751352808d634d7e4759ac9a75886c534"; + sha256 = "feb32308bc571ac0892f20c7969556535e29cd7368d70b95e3bf20bc74b8e2b1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/pt-BR/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/pt-BR/thunderbird-142.0.tar.xz"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "1e54aa49c4af4fff86c728b5a88c74b063b32480bf26ff92396a21da0a4aebf1"; + sha256 = "c695a0b030dd26b0b7a97aca0b5e333e30eb7da535b03f54780ee8bbe921ce71"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/pt-PT/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/pt-PT/thunderbird-142.0.tar.xz"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "592742688c4373d9a8901bc9e92148441b7d50a22477b7091d0c9d1608524c9b"; + sha256 = "401677bc6d9a7314b82e98e9c4feec55dd46c168830d123ddb78fb1aafd0f2f7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/rm/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/rm/thunderbird-142.0.tar.xz"; locale = "rm"; arch = "linux-i686"; - sha256 = "84ff84c3dc5e2d5f57cff956edd030350174c69c1ce143ba96fcf3d62c115860"; + sha256 = "9952696f3489a8228b7fa7beae9023981b063052d593e1a6168039646fa5dc03"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ro/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/ro/thunderbird-142.0.tar.xz"; locale = "ro"; arch = "linux-i686"; - sha256 = "22682657101bb13551bfe7a538612abbaf2177349b3c6623853cd71d6b71acee"; + sha256 = "20769c3659200e1e220b69596d7993f63fa6ab114fdcbc869eafe389b9386962"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ru/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/ru/thunderbird-142.0.tar.xz"; locale = "ru"; arch = "linux-i686"; - sha256 = "66f62f787d416732763b435cc8a7a578ef2dc20e0d6b1fd945b89e919cfabd5b"; + sha256 = "bc24f26700309c154aff04f2db37ec7afb99926cafe57d08477cedbcb2bace51"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/sk/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/sk/thunderbird-142.0.tar.xz"; locale = "sk"; arch = "linux-i686"; - sha256 = "97f2f0e5dbfc80c51c151bbcd4fac3fe9882772fb3898c738cfa3869b8b83b76"; + sha256 = "44da42feb37606641a054cd91f7256a867c44ba40442e951de375089de152690"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/sl/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/sl/thunderbird-142.0.tar.xz"; locale = "sl"; arch = "linux-i686"; - sha256 = "f331d3bd134642870817f2ecf5e20ad8a6c2217fb0ac12ca2b9f450f8ae704b0"; + sha256 = "56eec1855831ccc6f226e0d33b2c1e38ea1e0d150bb44618c91786e3e3d1aaf2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/sq/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/sq/thunderbird-142.0.tar.xz"; locale = "sq"; arch = "linux-i686"; - sha256 = "87f8177a17f950aa266a2a9f4261c14a0b877402d7a765b1059271f2f9b0058d"; + sha256 = "a3c4303140194bf74268ae21176dfb1543a094dfada13861caf76c6a3afd7fda"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/sr/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/sr/thunderbird-142.0.tar.xz"; locale = "sr"; arch = "linux-i686"; - sha256 = "6417cd8d5bc05ad293af59d3e7994d2ae4bd7c74768c253d60fb758531003e3e"; + sha256 = "456b13e638038c7948640850ed4e54b291274add5253c91a2a52fcd01f77b1f8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/sv-SE/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/sv-SE/thunderbird-142.0.tar.xz"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "1ce6be7ec939a9f803583d9381cf9bacaf3f90fd5d05c3d4a18c649645c44d57"; + sha256 = "3c8b0542893c7ca9568730dae65f06246aa9d9266a506d46f306e8e0f00060aa"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/th/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/th/thunderbird-142.0.tar.xz"; locale = "th"; arch = "linux-i686"; - sha256 = "1bb66df11e9ddfd184bd8de062c954a23206e54af2c8aca5207e42a0c4c57802"; + sha256 = "23cd68554836728f91dd3e881a8c866a08db6611a12cf6761675f67b63819602"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/tr/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/tr/thunderbird-142.0.tar.xz"; locale = "tr"; arch = "linux-i686"; - sha256 = "8af1af9b252ebd3e38529bff3ce81d574a9d3450f8b9beeb006ebd09472f2d9f"; + sha256 = "723e401bc7b6992645e97fab14b784726c34fe21509455c3ca06185a65e5218a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/uk/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/uk/thunderbird-142.0.tar.xz"; locale = "uk"; arch = "linux-i686"; - sha256 = "cc480e6a931ac0d1350e916e4af84c55b0acbfda861012fb5791fa3a2c27c2ef"; + sha256 = "46f5f9e07e5012ad8d094d8200812f813868dad188943eeda69eaa5aff0cf939"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/uz/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/uz/thunderbird-142.0.tar.xz"; locale = "uz"; arch = "linux-i686"; - sha256 = "b98fabc8ad222e67a82c376188ac4858ca106a61b74488fe77bcfc6db57236cd"; + sha256 = "058c1326b839120303b5a08b2b5069c5a29c68f4fcf2ce796423b2edc480e59b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/vi/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/vi/thunderbird-142.0.tar.xz"; locale = "vi"; arch = "linux-i686"; - sha256 = "6723b961380329c040a188c26422137e510b5906c0c804cc86e281c4c8b60554"; + sha256 = "814efffe40fe4b2697d556df4bdf91d818935f440dd35ee0e7b19d79d586c6eb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/zh-CN/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/zh-CN/thunderbird-142.0.tar.xz"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "0d71d5b2dba7aa7436073795d7f25a45891c101c2df45b7f97e5aac9f4e02b8e"; + sha256 = "067852744b73ce7034cf1c9287cb461d015c500f88d8eecd5ccd0161b70e4381"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/zh-TW/thunderbird-141.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/zh-TW/thunderbird-142.0.tar.xz"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "c6885b8aac0f87a5a6ac903b829e1b424601688965cc2422d9406e0a134d9ca4"; + sha256 = "572638402540335ff9dc125dcb10500408b481a419af1a5502df743ba42b1575"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/af/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/af/Thunderbird%20142.0.dmg"; locale = "af"; arch = "mac"; - sha256 = "70fb633f85a25f8bd97c304db7607c4481964d7f4d33f07c940fa1eb39964f66"; + sha256 = "eae9d549690df6c36fe13f86762cd5d83ad086f5a7def603ac8df0a16c707b81"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ar/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/ar/Thunderbird%20142.0.dmg"; locale = "ar"; arch = "mac"; - sha256 = "fb8b2675c7da8c457598541bd132c34ccffdc904553dedd953c06f1e3fcfa7e7"; + sha256 = "0cbf5635f1deb29dab597f9f676ee6a0450e5bc1e4d418b94f09ba00ef67443d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ast/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/ast/Thunderbird%20142.0.dmg"; locale = "ast"; arch = "mac"; - sha256 = "f5a6a6323661c36798dbbc22d4e13af7ed54b677cbc0f0b03325fa2ad058c2c1"; + sha256 = "b4c899ed54910635acd93caa5925e64c1960b0536d0900a63a0594e2f4a3f2e9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/be/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/be/Thunderbird%20142.0.dmg"; locale = "be"; arch = "mac"; - sha256 = "0258d6d0d9b10101761affa225973fa3e2dde241dd39b47774ca96694e00d5c1"; + sha256 = "b867c2db5be25236d3fb349204b596828642f27629addd3477e98444e1fb79d4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/bg/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/bg/Thunderbird%20142.0.dmg"; locale = "bg"; arch = "mac"; - sha256 = "9e599b125c76e1c9b706e880ed6ce93a41a39797368d024e9369b0dcdddda63f"; + sha256 = "9806157b89e04c66aa87c3368572ada3fa7a1a30de7abec9c856f11453ca1f56"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/br/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/br/Thunderbird%20142.0.dmg"; locale = "br"; arch = "mac"; - sha256 = "7830f4eca448512a6d56fe45c867003226bdad42afacf49cfd27f0cba6f64d71"; + sha256 = "b8a0d7b7e163efa64b509efcc90145581ea043f910fa3fa41b20742a9a85eaa5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ca/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/ca/Thunderbird%20142.0.dmg"; locale = "ca"; arch = "mac"; - sha256 = "0a5beafee9e791ec86f4bb5e03ad9aa1e2919d9aeb3a05e372bb9840fd0724d4"; + sha256 = "a2ec20086fd218896f925f408e03dba76dafe99dc82ac179155601213e68f245"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/cak/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/cak/Thunderbird%20142.0.dmg"; locale = "cak"; arch = "mac"; - sha256 = "c11916bb8a09bf6784c2bd65c7640c519e049c9895af9be04c5b82503c9c411b"; + sha256 = "7e74aad02bb9ccf72503298739d2d36a8a63666a18e20d0c5a606e11e9f45b20"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/cs/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/cs/Thunderbird%20142.0.dmg"; locale = "cs"; arch = "mac"; - sha256 = "c7eb485d8927e8a343ddf52035df39c39c8ec5c6e02a1af783a0fb692908810b"; + sha256 = "64c77a3e37030482350351b360c9036a10bae801917060627c0d6dfa58638679"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/cy/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/cy/Thunderbird%20142.0.dmg"; locale = "cy"; arch = "mac"; - sha256 = "4865ad34e0dda392f624818807b958c5dd2da975f93494e5759cdc4f1f425179"; + sha256 = "dce600ced1fc79408f749ccfd53c7a003af7eef11a017739e3689fc08ebe18dd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/da/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/da/Thunderbird%20142.0.dmg"; locale = "da"; arch = "mac"; - sha256 = "b4ac8827b25a116920ea88972fc9c423eb4b3f2f7e2cde6790365501f121c0b2"; + sha256 = "a52639170237e264d8301b654047f35586f32286c889d29e5cd6670eb4e19dce"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/de/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/de/Thunderbird%20142.0.dmg"; locale = "de"; arch = "mac"; - sha256 = "365e18dc39a980fd5c259dc0082834a02d2aeb63189b1b441880e15553eb1b26"; + sha256 = "7607cf3b58c03166284c46d7f6363b03815ee0bfd9cae9fdcb974d824f3343be"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/dsb/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/dsb/Thunderbird%20142.0.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "05676294cccb6ed1e17c4e2dcb01f3d85e4a43a14419e9c0a4fb5965dd14e94d"; + sha256 = "ee6e129075cbc5f27dbc561feeea50fb0e7cc7e533639d2ec3a83a697d4bf587"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/el/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/el/Thunderbird%20142.0.dmg"; locale = "el"; arch = "mac"; - sha256 = "749f87d70e6fd0b9154fd137527259540afd3fc2419eff004f7da625b912295f"; + sha256 = "3577648972809609e60711f5f514892bcd5a5f1125c5da096a7f79f77abee25b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/en-CA/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/en-CA/Thunderbird%20142.0.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "37fcb0879c7e0b6118a0820223432db7eee2678366beb996a044ced5a060f6da"; + sha256 = "70925846198cb31c6653f3cde56aa788a90b1d507878645b7e2f20358c4583be"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/en-GB/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/en-GB/Thunderbird%20142.0.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "6300f4d92ef6b548d751a8d695bfce687c38e86176ab37a249bad48ec62d9708"; + sha256 = "c1ec3a624efe46f5cebeb26daabb9494affbcfcfe426d541ef53781594e42a72"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/en-US/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/en-US/Thunderbird%20142.0.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "96eefb7c37b75921e14a72bf441f037fc7c7d3ff0e8b4303eed9dffea059e04f"; + sha256 = "2e7b818a3aedc12ad0adf35962e2eae603513973d35b50b3b353739d46e1fe51"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/es-AR/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/es-AR/Thunderbird%20142.0.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "5f2bce275c998cfccac7d5b82ceb4ba326bd7eb117516abbbc133a74118f447e"; + sha256 = "5feb5ce413813077eb59876b6feba7960f6d71d32999f2c14d873a6f51cfd2f3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/es-ES/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/es-ES/Thunderbird%20142.0.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "0231315dc91fca660f8fde0ee85509debd511cf78c11a375f94135de3ce2cce4"; + sha256 = "fabed9f27820ee1853a55bd801dab8ef3d0d0b250677af38c8eac780f0b6219d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/es-MX/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/es-MX/Thunderbird%20142.0.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "6bac155a2449069272bd75f0a1f9d38080c999cc78122b59cb528943a0bae325"; + sha256 = "9d49344bdd528cc6336b876948637475798aff36710ec1f0d689fc78ac79d3f0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/et/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/et/Thunderbird%20142.0.dmg"; locale = "et"; arch = "mac"; - sha256 = "6a4b8bc419c22444443eeaccac4bd5a4281c5efbee90496bf7f97a6c0b6276f7"; + sha256 = "703f592cb763158734eb061a29e7f5c16ec9a8c178dca70d40e22922fd9dead9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/eu/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/eu/Thunderbird%20142.0.dmg"; locale = "eu"; arch = "mac"; - sha256 = "c2002185a0ef8654fec9c6c79d553997c09a8d647471a0ca329cbe6d221357a4"; + sha256 = "a2bc9dd4f59f8ba2a93a28cd74911382d7862c640cb21e4fc3f566c6a615832f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/fi/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/fi/Thunderbird%20142.0.dmg"; locale = "fi"; arch = "mac"; - sha256 = "a6b07435361153e1bce27801fa716272d3fc42716c3366acb53573496b6a90bd"; + sha256 = "3b2813ca618a78679280a50035d4ea748d9088d9c41ea9b42560716c7c00832e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/fr/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/fr/Thunderbird%20142.0.dmg"; locale = "fr"; arch = "mac"; - sha256 = "9581024c69846acb002b6c6451c21042b093e616ff3dbe5863e002d7cded996b"; + sha256 = "cbe0a8826a535ace20d432eab1924840075941fd6702513da45672cbbd845bf6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/fy-NL/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/fy-NL/Thunderbird%20142.0.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "608320e4c6d13abc426e54d7868306464a1e127ed3b497ac955fe888d960fc87"; + sha256 = "731207409e7b72a0243313fa57d10f73d75a225c7330cb212b323a3128cffe9f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ga-IE/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/ga-IE/Thunderbird%20142.0.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "9ec25930a5b07dff62f3cab18beb7cd7478c3f236d2483d9c59d55b7cba6e856"; + sha256 = "2e47f24ed6c7ce3dfd6a2c1af8bf3b844020628acb3acb0dc27e4f901d9b6a8a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/gd/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/gd/Thunderbird%20142.0.dmg"; locale = "gd"; arch = "mac"; - sha256 = "836623763272e090a8074e840e61ea889dc151d98e7977bee7b04b005e84ef94"; + sha256 = "090a693ba84c4c53f1a404d8947a7e4a2c354fb1e9cb1c0cda2c6bb92a1729f8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/gl/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/gl/Thunderbird%20142.0.dmg"; locale = "gl"; arch = "mac"; - sha256 = "f47002972dfd09f0f24614d2ae1da85903fbc7409f75fd16fc6430f555660c46"; + sha256 = "1d5bc38e9f27400b2bd009bb21e6e19ed935378b85562a1edb1395e155078b91"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/he/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/he/Thunderbird%20142.0.dmg"; locale = "he"; arch = "mac"; - sha256 = "f854eca41c6022a7d6fab50273cba7af01a2bd973eb85116077f629414d61868"; + sha256 = "6ecfd0a61e47e01db8ae14f02e7f790bff135c64e9c701727f343a6950764e77"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/hr/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/hr/Thunderbird%20142.0.dmg"; locale = "hr"; arch = "mac"; - sha256 = "a9f10564066a0553c8b21ad52736980ea5eb14ac99c4611f63a82ac1083461e6"; + sha256 = "47a3367020d9a2b3974cff4ca09770eafd843261bfd2c111d9bbf1e3233decbe"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/hsb/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/hsb/Thunderbird%20142.0.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "56b2b69f0b767f57067c7daff449fa64d48a94dfd7b726a27f45846e3acf6293"; + sha256 = "26bea32d39f6ff4c98cb1fbd751622aa5ef0b4e0880d2b68312f1dd8009041ca"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/hu/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/hu/Thunderbird%20142.0.dmg"; locale = "hu"; arch = "mac"; - sha256 = "8a992416e499555800c93c3cae0c67ef9e01699ab66acbeb46fe5b88e6014783"; + sha256 = "963fe02fc3d0fcbba0d6a88923961b6b851bb266dfed583cd28922f1ef16445b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/hy-AM/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/hy-AM/Thunderbird%20142.0.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "5b2f4f0e4b706dba1bb9af59681c82939c5a78303fa9ed0b8a12ae434607bac3"; + sha256 = "748c7f0dd88aaa2f8ddcfd62dce36ac764806bc2319a012fc007a75ca761cfd0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/id/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/id/Thunderbird%20142.0.dmg"; locale = "id"; arch = "mac"; - sha256 = "47d9903004dc3b9b281ed3c0b2e607253340cb42fe9e706db13d8b54e6c79f7e"; + sha256 = "d24effa70c9fadc9073a76a5a06b193306356694706a6baa495b26c150fc10e4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/is/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/is/Thunderbird%20142.0.dmg"; locale = "is"; arch = "mac"; - sha256 = "d182714173b28c64df7da645a48103d49789875f3631d7c780b093847bd211d3"; + sha256 = "724f75d9c8f0fc3030326d3e764b7d061d7b29f105947ddc5ee69b70e1f5ecbe"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/it/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/it/Thunderbird%20142.0.dmg"; locale = "it"; arch = "mac"; - sha256 = "2c5261c937e7692f13c34d7579f1503cef948472d44941e14a546382ed70b8b2"; + sha256 = "dbd2b49e3f3a38de8f09dbea032d04d071db9b85af0adadb47a866d0086fe3b5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ja-JP-mac/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/ja-JP-mac/Thunderbird%20142.0.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "914f220e69386662bf69579126f76e32f9dcd644f2f078b4ed4627b392fe7241"; + sha256 = "7d28dc46bb984ee8e3492dcd60fe647997df98a42f03f127509fa67fed280d2f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ka/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/ka/Thunderbird%20142.0.dmg"; locale = "ka"; arch = "mac"; - sha256 = "897090d3276194c1a9f902643607cb084b68260fb2db191c0e3c7fa3c7589ab1"; + sha256 = "c059b7f3863ae7ebfaaccc17821c7d59e337fdfb41e9bd7b7a86a211d7fec5bd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/kab/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/kab/Thunderbird%20142.0.dmg"; locale = "kab"; arch = "mac"; - sha256 = "2123ca3320b119babbe81ca3bae965d961213a42d0f04bedd4aaf3acb29909fb"; + sha256 = "d24ae67981eff6fcd76600505dfb21e41320e8577eb78acce9f8997ef3b9d087"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/kk/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/kk/Thunderbird%20142.0.dmg"; locale = "kk"; arch = "mac"; - sha256 = "4512ff97d4772719781d8df896cbbf2659dc8c41adf6f65f473246536b179f01"; + sha256 = "8c14c9316f25197b489004c0c49fcb1745de9edb203b6fc9e4e3f38f190844bb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ko/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/ko/Thunderbird%20142.0.dmg"; locale = "ko"; arch = "mac"; - sha256 = "7baa261979475a26b5a926c00de9c6513a55061b186c22dd300edbda41a4773a"; + sha256 = "e88cd06cbdc0846afa479cc1ae6fad25dcc2cc48928f2cbdb94c7c0542e44b85"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/lt/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/lt/Thunderbird%20142.0.dmg"; locale = "lt"; arch = "mac"; - sha256 = "d267c7b3c8496a99cb7f61a86bc120146f27bf1e68bbff04b09a11a9f98a3de5"; + sha256 = "f0e7de837d956a2416521a5cc80330545a7898384f3dd1bce9aa98b632e7d10b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/lv/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/lv/Thunderbird%20142.0.dmg"; locale = "lv"; arch = "mac"; - sha256 = "7d36d465b4b7a2e6e382495581de59db26cb7ce2989532450ec9aed5181f2b47"; + sha256 = "540180f19414a5e3f7bdc7bf336621e902b87bb2479795a0c89f368e656a3362"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ms/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/ms/Thunderbird%20142.0.dmg"; locale = "ms"; arch = "mac"; - sha256 = "3e62ddffd2136478586e3d076d7e4134ca0e4590b0a18549c19c874dbd24f628"; + sha256 = "8ea6ffb506848b649bf4780142c38b3a6caed4af2a287b77aa977fc8c82bfac2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/nb-NO/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/nb-NO/Thunderbird%20142.0.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "9a077ac24b4407f936b06ff86a9a63396c0821e124ceed33ed550f662ec5c858"; + sha256 = "defbdfbd1b63f02efba8d58f189e2b063981481e7fd059c8fa976c7db4c0e0f2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/nl/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/nl/Thunderbird%20142.0.dmg"; locale = "nl"; arch = "mac"; - sha256 = "cc17dbf711a5890ce42ed534b4b2d90984e8f2d3563b7736189081a2e58eb668"; + sha256 = "a65413584a27851758b9bb31f5778d942fb76fb53d60c7f5bea66b700c7d3384"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/nn-NO/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/nn-NO/Thunderbird%20142.0.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "6d47c5ae8e01d443421ab674660cc8546036827af62fae614f8fad0b66d91cc9"; + sha256 = "74d8fff80f512759952e41814dad03415b2f7d947fbc9325f9e53b824762cb30"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/pa-IN/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/pa-IN/Thunderbird%20142.0.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "1b153660dcc8eab58df087174a2b3eea426778a987af026fe01d6e740d60a3bf"; + sha256 = "bb15d71fbe1770f420bbdb98a2f34f04ec303141b45407f77e671aa832f434f8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/pl/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/pl/Thunderbird%20142.0.dmg"; locale = "pl"; arch = "mac"; - sha256 = "76ebfd2c35a566ceeb2a060c37b03be3818acab7345c9e740d009b90afa6c06f"; + sha256 = "288e72075a5d67145b15f0474fb51a24623399a222981554fc9bd093de3fc5b3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/pt-BR/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/pt-BR/Thunderbird%20142.0.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "1ee45a1943fc3884594bf1f33bc685925b76f0e996bf80140be24f19d1975472"; + sha256 = "3bf0067176097638e4ff21a81be07acd18275e0e482167a5cefeba346018c872"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/pt-PT/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/pt-PT/Thunderbird%20142.0.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "9c9b45702ba9dd5446a4c61adb170d94654655e0ce6b38cec0afb3acf0d2990e"; + sha256 = "9bb9809d9485fa0e53e83c0889ff53d469647860cdb9d9efa7ad3d5bafbcfe1a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/rm/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/rm/Thunderbird%20142.0.dmg"; locale = "rm"; arch = "mac"; - sha256 = "7d6eea3ece15c512c7b3fbe11e7fe0fdf8a00ec9da2522881e3be1c0d9c0d4b6"; + sha256 = "e27985cce848baa307f37ce0a4e4b5604ca30c95990430bc5b36ec0cca670f83"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ro/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/ro/Thunderbird%20142.0.dmg"; locale = "ro"; arch = "mac"; - sha256 = "9bd37eaaaa6cbb3238d787a1cecd48d87cebef13a97b96186143d74497e3becb"; + sha256 = "59fc6c6e0f455fe252f9ae9f087d6177d885d831578e5f5e65baa13458466f58"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ru/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/ru/Thunderbird%20142.0.dmg"; locale = "ru"; arch = "mac"; - sha256 = "7a265ace72210afd5ee969565861a390a308e2357b3adbe3d27aa8c751c4a88f"; + sha256 = "82d2ef77108fc302621c2a293bb849bd57f5caed729af9b4a37460ce0b8a2315"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/sk/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/sk/Thunderbird%20142.0.dmg"; locale = "sk"; arch = "mac"; - sha256 = "4734e9cc1758c9ee7e735228940c74309aeb11cb98de8bdd92f9aa93fd6e62ed"; + sha256 = "dbf4f308f2436c8f932c85959d98f1e93d1ba163656161b98703bb1b41121c60"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/sl/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/sl/Thunderbird%20142.0.dmg"; locale = "sl"; arch = "mac"; - sha256 = "761457a8aba8ba260da9f812e87058d74e7c0f8e27160f93777400d35ccff42b"; + sha256 = "c2200ea27cd04a2fa0c8e2c1fc3523eb69a31c255cf11ac6ca0cf8155a0b7095"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/sq/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/sq/Thunderbird%20142.0.dmg"; locale = "sq"; arch = "mac"; - sha256 = "bbd056fb5c6b5f043a592f0e3e4723f3eb500a49bb88a3e7631dd6fa67287f6f"; + sha256 = "34316b8ce26ece8491df2d29468d349275ae79bfc7c4ffd1072e3b8255727fa8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/sr/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/sr/Thunderbird%20142.0.dmg"; locale = "sr"; arch = "mac"; - sha256 = "1d4d78d957e44fea001c0721e6fc2e0bbfeb907cb85f3c0ec15938e1822d6b3f"; + sha256 = "b7ed5f85941661fd6abb490221b3c3428d01ab03647926902d8b25528f08934d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/sv-SE/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/sv-SE/Thunderbird%20142.0.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "4bdc3f46e20c5906dd6ef107f5ebe173788471e0e9d21e0cbd90cacd4d2eb515"; + sha256 = "bb2793a2c8651c7a764c030d0e445f25a65bbc8945a752ab4ecf60dbad6116c0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/th/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/th/Thunderbird%20142.0.dmg"; locale = "th"; arch = "mac"; - sha256 = "4354cee3cd4302a5118801c8bd076b282493cdc6e49522269777433b2b207391"; + sha256 = "2356fba2343723ef4ad8b8c0b7c0fa727d61c6772cae56e9f45ad4141eb6a9ad"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/tr/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/tr/Thunderbird%20142.0.dmg"; locale = "tr"; arch = "mac"; - sha256 = "c2b596ae7302df6af6c6431b48a56207525bf13a99cf3dc2afd9f14d58c330a9"; + sha256 = "9783d1c8e80b817f960417c09e9e4f40c8aea9613b2251ce958fb2c977b59017"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/uk/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/uk/Thunderbird%20142.0.dmg"; locale = "uk"; arch = "mac"; - sha256 = "41cd949dce748f3eb6aa0f4bd3d82c3693a75e4cd77eeb62b7cda2bc4a9b2ea9"; + sha256 = "4feb83b2d4bc6ec505a736c4c298eea5d9e86edd0a55b9ffa76a5ce23b423506"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/uz/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/uz/Thunderbird%20142.0.dmg"; locale = "uz"; arch = "mac"; - sha256 = "b75f9e5ad3a0b78c1fb8948140c550cb0bcfa6daebdf8b3ebdb27f2359465fd1"; + sha256 = "e7147f2261f9599a5937cbbbd9026f1e0f718938970f9991fc37aabc1ee70d59"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/vi/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/vi/Thunderbird%20142.0.dmg"; locale = "vi"; arch = "mac"; - sha256 = "eba46c60236a3616078be2e5bbb85def75b41818974975f141ff2956ece633e6"; + sha256 = "ce05525b39ce21dada498af5f8979f06f9e6e62b315d34689692f07e579965db"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/zh-CN/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/zh-CN/Thunderbird%20142.0.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "4bca83d5949399da5355b8520c6d1eb914cc685e587d6f1161ab1dceb3e27aca"; + sha256 = "ba43571dbbe5e8f222a729c06bb9f324c01a637f8c74ed5e2d9f54701b99d771"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/zh-TW/Thunderbird%20141.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/zh-TW/Thunderbird%20142.0.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "a9e5beea2b1c44530904a4c26aeb1b6b3b86670e488a3d61f8e73f342b3704a7"; + sha256 = "08162db6cf90ba0cba0bbea9b66e4ef6bfa429b84c13e23ee3dfa84d8ef2e603"; } ]; } From 329c086afdc3d269673a726125905604cac4eff7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 12:41:44 +0000 Subject: [PATCH 115/305] python3Packages.python-glanceclient: 4.9.0 -> 4.10.0 --- .../python-modules/python-glanceclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-glanceclient/default.nix b/pkgs/development/python-modules/python-glanceclient/default.nix index dbbb4e8294c8..aa134b766652 100644 --- a/pkgs/development/python-modules/python-glanceclient/default.nix +++ b/pkgs/development/python-modules/python-glanceclient/default.nix @@ -21,7 +21,7 @@ }: let pname = "python-glanceclient"; - version = "4.9.0"; + version = "4.10.0"; disabledTests = [ # Skip tests which require networking. @@ -51,7 +51,7 @@ buildPythonPackage { src = fetchPypi { pname = "python_glanceclient"; inherit version; - hash = "sha256-+PANkCIO8wtLFgV64MfELMKdhHIcBntoVNU50sXdsVQ="; + hash = "sha256-/2wtQqF2fFz6PNHSKjcy04qxE9RxrSLE7mShvTlBsQM="; }; postPatch = '' From 22afd48754df4ac6c10023ef259c3fd666c22db5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 13:10:58 +0000 Subject: [PATCH 116/305] python3Packages.posthog: 6.6.0 -> 6.7.0 --- pkgs/development/python-modules/posthog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index 466e885bb0ea..f2411acfa845 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "posthog"; - version = "6.6.0"; + version = "6.7.0"; pyproject = true; src = fetchFromGitHub { owner = "PostHog"; repo = "posthog-python"; tag = "v${version}"; - hash = "sha256-/rcE8XqYiyHvDzaolGX9D0Z6aPuXen71/resZdjyxzk="; + hash = "sha256-//PjAWZF6FYsiG9UDg+MPv1x06Yp4msBkYkNAU9Rjsc="; }; build-system = [ setuptools ]; From 1b9949e9afaeaa44fb41c586f2087bffc26b1c92 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 29 Aug 2025 15:05:31 +0200 Subject: [PATCH 117/305] python3Packages.tokenizers: 0.21.4 -> 0.22.0 Diff: https://github.com/huggingface/tokenizers/compare/v0.21.4...v0.22.0 Changelog: https://github.com/huggingface/tokenizers/releases/tag/v0.22.0 --- .../python-modules/tokenizers/default.nix | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index 724fcc3df3af..d307f6edae15 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -21,6 +21,7 @@ # tests datasets, numpy, + pytest-asyncio, pytestCheckHook, requests, tiktoken, @@ -75,14 +76,14 @@ let in buildPythonPackage rec { pname = "tokenizers"; - version = "0.21.4"; + version = "0.22.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "tokenizers"; tag = "v${version}"; - hash = "sha256-HJUycrNDpy2FOYi6aZ76orLewZCuLC1MoJ57peYJqvI="; + hash = "sha256-HTJQ5nPkOsVqYzcsm0GLflX+teqDsrpIb5nf5pa7Gpc="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -92,7 +93,7 @@ buildPythonPackage rec { src sourceRoot ; - hash = "sha256-0olujhOOO/BAH4JvnmXd1kE7T/sp5Vr3Z3P2X2jhZKs="; + hash = "sha256-X9tsn4gPg7Ih/8NNiCBllgcZgUR/tok+mwCJE53Z/8g="; }; sourceRoot = "${src.name}/bindings/python"; @@ -117,6 +118,7 @@ buildPythonPackage rec { nativeCheckInputs = [ datasets numpy + pytest-asyncio pytestCheckHook requests tiktoken @@ -138,6 +140,23 @@ buildPythonPackage rec { "test_splitting" "TestTrainFromIterators" + # Require downloading from huggingface + # huggingface_hub.errors.LocalEntryNotFoundError + "test_async_methods_existence" + "test_basic_encoding" + "test_concurrency" + "test_decode" + "test_decode_skip_special_tokens" + "test_decode_stream_fallback" + "test_encode" + "test_error_handling" + "test_large_batch" + "test_numpy_inputs" + "test_performance_comparison" + "test_various_input_formats" + "test_with_special_tokens" + "test_with_truncation_padding" + # Those tests require more data "test_from_pretrained" "test_from_pretrained_revision" From b0ce3dc09f5146e831f1116e95b99017fc0f4a64 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Tue, 20 May 2025 17:04:01 +0200 Subject: [PATCH 118/305] stdenv: Add CPE fields to meta Add `identifiers` attr to `meta` attribute with following attrs: * `cpe` with the full CPE string when available * `possibleCPEs` with the list of potential CPEs when not all information is provided * `cpeParts` with the destructured CPE string, allowing to override it whenever needed * `v1` attribute set with `cpe` and `cpeParts` from above and a guarantee of a backwards-compatible interface Related issue: https://github.com/NixOS/nixpkgs/issues/354012 --- doc/redirects.json | 15 ++ doc/stdenv/meta.chapter.md | 71 +++++++ lib/meta.nix | 189 +++++++++++++++++- .../networking/sync/rsync/default.nix | 5 + pkgs/by-name/he/hello/package.nix | 1 + .../development/compilers/gcc/common/meta.nix | 1 + pkgs/development/compilers/gcc/default.nix | 1 + .../compilers/llvm/common/common-let.nix | 2 + .../linux/kernel/manual-config.nix | 7 + pkgs/shells/bash/5.nix | 10 + pkgs/stdenv/generic/check-meta.nix | 63 ++++++ 11 files changed, 364 insertions(+), 1 deletion(-) diff --git a/doc/redirects.json b/doc/redirects.json index 7b0841c639b7..91f98a064f6f 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -225,6 +225,12 @@ "sec-language-cosmic": [ "index.html#sec-language-cosmic" ], + "sec-meta-identifiers": [ + "index.html#sec-meta-identifiers" + ], + "sec-meta-identifiers-cpe": [ + "index.html#sec-meta-identifiers-cpe" + ], "sec-modify-via-packageOverrides": [ "index.html#sec-modify-via-packageOverrides" ], @@ -622,6 +628,15 @@ "typst-package-scope-and-usage": [ "index.html#typst-package-scope-and-usage" ], + "var-meta-identifiers-cpe": [ + "index.html#var-meta-identifiers-cpe" + ], + "var-meta-identifiers-cpeParts": [ + "index.html#var-meta-identifiers-cpeParts" + ], + "var-meta-identifiers-possibleCPEs": [ + "index.html#var-meta-identifiers-possibleCPEs" + ], "var-meta-teams": [ "index.html#var-meta-teams" ], diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index 6f092d406126..947009869ff1 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -248,3 +248,74 @@ Code to be executed on a peripheral device or embedded controller, built by a th ### `lib.sourceTypes.binaryBytecode` {#lib.sourceTypes.binaryBytecode} Code to run on a VM interpreter or JIT compiled into bytecode by a third party. This includes packages which download Java `.jar` files from another source. + +## Software identifiers {#sec-meta-identifiers} + +Package's `meta.identifiers` attribute specifies information about software identifiers associated with this package. Software identifiers are used, for example: +* to generate Software Bill of Materials (SBOM) that lists all components used to build the software, which can later be used to perform vulnerability or license analysis of the resulting software; +* to lookup software in different vulnerability databases or report new vulnerabilities to them. + +Overriding the default `meta.identifiers` attribute is optional, but it is recommended to fill in pieces to help tools mentioned above get precise data. +For example, we could get automatic notifications about potential vulnerabilities for users in the future. +All identifiers specified in `meta.identifiers` are expected to be unambiguous and valid. + +`meta.identifiers` contains `v1` attribute which is an attribute set that guarantees backward compatibility of its constituents. Right now it contains copies of all other attributes in `meta.identifiers`. + +### CPE {#sec-meta-identifiers-cpe} + +Common Platform Enumeration (CPE) is a specification maintained by NIST as part of the Security Content Automation Protocol (SCAP). It is used to identify software in National Vulnerabilities Database (NVD, https://nvd.nist.gov) and other vulnerability databases. + +Current version of CPE 2.3 consists of 13 parts: + +``` +cpe:2.3:a:::::::::: +``` + +Some of them are as follows: + +* *CPE version* - current version of CPE is `2.3` +* *part* - usually in Nixpkgs `a` for "application", can also be `o` for "operating system" or `h` for "hardware" +* *vendor* - can point to the source of the package, or to Nixpkgs itself +* *product* - name of the package +* *version* - version of the package +* *update* - name of the latest update, can be a patch version for semantically versioned packages +* *edition* - any additional specification about the version + +You can find information about all of these attributes in the [official specification](https://csrc.nist.gov/projects/security-content-automation-protocol/specifications/cpe/naming) (heading 5.3.3, pages 11-13). + +Any fields that don't have a value are set to either `-` if the value is not available or `*` when the field can match any value. + +For example, for glibc 2.40.1 CPE would be `cpe:2.3:a:gnu:glibc:2.40:1:*:*:*:*:*:*`. + +#### `meta.identifiers.cpeParts` {#var-meta-identifiers-cpeParts} + +This attribute contains an attribute set of all parts of the CPE for this package. Most of the parts default to `*` (match any value), with some exceptions: + +* `part` defaults to `a` (application), can also be set to `o` for operating systems, for example, Linux kernel, or to `h` for hardware +* `vendor` cannot be deduced from other sources, so it must be specified by the package author +* `product` defaults to provided derivation's `pname` attribute and must be provided explicitly if `pname` is missing +* `version` and `update` have no defaults and should be specified explicitly or using helper functions, when missing, `cpe` attribute will be empty, and all possible guesses using helper functions will be in `possibleCPEs` attribute. + +It is up to the package author to make sure all parts are correct and match expected values in [NVD dictionary](https://nvd.nist.gov/products/cpe). Unknown values can be skipped, which would leave them with the default value of `*`. + +Following functions help with filling out `version` and `update` fields: + +* [`lib.meta.cpeFullVersionWithVendor`](#function-library-lib.meta.cpeFullVersionWithVendor) +* [`lib.meta.cpePatchVersionInUpdateWithVendor`](#function-library-lib.meta.cpePatchVersionInUpdateWithVendor) + +For many packages to make CPE available it should be enough to specify only: + +```nix +{ + # ... + meta.identifiers.cpeParts = lib.meta.cpePatchVersionInUpdateWithVendor vendor version; +} +``` + +#### `meta.identifiers.cpe` {#var-meta-identifiers-cpe} + +A readonly attribute that concatenates all CPE parts in one string. + +#### `meta.identifiers.possibleCPEs` {#var-meta-identifiers-possibleCPEs} + +A readonly attribute containing the list of guesses for what CPE for this package can look like. It includes all variants of version handling mentioned above. Each item is an attrset with attributes `cpeParts` and `cpe` for each guess. diff --git a/lib/meta.nix b/lib/meta.nix index ee234d94489b..cf48a700b23a 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -15,7 +15,12 @@ let assertMsg ; inherit (lib.attrsets) mapAttrs' filterAttrs; - inherit (builtins) isString match typeOf; + inherit (builtins) + isString + match + typeOf + elemAt + ; in rec { @@ -484,4 +489,186 @@ rec { assert assertMsg (match ".*/.*" y == null) "lib.meta.getExe': The second argument \"${y}\" is a nested path with a \"/\" character, but it should just be the name of the executable instead."; "${getBin x}/bin/${y}"; + + /** + Generate [CPE parts](#var-meta-identifiers-cpeParts) from inputs. Copies `vendor` and `version` to the output, and sets `update` to `*`. + + # Inputs + + `vendor` + + : package's vendor + + `version` + + : package's version + + # Type + + ``` + cpeFullVersionWithVendor :: string -> string -> AttrSet + ``` + + # Examples + :::{.example} + ## `lib.meta.cpeFullVersionWithVendor` usage example + + ```nix + lib.meta.cpeFullVersionWithVendor "gnu" "1.2.3" + => { + vendor = "gnu"; + version = "1.2.3"; + update = "*"; + } + ``` + + ::: + :::{.example} + ## `lib.meta.cpeFullVersionWithVendor` usage in derivations + + ```nix + mkDerivation rec { + version = "1.2.3"; + # ... + meta = { + # ... + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gnu" version; + }; + } + ``` + ::: + */ + cpeFullVersionWithVendor = vendor: version: { + inherit vendor version; + update = "*"; + }; + + /** + Alternate version of [`lib.meta.cpePatchVersionInUpdateWithVendor`](#function-library-lib.meta.cpePatchVersionInUpdateWithVendor). + If `cpePatchVersionInUpdateWithVendor` succeeds, returns an attribute set with `success` set to `true` and `value` set to the result. + Otherwise, `success` is set to `false` and `error` is set to the string representation of the error. + + # Inputs + + `vendor` + + : package's vendor + + `version` + + : package's version + + # Type + + ``` + tryCPEPatchVersionInUpdateWithVendor :: string -> string -> AttrSet + ``` + + # Examples + :::{.example} + ## `lib.meta.tryCPEPatchVersionInUpdateWithVendor` usage example + + ```nix + lib.meta.tryCPEPatchVersionInUpdateWithVendor "gnu" "1.2.3" + => { + success = true; + value = { + vendor = "gnu"; + version = "1.2"; + update = "3"; + }; + } + ``` + + ::: + :::{.example} + ## `lib.meta.cpePatchVersionInUpdateWithVendor` error example + + ```nix + lib.meta.tryCPEPatchVersionInUpdateWithVendor "gnu" "5.3p0" + => { + success = false; + error = "version 5.3p0 doesn't match regex `([0-9]+\\.[0-9]+)\\.([0-9]+)`"; + } + ``` + + ::: + */ + tryCPEPatchVersionInUpdateWithVendor = + vendor: version: + let + regex = "([0-9]+\\.[0-9]+)\\.([0-9]+)"; + # we have to call toString here in case version is an attrset with __toString attribute + versionMatch = builtins.match regex (toString version); + in + if versionMatch == null then + { + success = false; + error = "version ${version} doesn't match regex `${regex}`"; + } + else + { + success = true; + value = { + inherit vendor; + version = elemAt versionMatch 0; + update = elemAt versionMatch 1; + }; + }; + + /** + Generate [CPE parts](#var-meta-identifiers-cpeParts) from inputs. Copies `vendor` to the result. When `version` matches `X.Y.Z` where all parts are numerical, sets `version` and `update` fields to `X.Y` and `Z`. Throws an error if the version doesn't match the expected template. + + # Inputs + + `vendor` + + : package's vendor + + `version` + + : package's version + + # Type + + ``` + cpePatchVersionInUpdateWithVendor :: string -> string -> AttrSet + ``` + + # Examples + :::{.example} + ## `lib.meta.cpePatchVersionInUpdateWithVendor` usage example + + ```nix + lib.meta.cpePatchVersionInUpdateWithVendor "gnu" "1.2.3" + => { + vendor = "gnu"; + version = "1.2"; + update = "3"; + } + ``` + + ::: + :::{.example} + ## `lib.meta.cpePatchVersionInUpdateWithVendor` usage in derivations + + ```nix + mkDerivation rec { + version = "1.2.3"; + # ... + meta = { + # ... + identifiers.cpeParts = lib.meta.cpePatchVersionInUpdateWithVendor "gnu" version; + }; + } + ``` + + ::: + */ + cpePatchVersionInUpdateWithVendor = + vendor: version: + let + result = tryCPEPatchVersionInUpdateWithVendor vendor version; + in + if result.success then result.value else throw result.error; } diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 6d486e5040fe..c965c62a8f4b 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -85,5 +85,10 @@ stdenv.mkDerivation rec { ivan ]; platforms = platforms.unix; + identifiers.cpeParts = { + vendor = "samba"; + inherit version; + update = "-"; + }; }; } diff --git a/pkgs/by-name/he/hello/package.nix b/pkgs/by-name/he/hello/package.nix index 4e12ff39093e..bbcce772a3aa 100644 --- a/pkgs/by-name/he/hello/package.nix +++ b/pkgs/by-name/he/hello/package.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ stv0g ]; mainProgram = "hello"; platforms = lib.platforms.all; + identifiers.cpeParts.vendor = "gnu"; }; }) diff --git a/pkgs/development/compilers/gcc/common/meta.nix b/pkgs/development/compilers/gcc/common/meta.nix index c69f9956ddfc..e0325feafbe8 100644 --- a/pkgs/development/compilers/gcc/common/meta.nix +++ b/pkgs/development/compilers/gcc/common/meta.nix @@ -30,4 +30,5 @@ in teams = [ teams.gcc ]; mainProgram = "${targetPrefix}gcc"; + identifiers.cpeParts.vendor = "gnu"; } diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 3e78d7946b5d..a79cfed28598 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -419,6 +419,7 @@ pipe platforms teams mainProgram + identifiers ; }; } diff --git a/pkgs/development/compilers/llvm/common/common-let.nix b/pkgs/development/compilers/llvm/common/common-let.nix index 1a17e39a0690..800f2000e68c 100644 --- a/pkgs/development/compilers/llvm/common/common-let.nix +++ b/pkgs/development/compilers/llvm/common/common-let.nix @@ -34,6 +34,8 @@ rec { ++ lib.optionals (lib.versionAtLeast release_version "7") lib.platforms.riscv ++ lib.optionals (lib.versionAtLeast release_version "14") lib.platforms.m68k ++ lib.optionals (lib.versionAtLeast release_version "16") lib.platforms.loongarch64; + + identifiers.cpeParts.vendor = "llvm"; }; releaseInfo = diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 38eda04ecb77..af99e2995c07 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -540,6 +540,13 @@ lib.makeOverridable ( ] ++ lib.optional (lib.versionOlder version "5.19") "loongarch64-linux"; timeout = 14400; # 4 hours + identifiers.cpeParts = { + part = "o"; + vendor = "linux"; + product = "linux_kernel"; + inherit version; + update = "*"; + }; } // extraMeta; }; diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index 424769a4a5c1..bb26bcd77336 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -183,5 +183,15 @@ lib.warnIf (withDocs != null) badPlatforms = [ lib.systems.inspect.patterns.isMinGW ]; maintainers = [ ]; mainProgram = "bash"; + identifiers.cpeParts = + let + versionSplit = lib.split "p" version; + in + { + vendor = "gnu"; + product = "bash"; + version = lib.elemAt versionSplit 0; + update = lib.elemAt versionSplit 2; + }; }; } diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 3a42ab4f15aa..66cf070c5268 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -11,6 +11,7 @@ let inherit (lib) all attrNames + attrValues concatMapStrings concatMapStringsSep concatStrings @@ -37,6 +38,8 @@ let inherit (lib.meta) availableOn + cpeFullVersionWithVendor + tryCPEPatchVersionInUpdateWithVendor ; inherit (lib.generators) @@ -437,6 +440,8 @@ let # Used for the original location of the maintainer and team attributes to assist with pings. maintainersPosition = any; teamsPosition = any; + + identifiers = attrs; }; checkMetaAttr = @@ -570,6 +575,19 @@ let else validYes; + # Helper functions and declarations to handle identifiers, extracted to reduce allocations + hasAllCPEParts = cpeParts: !any isNull (attrValues cpeParts); + makeCPE = + cpeParts: + "cpe:2.3:${cpeParts.part}:${cpeParts.vendor}:${cpeParts.product}:${cpeParts.version}:${cpeParts.update}:${cpeParts.edition}:${cpeParts.sw_edition}:${cpeParts.target_sw}:${cpeParts.target_hw}:${cpeParts.language}:${cpeParts.other}"; + possibleCPEPartsFuns = [ + (vendor: version: { + success = true; + value = cpeFullVersionWithVendor vendor version; + }) + tryCPEPatchVersionInUpdateWithVendor + ]; + # The meta attribute is passed in the resulting attribute set, # but it's not part of the actual derivation, i.e., it's not # passed to the builder and is not a dependency. But since we @@ -634,6 +652,51 @@ let maintainers = attrs.meta.maintainers or [ ] ++ concatMap (team: team.members or [ ]) attrs.meta.teams or [ ]; + identifiers = + let + defaultCPEParts = { + part = "a"; + vendor = null; + product = attrs.pname or null; + version = null; + update = null; + edition = "*"; + sw_edition = "*"; + target_sw = "*"; + target_hw = "*"; + language = "*"; + other = "*"; + }; + + cpeParts = defaultCPEParts // attrs.meta.identifiers.cpeParts or { }; + cpe = if hasAllCPEParts cpeParts then makeCPE cpeParts else null; + + possibleCPEs = + if cpe != null then + [ { inherit cpeParts cpe; } ] + else if attrs.meta.identifiers.cpeParts.vendor or null == null || attrs.version or null == null then + [ ] + else + concatMap ( + f: + let + result = f attrs.meta.identifiers.cpeParts.vendor attrs.version; + # Note that attrs.meta.identifiers.cpeParts at this point can include defaults with user overrides. + # Since we can't split them apart, user overrides don't apply to possibleCPEs. + guessedParts = cpeParts // result.value; + in + optional (result.success && (hasAllCPEParts guessedParts)) { + cpeParts = guessedParts; + cpe = (makeCPE guessedParts); + } + ) possibleCPEPartsFuns; + v1 = { inherit cpeParts cpe possibleCPEs; }; + in + v1 + // { + inherit v1; + }; + # Expose the result of the checks for everyone to see. unfree = hasUnfreeLicense attrs; broken = isMarkedBroken attrs; From 283a7184415f8b679d1eecf12b5fdf4e265d52c5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 29 Aug 2025 15:45:07 +0200 Subject: [PATCH 119/305] frigate: pin joserfc at 1.1.0 Breaking changes in newer versions break frigate at runtime as visible in the nixos test. --- pkgs/by-name/fr/frigate/package.nix | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix index 3c6c9d9b3660..27f584f6a7bc 100644 --- a/pkgs/by-name/fr/frigate/package.nix +++ b/pkgs/by-name/fr/frigate/package.nix @@ -27,7 +27,20 @@ let inherit version src; }; - python = python312Packages.python; + python = python312Packages.python.override { + packageOverrides = self: super: { + joserfc = super.joserfc.overridePythonAttrs (oldAttrs: { + version = "1.1.0"; + src = fetchFromGitHub { + owner = "authlib"; + repo = "joserfc"; + tag = version; + hash = "sha256-95xtUzzIxxvDtpHX/5uCHnTQTB8Fc08DZGUOR/SdKLs="; + }; + }); + }; + }; + python3Packages = python.pkgs; # Tensorflow audio model # https://github.com/blakeblackshear/frigate/blob/v0.15.0/docker/main/Dockerfile#L125 @@ -56,7 +69,7 @@ let hash = "sha256-5Cj2vEiWR8Z9d2xBmVoLZuNRv4UOuxHSGZQWTJorXUQ="; }; in -python312Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "frigate"; inherit version; format = "other"; @@ -109,7 +122,7 @@ python312Packages.buildPythonApplication rec { dontBuild = true; - dependencies = with python312Packages; [ + dependencies = with python3Packages; [ # docker/main/requirements.txt scikit-build # docker/main/requirements-wheel.txt @@ -191,7 +204,7 @@ python312Packages.buildPythonApplication rec { runHook postInstall ''; - nativeCheckInputs = with python312Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; @@ -213,7 +226,7 @@ python312Packages.buildPythonApplication rec { passthru = { web = frigate-web; inherit python; - pythonPath = (python312Packages.makePythonPath dependencies) + ":${frigate}/${python.sitePackages}"; + pythonPath = (python3Packages.makePythonPath dependencies) + ":${frigate}/${python.sitePackages}"; tests = { inherit (nixosTests) frigate; }; From 6c4b1800989fcd82bca51f7ba8a72439cfe84c3c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 29 Aug 2025 15:45:50 +0200 Subject: [PATCH 120/305] frigate: centralize the ffmpeg flavor selection in the module In 0.16.0 frigate added a config option to pass an ffmpeg build for the ffmpeg and ffprobe executables. Previously we unconditionally patched in ffmpeg-headless, which has now been changed to use the `ffmpeg.path` provided build, so that we don't bloat the closure with multiple ffmpegs or don't require overriding the package to select another version. In contrast to the upstream configuration we only accept packages and not the "default" string, because that would have complicated the logic needlessly. --- nixos/modules/services/video/frigate.nix | 11 ++++++++ pkgs/by-name/fr/frigate/ffmpeg.patch | 34 +++++++++++++++--------- pkgs/by-name/fr/frigate/package.nix | 8 ++---- 3 files changed, 34 insertions(+), 19 deletions(-) diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix index 6dc6bab6c036..5d8d92b5cae8 100644 --- a/nixos/modules/services/video/frigate.nix +++ b/nixos/modules/services/video/frigate.nix @@ -231,6 +231,17 @@ in }; }; + ffmpeg = { + path = mkOption { + type = coercedTo package toString str; + default = pkgs.ffmpeg-headless; + example = literalExpression "pkgs.ffmpeg-full"; + description = '' + Package providing the ffmpeg and ffprobe executables below the bin/ directory. + ''; + }; + }; + mqtt = { enabled = mkEnableOption "MQTT support"; diff --git a/pkgs/by-name/fr/frigate/ffmpeg.patch b/pkgs/by-name/fr/frigate/ffmpeg.patch index 78721dd6d3a4..9a91f6ed74b6 100644 --- a/pkgs/by-name/fr/frigate/ffmpeg.patch +++ b/pkgs/by-name/fr/frigate/ffmpeg.patch @@ -1,30 +1,39 @@ diff --git a/frigate/config/camera/ffmpeg.py b/frigate/config/camera/ffmpeg.py -index 04bbfac7..4390a571 100644 +index 04bbfac7..396bcc4b 100644 --- a/frigate/config/camera/ffmpeg.py +++ b/frigate/config/camera/ffmpeg.py -@@ -70,18 +70,14 @@ class FfmpegConfig(FrigateBaseModel): +@@ -1,4 +1,5 @@ + from enum import Enum ++from os.path import join + from typing import Union + + from pydantic import Field, field_validator +@@ -69,21 +70,11 @@ class FfmpegConfig(FrigateBaseModel): + @property def ffmpeg_path(self) -> str: - if self.path == "default": +- if self.path == "default": - return f"/usr/lib/ffmpeg/{DEFAULT_FFMPEG_VERSION}/bin/ffmpeg" - elif self.path in INCLUDED_FFMPEG_VERSIONS: - return f"/usr/lib/ffmpeg/{self.path}/bin/ffmpeg" -+ return "@ffmpeg@" - else: - return f"{self.path}/bin/ffmpeg" +- else: +- return f"{self.path}/bin/ffmpeg" ++ return join(self.path, "bin/ffmpeg") @property def ffprobe_path(self) -> str: - if self.path == "default": +- if self.path == "default": - return f"/usr/lib/ffmpeg/{DEFAULT_FFMPEG_VERSION}/bin/ffprobe" - elif self.path in INCLUDED_FFMPEG_VERSIONS: - return f"/usr/lib/ffmpeg/{self.path}/bin/ffprobe" -+ return "@ffprobe@" - else: - return f"{self.path}/bin/ffprobe" +- else: +- return f"{self.path}/bin/ffprobe" ++ return join(self.path, "bin/ffprobe") + + class CameraRoleEnum(str, Enum): diff --git a/frigate/record/export.py b/frigate/record/export.py -index 0d3f96da..09cadbcd 100644 +index 0d3f96da..463bcff4 100644 --- a/frigate/record/export.py +++ b/frigate/record/export.py @@ -126,7 +126,7 @@ class RecordingExporter(threading.Thread): @@ -32,8 +41,7 @@ index 0d3f96da..09cadbcd 100644 seconds = int(diff % 60) ffmpeg_cmd = [ - "/usr/lib/ffmpeg/7.0/bin/ffmpeg", # hardcode path for exports thumbnail due to missing libwebp support -+ "@ffmpeg@", # hardcode path for exports thumbnail due to missing libwebp support ++ FfmpegConfig.ffmpeg_path, # hardcode path for exports thumbnail due to missing libwebp support "-hide_banner", "-loglevel", "warning", -~ diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix index 27f584f6a7bc..f6a4fb5f6db2 100644 --- a/pkgs/by-name/fr/frigate/package.nix +++ b/pkgs/by-name/fr/frigate/package.nix @@ -2,7 +2,6 @@ lib, stdenv, callPackage, - replaceVars, python312Packages, fetchFromGitHub, fetchurl, @@ -78,11 +77,7 @@ python3Packages.buildPythonApplication rec { patches = [ ./constants.patch - - (replaceVars ./ffmpeg.patch { - ffmpeg = lib.getExe ffmpeg-headless; - ffprobe = lib.getExe' ffmpeg-headless "ffprobe"; - }) + ./ffmpeg.patch ]; postPatch = '' @@ -205,6 +200,7 @@ python3Packages.buildPythonApplication rec { ''; nativeCheckInputs = with python3Packages; [ + ffmpeg-headless pytestCheckHook ]; From f652310e55e2ebfdaf61520ffd0bf9bcde49a513 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 13:54:21 +0000 Subject: [PATCH 121/305] python3Packages.pygltflib: 1.16.2 -> 1.16.5 --- pkgs/development/python-modules/pygltflib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygltflib/default.nix b/pkgs/development/python-modules/pygltflib/default.nix index 6e6aefe3bdf8..42bb8a9d9ed7 100644 --- a/pkgs/development/python-modules/pygltflib/default.nix +++ b/pkgs/development/python-modules/pygltflib/default.nix @@ -21,7 +21,7 @@ in buildPythonPackage rec { pname = "pygltflib"; - version = "1.16.2"; + version = "1.16.5"; pyproject = true; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "dodgyville"; repo = "pygltflib"; tag = "v${version}"; - hash = "sha256-rUAg05M5biVsdG2yEH0Olng/0jH1R/Jo5/+j4ToKkTI="; + hash = "sha256-3XfOlL+l0isMFv71+uY/PBHCwND54qACoCVYntfCot4="; }; nativeBuildInputs = [ setuptools ]; From 08855e77a8e2b4cfece0fec2b8aa4b0529eee858 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 14:02:43 +0000 Subject: [PATCH 122/305] python3Packages.dnfile: 0.16.4 -> 0.17.0 --- pkgs/development/python-modules/dnfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dnfile/default.nix b/pkgs/development/python-modules/dnfile/default.nix index 4edf3e8ba16b..106c3bbb3028 100644 --- a/pkgs/development/python-modules/dnfile/default.nix +++ b/pkgs/development/python-modules/dnfile/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dnfile"; - version = "0.16.4"; + version = "0.17.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "malwarefrank"; repo = "dnfile"; tag = "v${version}"; - hash = "sha256-xizjWY+ByGDOI7HyzT5U4vqmPT2woU7z/3eV0KXDb8Y="; + hash = "sha256-JiJ7qvBP0SDGMynQuu2AyCwHU9aDI7Pq5/Z9IiWPWng="; fetchSubmodules = true; }; From a5ae7b9504471317986edeaab080b5e608c08a5a Mon Sep 17 00:00:00 2001 From: Dominic Wrege Date: Fri, 29 Aug 2025 16:14:39 +0200 Subject: [PATCH 123/305] librewolf-unwrapped: 142.0-1 -> 142.0.1-1 --- .../networking/browsers/librewolf/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index ac3afeac899e..c247bac2ebed 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "142.0-1", + "packageVersion": "142.0.1-1", "source": { - "rev": "142.0-1", - "hash": "sha256-/bn9xeDxnJCQol/E8rhS8RVhpUj7UN+QScSIzLFnZ/o=" + "rev": "142.0.1-1", + "hash": "sha256-frAMrNEGv36+SshorhjnOimT3bKe9uLaDjxbuqSp39c=" }, "firefox": { - "version": "142.0", - "hash": "sha512-sMHHZgg6MKkrd9zxalhNn7NBzYEdIcOjTaTNDXFP1q3HO2CAktZgWGl7xFYvqsxEhZFT5J/9624U4Fnlny6iRg==" + "version": "142.0.1", + "hash": "sha512-/KG5xnoLLyFvHxH9XjoIkgmYkh49YetjPx3ef+actAzbtjpBod/E8QIlCdpkPjeRRn2I5i5+owspPr9p2Hu1hQ==" } } From b1dd7b0e0b4390b5bb249a3fefcf4c00dc43db37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 14:17:33 +0000 Subject: [PATCH 124/305] aliyun-cli: 3.0.296 -> 3.0.299 --- pkgs/by-name/al/aliyun-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix index 91594d388ef3..45df933e0ac1 100644 --- a/pkgs/by-name/al/aliyun-cli/package.nix +++ b/pkgs/by-name/al/aliyun-cli/package.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.296"; + version = "3.0.299"; src = fetchFromGitHub { owner = "aliyun"; repo = "aliyun-cli"; tag = "v${version}"; - hash = "sha256-7LQUxUE31bFve3IyK9G+1XM6Fom888JQ2WZy2mpW9Fs="; + hash = "sha256-9312AWM6yzF8asL7+ziU3C4VtsFV6vrPZS4so09P4vw="; fetchSubmodules = true; }; - vendorHash = "sha256-Vp7cvIlswhRf1ntZESd7Oabg+xZ4UOFJGD2usRcnnhY="; + vendorHash = "sha256-7OI9YDehiKP5+VvCc0jUtCfyCPP5puWjyWXFE7Tjv5Q="; subPackages = [ "main" ]; From f2bb8a4dfbce5dabf96720b61dbd419b3378fcf9 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Mon, 18 Aug 2025 11:43:43 +1000 Subject: [PATCH 125/305] ISSUE_TEMPLATE: add the package request stub This isn't an issue template; it's a stub that will be auto-closed by CI and is meant to discourage future package requests, and encourage more pull requests. See the full discussion on https://github.com/NixOS/nixpkgs/issues/425040. Signed-off-by: Fernando Rodrigues --- .github/ISSUE_TEMPLATE/10_package_request.yml | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/10_package_request.yml diff --git a/.github/ISSUE_TEMPLATE/10_package_request.yml b/.github/ISSUE_TEMPLATE/10_package_request.yml new file mode 100644 index 000000000000..3f5fb06691b6 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/10_package_request.yml @@ -0,0 +1,41 @@ +name: "Request: Nix Package" +description: "Package requests are no longer accepted. Please open a Pull Request with your desired package instead." +title: "Package Request" +labels: ["0.kind: packaging request", "4.workflow: auto-close"] +body: + - type: "markdown" + attributes: + value: | +

+ + + + + NixOS logo + + +

+ + Thank you for your interest in packaging new software in Nixpkgs. + Unfortunately, to mitigate the unsustainable growth of unmaintained packages, **Nixpkgs is no longer accepting package requests** via Issues. + + As a [volunteer community][community], we are always open to new contributors. + If you wish to see this package in Nixpkgs, **we encourage you to [contribute] it yourself, via a Pull Request**. + Anyone can [become a package maintainer][maintainers]! + You can find language-specific packaging information in the [Nixpkgs Manual][nixpkgs]. + Should you need any help, please reach out to the community on [Matrix] or [Discourse]. + + [community]: https://nixos.org/community + [contribute]: https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#quick-start-to-adding-a-package + [maintainers]: https://github.com/NixOS/nixpkgs/blob/master/maintainers/README.md + [nixpkgs]: https://nixos.org/manual/nixpkgs/unstable/ + [Matrix]: https://matrix.to/#/#dev:nixos.org + [Discourse]: https://discourse.nixos.org/c/dev/14 + + --- + - type: "checkboxes" + id: "ignored" + attributes: + label: "Issues for new package requests are not accepted. Please open a Pull Request instead." + options: + - label: "I didn't read any of that." From ed9a505d36ce67403fe90683e36f98ad184c0b80 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 14:25:52 +0000 Subject: [PATCH 126/305] python3Packages.python-mpv-jsonipc: 1.2.0 -> 1.2.1 --- .../development/python-modules/python-mpv-jsonipc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix index 76570a030980..8178fe6e8cbb 100644 --- a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix +++ b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "python-mpv-jsonipc"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "iwalton3"; repo = "python-mpv-jsonipc"; rev = "v${version}"; - hash = "sha256-W9TNtbRhQmwZXhi0TJIDkZRtWhi92/iwL056YIcWnLM="; + hash = "sha256-ugdLUmo5w+IbtmL2b6+la1X01mWNmnXr9j6e99oPWpE="; }; # 'mpv-jsonipc' does not have any tests From 13214a8564bab6a5d662ded606fabb4577ca7ca6 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Fri, 22 Aug 2025 14:13:19 -0500 Subject: [PATCH 127/305] fyne: 1.26.1 -> 1.6.2 * This hot fix release resolves only the compile issue with Go v1.25.0 caused by golang.org/x/tools conflict I don't know why this is the upgrade version path, but it IS the correct versioning: https://github.com/fyne-io/tools/tags --- pkgs/by-name/fy/fyne/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fy/fyne/package.nix b/pkgs/by-name/fy/fyne/package.nix index fa11db13290f..dc09b790b450 100644 --- a/pkgs/by-name/fy/fyne/package.nix +++ b/pkgs/by-name/fy/fyne/package.nix @@ -15,16 +15,18 @@ buildGoModule rec { pname = "fyne"; - version = "1.26.1"; + # This is the current latest version + # version "1.26.1" was a typo of "1.6.2" - maybe, don't "upgrade" to it + version = "1.6.2"; src = fetchFromGitHub { owner = "fyne-io"; repo = "tools"; rev = "v${version}"; - hash = "sha256-eBwbXyhI1s4se7krzTemoSehgSXN7mht70q8mk+yGoM="; + hash = "sha256-N5v1oytSwRHE631KQDHTulUAqs/Jlr8YJqE8wy+Ygdk="; }; - vendorHash = "sha256-7B0PCKMfLULmqzIlNFeXhOUThnWSe9+gRhpswbiwLP4="; + vendorHash = "sha256-LU3UkWHsf0Qt6w5tNIz11ubI+OIWkbtqqSlcoYJVFZU="; nativeBuildInputs = [ pkg-config ]; From 289615112fe70270a5ba738399ced4da45ce4b9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 15:17:39 +0000 Subject: [PATCH 128/305] python3Packages.aioswitcher: 6.0.1 -> 6.0.2 --- pkgs/development/python-modules/aioswitcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index c21b891d8299..f51a899af510 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "6.0.1"; + version = "6.0.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "TomerFi"; repo = "aioswitcher"; tag = version; - hash = "sha256-w1gTLieZkn4iGrswyqRjwMrHX9ZtEMPB2zaKblJFlSw="; + hash = "sha256-DtTrfwT8Xvw5byWzTGpO/o2PI7/4Zt++xgKVnNMwA1k="; }; __darwinAllowLocalNetworking = true; From a5917ce0d7c790eb7276b1680b72fb293099db60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 15:22:02 +0000 Subject: [PATCH 129/305] python3Packages.pygitguardian: 1.24.0 -> 1.25.0 --- pkgs/development/python-modules/pygitguardian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygitguardian/default.nix b/pkgs/development/python-modules/pygitguardian/default.nix index c759e67bbf07..2c5468f77363 100644 --- a/pkgs/development/python-modules/pygitguardian/default.nix +++ b/pkgs/development/python-modules/pygitguardian/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pygitguardian"; - version = "1.24.0"; + version = "1.25.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "GitGuardian"; repo = "py-gitguardian"; tag = "v${version}"; - hash = "sha256-9Zk2XpMS8WhCOGYwtUgsjWKbUhmtKOgVWyqskLJ8DOw="; + hash = "sha256-XcmLaEnQ5cUTd71xvgvdS418RGOzpKydUDoSdVC/mgo="; }; pythonRelaxDeps = [ From 80f00ea0c963bc7d789dc8b90d119786d1b228f7 Mon Sep 17 00:00:00 2001 From: mmfallacy <31348500+mmfallacy@users.noreply.github.com> Date: Fri, 29 Aug 2025 23:25:54 +0800 Subject: [PATCH 130/305] vimPlugins: update on 2025-08-29 --- pkgs/applications/editors/vim/plugins/generated.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 02a681a2a58c..6836e95fe52e 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -3015,12 +3015,12 @@ final: prev: { codecompanion-nvim = buildVimPlugin { pname = "codecompanion.nvim"; - version = "2025-08-21"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "olimorris"; repo = "codecompanion.nvim"; - rev = "79cc678ca5f79a5ed04affa73116cb9bbe41bb12"; - sha256 = "1lm10bijwcr5dl7br6djlij3ixn12bhplc24j7qfiypphxw78yxq"; + rev = "c34e49676dd9bd44c9a18588167cdc0a31077dbd"; + sha256 = "0nmfrfjhs2l0m2cmgqgmsnc0irr1d8fv8xm6zglkdadppf0bm4s3"; }; meta.homepage = "https://github.com/olimorris/codecompanion.nvim/"; meta.hydraPlatforms = [ ]; From 98ed16e0b254502ad1e720999920fe7e56575361 Mon Sep 17 00:00:00 2001 From: azahi Date: Fri, 29 Aug 2025 18:59:51 +0300 Subject: [PATCH 131/305] lidarr: fix update script --- pkgs/by-name/li/lidarr/update.sh | 48 +++++++++++++------------------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/li/lidarr/update.sh b/pkgs/by-name/li/lidarr/update.sh index a0712f299113..c8cbca5bc089 100755 --- a/pkgs/by-name/li/lidarr/update.sh +++ b/pkgs/by-name/li/lidarr/update.sh @@ -1,43 +1,35 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnused nix-prefetch jq -set -e +set -euo pipefail -dirname="$(dirname "$0")" +dirname="$(dirname "$(readlink -f "$0")")" -updateHash() -{ - version=$1 - arch=$2 - os=$3 - - hashKey="${arch}-${os}_hash" +updateHash() { + local version arch os + version="$1" + arch="$2" + os="$3" + local url hash sriHash url="https://github.com/Lidarr/Lidarr/releases/download/v$version/Lidarr.master.$version.$os-core-$arch.tar.gz" - hash=$(nix-prefetch-url --type sha256 $url) - sriHash="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $hash)" + hash="$(nix-prefetch-url --type sha256 "$url")" + sriHash="$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$hash")" - sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/default.nix" + local hashKey="${arch}-${os}_hash" + sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/package.nix" } -updateVersion() -{ - sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix" +updateVersion() { + sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/package.nix" } -currentVersion=$(cd $dirname && nix eval --raw -f ../../.. lidarr.version) - latestTag=$(curl https://api.github.com/repos/Lidarr/Lidarr/releases/latest | jq -r ".tag_name") -latestVersion="$(expr $latestTag : 'v\(.*\)')" +latestVersion="$(expr "$latestTag" : 'v\(.*\)')" -if [[ "$currentVersion" == "$latestVersion" ]]; then - echo "Lidarr is up-to-date: ${currentVersion}" - exit 0 -fi +updateVersion "$latestVersion" -updateVersion $latestVersion - -updateHash $latestVersion x64 linux -updateHash $latestVersion arm64 linux -updateHash $latestVersion x64 osx -updateHash $latestVersion arm64 osx +updateHash "$latestVersion" x64 linux +updateHash "$latestVersion" arm64 linux +updateHash "$latestVersion" x64 osx +updateHash "$latestVersion" arm64 osx From 2a8555fd042855642ed80072e614c6107a3861b6 Mon Sep 17 00:00:00 2001 From: azahi Date: Fri, 29 Aug 2025 19:00:10 +0300 Subject: [PATCH 132/305] lidarr: 2.12.4.4658 -> 2.13.3.4711 --- pkgs/by-name/li/lidarr/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/li/lidarr/package.nix b/pkgs/by-name/li/lidarr/package.nix index 8c6e13698666..d11e27fc7e30 100644 --- a/pkgs/by-name/li/lidarr/package.nix +++ b/pkgs/by-name/li/lidarr/package.nix @@ -27,16 +27,16 @@ let ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-ttbQj6GYuKedDEdF8vUZcmc0AluZS6pPC5GCQTUu7OM="; - arm64-linux_hash = "sha256-9Zv0YCR7CvgcDFGYXuc55BhFmIH1iled9WDeEvwAMoI="; - x64-osx_hash = "sha256-v3R43J1KNEzKwIFIu6dkH6xyhr+MZAjcO72vn0ijgCY="; - arm64-osx_hash = "sha256-XAfSawOcfp5iVvmta/maYcj+UU2usRunLM6LjvKKVcg="; + x64-linux_hash = "sha256-24bNK4iHgaobxYpy+OJAocGugV0CwF3q1ND6maEaYSY="; + arm64-linux_hash = "sha256-ck2AspRkKm8hdzO70acTGUUd8WTOevIJF50YwQf/R20="; + x64-osx_hash = "sha256-ut/4154i/yKlm2JacgW9jvevDniedzLudfeuUXV9XzM="; + arm64-osx_hash = "sha256-/aIusVUmsqLCNNhosCAVbR5oN6oLROEuJKnH22cRXfo="; } ."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "lidarr"; - version = "2.12.4.4658"; + version = "2.13.3.4711"; src = fetchurl { url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.${os}-core-${arch}.tar.gz"; From d0c34e3286568700c51723e82673e48134945171 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 16:00:43 +0000 Subject: [PATCH 133/305] python3Packages.mscerts: 2025.6.27 -> 2025.8.29 --- pkgs/development/python-modules/mscerts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mscerts/default.nix b/pkgs/development/python-modules/mscerts/default.nix index ea6ceec821fb..da2095ec25de 100644 --- a/pkgs/development/python-modules/mscerts/default.nix +++ b/pkgs/development/python-modules/mscerts/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "mscerts"; - version = "2025.6.27"; + version = "2025.8.29"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ralphje"; repo = "mscerts"; tag = version; - hash = "sha256-By0gVlsVjgBREBGUOZjnKE9HTHC+zLZ4kUKIcN7/eKY="; + hash = "sha256-K7U4dbhH3yWElSKRhU9mHU4W+Hdc6Vb9kf/TE4EJs8c="; }; build-system = [ setuptools ]; From 8f9d51f0b1c23ab924599abcf0f3fe403febece1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 29 Aug 2025 18:04:54 +0200 Subject: [PATCH 134/305] esphome: 2025.8.1 -> 2025.8.2 https://github.com/esphome/esphome/releases/tag/2025.8.2 --- pkgs/by-name/es/esphome/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index 41e7b21e41b3..59737ac5f492 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -34,14 +34,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2025.8.1"; + version = "2025.8.2"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "esphome"; tag = version; - hash = "sha256-aXbsMqAq1VD3sG4M+zhFw5LyHpQTFFxKpRFRIRuJ/aU="; + hash = "sha256-UcYzGUz+H5N/jql3KgSNa24mygasAL4sOXLt9PdLYT8="; }; patches = [ From 02c2cf51eed159847e5d661d465a336291ae4854 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 16:09:04 +0000 Subject: [PATCH 135/305] python3Packages.pyfunctional: 1.5.0 -> 1.4.3 --- pkgs/development/python-modules/pyfunctional/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyfunctional/default.nix b/pkgs/development/python-modules/pyfunctional/default.nix index 704870e9e14f..e3a42ca3cd59 100644 --- a/pkgs/development/python-modules/pyfunctional/default.nix +++ b/pkgs/development/python-modules/pyfunctional/default.nix @@ -10,7 +10,7 @@ buildPythonPackage { pname = "pyfunctional"; - version = "1.5.0"; + version = "1.4.3"; pyproject = true; src = fetchFromGitHub { From 37ebb291eeaa078e90df16c0eb72be329f43d5b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 15:40:17 +0000 Subject: [PATCH 136/305] python3Packages.llguidance: 0.7.19 -> 1.2.0 --- .../python-modules/llguidance/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/llguidance/default.nix b/pkgs/development/python-modules/llguidance/default.nix index a9aa721066ed..ff1f22856ce2 100644 --- a/pkgs/development/python-modules/llguidance/default.nix +++ b/pkgs/development/python-modules/llguidance/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, fetchFromGitHub, - # build-system + # nativeBuildInputs cargo, pkg-config, rustPlatform, @@ -18,27 +18,26 @@ pytestCheckHook, torch, transformers, - pythonOlder, }: buildPythonPackage rec { pname = "llguidance"; - version = "0.7.19"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "guidance-ai"; repo = "llguidance"; tag = "v${version}"; - hash = "sha256-tfTiut8jiGGf2uQLGcC4ieNf4ePFauJZL6vNbWie078="; + hash = "sha256-Fe7cKZotjRexcSHcoT0Y9I3m+dRarhlBOjYR7rdJBRY="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - hash = "sha256-I1sjkZgtsBpPVkGL596TjLi9txRmgP5oTIWaM1K5I1E="; + inherit src pname version; + hash = "sha256-//Vjj4QIDcZEPujMfUhZd5nx5pAyF3l3CdNvI/Wi74A="; }; - build-system = [ + nativeBuildInputs = [ cargo pkg-config rustPlatform.cargoSetupHook @@ -88,12 +87,12 @@ buildPythonPackage rec { disabledTestPaths = [ # Require internet access (https://huggingface.co) + "python/torch_tests/test_hf.py" + "python/torch_tests/test_llamacpp.py" + "python/torch_tests/test_tiktoken.py" "scripts/tokenizer_test.py" ]; - # As dynamo is not supported on Python 3.13+, no successful tests remain. - doCheck = pythonOlder "3.13"; - meta = { description = "Super-fast Structured Outputs"; homepage = "https://github.com/guidance-ai/llguidance"; From 4b06c0af17538bc8110d745601806bac6c092f97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 16:22:12 +0000 Subject: [PATCH 137/305] rekor-cli: 1.4.0 -> 1.4.1 --- pkgs/tools/security/rekor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/rekor/default.nix b/pkgs/tools/security/rekor/default.nix index e28edd4be66a..21b5b4273d91 100644 --- a/pkgs/tools/security/rekor/default.nix +++ b/pkgs/tools/security/rekor/default.nix @@ -14,13 +14,13 @@ let }: buildGoModule rec { inherit pname; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "sigstore"; repo = "rekor"; rev = "v${version}"; - hash = "sha256-uGPjeBnai1QP/U9uu4wVMUVjd8Nx1sl4r83xrOdEoF0="; + hash = "sha256-qn65d2bG8flSlMXG5TiMrNAVX8emv4ymsGs516TKFWU="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -33,7 +33,7 @@ let ''; }; - vendorHash = "sha256-lHaRabQzeh69GXQc3Spe1mLi7zyGSjhICH3ZENMJUfI="; + vendorHash = "sha256-lHzBpCisojRk6adWq+vZsvGqXQ22IzqO3bJa3foaWIA="; nativeBuildInputs = [ installShellFiles ]; From 15e895181bc06d58268e265500b3aeb5c8444374 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 28 Aug 2025 12:52:07 -0700 Subject: [PATCH 138/305] win-pvdrivers: drop This package has been removed as it was subject to the Xen build machine compromise ([XSN-01]) and has open security vulnerabilities ([XSA-468]). [XSN-01]: https://lists.xenproject.org/archives/html/xen-announce/2023-07/msg00000.html [XSA-468]: https://xenbits.xen.org/xsa/advisory-468.html --- pkgs/by-name/wi/win-pvdrivers/package.nix | 80 ----------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 80 deletions(-) delete mode 100644 pkgs/by-name/wi/win-pvdrivers/package.nix diff --git a/pkgs/by-name/wi/win-pvdrivers/package.nix b/pkgs/by-name/wi/win-pvdrivers/package.nix deleted file mode 100644 index 275dd5e21205..000000000000 --- a/pkgs/by-name/wi/win-pvdrivers/package.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchurl, -}: - -let - # Upstream versioned download links are broken - # NOTE: the archive.org timestamp must be updated if the version changes. - # See https://xenproject.org/downloads/ - files = [ - { - url = "https://web.archive.org/web/20230817070451if_/https://xenbits.xenproject.org/pvdrivers/win/xenbus.tar"; - hash = "sha256-sInkbVL/xkoUeZxgknLM3e2AXBVSqItF2Vpkon53Xec="; - } - { - url = "https://web.archive.org/web/20230817070811if_/https://xenbits.xenproject.org/pvdrivers/win/xencons.tar"; - hash = "sha256-r8bxH5B4y0V9qgALi42KtpZW05UOevv29AqqXaIXMBo="; - } - { - url = "https://web.archive.org/web/20230817070811if_/https://xenbits.xenproject.org/pvdrivers/win/xenhid.tar"; - hash = "sha256-e7ztzaXi/6irMus9IH0cfbW5HiKSaybXV1C/rd5mEfA="; - } - { - url = "https://web.archive.org/web/20230817071133if_/https://xenbits.xenproject.org/pvdrivers/win/xeniface.tar"; - hash = "sha256-qPM0TjcGR2luPtOSAfXJ22k6yhwJOmOP3ot6kopEFsI="; - } - { - url = "https://web.archive.org/web/20230817071134if_/https://xenbits.xenproject.org/pvdrivers/win/xennet.tar"; - hash = "sha256-Vg1wSfXjIVRd2iXCa19W4Jdaf2LTVin0yac/D70UjPM="; - } - { - url = "https://web.archive.org/web/20230817070811if_/https://xenbits.xenproject.org/pvdrivers/win/xenvbd.tar"; - hash = "sha256-nLNM0TWqsEWiQBCYxARMldvRecRUcY5DBF5DNAG4490="; - } - { - url = "https://web.archive.org/web/20230817071225if_/https://xenbits.xenproject.org/pvdrivers/win/xenvif.tar"; - hash = "sha256-R8G5vG6Q4g0/UkA2oxcc9/jaHZQYb+u64NShCNt7s7U="; - } - { - url = "https://web.archive.org/web/20230817071153if_/https://xenbits.xenproject.org/pvdrivers/win/xenvkbd.tar"; - hash = "sha256-CaSxCKnT/KaZw8Ma60g2z+4lOOWIRisGRtzMveQqQmM="; - } - ]; - -in -stdenvNoCC.mkDerivation { - pname = "win-pvdrivers"; - version = "unstable-2023-08-17"; - - srcs = map ( - { hash, url }: - fetchurl { - inherit hash url; - # Wait & retry up to 3 times as archive.org can closes connection - # when an HTTP client makes too many requests - curlOpts = "--retry 3 --retry-delay 5"; - } - ) files; - - unpackPhase = '' - runHook preUnpack - - for _src in $srcs; do - mkdir -p $out - tar xfv $_src -C $out - done - - runHook postUnpack - ''; - - meta = with lib; { - description = "Xen Subproject: Windows PV Drivers"; - homepage = "https://xenproject.org/developers/teams/windows-pv-drivers/"; - license = licenses.bsd2; - maintainers = with maintainers; [ anthonyroussel ]; - platforms = platforms.linux; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 737c77ee774a..ec6633dcd4c9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2444,6 +2444,7 @@ mapAliases { whatsapp-for-linux = wasistlos; # Added 2025-01-30 wineWayland = wine-wayland; winhelpcgi = throw "'winhelpcgi' has been removed as it was unmaintained upstream and broken with GCC 14"; # Added 2025-06-14 + win-pvdrivers = throw "'win-pvdrivers' has been removed as it was subject to the Xen build machine compromise (XSN-01) and has open security vulnerabilities (XSA-468)"; # Added 2025-08-29 win-virtio = virtio-win; # Added 2023-10-17 wireguard-vanity-address = throw "'wireguard-vanity-address' has been removed due to lack of upstream maintenance"; # Added 2025-01-26 wkhtmltopdf-bin = wkhtmltopdf; # Added 2024-07-17 From 9d1f0b224a4407783975cf658acc35e56d550946 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 16:28:26 +0000 Subject: [PATCH 139/305] pinniped: 0.40.0 -> 0.41.0 --- pkgs/by-name/pi/pinniped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/pinniped/package.nix b/pkgs/by-name/pi/pinniped/package.nix index 09ad823ce66f..cc0d6d05026e 100644 --- a/pkgs/by-name/pi/pinniped/package.nix +++ b/pkgs/by-name/pi/pinniped/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "pinniped"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "pinniped"; rev = "v${version}"; - sha256 = "sha256-VFBiy7EKJ0J407PAWDlBNXxLWpZ4w3ai4yk32kn18rI="; + sha256 = "sha256-PCSRT3oYqfIsB5vWDIBV1tzRovDfrZOjLrINzos1RL0="; }; subPackages = "cmd/pinniped"; - vendorHash = "sha256-OGZ9/pXudz9YmxeEkMP710+RwHOCig0yDqo+X/o9eJw="; + vendorHash = "sha256-UYDmTwbT5odLMthGRqWuSr4G4oAU8zuWWRrMclIaY8g="; ldflags = [ "-s" From 3c49a68bb312de449b5c91032a5bf053dd9fd3f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 16:55:13 +0000 Subject: [PATCH 140/305] nfpm: 2.43.0 -> 2.43.1 --- pkgs/by-name/nf/nfpm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nf/nfpm/package.nix b/pkgs/by-name/nf/nfpm/package.nix index 584452324e11..d175301d73f1 100644 --- a/pkgs/by-name/nf/nfpm/package.nix +++ b/pkgs/by-name/nf/nfpm/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.43.0"; + version = "2.43.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = "nfpm"; rev = "v${version}"; - hash = "sha256-HbGO4+wFp2mRBOKNxbnZ9sHUJS25ZQ4RaC1Eaw0kfrg="; + hash = "sha256-00PsRRY8HlfvkLoim1iKjsYH0ab2Bn0DeyEv44iCw5s="; }; - vendorHash = "sha256-BN+ruaajQuvFa/tECI9s0no6+EFR7BYoa1+Z/YI1PbY="; + vendorHash = "sha256-AEnBrMv5e5JxuX9tNKf/Ee/vC4gN536zMLoVucaWdrI="; ldflags = [ "-s" From c587281c974424fa38d4d573e109a73813c51dcc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 17:04:50 +0000 Subject: [PATCH 141/305] kubescape: 3.0.38 -> 3.0.39 --- pkgs/by-name/ku/kubescape/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubescape/package.nix b/pkgs/by-name/ku/kubescape/package.nix index 86238601ec2d..98b27191be92 100644 --- a/pkgs/by-name/ku/kubescape/package.nix +++ b/pkgs/by-name/ku/kubescape/package.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "kubescape"; - version = "3.0.38"; + version = "3.0.39"; src = fetchFromGitHub { owner = "kubescape"; repo = "kubescape"; tag = "v${version}"; - hash = "sha256-G6oz72/q7EAjkBeUzeoHTMcKqRjLtTy+ZUnVFCXGjRE="; + hash = "sha256-yKbOzwvg8VtSVLZTJC7AUzUVRDbj7c+sjCt+C3x8VSI="; fetchSubmodules = true; }; proxyVendor = true; - vendorHash = "sha256-cvYjkf2TOi327MjcUvjyME5JRTJzxF4J0HssfiH9P7E="; + vendorHash = "sha256-oFY31Cd0fXkmDpRwF8NI2VZVmWRDZ53uwsT2aUfGyjM="; subPackages = [ "." ]; From 2c6eb485710624c8da2ef3846100d3c6d8d4dd6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 17:09:12 +0000 Subject: [PATCH 142/305] jay: 1.11.0 -> 1.11.1 --- pkgs/by-name/ja/jay/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ja/jay/package.nix b/pkgs/by-name/ja/jay/package.nix index d7a01ae9426d..b1995ee66130 100644 --- a/pkgs/by-name/ja/jay/package.nix +++ b/pkgs/by-name/ja/jay/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "jay"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "mahkoh"; repo = "jay"; rev = "v${version}"; - sha256 = "sha256-lVdNilNMeVN27VaDufWiNVme0apnX+w0x9JeHkDzFH4="; + sha256 = "sha256-mm2bXxl9TaKwmeCwFz3IKznqjsfY8RKEVU/RK4zd63U="; }; - cargoHash = "sha256-5j4ECjBCMSCmGfFUQ72nwER/vTvCiDl6f2CyNF3n1ek="; + cargoHash = "sha256-T7053eAH3IqkAxNZpYHdC6Z7JZtArrOqGMjoIccjemI="; SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib"; From 3632ad8d50d07dad87b3e2e12736fa158b0016f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 17:13:32 +0000 Subject: [PATCH 143/305] git-toolbelt: 1.9.3 -> 1.9.4 --- pkgs/by-name/gi/git-toolbelt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/git-toolbelt/package.nix b/pkgs/by-name/gi/git-toolbelt/package.nix index c288fd484899..fd1c135aa9c7 100644 --- a/pkgs/by-name/gi/git-toolbelt/package.nix +++ b/pkgs/by-name/gi/git-toolbelt/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "git-toolbelt"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "nvie"; repo = "git-toolbelt"; rev = "v${finalAttrs.version}"; - hash = "sha256-ANqv/iIDUyy2G4pKSw+2sutMEA0WhPN3OKfPTm5lwDU="; + hash = "sha256-6ubxMGDi5ocSh8q8rDujxpViT1OmVi7JzH+R6V/88UQ="; }; nativeBuildInputs = [ makeWrapper ]; From fcdbc73c8c333430c62ab7d1b88a80cca95a1457 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 17:25:48 +0000 Subject: [PATCH 144/305] ghorg: 1.11.3 -> 1.11.4 --- pkgs/by-name/gh/ghorg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gh/ghorg/package.nix b/pkgs/by-name/gh/ghorg/package.nix index 32424db097c6..f95b30c67a95 100644 --- a/pkgs/by-name/gh/ghorg/package.nix +++ b/pkgs/by-name/gh/ghorg/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.11.3"; + version = "1.11.4"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-SddkIZCnV6qPFFuFvV8I9P00C6oSKV32Xs6beAYvgs8="; + sha256 = "sha256-uhcQT/IgQZ36FMXtLWiSmXJj0BvN8NbpYhO+JslVf6Y="; }; doCheck = false; From 98f4096564532fd6bd845e9b6cab47c324df60ce Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Fri, 29 Aug 2025 10:31:24 -0700 Subject: [PATCH 145/305] windsurf: 1.12.2 -> 1.12.3 Patch release with bug fixes and memory improvements. --- pkgs/by-name/wi/windsurf/info.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json index 31193e4894a4..1f3da13866dc 100644 --- a/pkgs/by-name/wi/windsurf/info.json +++ b/pkgs/by-name/wi/windsurf/info.json @@ -1,20 +1,20 @@ { "aarch64-darwin": { - "version": "1.12.2", + "version": "1.12.3", "vscodeVersion": "1.99.3", - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/b8f002c02d165600299a109bf21d02d139c52644/Windsurf-darwin-arm64-1.12.2.zip", - "sha256": "de998189f46c4389cad8b1b984984042864ff0492cc92a066451cd9338f1237c" + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/bfcd46e04becbf1670511e8c1e9cb0f1c1d62983/Windsurf-darwin-arm64-1.12.3.zip", + "sha256": "cf604c6414f7f4d964a90aa4d6661592314e030fa31b28a2ac15b10bf3bbd529" }, "x86_64-darwin": { - "version": "1.12.2", + "version": "1.12.3", "vscodeVersion": "1.99.3", - "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/b8f002c02d165600299a109bf21d02d139c52644/Windsurf-darwin-x64-1.12.2.zip", - "sha256": "bb5d0c002d76ccffac28a673b01c02b5a603a222b1f2a399d43951a9c1b3e2d3" + "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/bfcd46e04becbf1670511e8c1e9cb0f1c1d62983/Windsurf-darwin-x64-1.12.3.zip", + "sha256": "146adff77f43eac46c548c4204f2026c0820e8f7129ec426db8029d61ee664ec" }, "x86_64-linux": { - "version": "1.12.2", + "version": "1.12.3", "vscodeVersion": "1.99.3", - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/b8f002c02d165600299a109bf21d02d139c52644/Windsurf-linux-x64-1.12.2.tar.gz", - "sha256": "ae1d3075237885c56bcb39d5b36f460f2a8ba4e4038c63f1d0b5795178e77c43" + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/bfcd46e04becbf1670511e8c1e9cb0f1c1d62983/Windsurf-linux-x64-1.12.3.tar.gz", + "sha256": "c9f0ea20d016b817f3d4ac2f66b9310f70f8d2d5c2314f56125ae9dc1c29d74d" } } From 81d4426bcf0feaff34c300f66523d8018bcfcdab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 17:35:05 +0000 Subject: [PATCH 146/305] python3Packages.datrie: 0.8.2 -> 0.8.3 --- pkgs/development/python-modules/datrie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datrie/default.nix b/pkgs/development/python-modules/datrie/default.nix index c76e36e6b21f..2d8b72098220 100644 --- a/pkgs/development/python-modules/datrie/default.nix +++ b/pkgs/development/python-modules/datrie/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "datrie"; - version = "0.8.2"; + version = "0.8.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-UlsI9jjVz2EV32zNgY5aASmM0jCy2skcj/LmSZ0Ydl0="; + hash = "sha256-6gIa1MiovxTginHHhypiKqOZpRD5gSloJQkcfKBDboA="; }; postPatch = '' From fc5ac6f3aeb1f2f352b2ec128e72663c9b2b8783 Mon Sep 17 00:00:00 2001 From: Mohamed Laradji Date: Sun, 24 Aug 2025 10:09:40 -0400 Subject: [PATCH 147/305] python3Packages.pyipv8: 3.0.0 -> 3.0.2197-unstable-2025-07-29 --- pkgs/development/python-modules/pyipv8/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyipv8/default.nix b/pkgs/development/python-modules/pyipv8/default.nix index cca3f6fef912..55e65a97679a 100644 --- a/pkgs/development/python-modules/pyipv8/default.nix +++ b/pkgs/development/python-modules/pyipv8/default.nix @@ -2,6 +2,7 @@ lib, fetchPypi, buildPythonPackage, + fetchFromGitHub, cryptography, libnacl, aiohttp, @@ -16,12 +17,14 @@ buildPythonPackage rec { pname = "pyipv8"; - version = "3.0.0"; + version = "3.0.2197-unstable-2025-07-29"; format = "setuptools"; - src = fetchPypi { - inherit pname version; - hash = "sha256-e8HoKKA1s93LbmvHs7gJqmCcuZZ9REenBwxKJFR6wjM="; + src = fetchFromGitHub { + owner = "tribler"; + repo = "py-ipv8"; + rev = "db39b85f4c28880dee24d1b59d8eae8ca8b9c03d"; + hash = "sha256-VIcBPzpK8Cdaz/dRp9QK/MtK41jm8rs/pxnLS716FNM="; }; propagatedBuildInputs = [ From 148297d3322537d0c7ac54d944af8b1f3fce6057 Mon Sep 17 00:00:00 2001 From: Mohamed Laradji Date: Sun, 24 Aug 2025 10:09:44 -0400 Subject: [PATCH 148/305] python3Packages.ipv8-rust-tunnels: init at 0.1.33 --- .../ipv8-rust-tunnels/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/ipv8-rust-tunnels/default.nix diff --git a/pkgs/development/python-modules/ipv8-rust-tunnels/default.nix b/pkgs/development/python-modules/ipv8-rust-tunnels/default.nix new file mode 100644 index 000000000000..657d58c7cc4d --- /dev/null +++ b/pkgs/development/python-modules/ipv8-rust-tunnels/default.nix @@ -0,0 +1,35 @@ +{ + lib, + rustPlatform, + fetchPypi, + buildPythonPackage, +}: + +buildPythonPackage rec { + pname = "ipv8-rust-tunnels"; + version = "0.1.33"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "ipv8_rust_tunnels"; + hash = "sha256-LwQL/u+h6mwCo207OxSk9YKxuLuxXQhh07rSWrNFh7w="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + hash = "sha256-NwYLez9NFgS0GBXrcNrKJKV+s4HIHM8jHXfmkgya03M="; + }; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; + + meta = with lib; { + description = "A set of performance enhancements to the TunnelCommunity, the anonymization layer used in IPv8 and Tribler"; + homepage = "https://github.com/Tribler/ipv8-rust-tunnels"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ mlaradji ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb1701b3f7d8..3d743f3ab6b1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7153,6 +7153,8 @@ self: super: with self; { iptools = callPackage ../development/python-modules/iptools { }; + ipv8-rust-tunnels = callPackage ../development/python-modules/ipv8-rust-tunnels { }; + ipwhl = callPackage ../development/python-modules/ipwhl { }; ipwhois = callPackage ../development/python-modules/ipwhois { }; From df3bc53260769d50cc5c64198d7cd7350f9029c1 Mon Sep 17 00:00:00 2001 From: Mohamed Laradji Date: Sun, 24 Aug 2025 10:09:47 -0400 Subject: [PATCH 149/305] tribler: 7.14.0 -> 8.2.3 --- pkgs/by-name/tr/tribler/package.nix | 234 ++++++++++--------- pkgs/by-name/tr/tribler/startupwmclass.patch | 9 - 2 files changed, 129 insertions(+), 114 deletions(-) delete mode 100644 pkgs/by-name/tr/tribler/startupwmclass.patch diff --git a/pkgs/by-name/tr/tribler/package.nix b/pkgs/by-name/tr/tribler/package.nix index a503f1e4cb05..8fcbc3aa3ff2 100644 --- a/pkgs/by-name/tr/tribler/package.nix +++ b/pkgs/by-name/tr/tribler/package.nix @@ -1,136 +1,160 @@ { lib, stdenv, - fetchurl, - fetchPypi, - python311, + python312, makeWrapper, - libtorrent-rasterbar-1_2_x, - qt5, nix-update-script, - boost186, + fetchFromGitHub, + rustPlatform, + buildNpmPackage, + nodejs_24, + wrapGAppsHook3, + libappindicator-gtk3, }: - let - # libtorrent-rasterbar-1_2_x requires python311 and boost 1.86 - python3 = python311.override { - packageOverrides = final: prev: { - boost = boost186; - }; + version = "8.2.3"; + python3 = python312; + nodejs = nodejs_24; + + src = fetchFromGitHub { + owner = "tribler"; + repo = "Tribler"; + tag = "v${version}"; + hash = "sha256-yThl3HhPtwi/pK5Rcr2ClVLY8uCnIyfvdc53A8gjKDg="; }; - libtorrent = (python3.pkgs.toPythonModule (libtorrent-rasterbar-1_2_x)).python; + + tribler-webui = buildNpmPackage { + inherit nodejs version; + pname = "tribler-webui"; + src = "${src}/src/tribler/ui"; + npmDepsHash = "sha256-bgRwhqP6/NMPFbZks31IZtVGV9wzFFU6qSgyLvdarlY="; + + # The prepack script runs the build script, which we'd rather do in the build phase. + npmPackFlags = [ "--ignore-scripts" ]; + + NODE_OPTIONS = "--openssl-legacy-provider"; + + dontNpmBuild = true; + dontNpmInstall = true; + + installPhase = '' + mkdir -pv $out + cp -prvd ./* $out/ + cd $out + npm install + npm run build + ''; + }; + in -stdenv.mkDerivation (finalAttrs: { - pname = "tribler"; - version = "7.14.0"; - src = fetchurl { - url = "https://github.com/Tribler/tribler/releases/download/v${finalAttrs.version}/Tribler-${finalAttrs.version}.tar.xz"; - hash = "sha256-fQJOs9P4y71De/+svmD7YZ4+tm/bC3rspm7SbOHlSR4="; - }; +python3.pkgs.buildPythonApplication { + inherit version src; + name = "tribler"; + pyproject = true; - patches = [ - ./startupwmclass.patch + build-system = with python3.pkgs; [ + setuptools ]; - nativeBuildInputs = [ - python3.pkgs.wrapPython - makeWrapper - # we had a "copy" of this in tribler's makeWrapper - # but it went out of date and broke, so please just use it directly - qt5.wrapQtAppsHook - ]; - - buildInputs = [ python3.pkgs.python ]; - - pythonPath = [ - libtorrent - ] - ++ (with python3.pkgs; [ - # requirements-core.txt - aiohttp - aiohttp-apispec - anyio - chardet - configobj - cryptography - decorator - faker - libnacl - lz4 - marshmallow - netifaces - networkx - pony - psutil - pyasn1 - pydantic_1 - pyopenssl - pyyaml - sentry-sdk - service-identity - yappi - yarl - bitarray - filelock - (pyipv8.overrideAttrs (p: rec { - version = "2.10.0"; - src = fetchPypi { - inherit (p) pname; - inherit version; - hash = "sha256-yxiXBxBiPokequm+vjsHIoG9kQnRnbsOx3mYOd8nmiU="; - }; - })) - file-read-backwards - brotli - human-readable + dependencies = with python3.pkgs; [ # requirements.txt + bitarray + configobj + pyipv8 + ipv8-rust-tunnels + libtorrent-rasterbar + lz4 pillow - pyqt5 - pyqt5-sip - pyqtgraph - pyqtwebengine - ]); + pony + pystray + ]; - installPhase = '' - mkdir -pv $out - # Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH. - wrapPythonPrograms - cp -prvd ./* $out/ - makeWrapper ${python3.pkgs.python}/bin/python $out/bin/tribler \ - --set _TRIBLERPATH "$out/src" \ - --set PYTHONPATH $out/src/tribler-core:$out/src/tribler-common:$out/src/tribler-gui:$program_PYTHONPATH \ - --set NO_AT_BRIDGE 1 \ - --chdir "$out/src" \ - --add-flags "-O $out/src/run_tribler.py" + buildInputs = with python3.pkgs; [ + # setup.py requirements + pygobject3 + setuptools + # sphinx requirements + sphinxHook + sphinx + sphinx-autoapi + sphinx-rtd-theme + astroid + # tray icon deps + wrapGAppsHook3 + libappindicator-gtk3 + # test phase requirements + pytestCheckHook - mkdir -p $out/share/applications $out/share/icons - cp $out/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop $out/share/applications/ - cp $out/build/debian/tribler/usr/share/pixmaps/tribler_big.xpm $out/share/icons/tribler.xpm - mkdir -p $out/share/copyright/tribler - mv $out/LICENSE $out/share/copyright/tribler + ]; + + outputs = [ + "out" + ]; + + buildPhase = '' + # fix the entrypoint + substituteInPlace build/setup.py --replace-fail '"tribler=tribler.run:main"' '"tribler=tribler.run:main_sync"' + substituteInPlace src/run_tribler.py --replace-fail 'if __name__ == "__main__":' 'def main_sync():' + + # copy the built webui + rm -r src/tribler/ui + ln -s ${tribler-webui} src/tribler/ui + + # build the docs + # FIXME: make doc SPHINXBUILD=${lib.getExe' python3.pkgs.sphinx "sphinx-build"} + + # build the wheel + substituteInPlace build/win/build.py --replace-fail "if {'setup.py', 'bdist_wheel'}.issubset(sys.argv):" "if True:" + export GITHUB_TAG=v${version} + python3 build/debian/update_metainfo.py + python3 build/setup.py bdist_wheel + + runHook pytestCheckHook + + # build the docs + runHook sphinxHook ''; - shellHook = '' - wrapPythonPrograms || true - export QT_QPA_PLATFORM_PLUGIN_PATH=$(echo ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms) - export PYTHONPATH=./tribler-core:./tribler-common:./tribler-gui:$program_PYTHONPATH - export QT_PLUGIN_PATH="${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}" + postInstall = '' + ln -s ${tribler-webui} $out/lib/python3.12/site-packages/tribler/ui ''; + preFixup = '' + gappsWrapperArgs+=( + --prefix GI_TYPELIB_PATH : "${lib.makeSearchPath "lib/girepository-1.0" [ libappindicator-gtk3 ]}" + ) + ''; + + postFixup = '' + runHook wrapGAppsHook3 + ''; + + disabledTests = [ + "test_request_for_version" + "test_establish_connection" + "test_tracker_test_error_resolve" + "test_get_default_fallback" + "test_get_default_fallback_half_tree" + "test_get_set_explicit" + ]; + + disabledTestPaths = [ + ]; + passthru.updateScript = nix-update-script { }; meta = { - description = "Decentralised P2P filesharing client based on the Bittorrent protocol"; + description = "Decentralized P2P filesharing client based on the Bittorrent protocol"; mainProgram = "tribler"; homepage = "https://www.tribler.org/"; - changelog = "https://github.com/Tribler/tribler/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.lgpl21Plus; + changelog = "https://github.com/Tribler/tribler/releases/tag/v${version}"; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ - xvapx - mkg20001 + mlaradji + xvapx ]; platforms = lib.platforms.linux; }; -}) +} diff --git a/pkgs/by-name/tr/tribler/startupwmclass.patch b/pkgs/by-name/tr/tribler/startupwmclass.patch deleted file mode 100644 index ce1ec9e4a59a..000000000000 --- a/pkgs/by-name/tr/tribler/startupwmclass.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop b/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop -index b0472a18d..0e0be14f3 100644 ---- a/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop -+++ b/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop -@@ -7,3 +7,4 @@ Terminal=false - Type=Application - Categories=Application;Network;P2P - MimeType=x-scheme-handler/ppsp;x-scheme-handler/tswift;x-scheme-handler/magnet;application/x-bittorrent -+StartupWMClass=Tribler From 44104d0ffefa5a3dcc6516f2f29918c874b7c6ae Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Sun, 24 Aug 2025 10:59:26 -0600 Subject: [PATCH 150/305] linuxPackages.system76-io: install thelio-io ko file --- pkgs/os-specific/linux/system76-io/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/system76-io/default.nix b/pkgs/os-specific/linux/system76-io/default.nix index 708eb6f80208..034281346c0d 100644 --- a/pkgs/os-specific/linux/system76-io/default.nix +++ b/pkgs/os-specific/linux/system76-io/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation { installPhase = '' install -D system76-io.ko $out/lib/modules/${kernel.modDirVersion}/misc/system76-io.ko + install -D system76-thelio-io.ko $out/lib/modules/${kernel.modDirVersion}/misc/system76-thelio-io.ko ''; meta = { From d753792abf7f6efb889bf00f841bbd7c21f5219e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 18:19:41 +0000 Subject: [PATCH 151/305] gh-classroom: 0.1.14 -> 0.1.15 --- pkgs/by-name/gh/gh-classroom/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gh/gh-classroom/package.nix b/pkgs/by-name/gh/gh-classroom/package.nix index 910e31d7f12f..d107c02b330b 100644 --- a/pkgs/by-name/gh/gh-classroom/package.nix +++ b/pkgs/by-name/gh/gh-classroom/package.nix @@ -9,16 +9,16 @@ }: buildGoModule (finalAttrs: { pname = "gh-classroom"; - version = "0.1.14"; + version = "0.1.15"; src = fetchFromGitHub { owner = "github"; repo = "gh-classroom"; tag = "v${finalAttrs.version}"; - hash = "sha256-h9j8B/MGZ4JJOJRj41IIQ9trQJZ4oqvT6ee9lc0P4oo="; + hash = "sha256-s7S7rk5I0mdXZh4pz1aF0btntuse3mpSZe/JiS/KlkU="; }; - vendorHash = "sha256-UFV3KiRnefrdOwRsHQeo8mx8Z+sI1Rk5yu3jdZxUHxo="; + vendorHash = "sha256-7P1TTv6EW351EbLT+oruztE5Zs9I01uRnel+OGUdV6M="; ldflags = [ "-s" From df32f9e1d58a42233d9a8ca15377bf97ef7ec529 Mon Sep 17 00:00:00 2001 From: Brian Lee Date: Fri, 29 Aug 2025 11:21:19 -0700 Subject: [PATCH 152/305] albyhub: 1.18.5 -> 1.19.2 --- pkgs/by-name/al/albyhub/ldk-node-go/default.nix | 6 +++--- pkgs/by-name/al/albyhub/ldk-node/default.nix | 8 ++++---- pkgs/by-name/al/albyhub/package.nix | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/al/albyhub/ldk-node-go/default.nix b/pkgs/by-name/al/albyhub/ldk-node-go/default.nix index a01ee2ffcb67..2f305b54d375 100644 --- a/pkgs/by-name/al/albyhub/ldk-node-go/default.nix +++ b/pkgs/by-name/al/albyhub/ldk-node-go/default.nix @@ -7,13 +7,13 @@ buildGoModule { pname = "ldk-node-go"; - version = "0-unstable-2025-06-30"; + version = "0-unstable-2025-08-22"; src = fetchFromGitHub { owner = "getAlby"; repo = "ldk-node-go"; - rev = "fc4853954f5259762ec91e6627f371a7a1241b08"; - hash = "sha256-M96Yx4jEIKa83gKx4ofWh19QZFUxSdwH2J8h1aIrbys="; + rev = "93af4d511ff81466ce547b42d0c7ea6adb724ad3"; + hash = "sha256-hDRjYUkV4dVT+iuO+hUpXrFZLZ9eLU50gBLEKVdXPLE="; }; vendorHash = null; diff --git a/pkgs/by-name/al/albyhub/ldk-node/default.nix b/pkgs/by-name/al/albyhub/ldk-node/default.nix index 800618bd28e3..05f7ffa60784 100644 --- a/pkgs/by-name/al/albyhub/ldk-node/default.nix +++ b/pkgs/by-name/al/albyhub/ldk-node/default.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ldk-node"; - version = "0-unstable-2025-06-30"; + version = "0-unstable-2025-08-21"; src = fetchFromGitHub { owner = "getAlby"; repo = "ldk-node"; - rev = "b00326e36445312a55f9fb583a8b54cc5763b6bf"; - hash = "sha256-SDuHM7aawLXGSUxsKMlU0iH5+xs35VULX4vDGkS6xMA="; + rev = "078a26fb3a79f1ef66443b773018a1cf917cb5da"; + hash = "sha256-ZmeohMnIbJzJbo9U+t0AWKFqLSIzDL/G42cBSBCtj3Q="; }; buildFeatures = [ "uniffi" ]; - cargoHash = "sha256-ONlN5xMU4A7ZTF4+XRbs5qAv8xQVYuMsU0bnD8Eh2gE="; + cargoHash = "sha256-VLQohnbuEdnu2E+BXe2mDKFUnDVlSY09rIIvHMIQ+Hg="; # Skip tests because they download bitcoin-core and electrs zip files, and then fail doCheck = false; diff --git a/pkgs/by-name/al/albyhub/package.nix b/pkgs/by-name/al/albyhub/package.nix index f433a86f6531..9707c1737a6f 100644 --- a/pkgs/by-name/al/albyhub/package.nix +++ b/pkgs/by-name/al/albyhub/package.nix @@ -23,16 +23,16 @@ in buildGoModule (finalAttrs: { pname = "albyhub"; - version = "1.18.5"; + version = "1.19.2"; src = fetchFromGitHub { owner = "getAlby"; repo = "hub"; tag = "v${finalAttrs.version}"; - hash = "sha256-j918jzhQs3dnPQaG4UMmoit8UvC8/3Z5+IiAZqO3OSA="; + hash = "sha256-11mHu067/SLh83UT2AZaLfYGwbB/b+vsQSN2AxuI/p4="; }; - vendorHash = "sha256-iMxxJQZLQOLl7v1SimtXSYH7wXFOdZcSJAaUAKDqvBY="; + vendorHash = "sha256-h1I0PwddDzOFlJphKfej+dXgDXgkBOjrKigGwqfXbTU="; proxyVendor = true; # needed for secp256k1-zkp CGO bindings nativeBuildInputs = [ @@ -49,7 +49,7 @@ buildGoModule (finalAttrs: { frontendYarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/frontend/yarn.lock"; - hash = "sha256-ttLhICDAsg8Cvqy2AJKgS2IJZgay1tMi3Qd8RccD1jI="; + hash = "sha256-ukLg+vK3yquRlWu8z3HtAaVFqtzWPR63oiK8e7b6Gg0="; }; preBuild = '' From 75563f8f5237c44ed7b8a51fd870ed3d6a11eb82 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 18:25:13 +0000 Subject: [PATCH 153/305] steam-unwrapped: 1.0.0.83 -> 1.0.0.84 --- pkgs/by-name/st/steam-unwrapped/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/steam-unwrapped/package.nix b/pkgs/by-name/st/steam-unwrapped/package.nix index 236caad9062a..26082e60cf9f 100644 --- a/pkgs/by-name/st/steam-unwrapped/package.nix +++ b/pkgs/by-name/st/steam-unwrapped/package.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "steam-unwrapped"; - version = "1.0.0.83"; + version = "1.0.0.84"; src = fetchurl { # use archive url so the tarball doesn't 404 on a new release url = "https://repo.steampowered.com/steam/archive/stable/steam_${finalAttrs.version}.tar.gz"; - hash = "sha256-eRaCsMx+/ZRscAL5F8ndR00mGbf57QCJEhaoprSsj4I="; + hash = "sha256-Mfp2LVh5Pxqo6p3wEiw0acJT/IrLbapxQPt0M/4He0Q="; }; patches = [ From 3f96e3106d92372a2c508b341523e42d1d6285c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 18:50:27 +0000 Subject: [PATCH 154/305] python3Packages.langchain-google-genai: 2.1.9 -> 2.1.10 --- .../python-modules/langchain-google-genai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langchain-google-genai/default.nix b/pkgs/development/python-modules/langchain-google-genai/default.nix index 37f2485556ba..b28f462f0359 100644 --- a/pkgs/development/python-modules/langchain-google-genai/default.nix +++ b/pkgs/development/python-modules/langchain-google-genai/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "langchain-google-genai"; - version = "2.1.9"; + version = "2.1.10"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain-google"; tag = "libs/genai/v${version}"; - hash = "sha256-9jXiX4WDx5YY39MytuzAWGuDzLkGmtq95ShAIW3zH0U="; + hash = "sha256-kqII8RG1ep+n5CqKLY1v7Mc+zJh6kl1rAjMmkomfeqM="; }; sourceRoot = "${src.name}/libs/genai"; From 57cf2183572a58d55048d63bea00a0a0c46ea1ea Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 29 Aug 2025 21:02:57 +0200 Subject: [PATCH 155/305] ISSUE_TEMPLATE: revert one-sentence-per-line for package_request We tried, but GitHub's markdown renderer will render these newlines there, so going back to "real" paragraphs. Also fixed the emphasis slightly, since "via Issues" is not bold, "via a Pull Request" is also made not bold for consistency. Puts the focus more on the "contribute" link as well. --- .github/ISSUE_TEMPLATE/10_package_request.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/10_package_request.yml b/.github/ISSUE_TEMPLATE/10_package_request.yml index 3f5fb06691b6..e7bff36f7d3c 100644 --- a/.github/ISSUE_TEMPLATE/10_package_request.yml +++ b/.github/ISSUE_TEMPLATE/10_package_request.yml @@ -16,14 +16,9 @@ body:

- Thank you for your interest in packaging new software in Nixpkgs. - Unfortunately, to mitigate the unsustainable growth of unmaintained packages, **Nixpkgs is no longer accepting package requests** via Issues. + Thank you for your interest in packaging new software in Nixpkgs. Unfortunately, to mitigate the unsustainable growth of unmaintained packages, **Nixpkgs is no longer accepting package requests** via Issues. - As a [volunteer community][community], we are always open to new contributors. - If you wish to see this package in Nixpkgs, **we encourage you to [contribute] it yourself, via a Pull Request**. - Anyone can [become a package maintainer][maintainers]! - You can find language-specific packaging information in the [Nixpkgs Manual][nixpkgs]. - Should you need any help, please reach out to the community on [Matrix] or [Discourse]. + As a [volunteer community][community], we are always open to new contributors. If you wish to see this package in Nixpkgs, **we encourage you to [contribute] it yourself**, via a Pull Request. Anyone can [become a package maintainer][maintainers]! You can find language-specific packaging information in the [Nixpkgs Manual][nixpkgs]. Should you need any help, please reach out to the community on [Matrix] or [Discourse]. [community]: https://nixos.org/community [contribute]: https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#quick-start-to-adding-a-package From e2ad57d487acab81377249ec17e389623aa0e6bd Mon Sep 17 00:00:00 2001 From: azahi Date: Fri, 29 Aug 2025 22:06:42 +0300 Subject: [PATCH 156/305] qolibri: move to by-name, switch to Qt6 --- .../qo/qolibri/package.nix} | 18 +++++++++--------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 9 insertions(+), 11 deletions(-) rename pkgs/{applications/misc/qolibri/default.nix => by-name/qo/qolibri/package.nix} (90%) diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/by-name/qo/qolibri/package.nix similarity index 90% rename from pkgs/applications/misc/qolibri/default.nix rename to pkgs/by-name/qo/qolibri/package.nix index 636344ebffd6..0d8e6088b5ba 100644 --- a/pkgs/applications/misc/qolibri/default.nix +++ b/pkgs/by-name/qo/qolibri/package.nix @@ -1,12 +1,10 @@ { - stdenv, - lib, - fetchFromGitHub, cmake, + fetchFromGitHub, + lib, ninja, - qttools, - qtwebengine, - wrapQtAppsHook, + qt6Packages, + stdenv, }: stdenv.mkDerivation { pname = "qolibri"; @@ -22,12 +20,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ninja - qttools - wrapQtAppsHook + qt6Packages.qttools + qt6Packages.wrapQtAppsHook ]; buildInputs = [ - qtwebengine + qt6Packages.qt5compat + qt6Packages.qtmultimedia + qt6Packages.qtwebengine ]; cmakeFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0f5f04f3b41..8d60a0a552f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8828,8 +8828,6 @@ with pkgs; inherit (lomiri) cmake-extras; }; - qolibri = libsForQt5.callPackage ../applications/misc/qolibri { }; - quarto = callPackage ../development/libraries/quarto { }; quartoMinimal = callPackage ../development/libraries/quarto { From b5dee53399e985f074d579dc439c1282ee9cb033 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 18 Aug 2025 15:04:06 +0200 Subject: [PATCH 157/305] ci/github-script/labels: auto close package request issues This allows the labels workflow to support issue management in two ways: - New package request can potentially created with a `4.workflow: auto-close` label immediately and be closed automatically this way. - Existing package requests can be bulk-closed by adding this label. This has the advantage of posting the explanatory comment at the same time, which is not possible with regular bulk operations. --- ci/github-script/labels.js | 47 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/ci/github-script/labels.js b/ci/github-script/labels.js index 3086cbaf3844..d50dab436d8a 100644 --- a/ci/github-script/labels.js +++ b/ci/github-script/labels.js @@ -171,6 +171,47 @@ module.exports = async ({ github, context, core, dry }) => { return prLabels } + // Returns true if the issue was closed. In this case, the labeling does not need to + // continue for this issue. Returns false if no action was taken. + async function handleAutoClose(item) { + const issue_number = item.number + + if (item.labels.some(({ name }) => name === '0.kind: packaging request')) { + const body = [ + 'Thank you for your interest in packaging new software in Nixpkgs. Unfortunately, to mitigate the unsustainable growth of unmaintained packages, **Nixpkgs is no longer accepting package requests** via Issues.', + '', + 'As a [volunteer community][community], we are always open to new contributors. If you wish to see this package in Nixpkgs, **we encourage you to [contribute] it yourself**, via a Pull Request. Anyone can [become a package maintainer][maintainers]! You can find language-specific packaging information in the [Nixpkgs Manual][nixpkgs]. Should you need any help, please reach out to the community on [Matrix] or [Discourse].', + '', + '[community]: https://nixos.org/community', + '[contribute]: https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#quick-start-to-adding-a-package', + '[maintainers]: https://github.com/NixOS/nixpkgs/blob/master/maintainers/README.md', + '[nixpkgs]: https://nixos.org/manual/nixpkgs/unstable/', + '[Matrix]: https://matrix.to/#/#dev:nixos.org', + '[Discourse]: https://discourse.nixos.org/c/dev/14', + ].join('\n') + + core.info(`Issue #${item.number}: auto-closed`) + + if (!dry) { + await github.rest.issues.createComment({ + ...context.repo, + issue_number, + body, + }) + + await github.rest.issues.update({ + ...context.repo, + issue_number, + state: 'closed', + state_reason: 'not_planned', + }) + } + + return true + } + return false + } + async function handle({ item, stats }) { try { const log = (k, v, skip) => { @@ -190,6 +231,12 @@ module.exports = async ({ github, context, core, dry }) => { Object.assign(itemLabels, await handlePullRequest({ item, stats })) } else { stats.issues++ + if (item.labels.some(({ name }) => name === '4.workflow: auto-close')) { + // If this returns true, the issue was closed. In this case we return, to not + // label the issue anymore. Most importantly this avoids unlabeling stale issues + // which are closed via auto-close. + if (await handleAutoClose(item)) return + } } const latest_event_at = new Date( From 3831d5829e27c917cfb1d19fa58e62938a08a5c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 19:20:12 +0000 Subject: [PATCH 158/305] pgmodeler: 1.2.0 -> 1.2.1 --- pkgs/by-name/pg/pgmodeler/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pg/pgmodeler/package.nix b/pkgs/by-name/pg/pgmodeler/package.nix index acf174617c5a..d076d7493aaa 100644 --- a/pkgs/by-name/pg/pgmodeler/package.nix +++ b/pkgs/by-name/pg/pgmodeler/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "pgmodeler"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-q0XoShp+XERvyERLxi9uh//dNxVEtfL+UY9uVKqX4fI="; + sha256 = "sha256-DIyqUewP8q9O6O/v82a2DNgyrBffWkBmyhBm3pA1qVY="; }; nativeBuildInputs = [ From 6514e0d864b5e0ecf26e171d1d846811d8ec05f4 Mon Sep 17 00:00:00 2001 From: nukdokplex Date: Wed, 18 Jun 2025 23:41:51 +0500 Subject: [PATCH 159/305] age-plugin-openpgp-card: init at 0.1.1 --- .../ag/age-plugin-openpgp-card/package.nix | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 pkgs/by-name/ag/age-plugin-openpgp-card/package.nix diff --git a/pkgs/by-name/ag/age-plugin-openpgp-card/package.nix b/pkgs/by-name/ag/age-plugin-openpgp-card/package.nix new file mode 100644 index 000000000000..878e174579a4 --- /dev/null +++ b/pkgs/by-name/ag/age-plugin-openpgp-card/package.nix @@ -0,0 +1,42 @@ +{ + lib, + fetchFromGitHub, + + rustPlatform, + + pcsclite, + pkg-config, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "age-plugin-openpgp-card"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "wiktor-k"; + repo = "age-plugin-openpgp-card"; + rev = "v${finalAttrs.version}"; + hash = "sha256-uJmYtc+GxJZtCjLQla/h9vpTzPcsL+zbM2uvAQsfwIY="; + }; + + cargoHash = "sha256-YZGrEO6SOS0Kir+1d8shf54420cYjvcfKYS+T2NlEug="; + + buildInputs = [ pcsclite ]; + nativeBuildInputs = [ pkg-config ]; + + meta = { + description = "Age plugin for using ed25519 on OpenPGP Card devices (Yubikeys, Nitrokeys)"; + homepage = "https://github.com/wiktor-k/age-plugin-openpgp-card"; + license = with lib.licenses; [ + asl20 + mit + ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + mainProgram = "age-plugin-openpgp-card"; + maintainers = with lib.maintainers; [ nukdokplex ]; + }; +}) From 3459a9becbb8e6c6eaee2ae2ec5ab21998a617c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 19:58:48 +0000 Subject: [PATCH 160/305] ipxe: 1.21.1-unstable-2025-08-13 -> 1.21.1-unstable-2025-08-29 --- pkgs/by-name/ip/ipxe/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix index 39b380d04f5c..f8e3876f45e1 100644 --- a/pkgs/by-name/ip/ipxe/package.nix +++ b/pkgs/by-name/ip/ipxe/package.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "ipxe"; - version = "1.21.1-unstable-2025-08-13"; + version = "1.21.1-unstable-2025-08-29"; nativeBuildInputs = [ mtools @@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ipxe"; repo = "ipxe"; - rev = "a53ec449327788e2015642bff21443d3a399c05b"; - hash = "sha256-rcRWkuOgtHs6ZzcECbsVXCN+HS5cG/HlrVPP5+ZF+EM="; + rev = "969ce2c559a6841a949a1b73a3967b1889e0c999"; + hash = "sha256-a9Nmo9ZAzbsePwS/LFh3qMMfsezu0194WV98BXhiT0Y="; }; # Calling syslinux on a FAT image isn't going to work on Aarch64. From 912d3338ebca245f1abac7ae76aeb50d5151d46a Mon Sep 17 00:00:00 2001 From: Brian Lee Date: Fri, 29 Aug 2025 13:00:24 -0700 Subject: [PATCH 161/305] albyhub: disable nixpkgs-update --- pkgs/by-name/al/albyhub/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/al/albyhub/package.nix b/pkgs/by-name/al/albyhub/package.nix index 9707c1737a6f..b0773f51bf3d 100644 --- a/pkgs/by-name/al/albyhub/package.nix +++ b/pkgs/by-name/al/albyhub/package.nix @@ -96,3 +96,4 @@ buildGoModule (finalAttrs: { mainProgram = "albyhub"; }; }) +# nixpkgs-update: no auto update From b5ae714e83b7ed06996c623ffe5906f17093aa5c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 Aug 2025 22:04:56 +0200 Subject: [PATCH 162/305] python313Packages.dnfile: modernize --- pkgs/development/python-modules/dnfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dnfile/default.nix b/pkgs/development/python-modules/dnfile/default.nix index 106c3bbb3028..4279f0ea4859 100644 --- a/pkgs/development/python-modules/dnfile/default.nix +++ b/pkgs/development/python-modules/dnfile/default.nix @@ -34,8 +34,8 @@ buildPythonPackage rec { meta = with lib; { description = "Module to parse .NET executable files"; homepage = "https://github.com/malwarefrank/dnfile"; - changelog = "https://github.com/malwarefrank/dnfile/blob/v${version}/HISTORY.rst"; - license = with licenses; [ mit ]; + changelog = "https://github.com/malwarefrank/dnfile/blob/${src.tag}/HISTORY.rst"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From 60ce2a62acb5f5358f3f9bec1b20fe01721d825e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Fri, 29 Aug 2025 20:42:00 +0200 Subject: [PATCH 163/305] python3Packages.aiohttp-apispec: disable tests as they are broken --- .../python-modules/aiohttp-apispec/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp-apispec/default.nix b/pkgs/development/python-modules/aiohttp-apispec/default.nix index ec0b6391daa4..55584cea286c 100644 --- a/pkgs/development/python-modules/aiohttp-apispec/default.nix +++ b/pkgs/development/python-modules/aiohttp-apispec/default.nix @@ -27,11 +27,15 @@ buildPythonPackage rec { hash = "sha256-C+/M25oCLTNGGEUj2EyXn3UjcvPvDYFmmUW8IOoF1uU="; }; - postPatch = '' - substituteInPlace tests/conftest.py \ - --replace-fail 'aiohttp_app(loop,' 'aiohttp_app(event_loop,' \ - --replace-fail 'return loop.run_until_complete' 'return event_loop.run_until_complete' - ''; + doCheck = false; + + /* + postPatch = '' + substituteInPlace tests/conftest.py \ + --replace-fail 'aiohttp_app(loop,' 'aiohttp_app(event_loop,' \ + --replace-fail 'return loop.run_until_complete' 'return event_loop.run_until_complete' + ''; + */ build-system = [ setuptools ]; From 82d2631e1c03e7bc8507e786bdb0e34b61c0d968 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Fri, 29 Aug 2025 22:11:52 +0200 Subject: [PATCH 164/305] nixos/postgresql-backup: add pgdumpAllOptions Signed-off-by: Sefa Eyeoglu --- .../services/backup/postgresql-backup.nix | 16 ++++++++++++++-- nixos/tests/postgresql/postgresql.nix | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix index b05435b4db36..fb2c90f8b2e0 100644 --- a/nixos/modules/services/backup/postgresql-backup.nix +++ b/nixos/modules/services/backup/postgresql-backup.nix @@ -124,7 +124,19 @@ in type = lib.types.separatedString " "; default = "-C"; description = '' - Command line options for pg_dump or pg_dumpall. + Command line options for pg_dump. This options is not used if + `config.services.postgresqlBackup.backupAll` is enabled. Note that + config.services.postgresqlBackup.backupAll is also active, when no + databases where specified. + ''; + }; + + pgdumpAllOptions = lib.mkOption { + type = lib.types.separatedString " "; + default = ""; + description = '' + Command line options for pg_dumpall. This options is not used if + `config.services.postgresqlBackup.backupAll` is disabled. ''; }; @@ -175,7 +187,7 @@ in } (lib.mkIf cfg.backupAll { - systemd.services.postgresqlBackup = postgresqlBackupService "all" "pg_dumpall ${cfg.pgdumpOptions}"; + systemd.services.postgresqlBackup = postgresqlBackupService "all" "pg_dumpall ${cfg.pgdumpAllOptions}"; }) (lib.mkIf (!cfg.backupAll) { diff --git a/nixos/tests/postgresql/postgresql.nix b/nixos/tests/postgresql/postgresql.nix index a1ea9b8a9028..ce3fb640ae92 100644 --- a/nixos/tests/postgresql/postgresql.nix +++ b/nixos/tests/postgresql/postgresql.nix @@ -66,6 +66,7 @@ let enable = true; databases = lib.optional (!backupAll) "postgres"; pgdumpOptions = "--restrict-key=ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + pgdumpAllOptions = "--restrict-key=ABCDEFGHIJKLMNOPQRSTUVWXYZ"; }; }; From 7b8285f0c515ece16bf7ee692203fed0d17fe618 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Fri, 29 Aug 2025 16:32:15 -0400 Subject: [PATCH 165/305] incus: 6.15.0 -> 6.16.0 Changelog: https://github.com/lxc/incus/releases/tag/v6.16.0 --- pkgs/by-name/in/incus/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix index a98c061fddf1..8fa781df2277 100644 --- a/pkgs/by-name/in/incus/package.nix +++ b/pkgs/by-name/in/incus/package.nix @@ -1,7 +1,7 @@ import ./generic.nix { - hash = "sha256-HhgAZ/MDNX6v1tBLv4sMHfFQMPoYkTaaWM8aLkl31Mg="; - version = "6.15.0"; - vendorHash = "sha256-pCpOHFWyacJ3K1EyK2Pkezv0Ooj+sFQ3ZmtBmhZJYNE="; + hash = "sha256-Nnig3i21AurzstrIcx+Jca8fMZtNAGbSrB4E8JhatVE="; + version = "6.16.0"; + vendorHash = "sha256-l8cu+Q6Tpco48iuooVDegk7Fkw9yW1SNfyWQXhcFo4c="; patches = [ ]; nixUpdateExtraArgs = [ "--override-filename=pkgs/by-name/in/incus/package.nix" From c926c344aa0d42abb734cf8471dde2eac2cc1138 Mon Sep 17 00:00:00 2001 From: offset---cyan Date: Wed, 27 Aug 2025 03:07:19 +0100 Subject: [PATCH 166/305] guile-goblins: remove offsetcyan from maintainers --- pkgs/by-name/gu/guile-goblins/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/gu/guile-goblins/package.nix b/pkgs/by-name/gu/guile-goblins/package.nix index 0238e33fe031..622cdac2001c 100644 --- a/pkgs/by-name/gu/guile-goblins/package.nix +++ b/pkgs/by-name/gu/guile-goblins/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "Spritely Goblins for Guile"; homepage = "https://spritely.institute/goblins/"; license = licenses.asl20; - maintainers = with maintainers; [ offsetcyan ]; + maintainers = with maintainers; [ ]; platforms = guile.meta.platforms; }; } From 3dc3043c54f3f2e0e0b8f2e47d22708114593399 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sat, 23 Aug 2025 01:49:42 -0400 Subject: [PATCH 167/305] virt-top: modernize --- pkgs/applications/virtualization/virt-top/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix index 2a29b0db8b2a..04844d214c67 100644 --- a/pkgs/applications/virtualization/virt-top/default.nix +++ b/pkgs/applications/virtualization/virt-top/default.nix @@ -44,16 +44,16 @@ stdenv.mkDerivation rec { ++ [ libxml2 ]; prePatch = '' - substituteInPlace ocaml-dep.sh.in --replace '#!/bin/bash' '#!${stdenv.shell}' - substituteInPlace ocaml-link.sh.in --replace '#!/bin/bash' '#!${stdenv.shell}' + substituteInPlace ocaml-dep.sh.in --replace-fail '#!/bin/bash' '#!${stdenv.shell}' + substituteInPlace ocaml-link.sh.in --replace-fail '#!/bin/bash' '#!${stdenv.shell}' ''; - meta = with lib; { + meta = { description = "Top-like utility for showing stats of virtualized domains"; homepage = "https://people.redhat.com/~rjones/virt-top/"; - license = licenses.gpl2Only; + license = lib.licenses.gpl2Only; maintainers = [ ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; mainProgram = "virt-top"; }; } From 0546ff0050765cb3730b3e8496d707359c221c93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 21:24:11 +0000 Subject: [PATCH 168/305] otel-desktop-viewer: 0.2.2 -> 0.2.5 --- pkgs/by-name/ot/otel-desktop-viewer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ot/otel-desktop-viewer/package.nix b/pkgs/by-name/ot/otel-desktop-viewer/package.nix index 94ba68db1262..931e7b19bbbd 100644 --- a/pkgs/by-name/ot/otel-desktop-viewer/package.nix +++ b/pkgs/by-name/ot/otel-desktop-viewer/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "otel-desktop-viewer"; - version = "0.2.2"; + version = "0.2.5"; src = fetchFromGitHub { owner = "CtrlSpice"; repo = "otel-desktop-viewer"; rev = "v${finalAttrs.version}"; - hash = "sha256-qvMpebhbg/OnheZIZBoiitGYUUMdTghSwEapblE0DkA="; + hash = "sha256-4CFemHoMt5Fxaq66zxzWrGxq4AJuZkm45Gb4t8wseWg="; }; # NOTE: This project uses Go workspaces, but 'buildGoModule' does not support @@ -27,7 +27,7 @@ buildGoModule (finalAttrs: { # # cf. https://github.com/NixOS/nixpkgs/issues/203039 proxyVendor = true; - vendorHash = "sha256-1TH9JQDnvhi+b3LDCAooMKgYhPudM7NCNCc+WXtcv/4="; + vendorHash = "sha256-2fPkSWPfEDMYH8E7dTq2AAFrsf3jimH315a8OJOIAII="; ldflags = [ "-s" From 5365b3cdd936e130889b2b39909c84dcfaed7912 Mon Sep 17 00:00:00 2001 From: undefined Date: Sat, 30 Aug 2025 05:51:34 +0800 Subject: [PATCH 169/305] gatus: 5.19.0 -> 5.23.2 --- nixos/modules/services/monitoring/gatus.nix | 3 ++- nixos/tests/gatus.nix | 2 +- pkgs/by-name/ga/gatus/package.nix | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/monitoring/gatus.nix b/nixos/modules/services/monitoring/gatus.nix index 5954f5bd7a20..eb459ddb61ae 100644 --- a/nixos/modules/services/monitoring/gatus.nix +++ b/nixos/modules/services/monitoring/gatus.nix @@ -105,7 +105,8 @@ in config = mkIf cfg.enable { systemd.services.gatus = { description = "Automated developer-oriented status page"; - after = [ "network.target" ]; + after = [ "network-online.target" ]; + requires = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { diff --git a/nixos/tests/gatus.nix b/nixos/tests/gatus.nix index 5bb146540fba..8f679226f067 100644 --- a/nixos/tests/gatus.nix +++ b/nixos/tests/gatus.nix @@ -29,6 +29,6 @@ testScript = '' machine.wait_for_unit("gatus.service") - machine.succeed("curl -s http://localhost:8080/metrics | grep go_info") + machine.wait_until_succeeds("curl -s http://localhost:8080/metrics | grep go_info", timeout=60) ''; } diff --git a/pkgs/by-name/ga/gatus/package.nix b/pkgs/by-name/ga/gatus/package.nix index e06c56be4ee9..ed68d6f467e5 100644 --- a/pkgs/by-name/ga/gatus/package.nix +++ b/pkgs/by-name/ga/gatus/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gatus"; - version = "5.19.0"; + version = "5.23.2"; src = fetchFromGitHub { owner = "TwiN"; repo = "gatus"; rev = "v${version}"; - hash = "sha256-Jw7OdFGSZgxy52fICURc313ONsmI9Qlsf75aS0LUB9s="; + hash = "sha256-b/UQwwyspOKrW9mRoq0zJZ41lNLM+XvGFlpxz+9ZMco="; }; - vendorHash = "sha256-CofmAYsRp0bya+q/eFJkWV9tGfhg37UxDFR9vpCKYls="; + vendorHash = "sha256-jMNsd7AiWG8vhUW9cLs5Ha2wmdw9SHjSDXIypvCKYqk="; subPackages = [ "." ]; From 4c870bc517b51c65aafc0e43f5c16adcd4fbdec1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 18:10:21 +0000 Subject: [PATCH 170/305] python3Packages.python-aodhclient: 3.7.1 -> 3.9.1 --- .../python-modules/python-aodhclient/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/python-aodhclient/default.nix b/pkgs/development/python-modules/python-aodhclient/default.nix index 2038d9a404dc..60432f3f033a 100644 --- a/pkgs/development/python-modules/python-aodhclient/default.nix +++ b/pkgs/development/python-modules/python-aodhclient/default.nix @@ -13,7 +13,6 @@ osprofiler, pbr, pyparsing, - pythonOlder, setuptools, sphinxHook, stestr, @@ -21,16 +20,14 @@ buildPythonPackage rec { pname = "python-aodhclient"; - version = "3.7.1"; + version = "3.9.1"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "openstack"; repo = "python-aodhclient"; tag = version; - hash = "sha256-99oErtl1clqsMx/ZOTJZ4sNOUqiE2t/NtDQDrZaIV3Y="; + hash = "sha256-ymOMCHhntoWr3mROI1M/PN7oWWaDTN58Z9xb97qnP+w="; }; env.PBR_VERSION = version; @@ -73,7 +70,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "aodhclient" ]; meta = { - homepage = "https://opendev.org/openstack/python-aodhclient"; + homepage = "https://github.com/openstack/python-aodhclient"; description = "Client library for OpenStack Aodh API"; license = lib.licenses.asl20; mainProgram = "aodh"; From ee02dcf8d72a4acbeb3f2e7b5c9638c6de9282e5 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 29 Aug 2025 23:55:17 +0200 Subject: [PATCH 171/305] rclip: fix build --- pkgs/by-name/rc/rclip/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/rc/rclip/package.nix b/pkgs/by-name/rc/rclip/package.nix index dd51c9af3b17..d2a5ca838625 100644 --- a/pkgs/by-name/rc/rclip/package.nix +++ b/pkgs/by-name/rc/rclip/package.nix @@ -33,6 +33,7 @@ python3Packages.buildPythonApplication rec { pythonRelaxDeps = [ "numpy" + "open_clip_torch" "pillow" "rawpy" "torch" From b65fdfb36adae111c323c5844b0378882ab9906f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 21:57:01 +0000 Subject: [PATCH 172/305] hassil: 3.1.0 -> 3.2.0 --- pkgs/development/python-modules/hassil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix index ec274094ab26..7400218e1504 100644 --- a/pkgs/development/python-modules/hassil/default.nix +++ b/pkgs/development/python-modules/hassil/default.nix @@ -16,7 +16,7 @@ let pname = "hassil"; - version = "3.1.0"; + version = "3.2.0"; in buildPythonPackage rec { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = "hassil"; tag = "v${version}"; - hash = "sha256-GwlnlOeG4uMMbT09Nm+UIr5FcOJf00+7r/2Kls4Rb4g="; + hash = "sha256-X+VOcgOFcdb29VfJCfD1xBEqY/1qbfwViS/N9PsT2y8="; }; build-system = [ setuptools ]; From 4ea249fcc309a209092e9ed34cb46c458a75ff19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 22:19:51 +0000 Subject: [PATCH 173/305] python3Packages.duckduckgo-search: 9.5.1 -> 9.5.4 --- pkgs/development/python-modules/duckduckgo-search/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/duckduckgo-search/default.nix b/pkgs/development/python-modules/duckduckgo-search/default.nix index 8e68e05545f3..a07008071675 100644 --- a/pkgs/development/python-modules/duckduckgo-search/default.nix +++ b/pkgs/development/python-modules/duckduckgo-search/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "duckduckgo-search"; - version = "9.5.1"; + version = "9.5.4"; pyproject = true; src = fetchFromGitHub { owner = "deedy5"; repo = "ddgs"; tag = "v${version}"; - hash = "sha256-8OGO70J/o6oUfgdMKgZOtmOf4Nenk3VcV8kxU6UnEFQ="; + hash = "sha256-iqa2OviyAfpKDM6ghfo5FcCqEacY7vxSra2ePPvm2D0="; }; build-system = [ setuptools ]; From 7dbd50832a197f205dcdb2cecdfe2b8f9e84ab2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 30 Aug 2025 00:19:01 +0200 Subject: [PATCH 174/305] nixos/plymouth: fix theme == "breeze" breakage after removing Plasma 5 --- nixos/modules/system/boot/plymouth.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 8636ec7957d2..84ff3e4af48e 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -17,6 +17,13 @@ let cfg = config.boot.plymouth; opt = options.boot.plymouth; + nixosBreezePlymouth = pkgs.kdePackages.breeze-plymouth.override { + logoFile = cfg.logo; + logoName = "nixos"; + osName = "NixOS"; + osVersion = config.system.nixos.release; + }; + plymouthLogos = pkgs.runCommand "plymouth-logos" { inherit (cfg) logo; } '' mkdir -p $out @@ -80,7 +87,12 @@ in }; themePackages = mkOption { - default = [ ]; + default = lib.optional (cfg.theme == "breeze") nixosBreezePlymouth; + defaultText = literalMD '' + A NixOS branded variant of the breeze theme when + `config.${opt.theme} == "breeze"`, otherwise + `[ ]`. + ''; type = types.listOf types.package; description = '' Extra theme packages for plymouth. From c7c502a5fc719dda78f07678aa49139dc4870b0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 30 Aug 2025 00:19:25 +0200 Subject: [PATCH 175/305] nixos/plymouth: list available themes if the current one does not exist --- nixos/modules/system/boot/plymouth.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 84ff3e4af48e..270f562459c9 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -192,6 +192,7 @@ in # Check if the actual requested theme is here if [[ ! -d ${themesEnv}/share/plymouth/themes/${cfg.theme} ]]; then echo "The requested theme: ${cfg.theme} is not provided by any of the packages in boot.plymouth.themePackages" + echo "The following themes exist: $(ls ${themesEnv}/share/plymouth/themes/)" exit 1 fi @@ -208,6 +209,7 @@ in # Check if the actual requested theme is here if [[ ! -d ${themesEnv}/share/plymouth/themes/${cfg.theme} ]]; then echo "The requested theme: ${cfg.theme} is not provided by any of the packages in boot.plymouth.themePackages" + echo "The following themes exist: $(ls ${themesEnv}/share/plymouth/themes/)" exit 1 fi @@ -290,6 +292,7 @@ in # Check if the actual requested theme is here if [[ ! -d ${themesEnv}/share/plymouth/themes/${cfg.theme} ]]; then echo "The requested theme: ${cfg.theme} is not provided by any of the packages in boot.plymouth.themePackages" + echo "The following themes exist: $(ls ${themesEnv}/share/plymouth/themes/)" exit 1 fi From 593320dbd154b081a2d22cc25432fb1d91a3aa1a Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 29 Aug 2025 15:10:07 -0700 Subject: [PATCH 176/305] =?UTF-8?q?zulip:=205.12.0=20=E2=86=92=205.12.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg --- pkgs/by-name/zu/zulip/package.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/zu/zulip/package.nix b/pkgs/by-name/zu/zulip/package.nix index 405842b94574..0ed9a5429972 100644 --- a/pkgs/by-name/zu/zulip/package.nix +++ b/pkgs/by-name/zu/zulip/package.nix @@ -3,7 +3,7 @@ fetchFromGitHub, buildNpmPackage, python3, - electron_35, + electron_37, makeDesktopItem, makeShellWrapper, copyDesktopItems, @@ -11,16 +11,17 @@ buildNpmPackage rec { pname = "zulip"; - version = "5.12.0"; + version = "5.12.1"; src = fetchFromGitHub { owner = "zulip"; repo = "zulip-desktop"; tag = "v${version}"; - hash = "sha256-YDb69tJCR58DARssnZgdVxtRpR8vHsawCTv7kQ56y+8="; + hash = "sha256-YuiPf/ciSm0nBlF8U55EkPSTz+RI148QKOFv6FmYRD0="; }; - npmDepsHash = "sha256-MKKN6prUdWaHm27GybdbswDMNJH0xVffXsT2ZwroOHI="; + npmDepsHash = "sha256-RNXhDV0b1FZglIS5UsTn6YboJ4Au1/CZVtRz1BvcP2E="; + makeCacheWritable = true; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = 1; @@ -37,8 +38,8 @@ buildNpmPackage rec { runHook preBuild npm run pack -- \ - -c.electronDist=${electron_35}/libexec/electron \ - -c.electronVersion=${electron_35.version} + -c.electronDist=${electron_37}/libexec/electron \ + -c.electronVersion=${electron_37.version} runHook postBuild ''; @@ -51,7 +52,7 @@ buildNpmPackage rec { install -m 444 -D app/resources/zulip.png $out/share/icons/hicolor/512x512/apps/zulip.png - makeShellWrapper '${lib.getExe electron_35}' "$out/bin/zulip" \ + makeShellWrapper '${lib.getExe electron_37}' "$out/bin/zulip" \ --add-flags "$out/share/lib/zulip/app.asar" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-wayland-ime=true}}" \ --inherit-argv0 From 17d0d352991095f70411c5d3633ade4f40dbebac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 29 Aug 2025 15:47:11 -0700 Subject: [PATCH 177/305] saldo: rename from banking --- pkgs/by-name/{ba/banking => sa/saldo}/package.nix | 12 ++++++------ pkgs/top-level/aliases.nix | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) rename pkgs/by-name/{ba/banking => sa/saldo}/package.nix (85%) diff --git a/pkgs/by-name/ba/banking/package.nix b/pkgs/by-name/sa/saldo/package.nix similarity index 85% rename from pkgs/by-name/ba/banking/package.nix rename to pkgs/by-name/sa/saldo/package.nix index cf19bad0f9e7..77db57392ac5 100644 --- a/pkgs/by-name/ba/banking/package.nix +++ b/pkgs/by-name/sa/saldo/package.nix @@ -17,14 +17,14 @@ }: python3.pkgs.buildPythonApplication rec { - pname = "banking"; + pname = "saldo"; version = "0.6.0"; - format = "other"; + pyproject = false; src = fetchFromGitLab { owner = "tabos"; - repo = "banking"; - rev = version; + repo = "saldo"; + tag = version; hash = "sha256-x/um40sRD58d5LuuJlyietCV1Rw4H5VSO0I3ZwD5kO8="; }; @@ -50,7 +50,7 @@ python3.pkgs.buildPythonApplication rec { librsvg ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ cryptography fints mt-940 @@ -61,7 +61,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Banking application for small screens"; - homepage = "https://tabos.gitlab.io/projects/banking/"; + homepage = "https://www.tabos.org/projects/saldo/"; license = licenses.gpl3Plus; mainProgram = "org.tabos.banking"; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ec6633dcd4c9..c1e349b635b3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -500,6 +500,7 @@ mapAliases { badtouch = authoscope; # Project was renamed, added 20210626 badwolf = throw "'badwolf' has been removed due to being unmaintained"; # Added 2025-04-15 baget = throw "'baget' has been removed due to being unmaintained"; + banking = saldo; # added 2025-08-29 base16-builder = throw "'base16-builder' has been removed due to being unmaintained"; # Added 2025-06-03 baserow = throw "baserow has been removed, due to lack of maintenance"; # Added 2025-08-02 bashInteractive_5 = throw "'bashInteractive_5' has been renamed to/replaced by 'bashInteractive'"; # Converted to throw 2024-10-17 From 66c187580393c803979548ee328b5e9a24974044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 29 Aug 2025 15:55:59 -0700 Subject: [PATCH 178/305] saldo: 0.6.0 -> 0.8.0 Diff: https://gitlab.com/tabos/saldo/-/compare/0.6.0...0.8.0 --- pkgs/by-name/sa/saldo/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sa/saldo/package.nix b/pkgs/by-name/sa/saldo/package.nix index 77db57392ac5..07c54fc3a85e 100644 --- a/pkgs/by-name/sa/saldo/package.nix +++ b/pkgs/by-name/sa/saldo/package.nix @@ -3,6 +3,7 @@ fetchFromGitLab, python3, appstream-glib, + blueprint-compiler, desktop-file-utils, glib, libxml2, @@ -14,18 +15,19 @@ libadwaita, librsvg, gtk4, + gitUpdater, }: python3.pkgs.buildPythonApplication rec { pname = "saldo"; - version = "0.6.0"; + version = "0.8.0"; pyproject = false; src = fetchFromGitLab { owner = "tabos"; repo = "saldo"; tag = version; - hash = "sha256-x/um40sRD58d5LuuJlyietCV1Rw4H5VSO0I3ZwD5kO8="; + hash = "sha256-L4xx9tYDiAoykoiqvXhkbnayYQyTVl1qgi3LBNDoWjg="; }; postPatch = '' @@ -34,6 +36,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ appstream-glib # for appstream-util + blueprint-compiler desktop-file-utils # for desktop-file-validate glib # for glib-compile-resources libxml2 # for xmllint @@ -59,11 +62,13 @@ python3.pkgs.buildPythonApplication rec { schwifty ]; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "Banking application for small screens"; homepage = "https://www.tabos.org/projects/saldo/"; license = licenses.gpl3Plus; - mainProgram = "org.tabos.banking"; + mainProgram = "org.tabos.saldo"; maintainers = with maintainers; [ dotlambda ]; }; } From b1dd43c020f5ff11a93c230ff8cd5229c26c9c3e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 30 Aug 2025 01:02:37 +0200 Subject: [PATCH 179/305] python3Packages.django-scim2: unbreak --- pkgs/development/python-modules/django-scim2/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/python-modules/django-scim2/default.nix b/pkgs/development/python-modules/django-scim2/default.nix index fa91f8fe1e76..ecaf9502c8e3 100644 --- a/pkgs/development/python-modules/django-scim2/default.nix +++ b/pkgs/development/python-modules/django-scim2/default.nix @@ -28,13 +28,6 @@ buildPythonPackage rec { hash = "sha256-OsfC6Jc/oQl6nzy3Nr3vkY+XicRxUoV62hK8MHa3LJ8="; }; - # remove this when upstream releases a new version > 0.19.0 - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "poetry>=0.12" "poetry-core>=1.5.2" \ - --replace-fail "poetry.masonry.api" "poetry.core.masonry.api" - ''; - build-system = [ poetry-core ]; dependencies = [ From fe3010b5adeace64e5f524bd0d61c6cc0592b77c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 23:11:20 +0000 Subject: [PATCH 180/305] python3Packages.spsdk-pyocd: 0.3.2 -> 0.3.3 --- pkgs/development/python-modules/spsdk-pyocd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spsdk-pyocd/default.nix b/pkgs/development/python-modules/spsdk-pyocd/default.nix index ef16cf229f66..1a034344701f 100644 --- a/pkgs/development/python-modules/spsdk-pyocd/default.nix +++ b/pkgs/development/python-modules/spsdk-pyocd/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "spsdk-pyocd"; - version = "0.3.2"; + version = "0.3.3"; pyproject = true; # Latest tag missing on GitHub src = fetchPypi { pname = "spsdk_pyocd"; inherit version; - hash = "sha256-OcRGYZ1U5jQyRv2OSKwS3uJpvRQRW6Fbm/rDxlzyxPg="; + hash = "sha256-Uu5QbvDd2U9evZiY2Gg4kSPRMGpFBXpxwYVgsa5M/SI="; }; build-system = [ From a86781facc172c491fc7d16a6da7cb433cbf2aae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 23:26:51 +0000 Subject: [PATCH 181/305] python3Packages.plastexdepgraph: 0.0.4 -> 0.0.5 --- pkgs/development/python-modules/plastexdepgraph/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/plastexdepgraph/default.nix b/pkgs/development/python-modules/plastexdepgraph/default.nix index 768184e77391..7b98cb0de1e2 100644 --- a/pkgs/development/python-modules/plastexdepgraph/default.nix +++ b/pkgs/development/python-modules/plastexdepgraph/default.nix @@ -12,7 +12,7 @@ }: buildPythonPackage { pname = "plastexdepgraph"; - version = "0.0.4"; + version = "0.0.5"; pyproject = true; src = fetchFromGitHub { From d7a76925c1a909d3f7b0f1e2160d693f256cd5fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 29 Aug 2025 16:27:26 -0700 Subject: [PATCH 182/305] python3Packages.spdx-tools: fix tests --- .../python-modules/spdx-tools/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/spdx-tools/default.nix b/pkgs/development/python-modules/spdx-tools/default.nix index dac04709b101..2519f3038bbe 100644 --- a/pkgs/development/python-modules/spdx-tools/default.nix +++ b/pkgs/development/python-modules/spdx-tools/default.nix @@ -4,10 +4,10 @@ buildPythonPackage, click, fetchFromGitHub, + fetchpatch, license-expression, ply, pytestCheckHook, - pythonOlder, pyyaml, rdflib, semantic-version, @@ -20,9 +20,7 @@ buildPythonPackage rec { pname = "spdx-tools"; version = "0.8.3"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "spdx"; @@ -31,12 +29,21 @@ buildPythonPackage rec { hash = "sha256-r7+RYGoq3LJYN1jYfwzb1r3fc/kL+CPd4pmGATFq8Pw="; }; - nativeBuildInputs = [ + patches = [ + # https://github.com/spdx/tools-python/issues/844 + (fetchpatch { + name = "beartype-0.20-compat.patch"; + url = "https://github.com/spdx/tools-python/pull/841/commits/3b13bd5af36a2b78f5c87fdbadc3f2601d2dcd8d.patch"; + hash = "sha256-8sQNGRss4R1olsw+xGps3NICyimBxKv47TaSrCcnVhA="; + }) + ]; + + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ beartype click license-expression From aa4f265f16b65cde4b88ffa4aad59c1a2fdfc389 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 29 Aug 2025 18:33:19 -0500 Subject: [PATCH 183/305] vimPlugins: resolve github repository redirects Signed-off-by: Austin Horstman --- .../editors/vim/plugins/vim-plugin-names | 86 +++++++++---------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 4d43348ad785..584970d814af 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -626,49 +626,49 @@ https://github.com/lsig/messenger.nvim/,HEAD, https://github.com/xero/miasma.nvim/,, https://github.com/dasupradyumna/midnight.nvim/,, https://github.com/hadronized/mind.nvim/,HEAD, -https://github.com/echasnovski/mini-git/,HEAD, -https://github.com/echasnovski/mini.ai/,HEAD, -https://github.com/echasnovski/mini.align/,HEAD, -https://github.com/echasnovski/mini.animate/,HEAD, -https://github.com/echasnovski/mini.base16/,HEAD, -https://github.com/echasnovski/mini.basics/,HEAD, -https://github.com/echasnovski/mini.bracketed/,HEAD, -https://github.com/echasnovski/mini.bufremove/,HEAD, -https://github.com/echasnovski/mini.clue/,HEAD, -https://github.com/echasnovski/mini.colors/,HEAD, -https://github.com/echasnovski/mini.comment/,HEAD, -https://github.com/echasnovski/mini.completion/,HEAD, -https://github.com/echasnovski/mini.cursorword/,HEAD, -https://github.com/echasnovski/mini.deps/,HEAD, -https://github.com/echasnovski/mini.diff/,HEAD, -https://github.com/echasnovski/mini.doc/,HEAD, -https://github.com/echasnovski/mini.extra/,HEAD, -https://github.com/echasnovski/mini.files/,HEAD, -https://github.com/echasnovski/mini.fuzzy/,HEAD, -https://github.com/echasnovski/mini.hipatterns/,HEAD, -https://github.com/echasnovski/mini.hues/,HEAD, -https://github.com/echasnovski/mini.icons/,HEAD, -https://github.com/echasnovski/mini.indentscope/,HEAD, -https://github.com/echasnovski/mini.jump/,HEAD, -https://github.com/echasnovski/mini.jump2d/,HEAD, -https://github.com/echasnovski/mini.keymap/,HEAD, -https://github.com/echasnovski/mini.map/,HEAD, -https://github.com/echasnovski/mini.misc/,HEAD, -https://github.com/echasnovski/mini.move/,HEAD, -https://github.com/echasnovski/mini.notify/,HEAD, -https://github.com/echasnovski/mini.nvim/,, -https://github.com/echasnovski/mini.operators/,HEAD, -https://github.com/echasnovski/mini.pairs/,HEAD, -https://github.com/echasnovski/mini.pick/,HEAD, -https://github.com/echasnovski/mini.sessions/,HEAD, -https://github.com/echasnovski/mini.snippets/,HEAD, -https://github.com/echasnovski/mini.splitjoin/,HEAD, -https://github.com/echasnovski/mini.starter/,HEAD, -https://github.com/echasnovski/mini.statusline/,HEAD, -https://github.com/echasnovski/mini.surround/,HEAD, -https://github.com/echasnovski/mini.tabline/,HEAD, -https://github.com/echasnovski/mini.trailspace/,HEAD, -https://github.com/echasnovski/mini.visits/,HEAD, +https://github.com/nvim-mini/mini-git/,HEAD, +https://github.com/nvim-mini/mini.ai/,HEAD, +https://github.com/nvim-mini/mini.align/,HEAD, +https://github.com/nvim-mini/mini.animate/,HEAD, +https://github.com/nvim-mini/mini.base16/,HEAD, +https://github.com/nvim-mini/mini.basics/,HEAD, +https://github.com/nvim-mini/mini.bracketed/,HEAD, +https://github.com/nvim-mini/mini.bufremove/,HEAD, +https://github.com/nvim-mini/mini.clue/,HEAD, +https://github.com/nvim-mini/mini.colors/,HEAD, +https://github.com/nvim-mini/mini.comment/,HEAD, +https://github.com/nvim-mini/mini.completion/,HEAD, +https://github.com/nvim-mini/mini.cursorword/,HEAD, +https://github.com/nvim-mini/mini.deps/,HEAD, +https://github.com/nvim-mini/mini.diff/,HEAD, +https://github.com/nvim-mini/mini.doc/,HEAD, +https://github.com/nvim-mini/mini.extra/,HEAD, +https://github.com/nvim-mini/mini.files/,HEAD, +https://github.com/nvim-mini/mini.fuzzy/,HEAD, +https://github.com/nvim-mini/mini.hipatterns/,HEAD, +https://github.com/nvim-mini/mini.hues/,HEAD, +https://github.com/nvim-mini/mini.icons/,HEAD, +https://github.com/nvim-mini/mini.indentscope/,HEAD, +https://github.com/nvim-mini/mini.jump/,HEAD, +https://github.com/nvim-mini/mini.jump2d/,HEAD, +https://github.com/nvim-mini/mini.keymap/,HEAD, +https://github.com/nvim-mini/mini.map/,HEAD, +https://github.com/nvim-mini/mini.misc/,HEAD, +https://github.com/nvim-mini/mini.move/,HEAD, +https://github.com/nvim-mini/mini.notify/,HEAD, +https://github.com/nvim-mini/mini.nvim/,, +https://github.com/nvim-mini/mini.operators/,HEAD, +https://github.com/nvim-mini/mini.pairs/,HEAD, +https://github.com/nvim-mini/mini.pick/,HEAD, +https://github.com/nvim-mini/mini.sessions/,HEAD, +https://github.com/nvim-mini/mini.snippets/,HEAD, +https://github.com/nvim-mini/mini.splitjoin/,HEAD, +https://github.com/nvim-mini/mini.starter/,HEAD, +https://github.com/nvim-mini/mini.statusline/,HEAD, +https://github.com/nvim-mini/mini.surround/,HEAD, +https://github.com/nvim-mini/mini.tabline/,HEAD, +https://github.com/nvim-mini/mini.trailspace/,HEAD, +https://github.com/nvim-mini/mini.visits/,HEAD, https://github.com/wfxr/minimap.vim/,, https://github.com/milanglacier/minuet-ai.nvim/,HEAD, https://github.com/jghauser/mkdir.nvim/,main, From 937980a2ebd83e0b540d8d76dd77f2ee4b0a09d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 23:33:40 +0000 Subject: [PATCH 184/305] fake-gcs-server: 1.52.2 -> 1.52.3 --- pkgs/by-name/fa/fake-gcs-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fa/fake-gcs-server/package.nix b/pkgs/by-name/fa/fake-gcs-server/package.nix index 5f5f0db8825a..bc2214ec2972 100644 --- a/pkgs/by-name/fa/fake-gcs-server/package.nix +++ b/pkgs/by-name/fa/fake-gcs-server/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "fake-gcs-server"; - version = "1.52.2"; + version = "1.52.3"; src = fetchFromGitHub { owner = "fsouza"; repo = "fake-gcs-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-sidMCbJAK3bRGJyyFIUn7e5y0z4O72JWCICHf4JL4yo="; + hash = "sha256-XoHG0dm565RRke3me/WDy1TRLrSlecy4b3xuYPvOcoo="; }; - vendorHash = "sha256-oTJ4DCsDazo58ozsAKI0BG7rxfF8oeiIl6vQpRng+LM="; + vendorHash = "sha256-FMDpQSwLrLaiy5HzdragOmgvLBDax5VDN0DZLzQyhts="; # Unit tests fail to start the emulator server in some environments (e.g. Hydra) for some reason. # From 9732672e3e92e96f8f4a294023e5b3257d192fd8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 23:42:27 +0000 Subject: [PATCH 185/305] bilibili: 1.17.1-1 -> 1.17.1-2 --- pkgs/by-name/bi/bilibili/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bi/bilibili/sources.nix b/pkgs/by-name/bi/bilibili/sources.nix index 0eb0109a946c..169b8b9212ca 100644 --- a/pkgs/by-name/bi/bilibili/sources.nix +++ b/pkgs/by-name/bi/bilibili/sources.nix @@ -1,6 +1,6 @@ # Generated by ./update.sh - do not update manually! { - version = "1.17.1-1"; - arm64-hash = "sha256-RCANNd8oT9UikiXYXtrO6ctvAxGbQ6TflFh/hVwC7TA="; - x86_64-hash = "sha256-rV+0f6qkaQWOZAO1RTzHxiocuhblHejXEcBcdz3OG0M="; + version = "1.17.1-2"; + arm64-hash = "sha256-oSqNQbzj1l60/BvVJ3OBmIfkqTM/Ll9U5IIQ55nBQAc="; + x86_64-hash = "sha256-nD5ET8CFBFlvcldyt6QnewfXm60Ec1yFyDHoOBcOY9g="; } From 45d2d5f8d61127deaa771f1e88ba28372e8ddbb7 Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Fri, 29 Aug 2025 19:48:52 -0400 Subject: [PATCH 186/305] openscad: fix application icon --- pkgs/by-name/op/openscad/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/op/openscad/package.nix b/pkgs/by-name/op/openscad/package.nix index 5f9b6378b196..a4256d035061 100644 --- a/pkgs/by-name/op/openscad/package.nix +++ b/pkgs/by-name/op/openscad/package.nix @@ -74,6 +74,16 @@ stdenv.mkDerivation rec { url = "https://github.com/openscad/openscad/commit/cc49ad8dac24309f5452d5dea9abd406615a52d9.patch"; hash = "sha256-B3i+o6lR5osRcVXTimDZUFQmm12JhmbFgG9UwOPebF4="; }) + (fetchpatch { + name = "fix-application-icon-not-shown-on-wayland.patch"; + url = "https://github.com/openscad/openscad/commit/5ea83e5117f5f3ac2197c63db69f523721b8fa85.patch"; + hash = "sha256-nfeUv0R+J95fyqnVC0HNeBVZnxVoisY1pcdII82qUSU="; + + # upstream's formatting conventions changed between 2021 and this patch + postFetch = '' + sed -i 's/& / \&/g;s/\*\*/\0 /g;s/^\(.\) /\1\t/' "$out" + ''; + }) ]; postPatch = '' From c12460edc8ce4f066fcaccecd2bcbef7debc232f Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 29 Aug 2025 18:33:21 -0500 Subject: [PATCH 187/305] vimPlugins: update on 2025-08-29 Signed-off-by: Austin Horstman --- .../editors/vim/plugins/generated.nix | 1110 ++++++++--------- .../editors/vim/plugins/overrides.nix | 2 +- .../patches/openscad.nvim/program_paths.patch | 22 +- 3 files changed, 558 insertions(+), 576 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 6836e95fe52e..b2ed1a32188e 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -74,12 +74,12 @@ final: prev: { CopilotChat-nvim = buildVimPlugin { pname = "CopilotChat.nvim"; - version = "2025-08-19"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "CopilotC-Nvim"; repo = "CopilotChat.nvim"; - rev = "f7bb32dbbe2ff5e26f5033e2142b5920cf427236"; - sha256 = "0cdilfh4964vqwb7m24hzgwy7jp6fxriskd7k3a7ajh8yc0kmr8i"; + rev = "ae2f5932983f42d54bee9ff803b5ab157b145787"; + sha256 = "1c003qq0linw4v03gl7n0jy33i3vrp6blhmffh3rsr7795bl7y6b"; }; meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/"; meta.hydraPlatforms = [ ]; @@ -399,12 +399,12 @@ final: prev: { SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2025-08-21"; + version = "2025-08-25"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "21a54161a87ab38b85d8b1eb52cc86c973a5fafe"; - sha256 = "1l26mm5dki4qvmz2jfai2pfbwknbp018yh5vi2nh0za9hc7nk655"; + rev = "8e74c08998fd786239caba373344f4e4601e21fe"; + sha256 = "0lgczxz99h578bkav5p9bnb5w6vddma4zs9ipq14v6cgviax1mpv"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; meta.hydraPlatforms = [ ]; @@ -660,12 +660,12 @@ final: prev: { aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2025-08-21"; + version = "2025-08-27"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "a5f3055f9d628ca0f4c74a0df07b029d2a74760c"; - sha256 = "1h1bj6wj5zdpgqw2dg4q95fnac9m3is15kdvhpzxw4vb06iz56i2"; + rev = "c7cbbad40c2065fccfd1f1863bb2c08180c0533d"; + sha256 = "01bzgwsx4v3y5l2hy4k6j7pma9azjcx4hnrr1sc4l27m1lklyqnx"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -1194,12 +1194,12 @@ final: prev: { auto-session = buildVimPlugin { pname = "auto-session"; - version = "2025-08-20"; + version = "2025-08-26"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "8cda7244a02f1304664889a78194604587ffc772"; - sha256 = "0n7cgkca18ml1ms663zyjrpba2rfxqycq22m8vlr88piqkflwwlx"; + rev = "3b5d8947cf16ac582ef00443ede4cdd3dfa23af9"; + sha256 = "0sskfdw4jpzx2ixp7m2ii6vl1x302d5aclwwhz4k9dxm7yglvqi4"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; meta.hydraPlatforms = [ ]; @@ -1416,12 +1416,12 @@ final: prev: { base46 = buildVimPlugin { pname = "base46"; - version = "2025-08-08"; + version = "2025-08-24"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "13a8a258da6ca87ce46014084063d5b846afd3bc"; - sha256 = "0pyc28l5p794jzsxg4zcnmknpfvh9s3pr8078ypl14ig0milii2d"; + rev = "0094095ed60aa55f7148bc1e783b0156f3e7f4f8"; + sha256 = "0mlqz2yv8hypkfx8ij4fqv1m8sjd52rq4r8n3qq416y1nr9yfzib"; }; meta.homepage = "https://github.com/nvchad/base46/"; meta.hydraPlatforms = [ ]; @@ -1689,12 +1689,12 @@ final: prev: { blink-ripgrep-nvim = buildVimPlugin { pname = "blink-ripgrep.nvim"; - version = "2025-08-21"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "blink-ripgrep.nvim"; - rev = "da53e523ca28bdc4aedda5cfcac7aec6120779da"; - sha256 = "0113cfi5iy9xwxzcl78djia94ymp6zzw3bfjaj6hwri30qq3xl9k"; + rev = "b035188bc6d8bcbf86c49ac230ee0bbadca7f7fb"; + sha256 = "1fmlsfnkyiakx7alap0vdr6shwwjd1afpkajjyn31w8bykhmmm9i"; }; meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/"; meta.hydraPlatforms = [ ]; @@ -2183,12 +2183,12 @@ final: prev: { cmake-tools-nvim = buildVimPlugin { pname = "cmake-tools.nvim"; - version = "2025-08-11"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "Civitasv"; repo = "cmake-tools.nvim"; - rev = "447fe7629bb5d5baca6f6099f3568484d149aa51"; - sha256 = "1jdqsc1myq9mrsziix3w5g0l2g7rdv6lphx99w7svb97br8ifs29"; + rev = "88e07c6bff838a5bda2f461e9c1122b79ff0829f"; + sha256 = "0m0xhkjqnfxm9l0kvpr2dnr4in35rifibygnrg08005g5yi5k0ji"; }; meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/"; meta.hydraPlatforms = [ ]; @@ -2950,12 +2950,12 @@ final: prev: { coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2025-08-21"; + version = "2025-08-27"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "0e8e1cbb731f420b5d3a41bae6b712b4911273a0"; - sha256 = "16ni09frbrh54li62xchfgiqrbq64aphq6afb902bb69bnf9827d"; + rev = "89425920ef943a20e56072665f4be33d8f320ddf"; + sha256 = "1h7bhzpw3kahhakdd5jj6v9w8xk4jln94lqg916crl2llhzh6cmv"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; meta.hydraPlatforms = [ ]; @@ -3002,12 +3002,12 @@ final: prev: { codecompanion-history-nvim = buildVimPlugin { pname = "codecompanion-history.nvim"; - version = "2025-08-21"; + version = "2025-08-22"; src = fetchFromGitHub { owner = "ravitemer"; repo = "codecompanion-history.nvim"; - rev = "44a4a3fbe62427fbe0b5b513b5ac6c976986fdfc"; - sha256 = "0jsc6x2x1zj3ksbpfvkvkvnlza38qdnyb4a3xfnx3r21pybb7ssh"; + rev = "b9f1afb77f1a8805e686f89ac38338a9ca588579"; + sha256 = "1q54q5zmxv6ad106rgk5bp0d3mmlyly2f15nk7xk058rgc159l0k"; }; meta.homepage = "https://github.com/ravitemer/codecompanion-history.nvim/"; meta.hydraPlatforms = [ ]; @@ -3019,8 +3019,8 @@ final: prev: { src = fetchFromGitHub { owner = "olimorris"; repo = "codecompanion.nvim"; - rev = "c34e49676dd9bd44c9a18588167cdc0a31077dbd"; - sha256 = "0nmfrfjhs2l0m2cmgqgmsnc0irr1d8fv8xm6zglkdadppf0bm4s3"; + rev = "6bc1f9f6d9f4ac71545b4883caf93181cadf6146"; + sha256 = "0ahg114lylb3f24l3mnhk8alwjsqy4b4yhrn5la8n25148hy62cd"; }; meta.homepage = "https://github.com/olimorris/codecompanion.nvim/"; meta.hydraPlatforms = [ ]; @@ -3080,12 +3080,12 @@ final: prev: { colorful-winsep-nvim = buildVimPlugin { pname = "colorful-winsep.nvim"; - version = "2025-08-20"; + version = "2025-08-27"; src = fetchFromGitHub { owner = "nvim-zh"; repo = "colorful-winsep.nvim"; - rev = "b8e72a231daf2a199bbc319364adcfc4d8b18e9f"; - sha256 = "1fsbwgyrivxach2hh5msr23m16r14db4g53azha1flrn27vsmkyr"; + rev = "5cce948992866514c744a66cb754a0e025fa95e9"; + sha256 = "0i2yng9wj5bwmbswm55z4rf6g6s9msajn6d56jgrxrima2fn7yk3"; }; meta.homepage = "https://github.com/nvim-zh/colorful-winsep.nvim/"; meta.hydraPlatforms = [ ]; @@ -3314,12 +3314,12 @@ final: prev: { conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2025-08-20"; + version = "2025-08-27"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "9ddab4e14c44196d393a72b958b4da6dab99ecef"; - sha256 = "1m0s9ff49bikqspg0w3nhwbb7i7q65bm9spjvrxs39v06hhk5m6p"; + rev = "b4aab989db276993ea5dcb78872be494ce546521"; + sha256 = "1637cpq5167dm4s2llc8w0y2sicqxn9gcq0p003x1mwb3m5wxm4g"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -3328,12 +3328,12 @@ final: prev: { conjure = buildVimPlugin { pname = "conjure"; - version = "2025-08-17"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "91980ec7de78dcbca23b2044da1686778311cc6e"; - sha256 = "018yhrcwinl09fzj5nw849qzrh9a9b9zxfx1bdjbm88l38w2f4r6"; + rev = "f360f1427a02d2e6e59b2b2d4c7f9a8038f465d8"; + sha256 = "1r6m11am1csa1wsr5wg590sy9sbb1csrhjr18lh596mx8zh0a76z"; }; meta.homepage = "https://github.com/Olical/conjure/"; meta.hydraPlatforms = [ ]; @@ -3367,12 +3367,12 @@ final: prev: { contextfiles-nvim = buildVimPlugin { pname = "contextfiles.nvim"; - version = "2025-07-13"; + version = "2025-08-24"; src = fetchFromGitHub { owner = "banjo"; repo = "contextfiles.nvim"; - rev = "d87da7901bbc18ee27d72cc7d4e43f3f2c41efa9"; - sha256 = "0nmhdllwxx4157w84krsavaxzhb1z8ay8ln31ayi50ar62m5sii7"; + rev = "f4a01aa465f7deeedb257266d47ef1849dd9b08b"; + sha256 = "10wzq2m0znj1x6jwv9ywcq4snplzilvp9sgaja2k91zlzjkvrzdl"; }; meta.homepage = "https://github.com/banjo/contextfiles.nvim/"; meta.hydraPlatforms = [ ]; @@ -3406,12 +3406,12 @@ final: prev: { copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2025-08-21"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "f7bacd90f571c2aef2be4d136a0d811b2d7930cf"; - sha256 = "18n5ikwwrrwrwv8vn6513c1h12lhd2cpiwlhax00s44zdbh7y3gi"; + rev = "e73fe7c43c68aeb84fbeed12ee6cc60a29e78fbb"; + sha256 = "1zxfqd2w3xr63z66aj28jk1qjfm86f60bsk9dkdda694rr0v4mhb"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; meta.hydraPlatforms = [ ]; @@ -3549,12 +3549,12 @@ final: prev: { crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2025-08-06"; + version = "2025-08-23"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "a49df0f70171adc77704eac70dd2c0d179065933"; - sha256 = "0g3rzy7nsa8p300sp2jzlxf573g1l5wprxwajqkb29kbdpbh93bg"; + rev = "ac9fa498a9edb96dc3056724ff69d5f40b898453"; + sha256 = "10hc28r9k4syay1pir24mk6kjj96llilqkyz8ch6rjmxyi7r5ycd"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; meta.hydraPlatforms = [ ]; @@ -3705,12 +3705,12 @@ final: prev: { cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2025-08-09"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "b154ec7e18558a34a0a6b6ad9a9ed6ca97aa41cf"; - sha256 = "0298a09afl0p40v5ywx90h1w3bvkqxc7i0s5fnw87iasj128dcia"; + rev = "89fd0b94040923597e2530ffcb2e887bd7c75d76"; + sha256 = "19w47qj2y04dbfbijv9v9fvil6z3kr8ym1l9b00k4g5nq90apz8g"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; meta.hydraPlatforms = [ ]; @@ -3887,12 +3887,12 @@ final: prev: { ddc-ui-pum = buildVimPlugin { pname = "ddc-ui-pum"; - version = "2025-04-07"; + version = "2025-08-26"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc-ui-pum"; - rev = "79df4ac4bf16cb69b358b5b2eedfeab2b69d0eb0"; - sha256 = "0vj03zbma1rsr3xm80cfp613xckc3y5y01mbsplr87vqa40r0gz5"; + rev = "f7f334380e18af42297468b3cf696794bbfa2652"; + sha256 = "070af7x08d5cvhnlwgirw8cr803wbicgqwm0dr7dpl2mmqmmy3ci"; }; meta.homepage = "https://github.com/Shougo/ddc-ui-pum/"; meta.hydraPlatforms = [ ]; @@ -3900,12 +3900,12 @@ final: prev: { ddc-vim = buildVimPlugin { pname = "ddc.vim"; - version = "2025-08-08"; + version = "2025-08-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc.vim"; - rev = "206c28876b4501db45b66318f658856c2fd14a1c"; - sha256 = "088siyyirnw970xy0zrkrplmz9kb4cfa0157v63h20250pcsg949"; + rev = "b8a12a1b2cef1eec6e754b88764f165611f973cc"; + sha256 = "13l9nz0q1rm8fkals3jra8vdnxwaz6y0pamix3vdmbjg96nf1kij"; }; meta.homepage = "https://github.com/Shougo/ddc.vim/"; meta.hydraPlatforms = [ ]; @@ -3926,12 +3926,12 @@ final: prev: { debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "2025-08-01"; + version = "2025-08-27"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "2f28d5b0773b350c69587d236d1db475985fac58"; - sha256 = "0nxid6siq33sa7nd3gs6g02j9blsyq8wydnhd9yx800qp88knbr4"; + rev = "91525630d048ca146892de423b33e8cf060b5a0d"; + sha256 = "114b83qm4zfkij69xd9zda7i9zxlv0w5nnhah3cqghx6gwfi29dm"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; meta.hydraPlatforms = [ ]; @@ -4056,12 +4056,12 @@ final: prev: { denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2025-08-12"; + version = "2025-08-24"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "b0ee649d8767d46f8f9ae7c49425dce969f2c0c8"; - sha256 = "17pk37rwzvg4c61acj96486f4brs75lj0s8x08rl85ww8jh651jf"; + rev = "a278b8342459e4687f24d4d575d72ff593326cee"; + sha256 = "1k1zcqf88z6yxxwvs0mjcharmykqis57jh505s37xaff2zvmb114"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; meta.hydraPlatforms = [ ]; @@ -4578,12 +4578,12 @@ final: prev: { easy-dotnet-nvim = buildVimPlugin { pname = "easy-dotnet.nvim"; - version = "2025-08-19"; + version = "2025-08-28"; src = fetchFromGitHub { owner = "GustavEikaas"; repo = "easy-dotnet.nvim"; - rev = "d23d2fdcffea11d18ef160672e81c9d63a9a78fa"; - sha256 = "1m1078avhff392s6d3v75v7924iccn8zv2gd72kjbzsdip3c62sv"; + rev = "270d5ba1f45ad64e1874760fe27b6bda0984da52"; + sha256 = "1655dxca9kr3j4k65bh9ws1piqwn9i5xazdmkl8rbfvvck0xb19r"; }; meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/"; meta.hydraPlatforms = [ ]; @@ -4696,12 +4696,12 @@ final: prev: { elixir-tools-nvim = buildVimPlugin { pname = "elixir-tools.nvim"; - version = "2025-06-20"; + version = "2025-08-26"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "b13c67398ee62531e1a4a53b95347a80eacefe6b"; - sha256 = "0hbz7yjspynba3vn9pxxfahk3ygnx1b46g8z40jakc1ivmhqg0c6"; + rev = "2b3dc7be1b9eea766bf6d75f519b05bd902e0c3a"; + sha256 = "0wzbv75a9r2v4i0fk5ddkc8lcqjw3lx20ikrxgbadh2rqs5v5gab"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; meta.hydraPlatforms = [ ]; @@ -4892,12 +4892,12 @@ final: prev: { fastaction-nvim = buildVimPlugin { pname = "fastaction.nvim"; - version = "2025-06-15"; + version = "2025-08-25"; src = fetchFromGitHub { owner = "Chaitanyabsprip"; repo = "fastaction.nvim"; - rev = "9bf0c368565023914c120562473dc5a5c179ee8c"; - sha256 = "12fb8av6q0y2ii23lx7rqln15syqhdxjrf9459jbm9dqjqrm6m9n"; + rev = "b147d91727cb35be4f722f17e7d4ed5b4a5801d8"; + sha256 = "0brks0ia2z6ahwqg5xad5h53552qm68c7w25d5gry0inlfr39bdx"; }; meta.homepage = "https://github.com/Chaitanyabsprip/fastaction.nvim/"; meta.hydraPlatforms = [ ]; @@ -5022,12 +5022,12 @@ final: prev: { firenvim = buildVimPlugin { pname = "firenvim"; - version = "2025-07-22"; + version = "2025-08-23"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "c927486daff6d1eb8a0d61fd9e264bc1bf5f2c36"; - sha256 = "01aahplvi2zvpvziqzwcbd3xj0zx8a8sp3cj2bhdvg3vyzl3rdjf"; + rev = "0c3b81444944ed51e9eb50b158b71ee26b611575"; + sha256 = "0dd5y08fqf5pn9ppfbwmx4whw37yiazjhsakvp6f84v6hi4xhx6p"; }; meta.homepage = "https://github.com/glacambre/firenvim/"; meta.hydraPlatforms = [ ]; @@ -5219,12 +5219,12 @@ final: prev: { fortune-nvim = buildVimPlugin { pname = "fortune.nvim"; - version = "2024-07-18"; + version = "2025-08-27"; src = fetchFromGitHub { owner = "rubiin"; repo = "fortune.nvim"; - rev = "29a99fbf887a2d48693f1eaa1893f84cde60af54"; - sha256 = "0kyi2pl5d1h7ycxsdvqdyg5zmjfxj7jpx7lk3bf2d14wvnvcwpb4"; + rev = "c5ad74c2eec74c6938ce813241ca1061ab1392eb"; + sha256 = "0vhwczrgczikc16vl0w66zyg3wz9j1m85cln9qh9y0hsxdd5ipbh"; }; meta.homepage = "https://github.com/rubiin/fortune.nvim/"; meta.hydraPlatforms = [ ]; @@ -5661,12 +5661,12 @@ final: prev: { go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2025-08-05"; + version = "2025-08-28"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "3279d15d146ab2eae6ad9bc930f3c8fc62a3697b"; - sha256 = "1aj9dvdd31f1vvvrkwv7ys9mrf3kc9w14wxq0gvnycg6aphdp7g3"; + rev = "9382e23d46eea94e08da0b56d8a416461fdb294d"; + sha256 = "1y65ggswxv8l678ilpas9swaf5ay1xpqiccwabs7f5vzjf4c80nj"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; meta.hydraPlatforms = [ ]; @@ -5778,12 +5778,12 @@ final: prev: { gruber-darker-nvim = buildVimPlugin { pname = "gruber-darker.nvim"; - version = "2024-01-08"; + version = "2025-08-25"; src = fetchFromGitHub { owner = "blazkowolf"; repo = "gruber-darker.nvim"; - rev = "a2dda61d9c1225e16951a51d6b89795b0ac35cd6"; - sha256 = "1sxnprl27svdf4wp38abbywjbipr15mzmx53hg5w0jz1vj0kdjvl"; + rev = "b22e1bbf06dd604d7d3483823d63103b86ebe942"; + sha256 = "0id7g797mvf7k7hfp3pfi19cbqjjg2ksk1dijsda76sjf2c07hs0"; }; meta.homepage = "https://github.com/blazkowolf/gruber-darker.nvim/"; meta.hydraPlatforms = [ ]; @@ -5882,12 +5882,12 @@ final: prev: { guard-collection = buildVimPlugin { pname = "guard-collection"; - version = "2025-05-29"; + version = "2025-08-24"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard-collection"; - rev = "7e87ae9c3758221ec6dbd24bb44ee8ff400f3940"; - sha256 = "0c89kl6by26s8i57x4cqrj2g274jy4kcqpj2g5s2576prxiyqkwl"; + rev = "2fbf8449609ce522c36050e4e27235575c2d5439"; + sha256 = "01xbpd4nm4c1gcxg5yqyk7g4d1fbdzkyc1x1m6ba7laq7cf15zql"; }; meta.homepage = "https://github.com/nvimdev/guard-collection/"; meta.hydraPlatforms = [ ]; @@ -5895,12 +5895,12 @@ final: prev: { guard-nvim = buildVimPlugin { pname = "guard.nvim"; - version = "2025-08-20"; + version = "2025-08-24"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard.nvim"; - rev = "b16aa1d92c8adac7d63c442b31498761ec09bdd9"; - sha256 = "0jfpyf93fjc76bjx6dkp1mq628c5p3azn9i3jk9i67z8g79ykmf1"; + rev = "5127d963f5f5eff6306078e662124df9d88766fa"; + sha256 = "0www7hdqgcj015gb9xbhv1awk4rzixcqijsq78cjmirajciy7zwd"; }; meta.homepage = "https://github.com/nvimdev/guard.nvim/"; meta.hydraPlatforms = [ ]; @@ -6026,12 +6026,12 @@ final: prev: { haskell-snippets-nvim = buildVimPlugin { pname = "haskell-snippets.nvim"; - version = "2025-03-17"; + version = "2025-08-25"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "haskell-snippets.nvim"; - rev = "27ac316463b9807496cd03e65289d3e79aa23528"; - sha256 = "1z49df35vzccq5jnckbmrsfpr8g6cjiq020jbwprzj8hrb769bqh"; + rev = "13f3671a34862a16fd7ecea1562207429acbab15"; + sha256 = "0ih4hfvgam8gk4khljg2jjbayxahjlbrn6b4vqxipg0jby6iiddy"; }; meta.homepage = "https://github.com/mrcjkb/haskell-snippets.nvim/"; meta.hydraPlatforms = [ ]; @@ -6248,12 +6248,12 @@ final: prev: { hop-nvim = buildVimPlugin { pname = "hop.nvim"; - version = "2025-08-06"; + version = "2025-08-22"; src = fetchFromGitHub { owner = "smoka7"; repo = "hop.nvim"; - rev = "2254e0b3c8054b9ee661c9be3cb201d4b3384d8e"; - sha256 = "085k2vyslaq0grxl87s1qn1k9dp0wp3fi7k4zmnmxw9rv8wngvw2"; + rev = "707049feaca9ae65abb3696eff9aefc7879e66aa"; + sha256 = "0xzxl1mkdp1zyg9m97h2mhvb98fwwd21h5ki7jlhkb8cl294lx40"; }; meta.homepage = "https://github.com/smoka7/hop.nvim/"; meta.hydraPlatforms = [ ]; @@ -6716,12 +6716,12 @@ final: prev: { jedi-vim = buildVimPlugin { pname = "jedi-vim"; - version = "2024-12-27"; + version = "2025-08-27"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "344814c214391368674813e3a11143448e73e749"; - sha256 = "149sm7hshnckap1bwngvy9lypxh8lhsg17ihqwhdrp3k7p8vrgs6"; + rev = "9679051ad40e9aebdca80681abacbf49313e9b89"; + sha256 = "0246b2p0l49mhgxfq9kwcph3mwhrvny5zdxkgk8flx7pvpabdkn6"; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; @@ -6847,12 +6847,12 @@ final: prev: { kanagawa-paper-nvim = buildVimPlugin { pname = "kanagawa-paper.nvim"; - version = "2025-08-19"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "thesimonho"; repo = "kanagawa-paper.nvim"; - rev = "6fca75ee0de76f5c9964aab89de6ac7bd4df5e2f"; - sha256 = "0vkm0j4yml86cqrbf4f2w1ynz2a3chszjxjpgla6ln725cv1v1cz"; + rev = "6621e6fd146146b67daee092e23f1ad6c92935c5"; + sha256 = "06rwilxf49k050n4bz9iq3al8wq7if1ggyl2yrf8w3h6n72w83di"; }; meta.homepage = "https://github.com/thesimonho/kanagawa-paper.nvim/"; meta.hydraPlatforms = [ ]; @@ -6964,12 +6964,12 @@ final: prev: { kulala-nvim = buildVimPlugin { pname = "kulala.nvim"; - version = "2025-08-19"; + version = "2025-08-26"; src = fetchFromGitHub { owner = "mistweaverco"; repo = "kulala.nvim"; - rev = "1695bdfc87e2af737bec034cd4cd2d11098a22fd"; - sha256 = "0ghvd9kgg9ir29sxa3pjcl7a0b4yg5njxkp9y6zmazbdczpsq2rf"; + rev = "cfe40c33636ab0f53f1edd3dbda37f4298298797"; + sha256 = "0zqhaqi6d7by4mavr00jbfd5gvqfcfdxcc4zm6ib1k1r83y2cj36"; fetchSubmodules = true; }; meta.homepage = "https://github.com/mistweaverco/kulala.nvim/"; @@ -7082,12 +7082,12 @@ final: prev: { lazydocker-nvim = buildVimPlugin { pname = "lazydocker.nvim"; - version = "2025-06-25"; + version = "2025-08-24"; src = fetchFromGitHub { owner = "crnvl96"; repo = "lazydocker.nvim"; - rev = "495fbbbdb22d48f2649a4b58c432f58c7981e3e2"; - sha256 = "006chxck2asaymmd8xh0g9fd5h2bvq1p0s8dn16b1zakp8rvq7zq"; + rev = "b69ff84a6223de39d34a150b980d3b9ef19549fb"; + sha256 = "15ac2pm5qy9p274qhd0ndl3q6849pq63lpamjdsvqvficmc99ii8"; }; meta.homepage = "https://github.com/crnvl96/lazydocker.nvim/"; meta.hydraPlatforms = [ ]; @@ -7121,12 +7121,12 @@ final: prev: { lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2025-08-21"; + version = "2025-08-25"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "62623347cdd5a27a73436c24eb9b4745ea207630"; - sha256 = "0m17w3v91chsasxff8h6dp8w3g1ji58caxc89r01g3dhsj2s5bx4"; + rev = "76da8fc9f3d2ac975dd3ada7704f4c56984a914c"; + sha256 = "1zf4kybca39a8sj68f7lcyi16bl1w7yg4m2m2584s5n1f0x9znng"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; meta.hydraPlatforms = [ ]; @@ -7160,12 +7160,12 @@ final: prev: { leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2025-08-15"; + version = "2025-08-28"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "8b03b5d62d11cd9da5ea8be62ab8e9ff3fabab8f"; - sha256 = "0nnbdzxgk4fq955wrzlgrg6slqrpmsm5mq5h30i0d2xp6ipkvh2m"; + rev = "e9cb442c0614a7e8185608f639e10c54e53bb083"; + sha256 = "1zqvgpslrw9gjd1grz0b8cpzi0i0gbcaljypx7h6yzf55mm0vn94"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; meta.hydraPlatforms = [ ]; @@ -7173,12 +7173,12 @@ final: prev: { leetcode-nvim = buildVimPlugin { pname = "leetcode.nvim"; - version = "2025-07-21"; + version = "2025-08-25"; src = fetchFromGitHub { owner = "kawre"; repo = "leetcode.nvim"; - rev = "422b6beb4a64eca0524fbff94edd9550c156afc5"; - sha256 = "0by4graq6bwnipssxrdrp9d22jf5g93srv10ghd8y35f370q9nlv"; + rev = "10f63d67201f6e988467485e6cf32d08176fcad2"; + sha256 = "1b3acblmg1xjyzbvlyf7qqm73ilgsr14dz9cgj0xfad5yq9mliha"; }; meta.homepage = "https://github.com/kawre/leetcode.nvim/"; meta.hydraPlatforms = [ ]; @@ -7212,12 +7212,12 @@ final: prev: { lensline-nvim = buildVimPlugin { pname = "lensline.nvim"; - version = "2025-08-28"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "oribarilan"; repo = "lensline.nvim"; - rev = "e057fe1845d58ca52967c8805eb6ff8f4d16f3d7"; - sha256 = "0ckwyvj6764npn836cjva7mmifzcnhz73a03kmq7p18r81sbrqgj"; + rev = "a641d430e8deba186b747a32630cea37d4275d32"; + sha256 = "1d9jf4pyi9i24cx3mrdy835bwzj17mphhzzrchf1bfhi0dlkfpkr"; }; meta.homepage = "https://github.com/oribarilan/lensline.nvim/"; meta.hydraPlatforms = [ ]; @@ -7537,12 +7537,12 @@ final: prev: { live-rename-nvim = buildVimPlugin { pname = "live-rename.nvim"; - version = "2025-06-23"; + version = "2025-08-27"; src = fetchFromGitHub { owner = "saecki"; repo = "live-rename.nvim"; - rev = "78fcdb4072c6b1a8e909872f9a971b2f2b642d1e"; - sha256 = "0g0yirjvlzjy7v6lpzwphn87h3mgs33l3pa3sw9np36lhk9ww6g4"; + rev = "44340587e7b67a86c5a4855ac8eb9ac5178bed69"; + sha256 = "1zgihfp8js41kz9nzd4dv1zbdxxfm6xhyqch4b1mw4mxk5n46gcs"; }; meta.homepage = "https://github.com/saecki/live-rename.nvim/"; meta.hydraPlatforms = [ ]; @@ -7563,12 +7563,12 @@ final: prev: { llama-vim = buildVimPlugin { pname = "llama.vim"; - version = "2025-08-20"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "ggml-org"; repo = "llama.vim"; - rev = "1b4a03fbf0d1c7aeaa10c390065751a9503de436"; - sha256 = "0nzsp6mjxsazmgzdbx1kgbavhk55pypvfxl2pm6y69qkhf3swcwz"; + rev = "6aff02aafa9719e487d7c0fd91cdfb91f27b6d91"; + sha256 = "0892p6jaaifh8q56hdk88cq9pgamjd098rrfxzmv9v95iwpzylcf"; }; meta.homepage = "https://github.com/ggml-org/llama.vim/"; meta.hydraPlatforms = [ ]; @@ -7940,12 +7940,12 @@ final: prev: { markview-nvim = buildVimPlugin { pname = "markview.nvim"; - version = "2025-08-19"; + version = "2025-08-26"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "markview.nvim"; - rev = "2fddeef5755f434a24bc452b0666f1ffd9882dae"; - sha256 = "1i207rdln8r8pd3kwminjh3brz0qpi67z9a36pa3mh3nygdnp7d9"; + rev = "9c7761f4446c23cfc8e9b8b1ba980a1a7fd1c94a"; + sha256 = "0ap2h1qkjsc4488njjwkj3hsxacy9iq25gvvsjaks0s8mmgd2yss"; fetchSubmodules = true; }; meta.homepage = "https://github.com/OXY2DEV/markview.nvim/"; @@ -7954,12 +7954,12 @@ final: prev: { mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2025-08-18"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "mason-org"; repo = "mason-lspconfig.nvim"; - rev = "1ec4da522fa49dcecee8d190efda273464dd2192"; - sha256 = "11sij20d2ancsbf7iygkfx14sw7i717gpy126bplgf107482xdbq"; + rev = "5e085efe67fccb13372d54331d849219662a7e93"; + sha256 = "0wzjr7144094bzvihp70nmprq5yznrrp9hhgbn498h9g8xdm6rsl"; }; meta.homepage = "https://github.com/mason-org/mason-lspconfig.nvim/"; meta.hydraPlatforms = [ ]; @@ -8162,560 +8162,560 @@ final: prev: { mini-ai = buildVimPlugin { pname = "mini.ai"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.ai"; - rev = "1cd4f021a05c29acd4ab511c0981da14217daf38"; - sha256 = "045f24n8b3f1ilhhanm1m0sfr0yjprxp5a8ykyjrqc4lwh3v1jwv"; + rev = "45a26d032d8703f280c69c2ed9fb4e1bfc8f24f9"; + sha256 = "0q65whb7hw1cill7dkf88m095m27j09ld8zf8rzfvy0xhp64rzlk"; }; - meta.homepage = "https://github.com/echasnovski/mini.ai/"; + meta.homepage = "https://github.com/nvim-mini/mini.ai/"; meta.hydraPlatforms = [ ]; }; mini-align = buildVimPlugin { pname = "mini.align"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.align"; - rev = "0202e1662a7a03a95cefd6851795ceae5e87b9b3"; - sha256 = "0yzwryx5y4v3838b1g2b6xnj6cg824iww4dxvlr0jmbqd3m23lf5"; + rev = "ab6777ca0fdfe8e4cfe931e3b0b5d98c719c3c1d"; + sha256 = "0j3xzfjrk430lx6l2l1wqi76pjnf0qn78xan722cpj9wy7vlvsds"; }; - meta.homepage = "https://github.com/echasnovski/mini.align/"; + meta.homepage = "https://github.com/nvim-mini/mini.align/"; meta.hydraPlatforms = [ ]; }; mini-animate = buildVimPlugin { pname = "mini.animate"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.animate"; - rev = "8a3f27183b38d2f255e3f5fc0df42c072f8339df"; - sha256 = "0zq5m24192hpkv03w65cw9famfc48n4dcqmsj1n2xhd4lynjhbrb"; + rev = "37df15e199da3edc0b36647967cc04bf80175183"; + sha256 = "1xn0chs9s63m7gyq7a023nlxd30wcslkg0295dyh0n1q9d6rw56c"; }; - meta.homepage = "https://github.com/echasnovski/mini.animate/"; + meta.homepage = "https://github.com/nvim-mini/mini.animate/"; meta.hydraPlatforms = [ ]; }; mini-base16 = buildVimPlugin { pname = "mini.base16"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.base16"; - rev = "ecd277e6204fc0411f070150081f40529dcf280c"; - sha256 = "08v2rlb2jzbza30n66rb19bgh9y6a8vk7jfq6mzi9dxb4f7a85sl"; + rev = "f4aa0d75c8bd0c4a4296f5f28b537040bcd18d3e"; + sha256 = "1n5abk7z06gh6q3ij2bk1ikxjayx52iyz2i4m67ara5w2n2g5n9v"; }; - meta.homepage = "https://github.com/echasnovski/mini.base16/"; + meta.homepage = "https://github.com/nvim-mini/mini.base16/"; meta.hydraPlatforms = [ ]; }; mini-basics = buildVimPlugin { pname = "mini.basics"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.basics"; - rev = "540c80d579e366a7c11d2b5cf3ecde009dbd125f"; - sha256 = "1zcysmzywibn8hsd098jj31hn2xdjisfchdd9ywmmhaxzg48djsm"; + rev = "76bf1343dc0ff70348f7cd6f1c4900b1d6f75a08"; + sha256 = "0ffvvql0j1wn7s6m93ph9wpis27dvxl106x9afaz3ynj20ls08gj"; }; - meta.homepage = "https://github.com/echasnovski/mini.basics/"; + meta.homepage = "https://github.com/nvim-mini/mini.basics/"; meta.hydraPlatforms = [ ]; }; mini-bracketed = buildVimPlugin { pname = "mini.bracketed"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.bracketed"; - rev = "4a005a6e5aad58230b69f0f59df2cbb8b1c2e643"; - sha256 = "0wg24cq6064c45p3sf022d54gmwwvi8354k2sbp09h19s797bpbx"; + rev = "672b4e2fe9222fd4d5a104ff23217801bae37046"; + sha256 = "19sqhv68yn214md95wkd3jg632smp7ny4nb3zbmn43ksyiaxmi9h"; }; - meta.homepage = "https://github.com/echasnovski/mini.bracketed/"; + meta.homepage = "https://github.com/nvim-mini/mini.bracketed/"; meta.hydraPlatforms = [ ]; }; mini-bufremove = buildVimPlugin { pname = "mini.bufremove"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.bufremove"; - rev = "a1bbb2af40f7773c8cee9e364aac4a724b5c10de"; - sha256 = "1xz9x5bd72cg4f56ngb6lr00cb468q84nm383fyzvwyxj99nw2b9"; + rev = "e60941ab23eb0679f0da0e92ac0b572425756dc2"; + sha256 = "03jj3lxykdl7dlblv90h1hym91ww5mz24wsr9jqi535acakajn3x"; }; - meta.homepage = "https://github.com/echasnovski/mini.bufremove/"; + meta.homepage = "https://github.com/nvim-mini/mini.bufremove/"; meta.hydraPlatforms = [ ]; }; mini-clue = buildVimPlugin { pname = "mini.clue"; - version = "2025-08-19"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.clue"; - rev = "21fc8ad164e82da22665e94948d44a4727d6980a"; - sha256 = "1g1sqk3kdp7y74ds0fkh3c07whd58w3ccl0glay7mwfbf802ji1w"; + rev = "2d361459de6a5fd7ea20a14ee4b95c6caec383b9"; + sha256 = "14gpvrcvwdr59vqmzs1ma6iylb23cr8dwcy5xv5cmbdiiz1sb1lp"; }; - meta.homepage = "https://github.com/echasnovski/mini.clue/"; + meta.homepage = "https://github.com/nvim-mini/mini.clue/"; meta.hydraPlatforms = [ ]; }; mini-colors = buildVimPlugin { pname = "mini.colors"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.colors"; - rev = "dd4209469024b249cf9dfed851fd85ad3467ccd3"; - sha256 = "0zppf2j94v19bvlkhaixx9vj4w3c574v0nycha9y2zy48ac1x6dy"; + rev = "3ec0d1bb6d82ec5f2275dfb58690ee22a2e59316"; + sha256 = "1w720qrjmv0gmw2irlsvlwyq5zni2ncafxb7im6brgf84nbhpcxc"; }; - meta.homepage = "https://github.com/echasnovski/mini.colors/"; + meta.homepage = "https://github.com/nvim-mini/mini.colors/"; meta.hydraPlatforms = [ ]; }; mini-comment = buildVimPlugin { pname = "mini.comment"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.comment"; - rev = "871746069a28e35d04a66f88bc0e6831779ccc40"; - sha256 = "051gfmd82m2ghf6am6q5bdsjda2wghy5pwn7gyxc1fahh9d9gakf"; + rev = "a9474da9175b27a5c32ee712433c23b9b0f7f139"; + sha256 = "1xjdhasqrli8gx89hhzm7zhcccnfr2irh5bldxkvvhydb3m74mar"; }; - meta.homepage = "https://github.com/echasnovski/mini.comment/"; + meta.homepage = "https://github.com/nvim-mini/mini.comment/"; meta.hydraPlatforms = [ ]; }; mini-completion = buildVimPlugin { pname = "mini.completion"; - version = "2025-08-17"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.completion"; - rev = "b635036d3fe5ea6f4450358a02e376612b628ac4"; - sha256 = "1awppnng3lab5vx7wbdc2hxr62586ria9yw96wja5c8rd281wajd"; + rev = "d121b158b557c61d6762999af9dca5c19c538f20"; + sha256 = "0vlzz1nn7d09fxfq3nmzqdqqvyw5asp8q4j67vqfxhwrq08ih6ca"; }; - meta.homepage = "https://github.com/echasnovski/mini.completion/"; + meta.homepage = "https://github.com/nvim-mini/mini.completion/"; meta.hydraPlatforms = [ ]; }; mini-cursorword = buildVimPlugin { pname = "mini.cursorword"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.cursorword"; - rev = "52834085b4ad175a050343cd96c4517def711cc5"; - sha256 = "1bb2s65z6wk0mq8xbiy6f9hh97rg20nbsgjbpkbjvzn75p22krja"; + rev = "84c82f8040a75445f1f39a0d36f4d0d0fe0bee92"; + sha256 = "1bwln3dlwpk9f0wa631jqkbqa1pc8is8ra35z1i742vls92b5ma5"; }; - meta.homepage = "https://github.com/echasnovski/mini.cursorword/"; + meta.homepage = "https://github.com/nvim-mini/mini.cursorword/"; meta.hydraPlatforms = [ ]; }; mini-deps = buildVimPlugin { pname = "mini.deps"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.deps"; - rev = "2953b2089591a49a70e0a88194dbb47fb0e4635c"; - sha256 = "0hkh1p45bsvcbfzzfnbl633yffwkg7lspj8dmimgv3sg1s4awsvp"; + rev = "694331a00cdbf15b0a3f7ec2c9b49b2a9879835e"; + sha256 = "0q29rvjl4y3ydbg0hlhns9wr3sqyy8frypyg7c3lprykxzab4jgn"; }; - meta.homepage = "https://github.com/echasnovski/mini.deps/"; + meta.homepage = "https://github.com/nvim-mini/mini.deps/"; meta.hydraPlatforms = [ ]; }; mini-diff = buildVimPlugin { pname = "mini.diff"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.diff"; - rev = "f573bd2ae2eb225ea2f125126b8869e04bcaf231"; - sha256 = "0rlah6kwv9xw244b1xhkdz1hg10zq2zidnlvnxjl7ckn9qxq908p"; + rev = "7077b636d642fcd5cd48554e187a251883239660"; + sha256 = "1kj1gwpdmnv0fwydfyi93bfqxghrgha1221pds3ki16f1zrm3d78"; }; - meta.homepage = "https://github.com/echasnovski/mini.diff/"; + meta.homepage = "https://github.com/nvim-mini/mini.diff/"; meta.hydraPlatforms = [ ]; }; mini-doc = buildVimPlugin { pname = "mini.doc"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.doc"; - rev = "dc336167b203f7405ce7a27d879a90fd9a4ba241"; - sha256 = "17akjcvps4adzp3ag04i11gdwxhk10qhlqlacy3yx8ks2l8jsibh"; + rev = "476a05cde8320bbbc5ac3d58ecde88106d457eea"; + sha256 = "14hwyva1d8g5gqwyfpvm6s7d8zklfyn57g7gl2pg1zscr7q0f66y"; }; - meta.homepage = "https://github.com/echasnovski/mini.doc/"; + meta.homepage = "https://github.com/nvim-mini/mini.doc/"; meta.hydraPlatforms = [ ]; }; mini-extra = buildVimPlugin { pname = "mini.extra"; - version = "2025-08-21"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.extra"; - rev = "b77a21a3c8c2a8815d8e8cf9f4d5fbac4c876197"; - sha256 = "0d4m6yhga756js73hxg3vz9kpj5myc6kxgc3i0n6ia6znfcmj5wj"; + rev = "a4ea6fc035906b1e9494f6e249ca387b57e8308f"; + sha256 = "0n2kq7qk3qzpph8jwm9jzr1b6rl00wl01w2xvln9sq0118lqk532"; }; - meta.homepage = "https://github.com/echasnovski/mini.extra/"; + meta.homepage = "https://github.com/nvim-mini/mini.extra/"; meta.hydraPlatforms = [ ]; }; mini-files = buildVimPlugin { pname = "mini.files"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.files"; - rev = "5b9431cf5c69b8e69e5a67d2d12338a3ac2e1541"; - sha256 = "1y32wk17hlpv17q3yrjx4cfywi9svxxpmzy1qdzqxdkddrzya3sc"; + rev = "34a730a6bdb09c3e6755fe34b20a78a5d81d21c4"; + sha256 = "1r3dzpg3wl41aqif4gvm8445vj0wbzgzj8ab94g3qqzagash4pj3"; }; - meta.homepage = "https://github.com/echasnovski/mini.files/"; + meta.homepage = "https://github.com/nvim-mini/mini.files/"; meta.hydraPlatforms = [ ]; }; mini-fuzzy = buildVimPlugin { pname = "mini.fuzzy"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.fuzzy"; - rev = "f270c05a0afcb4e87044f7cd01af187497f30c4d"; - sha256 = "0jvvbwva2csadr4hhbmbcw0hzj16rrpbnh1ibhzsnalws8bn5mh7"; + rev = "cb2f359471c2cb1cf2aa997552a28e4748d4c2bc"; + sha256 = "168np3jky78gz98l0sq3iwxkgqlg77vp0ki0602x4iijw1ghzw6c"; }; - meta.homepage = "https://github.com/echasnovski/mini.fuzzy/"; + meta.homepage = "https://github.com/nvim-mini/mini.fuzzy/"; meta.hydraPlatforms = [ ]; }; mini-git = buildVimPlugin { pname = "mini-git"; - version = "2025-08-12"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini-git"; - rev = "689bb78921e34d621df8dc1733337b2c3c39a786"; - sha256 = "0i16saficymszk64yjb2mgxij58za6kk6bgkvwkm70bscv9yj9iz"; + rev = "1948d4290105d4c52b8c1d5da5b748c402f6fdff"; + sha256 = "14zjrs6wh43x5dxnhdrsmfv19rq743bxlqvgaag54mn48029wmsc"; }; - meta.homepage = "https://github.com/echasnovski/mini-git/"; + meta.homepage = "https://github.com/nvim-mini/mini-git/"; meta.hydraPlatforms = [ ]; }; mini-hipatterns = buildVimPlugin { pname = "mini.hipatterns"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.hipatterns"; - rev = "2b78f3d475d60ea1793a6d595ff65a0db9ac3a67"; - sha256 = "1vn4pz7ibd4ll97xrvqvl8swr88dzr9gbq5zc4ssfixrqfssb22w"; + rev = "96d07d32a0db0d8d8a10c83a964ec557cca005e7"; + sha256 = "1lmdi790xcg7jpz6swfl9siray8gbx8wz638vzxa9b0s6wkwa2ab"; }; - meta.homepage = "https://github.com/echasnovski/mini.hipatterns/"; + meta.homepage = "https://github.com/nvim-mini/mini.hipatterns/"; meta.hydraPlatforms = [ ]; }; mini-hues = buildVimPlugin { pname = "mini.hues"; - version = "2025-08-15"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.hues"; - rev = "44a1df43693f82821650ff99f9812a32c276b30c"; - sha256 = "1nrgsxg7g7kc5ii21k2j70455hrq1ys3i16nqs98nfg3x1l3gdij"; + rev = "a067598176acfa754ba032c1526f53220249690a"; + sha256 = "0wx6aira4m3w8459jx6pi1d3f3npldyw23z1xa3wppivz7j9wdjd"; }; - meta.homepage = "https://github.com/echasnovski/mini.hues/"; + meta.homepage = "https://github.com/nvim-mini/mini.hues/"; meta.hydraPlatforms = [ ]; }; mini-icons = buildVimPlugin { pname = "mini.icons"; - version = "2025-07-24"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.icons"; - rev = "b8f6fa6f5a3fd0c56936252edcd691184e5aac0c"; - sha256 = "07zlbmisc8c4wj36mdnk7wlwb0qfd38zpjdkqazjzb5lfzh9hf9m"; + rev = "f9a177c11daa7829389b7b6eaaec8b8a5c47052d"; + sha256 = "028zvjc7wyqw51jbj5r5llfkq5223wxga6qwb16ns9s71cflpgh6"; }; - meta.homepage = "https://github.com/echasnovski/mini.icons/"; + meta.homepage = "https://github.com/nvim-mini/mini.icons/"; meta.hydraPlatforms = [ ]; }; mini-indentscope = buildVimPlugin { pname = "mini.indentscope"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.indentscope"; - rev = "f1567c6f46c250b22f4ad1b847a042464742b11d"; - sha256 = "0mbwy8ww0cxx4g5l7hipnxsgwzvmr6wxsap0dz6y4fy1g4jcw6cw"; + rev = "9d9490c172a4718d7d1f20eaae668a28f160c2d7"; + sha256 = "1rz56q0adi50d9rmwr4ydqv97jxgxgarhdrach4dvsmz1f3bh9d2"; }; - meta.homepage = "https://github.com/echasnovski/mini.indentscope/"; + meta.homepage = "https://github.com/nvim-mini/mini.indentscope/"; meta.hydraPlatforms = [ ]; }; mini-jump = buildVimPlugin { pname = "mini.jump"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.jump"; - rev = "5fd3bc5a97f3487c65b34475033ca8fccf297500"; - sha256 = "0ai4pl9cx8p57qja2ixf3294hdrj0j30pkh0gymd7jw992dqkp6s"; + rev = "bb5895c9ae4d25fd95c0431ece2bb8f5e3909911"; + sha256 = "0w0i4lcvxzjmniib076nm3yvkjn70xr21iiys8r3y57q1m3iw9f1"; }; - meta.homepage = "https://github.com/echasnovski/mini.jump/"; + meta.homepage = "https://github.com/nvim-mini/mini.jump/"; meta.hydraPlatforms = [ ]; }; mini-jump2d = buildVimPlugin { pname = "mini.jump2d"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.jump2d"; - rev = "7a1b72251bf841bd8feb3e54e3e61c2883bc29ae"; - sha256 = "0ydavxi9ryxllky3y7whv62dm8b4h5545w1kzgk3b3bfss4zq1rj"; + rev = "3710fcdfbbff539e245e16ff14f2d95ffc2fb631"; + sha256 = "0jxdhqim5zhsynd32xn8yj3p3i9qlw693r779yzmfadm5szncvp1"; }; - meta.homepage = "https://github.com/echasnovski/mini.jump2d/"; + meta.homepage = "https://github.com/nvim-mini/mini.jump2d/"; meta.hydraPlatforms = [ ]; }; mini-keymap = buildVimPlugin { pname = "mini.keymap"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.keymap"; - rev = "99557a5b87b4f73856b847d17920af6a1e1d84b7"; - sha256 = "1llcjkg4lzxabnphzlvnbqsz5s38l90g0nhc78pgk1nq4963fqjp"; + rev = "c894a1c9a6508bc667583bfff19f634bc6b8a4af"; + sha256 = "1h5y3zvmhi0w18aakhdjqda16ncv2fi76ymjcw7hcd5xqp3fciq4"; }; - meta.homepage = "https://github.com/echasnovski/mini.keymap/"; + meta.homepage = "https://github.com/nvim-mini/mini.keymap/"; meta.hydraPlatforms = [ ]; }; mini-map = buildVimPlugin { pname = "mini.map"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.map"; - rev = "94ce1694e7b7a3940fc507ab25f061deb9c8179c"; - sha256 = "0rfhkijxvb40wvb6abvpdq1s34xki2s36clml5lprg0v880qv75l"; + rev = "fe1ffddf80aadfdd312add16a1b4a882c5e0ffaa"; + sha256 = "17rdj52lilpn16r8k2w8m5lwz8p380kzwc0gzpv747wrj0q5v90v"; }; - meta.homepage = "https://github.com/echasnovski/mini.map/"; + meta.homepage = "https://github.com/nvim-mini/mini.map/"; meta.hydraPlatforms = [ ]; }; mini-misc = buildVimPlugin { pname = "mini.misc"; - version = "2025-08-19"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.misc"; - rev = "6b1525c853c1f6008601ce474ad4e5b787047ca4"; - sha256 = "05vkfmxcaxmr6wwnnc7is3f2mp8synrjffcj9dzm1w8i8ps5hmxn"; + rev = "b48a5527e26e3d1840be317e52b1f3db5c364f35"; + sha256 = "0gbv9nnl027lkqmp9jlrawbzi437gbxf52d7kgw4h1qg7lp5ccjx"; }; - meta.homepage = "https://github.com/echasnovski/mini.misc/"; + meta.homepage = "https://github.com/nvim-mini/mini.misc/"; meta.hydraPlatforms = [ ]; }; mini-move = buildVimPlugin { pname = "mini.move"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.move"; - rev = "819e90c3e113a3c826c3003ec07073f1e0677ea0"; - sha256 = "1dbflx3im6605vxhk3q8mqgsh89gs1q50x5vngl08knsv2vmm16a"; + rev = "710ff226e31a3b9dd7e14bc9e2993f24d653df20"; + sha256 = "0db5csmpi0rly8flh6rp2js6l9s1f28nygmlv3fa284igm5471sa"; }; - meta.homepage = "https://github.com/echasnovski/mini.move/"; + meta.homepage = "https://github.com/nvim-mini/mini.move/"; meta.hydraPlatforms = [ ]; }; mini-notify = buildVimPlugin { pname = "mini.notify"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.notify"; - rev = "e18f9fc783c7a26fab9c8a094d97dc768e56f558"; - sha256 = "0qvh5wy1acrilkzin16n2xnpsr5vydxajln0r2y2xbq9wix42vn6"; + rev = "f109564e1db7893bc500e52ebf6a06b85e14a705"; + sha256 = "006xx213lz22lqj150yabf8zq4n1mc33cyaw4q69dscm09iwnhvr"; }; - meta.homepage = "https://github.com/echasnovski/mini.notify/"; + meta.homepage = "https://github.com/nvim-mini/mini.notify/"; meta.hydraPlatforms = [ ]; }; mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2025-08-21"; + version = "2025-08-29"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.nvim"; - rev = "e38547768b2e12bdd48b16b8cfdca2e3b7543e22"; - sha256 = "1dc4i9lhnhn2mcq77znzim8zc12bj1k4vbln236anjhr8xyycif0"; + rev = "b5bae7dd5802b47bb03babfb374fdfdab02b9d8b"; + sha256 = "00rpjd3m2l4abnqnhhk9w3p46ggswja0v96y7g0i7hbk5sy9il78"; }; - meta.homepage = "https://github.com/echasnovski/mini.nvim/"; + meta.homepage = "https://github.com/nvim-mini/mini.nvim/"; meta.hydraPlatforms = [ ]; }; mini-operators = buildVimPlugin { pname = "mini.operators"; - version = "2025-08-12"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.operators"; - rev = "e72b5afec4c339aebd601a56e9ae3ef13d2f5d1a"; - sha256 = "1i7iph3vj0xd607fxk9cbhxyfgi7yvqlg5crmlkqbfrh2xmgxxy9"; + rev = "57c9daf96e0278ebac07bc57fe2f60cf360e5eea"; + sha256 = "0x8vm0fzvvw3d46ygdw45cbsfkawzflcpva6gdcd0q70iak7lnyv"; }; - meta.homepage = "https://github.com/echasnovski/mini.operators/"; + meta.homepage = "https://github.com/nvim-mini/mini.operators/"; meta.hydraPlatforms = [ ]; }; mini-pairs = buildVimPlugin { pname = "mini.pairs"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.pairs"; - rev = "1e1ca3f60f58d4050bf814902b472eec9963a5dd"; - sha256 = "1zwvywy9pbskip3nckbymkkrl19mvdz8ax0ixcnnavk6567v5hh5"; + rev = "6e1cc569130f25b2c6fa16d8b21b31ddb1420a4a"; + sha256 = "1q7blg6cigv3lh5y0yymv4swr6gbb9r1vdi45fk26pigvm2bkdvd"; }; - meta.homepage = "https://github.com/echasnovski/mini.pairs/"; + meta.homepage = "https://github.com/nvim-mini/mini.pairs/"; meta.hydraPlatforms = [ ]; }; mini-pick = buildVimPlugin { pname = "mini.pick"; - version = "2025-08-02"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.pick"; - rev = "82ec629ca108c7b96b8b9bb733d235b39e137690"; - sha256 = "1n9wg6v5wrxnk8x6l33k7949fp20ygr07xkyix8zk7hfyqbg9927"; + rev = "51680e9d67bdf657209aaef4117a4dcc61e8428c"; + sha256 = "0nsmjliz26c3rp6yp0b67w2d3w1nvy12gixj9ilpx3jnm5zwbw45"; }; - meta.homepage = "https://github.com/echasnovski/mini.pick/"; + meta.homepage = "https://github.com/nvim-mini/mini.pick/"; meta.hydraPlatforms = [ ]; }; mini-sessions = buildVimPlugin { pname = "mini.sessions"; - version = "2025-07-22"; + version = "2025-08-29"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.sessions"; - rev = "8b01c6cd257450b34a07fc0b3f05226020a94c75"; - sha256 = "1y9k63ac5i7mjqk1gazrm9w7avppbhc8cl5084d3rv7f4pgzn6cq"; + rev = "f590f6973fd7ae675a84743ab90a53dcdc36136d"; + sha256 = "00s3rvx67kmldzydb6j6s9w7va5ghwwq5ixv4m0xkvpsa24gbar4"; }; - meta.homepage = "https://github.com/echasnovski/mini.sessions/"; + meta.homepage = "https://github.com/nvim-mini/mini.sessions/"; meta.hydraPlatforms = [ ]; }; mini-snippets = buildVimPlugin { pname = "mini.snippets"; - version = "2025-08-12"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.snippets"; - rev = "752765aa04185d499e4f43506c434602eeb04e33"; - sha256 = "0b124ll40sshx97xb8lq63lci8fp6m296vh01654d848r30scaqw"; + rev = "c5e2d0aae10a299fd92834b6d68916c9c7ba14f2"; + sha256 = "0k9915ilqfwv927njr9gmpni7i2r77ij1m2jci281l1dpn12wn28"; }; - meta.homepage = "https://github.com/echasnovski/mini.snippets/"; + meta.homepage = "https://github.com/nvim-mini/mini.snippets/"; meta.hydraPlatforms = [ ]; }; mini-splitjoin = buildVimPlugin { pname = "mini.splitjoin"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.splitjoin"; - rev = "51909e9883ab206f5a92deb9ca685317387586a4"; - sha256 = "1rrpy2vf6dzxvrk4px4185zx5ci30d62hc7j5mqifv2br5gdlh0r"; + rev = "93b14b5e8e8107b77724b09763dcd6de58626af7"; + sha256 = "044naw7clk0ck522n35nmbhbz8l9jd2qda10lwdg0yinjfl8khf9"; }; - meta.homepage = "https://github.com/echasnovski/mini.splitjoin/"; + meta.homepage = "https://github.com/nvim-mini/mini.splitjoin/"; meta.hydraPlatforms = [ ]; }; mini-starter = buildVimPlugin { pname = "mini.starter"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.starter"; - rev = "aa1f05d40e59ddc652a7333a05e707bd9233b9d0"; - sha256 = "18y5k17vdlq1k93pnv7l7pd96g72zv4hp9q0fa4kh2r7ljn7zm7n"; + rev = "98e3ca7fa53fa7c011df576c22c52c7501eca245"; + sha256 = "16zx527acv13cj0ba4m9g6ya414a92hzbldbb99gnpbb96m6vhfd"; }; - meta.homepage = "https://github.com/echasnovski/mini.starter/"; + meta.homepage = "https://github.com/nvim-mini/mini.starter/"; meta.hydraPlatforms = [ ]; }; mini-statusline = buildVimPlugin { pname = "mini.statusline"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.statusline"; - rev = "f6917f4da995d64edf3728b1302dbd5d4561c912"; - sha256 = "17jvy7986d0f49cwq233aclwnq0zp8dhjdq3v66iijkg16kdrfq7"; + rev = "3c86b8a1cb67e347e91815b21662c28fd52ac144"; + sha256 = "092sl18f2n0wq6wy3jmbb5ap1wpcxj2wn3hv0880mqw1vv9x52pw"; }; - meta.homepage = "https://github.com/echasnovski/mini.statusline/"; + meta.homepage = "https://github.com/nvim-mini/mini.statusline/"; meta.hydraPlatforms = [ ]; }; mini-surround = buildVimPlugin { pname = "mini.surround"; - version = "2025-08-12"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.surround"; - rev = "7a8606333affe7ce637a0ba91bbafc46fc42bfa0"; - sha256 = "0znr2s0kq2lvfrgy2232wzhil2x71iv2pqigcfj47c4w0jhz86mc"; + rev = "953fb53aa1d0b2ae4506d35fff0e0e7afc8ceb8d"; + sha256 = "0g48c5wi0mgpyyi1430dqsb6176vrd87xzgzmm2ibafhq14aqdjs"; }; - meta.homepage = "https://github.com/echasnovski/mini.surround/"; + meta.homepage = "https://github.com/nvim-mini/mini.surround/"; meta.hydraPlatforms = [ ]; }; mini-tabline = buildVimPlugin { pname = "mini.tabline"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.tabline"; - rev = "c7bbf3e85ac1901bf170c7398ccdada8e4ea05b0"; - sha256 = "1l7aqxpc6ni6gkdqpp05w2pbsgj16f7ir9m9cd0qqwi3hjgm9cxq"; + rev = "033deb2f3e1f7eca6e4619da6e7facc9334c9658"; + sha256 = "0mnwcpywj5fq49qv5r1v8sd2n7c29y02jmpl4dlvcz7qgfmc4j9q"; }; - meta.homepage = "https://github.com/echasnovski/mini.tabline/"; + meta.homepage = "https://github.com/nvim-mini/mini.tabline/"; meta.hydraPlatforms = [ ]; }; mini-trailspace = buildVimPlugin { pname = "mini.trailspace"; - version = "2025-07-22"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.trailspace"; - rev = "3d570d015d63ad6d3f8a90f12c6b544c2400cea9"; - sha256 = "1xvrrnl4wkxhr4dsaii8ps96w88cdfmpgy1da23kpb0y3wxyjjf4"; + rev = "eb0756101087e941b22447c7564b79948a13f4d1"; + sha256 = "12ivcqzkjs97g0pplfy0csr97f7avc7zqa9br8z7rg87vvfgi3kb"; }; - meta.homepage = "https://github.com/echasnovski/mini.trailspace/"; + meta.homepage = "https://github.com/nvim-mini/mini.trailspace/"; meta.hydraPlatforms = [ ]; }; mini-visits = buildVimPlugin { pname = "mini.visits"; - version = "2025-08-16"; + version = "2025-08-28"; src = fetchFromGitHub { - owner = "echasnovski"; + owner = "nvim-mini"; repo = "mini.visits"; - rev = "065a8b3e7f1b7059c4c748a54034b6a113d91fe8"; - sha256 = "01fgxzr5p0hpdx18vv7y4zqyvqh9ad3lvjabfkd0nkc7wz216nzk"; + rev = "1ca5282c51c77ecd236ae3c123b5d7fbc6adf057"; + sha256 = "0nkw5511cgmlh98p3vyczcfz0bksqf8w6w25pypiar3ddg20aa1k"; }; - meta.homepage = "https://github.com/echasnovski/mini.visits/"; + meta.homepage = "https://github.com/nvim-mini/mini.visits/"; meta.hydraPlatforms = [ ]; }; @@ -8825,12 +8825,12 @@ final: prev: { molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2025-08-17"; + version = "2025-08-22"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "2f8a97d347d9dae08dea0d674c0852b05141ee09"; - sha256 = "09h51wvaqh5ryxkns8rbrhjc1mrqqi3bc40sxvzpg6slafxdi0hp"; + rev = "4e1c9997cb53b9d3236c5d6462d80119250ed5b7"; + sha256 = "0zyxaspflmj884ww0haava7na605lzbi482svsilgb7n0qfp1rq9"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; meta.hydraPlatforms = [ ]; @@ -8890,12 +8890,12 @@ final: prev: { multicursor-nvim = buildVimPlugin { pname = "multicursor.nvim"; - version = "2025-05-29"; + version = "2025-08-28"; src = fetchFromGitHub { owner = "jake-stewart"; repo = "multicursor.nvim"; - rev = "6fba38bccf45cfb681f4ff6098f886213f299a34"; - sha256 = "1d3lsxg9kmn4622nacn2ycg56ca3skazjaar0smc61v1asa8jhrm"; + rev = "35af2f31faf616f1b73a369cb4f695063b1ede03"; + sha256 = "1026k0ag6l74ai9ypygzk6bjbbfxc6c7j3jffvlxl2ff588vz11m"; }; meta.homepage = "https://github.com/jake-stewart/multicursor.nvim/"; meta.hydraPlatforms = [ ]; @@ -9202,12 +9202,12 @@ final: prev: { neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2025-08-17"; + version = "2025-08-28"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "bbeda076c8a2e7d16614287cd70239f577e5bf55"; - sha256 = "1705g7qkg3nm8gr8k7x44mjalm5dj5h2ww5qfspsapr2fj25fp0p"; + rev = "f1deac7ecec88c28a250d890ba7bb35843e69cbd"; + sha256 = "1n1a6cmy3h7m33v1f8cfjplnr6rw0qxh27v117i8f66v5p9hqlj4"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; meta.hydraPlatforms = [ ]; @@ -9228,12 +9228,12 @@ final: prev: { neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2025-08-20"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "48a2208cf74af1b4a2ed14b75435690e2925d262"; - sha256 = "1k6i88gh32b421yxfwj928sin9l94xq1d7hlpprn7r850mgj5hd2"; + rev = "d2455d8e9a6dc8133c0b5db6df391f408217a950"; + sha256 = "1z2p2cbl59iq78bpci6g4nh4lyyqz14mmc745im53hpr77nwmhwv"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; meta.hydraPlatforms = [ ]; @@ -9306,12 +9306,12 @@ final: prev: { neogit = buildVimPlugin { pname = "neogit"; - version = "2025-08-19"; + version = "2025-08-26"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "aec66c46c132a019296e9e73a2ef6d753bf15563"; - sha256 = "0vsk7kzl0s0915h69anvpa22ahjd32z830pvkass5wfkgj90vb1m"; + rev = "4046f747739cf7e7b9aada447f3edc59c947b111"; + sha256 = "1angqm8mi9z9k8qqp9c0lnw40a2zz3fmpca0xidvgjd3n3xdiis2"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; meta.hydraPlatforms = [ ]; @@ -9489,12 +9489,12 @@ final: prev: { neotest-ctest = buildVimPlugin { pname = "neotest-ctest"; - version = "2025-08-03"; + version = "2025-08-28"; src = fetchFromGitHub { owner = "orjangj"; repo = "neotest-ctest"; - rev = "d8e1f389e98d89cd3845bd83e8d1568802580297"; - sha256 = "05zsyx0clqfp8d719zmgyx1rqsi612xd424a2b1c60gpq811flz2"; + rev = "1677a4dc83383de44ee7729f0bdf626874aa1712"; + sha256 = "0psa473022sc9hihx14wlqk5vqcb9ghxv152axiwzszn43yf6czz"; }; meta.homepage = "https://github.com/orjangj/neotest-ctest/"; meta.hydraPlatforms = [ ]; @@ -9581,12 +9581,12 @@ final: prev: { neotest-golang = buildVimPlugin { pname = "neotest-golang"; - version = "2025-08-19"; + version = "2025-08-26"; src = fetchFromGitHub { owner = "fredrikaverpil"; repo = "neotest-golang"; - rev = "e892eeb585f8bb041eb50e9fc58d6d48f62c3717"; - sha256 = "0d7qkh3531ifwwywn746vc338dzcw3x6yj3b88shc41n283s4vr3"; + rev = "54a82ecf9413473a366b364e4e73da7cab35cef2"; + sha256 = "1a377ypq3cr5w50nn24gljhyj0ll1brasa3039mkbqicrdzr26sh"; }; meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/"; meta.hydraPlatforms = [ ]; @@ -9621,12 +9621,12 @@ final: prev: { neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2025-08-18"; + version = "2025-08-24"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "c9166b6793e95a9ec3046c39fb2f017c1865dd26"; - sha256 = "19k71s819bka3j7ni9yiz8mwn1w4m1jnd4mvn7vg0zfhvz4xl116"; + rev = "258687b21ab613da003f0f03f89fb777c1a5930a"; + sha256 = "0zl309ha6p22p7qsg42gma6fc1hyy7wq26jwvnf8a3bnlsdf14c4"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; meta.hydraPlatforms = [ ]; @@ -9647,12 +9647,12 @@ final: prev: { neotest-jest = buildVimPlugin { pname = "neotest-jest"; - version = "2025-08-02"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-jest"; - rev = "46ccc50273838f0b48e3c4814c1c46c0ccfe9edf"; - sha256 = "0nydhlxd96lagbjmbfrjj1mvn99dkhwamn01wlhm6kx6flj0863q"; + rev = "a119da28ad8c1481a2751044291c4494549d5f5c"; + sha256 = "05a5hpn7g696k3kzcdyxk6lpq42fyvrxs99ja8c7pk6b950dzb6c"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-jest/"; meta.hydraPlatforms = [ ]; @@ -9673,12 +9673,12 @@ final: prev: { neotest-mocha = buildVimPlugin { pname = "neotest-mocha"; - version = "2024-07-30"; + version = "2025-08-25"; src = fetchFromGitHub { owner = "adrigzr"; repo = "neotest-mocha"; - rev = "8239023d299a692784176f202f6a4a5e0a698ad2"; - sha256 = "sha256-Fbe7xuu5Qy6GXKsvQbVcE5oG7dgKjghuX470V7sjmqA="; + rev = "726283d3e963f4a1448a6555c87b74552d443257"; + sha256 = "0jfvwd0dgmh7c688flr59mbzb26217d3sj53jl2ryd1mv8m63jk5"; }; meta.homepage = "https://github.com/adrigzr/neotest-mocha/"; meta.hydraPlatforms = [ ]; @@ -9998,12 +9998,12 @@ final: prev: { nfnl = buildVimPlugin { pname = "nfnl"; - version = "2025-08-17"; + version = "2025-08-22"; src = fetchFromGitHub { owner = "Olical"; repo = "nfnl"; - rev = "eb30d38bffcd7e8f67f3d208a5d3e4cf2d844e12"; - sha256 = "1y5s1j6dxy2wrkhv45rzs4a6242fcvyvq0xby3n9v28k4sw44b1f"; + rev = "66409b6186a9e313f60f4690b0f46fa2da1ee476"; + sha256 = "1zgwcbqlq38bq9lbjr61lm2gkrgw2zym97p5kdwfz9bn5gljjcw5"; }; meta.homepage = "https://github.com/Olical/nfnl/"; meta.hydraPlatforms = [ ]; @@ -10115,12 +10115,12 @@ final: prev: { nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2025-08-21"; + version = "2025-08-26"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "d64b7088f257c3bd38bb6b9ef5be00d7a710c5d1"; - sha256 = "0ai0xfqx8gk8qgqx259aavn1nad1593cycrcwgdihrhdjcrysdhj"; + rev = "03939913a6b5e59ddf1842c4121ddb2587e2f939"; + sha256 = "0wb7wkfpyd7r5crkvqf30nj98npi1k4lzk4b2fpyqsh0k5dmm4cn"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; meta.hydraPlatforms = [ ]; @@ -10154,12 +10154,12 @@ final: prev: { no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2025-07-20"; + version = "2025-08-25"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "7bf83d3cfc8f6a120734f4254bbb87928756bea0"; - sha256 = "14bp8ksw3v3dw28nakxkhmzxvbwrn7kwnzpwx2zxxf1vn45az0cm"; + rev = "76ccd195fb2195ae1b9b9f0d539c517fa3f8a2b9"; + sha256 = "0f2wqd0i6sadvzzpbil0avi5sl6nzl7b57p5am2qf2m413lrzafc"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; meta.hydraPlatforms = [ ]; @@ -10193,12 +10193,12 @@ final: prev: { none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2025-08-05"; + version = "2025-08-25"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "5fcb73913a9290f78097e34420fe0e6130c5c33c"; - sha256 = "1z08ic5c8hknkqyivkpc4jvdqsispml0zllfnxhw59iyr48irw99"; + rev = "53ec77181d96494b9dc9457110dd62dc623cc78d"; + sha256 = "0z4wcbrxv955cmw6inrsg8iml2bjp0sfxx604hk582081yc2q9dp"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; meta.hydraPlatforms = [ ]; @@ -10310,12 +10310,12 @@ final: prev: { nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2025-08-08"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "af4407decaf6528cb21a7b0fd8925664c8e573c0"; - sha256 = "1r41jvjsx89jrjcc438wjlll8hjc0zm4fs2gs91fb7ch7r20p3sp"; + rev = "093b92b0491d1ae34c146696b3ab4682a9c5aaa9"; + sha256 = "1gwhdc8bhcpkkwm4il3i67746d735640gl6al89wk01kyf7b2mn5"; }; meta.homepage = "https://github.com/nvchad/ui/"; meta.hydraPlatforms = [ ]; @@ -10544,12 +10544,12 @@ final: prev: { nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2025-08-19"; + version = "2025-08-24"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "f777d1d20ed50c2f312e286892c062d9c2f1c6fe"; - sha256 = "1jqfmfsgyzfy4b5889sw6z40j59pywsgbiy5pw302r9pwwdizjyi"; + rev = "968f89f8aac11b6bdbfc942c71d3436658c1435f"; + sha256 = "11bcv5pgq59q8r26vr8k0vscvzhp9msmhvirw9fhynfz435qnxln"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; meta.hydraPlatforms = [ ]; @@ -10596,12 +10596,12 @@ final: prev: { nvim-dap-python = buildVimPlugin { pname = "nvim-dap-python"; - version = "2025-08-21"; + version = "2025-08-25"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap-python"; - rev = "679762ea611a37803090b5acb79fcc367a2d35b0"; - sha256 = "0n3qm932sr9x82b8xnvi34k9ai7jwqsqbqdysyv857gyh66mfsqv"; + rev = "030385d03363988370adaa5cf21fa465daddb088"; + sha256 = "15m68aymsh9s3insv3ivhzbsg1h9f5y2a570ihr90j9vccaspyl0"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; meta.hydraPlatforms = [ ]; @@ -10648,12 +10648,12 @@ final: prev: { nvim-dap-view = buildVimPlugin { pname = "nvim-dap-view"; - version = "2025-08-19"; + version = "2025-08-24"; src = fetchFromGitHub { owner = "igorlfs"; repo = "nvim-dap-view"; - rev = "e7dd190b7ef9c620e251d537b6404026d1d7d978"; - sha256 = "05nwp0wi1lqc0pwvwrb6gxg377k7hr4pr0v6bfgh4qv9q3hsfig2"; + rev = "efb540a4439f98dd32b5e89485def02fcc7b6f6d"; + sha256 = "1z4afy1qb9s1nr8cbnl7zyyhnkrvcxcrvjzvsal8lhi9wxhk2ivm"; }; meta.homepage = "https://github.com/igorlfs/nvim-dap-view/"; meta.hydraPlatforms = [ ]; @@ -10700,12 +10700,12 @@ final: prev: { nvim-early-retirement = buildVimPlugin { pname = "nvim-early-retirement"; - version = "2025-08-19"; + version = "2025-08-22"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-early-retirement"; - rev = "ef9fc0267da4204432ab7bf3ab9df359874cfeb6"; - sha256 = "14jhgpgqnkiryc4xccn99bwgqjcmhjly172nj3dfpjw2lizmkkzp"; + rev = "1a5b09db3874f9e2c5b3f332b372c8cc972370f8"; + sha256 = "15493nz9f56rd5d30mdy9igjcrml1hwcf203dj90hfhnmpdpx3ml"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-early-retirement/"; meta.hydraPlatforms = [ ]; @@ -10765,12 +10765,12 @@ final: prev: { nvim-genghis = buildVimPlugin { pname = "nvim-genghis"; - version = "2025-08-18"; + version = "2025-08-22"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-genghis"; - rev = "ff9cb27e2edfcde26ecd738c0f2ea835b1201b7e"; - sha256 = "1mknj2bg1hy17q4k2jfzlkndfsjdygaw755imzmm92vsq4fby3np"; + rev = "0fccd6f547d954607083b66d08043b8ed54dee7a"; + sha256 = "1w62hfcnr1i53s99mg6hgfllas59pp4x1y708ywq583mffz1wqqm"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/"; meta.hydraPlatforms = [ ]; @@ -10934,12 +10934,12 @@ final: prev: { nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; - version = "2025-06-13"; + version = "2025-08-28"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "4d77ff02063cf88963d5cf10683ab1fd15d072de"; - sha256 = "16sdq2ymrdnbm8667yairfji3md0w6c34qhssgahwb867185akzl"; + rev = "8eee2302598bad61c5674dc04d7e93cfd85f46f6"; + sha256 = "02hbiml5i6fw7cb3v7434jppvygl4rjngrf29ls2ridd1wqy6hlr"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; meta.hydraPlatforms = [ ]; @@ -11025,12 +11025,12 @@ final: prev: { nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2025-08-21"; + version = "2025-08-28"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "ee04d481d4e6089892c2fb2ad8924b1a053591e1"; - sha256 = "033qp7az1jgqplz2wglqimhydf33ajkkymgx2c44y79q8sw0lww4"; + rev = "f126af5345c7472e9a0cdbe1d1a29209be72c4c4"; + sha256 = "1qaxgsvbqn006q3lks7qcmlrrhc0i83fpbmrkr5nphc81xgjzlw4"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; meta.hydraPlatforms = [ ]; @@ -11077,12 +11077,12 @@ final: prev: { nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2025-08-21"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "0e268f5e0a398e77b2188aa94472b63daaa793b8"; - sha256 = "01n863qsly6cvsjpcyy495pp7ds180flslz14ysb92i83jphml48"; + rev = "408cf07b97535825cca6f1afa908d98348712ba6"; + sha256 = "1cf5b0wr89s6byxakvk5g5ch2cfn1x0m4x6yk1ig822ynp3scwnx"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; meta.hydraPlatforms = [ ]; @@ -11259,12 +11259,12 @@ final: prev: { nvim-origami = buildVimPlugin { pname = "nvim-origami"; - version = "2025-08-19"; + version = "2025-08-26"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-origami"; - rev = "5da8ffca21f303e53114ed6e5e1adc0827adf8e9"; - sha256 = "0pjxczb3vqdxra9bw5wxg5h1lcijbyp36vsbfzg47av4b8v40njz"; + rev = "44290197c47801b91ea569f1f6d8de8ce8693adb"; + sha256 = "1qf0cddakxwq1jv3dkpdkl1w64j88qg03mgax18667j6hd6km2bz"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-origami/"; meta.hydraPlatforms = [ ]; @@ -11285,12 +11285,12 @@ final: prev: { nvim-paredit = buildVimPlugin { pname = "nvim-paredit"; - version = "2025-07-21"; + version = "2025-08-22"; src = fetchFromGitHub { owner = "julienvincent"; repo = "nvim-paredit"; - rev = "86ef02ec249b41471545f07f1baa21615a9ba8fa"; - sha256 = "1msz4x23cq85vigj3njn7cinm8d0zbayb993wim8akmpzp7n24ci"; + rev = "b6ba636874a3115d944e35746444724240568aca"; + sha256 = "1q6sj4wl38v5px8px7lb5qa2kchac7bchqn6x6hgmycfb3lr45lx"; }; meta.homepage = "https://github.com/julienvincent/nvim-paredit/"; meta.hydraPlatforms = [ ]; @@ -11376,12 +11376,12 @@ final: prev: { nvim-rip-substitute = buildVimPlugin { pname = "nvim-rip-substitute"; - version = "2025-08-18"; + version = "2025-08-22"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-rip-substitute"; - rev = "b12256e1c3e717cc980adb16eb64232971f131f8"; - sha256 = "0854nrdpniakf5i9xn07748395k3milsdgj7x6qzrlsh8w4pcic3"; + rev = "8da3f01652b73712dc624c72fcdc537fb1b327b9"; + sha256 = "1jrq2rsa1vw3zdpvwdykr8rcn33s7f8hkgcm4479m9yzfcwpj4yg"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/"; meta.hydraPlatforms = [ ]; @@ -11389,12 +11389,12 @@ final: prev: { nvim-scissors = buildVimPlugin { pname = "nvim-scissors"; - version = "2025-08-02"; + version = "2025-08-25"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-scissors"; - rev = "d11c2ba40f7530d50534f977798054d25a95a8db"; - sha256 = "1id9flz427a57hq72anxk540hziigrikcz3p2vjvabby2b2l8zq0"; + rev = "1c65649b35e69539fc39edf801b1455686698ede"; + sha256 = "0i0l080axwjy4ksxvfq18bv4r7ax52yrijv4l8a4kqmr0xvihfid"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-scissors/"; meta.hydraPlatforms = [ ]; @@ -11493,12 +11493,12 @@ final: prev: { nvim-spider = buildVimPlugin { pname = "nvim-spider"; - version = "2025-08-18"; + version = "2025-08-22"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "a619b0d2799ae89b460a6461af74170b583193e5"; - sha256 = "0s39qzf43gbqazx7hlnf8fxj17apmm03i9wdyvv1pppg3d06cz76"; + rev = "53ba761cd40c1d683e8477d138ff03cd7e6e384a"; + sha256 = "02n0i7ifdy7gy6j05ihpi1vlx0l89fwvxv0azhmln6sga0dcd1ji"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; meta.hydraPlatforms = [ ]; @@ -11506,12 +11506,12 @@ final: prev: { nvim-surround = buildVimPlugin { pname = "nvim-surround"; - version = "2025-08-18"; + version = "2025-08-28"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "d56752df477ebd808cb82cea2fc68cf7455abb21"; - sha256 = "0j2gqmkwrkpyyv7qpvyvpazz009jb5s1kvjb1bqi9gn6bg0s9dbw"; + rev = "a868c256c861044beb9794b4dd126480dcdfbdad"; + sha256 = "01cw6paim1jv2wvjdb3r7qawfnbsnkiibpp9hc1zz53pbi3wzcmi"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; meta.hydraPlatforms = [ ]; @@ -11558,12 +11558,12 @@ final: prev: { nvim-tinygit = buildVimPlugin { pname = "nvim-tinygit"; - version = "2025-08-18"; + version = "2025-08-25"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-tinygit"; - rev = "b8d4d7a12427db58c774ac6807edd005b2bae71c"; - sha256 = "0z0wjw5ds3b361mp1lvl3r2c8mcfk64fw8cfdqvv4bjmc5r93yp5"; + rev = "bd38f10c10a29c08099a731ec098d1a42ecd4777"; + sha256 = "13rzzs63c4ff8sw9wala2gdcym85s5f0qdj2v4mcq76f2b7sjxkw"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-tinygit/"; meta.hydraPlatforms = [ ]; @@ -11571,12 +11571,12 @@ final: prev: { nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2025-08-20"; + version = "2025-08-25"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "f4fa6ebd3cbfa299fb554766c56b2f7cc1233f27"; - sha256 = "1z87vv5davz9jc3bqi90lrr4dxn5sdqjs45i7har8cmr8v5786d5"; + rev = "fefa335f1c8f690eb668a1efd18ee4fc6d64cd3e"; + sha256 = "087138m2536k9w1h0avd5gvyaaq0diszs52z7pkxy9zgvw6rv3z1"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; meta.hydraPlatforms = [ ]; @@ -11779,12 +11779,12 @@ final: prev: { nvim-various-textobjs = buildVimPlugin { pname = "nvim-various-textobjs"; - version = "2025-08-19"; + version = "2025-08-25"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-various-textobjs"; - rev = "8f0634188a607071a9a21b264a7f9b09f5fc5724"; - sha256 = "059wdcwkc4hka37fmxh10idgmjifsds0c0yaqkm0f4f123z8jh81"; + rev = "8fc1d6493880db6244e8ae8de0cbdd25daf6eb80"; + sha256 = "07b7vx974hvgrp6jcgfjf3by3yzpdcrl77xl3x33r7qy2k2acclf"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/"; meta.hydraPlatforms = [ ]; @@ -11935,12 +11935,12 @@ final: prev: { obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "2025-08-21"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "obsidian-nvim"; repo = "obsidian.nvim"; - rev = "e7818ca1f469dc90a3d7aef886531da11ffbe254"; - sha256 = "0ygvmg7xqxdbnfc40sl3xvcysnd8mxks2ri034pxic2ad3z6z8ga"; + rev = "d8027c1847c116ce257ebde4d50805b07397a5d3"; + sha256 = "1z4sl3wzwj9h36a13sc8qgxbskmarnwkhfgnz18mh9nal7lmzxzl"; }; meta.homepage = "https://github.com/obsidian-nvim/obsidian.nvim/"; meta.hydraPlatforms = [ ]; @@ -12169,12 +12169,12 @@ final: prev: { opencode-nvim = buildVimPlugin { pname = "opencode.nvim"; - version = "2025-08-21"; + version = "2025-08-27"; src = fetchFromGitHub { owner = "NickvanDyke"; repo = "opencode.nvim"; - rev = "e4bc3f05d71f12b6296125802512a08a69126d54"; - sha256 = "1kqnv9vrd02lbdc7l6kfbca0pccjp6ybcxxrf1ig49slwrl9zhkm"; + rev = "2fce982fc8080849afbe3db2ee4229ae9104af30"; + sha256 = "0599rijkm352326z5w1f7rdy9i03n2gs429vn6l5w9zd55v90a21"; }; meta.homepage = "https://github.com/NickvanDyke/opencode.nvim/"; meta.hydraPlatforms = [ ]; @@ -12195,12 +12195,12 @@ final: prev: { openscad-nvim = buildVimPlugin { pname = "openscad.nvim"; - version = "2025-04-04"; + version = "2025-08-22"; src = fetchFromGitHub { owner = "salkin-mada"; repo = "openscad.nvim"; - rev = "b78108a0a50c254d0964c790a1bd21ec5ec386ef"; - sha256 = "19rzgs859nn02c779r66xkgq1dgshcm04kg035srnjmjqbipm7ps"; + rev = "99d0fe6b4b1f5f0e8f749ebc64b5c3ad950d7e8f"; + sha256 = "141ys44qrvbl88q9ikqj6frd3q69fkama66rly6cq4x7zzicdd4d"; }; meta.homepage = "https://github.com/salkin-mada/openscad.nvim/"; meta.hydraPlatforms = [ ]; @@ -12208,12 +12208,12 @@ final: prev: { org-roam-nvim = buildVimPlugin { pname = "org-roam.nvim"; - version = "2025-08-12"; + version = "2025-08-24"; src = fetchFromGitHub { owner = "chipsenkbeil"; repo = "org-roam.nvim"; - rev = "e49b3bbce929a8f89042e1e251d37e9936dadc75"; - sha256 = "1igvhx7bacb0003n7h2pipj2hlz70ps3lczpy2zfy2ivr9vlwpxa"; + rev = "c48c6d1d2c73d5eefe3700b3c43937525bd5a741"; + sha256 = "0hf1jkphsb93h72hcag9skwcr3c2jnchsgi7y1bqgsgiwdb1vylk"; }; meta.homepage = "https://github.com/chipsenkbeil/org-roam.nvim/"; meta.hydraPlatforms = [ ]; @@ -12365,12 +12365,12 @@ final: prev: { papercolor-theme-slim = buildVimPlugin { pname = "papercolor-theme-slim"; - version = "2025-06-02"; + version = "2025-08-27"; src = fetchFromGitHub { owner = "pappasam"; repo = "papercolor-theme-slim"; - rev = "41338b61dd1ff8a12a711c7de355f1e48353c1d8"; - sha256 = "1npa7kfgxraw11mlsb9r55s6cy9hx0dsqw0mdmds30kl0m1wdvxg"; + rev = "48eb45ea2a50707e716306257e6233a15c20322c"; + sha256 = "0ss9mc8m8v31ipn32impfdfps0kc2didgwcb2cn0qi5v8w555flc"; }; meta.homepage = "https://github.com/pappasam/papercolor-theme-slim/"; meta.hydraPlatforms = [ ]; @@ -12417,12 +12417,12 @@ final: prev: { pckr-nvim = buildVimPlugin { pname = "pckr.nvim"; - version = "2025-06-11"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "lewis6991"; repo = "pckr.nvim"; - rev = "dcc0e2766d7a3a1911287fef7060ac07908cf376"; - sha256 = "1230zv396bfx962a5zmq5ng3bhzfqq76bcad1imc3gm99ihvnmin"; + rev = "aefa551d01615ca5bd98237a22c6ca47064f8b3c"; + sha256 = "12a5ks7m2hcxsz6akqfk7rk8sj12c0mhgxjdakj52l38ki1di69h"; }; meta.homepage = "https://github.com/lewis6991/pckr.nvim/"; meta.hydraPlatforms = [ ]; @@ -12769,12 +12769,12 @@ final: prev: { project-nvim = buildVimPlugin { pname = "project.nvim"; - version = "2025-08-21"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "DrKJeff16"; repo = "project.nvim"; - rev = "1328b1b445824d31bf8c5c810860103dac40c2dc"; - sha256 = "0y06gykqqh0qmkfq96cjxsg9w344w9iqidvfzgbcayp3mwlb3i69"; + rev = "67f14f9d489f9c7da1a4e50ac00dd99ab36fc4d5"; + sha256 = "1mg4dhcr3ya72ba3992rcydd83f07im3xsiyqq31b5jx6sf02yd5"; }; meta.homepage = "https://github.com/DrKJeff16/project.nvim/"; meta.hydraPlatforms = [ ]; @@ -12913,12 +12913,12 @@ final: prev: { quarto-nvim = buildVimPlugin { pname = "quarto-nvim"; - version = "2025-04-10"; + version = "2025-08-23"; src = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto-nvim"; - rev = "5325af3731ac9840b308791f08ad660958d76163"; - sha256 = "1vjam2g4nknqhnzz3x8qp2qbp6km8m7hs72qc459swpz6kvn2csv"; + rev = "0e9491509b38efbd83d3f41dbfacc7fc4bd40191"; + sha256 = "1vdlmmwbzw42hwk9x1dwrpk4012bwk7rymqaqaqh5f2zcwxhrhcb"; }; meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; meta.hydraPlatforms = [ ]; @@ -12939,12 +12939,12 @@ final: prev: { quicker-nvim = buildVimPlugin { pname = "quicker.nvim"; - version = "2025-05-15"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "stevearc"; repo = "quicker.nvim"; - rev = "51d3926f183c2d98fbc237cc237ae0926839af3a"; - sha256 = "0h6i5043g90hnxdf5gibld20bcfvi2sdld6y6bpzja0axkxsc6jm"; + rev = "6b88ca4d70e35df877d9564beba83f00ba0c3133"; + sha256 = "0kjqm5x3p1nsiqp0h8xvaia3x2z7mgp8j6hz2dm89sn443lrjqjq"; }; meta.homepage = "https://github.com/stevearc/quicker.nvim/"; meta.hydraPlatforms = [ ]; @@ -13160,12 +13160,12 @@ final: prev: { remote-nvim-nvim = buildVimPlugin { pname = "remote-nvim.nvim"; - version = "2025-08-21"; + version = "2025-08-22"; src = fetchFromGitHub { owner = "amitds1997"; repo = "remote-nvim.nvim"; - rev = "f0e271b84e6d820f1a2abf7f57bfb391e45d1b6c"; - sha256 = "153zxm31xfc1bmq2qarc1h6yrbh813lp1nac24cjya4y55irhxd1"; + rev = "9992c2fb8bf4f11aca2c8be8db286b506f92efcb"; + sha256 = "1svyb1hv66x0arzkcdh8kbyv8g4ihy52j2n2w9qxmwac1v2dmr61"; }; meta.homepage = "https://github.com/amitds1997/remote-nvim.nvim/"; meta.hydraPlatforms = [ ]; @@ -13199,12 +13199,12 @@ final: prev: { render-markdown-nvim = buildVimPlugin { pname = "render-markdown.nvim"; - version = "2025-08-21"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "MeanderingProgrammer"; repo = "render-markdown.nvim"; - rev = "c4ff9acddcf0f79b3187393319adb5cac5865bd3"; - sha256 = "0hvi2hq81i3lvv5wdkijdh2hxl4fxpgyknx0mp3w11729w3kwjk4"; + rev = "e76eb2e4262f0f0a1a7bd7a454dd7d44f1299afd"; + sha256 = "02bhhrc571vkmsm0rj4s9vzmfjx65dadas9dg11y618pzgbac8sc"; }; meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; meta.hydraPlatforms = [ ]; @@ -13317,12 +13317,12 @@ final: prev: { rose-pine = buildVimPlugin { pname = "rose-pine"; - version = "2025-07-18"; + version = "2025-08-24"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "72befaffeac38db7bdd49e0549eaa2c4806dd878"; - sha256 = "05f61gwsbppc14j6cabi30qrgj43i7sgal9r8b3qz7s5mcwaz0jx"; + rev = "72a04c4065345b51b56aed4859ea1d884f734097"; + sha256 = "144jffddwf727w4yqbikv2f46cny8r9z8mpkbc5ngzail5ldj0q8"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; meta.hydraPlatforms = [ ]; @@ -13708,12 +13708,12 @@ final: prev: { smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2025-08-15"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "dcdb68cf610e76573434f8cd21b37327d28cc8c4"; - sha256 = "1xaj1zrzzax0m120zn0qpf6qjf28vrwn7v76gwkc3iyjxh1z0543"; + rev = "1ac316e6ea719843fd80716d1105613c98632af1"; + sha256 = "1zg1awqafs4c7f52qkjnh42h51882m2wj7i5m11wd2cxmj5ya3ym"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; meta.hydraPlatforms = [ ]; @@ -13864,12 +13864,12 @@ final: prev: { sort-nvim = buildVimPlugin { pname = "sort.nvim"; - version = "2025-08-15"; + version = "2025-08-25"; src = fetchFromGitHub { owner = "sQVe"; repo = "sort.nvim"; - rev = "939f3f55536dbdaf68e9c9a37609d0ce9ba383c0"; - sha256 = "1a4cg7s4vj14xdy84c3zg64ghr79h8jgak1q68878c7rkw50sd9h"; + rev = "bb92140e1b96d62339bd5ab5b6df1eecca0d5da6"; + sha256 = "1q5akxh1vngq8pr5c5113fa4lmhccmwr38drn164wi10zcm5dl9g"; }; meta.homepage = "https://github.com/sQVe/sort.nvim/"; meta.hydraPlatforms = [ ]; @@ -15458,12 +15458,12 @@ final: prev: { treewalker-nvim = buildVimPlugin { pname = "treewalker.nvim"; - version = "2025-07-31"; + version = "2025-08-28"; src = fetchFromGitHub { owner = "aaronik"; repo = "treewalker.nvim"; - rev = "357f8e11bd4a6e0a7bb3a4e49bfe9e1ed91e55f8"; - sha256 = "0kzwv6dizakbfz3h75qnbz66isy4a8yaajdz50xp15ig1ps400c7"; + rev = "4b268cdd9d9b4bc6b06760dcf883734de84bfcd3"; + sha256 = "0pzzz0a72vnssdypisb4s8v55llx21gzzww51xadsbfah1c3nkcj"; }; meta.homepage = "https://github.com/aaronik/treewalker.nvim/"; meta.hydraPlatforms = [ ]; @@ -15497,12 +15497,12 @@ final: prev: { triptych-nvim = buildVimPlugin { pname = "triptych.nvim"; - version = "2025-05-18"; + version = "2025-08-22"; src = fetchFromGitHub { owner = "simonmclean"; repo = "triptych.nvim"; - rev = "3ee33448571ce7f32dc1017635af7ce94ecbc1b4"; - sha256 = "0rnxmgk5s95ppxskn9csdvyip3bnr6bzvs94visbm8lqjijs3sng"; + rev = "f30e48d8861adc69de01d65099d7b8922fb34f54"; + sha256 = "1ra5h9jcja6g8p8jrvwc4ypk26ql16lxagh7sl0p3p0aq90l8a1n"; fetchSubmodules = true; }; meta.homepage = "https://github.com/simonmclean/triptych.nvim/"; @@ -15732,12 +15732,12 @@ final: prev: { ultimate-autopair-nvim = buildVimPlugin { pname = "ultimate-autopair.nvim"; - version = "2025-08-17"; + version = "2025-08-28"; src = fetchFromGitHub { owner = "altermo"; repo = "ultimate-autopair.nvim"; - rev = "e65731d50c548c020f3961bb42071671f0fa923c"; - sha256 = "1japs52c9q6x0fk8dzrsy5mkv81dxwhs0h24yj4k9mnna17yc6qg"; + rev = "2479d645ab96b968dd1bf15930f74b3682448466"; + sha256 = "1bmjjs5x88p4yacy27a2l0rlx7vcfbjg7z2xp0vv9jrdsix86yaa"; }; meta.homepage = "https://github.com/altermo/ultimate-autopair.nvim/"; meta.hydraPlatforms = [ ]; @@ -15823,12 +15823,12 @@ final: prev: { unison = buildVimPlugin { pname = "unison"; - version = "2025-08-19"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "c9c45fc5241b48c333e9b8101f85039bdfe1dc46"; - sha256 = "1glqzw4y3p13nsdlv5jyx78am3p4h0nidij0z1gk0p4q5cfwsw45"; + rev = "e1b98c8608fcce3c79c8e09f9d3e507175c9ac56"; + sha256 = "0zhp3s0nr0pjzm2r5ry45cdig24wddlzfx2c31x43pc2j2l4s4xi"; }; meta.homepage = "https://github.com/unisonweb/unison/"; meta.hydraPlatforms = [ ]; @@ -15927,12 +15927,12 @@ final: prev: { vague-nvim = buildVimPlugin { pname = "vague.nvim"; - version = "2025-08-20"; + version = "2025-08-24"; src = fetchFromGitHub { owner = "vague2k"; repo = "vague.nvim"; - rev = "6c44ca64a7efc89bb86f501602e6ddd51bc92b3a"; - sha256 = "02r0wy9db7dlbynv9hqmwpf3mdilwvx1x4g1wdi2vgmf339ynwb7"; + rev = "f3620ef32fe8b756398d8dbed60166b2af6ea796"; + sha256 = "19bh34wg3320w3v9njp00r3pr5xf97gsglh5rygfpv7v05r03wnk"; }; meta.homepage = "https://github.com/vague2k/vague.nvim/"; meta.hydraPlatforms = [ ]; @@ -15966,12 +15966,12 @@ final: prev: { vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2025-07-24"; + version = "2025-08-22"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "57d24bebbeaac26970e87935bc7ff2b19d94e877"; - sha256 = "1i6adrban6psqgaizd48syk5hzai5apry7zzc15lv2q1060b3mlw"; + rev = "efeded48a0dedbcf6fa5c4caadc385f4a908b4e0"; + sha256 = "0x63qrq5gqrpfm96mg9bjdf41bf3qzwnagwabawqxl49s0lga4hi"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; meta.hydraPlatforms = [ ]; @@ -17201,12 +17201,12 @@ final: prev: { vim-dadbod-ui = buildVimPlugin { pname = "vim-dadbod-ui"; - version = "2025-06-02"; + version = "2025-08-24"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "2900a1617b3df1a48683d872eadbe1101146a49a"; - sha256 = "070x8c82a29ik68qy71j6dbznakc5vzr2b3kyicaiindbqavcbgv"; + rev = "e8b53c0f3aa6e6127ac2a2d2071d9aade6c6e373"; + sha256 = "014hzw3fh7v9zp3i6s1rv11i0gg8wv1qz4acs9nmwlmyir400jz9"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; meta.hydraPlatforms = [ ]; @@ -17968,12 +17968,12 @@ final: prev: { vim-gitgutter = buildVimPlugin { pname = "vim-gitgutter"; - version = "2025-05-26"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "85ca3a087204e3a32cb2faa5d9d0451524e08720"; - sha256 = "0prwv82rg95h1pvvf5vfz8dq0raa3mb1cla5r5101hpzz39pdr5x"; + rev = "488c0555e47e2aabe273c635f7dd233e985311a6"; + sha256 = "0h010qpqphkrh42r6p0avf5wplfdddc9vk4aq2xsnv5zn56nkbqj"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; meta.hydraPlatforms = [ ]; @@ -18059,11 +18059,11 @@ final: prev: { vim-graphql = buildVimPlugin { pname = "vim-graphql"; - version = "2025-05-25"; + version = "2025-08-25"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "3583ea204e5d51529a56c9e9aecf4bfd9cfc6120"; + rev = "c3ff332820a758553d691cf8cc228623c9b02326"; sha256 = "1mkvgzn0khjqj32hyasbh4jv6zzqy2i9kcwh72dv6ig99wjz9wf1"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; @@ -18124,12 +18124,12 @@ final: prev: { vim-habamax = buildVimPlugin { pname = "vim-habamax"; - version = "2025-08-18"; + version = "2025-08-22"; src = fetchFromGitHub { owner = "habamax"; repo = "vim-habamax"; - rev = "0016f249614b4aee33a2556efb29d7299bd5cf0f"; - sha256 = "0iv7krz4li40a9096ql09zlb7lq3wzr10d3a1vi97jxkdzwsxgp6"; + rev = "ec1e5f752c68d0faff962494b37d779c2308180f"; + sha256 = "1rbzlvv9hp5z7ggal320dwy8khzcb0fah15cbj342j7vfnnkp47k"; }; meta.homepage = "https://github.com/habamax/vim-habamax/"; meta.hydraPlatforms = [ ]; @@ -19140,12 +19140,12 @@ final: prev: { vim-matchup = buildVimPlugin { pname = "vim-matchup"; - version = "2025-08-14"; + version = "2025-08-26"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "704c9d98e686836ae1c4b6c4ea5b057ecf5fbbca"; - sha256 = "0r6k5hyr2a99q9k93b1qvj726hcvzyg6l6wwk7irgdixamqx8039"; + rev = "347c890d51ae8e63239e92c935d2297c94975538"; + sha256 = "0djrx32hhkvhj3im7b4q1kaini7zj0vbgcaj9c5gcnswplfpwc9p"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; meta.hydraPlatforms = [ ]; @@ -19881,12 +19881,12 @@ final: prev: { vim-polyglot = buildVimPlugin { pname = "vim-polyglot"; - version = "2024-12-04"; + version = "2025-08-27"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "f5393cfee07aeb666f4d75f9b3a83163862fb094"; - sha256 = "05navypzrz1ck1vmf60rnmscisxy7gfi3ic749vqmr7prmdbavp6"; + rev = "f061eddb7cdcc614c8406847b2bfb53099832a4e"; + sha256 = "03vn7zhdx55f8fi843v5d6jfascrs4yy6sjdx7rmaw9n2w553hhr"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; meta.hydraPlatforms = [ ]; @@ -19985,12 +19985,12 @@ final: prev: { vim-prosession = buildVimPlugin { pname = "vim-prosession"; - version = "2024-06-13"; + version = "2025-08-22"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-prosession"; - rev = "4b8323d4e9b74afe9132a34b2d7ea6cfa9461550"; - sha256 = "0xhbqphjldw5ygxmblx9r2zgbda1dgc2h0py6h05ss43cdvzikwa"; + rev = "df3677ac974a08b054915db461bf5fd4599da103"; + sha256 = "0mbgnbhrvmq6rccbwfsx0bv0rym9hjsnfkd4sgclcjwmgpsnk1sk"; }; meta.homepage = "https://github.com/dhruvasagar/vim-prosession/"; meta.hydraPlatforms = [ ]; @@ -20427,12 +20427,12 @@ final: prev: { vim-signify = buildVimPlugin { pname = "vim-signify"; - version = "2025-07-28"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "54346382be614ef5934cbbe204fd58ba3247a84d"; - sha256 = "0gqi64rw1zcrgs96gmbgg1xjwp25izam02m1qjd7g07p5x25hzc1"; + rev = "1a94c4124cd7d5b2f73352f7be38c14bd7441350"; + sha256 = "007cfd11mbr30zq3v2q2p3s6614whisdzg3kc0gsbgrryyx23mv3"; }; meta.homepage = "https://github.com/mhinz/vim-signify/"; meta.hydraPlatforms = [ ]; @@ -20492,12 +20492,12 @@ final: prev: { vim-slime = buildVimPlugin { pname = "vim-slime"; - version = "2025-04-22"; + version = "2025-08-25"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "507107dd24c9b85721fa589462fd5068e0f70266"; - sha256 = "0vpn8dfxzc5f2scc1ydl25fk4rxbnv849z00h1abzh73ysa3mpaq"; + rev = "67b24bf93cff3ac39db94694a7aefcdb3f44b927"; + sha256 = "1x2z8arn6zkmilq75qs3l66qdvgay28zi85q0i1q0zxl365nhl16"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; meta.hydraPlatforms = [ ]; @@ -20674,12 +20674,12 @@ final: prev: { vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "2025-08-20"; + version = "2025-08-28"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "77bf035687275b503a624360738796fe0e0c5177"; - sha256 = "0ampix9ajrz570778k8qvyq9yq6wfvchz6blpqkviahviiwsjcz3"; + rev = "c01f43e276aa32ce26a746fa858e26b9b8d815d7"; + sha256 = "00x39581pfjlcgdw97vb89w8ghmyhj2yvib3fpkb2yjc57nj0lx7"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; meta.hydraPlatforms = [ ]; @@ -20687,12 +20687,12 @@ final: prev: { vim-splunk = buildVimPlugin { pname = "vim-splunk"; - version = "2024-08-10"; + version = "2025-08-25"; src = fetchFromGitHub { owner = "yorokobi"; repo = "vim-splunk"; - rev = "827cdf8d9f6940eea146e6571a1086ed7a4061eb"; - sha256 = "08f5c14ic4mr039by2ml9xf6b2l2rylgjj5q3m7gj29n7mn1zzc7"; + rev = "b6306fc0105caa3ff9d8a2bb0a858a691a98a4af"; + sha256 = "084zqx5d5mw5z8njd5yyf7kn0m36sax5mcx1vwhmxgmxh0zhv9vi"; }; meta.homepage = "https://github.com/yorokobi/vim-splunk/"; meta.hydraPlatforms = [ ]; @@ -20948,12 +20948,12 @@ final: prev: { vim-test = buildVimPlugin { pname = "vim-test"; - version = "2025-08-20"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "35f286da462d544a78810b7606778d3467ef4369"; - sha256 = "06wj34s05zwfifjw5a96nva0v0w7ml19g4040ybs0iibcibh6dl0"; + rev = "8c76f6c0953edaa13a37c29ac9c6a7bb56ddce89"; + sha256 = "0qs7dikmilcwp7hsjwscy2h7msqbiz64lqq9wv0c4fh8g4n4p1nh"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; meta.hydraPlatforms = [ ]; @@ -21052,12 +21052,12 @@ final: prev: { vim-themis = buildVimPlugin { pname = "vim-themis"; - version = "2024-04-06"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-themis"; - rev = "c1f4d465ce7dd23735513551b5c4c918d9c1bab1"; - sha256 = "1vzwjpn3jr3ayal2pjr2qb36mal2pa8szbf83nqzb2awa1lv1ds1"; + rev = "355c34b1bff03a8fd3744e3ad2dd0627c0692716"; + sha256 = "0rarfik723i2fb5fzbk69hlw20khazw6bfr34hlkvkyljfksdpv7"; }; meta.homepage = "https://github.com/thinca/vim-themis/"; meta.hydraPlatforms = [ ]; @@ -21403,12 +21403,12 @@ final: prev: { vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; - version = "2025-07-27"; + version = "2025-08-28"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "3403495670f0ee08887401a28f8430dc4ac67429"; - sha256 = "09f6il3ydxli829klnk0whn0rrcnc7ps7dgfxmikyk1s4hq38k5x"; + rev = "ecba6015dd9a8c7657583efcdcd95c362e5ed20b"; + sha256 = "11k33nivca1v8p3x34ga9sd62jxzg34ggk1vxrr6hv4by0c8pm05"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; meta.hydraPlatforms = [ ]; @@ -21754,12 +21754,12 @@ final: prev: { vimspector = buildVimPlugin { pname = "vimspector"; - version = "2025-07-24"; + version = "2025-08-26"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "a1ee02d4e5df05d411e93740465db1177ba42b4c"; - sha256 = "18dlc58r3i9wwfra4838jixlv4hcs7sqjss2x6i6zicwx3p54ph7"; + rev = "cc01dc81a5bef35c8073da2bae2b2b0f70652e90"; + sha256 = "1jyknd284jjjpnbyahdw5j02xwjdxnnfpxs51dpzp38hd9gn8pxs"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -21768,12 +21768,12 @@ final: prev: { vimtex = buildVimPlugin { pname = "vimtex"; - version = "2025-08-17"; + version = "2025-08-23"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "c74d9927d9ac2fd24f965634ab56fc5d3c0a60a7"; - sha256 = "0pjy088rf3j3jrbia8wpxhb6d8vdqkbc3niyb5mrnd6fczxd7iiz"; + rev = "dc90feacb86f7b85b0b791d8073eefc769a23725"; + sha256 = "07vm6nwd31zv19yifbfc61mpxyhdc378dz6b90b9lzm1lcc07waw"; }; meta.homepage = "https://github.com/lervag/vimtex/"; meta.hydraPlatforms = [ ]; @@ -22302,12 +22302,12 @@ final: prev: { yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "2025-08-21"; + version = "2025-08-28"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "f3c747e616651ff97d31373a335c8479bab2af2a"; - sha256 = "19i0hpg9kj0i1s7qq3a5spbf4hygi79ms383h3jhp5cyg794ik1d"; + rev = "12409d3288683fa1836a022cc86431c1f0e3c093"; + sha256 = "0ppbcibfdswg7ndwc17ikwj63cnyf4xmih365g03isd7grs72c6y"; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; meta.hydraPlatforms = [ ]; @@ -22497,12 +22497,12 @@ final: prev: { zoxide-vim = buildVimPlugin { pname = "zoxide.vim"; - version = "2023-10-23"; + version = "2025-08-25"; src = fetchFromGitHub { owner = "nanotee"; repo = "zoxide.vim"; - rev = "b1e70b6fc1682a83929aee63680d2b43456fe9a5"; - sha256 = "025rqfs0n2ryi7xwzpq5h2r7jhvxbrb2gjp6fqa072hapgqr0igb"; + rev = "520d1abeb71ba42989a842251f8ba5c46be89aab"; + sha256 = "11nga7l5zc8m57y3d85016p0zxw6zywn9fcnyxjarfw5998s5ll9"; }; meta.homepage = "https://github.com/nanotee/zoxide.vim/"; meta.hydraPlatforms = [ ]; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index cea9ccf904a8..aaaf7e3c9491 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -190,6 +190,7 @@ in checkInputs = with self; [ lualine-nvim telescope-nvim + fzf-lua ]; }; @@ -2902,7 +2903,6 @@ in (replaceVars ./patches/openscad.nvim/program_paths.patch { htop = lib.getExe htop; openscad = lib.getExe openscad; - zathura = lib.getExe zathura; }) ]; }; diff --git a/pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch b/pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch index c3b1368577f3..1773fed655ae 100644 --- a/pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch +++ b/pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch @@ -2,18 +2,9 @@ diff --git a/autoload/health/openscad_nvim.vim b/autoload/health/openscad_nvim.v index d6d4b4c..9853877 100644 --- a/autoload/health/openscad_nvim.vim +++ b/autoload/health/openscad_nvim.vim -@@ -7,7 +7,7 @@ function! s:check_nvim_version_minimum() abort - endfunction - - function! s:check_zathura_installed() abort -- if !executable('zathura') -+ if !executable('@zathura@') - call v:lua.vim.health.error('has(zathura)','install zathura') - else - call v:lua.vim.health.ok("zathura is installed") @@ -15,7 +15,7 @@ function! s:check_zathura_installed() abort endfunction - + function! s:check_htop_installed() abort - if !executable('htop') + if !executable('@htop@') @@ -24,15 +15,6 @@ diff --git a/lua/openscad.lua b/lua/openscad.lua index 0a26d08..1264989 100644 --- a/lua/openscad.lua +++ b/lua/openscad.lua -@@ -101,7 +101,7 @@ end - - function M.manual() - local path = U.openscad_nvim_root_dir .. U.path_sep .. "help_source" .. U.path_sep .. "openscad-manual.pdf" -- api.nvim_command('silent !zathura --fork ' .. path) -+ api.nvim_command('silent !@zathura@ --fork ' .. path) - end - - function M.help() @@ -126,7 +126,7 @@ function M.exec_openscad() jobCommand = '/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD ' .. filename else @@ -40,5 +22,5 @@ index 0a26d08..1264989 100644 - jobCommand = 'openscad ' .. filename + jobCommand = '@openscad@ ' .. filename end - + vim.fn.jobstart(jobCommand) From e9e0a0984f12a44238ed7e8f21ab6ac5107078fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 30 Aug 2025 00:24:54 +0200 Subject: [PATCH 188/305] nixos/plymouth: dedupe theme check --- nixos/modules/system/boot/plymouth.nix | 179 ++++++++++++------------- 1 file changed, 89 insertions(+), 90 deletions(-) diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 270f562459c9..3e93bf0433a7 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -67,6 +67,14 @@ let ${cfg.extraConfig} ''; + checkIfThemeExists = '' + # Check if the actual requested theme is here + if [[ ! -d ${themesEnv}/share/plymouth/themes/${cfg.theme} ]]; then + echo "The requested theme: ${cfg.theme} is not provided by any of the packages in boot.plymouth.themePackages" + echo "The following themes exist: $(ls ${themesEnv}/share/plymouth/themes/)" + exit 1 + fi + ''; in { @@ -188,50 +196,42 @@ in "/etc/plymouth/logo.png".source = cfg.logo; "/etc/plymouth/plymouthd.defaults".source = "${plymouth}/share/plymouth/plymouthd.defaults"; # Directories - "/etc/plymouth/plugins".source = pkgs.runCommand "plymouth-initrd-plugins" { } '' - # Check if the actual requested theme is here - if [[ ! -d ${themesEnv}/share/plymouth/themes/${cfg.theme} ]]; then - echo "The requested theme: ${cfg.theme} is not provided by any of the packages in boot.plymouth.themePackages" - echo "The following themes exist: $(ls ${themesEnv}/share/plymouth/themes/)" - exit 1 - fi + "/etc/plymouth/plugins".source = pkgs.runCommand "plymouth-initrd-plugins" { } ( + checkIfThemeExists + + '' + moduleName="$(sed -n 's,ModuleName *= *,,p' ${themesEnv}/share/plymouth/themes/${cfg.theme}/${cfg.theme}.plymouth)" - moduleName="$(sed -n 's,ModuleName *= *,,p' ${themesEnv}/share/plymouth/themes/${cfg.theme}/${cfg.theme}.plymouth)" - - mkdir -p $out/renderers - # module might come from a theme - cp ${themesEnv}/lib/plymouth/*.so $out - cp ${plymouth}/lib/plymouth/renderers/*.so $out/renderers - # useless in the initrd, and adds several megabytes to the closure - rm $out/renderers/x11.so - ''; - "/etc/plymouth/themes".source = pkgs.runCommand "plymouth-initrd-themes" { } '' - # Check if the actual requested theme is here - if [[ ! -d ${themesEnv}/share/plymouth/themes/${cfg.theme} ]]; then - echo "The requested theme: ${cfg.theme} is not provided by any of the packages in boot.plymouth.themePackages" - echo "The following themes exist: $(ls ${themesEnv}/share/plymouth/themes/)" - exit 1 - fi - - mkdir -p $out/${cfg.theme} - cp -r ${themesEnv}/share/plymouth/themes/${cfg.theme}/* $out/${cfg.theme} - # Copy more themes if the theme depends on others - for theme in $(grep -hRo '/share/plymouth/themes/.*$' $out | xargs -n1 basename); do - if [[ -d "${themesEnv}/share/plymouth/themes/$theme" ]]; then - if [[ ! -d "$out/$theme" ]]; then - echo "Adding dependent theme: $theme" - mkdir -p "$out/$theme" - cp -r "${themesEnv}/share/plymouth/themes/$theme"/* "$out/$theme" - fi - else - echo "Missing theme dependency: $theme" - fi - done - # Fixup references - for theme in $out/*/*.plymouth; do - sed -i "s,${builtins.storeDir}/.*/share/plymouth/themes,$out," "$theme" - done - ''; + mkdir -p $out/renderers + # module might come from a theme + cp ${themesEnv}/lib/plymouth/*.so $out + cp ${plymouth}/lib/plymouth/renderers/*.so $out/renderers + # useless in the initrd, and adds several megabytes to the closure + rm $out/renderers/x11.so + '' + ); + "/etc/plymouth/themes".source = pkgs.runCommand "plymouth-initrd-themes" { } ( + checkIfThemeExists + + '' + mkdir -p $out/${cfg.theme} + cp -r ${themesEnv}/share/plymouth/themes/${cfg.theme}/* $out/${cfg.theme} + # Copy more themes if the theme depends on others + for theme in $(grep -hRo '/share/plymouth/themes/.*$' $out | xargs -n1 basename); do + if [[ -d "${themesEnv}/share/plymouth/themes/$theme" ]]; then + if [[ ! -d "$out/$theme" ]]; then + echo "Adding dependent theme: $theme" + mkdir -p "$out/$theme" + cp -r "${themesEnv}/share/plymouth/themes/$theme"/* "$out/$theme" + fi + else + echo "Missing theme dependency: $theme" + fi + done + # Fixup references + for theme in $out/*/*.plymouth; do + sed -i "s,${builtins.storeDir}/.*/share/plymouth/themes,$out," "$theme" + done + '' + ); # Fonts "/etc/plymouth/fonts".source = pkgs.runCommand "plymouth-initrd-fonts" { } '' @@ -285,63 +285,62 @@ in '') ]; - boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) '' - copy_bin_and_libs ${plymouth}/bin/plymouth - copy_bin_and_libs ${plymouth}/bin/plymouthd + boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) ( + '' + copy_bin_and_libs ${plymouth}/bin/plymouth + copy_bin_and_libs ${plymouth}/bin/plymouthd - # Check if the actual requested theme is here - if [[ ! -d ${themesEnv}/share/plymouth/themes/${cfg.theme} ]]; then - echo "The requested theme: ${cfg.theme} is not provided by any of the packages in boot.plymouth.themePackages" - echo "The following themes exist: $(ls ${themesEnv}/share/plymouth/themes/)" - exit 1 - fi + '' + + checkIfThemeExists + + '' - moduleName="$(sed -n 's,ModuleName *= *,,p' ${themesEnv}/share/plymouth/themes/${cfg.theme}/${cfg.theme}.plymouth)" + moduleName="$(sed -n 's,ModuleName *= *,,p' ${themesEnv}/share/plymouth/themes/${cfg.theme}/${cfg.theme}.plymouth)" - mkdir -p $out/lib/plymouth/renderers - # module might come from a theme - cp ${themesEnv}/lib/plymouth/*.so $out/lib/plymouth - cp ${plymouth}/lib/plymouth/renderers/*.so $out/lib/plymouth/renderers - # useless in the initrd, and adds several megabytes to the closure - rm $out/lib/plymouth/renderers/x11.so + mkdir -p $out/lib/plymouth/renderers + # module might come from a theme + cp ${themesEnv}/lib/plymouth/*.so $out/lib/plymouth + cp ${plymouth}/lib/plymouth/renderers/*.so $out/lib/plymouth/renderers + # useless in the initrd, and adds several megabytes to the closure + rm $out/lib/plymouth/renderers/x11.so - mkdir -p $out/share/plymouth/themes - cp ${plymouth}/share/plymouth/plymouthd.defaults $out/share/plymouth + mkdir -p $out/share/plymouth/themes + cp ${plymouth}/share/plymouth/plymouthd.defaults $out/share/plymouth - # Copy themes into working directory for patching - mkdir themes + # Copy themes into working directory for patching + mkdir themes - # Use -L to copy the directories proper, not the symlinks to them. - # Copy all themes because they're not large assets, and bgrt depends on the ImageDir of - # the spinner theme. - cp -r -L ${themesEnv}/share/plymouth/themes/* themes + # Use -L to copy the directories proper, not the symlinks to them. + # Copy all themes because they're not large assets, and bgrt depends on the ImageDir of + # the spinner theme. + cp -r -L ${themesEnv}/share/plymouth/themes/* themes - # Patch out any attempted references to the theme or plymouth's themes directory - chmod -R +w themes - find themes -type f | while read file - do - sed -i "s,${builtins.storeDir}/.*/share/plymouth/themes,$out/share/plymouth/themes,g" $file - done + # Patch out any attempted references to the theme or plymouth's themes directory + chmod -R +w themes + find themes -type f | while read file + do + sed -i "s,${builtins.storeDir}/.*/share/plymouth/themes,$out/share/plymouth/themes,g" $file + done - # Install themes - cp -r themes/* $out/share/plymouth/themes + # Install themes + cp -r themes/* $out/share/plymouth/themes - # Install logo - mkdir -p $out/etc/plymouth - cp -r -L ${themesEnv}/etc/plymouth $out/etc + # Install logo + mkdir -p $out/etc/plymouth + cp -r -L ${themesEnv}/etc/plymouth $out/etc - # Setup font - mkdir -p $out/share/fonts - cp ${cfg.font} $out/share/fonts - mkdir -p $out/etc/fonts - cat > $out/etc/fonts/fonts.conf < - - - $out/share/fonts - - EOF - ''; + # Setup font + mkdir -p $out/share/fonts + cp ${cfg.font} $out/share/fonts + mkdir -p $out/etc/fonts + cat > $out/etc/fonts/fonts.conf < + + + $out/share/fonts + + EOF + '' + ); boot.initrd.extraUtilsCommandsTest = mkIf (!config.boot.initrd.systemd.enable) '' $out/bin/plymouthd --help >/dev/null From 24212ab73ea725eae604cdec8f10bede24cb5ccd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 00:01:39 +0000 Subject: [PATCH 189/305] simplex-chat-desktop: 6.4.3.1 -> 6.4.4 --- pkgs/by-name/si/simplex-chat-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index b36c783ea5e9..00e72f03b04d 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -7,11 +7,11 @@ let pname = "simplex-chat-desktop"; - version = "6.4.3.1"; + version = "6.4.4"; src = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-rFNatd7mC96WrX6imDOdEMNkSokiSeYq0oFRh/HTEC8="; + hash = "sha256-yL/WNdq3egTzalwheYDreMgxUJXqUEe45c9k0eXX7Wg="; }; appimageContents = appimageTools.extract { From 4701c90768d9892021c57f220e6ed41adcbd039f Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 29 Aug 2025 18:52:56 -0500 Subject: [PATCH 190/305] vimPlugins.nvim-treesitter: update grammars Signed-off-by: Austin Horstman --- .../vim/plugins/nvim-treesitter/generated.nix | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index e38a3a9eb3a8..9d11c97f8483 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -66,12 +66,12 @@ }; arduino = buildGrammar { language = "arduino"; - version = "0.0.0+rev=3b5ddcd"; + version = "0.0.0+rev=2f0c122"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-arduino"; - rev = "3b5ddcdbcac43c6084358d3d14a30e10e2d36b88"; - hash = "sha256-qoVN/84BbuvhTb+WuwmTtNGqf9mKelViHMIVjMqyvG4="; + rev = "2f0c1223c50aa4b754136db544204c6fc99ffc77"; + hash = "sha256-t0EtibjsMJpiTbwhkgZGv9lUdpI6gg2VoSEUDXswEMA="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-arduino"; }; @@ -652,12 +652,12 @@ }; elixir = buildGrammar { language = "elixir"; - version = "0.0.0+rev=b848e63"; + version = "0.0.0+rev=d24cece"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "tree-sitter-elixir"; - rev = "b848e63e9f2a68accff0332392f07582c046295a"; - hash = "sha256-kMsGDHFGBclpyk9n01JJsoqInEWLEcyIUSgcWJ2Jpzk="; + rev = "d24cecee673c4c770f797bac6f87ae4b6d7ddec5"; + hash = "sha256-nSXXMPneL/sTdkpcsxUz73DiXVuNxVHnf8b2LTbAUs8="; }; meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir"; }; @@ -1413,12 +1413,12 @@ }; inko = buildGrammar { language = "inko"; - version = "0.0.0+rev=f58a87a"; + version = "0.0.0+rev=74cbd0f"; src = fetchFromGitHub { owner = "inko-lang"; repo = "tree-sitter-inko"; - rev = "f58a87ac4dc6a7955c64c9e4408fbd693e804686"; - hash = "sha256-hZdbF9lw7fR5K8UfUaESS7/c4v9u7vEcSylEEbc6//4="; + rev = "74cbd0f69053b4a9ad4fed8831dee983ec7e4990"; + hash = "sha256-nrhouUE2vjHiTlLquCJf2IUF3vy9vlBL6LuAmeKcB8M="; }; meta.homepage = "https://github.com/inko-lang/tree-sitter-inko"; }; @@ -1457,12 +1457,12 @@ }; javadoc = buildGrammar { language = "javadoc"; - version = "0.0.0+rev=77afe93"; + version = "0.0.0+rev=384952d"; src = fetchFromGitHub { owner = "rmuir"; repo = "tree-sitter-javadoc"; - rev = "77afe93bc6fc10f2cf4935857b8e055b2a47bb94"; - hash = "sha256-HkhVHPYe+IgVkRlJu72Y+3eNZnPPpDqs6UJ0ej0PZrI="; + rev = "384952d91ebc176fcf8f1933dff93b9c32430911"; + hash = "sha256-IH1LUPO+18vDC83jcrC0DihTYt6aXV1w/u0iTm5jgK4="; }; meta.homepage = "https://github.com/rmuir/tree-sitter-javadoc"; }; @@ -1735,12 +1735,12 @@ }; llvm = buildGrammar { language = "llvm"; - version = "0.0.0+rev=470886d"; + version = "0.0.0+rev=2914786"; src = fetchFromGitHub { owner = "benwilliamgraham"; repo = "tree-sitter-llvm"; - rev = "470886ddd635e0ee48a4cb169e33d0c6d9bff32e"; - hash = "sha256-1Fv1r644UfHXC4x4mbMetC0ThroYHwYDtKTSX3Nd4fo="; + rev = "2914786ae6774d4c4e25a230f4afe16aa68fe1c1"; + hash = "sha256-jBSotMFsBUcgQrWH5p8EiywG00+v9QqePcUTI6ZqAkw="; }; meta.homepage = "https://github.com/benwilliamgraham/tree-sitter-llvm"; }; @@ -1880,12 +1880,12 @@ }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=b209a18"; + version = "0.0.0+rev=09666ce"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "b209a18d1a0f440acd3a85b6d633dac2660114e1"; - hash = "sha256-aAfrn3my/qfEy9uK/WPCxSefBOsekJ+rT04K9UmDVvs="; + rev = "09666cead2c001cbbfc82b395007f6d8158113a5"; + hash = "sha256-toH/pG8CKI4UFdBQqkgIer5tfpIWkWoCP+fU0OByxQg="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; @@ -2104,12 +2104,12 @@ }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=e95676f"; + version = "0.0.0+rev=0c24d00"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-perl"; - rev = "e95676fa54559c71f15ad73e871c1e44db8a9b05"; - hash = "sha256-VABlYn+OwgR+aD6dFI1bxa/JhwHV0KigsAcug3gze1c="; + rev = "0c24d001dd1921e418fb933d208a7bd7dd3f923a"; + hash = "sha256-rKu3CGHckXlQnI/bvrQDq40jRO4PAueWKNZJADjmv5A="; }; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl"; }; @@ -2927,12 +2927,12 @@ }; superhtml = buildGrammar { language = "superhtml"; - version = "0.0.0+rev=0daae52"; + version = "0.0.0+rev=8cb16ba"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "superhtml"; - rev = "0daae5239bd9366dda0c28c7540d7503b0c104d4"; - hash = "sha256-dfH7/i/xnjQRMAhzNPkDMhre+lR+pJ/s8aDxXhPqyic="; + rev = "8cb16babb0c66b6512d6aeb4cbc37ed90641d980"; + hash = "sha256-lLZqyqVEUCn9z++9lPnrK8R2uDvht5v+5Y8KOZDgPs0="; }; location = "tree-sitter-superhtml"; meta.homepage = "https://github.com/kristoff-it/superhtml"; @@ -3365,12 +3365,12 @@ }; vhdl = buildGrammar { language = "vhdl"; - version = "0.0.0+rev=73ff9d3"; + version = "0.0.0+rev=02523d7"; src = fetchFromGitHub { owner = "jpt13653903"; repo = "tree-sitter-vhdl"; - rev = "73ff9d3e7bc42b8cc123bf5f0b2db12a900ee9b7"; - hash = "sha256-8Fp/x3TC+bq4nJdbeVdBrnz7QnBSD1sc5CC0TRh0mGc="; + rev = "02523d7fb0321344c19c1f3f4ec6b83424c7d6c8"; + hash = "sha256-TI1R2L8/9QwpKuTz18ayOeGXqRhYgbd0X6Rpj8kgsfw="; }; meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl"; }; @@ -3498,12 +3498,12 @@ }; xresources = buildGrammar { language = "xresources"; - version = "0.0.0+rev=6113943"; + version = "0.0.0+rev=f40778f"; src = fetchFromGitHub { owner = "ValdezFOmar"; repo = "tree-sitter-xresources"; - rev = "6113943ab0847a307f3f3c38ff91d9cdfce9d0d9"; - hash = "sha256-ZqJvLw475e/5KBcJzx0w+aPbGCIAFfdig9cpZ5oaat8="; + rev = "f40778ff42f2119aebacd46d4b6d785a4181a9ba"; + hash = "sha256-9vqVBsErlbFXzTd7QmMItd5GW2F9kE04HQFjq/vtrTc="; }; meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources"; }; @@ -3564,12 +3564,12 @@ }; ziggy = buildGrammar { language = "ziggy"; - version = "0.0.0+rev=e95c85c"; + version = "0.0.0+rev=4353b20"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "ziggy"; - rev = "e95c85cb58773c43e9d94c0b9422ae84697e68a1"; - hash = "sha256-6vqUPY/fpGuM1K4HfgpL/dRy7Na6fJ/t+Pe/12b1wqE="; + rev = "4353b20ef2ac750e35c6d68e4eb2a07c2d7cf901"; + hash = "sha256-7XZNKUrOkpPMge6nDSiEBlUAf7dZLDcVcJ7fHT8fPh4="; }; location = "tree-sitter-ziggy"; meta.homepage = "https://github.com/kristoff-it/ziggy"; From d43a3b9a47c64d0d2dc2aff06077e99a76fcf5d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 30 Aug 2025 02:05:17 +0200 Subject: [PATCH 191/305] python313Packages.fints: fix build with sandbox python3.13-fints> _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ python3.13-fints> /nix/store/gkspnzkgarw4qvbl4670p3jcbgg6psrg-python3-3.13.6/lib/python3.13/socketserver.py:457: in __init__ python3.13-fints> self.server_bind() python3.13-fints> /nix/store/gkspnzkgarw4qvbl4670p3jcbgg6psrg-python3-3.13.6/lib/python3.13/http/server.py:136: in server_bind python3.13-fints> socketserver.TCPServer.server_bind(self) python3.13-fints> _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ python3.13-fints> python3.13-fints> self = python3.13-fints> python3.13-fints> def server_bind(self): python3.13-fints> """Called by constructor to bind the socket. python3.13-fints> python3.13-fints> May be overridden. python3.13-fints> python3.13-fints> """ python3.13-fints> if self.allow_reuse_address and hasattr(socket, "SO_REUSEADDR"): python3.13-fints> self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) python3.13-fints> # Since Linux 6.12.9, SO_REUSEPORT is not allowed python3.13-fints> # on other address families than AF_INET/AF_INET6. python3.13-fints> if ( python3.13-fints> self.allow_reuse_port and hasattr(socket, "SO_REUSEPORT") python3.13-fints> and self.address_family in (socket.AF_INET, socket.AF_INET6) python3.13-fints> ): python3.13-fints> self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1) python3.13-fints> > self.socket.bind(self.server_address) python3.13-fints> E PermissionError: [Errno 1] Operation not permitted python3.13-fints> python3.13-fints> /nix/store/gkspnzkgarw4qvbl4670p3jcbgg6psrg-python3-3.13.6/lib/python3.13/socketserver.py:478: PermissionError python3.13-fints> =============================== warnings summary =============================== --- pkgs/development/python-modules/fints/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix index 469416ab35f4..61128bb7e8d0 100644 --- a/pkgs/development/python-modules/fints/default.nix +++ b/pkgs/development/python-modules/fints/default.nix @@ -37,6 +37,8 @@ buildPythonPackage rec { sepaxml ]; + __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ "fints" ]; nativeCheckInputs = [ From 2513b4f3878c0701442a7eef54befcf3b455a903 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 00:05:30 +0000 Subject: [PATCH 192/305] python3Packages.millheater: 012.2 -> 0.12.5 --- pkgs/development/python-modules/millheater/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/millheater/default.nix b/pkgs/development/python-modules/millheater/default.nix index 0a36ae615300..9be5871e551d 100644 --- a/pkgs/development/python-modules/millheater/default.nix +++ b/pkgs/development/python-modules/millheater/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "millheater"; - version = "012.2"; + version = "0.12.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pymill"; tag = version; # https://github.com/Danielhiversen/pymill/issues/87 - hash = "sha256-tR6MZIgCazGcXRIaSXyDYIEp+kD6xyrpOXORbi8LV7E="; + hash = "sha256-DGMG6LabfKGmQ6MDm/skqeQuOhSlr1ssZ2Z7fItzOt0="; }; build-system = [ setuptools ]; From 99bfc6e945094431e8bdb3689b1bf305b94af74d Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sat, 30 Aug 2025 10:33:48 +1000 Subject: [PATCH 193/305] gemini-cli: drop node-tty doesn't build on darwin --- pkgs/by-name/ge/gemini-cli/package.nix | 2 +- .../restore-missing-dependencies-fields.patch | 76 ++++++++++++++----- 2 files changed, 59 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index 1ddd34275c79..da14a4b2898a 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -21,7 +21,7 @@ buildNpmPackage (finalAttrs: { ./restore-missing-dependencies-fields.patch ]; - npmDepsHash = "sha256-0j6kXlnWg7N23cnmMialZVqyZTAzgPn0VGAqSeYIVZM="; + npmDepsHash = "sha256-i4Z/zM4jRf9Orisu0xHHa3yJsDjYSmHieF2WIKU/1iY="; preConfigure = '' mkdir -p packages/generated diff --git a/pkgs/by-name/ge/gemini-cli/restore-missing-dependencies-fields.patch b/pkgs/by-name/ge/gemini-cli/restore-missing-dependencies-fields.patch index ed50554e645e..182198f6fbdd 100644 --- a/pkgs/by-name/ge/gemini-cli/restore-missing-dependencies-fields.patch +++ b/pkgs/by-name/ge/gemini-cli/restore-missing-dependencies-fields.patch @@ -1,18 +1,36 @@ -From c1aef417d559237bf4d147c584449b74d6fbc1f8 Mon Sep 17 00:00:00 2001 -From: ljxfstorm -Date: Fri, 1 Aug 2025 10:23:11 +0800 -Subject: [PATCH] build(deps): restore missing `resolved` and `integrity` of - some dependencies - ---- - package-lock.json | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - diff --git a/package-lock.json b/package-lock.json -index 3938c5e32b..99590b8a9b 100644 +index 74cfbfef..4131aa2b 100644 --- a/package-lock.json +++ b/package-lock.json -@@ -11738,6 +11738,8 @@ +@@ -58,8 +58,7 @@ + "@lydell/node-pty-darwin-x64": "1.1.0", + "@lydell/node-pty-linux-x64": "1.1.0", + "@lydell/node-pty-win32-arm64": "1.1.0", +- "@lydell/node-pty-win32-x64": "1.1.0", +- "node-pty": "^1.0.0" ++ "@lydell/node-pty-win32-x64": "1.1.0" + } + }, + "node_modules/@alcalzone/ansi-tokenize": { +@@ -8604,17 +8603,6 @@ + "url": "https://opencollective.com/node-fetch" + } + }, +- "node_modules/node-pty": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.0.0.tgz", +- "integrity": "sha512-wtBMWWS7dFZm/VgqElrTvtfMq4GzJ6+edFI0Y0zyzygUSZMgZdraDUMUhCIvkjhJjme15qWmbyJbtAx4ot4uZA==", +- "hasInstallScript": true, +- "license": "MIT", +- "optional": true, +- "dependencies": { +- "nan": "^2.17.0" +- } +- }, + "node_modules/normalize-package-data": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.2.tgz", +@@ -12535,6 +12523,8 @@ }, "packages/cli/node_modules/@testing-library/dom": { "version": "10.4.0", @@ -21,7 +39,7 @@ index 3938c5e32b..99590b8a9b 100644 "dev": true, "license": "MIT", "peer": true, -@@ -11773,6 +11775,8 @@ +@@ -12570,6 +12560,8 @@ }, "packages/cli/node_modules/@testing-library/react": { "version": "16.3.0", @@ -30,7 +48,7 @@ index 3938c5e32b..99590b8a9b 100644 "dev": true, "license": "MIT", "dependencies": { -@@ -11824,6 +11828,8 @@ +@@ -12621,6 +12613,8 @@ }, "packages/cli/node_modules/aria-query": { "version": "5.3.0", @@ -39,7 +57,7 @@ index 3938c5e32b..99590b8a9b 100644 "dev": true, "license": "Apache-2.0", "peer": true, -@@ -11833,6 +11839,8 @@ +@@ -12630,6 +12624,8 @@ }, "packages/cli/node_modules/emoji-regex": { "version": "10.4.0", @@ -48,7 +66,7 @@ index 3938c5e32b..99590b8a9b 100644 "license": "MIT" }, "packages/cli/node_modules/react-is": { -@@ -11845,6 +11853,8 @@ +@@ -12642,6 +12638,8 @@ }, "packages/cli/node_modules/string-width": { "version": "7.2.0", @@ -57,7 +75,17 @@ index 3938c5e32b..99590b8a9b 100644 "license": "MIT", "dependencies": { "emoji-regex": "^10.3.0", -@@ -11942,6 +11952,8 @@ +@@ -12715,8 +12713,7 @@ + "@lydell/node-pty-darwin-x64": "1.1.0", + "@lydell/node-pty-linux-x64": "1.1.0", + "@lydell/node-pty-win32-arm64": "1.1.0", +- "@lydell/node-pty-win32-x64": "1.1.0", +- "node-pty": "^1.0.0" ++ "@lydell/node-pty-win32-x64": "1.1.0" + } + }, + "packages/core/node_modules/ajv": { +@@ -12751,6 +12748,8 @@ }, "packages/core/node_modules/ignore": { "version": "7.0.5", @@ -66,4 +94,16 @@ index 3938c5e32b..99590b8a9b 100644 "license": "MIT", "engines": { "node": ">= 4" - +diff --git a/package.json b/package.json +index aba2aa98..57c79274 100644 +--- a/package.json ++++ b/package.json +@@ -100,7 +100,6 @@ + "@lydell/node-pty-darwin-x64": "1.1.0", + "@lydell/node-pty-linux-x64": "1.1.0", + "@lydell/node-pty-win32-arm64": "1.1.0", +- "@lydell/node-pty-win32-x64": "1.1.0", +- "node-pty": "^1.0.0" ++ "@lydell/node-pty-win32-x64": "1.1.0" + } + } From 4afcb464ccddc5ae9ffccd17d10a8be77c538244 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 01:16:05 +0000 Subject: [PATCH 194/305] gatekeeper: 3.20.0 -> 3.20.1 --- pkgs/by-name/ga/gatekeeper/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ga/gatekeeper/package.nix b/pkgs/by-name/ga/gatekeeper/package.nix index 91f169fe7263..f38ba23da0f5 100644 --- a/pkgs/by-name/ga/gatekeeper/package.nix +++ b/pkgs/by-name/ga/gatekeeper/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gatekeeper"; - version = "3.20.0"; + version = "3.20.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "gatekeeper"; tag = "v${version}"; - hash = "sha256-7DJWqm51eRGYTES2x05D2JSJwaaHiXgH4uq31nOIXIs="; + hash = "sha256-vChpVCw2La4cgNMDFnC7thU4jSmJ4LlOLVVeURNQ1+0="; }; vendorHash = null; From fff977b945d817c19ed41d1529eb5fe65e4be4dc Mon Sep 17 00:00:00 2001 From: puzzlewolf Date: Thu, 28 Aug 2025 13:21:25 +0200 Subject: [PATCH 195/305] python313Packages.reqif: fix runtime dependency, minor cleanup --- pkgs/development/python-modules/reqif/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/reqif/default.nix b/pkgs/development/python-modules/reqif/default.nix index b45ca4d2bad6..0e6424ab85e7 100644 --- a/pkgs/development/python-modules/reqif/default.nix +++ b/pkgs/development/python-modules/reqif/default.nix @@ -1,6 +1,5 @@ { lib, - beautifulsoup4, buildPythonPackage, fetchFromGitHub, hatchling, @@ -8,7 +7,6 @@ lxml, pytestCheckHook, python, - pythonOlder, xmlschema, }: @@ -17,8 +15,6 @@ buildPythonPackage rec { version = "0.0.46"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "strictdoc-project"; repo = "reqif"; @@ -32,15 +28,15 @@ buildPythonPackage rec { "\"${placeholder "out"}/${python.sitePackages}/reqif\"" ''; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ - beautifulsoup4 + dependencies = with python.pkgs; [ lxml jinja2 xmlschema + openpyxl ]; nativeCheckInputs = [ pytestCheckHook ]; From b2774b3bd684209f0ef10a74b31ec3a745720c94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 30 Aug 2025 03:24:07 +0200 Subject: [PATCH 196/305] dnscontrol: 4.23.0 -> 4.24.0 Diff: https://github.com/StackExchange/dnscontrol/compare/v4.23.0...v4.24.0 Changelog: https://github.com/StackExchange/dnscontrol/releases/tag/v4.24.0 --- pkgs/by-name/dn/dnscontrol/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/dn/dnscontrol/package.nix b/pkgs/by-name/dn/dnscontrol/package.nix index f32409a95402..5acd2f141f8b 100644 --- a/pkgs/by-name/dn/dnscontrol/package.nix +++ b/pkgs/by-name/dn/dnscontrol/package.nix @@ -1,24 +1,24 @@ { lib, - buildGoModule, + buildGo125Module, fetchFromGitHub, installShellFiles, testers, dnscontrol, }: -buildGoModule rec { +buildGo125Module rec { pname = "dnscontrol"; - version = "4.23.0"; + version = "4.24.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = "dnscontrol"; tag = "v${version}"; - hash = "sha256-Jaa+geO2836kQHTRhaQru367iQvqac6sgnpL9244dkw="; + hash = "sha256-DAH6XpRZz6KnkUYcQVWqLc3GP//dgojYH5AUvJ/X7v8="; }; - vendorHash = "sha256-PbOqi9vfz46lwoP3aUPl/JKDJtYYF7IwnN9lppZ8KYA="; + vendorHash = "sha256-lY4E0ediBPsOXL/1KKu0QeYC0llswzYYV4JvtxMQ+PE="; nativeBuildInputs = [ installShellFiles ]; From 604f22e0304b679e96edd9f47cbbfc4d513a3751 Mon Sep 17 00:00:00 2001 From: botnk Date: Sat, 30 Aug 2025 01:26:28 +0000 Subject: [PATCH 197/305] zed-editor: 0.201.6 -> 0.201.8 Changelog: https://github.com/zed-industries/zed/releases/tag/v0.201.8 --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 14dc685172c4..3c91d8bfea8c 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -99,7 +99,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.201.6"; + version = "0.201.8"; outputs = [ "out" @@ -112,7 +112,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-d1B04N5KS34ghUHOhStkCMZZosQe2yG2cu88KVxujKY="; + hash = "sha256-y7pWGdq7r675JnBFQwcB4QLn/0aFxpkwK7CjX0Ox+lk="; }; patches = [ @@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)" ''; - cargoHash = "sha256-npuNvJUN9ENNB1G8kwcz8dRdFoLBJ/UgQHd+9ojW8PI="; + cargoHash = "sha256-20pOYcodc2jflxibY0I0+SSC1FTxB8Jw03kcihCnBOY="; nativeBuildInputs = [ cmake From c8452306d7c66c27b32f1bf6674504fc8f2e1540 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 30 Aug 2025 10:28:08 +0900 Subject: [PATCH 198/305] python3Packages.rubicon-objc: fix build --- pkgs/development/python-modules/rubicon-objc/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rubicon-objc/default.nix b/pkgs/development/python-modules/rubicon-objc/default.nix index cab1a5684b8d..d1349b7e9a40 100644 --- a/pkgs/development/python-modules/rubicon-objc/default.nix +++ b/pkgs/development/python-modules/rubicon-objc/default.nix @@ -23,9 +23,8 @@ buildPythonPackage rec { }; postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "setuptools==75.7.0" "setuptools" \ - --replace-fail "setuptools_scm==8.1.0" "setuptools_scm" + sed -i 's/"setuptools==.*"/"setuptools"/' pyproject.toml + sed -i 's/"setuptools_scm==.*"/"setuptools_scm"/' pyproject.toml ''; build-system = [ From f2f3b63550e9a898fea1ef6406bbec91f91f7f9f Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 30 Aug 2025 10:28:28 +0900 Subject: [PATCH 199/305] python3Packages.rubicon-objc: 0.5.1 -> 0.5.2 Diff: https://github.com/beeware/rubicon-objc/compare/v0.5.1...v0.5.2 Changelog: https://github.com/beeware/rubicon-objc/releases/tag/v0.5.2 --- pkgs/development/python-modules/rubicon-objc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rubicon-objc/default.nix b/pkgs/development/python-modules/rubicon-objc/default.nix index d1349b7e9a40..4e9d1775a0c2 100644 --- a/pkgs/development/python-modules/rubicon-objc/default.nix +++ b/pkgs/development/python-modules/rubicon-objc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rubicon-objc"; - version = "0.5.1"; + version = "0.5.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "beeware"; repo = "rubicon-objc"; tag = "v${version}"; - hash = "sha256-HnPp7VUrcTfkl5XdXYasydMqxhp7eb7r5RW/7yRWmko="; + hash = "sha256-ahlsY4eU9n+BRexE4wNVXMcgSiGW7pU25zJif9lGTUs="; }; postPatch = '' From faab53431d3d3a7ab7e9bd35319edc98372bcc5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 01:46:17 +0000 Subject: [PATCH 200/305] managarr: 0.5.1 -> 0.6.0 --- pkgs/by-name/ma/managarr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/managarr/package.nix b/pkgs/by-name/ma/managarr/package.nix index 8ba8bf5a8a5f..fcdd760be40d 100644 --- a/pkgs/by-name/ma/managarr/package.nix +++ b/pkgs/by-name/ma/managarr/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "managarr"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Dark-Alex-17"; repo = "managarr"; tag = "v${version}"; - hash = "sha256-VWlKfot6G97H7o1JhcAQgAjhYr2hvPrez1ZkeniWYBQ="; + hash = "sha256-kUEYmhoM284SssSP5G7cbySo+dhH2zK6liCHEwKDpic="; }; - cargoHash = "sha256-bddsQlPsVXrhKoitEmxb2fZIoq4ePsVCGBN1y5hMn2U="; + cargoHash = "sha256-utegnUGHilDoLlKB55BbdXiCwv/8AAqdtofJ42D7Baw="; nativeBuildInputs = [ perl ]; From 5052d3e0ebe804185f74fa2a42a1fffc73a7ad61 Mon Sep 17 00:00:00 2001 From: qzylinra Date: Sat, 30 Aug 2025 09:55:17 +0800 Subject: [PATCH 201/305] voxelands: drop The upstream project has not been updated for years, the package has no maintainer, it has not been upgraded to the latest version, and no users can be found for it on GitHub. --- pkgs/by-name/vo/voxelands/package.nix | 76 --------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 76 deletions(-) delete mode 100644 pkgs/by-name/vo/voxelands/package.nix diff --git a/pkgs/by-name/vo/voxelands/package.nix b/pkgs/by-name/vo/voxelands/package.nix deleted file mode 100644 index 19f2e4c22c60..000000000000 --- a/pkgs/by-name/vo/voxelands/package.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - bzip2, - cmake, - expat, - freetype, - irrlicht, - libICE, - libGL, - libGLU, - libSM, - libX11, - libXext, - libXxf86vm, - libjpeg, - libpng, - libvorbis, - openal, - pkg-config, - sqlite, -}: - -stdenv.mkDerivation rec { - pname = "voxelands"; - version = "1704.00"; - - src = fetchFromGitLab { - owner = "voxelands"; - repo = "voxelands"; - rev = version; - sha256 = "0yj9z9nygpn0z63y739v72l3kg81wd71xgix5k045vfzhqsam5m0"; - }; - - cmakeFlags = [ - "-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht" - "-DCMAKE_C_FLAGS_RELEASE=-DNDEBUG" - "-DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG" - ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - # has to go before others to override transitive libpng-1.6 - libpng - - bzip2 - expat - freetype - irrlicht - libICE - libGL - libGLU - libSM - libX11 - libXext - libXxf86vm - libjpeg - libvorbis - openal - sqlite - ]; - - meta = with lib; { - homepage = "https://voxelands.net/"; - description = "Infinite-world block sandbox game based on Minetest"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = [ ]; - broken = stdenv.hostPlatform.isAarch64; # build fails with "libIrrlicht.so: undefined reference to `png_init_filter_functions_neon'" - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 58e7cf890438..f8e06f745ebf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2406,6 +2406,7 @@ mapAliases { vocal = throw "'vocal' has been archived upstream. Consider using 'gnome-podcasts' or 'kasts' instead."; # Added 2025-04-12 void = throw "'void' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 volnoti = throw "'volnoti' has been removed due to lack of maintenance upstream."; # Added 2024-12-04 + voxelands = throw "'voxelands' has been removed due to lack of upstream maintenance"; # Added 2025-08-30 vtk_9 = lib.warnOnInstantiate "'vtk_9' has been renamed to 'vtk_9_5'" vtk_9_5; # Added 2025-07-18 vtk_9_egl = lib.warnOnInstantiate "'vtk_9_5' now build with egl support by default, so `vtk_9_egl` is deprecated, consider using 'vtk_9_5' instead." vtk_9_5; # Added 2025-07-18 vtk_9_withQt5 = throw "'vtk_9_withQt5' has been removed, Consider using 'vtkWithQt5' instead." vtkWithQt5; # Added 2025-07-18 From 064cb56bd6a6c40867007914f82ef82cdb624b17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 02:03:34 +0000 Subject: [PATCH 202/305] proxify: 0.0.15 -> 0.0.16 --- pkgs/by-name/pr/proxify/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/proxify/package.nix b/pkgs/by-name/pr/proxify/package.nix index 1a313caa2423..178e6d37f64f 100644 --- a/pkgs/by-name/pr/proxify/package.nix +++ b/pkgs/by-name/pr/proxify/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "proxify"; - version = "0.0.15"; + version = "0.0.16"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "proxify"; tag = "v${version}"; - hash = "sha256-vAI8LKdBmujH7zidXADc8bMLXaFMjT965hR+PVZVeNw="; + hash = "sha256-CctbeKMf4+E+Fh/0hWLwHdTTsAavkiJ2ziMumY/+oF8="; }; - vendorHash = "sha256-eGcCc83napjt0VBhpDiHWn7+ew77XparDJ9uyjF353w="; + vendorHash = "sha256-7bOnLv2IJ9tysvZm33wBeMHvdSBDg1ii/QXv2n1wqxw="; meta = { description = "Proxy tool for HTTP/HTTPS traffic capture"; From 7285fc2f9a59da8cb8b1ab49c4b3782c794980bc Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Sat, 30 Aug 2025 14:05:57 +1200 Subject: [PATCH 203/305] top-level/aliases: add filtering Make aliases in deprecatedPlasma5Packages break eval so we cannot accidentally shadow packages that have been migrated to Plasma 6. --- pkgs/top-level/aliases.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ec6633dcd4c9..8877826a14e8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -355,8 +355,6 @@ let '' ); - plasma5Throws = lib.mapAttrs (k: _: makePlasma5Throw k) deprecatedPlasma5Packages; - # Make sure that we are not shadowing something from all-packages.nix. checkInPkgs = n: alias: @@ -364,6 +362,8 @@ let mapAliases = aliases: lib.mapAttrs (n: alias: removeRecurseForDerivations (checkInPkgs n alias)) aliases; + + plasma5Throws = mapAliases (lib.mapAttrs (k: _: makePlasma5Throw k) deprecatedPlasma5Packages); in mapAliases { From 485644162524d2b6e0c93bc774ce1750d342a6d6 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 30 Aug 2025 09:39:39 +0800 Subject: [PATCH 204/305] python3Packages.essentials: fix build --- .../python-modules/essentials/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/essentials/default.nix b/pkgs/development/python-modules/essentials/default.nix index 9854a018afae..8e56431ef390 100644 --- a/pkgs/development/python-modules/essentials/default.nix +++ b/pkgs/development/python-modules/essentials/default.nix @@ -1,7 +1,9 @@ { buildPythonPackage, fetchFromGitHub, - setuptools, + hatchling, + pydantic, + pytest-asyncio, pytestCheckHook, stdenv, lib, @@ -18,9 +20,13 @@ buildPythonPackage rec { hash = "sha256-wOZ0y6sAPEy2MgcwmM9SjnULe6oWlVuNeC7Zl070CK4="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ hatchling ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pydantic + pytest-asyncio + pytestCheckHook + ]; disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # time.sleep(0.01) can be up to 0.05s on darwin From b474b7cb3e2488705f8d82e96966bd7c42219a1c Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 30 Aug 2025 09:47:44 +0800 Subject: [PATCH 205/305] python3Packages.essentials: avoid with lib; --- pkgs/development/python-modules/essentials/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/essentials/default.nix b/pkgs/development/python-modules/essentials/default.nix index 8e56431ef390..77a7fae225da 100644 --- a/pkgs/development/python-modules/essentials/default.nix +++ b/pkgs/development/python-modules/essentials/default.nix @@ -36,12 +36,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "essentials" ]; - meta = with lib; { + meta = { homepage = "https://github.com/Neoteroi/essentials"; description = "General purpose classes and functions"; changelog = "https://github.com/Neoteroi/essentials/releases/${src.tag}"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aldoborrero zimbatm ]; From 41b164827ff5948b7a5e51fb1ebac0535accfb55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 30 Aug 2025 03:20:30 +0200 Subject: [PATCH 206/305] yq-go: generate and install man page --- pkgs/by-name/yq/yq-go/package.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/yq/yq-go/package.nix b/pkgs/by-name/yq/yq-go/package.nix index d8b826e25e2b..ea95fc1871db 100644 --- a/pkgs/by-name/yq/yq-go/package.nix +++ b/pkgs/by-name/yq/yq-go/package.nix @@ -4,6 +4,7 @@ buildGoModule, fetchFromGitHub, installShellFiles, + pandoc, runCommand, nix-update-script, }: @@ -21,13 +22,22 @@ buildGoModule (finalAttrs: { vendorHash = "sha256-mG9rKla2ZSEbOvSlV6jl7MBoo0dDI//CMcR2hLET4K4="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = lib.optionalAttrs (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + installShellFiles + pandoc + ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd yq \ --bash <($out/bin/yq shell-completion bash) \ --fish <($out/bin/yq shell-completion fish) \ --zsh <($out/bin/yq shell-completion zsh) + + patchShebangs ./scripts/generate-man-page* + export MAN_HEADER="yq (https://github.com/mikefarah/yq/) version ${finalAttrs.version}" + ./scripts/generate-man-page-md.sh + ./scripts/generate-man-page.sh + installManPage yq.1 ''; passthru = { From b0648f7ff58fd9832eaa105a3b22f0a127203748 Mon Sep 17 00:00:00 2001 From: Devan Carpenter Date: Fri, 29 Aug 2025 21:22:29 -0500 Subject: [PATCH 207/305] libnl-tiny: correct license to GPLv2 --- pkgs/by-name/li/libnl-tiny/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libnl-tiny/package.nix b/pkgs/by-name/li/libnl-tiny/package.nix index 84d9210328e6..9e4e635715bc 100644 --- a/pkgs/by-name/li/libnl-tiny/package.nix +++ b/pkgs/by-name/li/libnl-tiny/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Tiny OpenWrt fork of libnl"; homepage = "https://git.openwrt.org/?p=project/libnl-tiny.git;a=summary"; - license = licenses.isc; + license = licenses.gpl2Only; maintainers = with maintainers; [ mkg20001 ]; platforms = platforms.linux; }; From bdb0f63c2bf5d2a0b2279aec50147ba0d9f02aef Mon Sep 17 00:00:00 2001 From: Devan Carpenter Date: Fri, 29 Aug 2025 21:18:10 -0500 Subject: [PATCH 208/305] libnl-tiny: 2023-12-05 -> 2025-03-19 --- pkgs/by-name/li/libnl-tiny/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/libnl-tiny/package.nix b/pkgs/by-name/li/libnl-tiny/package.nix index 9e4e635715bc..8310d4d75672 100644 --- a/pkgs/by-name/li/libnl-tiny/package.nix +++ b/pkgs/by-name/li/libnl-tiny/package.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation { pname = "libnl-tiny"; - version = "unstable-2023-12-05"; + version = "0-unstable-2025-03-19"; src = fetchgit { url = "https://git.openwrt.org/project/libnl-tiny.git"; - rev = "965c4bf49658342ced0bd6e7cb069571b4a1ddff"; - hash = "sha256-kegTV7FXMERW7vjRZo/Xp4cbSBZmynBgge2lK71Fx94="; + rev = "c0df580adbd4d555ecc1962dbe88e91d75b67a4e"; + hash = "sha256-j5oIEbWqVWd7rNpCMm9+WZwud43uTGeHG81lmzQOoeY="; }; nativeBuildInputs = [ @@ -31,7 +31,10 @@ stdenv.mkDerivation { description = "Tiny OpenWrt fork of libnl"; homepage = "https://git.openwrt.org/?p=project/libnl-tiny.git;a=summary"; license = licenses.gpl2Only; - maintainers = with maintainers; [ mkg20001 ]; + maintainers = with maintainers; [ + mkg20001 + dvn0 + ]; platforms = platforms.linux; }; } From 0f869a64c4a259edd3c9be0cb75df5aaba479fa5 Mon Sep 17 00:00:00 2001 From: Devan Carpenter Date: Fri, 29 Aug 2025 21:24:17 -0500 Subject: [PATCH 209/305] libnl-tiny: drop unused build input --- pkgs/by-name/li/libnl-tiny/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/li/libnl-tiny/package.nix b/pkgs/by-name/li/libnl-tiny/package.nix index 8310d4d75672..f0fefcc64767 100644 --- a/pkgs/by-name/li/libnl-tiny/package.nix +++ b/pkgs/by-name/li/libnl-tiny/package.nix @@ -3,7 +3,6 @@ lib, fetchgit, cmake, - pkg-config, }: stdenv.mkDerivation { @@ -18,7 +17,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake - pkg-config ]; preConfigure = '' From ea8a4d842d9db1c4d017d98064b9cb99ad613059 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Aug 2025 03:20:18 +0000 Subject: [PATCH 210/305] terraform-providers.exoscale: 0.65.0 -> 0.65.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1994f726d04e..1cc1f506a1f4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -444,11 +444,11 @@ "vendorHash": "sha256-65gJeUzeWB4BA76Mbw4eBScByyYyUqOl2/jwRVMJOVM=" }, "exoscale": { - "hash": "sha256-TA8mMMeelnkvGcvRy9+QLiRegQYf8xo6vRZ+kb+DY5A=", + "hash": "sha256-tTFGYzDwx7VXzS287eNUUjsAuwY/Rh2zuOsGwLT6BRU=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.65.0", + "rev": "v0.65.1", "spdx": "MPL-2.0", "vendorHash": null }, From d5d19e823177c1976a72d6fe11f9cc6bbc144015 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Aug 2025 21:48:25 +0000 Subject: [PATCH 211/305] terraform-providers.google: 6.48.0 -> 6.49.2 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1cc1f506a1f4..6db98e24f42c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -525,13 +525,13 @@ "vendorHash": "sha256-eE9AY/79xQSbRl5kA0rwS8Oz8I9jaxT/KlVd0v0GAa8=" }, "google": { - "hash": "sha256-enfKikX5raeLzZCnslaiAJ6hF/7+AXpKlDbNDm2v1qE=", + "hash": "sha256-TInKyk82gwn3bGEPM6l9pGDmfMPskrMSSWNL0hDpnws=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "repo": "terraform-provider-google", - "rev": "v6.48.0", + "rev": "v6.49.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-IwUmrRZC2KXNzbKajKisaqKbv0RMIH8tgiKsOOlduIo=" + "vendorHash": "sha256-KWXHXLIt0fI9k3XRhch8VLLnVXwkSH2uUS5APfCcNdI=" }, "google-beta": { "hash": "sha256-288cK94lKkgSKTs0YuHvoyp/Z3rPr4qDo7AZE6ndJZo=", From b4db7711a7918f2f3366cbeb7a1d9cf8b419fda6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Aug 2025 15:48:37 +0000 Subject: [PATCH 212/305] terraform-providers.tencentcloud: 1.82.17 -> 1.82.18 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6db98e24f42c..010b877ab8a9 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1354,11 +1354,11 @@ "vendorHash": "sha256-PVN3oPT3cxsnWH03twbPSIIERGHCp3XAmcqrQAOULZ4=" }, "tencentcloud": { - "hash": "sha256-vHw2GcBZqWYwXo6jVEUtf6onINuk6duxWofmNffTbqk=", + "hash": "sha256-dhhQxSIsFngZ/bcZ9a1ECo98A8lu+egSi9znVRUVkBQ=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.82.17", + "rev": "v1.82.18", "spdx": "MPL-2.0", "vendorHash": null }, From d3522a5d5882e49e8d4f0fc67e6cd34c95384ec1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Aug 2025 16:07:55 +0000 Subject: [PATCH 213/305] terraform-providers.digitalocean: 2.65.0 -> 2.66.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 010b877ab8a9..daaebc471897 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -372,11 +372,11 @@ "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM=" }, "digitalocean": { - "hash": "sha256-kqJVwh3Myu8pfNfO2uVQFO/aU/7trDKktRdXdFQvnOg=", + "hash": "sha256-mFwmq/uYQ9i6s7vWfDExl7AC5i/lA4596VH3iCdjC3Q=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.65.0", + "rev": "v2.66.0", "spdx": "MPL-2.0", "vendorHash": null }, From 0ec79da0b9e590cc415d016799146a0d7c265319 Mon Sep 17 00:00:00 2001 From: Devan Carpenter Date: Fri, 29 Aug 2025 21:12:00 -0500 Subject: [PATCH 214/305] libubox: 2024-12-19 -> 2025-07-23 --- pkgs/development/libraries/libubox/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix index f186fbc82412..86aef1036258 100644 --- a/pkgs/development/libraries/libubox/default.nix +++ b/pkgs/development/libraries/libubox/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation { pname = "libubox"; - version = "0-unstable-2024-12-19"; + version = "0-unstable-2025-07-23"; src = fetchgit { url = "https://git.openwrt.org/project/libubox.git"; - rev = "3868f47c8f6c6570e62a3cdf8a7f26ffb1a67e6a"; - hash = "sha256-rACcvyMhksw5A+Tkn6XiTqz1DHK23YKRHL7j3CEccr4="; + rev = "49056d178f42da98048a5d4c23f83a6f6bc6dd80"; + hash = "sha256-sk5r18M0hJ+8CrC2G/rb+XqUmUGer2VBrVbuReHj1dM="; }; cmakeFlags = [ @@ -56,6 +56,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ fpletz mkg20001 + dvn0 ]; mainProgram = "jshn"; platforms = platforms.all; From 7348937bb3b9f029f29092a10a8c2db01ffeae43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Aug 2025 16:10:19 +0000 Subject: [PATCH 215/305] terraform-providers.temporalcloud: 0.9.2 -> 1.0.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index daaebc471897..76d75bdc30c5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1345,13 +1345,13 @@ "vendorHash": "sha256-V0dK5G3zheyyqexBud+9Hg9ExYI/9X1wuYx+lEn6pVg=" }, "temporalcloud": { - "hash": "sha256-dsOBLWHDWMO2/VKQOvJP5WgdAS3Zo9mkqRbfEDvzQRk=", + "hash": "sha256-tXNnDoUskOcmOKPpgBIcLcup0jMqRVWkhwSU3GKjAFI=", "homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud", "owner": "temporalio", "repo": "terraform-provider-temporalcloud", - "rev": "v0.9.2", + "rev": "v1.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-PVN3oPT3cxsnWH03twbPSIIERGHCp3XAmcqrQAOULZ4=" + "vendorHash": "sha256-M3wnvRxMyU0Yo733E9e8Q++xVTuSXD0W3fB2C14RDNU=" }, "tencentcloud": { "hash": "sha256-dhhQxSIsFngZ/bcZ9a1ECo98A8lu+egSi9znVRUVkBQ=", From 5a19a94d523bb26129896c38e8aac0501fe5ddca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Aug 2025 19:21:00 +0000 Subject: [PATCH 216/305] terraform-providers.alicloud: 1.257.0 -> 1.258.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 76d75bdc30c5..69ff5a5150a8 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -54,11 +54,11 @@ "vendorHash": "sha256-WT4sjem80445Qwlr3i/OuQMujrxEKqhws1GLpvbqKaU=" }, "alicloud": { - "hash": "sha256-pZhEc70Y0WYOP0wOZwpy+pLG5wXCzcmrHPQDqHNTCRQ=", + "hash": "sha256-pCGmH70Ro4QSpcHBhUpoQtQBTos3QluJxfPJkJP3+ng=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.257.0", + "rev": "v1.258.0", "spdx": "MPL-2.0", "vendorHash": "sha256-+Hc2NCCnJ0fB86fvgE4Kak8fwlsXIiv8avIhE/RoWeM=" }, From ae8a7d325e5e5f826056297e7f0185ee822a47e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Aug 2025 22:54:20 +0000 Subject: [PATCH 217/305] terraform-providers.mongodbatlas: 1.39.0 -> 1.40.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 69ff5a5150a8..a43c4e915be7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -849,13 +849,13 @@ "vendorHash": "sha256-QWBzQXx/dzWZr9dn3LHy8RIvZL1EA9xYqi7Ppzvju7g=" }, "mongodbatlas": { - "hash": "sha256-Lv0LwvQZTtZ2ZaNDJSQFVRDFtM23mnihV4XOBIxL5Bc=", + "hash": "sha256-IWawVQ+m1NeGqMTrtSE4bH/220tdP2Figqb6yviVEUo=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.39.0", + "rev": "v1.40.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-6ZxrQGYX15TpCTQ/Oxe4NL/XlgdqmWBm53JEuMv8KQg=" + "vendorHash": "sha256-XhsoMZc/7zh5AoJtpETVHVvmxSkfMYtJGho+Cy06VMs=" }, "namecheap": { "hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=", From 38d564eaf0b02c26fac6abdbdf05fa1582bfd20c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Aug 2025 23:19:26 +0000 Subject: [PATCH 218/305] terraform-providers.yandex: 0.150.0 -> 0.152.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a43c4e915be7..d715551f4733 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1535,12 +1535,12 @@ "vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg=" }, "yandex": { - "hash": "sha256-Lo6OSvS1MfXNHevSfSjmLmuiRKVMW4Me2e8r6/7VWwI=", + "hash": "sha256-42LhewtXX8TTRB6Xfz0iQaa1ldKm+YRmLm0s+LKvdic=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.150.0", + "rev": "v0.152.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-qwrb6qYjUtMpeX1Mnrvu3zEgtsELvAdr/p4loWxdFaU=" + "vendorHash": "sha256-LovDyADJeMQpIW3YqrdoNChmRf4XDBZK3DG/oOmtxOI=" } } From abf1272900d63a737428b605e14f0913ff1b9205 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Aug 2025 23:16:34 +0000 Subject: [PATCH 219/305] terraform-providers.spotinst: 1.225.0 -> 1.225.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d715551f4733..9dabebe2430a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1273,11 +1273,11 @@ "vendorHash": "sha256-D8VG9CWP4wo+cxb/ewP+b6qAeaBCu6lNwH2leoiBMAc=" }, "spotinst": { - "hash": "sha256-uLIm4j7rCPvA8xVZwdd7xHrL8KNLbZypGLVNzUuhVjw=", + "hash": "sha256-SGlNS6E96uXExu60D0WjRXB2YnsJoz4xfxfHe1/pYn8=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.225.0", + "rev": "v1.225.1", "spdx": "MPL-2.0", "vendorHash": "sha256-tfANShbNhWcMZvnJUIbErukbGZyPABVS4l0VKWcLqZA=" }, From db04d3c1ff759c06d5b8e2a28e9587399c35b698 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Aug 2025 22:09:57 +0000 Subject: [PATCH 220/305] terraform-providers.harbor: 3.10.23 -> 3.11.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 9dabebe2430a..a240113ef4c3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -570,11 +570,11 @@ "vendorHash": null }, "harbor": { - "hash": "sha256-RZkXUB4Msmsm+1mQij+577d7KUrDpk50oPc2rcFevi4=", + "hash": "sha256-IxtPbdgjRpqN2ZRSLjtrl6sHrVAiQI+TkZboHsD/6qU=", "homepage": "https://registry.terraform.io/providers/goharbor/harbor", "owner": "goharbor", "repo": "terraform-provider-harbor", - "rev": "v3.10.23", + "rev": "v3.11.0", "spdx": "MIT", "vendorHash": "sha256-UmlhKa2SVgrhRc1EOO9sEkherIS77CP+hkAL3Y79h3U=" }, From e379076e2dbc61b917d294fe158149cdbafe58ca Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Thu, 28 Aug 2025 20:03:27 -0700 Subject: [PATCH 221/305] python3Packages.pyosoenergyapi: init at 1.2.4 --- .../python-modules/pyosoenergyapi/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/pyosoenergyapi/default.nix diff --git a/pkgs/development/python-modules/pyosoenergyapi/default.nix b/pkgs/development/python-modules/pyosoenergyapi/default.nix new file mode 100644 index 000000000000..243c3abb483d --- /dev/null +++ b/pkgs/development/python-modules/pyosoenergyapi/default.nix @@ -0,0 +1,51 @@ +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + loguru, + numpy, + setuptools, + unasync, + urllib3, + writableTmpDirAsHomeHook, +}: + +buildPythonPackage rec { + pname = "pyosoenergyapi"; + version = "1.2.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "osohotwateriot"; + repo = "apyosohotwaterapi"; + tag = version; + hash = "sha256-hpbmiSOLawKVSh7BGV70bRi45HCDKmdxEEhCOdJuIww="; + }; + + build-system = [ + setuptools + unasync + writableTmpDirAsHomeHook + ]; + + dependencies = [ + aiohttp + loguru + numpy + urllib3 + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "pyosoenergyapi" ]; + + meta = { + description = "Python library to interface with the OSO Energy API"; + homepage = "https://github.com/osohotwateriot/apyosohotwaterapi"; + changelog = "https://github.com/osohotwateriot/apyosohotwaterapi/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 540f3546f9ba..d6c4432e01fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13588,6 +13588,8 @@ self: super: with self; { pyosmium = callPackage ../development/python-modules/pyosmium { inherit (pkgs) lz4; }; + pyosoenergyapi = callPackage ../development/python-modules/pyosoenergyapi { }; + pyosohotwaterapi = callPackage ../development/python-modules/pyosohotwaterapi { }; pyotb = callPackage ../development/python-modules/pyotb { }; From cdbc2fd8d5bb44d1460991a792a3f3a4077ccb89 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Thu, 28 Aug 2025 20:04:12 -0700 Subject: [PATCH 222/305] home-assistant: update component packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index a570436a8ba2..00ee13815ed8 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -4319,7 +4319,8 @@ ]; "osoenergy" = ps: with ps; [ - ]; # missing inputs: pyosoenergyapi + pyosoenergyapi + ]; "osramlightify" = ps: with ps; [ lightify @@ -7530,6 +7531,7 @@ "opnsense" "opower" "oralb" + "osoenergy" "otbr" "otp" "ourgroceries" From b3317164c2bdac2bde9f591c8ec0cb3b79a6f4fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Aug 2025 20:39:01 +0000 Subject: [PATCH 223/305] terraform-providers.google-beta: 6.48.0 -> 7.0.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a240113ef4c3..917544a45346 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -534,13 +534,13 @@ "vendorHash": "sha256-KWXHXLIt0fI9k3XRhch8VLLnVXwkSH2uUS5APfCcNdI=" }, "google-beta": { - "hash": "sha256-288cK94lKkgSKTs0YuHvoyp/Z3rPr4qDo7AZE6ndJZo=", + "hash": "sha256-lmn6hHVJ65Q65bATLV8XeyGOh9lsMcOprJt7vbGBCeE=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v6.48.0", + "rev": "v7.0.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-etnuDVoCrGySDh6cSCO24GCqRVD2UiK4Zcrbf+y12vQ=" + "vendorHash": "sha256-l5UkyXzoy3lY5bAus6pHnYKa6QniebN6nmQ5gANxr/Y=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", From 1ec2dbd41d05bccbde2e26447eba1c29f9a045ed Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 30 Aug 2025 10:35:37 +0800 Subject: [PATCH 224/305] firefox-beta: build in cuda release --- pkgs/top-level/release-cuda.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix index e87cd289e7a1..5dfc7ce01212 100644 --- a/pkgs/top-level/release-cuda.nix +++ b/pkgs/top-level/release-cuda.nix @@ -88,6 +88,8 @@ let ffmpeg-full = linux; firefox = linux; firefox-unwrapped = linux; + firefox-beta = linux; + firefox-beta-unwrapped = linux; gimp = linux; gimp3 = linux; gpu-screen-recorder = linux; From f7e6c0d5d1f944bf553646cf61ac03b7e6f759a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 02:47:14 +0000 Subject: [PATCH 225/305] boxflat: 1.34.2-1 -> 1.34.4 --- pkgs/by-name/bo/boxflat/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bo/boxflat/package.nix b/pkgs/by-name/bo/boxflat/package.nix index 71c1242a8807..991bb43dc7f4 100644 --- a/pkgs/by-name/bo/boxflat/package.nix +++ b/pkgs/by-name/bo/boxflat/package.nix @@ -14,14 +14,14 @@ python3Packages.buildPythonPackage rec { pname = "boxflat"; - version = "1.34.2-1"; + version = "1.34.4"; pyproject = true; src = fetchFromGitHub { owner = "Lawstorant"; repo = "boxflat"; tag = "v${version}"; - hash = "sha256-A18YhQp4USFQ4xoyR1Zc0o0fs5mVFVrvfbdPWvo1NXw="; + hash = "sha256-QuBGEOAMVR70JDpD1VVASuCJJdwbWDzK8qmo/BOOua0="; }; build-system = [ python3Packages.setuptools ]; From 9dee9dfaa1b38c9e5792266f52a7fb3461d2c12a Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Sat, 30 Aug 2025 14:06:44 +1200 Subject: [PATCH 226/305] top-level/aliases: remove incorrect deprecation aliases --- pkgs/top-level/aliases.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8877826a14e8..12d1ca1864c2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -53,7 +53,6 @@ let akonadi-search akonadiconsole akregator - alkimia alligator analitza angelfish @@ -267,7 +266,6 @@ let messagelib milou minuet - nota okular oxygen oxygen-sounds From ebdb272cd4fa2220d0765a4f7c0ee91d7d1a91d6 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 30 Aug 2025 13:20:26 +1000 Subject: [PATCH 227/305] aliases: add trillium-next-* Removed in https://www.github.com/NixOS/nixpkgs/pull/434791 Signed-off-by: Fernando Rodrigues --- pkgs/top-level/aliases.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 145fddcfad51..7cc9a3830676 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2323,6 +2323,8 @@ mapAliases { transifex-client = transifex-cli; # Added 2023-12-29 trfl = throw "trfl has been removed, because it has not received an update for 3 years and was broken"; # Added 2024-07-25 trezor_agent = trezor-agent; # Added 2024-01-07 + trilium-next-desktop = trilium-desktop; # Added 2025-08-30 + trilium-next-server = trilium-server; # Added 2025-08-30 trojita = throw "'trojita' has been dropped as it depends on KDE Gear 5, and is unmaintained"; # Added 2025-08-20 trust-dns = hickory-dns; # Added 2024-08-07 ttyrec = throw "'ttyrec' has been renamed to/replaced by 'ovh-ttyrec'"; # Converted to throw 2024-10-17 From 27fdf1c411495ca39ac2cb365c23b3009ee79371 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 03:32:35 +0000 Subject: [PATCH 228/305] mieru: 3.19.0 -> 3.19.1 --- pkgs/by-name/mi/mieru/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix index 4fe19a5d8103..141dd691f232 100644 --- a/pkgs/by-name/mi/mieru/package.nix +++ b/pkgs/by-name/mi/mieru/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "mieru"; - version = "3.19.0"; + version = "3.19.1"; src = fetchFromGitHub { owner = "enfein"; repo = "mieru"; rev = "v${version}"; - hash = "sha256-0kOYAtPFIXHg/CNoPxdRot9zTfEQ2uD0wBFFBW5h2ZA="; + hash = "sha256-x8rddxjhmHw7J7majt4qdkXRPsfm8SATFsMxN2stN14="; }; vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM="; From 1d2e4fa691f25683de88e690315343b9527cfa45 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 03:57:23 +0000 Subject: [PATCH 229/305] python3Packages.google-genai: 1.31.0 -> 1.32.0 --- pkgs/development/python-modules/google-genai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-genai/default.nix b/pkgs/development/python-modules/google-genai/default.nix index d685b595b474..d64129bda44c 100644 --- a/pkgs/development/python-modules/google-genai/default.nix +++ b/pkgs/development/python-modules/google-genai/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "google-genai"; - version = "1.31.0"; + version = "1.32.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "python-genai"; tag = "v${version}"; - hash = "sha256-pzW0SYLlj7XjJSEqCY3uSYZI8asn451LANpcpr/lxI4="; + hash = "sha256-vUYv5nsiG6/bNUQvzPfn+dWaeyelQvgd12d/DdkdqKs="; }; build-system = [ From 50b5e742ef70c00b1424db25a212fa2286ec5256 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 04:36:18 +0000 Subject: [PATCH 230/305] copier: 9.9.0 -> 9.10.1 --- pkgs/development/python-modules/copier/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/copier/default.nix b/pkgs/development/python-modules/copier/default.nix index 74fe3d969934..eab1d2b7ae0d 100644 --- a/pkgs/development/python-modules/copier/default.nix +++ b/pkgs/development/python-modules/copier/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "copier"; - version = "9.9.0"; + version = "9.10.1"; pyproject = true; src = fetchFromGitHub { @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm $out/tests/demo/doc/ma*ana.txt ''; - hash = "sha256-J+8MSlVKJb6Dr48pgy2OCBZpctGsVm23BcV4B9nk7o4="; + hash = "sha256-fpBUYQiYVJaFgAetZE60fjF40877k1u5ksFOTLRmc44="; }; POETRY_DYNAMIC_VERSIONING_BYPASS = version; From 0971f49d21eff6bdae828eb0b3eb38fdcd30fc67 Mon Sep 17 00:00:00 2001 From: Sergey Volkov Date: Fri, 29 Aug 2025 07:33:18 +0200 Subject: [PATCH 231/305] gemini-cli: 0.2.1 -> 0.2.2 --- pkgs/by-name/ge/gemini-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index da14a4b2898a..419a6f6b817b 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -7,13 +7,13 @@ buildNpmPackage (finalAttrs: { pname = "gemini-cli"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "google-gemini"; repo = "gemini-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-TcXCGI27qJOVbR8XaJzE9dYV/3uDM9HATU1OkziRib8="; + hash = "sha256-ykNgtHtH+PPCycRn9j1lc8UIEHqYj54l0MTeVz6OhsQ="; }; patches = [ @@ -21,7 +21,7 @@ buildNpmPackage (finalAttrs: { ./restore-missing-dependencies-fields.patch ]; - npmDepsHash = "sha256-i4Z/zM4jRf9Orisu0xHHa3yJsDjYSmHieF2WIKU/1iY="; + npmDepsHash = "sha256-gpNt581BHDA12s+3nm95UOYHjoa7Nfe46vgPwFr7ZOU="; preConfigure = '' mkdir -p packages/generated From de74f9caf0854a9ee8c39774cf4521870fa1f44a Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 30 Aug 2025 09:29:43 +0300 Subject: [PATCH 232/305] Revert "stdenv: Add CPE fields to meta" --- doc/redirects.json | 15 -- doc/stdenv/meta.chapter.md | 71 ------- lib/meta.nix | 189 +----------------- .../networking/sync/rsync/default.nix | 5 - pkgs/by-name/he/hello/package.nix | 1 - .../development/compilers/gcc/common/meta.nix | 1 - pkgs/development/compilers/gcc/default.nix | 1 - .../compilers/llvm/common/common-let.nix | 2 - .../linux/kernel/manual-config.nix | 7 - pkgs/shells/bash/5.nix | 10 - pkgs/stdenv/generic/check-meta.nix | 63 ------ 11 files changed, 1 insertion(+), 364 deletions(-) diff --git a/doc/redirects.json b/doc/redirects.json index 91f98a064f6f..7b0841c639b7 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -225,12 +225,6 @@ "sec-language-cosmic": [ "index.html#sec-language-cosmic" ], - "sec-meta-identifiers": [ - "index.html#sec-meta-identifiers" - ], - "sec-meta-identifiers-cpe": [ - "index.html#sec-meta-identifiers-cpe" - ], "sec-modify-via-packageOverrides": [ "index.html#sec-modify-via-packageOverrides" ], @@ -628,15 +622,6 @@ "typst-package-scope-and-usage": [ "index.html#typst-package-scope-and-usage" ], - "var-meta-identifiers-cpe": [ - "index.html#var-meta-identifiers-cpe" - ], - "var-meta-identifiers-cpeParts": [ - "index.html#var-meta-identifiers-cpeParts" - ], - "var-meta-identifiers-possibleCPEs": [ - "index.html#var-meta-identifiers-possibleCPEs" - ], "var-meta-teams": [ "index.html#var-meta-teams" ], diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index 947009869ff1..6f092d406126 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -248,74 +248,3 @@ Code to be executed on a peripheral device or embedded controller, built by a th ### `lib.sourceTypes.binaryBytecode` {#lib.sourceTypes.binaryBytecode} Code to run on a VM interpreter or JIT compiled into bytecode by a third party. This includes packages which download Java `.jar` files from another source. - -## Software identifiers {#sec-meta-identifiers} - -Package's `meta.identifiers` attribute specifies information about software identifiers associated with this package. Software identifiers are used, for example: -* to generate Software Bill of Materials (SBOM) that lists all components used to build the software, which can later be used to perform vulnerability or license analysis of the resulting software; -* to lookup software in different vulnerability databases or report new vulnerabilities to them. - -Overriding the default `meta.identifiers` attribute is optional, but it is recommended to fill in pieces to help tools mentioned above get precise data. -For example, we could get automatic notifications about potential vulnerabilities for users in the future. -All identifiers specified in `meta.identifiers` are expected to be unambiguous and valid. - -`meta.identifiers` contains `v1` attribute which is an attribute set that guarantees backward compatibility of its constituents. Right now it contains copies of all other attributes in `meta.identifiers`. - -### CPE {#sec-meta-identifiers-cpe} - -Common Platform Enumeration (CPE) is a specification maintained by NIST as part of the Security Content Automation Protocol (SCAP). It is used to identify software in National Vulnerabilities Database (NVD, https://nvd.nist.gov) and other vulnerability databases. - -Current version of CPE 2.3 consists of 13 parts: - -``` -cpe:2.3:a:::::::::: -``` - -Some of them are as follows: - -* *CPE version* - current version of CPE is `2.3` -* *part* - usually in Nixpkgs `a` for "application", can also be `o` for "operating system" or `h` for "hardware" -* *vendor* - can point to the source of the package, or to Nixpkgs itself -* *product* - name of the package -* *version* - version of the package -* *update* - name of the latest update, can be a patch version for semantically versioned packages -* *edition* - any additional specification about the version - -You can find information about all of these attributes in the [official specification](https://csrc.nist.gov/projects/security-content-automation-protocol/specifications/cpe/naming) (heading 5.3.3, pages 11-13). - -Any fields that don't have a value are set to either `-` if the value is not available or `*` when the field can match any value. - -For example, for glibc 2.40.1 CPE would be `cpe:2.3:a:gnu:glibc:2.40:1:*:*:*:*:*:*`. - -#### `meta.identifiers.cpeParts` {#var-meta-identifiers-cpeParts} - -This attribute contains an attribute set of all parts of the CPE for this package. Most of the parts default to `*` (match any value), with some exceptions: - -* `part` defaults to `a` (application), can also be set to `o` for operating systems, for example, Linux kernel, or to `h` for hardware -* `vendor` cannot be deduced from other sources, so it must be specified by the package author -* `product` defaults to provided derivation's `pname` attribute and must be provided explicitly if `pname` is missing -* `version` and `update` have no defaults and should be specified explicitly or using helper functions, when missing, `cpe` attribute will be empty, and all possible guesses using helper functions will be in `possibleCPEs` attribute. - -It is up to the package author to make sure all parts are correct and match expected values in [NVD dictionary](https://nvd.nist.gov/products/cpe). Unknown values can be skipped, which would leave them with the default value of `*`. - -Following functions help with filling out `version` and `update` fields: - -* [`lib.meta.cpeFullVersionWithVendor`](#function-library-lib.meta.cpeFullVersionWithVendor) -* [`lib.meta.cpePatchVersionInUpdateWithVendor`](#function-library-lib.meta.cpePatchVersionInUpdateWithVendor) - -For many packages to make CPE available it should be enough to specify only: - -```nix -{ - # ... - meta.identifiers.cpeParts = lib.meta.cpePatchVersionInUpdateWithVendor vendor version; -} -``` - -#### `meta.identifiers.cpe` {#var-meta-identifiers-cpe} - -A readonly attribute that concatenates all CPE parts in one string. - -#### `meta.identifiers.possibleCPEs` {#var-meta-identifiers-possibleCPEs} - -A readonly attribute containing the list of guesses for what CPE for this package can look like. It includes all variants of version handling mentioned above. Each item is an attrset with attributes `cpeParts` and `cpe` for each guess. diff --git a/lib/meta.nix b/lib/meta.nix index cf48a700b23a..ee234d94489b 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -15,12 +15,7 @@ let assertMsg ; inherit (lib.attrsets) mapAttrs' filterAttrs; - inherit (builtins) - isString - match - typeOf - elemAt - ; + inherit (builtins) isString match typeOf; in rec { @@ -489,186 +484,4 @@ rec { assert assertMsg (match ".*/.*" y == null) "lib.meta.getExe': The second argument \"${y}\" is a nested path with a \"/\" character, but it should just be the name of the executable instead."; "${getBin x}/bin/${y}"; - - /** - Generate [CPE parts](#var-meta-identifiers-cpeParts) from inputs. Copies `vendor` and `version` to the output, and sets `update` to `*`. - - # Inputs - - `vendor` - - : package's vendor - - `version` - - : package's version - - # Type - - ``` - cpeFullVersionWithVendor :: string -> string -> AttrSet - ``` - - # Examples - :::{.example} - ## `lib.meta.cpeFullVersionWithVendor` usage example - - ```nix - lib.meta.cpeFullVersionWithVendor "gnu" "1.2.3" - => { - vendor = "gnu"; - version = "1.2.3"; - update = "*"; - } - ``` - - ::: - :::{.example} - ## `lib.meta.cpeFullVersionWithVendor` usage in derivations - - ```nix - mkDerivation rec { - version = "1.2.3"; - # ... - meta = { - # ... - identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gnu" version; - }; - } - ``` - ::: - */ - cpeFullVersionWithVendor = vendor: version: { - inherit vendor version; - update = "*"; - }; - - /** - Alternate version of [`lib.meta.cpePatchVersionInUpdateWithVendor`](#function-library-lib.meta.cpePatchVersionInUpdateWithVendor). - If `cpePatchVersionInUpdateWithVendor` succeeds, returns an attribute set with `success` set to `true` and `value` set to the result. - Otherwise, `success` is set to `false` and `error` is set to the string representation of the error. - - # Inputs - - `vendor` - - : package's vendor - - `version` - - : package's version - - # Type - - ``` - tryCPEPatchVersionInUpdateWithVendor :: string -> string -> AttrSet - ``` - - # Examples - :::{.example} - ## `lib.meta.tryCPEPatchVersionInUpdateWithVendor` usage example - - ```nix - lib.meta.tryCPEPatchVersionInUpdateWithVendor "gnu" "1.2.3" - => { - success = true; - value = { - vendor = "gnu"; - version = "1.2"; - update = "3"; - }; - } - ``` - - ::: - :::{.example} - ## `lib.meta.cpePatchVersionInUpdateWithVendor` error example - - ```nix - lib.meta.tryCPEPatchVersionInUpdateWithVendor "gnu" "5.3p0" - => { - success = false; - error = "version 5.3p0 doesn't match regex `([0-9]+\\.[0-9]+)\\.([0-9]+)`"; - } - ``` - - ::: - */ - tryCPEPatchVersionInUpdateWithVendor = - vendor: version: - let - regex = "([0-9]+\\.[0-9]+)\\.([0-9]+)"; - # we have to call toString here in case version is an attrset with __toString attribute - versionMatch = builtins.match regex (toString version); - in - if versionMatch == null then - { - success = false; - error = "version ${version} doesn't match regex `${regex}`"; - } - else - { - success = true; - value = { - inherit vendor; - version = elemAt versionMatch 0; - update = elemAt versionMatch 1; - }; - }; - - /** - Generate [CPE parts](#var-meta-identifiers-cpeParts) from inputs. Copies `vendor` to the result. When `version` matches `X.Y.Z` where all parts are numerical, sets `version` and `update` fields to `X.Y` and `Z`. Throws an error if the version doesn't match the expected template. - - # Inputs - - `vendor` - - : package's vendor - - `version` - - : package's version - - # Type - - ``` - cpePatchVersionInUpdateWithVendor :: string -> string -> AttrSet - ``` - - # Examples - :::{.example} - ## `lib.meta.cpePatchVersionInUpdateWithVendor` usage example - - ```nix - lib.meta.cpePatchVersionInUpdateWithVendor "gnu" "1.2.3" - => { - vendor = "gnu"; - version = "1.2"; - update = "3"; - } - ``` - - ::: - :::{.example} - ## `lib.meta.cpePatchVersionInUpdateWithVendor` usage in derivations - - ```nix - mkDerivation rec { - version = "1.2.3"; - # ... - meta = { - # ... - identifiers.cpeParts = lib.meta.cpePatchVersionInUpdateWithVendor "gnu" version; - }; - } - ``` - - ::: - */ - cpePatchVersionInUpdateWithVendor = - vendor: version: - let - result = tryCPEPatchVersionInUpdateWithVendor vendor version; - in - if result.success then result.value else throw result.error; } diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index c965c62a8f4b..6d486e5040fe 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -85,10 +85,5 @@ stdenv.mkDerivation rec { ivan ]; platforms = platforms.unix; - identifiers.cpeParts = { - vendor = "samba"; - inherit version; - update = "-"; - }; }; } diff --git a/pkgs/by-name/he/hello/package.nix b/pkgs/by-name/he/hello/package.nix index bbcce772a3aa..4e12ff39093e 100644 --- a/pkgs/by-name/he/hello/package.nix +++ b/pkgs/by-name/he/hello/package.nix @@ -55,6 +55,5 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ stv0g ]; mainProgram = "hello"; platforms = lib.platforms.all; - identifiers.cpeParts.vendor = "gnu"; }; }) diff --git a/pkgs/development/compilers/gcc/common/meta.nix b/pkgs/development/compilers/gcc/common/meta.nix index e0325feafbe8..c69f9956ddfc 100644 --- a/pkgs/development/compilers/gcc/common/meta.nix +++ b/pkgs/development/compilers/gcc/common/meta.nix @@ -30,5 +30,4 @@ in teams = [ teams.gcc ]; mainProgram = "${targetPrefix}gcc"; - identifiers.cpeParts.vendor = "gnu"; } diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index a79cfed28598..3e78d7946b5d 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -419,7 +419,6 @@ pipe platforms teams mainProgram - identifiers ; }; } diff --git a/pkgs/development/compilers/llvm/common/common-let.nix b/pkgs/development/compilers/llvm/common/common-let.nix index 800f2000e68c..1a17e39a0690 100644 --- a/pkgs/development/compilers/llvm/common/common-let.nix +++ b/pkgs/development/compilers/llvm/common/common-let.nix @@ -34,8 +34,6 @@ rec { ++ lib.optionals (lib.versionAtLeast release_version "7") lib.platforms.riscv ++ lib.optionals (lib.versionAtLeast release_version "14") lib.platforms.m68k ++ lib.optionals (lib.versionAtLeast release_version "16") lib.platforms.loongarch64; - - identifiers.cpeParts.vendor = "llvm"; }; releaseInfo = diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index af99e2995c07..38eda04ecb77 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -540,13 +540,6 @@ lib.makeOverridable ( ] ++ lib.optional (lib.versionOlder version "5.19") "loongarch64-linux"; timeout = 14400; # 4 hours - identifiers.cpeParts = { - part = "o"; - vendor = "linux"; - product = "linux_kernel"; - inherit version; - update = "*"; - }; } // extraMeta; }; diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index bb26bcd77336..424769a4a5c1 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -183,15 +183,5 @@ lib.warnIf (withDocs != null) badPlatforms = [ lib.systems.inspect.patterns.isMinGW ]; maintainers = [ ]; mainProgram = "bash"; - identifiers.cpeParts = - let - versionSplit = lib.split "p" version; - in - { - vendor = "gnu"; - product = "bash"; - version = lib.elemAt versionSplit 0; - update = lib.elemAt versionSplit 2; - }; }; } diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 66cf070c5268..3a42ab4f15aa 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -11,7 +11,6 @@ let inherit (lib) all attrNames - attrValues concatMapStrings concatMapStringsSep concatStrings @@ -38,8 +37,6 @@ let inherit (lib.meta) availableOn - cpeFullVersionWithVendor - tryCPEPatchVersionInUpdateWithVendor ; inherit (lib.generators) @@ -440,8 +437,6 @@ let # Used for the original location of the maintainer and team attributes to assist with pings. maintainersPosition = any; teamsPosition = any; - - identifiers = attrs; }; checkMetaAttr = @@ -575,19 +570,6 @@ let else validYes; - # Helper functions and declarations to handle identifiers, extracted to reduce allocations - hasAllCPEParts = cpeParts: !any isNull (attrValues cpeParts); - makeCPE = - cpeParts: - "cpe:2.3:${cpeParts.part}:${cpeParts.vendor}:${cpeParts.product}:${cpeParts.version}:${cpeParts.update}:${cpeParts.edition}:${cpeParts.sw_edition}:${cpeParts.target_sw}:${cpeParts.target_hw}:${cpeParts.language}:${cpeParts.other}"; - possibleCPEPartsFuns = [ - (vendor: version: { - success = true; - value = cpeFullVersionWithVendor vendor version; - }) - tryCPEPatchVersionInUpdateWithVendor - ]; - # The meta attribute is passed in the resulting attribute set, # but it's not part of the actual derivation, i.e., it's not # passed to the builder and is not a dependency. But since we @@ -652,51 +634,6 @@ let maintainers = attrs.meta.maintainers or [ ] ++ concatMap (team: team.members or [ ]) attrs.meta.teams or [ ]; - identifiers = - let - defaultCPEParts = { - part = "a"; - vendor = null; - product = attrs.pname or null; - version = null; - update = null; - edition = "*"; - sw_edition = "*"; - target_sw = "*"; - target_hw = "*"; - language = "*"; - other = "*"; - }; - - cpeParts = defaultCPEParts // attrs.meta.identifiers.cpeParts or { }; - cpe = if hasAllCPEParts cpeParts then makeCPE cpeParts else null; - - possibleCPEs = - if cpe != null then - [ { inherit cpeParts cpe; } ] - else if attrs.meta.identifiers.cpeParts.vendor or null == null || attrs.version or null == null then - [ ] - else - concatMap ( - f: - let - result = f attrs.meta.identifiers.cpeParts.vendor attrs.version; - # Note that attrs.meta.identifiers.cpeParts at this point can include defaults with user overrides. - # Since we can't split them apart, user overrides don't apply to possibleCPEs. - guessedParts = cpeParts // result.value; - in - optional (result.success && (hasAllCPEParts guessedParts)) { - cpeParts = guessedParts; - cpe = (makeCPE guessedParts); - } - ) possibleCPEPartsFuns; - v1 = { inherit cpeParts cpe possibleCPEs; }; - in - v1 - // { - inherit v1; - }; - # Expose the result of the checks for everyone to see. unfree = hasUnfreeLicense attrs; broken = isMarkedBroken attrs; From 9dd0bee7269951ce70cc413f2b09817f33376eb0 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 30 Aug 2025 09:57:44 +0300 Subject: [PATCH 233/305] gamescope: 3.16.14.2 -> 3.16.15 Diff: https://github.com/ValveSoftware/gamescope/compare/3.16.14.2...3.16.15 --- pkgs/by-name/ga/gamescope/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index 5432341d60e7..47dd74f38ba3 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -49,14 +49,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gamescope"; - version = "3.16.14.2"; + version = "3.16.15"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = "gamescope"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-l8SK8LQmFK0KeWxag7CX2lnME+HOvGpn4s3FqUNsK1Q="; + hash = "sha256-/JMk1ZzcVDdgvTYC+HQL09CiFDmQYWcu6/uDNgYDfdM="; }; patches = [ From 360003df84a378f8569aa56f4877e2d7f161e60d Mon Sep 17 00:00:00 2001 From: Kylie McClain Date: Wed, 27 Aug 2025 21:58:08 -0400 Subject: [PATCH 234/305] tageditor: switch to using Qt6 --- pkgs/by-name/ta/tageditor/package.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ta/tageditor/package.nix b/pkgs/by-name/ta/tageditor/package.nix index de03722f3c4e..e781976b018d 100644 --- a/pkgs/by-name/ta/tageditor/package.nix +++ b/pkgs/by-name/ta/tageditor/package.nix @@ -7,8 +7,8 @@ cpp-utilities, mp4v2, libid3tag, - libsForQt5, - qt5, + kdePackages, + qt6, tagparser, }: @@ -26,21 +26,26 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake - qt5.wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ mp4v2 libid3tag - qt5.qtbase - qt5.qttools - qt5.qtx11extras - qt5.qtwebengine cpp-utilities - libsForQt5.qtutilities + kdePackages.qtutilities + qt6.qtbase + qt6.qttools + qt6.qtwebengine tagparser ]; + cmakeFlags = [ + "-DQT_PACKAGE_PREFIX=Qt6" + "-DQt6_DIR=${qt6.qtbase}/lib/cmake/Qt6" + "-DQt6WebEngineWidgets_DIR=${qt6.qtwebengine}/lib/cmake/Qt6WebEngineWidgets" + ]; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/*.app $out/Applications From 329379cd71dd3ea553208437378778059da26414 Mon Sep 17 00:00:00 2001 From: liberodark Date: Sat, 30 Aug 2025 09:38:28 +0200 Subject: [PATCH 235/305] vkd3d: 1.15 -> 1.17 --- pkgs/by-name/vk/vkd3d/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vk/vkd3d/package.nix b/pkgs/by-name/vk/vkd3d/package.nix index 13e31f9fcb14..5ca791c4bac5 100644 --- a/pkgs/by-name/vk/vkd3d/package.nix +++ b/pkgs/by-name/vk/vkd3d/package.nix @@ -4,6 +4,7 @@ bison, fetchFromGitLab, flex, + perlPackages, pkg-config, spirv-headers, stdenv, @@ -14,14 +15,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "vkd3d"; - version = "1.15"; + version = "1.17"; src = fetchFromGitLab { domain = "gitlab.winehq.org"; owner = "wine"; repo = "vkd3d"; - rev = "vkd3d-${finalAttrs.version}"; - hash = "sha256-EzXsYi9wC+JdMYE77cIeO2lV+fY4ViQM3+KcAJFv9tU="; + tag = "vkd3d-${finalAttrs.version}"; + hash = "sha256-jxQ9L1GL4j3P5/nb79qAXQp8/IStOWmiK/vvbFxeg1k="; }; outputs = [ @@ -34,6 +35,8 @@ stdenv.mkDerivation (finalAttrs: { autoreconfHook bison flex + perlPackages.perl + perlPackages.JSON pkg-config wine ]; From e2b5ec05b97533e37cbf7b41e6c1a55aa8d70783 Mon Sep 17 00:00:00 2001 From: liberodark Date: Sat, 30 Aug 2025 09:50:24 +0200 Subject: [PATCH 236/305] vkd3d: add liberodark to maintainers --- pkgs/by-name/vk/vkd3d/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/vk/vkd3d/package.nix b/pkgs/by-name/vk/vkd3d/package.nix index 5ca791c4bac5..28c81fcb2010 100644 --- a/pkgs/by-name/vk/vkd3d/package.nix +++ b/pkgs/by-name/vk/vkd3d/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = with lib.licenses; [ lgpl21Plus ]; mainProgram = "vkd3d-compiler"; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ liberodark ]; inherit (wine.meta) platforms; }; }) From 87b221a848fbc902c37881c7efcd930ad72f0ffd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 07:55:16 +0000 Subject: [PATCH 237/305] python3Packages.argos-translate-files: 1.4.0 -> 1.4.1 --- .../python-modules/argos-translate-files/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/argos-translate-files/default.nix b/pkgs/development/python-modules/argos-translate-files/default.nix index c0917a76e03c..522ddeabbe35 100644 --- a/pkgs/development/python-modules/argos-translate-files/default.nix +++ b/pkgs/development/python-modules/argos-translate-files/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "argos-translate-files"; - version = "1.4.0"; + version = "1.4.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-vKnPL0xgyJ1vYtB2AgnKv4BqigSiFYmIm5HBq4hQ7nI="; + hash = "sha256-9ufNuExfyW3gr8+pIpp6Ie03e0hE4l3l3kk6EiVH0x8="; }; build-system = [ setuptools ]; From df87bc3814fab351c6649f126d551a8999831947 Mon Sep 17 00:00:00 2001 From: codgician <15964984+codgician@users.noreply.github.com> Date: Sat, 30 Aug 2025 16:01:17 +0800 Subject: [PATCH 238/305] linuxPackages_latest.prl-tools: 20.4.1-55996 -> 26.0.0-57238 --- .../virtualisation/parallels-guest.nix | 16 +------- .../linux/prl-tools/autostart.desktop | 8 ---- pkgs/os-specific/linux/prl-tools/default.nix | 6 +-- pkgs/os-specific/linux/prl-tools/update.sh | 41 ++++++++++++------- 4 files changed, 30 insertions(+), 41 deletions(-) delete mode 100644 pkgs/os-specific/linux/prl-tools/autostart.desktop diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix index 862d606dea64..a0918900f442 100644 --- a/nixos/modules/virtualisation/parallels-guest.nix +++ b/nixos/modules/virtualisation/parallels-guest.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, ... }: @@ -55,11 +54,8 @@ in boot.extraModulePackages = [ prl-tools ]; boot.kernelModules = [ - "prl_fs" - "prl_fs_freeze" "prl_tg" - ] - ++ optional (pkgs.stdenv.hostPlatform.system == "aarch64-linux") "prl_notifier"; + ]; services.timesyncd.enable = false; @@ -114,15 +110,6 @@ in WorkingDirectory = "${prl-tools}/bin"; }; }; - prlsga = { - description = "Parallels Shared Guest Applications Tool"; - wantedBy = [ "graphical-session.target" ]; - path = [ prl-tools ]; - serviceConfig = { - ExecStart = "${prl-tools}/bin/prlsga"; - WorkingDirectory = "${prl-tools}/bin"; - }; - }; prlshprof = { description = "Parallels Shared Profile Tool"; wantedBy = [ "graphical-session.target" ]; @@ -133,6 +120,5 @@ in }; }; }; - }; } diff --git a/pkgs/os-specific/linux/prl-tools/autostart.desktop b/pkgs/os-specific/linux/prl-tools/autostart.desktop deleted file mode 100644 index b8eb27fdd992..000000000000 --- a/pkgs/os-specific/linux/prl-tools/autostart.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Version=@version@ -Encoding=UTF-8 -Name=@description@ -Type=Application -Exec=@exec@ -X-KDE-autostart-phase=1 -GenericName[en_US]= diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 120a14a37107..aa100b3d222b 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -43,13 +43,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prl-tools"; - version = "20.4.1-55996"; + version = "26.0.0-57238"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; - hash = "sha256-CEyP8YZPLzjVAAjOaUqwQ4Ilzk9ybAtTTZUGZbSRrKQ="; + hash = "sha256-UuQGW1qYLGVLqAzApPKBqfOZdS23mCPsID4D0HATHNw="; }; hardeningDisable = [ @@ -118,9 +118,7 @@ stdenv.mkDerivation (finalAttrs: { ( # kernel modules cd kmods mkdir -p $out/lib/modules/${kernelVersion}/extra - cp prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.ko $out/lib/modules/${kernelVersion}/extra cp prl_tg/Toolgate/Guest/Linux/prl_tg/prl_tg.ko $out/lib/modules/${kernelVersion}/extra - ${lib.optionalString stdenv.hostPlatform.isAarch64 "cp prl_notifier/Installation/lnx/prl_notifier/prl_notifier.ko $out/lib/modules/${kernelVersion}/extra"} ) ( # tools diff --git a/pkgs/os-specific/linux/prl-tools/update.sh b/pkgs/os-specific/linux/prl-tools/update.sh index a720ca8856db..c6999c494d01 100755 --- a/pkgs/os-specific/linux/prl-tools/update.sh +++ b/pkgs/os-specific/linux/prl-tools/update.sh @@ -6,23 +6,36 @@ set -eu -o pipefail nixpkgs="$(git rev-parse --show-toplevel)" path="$nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix" -# Currently this script only supports Parallels 20 +# Currently this script only supports Parallels 26 # Please change the knowledge base url after each major release -kb_url="https://kb.parallels.com/en/130212" +kb_url="https://kb.parallels.com/en/131014" content="$(curl -s "$kb_url")" -# Parse HTML content and retrieve og:description for header metadata -description=$(echo "$content" | xmllint --recover --html --xpath 'string(//meta[@property="og:description"]/@content)' - 2>/dev/null) -regex='[^0-9]+([0-9]+\.[0-9]+\.[0-9]+)[^\(]+\(([0-9]+)\)' -if [[ $description =~ $regex ]]; then - version="${BASH_REMATCH[1]}-${BASH_REMATCH[2]}" - echo "Found latest version: $version" -else - echo "Failed to extract version from $kb_url" >&2 - echo "Retrived description: $description" >&2 - exit 1 +# Extract all version/build pairs and select the latest (by semver, then build) +# Prefer the article content; fallback to whole body text +article_text="$(echo "$content" | xmllint --recover --html --xpath 'string(//div[@id="article-content"])' - 2>/dev/null || true)" +if [[ -z "${article_text:-}" ]]; then + article_text="$(echo "$content" | xmllint --recover --html --xpath 'string(//body)' - 2>/dev/null || echo "$content")" fi +# Find all "X.Y.Z (BUILD)" occurrences like "20.4.1 (55996)" +mapfile -t candidates < <(echo "$article_text" \ + | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+[[:space:]]*\(([0-9]+)\)' \ + | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+)[[:space:]]*\(([0-9]+)\)/\1 \2/' \ + | sort -u) + +if [[ ${#candidates[@]} -eq 0 ]]; then + echo "Failed to extract any version from $kb_url" >&2 + exit 1 +fi + +# Sort by version then build and pick the highest +latest_pair="$(printf '%s\n' "${candidates[@]}" | sort -V -k1,1 -k2,2n | tail -n1)" +latest_ver="$(awk '{print $1}' <<< "$latest_pair")" +latest_build="$(awk '{print $2}' <<< "$latest_pair")" +version="${latest_ver}-${latest_build}" +echo "Found latest version: $version" + # Extract and compare current version old_version="$(grep -o 'version = ".*"' "$path" | awk -F'"' '{print $2}')" if [[ "$old_version" > "$version" || "$old_version" == "$version" ]]; then @@ -31,9 +44,9 @@ if [[ "$old_version" > "$version" || "$old_version" == "$version" ]]; then fi # Update version and hash -major_version=$(echo $version | cut -d. -f1) +major_version="$(echo "$version" | cut -d. -f1)" dmg_url="https://download.parallels.com/desktop/v${major_version}/${version}/ParallelsDesktop-${version}.dmg" -sha256="$(nix store prefetch-file $dmg_url --json | jq -r '.hash')" +sha256="$(nix store prefetch-file "$dmg_url" --json | jq -r '.hash')" sed -i -e "s,version = \"$old_version\",version = \"$version\"," \ -e "s,hash = \"sha256-.*\",hash = \"$sha256\"," "$path" From d6cff4d8805ec72b04824662a77f71e4887e2df5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 30 Aug 2025 10:20:43 +0200 Subject: [PATCH 239/305] python3Packages.ansible-runner: skip failing tests --- .../development/python-modules/ansible-runner/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index b094970f2bdd..760a30469aad 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -17,6 +17,7 @@ importlib-metadata, # tests + addBinToPathHook, ansible-core, glibcLocales, mock, @@ -26,6 +27,7 @@ pytest-xdist, pytestCheckHook, versionCheckHook, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { @@ -60,6 +62,7 @@ buildPythonPackage rec { ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; nativeCheckInputs = [ + addBinToPathHook ansible-core # required to place ansible CLI onto the PATH in tests glibcLocales mock @@ -69,12 +72,11 @@ buildPythonPackage rec { pytest-xdist pytestCheckHook versionCheckHook + writableTmpDirAsHomeHook ]; versionCheckProgramArg = "--version"; preCheck = '' - export HOME=$(mktemp -d) - export PATH="$PATH:$out/bin"; # avoid coverage flags rm pytest.ini ''; @@ -90,8 +92,10 @@ buildPythonPackage rec { # Assertion error "test_callback_plugin_censoring_does_not_overwrite" "test_get_role_list" + "test_include_role_events" "test_include_role_from_collection_events" "test_module_level_no_log" + "test_output_when_given_invalid_playbook" "test_resolved_actions" ]; From 06ca02eba3b386b6efaff0467ad22214c02149f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 08:21:12 +0000 Subject: [PATCH 240/305] koboldcpp: 1.98 -> 1.98.1 --- pkgs/by-name/ko/koboldcpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index bbdadfaf7234..8069cd12f86e 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -41,13 +41,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "koboldcpp"; - version = "1.98"; + version = "1.98.1"; src = fetchFromGitHub { owner = "LostRuins"; repo = "koboldcpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-5VP7NfHc00TdTqr5wel1vrtOnJWDGZT44tKDEm/f2iw="; + hash = "sha256-CJM97DRSIq2d3X6aR096+9QwBeI4kQNzxufdSoEydco="; }; enableParallelBuilding = true; From f879ac45475389051647225f436b9b84f96096f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 09:15:52 +0000 Subject: [PATCH 241/305] qownnotes: 25.8.4 -> 25.8.7 --- pkgs/by-name/qo/qownnotes/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix index 7319dde4af42..3265160fe9fe 100644 --- a/pkgs/by-name/qo/qownnotes/package.nix +++ b/pkgs/by-name/qo/qownnotes/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "qownnotes"; appname = "QOwnNotes"; - version = "25.8.4"; + version = "25.8.7"; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz"; - hash = "sha256-6DrwdimHuCLcmSiOGghvJajowbhWh8arnL/iPPxfopQ="; + hash = "sha256-OBLFdJAiBleymmWVDYIu7zeMNDU++HAlyPJi5qSoRO4="; }; nativeBuildInputs = [ From 9904c241417e489fe060590696dbbf0b625f5014 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 30 Aug 2025 11:37:14 +0200 Subject: [PATCH 242/305] python3Packages.transformers: 4.55.4 -> 4.56.0 Diff: https://github.com/huggingface/transformers/compare/v4.55.4...v4.56.0 Changelog: https://github.com/huggingface/transformers/releases/tag/v4.56.0 --- pkgs/development/python-modules/transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 6783c86c8fc8..774867251ee3 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -59,14 +59,14 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.55.4"; + version = "4.56.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "transformers"; tag = "v${version}"; - hash = "sha256-gBVFIX4wSfWVWPc0dAC9aGGjNdBhUaOfyU3C+wDr6GY="; + hash = "sha256-gM9kGID1lR7wN9Nxlq4h0GtI3QuJxkRVxQAsYbW8ok0="; }; build-system = [ setuptools ]; From 036b471cb6bc50b3ae59f699a812aea4799c75ab Mon Sep 17 00:00:00 2001 From: daspk04 Date: Sat, 30 Aug 2025 16:40:19 +0700 Subject: [PATCH 243/305] python3Packages.syne-tune: init at 0.14.2 --- .../python-modules/syne-tune/default.nix | 146 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 148 insertions(+) create mode 100644 pkgs/development/python-modules/syne-tune/default.nix diff --git a/pkgs/development/python-modules/syne-tune/default.nix b/pkgs/development/python-modules/syne-tune/default.nix new file mode 100644 index 000000000000..00058a4ae46d --- /dev/null +++ b/pkgs/development/python-modules/syne-tune/default.nix @@ -0,0 +1,146 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + dill, + numpy, + pandas, + sortedcontainers, + typing-extensions, + + # optional-dependencies + autograd, + botorch, + # configspace, + fastparquet, + h5py, + huggingface-hub, + matplotlib, + onnxruntime, + pymoo, + pyyaml, + scikit-learn, + scipy, + # smac, + statsmodels, + swig, + xgboost, + # yahpo-gym, + + # tests + pytestCheckHook, + pytest-timeout, + ray, + writableTmpDirAsHomeHook, +}: +buildPythonPackage rec { + pname = "syne-tune"; + version = "0.14.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "syne-tune"; + repo = "syne-tune"; + tag = "v${version}"; + hash = "sha256-51QyfJ0XOcXTeE95YOhtUmhat23joaEYvUnk7hYfksY="; + }; + + postPatch = '' + substituteInPlace syne_tune/optimizer/schedulers/synchronous/hyperband.py \ + --replace-fail 'metric_val=np.NAN' 'metric_val=np.nan' + substituteInPlace syne_tune/optimizer/schedulers/synchronous/dehb.py \ + --replace-fail 'result_failed.metric_val = np.NAN' 'result_failed.metric_val = np.nan' + ''; + + build-system = [ + setuptools + ]; + + pythonRelaxDeps = [ + "numpy" + ]; + + dependencies = [ + dill + numpy + pandas + sortedcontainers + typing-extensions + ]; + + optional-dependencies = lib.fix (self: { + blackbox-repository = [ + fastparquet + h5py + huggingface-hub + numpy + pandas + scikit-learn + xgboost + ]; + bore = [ + scikit-learn + xgboost + ]; + botorch = [ botorch ]; + gpsearchers = [ + autograd + scipy + ]; + kde = [ statsmodels ]; + moo = [ + pymoo + scipy + ]; + sklearn = [ scikit-learn ]; + # smac = [ smac swig ]; # smac unavailable on nixpkgs + visual = [ matplotlib ]; + # yahpo = [ configspace onnxruntime pandas pyyaml yahpo-gym ]; # yahpo-gym unavailable on nixpkgs + }); + + nativeCheckInputs = [ + pytestCheckHook + pytest-timeout + ray + writableTmpDirAsHomeHook + ] + ++ ray.optional-dependencies.tune + ++ optional-dependencies.blackbox-repository + ++ optional-dependencies.bore + ++ optional-dependencies.botorch + ++ optional-dependencies.gpsearchers + ++ optional-dependencies.kde + ++ optional-dependencies.sklearn; + + disabledTests = [ + # NameError: name 'HV' is not defined + # these require pkg `pymoo` and adding `pymoo` raises: + # setuptools.errors.PackageDiscoveryError: Multiple top-level packages discovered in a flat-layout: ['cma', 'notebooks']. + "test_append_hypervolume_indicator" + "test_hypervolume" + "test_hypervolume_progress" + "test_hypervolume_simple" + ]; + + disabledTestPaths = [ + # legacy test + "tst/schedulers/test_legacy_schedulers_api.py" + ]; + + pythonImportsCheck = [ + "syne_tune" + ]; + + meta = { + description = "Large scale asynchronous hyperparameter and architecture optimization library"; + homepage = "https://github.com/syne-tune/syne-tune"; + changelog = "https://github.com/syne-tune/syne-tune/releases/tag/${src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ daspk04 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1f45c475922e..bd6c516449d1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17740,6 +17740,8 @@ self: super: with self; { } ); + syne-tune = callPackage ../development/python-modules/syne-tune { }; + synergy = callPackage ../development/python-modules/synergy { }; synology-srm = callPackage ../development/python-modules/synology-srm { }; From 8c5f803260b721588fda776a178735b3a7e9f422 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 00:27:15 +0000 Subject: [PATCH 244/305] duply: 2.5.5 -> 2.5.6 --- pkgs/by-name/du/duply/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/du/duply/package.nix b/pkgs/by-name/du/duply/package.nix index d3157d64781e..89f0ca4fcce3 100644 --- a/pkgs/by-name/du/duply/package.nix +++ b/pkgs/by-name/du/duply/package.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "duply"; - version = "2.5.5"; + version = "2.5.6"; src = fetchurl { url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.5.x/duply_${finalAttrs.version}.tgz"; - hash = "sha256-ABryuV5jJNoxcJLsSjODLOHuLKrSEhY3buzy1cQh+AU="; + hash = "sha256-DSSnjfbcgWIuWaA+4h7d/0HqpDoXqkJOyGapYX4rtP0="; }; nativeBuildInputs = [ makeWrapper ]; From a9e6d32575c643f7818d0d7744858813fb787803 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 30 Aug 2025 12:19:57 +0200 Subject: [PATCH 245/305] python3Packages.sentence-transformers: skip failing tests --- .../python-modules/sentence-transformers/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix index 4872c23b0d31..178e75aae18d 100644 --- a/pkgs/development/python-modules/sentence-transformers/default.nix +++ b/pkgs/development/python-modules/sentence-transformers/default.nix @@ -104,6 +104,10 @@ buildPythonPackage rec { # Assertion error: Sparse operations take too long # (namely, load-sensitive test) "test_performance_with_large_vectors" + + # NameError: name 'ParallelismConfig' is not defined + "test_hf_argument_parser" + "test_hf_argument_parser_incorrect_string_arguments" ]; disabledTestPaths = [ From 2f680b87418f88cefd9ac549c4c8577046227dd1 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 23 Jul 2025 00:41:53 +0200 Subject: [PATCH 246/305] python3Packages.jax[lib]: 0.6.2 -> 0.7.0 Diff: https://github.com/jax-ml/jax/compare/jax-v0.6.2...jax-v0.7.0 Changelog: https://github.com/jax-ml/jax/releases/tag/jax-v0.7.0 --- .../jax-cuda12-pjrt/default.nix | 4 +-- .../jax-cuda12-plugin/default.nix | 22 ++++-------- .../python-modules/jax/default.nix | 12 +++++-- .../development/python-modules/jaxlib/bin.nix | 36 ++++++------------- .../python-modules/jaxlib/prefetch.sh | 2 +- 5 files changed, 29 insertions(+), 47 deletions(-) diff --git a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix index a12bf301fc19..76d23a8c6bba 100644 --- a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix +++ b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix @@ -50,8 +50,8 @@ buildPythonPackage rec { .${stdenv.hostPlatform.system}; hash = { - x86_64-linux = "sha256-jNnq15SOosd4pQj+9dEVnot6v0/MxwN8P+Hb/NlQEtw="; - aarch64-linux = "sha256-IvrwINLo98oeKRVjMkH333Z4tzxwePXwsvETJIM3994="; + x86_64-linux = "sha256-dCzCYNaXdxy4gwhDmHSKAH0jMoaqP+X8FSp0wHPVmiQ="; + aarch64-linux = "sha256-3Oaxz+f0R0lCW66iKpAnQjuvsaUmnhPzB4XP0bLimGI="; } .${stdenv.hostPlatform.system}; }; diff --git a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix index 4416b1829a52..eecf5b25de85 100644 --- a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix +++ b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix @@ -36,45 +36,35 @@ let # upstream does not distribute jax-cuda12-plugin 0.4.38 binaries for aarch64-linux srcs = { - "3.10-x86_64-linux" = getSrcFromPypi { - platform = "manylinux2014_x86_64"; - dist = "cp310"; - hash = "sha256-F1H4iYkmmzzbDf5PewcqZEIUmBjJvJjDo5XIrK+RCnk="; - }; - "3.10-aarch64-linux" = getSrcFromPypi { - platform = "manylinux2014_aarch64"; - dist = "cp310"; - hash = "sha256-vFw6ddBVGbTTJuRmnQ960P4PCs+HX5MT2RN0jMylqeo="; - }; "3.11-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp311"; - hash = "sha256-CJbLswjZUpHiBc2J0lQCne46HfQ9ZumDEzGpr9LSeHA="; + hash = "sha256-2MmZTNYm4vFQmhZOXgfBIiIN3QptiDRvika9U8tePhk="; }; "3.11-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp311"; - hash = "sha256-LNjieaWaOLoMl4qDHhOt627p5Fcvujh8eXW6OtU13Tg="; + hash = "sha256-JlpL8jjASPmJKeDa2XZCRtEkl73Yz98uIng6adc8xj4="; }; "3.12-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp312"; - hash = "sha256-/r0Jn5cNNQ64+losmi+0sOp7PWqJ3xSWZj7fp6/lkOU="; + hash = "sha256-q37GQziSIY8lvdWi0TddqQh+mB36CYJ6x/NzzNu/LE0="; }; "3.12-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp312"; - hash = "sha256-bJsALROx/LlANxPu3Th2oietH/vfs4EbH5+Jr0wlpfc="; + hash = "sha256-2UJ4q5a2ImQ3Ns3tt3eHA9MPL2T6SXrZ9bo13QyhBGQ="; }; "3.13-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp313"; - hash = "sha256-20xhA8kS2M0a35TDTTE7tHYMp/AciXynzWLmXyeZQZk="; + hash = "sha256-v94NtxSyrV/p6GwfbS5gx9TZgNAVAphYIIgoq82CdM8="; }; "3.13-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp313"; - hash = "sha256-dz76i1WoN0BsVh8O8CFE3akBkYEZN2DsVBnuyd0rmqw="; + hash = "sha256-5Nz+GFcW+0WsHti4kSIJbG2Tm0NRNxAzobz/JU3Rejg="; }; }; in diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index bb28c4f4aea1..9ecf5853e574 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -40,7 +40,7 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.6.2"; + version = "0.7.0"; pyproject = true; src = fetchFromGitHub { @@ -48,7 +48,7 @@ buildPythonPackage rec { repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jax tags! tag = "jax-v${version}"; - hash = "sha256-MTgpwpJWxULCiZhDG+MFpOp8ZHoj1ZDmOD05OaGfXhM="; + hash = "sha256-CWtzT5c2Rzf2C0yaF9z2Y+uV3TdZC/h4AQf8t+U8o7o="; }; build-system = [ setuptools ]; @@ -103,6 +103,14 @@ buildPythonPackage rec { "tests/pjit_test.py::PJitErrorTest::testAxisResourcesMismatch" "tests/shape_poly_test.py::ShapePolyTest" "tests/tree_util_test.py::TreeTest" + + # Mostly AssertionError on numerical tests failing since 0.7.0 + # https://github.com/jax-ml/jax/issues/31428 + "tests/export_back_compat_test.py" + "tests/lax_numpy_test.py" + "tests/lax_scipy_test.py" + "tests/lax_test.py" + "tests/linalg_test.py" ]; # Prevents `tests/export_back_compat_test.py::CompatTest::test_*` tests from failing on darwin with diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index cd1b44384b99..0d13280e1bf0 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -18,7 +18,7 @@ }: let - version = "0.6.2"; + version = "0.7.0"; inherit (python) pythonVersion; # As of 2023-06-06, google/jax upstream is no longer publishing CPU-only wheels to their GCS bucket. Instead the @@ -46,68 +46,52 @@ let }; in { - "3.10-x86_64-linux" = getSrcFromPypi { - platform = "manylinux2014_x86_64"; - dist = "cp310"; - hash = "sha256-wIeg62+39vj1TVb0cwMo395QQN07Xd+oEOfCjqcQK0I="; - }; - "3.10-aarch64-linux" = getSrcFromPypi { - platform = "manylinux2014_aarch64"; - dist = "cp310"; - hash = "sha256-QgXQmM6O+19/4v5QmLrmA2CU3I2IKfXg4NepsVUyYzY="; - }; - "3.10-aarch64-darwin" = getSrcFromPypi { - platform = "macosx_11_0_arm64"; - dist = "cp310"; - hash = "sha256-2kYBsrXcjCPWr7KT6s+5rsTh0YccsvKcWhUdED5zsPg="; - }; - "3.11-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp311"; - hash = "sha256-M11+NRXOeLUqQQE29Gqkp+oU0OfWQPNOHhN0CVVK0Kw="; + hash = "sha256-B0oCVmTPQ5tZZdzKryDEqubMlV3d106FNCVoq6QN2kc="; }; "3.11-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp311"; - hash = "sha256-Eern4FvFp5h12jYySvue3dS66u8qA4bK9tTzcgua7yg="; + hash = "sha256-nfW6TIcSxVXs8y6yV0OR9kPlyg7KyiF4CEuMS/gktDM="; }; "3.11-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp311"; - hash = "sha256-ogj/YcWBKNMGu05a0IWL0rCWDywcEK1CxUj3SmDAAg4="; + hash = "sha256-/8tLHj4BIQb0OzBtcND2o2JigkoyT4n38ivyiGf76Bw="; }; "3.12-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp312"; - hash = "sha256-8d0JtIGpPB1MdQAT9Gf3QZRJO6e9KfzU0c7BbjohT2U="; + hash = "sha256-U0+zJyuQ4sf47ZpCKaabXlwZsC+hRRbMxe750B8khUY="; }; "3.12-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp312"; - hash = "sha256-h+wtycPtmrk27shTUWDF+9LISZSFWfHF2qdfY/q+WUI="; + hash = "sha256-AFITtty9ILC9ZVgLdAJVlQFQtInhpTBvZdjkn5EUq4U="; }; "3.12-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp312"; - hash = "sha256-NNimhKi+lJ3YfdSsyXEBtBBqDcmtFR7IkdoHIxmle5k="; + hash = "sha256-vpBV41zmvePpCfVbTLbttxR9CsLbCM+YbVw0EJhq+l0="; }; "3.13-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp313"; - hash = "sha256-+UFj8UyP07qTrhS2Maus8UywMbugtZE4hpmEtNEDdfg="; + hash = "sha256-3zFmSlPBOpJjvKDow54DgKDMrgscElN232OkgNnLIIc="; }; "3.13-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp313"; - hash = "sha256-cEmIN8r1OL1Fj/aFjIv9QE24IBWrqPZjZwGX+pkA/wI="; + hash = "sha256-W3OTyGlKF+1SLpVT4GeR3Xa0eJs0SNCF0O1P+613ouc="; }; "3.13-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp313"; - hash = "sha256-v/Z7GIEzzh8BEcexY6wyH9ZGtZ7SIepIkGPi4PhcuWc="; + hash = "sha256-Oo8ynwVNLggJPNWkr5MozOEsO1+rS9peLFza3GO17S0="; }; }; in diff --git a/pkgs/development/python-modules/jaxlib/prefetch.sh b/pkgs/development/python-modules/jaxlib/prefetch.sh index d90cb0e97ff9..269d7823c78a 100755 --- a/pkgs/development/python-modules/jaxlib/prefetch.sh +++ b/pkgs/development/python-modules/jaxlib/prefetch.sh @@ -10,7 +10,7 @@ prefetch() { echo } -for py in "310" "311" "312" "313"; do +for py in "311" "312" "313"; do prefetch "$py" "x86_64-linux" "jaxlib-bin" prefetch "$py" "aarch64-linux" "jaxlib-bin" prefetch "$py" "aarch64-darwin" "jaxlib-bin" From 9a0a4c077ebb4cf41cc2249685693fc3f3cf48a9 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 23 Jul 2025 15:10:17 +0200 Subject: [PATCH 247/305] python3Packages.tensorflow-probability: patch to fix jax 0.7.0 compatibility --- .../tensorflow-probability/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 06989acddfe6..9e23f1c0e5a2 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch2, # bazel wheel buildBazelPackage, @@ -52,6 +53,18 @@ let rev = "refs/tags/v${version}"; hash = "sha256-LXQfGFgnM7WYUQjJ2Y3jskdeJ/dEKz+Afg+UOQjv5kc="; }; + + patches = [ + # AttributeError: jax.interpreters.xla.pytype_aval_mappings was deprecated in JAX v0.5.0 and + # removed in JAX v0.7.0. jax.core.pytype_aval_mappings can be used as a replacement in most cases. + # TODO: remove when updating to the next release + (fetchpatch2 { + name = "future-proof-reference-to-deprecated-pytype_aval_mappings"; + url = "https://github.com/tensorflow/probability/commit/135080b6b1ac5724fc1731b0a9ca6f2010b1aea5.patch"; + hash = "sha256-27yWIw5pI86KcUz0TsYwRFyLDoeiqmxgsRMBXaauzVw="; + }) + ]; + nativeBuildInputs = [ absl-py # needed to create the output wheel in installPhase From 317bd97b9b990f700e18fb54be6e0119d848f1a9 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 24 Jul 2025 09:58:19 +0200 Subject: [PATCH 248/305] python3Packages.chex: remove unused input pythonOlder --- pkgs/development/python-modules/chex/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/chex/default.nix b/pkgs/development/python-modules/chex/default.nix index 2318bc14e71e..8ec1a28dd608 100644 --- a/pkgs/development/python-modules/chex/default.nix +++ b/pkgs/development/python-modules/chex/default.nix @@ -18,7 +18,6 @@ cloudpickle, dm-tree, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { From c2bead39eecc15f8cc6f6159f0ed9e8e2967e769 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 18 Aug 2025 10:37:43 +0200 Subject: [PATCH 249/305] python3Packages.blackjax: skip failing test https://github.com/blackjax-devs/blackjax/issues/795 --- pkgs/development/python-modules/blackjax/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix index 1a0b0da52e03..e10d406aed7f 100644 --- a/pkgs/development/python-modules/blackjax/default.nix +++ b/pkgs/development/python-modules/blackjax/default.nix @@ -75,10 +75,12 @@ buildPythonPackage rec { "test_nuts__without_device" "test_nuts__without_jit" "test_smc_waste_free__with_jit" - ] - ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # Numerical test (AssertionError) + # First report, when the failure was only happening on aarch64-linux: # https://github.com/blackjax-devs/blackjax/issues/668 + # Second report, when the test started happening on x86_64-linux too after Jax was updated to 0.7.0 + # https://github.com/blackjax-devs/blackjax/issues/795 "test_chees_adaptation" ]; From 8f5fbd1ea9753e3d2346058a0407bb484a90f44b Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Sat, 30 Aug 2025 12:59:29 +0200 Subject: [PATCH 250/305] pluginupdate.py: normalize input for filtering plugins Replacing `.` with `-` --- maintainers/scripts/pluginupdate-py/pluginupdate.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/pluginupdate-py/pluginupdate.py b/maintainers/scripts/pluginupdate-py/pluginupdate.py index e3a4c44ede7e..c65a27b16cd7 100644 --- a/maintainers/scripts/pluginupdate-py/pluginupdate.py +++ b/maintainers/scripts/pluginupdate-py/pluginupdate.py @@ -504,13 +504,14 @@ class Editor: ) _prefetch = functools.partial(prefetch, cache=cache) + to_update_for_filter = [x.replace(".", "-") for x in to_update] plugins_to_update = ( current_plugin_specs if len(to_update) == 0 else [ description for description in current_plugin_specs - if self.filter_plugins_to_update(description, to_update) + if self.filter_plugins_to_update(description, to_update_for_filter) ] ) From ac5f21a0ad4950f7a42ae9a90c9f59c05297d670 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 30 Aug 2025 18:59:53 +0800 Subject: [PATCH 251/305] luau: 0.688 -> 0.689 (#438465) --- pkgs/by-name/lu/luau/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix index 843c368f7282..77322466aaed 100644 --- a/pkgs/by-name/lu/luau/package.nix +++ b/pkgs/by-name/lu/luau/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luau"; - version = "0.688"; + version = "0.689"; src = fetchFromGitHub { owner = "luau-lang"; repo = "luau"; tag = finalAttrs.version; - hash = "sha256-JrJoFSKvy9EqsJ7jdthLmnzQqZPIsVt9aixwaWbLp8Q="; + hash = "sha256-ZHALILdIJHYovSdUJk2KZIG0u/vdCAROzFd7U3pqWIk="; }; nativeBuildInputs = [ cmake ]; From 4282b58e5f6cbd8cc797e2b7bc5d3ac9151c05fe Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Sat, 30 Aug 2025 14:00:38 +0300 Subject: [PATCH 252/305] pulumi: 3.190.0 -> 3.192.0 (#438505) * python3Packages.pulumi: update for protobuf5 and fix tests * pulumi: 3.190.0 -> 3.192.0 --- pkgs/by-name/pu/pulumi/package.nix | 23 +++++++++++-------- .../pu/pulumi/plugins/pulumi-go/package.nix | 2 +- .../pulumi/plugins/pulumi-nodejs/package.nix | 2 +- .../pulumi/plugins/pulumi-python/package.nix | 2 +- .../python-modules/pulumi/default.nix | 14 ++++++++--- 5 files changed, 28 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/pu/pulumi/package.nix b/pkgs/by-name/pu/pulumi/package.nix index 088bb4e1a1f4..e981ff31fedc 100644 --- a/pkgs/by-name/pu/pulumi/package.nix +++ b/pkgs/by-name/pu/pulumi/package.nix @@ -17,18 +17,18 @@ }: buildGoModule rec { pname = "pulumi"; - version = "3.190.0"; + version = "3.192.0"; src = fetchFromGitHub { owner = "pulumi"; repo = "pulumi"; tag = "v${version}"; - hash = "sha256-n4YjJJZNPRjvR5WuDO3+bCvKxDrmK7VBbS6E6RP0C84="; + hash = "sha256-rcDXC+xlUa67afuXvmEv8UNsYWBvQQ0P4httdtdcrh4="; # Some tests rely on checkout directory name name = "pulumi"; }; - vendorHash = "sha256-ewVZNgnW7JbX0VOU14Ipo7EBkj8evOoXWjf9yLOmJF8="; + vendorHash = "sha256-BaFw8EnPd2GPA/p9wm8XpVy/iE8gqbteRnMQC8Z4NHQ="; sourceRoot = "${src.name}/pkg"; @@ -68,6 +68,10 @@ buildGoModule rec { # Seems to require TTY. "TestProgressEvents" + # Flaky; upstream “fixed” it by increasing timeout. + # https://github.com/pulumi/pulumi/pull/20116 + "TestAnalyzerCancellation" + # Tries to clone repo: https://github.com/pulumi/test-repo.git "TestValidateRelativeDirectory" "TestRepoLookup" @@ -83,6 +87,8 @@ buildGoModule rec { "TestPulumiNewWithoutTemplateSupport" "TestGeneratingProjectWithAIPromptSucceeds" "TestPulumiNewWithRegistryTemplates" + "TestRunNewYesNoTemplate" + "TestRunNewYesWithTemplate" # Connects to https://api.pulumi.com/… "TestGetLatestPluginIncludedVersion" @@ -156,18 +162,17 @@ buildGoModule rec { version = "v${version}"; command = "PULUMI_SKIP_UPDATE_CHECK=1 pulumi version"; }; + # Test building packages that reuse our version and src. inherit (pulumiPackages) pulumi-go pulumi-nodejs pulumi-python; - # Pulumi currently requires protobuf4, but Nixpkgs defaults to a newer - # version. Test that we can actually build the package with protobuf4. - # https://github.com/pulumi/pulumi/issues/16828 - # https://github.com/NixOS/nixpkgs/issues/351751#issuecomment-2462163436 - pythonPackage = + pythonPackage = python3Packages.pulumi; + pythonPackageProtobuf5 = (python3Packages.overrideScope ( final: _: { - protobuf = final.protobuf4; + protobuf = final.protobuf5; } )).pulumi; + pulumiTestHookShellcheck = testers.shellcheck { name = "pulumi-test-hook-shellcheck"; src = ./extra/pulumi-test-hook.sh; diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix index 4632c8353e82..1958b04eeb03 100644 --- a/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix +++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix @@ -9,7 +9,7 @@ buildGoModule rec { sourceRoot = "${src.name}/sdk/go/pulumi-language-go"; - vendorHash = "sha256-SfnGZyHuhgj277DrRqr8TkKE+ZwnPKBFu/7EcPS4OhE="; + vendorHash = "sha256-jwsdMSLDn2PNJFIIVhqwBLH7acFTOFLPgVNMKbI5DZE="; ldflags = [ "-s" diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix index 862436c760dc..af7be805670f 100644 --- a/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix +++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { sourceRoot = "${src.name}/sdk/nodejs/cmd/pulumi-language-nodejs"; - vendorHash = "sha256-Mf/SsRRDlm/TuSOksLV8f7H7xiT6fkHWyH6fJFo5fCc="; + vendorHash = "sha256-Q5Pk2f3EAiM4oit1vhc+PMEuMxdbrKAue3e0pnrZw2c="; ldflags = [ "-s" diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix index 4672f754ed1e..dfda8bf7764b 100644 --- a/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix +++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { sourceRoot = "${src.name}/sdk/python/cmd/pulumi-language-python"; - vendorHash = "sha256-cpmB1Vmi8JAh+OKzoZ/x/AxB4uxH95laSo0uBGrj3FQ="; + vendorHash = "sha256-BfkjDesPdPDV2uILYaMJFIvaEBKT15ukwaReAL3yziw="; ldflags = [ "-s" diff --git a/pkgs/development/python-modules/pulumi/default.nix b/pkgs/development/python-modules/pulumi/default.nix index b0bf59d45c62..1d14aa2d186d 100644 --- a/pkgs/development/python-modules/pulumi/default.nix +++ b/pkgs/development/python-modules/pulumi/default.nix @@ -54,6 +54,7 @@ buildPythonPackage { ]; pythonRelaxDeps = [ + "protobuf" "grpcio" "pip" "semver" @@ -66,11 +67,20 @@ buildPythonPackage { pulumi-python ]; + disabledTestPaths = [ + # TODO: remove disabledTestPaths once the test is fixed upstream. + # https://github.com/pulumi/pulumi/pull/19080#discussion_r2309611222 + "lib/test/provider/experimental/test_property_value.py::test_nesting" + ]; + # https://github.com/pulumi/pulumi/blob/0acaf8060640fdd892abccf1ce7435cd6aae69fe/sdk/python/scripts/test_fast.sh#L10-L11 # https://github.com/pulumi/pulumi/blob/0acaf8060640fdd892abccf1ce7435cd6aae69fe/sdk/python/scripts/test_fast.sh#L16 installCheckPhase = '' runHook preInstallCheck - ${python.executable} -m pytest --junit-xml= --ignore=lib/test/automation lib/test + declare -a _disabledTestPathsArray + concatTo _disabledTestPathsArray disabledTestPaths + ${python.executable} -m pytest --junit-xml= --ignore=lib/test/automation lib/test \ + "''${_disabledTestPathsArray[@]/#/--deselect=}" pushd lib/test_with_mocks ${python.executable} -m pytest --junit-xml= popd @@ -86,8 +96,6 @@ buildPythonPackage { description = "Modern Infrastructure as Code. Any cloud, any language"; homepage = "https://www.pulumi.com"; license = lib.licenses.asl20; - # https://github.com/pulumi/pulumi/issues/16828 - broken = lib.versionAtLeast protobuf.version "5"; maintainers = with lib.maintainers; [ teto tie From 649223979fd35c128985fc0c56f7c468026c4892 Mon Sep 17 00:00:00 2001 From: Robert James Hernandez Date: Sat, 30 Aug 2025 11:09:38 +0000 Subject: [PATCH 253/305] helmsman: move to finalAttrs --- pkgs/by-name/he/helmsman/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/he/helmsman/package.nix b/pkgs/by-name/he/helmsman/package.nix index b932bc721dfb..84d6e8435377 100644 --- a/pkgs/by-name/he/helmsman/package.nix +++ b/pkgs/by-name/he/helmsman/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "helmsman"; version = "4.0.1"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-As0YjqMdPCgIzYWB1Wf3R11mwj6CglWZdvCRzlHDvkw="; }; @@ -31,4 +31,4 @@ buildGoModule rec { sarcasticadmin ]; }; -} +}) From fa56da1bbdbc462c0e4f176065b9fc2390086280 Mon Sep 17 00:00:00 2001 From: Robert James Hernandez Date: Sat, 30 Aug 2025 11:09:58 +0000 Subject: [PATCH 254/305] helmsman: repo owner changed --- pkgs/by-name/he/helmsman/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/he/helmsman/package.nix b/pkgs/by-name/he/helmsman/package.nix index 84d6e8435377..74dc6b3897f7 100644 --- a/pkgs/by-name/he/helmsman/package.nix +++ b/pkgs/by-name/he/helmsman/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { version = "4.0.1"; src = fetchFromGitHub { - owner = "Praqma"; + owner = "mkubaczyk"; repo = "helmsman"; rev = "v${finalAttrs.version}"; sha256 = "sha256-As0YjqMdPCgIzYWB1Wf3R11mwj6CglWZdvCRzlHDvkw="; From ae0f69acb9b6e05e4fc96be66b783a1cb8d1f028 Mon Sep 17 00:00:00 2001 From: yunfachi Date: Fri, 8 Aug 2025 10:39:10 +0000 Subject: [PATCH 255/305] nixos/plymouth: use system.nixos.distroName in nixosBreezePlymouth --- nixos/modules/system/boot/plymouth.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 3e93bf0433a7..d2cdc2fcee1b 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -20,7 +20,7 @@ let nixosBreezePlymouth = pkgs.kdePackages.breeze-plymouth.override { logoFile = cfg.logo; logoName = "nixos"; - osName = "NixOS"; + osName = config.system.nixos.distroName; osVersion = config.system.nixos.release; }; From 8057a1d1c06f0c692a9979cf158dfd4a29ec40fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 11:55:22 +0000 Subject: [PATCH 256/305] libretro.ppsspp: 0-unstable-2025-08-19 -> 0-unstable-2025-08-30 --- pkgs/applications/emulators/libretro/cores/ppsspp.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix index 32cf3dbc34c3..5394356c4928 100644 --- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix +++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix @@ -13,13 +13,13 @@ }: mkLibretroCore { core = "ppsspp"; - version = "0-unstable-2025-08-19"; + version = "0-unstable-2025-08-30"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; - rev = "e526986da2b491763e2d715741f1babeef68f1a6"; - hash = "sha256-aPYsgb/nO9RzSGL+evMiCoYz3+08HC83An3rMoCWWMw="; + rev = "b9a3e939711e007cce6af5930603122c0df91f20"; + hash = "sha256-eEJeH7tfuIVrlkqGwsoe6RkY7tOEIyUbHSM8xGyZL4o="; fetchSubmodules = true; }; From 828fa957ddfa18c8605d8ff8c57bb7a506ffd47e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 12:43:17 +0000 Subject: [PATCH 257/305] panoply: 5.6.2 -> 5.7.0 --- pkgs/by-name/pa/panoply/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/panoply/package.nix b/pkgs/by-name/pa/panoply/package.nix index b8bbdba8e308..6b614993012e 100644 --- a/pkgs/by-name/pa/panoply/package.nix +++ b/pkgs/by-name/pa/panoply/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.6.2"; + version = "5.7.0"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - hash = "sha256-DxQjIUv2Gkb3VnaorphMDTo+GlM/NoCZ6y/ogHSs07c="; + hash = "sha256-R3hzqYytQ0k2dhmJAOIKy+zbEYQ6et/q3b0NEQkAGt4="; }; nativeBuildInputs = [ makeWrapper ]; From 0368011b1018dcf0c992534f562074deb3df992b Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 30 Aug 2025 14:55:44 +0200 Subject: [PATCH 258/305] nixf-diagnose: add update script To allow running locally: ``` nix-shell maintainers/scripts/update.nix --argstr package nixf-diagnose ``` --- pkgs/by-name/ni/nixf-diagnose/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ni/nixf-diagnose/package.nix b/pkgs/by-name/ni/nixf-diagnose/package.nix index 6cb833755301..6da4a83c4144 100644 --- a/pkgs/by-name/ni/nixf-diagnose/package.nix +++ b/pkgs/by-name/ni/nixf-diagnose/package.nix @@ -3,6 +3,7 @@ rustPlatform, fetchFromGitHub, nixf, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -20,6 +21,8 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-nrr2/lTWPyH7MsG2hSMJjbFCpHsKWINEP8jwSYPhocg="; + passthru.updateScript = nix-update-script { }; + meta = { description = "CLI wrapper for nixf-tidy with fancy diagnostic output"; mainProgram = "nixf-diagnose"; From ab82350f9c3fceb2b5c7c5a7a743fa72208e3b00 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 30 Aug 2025 14:57:06 +0200 Subject: [PATCH 259/305] nixf-diagnose: 0.1.2 -> 0.1.3 Changes: https://github.com/inclyc/nixf-diagnose/compare/0.1.2...0.1.3 --- pkgs/by-name/ni/nixf-diagnose/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nixf-diagnose/package.nix b/pkgs/by-name/ni/nixf-diagnose/package.nix index 6da4a83c4144..52f6f55ce003 100644 --- a/pkgs/by-name/ni/nixf-diagnose/package.nix +++ b/pkgs/by-name/ni/nixf-diagnose/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nixf-diagnose"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "inclyc"; repo = "nixf-diagnose"; tag = finalAttrs.version; - hash = "sha256-gkeU3EwAl9810eRRp5/ddf1h0qpV6FrBBdntNBpBtsM="; + hash = "sha256-8kcA2/ZMREKtXUM5rlAWRQL/C8+JNocZegq2ZHqbiSA="; }; env.NIXF_TIDY_PATH = lib.getExe nixf; - cargoHash = "sha256-nrr2/lTWPyH7MsG2hSMJjbFCpHsKWINEP8jwSYPhocg="; + cargoHash = "sha256-9rWQfoaMXFs83cYHtJPL0ogA9hPh7q3mK1DG4Q4CCq0="; passthru.updateScript = nix-update-script { }; From 1898fb4be4cc634fa60939683d05574dce436528 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Thu, 28 Aug 2025 08:01:29 +0100 Subject: [PATCH 260/305] buildArmTrustedFirmware: use lib.extendMkDerivation By switching to `lib.extendMkDerivation`, users can use the "finalAttrs" style when constructing their ATF builds. In addition, move buildArmTrustedFirmware to its own callPackage'd file, which allows for all arguments used to construct `buildArmTrustedFirmware` to be easily overridable. This was previously difficult and cumbersome to do due to the buildArmTrustedFirmware enclosing the function arguments in `pkgs/misc/arm-trusted-firmware/default.nix`, but not being available on the package-set to override said arguments. --- .../build-arm-trusted-firmware.nix | 128 ++++++++++ pkgs/misc/arm-trusted-firmware/default.nix | 218 ++++-------------- pkgs/top-level/all-packages.nix | 5 +- 3 files changed, 178 insertions(+), 173 deletions(-) create mode 100644 pkgs/misc/arm-trusted-firmware/build-arm-trusted-firmware.nix diff --git a/pkgs/misc/arm-trusted-firmware/build-arm-trusted-firmware.nix b/pkgs/misc/arm-trusted-firmware/build-arm-trusted-firmware.nix new file mode 100644 index 000000000000..7abff55f986d --- /dev/null +++ b/pkgs/misc/arm-trusted-firmware/build-arm-trusted-firmware.nix @@ -0,0 +1,128 @@ +{ + buildPackages, + fetchFromGitHub, + lib, + openssl, + pkgsCross, + stdenv, + + # Warning: this blob (hdcp.bin) runs on the main CPU (not the GPU) at + # privilege level EL3, which is above both the kernel and the + # hypervisor. + # + # This parameter applies only to platforms which are believed to use + # hdcp.bin. On all other platforms, or if unfreeIncludeHDCPBlob=false, + # hdcp.bin will be deleted before building. + unfreeIncludeHDCPBlob ? true, +}: + +lib.extendMkDerivation { + constructDrv = stdenv.mkDerivation; + + excludeDrvArgNames = [ "extraMeta" ]; + + extendDrvArgs = + finalAttrs: + { + filesToInstall, + installDir ? "$out", + platform ? null, + platformCanUseHDCPBlob ? false, # set this to true if the platform is able to use hdcp.bin + ... + }@args: + + # delete hdcp.bin if either: the platform is thought to + # not need it or unfreeIncludeHDCPBlob is false + let + deleteHDCPBlobBeforeBuild = !platformCanUseHDCPBlob || !unfreeIncludeHDCPBlob; + in + { + pname = "arm-trusted-firmware${lib.optionalString (platform != null) "-${platform}"}"; + version = args.version or "2.13.0"; + + src = + args.src or (fetchFromGitHub { + owner = "ARM-software"; + repo = "arm-trusted-firmware"; + tag = "v${finalAttrs.version}"; + hash = "sha256-rxm5RCjT/MyMCTxiEC8jQeFMrCggrb2DRbs/qDPXb20="; + }); + + patches = + lib.optionals deleteHDCPBlobBeforeBuild [ + # this is a rebased version of https://gitlab.com/vicencb/kevinboot/-/blob/master/atf.patch + ./remove-hdcp-blob.patch + ] + ++ args.patches or [ ]; + + postPatch = + lib.optionalString deleteHDCPBlobBeforeBuild '' + rm plat/rockchip/rk3399/drivers/dp/hdcp.bin + '' + + args.postPatch or ""; + + depsBuildBuild = [ buildPackages.stdenv.cc ] ++ args.depsBuildBuild or [ ]; + + nativeBuildInputs = [ + pkgsCross.arm-embedded.stdenv.cc # For Cortex-M0 firmware in RK3399 + openssl # For fiptool + ] + ++ args.nativeBuildInputs or [ ]; + + # Make the new toolchain guessing (from 2.11+) happy + # https://github.com/ARM-software/arm-trusted-firmware/blob/4ec2948fe3f65dba2f19e691e702f7de2949179c/make_helpers/toolchains/rk3399-m0.mk#L21-L22 + rk3399-m0-oc = "${pkgsCross.arm-embedded.stdenv.cc.targetPrefix}objcopy"; + + buildInputs = [ openssl ] ++ args.buildInputs or [ ]; + + makeFlags = [ + "HOSTCC=$(CC_FOR_BUILD)" + "M0_CROSS_COMPILE=${pkgsCross.arm-embedded.stdenv.cc.targetPrefix}" + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + # Make the new toolchain guessing (from 2.11+) happy + "CC=${stdenv.cc.targetPrefix}cc" + "LD=${stdenv.cc.targetPrefix}cc" + "AS=${stdenv.cc.targetPrefix}cc" + "OC=${stdenv.cc.targetPrefix}objcopy" + "OD=${stdenv.cc.targetPrefix}objdump" + # Passing OpenSSL path according to docs/design/trusted-board-boot-build.rst + "OPENSSL_DIR=${openssl}" + ] + ++ (lib.optional (platform != null) "PLAT=${platform}") + ++ args.makeFlags or [ ] + ++ (lib.warnIf (args ? extraMakeFlags) + "buildArmTrustedFirmware now accepts `makeFlags`, please switch from using `extraMakeFlags` to `makeFlags`" + args.extraMakeFlags or [ ] + ); + + installPhase = '' + runHook preInstall + + mkdir -p ${installDir} + cp ${lib.concatStringsSep " " filesToInstall} ${installDir} + + runHook postInstall + ''; + + hardeningDisable = [ "all" ]; + dontStrip = true; + + # breaks secondary CPU bringup on at least RK3588, maybe others + env.NIX_CFLAGS_COMPILE = "-fomit-frame-pointer"; + + meta = { + homepage = "https://github.com/ARM-software/arm-trusted-firmware"; + description = "Reference implementation of secure world software for ARMv8-A"; + license = [ + lib.licenses.bsd3 + ] + ++ lib.optionals (!deleteHDCPBlobBeforeBuild) [ lib.licenses.unfreeRedistributable ]; + maintainers = [ lib.maintainers.lopsided98 ]; + } + // (args.meta or { }) + // (lib.warnIf (args ? extraMeta) + "buildArmTrustedFirmware now accepts `meta`, please switch from using `extraMeta` to `meta`" + args.extraMeta or { } + ); + }; +} diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 93888011ba8a..c11bc93585c6 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -1,134 +1,8 @@ +{ buildArmTrustedFirmware, stdenv }: + { - lib, - stdenv, - fetchFromGitHub, - fetchFromGitLab, - openssl, - pkgsCross, - buildPackages, - - # Warning: this blob (hdcp.bin) runs on the main CPU (not the GPU) at - # privilege level EL3, which is above both the kernel and the - # hypervisor. - # - # This parameter applies only to platforms which are believed to use - # hdcp.bin. On all other platforms, or if unfreeIncludeHDCPBlob=false, - # hdcp.bin will be deleted before building. - unfreeIncludeHDCPBlob ? true, -}: - -let - buildArmTrustedFirmware = lib.makeOverridable ( - { - filesToInstall, - installDir ? "$out", - platform ? null, - platformCanUseHDCPBlob ? false, # set this to true if the platform is able to use hdcp.bin - extraMakeFlags ? [ ], - extraMeta ? { }, - ... - }@args: - - # delete hdcp.bin if either: the platform is thought to - # not need it or unfreeIncludeHDCPBlob is false - let - deleteHDCPBlobBeforeBuild = !platformCanUseHDCPBlob || !unfreeIncludeHDCPBlob; - in - - stdenv.mkDerivation ( - rec { - - pname = "arm-trusted-firmware${lib.optionalString (platform != null) "-${platform}"}"; - version = "2.13.0"; - - src = fetchFromGitHub { - owner = "ARM-software"; - repo = "arm-trusted-firmware"; - tag = "v${version}"; - hash = "sha256-rxm5RCjT/MyMCTxiEC8jQeFMrCggrb2DRbs/qDPXb20="; - }; - - patches = lib.optionals deleteHDCPBlobBeforeBuild [ - # this is a rebased version of https://gitlab.com/vicencb/kevinboot/-/blob/master/atf.patch - ./remove-hdcp-blob.patch - ]; - - postPatch = lib.optionalString deleteHDCPBlobBeforeBuild '' - rm plat/rockchip/rk3399/drivers/dp/hdcp.bin - ''; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - nativeBuildInputs = [ - pkgsCross.arm-embedded.stdenv.cc # For Cortex-M0 firmware in RK3399 - openssl # For fiptool - ]; - - # Make the new toolchain guessing (from 2.11+) happy - # https://github.com/ARM-software/arm-trusted-firmware/blob/4ec2948fe3f65dba2f19e691e702f7de2949179c/make_helpers/toolchains/rk3399-m0.mk#L21-L22 - rk3399-m0-oc = "${pkgsCross.arm-embedded.stdenv.cc.targetPrefix}objcopy"; - - buildInputs = [ openssl ]; - - makeFlags = [ - "HOSTCC=$(CC_FOR_BUILD)" - "M0_CROSS_COMPILE=${pkgsCross.arm-embedded.stdenv.cc.targetPrefix}" - "CROSS_COMPILE=${stdenv.cc.targetPrefix}" - # Make the new toolchain guessing (from 2.11+) happy - "CC=${stdenv.cc.targetPrefix}cc" - "LD=${stdenv.cc.targetPrefix}cc" - "AS=${stdenv.cc.targetPrefix}cc" - "OC=${stdenv.cc.targetPrefix}objcopy" - "OD=${stdenv.cc.targetPrefix}objdump" - # Passing OpenSSL path according to docs/design/trusted-board-boot-build.rst - "OPENSSL_DIR=${openssl}" - ] - ++ (lib.optional (platform != null) "PLAT=${platform}") - ++ extraMakeFlags; - - installPhase = '' - runHook preInstall - - mkdir -p ${installDir} - cp ${lib.concatStringsSep " " filesToInstall} ${installDir} - - runHook postInstall - ''; - - hardeningDisable = [ "all" ]; - dontStrip = true; - - # breaks secondary CPU bringup on at least RK3588, maybe others - env.NIX_CFLAGS_COMPILE = "-fomit-frame-pointer"; - - meta = - with lib; - { - homepage = "https://github.com/ARM-software/arm-trusted-firmware"; - description = "Reference implementation of secure world software for ARMv8-A"; - license = [ - licenses.bsd3 - ] - ++ lib.optionals (!deleteHDCPBlobBeforeBuild) [ licenses.unfreeRedistributable ]; - maintainers = with maintainers; [ lopsided98 ]; - } - // extraMeta; - } - // builtins.removeAttrs args [ "extraMeta" ] - ) - ); - -in -{ - inherit buildArmTrustedFirmware; - armTrustedFirmwareTools = buildArmTrustedFirmware { - # Normally, arm-trusted-firmware builds the build tools for buildPlatform - # using CC_FOR_BUILD (or as it calls it HOSTCC). Since want to build them - # for the hostPlatform here, we trick it by overriding the HOSTCC setting - # and, to be safe, remove CC_FOR_BUILD from the environment. - depsBuildBuild = [ ]; - extraMakeFlags = [ + makeFlags = [ "HOSTCC=${stdenv.cc.targetPrefix}gcc" "fiptool" "certtool" @@ -143,67 +17,67 @@ in ''; }; - armTrustedFirmwareAllwinner = buildArmTrustedFirmware rec { + armTrustedFirmwareAllwinner = buildArmTrustedFirmware (finalAttrs: { platform = "sun50i_a64"; - extraMeta.platforms = [ "aarch64-linux" ]; - filesToInstall = [ "build/${platform}/release/bl31.bin" ]; - }; + meta.platforms = [ "aarch64-linux" ]; + filesToInstall = [ "build/${finalAttrs.platform}/release/bl31.bin" ]; + }); - armTrustedFirmwareAllwinnerH616 = buildArmTrustedFirmware rec { + armTrustedFirmwareAllwinnerH616 = buildArmTrustedFirmware (finalAttrs: { platform = "sun50i_h616"; - extraMeta.platforms = [ "aarch64-linux" ]; - filesToInstall = [ "build/${platform}/release/bl31.bin" ]; - }; + meta.platforms = [ "aarch64-linux" ]; + filesToInstall = [ "build/${finalAttrs.platform}/release/bl31.bin" ]; + }); - armTrustedFirmwareAllwinnerH6 = buildArmTrustedFirmware rec { + armTrustedFirmwareAllwinnerH6 = buildArmTrustedFirmware (finalAttrs: { platform = "sun50i_h6"; - extraMeta.platforms = [ "aarch64-linux" ]; - filesToInstall = [ "build/${platform}/release/bl31.bin" ]; - }; + meta.platforms = [ "aarch64-linux" ]; + filesToInstall = [ "build/${finalAttrs.platform}/release/bl31.bin" ]; + }); - armTrustedFirmwareQemu = buildArmTrustedFirmware rec { + armTrustedFirmwareQemu = buildArmTrustedFirmware (finalAttrs: { platform = "qemu"; - extraMeta.platforms = [ "aarch64-linux" ]; + meta.platforms = [ "aarch64-linux" ]; filesToInstall = [ - "build/${platform}/release/bl1.bin" - "build/${platform}/release/bl2.bin" - "build/${platform}/release/bl31.bin" + "build/${finalAttrs.platform}/release/bl1.bin" + "build/${finalAttrs.platform}/release/bl2.bin" + "build/${finalAttrs.platform}/release/bl31.bin" ]; - }; + }); - armTrustedFirmwareRK3328 = buildArmTrustedFirmware rec { - extraMakeFlags = [ "bl31" ]; + armTrustedFirmwareRK3328 = buildArmTrustedFirmware (finalAttrs: { + makeFlags = [ "bl31" ]; platform = "rk3328"; - extraMeta.platforms = [ "aarch64-linux" ]; - filesToInstall = [ "build/${platform}/release/bl31/bl31.elf" ]; - }; + meta.platforms = [ "aarch64-linux" ]; + filesToInstall = [ "build/${finalAttrs.platform}/release/bl31/bl31.elf" ]; + }); - armTrustedFirmwareRK3399 = buildArmTrustedFirmware rec { - extraMakeFlags = [ "bl31" ]; + armTrustedFirmwareRK3399 = buildArmTrustedFirmware (finalAttrs: { + makeFlags = [ "bl31" ]; platform = "rk3399"; - extraMeta.platforms = [ "aarch64-linux" ]; - filesToInstall = [ "build/${platform}/release/bl31/bl31.elf" ]; + meta.platforms = [ "aarch64-linux" ]; + filesToInstall = [ "build/${finalAttrs.platform}/release/bl31/bl31.elf" ]; platformCanUseHDCPBlob = true; - }; + }); - armTrustedFirmwareRK3568 = buildArmTrustedFirmware rec { - extraMakeFlags = [ "bl31" ]; + armTrustedFirmwareRK3568 = buildArmTrustedFirmware (finalAttrs: { + makeFlags = [ "bl31" ]; platform = "rk3568"; - extraMeta.platforms = [ "aarch64-linux" ]; - filesToInstall = [ "build/${platform}/release/bl31/bl31.elf" ]; - }; + meta.platforms = [ "aarch64-linux" ]; + filesToInstall = [ "build/${finalAttrs.platform}/release/bl31/bl31.elf" ]; + }); - armTrustedFirmwareRK3588 = buildArmTrustedFirmware rec { - extraMakeFlags = [ "bl31" ]; + armTrustedFirmwareRK3588 = buildArmTrustedFirmware (finalAttrs: { + makeFlags = [ "bl31" ]; platform = "rk3588"; - extraMeta.platforms = [ "aarch64-linux" ]; - filesToInstall = [ "build/${platform}/release/bl31/bl31.elf" ]; - }; + meta.platforms = [ "aarch64-linux" ]; + filesToInstall = [ "build/${finalAttrs.platform}/release/bl31/bl31.elf" ]; + }); - armTrustedFirmwareS905 = buildArmTrustedFirmware rec { - extraMakeFlags = [ "bl31" ]; + armTrustedFirmwareS905 = buildArmTrustedFirmware (finalAttrs: { + makeFlags = [ "bl31" ]; platform = "gxbb"; - extraMeta.platforms = [ "aarch64-linux" ]; - filesToInstall = [ "build/${platform}/release/bl31.bin" ]; - }; + meta.platforms = [ "aarch64-linux" ]; + filesToInstall = [ "build/${finalAttrs.platform}/release/bl31.bin" ]; + }); } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe5094154213..50e15e2c2dc9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10379,9 +10379,12 @@ with pkgs; fftw = fftwFloat; }; + buildArmTrustedFirmware = + callPackage ../misc/arm-trusted-firmware/build-arm-trusted-firmware.nix + { }; + arm-trusted-firmware = callPackage ../misc/arm-trusted-firmware { }; inherit (arm-trusted-firmware) - buildArmTrustedFirmware armTrustedFirmwareTools armTrustedFirmwareAllwinner armTrustedFirmwareAllwinnerH616 From 36b01f623e962c9da88d8fa2de9db3df61541701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sat, 30 Aug 2025 09:10:56 -0400 Subject: [PATCH 261/305] nixos/cups-pdf: fix settings type --- nixos/modules/services/printing/cups-pdf.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/printing/cups-pdf.nix b/nixos/modules/services/printing/cups-pdf.nix index ccb5f4963e9c..25c5fb8a89b1 100644 --- a/nixos/modules/services/printing/cups-pdf.nix +++ b/nixos/modules/services/printing/cups-pdf.nix @@ -42,12 +42,14 @@ let instanceSettings = name: { freeformType = with lib.types; - nullOr (oneOf [ - int - str - path - package - ]); + attrsOf ( + nullOr (oneOf [ + int + str + path + package + ]) + ); # override defaults: # inject instance name into paths, # also avoid conflicts between user names and special dirs From c9febd4b93200a53861e05580a57ee602045b2cb Mon Sep 17 00:00:00 2001 From: zimward Date: Sat, 30 Aug 2025 16:57:27 +0200 Subject: [PATCH 262/305] niri: 25.05.1 -> 25.08 --- pkgs/by-name/ni/niri/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index 52dee4964bcd..64f143858e7b 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -27,13 +27,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "niri"; - version = "25.05.1"; + version = "25.08"; src = fetchFromGitHub { owner = "YaLTeR"; repo = "niri"; tag = "v${finalAttrs.version}"; - hash = "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs="; + hash = "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo="; }; outputs = [ @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '/usr/bin' "$out/bin" ''; - cargoHash = "sha256-8ltuI94yIhff7JxIfe1mog4bDJ/7VFgLooMWOnSTREs="; + cargoHash = "sha256-lR0emU2sOnlncN00z6DwDIE2ljI+D2xoKqG3rS45xG0="; strictDeps = true; @@ -81,7 +81,7 @@ rustPlatform.buildRustPackage (finalAttrs: { postInstall = '' install -Dm0644 README.md resources/default-config.kdl -t $doc/share/doc/niri - mv wiki $doc/share/doc/niri/wiki + mv docs/wiki $doc/share/doc/niri/wiki install -Dm0644 resources/niri.desktop -t $out/share/wayland-sessions '' @@ -122,6 +122,7 @@ rustPlatform.buildRustPackage (finalAttrs: { NIRI_BUILD_COMMIT = "Nixpkgs"; }; + checkFlags = [ "--skip=::egl" ]; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; doInstallCheck = true; From 23b46d910185f39f95a86a193ac4babdae251758 Mon Sep 17 00:00:00 2001 From: Notarin Steele <424c414e4b@gmail.com> Date: Wed, 27 Aug 2025 03:15:50 -0400 Subject: [PATCH 263/305] maintainers: add Notarin --- maintainers/maintainer-list.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d072e72875e8..cc267594de8f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18588,6 +18588,14 @@ githubId = 30374463; name = "Michal S."; }; + Notarin = { + name = "Notarin Steele"; + email = "424c414e4b@gmail.com"; + github = "Notarin"; + githubId = 25104390; + keys = [ { fingerprint = "4E15 9433 48D9 7BA7 E8B8 B0FF C38F D346 AE36 36FB"; } ]; + matrix = "@notarin:matrix.org"; + }; NotAShelf = { name = "NotAShelf"; email = "raf@notashelf.dev"; From 64c843885c6e3a754750b4c4d81d7d5f421f6239 Mon Sep 17 00:00:00 2001 From: Notarin Steele <424c414e4b@gmail.com> Date: Wed, 27 Aug 2025 03:19:01 -0400 Subject: [PATCH 264/305] hayabusa: add Notarin as maintainer Notarin is the upstream developer of hayabusa. --- pkgs/by-name/ha/hayabusa/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ha/hayabusa/package.nix b/pkgs/by-name/ha/hayabusa/package.nix index fc777a4bb048..adb90bcb7062 100644 --- a/pkgs/by-name/ha/hayabusa/package.nix +++ b/pkgs/by-name/ha/hayabusa/package.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage { description = "Swift rust fetch program"; homepage = "https://github.com/notarin/hayabusa"; license = lib.licenses.cc-by-nc-nd-40; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ Notarin ]; mainProgram = "hayabusa"; platforms = lib.platforms.linux; }; From cf2425f5f23dd77f9b2979acc518421356303d3f Mon Sep 17 00:00:00 2001 From: Notarin Steele <424c414e4b@gmail.com> Date: Wed, 27 Aug 2025 03:20:21 -0400 Subject: [PATCH 265/305] hayabusa: correct license --- pkgs/by-name/ha/hayabusa/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ha/hayabusa/package.nix b/pkgs/by-name/ha/hayabusa/package.nix index adb90bcb7062..f4fe76e84a9e 100644 --- a/pkgs/by-name/ha/hayabusa/package.nix +++ b/pkgs/by-name/ha/hayabusa/package.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage { meta = { description = "Swift rust fetch program"; homepage = "https://github.com/notarin/hayabusa"; - license = lib.licenses.cc-by-nc-nd-40; + license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ Notarin ]; mainProgram = "hayabusa"; platforms = lib.platforms.linux; From 9c1b34afceacec0cb31bd1620484d71eb23e54d2 Mon Sep 17 00:00:00 2001 From: Notarin Steele <424c414e4b@gmail.com> Date: Wed, 27 Aug 2025 03:20:39 -0400 Subject: [PATCH 266/305] hayabusa: switched version tracking to tags Co-authored-by: langsjo <104687438+langsjo@users.noreply.github.com> --- pkgs/by-name/ha/hayabusa/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ha/hayabusa/package.nix b/pkgs/by-name/ha/hayabusa/package.nix index f4fe76e84a9e..08c4bb54e3d1 100644 --- a/pkgs/by-name/ha/hayabusa/package.nix +++ b/pkgs/by-name/ha/hayabusa/package.nix @@ -7,14 +7,14 @@ vulkan-loader, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage (finalAttrs: { pname = "hayabusa"; - version = "unstable-2023-11-29"; + version = "0.3.9"; src = fetchFromGitHub { owner = "notarin"; repo = "hayabusa"; - rev = "1d6b8cfd301d60ff9f6946970b51818c036083b0"; + tag = "v${finalAttrs.version}"; hash = "sha256-w9vXC7L7IP4QLPFS1IgPOKSm7fT7W0R+NsHTdAfIupg="; }; @@ -48,4 +48,4 @@ rustPlatform.buildRustPackage { mainProgram = "hayabusa"; platforms = lib.platforms.linux; }; -} +}) From 6d1db4e3fc93d16b69652f27dd05c44b04ba0667 Mon Sep 17 00:00:00 2001 From: wrvsrx Date: Tue, 26 Aug 2025 15:59:13 +0800 Subject: [PATCH 267/305] clipcat: fix build --- pkgs/by-name/cl/clipcat/dummy.patch | 14 ++++++++++++++ pkgs/by-name/cl/clipcat/package.nix | 12 ++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/by-name/cl/clipcat/dummy.patch diff --git a/pkgs/by-name/cl/clipcat/dummy.patch b/pkgs/by-name/cl/clipcat/dummy.patch new file mode 100644 index 000000000000..4fdc3d60526a --- /dev/null +++ b/pkgs/by-name/cl/clipcat/dummy.patch @@ -0,0 +1,14 @@ +diff --git a/crates/server/src/notification/dummy.rs b/crates/server/src/notification/dummy.rs +index f85dda0..7489f22 100644 +--- a/crates/server/src/notification/dummy.rs ++++ b/crates/server/src/notification/dummy.rs +@@ -1,6 +1,9 @@ ++#[cfg(test)] + use crate::notification::traits; + ++#[cfg(test)] + #[derive(Clone, Copy, Debug, Default)] + pub struct Notification {} + ++#[cfg(test)] + impl traits::Notification for Notification {} diff --git a/pkgs/by-name/cl/clipcat/package.nix b/pkgs/by-name/cl/clipcat/package.nix index 56e2e87e051f..2b674db07e8f 100644 --- a/pkgs/by-name/cl/clipcat/package.nix +++ b/pkgs/by-name/cl/clipcat/package.nix @@ -5,6 +5,7 @@ rustPlatform, protobuf, installShellFiles, + writableTmpDirAsHomeHook, }: rustPlatform.buildRustPackage rec { @@ -20,9 +21,20 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-UA+NTtZ2qffUPUmvCidnTHwFzD3WOPTlxHR2e2vKwPQ="; + patches = [ + # Fix compilation errors caused by stricter restrictions on unused code in Rust 1.89. + # TODO: remove this patch after upstream fix it. + ./dummy.patch + ]; + nativeBuildInputs = [ protobuf installShellFiles + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # fix following error on darwin: + # objc/notify.h:1:9: fatal error: could not build module 'Cocoa' + writableTmpDirAsHomeHook ]; checkFlags = [ From 56d32fd2ce6cfd9b5789653cb5944c52e21b8ae1 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Mon, 25 Aug 2025 22:04:25 +0200 Subject: [PATCH 268/305] glab: 1.65.0 -> 1.67.0 https://gitlab.com/gitlab-org/cli/-/releases/v1.67.0 https://gitlab.com/gitlab-org/cli/-/releases/v1.66.0 Diff: https://gitlab.com/gitlab-org/cli/-/compare/v1.65.0...v1.67.0 --- pkgs/by-name/gl/glab/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index 98f7be5ff5b2..d72d3373e8f5 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "glab"; - version = "1.65.0"; + version = "1.67.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-LqcUrF1CkNshsZBl9PdYByQKzMr5lWw5+BwCXs+yml0="; + hash = "sha256-d0pElHlfElqnlXbbAaIGzLtWpuAdIOVfdmTD6+2nNX4="; leaveDotGit = true; postFetch = '' cd "$out" @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { ''; }; - vendorHash = "sha256-2lC55LaMOrDy8F+IOqB4aujYlKKgpJmhZw6kl2yN/GM="; + vendorHash = "sha256-/nFdlC1gg08vEGuiq9qoUar8EGuYddxvTvFuGxQKnYA="; ldflags = [ "-s" From 603ff7ec484d7c7018907fd4a3904857bad27d2d Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Mon, 25 Aug 2025 22:05:16 +0200 Subject: [PATCH 269/305] glab: add anthonyroussel to maintainers --- pkgs/by-name/gl/glab/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index d72d3373e8f5..940c787492ef 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -85,6 +85,7 @@ buildGoModule (finalAttrs: { maintainers = with lib.maintainers; [ freezeboy luftmensch-luftmensch + anthonyroussel ]; mainProgram = "glab"; }; From 1a3410501fc689fd4fccb9b7c0ac624944dda472 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 15:35:24 +0000 Subject: [PATCH 270/305] owi: 0.2-unstable-2025-08-18 -> 0.2-unstable-2025-08-22 --- pkgs/by-name/ow/owi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ow/owi/package.nix b/pkgs/by-name/ow/owi/package.nix index 968af0d915b8..0f392f07c814 100644 --- a/pkgs/by-name/ow/owi/package.nix +++ b/pkgs/by-name/ow/owi/package.nix @@ -15,14 +15,14 @@ let in ocamlPackages.buildDunePackage rec { pname = "owi"; - version = "0.2-unstable-2025-08-18"; + version = "0.2-unstable-2025-08-22"; src = fetchFromGitHub { owner = "ocamlpro"; repo = "owi"; - rev = "40c6434ecdb0cf7248b98670526e18dc007b425b"; + rev = "daad8163dec12abc8fe7f3384adc37e51f0994e9"; fetchSubmodules = true; - hash = "sha256-N/DO3vml7vzOjPi81LPOL+ZuI8CewAhANM9j4nuRbyU="; + hash = "sha256-C28YoUbovSEk9/RW0iYWNVB7/ETlDnY+vPTfQZPOerE="; }; nativeBuildInputs = with ocamlPackages; [ From e068fffb76342c9461727b00b71835f007d6b627 Mon Sep 17 00:00:00 2001 From: azahi Date: Sat, 23 Aug 2025 13:32:12 +0300 Subject: [PATCH 271/305] tree-sitter-grammars.tree-sitter-go-template: init --- .../tools/parsing/tree-sitter/grammars/default.nix | 1 + .../grammars/tree-sitter-go-template.json | 14 ++++++++++++++ .../tools/parsing/tree-sitter/update.nix | 4 ++++ pkgs/top-level/python-packages.nix | 1 + 4 files changed, 20 insertions(+) create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go-template.json diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 4769ff0013db..b16e98289a50 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -37,6 +37,7 @@ tree-sitter-glimmer = lib.importJSON ./tree-sitter-glimmer.json; tree-sitter-glsl = lib.importJSON ./tree-sitter-glsl.json; tree-sitter-go = lib.importJSON ./tree-sitter-go.json; + tree-sitter-go-template = lib.importJSON ./tree-sitter-go-template.json; tree-sitter-godot-resource = lib.importJSON ./tree-sitter-godot-resource.json; tree-sitter-gomod = lib.importJSON ./tree-sitter-gomod.json; tree-sitter-gowork = lib.importJSON ./tree-sitter-gowork.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go-template.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go-template.json new file mode 100644 index 000000000000..4032f124945d --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go-template.json @@ -0,0 +1,14 @@ +{ + "url": "https://github.com/ngalaiko/tree-sitter-go-template", + "rev": "5f19a36bb1eebb30454e277b222b278ceafed0dd", + "date": "2025-01-29T18:19:22Z", + "path": "/nix/store/lcgn1hzzsf5jhliy7454lxx7phkmrjfb-tree-sitter-go-template", + "sha256": "1nm9ybwb4if6g7cs911i6msb3q2f1plbl70k2y4icbxk2p57k5ka", + "hash": "sha256-apZ5yhWzLxaJFxMcuugNTuCxdDUxhKTZecZFsvjyqdo=", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "fetchTags": false, + "leaveDotGit": false, + "rootDir": "" +} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index e2d3192611cb..2a499434aa6f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -344,6 +344,10 @@ let orga = "blessanabraham"; repo = "tree-sitter-gemini"; }; + "tree-sitter-go-template" = { + orga = "ngalaiko"; + repo = "tree-sitter-go-template"; + }; "tree-sitter-godot-resource" = { orga = "prestonknopp"; repo = "tree-sitter-godot-resource"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bff0f1a6d500..388b111ae1cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18416,6 +18416,7 @@ self: super: with self; { lib.filterAttrs ( name: value: !(builtins.elem name [ + "tree-sitter-go-template" "tree-sitter-sql" "tree-sitter-templ" ]) From 81cdc8766c5103825776294feec58f7db037234f Mon Sep 17 00:00:00 2001 From: dylan Date: Sat, 30 Aug 2025 10:21:21 -0700 Subject: [PATCH 272/305] python313Packages.loro: init at 1.5.4 --- .../python-modules/loro/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/loro/default.nix diff --git a/pkgs/development/python-modules/loro/default.nix b/pkgs/development/python-modules/loro/default.nix new file mode 100644 index 000000000000..ea6bb82e50cb --- /dev/null +++ b/pkgs/development/python-modules/loro/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + rustPlatform, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "loro"; + version = "1.5.4"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-vC1SLkwCkiytZe9d9t1OH+Vd360657XxdU81bM9C9jk="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-cjIHU2aMxkYMoulePmxFhuZrqMbnOkEL+Ar75+KCVFw="; + }; + + build-system = [ + rustPlatform.maturinBuildHook + rustPlatform.cargoSetupHook + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Upstream test has hardcoded version and is rarely updated. + # See https://github.com/loro-dev/loro-py/issues/19 + "test_version" + ]; + + meta = { + description = "Data collaborative and version-controlled JSON with CRDTs"; + homepage = "https://github.com/loro-dev/loro-py"; + changelog = "https://github.com/loro-dev/loro-py/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + dmadisetti + ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e722cfc7ae0c..8b6489a2e6da 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8721,6 +8721,8 @@ self: super: with self; { loqedapi = callPackage ../development/python-modules/loqedapi { }; + loro = callPackage ../development/python-modules/loro { }; + losant-rest = callPackage ../development/python-modules/losant-rest { }; lottie = callPackage ../development/python-modules/lottie { }; From 605c55e623cb2bd9efb4417a6cc3074e936ee22b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 17:33:59 +0000 Subject: [PATCH 273/305] gefyra: 2.3.1 -> 2.3.2 --- pkgs/by-name/ge/gefyra/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ge/gefyra/package.nix b/pkgs/by-name/ge/gefyra/package.nix index 1f3125f822a9..10d328ab96cb 100644 --- a/pkgs/by-name/ge/gefyra/package.nix +++ b/pkgs/by-name/ge/gefyra/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gefyra"; - version = "2.3.1"; + version = "2.3.2"; src = fetchzip { url = "https://github.com/gefyrahq/gefyra/releases/download/${finalAttrs.version}/gefyra-${finalAttrs.version}-linux-amd64.zip"; - hash = "sha256-piF/h2g9NeLbSVC5YjfcN1Hq+LWXe+Ib3LolA/vOZdw="; + hash = "sha256-p75lJMg5U/cuoOMK+Vf76XhSu1oCKXTPokPCJphuwUw="; stripRoot = false; }; From 8227a08ab1f8ec93247d24913874ccef595ad8db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 16:57:03 +0000 Subject: [PATCH 274/305] androidStudioPackages.canary: 2025.1.4.1 -> 2025.1.4.3 --- 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 d3578652ff79..a97608cba5be 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -24,8 +24,8 @@ let sha256Hash = "sha256-3LkcpvuoUhY/kRpoqYnwfx1cdPvvdBMEFXtRLYmqTk4="; }; latestVersion = { - version = "2025.1.4.1"; # "Android Studio Narwhal 4 Feature Drop | 2025.1.4 Canary 1" - sha256Hash = "sha256-OGnBf0LrfbN7WpO9skT8+ltAeKejyqHobxFvrzLp3EY="; + version = "2025.1.4.3"; # "Android Studio Narwhal 4 Feature Drop | 2025.1.4 Canary 3" + sha256Hash = "sha256-YYacdZ7YdmmrTSsKtCfmSSrrZV+/GGPK34KnlO0+aKQ="; }; in { From d0e83189d26b2846e7774abcffb2455ad5afed6b Mon Sep 17 00:00:00 2001 From: Yureka Date: Sat, 30 Aug 2025 19:50:16 +0200 Subject: [PATCH 275/305] fastnetmon-advanced: 2.0.371 -> 2.0.372 (#436727) Changelog: https://github.com/FastNetMon/fastnetmon-advanced-releases/releases/tag/v2.0.372 --- pkgs/by-name/fa/fastnetmon-advanced/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fastnetmon-advanced/package.nix b/pkgs/by-name/fa/fastnetmon-advanced/package.nix index 3b510c25507b..851c19015a20 100644 --- a/pkgs/by-name/fa/fastnetmon-advanced/package.nix +++ b/pkgs/by-name/fa/fastnetmon-advanced/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "fastnetmon-advanced"; - version = "2.0.371"; + version = "2.0.372"; src = fetchurl { url = "https://repo.fastnetmon.com/fastnetmon_ubuntu_jammy/pool/fastnetmon/f/fastnetmon/fastnetmon_${version}_amd64.deb"; - hash = "sha256-/qCUeo/2AYIT9Yl6QjoTBPfmg8Lk2efDU5Axv4JU+t8="; + hash = "sha256-FwYAbTBkk+AciDVxTIimswsB0M3gbzKX+03PD0fLMsY="; }; nativeBuildInputs = [ From 8fa7c7ad4c13dd85474498bf1b557ff7b4e0b93e Mon Sep 17 00:00:00 2001 From: codgician <15964984+codgician@users.noreply.github.com> Date: Sat, 30 Aug 2025 21:48:46 +0800 Subject: [PATCH 276/305] python3Packages:opensearch-py: fix build by cherrypicking upstream fix commit --- .../python-modules/opensearch-py/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/opensearch-py/default.nix b/pkgs/development/python-modules/opensearch-py/default.nix index ec066248dde8..9da3f6d21d44 100644 --- a/pkgs/development/python-modules/opensearch-py/default.nix +++ b/pkgs/development/python-modules/opensearch-py/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, # build-system setuptools, @@ -40,6 +41,15 @@ buildPythonPackage rec { hash = "sha256-IAEh+rB26Zqv7j5g2YIRZRCAtFbBngoh+w8Z4e2bY+M="; }; + patches = [ + # Remove delete event_loop fixture to fix test with pytest-asyncio 1.x + (fetchpatch { + name = "remove-delete-event-loop-fixture.patch"; + url = "https://github.com/opensearch-project/opensearch-py/commit/2f9eeaad3f7bd38518b23a59659ccf02fff19577.patch"; + hash = "sha256-ljg9GiXPOokrIRS+gF+W9DnZ71AzH8WmLeb3G7rLeK8="; + }) + ]; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ @@ -83,7 +93,7 @@ buildPythonPackage rec { "test_basicauth_in_request_session" "test_callable_in_request_session" ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86) [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Flaky tests: OSError: [Errno 48] Address already in use "test_redirect_failure_when_allow_redirect_false" "test_redirect_success_when_allow_redirect_true" From c28e4efd6a8ffc46345aec29ecd2ad5a28041691 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Sat, 30 Aug 2025 20:07:28 +0200 Subject: [PATCH 277/305] claude-code: 1.0.96 -> 1.0.98 Changelog: https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md - Settings: /doctor now validates permission rule syntax and suggests corrections (1.0.97) - Additional improvements and bug fixes for version 1.0.98 --- pkgs/by-name/cl/claude-code/package-lock.json | 8 ++++---- pkgs/by-name/cl/claude-code/package.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 7cae438e5af9..5430f4df97b4 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -6,13 +6,13 @@ "packages": { "": { "dependencies": { - "@anthropic-ai/claude-code": "^1.0.96" + "@anthropic-ai/claude-code": "^1.0.98" } }, "node_modules/@anthropic-ai/claude-code": { - "version": "1.0.96", - "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.96.tgz", - "integrity": "sha512-xnxhYzuh6PYlMcw56REMQiGMW20WaLLOvG8L8TObq70zhNKs3dro7nhYwHRe1c2ubTr20oIJK0aSkyD2BpO8nA==", + "version": "1.0.98", + "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.98.tgz", + "integrity": "sha512-IV193Eh8STdRcN3VkNcojPIlLnQPch+doBVrDSEV1rPPePISy7pzHFZL0Eg7zIPj9gHkHV1D2s0RMMwzVXJThA==", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index cdc0f9c59807..21cfe04287fa 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "claude-code"; - version = "1.0.96"; + version = "1.0.98"; nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz"; - hash = "sha256-w3KT+dZbrcrwnOl9ByZ43nuSN9ON078kCqxF7fIZ7AA="; + hash = "sha256-Dkaj97FuRp6LmZgsmzKRX9PKp7bzvUj7rUD3b/5CxtU="; }; - npmDepsHash = "sha256-qjg3gUmqlPfngnWRfADZlAK89aOoKtCkQkCXKjVPNFk="; + npmDepsHash = "sha256-rcULDhcHZm16LKzceIu6gRH/Q1HBCpIJFfZRMVkhiiQ="; postPatch = '' cp ${./package-lock.json} package-lock.json From e56577c6ea9c5140b53b1b605982caf9eab022b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 18:09:17 +0000 Subject: [PATCH 278/305] dotter: 0.13.3 -> 0.13.4 --- pkgs/by-name/do/dotter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/do/dotter/package.nix b/pkgs/by-name/do/dotter/package.nix index 0608d94c871f..caf02fcebf88 100644 --- a/pkgs/by-name/do/dotter/package.nix +++ b/pkgs/by-name/do/dotter/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "dotter"; - version = "0.13.3"; + version = "0.13.4"; src = fetchFromGitHub { owner = "SuperCuber"; repo = "dotter"; rev = "v${version}"; - hash = "sha256-7YExvmuliTL9oagXNUtZ7ZOPyELcS+igK1tXdhG0kQk="; + hash = "sha256-cxabaCxbwP2YbnG2XfmVJWFTw9LGO0D1dlLy6fuux+M="; }; - cargoHash = "sha256-UBZZu8D1fbNOn2obviP+/Qw+E/OoNKRA4NXzqCqghGs="; + cargoHash = "sha256-KLU+4CYqTKEH8wuvinVS0Zs+nFgOer2ho8LXnLDNVKY="; nativeCheckInputs = [ which From f2849b3234c0e8bb90797cc78e1488922c698576 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Sat, 30 Aug 2025 21:24:21 +0200 Subject: [PATCH 279/305] jjui: 0.9.2 -> 0.9.3 Changelog: https://github.com/idursun/jjui/releases/tag/v0.9.3 Diff: https://github.com/idursun/jjui/compare/v0.9.2...v0.9.3 --- pkgs/by-name/jj/jjui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix index 88b1ee75e373..0ce7c97a9796 100644 --- a/pkgs/by-name/jj/jjui/package.nix +++ b/pkgs/by-name/jj/jjui/package.nix @@ -7,16 +7,16 @@ }: buildGoModule (finalAttrs: { pname = "jjui"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "idursun"; repo = "jjui"; tag = "v${finalAttrs.version}"; - hash = "sha256-8jLQ9KLMMz4y7pXA9wlHbGN4cxRAYVPy6oRKLHCU4SM="; + hash = "sha256-UkgQ3uxWPwLQiNhcZReFifLPD8h+xmH798ckTtia/+4="; }; - vendorHash = "sha256-2rlfR5HLFJyLVSRiUGTCwQDFWRBt4jmL6sdZcq7blaE="; + vendorHash = "sha256-VfzvGzh/ZYHI5LDuhwOwb4nEOVesBu0kxRF6Q/ISPww="; ldflags = [ "-X main.Version=${finalAttrs.version}" ]; From 5949a98219ff780571fa53055d5cb3ab5ed88540 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 19:41:29 +0000 Subject: [PATCH 280/305] metacubexd: 1.190.1 -> 1.192.0 --- pkgs/by-name/me/metacubexd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/metacubexd/package.nix b/pkgs/by-name/me/metacubexd/package.nix index e418b940a7de..7c04d30ffe5f 100644 --- a/pkgs/by-name/me/metacubexd/package.nix +++ b/pkgs/by-name/me/metacubexd/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "metacubexd"; - version = "1.190.1"; + version = "1.192.0"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "metacubexd"; rev = "v${finalAttrs.version}"; - hash = "sha256-oXyPT47rq1hadaUmQPqtvOwemMOE0z19zjWQbfxIyLw="; + hash = "sha256-OZLwKckwiw0FPJYOLgj9bXEm6xq9SmDrDZNQhM0r7dc="; }; nativeBuildInputs = [ @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-Ufm0I5ZjSHzmMRGpX7Y8VYspSszCR7AjdWc1c9fjdPQ="; + hash = "sha256-v+wuYGK0WEgrPNBLuLnoO/uDEk6AqJTlNJZHTpEb4mc="; }; buildPhase = '' From 352643aea12c2866862b06a134f2924da4c4a1e8 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 18 Aug 2025 14:55:29 +0200 Subject: [PATCH 281/305] python3Packages.distrax: fetch upstream patches to fix jax 0.7.0 compatibility --- .../python-modules/distrax/default.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distrax/default.nix b/pkgs/development/python-modules/distrax/default.nix index 014167bf2aea..e7b6257d141d 100644 --- a/pkgs/development/python-modules/distrax/default.nix +++ b/pkgs/development/python-modules/distrax/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, + fetchpatch2, chex, jaxlib, numpy, @@ -26,13 +26,28 @@ buildPythonPackage rec { patches = [ # TODO: remove at the next release (already on master) - (fetchpatch { + (fetchpatch2 { name = "fix-jax-0.6.0-compat"; url = "https://github.com/google-deepmind/distrax/commit/c02708ac46518fac00ab2945311e0f2ee32c672c.patch"; hash = "sha256-hFNXKoA1b5I6dzhwTRXp/SnkHv89GI6tYwlnBBHwG78="; }) + # https://github.com/google-deepmind/distrax/pull/289 + (fetchpatch2 { + name = "fix-jax-0.7.0-compat"; + url = "https://github.com/google-deepmind/distrax/commit/7fc5bd7efff4a7144d175199159f115c3e68a3cf.patch"; + hash = "sha256-TiD72YIb6ajpaCO1yOGl/+JCuaikQ879Zcpaf2wzMq4="; + }) ]; + # TODO: remove at the next release (already on master) + # https://github.com/google-deepmind/distrax/pull/293 + postPatch = '' + substituteInPlace distrax/_src/utils/transformations.py \ + --replace-fail \ + "jax.experimental.pjit.pjit_p" \ + "jex.core.primitives.jit_p" + ''; + dependencies = [ chex jaxlib From 4d76031c93248f7974356376a66103268b5ffefc Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 20 Aug 2025 22:54:11 +0200 Subject: [PATCH 282/305] python3Packages.jax[lib]: 0.7.0 -> 0.7.1 Diff: https://github.com/jax-ml/jax/compare/jax-v0.7.0...jax-v0.7.1 Changelog: https://github.com/jax-ml/jax/releases/tag/jax-v0.7.1 --- .../jax-cuda12-pjrt/default.nix | 6 ++--- .../jax-cuda12-plugin/default.nix | 18 ++++++------- .../python-modules/jax/default.nix | 4 +-- .../development/python-modules/jaxlib/bin.nix | 26 +++++++++---------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix index 76d23a8c6bba..932b8804dbc7 100644 --- a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix +++ b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix @@ -44,14 +44,14 @@ buildPythonPackage rec { dist = "py3"; platform = { - x86_64-linux = "manylinux2014_x86_64"; + x86_64-linux = "manylinux_2_27_x86_64"; aarch64-linux = "manylinux2014_aarch64"; } .${stdenv.hostPlatform.system}; hash = { - x86_64-linux = "sha256-dCzCYNaXdxy4gwhDmHSKAH0jMoaqP+X8FSp0wHPVmiQ="; - aarch64-linux = "sha256-3Oaxz+f0R0lCW66iKpAnQjuvsaUmnhPzB4XP0bLimGI="; + x86_64-linux = "sha256-quPn80WASloSKaxxSMvRNEUMgWGYu7/4WnYiGC7H9ko="; + aarch64-linux = "sha256-f8QFBJYN5W4jL5MmMKJ1fs8/hzZlsTmDF9Jfa3RF1WA="; } .${stdenv.hostPlatform.system}; }; diff --git a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix index eecf5b25de85..ef02e58218ea 100644 --- a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix +++ b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix @@ -37,34 +37,34 @@ let # upstream does not distribute jax-cuda12-plugin 0.4.38 binaries for aarch64-linux srcs = { "3.11-x86_64-linux" = getSrcFromPypi { - platform = "manylinux2014_x86_64"; + platform = "manylinux_2_27_x86_64"; dist = "cp311"; - hash = "sha256-2MmZTNYm4vFQmhZOXgfBIiIN3QptiDRvika9U8tePhk="; + hash = "sha256-Yw9aGxuorpSsC0K8N1IeGXBcmlRURWV5+NKY5FC2/tw="; }; "3.11-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp311"; - hash = "sha256-JlpL8jjASPmJKeDa2XZCRtEkl73Yz98uIng6adc8xj4="; + hash = "sha256-iAQd0J4Bm4JnTZ9xZ7eWtIy1so3pVHLBosA2OxZtS/Y="; }; "3.12-x86_64-linux" = getSrcFromPypi { - platform = "manylinux2014_x86_64"; + platform = "manylinux_2_27_x86_64"; dist = "cp312"; - hash = "sha256-q37GQziSIY8lvdWi0TddqQh+mB36CYJ6x/NzzNu/LE0="; + hash = "sha256-LPPm/mNDtbV2TTWJPON16z5qhZBIty3I9wCv7CFai6Y="; }; "3.12-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp312"; - hash = "sha256-2UJ4q5a2ImQ3Ns3tt3eHA9MPL2T6SXrZ9bo13QyhBGQ="; + hash = "sha256-M9ZGYPYVg1pg4M+Z656KMuz/1dIGYTV/RZEqHYFkMPE="; }; "3.13-x86_64-linux" = getSrcFromPypi { - platform = "manylinux2014_x86_64"; + platform = "manylinux_2_27_x86_64"; dist = "cp313"; - hash = "sha256-v94NtxSyrV/p6GwfbS5gx9TZgNAVAphYIIgoq82CdM8="; + hash = "sha256-dDC8RnptxbvBhvgcq5L0GhJy9aodFkbBu/rqkleD2oU="; }; "3.13-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp313"; - hash = "sha256-5Nz+GFcW+0WsHti4kSIJbG2Tm0NRNxAzobz/JU3Rejg="; + hash = "sha256-w8IAegYZmwlYMZdsamZcEvylWs1+yEq0SI4a5Y7stJQ="; }; }; in diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 9ecf5853e574..5d8e8798eb6a 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -40,7 +40,7 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; src = fetchFromGitHub { @@ -48,7 +48,7 @@ buildPythonPackage rec { repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jax tags! tag = "jax-v${version}"; - hash = "sha256-CWtzT5c2Rzf2C0yaF9z2Y+uV3TdZC/h4AQf8t+U8o7o="; + hash = "sha256-k3yuWs+SOxrDXysVWCFR3wliATtro+aDdDXfFVtOTBo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index 0d13280e1bf0..c97c1202cc8d 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -18,7 +18,7 @@ }: let - version = "0.7.0"; + version = "0.7.1"; inherit (python) pythonVersion; # As of 2023-06-06, google/jax upstream is no longer publishing CPU-only wheels to their GCS bucket. Instead the @@ -47,51 +47,51 @@ let in { "3.11-x86_64-linux" = getSrcFromPypi { - platform = "manylinux2014_x86_64"; + platform = "manylinux_2_27_x86_64"; dist = "cp311"; - hash = "sha256-B0oCVmTPQ5tZZdzKryDEqubMlV3d106FNCVoq6QN2kc="; + hash = "sha256-6vX2j1O/TcuTtlElOFR2Z2JViOTzzK7vBIeI/RjYwNU="; }; "3.11-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp311"; - hash = "sha256-nfW6TIcSxVXs8y6yV0OR9kPlyg7KyiF4CEuMS/gktDM="; + hash = "sha256-n7GJw7OUcMQ5T/yxi3HkfP/Fv4Xo/LHjNpJoaww+BN0="; }; "3.11-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp311"; - hash = "sha256-/8tLHj4BIQb0OzBtcND2o2JigkoyT4n38ivyiGf76Bw="; + hash = "sha256-PzLD5MFntzJ8NC6C09+EB5cU6gtDcYvocdA5mZZws8k="; }; "3.12-x86_64-linux" = getSrcFromPypi { - platform = "manylinux2014_x86_64"; + platform = "manylinux_2_27_x86_64"; dist = "cp312"; - hash = "sha256-U0+zJyuQ4sf47ZpCKaabXlwZsC+hRRbMxe750B8khUY="; + hash = "sha256-dKvTE1eX+CRA3TcRo1y6FsQw0bumVHS4W7cOQXM6Uuk="; }; "3.12-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp312"; - hash = "sha256-AFITtty9ILC9ZVgLdAJVlQFQtInhpTBvZdjkn5EUq4U="; + hash = "sha256-8PH1KVa4wlGKsACk09jCG+d34dR/kmugNkDjkQYaQe4="; }; "3.12-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp312"; - hash = "sha256-vpBV41zmvePpCfVbTLbttxR9CsLbCM+YbVw0EJhq+l0="; + hash = "sha256-EnwHxydwPl1Z+E9lUWm+yEn0Qi5S+FRjSc7MMKihPh0="; }; "3.13-x86_64-linux" = getSrcFromPypi { - platform = "manylinux2014_x86_64"; + platform = "manylinux_2_27_x86_64"; dist = "cp313"; - hash = "sha256-3zFmSlPBOpJjvKDow54DgKDMrgscElN232OkgNnLIIc="; + hash = "sha256-s1D1Gahu/1pLHuAUx/qjZYX0fz1jeH0fPpvf/pzEGmY="; }; "3.13-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp313"; - hash = "sha256-W3OTyGlKF+1SLpVT4GeR3Xa0eJs0SNCF0O1P+613ouc="; + hash = "sha256-zmobpgGXZIcMJ1B6yhjlJpmK061L6i3WHhnQSZw7iwQ="; }; "3.13-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp313"; - hash = "sha256-Oo8ynwVNLggJPNWkr5MozOEsO1+rS9peLFza3GO17S0="; + hash = "sha256-Kic3nl7Sl2WYDvMtTXf1fdDh3ZZYA6xnRVQESsI80+w="; }; }; in From 7d5f6f69f8b7e287f2644ef2da2f0987c883e850 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 30 Aug 2025 11:15:32 +0200 Subject: [PATCH 283/305] python3Packages.equinox: backport patches to fix with jax 0.7.0 https://github.com/patrick-kidger/equinox/pull/1086 https://github.com/patrick-kidger/equinox/pull/1082 --- .../python-modules/equinox/default.nix | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix index 67b924287e3d..b56147a10b5b 100644 --- a/pkgs/development/python-modules/equinox/default.nix +++ b/pkgs/development/python-modules/equinox/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch2, # build-system hatchling, @@ -32,12 +33,31 @@ buildPythonPackage rec { hash = "sha256-zXgAuFGWKHShKodi9swnWIry4VU9s4pBhBRoK5KzaL0="; }; + patches = [ + # The following two patches have been merged upstream and should be removed when updating to the next release + # They fix the incompatibilities with jax>=0.7.0 + + # https://github.com/patrick-kidger/equinox/pull/1086 + (fetchpatch2 { + name = "remove-deprecated-batching-NotMapped"; + url = "https://github.com/patrick-kidger/equinox/commit/6a6a441ced2fe64191a087752f1c2e71a6ce39f1.patch"; + hash = "sha256-tzHFjMI3gAIh5MPkdbmzsky/oFjDEbOIkPGQMQ+gcQQ="; + }) + + # https://github.com/patrick-kidger/equinox/pull/1082 + (fetchpatch2 { + name = "allow-creating-weak-references-to-flatten"; + url = "https://github.com/patrick-kidger/equinox/commit/62b3c94ad56bdb63524702b320e977d2d93dbe72.patch"; + hash = "sha256-c1FKCnC3/okuP2VJV4h7sPRYQeYJZSdzEG5ETL2M35k="; + }) + ]; + # Relax speed constraints on tests that can fail on busy builders postPatch = '' substituteInPlace tests/test_while_loop.py \ --replace-fail "speed < 0.1" "speed < 0.5" \ --replace-fail "speed < 0.5" "speed < 1" \ - --replace-fail "speed < 1" "speed < 4" \ + --replace-fail "speed < 1" "speed < 20" ''; build-system = [ hatchling ]; From ea8ae9fea18b21a967441868aa058031e2c6ff4b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 30 Aug 2025 14:46:17 +0200 Subject: [PATCH 284/305] python3Packages.keras: skip failing tests https://github.com/keras-team/keras/issues/21629 --- .../python-modules/keras/default.nix | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index bdfd593816ea..93f8a3a14784 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -93,6 +93,84 @@ buildPythonPackage rec { # TypeError: this __dict__ descriptor does not support '_DictWrapper' objects "test_reloading_default_saved_model" + + # E AssertionError: + # E - float32 + # E + float64 + "test_angle_bool" + "test_angle_int16" + "test_angle_int32" + "test_angle_int8" + "test_angle_uint16" + "test_angle_uint32" + "test_angle_uint8" + "test_bartlett_bfloat16" + "test_bartlett_bool" + "test_bartlett_float16" + "test_bartlett_float32" + "test_bartlett_float64" + "test_bartlett_int16" + "test_bartlett_int32" + "test_bartlett_int64" + "test_bartlett_int8" + "test_bartlett_none" + "test_bartlett_uint16" + "test_bartlett_uint32" + "test_bartlett_uint8" + "test_blackman_bfloat16" + "test_blackman_bool" + "test_blackman_float16" + "test_blackman_float32" + "test_blackman_float64" + "test_blackman_int16" + "test_blackman_int32" + "test_blackman_int64" + "test_blackman_int8" + "test_blackman_none" + "test_blackman_uint16" + "test_blackman_uint32" + "test_blackman_uint8" + "test_eye_none" + "test_hamming_bfloat16" + "test_hamming_bool" + "test_hamming_float16" + "test_hamming_float32" + "test_hamming_float64" + "test_hamming_int16" + "test_hamming_int32" + "test_hamming_int64" + "test_hamming_int8" + "test_hamming_none" + "test_hamming_uint16" + "test_hamming_uint32" + "test_hamming_uint8" + "test_hanning_bfloat16" + "test_hanning_bool" + "test_hanning_float16" + "test_hanning_float32" + "test_hanning_float64" + "test_hanning_int16" + "test_hanning_int32" + "test_hanning_int64" + "test_hanning_int8" + "test_hanning_none" + "test_hanning_uint16" + "test_hanning_uint32" + "test_hanning_uint8" + "test_identity_none" + "test_kaiser_bfloat16" + "test_kaiser_bool" + "test_kaiser_float16" + "test_kaiser_float32" + "test_kaiser_float64" + "test_kaiser_int16" + "test_kaiser_int32" + "test_kaiser_int64" + "test_kaiser_int8" + "test_kaiser_none" + "test_kaiser_uint16" + "test_kaiser_uint32" + "test_kaiser_uint8" ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # Hangs forever From 4cfbd1dcc35226abe6202770d4d5bd55de50d683 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 30 Aug 2025 15:09:42 +0200 Subject: [PATCH 285/305] python3Packages.optimistix: disable failing test https://github.com/patrick-kidger/optimistix/issues/160 --- pkgs/development/python-modules/optimistix/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/optimistix/default.nix b/pkgs/development/python-modules/optimistix/default.nix index c859fab8aac0..c46ddfa1daf8 100644 --- a/pkgs/development/python-modules/optimistix/default.nix +++ b/pkgs/development/python-modules/optimistix/default.nix @@ -59,6 +59,12 @@ buildPythonPackage rec { "-Wignore::DeprecationWarning" ]; + disabledTests = [ + # assert Array(False, dtype=bool) + # + where Array(False, dtype=bool) = tree_allclose(Array(0.12993518, dtype=float64), Array(0., dtype=float64, weak_type=True), atol=0.0001, rtol=0.0001) + "test_least_squares" + ]; + meta = { description = "Nonlinear optimisation (root-finding, least squares, ...) in JAX+Equinox"; homepage = "https://github.com/patrick-kidger/optimistix"; From 72d4845900d19624c597f19f4aff2f8a39ac9a84 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 30 Aug 2025 23:59:59 +0400 Subject: [PATCH 286/305] mpich: fix build --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b61cf0936cf0..2e7cded280ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8566,6 +8566,7 @@ with pkgs; msoffcrypto-tool = with python3.pkgs; toPythonApplication msoffcrypto-tool; mpich = callPackage ../development/libraries/mpich { + automake = automake116x; ch4backend = libfabric; }; From 6b1069c0d4a3b7856c3547029c01018f21b380b3 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 30 Aug 2025 14:24:31 -0500 Subject: [PATCH 287/305] vimPlugins: fix meta shadowing Currently shadows entire `meta` from `generated.nix`. Signed-off-by: Austin Horstman --- .../editors/vim/plugins/overrides.nix | 152 ++++++++++-------- 1 file changed, 88 insertions(+), 64 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index aaaf7e3c9491..4942fbca8e09 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -277,18 +277,18 @@ in nvimSkipModules = [ "bufferline.utils" ]; }; - barbecue-nvim = super.barbecue-nvim.overrideAttrs { + barbecue-nvim = super.barbecue-nvim.overrideAttrs (old: { dependencies = with self; [ nvim-lspconfig nvim-navic ]; - meta = { + meta = old.meta // { description = "VS Code like winbar for Neovim"; homepage = "https://github.com/utilyre/barbecue.nvim"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ lightquantum ]; }; - }; + }); base46 = super.base46.overrideAttrs { dependencies = [ self.nvchad-ui ]; @@ -335,13 +335,13 @@ in dependencies = [ self.blink-cmp ]; }; - blink-cmp-words = super.blink-cmp-words.overrideAttrs { + blink-cmp-words = super.blink-cmp-words.overrideAttrs (old: { dependencies = [ self.blink-cmp ]; - meta = { + meta = old.meta // { description = "Offline word and synonym completion provider for Neovim"; maintainers = with lib.maintainers; [ m3l6h ]; }; - }; + }); bluloco-nvim = super.bluloco-nvim.overrideAttrs { dependencies = [ self.lush-nvim ]; @@ -352,9 +352,11 @@ in nvimSkipModules = [ "bufferline.commands" ]; }; - bufresize-nvim = super.bufresize-nvim.overrideAttrs { - meta.license = lib.licenses.mit; - }; + bufresize-nvim = super.bufresize-nvim.overrideAttrs (old: { + meta = old.meta // { + license = lib.licenses.mit; + }; + }); catppuccin-nvim = super.catppuccin-nvim.overrideAttrs { nvimSkipModules = [ @@ -1012,17 +1014,17 @@ in dependencies = [ self.nvim-yarp ]; }; - demicolon-nvim = super.demicolon-nvim.overrideAttrs { + demicolon-nvim = super.demicolon-nvim.overrideAttrs (old: { dependencies = with self; [ nvim-treesitter nvim-treesitter-textobjects ]; - meta = { + meta = old.meta // { description = "Overloaded ; and , keys in Neovim"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ m3l6h ]; }; - }; + }); denops-vim = super.denops-vim.overrideAttrs { postPatch = '' @@ -1048,16 +1050,16 @@ in ''; }; - deoplete-khard = super.deoplete-khard.overrideAttrs { + deoplete-khard = super.deoplete-khard.overrideAttrs (old: { dependencies = [ self.deoplete-nvim ]; passthru.python3Dependencies = ps: [ (ps.toPythonModule khard) ]; - meta = { + meta = old.meta // { description = "Address-completion for khard via deoplete"; homepage = "https://github.com/nicoe/deoplete-khard"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jorsn ]; }; - }; + }); devdocs-nvim = super.devdocs-nvim.overrideAttrs { nvimSkipModules = [ @@ -1184,13 +1186,13 @@ in ]; }; - fcitx-vim = super.fcitx-vim.overrideAttrs { + fcitx-vim = super.fcitx-vim.overrideAttrs (old: { passthru.python3Dependencies = ps: with ps; [ dbus-python ]; - meta = { + meta = old.meta // { description = "Keep and restore fcitx state when leaving/re-entering insert mode or search mode"; license = lib.licenses.mit; }; - }; + }); flash-nvim = super.flash-nvim.overrideAttrs { # Docs require lazyvim @@ -1563,14 +1565,14 @@ in dependencies = [ self.plenary-nvim ]; }; - jedi-vim = super.jedi-vim.overrideAttrs { + jedi-vim = super.jedi-vim.overrideAttrs (old: { # checking for python3 support in vim would be neat, too, but nobody else seems to care buildInputs = [ python3.pkgs.jedi ]; - meta = { + meta = old.meta // { description = "code-completion for python using python-jedi"; license = lib.licenses.mit; }; - }; + }); jellybeans-nvim = super.jellybeans-nvim.overrideAttrs { dependencies = [ self.lush-nvim ]; @@ -1795,7 +1797,7 @@ in dependencies = [ self.litee-nvim ]; }; - live-preview-nvim = super.live-preview-nvim.overrideAttrs { + live-preview-nvim = super.live-preview-nvim.overrideAttrs (old: { checkInputs = with self; [ fzf-lua mini-pick @@ -1808,16 +1810,20 @@ in # This file runs tests on require which unfortunately fails as it attempts to require the base plugin. See https://github.com/brianhuster/live-preview.nvim/blob/5890c4f7cb81a432fd5f3b960167757f1b4d4702/lua/livepreview/_spec.lua#L25 "livepreview._spec" ]; - meta.license = lib.licenses.gpl3Only; - }; + meta = old.meta // { + license = lib.licenses.gpl3Only; + }; + }); lspcontainers-nvim = super.lspcontainers-nvim.overrideAttrs { dependencies = [ self.nvim-lspconfig ]; }; - lspecho-nvim = super.lspecho-nvim.overrideAttrs { - meta.license = lib.licenses.mit; - }; + lspecho-nvim = super.lspecho-nvim.overrideAttrs (old: { + meta = old.meta // { + license = lib.licenses.mit; + }; + }); lspsaga-nvim = super.lspsaga-nvim.overrideAttrs { # Other modules require setup call first @@ -2878,11 +2884,13 @@ in configurePhase = "cd vim"; }; - one-nvim = super.one-nvim.overrideAttrs { + one-nvim = super.one-nvim.overrideAttrs (old: { # E5108: /lua/one-nvim.lua:14: Unknown option 't_Co' # https://github.com/Th3Whit3Wolf/one-nvim/issues/23 - meta.broken = true; - }; + meta = old.meta // { + broken = true; + }; + }); # The plugin depends on either skim-vim or fzf-vim, but we don't want to force the user so we # avoid choosing one of them and leave it to the user @@ -2991,7 +2999,10 @@ in perfanno-nvim = super.perfanno-nvim.overrideAttrs (old: { dependencies = [ gperf ]; - meta.maintainers = with lib.maintainers; [ fredeb ]; + + meta = old.meta // { + maintainers = with lib.maintainers; [ fredeb ]; + }; }); persisted-nvim = super.persisted-nvim.overrideAttrs { @@ -3384,26 +3395,31 @@ in os.execv("${svedbackend}/bin/evinceSync.py", sys.argv) ''; in - super.sved.overrideAttrs { + super.sved.overrideAttrs (old: { preferLocalBuild = true; postPatch = '' rm ftplugin/evinceSync.py install -m 544 ${pythonWrapper} ftplugin/evinceSync.py ''; - meta = { + meta = old.meta // { description = "synctex support between vim/neovim and evince"; }; - }; + }); - syntax-tree-surfer = super.syntax-tree-surfer.overrideAttrs { + syntax-tree-surfer = super.syntax-tree-surfer.overrideAttrs (old: { dependencies = [ self.nvim-treesitter ]; - meta.maintainers = with lib.maintainers; [ callumio ]; - }; - tardis-nvim = super.tardis-nvim.overrideAttrs { + meta = old.meta // { + maintainers = with lib.maintainers; [ callumio ]; + }; + }); + + tardis-nvim = super.tardis-nvim.overrideAttrs (old: { dependencies = [ self.plenary-nvim ]; - meta.maintainers = with lib.maintainers; [ fredeb ]; - }; + meta = old.meta // { + maintainers = with lib.maintainers; [ fredeb ]; + }; + }); taskwarrior2 = buildVimPlugin { inherit (taskwarrior2) version pname; @@ -3466,11 +3482,13 @@ in nvimSkipModules = "frecency.types"; }; - telescope-fzf-native-nvim = super.telescope-fzf-native-nvim.overrideAttrs { + telescope-fzf-native-nvim = super.telescope-fzf-native-nvim.overrideAttrs (old: { dependencies = [ self.telescope-nvim ]; buildPhase = "make"; - meta.platforms = lib.platforms.all; - }; + meta = old.meta // { + platforms = lib.platforms.all; + }; + }); telescope-fzf-writer-nvim = super.telescope-fzf-writer-nvim.overrideAttrs { dependencies = with self; [ @@ -3500,7 +3518,9 @@ in ln -s ${fzy-lua-native}/static $target/${fzy-lua-native-path}/static ln -s ${fzy-lua-native}/lua $target/${fzy-lua-native-path}/lua ''; - meta.platforms = lib.platforms.all; + meta = old.meta // { + platforms = lib.platforms.all; + }; }); telescope-git-conflicts-nvim = super.telescope-git-conflicts-nvim.overrideAttrs { @@ -3748,16 +3768,16 @@ in runtimeDeps = [ uv ]; }; - vCoolor-vim = super.vCoolor-vim.overrideAttrs { + vCoolor-vim = super.vCoolor-vim.overrideAttrs (old: { # on linux can use either Zenity or Yad. propagatedBuildInputs = [ zenity ]; - meta = { + meta = old.meta // { description = "Simple color selector/picker plugin"; license = lib.licenses.publicDomain; }; - }; + }); - vimacs = super.vimacs.overrideAttrs { + vimacs = super.vimacs.overrideAttrs (old: { buildPhase = '' substituteInPlace bin/vim \ --replace-fail '/usr/bin/vim' 'vim' \ @@ -3765,13 +3785,13 @@ in # remove unnecessary duplicated bin wrapper script rm -r plugin/vimacs ''; - meta = with lib; { + meta = old.meta // { description = "Vim-Improved eMACS: Emacs emulation plugin for Vim"; homepage = "http://algorithm.com.au/code/vimacs"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ millerjason ]; }; - }; + }); vimade = super.vimade.overrideAttrs { checkInputs = with self; [ @@ -3782,13 +3802,13 @@ in ]; }; - vimsence = super.vimsence.overrideAttrs { - meta = with lib; { + vimsence = super.vimsence.overrideAttrs (old: { + meta = old.meta // { description = "Discord rich presence for Vim"; homepage = "https://github.com/hugolgst/vimsence"; maintainers = with lib.maintainers; [ hugolgst ]; }; - }; + }); vimproc-vim = super.vimproc-vim.overrideAttrs { buildInputs = [ which ]; @@ -4009,7 +4029,9 @@ in ln -s ${hexokinase}/bin/hexokinase $target/hexokinase/hexokinase ''; - meta.platforms = lib.platforms.all; + meta = old.meta // { + platforms = lib.platforms.all; + }; }); vim-hier = super.vim-hier.overrideAttrs { @@ -4078,10 +4100,12 @@ in vim-tabby = super.vim-tabby.overrideAttrs { }; - vim-textobj-entire = super.vim-textobj-entire.overrideAttrs { + vim-textobj-entire = super.vim-textobj-entire.overrideAttrs (old: { dependencies = [ self.vim-textobj-user ]; - meta.maintainers = with lib.maintainers; [ workflow ]; - }; + meta = old.meta // { + maintainers = with lib.maintainers; [ workflow ]; + }; + }); vim-tpipeline = super.vim-tpipeline.overrideAttrs { # Requires global variable @@ -4218,7 +4242,7 @@ in ]; }; - YouCompleteMe = super.YouCompleteMe.overrideAttrs { + YouCompleteMe = super.YouCompleteMe.overrideAttrs (old: { buildPhase = '' substituteInPlace plugin/youcompleteme.vim \ --replace-fail "'ycm_path_to_python_interpreter', '''" \ @@ -4228,18 +4252,18 @@ in ln -s ${ycmd}/lib/ycmd third_party ''; - meta = with lib; { + meta = old.meta // { description = "Code-completion engine for Vim"; homepage = "https://github.com/Valloric/YouCompleteMe"; - license = licenses.gpl3; - maintainers = with maintainers; [ + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ marcweber jagajaga mel ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; - }; + }); zenbones-nvim = super.zenbones-nvim.overrideAttrs { nvimSkipModules = [ From a251b8a9f2f1f8858408262d060d6270daf0599f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 01:13:28 +0000 Subject: [PATCH 288/305] ladybird: 0-unstable-2025-08-19 -> 0-unstable-2025-08-29 --- pkgs/by-name/la/ladybird/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix index 8a53b1a6b7fd..cd1bb274a6ee 100644 --- a/pkgs/by-name/la/ladybird/package.nix +++ b/pkgs/by-name/la/ladybird/package.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2025-08-19"; + version = "0-unstable-2025-08-29"; src = fetchFromGitHub { owner = "LadybirdWebBrowser"; repo = "ladybird"; - rev = "658477620afe4c14b936227d1c8307b2dea56267"; - hash = "sha256-WkEgZP5Ci0mlNDGq++93v4coz36dhp+kXtlKQu1xnVM="; + rev = "c3aa8f0c8d3ee28b100260b376c45f2583b49c0d"; + hash = "sha256-pckHeaGhpFemCIhTL8FeNWVea8itvy3SFYT9oWVPmu4="; }; postPatch = '' From 4956762039eb513231f7c8b62532fa6d14e11715 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 30 Aug 2025 14:31:56 -0500 Subject: [PATCH 289/305] vimPlugins.meson: move to non-generated Looks like it was missed in `overrides.nix` when it should be in non-generated. Signed-off-by: Austin Horstman --- .../vim/plugins/non-generated/meson/default.nix | 10 ++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 7 ------- 2 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/meson/default.nix diff --git a/pkgs/applications/editors/vim/plugins/non-generated/meson/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/meson/default.nix new file mode 100644 index 000000000000..53efe4a19200 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/meson/default.nix @@ -0,0 +1,10 @@ +{ + lib, + vimUtils, + meson, +}: +vimUtils.buildVimPlugin { + inherit (meson) pname version src; + preInstall = "cd data/syntax-highlighting/vim"; + meta.maintainers = with lib.maintainers; [ vcunat ]; +} diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 4942fbca8e09..85a856694d8b 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -33,7 +33,6 @@ languagetool, libgit2, llvmPackages, - meson, neovim-unwrapped, nim1, nodejs, @@ -1949,12 +1948,6 @@ in checkInputs = [ self.lualine-nvim ]; }; - meson = buildVimPlugin { - inherit (meson) pname version src; - preInstall = "cd data/syntax-highlighting/vim"; - meta.maintainers = with lib.maintainers; [ vcunat ]; - }; - mind-nvim = super.mind-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; From 689e8e652fb56be0a2a93dd365928afc7dafcecc Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 30 Aug 2025 14:35:33 -0500 Subject: [PATCH 290/305] vimPlugins.ethersync: move to non-generated Looks like it was missed in `overrides.nix` when it should be in non-generated. Signed-off-by: Austin Horstman --- .../plugins/non-generated/ethersync/default.nix | 14 ++++++++++++++ .../applications/editors/vim/plugins/overrides.nix | 13 ------------- 2 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/ethersync/default.nix diff --git a/pkgs/applications/editors/vim/plugins/non-generated/ethersync/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/ethersync/default.nix new file mode 100644 index 000000000000..8e6f58e1a105 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/ethersync/default.nix @@ -0,0 +1,14 @@ +{ + vimUtils, + ethersync, +}: +vimUtils.buildVimPlugin rec { + inherit (ethersync) + pname + version + src + meta + ; + + sourceRoot = "${src.name}/nvim-plugin"; +} diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 85a856694d8b..e0aeef5ca345 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -133,8 +133,6 @@ # search-and-replace.nvim dependencies fd, sad, - # ethersync vim plugin - ethersync, }: self: super: let @@ -1159,17 +1157,6 @@ in ''; }; - ethersync = buildVimPlugin rec { - inherit (ethersync) - pname - version - src - meta - ; - - sourceRoot = "${src.name}/nvim-plugin"; - }; - executor-nvim = super.executor-nvim.overrideAttrs { dependencies = [ self.nui-nvim ]; }; From cfe8e54c1b77b9c3bc8941b2ab7b0b65ed126260 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 30 Aug 2025 14:35:45 -0500 Subject: [PATCH 291/305] vimPlugins.fzfWrapper: move to non-generated Looks like it was missed in `overrides.nix` when it should be in non-generated. Signed-off-by: Austin Horstman --- pkgs/applications/editors/vim/plugins/aliases.nix | 1 + .../plugins/non-generated/fzf-wrapper/default.nix | 14 ++++++++++++++ .../applications/editors/vim/plugins/overrides.nix | 13 +------------ 3 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/fzf-wrapper/default.nix diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix index 1adb63ed5d23..0f4054d498e7 100644 --- a/pkgs/applications/editors/vim/plugins/aliases.nix +++ b/pkgs/applications/editors/vim/plugins/aliases.nix @@ -75,6 +75,7 @@ mapAliases ( feline-nvim = throw "feline.nvim has been removed: upstream deleted repository. Consider using lualine"; # Added 2025-02-09 fugitive = vim-fugitive; floating-nvim = throw "floating.nvim has been removed: abandoned by upstream. Use popup-nvim or nui-nvim"; # Added 2024-11-26 + fzfWrapper = fzf-wrapper; ghc-mod-vim = ghcmod-vim; ghcmod = ghcmod-vim; gleam-vim = throw "gleam.vim has been removed: its code was merged into vim."; # Added 2025-06-10 diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fzf-wrapper/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fzf-wrapper/default.nix new file mode 100644 index 000000000000..c22afcf7e9ae --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/fzf-wrapper/default.nix @@ -0,0 +1,14 @@ +{ + vimUtils, + fzf, +}: +# Mainly used as a dependency for fzf-vim. Wraps the fzf program as a vim +# plugin, since part of the fzf vim plugin is included in the main fzf +# program. +vimUtils.buildVimPlugin { + inherit (fzf) src version; + pname = "fzf"; + postInstall = '' + ln -s ${fzf}/bin/fzf $target/bin/fzf + ''; +} diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index e0aeef5ca345..3ac1f9d4f6b8 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1320,18 +1320,7 @@ in }; fzf-vim = super.fzf-vim.overrideAttrs { - dependencies = [ self.fzfWrapper ]; - }; - - # Mainly used as a dependency for fzf-vim. Wraps the fzf program as a vim - # plugin, since part of the fzf vim plugin is included in the main fzf - # program. - fzfWrapper = buildVimPlugin { - inherit (fzf) src version; - pname = "fzf"; - postInstall = '' - ln -s ${fzf}/bin/fzf $target/bin/fzf - ''; + dependencies = [ self.fzf-wrapper ]; }; gen-nvim = super.gen-nvim.overrideAttrs { From a15c556a0ff773819f0acd7b1332fde9fb5a717a Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 30 Aug 2025 14:35:54 -0500 Subject: [PATCH 292/305] vimPlugins.hurl: move to non-generated Looks like it was missed in `overrides.nix` when it should be in non-generated. Signed-off-by: Austin Horstman --- .../vim/plugins/non-generated/hurl/default.nix | 11 +++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 9 --------- 2 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/hurl/default.nix diff --git a/pkgs/applications/editors/vim/plugins/non-generated/hurl/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/hurl/default.nix new file mode 100644 index 000000000000..7bb376ea1f18 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/hurl/default.nix @@ -0,0 +1,11 @@ +{ + vimUtils, + hurl, +}: +vimUtils.buildVimPlugin { + pname = "hurl"; + inherit (hurl) version; + + # https://hurl.dev/ + src = "${hurl.src}/contrib/vim"; +} diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 3ac1f9d4f6b8..bddaf8417f78 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1474,15 +1474,6 @@ in dependencies = [ self.nui-nvim ]; }; - # https://hurl.dev/ - hurl = buildVimPlugin { - pname = "hurl"; - version = hurl.version; - # dontUnpack = true; - - src = "${hurl.src}/contrib/vim"; - }; - hurl-nvim = super.hurl-nvim.overrideAttrs { dependencies = with self; [ nui-nvim From 0858bbcc13b8242f8aaaaa42ac1f51981058711e Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 30 Aug 2025 14:39:46 -0500 Subject: [PATCH 293/305] vimPlugins.minsnip-nvim: remove plugin Upstream repository removed. Signed-off-by: Austin Horstman --- pkgs/applications/editors/vim/plugins/aliases.nix | 1 + pkgs/applications/editors/vim/plugins/overrides.nix | 12 ------------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix index 0f4054d498e7..660fb8db03c1 100644 --- a/pkgs/applications/editors/vim/plugins/aliases.nix +++ b/pkgs/applications/editors/vim/plugins/aliases.nix @@ -95,6 +95,7 @@ mapAliases ( ipython = vim-ipython; latex-live-preview = vim-latex-live-preview; maktaba = vim-maktaba; + minsnip-nvim = throw "the upstream repository got deleted"; # added 2025-08-30 multiple-cursors = vim-multiple-cursors; necoGhc = neco-ghc; # backwards compat, added 2014-10-18 neocomplete = neocomplete-vim; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index bddaf8417f78..b6e73c92fa61 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1938,18 +1938,6 @@ in vimCommandCheck = "MinimapToggle"; }; - minsnip-nvim = buildVimPlugin { - pname = "minsnip.nvim"; - version = "2022-01-04"; - src = fetchFromGitHub { - owner = "jose-elias-alvarez"; - repo = "minsnip.nvim"; - rev = "6ae2f3247b3a2acde540ccef2e843fdfcdfebcee"; - sha256 = "1db5az5civ2bnqg7v3g937mn150ys52258c3glpvdvyyasxb4iih"; - }; - meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/"; - }; - minuet-ai-nvim = super.minuet-ai-nvim.overrideAttrs { checkInputs = [ # optional cmp integration From 648fd98f24f173ae814e34c7eee2eab860a51ef6 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 30 Aug 2025 14:50:08 -0500 Subject: [PATCH 294/305] vimPlugins.phpactor: move to non-generated Looks like it was missed in `overrides.nix` when it should be in non-generated. Signed-off-by: Austin Horstman --- .../plugins/non-generated/phpactor/default.nix | 16 ++++++++++++++++ .../editors/vim/plugins/overrides.nix | 14 -------------- 2 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/phpactor/default.nix diff --git a/pkgs/applications/editors/vim/plugins/non-generated/phpactor/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/phpactor/default.nix new file mode 100644 index 000000000000..107d6ca9c353 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/phpactor/default.nix @@ -0,0 +1,16 @@ +{ + vimUtils, + phpactor, +}: +vimUtils.buildVimPlugin { + inherit (phpactor) + pname + src + meta + version + ; + postPatch = '' + substituteInPlace plugin/phpactor.vim \ + --replace-fail "g:phpactorpath = expand(':p:h') . '/..'" "g:phpactorpath = '${phpactor}'" + ''; +} diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index b6e73c92fa61..8cd54cbfcecd 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -40,7 +40,6 @@ openscad, openssh, parinfer-rust, - phpactor, ranger, ripgrep, skim, @@ -2969,19 +2968,6 @@ in ]; }; - phpactor = buildVimPlugin { - inherit (phpactor) - pname - src - meta - version - ; - postPatch = '' - substituteInPlace plugin/phpactor.vim \ - --replace-fail "g:phpactorpath = expand(':p:h') . '/..'" "g:phpactorpath = '${phpactor}'" - ''; - }; - plantuml-nvim = super.plantuml-nvim.overrideAttrs { dependencies = [ self.LibDeflate-nvim ]; }; From 4c8aa4257a925e62a8bb81332b56cc29d60610a4 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 30 Aug 2025 14:50:54 -0500 Subject: [PATCH 295/305] vimPlugins.skim: move to non-generated Looks like it was missed in `overrides.nix` when it should be in non-generated. Signed-off-by: Austin Horstman --- .../editors/vim/plugins/non-generated/skim/default.nix | 9 +++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 7 ------- 2 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/skim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/non-generated/skim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/skim/default.nix new file mode 100644 index 000000000000..5fb2fcc5af57 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/skim/default.nix @@ -0,0 +1,9 @@ +{ + vimUtils, + skim, +}: +vimUtils.buildVimPlugin { + pname = "skim"; + inherit (skim) version; + src = skim.vim; +} diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 8cd54cbfcecd..55d387800e86 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -42,7 +42,6 @@ parinfer-rust, ranger, ripgrep, - skim, sqlite, sshfs, statix, @@ -3145,12 +3144,6 @@ in ]; }; - skim = buildVimPlugin { - pname = "skim"; - inherit (skim) version; - src = skim.vim; - }; - skim-vim = super.skim-vim.overrideAttrs { dependencies = [ self.skim ]; }; From e90c4fcba7fa3cf4afbe280e0d9368bbae12794b Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 30 Aug 2025 14:51:36 -0500 Subject: [PATCH 296/305] vimPlugins.statix: move to non-generated Looks like it was missed in `overrides.nix` when it should be in non-generated. Signed-off-by: Austin Horstman --- .../plugins/non-generated/statix/default.nix | 17 +++++++++++++++++ .../editors/vim/plugins/overrides.nix | 15 --------------- 2 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/statix/default.nix diff --git a/pkgs/applications/editors/vim/plugins/non-generated/statix/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/statix/default.nix new file mode 100644 index 000000000000..62dd5e9b9bc0 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/statix/default.nix @@ -0,0 +1,17 @@ +{ + vimUtils, + statix, +}: +vimUtils.buildVimPlugin rec { + inherit (statix) pname src meta; + version = "0.1.0"; + postPatch = '' + # check that version is up to date + grep 'pname = "statix-vim"' -A 1 flake.nix \ + | grep -F 'version = "${version}"' + + cd vim-plugin + substituteInPlace ftplugin/nix.vim --replace-fail statix ${statix}/bin/statix + substituteInPlace plugin/statix.vim --replace-fail statix ${statix}/bin/statix + ''; +} diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 55d387800e86..71b62430e031 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -44,7 +44,6 @@ ripgrep, sqlite, sshfs, - statix, stylish-haskell, tabnine, taskwarrior2, @@ -3260,20 +3259,6 @@ in dependencies = [ self.plenary-nvim ]; }; - statix = buildVimPlugin rec { - inherit (statix) pname src meta; - version = "0.1.0"; - postPatch = '' - # check that version is up to date - grep 'pname = "statix-vim"' -A 1 flake.nix \ - | grep -F 'version = "${version}"' - - cd vim-plugin - substituteInPlace ftplugin/nix.vim --replace-fail statix ${statix}/bin/statix - substituteInPlace plugin/statix.vim --replace-fail statix ${statix}/bin/statix - ''; - }; - stylish-nvim = super.stylish-nvim.overrideAttrs { postPatch = '' substituteInPlace lua/stylish/common/mouse_hover_handler.lua --replace-fail xdotool ${xdotool}/bin/xdotool From cfe364f05574835b226a9099202006c23333728b Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 30 Aug 2025 14:52:50 -0500 Subject: [PATCH 297/305] vimPlugins.taskwarrior2: move to non-generated Looks like it was missed in `overrides.nix` when it should be in non-generated. Signed-off-by: Austin Horstman --- .../vim/plugins/non-generated/taskwarrior2/default.nix | 8 ++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/taskwarrior2/default.nix diff --git a/pkgs/applications/editors/vim/plugins/non-generated/taskwarrior2/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/taskwarrior2/default.nix new file mode 100644 index 000000000000..0c9deecec1c0 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/taskwarrior2/default.nix @@ -0,0 +1,8 @@ +{ + vimUtils, + taskwarrior2, +}: +vimUtils.buildVimPlugin { + inherit (taskwarrior2) version pname; + src = "${taskwarrior2.src}/scripts/vim"; +} diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 71b62430e031..533b0eed18ec 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -46,7 +46,6 @@ sshfs, stylish-haskell, tabnine, - taskwarrior2, taskwarrior3, tmux, tup, @@ -3332,12 +3331,6 @@ in maintainers = with lib.maintainers; [ fredeb ]; }; }); - - taskwarrior2 = buildVimPlugin { - inherit (taskwarrior2) version pname; - src = "${taskwarrior2.src}/scripts/vim"; - }; - taskwarrior3 = buildVimPlugin { inherit (taskwarrior3) version pname; src = "${taskwarrior3.src}/scripts/vim"; From 37ffe2c9d410c1ddb27d78ef9e161b6400685118 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 30 Aug 2025 14:52:57 -0500 Subject: [PATCH 298/305] vimPlugins.taskwarrior3: move to non-generated Looks like it was missed in `overrides.nix` when it should be in non-generated. Signed-off-by: Austin Horstman --- .../vim/plugins/non-generated/taskwarrior3/default.nix | 8 ++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 6 ------ 2 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/taskwarrior3/default.nix diff --git a/pkgs/applications/editors/vim/plugins/non-generated/taskwarrior3/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/taskwarrior3/default.nix new file mode 100644 index 000000000000..0abec7239e73 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/taskwarrior3/default.nix @@ -0,0 +1,8 @@ +{ + vimUtils, + taskwarrior3, +}: +vimUtils.buildVimPlugin { + inherit (taskwarrior3) version pname; + src = "${taskwarrior3.src}/scripts/vim"; +} diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 533b0eed18ec..d6f00e994604 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -46,7 +46,6 @@ sshfs, stylish-haskell, tabnine, - taskwarrior3, tmux, tup, typescript, @@ -3331,11 +3330,6 @@ in maintainers = with lib.maintainers; [ fredeb ]; }; }); - taskwarrior3 = buildVimPlugin { - inherit (taskwarrior3) version pname; - src = "${taskwarrior3.src}/scripts/vim"; - }; - telekasten-nvim = super.telekasten-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim From aa88b95202fcfd930a22626bd67385c6ab54d890 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 30 Aug 2025 14:54:07 -0500 Subject: [PATCH 299/305] vimPlugins.tup: move to non-generated Looks like it was missed in `overrides.nix` when it should be in non-generated. Signed-off-by: Austin Horstman --- .../vim/plugins/non-generated/tup/default.nix | 21 +++++++++++++++++++ .../editors/vim/plugins/overrides.nix | 19 ----------------- 2 files changed, 21 insertions(+), 19 deletions(-) create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/tup/default.nix diff --git a/pkgs/applications/editors/vim/plugins/non-generated/tup/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/tup/default.nix new file mode 100644 index 000000000000..6a92e835a642 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/tup/default.nix @@ -0,0 +1,21 @@ +{ + lib, + vimUtils, + tup, +}: +let + # Based on the comment at the top of https://github.com/gittup/tup/blob/master/contrib/syntax/tup.vim + ftdetect = builtins.toFile "tup.vim" '' + au BufNewFile,BufRead Tupfile,*.tup setf tup + ''; +in +vimUtils.buildVimPlugin { + inherit (tup) pname version src; + preInstall = '' + mkdir -p vim-plugin/syntax vim-plugin/ftdetect + cp contrib/syntax/tup.vim vim-plugin/syntax/tup.vim + cp "${ftdetect}" vim-plugin/ftdetect/tup.vim + cd vim-plugin + ''; + meta.maintainers = with lib.maintainers; [ enderger ]; +} diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index d6f00e994604..e51deb33832d 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -47,7 +47,6 @@ stylish-haskell, tabnine, tmux, - tup, typescript, typescript-language-server, vim, @@ -3587,24 +3586,6 @@ in dependencies = [ self.nvim-treesitter ]; }; - tup = - let - # Based on the comment at the top of https://github.com/gittup/tup/blob/master/contrib/syntax/tup.vim - ftdetect = builtins.toFile "tup.vim" '' - au BufNewFile,BufRead Tupfile,*.tup setf tup - ''; - in - buildVimPlugin { - inherit (tup) pname version src; - preInstall = '' - mkdir -p vim-plugin/syntax vim-plugin/ftdetect - cp contrib/syntax/tup.vim vim-plugin/syntax/tup.vim - cp "${ftdetect}" vim-plugin/ftdetect/tup.vim - cd vim-plugin - ''; - meta.maintainers = with lib.maintainers; [ enderger ]; - }; - typescript-nvim = super.typescript-nvim.overrideAttrs { checkInputs = [ # Optional null-ls integration From c90c292cef0253385a98c6157a853d3854dbdb27 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 30 Aug 2025 15:09:47 -0500 Subject: [PATCH 300/305] vimPlugins: shadow plugin builders in overrides.nix We want to prevent plugins being added in `overrides.nix`. Shadow the helper names to throw if someone tries to add them and use them in the file. Signed-off-by: Austin Horstman --- pkgs/applications/editors/vim/plugins/default.nix | 1 - pkgs/applications/editors/vim/plugins/overrides.nix | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/default.nix b/pkgs/applications/editors/vim/plugins/default.nix index 729129901315..0bf9f74f2ede 100644 --- a/pkgs/applications/editors/vim/plugins/default.nix +++ b/pkgs/applications/editors/vim/plugins/default.nix @@ -55,7 +55,6 @@ let # If additional modifications to the build process are required, # add to ./overrides.nix. overrides = callPackage ./overrides.nix { - inherit buildVimPlugin; inherit llvmPackages; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index e51deb33832d..6baecc1ec162 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3,7 +3,6 @@ stdenv, # nixpkgs functions buildGoModule, - buildVimPlugin, callPackage, fetchFromGitHub, fetchpatch, @@ -131,6 +130,11 @@ self: super: let luaPackages = neovim-unwrapped.lua.pkgs; + + # Ensure the vim plugin builders are not used in this file. + # If they are used, these stubs will throw. + buildVimPlugin = throw "New plugin definitions should be done outside `overrides.nix`"; + buildNeoVimPlugin = throw "New plugin definitions should be done outside `overrides.nix`"; in { corePlugins = symlinkJoin { From ffde6c3606f31ea9452ff7a31183b9b80d4323d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 23:12:22 +0000 Subject: [PATCH 301/305] python3Packages.disposable-email-domains: 0.0.131 -> 0.0.132 --- .../python-modules/disposable-email-domains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/disposable-email-domains/default.nix b/pkgs/development/python-modules/disposable-email-domains/default.nix index 47a163f942e0..7cc8b795288c 100644 --- a/pkgs/development/python-modules/disposable-email-domains/default.nix +++ b/pkgs/development/python-modules/disposable-email-domains/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "disposable-email-domains"; - version = "0.0.131"; + version = "0.0.132"; pyproject = true; # No tags on GitHub src = fetchPypi { pname = "disposable_email_domains"; inherit version; - hash = "sha256-9TlGamU5x3MhZhm4xdCO5a342duXodIu0J2LDH5uOrY="; + hash = "sha256-otXbxrFu4Xf0O8OFif/JKsx5wPPtQ6PfwJ/AxtR2SJA="; }; build-system = [ From 070e54bf8d4559acf29de588463a0a666a47dcd7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 31 Aug 2025 01:10:12 +0200 Subject: [PATCH 302/305] python3Packages.django-mptt: 0.17 -> 0.18 https://github.com/django-mptt/django-mptt/compare/0.17...0.18 --- .../python-modules/django-mptt/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/django-mptt/default.nix b/pkgs/development/python-modules/django-mptt/default.nix index 43d4739fa016..5cd5b63a76dc 100644 --- a/pkgs/development/python-modules/django-mptt/default.nix +++ b/pkgs/development/python-modules/django-mptt/default.nix @@ -5,18 +5,21 @@ hatchling, django, django-js-asset, + model-bakery, + pytestCheckHook, + pytest-django, }: buildPythonPackage rec { pname = "django-mptt"; - version = "0.17"; + version = "0.18"; pyproject = true; src = fetchFromGitHub { owner = "django-mptt"; repo = "django-mptt"; rev = version; - hash = "sha256-fsVGwqlSZcBGXisbxTNGSwiuDOJ3DFV6MnB4h6OxkMA="; + hash = "sha256-UJQwjOde0DkG/Pa/pd2htnp4KEn5KwYAo8GP5A7/h+I="; }; build-system = [ hatchling ]; @@ -28,8 +31,16 @@ buildPythonPackage rec { pythonImportsCheck = [ "mptt" ]; - # No pytest checks, since they depend on model_mommy, which is deprecated - doCheck = false; + nativeCheckInputs = [ + model-bakery + pytestCheckHook + pytest-django + ]; + + preCheck = '' + export DJANGO_SETTINGS_MODULE=tests.settings + export PYTHONPATH=$(pwd)/tests:$PYTHONPATH + ''; meta = with lib; { description = "Utilities for implementing a modified pre-order traversal tree in Django"; From c3713cbb4e78536db219301b46c2581b451c0061 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 23:07:53 +0000 Subject: [PATCH 303/305] terraform: 1.13.0 -> 1.13.1 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index ff20618056de..135096230344 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -194,8 +194,8 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.13.0"; - hash = "sha256-ZZFwzGCB6IS/SJQJoApC7blDhTqT9aZkeMmPimdcj7Q="; + version = "1.13.1"; + hash = "sha256-PuC2wOEEMFaiR9eyF3yI6PLSkqnT/MWdy6RZo6B9zWM="; vendorHash = "sha256-UcsB5cTae55meJ945fvgowch4EBdaTET2+t5KWvpPQ8="; patches = [ ./provider-path-0_15.patch ]; passthru = { From cfc934a91fdc0a38ade9562bc3f7e4f8a60a150f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 31 Aug 2025 01:53:32 +0200 Subject: [PATCH 304/305] postfix-tlspol: 1.8.14 -> 1.8.15 https://github.com/Zuplu/postfix-tlspol/releases/tag/v1.8.15 --- pkgs/by-name/po/postfix-tlspol/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix index f938699e8f85..255922c0fcdd 100644 --- a/pkgs/by-name/po/postfix-tlspol/package.nix +++ b/pkgs/by-name/po/postfix-tlspol/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "postfix-tlspol"; - version = "1.8.14"; + version = "1.8.15"; src = fetchFromGitHub { owner = "Zuplu"; repo = "postfix-tlspol"; tag = "v${version}"; - hash = "sha256-lfezkGMmdYlstchUWGoofCfJLIHOStaDwR/A5j1EOGc="; + hash = "sha256-DqFBXU9b6TOujG464Ww4iAA04NA5j0z9N00F7mbV92Q="; }; vendorHash = null; From 8488f9a28c9c54b33f4c2a27336ad20c38dfe5ae Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 31 Aug 2025 01:53:11 +0200 Subject: [PATCH 305/305] systemd-language-server: fix build --- pkgs/by-name/sy/systemd-language-server/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/sy/systemd-language-server/package.nix b/pkgs/by-name/sy/systemd-language-server/package.nix index d53e998b8e12..c0b4d6587375 100644 --- a/pkgs/by-name/sy/systemd-language-server/package.nix +++ b/pkgs/by-name/sy/systemd-language-server/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, python3Packages, fetchFromGitHub, pandoc, @@ -21,6 +22,9 @@ python3Packages.buildPythonApplication rec { poetry-core ]; + pythonRelaxDeps = [ + "lxml" + ]; dependencies = with python3Packages; [ lxml pygls @@ -33,6 +37,11 @@ python3Packages.buildPythonApplication rec { python3Packages.pytestCheckHook ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # TimeoutError + "test_hover" + ]; + __darwinAllowLocalNetworking = true; meta = {