From fc7aea9368cd4d688aa3ee0c56a029c8c21b2fad Mon Sep 17 00:00:00 2001 From: sohalt Date: Fri, 20 Dec 2024 11:47:07 +0100 Subject: [PATCH 01/86] nixos/spacenavd: add wantedBy for automatic startup nixos currently does not respect the WantedBy directive from the upstream service file (https://github.com/NixOS/nixpkgs/issues/81138) --- nixos/modules/services/hardware/spacenavd.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/spacenavd.nix b/nixos/modules/services/hardware/spacenavd.nix index db3ab37dc267..ddc3f1dc1b59 100644 --- a/nixos/modules/services/hardware/spacenavd.nix +++ b/nixos/modules/services/hardware/spacenavd.nix @@ -17,7 +17,10 @@ in config = lib.mkIf cfg.enable { systemd = { packages = [ pkgs.spacenavd ]; - services.spacenavd.enable = true; + services.spacenavd = { + enable = true; + wantedBy = [ "graphical.target" ]; + }; }; }; } From 7a6fb80e6df1f24203a6299c037c6c5ac6408477 Mon Sep 17 00:00:00 2001 From: Daniel Glinka Date: Tue, 29 Apr 2025 17:42:10 -0300 Subject: [PATCH 02/86] gf: 0-unstable-2025-02-04 -> 0-unstable-2025-04-11; bump to latest version --- pkgs/by-name/gf/gf/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gf/gf/package.nix b/pkgs/by-name/gf/gf/package.nix index ec50399ac3bc..8ee246edd7bb 100644 --- a/pkgs/by-name/gf/gf/package.nix +++ b/pkgs/by-name/gf/gf/package.nix @@ -7,6 +7,7 @@ pkg-config, gdb, freetype, + nix-update-script, freetypeSupport ? true, withExtensions ? true, extraFlags ? "", @@ -15,13 +16,13 @@ stdenv.mkDerivation { pname = "gf"; - version = "0-unstable-2025-02-04"; + version = "0-unstable-2025-04-11"; src = fetchFromGitHub { repo = "gf"; owner = "nakst"; - rev = "9c1686439f97ae6e1ca8f1fb785b545303adfebc"; - hash = "sha256-0uABsjAVn+wAN8hMkM38CepSV4gYtIL0WHDq25TohZ0="; + rev = "162249220bde1c9fef7d87f8bb9128be9323d93f"; + hash = "sha256-wP8ELlqtMwYv6/jQzKahaX7vlMKLUBgxm5Io49tphsM="; }; nativeBuildInputs = [ @@ -67,6 +68,8 @@ stdenv.mkDerivation { wrapProgram $out/bin/gf2 --prefix PATH : ${lib.makeBinPath [ gdb ]} ''; + passthru.updateScript = nix-update-script { extraArgs = lib.singleton "--version=branch"; }; + meta = with lib; { description = "GDB Frontend"; homepage = "https://github.com/nakst/gf"; From 66088bc2623b7e0b9fe42b5206c46a37f23f90e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 May 2025 13:52:13 +0000 Subject: [PATCH 03/86] python3Packages.gotenberg-client: 0.9.0 -> 0.10.0 --- .../development/python-modules/gotenberg-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gotenberg-client/default.nix b/pkgs/development/python-modules/gotenberg-client/default.nix index 2b4170463262..b350b87780f2 100644 --- a/pkgs/development/python-modules/gotenberg-client/default.nix +++ b/pkgs/development/python-modules/gotenberg-client/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { pname = "gotenberg-client"; - version = "0.9.0"; + version = "0.10.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "stumpylog"; repo = "gotenberg-client"; tag = version; - hash = "sha256-4tIkwfqFKERVQMB9nGwGfdMtxCWm3q4hrSWnEqA0qd8="; + hash = "sha256-eDYgKbNeNCIdENo6DVmcABRwP5JUMCJW7NtbPOA5aqg="; }; nativeBuildInputs = [ hatchling ]; @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for interfacing with the Gotenberg API"; homepage = "https://github.com/stumpylog/gotenberg-client"; - changelog = "https://github.com/stumpylog/gotenberg-client/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/stumpylog/gotenberg-client/blob/${src.tag}/CHANGELOG.md"; license = licenses.mpl20; maintainers = with maintainers; [ leona ]; }; From 7bbc83cedf3a05d6d7ae0ee23d3171fc73a0b653 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Mon, 12 May 2025 12:35:34 +0200 Subject: [PATCH 04/86] authelia: 4.39.1 -> 4.39.3 Release notes: - https://github.com/authelia/authelia/releases/tag/v4.39.2 - https://github.com/authelia/authelia/releases/tag/v4.39.3 Full changelog: https://github.com/authelia/authelia/compare/v4.39.1...v4.39.3 See #406404 --- pkgs/servers/authelia/sources.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/authelia/sources.nix b/pkgs/servers/authelia/sources.nix index be8ec5069ca3..61a553705af0 100644 --- a/pkgs/servers/authelia/sources.nix +++ b/pkgs/servers/authelia/sources.nix @@ -1,14 +1,14 @@ { fetchFromGitHub }: rec { pname = "authelia"; - version = "4.39.1"; + version = "4.39.3"; src = fetchFromGitHub { owner = "authelia"; repo = "authelia"; rev = "v${version}"; - hash = "sha256-Q/NGjJphuZ7MMnOSTAukzEg4iAQWc/VDFWs0jj4e0dY="; + hash = "sha256-HBkHN7c8O07b2ZI6R7KFvdBF5GWuYU6rmisxLMSH5EQ="; }; - vendorHash = "sha256-FE4YABsWKhifVjdzJSnjWPesjuSe/hWDa6oTg8MZjo8="; - pnpmDepsHash = "sha256-TJ/Uz7Q+mXfvZ/Zu12Pv1O8LKTzEPJ+Pa+3vrKghPks="; + vendorHash = "sha256-2wJvX6jAjU9iaFMIcC5Qm1agRMPv4fFfsCeTkvXSpYs="; + pnpmDepsHash = "sha256-uy6uKfZpsFEl2n6zOriRsKwlw3av1f0xBF/CwhWLJMU="; } From a312acc618686faacb78f215ea61e97627d33f1a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 May 2025 03:30:56 +0000 Subject: [PATCH 05/86] python3Packages.django-celery-results: 2.5.1 -> 2.6.0 --- .../python-modules/django-celery-results/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-celery-results/default.nix b/pkgs/development/python-modules/django-celery-results/default.nix index e2a0a47a7f90..037fbdec4550 100644 --- a/pkgs/development/python-modules/django-celery-results/default.nix +++ b/pkgs/development/python-modules/django-celery-results/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "django-celery-results"; - version = "2.5.1"; + version = "2.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "django_celery_results"; inherit version; - hash = "sha256-PstxR/dz800DgbrGJGM3zkz4ii6nuCd07UjlGLZ7uP0="; + hash = "sha256-mrzYNq5rYQY3eSRNiIeoj+gLv6uhQ98208sHA0ZxJ3w="; }; postPatch = '' From 8ea963f28d94c6ec3658990fe847fb71df929bb1 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Tue, 12 Nov 2024 00:24:41 +1100 Subject: [PATCH 06/86] airdrop-cli: init at 0-unstable-2024-04-13 --- pkgs/by-name/ai/airdrop-cli/package.nix | 38 +++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/by-name/ai/airdrop-cli/package.nix diff --git a/pkgs/by-name/ai/airdrop-cli/package.nix b/pkgs/by-name/ai/airdrop-cli/package.nix new file mode 100644 index 000000000000..805fd28bcbbd --- /dev/null +++ b/pkgs/by-name/ai/airdrop-cli/package.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchFromGitHub, + swift, + swiftPackages, + swiftpm, +}: + +# Doesn't build without using the same stdenv (and Clang) to build swift +swiftPackages.stdenv.mkDerivation { + pname = "airdrop-cli"; + version = "0-unstable-2024-04-13"; + + src = fetchFromGitHub { + owner = "vldmrkl"; + repo = "airdrop-cli"; + rev = "dcdd570c3af3aae509ba7ad9fb26782b427f3a1a"; + hash = "sha256-7gKKeedRayf27XrOhntu41AMXgxc7fqJRE8Jhbihh3o="; + }; + + nativeBuildInputs = [ + swift + swiftpm + ]; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + meta = { + description = "Use Airdrop from the CLI on macOS written in Swift"; + homepage = "https://github.com/vldmrkl/airdrop-cli"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Enzime ]; + mainProgram = "airdrop"; + platforms = lib.platforms.darwin; + }; +} From b7e74c23a95840266a4c5569e8d08fc9396b3381 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 May 2025 10:53:17 +0000 Subject: [PATCH 07/86] beeper: 4.0.661 -> 4.0.693 --- pkgs/by-name/be/beeper/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index 936e7405e049..4d709b6b0e5f 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -9,10 +9,10 @@ }: let pname = "beeper"; - version = "4.0.661"; + version = "4.0.693"; src = fetchurl { url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}.AppImage"; - hash = "sha256-cKeHttoaV+UN5LXUArUxEcMjj3a4kjcj0EuiDriTtyE="; + hash = "sha256-+m4pmDYnn4fWAp8Ve7hjNaFClPU8tLIAVGQSJNlo/p0="; }; appimageContents = appimageTools.extract { inherit pname version src; From aea3c8be1f6b11702046cf0c002378b9cd245c2b Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Mon, 12 May 2025 22:02:36 +0200 Subject: [PATCH 08/86] victoriametrics: 1.116.0 -> 1.117.1 Release notes: - https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.117.0 - https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.117.1 Full changelog: https://github.com/VictoriaMetrics/VictoriaMetrics/compare/v1.116.0...v1.117.1 --- pkgs/by-name/vi/victoriametrics/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 183260448d55..2cb333913c17 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.116.0"; + version = "1.117.1"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-iXMn1C5dUzsZSNwv4PqS4iMsTlxjhj9U9YLJHy8WGHs="; + hash = "sha256-Y3Ai5e9bJnGlWfxOMWMhesJ/eHrklSbR+YmR1EgzFS0="; }; vendorHash = null; From c0bef8d9e78be0e9b201f938fbdcb661a2ab3c42 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 May 2025 22:43:21 +0000 Subject: [PATCH 09/86] museum: 1.0.4 -> 1.0.10 --- pkgs/by-name/mu/museum/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix index ca4fccd5251b..2b8a5862ea15 100644 --- a/pkgs/by-name/mu/museum/package.nix +++ b/pkgs/by-name/mu/museum/package.nix @@ -9,14 +9,14 @@ buildGoModule rec { pname = "museum"; - version = "1.0.4"; + version = "1.0.10"; src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; sparseCheckout = [ "server" ]; rev = "photos-v${version}"; - hash = "sha256-tFXOLzGGMrjVImOOl3RGaX3i/FwhjbGqKRdxv/xxKTs="; + hash = "sha256-CX12JrKlI7FMizk29LXO5e5i7pmgjzni/RY97020UZg="; }; vendorHash = "sha256-px4pMqeH73Fe06va4+n6hklIUDMbPmAQNKKRIhwv6ec="; From f25948845aba15048f05d9516f94debcbc695d27 Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Fri, 16 May 2025 20:41:01 +0200 Subject: [PATCH 10/86] element-desktop: 1.11.99 -> 1.11.100 --- pkgs/by-name/el/element-desktop/element-desktop-pin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix index 2cf6c048791f..1a72d1488ab6 100644 --- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix +++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.11.99"; + "version" = "1.11.100"; "hashes" = { - "desktopSrcHash" = "sha256-vfbCcRd2vwdH45qDpavSJksU71S3adnK6KYS4jwKUkk="; - "desktopYarnHash" = "sha256-AP/qoYiOfq7Etc9TqeNjXM1nAJ1FlgzT2fPIimybeEk="; + "desktopSrcHash" = "sha256-qlKZkBPWcD1eyEetCrIKsSXmodg6DYCmENfY+UT7Khc="; + "desktopYarnHash" = "sha256-wuRAeb4IpA2Ihr3ohaMPvFsaMod4Bg8o9lm8yzStwmk="; }; } From c1ef83481f55c21a750c406d1a7625928db40a50 Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Fri, 16 May 2025 20:41:13 +0200 Subject: [PATCH 11/86] element-web: 1.11.99 -> 1.11.100 --- pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix index a795680799a2..2fb0517243dc 100644 --- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix +++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.11.99"; + "version" = "1.11.100"; "hashes" = { - "webSrcHash" = "sha256-yTOvvoTt6HnXq+QFshYjpt0q5hpcR8cjpxgoyBtS2X0="; - "webYarnHash" = "sha256-kgwM1zo7/lRS2g/4fHuT/Z/fExOg6hWAJ7xoKt7vYA8="; + "webSrcHash" = "sha256-FiYjWOJ50Vhbs9vgEqK64HTVtwSuy4/BZAkPK4c6DXQ="; + "webYarnHash" = "sha256-C1yVJHU9ClTJHQfMLkdZEeRWVVu68eJp2kxnIlLinY8="; }; } From a8b3c34d4e8a245ed4feb1247aa5616b22f89f4a Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Sat, 17 May 2025 11:24:32 +1000 Subject: [PATCH 12/86] pnpm.fetchDeps: allow overriding the hash using `.override` --- pkgs/development/tools/pnpm/fetch-deps/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pnpm/fetch-deps/default.nix b/pkgs/development/tools/pnpm/fetch-deps/default.nix index 7e2b82d9b414..024aec34119d 100644 --- a/pkgs/development/tools/pnpm/fetch-deps/default.nix +++ b/pkgs/development/tools/pnpm/fetch-deps/default.nix @@ -11,7 +11,7 @@ }: { - fetchDeps = + fetchDeps = lib.makeOverridable ( { hash ? "", pname, @@ -120,7 +120,8 @@ } // hash' ) - ); + ) + ); configHook = makeSetupHook { name = "pnpm-config-hook"; From 6d4f1aa1312e449463a0c7ad53a7bf8b031ed47a Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 11 May 2025 09:38:15 +0800 Subject: [PATCH 13/86] rustdesk-flutter: 1.3.9 -> 1.4.0 --- pkgs/by-name/ru/rustdesk-flutter/package.nix | 8 ++-- .../rustdesk-flutter/update-cargo-lock.patch | 40 ------------------- 2 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 pkgs/by-name/ru/rustdesk-flutter/update-cargo-lock.patch diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix index 0d89f1e6a490..5516a2629a5e 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/package.nix +++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix @@ -64,14 +64,14 @@ let in flutter.buildFlutterApplication rec { pname = "rustdesk"; - version = "1.3.9"; + version = "1.4.0"; src = fetchFromGitHub { owner = "rustdesk"; repo = "rustdesk"; tag = version; fetchSubmodules = true; - hash = "sha256-DvFsHrYLdAaEh2cXF8Zp5AvyG8Okiy2guW/r2x7Kz4U="; + hash = "sha256-fuS2ENrMlzk1AIZGZp4M3ZbsHks5TFW2pRQEGzsTThQ="; }; strictDeps = true; @@ -101,7 +101,7 @@ flutter.buildFlutterApplication rec { src patches ; - hash = "sha256-D64W2+eBR2RGiN+puJW3QIO1334SgOOHv5fws5r3wmg="; + hash = "sha256-9DjfGfTs8/J9XPZmWXCibyRib1/abnWzznQn6A5Tw2I="; }; dontCargoBuild = true; @@ -153,8 +153,6 @@ flutter.buildFlutterApplication rec { patches = [ ./make-build-reproducible.patch - # Multiple version of core-foundation-sys will make fetchCargoVendor unhappy. Keep one of it. - ./update-cargo-lock.patch ]; prepareBuildRunner = '' diff --git a/pkgs/by-name/ru/rustdesk-flutter/update-cargo-lock.patch b/pkgs/by-name/ru/rustdesk-flutter/update-cargo-lock.patch deleted file mode 100644 index d78e8e76ac3e..000000000000 --- a/pkgs/by-name/ru/rustdesk-flutter/update-cargo-lock.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index e8ed6c42e..3e90da8fc 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1178,7 +1178,7 @@ name = "core-foundation" - version = "0.9.3" - source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" - dependencies = [ -- "core-foundation-sys 0.8.6 (git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd)", -+ "core-foundation-sys", - "libc", - ] - -@@ -1188,7 +1188,7 @@ version = "0.9.4" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" - dependencies = [ -- "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "core-foundation-sys", - "libc", - ] - -@@ -1198,14 +1198,6 @@ version = "0.8.6" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - --[[package]] --name = "core-foundation-sys" --version = "0.8.6" --source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" --dependencies = [ -- "objc2-encode 2.0.0-pre.2", --] -- - [[package]] - name = "core-graphics" - version = "0.22.3" --- -2.47.2 - From 31d520ee18a6ec3b95feac69d5d359bbe279361b Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Fri, 16 May 2025 23:57:57 +0200 Subject: [PATCH 14/86] element-{desktop,web-unwrapped}: {fix,modernize} update script - Does not fetch `-rc` versions anymore - Fixes weird output by `prefetch-yarn-deps` (see https://github.com/NixOS/nixpkgs/pull/407704#issue-3069691545) - Doesn't create any temporary files anymore, since everything is prefetched local builds will be faster too - DRY --- pkgs/by-name/el/element-desktop/update.sh | 61 +++++++++++------------ 1 file changed, 28 insertions(+), 33 deletions(-) diff --git a/pkgs/by-name/el/element-desktop/update.sh b/pkgs/by-name/el/element-desktop/update.sh index 20251b2644a4..ca573c6e994c 100755 --- a/pkgs/by-name/el/element-desktop/update.sh +++ b/pkgs/by-name/el/element-desktop/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq +#!nix-shell -i bash -p nix coreutils prefetch-yarn-deps jq curl if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then echo "Regenerates packaging data for the element packages." @@ -12,54 +12,49 @@ version="$1" set -euo pipefail if [ -z "$version" ]; then - version="$(wget -q -O- "https://api.github.com/repos/element-hq/element-desktop/releases?per_page=1" | jq -r '.[0].tag_name')" + version="$(curl -fsSL "https://api.github.com/repos/element-hq/element-desktop/releases/latest" | jq -r '.tag_name')" fi # strip leading "v" version="${version#v}" -# Element Web -web_src="https://raw.githubusercontent.com/element-hq/element-web/v$version" -web_src_hash=$(nix-prefetch-github element-hq element-web --rev v${version} | jq -r .hash) - cd "$(dirname "${BASH_SOURCE[0]}")" || exit 1 -web_tmpdir=$(mktemp -d) -trap 'rm -rf "$web_tmpdir"' EXIT +nixflags=( + --extra-experimental-features + "nix-command flakes" +) -pushd $web_tmpdir -wget -q "$web_src/yarn.lock" -web_yarn_hash=$(prefetch-yarn-deps yarn.lock) -popd +# HACK: prefetch-yarn-deps hashes may output extra clutter on stdout (!) so +# we'll need to get the last line, last word +fixupHash() { + local sorta_yarn_hash="$(tail -n1 <<< "$1")" + local almost_yarn_hash="${sorta_yarn_hash##* }" + local yarn_hash="$(nix "${nixflags[@]}" hash convert --hash-algo sha256 "$almost_yarn_hash")" -# Element Desktop -desktop_src="https://raw.githubusercontent.com/element-hq/element-desktop/v$version" -desktop_src_hash=$(nix-prefetch-github element-hq element-desktop --rev v${version} | jq -r .hash) + printf "%s" "$yarn_hash" +} -desktop_tmpdir=$(mktemp -d) -trap 'rm -rf "$desktop_tmpdir"' EXIT +getHashes() { + variant="$1" + output="$2" -pushd $desktop_tmpdir -wget -q "$desktop_src/yarn.lock" -desktop_yarn_hash=$(prefetch-yarn-deps yarn.lock) -popd + local url="github:element-hq/element-$variant/v$version" + local src="$(nix "${nixflags[@]}" flake prefetch --json "$url")" + local src_hash="$(jq -r ".hash" <<< "$src")" + local src_path="$(jq -r ".storePath" <<< "$src")" + local yarn_hash="$(fixupHash "$(prefetch-yarn-deps "$src_path/yarn.lock")")" -cat > ../element-web-unwrapped/element-web-pin.nix << EOF + cat > "$output" << EOF { "version" = "$version"; "hashes" = { - "webSrcHash" = "$web_src_hash"; - "webYarnHash" = "$web_yarn_hash"; + "${variant}SrcHash" = "$src_hash"; + "${variant}YarnHash" = "$yarn_hash"; }; } EOF +} -cat > element-desktop-pin.nix << EOF -{ - "version" = "$version"; - "hashes" = { - "desktopSrcHash" = "$desktop_src_hash"; - "desktopYarnHash" = "$desktop_yarn_hash"; - }; -} -EOF +getHashes web ../element-web-unwrapped/element-web-pin.nix +getHashes desktop element-desktop-pin.nix From 7ca585a2b771ff25aed1fafcbddb3ce31c098ff2 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Sat, 17 May 2025 16:56:18 +0200 Subject: [PATCH 15/86] meli: 0.8.11 -> 0.8.12 --- pkgs/by-name/me/meli/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/me/meli/package.nix b/pkgs/by-name/me/meli/package.nix index 224cea987cb9..d713ff827a6e 100644 --- a/pkgs/by-name/me/meli/package.nix +++ b/pkgs/by-name/me/meli/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { pname = "meli"; - version = "0.8.11"; + version = "0.8.12"; src = fetchzip { urls = [ @@ -33,11 +33,11 @@ rustPlatform.buildRustPackage rec { "https://codeberg.org/meli/meli/archive/v${version}.tar.gz" "https://github.com/meli/meli/archive/refs/tags/v${version}.tar.gz" ]; - hash = "sha256-q3vnvH0GWnrfYnk2WBRLTDInJ/wazI4JtkEMwiWanfI="; + hash = "sha256-Dp0WI1Cl+m7oxZ/4zEi0TtOwqRX681jZht9bNMFnmsU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-OAytdJgIiaS0xsHWOgNW2dkRQEyU9xcyaJtxClWzfjQ="; + cargoHash = "sha256-DJtk8xLppXdl9sSt6GcaXwZ5MEIY/s/z/bdcdr8YdLw="; # Needed to get openssl-sys to use pkg-config OPENSSL_NO_VENDOR = 1; @@ -75,7 +75,6 @@ rustPlatform.buildRustPackage rec { ]; meta = with lib; { - broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Terminal e-mail client and e-mail client library"; mainProgram = "meli"; homepage = "https://meli.delivery"; From d8935f58f505e7d094e564a2e585340dd3445c73 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 May 2025 14:59:53 +0000 Subject: [PATCH 16/86] yakut: 0.13.0 -> 0.14.0 --- pkgs/development/tools/misc/yakut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/yakut/default.nix b/pkgs/development/tools/misc/yakut/default.nix index d4c98e0e7114..d0a9487f4b0b 100644 --- a/pkgs/development/tools/misc/yakut/default.nix +++ b/pkgs/development/tools/misc/yakut/default.nix @@ -18,12 +18,12 @@ buildPythonApplication rec { pname = "yakut"; - version = "0.13.0"; + version = "0.14.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-MBVSt01D36rBPW2bopujyu8Opwwavmm7S3tdaWp5ACw="; + hash = "sha256-58SYSbKJWFgxm8QAaLPIDfVowV+NEh2nMEDrwSSBDbI="; }; buildInputs = [ From 89d1d931a90a147891755a1eea3191b113903f65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 May 2025 17:23:54 +0000 Subject: [PATCH 17/86] sydbox: 3.32.7 -> 3.34.0 --- pkgs/by-name/sy/sydbox/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix index faff6b29ed50..f61fdc2f85b5 100644 --- a/pkgs/by-name/sy/sydbox/package.nix +++ b/pkgs/by-name/sy/sydbox/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sydbox"; - version = "3.32.7"; + version = "3.34.0"; outputs = [ "out" @@ -24,11 +24,11 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "Sydbox"; repo = "sydbox"; tag = "v${finalAttrs.version}"; - hash = "sha256-l1CWCSd1ORw0Pvt9tcvbie5hEcysw0MoFhKxheIevEA="; + hash = "sha256-m4iooJzc/TQguWF4qVOvuNabFmijsTtlzjz7IllNN74="; }; useFetchCargoVendor = true; - cargoHash = "sha256-3eFYf8+ESNLBgV7thEWseocPQG7mCrjCt42FfzEnB6Q="; + cargoHash = "sha256-B/JSJKCLYnNjHFEDdFdGTdXuirA2zRKL+mr36a0Fqh0="; nativeBuildInputs = [ mandoc From 98691088c7db99163e684714c280889822b28632 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Sat, 17 May 2025 18:37:46 +0200 Subject: [PATCH 18/86] msi-ec-kmods: 0-unstable-2024-11-04 -> 0-unstable-2025-05-17 --- pkgs/os-specific/linux/msi-ec/default.nix | 11 ++++-- .../patches/kernel-string-choices.patch | 37 +++++++++++++++++++ 2 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 pkgs/os-specific/linux/msi-ec/patches/kernel-string-choices.patch diff --git a/pkgs/os-specific/linux/msi-ec/default.nix b/pkgs/os-specific/linux/msi-ec/default.nix index f21be652c5ad..9056e6132a92 100644 --- a/pkgs/os-specific/linux/msi-ec/default.nix +++ b/pkgs/os-specific/linux/msi-ec/default.nix @@ -9,18 +9,21 @@ }: stdenv.mkDerivation { pname = "msi-ec-kmods"; - version = "0-unstable-2024-11-04"; + version = "0-unstable-2025-05-17"; src = fetchFromGitHub { owner = "BeardOverflow"; repo = "msi-ec"; - rev = "be6f7156cd15f6ecf9d48dfcc30cbd1f693916b8"; - hash = "sha256-gImiP4OaBt80n+qgVnbhd0aS/zW+05o3DzGCw0jq+0g="; + rev = "796be9047b13c311ac4cdec33913775f4057f600"; + hash = "sha256-npJbnWFBVb8TK9ynVD/kXWq2iqO0ACKF4UYsu5mQuok="; }; dontMakeSourcesWritable = false; - patches = [ ./patches/makefile.patch ]; + patches = [ + ./patches/makefile.patch + ./patches/kernel-string-choices.patch + ]; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/msi-ec/patches/kernel-string-choices.patch b/pkgs/os-specific/linux/msi-ec/patches/kernel-string-choices.patch new file mode 100644 index 000000000000..da55ad77bdef --- /dev/null +++ b/pkgs/os-specific/linux/msi-ec/patches/kernel-string-choices.patch @@ -0,0 +1,37 @@ +--- a/msi-ec.c ++++ b/msi-ec.c +@@ -38,7 +38,12 @@ + #include + #include + #include +-#include ++ ++#include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,6,0) ++#include ++#endif ++ + + static DEFINE_MUTEX(ec_set_by_mask_mutex); + static DEFINE_MUTEX(ec_unset_by_mask_mutex); +@@ -1141,6 +1146,20 @@ static struct msi_ec_conf CONF52 __initdata = { + }, + }; + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0) ++/* Define our own string choice helpers for older kernels */ ++static inline const char *str_on_off(bool v) ++{ ++ return v ? "on" : "off"; ++} ++ ++static inline const char *str_yes_no(bool v) ++{ ++ return v ? "yes" : "no"; ++} ++#endif ++ ++ + static struct msi_ec_conf *CONFIGURATIONS[] __initdata = { + &CONF0, + &CONF1, From b46869e2b68bb776aec96087e0149c92e88ed9c1 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sun, 18 May 2025 17:18:12 +0200 Subject: [PATCH 19/86] clojure: fix and enable strictDeps --- pkgs/development/interpreters/clojure/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 89d337e5745e..b39989882a35 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, + bashNonInteractive, fetchurl, installShellFiles, jdk, @@ -24,6 +25,12 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ]; + buildInputs = [ + bashNonInteractive + ]; + + strictDeps = true; + # See https://github.com/clojure/brew-install/blob/1.10.3/src/main/resources/clojure/install/linux-install.sh installPhase = let From 0dc9e150a79e320d4c4858befb4d3d6ce7d337d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 12:54:07 +0000 Subject: [PATCH 20/86] source-meta-json-schema: 9.2.4 -> 9.3.1 --- pkgs/by-name/so/source-meta-json-schema/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/source-meta-json-schema/package.nix b/pkgs/by-name/so/source-meta-json-schema/package.nix index e220080b67b9..5760c6be9530 100644 --- a/pkgs/by-name/so/source-meta-json-schema/package.nix +++ b/pkgs/by-name/so/source-meta-json-schema/package.nix @@ -5,7 +5,7 @@ cmake, }: let - version = "9.2.4"; + version = "9.3.1"; in stdenv.mkDerivation (finalAttrs: { pname = "source-meta-json-schema"; @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "sourcemeta"; repo = "jsonschema"; rev = "v${version}"; - hash = "sha256-IQuXybTpdVdPiYVpb9BffZdUs0TxKqA1HkzxS/gi+pw="; + hash = "sha256-uqx2GBG4sTmFWexTr8fCP9r/o37d3vTD93giB/OEmac="; }; nativeBuildInputs = [ From d02c917a25995943a6540453e5f4702feee0913e Mon Sep 17 00:00:00 2001 From: Axel Karjalainen Date: Mon, 19 May 2025 17:01:47 +0300 Subject: [PATCH 21/86] anytype: Minor fixes to .desktop file Renamed to `anytype.desktop` to stay consistent with the Wayland application ID and added support for the custom URL scheme handler. --- pkgs/by-name/an/anytype/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index 014f7cb9aaef..98d1511c80f9 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -100,11 +100,12 @@ buildNpmPackage { desktopItems = [ (makeDesktopItem { - name = "Anytype"; + name = "anytype"; exec = "anytype"; icon = "anytype"; desktopName = "Anytype"; comment = description; + mimeTypes = [ "x-scheme-handler/anytype" ]; categories = [ "Utility" "Office" From 4dc94661e253d9d4d512e4e8921a2c297b02d2e3 Mon Sep 17 00:00:00 2001 From: Defelo Date: Mon, 19 May 2025 16:04:50 +0000 Subject: [PATCH 22/86] uiua: 0.15.1 -> 0.16.0 --- pkgs/by-name/ui/uiua/stable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ui/uiua/stable.nix b/pkgs/by-name/ui/uiua/stable.nix index dee37a99cc6b..a814452e07a1 100644 --- a/pkgs/by-name/ui/uiua/stable.nix +++ b/pkgs/by-name/ui/uiua/stable.nix @@ -1,7 +1,7 @@ rec { - version = "0.15.1"; + version = "0.16.0"; tag = version; - hash = "sha256-PTpGjJCTqc8bgCfKoq8Bh5eb5vWc1ZjWtdZXMY2j2f8="; - cargoHash = "sha256-UAwlnJsZfHnKzchhn79cBsX3iRPV+N52szRMiv2NBno="; + hash = "sha256-/BSn0B/yJY9rmGLBxnCwCNf2BGQOsbzpHu6Ww4NQpAs="; + cargoHash = "sha256-sxCcnfI3i81oDsmAingNesNP3CAAnvKtSoFPYP8uaqs="; updateScript = ./update-stable.sh; } From 89fa79a84071625609c0e07494946cfe2363d1d3 Mon Sep 17 00:00:00 2001 From: Defelo Date: Mon, 19 May 2025 18:05:30 +0200 Subject: [PATCH 23/86] vscode-extensions.uiua-lang.uiua-vscode: 0.0.63 -> 0.0.64 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 7ab8e0702496..d9a8f929a422 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4998,8 +4998,8 @@ let mktplcRef = { name = "uiua-vscode"; publisher = "uiua-lang"; - version = "0.0.63"; - hash = "sha256-qlBcnQyH5VbgmBlTvVi59OpYtyuVrJLoSuRIbrBGFVE="; + version = "0.0.64"; + hash = "sha256-mASTMZhXsM8IzaMmHsWRmf+pf1EjXyWsBMFXTcq7Acw="; }; meta = { description = "VSCode language extension for Uiua"; From 824ca145d875add7ca8215cdbc1db1e086d2c2cd Mon Sep 17 00:00:00 2001 From: Defelo Date: Mon, 19 May 2025 16:06:43 +0000 Subject: [PATCH 24/86] uiua-unstable: 0.16.0-rc.1 -> 0.16.0 --- pkgs/by-name/ui/uiua/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ui/uiua/unstable.nix b/pkgs/by-name/ui/uiua/unstable.nix index 1729bdd2d25e..cdd554a09a7b 100644 --- a/pkgs/by-name/ui/uiua/unstable.nix +++ b/pkgs/by-name/ui/uiua/unstable.nix @@ -1,7 +1,7 @@ rec { - version = "0.16.0-rc.1"; + version = "0.16.0"; tag = version; - hash = "sha256-c17CBFPBWe0UR+qwRMLCPGeaozVBq6aRv3haVDoIyyA="; - cargoHash = "sha256-8MulQU6SU1M/ITmPLtYa8SShXRsp7NTMhEZRXEgY5zw="; + hash = "sha256-/BSn0B/yJY9rmGLBxnCwCNf2BGQOsbzpHu6Ww4NQpAs="; + cargoHash = "sha256-sxCcnfI3i81oDsmAingNesNP3CAAnvKtSoFPYP8uaqs="; updateScript = ./update-unstable.sh; } From 8c856163e36f2c07212572ca5425f7ec374fe66e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 17:59:47 +0000 Subject: [PATCH 25/86] cloudflare-warp: 2025.2.600 -> 2025.4.929 --- pkgs/by-name/cl/cloudflare-warp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix index c3b2ab00ca05..f8386f73b860 100644 --- a/pkgs/by-name/cl/cloudflare-warp/package.nix +++ b/pkgs/by-name/cl/cloudflare-warp/package.nix @@ -23,15 +23,15 @@ }: let - version = "2025.2.600"; + version = "2025.4.929"; sources = { x86_64-linux = fetchurl { url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_amd64.deb"; - hash = "sha256-YY80XGTkKqE5pywuidvXPytv0/uMD4eMIcBlSpEV2Ps="; + hash = "sha256-9pofIjiKbe/8vKWe8bc1xoRE1PSexeDxnJcVqfxHd2c="; }; aarch64-linux = fetchurl { url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_arm64.deb"; - hash = "sha256-ueZL0rX1FCkd7jFpM2c63eu11vFBCUVnl1uOGxPClZU="; + hash = "sha256-Y3VMuf9rxsvvfL/UVbW2d8hWHfEMhoDZcv/oahinFNo="; }; }; in From b1b8bb11280df3e84feed34202852257ffdf6131 Mon Sep 17 00:00:00 2001 From: Taha YASSINE Date: Wed, 23 Apr 2025 20:33:51 +0100 Subject: [PATCH 26/86] codegrab: init at 1.0.7 --- pkgs/by-name/co/codegrab/package.nix | 49 ++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/co/codegrab/package.nix diff --git a/pkgs/by-name/co/codegrab/package.nix b/pkgs/by-name/co/codegrab/package.nix new file mode 100644 index 000000000000..d30d6cbe5de3 --- /dev/null +++ b/pkgs/by-name/co/codegrab/package.nix @@ -0,0 +1,49 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule (finalAttrs: { + pname = "codegrab"; + version = "1.0.7"; + + src = fetchFromGitHub { + owner = "epilande"; + repo = "codegrab"; + tag = "v${finalAttrs.version}"; + hash = "sha256-gKxvPcAZ8TnECAs3iMkFfZKdaq8vkLz/T9MUBWk4MfQ="; + leaveDotGit = true; + postFetch = '' + cd "$out" + git rev-parse --short HEAD > $out/COMMIT + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; + }; + + vendorHash = "sha256-u9pVOZOwK6xLdR4tlWN2eBoJZ2ziPEdJv78uCV0Suus="; + + checkFlags = [ + "-skip=TestParseSizeString" + ]; + + ldflags = [ + "-s" + "-w" + "-X=github.com/epilande/codegrab/internal/utils.Version=${finalAttrs.version}" + ]; + + # ldflags based on metadata from git and source + preBuild = '' + ldflags+=" -X=github.com/epilande/codegrab/internal/utils.CommitSHA=$(cat COMMIT)" + ''; + + meta = { + description = "Interactive CLI tool for selecting and bundling code into a single, LLM-ready output file"; + homepage = "https://github.com/epilande/codegrab"; + changelog = "https://github.com/epilande/codegrab/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ taha-yassine ]; + mainProgram = "grab"; + }; +}) From aac86362094d8ac922072bc4e459c79f738a08a4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 May 2025 01:15:22 +0200 Subject: [PATCH 27/86] python312Packages.mypy-boto3-ec2: 1.38.14 -> 1.38.19 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 860eb3a45f35..2a1a8551f958 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -446,8 +446,8 @@ rec { "sha256-RQh46jrXqj4bXTRJ+tPR9sql7yUn7Ek9u4p0OU0A7b0="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.38.14" - "sha256-+EI+0aGCa21XL3qoAr821F/j8dJTCaLcVRKP743szUQ="; + buildMypyBoto3Package "ec2" "1.38.19" + "sha256-FonE4x7zpgXEgLAtwv2qJ1I//IRUHSvSvvCLmy8CF1Y="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.38.0" From cfa5de255af5474765e942fde7b08fc9cb120dba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 May 2025 01:15:55 +0200 Subject: [PATCH 28/86] python312Packages.mypy-boto3-mediapackagev2: 1.38.0 -> 1.38.19 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 2a1a8551f958..7588685aae4c 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -878,8 +878,8 @@ rec { "sha256-QKKwwaJJ7o/FEWPQpLT7yMapG5DR6bn3UTt5XcMlN9A="; mypy-boto3-mediapackagev2 = - buildMypyBoto3Package "mediapackagev2" "1.38.0" - "sha256-f+MhMUbwcntEUONIzYIFCcJQgvNGeDZqhPbA4HJkVU8="; + buildMypyBoto3Package "mediapackagev2" "1.38.19" + "sha256-XgeZlI03x32rfCt02ozAxWLOe6CBV+6qzgKhxkC6pc8="; mypy-boto3-mediastore = buildMypyBoto3Package "mediastore" "1.38.0" From 0a8d55daa04c616623f3c496f0bb2fb4c86848fa Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 20 May 2025 01:16:20 +0200 Subject: [PATCH 29/86] python312Packages.pytensor: 2.30.3 -> 2.31.0 Diff: https://github.com/pymc-devs/pytensor/compare/refs/tags/rel-2.30.3...rel-2.31.0 Changelog: https://github.com/pymc-devs/pytensor/releases/tag/rel-2.31.0 --- pkgs/development/python-modules/pytensor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix index 5c1f81b4fcaa..63ca789b70ba 100644 --- a/pkgs/development/python-modules/pytensor/default.nix +++ b/pkgs/development/python-modules/pytensor/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "pytensor"; - version = "2.30.3"; + version = "2.31.0"; pyproject = true; src = fetchFromGitHub { @@ -42,7 +42,7 @@ buildPythonPackage rec { postFetch = '' sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' $out/pytensor/_version.py ''; - hash = "sha256-Iyiuvt86pfz8MmpwgDecKJFVOw+fKpEaA9m1MBA9Yxs="; + hash = "sha256-RgJeKA0dRSY1xn+7pgzUg5Hn5KKAWUilimbZOn43xHQ="; }; build-system = [ From f62f871c5c78f51b16478d97070f2e1b53791026 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 May 2025 01:16:33 +0200 Subject: [PATCH 30/86] python313Packages.botocore-stubs: 1.38.18 -> 1.38.19 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index bfd30dd15af5..6266183ea45d 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.38.18"; + version = "1.38.19"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-lc6Rrf+iFOrV62uq8oHJkmxSsgrZsgjVTzsYM6HuxqQ="; + hash = "sha256-hPZ6QrskCo6gxf5PBdSXzEERd9tgC8cBIYLkmawkvxk="; }; nativeBuildInputs = [ setuptools ]; From 38c7d40c7eb24bf994d6649ac49db391db1156e6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 May 2025 01:16:37 +0200 Subject: [PATCH 31/86] python313Packages.boto3-stubs: 1.38.18 -> 1.38.19 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 1b36c4ca3a2f..525c03ccb7e8 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.38.18"; + version = "1.38.19"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-4hn4/Xsx9tHaMWamBMazFWtGZq2OGwj+WCVu2UPzWpE="; + hash = "sha256-Vm1Q7HAQXwb4YEHQP9SvaiQyL0Bj7NL2rIm5szgDjRQ="; }; build-system = [ setuptools ]; From dac793ec0602020264c7cc9ce4c0814e0833228c Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Tue, 20 May 2025 12:54:39 +0800 Subject: [PATCH 32/86] python3Packages.django-auditlog: avoid with lib; --- pkgs/development/python-modules/django-auditlog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django-auditlog/default.nix b/pkgs/development/python-modules/django-auditlog/default.nix index 880512f617de..484764123a19 100644 --- a/pkgs/development/python-modules/django-auditlog/default.nix +++ b/pkgs/development/python-modules/django-auditlog/default.nix @@ -61,11 +61,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "auditlog" ]; - meta = with lib; { + meta = { changelog = "https://github.com/jazzband/django-auditlog/blob/v${version}/CHANGELOG.md"; description = "Django app that keeps a log of changes made to an object"; downloadPage = "https://github.com/jazzband/django-auditlog"; - license = licenses.mit; - maintainers = with maintainers; [ leona ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ leona ]; }; } From 8f4ca275547010db22069d9667c1d99d23f09027 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Tue, 20 May 2025 12:55:43 +0800 Subject: [PATCH 33/86] python3Packages.django-auditlog: 3.0.0 -> 3.1.2 --- .../python-modules/django-auditlog/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/django-auditlog/default.nix b/pkgs/development/python-modules/django-auditlog/default.nix index 484764123a19..9a2cb264f816 100644 --- a/pkgs/development/python-modules/django-auditlog/default.nix +++ b/pkgs/development/python-modules/django-auditlog/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "django-auditlog"; - version = "3.0.0"; + version = "3.1.2"; pyproject = true; src = fetchFromGitHub { owner = "jazzband"; repo = "django-auditlog"; - rev = "v${version}"; - hash = "sha256-SJ4GJp/gVIxiLbdAj3ZS+weevqIDZCMQnW/pqc5liJU="; + tag = "v${version}"; + hash = "sha256-xb6pTsXkB8HVpXvB9WzBUlRcjh5cn1CdmMYQQVCQ/GU="; }; nativeBuildInputs = [ @@ -62,7 +62,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "auditlog" ]; meta = { - changelog = "https://github.com/jazzband/django-auditlog/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/jazzband/django-auditlog/blob/${src.tag}/CHANGELOG.md"; description = "Django app that keeps a log of changes made to an object"; downloadPage = "https://github.com/jazzband/django-auditlog"; license = lib.licenses.mit; From 21e09dce2acd5efe4160aca6b25f1e40e2e055e1 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Tue, 20 May 2025 13:06:34 +0800 Subject: [PATCH 34/86] python3Packages.django-auditlog: fix tests --- pkgs/development/python-modules/django-auditlog/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/django-auditlog/default.nix b/pkgs/development/python-modules/django-auditlog/default.nix index 9a2cb264f816..4b488a328ae8 100644 --- a/pkgs/development/python-modules/django-auditlog/default.nix +++ b/pkgs/development/python-modules/django-auditlog/default.nix @@ -50,11 +50,13 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck + cd auditlog_tests # strip escape codes otherwise tests fail # see https://github.com/jazzband/django-auditlog/issues/644 TEST_DB_USER=$PGUSER \ TEST_DB_HOST=$PGHOST \ - ${python.interpreter} runtests.py | cat + ${python.interpreter} ./manage.py test | cat + cd .. runHook postCheck ''; From ebcc70174c64d5c7dc39e0b3da05d91110a3c34c Mon Sep 17 00:00:00 2001 From: Christoph Jabs Date: Tue, 20 May 2025 09:17:22 +0300 Subject: [PATCH 35/86] cargo-valgrind: 2.2.1 -> 2.3.1 --- pkgs/by-name/ca/cargo-valgrind/package.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ca/cargo-valgrind/package.nix b/pkgs/by-name/ca/cargo-valgrind/package.nix index cadb8bc4cc51..6463f3821661 100644 --- a/pkgs/by-name/ca/cargo-valgrind/package.nix +++ b/pkgs/by-name/ca/cargo-valgrind/package.nix @@ -6,35 +6,36 @@ makeWrapper, valgrind, }: - rustPlatform.buildRustPackage rec { pname = "cargo-valgrind"; - version = "2.2.1"; + version = "2.3.1"; src = fetchFromGitHub { owner = "jfrimmel"; repo = "cargo-valgrind"; tag = version; - sha256 = "sha256-yUCDKklkfK+2n+THH4QlHb+FpeWfObXpmp4VozsFiUM="; + sha256 = "sha256-gr/s2dYCFmhwfXT3tqWPFpXQK2QaAhL7Aqnn1A3KjJI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nTqdsi+5YmOzQ5DPn3jOfUXUUut9uo5xKyx/R2MjV1A="; + cargoHash = "sha256-iNsGrbncZwCHXn/xuiI4Mw4F3FFWswEhwpIMI0xcFgU="; passthru = { updateScript = nix-update-script { }; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + valgrind # for tests where the executable is not wrapped yet + ]; postInstall = '' wrapProgram $out/bin/cargo-valgrind --prefix PATH : ${lib.makeBinPath [ valgrind ]} ''; checkFlags = [ - "--skip examples_are_runnable" "--skip tests_are_runnable" - "--skip issue74" + "--skip default_cargo_project_reports_no_violations" ]; meta = with lib; { From 7244cb9d1c05587a0e5982ce139c750316fc6b0f Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Tue, 20 May 2025 17:32:18 +1000 Subject: [PATCH 36/86] awsebcli: 3.23.3 -> 3.24 diff: https://github.com/aws/aws-elastic-beanstalk-cli/compare/3.23.3...3.24 --- pkgs/by-name/aw/awsebcli/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix index efdbfd342a7d..f74292beb65b 100644 --- a/pkgs/by-name/aw/awsebcli/package.nix +++ b/pkgs/by-name/aw/awsebcli/package.nix @@ -25,14 +25,14 @@ in python.pkgs.buildPythonApplication rec { pname = "awsebcli"; - version = "3.23.3"; + version = "3.24"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-elastic-beanstalk-cli"; tag = version; - hash = "sha256-Jaj90NRCwaxRQQlB4s4Us+liYiNohpwRsHuvKM5WmbU="; + hash = "sha256-i1CcOlrrtizvQMXKoj5xQYlmaTB8JWb4X5S+EcnQXps="; }; pythonRelaxDeps = [ @@ -50,6 +50,7 @@ python.pkgs.buildPythonApplication rec { botocore cement colorama + fabric pathspec pyyaml future From 4e306af93d35f1b765df78f8c110d3b2344f54d8 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 18 May 2025 00:12:44 +0200 Subject: [PATCH 37/86] python312Packages.pythonefl: use pyproject = true, disable for python 3.13 --- .../python-modules/python-efl/default.nix | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index 0b0eaec2d29d..ddb6cdbd05a0 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -2,11 +2,17 @@ lib, fetchurl, buildPythonPackage, + pythonAtLeast, + pkg-config, - python, - dbus-python, - packaging, + enlightenment, + + packaging, + setuptools, + + dbus-python, + directoryListingUpdater, }: @@ -15,10 +21,13 @@ buildPythonPackage rec { pname = "python-efl"; version = "1.26.1"; - format = "setuptools"; + pyproject = true; + + # As of 1.26.1, native extensions fail to build with python 3.13+ + disabled = pythonAtLeast "3.13"; src = fetchurl { - url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz"; + url = "http://download.enlightenment.org/rel/bindings/python/python-efl-${version}.tar.xz"; hash = "sha256-3Ns5fhIHihnpDYDnxvPP00WIZL/o1UWLzgNott4GKNc="; }; @@ -26,23 +35,19 @@ buildPythonPackage rec { buildInputs = [ enlightenment.efl ]; - propagatedBuildInputs = [ - dbus-python + build-system = [ packaging + setuptools + ]; + + dependencies = [ + dbus-python ]; preConfigure = '' NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl evas) $NIX_CFLAGS_COMPILE" ''; - preBuild = '' - ${python.pythonOnBuildForHost.interpreter} setup.py build_ext - ''; - - installPhase = '' - ${python.pythonOnBuildForHost.interpreter} setup.py install --prefix=$out --single-version-externally-managed - ''; - doCheck = false; passthru.updateScript = directoryListingUpdater { }; From 77ebb549a5401e56f3e5c8ca4fab74971dec49c6 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 18 May 2025 00:59:47 +0200 Subject: [PATCH 38/86] python312Packages.pythonefl: enable tests --- .../python-modules/python-efl/default.nix | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index ddb6cdbd05a0..d227d8ac5f8a 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -13,6 +13,8 @@ dbus-python, + pytestCheckHook, + directoryListingUpdater, }: @@ -48,7 +50,30 @@ buildPythonPackage rec { NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl evas) $NIX_CFLAGS_COMPILE" ''; - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + # make sure we load the library from $out instead of the cwd + # because cwd doesn't contain the built extensions + rm -r efl/ + + patchShebangs tests/ecore/exe_helper.sh + + # use the new name instead of the removed alias + substituteInPlace tests/evas/test_01_rect.py \ + --replace-fail ".assert_(" ".assertTrue(" + ''; + + pytestFlagsArray = [ "tests/" ]; + + disabledTestPaths = [ + "tests/dbus/test_01_basics.py" # needs dbus daemon + "tests/ecore/test_09_file_download.py" # uses network + "tests/ecore/test_11_con.py" # uses network + "tests/elementary/test_02_image_icon.py" # RuntimeWarning: Setting standard icon failed + ]; passthru.updateScript = directoryListingUpdater { }; From 4b6c2533636791cf946b899903df3c72ecbb745d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 11:09:24 +0000 Subject: [PATCH 39/86] python3Packages.pyghmi: 1.6.0 -> 1.6.1 --- pkgs/development/python-modules/pyghmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyghmi/default.nix b/pkgs/development/python-modules/pyghmi/default.nix index 59133646877f..c942e1383eb5 100644 --- a/pkgs/development/python-modules/pyghmi/default.nix +++ b/pkgs/development/python-modules/pyghmi/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "pyghmi"; - version = "1.6.0"; + version = "1.6.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-jPfGPKQkHLyapGWJ0o05e79pPlw0UWNJeHHJgb+MdFQ="; + hash = "sha256-XS0QQhHLkld9swn4WYj6nnMkMO6BZZ5iG0oJgFOCC9k="; }; build-system = [ From 07e4c2fef24e653be2c2f7ae1743695bd391d57d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 12:02:15 +0000 Subject: [PATCH 40/86] python3Packages.oslo-config: 9.7.1 -> 9.8.0 --- pkgs/development/python-modules/oslo-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix index a4274a88b1ed..799c35acc316 100644 --- a/pkgs/development/python-modules/oslo-config/default.nix +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "oslo-config"; - version = "9.7.1"; + version = "9.8.0"; pyproject = true; src = fetchPypi { pname = "oslo_config"; inherit version; - hash = "sha256-VVizS8wrUvIgjoD8rZVaT3ssQbskW2RR1DpiGtEmO70="; + hash = "sha256-7qgAlQSr7mchN8WL2r2roYX0lrk8ha3SRuLNzr6dCKo="; }; postPatch = '' From ecda0e0adbff8e7cb06c75ec25e180c51fce2784 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 May 2025 06:32:42 +0000 Subject: [PATCH 41/86] python3Packages.proglog: 0.1.10 -> 0.1.12 --- pkgs/development/python-modules/proglog/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/proglog/default.nix b/pkgs/development/python-modules/proglog/default.nix index ebb674d14bda..1e7605b0907d 100644 --- a/pkgs/development/python-modules/proglog/default.nix +++ b/pkgs/development/python-modules/proglog/default.nix @@ -2,20 +2,23 @@ lib, fetchPypi, buildPythonPackage, + setuptools, tqdm, }: buildPythonPackage rec { pname = "proglog"; - version = "0.1.10"; - format = "setuptools"; + version = "0.1.12"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ZYwoycguTK6y8l9Ij/+c6s4i+NabFdDByG1kJ15N2rQ="; + hash = "sha256-Nh7gdHIcJ3uJt1wGEzbLjF8ofJKwQ++lYsz3hmzakxw="; }; - propagatedBuildInputs = [ tqdm ]; + build-system = [ setuptools ]; + + dependencies = [ tqdm ]; meta = with lib; { description = "Logs and progress bars manager for Python"; From f51f718e7c261a49263347286035c8b184a5ee6a Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Tue, 20 May 2025 17:28:50 +0200 Subject: [PATCH 42/86] scorched3d: add gcc 14 fix Signed-off-by: Marcin Serwin --- pkgs/by-name/sc/scorched3d/gcc14-fix.patch | 13 +++++++++++++ pkgs/by-name/sc/scorched3d/package.nix | 1 + 2 files changed, 14 insertions(+) create mode 100644 pkgs/by-name/sc/scorched3d/gcc14-fix.patch diff --git a/pkgs/by-name/sc/scorched3d/gcc14-fix.patch b/pkgs/by-name/sc/scorched3d/gcc14-fix.patch new file mode 100644 index 000000000000..8bae4dfe0b1e --- /dev/null +++ b/pkgs/by-name/sc/scorched3d/gcc14-fix.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index 59414ee..c53064d 100755 +--- a/configure ++++ b/configure +@@ -4881,7 +4881,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + int main(int argc, char *argv[]) + { +- alutInit(argc, argv); ++ alutInit(&argc, argv); + return 0; + } + #undef main diff --git a/pkgs/by-name/sc/scorched3d/package.nix b/pkgs/by-name/sc/scorched3d/package.nix index da9b404812eb..cdfa6d7ca6b5 100644 --- a/pkgs/by-name/sc/scorched3d/package.nix +++ b/pkgs/by-name/sc/scorched3d/package.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { url = "https://sources.debian.org/data/main/s/scorched3d/44%2Bdfsg-7/debian/patches/wx3.0-compat.patch"; sha256 = "sha256-Y5U5yYNT5iMqhdRaDMFtZ4K7aD+pugFZP0jLh7rdDp8="; }) + ./gcc14-fix.patch ]; sourceRoot = "scorched"; From 598b7f3f27d446f495176bb34463561fd3baf6ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 16:14:13 +0000 Subject: [PATCH 43/86] noto-fonts: 2025.04.01 -> 2025.05.01 --- pkgs/by-name/no/noto-fonts/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/noto-fonts/package.nix b/pkgs/by-name/no/noto-fonts/package.nix index 7fa4f8495752..0c9d6ddef625 100644 --- a/pkgs/by-name/no/noto-fonts/package.nix +++ b/pkgs/by-name/no/noto-fonts/package.nix @@ -20,13 +20,13 @@ stdenvNoCC.mkDerivation rec { pname = "noto-fonts${suffix}"; - version = "2025.04.01"; + version = "2025.05.01"; src = fetchFromGitHub { owner = "notofonts"; repo = "notofonts.github.io"; rev = "noto-monthly-release-${version}"; - hash = "sha256-xR3P6RWb1pHdOuCbb+kQXqv3Ip3+2yXAVqeZ+f2M3VU="; + hash = "sha256-voOizeGK7fU2bGLoNBhdNIfleDCu84nFiEHo5lCIye4="; }; outputs = [ From a135b47ed30b8f5fa964b0b60a83ef7e93ac9f28 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 20 May 2025 19:23:03 +0200 Subject: [PATCH 44/86] python312Packages.pymc: relax pytensor --- pkgs/development/python-modules/pymc/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index a420212baea0..8f2ea6ee717a 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -37,6 +37,10 @@ buildPythonPackage rec { versioneer ]; + pythonRelaxDeps = [ + "pytensor" + ]; + dependencies = [ arviz cachetools From ccf161406023b55bc4996d4eef57ceb7b5b7e2c8 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Tue, 20 May 2025 21:10:14 +0200 Subject: [PATCH 45/86] mumble: Apply point release number to internal version string Without applying the build option BUILD_NUMBER, Mumble only knows about the major and minor version. So, if the actual version string is 1.5.735, then the Mumble application only displays 1.5.0. Fix that. Reported-by: Hartmnt Signed-off-by: Felix Singer --- pkgs/applications/networking/mumble/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 43f91c227027..cab3e4774bee 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -62,6 +62,7 @@ let cmakeFlags = [ "-D g15=OFF" "-D CMAKE_CXX_STANDARD=17" # protobuf >22 requires C++ 17 + "-D BUILD_NUMBER=${lib.versions.patch source.version}" ] ++ (overrides.configureFlags or [ ]); preConfigure = '' From 5e82c040f8274d5227a78793c922a939a6251be1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 19:38:10 +0000 Subject: [PATCH 46/86] tektoncd-cli: 0.40.0 -> 0.41.0 --- pkgs/by-name/te/tektoncd-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/tektoncd-cli/package.nix b/pkgs/by-name/te/tektoncd-cli/package.nix index e3b3cbe537a3..abecece8ea43 100644 --- a/pkgs/by-name/te/tektoncd-cli/package.nix +++ b/pkgs/by-name/te/tektoncd-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-LcYd8v6+at/GqlEV2Qkj5g+WNiTBfnQuhDtpP7lmnuk="; + sha256 = "sha256-X+zFYPoHf8Q1K0bLjrsnwOZxxAeJCzgKqmr3FYK5AKA="; }; vendorHash = null; From 3b087a8951dba4f5110d6ba256e424bd46922044 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 19:38:17 +0000 Subject: [PATCH 47/86] parca-agent: 0.38.1 -> 0.38.2 --- pkgs/by-name/pa/parca-agent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/parca-agent/package.nix b/pkgs/by-name/pa/parca-agent/package.nix index fa4c4e2b6747..ba47b0ea01e3 100644 --- a/pkgs/by-name/pa/parca-agent/package.nix +++ b/pkgs/by-name/pa/parca-agent/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "parca-agent"; - version = "0.38.1"; + version = "0.38.2"; src = fetchFromGitHub { owner = "parca-dev"; repo = "parca-agent"; tag = "v${version}"; - hash = "sha256-8xzRHOqiGaAKkVlFv0YLj76xJhr6+ljFyGa819iOPiY="; + hash = "sha256-6TjO5Fb6+zCrVz/Edq41H3tTbJLtYD1k/OKt01ms2dY="; fetchSubmodules = true; }; proxyVendor = true; - vendorHash = "sha256-o7wf0n2XHZnfURJfQqgvU9bXfFrbFXIo3rt5cqYCx6w="; + vendorHash = "sha256-Qm5ezWjMTYrhulHS5ALs4yrCInhqsxRc9RvCh9vv3GE="; buildInputs = [ stdenv.cc.libc.static From eaf7f337a003963e2f22b4a4aa4c90dfdc74318a Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Tue, 20 May 2025 20:30:42 +0000 Subject: [PATCH 48/86] ty: 0.0.1-alpha.5 -> 0.0.1-alpha.6 --- pkgs/by-name/ty/ty/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index 80338e0caf61..cfb8a4ca6afb 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ty"; - version = "0.0.1-alpha.5"; + version = "0.0.1-alpha.6"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ty"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-F3q6IpS7dk0jISG+aREKpPxwWHO5UdSfslOnclYa0R8="; + hash = "sha256-0/Vzc5N4w23dcRLSWMn/hcgtx3dOpJagPBCiNjCT3mI="; }; # For Darwin platforms, remove the integration test for file notifications, @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=ty" ]; - cargoHash = "sha256-NXhO+xYHCz269jxEuiB8yMgaX21Z8wAySVl9XOc7W60="; + cargoHash = "sha256-p3D2sHMyeQY6hZsX17REidyofuQsIkunGLP8IrO1+8A="; nativeBuildInputs = [ installShellFiles ]; From 53a13495bb6adfefd195a6eb42d9a4fc2e5152b0 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 20 May 2025 21:44:57 +0100 Subject: [PATCH 49/86] sqlitecpp: 3.3.2 -> 3.3.3 Changes: https://github.com/SRombauts/SQLiteCpp/releases/tag/3.3.3 --- pkgs/by-name/sq/sqlitecpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sq/sqlitecpp/package.nix b/pkgs/by-name/sq/sqlitecpp/package.nix index e1dcac1598de..acc141ffb42b 100644 --- a/pkgs/by-name/sq/sqlitecpp/package.nix +++ b/pkgs/by-name/sq/sqlitecpp/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sqlitecpp"; - version = "3.3.2"; + version = "3.3.3"; src = fetchFromGitHub { owner = "SRombauts"; repo = "sqlitecpp"; rev = finalAttrs.version; - sha256 = "sha256-rsVFk4FsonrwpBd3TonkxilwWeOBocH8AyeB+71OBdI="; + hash = "sha256-RSNJGfvIvNfk+/Awzh06tDi/TA5Wc35X8ya0X5mP9IE="; }; nativeBuildInputs = [ From 9c0b6aa54315263a3bdab306e70d0f7799bc93dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 21:14:37 +0000 Subject: [PATCH 50/86] python3Packages.gehomesdk: 2025.2.2 -> 2025.5.0 --- pkgs/development/python-modules/gehomesdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix index 1d735c1088e5..3e192bea29c0 100644 --- a/pkgs/development/python-modules/gehomesdk/default.nix +++ b/pkgs/development/python-modules/gehomesdk/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "gehomesdk"; - version = "2025.2.2"; + version = "2025.5.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-c2WrY/Db2D0x+jDszDkojBKAZmwGNQnXXfSrkoSjs3w="; + hash = "sha256-YMw0W9EWz3KY1+aZMdtE4TRvFd9yqTHkfw0X3+ZDCfQ="; }; build-system = [ setuptools ]; From 59ec985fc30e5303134e431cb963bb7114b7473e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 May 2025 23:31:35 +0200 Subject: [PATCH 51/86] python313Packages.tencentcloud-sdk-python: 3.0.1381 -> 3.0.1383 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1381...refs/tags/3.0.1383 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1383/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index a51e8172665e..64e537fcfc1b 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1381"; + version = "3.0.1383"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-qxdQZnptPh5y0Hk0Zron2LvggdHWpVgjVW75+pe7iWU="; + hash = "sha256-xC16Y4fLEvGgMnZGx2KV/a3HTIrXwPSwxlQwDzB52fo="; }; build-system = [ setuptools ]; From 761fb0def9f09fd37bf7d139cbbfd6b2bb06ff97 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 May 2025 23:32:54 +0200 Subject: [PATCH 52/86] exploitdb: 2025-05-10 -> 2025-05-19 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2025-05-10...2025-05-19 --- pkgs/by-name/ex/exploitdb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index 86a9ff62ea9c..aaf64e7aeb61 100644 --- a/pkgs/by-name/ex/exploitdb/package.nix +++ b/pkgs/by-name/ex/exploitdb/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2025-05-10"; + version = "2025-05-19"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-YcSkBnzw3iMuD0MtpqtUq1gOBoj2ptigI63cI1wBibY="; + hash = "sha256-Tk2iPWiybUlsmiHbjJTNEMkCuXVeam49PiWrl4mVzhY="; }; nativeBuildInputs = [ makeWrapper ]; From 57756393f2595f281cd95ac853b362e21ed06622 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 May 2025 23:34:21 +0200 Subject: [PATCH 53/86] checkov: 3.2.425 -> 3.2.427 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.425...refs/tags/3.2.427 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.427 --- pkgs/by-name/ch/checkov/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index 1163f7e7e0f6..a6c1a3310361 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -25,14 +25,14 @@ with py.pkgs; python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.425"; + version = "3.2.427"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-tYK+GvWoSy3WOqVWqJ0w7EDJthNF+O5XvAPmWOVcjII="; + hash = "sha256-jdlTSWdojaM7M5g7yWCudZeCuQqaZZWFYJ0kWWup4ts="; }; pythonRelaxDeps = [ From baae9ddf04914df49af0c4cb80ac24038c1342f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 21:41:36 +0000 Subject: [PATCH 54/86] python3Packages.diffenator2: 0.4.8 -> 0.4.9 --- pkgs/development/python-modules/diffenator2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/diffenator2/default.nix b/pkgs/development/python-modules/diffenator2/default.nix index c1c449ab976c..80f6181eec79 100644 --- a/pkgs/development/python-modules/diffenator2/default.nix +++ b/pkgs/development/python-modules/diffenator2/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "diffenator2"; - version = "0.4.8"; + version = "0.4.9"; pyproject = true; src = fetchFromGitHub { owner = "googlefonts"; repo = "diffenator2"; tag = "v${version}"; - hash = "sha256-DazI5YxNQIdkzCuC5T3JFwfYBDXbeWnyQgwWdndWMhA="; + hash = "sha256-EV+ju2PnjqRsjQvh/bQJYtDOO4vvisoU0aqlV9vMQp8="; }; env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; From 469a34b832fa831fb922ed52ffa37b50eb9e2152 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 23:56:02 +0000 Subject: [PATCH 55/86] foundry: 1.1.0 -> 1.2.0 --- pkgs/by-name/fo/foundry/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/foundry/package.nix b/pkgs/by-name/fo/foundry/package.nix index 8b8d331882fd..f90db207f2bf 100644 --- a/pkgs/by-name/fo/foundry/package.nix +++ b/pkgs/by-name/fo/foundry/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "foundry"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "foundry-rs"; repo = "foundry"; tag = "v${version}"; - hash = "sha256-bFr1mzp1evaCJsVj5H20ShoaGMJ1TPB/91Yd37ZGNsI="; + hash = "sha256-hHvHnSq6XarfofX0G5RE2hIai2eY8Nf1aqgJ5Z6ZuDg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-v+7sykIVdrzBOkNVnpgUnCUG7SUf2UToq9P539UAOH4="; + cargoHash = "sha256-spB89RmR6+9L+zo2YOl7fBxcmRdLUELXr8OmUt3waO4="; nativeBuildInputs = [ pkg-config From 34fb66f6ec4f19c9c9539a3cbf410a4f1717b246 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 May 2025 00:51:56 +0000 Subject: [PATCH 56/86] manilaclient: 5.4.0 -> 5.5.0 --- .../python-modules/python-manilaclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index bb2d2a922092..ad1ee7bf62e0 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/pkgs/development/python-modules/python-manilaclient/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "python-manilaclient"; - version = "5.4.0"; + version = "5.5.0"; pyproject = true; src = fetchPypi { pname = "python_manilaclient"; inherit version; - hash = "sha256-58AYZzpFwG4Vd2AXW1WYxzbKRtMri7cyY7kboqv9EN8="; + hash = "sha256-wPYVZ0+a9g+IP3l3eH9gMWXfe5VGUzem7qWEOWZ+vlo="; }; build-system = [ From 1e706f30d7fe1d91dea5f688169adf23c7ab92be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 May 2025 01:17:44 +0000 Subject: [PATCH 57/86] azure-cli-extensions.containerapp: 1.1.0b4 -> 1.1.0b5 --- pkgs/by-name/az/azure-cli/extensions-manual.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index e277fa6d81cf..609acd44a90e 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -83,9 +83,9 @@ containerapp = mkAzExtension rec { pname = "containerapp"; - version = "1.1.0b4"; + version = "1.1.0b5"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/containerapp-${version}-py2.py3-none-any.whl"; - hash = "sha256-d2pqanDERA54NGQwzO1S2D+WM1q5w1dmKjYbEdbknik="; + hash = "sha256-gC75NiDDRw4DVIDGiyfdCcFSAzdUgVNjyTfrgGgRd90="; description = "Microsoft Azure Command-Line Tools Containerapp Extension"; propagatedBuildInputs = with python3Packages; [ docker From 8948de5c350b29aa2a123eafeb9d8e25ed9f4e6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 May 2025 02:02:10 +0000 Subject: [PATCH 58/86] qbittorrent-enhanced: 5.0.5.10 -> 5.1.0.10 --- pkgs/by-name/qb/qbittorrent-enhanced/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qb/qbittorrent-enhanced/package.nix b/pkgs/by-name/qb/qbittorrent-enhanced/package.nix index ed4da5552468..441a5b8b9795 100644 --- a/pkgs/by-name/qb/qbittorrent-enhanced/package.nix +++ b/pkgs/by-name/qb/qbittorrent-enhanced/package.nix @@ -7,13 +7,13 @@ (qbittorrent.override { inherit guiSupport; }).overrideAttrs (old: rec { pname = "qbittorrent-enhanced" + lib.optionalString (!guiSupport) "-nox"; - version = "5.0.5.10"; + version = "5.1.0.10"; src = fetchFromGitHub { owner = "c0re100"; repo = "qBittorrent-Enhanced-Edition"; rev = "release-${version}"; - hash = "sha256-wMPzasrWmPG+iOwUBkbswSMQQBJxq03GVlQg5ck54vQ="; + hash = "sha256-VJqQFx9OvfuGyIfot9CgKiyGawOD3mYIdux20Atjea0="; }; meta = old.meta // { From b66c316b0a19dda871e290a93f73106719c8e09d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 May 2025 02:02:56 +0000 Subject: [PATCH 59/86] python3Packages.githubkit: 0.12.12 -> 0.12.13 --- pkgs/development/python-modules/githubkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix index b1f8fb1d5aca..fa4e341d32e4 100644 --- a/pkgs/development/python-modules/githubkit/default.nix +++ b/pkgs/development/python-modules/githubkit/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "githubkit"; - version = "0.12.12"; + version = "0.12.13"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "yanyongyu"; repo = "githubkit"; tag = "v${version}"; - hash = "sha256-QAEPcSjMJi4BXkc3owM+fRlplOa+IlKdYYzf08iqLOQ="; + hash = "sha256-TMn81YY44bXUyU6GHSGtLtQ7aC2/vA9nZf/PaGhBi0s="; }; pythonRelaxDeps = [ "hishel" ]; From e05c651485bedd2dc49df73dae7fa675aa9f6baf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 May 2025 02:28:31 +0000 Subject: [PATCH 60/86] python3Packages.mkdocs-awesome-nav: 3.1.1 -> 3.1.2 --- .../development/python-modules/mkdocs-awesome-nav/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix b/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix index de985ef7cd5b..9672de42338d 100644 --- a/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix +++ b/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix @@ -16,14 +16,14 @@ }: buildPythonPackage rec { pname = "mkdocs-awesome-nav"; - version = "3.1.1"; + version = "3.1.2"; pyproject = true; src = fetchFromGitHub { owner = "lukasgeiter"; repo = "mkdocs-awesome-nav"; tag = "v${version}"; - hash = "sha256-K7W8RHLzVx3wvLPjDEHLhednxViWWfez/w1tbDfcvrA="; + hash = "sha256-F52LG5kdrZvQbVhV++0SwRYKLg6kgBY4ycomfr/bG/0="; }; build-system = [ flit-core ]; From e2e2544d385c7fe969eddb089345acb92c20db5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 May 2025 02:31:25 +0000 Subject: [PATCH 61/86] wastebin: 3.0.0 -> 3.1.0 --- pkgs/by-name/wa/wastebin/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/wastebin/package.nix b/pkgs/by-name/wa/wastebin/package.nix index a1e24f12502c..74cbee859222 100644 --- a/pkgs/by-name/wa/wastebin/package.nix +++ b/pkgs/by-name/wa/wastebin/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "wastebin"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "matze"; repo = "wastebin"; rev = version; - hash = "sha256-DuIT4jIxk+L7c+rWIzrNjNEs2Lv5mYqLeCAaBMsBCBg="; + hash = "sha256-7+Ufin68gMQtKv8SC8Gmn0Ra2qpumsKYgpURTkVqzt8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Ui4Bns5A25VrNer6wpD0agYJQwxuIYWSOO26u1K8Vmc="; + cargoHash = "sha256-j9Wpo3N1kwCvjDEqmn87rGSYFVw1ZGkSps72zVpXNls="; nativeBuildInputs = [ pkg-config From 0bc2923ef75d233ac70c4ee68a7ff8e302faeeb0 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Tue, 20 May 2025 22:53:21 -0400 Subject: [PATCH 62/86] Revert "buildNodePackage: enable strictDeps" This reverts commit e0705250d2b9b192aa0ee430d61e4039c91d1f55, which broke patching `#!/usr/bin/env node` shebangs. It also modified a generated file, which would get reverted the next time node-env.nix is regenerated. If we want to enable strictDeps for node packages we should update node2nix instead. --- pkgs/development/node-packages/node-env.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index f5a9db742566..4154ce72634c 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -540,17 +540,16 @@ let in stdenv.mkDerivation ( { - name = name + lib.optionalString (version != null) "-${version}"; - strictDeps = true; + name = "${name}${if version == null then "" else "-${version}"}"; buildInputs = - [ tarWrapper ] + [ + tarWrapper + python + nodejs + ] ++ lib.optional (stdenv.hostPlatform.isLinux) pkgs.util-linux ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool ++ buildInputs; - propagatedNativeBuildInputs = [ - nodejs - python - ]; inherit nodejs; From 9932a119172c0efb440d3273a86f8f08461e711a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 May 2025 03:36:08 +0000 Subject: [PATCH 63/86] bitrise: 2.31.0 -> 2.31.1 --- pkgs/by-name/bi/bitrise/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bi/bitrise/package.nix b/pkgs/by-name/bi/bitrise/package.nix index 0d9185aa383e..5da72b29ee18 100644 --- a/pkgs/by-name/bi/bitrise/package.nix +++ b/pkgs/by-name/bi/bitrise/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "bitrise"; - version = "2.31.0"; + version = "2.31.1"; src = fetchFromGitHub { owner = "bitrise-io"; repo = "bitrise"; rev = "v${version}"; - hash = "sha256-zCa8qOrjavrUDi2n7KpSS5+hgDH9dCMwb6AjQ3bKACs="; + hash = "sha256-mSlN+7V25HFyTE5glz8vRzv2OplzsiEybBj71DThcSk="; }; # many tests rely on writable $HOME/.bitrise and require network access From be126a59c9aa640feea0b15e8ef7dbc08864c725 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 May 2025 05:12:48 +0000 Subject: [PATCH 64/86] python3Packages.faraday-plugins: 1.24.0 -> 1.24.1 --- pkgs/development/python-modules/faraday-plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index 8443247bbf4f..cd88034051cc 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.24.0"; + version = "1.24.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "infobyte"; repo = "faraday_plugins"; tag = version; - hash = "sha256-GADunGRBcVTnzYzBgXQH2IkDXHRSJiPsdeRBEdJJs0s="; + hash = "sha256-CTBEerFfqE9zRTe6l7IDKXOP+WVEPYdNMuMk2PBkkdw="; }; postPatch = '' @@ -76,7 +76,7 @@ buildPythonPackage rec { meta = with lib; { description = "Security tools report parsers for Faraday"; homepage = "https://github.com/infobyte/faraday_plugins"; - changelog = "https://github.com/infobyte/faraday_plugins/releases/tag/${version}"; + changelog = "https://github.com/infobyte/faraday_plugins/releases/tag/${src.tag}"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; mainProgram = "faraday-plugins"; From 7d22613e22ebf4dd43e80645824ceb312c80eda7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 May 2025 05:32:57 +0000 Subject: [PATCH 65/86] python3Packages.python-engineio: 4.12.0 -> 4.12.1 --- pkgs/development/python-modules/python-engineio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index e5070ee48abc..905a08140ece 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-engineio"; - version = "4.12.0"; + version = "4.12.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-engineio"; tag = "v${version}"; - hash = "sha256-PeVQT1gT2XAPJgR7EDPmN1j2p9hDrwF0LWbqVtgkZ7M="; + hash = "sha256-slSLTcnrDGCI2hUbttp14qbNhiVFJ+PMZlhAq4ISDBs="; }; build-system = [ setuptools ]; From b80b9914ac404cab883b8f40975c711785747b61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 May 2025 05:40:22 +0000 Subject: [PATCH 66/86] beam26Packages.ex_doc: 0.38.0 -> 0.38.1 --- pkgs/development/beam-modules/ex_doc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/ex_doc/default.nix b/pkgs/development/beam-modules/ex_doc/default.nix index cd7b12a7549d..0aa06e6a2047 100644 --- a/pkgs/development/beam-modules/ex_doc/default.nix +++ b/pkgs/development/beam-modules/ex_doc/default.nix @@ -14,12 +14,12 @@ let pname = "ex_doc"; - version = "0.38.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "${pname}"; rev = "v${version}"; - hash = "sha256-NyRvEN07PBk1ZCXLu/lu+d1SYO8fXyiUEcpFZ8cSEng="; + hash = "sha256-lsz+r/7Pre15qWOqla9j712I6HExyHfvBfupmKuePmI="; }; in mixRelease { From 3978e2e8c4e6b29918f608c29078c34271b0d690 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 May 2025 06:04:29 +0000 Subject: [PATCH 67/86] iplookup-gtk: 0.4.0 -> 0.4.1 --- pkgs/by-name/ip/iplookup-gtk/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ip/iplookup-gtk/package.nix b/pkgs/by-name/ip/iplookup-gtk/package.nix index 2efdca4256c5..7721f83bcab7 100644 --- a/pkgs/by-name/ip/iplookup-gtk/package.nix +++ b/pkgs/by-name/ip/iplookup-gtk/package.nix @@ -13,14 +13,14 @@ python3Packages.buildPythonPackage rec { pname = "iplookup-gtk"; - version = "0.4.0"; + version = "0.4.1"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "Bytezz"; repo = "IPLookup-gtk"; tag = "v${version}"; - hash = "sha256-pO05WDNb9AMKXm8OqzOnk77T5sLBdURV90FgQKL9oAw="; + hash = "sha256-WXLT7ThuD4/alb44mkGNLJjZPiWgNmSUqsRiO+cjdPk="; }; nativeBuildInputs = [ @@ -49,7 +49,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Find info about an IP address"; homepage = "https://github.com/Bytezz/IPLookup-gtk"; - changelog = "https://github.com/Bytezz/IPLookup-gtk/releases/tag/${src.rev}"; + changelog = "https://github.com/Bytezz/IPLookup-gtk/releases/tag/${src.tag}"; license = lib.licenses.gpl3Plus; mainProgram = "iplookup"; maintainers = with lib.maintainers; [ aleksana ]; From a4e1ad552172ff52df70620094d69bc14c1ad984 Mon Sep 17 00:00:00 2001 From: Evan Scamehorn <63885438+evan203@users.noreply.github.com> Date: Wed, 21 May 2025 01:45:12 -0500 Subject: [PATCH 68/86] nixos/spotifyd: Fix 404 URLs (#408504) --- nixos/modules/services/audio/spotifyd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/audio/spotifyd.nix b/nixos/modules/services/audio/spotifyd.nix index 1f6ab0b5f75b..2264d7c39c6b 100644 --- a/nixos/modules/services/audio/spotifyd.nix +++ b/nixos/modules/services/audio/spotifyd.nix @@ -28,7 +28,7 @@ in type = lib.types.lines; description = '' (Deprecated) Configuration for Spotifyd. For syntax and directives, see - . + . ''; }; @@ -40,7 +40,7 @@ in }; description = '' Configuration for Spotifyd. For syntax and directives, see - . + . ''; }; }; From c6ee73421e8049297b3eb60aa41f9d4ee6017dbb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 May 2025 06:51:44 +0000 Subject: [PATCH 69/86] python3Packages.llama-cloud: 0.1.21 -> 0.1.22 --- pkgs/development/python-modules/llama-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix index 670cea5f4b5f..b8fddf1197be 100644 --- a/pkgs/development/python-modules/llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-cloud"; - version = "0.1.21"; + version = "0.1.22"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_cloud"; inherit version; - hash = "sha256-VnbVTkZQ0pNpH1ztFZfXTUibM/1B9R1nez/TX1bfaT4="; + hash = "sha256-XZOCc2ktpQ9zMBqt/tG0sQ+U3767nx4THAMeAz67Kn8="; }; build-system = [ poetry-core ]; From 48bc06f86159fce9a7a39b54370c1a92c8e8ec3a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 21 May 2025 09:00:44 +0200 Subject: [PATCH 70/86] python313Packages.google-pasta: refactor (#408329) - enable tests - add pythonImportsCheck --- .../python-modules/google-pasta/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/google-pasta/default.nix b/pkgs/development/python-modules/google-pasta/default.nix index d9692217a520..f252434b319e 100644 --- a/pkgs/development/python-modules/google-pasta/default.nix +++ b/pkgs/development/python-modules/google-pasta/default.nix @@ -2,17 +2,19 @@ lib, buildPythonPackage, fetchPypi, + pytestCheckHook, + setuptools, six, }: buildPythonPackage rec { pname = "google-pasta"; version = "0.2.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "0vm1r1jlaiagj0l9yf7j6zn9w3733dr2169911c0svgrr3gwiwn9"; + hash = "sha256-yfLI38j5bQ1YCCmZIHIb4wye7DfyOJ8okE9FRWXIoW4="; }; postPatch = '' @@ -20,12 +22,17 @@ buildPythonPackage rec { --replace-fail assertRaisesRegexp assertRaisesRegex ''; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; + + dependencies = [ six ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pasta" ]; meta = { description = "AST-based Python refactoring library"; homepage = "https://github.com/google/pasta"; - # Usually the tag message contains a one-line summary of the changes. changelog = "https://github.com/google/pasta/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ timokau ]; From f304e2719269caa3fbf84165c4101a0b7c8cfc9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Mon, 14 Apr 2025 21:48:16 +0200 Subject: [PATCH 71/86] crystal: 1.16.1 --- pkgs/development/compilers/crystal/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index f87a4a0ab37d..82d39160fc1e 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -317,5 +317,13 @@ rec { doCheck = false; }; - crystal = crystal_1_15; + crystal_1_16 = generic { + version = "1.16.1"; + sha256 = "sha256-kbcr1t4ZskCgDdejDNYzYB/x4HLQk4Xoun9KvIW7FKc="; + binary = binaryCrystal_1_10; + llvmPackages = llvmPackages_18; + doCheck = false; + }; + + crystal = crystal_1_16; } From 5c1033c3064cc4272699507fb2fc7c02ce89b8fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Mon, 19 May 2025 15:10:33 +0200 Subject: [PATCH 72/86] Update on 1.16.3 --- pkgs/development/compilers/crystal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 82d39160fc1e..dcb586405faa 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -318,8 +318,8 @@ rec { }; crystal_1_16 = generic { - version = "1.16.1"; - sha256 = "sha256-kbcr1t4ZskCgDdejDNYzYB/x4HLQk4Xoun9KvIW7FKc="; + version = "1.16.3"; + sha256 = "sha256-U9H1tHUMyDNicZnXzEccDki5bGXdV0B2Wu2PyCksPVI="; binary = binaryCrystal_1_10; llvmPackages = llvmPackages_18; doCheck = false; From 522d23c200cb52e28c1f597c1ab8cc3c028f8683 Mon Sep 17 00:00:00 2001 From: emaryn Date: Wed, 21 May 2025 16:12:08 +0800 Subject: [PATCH 73/86] pan: 0.158 -> 0.162 --- pkgs/by-name/pa/pan/package.nix | 60 ++++++++++++++++----------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/pkgs/by-name/pa/pan/package.nix b/pkgs/by-name/pa/pan/package.nix index f6f84067dcc3..401426f34205 100644 --- a/pkgs/by-name/pa/pan/package.nix +++ b/pkgs/by-name/pa/pan/package.nix @@ -1,12 +1,11 @@ { - spellChecking ? true, lib, stdenv, fetchFromGitLab, - autoreconfHook, + cmake, pkg-config, gtk3, - gtkspell3, + gspell, gmime3, gettext, intltool, @@ -14,33 +13,34 @@ libxml2, libnotify, gnutls, - makeWrapper, + wrapGAppsHook3, gnupg, + spellChecking ? true, gnomeSupport ? true, libsecret, gcr, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pan"; - version = "0.158"; + version = "0.162"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "pan"; - rev = "v${version}"; - hash = "sha256-gcs3TsUzZAW8PhNPMzyOfwu+2SNynjRgfxdGIfAHrpA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-YXZA0WguDAV/CCqjdkNWB2bnkBwDN7AfWtaSaJ1ztmM="; }; nativeBuildInputs = [ - autoreconfHook + cmake pkg-config gettext intltool itstool libxml2 - makeWrapper + wrapGAppsHook3 ]; buildInputs = @@ -50,37 +50,37 @@ stdenv.mkDerivation rec { libnotify gnutls ] - ++ lib.optional spellChecking gtkspell3 + ++ lib.optionals spellChecking [ gspell ] ++ lib.optionals gnomeSupport [ libsecret gcr ]; - configureFlags = - [ - "--with-dbus" - "--with-gtk3" - "--with-gnutls" - "--enable-libnotify" - ] - ++ lib.optional spellChecking "--with-gtkspell" - ++ lib.optional gnomeSupport "--enable-gkr"; + cmakeFlags = [ + (lib.cmakeBool "WANT_GSPELL" spellChecking) + (lib.cmakeBool "WANT_GKR" gnomeSupport) + (lib.cmakeBool "ENABLE_MANUAL" true) + (lib.cmakeBool "WANT_GMIME_CRYPTO" true) + (lib.cmakeBool "WANT_WEBKIT" false) # We don't have webkitgtk_3_0 + (lib.cmakeBool "WANT_NOTIFY" true) + ]; - postInstall = '' - wrapProgram $out/bin/pan --suffix PATH : ${gnupg}/bin + preFixup = '' + gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnupg ]}) ''; - enableParallelBuilding = true; - - meta = with lib; { + meta = { description = "GTK-based Usenet newsreader good at both text and binaries"; mainProgram = "pan"; - homepage = "http://pan.rebelbase.com/"; - maintainers = with maintainers; [ aleksana ]; - platforms = platforms.linux; - license = with licenses; [ + homepage = "http://pan.rebelbase.com"; + maintainers = with lib.maintainers; [ + aleksana + emaryn + ]; + platforms = lib.platforms.linux; + license = with lib.licenses; [ gpl2Only fdl11Only ]; }; -} +}) From a18f2971541a0d0fffe84d4103fcd61208ac09f3 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 21 May 2025 10:13:39 +0200 Subject: [PATCH 74/86] mprocs: 0.7.2 -> 0.7.3 Diff: https://github.com/pvolok/mprocs/compare/refs/tags/v0.7.2...refs/tags/v0.7.3 Changelog: https://github.com/pvolok/mprocs/releases/tag/v0.7.3 --- pkgs/by-name/mp/mprocs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mp/mprocs/package.nix b/pkgs/by-name/mp/mprocs/package.nix index 7bc29e3aab38..9e8a43c35145 100644 --- a/pkgs/by-name/mp/mprocs/package.nix +++ b/pkgs/by-name/mp/mprocs/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "mprocs"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "pvolok"; repo = "mprocs"; tag = "v${version}"; - hash = "sha256-bNA+P6Mnhxi6YH5gAUwvAPN7STUvwDnU/r/ZBYwzgrw="; + hash = "sha256-/FuvejcZoaHzlYh4zYDVS1WimzNMNbRZyM39OBi02VA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-UnrwAff7Eer5Bpn2CTL2XOyM8J2Z2xofcH6d9eTr2yQ="; + cargoHash = "sha256-i9oQT2vpA5nAgQgVpxxfRPvCIb4w1emt1YsjMS6UPIk="; nativeInstallCheckInputs = [ versionCheckHook From 772172869d6ea3724b00cfe2772337a3e748aa4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 May 2025 08:27:39 +0000 Subject: [PATCH 75/86] libretro.puae: 0-unstable-2025-05-10 -> 0-unstable-2025-05-14 --- pkgs/applications/emulators/libretro/cores/puae.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/puae.nix b/pkgs/applications/emulators/libretro/cores/puae.nix index c38ebe25e960..470a02bbd0cc 100644 --- a/pkgs/applications/emulators/libretro/cores/puae.nix +++ b/pkgs/applications/emulators/libretro/cores/puae.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "puae"; - version = "0-unstable-2025-05-10"; + version = "0-unstable-2025-05-14"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-uae"; - rev = "d3c925ef4fadee6c25bcef20d1f165141ba18ac3"; - hash = "sha256-Wo58+4XSxEVtlKsHmW90Qhm+kdUHmDvN3d2gASNiIrw="; + rev = "fad7beb42c90a1a04829d465bed951a69cd36f8b"; + hash = "sha256-pO45/IvgT2q5k0sBhSNZ6srJx4h2lYSjG/mKFJesGbc="; }; makefile = "Makefile"; From 85a836e0db72f4ab46550f2e00c51a37740086df Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 21 May 2025 02:11:29 +0200 Subject: [PATCH 76/86] python312Packages.spacy: 3.8.5 -> 3.8.6 Diff: https://github.com/explosion/spaCy/compare/refs/tags/release-v3.8.5...release-v3.8.6 Changelog: https://github.com/explosion/spaCy/releases/tag/release-v3.8.6 --- pkgs/development/python-modules/spacy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 8389430e1e24..019b4f4fa41d 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -47,14 +47,14 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.8.5"; + version = "3.8.6"; pyproject = true; src = fetchFromGitHub { owner = "explosion"; repo = "spaCy"; tag = "release-v${version}"; - hash = "sha256-rgMstGSscUBACA5+veXD9H/lHuvWKs7hJ6hz6aKOB/0="; + hash = "sha256-Zy2RLib/B9fLtcqO24ltvn1PUD68l9Rf7nHH4XuT6to="; }; build-system = [ From e179b1a61eb580b80a208b25b21917fcb43c1e71 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Mon, 19 May 2025 11:43:32 +0800 Subject: [PATCH 77/86] limine: add prince213 to maintainers --- pkgs/by-name/li/limine/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index cc2279f668aa..2b5d2497095d 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -113,6 +113,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ lzcunt phip1611 + prince213 surfaceflinger ]; }; From fb8a3dc232c15a22e1835a89a49a7f708253676f Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Mon, 19 May 2025 11:44:05 +0800 Subject: [PATCH 78/86] limine: 9.3.1 -> 9.3.2 --- pkgs/by-name/li/limine/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 2b5d2497095d..06fc33255a1b 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -42,14 +42,14 @@ in # as bootloader for various platforms and corresponding binary and helper files. stdenv.mkDerivation (finalAttrs: { pname = "limine"; - version = "9.3.1"; + version = "9.3.2"; # We don't use the Git source but the release tarball, as the source has a # `./bootstrap` script performing network access to download resources. # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://github.com/limine-bootloader/limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz"; - hash = "sha256-KRHWXrsJ1l9gFq0j2gB/MQobqNe3Z8rknrs4m7WMRFU="; + hash = "sha256-aYzNgErrlRIIv4hmekdoPMCZ4g5xDYIeTUJhEkfuuJQ="; }; enableParallelBuilding = true; From 98ad5d7d2a99bd389ed6651c97275e28722dfb35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 May 2025 09:39:18 +0000 Subject: [PATCH 79/86] python3Packages.types-tqdm: 4.67.0.20250417 -> 4.67.0.20250516 --- pkgs/development/python-modules/types-tqdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-tqdm/default.nix b/pkgs/development/python-modules/types-tqdm/default.nix index d181c6308b06..4eccf683e361 100644 --- a/pkgs/development/python-modules/types-tqdm/default.nix +++ b/pkgs/development/python-modules/types-tqdm/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "types-tqdm"; - version = "4.67.0.20250417"; + version = "4.67.0.20250516"; pyproject = true; src = fetchPypi { pname = "types_tqdm"; inherit version; - hash = "sha256-v8xAmdjUjfVOU/PqZHCMvMHRxAOcp2GVlBidqMA8e+I="; + hash = "sha256-IwzKuKMy008ZP8AH6xMqbvVLRRJFLnGL8hrgp8rrWms="; }; build-system = [ setuptools ]; From 2c7659b1ff1bea0dc112ca15de0773c14aeedffa Mon Sep 17 00:00:00 2001 From: programmerlexi Date: Mon, 12 May 2025 19:31:04 +0200 Subject: [PATCH 80/86] nixos/limine: atomically copy files --- nixos/modules/system/boot/loader/limine/limine-install.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/limine/limine-install.py b/nixos/modules/system/boot/loader/limine/limine-install.py index 44dee4645e05..d04266824e55 100644 --- a/nixos/modules/system/boot/loader/limine/limine-install.py +++ b/nixos/modules/system/boot/loader/limine/limine-install.py @@ -203,7 +203,8 @@ def copy_file(from_path: str, to_path: str): if not os.path.exists(dirname): os.makedirs(dirname) - shutil.copyfile(from_path, to_path) + shutil.copyfile(from_path, to_path + ".tmp") + os.rename(to_path + ".tmp", to_path) def option_from_config(name: str, config_path: List[str], conversion: Callable[[str], str] | None = None) -> str: if config(*config_path): From a094b5d8cce756083b19c6931d2ba52a1b1e45f1 Mon Sep 17 00:00:00 2001 From: programmerlexi Date: Mon, 12 May 2025 19:32:12 +0200 Subject: [PATCH 81/86] nixos/limine: carefully remove files instead of nuking them --- .../boot/loader/limine/limine-install.py | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/nixos/modules/system/boot/loader/limine/limine-install.py b/nixos/modules/system/boot/loader/limine/limine-install.py index d04266824e55..9279db7f58f0 100644 --- a/nixos/modules/system/boot/loader/limine/limine-install.py +++ b/nixos/modules/system/boot/loader/limine/limine-install.py @@ -74,6 +74,7 @@ def is_encrypted(device: str) -> bool: def is_fs_type_supported(fs_type: str) -> bool: return fs_type.startswith('vfat') +paths = {} def get_copied_path_uri(path: str, target: str) -> str: result = '' @@ -85,6 +86,8 @@ def get_copied_path_uri(path: str, target: str) -> str: if not os.path.exists(dest_path): copy_file(path, dest_path) + else: + paths[dest_path] = True path_with_prefix = os.path.join('/limine', target, dest_file) result = f'boot():{path_with_prefix}' @@ -206,6 +209,8 @@ def copy_file(from_path: str, to_path: str): shutil.copyfile(from_path, to_path + ".tmp") os.rename(to_path + ".tmp", to_path) + paths[to_path] = True + def option_from_config(name: str, config_path: List[str], conversion: Callable[[str], str] | None = None) -> str: if config(*config_path): return f'{name}: {conversion(config(*config_path)) if conversion else config(*config_path)}\n' @@ -246,12 +251,10 @@ def main(): if not os.path.exists(limine_dir): os.makedirs(limine_dir) - - if os.path.exists(os.path.join(limine_dir, 'kernels')): - print(f'nuking {os.path.join(limine_dir, "kernels")}') - shutil.rmtree(os.path.join(limine_dir, 'kernels')) - - os.makedirs(os.path.join(limine_dir, "kernels")) + else: + for dir, dirs, files in os.walk(limine_dir, topdown=True): + for file in files: + paths[os.path.join(dir, file)] = False profiles = [('system', get_gens())] @@ -271,13 +274,6 @@ def main(): default_entry: 2 ''') - if os.path.exists(os.path.join(limine_dir, 'wallpapers')): - print(f'nuking {os.path.join(limine_dir, "wallpapers")}') - shutil.rmtree(os.path.join(limine_dir, 'wallpapers')) - - if len(config('style', 'wallpapers')) > 0: - os.makedirs(os.path.join(limine_dir, 'wallpapers')) - for wallpaper in config('style', 'wallpapers'): config_file += f'''wallpaper: {get_copied_path_uri(wallpaper, 'wallpapers')}\n''' @@ -319,6 +315,8 @@ def main(): file.truncate() file.write(config_file.strip()) + paths[config_file_path] = True + for dest_path, source_path in config('additionalFiles').items(): dest_path = os.path.join(limine_dir, dest_path) @@ -410,4 +408,9 @@ def main(): 'Failed to deploy BIOS stage 1 Limine bootloader!\n' + 'You might want to try enabling the `boot.loader.limine.forceMbr` option.') + print("removing unused boot files...") + for path in paths: + if not paths[path]: + os.remove(path) + main() From 02b41fd27a78a2f07ef862b65faf2267bae6dfc4 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Wed, 21 May 2025 12:17:39 +0200 Subject: [PATCH 82/86] ty: add GaetanLepage to maintainers Followup from https://github.com/NixOS/nixpkgs/pull/409234 --- pkgs/by-name/ty/ty/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index cfb8a4ca6afb..79ab77df9ab4 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -83,6 +83,9 @@ rustPlatform.buildRustPackage (finalAttrs: { changelog = "https://github.com/astral-sh/ty/blob/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; mainProgram = "ty"; - maintainers = [ lib.maintainers.bengsparks ]; + maintainers = with lib.maintainers; [ + bengsparks + GaetanLepage + ]; }; }) From 327786d52f5b6c32fafc0ac8b46d92a8fcbfcd6e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 May 2025 10:30:08 +0000 Subject: [PATCH 83/86] python3Packages.google-cloud-netapp: 0.3.22 -> 0.3.23 --- .../python-modules/google-cloud-netapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-netapp/default.nix b/pkgs/development/python-modules/google-cloud-netapp/default.nix index 572b18ad7983..2f4a1b850fc8 100644 --- a/pkgs/development/python-modules/google-cloud-netapp/default.nix +++ b/pkgs/development/python-modules/google-cloud-netapp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-netapp"; - version = "0.3.22"; + version = "0.3.23"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_netapp"; inherit version; - hash = "sha256-umh9DcaAAW8Naa1+TRdLosICAIQ+71VT3cHR2pl78mk="; + hash = "sha256-PP4o+qHCa3Ok6y9Ehyevmq1ac9Wb2zZoEDQgIpm0sr0="; }; build-system = [ setuptools ]; From 0fb75e137b48ee13d742ec3fe5a0b620f6d80747 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 May 2025 10:41:09 +0000 Subject: [PATCH 84/86] libretro.fbneo: 0-unstable-2025-05-09 -> 0-unstable-2025-05-19 --- pkgs/applications/emulators/libretro/cores/fbneo.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix index 0e629609717c..0abcdb69ecab 100644 --- a/pkgs/applications/emulators/libretro/cores/fbneo.nix +++ b/pkgs/applications/emulators/libretro/cores/fbneo.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fbneo"; - version = "0-unstable-2025-05-09"; + version = "0-unstable-2025-05-19"; src = fetchFromGitHub { owner = "libretro"; repo = "fbneo"; - rev = "922fb2c9d7541b3554f7e5364a6072da241a9837"; - hash = "sha256-LVQlWznu0wGlyFDexNaMqYjqHHNDeLLa6oeGvqGAjPQ="; + rev = "d2cf158e9ba82fc7dfec592452e6113121665c19"; + hash = "sha256-dO1R0iIXEo2lrMSOJXlZBw2yXBfyB/1yFfRPYEEAojo="; }; makefile = "Makefile"; From c80aab436cb1a614b485cac6e21741a33a24c2f3 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 15 May 2025 10:20:06 +0300 Subject: [PATCH 85/86] mesa: 25.0.6 -> 25.1.1 - osmesa is no more - build asahi - build more layers - extra cross crimes --- pkgs/development/libraries/mesa/common.nix | 4 +- pkgs/development/libraries/mesa/default.nix | 30 ++- pkgs/development/libraries/mesa/opencl.patch | 4 +- .../libraries/mesa/system-gbm.patch | 195 ------------------ 4 files changed, 26 insertions(+), 207 deletions(-) delete mode 100644 pkgs/development/libraries/mesa/system-gbm.patch diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix index ae76873b96a3..5d5bfd2fbd88 100644 --- a/pkgs/development/libraries/mesa/common.nix +++ b/pkgs/development/libraries/mesa/common.nix @@ -5,14 +5,14 @@ # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa rec { pname = "mesa"; - version = "25.0.6"; + version = "25.1.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; rev = "mesa-${version}"; - hash = "sha256-SuSs8rwcu3GizOFfoUQZkVfwS1gxihgnmIGnD90YS54="; + hash = "sha256-Vk5sE7D8XHDOtxq0ax2a3FmQFWp7IDP4Y510EpnKWo4="; }; meta = { diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index f691f2d3bf8c..b2145088cbf8 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -16,6 +16,7 @@ libdrm, libgbm, libglvnd, + libpng, libunwind, libva-minimal, libvdpau, @@ -45,10 +46,12 @@ galliumDrivers ? [ + "asahi" # Apple AGX, built on non-aarch64 for cross tools "d3d12" # WSL emulated GPU (aka Dozen) "iris" # new Intel (Broadwell+) "llvmpipe" # software renderer "nouveau" # Nvidia + "panfrost" # ARM Mali Midgard and up (T/G series), built on non-ARM for cross tools "r300" # very old AMD "r600" # less old AMD "radeonsi" # new AMD (GCN+) @@ -61,7 +64,6 @@ "etnaviv" # Vivante GPU designs (mostly NXP/Marvell SoCs) "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) "lima" # ARM Mali 4xx - "panfrost" # ARM Mali Midgard and up (T/G series) "vc4" # Broadcom VC4 (Raspberry Pi 0-3) ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ @@ -75,6 +77,7 @@ vulkanDrivers ? [ "amd" # AMD (aka RADV) + "asahi" # Apple AGX, built on non-aarch64 for cross tools "intel" # new Intel (aka ANV) "microsoft-experimental" # WSL virtualized GPU (aka DZN/Dozen) "nouveau" # Nouveau (aka NVK) @@ -103,8 +106,10 @@ ], vulkanLayers ? [ "device-select" - "overlay" "intel-nullhw" + "overlay" + "screenshot" + "vram-report-limit" ], mesa, mesa-gl-headers, @@ -161,7 +166,6 @@ stdenv.mkDerivation { patches = [ ./opencl.patch - ./system-gbm.patch ]; postPatch = '' @@ -223,7 +227,6 @@ stdenv.mkDerivation { (lib.mesonBool "libgbm-external" true) (lib.mesonBool "gallium-nine" false) # Direct3D9 in Wine, largely supplanted by DXVK - (lib.mesonBool "osmesa" false) # deprecated upstream # Only used by xf86-video-vmware, which has more features than VMWare's KMS driver, # so we're keeping it for now. Should be removed when that's no longer the case. @@ -245,14 +248,14 @@ stdenv.mkDerivation { # Rusticl, new OpenCL frontend (lib.mesonBool "gallium-rusticl" true) + (lib.mesonOption "gallium-rusticl-enable-drivers" "auto") # meson auto_features enables this, but we do not want it (lib.mesonEnable "android-libbacktrace" false) (lib.mesonEnable "microsoft-clc" false) # Only relevant on Windows (OpenCL 1.2 API on top of D3D12) - # Build and install extra tools for cross - (lib.mesonBool "install-mesa-clc" true) - (lib.mesonBool "install-precomp-compiler" true) + # Enable more sensors in gallium-hud + (lib.mesonBool "gallium-extra-hud" true) # Disable valgrind on targets where it's not available (lib.mesonEnable "valgrind" withValgrind) @@ -260,6 +263,12 @@ stdenv.mkDerivation { ++ lib.optionals enablePatentEncumberedCodecs [ (lib.mesonOption "video-codecs" "all") ] + ++ lib.optionals (!needNativeCLC) [ + # Build and install extra tools for cross + (lib.mesonOption "tools" "asahi,panfrost") + (lib.mesonBool "install-mesa-clc" true) + (lib.mesonBool "install-precomp-compiler" true) + ] ++ lib.optionals needNativeCLC [ (lib.mesonOption "mesa-clc" "system") (lib.mesonOption "precomp-compiler" "system") @@ -277,6 +286,7 @@ stdenv.mkDerivation { libdrm libgbm libglvnd + libpng libunwind libva-minimal libvdpau @@ -348,9 +358,13 @@ stdenv.mkDerivation { doCheck = false; postInstall = '' + moveToOutput bin/asahi_clc $cross_tools moveToOutput bin/intel_clc $cross_tools moveToOutput bin/mesa_clc $cross_tools - moveToOutput bin/vtn_bindgen $cross_tools + moveToOutput bin/panfrost_compile $cross_tools + moveToOutput bin/panfrost_texfeatures $cross_tools + moveToOutput bin/panfrostdump $cross_tools + moveToOutput bin/vtn_bindgen2 $cross_tools moveToOutput "lib/lib*OpenCL*" $opencl # Construct our own .icd file that contains an absolute path. diff --git a/pkgs/development/libraries/mesa/opencl.patch b/pkgs/development/libraries/mesa/opencl.patch index 8444237d3d54..9d40da82f856 100644 --- a/pkgs/development/libraries/mesa/opencl.patch +++ b/pkgs/development/libraries/mesa/opencl.patch @@ -13,8 +13,8 @@ index c150bff74ff..37fa7f0531b 100644 diff --git a/meson_options.txt b/meson_options.txt index 82324617884..4bde97a8568 100644 ---- a/meson_options.txt -+++ b/meson_options.txt +--- a/meson.options ++++ b/meson.options @@ -738,3 +738,10 @@ option( 'none', 'dri2' ], diff --git a/pkgs/development/libraries/mesa/system-gbm.patch b/pkgs/development/libraries/mesa/system-gbm.patch deleted file mode 100644 index 7f16ff7469c7..000000000000 --- a/pkgs/development/libraries/mesa/system-gbm.patch +++ /dev/null @@ -1,195 +0,0 @@ -commit 69914d79c3d86b0aee80665c51074cf8cc55f660 -Author: K900 -Date: 2025-03-05 13:14:02 +0300 - - meson: support building with system libgbm - - This is the next step towards making libgbm just a loader. - -diff --git a/meson.build b/meson.build -index 4766ce838ba..300a6bb0cc8 100644 ---- a/meson.build -+++ b/meson.build -@@ -2377,7 +2377,7 @@ summary(egl_summary, section: 'EGL', bool_yn: true, list_sep: ' ') - - gbm_summary = {'Enabled': with_gbm} - if with_gbm -- gbm_summary += {'Backends path': gbm_backends_path} -+ gbm_summary += {'External libgbm': get_option('libgbm-external'), 'Backends path': gbm_backends_path} - endif - summary(gbm_summary, section: 'GBM', bool_yn: true, list_sep: ' ') - -diff --git a/meson_options.txt b/meson_options.txt -index 2622cf1d235..7bf8ae8a1c5 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -329,6 +329,13 @@ option( - description : 'Build support for gbm platform' - ) - -+option( -+ 'libgbm-external', -+ type: 'boolean', -+ value: false, -+ description: 'Whether to use external libgbm (default: use in-tree copy)' -+) -+ - option( - 'gbm-backends-path', - type : 'string', -diff --git a/src/egl/meson.build b/src/egl/meson.build -index a02b83419c4..ae4b0c5e063 100644 ---- a/src/egl/meson.build -+++ b/src/egl/meson.build -@@ -108,9 +108,8 @@ if with_dri - endif - if with_gbm and not with_platform_android - files_egl += files('drivers/dri2/platform_drm.c') -- link_for_egl += libgbm -- incs_for_egl += [inc_gbm, include_directories('../gbm/main')] -- deps_for_egl += dep_libdrm -+ incs_for_egl += [include_directories('../gbm/backends/dri')] -+ deps_for_egl += [dep_libdrm, dep_gbm] - endif - if with_platform_wayland - deps_for_egl += [dep_wayland_client, dep_wayland_server, dep_wayland_egl_headers] -diff --git a/src/gallium/targets/dril/dril_target.c b/src/gallium/targets/dril/dril_target.c -index 339e9376c3d..f1a0bb18ed8 100644 ---- a/src/gallium/targets/dril/dril_target.c -+++ b/src/gallium/targets/dril/dril_target.c -@@ -25,7 +25,7 @@ - #include - #include - #include --#include "gbm/main/gbm.h" -+#include - #include "drm-uapi/drm_fourcc.h" - - #define EGL_PLATFORM_GBM_MESA 0x31D7 -diff --git a/src/gallium/targets/dril/meson.build b/src/gallium/targets/dril/meson.build -index 7cfa982ffe1..22b955b9074 100644 ---- a/src/gallium/targets/dril/meson.build -+++ b/src/gallium/targets/dril/meson.build -@@ -51,10 +51,10 @@ dril_dri = shared_library( - link_depends : dril_link_depends, - link_with : [ - libgallium, -- libgbm, - ], - dependencies : [ - idep_mesautil, -+ dep_gbm, - ], - # Will be deleted during installation, see install_megadrivers.py - install : true, -diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c -index a51e3cb3b8d..f1a5e0f7649 100644 ---- a/src/gbm/backends/dri/gbm_dri.c -+++ b/src/gbm/backends/dri/gbm_dri.c -@@ -43,7 +43,7 @@ - - #include "mesa_interface.h" - #include "gbm_driint.h" --#include "gbmint.h" -+#include - #include "loader_dri_helper.h" - #include "kopper_interface.h" - #include "loader.h" -diff --git a/src/gbm/backends/dri/gbm_driint.h b/src/gbm/backends/dri/gbm_driint.h -index 9b324aeaf12..9c7588e5726 100644 ---- a/src/gbm/backends/dri/gbm_driint.h -+++ b/src/gbm/backends/dri/gbm_driint.h -@@ -31,7 +31,7 @@ - #include - #include - #include --#include "gbmint.h" -+#include - #include "c11/threads.h" - - #include /* mesa_interface needs GL types */ -diff --git a/src/gbm/backends/dri/meson.build b/src/gbm/backends/dri/meson.build -index 9b5d13e9db8..84a40656980 100644 ---- a/src/gbm/backends/dri/meson.build -+++ b/src/gbm/backends/dri/meson.build -@@ -11,10 +11,10 @@ endif - shared_library( - 'dri_gbm', - files('gbm_dri.c', 'gbm_driint.h'), -- include_directories : [incs_gbm, incs_gbm_dri, inc_st_dri, inc_gallium_aux], -+ include_directories : [inc_gallium, incs_gbm_dri, inc_loader, inc_st_dri, inc_gallium_aux], - link_args : [ld_args_gc_sections], - link_with : [libloader, libgallium_dri], -- dependencies : [deps_gbm_dri, dep_dl, dep_libdrm, idep_mesautil, idep_xmlconfig], -+ dependencies : [deps_gbm_dri, dep_dl, dep_gbm, dep_libdrm, idep_mesautil, idep_xmlconfig], - gnu_symbol_visibility : 'hidden', - install : true, - install_dir: join_paths(get_option('libdir'), 'gbm'), -diff --git a/src/gbm/meson.build b/src/gbm/meson.build -index eaed028d049..97e8d5fa044 100644 ---- a/src/gbm/meson.build -+++ b/src/gbm/meson.build -@@ -15,10 +15,6 @@ args_gbm = [ - ] - incs_gbm = [include_directories('main'), inc_loader, inc_gallium] - --if with_dri2 -- subdir('backends/dri') --endif -- - libgbm_name = 'gbm' - - if with_platform_android and get_option('platform-sdk-version') >= 30 -@@ -43,7 +39,7 @@ if with_tests - test('gbm-abi-check', abi_check, suite : ['gbm']) - endif - --install_headers('main/gbm.h') -+install_headers('main/gbm.h', 'main/gbm_backend_abi.h') - - pkg.generate( - name : 'gbm', -@@ -67,3 +63,8 @@ if with_symbols_check - suite : ['gbm'], - ) - endif -+ -+dep_gbm = declare_dependency( -+ link_with : libgbm, -+ include_directories : inc_gbm, -+) -diff --git a/src/meson.build b/src/meson.build -index d443d2b41bb..74250ed2148 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -127,11 +127,17 @@ endif - if with_glx == 'dri' - subdir('glx') - endif -+ - if with_gbm -- subdir('gbm') -+ if get_option('libgbm-external') -+ dep_gbm = dependency('gbm') -+ else -+ subdir('gbm') -+ endif - else -- inc_gbm = [] -+ dep_gbm = null_dep - endif -+ - if with_egl - subdir('egl') - endif -@@ -141,6 +147,10 @@ if with_gallium and with_gbm - endif - endif - -+if with_gbm and with_dri2 -+ subdir('gbm/backends/dri') -+endif -+ - # This must be after at least mesa, glx, and gallium, since libgl will be - # defined in one of those subdirs depending on the glx provider. - if with_glx != 'disabled' and not with_glvnd From 9118a7388e5e73ab966626882a932f1267d57f82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Tue, 20 May 2025 03:08:32 +0700 Subject: [PATCH 86/86] =?UTF-8?q?ocamlPackages.vdom:=200.2=20=E2=86=92=200?= =?UTF-8?q?.3=20(renamed=20from=20ocaml-vdom)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/{ocaml-vdom => vdom}/default.nix | 13 ++++++------- pkgs/top-level/ocaml-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 8 deletions(-) rename pkgs/development/ocaml-modules/{ocaml-vdom => vdom}/default.nix (75%) diff --git a/pkgs/development/ocaml-modules/ocaml-vdom/default.nix b/pkgs/development/ocaml-modules/vdom/default.nix similarity index 75% rename from pkgs/development/ocaml-modules/ocaml-vdom/default.nix rename to pkgs/development/ocaml-modules/vdom/default.nix index e34feb49f0d3..918e086397e0 100644 --- a/pkgs/development/ocaml-modules/ocaml-vdom/default.nix +++ b/pkgs/development/ocaml-modules/vdom/default.nix @@ -1,6 +1,6 @@ { lib, - fetchurl, + fetchzip, buildDunePackage, js_of_ocaml-compiler, gen_js_api, @@ -8,14 +8,13 @@ }: buildDunePackage rec { - pname = "ocaml-vdom"; - version = "0.2"; + pname = "vdom"; + version = "0.3"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; - src = fetchurl { - url = "https://github.com/LexiFi/ocaml-vdom/archive/refs/tags/v${version}.tar.gz"; - sha256 = "sha256-FVR0WubW9VJBGVtVaXdJ+O/ghq0w5+BuItFWXkuVYL8="; + src = fetchzip { + url = "https://github.com/LexiFi/ocaml-vdom/archive/refs/tags/${version}.tar.gz"; + hash = "sha256-mlXOb+KCdHWNL9PAppan7m7JaP83JEjq+tu14JI+NJo="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 087745078bc6..27d54dfe05a4 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1467,7 +1467,7 @@ let ocaml-version = callPackage ../development/ocaml-modules/ocaml-version { }; - ocaml-vdom = callPackage ../development/ocaml-modules/ocaml-vdom { }; + ocaml-vdom = throw "2023-10-09: ocamlPackages.ocaml-vdom was renamed to ocamlPackages.vdom"; ocamlbuild = if lib.versionOlder "4.03" ocaml.version then @@ -2122,6 +2122,8 @@ let vchan = callPackage ../development/ocaml-modules/vchan { }; + vdom = callPackage ../development/ocaml-modules/vdom { }; + vector = callPackage ../development/ocaml-modules/vector { }; vg = callPackage ../development/ocaml-modules/vg { };