From 7a6db4f50cd2d2eab67646a9f34459375e6e9cd1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Jul 2025 23:28:47 +0000 Subject: [PATCH 01/50] python3Packages.dateparser: 1.2.1 -> 1.2.2 --- pkgs/development/python-modules/dateparser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 87f08f29a55f..01aa1dde1062 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "dateparser"; - version = "1.2.1"; + version = "1.2.2"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "scrapinghub"; repo = "dateparser"; tag = "v${version}"; - hash = "sha256-O0FsLWbH0kGjwGCTklBMVVqosxXlXRyS9aAcggtBLsA="; + hash = "sha256-cUbY6c0JFzs1oZJOTnMXz3uCah2f50g8/3uWQXtwiGY="; }; nativeBuildInputs = [ setuptools ]; @@ -82,7 +82,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "dateparser" ]; meta = with lib; { - changelog = "https://github.com/scrapinghub/dateparser/blob/${src.rev}/HISTORY.rst"; + changelog = "https://github.com/scrapinghub/dateparser/blob/${src.tag}/HISTORY.rst"; description = "Date parsing library designed to parse dates from HTML pages"; homepage = "https://github.com/scrapinghub/dateparser"; license = licenses.bsd3; From 0132c034d191cbd0d4903fa1e08b91c1c8861fd7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Jul 2025 13:37:50 +0000 Subject: [PATCH 02/50] libgphoto2: 2.5.31 -> 2.5.32 --- pkgs/by-name/li/libgphoto2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libgphoto2/package.nix b/pkgs/by-name/li/libgphoto2/package.nix index f2dcce8066fd..407136cc63d0 100644 --- a/pkgs/by-name/li/libgphoto2/package.nix +++ b/pkgs/by-name/li/libgphoto2/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "libgphoto2"; - version = "2.5.31"; + version = "2.5.32"; src = fetchFromGitHub { owner = "gphoto"; repo = "libgphoto2"; rev = "libgphoto2-${builtins.replaceStrings [ "." ] [ "_" ] version}-release"; - sha256 = "sha256-UmyDKEaPP9VJqi8f+y6JZcTlQomhMTN+/C//ODYx6/w="; + sha256 = "sha256-gUw3D/bHnKoiTInJVAzMCs5urWz4UHWywTLZUuRROqw="; }; depsBuildBuild = [ pkg-config ]; From a3c11f3a5b3f7860ce8e28571694351b591ef6fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Jul 2025 23:14:42 +0000 Subject: [PATCH 03/50] python3Packages.coredis: 4.23.1 -> 4.24.0 --- pkgs/development/python-modules/coredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coredis/default.nix b/pkgs/development/python-modules/coredis/default.nix index 8b06307031f8..079da912ba2f 100644 --- a/pkgs/development/python-modules/coredis/default.nix +++ b/pkgs/development/python-modules/coredis/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "coredis"; - version = "4.23.1"; + version = "4.24.0"; pyproject = true; src = fetchFromGitHub { owner = "alisaifee"; repo = "coredis"; tag = version; - hash = "sha256-5Ho9X2VCOwKo079M2ReJ93jqEpG2ZV6vKM5/qrgzjxM="; + hash = "sha256-vqgxj366x+TphGxUBXUHJpEM0zAdr6Ia4pDPKGWUx14="; }; postPatch = '' From 3ce2b52d82b649e5da78226dd25d0deed68e3f8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Jul 2025 14:37:38 +0000 Subject: [PATCH 04/50] python3Packages.transitions: 0.9.2 -> 0.9.3 --- pkgs/development/python-modules/transitions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix index a7b5535c9dcc..321cdeb3e91b 100644 --- a/pkgs/development/python-modules/transitions/default.nix +++ b/pkgs/development/python-modules/transitions/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "transitions"; - version = "0.9.2"; + version = "0.9.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-L4SQ29vUGTZs7xUWAyqwbQfMtYOe9UkF6EKkcmktQgQ="; + hash = "sha256-iB+3W7FlTtVdhgYLsGfyxxb44VX1e7c/1ETlNxOq/sg="; }; build-system = [ setuptools ]; From ce904fef3a94a633a3965c64ef3624236ed95c41 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Jul 2025 15:11:57 +0000 Subject: [PATCH 05/50] python3Packages.retrying: 1.3.4 -> 1.4.1 --- pkgs/development/python-modules/retrying/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/retrying/default.nix b/pkgs/development/python-modules/retrying/default.nix index 11eab85380a6..ebef0e8ee677 100644 --- a/pkgs/development/python-modules/retrying/default.nix +++ b/pkgs/development/python-modules/retrying/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "retrying"; - version = "1.3.4"; + version = "1.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NF2oxXZb2YKx0ZFd65EC/T0fetFr2EqXALhfZNJOjz4="; + hash = "sha256-TSBuDtKv9e8vPNhnq7lRHp6PMRJ8Wsog8dUkbkdpA7A="; }; propagatedBuildInputs = [ six ]; From 05635422e00408218dda5cb08f5be4e7fc86af55 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Aug 2025 10:03:48 +0000 Subject: [PATCH 06/50] python3Packages.auditwheel: 6.4.0 -> 6.4.2 --- pkgs/development/python-modules/auditwheel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/auditwheel/default.nix b/pkgs/development/python-modules/auditwheel/default.nix index c652b6014190..742bcf09c4d0 100644 --- a/pkgs/development/python-modules/auditwheel/default.nix +++ b/pkgs/development/python-modules/auditwheel/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "auditwheel"; - version = "6.4.0"; + version = "6.4.2"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-IJkMyyQW/bgZg+9lTRDfcvnyWziOMBBbw9l7Btauyvs="; + hash = "sha256-t6Ya/JGDtrXGYd5ZylhvnHIARFpAnFjN8gSdb3FjbVE="; }; build-system = [ setuptools-scm ]; From 287c9751167baecada36692cdf097ad4a957f35b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 2 Aug 2025 20:31:20 +0800 Subject: [PATCH 07/50] timeshift: 24.06.6 -> 25.07.4 https://github.com/linuxmint/timeshift/compare/24.06.6...25.07.4 The timeshift-launcher substitution upstreamed: https://github.com/linuxmint/timeshift/commit/98af1049992693599be78528029abba5421c4f19 run-parts introduced in: https://github.com/linuxmint/timeshift/commit/b20c307d455a04df3d8bcd2cf9eee01c26b5b999 --- pkgs/applications/backup/timeshift/default.nix | 2 ++ pkgs/applications/backup/timeshift/unwrapped.nix | 8 +++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/backup/timeshift/default.nix b/pkgs/applications/backup/timeshift/default.nix index c398fe58d7a5..c5123672fbf2 100644 --- a/pkgs/applications/backup/timeshift/default.nix +++ b/pkgs/applications/backup/timeshift/default.nix @@ -3,6 +3,7 @@ btrfs-progs, coreutils, cron, + debianutils, grubPackage, mount, psmisc, @@ -17,6 +18,7 @@ in btrfs-progs coreutils cron + debianutils grubPackage mount psmisc diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index 571672dd0d1e..81b6bbb08ed3 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "timeshift"; - version = "24.06.6"; + version = "25.07.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = "timeshift"; rev = version; - hash = "sha256-umMekxP9bvV01KzfIh2Zxa9Xb+tR5x+tG9dOnBIOkjY="; + hash = "sha256-yrLpEhSt7QB0qWCXjIjTVeXKRpgue2pVdV+6hSixeuA="; }; postPatch = '' @@ -37,10 +37,8 @@ stdenv.mkDerivation rec { --replace-fail "/usr/share" "$out/share" # Substitute app_command to look for the `timeshift-gtk` in $out. - # Substitute the `pkexec ...` as a hack to run a GUI application like Timeshift as root without setting up the corresponding pkexec policy. substituteInPlace ./src/timeshift-launcher \ - --replace-fail "app_command='timeshift-gtk'" "app_command=$out/bin/timeshift-gtk" \ - --replace-fail ${lib.escapeShellArg ''pkexec ''${app_command}''} ${lib.escapeShellArg ''pkexec env DISPLAY="$DISPLAY" XAUTHORITY="$XAUTHORITY" "''${app_command}"''} + --replace-fail "app_command='timeshift-gtk'" "app_command=$out/bin/timeshift-gtk" ''; nativeBuildInputs = [ From b551582dc4c0ec94c38608581c4be7690daa48db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Aug 2025 02:05:07 +0000 Subject: [PATCH 08/50] snac2: 2.80 -> 2.81 --- pkgs/by-name/sn/snac2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sn/snac2/package.nix b/pkgs/by-name/sn/snac2/package.nix index a7c2dee6557c..90038ea24f21 100644 --- a/pkgs/by-name/sn/snac2/package.nix +++ b/pkgs/by-name/sn/snac2/package.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "snac2"; - version = "2.80"; + version = "2.81"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = "snac2"; tag = finalAttrs.version; - hash = "sha256-8f9JesQgdRwholsa0p1TP0L4vPd1HHLEMwfxVlGm99o="; + hash = "sha256-ozK+T8V4KNqNhkLYw4yJd0u56I3wsxl9ctWFmfJplos="; }; buildInputs = [ From c37c9bdd5bf87f1d854a194023693cc5f23fdba4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 3 Aug 2025 18:56:57 +0200 Subject: [PATCH 09/50] nextcloudPackages.apps: update --- pkgs/servers/nextcloud/packages/30.json | 104 ++++++++++++------------ pkgs/servers/nextcloud/packages/31.json | 104 ++++++++++++------------ 2 files changed, 104 insertions(+), 104 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json index eab872f3b7da..4c0b2cc3e15e 100644 --- a/pkgs/servers/nextcloud/packages/30.json +++ b/pkgs/servers/nextcloud/packages/30.json @@ -10,9 +10,9 @@ ] }, "bookmarks": { - "hash": "sha256-NVe9eOL6dcL4hYYV7dsoR8ZKXFHkEGAo5sj9DXuDJEI=", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v15.1.1/bookmarks-15.1.1.tar.gz", - "version": "15.1.1", + "hash": "sha256-67Bl8UacPdTJ3YYIFZScChPHgb12v6jRAQXhXooX1hg=", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v15.1.3/bookmarks-15.1.3.tar.gz", + "version": "15.1.3", "description": "- ๐Ÿ“‚ Sort bookmarks into folders\n- ๐Ÿท Add tags and personal notes\n- โ˜  Find broken links and duplicates\n- ๐Ÿ“ฒ Synchronize with all your browsers and devices\n- ๐Ÿ“” Store archived versions of your links in case they are depublished\n- ๐Ÿ” Full-text search on site contents\n- ๐Ÿ‘ช Share bookmarks with other users, groups and teams or via public links\n- โš› Generate RSS feeds of your collections\n- ๐Ÿ“ˆ Stats on how often you access which links\n- ๐Ÿ”’ Automatic backups of your bookmarks collection\n- ๐Ÿ’ผ Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ @@ -20,9 +20,9 @@ ] }, "calendar": { - "hash": "sha256-Wm7RWDe/6jcOEGp2eR1k7x05ilB6kW1u1aRdN7HI4Wk=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.3.5/calendar-v5.3.5.tar.gz", - "version": "5.3.5", + "hash": "sha256-R5L0EAoLGr1CfzhtHO4FfUstqR+EDsOIdgFYccgnEMc=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.3.8/calendar-v5.3.8.tar.gz", + "version": "5.3.8", "description": "A Calendar app for Nextcloud. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* ๐Ÿš€ **Integration with other Nextcloud apps!** Like Contacts, Talk, Tasks, Deck and Circles\n* ๐ŸŒ **WebCal Support!** Want to see your favorite team's matchdays in your calendar? No problem!\n* ๐Ÿ™‹ **Attendees!** Invite people to your events\n* โŒš **Free/Busy!** See when your attendees are available to meet\n* โฐ **Reminders!** Get alarms for events inside your browser and via email\n* ๐Ÿ” **Search!** Find your events at ease\n* โ˜‘๏ธ **Tasks!** See tasks or Deck cards with a due date directly in the calendar\n* ๐Ÿ”ˆ **Talk rooms!** Create an associated Talk room when booking a meeting with just one click\n* ๐Ÿ“† **Appointment booking** Send people a link so they can book an appointment with you [using this app](https://apps.nextcloud.com/apps/appointments)\n* ๐Ÿ“Ž **Attachments!** Add, upload and view event attachments\n* ๐Ÿ™ˆ **Weโ€™re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -30,9 +30,9 @@ ] }, "collectives": { - "hash": "sha256-RCpIfoSmYahIo03IumJwEn/06ZeqOhJ/ov5WKGvwcUA=", - "url": "https://github.com/nextcloud/collectives/releases/download/v2.18.0/collectives-2.18.0.tar.gz", - "version": "2.18.0", + "hash": "sha256-H7Fc3tBOTGjOlhmzImqik7ZC9IorWwrTKsxUkz4E8H0=", + "url": "https://github.com/nextcloud/collectives/releases/download/v3.0.3/collectives-3.0.3.tar.gz", + "version": "3.0.3", "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* ๐Ÿ‘ฅ **Collective and non-hierarchical workflow by heart**: Collectives are\n tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n owned by the collective.\n* ๐Ÿ“ **Collaborative page editing** like known from Etherpad thanks to the\n [Text app](https://github.com/nextcloud/text).\n* ๐Ÿ”ค **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **ยปAppsยซ**, find the\n**ยปTeamsยซ** and **ยปCollectivesยซ** apps and enable them.", "homepage": "https://github.com/nextcloud/collectives", "licenses": [ @@ -40,9 +40,9 @@ ] }, "contacts": { - "hash": "sha256-52FNlLIc4Xr/8mKzEJW8YJ7RbfaeSpMaIxGhBFp0WFc=", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.1.5/contacts-v7.1.5.tar.gz", - "version": "7.1.5", + "hash": "sha256-AAlfPeFWCO894/R5fLsXSSW2VKacVCH07JsGLIJWVms=", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.2.3/contacts-v7.2.3.tar.gz", + "version": "7.2.3", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* ๐Ÿš€ **Integration with other Nextcloud apps!** Currently Mail and Calendar โ€“ more to come.\n* ๐ŸŽ‰ **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* ๐Ÿ‘ฅ **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* ๐Ÿ™ˆ **Weโ€™re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -80,9 +80,9 @@ ] }, "deck": { - "hash": "sha256-A2n68T7x4la4VrMwsBMIWk6LWM4nge9FtQhl5eLp8jQ=", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.14.5/deck-v1.14.5.tar.gz", - "version": "1.14.5", + "hash": "sha256-cB2EaqyaSG+cE+51Q86au0cSl5/VEZeTW2exqajmKBY=", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.14.6/deck-v1.14.6.tar.gz", + "version": "1.14.6", "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- ๐Ÿ“ฅ Add your tasks to cards and put them in order\n- ๐Ÿ“„ Write down additional notes in Markdown\n- ๐Ÿ”– Assign labels for even better organization\n- ๐Ÿ‘ฅ Share with your team, friends or family\n- ๐Ÿ“Ž Attach files and embed them in your Markdown description\n- ๐Ÿ’ฌ Discuss with your team using comments\n- โšก Keep track of changes in the activity stream\n- ๐Ÿš€ Get your project organized", "homepage": "https://github.com/nextcloud/deck", "licenses": [ @@ -150,10 +150,10 @@ ] }, "groupfolders": { - "hash": "sha256-FpGpZB5hv0gSXRDTYpCo0MPNOat27ZsyuXxVIYBs+pg=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.1.3/groupfolders-v18.1.3.tar.gz", - "version": "18.1.3", - "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", + "hash": "sha256-OUZsjf5i/ihzihybiM+HNQwiYOOw+/QgnIOsm+ipuOk=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.1.4/groupfolders-v18.1.4.tar.gz", + "version": "18.1.4", + "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -170,9 +170,9 @@ ] }, "integration_deepl": { - "hash": "sha256-FKlu1tlA/GxAHKFu4kfq8CsDvBrnMnLKDizisgb0IOQ=", - "url": "https://github.com/nextcloud-releases/integration_deepl/releases/download/v1.3.1/integration_deepl-v1.3.1.tar.gz", - "version": "1.3.1", + "hash": "sha256-WjTg/+ckoZ/xFrfN0LaLvWIM/JbbnfvVO4EbnRnvB60=", + "url": "https://github.com/nextcloud-releases/integration_deepl/releases/download/v2.0.0/integration_deepl-v2.0.0.tar.gz", + "version": "2.0.0", "description": "Deepl integration providing an translations through deepl.com with Nextcloud\n\nThis app integrates with [Nextcloud Assistant](https://apps.nextcloud.com/apps/assistant) to offer translation services We recommend to install Assistant additionally and activate Deepl as translation provider in the Artifical Intelligence admin settings.\n\nThis app also integrates with the translation API of Nextcloud server to offer translation services without Assistant. Currently this is available in Text and Talk.\n\nTo run translations and any other Task Processing tasks synchronously, run the following command in a background process (10 is the interval in seconds when the process should relaunch to use the latest php changes):\n\n```sh\nset -e; while true; do occ background-job:worker -v -t 10 \"OC\\TaskProcessing\\SynchronousBackgroundJob\"; done\n```\n\n## Ethical AI Rating\n### Rating: ๐Ÿ”ด\n\nNegative:\n* the software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* the trained model is not freely available, so the model can not be ran on-premises\n* the training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelโ€™s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/integration_deepl", "licenses": [ @@ -180,10 +180,10 @@ ] }, "integration_openai": { - "hash": "sha256-LUfgHGN2gddCsATRBgWMJO8EsaOqqRYVZXCL4EKc6Vw=", - "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v3.5.0/integration_openai-v3.5.0.tar.gz", - "version": "3.5.0", - "description": "โš ๏ธ The smart pickers have been removed from this app\nas they are now included in the [Assistant app](https://apps.nextcloud.com/apps/assistant).\n\nThis app implements:\n\n* Text generation providers: Free prompt, Summarize, Headline, Context Write, Chat, and Reformulate (using any available large language model)\n* A Translation provider (using any available language model)\n* A SpeechToText provider (using Whisper)\n* An image generation provider\n\nโš ๏ธ Context Write, Summarize, Headline and Reformulate have mainly been tested with OpenAI.\nThey might work when connecting to other services, without any guarantee.\n\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance or [Ollama](https://ollama.com/) instance\nor to any service that implements an API similar to the OpenAI one, for example:\n[IONOS AI Model Hub](https://docs.ionos.com/cloud/ai/ai-model-hub), [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\nโš ๏ธ This app is mainly tested with OpenAI. We do not guarantee it works perfectly\nwith other services that implement OpenAI-compatible APIs with slight differences.\n\n## Improve AI task pickup speed\n\nTo avoid task processing execution delay, setup at 4 background job workers in the main server (where Nextcloud is installed). The setup process is documented here: https://docs.nextcloud.com/server/latest/admin_manual/ai/overview.html#improve-ai-task-pickup-speed\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via the OpenAI API: ๐Ÿ”ด\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n\n### Rating for Translation using ChatGPT via the OpenAI API: ๐Ÿ”ด\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n### Rating for Image generation using DALLยทE via the OpenAI API: ๐Ÿ”ด\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelโ€™s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via the OpenAI API: ๐ŸŸก\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can run on-premise\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelโ€™s performance and CO2 usage.\n\n### Rating for Text generation via LocalAI: ๐ŸŸข\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n* The training data is freely available, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n\n### Rating for Image generation using Stable Diffusion via LocalAI : ๐ŸŸก\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelโ€™s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via LocalAI: ๐ŸŸก\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelโ€™s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", + "hash": "sha256-VAvpbiTzbbQPsohQygdXRfPqPkxf7rEBuYELb0ADZqA=", + "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v3.7.1/integration_openai-v3.7.1.tar.gz", + "version": "3.7.1", + "description": "โš ๏ธ The smart pickers have been removed from this app\nas they are now included in the [Assistant app](https://apps.nextcloud.com/apps/assistant).\n\nThis app implements:\n\n* Text generation providers: Free prompt, Summarize, Headline, Context Write, Chat, and Reformulate (using any available large language model)\n* A Translation provider (using any available language model)\n* A SpeechToText provider (using Whisper)\n* An image generation provider\n\nโš ๏ธ Context Write, Summarize, Headline and Reformulate have mainly been tested with OpenAI.\nThey might work when connecting to other services, without any guarantee.\n\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance or [Ollama](https://ollama.com/) instance\nor to any service that implements an API similar to the OpenAI one, for example:\n[IONOS AI Model Hub](https://docs.ionos.com/cloud/ai/ai-model-hub), [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\nโš ๏ธ This app is mainly tested with OpenAI. We do not guarantee it works perfectly\nwith other services that implement OpenAI-compatible APIs with slight differences.\n\n## Improve AI task pickup speed\n\nTo avoid task processing execution delay, setup at 4 background job workers in the main server (where Nextcloud is installed). The setup process is documented here: https://docs.nextcloud.com/server/latest/admin_manual/ai/overview.html#improve-ai-task-pickup-speed\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via the OpenAI API: ๐Ÿ”ด\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n\n### Rating for Translation using ChatGPT via the OpenAI API: ๐Ÿ”ด\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n### Rating for Image generation using DALLยทE via the OpenAI API: ๐Ÿ”ด\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelโ€™s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via the OpenAI API: ๐ŸŸก\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can run on-premise\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelโ€™s performance and CO2 usage.\n\n### Rating for Text-To-Speech via the OpenAI API: ๐Ÿ”ด\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelโ€™s performance and CO2 usage.\n\n### Rating for Text generation via LocalAI: ๐ŸŸข\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n* The training data is freely available, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n\n### Rating for Image generation using Stable Diffusion via LocalAI : ๐ŸŸก\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelโ€™s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via LocalAI: ๐ŸŸก\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelโ€™s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/integration_openai", "licenses": [ "agpl" @@ -200,9 +200,9 @@ ] }, "mail": { - "hash": "sha256-FSpr/PVZlx4t+1cGmyoES/9i0c2nyRTPLTodLM2JP04=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.1.7/mail-v5.1.7.tar.gz", - "version": "5.1.7", + "hash": "sha256-ZO7OfGtHckgY02djPHRH1dZW1gu5R/2Te+v9k3lKpeM=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.1.10/mail-v5.1.10.tar.gz", + "version": "5.1.10", "description": "**๐Ÿ’Œ A mail app for Nextcloud**\n\n- **๐Ÿš€ Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files โ€“ more to come.\n- **๐Ÿ“ฅ Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **๐Ÿ”’ Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **๐Ÿ™ˆ Weโ€™re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **๐Ÿ“ฌ Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** ๐ŸŸข/๐ŸŸก/๐ŸŸ /๐Ÿ”ด\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -210,8 +210,8 @@ ] }, "maps": { - "hash": "sha256-E0S/CwXyye19lcuiONEQCyHJqlL0ZG1A9Q7oOTEZH1g=", - "url": "https://github.com/nextcloud/maps/releases/download/v1.6.0-3-nightly/maps-1.6.0-3-nightly.tar.gz", + "hash": "sha256-IupRymjs955TiUutzoTTMeESNfBmAp51l+oBaZwfdN0=", + "url": "https://github.com/nextcloud/maps/releases/download/v1.6.0/maps-1.6.0.tar.gz", "version": "1.6.0", "description": "**The whole world fits inside your cloud!**\n\n- **๐Ÿ—บ Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! ๐ŸŽจ\n- **โญ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **๐Ÿงญ Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **๐Ÿ–ผ Photos on the map:** No more boring slideshows, just show directly where you were!\n- **๐Ÿ™‹ Contacts on the map:** See where your friends live and plan your next visit.\n- **๐Ÿ“ฑ Devices:** Lost your phone? Check the map!\n- **ใ€ฐ Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "homepage": "https://github.com/nextcloud/maps", @@ -230,9 +230,9 @@ ] }, "news": { - "hash": "sha256-Y1+hcRxewWyctG5nS7GjN+zWCBrxoroeb01HLzqAR08=", - "url": "https://github.com/nextcloud/news/releases/download/26.0.2/news.tar.gz", - "version": "26.0.2", + "hash": "sha256-8U2EOK8mXPEk70IU8GLXYU0EoZU7O4fhFkzhGpauvZc=", + "url": "https://github.com/nextcloud/news/releases/download/26.1.0/news.tar.gz", + "version": "26.1.0", "description": "๐Ÿ“ฐ A RSS/Atom Feed reader App for Nextcloud\n\n- ๐Ÿ“ฒ Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- ๐Ÿ”„ Automatic updates of your news feeds\n- ๐Ÿ†“ Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -250,9 +250,9 @@ ] }, "notes": { - "hash": "sha256-/Zym7bNotcdradtR3cG+rIaAH9jZs+/3PCP7zXS6WJo=", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.12.1/notes-v4.12.1.tar.gz", - "version": "4.12.1", + "hash": "sha256-WpxRJ45N+aO+cOp5u6+uwlijzofpmdcUg07ax3p3WDA=", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.12.2/notes-v4.12.2.tar.gz", + "version": "4.12.2", "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into apps ([Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios), as well as [3rd-party apps](https://github.com/nextcloud/notes/wiki#3rd-party-clients) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", "homepage": "https://github.com/nextcloud/notes", "licenses": [ @@ -290,9 +290,9 @@ ] }, "polls": { - "hash": "sha256-j+Aq3Hu7i52o5HqMROTHeb/955N7Qw4TMFPEevR+bYQ=", - "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.4.4/polls-v7.4.4.tar.gz", - "version": "7.4.4", + "hash": "sha256-pGXydde3kLTHgA3vgq2NG1YsyWkda/z8frMFbHdxetQ=", + "url": "https://github.com/nextcloud-releases/polls/releases/download/v8.1.4/polls-v8.1.4.tar.gz", + "version": "8.1.4", "description": "A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -300,9 +300,9 @@ ] }, "previewgenerator": { - "hash": "sha256-dPUvtVFtSqlG9M1RXZ8u7nL3wgK5yFU2/pL9pFLjisc=", - "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.8.0/previewgenerator-v5.8.0.tar.gz", - "version": "5.8.0", + "hash": "sha256-+vJ1h/wxOOwmWmj6gSfXv7UgsRjwelboFQwHpE53efY=", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.9.0/previewgenerator-v5.9.0.tar.gz", + "version": "5.9.0", "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", "homepage": "https://github.com/nextcloud/previewgenerator", "licenses": [ @@ -340,9 +340,9 @@ ] }, "richdocuments": { - "hash": "sha256-vvZZE76NLNgrqwufVV/FVp09W8udJvY6iWzxxMuLCU0=", - "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.5.7/richdocuments-v8.5.7.tar.gz", - "version": "8.5.7", + "hash": "sha256-PVGFCzWPbP9bR433XvpNu5TVFFUmJ/Ewzo0Zo9wg4gU=", + "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.5.9/richdocuments-v8.5.9.tar.gz", + "version": "8.5.9", "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.", "homepage": "https://collaboraoffice.com/", "licenses": [ @@ -360,9 +360,9 @@ ] }, "spreed": { - "hash": "sha256-McNUCYvP7bKwZHrfqKMq5w5aEvA4ulS+ifFqUIl4i48=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.1.8/spreed-v20.1.8.tar.gz", - "version": "20.1.8", + "hash": "sha256-+1CdYMgyDDTUJJ/q4lqs1PMtNhkHVF/miFkbfc5j5aA=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.1.9/spreed-v20.1.9.tar.gz", + "version": "20.1.9", "description": "Chat, video & audio-conferencing using WebRTC\n\n* ๐Ÿ’ฌ **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* ๐Ÿ‘ฅ **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* ๐ŸŒ **Federated chats** Chat with other Nextcloud users on their servers\n* ๐Ÿ’ป **Screen sharing!** Share your screen with the participants of your call.\n* ๐Ÿš€ **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* ๐ŸŒ‰ **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -430,9 +430,9 @@ ] }, "user_oidc": { - "hash": "sha256-nXDWfRP9n9eH+JGg1a++kD5uLMsXh5BHAaTAOgLI9W4=", - "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v7.2.0/user_oidc-v7.2.0.tar.gz", - "version": "7.2.0", + "hash": "sha256-5ny76JXlGKnzmoaFyKU3l5I50oc03yy6WtiIcUZwKnk=", + "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v7.3.0/user_oidc-v7.3.0.tar.gz", + "version": "7.3.0", "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", "homepage": "https://github.com/nextcloud/user_oidc", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/31.json b/pkgs/servers/nextcloud/packages/31.json index 5d95983bad59..7f5204b51713 100644 --- a/pkgs/servers/nextcloud/packages/31.json +++ b/pkgs/servers/nextcloud/packages/31.json @@ -10,9 +10,9 @@ ] }, "bookmarks": { - "hash": "sha256-NVe9eOL6dcL4hYYV7dsoR8ZKXFHkEGAo5sj9DXuDJEI=", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v15.1.1/bookmarks-15.1.1.tar.gz", - "version": "15.1.1", + "hash": "sha256-67Bl8UacPdTJ3YYIFZScChPHgb12v6jRAQXhXooX1hg=", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v15.1.3/bookmarks-15.1.3.tar.gz", + "version": "15.1.3", "description": "- ๐Ÿ“‚ Sort bookmarks into folders\n- ๐Ÿท Add tags and personal notes\n- โ˜  Find broken links and duplicates\n- ๐Ÿ“ฒ Synchronize with all your browsers and devices\n- ๐Ÿ“” Store archived versions of your links in case they are depublished\n- ๐Ÿ” Full-text search on site contents\n- ๐Ÿ‘ช Share bookmarks with other users, groups and teams or via public links\n- โš› Generate RSS feeds of your collections\n- ๐Ÿ“ˆ Stats on how often you access which links\n- ๐Ÿ”’ Automatic backups of your bookmarks collection\n- ๐Ÿ’ผ Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ @@ -20,9 +20,9 @@ ] }, "calendar": { - "hash": "sha256-Wm7RWDe/6jcOEGp2eR1k7x05ilB6kW1u1aRdN7HI4Wk=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.3.5/calendar-v5.3.5.tar.gz", - "version": "5.3.5", + "hash": "sha256-R5L0EAoLGr1CfzhtHO4FfUstqR+EDsOIdgFYccgnEMc=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.3.8/calendar-v5.3.8.tar.gz", + "version": "5.3.8", "description": "A Calendar app for Nextcloud. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* ๐Ÿš€ **Integration with other Nextcloud apps!** Like Contacts, Talk, Tasks, Deck and Circles\n* ๐ŸŒ **WebCal Support!** Want to see your favorite team's matchdays in your calendar? No problem!\n* ๐Ÿ™‹ **Attendees!** Invite people to your events\n* โŒš **Free/Busy!** See when your attendees are available to meet\n* โฐ **Reminders!** Get alarms for events inside your browser and via email\n* ๐Ÿ” **Search!** Find your events at ease\n* โ˜‘๏ธ **Tasks!** See tasks or Deck cards with a due date directly in the calendar\n* ๐Ÿ”ˆ **Talk rooms!** Create an associated Talk room when booking a meeting with just one click\n* ๐Ÿ“† **Appointment booking** Send people a link so they can book an appointment with you [using this app](https://apps.nextcloud.com/apps/appointments)\n* ๐Ÿ“Ž **Attachments!** Add, upload and view event attachments\n* ๐Ÿ™ˆ **Weโ€™re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -30,9 +30,9 @@ ] }, "collectives": { - "hash": "sha256-RCpIfoSmYahIo03IumJwEn/06ZeqOhJ/ov5WKGvwcUA=", - "url": "https://github.com/nextcloud/collectives/releases/download/v2.18.0/collectives-2.18.0.tar.gz", - "version": "2.18.0", + "hash": "sha256-H7Fc3tBOTGjOlhmzImqik7ZC9IorWwrTKsxUkz4E8H0=", + "url": "https://github.com/nextcloud/collectives/releases/download/v3.0.3/collectives-3.0.3.tar.gz", + "version": "3.0.3", "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* ๐Ÿ‘ฅ **Collective and non-hierarchical workflow by heart**: Collectives are\n tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n owned by the collective.\n* ๐Ÿ“ **Collaborative page editing** like known from Etherpad thanks to the\n [Text app](https://github.com/nextcloud/text).\n* ๐Ÿ”ค **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **ยปAppsยซ**, find the\n**ยปTeamsยซ** and **ยปCollectivesยซ** apps and enable them.", "homepage": "https://github.com/nextcloud/collectives", "licenses": [ @@ -40,9 +40,9 @@ ] }, "contacts": { - "hash": "sha256-52FNlLIc4Xr/8mKzEJW8YJ7RbfaeSpMaIxGhBFp0WFc=", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.1.5/contacts-v7.1.5.tar.gz", - "version": "7.1.5", + "hash": "sha256-AAlfPeFWCO894/R5fLsXSSW2VKacVCH07JsGLIJWVms=", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.2.3/contacts-v7.2.3.tar.gz", + "version": "7.2.3", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* ๐Ÿš€ **Integration with other Nextcloud apps!** Currently Mail and Calendar โ€“ more to come.\n* ๐ŸŽ‰ **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* ๐Ÿ‘ฅ **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* ๐Ÿ™ˆ **Weโ€™re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -80,9 +80,9 @@ ] }, "deck": { - "hash": "sha256-VUdHoLYyCg7DsNu2LYZelmcHM4B0cfkH8PwcTK844mo=", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.15.1/deck-v1.15.1.tar.gz", - "version": "1.15.1", + "hash": "sha256-y0kZrmWO6sI4IP+5j+gi8UuxgIwNPXMRDFfETjsRtFg=", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.15.2/deck-v1.15.2.tar.gz", + "version": "1.15.2", "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- ๐Ÿ“ฅ Add your tasks to cards and put them in order\n- ๐Ÿ“„ Write down additional notes in Markdown\n- ๐Ÿ”– Assign labels for even better organization\n- ๐Ÿ‘ฅ Share with your team, friends or family\n- ๐Ÿ“Ž Attach files and embed them in your Markdown description\n- ๐Ÿ’ฌ Discuss with your team using comments\n- โšก Keep track of changes in the activity stream\n- ๐Ÿš€ Get your project organized", "homepage": "https://github.com/nextcloud/deck", "licenses": [ @@ -150,10 +150,10 @@ ] }, "groupfolders": { - "hash": "sha256-KqbPvcHOYJA8bjWbh6X/7RM78FGCqFJIOS8FgugJyJk=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v19.1.2/groupfolders-v19.1.2.tar.gz", - "version": "19.1.2", - "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", + "hash": "sha256-0z6zxuBNvEhPAtCUUDtb0BOMSS+xT/rN7H2PQQ/BLPE=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v19.1.3/groupfolders-v19.1.3.tar.gz", + "version": "19.1.3", + "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -170,9 +170,9 @@ ] }, "integration_deepl": { - "hash": "sha256-FKlu1tlA/GxAHKFu4kfq8CsDvBrnMnLKDizisgb0IOQ=", - "url": "https://github.com/nextcloud-releases/integration_deepl/releases/download/v1.3.1/integration_deepl-v1.3.1.tar.gz", - "version": "1.3.1", + "hash": "sha256-WjTg/+ckoZ/xFrfN0LaLvWIM/JbbnfvVO4EbnRnvB60=", + "url": "https://github.com/nextcloud-releases/integration_deepl/releases/download/v2.0.0/integration_deepl-v2.0.0.tar.gz", + "version": "2.0.0", "description": "Deepl integration providing an translations through deepl.com with Nextcloud\n\nThis app integrates with [Nextcloud Assistant](https://apps.nextcloud.com/apps/assistant) to offer translation services We recommend to install Assistant additionally and activate Deepl as translation provider in the Artifical Intelligence admin settings.\n\nThis app also integrates with the translation API of Nextcloud server to offer translation services without Assistant. Currently this is available in Text and Talk.\n\nTo run translations and any other Task Processing tasks synchronously, run the following command in a background process (10 is the interval in seconds when the process should relaunch to use the latest php changes):\n\n```sh\nset -e; while true; do occ background-job:worker -v -t 10 \"OC\\TaskProcessing\\SynchronousBackgroundJob\"; done\n```\n\n## Ethical AI Rating\n### Rating: ๐Ÿ”ด\n\nNegative:\n* the software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* the trained model is not freely available, so the model can not be ran on-premises\n* the training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelโ€™s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/integration_deepl", "licenses": [ @@ -180,10 +180,10 @@ ] }, "integration_openai": { - "hash": "sha256-LUfgHGN2gddCsATRBgWMJO8EsaOqqRYVZXCL4EKc6Vw=", - "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v3.5.0/integration_openai-v3.5.0.tar.gz", - "version": "3.5.0", - "description": "โš ๏ธ The smart pickers have been removed from this app\nas they are now included in the [Assistant app](https://apps.nextcloud.com/apps/assistant).\n\nThis app implements:\n\n* Text generation providers: Free prompt, Summarize, Headline, Context Write, Chat, and Reformulate (using any available large language model)\n* A Translation provider (using any available language model)\n* A SpeechToText provider (using Whisper)\n* An image generation provider\n\nโš ๏ธ Context Write, Summarize, Headline and Reformulate have mainly been tested with OpenAI.\nThey might work when connecting to other services, without any guarantee.\n\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance or [Ollama](https://ollama.com/) instance\nor to any service that implements an API similar to the OpenAI one, for example:\n[IONOS AI Model Hub](https://docs.ionos.com/cloud/ai/ai-model-hub), [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\nโš ๏ธ This app is mainly tested with OpenAI. We do not guarantee it works perfectly\nwith other services that implement OpenAI-compatible APIs with slight differences.\n\n## Improve AI task pickup speed\n\nTo avoid task processing execution delay, setup at 4 background job workers in the main server (where Nextcloud is installed). The setup process is documented here: https://docs.nextcloud.com/server/latest/admin_manual/ai/overview.html#improve-ai-task-pickup-speed\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via the OpenAI API: ๐Ÿ”ด\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n\n### Rating for Translation using ChatGPT via the OpenAI API: ๐Ÿ”ด\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n### Rating for Image generation using DALLยทE via the OpenAI API: ๐Ÿ”ด\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelโ€™s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via the OpenAI API: ๐ŸŸก\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can run on-premise\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelโ€™s performance and CO2 usage.\n\n### Rating for Text generation via LocalAI: ๐ŸŸข\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n* The training data is freely available, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n\n### Rating for Image generation using Stable Diffusion via LocalAI : ๐ŸŸก\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelโ€™s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via LocalAI: ๐ŸŸก\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelโ€™s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", + "hash": "sha256-VAvpbiTzbbQPsohQygdXRfPqPkxf7rEBuYELb0ADZqA=", + "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v3.7.1/integration_openai-v3.7.1.tar.gz", + "version": "3.7.1", + "description": "โš ๏ธ The smart pickers have been removed from this app\nas they are now included in the [Assistant app](https://apps.nextcloud.com/apps/assistant).\n\nThis app implements:\n\n* Text generation providers: Free prompt, Summarize, Headline, Context Write, Chat, and Reformulate (using any available large language model)\n* A Translation provider (using any available language model)\n* A SpeechToText provider (using Whisper)\n* An image generation provider\n\nโš ๏ธ Context Write, Summarize, Headline and Reformulate have mainly been tested with OpenAI.\nThey might work when connecting to other services, without any guarantee.\n\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance or [Ollama](https://ollama.com/) instance\nor to any service that implements an API similar to the OpenAI one, for example:\n[IONOS AI Model Hub](https://docs.ionos.com/cloud/ai/ai-model-hub), [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\nโš ๏ธ This app is mainly tested with OpenAI. We do not guarantee it works perfectly\nwith other services that implement OpenAI-compatible APIs with slight differences.\n\n## Improve AI task pickup speed\n\nTo avoid task processing execution delay, setup at 4 background job workers in the main server (where Nextcloud is installed). The setup process is documented here: https://docs.nextcloud.com/server/latest/admin_manual/ai/overview.html#improve-ai-task-pickup-speed\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via the OpenAI API: ๐Ÿ”ด\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n\n### Rating for Translation using ChatGPT via the OpenAI API: ๐Ÿ”ด\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n### Rating for Image generation using DALLยทE via the OpenAI API: ๐Ÿ”ด\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelโ€™s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via the OpenAI API: ๐ŸŸก\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can run on-premise\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelโ€™s performance and CO2 usage.\n\n### Rating for Text-To-Speech via the OpenAI API: ๐Ÿ”ด\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelโ€™s performance and CO2 usage.\n\n### Rating for Text generation via LocalAI: ๐ŸŸข\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n* The training data is freely available, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n\n### Rating for Image generation using Stable Diffusion via LocalAI : ๐ŸŸก\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelโ€™s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via LocalAI: ๐ŸŸก\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelโ€™s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/integration_openai", "licenses": [ "agpl" @@ -200,9 +200,9 @@ ] }, "mail": { - "hash": "sha256-FSpr/PVZlx4t+1cGmyoES/9i0c2nyRTPLTodLM2JP04=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.1.7/mail-v5.1.7.tar.gz", - "version": "5.1.7", + "hash": "sha256-ZO7OfGtHckgY02djPHRH1dZW1gu5R/2Te+v9k3lKpeM=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.1.10/mail-v5.1.10.tar.gz", + "version": "5.1.10", "description": "**๐Ÿ’Œ A mail app for Nextcloud**\n\n- **๐Ÿš€ Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files โ€“ more to come.\n- **๐Ÿ“ฅ Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **๐Ÿ”’ Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **๐Ÿ™ˆ Weโ€™re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **๐Ÿ“ฌ Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** ๐ŸŸข/๐ŸŸก/๐ŸŸ /๐Ÿ”ด\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -210,8 +210,8 @@ ] }, "maps": { - "hash": "sha256-E0S/CwXyye19lcuiONEQCyHJqlL0ZG1A9Q7oOTEZH1g=", - "url": "https://github.com/nextcloud/maps/releases/download/v1.6.0-3-nightly/maps-1.6.0-3-nightly.tar.gz", + "hash": "sha256-IupRymjs955TiUutzoTTMeESNfBmAp51l+oBaZwfdN0=", + "url": "https://github.com/nextcloud/maps/releases/download/v1.6.0/maps-1.6.0.tar.gz", "version": "1.6.0", "description": "**The whole world fits inside your cloud!**\n\n- **๐Ÿ—บ Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! ๐ŸŽจ\n- **โญ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **๐Ÿงญ Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **๐Ÿ–ผ Photos on the map:** No more boring slideshows, just show directly where you were!\n- **๐Ÿ™‹ Contacts on the map:** See where your friends live and plan your next visit.\n- **๐Ÿ“ฑ Devices:** Lost your phone? Check the map!\n- **ใ€ฐ Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "homepage": "https://github.com/nextcloud/maps", @@ -230,9 +230,9 @@ ] }, "news": { - "hash": "sha256-Y1+hcRxewWyctG5nS7GjN+zWCBrxoroeb01HLzqAR08=", - "url": "https://github.com/nextcloud/news/releases/download/26.0.2/news.tar.gz", - "version": "26.0.2", + "hash": "sha256-8U2EOK8mXPEk70IU8GLXYU0EoZU7O4fhFkzhGpauvZc=", + "url": "https://github.com/nextcloud/news/releases/download/26.1.0/news.tar.gz", + "version": "26.1.0", "description": "๐Ÿ“ฐ A RSS/Atom Feed reader App for Nextcloud\n\n- ๐Ÿ“ฒ Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- ๐Ÿ”„ Automatic updates of your news feeds\n- ๐Ÿ†“ Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -250,9 +250,9 @@ ] }, "notes": { - "hash": "sha256-/Zym7bNotcdradtR3cG+rIaAH9jZs+/3PCP7zXS6WJo=", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.12.1/notes-v4.12.1.tar.gz", - "version": "4.12.1", + "hash": "sha256-WpxRJ45N+aO+cOp5u6+uwlijzofpmdcUg07ax3p3WDA=", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.12.2/notes-v4.12.2.tar.gz", + "version": "4.12.2", "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into apps ([Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios), as well as [3rd-party apps](https://github.com/nextcloud/notes/wiki#3rd-party-clients) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", "homepage": "https://github.com/nextcloud/notes", "licenses": [ @@ -290,9 +290,9 @@ ] }, "polls": { - "hash": "sha256-iv3Jjx/p2uGhxYctaMaaB/5c3oroauE8iOEH2eWi4+A=", - "url": "https://github.com/nextcloud-releases/polls/releases/download/v8.0.6/polls-v8.0.6.tar.gz", - "version": "8.0.6", + "hash": "sha256-pGXydde3kLTHgA3vgq2NG1YsyWkda/z8frMFbHdxetQ=", + "url": "https://github.com/nextcloud-releases/polls/releases/download/v8.1.4/polls-v8.1.4.tar.gz", + "version": "8.1.4", "description": "A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -300,9 +300,9 @@ ] }, "previewgenerator": { - "hash": "sha256-dPUvtVFtSqlG9M1RXZ8u7nL3wgK5yFU2/pL9pFLjisc=", - "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.8.0/previewgenerator-v5.8.0.tar.gz", - "version": "5.8.0", + "hash": "sha256-+vJ1h/wxOOwmWmj6gSfXv7UgsRjwelboFQwHpE53efY=", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.9.0/previewgenerator-v5.9.0.tar.gz", + "version": "5.9.0", "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", "homepage": "https://github.com/nextcloud/previewgenerator", "licenses": [ @@ -340,9 +340,9 @@ ] }, "richdocuments": { - "hash": "sha256-qJt7nkXhW3t0c8m+MHStWt2FnSNUNiMbDLeDOpU8VVA=", - "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.7.1/richdocuments-v8.7.1.tar.gz", - "version": "8.7.1", + "hash": "sha256-jFjn74izMbj3aHTswUvwl1k7nA+WrBuIrSrRLqK7/28=", + "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.7.3/richdocuments-v8.7.3.tar.gz", + "version": "8.7.3", "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.", "homepage": "https://collaboraoffice.com/", "licenses": [ @@ -360,9 +360,9 @@ ] }, "spreed": { - "hash": "sha256-tumLEoJAGvcFgN8dQbmwxPofOQ825mySOa5qNg6wzgs=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v21.1.1/spreed-v21.1.1.tar.gz", - "version": "21.1.1", + "hash": "sha256-eg2d2Mb4rMey2H4plSLdsqjPrIWQP5cStA7ISkT0VDs=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v21.1.2/spreed-v21.1.2.tar.gz", + "version": "21.1.2", "description": "Chat, video & audio-conferencing using WebRTC\n\n* ๐Ÿ’ฌ **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* ๐Ÿ‘ฅ **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* ๐ŸŒ **Federated chats** Chat with other Nextcloud users on their servers\n* ๐Ÿ’ป **Screen sharing!** Share your screen with the participants of your call.\n* ๐Ÿš€ **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* ๐ŸŒ‰ **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -430,9 +430,9 @@ ] }, "user_oidc": { - "hash": "sha256-nXDWfRP9n9eH+JGg1a++kD5uLMsXh5BHAaTAOgLI9W4=", - "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v7.2.0/user_oidc-v7.2.0.tar.gz", - "version": "7.2.0", + "hash": "sha256-5ny76JXlGKnzmoaFyKU3l5I50oc03yy6WtiIcUZwKnk=", + "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v7.3.0/user_oidc-v7.3.0.tar.gz", + "version": "7.3.0", "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", "homepage": "https://github.com/nextcloud/user_oidc", "licenses": [ From 7abf00a8aec89d2eeafe519bb7dc02bca7e7772b Mon Sep 17 00:00:00 2001 From: kilianar Date: Sun, 3 Aug 2025 21:15:54 +0200 Subject: [PATCH 10/50] portfolio: 0.77.3 -> 0.78.0 https://github.com/portfolio-performance/portfolio/releases/tag/0.78.0 --- pkgs/by-name/po/portfolio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix index c91789bb1266..01c22a518f07 100644 --- a/pkgs/by-name/po/portfolio/package.nix +++ b/pkgs/by-name/po/portfolio/package.nix @@ -34,11 +34,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "PortfolioPerformance"; - version = "0.77.3"; + version = "0.78.0"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-e+1W2jT2YUM+udegvvupUv8RR+nHZSK/NMjMeu01uR8="; + hash = "sha256-f5xPXBzwa9VOutiG5uYQ5FqC6Avd+VAIyDlLW7db82Y="; }; nativeBuildInputs = [ From 02823584dd55d4b5a5529d5e78cbcb949ae630d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Aug 2025 08:44:17 +0000 Subject: [PATCH 11/50] python3Packages.oci: 2.154.1 -> 2.157.0 --- pkgs/development/python-modules/oci/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 56a03b3882dd..9e6677219b5c 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "oci"; - version = "2.154.1"; + version = "2.157.0"; pyproject = true; src = fetchFromGitHub { owner = "oracle"; repo = "oci-python-sdk"; tag = "v${version}"; - hash = "sha256-jkB7P0T12ybSqR73Z2wcBcGCep7eFlX5MYNX4E2qnMY="; + hash = "sha256-Ly94Tiyk0yeH9EPMfR3jkeZNhQBjeiS5rbY5IFBeYOs="; }; pythonRelaxDeps = [ From cb73ee25911d8d5ad7c0359501d8bc4f442a650a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 4 Aug 2025 22:08:26 +0800 Subject: [PATCH 12/50] lightdm-slick-greeter: 2.2.1 -> 2.2.2 https://github.com/linuxmint/slick-greeter/compare/2.2.1...2.2.2 --- pkgs/by-name/li/lightdm-slick-greeter/package.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/li/lightdm-slick-greeter/package.nix b/pkgs/by-name/li/lightdm-slick-greeter/package.nix index 38a775254e5a..ca9bc2a58e27 100644 --- a/pkgs/by-name/li/lightdm-slick-greeter/package.nix +++ b/pkgs/by-name/li/lightdm-slick-greeter/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "lightdm-slick-greeter"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "slick-greeter"; rev = version; - hash = "sha256-AErY8Gy1AkYY/vpXoSE8zhyJd/nboMw+9BO3j6N7CNc="; + hash = "sha256-32H2Q/JdT5v0xrdsZfSJobJ4Dxx63LPgbiB9OKIyc1U="; }; nativeBuildInputs = [ @@ -69,10 +69,6 @@ stdenv.mkDerivation rec { substituteInPlace data/x.dm.slick-greeter.gschema.xml \ --replace-fail "/usr/share/onboard" "/run/current-system/sw/share/onboard" - # This image is really just a fallback. - substituteInPlace src/user-prompt-box.vala \ - --replace-fail "/usr/share/cinnamon/faces/" "/run/current-system/sw/share/cinnamon/faces/" - patchShebangs files/usr/bin/* ''; From 3a737703aa037fab9af2641d352d0fc4b7c0484c Mon Sep 17 00:00:00 2001 From: Bruno Bigras <24027+bbigras@users.noreply.github.com> Date: Mon, 4 Aug 2025 15:46:37 -0400 Subject: [PATCH 13/50] jjui: 0.9.0 -> 0.9.1 --- pkgs/by-name/jj/jjui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix index 40541c059da1..23e6da63b086 100644 --- a/pkgs/by-name/jj/jjui/package.nix +++ b/pkgs/by-name/jj/jjui/package.nix @@ -7,16 +7,16 @@ }: buildGoModule (finalAttrs: { pname = "jjui"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "idursun"; repo = "jjui"; tag = "v${finalAttrs.version}"; - hash = "sha256-FTFryzlU7PsrU2SkOdxYLunVrRKUauAwmzIkJe3xKlk="; + hash = "sha256-XWsHkfakSVQZtmN21exUc62is6qT3jw/1FF9RNaW0Uo="; }; - vendorHash = "sha256-oswFlMuoaTHfgpr2+o8EX80hl82H9JewPFk3khm8Il4="; + vendorHash = "sha256-2rlfR5HLFJyLVSRiUGTCwQDFWRBt4jmL6sdZcq7blaE="; ldflags = [ "-X main.Version=${finalAttrs.version}" ]; From 6a0a668274d9f29e72d83e87057eef2331c5ffeb Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 5 Aug 2025 15:11:23 +0800 Subject: [PATCH 14/50] okteto: use tag in fetchers --- pkgs/by-name/ok/okteto/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix index 5f3163b13eae..12ba7e6d22c0 100644 --- a/pkgs/by-name/ok/okteto/package.nix +++ b/pkgs/by-name/ok/okteto/package.nix @@ -14,7 +14,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-gGtQrhetIWV7ZvnmPYcGzz718uGyAdRiraiKODrJS4w="; }; From 7691944896081895f6c7b0302b9a49649f96f5fb Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 5 Aug 2025 15:11:46 +0800 Subject: [PATCH 15/50] vsce: use tag in fetchers --- pkgs/by-name/vs/vsce/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/vs/vsce/package.nix b/pkgs/by-name/vs/vsce/package.nix index 764e7a0fa712..206ada875747 100644 --- a/pkgs/by-name/vs/vsce/package.nix +++ b/pkgs/by-name/vs/vsce/package.nix @@ -17,7 +17,7 @@ buildNpmPackage (finalAttrs: { src = fetchFromGitHub { owner = "microsoft"; repo = "vscode-vsce"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6Tt7IewbCLHG8DVoD8PV6VmrNu3MCUHITgYFq9smvOo="; }; From bbf8e5d92f85098c67aa625738764cf8d36fb6ae Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 5 Aug 2025 15:12:15 +0800 Subject: [PATCH 16/50] harbor-cli: use tag in fetchers --- pkgs/by-name/ha/harbor-cli/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ha/harbor-cli/package.nix b/pkgs/by-name/ha/harbor-cli/package.nix index f377959cb7b3..93a43ae958d0 100644 --- a/pkgs/by-name/ha/harbor-cli/package.nix +++ b/pkgs/by-name/ha/harbor-cli/package.nix @@ -15,7 +15,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "goharbor"; repo = "harbor-cli"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7Fi4FeWsLwTtNZhD8TfSBTMr/LKzUm6UO4aWC0eJFtQ="; }; From b0a019b6bf467e0d5eea32345b35655838d8b242 Mon Sep 17 00:00:00 2001 From: ProxyVT Date: Mon, 4 Aug 2025 15:06:32 +0300 Subject: [PATCH 17/50] maintainers: add ProxyVT --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 78ebc75dae15..5c0ee2147cfe 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -20460,6 +20460,12 @@ github = "provokateurin"; githubId = 26026535; }; + ProxyVT = { + email = "tikit.us@outlook.com"; + github = "ProxyVT"; + githubId = 86965169; + name = "Ulad Tiknyus"; + }; prrlvr = { email = "po@prrlvr.fr"; github = "prrlvr"; From 280275e010e40a7f3bb04503f4fb16d909a38574 Mon Sep 17 00:00:00 2001 From: ProxyVT Date: Mon, 4 Aug 2025 15:06:09 +0300 Subject: [PATCH 18/50] xfce.xfce4-alsa-plugin: init at 0.4.0 Fixes #381435 --- pkgs/desktops/xfce/default.nix | 2 + .../xfce4-alsa-plugin/default.nix | 51 +++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-alsa-plugin/default.nix diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index bdd3a9aadc84..c74183e49995 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -111,6 +111,8 @@ makeScopeWithSplicing' { #### PANEL PLUGINS + xfce4-alsa-plugin = callPackage ./panel-plugins/xfce4-alsa-plugin { }; + xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin { }; xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-alsa-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-alsa-plugin/default.nix new file mode 100644 index 000000000000..ab02e517467e --- /dev/null +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-alsa-plugin/default.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + vala, + pkg-config, + gettext, + ninja, + alsa-lib, + xfce4-panel, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "xfce4-alsa-plugin"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "equeim"; + repo = "xfce4-alsa-plugin"; + tag = finalAttrs.version; + hash = "sha256-95uVHDyXji8dut7qfE5V/uBBt6DPYF/YfudHe7HJcE8="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + meson + vala + pkg-config + gettext + ninja + ]; + + buildInputs = [ + alsa-lib + xfce4-panel + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/equeim/xfce4-alsa-plugin"; + description = "Simple ALSA volume control for xfce4-panel"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ProxyVT ]; + teams = [ lib.teams.xfce ]; + }; +}) From 425c7e46a00a9393ca3e63973dc08e655778da87 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 5 Aug 2025 09:21:41 +0100 Subject: [PATCH 19/50] fetchurl: fix `resolvedUrl` eval on URLs without mirror:// prefix Without the change `resolvedUrl` fails on non-mirror:// packages as: $ nix eval --impure --expr 'with import ./. {}; AMB-plugins.src.resolvedUrl' error: ... error: expected a list but found null: null After ther change the eval works as expected: $ nix eval --impure --expr 'with import ./. {}; AMB-plugins.src.resolvedUrl' "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/AMB-plugins-0.8.1.tar.bz2" --- pkgs/build-support/fetchurl/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 6d86386e051a..049458a940c4 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -203,7 +203,10 @@ let else throw "unknown mirror:// site ${mirrorName}"; in - if mirrorName == null then url else "${lib.head mirrorList}${lib.elemAt mirrorSplit 1}"; + if mirrorSplit == null || mirrorName == null then + url + else + "${lib.head mirrorList}${lib.elemAt mirrorSplit 1}"; in assert From 492225f4f751c95ecc28c86f5e4a9db665bd6fb8 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 5 Aug 2025 11:13:49 +0200 Subject: [PATCH 20/50] ci/pinned: update This gives us Nix 2.30 as `nixVersions.latest`, which enables it for Eval in CI automatically. It also gives us markdown-code-runner 0.2.0, which allows it to run with treefmt. From the nixpkgs-unstable channel: https://hydra.nixos.org/eval/1817362#tabs-inputs Changes for treefmt-nix: https://github.com/numtide/treefmt-nix/compare/421b56313c65a0815a52b424777f55acf0b56ddf...58bd4da459f0a39e506847109a2a5cfceb837796 --- ci/pinned.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/pinned.json b/ci/pinned.json index 7818ad5f6769..1f1af448a2e8 100644 --- a/ci/pinned.json +++ b/ci/pinned.json @@ -9,9 +9,9 @@ }, "branch": "nixpkgs-unstable", "submodules": false, - "revision": "2baf8e1658cba84a032c3a8befb1e7b06629242a", - "url": "https://github.com/NixOS/nixpkgs/archive/2baf8e1658cba84a032c3a8befb1e7b06629242a.tar.gz", - "hash": "0l48zkf2zs7r53fjq46j770vpb5avxihyfypra3fv429akqnsmm1" + "revision": "6a489c9482ca676ce23c0bcd7f2e1795383325fa", + "url": "https://github.com/NixOS/nixpkgs/archive/6a489c9482ca676ce23c0bcd7f2e1795383325fa.tar.gz", + "hash": "0vsvkhy3gb8yzq62vazhmpqixssmd4xinnll7w73l4vrqd611wlf" }, "treefmt-nix": { "type": "Git", @@ -22,9 +22,9 @@ }, "branch": "main", "submodules": false, - "revision": "421b56313c65a0815a52b424777f55acf0b56ddf", - "url": "https://github.com/numtide/treefmt-nix/archive/421b56313c65a0815a52b424777f55acf0b56ddf.tar.gz", - "hash": "1l57hzz704s7izkkcl3xsg77xjfza57cl0fchs24rdpdhmry2dmp" + "revision": "58bd4da459f0a39e506847109a2a5cfceb837796", + "url": "https://github.com/numtide/treefmt-nix/archive/58bd4da459f0a39e506847109a2a5cfceb837796.tar.gz", + "hash": "01bg9b4xzlv6s5q1q78vib6l2csw02b3rk5bm5yj4gx2sk2hvmrq" } }, "version": 5 From 6884dd65da41ca624772832191bf920727fd41e8 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 5 Aug 2025 11:16:37 +0200 Subject: [PATCH 21/50] ci/tarball: build with Nix 2.30 We had to avoid 2.28 / 2.29 due to performance regressions, but this should work well again with Nix 2.30. --- ci/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ci/default.nix b/ci/default.nix index 1f87117d39fc..eaa1879c34b4 100644 --- a/ci/default.nix +++ b/ci/default.nix @@ -124,8 +124,6 @@ rec { }; officialRelease = false; inherit pkgs lib-tests; - # 2.28 / 2.29 take 9x longer than 2.30 or Lix. - # TODO: Switch back to nixVersions.latest - nix = pkgs.lix; + nix = pkgs.nixVersions.latest; }; } From 337d444c96ff1d78af6971c48b6690dca025d33f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Aug 2025 09:29:27 +0000 Subject: [PATCH 22/50] cargo-nextest: 0.9.101 -> 0.9.102 --- pkgs/by-name/ca/cargo-nextest/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix index ed97abf0a102..cf094a1bba28 100644 --- a/pkgs/by-name/ca/cargo-nextest/package.nix +++ b/pkgs/by-name/ca/cargo-nextest/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.101"; + version = "0.9.102"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - hash = "sha256-yaRwHQopkkZ8gLEhuJuzAiY/enWNdL3B+POGV2ykOWA="; + hash = "sha256-NaWEJEmE8LW1qankVu2Z8eU2yj4/P4DKDLrCEDXPfOc="; }; - cargoHash = "sha256-F26/IDq3/Il6BBCkKUy59T47sI20DAabeSjt3Kdqu+Y="; + cargoHash = "sha256-plZYGm/Sh+pKx1srRPXpZPTZ4k9k/rWZreJqJKFmiG4="; cargoBuildFlags = [ "-p" From 922df659e154b3b63b26f319b20c02605af03ae6 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 5 Aug 2025 13:25:21 +0300 Subject: [PATCH 23/50] mpd: no with lib; in meta --- pkgs/servers/mpd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 11cc489902b0..fffb649c5970 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -273,14 +273,14 @@ let passthru.tests.nixos = nixosTests.mpd; - meta = with lib; { + meta = { description = "Flexible, powerful daemon for playing music"; homepage = "https://www.musicpd.org/"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ tobim ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; mainProgram = "mpd"; longDescription = '' From 701d16472fa353a6260fe2cbeb32c77137b40f2b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 5 Aug 2025 13:25:58 +0300 Subject: [PATCH 24/50] mpd: use finalAttrs --- pkgs/servers/mpd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index fffb649c5970..7fb365c91086 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -198,14 +198,14 @@ let features; in - stdenv.mkDerivation rec { + stdenv.mkDerivation (finalAttrs: { pname = "mpd"; version = "0.24.5"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-MgepOQeOl+n65+7b8zXe2u0fCHFAviSqL1aNu2iSXiM="; }; @@ -289,7 +289,7 @@ let files while being controlled by its network protocol. ''; }; - }; + }); in { mpd = run { }; From a50eba26de35d247c65149ae029373f0b362d3d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Aug 2025 10:30:12 +0000 Subject: [PATCH 25/50] libretro.beetle-psx: 0-unstable-2025-07-18 -> 0-unstable-2025-08-01 --- pkgs/applications/emulators/libretro/cores/beetle-psx.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix index f738d40f95ac..cbbcb4b8c0ca 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "mednafen-psx" + lib.optionalString withHw "-hw"; - version = "0-unstable-2025-07-18"; + version = "0-unstable-2025-08-01"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-psx-libretro"; - rev = "ae0daef1e6f6d5aa36c3d358c7e52c7d007e3b04"; - hash = "sha256-2hq5wbFi0FoxPYza0zxL1FcF+dtu/HRNmIPRUhDNRu8="; + rev = "6eafe85d672ace484bd6b29eeb94eb84f0b41ee1"; + hash = "sha256-+gja4vMD+o78BxCR1SY4wLks6zOjKfU7M3a7cYg+2lc="; }; extraBuildInputs = lib.optionals withHw [ From 4ef842967118f49fc1e509326b99adcef718d181 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 5 Aug 2025 13:30:14 +0300 Subject: [PATCH 26/50] mpd-small: move to pkgs/by-name --- pkgs/by-name/mp/mpd-small/package.nix | 43 +++++++++++++++++++++++++++ pkgs/servers/mpd/default.nix | 37 ----------------------- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 43 insertions(+), 38 deletions(-) create mode 100644 pkgs/by-name/mp/mpd-small/package.nix diff --git a/pkgs/by-name/mp/mpd-small/package.nix b/pkgs/by-name/mp/mpd-small/package.nix new file mode 100644 index 000000000000..f1f71daf0de1 --- /dev/null +++ b/pkgs/by-name/mp/mpd-small/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + mpdWithFeatures, +}: + +mpdWithFeatures { + features = [ + "webdav" + "curl" + "mms" + "bzip2" + "zzip" + "nfs" + "audiofile" + "faad" + "flac" + "gme" + "mpg123" + "opus" + "vorbis" + "vorbisenc" + "lame" + "libsamplerate" + "shout" + "libmpdclient" + "id3tag" + "expat" + "pcre" + "sqlite" + "qobuz" + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + "alsa" + "systemd" + "syslog" + "io_uring" + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + "mad" + "jack" + ]; +} diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 7fb365c91086..e978ff994965 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -293,42 +293,5 @@ let in { mpd = run { }; - mpd-small = run { - features = [ - "webdav" - "curl" - "mms" - "bzip2" - "zzip" - "nfs" - "audiofile" - "faad" - "flac" - "gme" - "mpg123" - "opus" - "vorbis" - "vorbisenc" - "lame" - "libsamplerate" - "shout" - "libmpdclient" - "id3tag" - "expat" - "pcre" - "sqlite" - "qobuz" - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - "alsa" - "systemd" - "syslog" - "io_uring" - ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - "mad" - "jack" - ]; - }; mpdWithFeatures = run; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a2b319170a0..4eabe9e214c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10224,7 +10224,6 @@ with pkgs; (callPackages ../servers/mpd { }) mpd - mpd-small mpdWithFeatures ; From 049a4670b25fac3eaebd053707a7ec9fcd86adfe Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 5 Aug 2025 13:40:16 +0300 Subject: [PATCH 27/50] mpd: promote features list to top level arguments From some reason, using mpdWithFeature = mpd.override inside mpd/default.nix causes an evaluation error --- pkgs/by-name/mp/mpd-small/package.nix | 4 ++-- pkgs/servers/mpd/default.nix | 13 ++++--------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/mp/mpd-small/package.nix b/pkgs/by-name/mp/mpd-small/package.nix index f1f71daf0de1..441beb7bba8d 100644 --- a/pkgs/by-name/mp/mpd-small/package.nix +++ b/pkgs/by-name/mp/mpd-small/package.nix @@ -1,10 +1,10 @@ { lib, stdenv, - mpdWithFeatures, + mpd, }: -mpdWithFeatures { +mpd.override { features = [ "webdav" "curl" diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index e978ff994965..5cea63610e76 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -65,6 +65,8 @@ # For tests gtest, zip, + # Features list + features ? null, }: let @@ -152,11 +154,6 @@ let ]; }; - run = - { - features ? null, - }: - let # Disable platform specific features if needed # using libmad to decode mp3 files on darwin is causing a segfault -- there # is probably a solution, but I'm disabling it for now @@ -197,8 +194,7 @@ let else features; - in - stdenv.mkDerivation (finalAttrs: { + mpd = stdenv.mkDerivation (finalAttrs: { pname = "mpd"; version = "0.24.5"; @@ -292,6 +288,5 @@ let }); in { - mpd = run { }; - mpdWithFeatures = run; + inherit mpd; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ab98e192fe04..34fc4540c7e4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1333,6 +1333,7 @@ mapAliases { mpc-cli = mpc; # Added 2024-10-14 mpc_cli = mpc; # Added 2024-10-14 mpd_clientlib = throw "'mpd_clientlib' has been renamed to/replaced by 'libmpdclient'"; # Converted to throw 2024-10-17 + mpdWithFeatures = lib.warnOnInstantiate "mpdWithFeatures has been replaced by mpd.override" mpd.override; # Added 2025-08-08 mpdevil = plattenalbum; # Added 2024-05-22 mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10 mq-cli = throw "'mq-cli' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4eabe9e214c4..88a254db5f05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10224,7 +10224,6 @@ with pkgs; (callPackages ../servers/mpd { }) mpd - mpdWithFeatures ; mtprotoproxy = python3.pkgs.callPackage ../servers/mtprotoproxy { }; From 587d06f7e043b165c33bce89f5f01992c9793c18 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 5 Aug 2025 13:43:51 +0300 Subject: [PATCH 28/50] mpd: define simpler, using callPackage (singular) --- pkgs/servers/mpd/default.nix | 9 +++------ pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 5cea63610e76..67752682ca8a 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -194,7 +194,8 @@ let else features; - mpd = stdenv.mkDerivation (finalAttrs: { +in + stdenv.mkDerivation (finalAttrs: { pname = "mpd"; version = "0.24.5"; @@ -285,8 +286,4 @@ let files while being controlled by its network protocol. ''; }; - }); -in -{ - inherit mpd; -} + }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88a254db5f05..18a08f3ff2ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10220,11 +10220,7 @@ with pkgs; mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { }; - inherit - (callPackages ../servers/mpd { - }) - mpd - ; + mpd = callPackage ../servers/mpd { }; mtprotoproxy = python3.pkgs.callPackage ../servers/mtprotoproxy { }; From 171215f1828ef638de35a162a8eef4d7688f4ff5 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 5 Aug 2025 13:45:13 +0300 Subject: [PATCH 29/50] mpd: format expression --- pkgs/servers/mpd/default.nix | 228 +++++++++++++++++------------------ 1 file changed, 114 insertions(+), 114 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 67752682ca8a..7a152517ff9b 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -154,136 +154,136 @@ let ]; }; - # Disable platform specific features if needed - # using libmad to decode mp3 files on darwin is causing a segfault -- there - # is probably a solution, but I'm disabling it for now - platformMask = - lib.optionals stdenv.hostPlatform.isDarwin [ - "mad" - "pulse" - "jack" - "smbclient" - ] - ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ - "alsa" - "pipewire" - "io_uring" - "systemd" - "syslog" - ]; + # Disable platform specific features if needed + # using libmad to decode mp3 files on darwin is causing a segfault -- there + # is probably a solution, but I'm disabling it for now + platformMask = + lib.optionals stdenv.hostPlatform.isDarwin [ + "mad" + "pulse" + "jack" + "smbclient" + ] + ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ + "alsa" + "pipewire" + "io_uring" + "systemd" + "syslog" + ]; - knownFeatures = - builtins.attrNames featureDependencies ++ builtins.attrNames nativeFeatureDependencies; - platformFeatures = lib.subtractLists platformMask knownFeatures; + knownFeatures = + builtins.attrNames featureDependencies ++ builtins.attrNames nativeFeatureDependencies; + platformFeatures = lib.subtractLists platformMask knownFeatures; - features_ = - if (features == null) then - platformFeatures + features_ = + if (features == null) then + platformFeatures + else + let + unknown = lib.subtractLists knownFeatures features; + in + if (unknown != [ ]) then + throw "Unknown feature(s): ${lib.concatStringsSep " " unknown}" + else + let + unsupported = lib.subtractLists platformFeatures features; + in + if (unsupported != [ ]) then + throw "Feature(s) ${lib.concatStringsSep " " unsupported} are not supported on ${stdenv.hostPlatform.system}" else - let - unknown = lib.subtractLists knownFeatures features; - in - if (unknown != [ ]) then - throw "Unknown feature(s): ${lib.concatStringsSep " " unknown}" - else - let - unsupported = lib.subtractLists platformFeatures features; - in - if (unsupported != [ ]) then - throw "Feature(s) ${lib.concatStringsSep " " unsupported} are not supported on ${stdenv.hostPlatform.system}" - else - features; + features; in - stdenv.mkDerivation (finalAttrs: { - pname = "mpd"; - version = "0.24.5"; +stdenv.mkDerivation (finalAttrs: { + pname = "mpd"; + version = "0.24.5"; - src = fetchFromGitHub { - owner = "MusicPlayerDaemon"; - repo = "MPD"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-MgepOQeOl+n65+7b8zXe2u0fCHFAviSqL1aNu2iSXiM="; - }; + src = fetchFromGitHub { + owner = "MusicPlayerDaemon"; + repo = "MPD"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-MgepOQeOl+n65+7b8zXe2u0fCHFAviSqL1aNu2iSXiM="; + }; - buildInputs = [ - glib - fmt - # According to the configurePhase of meson, gtest is considered a - # runtime dependency. Quoting: - # - # Run-time dependency GTest found: YES 1.10.0 - gtest - libupnp - ] - ++ concatAttrVals features_ featureDependencies; + buildInputs = [ + glib + fmt + # According to the configurePhase of meson, gtest is considered a + # runtime dependency. Quoting: + # + # Run-time dependency GTest found: YES 1.10.0 + gtest + libupnp + ] + ++ concatAttrVals features_ featureDependencies; - nativeBuildInputs = [ - meson - ninja - pkg-config - ] - ++ concatAttrVals features_ nativeFeatureDependencies; + nativeBuildInputs = [ + meson + ninja + pkg-config + ] + ++ concatAttrVals features_ nativeFeatureDependencies; - depsBuildBuild = [ buildPackages.stdenv.cc ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; - postPatch = - lib.optionalString - (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "12.0") - '' - substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \ - --replace kAudioObjectPropertyElement{Main,Master} \ - --replace kAudioHardwareServiceDeviceProperty_Virtual{Main,Master}Volume - ''; + postPatch = + lib.optionalString + (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "12.0") + '' + substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \ + --replace kAudioObjectPropertyElement{Main,Master} \ + --replace kAudioHardwareServiceDeviceProperty_Virtual{Main,Master}Volume + ''; - # Otherwise, the meson log says: - # - # Program zip found: NO - nativeCheckInputs = [ zip ]; + # Otherwise, the meson log says: + # + # Program zip found: NO + nativeCheckInputs = [ zip ]; - doCheck = true; + doCheck = true; - mesonAutoFeatures = "disabled"; + mesonAutoFeatures = "disabled"; - outputs = [ - "out" - "doc" - ] - ++ lib.optional (builtins.elem "documentation" features_) "man"; + outputs = [ + "out" + "doc" + ] + ++ lib.optional (builtins.elem "documentation" features_) "man"; - CXXFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [ - "-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0" - ]; + CXXFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [ + "-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0" + ]; - mesonFlags = [ - "-Dtest=true" - "-Dmanpages=true" - "-Dhtml_manual=true" - ] - ++ map (x: "-D${x}=enabled") features_ - ++ map (x: "-D${x}=disabled") (lib.subtractLists features_ knownFeatures) - ++ lib.optional (builtins.elem "zeroconf" features_) ( - "-Dzeroconf=" + (if stdenv.hostPlatform.isDarwin then "bonjour" else "avahi") - ) - ++ lib.optional (builtins.elem "systemd" features_) "-Dsystemd_system_unit_dir=etc/systemd/system" - ++ lib.optional (builtins.elem "qobuz" features_) "-Dnlohmann_json=enabled"; + mesonFlags = [ + "-Dtest=true" + "-Dmanpages=true" + "-Dhtml_manual=true" + ] + ++ map (x: "-D${x}=enabled") features_ + ++ map (x: "-D${x}=disabled") (lib.subtractLists features_ knownFeatures) + ++ lib.optional (builtins.elem "zeroconf" features_) ( + "-Dzeroconf=" + (if stdenv.hostPlatform.isDarwin then "bonjour" else "avahi") + ) + ++ lib.optional (builtins.elem "systemd" features_) "-Dsystemd_system_unit_dir=etc/systemd/system" + ++ lib.optional (builtins.elem "qobuz" features_) "-Dnlohmann_json=enabled"; - passthru.tests.nixos = nixosTests.mpd; + passthru.tests.nixos = nixosTests.mpd; - meta = { - description = "Flexible, powerful daemon for playing music"; - homepage = "https://www.musicpd.org/"; - license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ - tobim - ]; - platforms = lib.platforms.unix; - mainProgram = "mpd"; + meta = { + description = "Flexible, powerful daemon for playing music"; + homepage = "https://www.musicpd.org/"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ + tobim + ]; + platforms = lib.platforms.unix; + mainProgram = "mpd"; - longDescription = '' - Music Player Daemon (MPD) is a flexible, powerful daemon for playing - music. Through plugins and libraries it can play a variety of sound - files while being controlled by its network protocol. - ''; - }; - }) + longDescription = '' + Music Player Daemon (MPD) is a flexible, powerful daemon for playing + music. Through plugins and libraries it can play a variety of sound + files while being controlled by its network protocol. + ''; + }; +}) From 0d6026023e39eadcf4f2ef60669c6cc7432a2eb8 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 5 Aug 2025 13:46:27 +0300 Subject: [PATCH 30/50] mpd: move to pkgs/by-name --- pkgs/{servers/mpd/default.nix => by-name/mp/mpd/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{servers/mpd/default.nix => by-name/mp/mpd/package.nix} (100%) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/by-name/mp/mpd/package.nix similarity index 100% rename from pkgs/servers/mpd/default.nix rename to pkgs/by-name/mp/mpd/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18a08f3ff2ad..fd0148711a83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10220,8 +10220,6 @@ with pkgs; mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { }; - mpd = callPackage ../servers/mpd { }; - mtprotoproxy = python3.pkgs.callPackage ../servers/mtprotoproxy { }; moodle = callPackage ../servers/web-apps/moodle { }; From e5e7fd3a42aa9a73ae50c363899c7c530a45edcb Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Tue, 5 Aug 2025 13:57:47 +0200 Subject: [PATCH 31/50] k3s_1_30: 1.30.14+k3s1 -> 1.30.14+k3s2 https://github.com/k3s-io/k3s/releases/tag/v1.30.14%2Bk3s2 --- .../cluster/k3s/1_30/images-versions.json | 16 ++++++++-------- .../networking/cluster/k3s/1_30/versions.nix | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json index 9a4809f6b0bf..c37737fbbfd6 100644 --- a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "0517c1a3bec942b78ab456643b614700296aba1bd0ca2399883aadeb22b6de5d" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-amd64.tar.zst", + "sha256": "9bda99cde833c4e13fb4d35fa46fd57d4b1a2eefc33e00fa352ce686c871c842" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "d8f77b6121d40ea19c6f0658d82158a782507730ba183ebe76643d90d67f736f" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-arm.tar.zst", + "sha256": "d40a78ff14b40547bca6d05db3d7e767b272bb9257628ebd3905d1659bc49bd5" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "7edb77c4c586f661b9bf156aea4f5d35b5b390a315bae11140f425cd3ed729eb" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-arm64.tar.zst", + "sha256": "6561f91f14c8419c9d1c20fb9af7948757d87bd91855b376058d9f2e16010452" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s1/k3s-images.txt", - "sha256": "ebe55bbef8ec772071bf736c9671e444aa31ac259e86bfb65180d2405b314c5e" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-images.txt", + "sha256": "1f87ad26acac5e553279a64942c0e3eeef5c026cc2f82661d358990848672584" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix index e4dcaaa65ad0..566c9c352d40 100644 --- a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.30.14+k3s1"; - k3sCommit = "a7f3d379effef5e0979996339172adb4f87d78df"; - k3sRepoSha256 = "0kgsfv9bva440a79xgwwdjvhqswzx91mzgf8qishvlwrrw1w0vcm"; - k3sVendorHash = "sha256-y1UCvafEdFozMlWWd0Yunu4oIkLsHnV4IMTq1RLJ87M="; + k3sVersion = "1.30.14+k3s2"; + k3sCommit = "071b1ead43641c6803e0b9fce6473baeb12357cf"; + k3sRepoSha256 = "0lldw9kgzpr1073zsr5y4jxmh1c8ah4giyxzb10rfcwx06mglmir"; + k3sVendorHash = "sha256-qEvdBT3noOtKdIdHDJZChowXzQMpVpY/l1ioTJCGVJ4="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.1"; From 0f0f64911dec74b4beab1e77fb1896a9a81a01f3 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Tue, 5 Aug 2025 14:03:13 +0200 Subject: [PATCH 32/50] k3s_1_31: 1.31.10+k3s1 -> 1.31.11+k3s1 https://github.com/k3s-io/k3s/releases/tag/v1.31.11%2Bk3s1 --- .../cluster/k3s/1_31/images-versions.json | 16 ++++++++-------- .../networking/cluster/k3s/1_31/versions.nix | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json index be2f8c46f141..3eb41c7c1b00 100644 --- a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.10%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "86fd5e5cceee3ab6743b1257ed39e62ef73b20475c12495888589e68199210a3" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "c98ad7590af33ef7e148920eb809dfd0f8145a623fdd8d32c6efeecab6088412" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.10%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "0bb5712817ea3c98c69b51eb5925e37ad47a5b2851a0fd72868502a70ef5c3e6" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "c1bd7557836538592dbd59f798e7a4b91d7aef74c8f9f71631060c96a5288dd6" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.10%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "4e34adcadba448524851d8b1ea98bc918105eb7b1717c7d8cb8866749373b060" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "97f0db38f57a2dc63167795620ba34a89348d874ecc91fbf3d8d962dc1392e47" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.10%2Bk3s1/k3s-images.txt", - "sha256": "ebe55bbef8ec772071bf736c9671e444aa31ac259e86bfb65180d2405b314c5e" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-images.txt", + "sha256": "1f87ad26acac5e553279a64942c0e3eeef5c026cc2f82661d358990848672584" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix index d96c01cdb6b9..17fabb8925ad 100644 --- a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix @@ -1,15 +1,15 @@ { - k3sVersion = "1.31.10+k3s1"; - k3sCommit = "c02ce139f6409f455775004d235d98fc9bee849b"; - k3sRepoSha256 = "1ap91j0vwgayis1g7j8rh4dxq4g5fn1kkf1dfa2wg0kxfkcldp0x"; - k3sVendorHash = "sha256-URczHgCfkg2XoX9XNxW7GxPQcfMraLkFCTEbGafyTEI="; + k3sVersion = "1.31.11+k3s1"; + k3sCommit = "17cfde1c82427535f0d3b6fe15caef1a0e62e82f"; + k3sRepoSha256 = "17dmk8r1rjv2wv4kfyrsdyb9xp696ckq79lzjkvh89x8g31b6p1h"; + k3sVendorHash = "sha256-ogyFEWnTBYjpz9clO3v5DyO23mHPhUS+JC587kLJ5Ck="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.1"; k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7"; k3sCNIVersion = "1.7.1-k3s1"; k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz"; - containerdVersion = "2.0.5-k3s1.32"; - containerdSha256 = "1la7ygx5caqfqk025wyrxmhjb0xbpkzwnxv52338p33g68sb3yb0"; + containerdVersion = "2.0.5-k3s2.32"; + containerdSha256 = "1q285ijgxhf4w9xgqqg7yi29mb4jqpifk6bqkjih456qxxkiyk2z"; criCtlVersion = "1.31.0-k3s2"; } From 6e55904495aeadbba5f30ffb56943a5e1df32635 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Tue, 5 Aug 2025 14:04:00 +0200 Subject: [PATCH 33/50] rshim-user-space: 2.4.2 -> 2.4.4 Signed-off-by: Markus Theil --- pkgs/by-name/rs/rshim-user-space/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rs/rshim-user-space/package.nix b/pkgs/by-name/rs/rshim-user-space/package.nix index 7ce7b7e762f5..db830029690e 100644 --- a/pkgs/by-name/rs/rshim-user-space/package.nix +++ b/pkgs/by-name/rs/rshim-user-space/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "rshim-user-space"; - version = "2.4.2"; + version = "2.4.4"; src = fetchFromGitHub { owner = "Mellanox"; repo = "rshim-user-space"; rev = "rshim-${version}"; - hash = "sha256-J/gCACqpUY+KraVOLWpd+UVyZ1f2o77EfpAgUVtZL9w="; + hash = "sha256-w2+1tUDWYmgDC0ycWGdtVfdbkZCmtvwXm47qK5PCCfg="; }; nativeBuildInputs = [ From e7bb0504d255d7e1baa3cae9ba5ab583c48254fb Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Tue, 5 Aug 2025 14:14:20 +0200 Subject: [PATCH 34/50] k3s_1_32: 1.32.6+k3s1 -> 1.32.7+k3s1 https://github.com/k3s-io/k3s/releases/tag/v1.32.7%2Bk3s1 --- .../cluster/k3s/1_32/images-versions.json | 16 ++++++++-------- .../networking/cluster/k3s/1_32/versions.nix | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json index 410a19d952fa..b5c452ddc819 100644 --- a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.6%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "11350d97016e084bff9d0410e3abfb0ed5dd5920378565584e88996b0a6e2da4" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "965f5767c08cffc96bf0967813e7c3fec4c41309e9952a480f0a50865bebd039" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.6%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "1aa4286b30b5418df7b94782b70bcf79644da6c2d77bc5ab643da9c69e0290ac" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "57ab9c306cc96f8dd925bc788c80e49c2d13ee7a222a12235fb525529ad25ac0" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.6%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "cff2d5270b5702b5813f662af7e1f0a741ea3a1052cc81629de6eee1d5a767bd" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "1aa05a55492ba0872fa8a0ff518d6e947869bea32dc2b8e5223bdcf53450c7f9" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.6%2Bk3s1/k3s-images.txt", - "sha256": "637ccb5f5a8f4a7d13991cb3060f05b8c7c46e7351e0edae351f9ad23bb51631" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-images.txt", + "sha256": "e786e9a6f0331a92a2257a12995028761bfee1b5bfaac866025b64162e69bfe0" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix index b8dea807d758..1b9cf156e4bf 100644 --- a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix @@ -1,15 +1,15 @@ { - k3sVersion = "1.32.6+k3s1"; - k3sCommit = "eb603acd1530edcaf79a4a8ed3da54e9e03d9967"; - k3sRepoSha256 = "05py458rdrys1hkw8rg62c98lnwjij5zby8n2zkl1kbfqy12adln"; - k3sVendorHash = "sha256-K8vlX8rucbAOCxHbgrWHsMBWiRc/98IJVCYS8UD+ZsI="; + k3sVersion = "1.32.7+k3s1"; + k3sCommit = "ab99e9da82c7072e4d9efbfa9464e343846fae72"; + k3sRepoSha256 = "0srs8nrmnqsxlyhbbd7i18vbk5c55c16xg278958wi3lbwang0b2"; + k3sVendorHash = "sha256-vKTujaFATguUtIorfa7bY8lSQsx6RhFx0sdWencR2nc="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.1"; k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7"; k3sCNIVersion = "1.7.1-k3s1"; k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz"; - containerdVersion = "2.0.5-k3s1.32"; - containerdSha256 = "1la7ygx5caqfqk025wyrxmhjb0xbpkzwnxv52338p33g68sb3yb0"; + containerdVersion = "2.0.5-k3s2.32"; + containerdSha256 = "1q285ijgxhf4w9xgqqg7yi29mb4jqpifk6bqkjih456qxxkiyk2z"; criCtlVersion = "1.31.0-k3s2"; } From e6312a32ee9d5b5271c28cc1b56bed4e0cd474ed Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Tue, 5 Aug 2025 14:34:45 +0200 Subject: [PATCH 35/50] k3s_1_33: 1.33.2+k3s1 -> 1.33.3+k3s1 https://github.com/k3s-io/k3s/releases/tag/v1.33.3%2Bk3s1 --- .../cluster/k3s/1_33/images-versions.json | 16 ++++++++-------- .../networking/cluster/k3s/1_33/versions.nix | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json index 2416e6b26bb1..6e80722b9f5a 100644 --- a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.2%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "aa52e035f7e2fff17f4cb59cdaa60d117770bfa7b5c67be655c1d1fa4f261137" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "51b6ddeafa465e542f0707272736100916886dd49abcb1420ee52878dd3638a9" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.2%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "670743ad088ada4a72966e30cbf10c7c3b0cc1fe7775f709647820c32b8d3b05" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "339dd2b33b40f03bf95ee2e5dcb8e543ab6852e156cb8aaebe3885717a2966b5" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.2%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "3f2b8c54702018362c24266daaa39b582742c8612cf16ac53c04fb778193884b" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "c12ec7b122f34eb1f89310b05e66b500a2f49522d7cd4ceb3475a675cab6ebc6" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.2%2Bk3s1/k3s-images.txt", - "sha256": "637ccb5f5a8f4a7d13991cb3060f05b8c7c46e7351e0edae351f9ad23bb51631" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-images.txt", + "sha256": "e786e9a6f0331a92a2257a12995028761bfee1b5bfaac866025b64162e69bfe0" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix index d5cad93fd7ce..185a61040575 100644 --- a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix @@ -1,15 +1,15 @@ { - k3sVersion = "1.33.2+k3s1"; - k3sCommit = "6e38c8b55284c0d68f64a9e603fb645a32ecd232"; - k3sRepoSha256 = "1s2ibbq2ivy1w3dkqlwnipg6cphiji0ax96fagfxgzwyjhxkyvxh"; - k3sVendorHash = "sha256-MLntaqh1uwJ4cfvHW4lJxUzxtlq87DWCfhU4X6aRbxI="; + k3sVersion = "1.33.3+k3s1"; + k3sCommit = "236cbf257332b293f444abe6f24d699ff628173e"; + k3sRepoSha256 = "163brwnz4af1rjv5pcghlzjnwr27b087y73bv6pri0fyqd3mwiim"; + k3sVendorHash = "sha256-rU+rpExb9LVIROPj3MN924r7Hk8sK/5P8JSssOoIWTU="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.1"; k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7"; k3sCNIVersion = "1.7.1-k3s1"; k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz"; - containerdVersion = "2.0.5-k3s1"; - containerdSha256 = "1c3hv22zx8y94zwmv5r59bnwgqyhxd10zkinm0jrcvny32ijqdfj"; + containerdVersion = "2.0.5-k3s2"; + containerdSha256 = "0011p1905jsswz1zqzkylzjfvi50mc60ifgjnjxwnjrk2rnwbmbz"; criCtlVersion = "1.31.0-k3s2"; } From 5abdb30f79c029222def8f7d41e317eda507be69 Mon Sep 17 00:00:00 2001 From: Vladyslav Pekker Date: Tue, 5 Aug 2025 10:19:04 -0300 Subject: [PATCH 36/50] bloop: 2.0.12 -> 2.0.13 --- pkgs/by-name/bl/bloop/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/bl/bloop/package.nix b/pkgs/by-name/bl/bloop/package.nix index 2914d30eb1c9..cd06a71b2c9f 100644 --- a/pkgs/by-name/bl/bloop/package.nix +++ b/pkgs/by-name/bl/bloop/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "2.0.12"; + version = "2.0.13"; platform = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}"; sha256 = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then - "sha256-vsPzoZLEeBLVDkKpFzJ2qCfGxZNRedlGI96X3uSmqkw=" + "sha256-d6Fz87qvjIHhcU3sL6PalZGbkt1hZIMJEbiqJtRb2/0=" else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then - "sha256-JNX+uyGynl/QokSB1gwY75c/im8+UZwM/pg7X+rFLbU=" + "sha256-LuX8LFYNzrcqJl9RTLLjQTDsdQg2KmJ+ijKwmi34E3A=" else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then - "sha256-Ry9VRrJe6ThKAKQNgD1RSsT7mVxoPpP1Tzq3bwcPxTM=" + "sha256-jH7zHVns7pDlrRRAGO2nZ5VW71Wyuz0a0oBmXZ4fOAA=" else throw "unsupported platform"; }; From 3fc72d286c51962d0a0deffc29d23bcd9fe30bed Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Tue, 29 Jul 2025 09:32:25 +0200 Subject: [PATCH 37/50] ocamlPackages.elpi: 2.0.7 -> 3.0.1 --- .../coq-modules/mathcomp-algebra-tactics/default.nix | 2 ++ pkgs/development/ocaml-modules/elpi/default.nix | 3 ++- pkgs/development/rocq-modules/hierarchy-builder/default.nix | 2 ++ pkgs/development/rocq-modules/rocq-elpi/default.nix | 3 +++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix index 73272224ffda..8f28e77d2612 100644 --- a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix +++ b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix @@ -32,6 +32,7 @@ mkCoqDerivation { lib.switch [ coq.coq-version mathcomp-algebra.version ] [ + (case (range "8.20" "9.1") (isGe "2.4") "1.2.6") (case (range "8.20" "9.1") (isGe "2.4") "1.2.5") (case (range "8.16" "9.0") (isGe "2.0") "1.2.4") (case (range "8.16" "8.18") (isGe "2.0") "1.2.2") @@ -46,6 +47,7 @@ mkCoqDerivation { release."1.2.3".sha256 = "sha256-6uc1VEfDv+fExEfBR2c0/Q/KjrkX0TbEMCLgeYcpkls="; release."1.2.4".sha256 = "sha256-BRxt0LGPz2u3kJRjcderaZqCfs8M8qKAAwNSWmIck7Q="; release."1.2.5".sha256 = "sha256-wTfe+g7ljWs1S+g02VQutnJGLVIOzNX1lm1HTMXeUUA="; + release."1.2.6".sha256 = "sha256-D7EEiLeCJMgxsYvlAFyL7QZyx/KJAKesVE+vyfzqzkU="; propagatedBuildInputs = [ mathcomp-ssreflect diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index c256f5c6c6cf..2396e4756693 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -18,7 +18,7 @@ coqPackages, version ? if lib.versionAtLeast ocaml.version "4.13" then - "2.0.7" + "3.0.1" else if lib.versionAtLeast ocaml.version "4.08" then "1.20.0" else @@ -34,6 +34,7 @@ in let fetched = coqPackages.metaFetch ({ + release."3.0.1".sha256 = "sha256-r4B0xn6UCVslVW4dHiqq8NBMGfNz44kZy48KDWeGquc="; release."2.0.7".sha256 = "sha256-gCM+vZK6vWlhSO1VMjiWHse23mvxVwRarhxwkIQK7e0="; release."2.0.6".sha256 = "sha256-tRUYXQZ0VXrjIZBZ1skdzieUsww4rSNEe5ik+iKpk3U="; release."2.0.5".sha256 = "sha256-cHgERFqrfSg5WtUX3UxR6L+QkzS7+t6n4V+wweiEacc="; diff --git a/pkgs/development/rocq-modules/hierarchy-builder/default.nix b/pkgs/development/rocq-modules/hierarchy-builder/default.nix index 07868dd4656b..4933ae7767c3 100644 --- a/pkgs/development/rocq-modules/hierarchy-builder/default.nix +++ b/pkgs/development/rocq-modules/hierarchy-builder/default.nix @@ -17,8 +17,10 @@ let in with lib.versions; lib.switch rocq-core.rocq-version [ + (case (range "9.0" "9.1") "1.10.0") (case (range "9.0" "9.1") "1.9.1") ] null; + release."1.10.0".sha256 = "sha256-c52nS8I0tia7Q8lZTFJyHVPVabW9xv55m7w6B7y3+e8="; release."1.9.1".sha256 = "sha256-AiS0ezMyfIYlXnuNsVLz1GlKQZzJX+ilkrKkbo0GrF0="; releaseRev = v: "v${v}"; diff --git a/pkgs/development/rocq-modules/rocq-elpi/default.nix b/pkgs/development/rocq-modules/rocq-elpi/default.nix index a8e27e5e1f60..57a81396843c 100644 --- a/pkgs/development/rocq-modules/rocq-elpi/default.nix +++ b/pkgs/development/rocq-modules/rocq-elpi/default.nix @@ -17,6 +17,7 @@ let in with lib.versions; lib.switch rocq-core.rocq-version [ + (case (range "9.0" "9.1") "3.0.1") (case (range "9.0" "9.1") "2.0.7") ] { }; elpi = rocq-core.ocamlPackages.elpi.override { version = default-elpi-version; }; @@ -35,9 +36,11 @@ let in with lib.versions; lib.switch rocq-core.rocq-version [ + (case (range "9.0" "9.1") "3.0.0") (case (range "9.0" "9.1") "2.6.0") (case ("9.0") "2.5.2") ] null; + release."3.0.0".sha256 = "sha256-YMe2is7duGcvAHjM4joUE90EloibjSxqfZThsJhstdU="; release."2.6.0".sha256 = "sha256-23BHq1NFUkI3ayXnGUwiGFySLyY3EuH4RyMgAhQqI4g="; release."2.5.2".sha256 = "sha256-lLzjPrbVB3rrqox528YiheUb0u89R84Xmrgkn0oplOs="; releaseRev = v: "v${v}"; From 22ae0b20d009c3228d863d0c495302e64eabf8e1 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: Mon, 4 Aug 2025 16:55:12 +0700 Subject: [PATCH 38/50] ocamlPackages.jsont: flags to turn off optional dependencies --- .../ocaml-modules/jsont/default.nix | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/jsont/default.nix b/pkgs/development/ocaml-modules/jsont/default.nix index 816d33329d09..70a88865a76d 100644 --- a/pkgs/development/ocaml-modules/jsont/default.nix +++ b/pkgs/development/ocaml-modules/jsont/default.nix @@ -1,9 +1,13 @@ { lib, fetchzip, + topkg, buildTopkgPackage, + withBrr ? true, brr, + withBytesrw ? true, bytesrw, + withCmdliner ? true, cmdliner, }: @@ -18,17 +22,22 @@ buildTopkgPackage rec { hash = "sha256-dXHl+bLuIrlrQ5Np37+uVuETFBb3j8XeDVEK9izoQFk="; }; - # docs say these dependendencies are optional, but buildTopkgPackage doesnโ€™t - # handle missing dependencies + buildInputs = lib.optional withCmdliner cmdliner; - buildInputs = [ - cmdliner - ]; + propagatedBuildInputs = lib.optional withBrr brr ++ lib.optional withBytesrw bytesrw; - propagatedBuildInputs = [ - brr - bytesrw - ]; + buildPhase = "${topkg.run} build ${ + lib.escapeShellArgs [ + "--with-brr" + (lib.boolToString withBrr) + + "--with-bytesrw" + (lib.boolToString withBytesrw) + + "--with-cmdliner" + (lib.boolToString withCmdliner) + ] + }"; meta = { description = "Declarative JSON data manipulation"; From 24d85e24db23bd1b4797f63a64b8dea3dbd2aca1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Aug 2025 13:49:35 +0000 Subject: [PATCH 39/50] lagrange: 1.18.5 -> 1.18.6 --- pkgs/by-name/la/lagrange/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/lagrange/package.nix b/pkgs/by-name/la/lagrange/package.nix index 476f746b0105..05ef747aeddc 100644 --- a/pkgs/by-name/la/lagrange/package.nix +++ b/pkgs/by-name/la/lagrange/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.18.5"; + version = "1.18.6"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; tag = "v${finalAttrs.version}"; - hash = "sha256-NlnT8dGh05dDjSMxjaBnW7x/KjLgf2Ma0nbaiR7MpiY="; + hash = "sha256-KII0Rnas0H3iODEn89DD5BN96Ao7Aq0cTC4uhtuvNt4="; }; nativeBuildInputs = [ From f0f66a31130a510c7886472e8ab39e58d939316b Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 4 Aug 2025 18:47:13 +0100 Subject: [PATCH 40/50] ladybird: reduce use of with lib --- pkgs/by-name/la/ladybird/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix index 3999aea83e12..2ff7b5b69461 100644 --- a/pkgs/by-name/la/ladybird/package.nix +++ b/pkgs/by-name/la/ladybird/package.nix @@ -186,11 +186,11 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = unstableGitUpdater { }; - meta = with lib; { + meta = { description = "Browser using the SerenityOS LibWeb engine with a Qt or Cocoa GUI"; homepage = "https://ladybird.org"; - license = licenses.bsd2; - maintainers = with maintainers; [ fgaz ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ fgaz ]; platforms = [ "x86_64-linux" "aarch64-linux" From 368351fc7485bce9153555e49f871df2c26a7090 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 4 Aug 2025 18:47:40 +0100 Subject: [PATCH 41/50] ladybird: add jk as a maintainer --- pkgs/by-name/la/ladybird/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix index 2ff7b5b69461..52df089025ca 100644 --- a/pkgs/by-name/la/ladybird/package.nix +++ b/pkgs/by-name/la/ladybird/package.nix @@ -190,7 +190,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Browser using the SerenityOS LibWeb engine with a Qt or Cocoa GUI"; homepage = "https://ladybird.org"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ fgaz ]; + maintainers = with lib.maintainers; [ + fgaz + jk + ]; platforms = [ "x86_64-linux" "aarch64-linux" From a14966419ea624c53bff9386099995e1d590bdbd Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 23 Jul 2025 09:26:18 +0100 Subject: [PATCH 42/50] ladybird: 0-unstable-2025-06-27 -> 0-unstable-2025-08-04 Needed to update cache cmake flag. Removed ca-certs as no longer required at build time. Adjusted skia cflags to match updated format in upstream. Dropped our desktop item in favor of the new one in upstream. No longer need to manually move icons. --- pkgs/by-name/la/ladybird/package.nix | 63 +++++----------------------- 1 file changed, 10 insertions(+), 53 deletions(-) diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix index 52df089025ca..d7a3509e6b1d 100644 --- a/pkgs/by-name/la/ladybird/package.nix +++ b/pkgs/by-name/la/ladybird/package.nix @@ -2,19 +2,16 @@ lib, stdenv, fetchFromGitHub, - cacert, unicode-emoji, unicode-character-database, unicode-idna, publicsuffix-list, cmake, - copyDesktopItems, - makeDesktopItem, ninja, pkg-config, curl, libavif, - libGL, + angle, # libEGL libjxl, libpulseaudio, libwebp, @@ -23,6 +20,7 @@ python3, qt6Packages, woff2, + fast-float, ffmpeg, fontconfig, simdutf, @@ -33,19 +31,15 @@ libtommath, }: -let - # Note: The cacert version is synthetic and must match the version in the package's CMake - cacert_version = "2025-05-20"; -in stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2025-06-27"; + version = "0-unstable-2025-08-04"; src = fetchFromGitHub { owner = "LadybirdWebBrowser"; repo = "ladybird"; - rev = "831ba5d6550fd9dfaf90153876ff42396f7165ac"; - hash = "sha256-7feXPFKExjuOGbitlAkSEEzYNEZb6hGSDUZW1EJGIW8="; + rev = "e4b2e7b131140072416d4301d5f60dea6d79b86d"; + hash = "sha256-d3IRIzukntabRqWbOjjx8WgaiTMnFpFJT2tbMt5ws40="; }; postPatch = '' @@ -62,9 +56,6 @@ stdenv.mkDerivation (finalAttrs: { # Note that the versions of the input data packages must match the # expected version in the package's CMake. - # Check that the versions match - grep -F 'set(CACERT_VERSION "${cacert_version}")' Meta/CMake/ca_certificates_data.cmake || (echo cacert_version mismatch && exit 1) - mkdir -p build/Caches cp -r ${unicode-character-database}/share/unicode build/Caches/UCD @@ -74,17 +65,12 @@ stdenv.mkDerivation (finalAttrs: { echo -n ${unicode-character-database.version} > build/Caches/UCD/version.txt chmod -w build/Caches/UCD - mkdir build/Caches/CACERT - cp ${cacert}/etc/ssl/certs/ca-bundle.crt build/Caches/CACERT/cacert-${cacert_version}.pem - echo -n ${cacert_version} > build/Caches/CACERT/version.txt - mkdir build/Caches/PublicSuffix cp ${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat build/Caches/PublicSuffix ''; nativeBuildInputs = [ cmake - copyDesktopItems ninja pkg-config python3 @@ -94,10 +80,11 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ curl + fast-float ffmpeg fontconfig libavif - libGL + angle # libEGL libjxl libwebp libxcrypt @@ -110,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/LadybirdBrowser/ladybird/commit/af3d46dc06829dad65309306be5ea6fbc6a587ec # https://github.com/LadybirdBrowser/ladybird/commit/4d7b7178f9d50fff97101ea18277ebc9b60e2c7c # Remove when/if this gets upstreamed in skia. - "extra_cflags+=[\"-DSKCMS_API=__attribute__((visibility(\\\"default\\\")))\"]" + "extra_cflags+=[\"-DSKCMS_API=[[gnu::visibility(\\\"default\\\")]]\"]" ]; })) woff2 @@ -127,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: { # Takes an enormous amount of resources, even with mold (lib.cmakeBool "ENABLE_LTO_FOR_RELEASE" false) # Disable network operations - "-DSERENITY_CACHE_DIR=Caches" + "-DLADYBIRD_CACHE_DIR=Caches" "-DENABLE_NETWORK_DOWNLOADS=OFF" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ @@ -141,41 +128,11 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/LadybirdBrowser/ladybird/issues/371#issuecomment-2616415434 env.NIX_LDFLAGS = "-lGL -lfontconfig"; - postInstall = '' - for size in 48x48 128x128; do - mkdir -p $out/share/icons/hicolor/$size/apps - ln -s $out/share/Lagom/icons/$size/app-browser.png \ - $out/share/icons/hicolor/$size/apps/ladybird.png - done - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications $out/bin mv $out/bundle/Ladybird.app $out/Applications ''; - desktopItems = [ - (makeDesktopItem { - name = "ladybird"; - desktopName = "Ladybird"; - exec = "Ladybird -- %U"; - icon = "ladybird"; - categories = [ - "Network" - "WebBrowser" - ]; - mimeTypes = [ - "text/html" - "application/xhtml+xml" - "x-scheme-handler/http" - "x-scheme-handler/https" - ]; - actions.new-window = { - name = "New Window"; - exec = "Ladybird --new-window -- %U"; - }; - }) - ]; - # Only Ladybird and WebContent need wrapped, if Qt is enabled. # On linux we end up wraping some non-Qt apps, like headless-browser. dontWrapQtApps = stdenv.hostPlatform.isDarwin; From d3caafc32f68040ba90848d73555c8ed304af02d Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 5 Aug 2025 17:08:01 +0200 Subject: [PATCH 43/50] nixos/doc/mailman: fix syntax in code block --- nixos/modules/services/mail/mailman.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/mail/mailman.md b/nixos/modules/services/mail/mailman.md index d5a8e5ba84fa..341c3d6744b6 100644 --- a/nixos/modules/services/mail/mailman.md +++ b/nixos/modules/services/mail/mailman.md @@ -19,8 +19,8 @@ For a basic configuration with Postfix as the MTA, the following settings are su local_recipient_maps = [ "hash:/var/lib/mailman/data/postfix_lmtp" ]; relay_domains = [ "hash:/var/lib/mailman/data/postfix_domains" ]; smtpd_tls_chain_files = [ - config.security.acme.certs."lists.example.org".directory + "/full.pem" - config.security.acme.certs."lists.example.org".directory + "/key.pem" + (config.security.acme.certs."lists.example.org".directory + "/full.pem") + (config.security.acme.certs."lists.example.org".directory + "/key.pem") ]; }; }; From fed181fac11b376fc242c4805b91d852902fbc35 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 5 Aug 2025 17:08:25 +0200 Subject: [PATCH 44/50] nixos/doc/modular-services: run nixfmt on code blocks --- nixos/doc/manual/development/modular-services.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/development/modular-services.md b/nixos/doc/manual/development/modular-services.md index eadead5c4a40..c34871f7725f 100644 --- a/nixos/doc/manual/development/modular-services.md +++ b/nixos/doc/manual/development/modular-services.md @@ -45,11 +45,18 @@ So note that the default value of `system.services.` is not a complete ser It is possible to write service modules that are portable. This is done by either avoiding the `systemd` option tree, or by defining process-manager-specific definitions in an optional way: ```nix -{ config, options, lib, ... }: { +{ + config, + options, + lib, + ... +}: +{ _class = "service"; config = { process.argv = [ (lib.getExe config.foo.program) ]; - } // lib.optionalAttrs (options?systemd) { + } + // lib.optionalAttrs (options ? systemd) { # ... systemd-specific definitions ... }; } From a7b3b2584a7b9f204f634714fe9fbe3a3965b06c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 22 Jul 2025 16:12:42 +0200 Subject: [PATCH 45/50] ci/treefmt: add markdown-code-runner This was run as a test in `doc/tests/check-nix-code-blocks.nix` before, but its DX can be improved: By including it in `treefmt` we get better error reporting and auto-fixing, as well as running it on *all* markdown files (including READMEs etc.) for free. --- ci/default.nix | 17 +++++++++++++++ doc/doc-support/package.nix | 1 - doc/tests/check-nix-code-blocks.nix | 32 ----------------------------- doc/tests/mdcr-config.toml | 3 --- 4 files changed, 17 insertions(+), 36 deletions(-) delete mode 100644 doc/tests/check-nix-code-blocks.nix delete mode 100644 doc/tests/mdcr-config.toml diff --git a/ci/default.nix b/ci/default.nix index eaa1879c34b4..727e591a90b8 100644 --- a/ci/default.nix +++ b/ci/default.nix @@ -75,6 +75,23 @@ let includes = [ "*" ]; priority = 1; }; + + # TODO: Upstream this into treefmt-nix eventually: + # https://github.com/numtide/treefmt-nix/issues/387 + settings.formatter.markdown-code-runner = { + command = pkgs.lib.getExe pkgs.markdown-code-runner; + options = + let + config = pkgs.writers.writeTOML "markdown-code-runner-config" { + presets.nixfmt = { + language = "nix"; + command = [ (pkgs.lib.getExe pkgs.nixfmt) ]; + }; + }; + in + [ "--config=${config}" ]; + includes = [ "*.md" ]; + }; }; fs = pkgs.lib.fileset; nixFilesSrc = fs.toSource { diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix index aefc301ec81c..8ed6865a1c90 100644 --- a/doc/doc-support/package.nix +++ b/doc/doc-support/package.nix @@ -137,7 +137,6 @@ stdenvNoCC.mkDerivation ( tests = { manpage-urls = callPackage ../tests/manpage-urls.nix { }; - check-nix-code-blocks = callPackage ../tests/check-nix-code-blocks.nix { }; }; }; } diff --git a/doc/tests/check-nix-code-blocks.nix b/doc/tests/check-nix-code-blocks.nix deleted file mode 100644 index 5ec934f6bba8..000000000000 --- a/doc/tests/check-nix-code-blocks.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - runCommand, - markdown-code-runner, - nixfmt-rfc-style, -}: - -runCommand "manual_check-nix-code-blocks" - { - nativeBuildInputs = [ - markdown-code-runner - nixfmt-rfc-style - ]; - } - '' - set +e - - mdcr --check --config ${./mdcr-config.toml} ${./..} - - if [ $? -ne 0 ]; then - cat < Date: Tue, 5 Aug 2025 15:45:59 +0000 Subject: [PATCH 46/50] phoenixd: 0.6.1 -> 0.6.2 --- pkgs/by-name/ph/phoenixd/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ph/phoenixd/package.nix b/pkgs/by-name/ph/phoenixd/package.nix index cd1f1bcfb7cb..9073d7310479 100644 --- a/pkgs/by-name/ph/phoenixd/package.nix +++ b/pkgs/by-name/ph/phoenixd/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "phoenixd"; - version = "0.6.1"; + version = "0.6.2"; src = let @@ -28,10 +28,10 @@ stdenv.mkDerivation (finalAttrs: { fetchurl { url = "https://github.com/ACINQ/phoenixd/releases/download/v${finalAttrs.version}/phoenixd-${finalAttrs.version}-${suffix}.zip"; hash = selectSystem { - aarch64-darwin = "sha256-kPM82YcgTfcXnkE8ihEVKERAlFDSqZQZVmhPkThjtDk="; - x86_64-darwin = "sha256-mQ44LOm5tSBSSazkp1RW7Krncfo/O5VOZHtg7m6Uf0Y="; - x86_64-linux = "sha256-j6PhXo4q6UZY6hNylZJCBtFE03UcKHgWZbg7+2pO1N4="; - aarch64-linux = "sha256-IH/QngEUv2YKzIK1tJORFNZ/gM9a+0VYiqcvVrJhqT8="; + aarch64-darwin = "sha256-M1zcd1ZyqnRVTaH0pGUPPKcke5nx2Hd45t911j6EObQ="; + x86_64-darwin = "sha256-sYl51UC9AwCUzshF91npR4dZ6gmaF6n9+zLFm9IeSLQ="; + x86_64-linux = "sha256-qJKCKCquCTAE3Oc4esLYWXiKJk+NUuCVyD3MjWcbXEo="; + aarch64-linux = "sha256-H9KvrNJ/jBuZbJlNsnM5HTF/OCYgdScgaBi0G4gRkEY="; }; }; From 47b39dc9dc6207a71bda81381828f3cf63d58565 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Aug 2025 16:41:48 +0000 Subject: [PATCH 47/50] lux-cli: 0.11.1 -> 0.13.0 --- pkgs/by-name/lu/lux-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix index cd1da90d7dd6..0f40eb01ed00 100644 --- a/pkgs/by-name/lu/lux-cli/package.nix +++ b/pkgs/by-name/lu/lux-cli/package.nix @@ -17,18 +17,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lux-cli"; - version = "0.11.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "nvim-neorocks"; repo = "lux"; tag = "v${finalAttrs.version}"; - hash = "sha256-yjd8nqrypgdS2UtAANv1TtuGtZPaWm7LhVrHPghf5hg="; + hash = "sha256-tx4sgh8G5R3odpBBVl0qLFWnTcmk1YYfGYkAJtHL9wE="; }; buildAndTestSubdir = "lux-cli"; - cargoHash = "sha256-iKZ4FJ0IL1lnKuYTmFvx8umoB0z8M8xnvgb/GMfGKkI="; + cargoHash = "sha256-dLhfDDoz2jFShk3ksxmQ8FEKc9JE/NPF4zSUV5kvgj8="; nativeInstallCheckInputs = [ versionCheckHook From 4f2ad9dcdaa60d1354af8e7a73e6c86fe90b45d3 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 5 Aug 2025 08:54:23 -0500 Subject: [PATCH 48/50] grimblast: 0.1-unstable-2025-07-18 -> 0.1-unstable-2025-07-23 https: //github.com/hyprwm/contrib/commit/6839b23345b71db17cd408373de4f5605bf589b8 Signed-off-by: Austin Horstman --- pkgs/by-name/gr/grimblast/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/grimblast/package.nix b/pkgs/by-name/gr/grimblast/package.nix index 028f1e09896c..4151a243a625 100644 --- a/pkgs/by-name/gr/grimblast/package.nix +++ b/pkgs/by-name/gr/grimblast/package.nix @@ -18,13 +18,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "grimblast"; - version = "0.1-unstable-2025-07-18"; + version = "0.1-unstable-2025-07-23"; src = fetchFromGitHub { owner = "hyprwm"; repo = "contrib"; - rev = "481175e17e155f19a3b31416530b6edf725e7034"; - hash = "sha256-usBNOT/uzFdsKDe5Ik+C36zqL+BfT7Lp2rqKWrpQuqk="; + rev = "6839b23345b71db17cd408373de4f5605bf589b8"; + hash = "sha256-PFAJoEqQWMlo1J+yZb+4HixmhbRVmmNl58e/AkLYDDI="; }; strictDeps = true; From 38e72a1ce2b4b6f2ac860a6c946070dcbf252cfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?= <23130178+ShadowRZ@users.noreply.github.com> Date: Mon, 4 Aug 2025 08:31:52 +0800 Subject: [PATCH 49/50] android-studio: 2025.1.1.14 -> 2025.1.2.11 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 423426bc2f57..ce220482389e 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -16,8 +16,8 @@ let inherit tiling_wm; }; stableVersion = { - version = "2025.1.1.14"; # "Android Studio Narwhal | 2025.1.1 Patch 1" - sha256Hash = "sha256-rTZOvLl1Lqc0zXNiTmVoMnLEAwWOEDW5MJg8ysiiyBo="; + version = "2025.1.2.11"; # "Android Studio Narwhal Feature Drop | 2025.1.2" + sha256Hash = "sha256-jzh0xrEZU4zdlse8tlVV/uqBEz4lH2k2XSHd13d3vng="; }; betaVersion = { version = "2025.1.2.10"; # "Android Studio Narwhal Feature Drop | 2025.1.2 RC 1" From abe860e8d220dbe92b11ce6334571d1a147ff050 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 5 Aug 2025 10:07:59 -0700 Subject: [PATCH 50/50] ollama: 0.10.0 -> 0.11.0 --- pkgs/by-name/ol/ollama/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 2d0fa1dd0028..2b0cdf39d8be 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -116,13 +116,13 @@ in goBuild (finalAttrs: { pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; tag = "v${finalAttrs.version}"; - hash = "sha256-BoT4WUapxakETHAlHP64okcReMIhQ+PzKaSVpELvrcI="; + hash = "sha256-fBoSt/chnxnlD6/HsWeMX9TR7Du7RCOmWcqCKamyK7A="; fetchSubmodules = true; };