From bfed80cb51cedf1185737dc642a5f28b8afb4098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Mon, 20 May 2024 16:11:48 -0400 Subject: [PATCH 01/61] webcord-vencord: fix runtime segfault --- pkgs/by-name/we/webcord-vencord/package.nix | 4 +++- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/we/webcord-vencord/package.nix b/pkgs/by-name/we/webcord-vencord/package.nix index 352e372d00ad..2ac078def4ee 100644 --- a/pkgs/by-name/we/webcord-vencord/package.nix +++ b/pkgs/by-name/we/webcord-vencord/package.nix @@ -1,4 +1,6 @@ { + # allow overriding electron + electron, webcord, substituteAll, lib, @@ -6,7 +8,7 @@ }: # nixpkgs-update: no auto update -webcord.overrideAttrs (old: { +(webcord.override { inherit electron; }).overrideAttrs (old: { pname = "webcord-vencord"; patches = (old.patches or [ ]) ++ [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce162c99e57e..b2b02521408c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35429,6 +35429,8 @@ with pkgs; webcord = callPackage ../by-name/we/webcord/package.nix { electron = electron_30; }; + webcord-vencord = callPackage ../by-name/we/webcord-vencord/package.nix { electron = electron_29; }; + webex = callPackage ../applications/networking/instant-messengers/webex { }; webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs { From 84c8e8af002131881ec7bf62d13b24a189a9b860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 23 May 2024 13:29:27 -0700 Subject: [PATCH 02/61] nextcloud28: 28.0.5 -> 28.0.6 Changelog: https://nextcloud.com/changelog/#28-0-6 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 0c5ee36951c0..c680bc6f8b82 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -49,8 +49,8 @@ in { }; nextcloud28 = generic { - version = "28.0.5"; - hash = "sha256-3KEQD5W4ZLreETR3cjxxrIlxkzUsMX45zShth2NXBus="; + version = "28.0.6"; + hash = "sha256-3w0zhLRHy6HhKPIggPZ4BSH4aBab6r7o6g0VW/nGa48="; packages = nextcloud28Packages; }; From ff64ac2e176d2a71d5b07c1ea88512b73fc38e43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 23 May 2024 13:30:23 -0700 Subject: [PATCH 03/61] nextcloud29: 29.0.0 -> 29.0.1 Changelog: https://nextcloud.com/changelog/#29-0-1 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index c680bc6f8b82..3cb9023694e5 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -55,8 +55,8 @@ in { }; nextcloud29 = generic { - version = "29.0.0"; - hash = "sha256-6bU/ZDK29mRIfThpZF+hIaZM8O1q7oOqVgkD2vhrUr0="; + version = "29.0.1"; + hash = "sha256-dZVG2uz3nKeH7WcFUDaTxttVOqvx165N+neccwmyrak="; packages = nextcloud29Packages; }; From ea23d5ac3d277f8986135aed32feac9fc477fc03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 23 May 2024 13:42:04 -0700 Subject: [PATCH 04/61] nextcloudPackages: update --- pkgs/servers/nextcloud/packages/27.json | 44 ++++++++--------- pkgs/servers/nextcloud/packages/28.json | 56 ++++++++++----------- pkgs/servers/nextcloud/packages/29.json | 66 ++++++++++++------------- 3 files changed, 83 insertions(+), 83 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/27.json b/pkgs/servers/nextcloud/packages/27.json index 44ae57d67984..fe5317430d84 100644 --- a/pkgs/servers/nextcloud/packages/27.json +++ b/pkgs/servers/nextcloud/packages/27.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "04wka70zfz36ccad755vq7wnnjid69ws252jf6nyw614dwr5idvh", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.1/calendar-v4.7.1.tar.gz", - "version": "4.7.1", + "sha256": "0zm2a63f99q7n1qw2n3p4pk50j5v4q24vpgndk4nnvaz6c792rzg", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.4/calendar-v4.7.4.tar.gz", + "version": "4.7.4", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* ๐Ÿš€ **Integration with other Nextcloud apps!** Currently Contacts - more to come.\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 with a due date directly in the calendar\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": [ @@ -100,9 +100,9 @@ ] }, "gpoddersync": { - "sha256": "1lm8lqvs1mvb3i2a8b5j9g7b26f747jfp696b9ima0hgpw8ycbfs", - "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.8.3/gpoddersync.tar.gz", - "version": "3.8.3", + "sha256": "1hk052864mb49crmsy2m9alv22rk7ns6m6q7l372j7py9gr8rf60", + "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.9.0/gpoddersync.tar.gz", + "version": "3.9.0", "description": "Expose GPodder API to sync podcast consumer apps like AntennaPod", "homepage": "https://github.com/thrillfall/nextcloud-gpodder", "licenses": [ @@ -133,16 +133,16 @@ "sha256": "1cb5csdn85y5fkwhbxxl9i1qy92iqx9v9ccavcp66xfpyk4dlf22", "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v1.1.5/integration_openai-v1.1.5.tar.gz", "version": "1.1.5", - "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 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\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance\nor to any service that implements an API similar to the OpenAI one, for example: [Plusserver](https://www.plusserver.com/en/ai-platform/).\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via 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 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 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 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/).", + "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 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\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance\nor to any service that implements an API similar to the OpenAI one, for example: [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via 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 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 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 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/).", "homepage": "https://github.com/nextcloud/integration_openai", "licenses": [ "agpl" ] }, "mail": { - "sha256": "1m48zdh7jjmgw7r9y9irp7z22wjippjswy7r60yvsdxbac765n14", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.6.0/mail-v3.6.0.tar.gz", - "version": "3.6.0", + "sha256": "1w6bww8wc42biz1zjf4fxgf60ryh1cdsm8b6ji3fhsqjlmkvs4ly", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.6.1/mail-v3.6.1.tar.gz", + "version": "3.6.1", "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://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": [ @@ -160,9 +160,9 @@ ] }, "memories": { - "sha256": "02l9rq117x7x4nra1f50fkn7yr3cpbjnsq9nlr7rnsn9qsf5rrw9", - "url": "https://github.com/pulsejet/memories/releases/download/v7.2.0/memories.tar.gz", - "version": "7.2.0", + "sha256": "1wahnkc253bgm0bqciyhfh1iyl8girbj8mzdd29l0k1bks8fr4qc", + "url": "https://github.com/pulsejet/memories/releases/download/v7.3.1/memories.tar.gz", + "version": "7.3.1", "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **๐Ÿ“ธ Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **โช Rewind**: Jump to any time in the past instantly and relive your memories.\n- **๐Ÿค– AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **๐Ÿ–ผ๏ธ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **๐Ÿซฑ๐Ÿปโ€๐Ÿซฒ๐Ÿป External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **๐Ÿ“ฑ Mobile Support**: Work from any device, of any shape and size through the web app.\n- **โœ๏ธ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **๐Ÿ“ฆ Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **๐Ÿ“น Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **๐Ÿ—บ๏ธ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **๐Ÿ“ฆ Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **โšก๏ธ Performance**: Do all this very fast.\n\n## ๐Ÿš€ Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the ๐Ÿ“ท Memories app in Nextcloud and set the directory containing your photos.", "homepage": "https://memories.gallery", "licenses": [ @@ -200,9 +200,9 @@ ] }, "notify_push": { - "sha256": "0zsjr3zr8c686pkgsmhjg1ssnzvc9flkyy1x571wk7lx7lfrvrd1", - "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.10/notify_push-v0.6.10.tar.gz", - "version": "0.6.10", + "sha256": "1w0nb74q5ishwsd9xhgjlp5ik159xjfp5i2cczi0fmwlb185n1ik", + "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.11/notify_push-v0.6.11.tar.gz", + "version": "0.6.11", "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions", "homepage": "", "licenses": [ @@ -230,9 +230,9 @@ ] }, "polls": { - "sha256": "1y6908yp327j6v9caawylah5zayh4m1d7658j3yh0r5siml9lq94", - "url": "https://github.com/nextcloud/polls/releases/download/v5.4.3/polls.tar.gz", - "version": "5.4.3", + "sha256": "1s3rlfdk3g3c45ch8kb66ydzxfx20vcaff1926m5h8m50cmapq6x", + "url": "https://github.com/nextcloud/polls/releases/download/v6.3.0/polls.tar.gz", + "version": "6.3.0", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -270,9 +270,9 @@ ] }, "spreed": { - "sha256": "0699c9xfmzk48q0f48lxw16h9l2300w6vp1sn2vb8wr76fbhm9kf", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v17.1.8/spreed-v17.1.8.tar.gz", - "version": "17.1.8", + "sha256": "0knzz84ky8w1dvxrl61p63zrmalzg6b4b8syf5hx9ympr4ngpaza", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v17.1.9/spreed-v17.1.9.tar.gz", + "version": "17.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": [ diff --git a/pkgs/servers/nextcloud/packages/28.json b/pkgs/servers/nextcloud/packages/28.json index 0c83f7f04bd9..c54ead8b244b 100644 --- a/pkgs/servers/nextcloud/packages/28.json +++ b/pkgs/servers/nextcloud/packages/28.json @@ -1,8 +1,8 @@ { "bookmarks": { - "sha256": "06pprhlaaqdha2nmfdcf76mhh48hdr5jlv88snxji8lpflv50wr5", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.3/bookmarks-13.1.3.tar.gz", - "version": "13.1.3", + "sha256": "0i070c5a66yxs8h7w6r9wi0n1bf41q4vrhvwr4vybi1siwr3psv6", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.0.2/bookmarks-14.0.2.tar.gz", + "version": "14.0.2", "description": "- ๐Ÿ“‚ Sort bookmarks into folders\n- ๐Ÿท Add tags and personal notes\n- ๐Ÿ” Full-text search\n- ๐Ÿ“ฒ Synchronize with all your browsers and devices\n- ๐Ÿ‘ช Share bookmarks with other users and publicly\n- โ˜  Find broken links\n- โš› Generate RSS feeds of your collections\n- ๐Ÿ“” Read archived versions of your links in case they are depublished\n- ๐Ÿ’ฌ Create new bookmarks directly from within Nextcloud Talk\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": [ @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "04wka70zfz36ccad755vq7wnnjid69ws252jf6nyw614dwr5idvh", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.1/calendar-v4.7.1.tar.gz", - "version": "4.7.1", + "sha256": "0zm2a63f99q7n1qw2n3p4pk50j5v4q24vpgndk4nnvaz6c792rzg", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.4/calendar-v4.7.4.tar.gz", + "version": "4.7.4", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* ๐Ÿš€ **Integration with other Nextcloud apps!** Currently Contacts - more to come.\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 with a due date directly in the calendar\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": [ @@ -80,9 +80,9 @@ ] }, "gpoddersync": { - "sha256": "1lm8lqvs1mvb3i2a8b5j9g7b26f747jfp696b9ima0hgpw8ycbfs", - "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.8.3/gpoddersync.tar.gz", - "version": "3.8.3", + "sha256": "1hk052864mb49crmsy2m9alv22rk7ns6m6q7l372j7py9gr8rf60", + "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.9.0/gpoddersync.tar.gz", + "version": "3.9.0", "description": "Expose GPodder API to sync podcast consumer apps like AntennaPod", "homepage": "https://github.com/thrillfall/nextcloud-gpodder", "licenses": [ @@ -110,19 +110,19 @@ ] }, "integration_openai": { - "sha256": "1x9w13xljh8h8n7hic4ffxsk7y63x9yghr1450ng2p68y6vjsg4g", - "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v2.0.0/integration_openai-v2.0.0.tar.gz", - "version": "2.0.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 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\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance\nor to any service that implements an API similar to the OpenAI one, for example: [Plusserver](https://www.plusserver.com/en/ai-platform/).\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via 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 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 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 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/).", + "sha256": "0q5fs57n644mad4qvr7pb46dljmdnl4c9wkh2kdhaqnmjsa7zs8j", + "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v2.0.1/integration_openai-v2.0.1.tar.gz", + "version": "2.0.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 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\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance\nor to any service that implements an API similar to the OpenAI one, for example: [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via 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 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 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 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/).", "homepage": "https://github.com/nextcloud/integration_openai", "licenses": [ "agpl" ] }, "mail": { - "sha256": "1m48zdh7jjmgw7r9y9irp7z22wjippjswy7r60yvsdxbac765n14", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.6.0/mail-v3.6.0.tar.gz", - "version": "3.6.0", + "sha256": "1w6bww8wc42biz1zjf4fxgf60ryh1cdsm8b6ji3fhsqjlmkvs4ly", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.6.1/mail-v3.6.1.tar.gz", + "version": "3.6.1", "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://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": [ @@ -140,9 +140,9 @@ ] }, "memories": { - "sha256": "02l9rq117x7x4nra1f50fkn7yr3cpbjnsq9nlr7rnsn9qsf5rrw9", - "url": "https://github.com/pulsejet/memories/releases/download/v7.2.0/memories.tar.gz", - "version": "7.2.0", + "sha256": "1wahnkc253bgm0bqciyhfh1iyl8girbj8mzdd29l0k1bks8fr4qc", + "url": "https://github.com/pulsejet/memories/releases/download/v7.3.1/memories.tar.gz", + "version": "7.3.1", "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **๐Ÿ“ธ Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **โช Rewind**: Jump to any time in the past instantly and relive your memories.\n- **๐Ÿค– AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **๐Ÿ–ผ๏ธ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **๐Ÿซฑ๐Ÿปโ€๐Ÿซฒ๐Ÿป External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **๐Ÿ“ฑ Mobile Support**: Work from any device, of any shape and size through the web app.\n- **โœ๏ธ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **๐Ÿ“ฆ Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **๐Ÿ“น Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **๐Ÿ—บ๏ธ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **๐Ÿ“ฆ Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **โšก๏ธ Performance**: Do all this very fast.\n\n## ๐Ÿš€ Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the ๐Ÿ“ท Memories app in Nextcloud and set the directory containing your photos.", "homepage": "https://memories.gallery", "licenses": [ @@ -170,9 +170,9 @@ ] }, "notify_push": { - "sha256": "0zsjr3zr8c686pkgsmhjg1ssnzvc9flkyy1x571wk7lx7lfrvrd1", - "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.10/notify_push-v0.6.10.tar.gz", - "version": "0.6.10", + "sha256": "1w0nb74q5ishwsd9xhgjlp5ik159xjfp5i2cczi0fmwlb185n1ik", + "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.11/notify_push-v0.6.11.tar.gz", + "version": "0.6.11", "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions", "homepage": "", "licenses": [ @@ -240,9 +240,9 @@ ] }, "spreed": { - "sha256": "1d6y473xnlc2n3k9hqb2n2zk780pran77k4frbgfyikinbadd1ci", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v18.0.7/spreed-v18.0.7.tar.gz", - "version": "18.0.7", + "sha256": "0mz6cb2janafday60dw7ga42c67lpqzjpw0gli6jj90pzcc4by72", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v18.0.8/spreed-v18.0.8.tar.gz", + "version": "18.0.8", "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": [ @@ -250,9 +250,9 @@ ] }, "tasks": { - "sha256": "0a1wpb9f08iqxl9vjp0slxwzn0w67ilpk21dsi0nhpm28ns2mhyc", - "url": "https://github.com/nextcloud/tasks/releases/download/v0.15.0/tasks.tar.gz", - "version": "0.15.0", + "sha256": "1g2wqsm9kjm7dri75ghix2hb5vby3vy3ibcvmwfdwsab3a12xbrg", + "url": "https://github.com/nextcloud/tasks/releases/download/v0.16.0/tasks.tar.gz", + "version": "0.16.0", "description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal โ€ฆ - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.", "homepage": "https://github.com/nextcloud/tasks/", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/29.json b/pkgs/servers/nextcloud/packages/29.json index f7669624b3a1..ecbd49f39bd1 100644 --- a/pkgs/servers/nextcloud/packages/29.json +++ b/pkgs/servers/nextcloud/packages/29.json @@ -1,8 +1,8 @@ { "bookmarks": { - "sha256": "06pprhlaaqdha2nmfdcf76mhh48hdr5jlv88snxji8lpflv50wr5", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.3/bookmarks-13.1.3.tar.gz", - "version": "13.1.3", + "sha256": "0i070c5a66yxs8h7w6r9wi0n1bf41q4vrhvwr4vybi1siwr3psv6", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.0.2/bookmarks-14.0.2.tar.gz", + "version": "14.0.2", "description": "- ๐Ÿ“‚ Sort bookmarks into folders\n- ๐Ÿท Add tags and personal notes\n- ๐Ÿ” Full-text search\n- ๐Ÿ“ฒ Synchronize with all your browsers and devices\n- ๐Ÿ‘ช Share bookmarks with other users and publicly\n- โ˜  Find broken links\n- โš› Generate RSS feeds of your collections\n- ๐Ÿ“” Read archived versions of your links in case they are depublished\n- ๐Ÿ’ฌ Create new bookmarks directly from within Nextcloud Talk\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": [ @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "04wka70zfz36ccad755vq7wnnjid69ws252jf6nyw614dwr5idvh", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.1/calendar-v4.7.1.tar.gz", - "version": "4.7.1", + "sha256": "0zm2a63f99q7n1qw2n3p4pk50j5v4q24vpgndk4nnvaz6c792rzg", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.4/calendar-v4.7.4.tar.gz", + "version": "4.7.4", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* ๐Ÿš€ **Integration with other Nextcloud apps!** Currently Contacts - more to come.\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 with a due date directly in the calendar\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": [ @@ -80,9 +80,9 @@ ] }, "gpoddersync": { - "sha256": "1lm8lqvs1mvb3i2a8b5j9g7b26f747jfp696b9ima0hgpw8ycbfs", - "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.8.3/gpoddersync.tar.gz", - "version": "3.8.3", + "sha256": "1hk052864mb49crmsy2m9alv22rk7ns6m6q7l372j7py9gr8rf60", + "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.9.0/gpoddersync.tar.gz", + "version": "3.9.0", "description": "Expose GPodder API to sync podcast consumer apps like AntennaPod", "homepage": "https://github.com/thrillfall/nextcloud-gpodder", "licenses": [ @@ -90,9 +90,9 @@ ] }, "groupfolders": { - "sha256": "0cg81d75dg96zp09jy4yzg65v14wf99c2snnj304v4dia410c8a3", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.5/groupfolders-v16.0.5.tar.gz", - "version": "16.0.5", + "sha256": "1x765bd5qd88rpa786pvj74psc52zbivk73pxna6nmhn9v0pmpms", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.0/groupfolders-v17.0.0.tar.gz", + "version": "17.0.0", "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.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -110,19 +110,19 @@ ] }, "integration_openai": { - "sha256": "1x9w13xljh8h8n7hic4ffxsk7y63x9yghr1450ng2p68y6vjsg4g", - "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v2.0.0/integration_openai-v2.0.0.tar.gz", - "version": "2.0.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 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\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance\nor to any service that implements an API similar to the OpenAI one, for example: [Plusserver](https://www.plusserver.com/en/ai-platform/).\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via 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 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 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 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/).", + "sha256": "0q5fs57n644mad4qvr7pb46dljmdnl4c9wkh2kdhaqnmjsa7zs8j", + "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v2.0.1/integration_openai-v2.0.1.tar.gz", + "version": "2.0.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 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\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance\nor to any service that implements an API similar to the OpenAI one, for example: [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via 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 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 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 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/).", "homepage": "https://github.com/nextcloud/integration_openai", "licenses": [ "agpl" ] }, "mail": { - "sha256": "1m48zdh7jjmgw7r9y9irp7z22wjippjswy7r60yvsdxbac765n14", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.6.0/mail-v3.6.0.tar.gz", - "version": "3.6.0", + "sha256": "1w6bww8wc42biz1zjf4fxgf60ryh1cdsm8b6ji3fhsqjlmkvs4ly", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.6.1/mail-v3.6.1.tar.gz", + "version": "3.6.1", "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://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": [ @@ -130,8 +130,8 @@ ] }, "maps": { - "sha256": "18gln06hgljgnr90ki95nl7b8986ivf3cymr6hajilszlr77hk22", - "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0-1-nightly/maps-1.4.0-1-nightly.tar.gz", + "sha256": "1gqms3rrdpjmpb1h5d72b4lwbvsl8p10zwnkhgnsmvfcf93h3r1c", + "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0/maps-1.4.0.tar.gz", "version": "1.4.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", @@ -140,9 +140,9 @@ ] }, "memories": { - "sha256": "02l9rq117x7x4nra1f50fkn7yr3cpbjnsq9nlr7rnsn9qsf5rrw9", - "url": "https://github.com/pulsejet/memories/releases/download/v7.2.0/memories.tar.gz", - "version": "7.2.0", + "sha256": "1wahnkc253bgm0bqciyhfh1iyl8girbj8mzdd29l0k1bks8fr4qc", + "url": "https://github.com/pulsejet/memories/releases/download/v7.3.1/memories.tar.gz", + "version": "7.3.1", "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **๐Ÿ“ธ Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **โช Rewind**: Jump to any time in the past instantly and relive your memories.\n- **๐Ÿค– AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **๐Ÿ–ผ๏ธ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **๐Ÿซฑ๐Ÿปโ€๐Ÿซฒ๐Ÿป External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **๐Ÿ“ฑ Mobile Support**: Work from any device, of any shape and size through the web app.\n- **โœ๏ธ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **๐Ÿ“ฆ Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **๐Ÿ“น Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **๐Ÿ—บ๏ธ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **๐Ÿ“ฆ Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **โšก๏ธ Performance**: Do all this very fast.\n\n## ๐Ÿš€ Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the ๐Ÿ“ท Memories app in Nextcloud and set the directory containing your photos.", "homepage": "https://memories.gallery", "licenses": [ @@ -170,9 +170,9 @@ ] }, "notify_push": { - "sha256": "0zsjr3zr8c686pkgsmhjg1ssnzvc9flkyy1x571wk7lx7lfrvrd1", - "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.10/notify_push-v0.6.10.tar.gz", - "version": "0.6.10", + "sha256": "1w0nb74q5ishwsd9xhgjlp5ik159xjfp5i2cczi0fmwlb185n1ik", + "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.11/notify_push-v0.6.11.tar.gz", + "version": "0.6.11", "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions", "homepage": "", "licenses": [ @@ -240,9 +240,9 @@ ] }, "spreed": { - "sha256": "07zjf8ci2jysrv0bagcrdfz2afzafha7fs3045p5kzb9zr6yvpy5", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.0/spreed-v19.0.0.tar.gz", - "version": "19.0.0", + "sha256": "106y9mbnwga7pfhydrd8rjpcr89ir3fjrdn81xykyzqwrq29fxgs", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.1/spreed-v19.0.1.tar.gz", + "version": "19.0.1", "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": [ @@ -250,9 +250,9 @@ ] }, "tasks": { - "sha256": "0a1wpb9f08iqxl9vjp0slxwzn0w67ilpk21dsi0nhpm28ns2mhyc", - "url": "https://github.com/nextcloud/tasks/releases/download/v0.15.0/tasks.tar.gz", - "version": "0.15.0", + "sha256": "1g2wqsm9kjm7dri75ghix2hb5vby3vy3ibcvmwfdwsab3a12xbrg", + "url": "https://github.com/nextcloud/tasks/releases/download/v0.16.0/tasks.tar.gz", + "version": "0.16.0", "description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal โ€ฆ - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.", "homepage": "https://github.com/nextcloud/tasks/", "licenses": [ From dd7a48b54fc63a165cde8300f232f375f50431dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 23 May 2024 13:40:14 -0700 Subject: [PATCH 05/61] nextcloud-notify_push: 0.6.10 -> 0.6.11 Diff: https://github.com/nextcloud/notify_push/compare/v0.6.10...v0.6.11 Changelog: https://github.com/nextcloud/notify_push/releases/tag/v0.6.11 --- pkgs/servers/nextcloud/notify_push.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix index 3d92584d2f93..e0f81b04b4d8 100644 --- a/pkgs/servers/nextcloud/notify_push.nix +++ b/pkgs/servers/nextcloud/notify_push.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "notify_push"; - version = "0.6.10"; + version = "0.6.11"; src = fetchFromGitHub { owner = "nextcloud"; repo = pname; rev = "v${version}"; - hash = "sha256-Kk9l9jowerxh5nsKQ5TOaijSJbs0DgJKaRl9tlAttzI="; + hash = "sha256-241p+9gLyEe2Mkc0GQ/Z0BjbxV5OZfbDC6kqfq7ATaE="; }; - cargoHash = "sha256-wtmYWQOYy8JmbSxgrXkFtDe6KmJJIMVpcELQj06II4k="; + cargoHash = "sha256-fGbRmrOEbs9nGZhcu1w7qOIwYMaTohaUFb7dilPuTHc="; passthru = rec { test_client = rustPlatform.buildRustPackage { @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildAndTestSubdir = "test_client"; - cargoHash = "sha256-sPUlke8KI6sX2HneeoZh8RMG7aydC43c37V179ipukU="; + cargoHash = "sha256-RJnNwSDwIA0M+BufBKT9a/pyHwpcpJFR//j0fE4U3gE="; meta = meta // { mainProgram = "test_client"; @@ -32,9 +32,9 @@ rustPlatform.buildRustPackage rec { }; tests = { inherit (nixosTests.nextcloud) - with-postgresql-and-redis26 with-postgresql-and-redis27 - with-postgresql-and-redis28; + with-postgresql-and-redis28 + with-postgresql-and-redis29; inherit test_client; }; }; From dcf2ccbccd86c32ab82facf2cf4a2004168cca4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 04:33:18 +0000 Subject: [PATCH 06/61] btrfs-assistant: 2.0 -> 2.1.1 --- pkgs/by-name/bt/btrfs-assistant/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bt/btrfs-assistant/package.nix b/pkgs/by-name/bt/btrfs-assistant/package.nix index d3bdc7498022..646a95c7af56 100644 --- a/pkgs/by-name/bt/btrfs-assistant/package.nix +++ b/pkgs/by-name/bt/btrfs-assistant/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "btrfs-assistant"; - version = "2.0"; + version = "2.1.1"; src = fetchFromGitLab { owner = "btrfs-assistant"; repo = "btrfs-assistant"; rev = finalAttrs.version; - hash = "sha256-nE8Vsc0leXWhbrjMgJDef6jl9MqdojRniGcvUmrQNUQ="; + hash = "sha256-I4nbQmHwk84qN1SngKzKnPtQN5Dz1QSSEpHJxV8wkJw="; }; nativeBuildInputs = [ From 5e7a0de3b626bfae65d2be1eb0aba3aa14ed260d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 05:57:48 +0000 Subject: [PATCH 07/61] semgrep: 1.73.0 -> 1.74.0 --- pkgs/tools/security/semgrep/common.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/semgrep/common.nix b/pkgs/tools/security/semgrep/common.nix index 1ae95ed6572a..d51853953bf4 100644 --- a/pkgs/tools/security/semgrep/common.nix +++ b/pkgs/tools/security/semgrep/common.nix @@ -1,9 +1,9 @@ { lib }: rec { - version = "1.73.0"; + version = "1.74.0"; - srcHash = "sha256-INgc1rTN5K5mcV3u4Jktn7cqu87Z5sLnn70CxuZlbPA="; + srcHash = "sha256-PH0fTT6n6o3Jtuq+cyyRb048Tuv3VGNduCZCEKTXMrE="; # submodule dependencies # these are fetched so we: @@ -25,19 +25,19 @@ rec { core = { x86_64-linux = { platform = "any"; - hash = "sha256-NSleztCh9+VEsezypbIS74Ll+KP/Nb/zqAWum7tdoMc="; + hash = "sha256-ZA5KlbSLkC0IJGqyK0XhuDKRx53987vf53vSM0zwD9k="; }; aarch64-linux = { platform = "musllinux_1_0_aarch64.manylinux2014_aarch64"; - hash = "sha256-tySsh+CLciJRXpr4oJa/h6Zh0Fw8c+EDdSNNRwOfKpg="; + hash = "sha256-aHq87uzk9TtnlMDfAS6492ocXRJSHdBinng0hu2xLas="; }; x86_64-darwin = { platform = "macosx_10_14_x86_64"; - hash = "sha256-jO8H0wSjW34ynx+WN0oP8mpuAsfMva7H86gg72WrsBY="; + hash = "sha256-OorDXQ0oYHV8aPu9o1dQAd22u78/EjpUWA2yPYG0S9E="; }; aarch64-darwin = { platform = "macosx_11_0_arm64"; - hash = "sha256-EizxrTI7b4qSp8nLwXCnvJqKwZje7+WXyw5z+Yk6bvQ="; + hash = "sha256-g8sFLh2V9NDIvAZOaDhMpFxKqbS/S1eKep4v1vlOOo8="; }; }; From a70c84270aa82398895bdc08520971d00f37ab7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 06:49:27 +0000 Subject: [PATCH 08/61] vencord: 1.8.4 -> 1.8.6 --- pkgs/by-name/ve/vencord/package-lock.json | 167 +++++++++++++++------- pkgs/by-name/ve/vencord/package.nix | 8 +- 2 files changed, 117 insertions(+), 58 deletions(-) diff --git a/pkgs/by-name/ve/vencord/package-lock.json b/pkgs/by-name/ve/vencord/package-lock.json index a5c9f7b54397..e59078145c53 100644 --- a/pkgs/by-name/ve/vencord/package-lock.json +++ b/pkgs/by-name/ve/vencord/package-lock.json @@ -1,12 +1,12 @@ { "name": "vencord", - "version": "1.8.2", + "version": "1.8.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vencord", - "version": "1.8.2", + "version": "1.8.6", "license": "GPL-3.0-or-later", "dependencies": { "@sapphi-red/web-noise-suppressor": "0.3.3", @@ -43,11 +43,12 @@ "standalone-electron-types": "^1.0.0", "stylelint": "^15.6.0", "stylelint-config-standard": "^33.0.0", + "ts-patch": "^3.1.2", "tsx": "^3.12.7", "type-fest": "^3.9.0", - "typescript": "^5.0.4", - "zip-local": "^0.3.5", - "zustand": "^3.7.2" + "typescript": "^5.4.5", + "typescript-transform-paths": "^3.4.7", + "zip-local": "^0.3.5" }, "engines": { "node": ">=18", @@ -227,9 +228,9 @@ } }, "node_modules/@csstools/selector-specificity": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.0.3.tgz", - "integrity": "sha512-KEPNw4+WW5AVEIyzC80rTbWEUatTW2lXpN8+8ILC8PiPeWPjwUzrPZDIOZ2wwqDmeqOYTdSGyL3+vE5GC3FB3Q==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.1.1.tgz", + "integrity": "sha512-a7cxGcJ2wIlMFLlh8z2ONm+715QkPHiyJcxwQlKOz/03GPw1COpfhcmC9wm4xlZfp//jWHNNMwzjtqHXVWU9KA==", "dev": true, "funding": [ { @@ -803,9 +804,9 @@ "dev": true }, "node_modules/@types/lodash": { - "version": "4.17.1", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.1.tgz", - "integrity": "sha512-X+2qazGS3jxLAIz5JDXDzglAF3KpijdhFxlf/V1+hEsOUc+HnWi81L/uv/EvGuV90WY+7mPGFCUDGfQC3Gj95Q==", + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha512-wYCP26ZLxaT3R39kiN2+HcJ4kTd3U1waI/cY7ivWYqFP6pW3ZNpvi6Wd6PHZx7T/t8z0vlkXMg3QYLa7DZ/IJQ==", "dev": true }, "node_modules/@types/minimist": { @@ -836,9 +837,9 @@ "dev": true }, "node_modules/@types/react": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.1.tgz", - "integrity": "sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw==", + "version": "18.3.3", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz", + "integrity": "sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==", "dev": true, "dependencies": { "@types/prop-types": "*", @@ -1329,12 +1330,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -2308,9 +2309,9 @@ } }, "node_modules/eslint-plugin-path-alias": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-path-alias/-/eslint-plugin-path-alias-1.0.0.tgz", - "integrity": "sha512-FXus57yC+Zd3sMv46pbloXYwFeNVNHJqlACr9V68FG/IzGFBBokGJpmjDbEjpt8ZCeVSndUubeDWWl2A8sCNVQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-path-alias/-/eslint-plugin-path-alias-1.1.0.tgz", + "integrity": "sha512-fDsuIsB11cvZ+5LDaOMEn1CkLFeOLXdvp9Mqi/9ZL2sAnVlRPKlMH3UPT7onFTWcFrNllYwrQ/+7LbzagGOA9A==", "dev": true, "dependencies": { "nanomatch": "^1.2.13" @@ -2619,9 +2620,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" @@ -3101,6 +3102,7 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", "dev": true, "dependencies": { "once": "^1.3.0", @@ -3541,12 +3543,12 @@ } }, "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", + "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", "dev": true, "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": { @@ -3574,6 +3576,15 @@ "node": "*" } }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/minimist-options": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", @@ -3931,6 +3942,12 @@ "node": ">=8" } }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true + }, "node_modules/path-type": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", @@ -3947,9 +3964,9 @@ "dev": true }, "node_modules/picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", + "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==", "dev": true }, "node_modules/picomatch": { @@ -4015,9 +4032,9 @@ } }, "node_modules/postcss-selector-parser": { - "version": "6.0.16", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz", - "integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz", + "integrity": "sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ==", "dev": true, "dependencies": { "cssesc": "^3.0.0", @@ -4286,6 +4303,23 @@ "node": ">=0.10.0" } }, + "node_modules/resolve": { + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "dev": true, + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", @@ -4669,9 +4703,9 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.17", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz", - "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==", + "version": "3.0.18", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz", + "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==", "dev": true }, "node_modules/split-string": { @@ -4941,6 +4975,18 @@ "node": ">=14.18" } }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/svg-tags": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz", @@ -5103,6 +5149,24 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/ts-patch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/ts-patch/-/ts-patch-3.1.2.tgz", + "integrity": "sha512-n58F5AqjUMdp9RAKq+E1YBkmONltPVbt1nN+wrmZXoYZek6QcvaTuqvKMhYhr5BxtC53kD/exxIPA1cP1RQxsA==", + "dev": true, + "dependencies": { + "chalk": "^4.1.2", + "global-prefix": "^3.0.0", + "minimist": "^1.2.8", + "resolve": "^1.22.2", + "semver": "^7.5.4", + "strip-ansi": "^6.0.1" + }, + "bin": { + "ts-patch": "bin/ts-patch.js", + "tspc": "bin/tspc.js" + } + }, "node_modules/tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", @@ -5247,6 +5311,18 @@ "node": ">=14.17" } }, + "node_modules/typescript-transform-paths": { + "version": "3.4.7", + "resolved": "https://registry.npmjs.org/typescript-transform-paths/-/typescript-transform-paths-3.4.7.tgz", + "integrity": "sha512-1Us1kdkdfKd2unbkBAOV2HHRmbRBYpSuk9nJ7cLD2hP4QmfToiM/VpxNlhJc1eezVwVqSKSBjNSzZsK/fWR/9A==", + "dev": true, + "dependencies": { + "minimatch": "^3.0.4" + }, + "peerDependencies": { + "typescript": ">=3.6.5" + } + }, "node_modules/unbzip2-stream": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", @@ -5572,23 +5648,6 @@ "jszip": "^2.6.1", "q": "^1.4.1" } - }, - "node_modules/zustand": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/zustand/-/zustand-3.7.2.tgz", - "integrity": "sha512-PIJDIZKtokhof+9+60cpockVOq05sJzHCriyvaLBmEJixseQ1a5Kdov6fWZfWOu5SK9c+FhH1jU0tntLxRJYMA==", - "dev": true, - "engines": { - "node": ">=12.7.0" - }, - "peerDependencies": { - "react": ">=16.8" - }, - "peerDependenciesMeta": { - "react": { - "optional": true - } - } } } } diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index 5d8074d70cb2..4b91092d034a 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -5,8 +5,8 @@ , buildWebExtension ? false }: let - version = "1.8.4"; - gitHash = "a5eb55e"; + version = "1.8.6"; + gitHash = "1866e4d"; in buildNpmPackage rec { pname = "vencord"; @@ -16,7 +16,7 @@ buildNpmPackage rec { owner = "Vendicated"; repo = "Vencord"; rev = "v${version}"; - hash = "sha256-FbU1Zsz/84oSOCOSWunA5nn5qFGLQ4W3uqsbYytF/7c="; + hash = "sha256-akCuZcB7psZlMAnDKJU3bK1K++ACjHxTUFxl5DRdtQ4="; }; ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: { @@ -34,7 +34,7 @@ buildNpmPackage rec { npmRebuildFlags = [ "|| true" ]; makeCacheWritable = true; - npmDepsHash = "sha256-yb9Dbu9Rb1+xV/XiDP49uaQdBP9uM+oimzkeznpGrKw="; + npmDepsHash = "sha256-HYjZ6DkyQAImiqHSnZu4bZ0ItROZt12DvoIMGcTlq+U="; npmFlags = [ "--legacy-peer-deps" ]; npmBuildScript = if buildWebExtension then "buildWeb" else "build"; npmBuildFlags = [ "--" "--standalone" "--disable-updater" ]; From d5d81bb96171947d5d5a5448d1bccb874842f967 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 16:21:55 +0000 Subject: [PATCH 09/61] stylelint: 16.5.0 -> 16.6.0 --- pkgs/development/tools/analysis/stylelint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/stylelint/default.nix b/pkgs/development/tools/analysis/stylelint/default.nix index f2c478ea49cf..f60751bc33b1 100644 --- a/pkgs/development/tools/analysis/stylelint/default.nix +++ b/pkgs/development/tools/analysis/stylelint/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "stylelint"; - version = "16.5.0"; + version = "16.6.0"; src = fetchFromGitHub { owner = "stylelint"; repo = "stylelint"; rev = version; - hash = "sha256-kbcf0OPAIeEdh5YI2qqaLJww+ZejfXt/llJTK10nE0M="; + hash = "sha256-yNEXtuemNzpy7gIlVUWM5crP0LpLHmiVYznomC5eGYs="; }; - npmDepsHash = "sha256-tENUngFWjrmsJErvbmFflwGL0uxou0vQjC/MwfCpm+Y="; + npmDepsHash = "sha256-e9helwaAiW3KtPHOWN7S0VxG87nKj6X4lTHTEdXoRZc="; dontNpmBuild = true; From 04445ac13756f849fe1a09410803388de4c18e31 Mon Sep 17 00:00:00 2001 From: Atemu Date: Fri, 24 May 2024 19:04:25 +0200 Subject: [PATCH 10/61] nextcloudPackages.richdocuments: init This is the "Nextcloud Office" app that offers Collabora CODE integration. You still need Collabora CODE itself running somewhere but this is one step towards https://github.com/NixOS/nixpkgs/issues/218878. --- pkgs/servers/nextcloud/packages/27.json | 10 ++++++++++ pkgs/servers/nextcloud/packages/28.json | 10 ++++++++++ pkgs/servers/nextcloud/packages/29.json | 10 ++++++++++ pkgs/servers/nextcloud/packages/nextcloud-apps.json | 1 + 4 files changed, 31 insertions(+) diff --git a/pkgs/servers/nextcloud/packages/27.json b/pkgs/servers/nextcloud/packages/27.json index 44ae57d67984..2941c543d1ff 100644 --- a/pkgs/servers/nextcloud/packages/27.json +++ b/pkgs/servers/nextcloud/packages/27.json @@ -269,6 +269,16 @@ "agpl" ] }, + "richdocuments": { + "sha256": "161v7gb0zg3anr3322ar2m3f6y0zf5cqrwfdsb04p6pqvfpsy9wh", + "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.2.10/richdocuments-v8.2.10.tar.gz", + "version": "8.2.10", + "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": [ + "agpl" + ] + }, "spreed": { "sha256": "0699c9xfmzk48q0f48lxw16h9l2300w6vp1sn2vb8wr76fbhm9kf", "url": "https://github.com/nextcloud-releases/spreed/releases/download/v17.1.8/spreed-v17.1.8.tar.gz", diff --git a/pkgs/servers/nextcloud/packages/28.json b/pkgs/servers/nextcloud/packages/28.json index 0c83f7f04bd9..bf2ecea7a916 100644 --- a/pkgs/servers/nextcloud/packages/28.json +++ b/pkgs/servers/nextcloud/packages/28.json @@ -239,6 +239,16 @@ "agpl" ] }, + "richdocuments": { + "sha256": "1rpbzcxi6n656351rlx1gpg2nwz0z5i4107adls9fh1cdvj9vqs6", + "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.3.7/richdocuments-v8.3.7.tar.gz", + "version": "8.3.7", + "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": [ + "agpl" + ] + }, "spreed": { "sha256": "1d6y473xnlc2n3k9hqb2n2zk780pran77k4frbgfyikinbadd1ci", "url": "https://github.com/nextcloud-releases/spreed/releases/download/v18.0.7/spreed-v18.0.7.tar.gz", diff --git a/pkgs/servers/nextcloud/packages/29.json b/pkgs/servers/nextcloud/packages/29.json index f7669624b3a1..0bb68e9e9164 100644 --- a/pkgs/servers/nextcloud/packages/29.json +++ b/pkgs/servers/nextcloud/packages/29.json @@ -239,6 +239,16 @@ "agpl" ] }, + "richdocuments": { + "sha256": "1gbgygb7ymsg7gjb29r3caglsrimcrk7yn4kka5f8swv9b1k0qx6", + "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.4.2/richdocuments-v8.4.2.tar.gz", + "version": "8.4.2", + "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": [ + "agpl" + ] + }, "spreed": { "sha256": "07zjf8ci2jysrv0bagcrdfz2afzafha7fs3045p5kzb9zr6yvpy5", "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.0/spreed-v19.0.0.tar.gz", diff --git a/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/pkgs/servers/nextcloud/packages/nextcloud-apps.json index b7a48a0baca7..3affc750f982 100644 --- a/pkgs/servers/nextcloud/packages/nextcloud-apps.json +++ b/pkgs/servers/nextcloud/packages/nextcloud-apps.json @@ -26,6 +26,7 @@ , "previewgenerator": "agpl3Plus" , "qownnotesapi": "agpl3Plus" , "registration": "agpl3Plus" +, "richdocuments": "agpl3Only" , "spreed": "agpl3Plus" , "tasks": "agpl3Plus" , "twofactor_nextcloud_notification": "agpl3Only" From cca07f139dc2b01fee4f241d43b450a8df4b2e89 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 25 May 2024 00:12:37 +0200 Subject: [PATCH 11/61] wasmtime: fix build on aarch64-darwin The check phase fails on aarch64-darwin because of: ``` $ nix-build -A wasmtime ... buildPhase completed in 1 minutes 41 seconds Running phase: checkPhase Executing cargoCheckHook ++ cargo test -j 10 --profile release --target aarch64-apple-darwin --frozen -- --test-threads=10 ... > error: linker `rust-lld` not found > | > = note: No such file or directory (os error 2) > > error: could not compile `wasi-preview1-component-adapter` (lib) due to 1 previous error ``` I tried to bring `lld` into scope and set `RUSTFLAGS = "-C linker=lld` but I couldn't get the tests to build. So I just disabled them on aarch64-darwin. --- .../interpreters/wasmtime/default.nix | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index afa65741892c..06bff777ddbf 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub, Security, lib, stdenv }: +{ rustPlatform, rustfmt, fetchFromGitHub, Security, lib, stdenv }: rustPlatform.buildRustPackage rec { pname = "wasmtime"; @@ -21,11 +21,20 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional stdenv.isDarwin Security; - # SIMD tests are only executed on platforms that support all - # required processor features (e.g. SSE3, SSSE3 and SSE4.1 on x86_64): - # https://github.com/bytecodealliance/wasmtime/blob/v9.0.0/cranelift/codegen/src/isa/x64/mod.rs#L220 - doCheck = with stdenv.buildPlatform; (isx86_64 -> sse3Support && ssse3Support && sse4_1Support); - cargoTestFlags = ["--package" "wasmtime-runtime"]; + # rustfmt is brought into scope to fix the following + # warning: cranelift-codegen@0.108.0: + # Failed to run `rustfmt` on ISLE-generated code: Os + # { code: 2, kind: NotFound, message: "No such file or directory" } + nativeBuildInputs = [ rustfmt ]; + + doCheck = with stdenv.buildPlatform; + # SIMD tests are only executed on platforms that support all + # required processor features (e.g. SSE3, SSSE3 and SSE4.1 on x86_64): + # https://github.com/bytecodealliance/wasmtime/blob/v9.0.0/cranelift/codegen/src/isa/x64/mod.rs#L220 + (isx86_64 -> sse3Support && ssse3Support && sse4_1Support) && + # The dependency `wasi-preview1-component-adapter` fails to build because of: + # error: linker `rust-lld` not found + !(isAarch64 && stdenv.isDarwin); postInstall = '' # move libs from out to dev From cbb848547a29a483935ee3baff3813a988698756 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 25 May 2024 00:28:13 +0200 Subject: [PATCH 12/61] wasmtime: disable checks on all aarch64 platforms --- pkgs/development/interpreters/wasmtime/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 06bff777ddbf..f880cf81a721 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { (isx86_64 -> sse3Support && ssse3Support && sse4_1Support) && # The dependency `wasi-preview1-component-adapter` fails to build because of: # error: linker `rust-lld` not found - !(isAarch64 && stdenv.isDarwin); + !isAarch64; postInstall = '' # move libs from out to dev From c15976a9a23062a2197c80ddfb97fb6977b65abc Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Fri, 24 May 2024 18:37:02 -0400 Subject: [PATCH 13/61] brave: 1.66.110 -> 1.66.115 https://community.brave.com/t/release-channel-1-66-115/550022 --- .../networking/browsers/brave/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index acd1b4d8373f..e63bda123572 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) if stdenv.isAarch64 then { pname = "brave"; - version = "1.66.110"; - url = "https://github.com/brave/brave-browser/releases/download/v1.66.110/brave-browser_1.66.110_arm64.deb"; - hash = "sha256-yElWlzGdI+mopmPgXTABXncoufojHngRX88TCy3AE+E="; + version = "1.66.115"; + url = "https://github.com/brave/brave-browser/releases/download/v1.66.115/brave-browser_1.66.115_arm64.deb"; + hash = "sha256-zOrulR0a/iRYtjdFiyN0V6q0KktD7G0ZrEYSXfIwaL8="; platform = "aarch64-linux"; } else if stdenv.isx86_64 then { pname = "brave"; - version = "1.66.110"; - url = "https://github.com/brave/brave-browser/releases/download/v1.66.110/brave-browser_1.66.110_amd64.deb"; - hash = "sha256-2KtTI9QODfQR25YzXJMXJspuzCS11FpDx2L1B8DWmmc="; + version = "1.66.115"; + url = "https://github.com/brave/brave-browser/releases/download/v1.66.115/brave-browser_1.66.115_amd64.deb"; + hash = "sha256-TMQips7dyxKfYEin7QJCV0ru4NHi4j3DjLh2fmzuYeQ="; platform = "x86_64-linux"; } else From 989b3c9f1fedc7640687db8e489147ca5b5d6988 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 02:45:02 +0000 Subject: [PATCH 14/61] mssql_jdbc: 12.6.1 -> 12.6.2 --- pkgs/servers/sql/mssql/jdbc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mssql/jdbc/default.nix b/pkgs/servers/sql/mssql/jdbc/default.nix index c40de0cb219d..2cafd510c51d 100644 --- a/pkgs/servers/sql/mssql/jdbc/default.nix +++ b/pkgs/servers/sql/mssql/jdbc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mssql-jdbc"; - version = "12.6.1"; + version = "12.6.2"; src = fetchurl { url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/mssql-jdbc-${version}.jre8.jar"; - sha256 = "sha256-OtherTxRxxE57u20nl1sD7mpV6tcHD9qL/C1AJOm0Qw="; + sha256 = "sha256-PR6oWlbCLPtVUMspw+DrQ8VhjXu4Mgqlpx9kSKds7S0="; }; dontUnpack = true; From 37245e94f3da07bedc9ea34364b015fef1af40c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 02:46:05 +0000 Subject: [PATCH 15/61] lobster: 2023.13 -> 2024.0 --- pkgs/development/compilers/lobster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/lobster/default.nix b/pkgs/development/compilers/lobster/default.nix index 131fdbfef98f..ec961a22cb1b 100644 --- a/pkgs/development/compilers/lobster/default.nix +++ b/pkgs/development/compilers/lobster/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lobster"; - version = "2023.13"; + version = "2024.0"; src = fetchFromGitHub { owner = "aardappel"; repo = "lobster"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-7lMIIJ3iduyxZKwK65tle3c+az2G2Mpi4JwAeCCsTxw="; + sha256 = "sha256-EBgb442wI9qU/o6EVCwPnMtPuv1f6Xk2+CZpKWXf3tY="; }; nativeBuildInputs = [ cmake ]; From 33d5759094fabea9836d2d1876e69edf6fb78752 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 03:21:49 +0000 Subject: [PATCH 16/61] media-downloader: 4.6.0 -> 4.7.0 --- pkgs/applications/video/media-downloader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/media-downloader/default.nix b/pkgs/applications/video/media-downloader/default.nix index e11b1b1b5bb2..189edf1f48f1 100644 --- a/pkgs/applications/video/media-downloader/default.nix +++ b/pkgs/applications/video/media-downloader/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "media-downloader"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "media-downloader"; rev = finalAttrs.version; - hash = "sha256-sl82ZnRqFE3z+EGM+m5rAy4MMrbgkY4PZgyc94x7XUI="; + hash = "sha256-ykPYxRgzKZrA0KwS1FoxZOkSL+7TbLgy0yLfs7Iqpf4="; }; nativeBuildInputs = [ From bc9cbc10125b2aa21c7809162d330b003ead32e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 03:22:50 +0000 Subject: [PATCH 17/61] rain: 1.8.6 -> 1.9.0 --- pkgs/development/tools/rain/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rain/default.nix b/pkgs/development/tools/rain/default.nix index 8132c2370458..58fdb1f97f55 100644 --- a/pkgs/development/tools/rain/default.nix +++ b/pkgs/development/tools/rain/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "rain"; - version = "1.8.6"; + version = "1.9.0"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wQ767MgLSdcNm3Z1HL8VgmUk2tMFmIyACMaMhPr4lmY="; + sha256 = "sha256-a+oKQB2pbheC1wLIQh+g5E/dYCIfdnGEZ7hKsHZrNxs="; }; - vendorHash = "sha256-SXgyxf8pqSZzlMoOissGLBfeXueY4aSkCcd7ahT2KMA="; + vendorHash = "sha256-UBFOtgHf1HNERLWQGJqYlmAd8PKu2Qk49R+gVpdosuk="; subPackages = [ "cmd/rain" ]; From 58634532a68117296ff5906f2a88d617ae3ecf7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 03:37:50 +0000 Subject: [PATCH 18/61] rt-tests: 2.6 -> 2.7 --- pkgs/os-specific/linux/rt-tests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/rt-tests/default.nix b/pkgs/os-specific/linux/rt-tests/default.nix index 8e3a9b0ceb02..a9e3e57d4875 100644 --- a/pkgs/os-specific/linux/rt-tests/default.nix +++ b/pkgs/os-specific/linux/rt-tests/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "rt-tests"; - version = "2.6"; + version = "2.7"; src = fetchurl { url = "https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/snapshot/${pname}-${version}.tar.gz"; - sha256 = "sha256-apRJwRqcyzfmyGCCv5BDN92pKP3Nafa9SkxlZ+Bxrm0="; + sha256 = "sha256-1kfLmB1RPO8Hd7o8tROSyVBWchchc+AGPuOUlM2hR8g="; }; nativeBuildInputs = [ makeWrapper ]; From 36f4cee01098fbee74345aeed7c6183446f9d579 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 03:41:48 +0000 Subject: [PATCH 19/61] jsvc: 1.3.4 -> 1.4.0 --- pkgs/tools/system/jsvc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/jsvc/default.nix b/pkgs/tools/system/jsvc/default.nix index f8f67b0f45f9..9ace8902992e 100644 --- a/pkgs/tools/system/jsvc/default.nix +++ b/pkgs/tools/system/jsvc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jsvc"; - version = "1.3.4"; + version = "1.4.0"; src = fetchurl { url = "https://downloads.apache.org//commons/daemon/source/commons-daemon-${version}-src.tar.gz"; - sha256 = "sha256-30hJ0F5YFmEOZ4IYg/T8HhFySgu4t4uEsh7dUDns674="; + sha256 = "sha256-AFnx6AqmOfAsfh/4ALV9xiA2pbP0sX1h5dPj/9JCj+4="; }; buildInputs = [ commonsDaemon ]; From 368c26931b260cc2e4255764242e9ae039b3615e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 03:45:48 +0000 Subject: [PATCH 20/61] sumo: 1.19.0 -> 1.20.0 --- pkgs/applications/science/networking/sumo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/networking/sumo/default.nix b/pkgs/applications/science/networking/sumo/default.nix index 956691582bda..16ce24ca3e8a 100644 --- a/pkgs/applications/science/networking/sumo/default.nix +++ b/pkgs/applications/science/networking/sumo/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "sumo"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "eclipse"; repo = "sumo"; rev = "v${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-uB7Gy0uX3LsZDeeITyjl7DN76TFJQKgsQs4RoDVfSmY="; + sha256 = "sha256-y/bkdDWrb1KB0EOVSJPfPVYHGp/zQ2+Shb6eLsFQRNQ="; fetchSubmodules = true; }; From 935b530381684fdfe50c58190d364f3f19524ee2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 03:50:50 +0000 Subject: [PATCH 21/61] francis: 1.1.0 -> 24.05.0 --- pkgs/by-name/fr/francis/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fr/francis/package.nix b/pkgs/by-name/fr/francis/package.nix index 95a25ea95a29..173c1ca137a6 100644 --- a/pkgs/by-name/fr/francis/package.nix +++ b/pkgs/by-name/fr/francis/package.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "francis"; - version = "1.1.0"; + version = "24.05.0"; src = fetchFromGitLab { domain = "invent.kde.org"; repo = "francis"; owner = "utilities"; rev = "v${version}"; - hash = "sha256-TvLFzGWb3RROGywhNzCvnFG00PpKC2k+/w1bgwTCESg="; + hash = "sha256-mvB01iFvTmGSGaCdvyMOC8BaIgZgyeyRJEra31w04DI="; }; nativeBuildInputs = [ From 1fab0aff29bad81106f7af75c96ddab0d8aa02d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 03:53:08 +0000 Subject: [PATCH 22/61] genymotion: 3.6.0 -> 3.7.0 --- pkgs/development/mobile/genymotion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index a2e81531c174..80e82ec0208b 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { pname = "genymotion"; - version = "3.6.0"; + version = "3.7.0"; src = fetchurl { url = "https://dl.genymotion.com/releases/genymotion-${version}/genymotion-${version}-linux_x64.bin"; name = "genymotion-${version}-linux_x64.bin"; - sha256 = "sha256-CS1A9udt47bhgnYJqqkCG3z4XaPVHmz417VTsY2ccOA="; + sha256 = "sha256-JBz6rfKm4hX+Mr+xU3VgzxbFKj+SDr9/ulJ6KrmzAnM="; }; nativeBuildInputs = [ makeWrapper which xdg-utils ]; From 5fc469062757548a7adb9240c4ace89f1e9a7d52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 04:08:51 +0000 Subject: [PATCH 23/61] flashprint: 5.8.3 -> 5.8.4 --- pkgs/applications/misc/flashprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/flashprint/default.nix b/pkgs/applications/misc/flashprint/default.nix index affc8c5ad2be..182e219d0e57 100644 --- a/pkgs/applications/misc/flashprint/default.nix +++ b/pkgs/applications/misc/flashprint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "flashprint"; - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { url = "http://www.ishare3d.com/3dapp/public/FlashPrint-5/FlashPrint/flashprint5_${finalAttrs.version}_amd64.deb"; - hash = "sha256-6vBEthQD0HM2D+l+2dwWmdU+XPJpcvZQM+2GMuaf5Pw="; + hash = "sha256-Gr76yG3Qz7bnbm5YerHbpb+yzqhw1LthUb4qIH03VQw="; }; nativeBuildInputs = [ dpkg autoPatchelfHook wrapQtAppsHook ]; From 987cc2cb4434b4e20719c2bacd8cee0c8154bf7b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 04:12:41 +0000 Subject: [PATCH 24/61] commonsFileUpload: 1.4 -> 1.5 --- .../development/libraries/java/commons/fileupload/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/development/libraries/java/commons/fileupload/default.nix index 40c66909213e..6c9235117355 100644 --- a/pkgs/development/libraries/java/commons/fileupload/default.nix +++ b/pkgs/development/libraries/java/commons/fileupload/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "1.4"; + version = "1.5"; pname = "commons-fileupload"; src = fetchurl { url = "mirror://apache/commons/fileupload/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "1avfv4gljp7flra767yzas54vfb6az9s1nhxfjv48jj2x0llxxkx"; + sha256 = "sha256-r7EGiih4qOCbjaL7Wg+plbe0m3CuFWXs/RmbfGLmj1g="; }; installPhase = '' tar xf ${src} From 264eb2fdd0f7bf46cd074d80e745feea0da48a5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 04:46:44 +0000 Subject: [PATCH 25/61] boinc: 8.0.1 -> 8.0.2 --- pkgs/applications/science/misc/boinc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 6a0aafad3e91..0c559a530e08 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "boinc"; - version = "8.0.1"; + version = "8.0.2"; src = fetchFromGitHub { name = "${pname}-${version}-src"; owner = "BOINC"; repo = "boinc"; rev = "client_release/${lib.versions.majorMinor version}/${version}"; - hash = "sha256-pjk9+VRWrFIoHolIEEWlRx89hifLNeFtIi34F1OBD38="; + hash = "sha256-e0zEdiN3QQHj6MNGd1pfaZf3o9rOpCTmuNSJQb3sss4="; }; nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; From b2bf2e68f8220fe54cea7a7b2cc93d8a47921dd6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 11:43:31 +0000 Subject: [PATCH 26/61] mendeley: 2.114.1 -> 2.115.0 --- pkgs/applications/office/mendeley/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 38c4fdb78cd8..aa31b5f55f2e 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -7,13 +7,13 @@ let pname = "mendeley"; - version = "2.114.1"; + version = "2.115.0"; executableName = "${pname}-reference-manager"; src = fetchurl { url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage"; - hash = "sha256-bvX5onyTPc4G+9PcrSXhsfkNbU6DZ5T3ljf+r77bjKw="; + hash = "sha256-ir96BQQ+dlUv2aNU9iQ+jnpeLE3D3ow9RPGstREUWNA="; }; appimageContents = appimageTools.extractType2 { From 510ea77aea1f2f76ffc4064473ac2d09e20b8279 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 11:51:38 +0000 Subject: [PATCH 27/61] angie: 1.4.1 -> 1.5.1 --- pkgs/servers/http/angie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/angie/default.nix b/pkgs/servers/http/angie/default.nix index 233298053b2e..4c447f2b8c75 100644 --- a/pkgs/servers/http/angie/default.nix +++ b/pkgs/servers/http/angie/default.nix @@ -9,12 +9,12 @@ }@args: callPackage ../nginx/generic.nix args rec { - version = "1.4.1"; + version = "1.5.1"; pname = if withQuic then "angieQuic" else "angie"; src = fetchurl { url = "https://download.angie.software/files/angie-${version}.tar.gz"; - hash = "sha256-g6PyuyulnltnZJWiZ01iYG1k6Lz5nO+gneb8M4q3WHo="; + hash = "sha256-pSBy+Gv3rSa0WqQOxLHM0V03/vLqvOYBGxrjY9qsBfQ="; }; configureFlags = lib.optional withQuic [ From 2ca6dde52fae5ec0032db5faeccfbdc5976cc8c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 13:00:58 +0000 Subject: [PATCH 28/61] faketty: 1.0.16 -> 1.0.17 --- pkgs/tools/misc/faketty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/faketty/default.nix b/pkgs/tools/misc/faketty/default.nix index 228cdf7f2f2f..76baf0edd116 100644 --- a/pkgs/tools/misc/faketty/default.nix +++ b/pkgs/tools/misc/faketty/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "faketty"; - version = "1.0.16"; + version = "1.0.17"; src = fetchCrate { inherit pname version; - hash = "sha256-BlQnVjYPFUfEurFUE2MHOL2ad56Nu/atzRuFu4OoCSI="; + hash = "sha256-JUvQg8WLk5+O+3fbbQSUW6Mtp9TrYlrt+uwMAzm082Q="; }; - cargoHash = "sha256-q9jx03XYA977481B9xuUfaaMBDbSVx4xREj4Q1Ti/Yw="; + cargoHash = "sha256-Y+jcq2twIGDbHTA6aBGnyN9Old993Y/2j/fKnXhZGYU="; postPatch = '' patchShebangs tests/test.sh From cb4abf8f7b6d6d793210f158ecb2523e74771e3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 13:01:05 +0000 Subject: [PATCH 29/61] emplace: 1.5.3 -> 1.6.0 --- pkgs/tools/package-management/emplace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index 6dd2445d6cef..2bf3d67443ed 100644 --- a/pkgs/tools/package-management/emplace/default.nix +++ b/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "1.5.3"; + version = "1.6.0"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KwA0GlZatY1DvtqSR4rwq/nODSa9n+S0gPVqS6agSzM="; + sha256 = "sha256-FZ+lvf5HRSruUdmkm/Hqz0aRa95SjfIa43WQczRCGNg="; }; - cargoHash = "sha256-eQ+T6YiYYeWaUezXB59+Ki05PXtJd7ISwnRw/x/YTZA="; + cargoHash = "sha256-0bKLN0l3ldHJizqWuSoBUxQ8I114BQz6ZTtsro3eYEI="; meta = with lib; { description = "Mirror installed software on multiple machines"; From ccc1f153542d4f2836c68b8033d384dd6bb19c1f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 13:10:29 +0000 Subject: [PATCH 30/61] jql: 7.1.8 -> 7.1.9 --- pkgs/development/tools/jql/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index 95c0ff65e57d..661526f30b96 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "7.1.8"; + version = "7.1.9"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "jql-v${version}"; - hash = "sha256-TjpbFX7k4coZH8IY4bygLwj8Z4JLQQ9yUqOmmr7NU9s="; + hash = "sha256-DNR+5ygTFXmly1XVyV1x3ly+n9MHor/6BlMe+q0JLYA="; }; - cargoHash = "sha256-7mzmaXeYZGtUjefC7Zo8wOArBuus7mfu6AaKE4tS5HE="; + cargoHash = "sha256-6bB/qqr+IMZz1I8JzxxOM3YVIDO5TW9hLc6PQpQcFx8="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; From 6abf602b1cbac7b94ff681b18528a5af014dbd52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 13:10:33 +0000 Subject: [PATCH 31/61] jay: 1.2.0 -> 1.3.0 --- pkgs/applications/window-managers/jay/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/jay/default.nix b/pkgs/applications/window-managers/jay/default.nix index 97be1c5fe293..e050c604fae1 100644 --- a/pkgs/applications/window-managers/jay/default.nix +++ b/pkgs/applications/window-managers/jay/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "jay"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "mahkoh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cfX9KcXbBRIaYrR7c+aIQrg+mvLJIM1sEzJ0J7wshMU="; + sha256 = "sha256-D+dG0/MSC6LzGZBMNofU8WKVYvn52kNWunXExQPoOu8="; }; - cargoHash = "sha256-htAXhjCBOb8qTAAKdFqTaTSefJJTFlvEBYveOokyWjs="; + cargoHash = "sha256-WEEAFr5lemyOfeIKC9Pvr9sYMz8rLO6k1BFgbxXJ0Pk="; SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib"; From 7b3f4fcdb2c487a73c58b1e6702b40676a7d9173 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 24 May 2024 01:31:35 +0400 Subject: [PATCH 32/61] python3Packages.pyogrio: init at 0.8.0 --- .../python-modules/pyogrio/default.nix | 75 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 77 insertions(+) create mode 100644 pkgs/development/python-modules/pyogrio/default.nix diff --git a/pkgs/development/python-modules/pyogrio/default.nix b/pkgs/development/python-modules/pyogrio/default.nix new file mode 100644 index 000000000000..551fde29bafe --- /dev/null +++ b/pkgs/development/python-modules/pyogrio/default.nix @@ -0,0 +1,75 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + + certifi, + cython, + gdal, + numpy, + packaging, + setuptools, + versioneer, + wheel, +}: + +buildPythonPackage rec { + pname = "pyogrio"; + version = "0.8.0"; + pyproject = true; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "geopandas"; + repo = "pyogrio"; + rev = "v${version}"; + hash = "sha256-h4Rv5xOWSJSv0nLbosviz5EiF/IsZO5wzBel9YRd0Bg="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "versioneer[toml]==0.28" "versioneer[toml]" + '' + lib.optionalString (!pythonOlder "3.12") '' + substituteInPlace setup.py \ + --replace-fail "distutils" "setuptools._distutils" + ''; + + nativeBuildInputs = [ + cython + gdal # for gdal-config + setuptools + versioneer + wheel + ] ++ versioneer.optional-dependencies.toml; + + buildInputs = [ gdal ]; + + propagatedBuildInputs = [ + certifi + numpy + packaging + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + preCheck = '' + python setup.py build_ext --inplace + ''; + + pytestFlagsArray = [ + # disable tests which require network access + "-m 'not network'" + ]; + + pythonImportsCheck = [ "pyogrio" ]; + + meta = { + description = "Vectorized spatial vector file format I/O using GDAL/OGR"; + homepage = "https://pyogrio.readthedocs.io/"; + changelog = "https://github.com/geopandas/pyogrio/blob/${src.rev}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = lib.teams.geospatial.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2134664da533..b7375332a38d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9998,6 +9998,8 @@ self: super: with self; { pynx584 = callPackage ../development/python-modules/pynx584 { }; + pyogrio = callPackage ../development/python-modules/pyogrio { }; + pyorthanc = callPackage ../development/python-modules/pyorthanc { }; pyoutbreaksnearme = callPackage ../development/python-modules/pyoutbreaksnearme { }; From 535a575606cd8d5046acd35c44881df17da997fd Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 24 May 2024 01:31:35 +0400 Subject: [PATCH 33/61] python3Packages.geodatasets: init at 2023.12.0 --- .../python-modules/geodatasets/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/geodatasets/default.nix diff --git a/pkgs/development/python-modules/geodatasets/default.nix b/pkgs/development/python-modules/geodatasets/default.nix new file mode 100644 index 000000000000..306c152dffa9 --- /dev/null +++ b/pkgs/development/python-modules/geodatasets/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + + geopandas, + pooch, + pyogrio, + setuptools-scm, +}: + +buildPythonPackage rec { + pname = "geodatasets"; + version = "2023.12.0"; + pyproject = true; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "geopandas"; + repo = "geodatasets"; + rev = version; + hash = "sha256-yecAky3lCKcSgW4kkYTBNnyKyIWnGSBL600wVgGN8CE="; + }; + + build-system = [ setuptools-scm ]; + + propagatedBuildInputs = [ pooch ]; + + nativeCheckInputs = [ + geopandas + pyogrio + pytestCheckHook + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + pytestFlagsArray = [ + # disable tests which require network access + "-m 'not request'" + ]; + + pythonImportsCheck = [ "geodatasets" ]; + + meta = { + description = "Spatial data examples"; + homepage = "https://geodatasets.readthedocs.io/"; + license = lib.licenses.bsd3; + maintainers = lib.teams.geospatial.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b7375332a38d..008357d55ba3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4713,6 +4713,8 @@ self: super: with self; { geocoder = callPackage ../development/python-modules/geocoder { }; + geodatasets = callPackage ../development/python-modules/geodatasets { }; + geographiclib = callPackage ../development/python-modules/geographiclib { }; geoip2 = callPackage ../development/python-modules/geoip2 { }; From a20cc357444d8a2ed3f599a491c37ac5327eda6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 15:03:37 +0000 Subject: [PATCH 34/61] spotify-player: 0.18.1 -> 0.18.2 --- pkgs/applications/audio/spotify-player/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/spotify-player/default.nix b/pkgs/applications/audio/spotify-player/default.nix index e0bc35858b04..73712208c858 100644 --- a/pkgs/applications/audio/spotify-player/default.nix +++ b/pkgs/applications/audio/spotify-player/default.nix @@ -33,16 +33,16 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [ "" "alsa" "pulseaud rustPlatform.buildRustPackage rec { pname = "spotify-player"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "aome510"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3nPESnBWaxWjWMvRG7gbXt8FzuPlx2soOonCKom+tzA="; + hash = "sha256-bLUPQgqSsE9tF5YiFj5B+Ylyy96DhWFNjwqXbQ9H8uc="; }; - cargoHash = "sha256-9HroNMHvmNjGPnEO4kTDalHBXe5MH7btEwk6maLh05E="; + cargoHash = "sha256-rptGA7J63rHdmxuPIguhZYYs8tZbpidJ0fXroBBoEIM="; nativeBuildInputs = [ pkg-config From ac1c0d7a5220b3eb811a368e6dd8c0ecb6bfaebb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 15:54:04 +0000 Subject: [PATCH 35/61] cargo-binstall: 1.6.7 -> 1.6.8 --- pkgs/development/tools/rust/cargo-binstall/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/development/tools/rust/cargo-binstall/default.nix index 50d3c984cf21..7391ea07d061 100644 --- a/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.6.7"; + version = "1.6.8"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-BMWcLEoqX8uHXazitOuzon5Sef3xMQ0b6Lk0IiVGFP8="; + hash = "sha256-VCAoY5bn5hsO+hkPtphDB0keFVsrowtFHivrpnTIcNo="; }; - cargoHash = "sha256-nAp2wySQ8u9lgixE9M6ri/Mk4BUBBe3CLHnqUv+mdxk="; + cargoHash = "sha256-OQ7l7lqDISH21eZ5JGLdE8+cysptVTv5+EZ3PkMs9vg="; nativeBuildInputs = [ pkg-config From 6ad2a273653b71ca0144975c0c10e10be9b8443f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 18:48:48 +0000 Subject: [PATCH 36/61] g4music: 3.5.2 -> 3.6 --- pkgs/applications/audio/g4music/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/g4music/default.nix b/pkgs/applications/audio/g4music/default.nix index 0cc1987c356d..e27d6852c6b2 100644 --- a/pkgs/applications/audio/g4music/default.nix +++ b/pkgs/applications/audio/g4music/default.nix @@ -15,14 +15,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "g4music"; - version = "3.5.2"; + version = "3.6"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "neithern"; repo = "g4music"; rev = "v${finalAttrs.version}"; - hash = "sha256-ljSXTEp+f4HMXhGWDGHdX6whm90Vo5KWOQunU2hHwo8="; + hash = "sha256-RDz3QwjbzYS4JllxpSA59cs2S3dNTmNcOoxu4JFC8oM="; }; nativeBuildInputs = [ From 32ebfe33e8080ecf1c3f59e9c1ee8a5efeb57b03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 19:57:38 +0000 Subject: [PATCH 37/61] python311Packages.craft-parts: 1.30.0 -> 1.31.0 --- pkgs/development/python-modules/craft-parts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix index 83fbd2f7bb02..3a137744d68f 100644 --- a/pkgs/development/python-modules/craft-parts/default.nix +++ b/pkgs/development/python-modules/craft-parts/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "craft-parts"; - version = "1.30.0"; + version = "1.31.0"; pyproject = true; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-parts"; rev = "refs/tags/${version}"; - hash = "sha256-JEf5JYDBH4Pm5ke++7GkpimM8Ec0dFe1GGxruntjmVE="; + hash = "sha256-DohH81xhUfZI3NfmX6aDaOC/QLiddsxPzrc1vgFECTg="; }; patches = [ ./bash-path.patch ]; From 55f48eac29753447808f0fcffb4a18193225a7bb Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 24 May 2024 01:31:36 +0400 Subject: [PATCH 38/61] python3Packages.libpysal: init at 4.10 --- .../python-modules/libpysal/default.nix | 86 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 88 insertions(+) create mode 100644 pkgs/development/python-modules/libpysal/default.nix diff --git a/pkgs/development/python-modules/libpysal/default.nix b/pkgs/development/python-modules/libpysal/default.nix new file mode 100644 index 000000000000..af52f048cb96 --- /dev/null +++ b/pkgs/development/python-modules/libpysal/default.nix @@ -0,0 +1,86 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + + beautifulsoup4, + fiona, + geodatasets, + geopandas, + numpy, + packaging, + pandas, + platformdirs, + requests, + scikit-learn, + scipy, + setuptools-scm, + shapely, +}: + +buildPythonPackage rec { + pname = "libpysal"; + version = "4.10"; + pyproject = true; + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "pysal"; + repo = "libpysal"; + rev = "v${version}"; + hash = "sha256-jzSkIFSIXc039KR4fS1HOI/Rj0mHwbArn2hD+zfAZDg="; + }; + + build-system = [ setuptools-scm ]; + + propagatedBuildInputs = [ + beautifulsoup4 + fiona + geopandas + numpy + packaging + pandas + platformdirs + requests + scikit-learn + scipy + shapely + ]; + + nativeCheckInputs = [ + geodatasets + pytestCheckHook + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + # requires network access + disabledTestPaths = [ + "libpysal/cg/tests/test_geoJSON.py" + "libpysal/examples/tests/test_available.py" + "libpysal/graph/tests/test_base.py" + "libpysal/graph/tests/test_builders.py" + "libpysal/graph/tests/test_contiguity.py" + "libpysal/graph/tests/test_kernel.py" + "libpysal/graph/tests/test_matching.py" + "libpysal/graph/tests/test_plotting.py" + "libpysal/graph/tests/test_triangulation.py" + "libpysal/graph/tests/test_utils.py" + "libpysal/graph/tests/test_set_ops.py" + "libpysal/weights/tests/test_contiguity.py" + "libpysal/weights/tests/test_util.py" + ]; + + pythonImportsCheck = [ "libpysal" ]; + + meta = { + description = "A library of spatial analysis functions"; + homepage = "https://pysal.org/libpysal/"; + license = lib.licenses.bsd3; + maintainers = lib.teams.geospatial.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 008357d55ba3..16b919659fc3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6694,6 +6694,8 @@ self: super: with self; { libpyfoscam = callPackage ../development/python-modules/libpyfoscam { }; + libpysal = callPackage ../development/python-modules/libpysal { }; + libpyvivotek = callPackage ../development/python-modules/libpyvivotek { }; libpwquality = lib.pipe pkgs.libpwquality [ From c01eae87e24d5be1443b75c2a1ed9d25a77a7845 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 24 May 2024 01:31:36 +0400 Subject: [PATCH 39/61] python3Packages.mapclassify: init at 2.6.1 --- .../python-modules/mapclassify/default.nix | 58 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/mapclassify/default.nix diff --git a/pkgs/development/python-modules/mapclassify/default.nix b/pkgs/development/python-modules/mapclassify/default.nix new file mode 100644 index 000000000000..0045daf1bd9f --- /dev/null +++ b/pkgs/development/python-modules/mapclassify/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + + geopandas, + libpysal, + networkx, + numpy, + pandas, + scikit-learn, + scipy, + setuptools-scm, +}: + +buildPythonPackage rec { + pname = "mapclassify"; + version = "2.6.1"; + pyproject = true; + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "pysal"; + repo = "mapclassify"; + rev = "v${version}"; + hash = "sha256-lb2Ui6zdx6MQBtBrL/Xj9k7cm6De8aLEuBLZDhPPDnE="; + }; + + build-system = [ setuptools-scm ]; + + propagatedBuildInputs = [ + networkx + numpy + pandas + scikit-learn + scipy + ]; + + nativeCheckInputs = [ + pytestCheckHook + geopandas + libpysal + ]; + + # requires network access + disabledTestPaths = [ "mapclassify/tests/test_greedy.py" ]; + + pythonImportsCheck = [ "mapclassify" ]; + + meta = { + description = "Classification Schemes for Choropleth Maps"; + homepage = "https://pysal.org/mapclassify/"; + license = lib.licenses.bsd3; + maintainers = lib.teams.geospatial.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 16b919659fc3..86f67234fae6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7176,6 +7176,8 @@ self: super: with self; { mapbox-earcut = callPackage ../development/python-modules/mapbox-earcut { }; + mapclassify = callPackage ../development/python-modules/mapclassify { }; + mariadb = callPackage ../development/python-modules/mariadb { }; marimo = callPackage ../development/python-modules/marimo { }; From 9452c6886171d0c6d13b8492ca00b75ca37a97f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 21:20:34 +0000 Subject: [PATCH 40/61] lunar-client: 3.2.7 -> 3.2.9 --- pkgs/by-name/lu/lunar-client/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index 4a727834f670..438dce7049f2 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -6,11 +6,11 @@ appimageTools.wrapType2 rec { pname = "lunar-client"; - version = "3.2.7"; + version = "3.2.9"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; - hash = "sha512-dziL9lnpsiJ2BV+jNOhVMvZtYY/K4chyiZB5/fMCw9/4/3Boe/DO7s2steEOhxEsPqUcWaf1Sjs6DFSX/CHUqw=="; + hash = "sha512-7D7rGYJc6q5cPlgDjWkd76TwJ4QPSf99buoeJOfhP/e/clnWvfmLHK6CaAPAPDnOjijMuAEM9XkDYH8U5tlvMQ=="; }; extraInstallCommands = From 19bcafba4d47bb7b4eaf851735a2ae56e14c25ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 22:38:04 +0000 Subject: [PATCH 41/61] oh-my-posh: 19.29.0 -> 20.2.0 --- pkgs/by-name/oh/oh-my-posh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/oh/oh-my-posh/package.nix b/pkgs/by-name/oh/oh-my-posh/package.nix index 698aa781b201..e36c1faf97a7 100644 --- a/pkgs/by-name/oh/oh-my-posh/package.nix +++ b/pkgs/by-name/oh/oh-my-posh/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "19.29.0"; + version = "20.2.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-vn3P9upO6d0jpZzrG77/xkhfn4NINnBZ3YymlRdoONw="; + hash = "sha256-OkLQpU9FN7R+W8zNd3UMmNVgmEVzSVibZ/cl5mN8TU8="; }; - vendorHash = "sha256-mZNhsvEI1AbsAhoK7AuNgrQvYlkGrrpPVuv3R5nssC4="; + vendorHash = "sha256-PDMmiU6NoJiCRZxJNKxt30sH+a14Snvk/CrD/+QpEEU="; sourceRoot = "${src.name}/src"; From dcf25f5f482cd038fe6f4b86e62387f4f74526f8 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Sat, 25 May 2024 01:54:18 +0000 Subject: [PATCH 42/61] python3Packages.pgmpy: patch assert in test suite for Python 3.12 --- pkgs/development/python-modules/pgmpy/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/pgmpy/default.nix b/pkgs/development/python-modules/pgmpy/default.nix index ad6b248b0f39..d9505528c64b 100644 --- a/pkgs/development/python-modules/pgmpy/default.nix +++ b/pkgs/development/python-modules/pgmpy/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, pythonOlder, # build inputs networkx, @@ -42,6 +43,14 @@ buildPythonPackage { hash = "sha256-d2TNcJQ82XxTWdetLgtKXRpFulAEEzrr+cyRewoA6YI="; }; + # TODO: Remove this patch after updating to pgmpy 0.1.26. + # The PR https://github.com/pgmpy/pgmpy/pull/1745 will have been merged. + # It contains the fix below, among other things, which is why we do not use fetchpatch. + postPatch = lib.optionalString (pythonAtLeast "3.12") '' + substituteInPlace pgmpy/tests/test_estimators/test_MarginalEstimator.py \ + --replace-fail 'self.assert_' 'self.assertTrue' + ''; + propagatedBuildInputs = [ networkx numpy From 24641e566dd50c26c942aab0b14d383d3683c227 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 23:59:33 +0000 Subject: [PATCH 43/61] glances: 3.4.0.5 -> 4.0.6 --- pkgs/applications/system/glances/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index 323d7c5e81fd..fb0ba1595526 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.4.0.5"; + version = "4.0.6"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "refs/tags/v${version}"; - hash = "sha256-Ho4vcmTEVja7rkgLSfNkXvnpopYupRxPL1UVlnmdGCg="; + hash = "sha256-FkAMsfr/bO7Chemw4hhVt2SKkSyPLECNVuOsOxKWsGE="; }; # On Darwin this package segfaults due to mismatch of pure and impure From 8d775b86e61b1b37c3d788118af000b68397e337 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 23:59:54 +0000 Subject: [PATCH 44/61] mdbook-admonish: 1.16.0 -> 1.17.0 --- pkgs/tools/text/mdbook-admonish/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-admonish/default.nix b/pkgs/tools/text/mdbook-admonish/default.nix index 442620f87265..b4407c5dbbc6 100644 --- a/pkgs/tools/text/mdbook-admonish/default.nix +++ b/pkgs/tools/text/mdbook-admonish/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-admonish"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "tommilligan"; repo = pname; rev = "v${version}"; - hash = "sha256-/P9cHxeo2HZ11ErdAULlZt1VwmVqs4hoC8inXQiGLj4="; + hash = "sha256-Pks33QDAPocUjZTWRS69g9ZkubMqzQezYtJb0UNnd3Q="; }; - cargoHash = "sha256-d/jbokKsnuaJfKHQhtXVoD/JoNdhlZpnwRkgOw15p+Y="; + cargoHash = "sha256-HXUPdur45CkrzQrCi8YRlyKjk++GRFCcJwzfoX2ix+M="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From 4e5a485d6ae990636bf9685cc0ba26c5d98788e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 May 2024 02:40:24 +0000 Subject: [PATCH 45/61] firefoxpwa: 2.12.0 -> 2.12.1 --- pkgs/by-name/fi/firefoxpwa/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fi/firefoxpwa/package.nix b/pkgs/by-name/fi/firefoxpwa/package.nix index 3564ce0296c2..3e8f82780a49 100644 --- a/pkgs/by-name/fi/firefoxpwa/package.nix +++ b/pkgs/by-name/fi/firefoxpwa/package.nix @@ -25,13 +25,13 @@ rustPlatform.buildRustPackage rec { pname = "firefoxpwa"; - version = "2.12.0"; + version = "2.12.1"; src = fetchFromGitHub { owner = "filips123"; repo = "PWAsForFirefox"; rev = "v${version}"; - hash = "sha256-T2X+41ScE8FDZGJdgAjZCp1MQX51UACuNsWFk+6cR3A="; + hash = "sha256-0Yyd0mJK/eDallg9ERimvZIRCOTeDkzeAVUfDeNP928="; }; sourceRoot = "${src.name}/native"; From 3a58b7369169641be6ea9e3409f5acc06b94c930 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 May 2024 02:41:07 +0000 Subject: [PATCH 46/61] markdownlint-cli: 0.40.0 -> 0.41.0 --- pkgs/tools/text/markdownlint-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/markdownlint-cli/default.nix b/pkgs/tools/text/markdownlint-cli/default.nix index 736c59d2c5cf..12b19d3a7165 100644 --- a/pkgs/tools/text/markdownlint-cli/default.nix +++ b/pkgs/tools/text/markdownlint-cli/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "markdownlint-cli"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "igorshubovych"; repo = "markdownlint-cli"; rev = "v${version}"; - hash = "sha256-h9h1qJ6xKQRRNSr3PsMeuMMyzfJbq49BluKvhJK86v4="; + hash = "sha256-qRbfOxMCm5pUAi0KHookOOnKaTShBUkTkrqZX4QGezk="; }; - npmDepsHash = "sha256-Ez83Q/zXF61L0hoEb+i4h8oyelrHfgHueAW2mqhCjMQ="; + npmDepsHash = "sha256-UwyjaEKYA81J0DR2yFqYVp4e7l3Jol/R8hgaijNpBaU="; dontNpmBuild = true; From e152d121a28249d6c34638ee6389f62c9ab91c89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 May 2024 02:46:37 +0000 Subject: [PATCH 47/61] iosevka: 30.0.1 -> 30.1.0 --- pkgs/data/fonts/iosevka/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 5628df5393cf..190170ebc28f 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "30.0.1"; + version = "30.1.0"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-THs6kN5VZpTvzTK7w/sGQbxoEyyPwzl93JDOvwucgeo="; + hash = "sha256-HYoCf5rwkKMjMPYW7E7EJgPXfgk7nELQu+ur4N3PC8s="; }; - npmDepsHash = "sha256-maDIkbe4BKY7XYOQNGdOalyTGdBXgIU5t0QjVJW6lvQ="; + npmDepsHash = "sha256-8EqIfgthhYkefAb+jFoL7Sk9/2gqwLwjZkc3WL35nYQ="; nativeBuildInputs = [ remarshal From 1074d2f93f5da3e85f5339a75e8d5b93db1fc49b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 May 2024 02:51:40 +0000 Subject: [PATCH 48/61] mlib: 0.7.2 -> 0.7.3 --- pkgs/development/libraries/mlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mlib/default.nix b/pkgs/development/libraries/mlib/default.nix index f3415adadf74..91e127127833 100644 --- a/pkgs/development/libraries/mlib/default.nix +++ b/pkgs/development/libraries/mlib/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "mlib"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "P-p-H-d"; repo = pname; rev = "V${version}"; - hash = "sha256-wt/wLtvAZ19ZiLIjPrKbqVztLyXEa8hy6cEkaCO+tuY="; + hash = "sha256-r8ol923tNkZ13QXWjWpMrN6rBjjjg5XoBCho4OKdyvY="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=$(out)" ]; From e54355ea20462adc67388f95980797f628acc774 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Sat, 25 May 2024 05:04:17 +0000 Subject: [PATCH 49/61] python3Packages.trainer: fix Python 3.12+ --- pkgs/development/python-modules/trainer/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/trainer/default.nix b/pkgs/development/python-modules/trainer/default.nix index e2c16943fffc..0c1c14f41eea 100644 --- a/pkgs/development/python-modules/trainer/default.nix +++ b/pkgs/development/python-modules/trainer/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, coqpit, fsspec, @@ -30,6 +31,14 @@ buildPythonPackage { hash = "sha256-z6TOzWqE3NytkdG3nUzh9GpFVGQEXFyzSQ8gvdB4wiw="; }; + patches = [ + (fetchpatch { + name = "add-support-for-python312.patch"; + hash = "sha256-V5RPn/2pGKzQrf/SIRU3imo6nBhpBEJpI7HsFYbVZj4="; + url = "https://github.com/coqui-ai/Trainer/commit/0278012c7e6f5972b656d11757add4ab89f6d272.patch"; + }) + ]; + postPatch = '' sed -i 's/^protobuf.*/protobuf/' requirements.txt ''; From bd580000a3c539676723308cffeb20eba49ab021 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 May 2024 04:11:34 +0000 Subject: [PATCH 50/61] gpxsee: 13.19 -> 13.20 --- pkgs/applications/misc/gpxsee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 947c18050ea7..b6e606787532 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.19"; + version = "13.20"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-Q/Na+uc6a+OSLvJK75MEIxgdJhg/At830SBrix38Qj8="; + hash = "sha256-zZjE1mXZPPda4CjkOeKtLvFZO31ta4kucpzsriR2+Nw="; }; buildInputs = [ From d96ff8a4c95ebc41204c1d029272ed35f95d8a89 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 26 May 2024 09:33:27 +0200 Subject: [PATCH 51/61] tinymist: 0.11.9 -> 0.11.10 Diff: https://github.com/Myriad-Dreamin/tinymist/compare/refs/tags/v0.11.9...v0.11.10 Changelog: https://github.com/Myriad-Dreamin/tinymist/blob/refs/tags/v0.11.10/CHANGELOG.md --- pkgs/by-name/ti/tinymist/Cargo.lock | 12 ++++++------ pkgs/by-name/ti/tinymist/package.nix | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ti/tinymist/Cargo.lock b/pkgs/by-name/ti/tinymist/Cargo.lock index ee6705a0f511..917c5358bf46 100644 --- a/pkgs/by-name/ti/tinymist/Cargo.lock +++ b/pkgs/by-name/ti/tinymist/Cargo.lock @@ -3743,7 +3743,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.11.9" +version = "0.11.10" dependencies = [ "insta", "lsp-server", @@ -3840,7 +3840,7 @@ dependencies = [ [[package]] name = "tinymist" -version = "0.11.9" +version = "0.11.10" dependencies = [ "anyhow", "async-trait", @@ -3891,7 +3891,7 @@ dependencies = [ [[package]] name = "tinymist-query" -version = "0.11.9" +version = "0.11.10" dependencies = [ "anyhow", "biblatex", @@ -3935,7 +3935,7 @@ dependencies = [ [[package]] name = "tinymist-render" -version = "0.11.9" +version = "0.11.10" dependencies = [ "base64 0.22.1", "log", @@ -4530,9 +4530,9 @@ dependencies = [ [[package]] name = "typstyle" -version = "0.11.21" +version = "0.11.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af9697d141856bfe6c865c9ef74d04c62dd6cd1b3b63c1e284b96974871a2fc7" +checksum = "bb15ec2ba1f804eab4f8f2ae1bbbe8a7d2f882bb8acabaee0b101de46ee28c56" dependencies = [ "anyhow", "clap", diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index a9b79e071459..702ac9abbe8c 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.11.9"; + version = "0.11.10"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; rev = "refs/tags/v${version}"; - hash = "sha256-Oa88WBkV9q17KNJuc/sGSQS39yVyqme66SfB0ZZw7b8="; + hash = "sha256-lmT0da517dVaXGeObyCXZyte8DNBh+/vaqV7hA+SJR4="; }; cargoLock = { @@ -50,12 +50,12 @@ rustPlatform.buildRustPackage rec { "--skip=e2e" ]; - meta = with lib; { + meta = { changelog = "https://github.com/Myriad-Dreamin/tinymist/blob/${src.rev}/CHANGELOG.md"; description = "Tinymist is an integrated language service for Typst"; homepage = "https://github.com/Myriad-Dreamin/tinymist"; - license = licenses.asl20; + license = lib.licenses.asl20; mainProgram = "tinymist"; - maintainers = with maintainers; [ lampros ]; + maintainers = with lib.maintainers; [ lampros ]; }; } From ee8e2cb7568eeebf2da32a46edce54ac92fda4e0 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Sun, 26 May 2024 09:49:59 +0200 Subject: [PATCH 52/61] mpvScripts.modernx-zydezu: 0.3.5 -> 0.3.5.5 --- pkgs/applications/video/mpv/scripts/modernx-zydezu.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix b/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix index ceda04b001c3..a5f6608bfba7 100644 --- a/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix +++ b/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix @@ -7,14 +7,14 @@ }: buildLua (finalAttrs: { pname = "modernx-zydezu"; - version = "0.3.5"; + version = "0.3.5.5"; scriptPath = "modernx.lua"; src = fetchFromGitHub { owner = "zydezu"; repo = "ModernX"; rev = finalAttrs.version; - hash = "sha256-pU3ROjdSa80FV/b/HlsKvlM6wZxEV5c4Os8g2Lgs65U="; + hash = "sha256-sPpVwI8w5JsP/jML0viOSqhyYBVKfxWuKbxHkX3GVug="; }; postInstall = '' From 7798ba62491e699f84cd65b3661a29a2a76bcf98 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 26 May 2024 09:54:28 +0200 Subject: [PATCH 53/61] vscode-extensions.myriad-dreamin.tinymist: 0.11.9 -> 0.11.10 --- .../vscode/extensions/myriad-dreamin.tinymist/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index 21a412b91e31..8bb08893f8db 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -10,10 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "tinymist"; publisher = "myriad-dreamin"; - # Please update the corresponding binary (tinymist) when updating - # this extension. - version = "0.11.9"; - hash = "sha256-h49SI/KoA5sbLIkJreZoux7mTIhGZ7HqtgE1EAh3vYM="; + inherit (tinymist) version; + hash = "sha256-etPjbmcBhS1dgq5wEoRIekZlRxYoC6KrsV/+owjHu4I="; }; nativeBuildInputs = [ From 0be5a16bb37359e3e005319d4d7641f81b2d7b47 Mon Sep 17 00:00:00 2001 From: Alex James Date: Sun, 26 May 2024 03:03:42 -0500 Subject: [PATCH 54/61] bento4: fix build on darwin (#314361) CMakeLists.txt in v1.6.0-641 set `CMAKE_OSX_ARCHITECTURES`, which broke evaluation on Darwin. Fix it by unsetting `CMAKE_OSX_ARCHITECTURES`. --- pkgs/tools/video/bento4/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/video/bento4/default.nix b/pkgs/tools/video/bento4/default.nix index 54e5a22cc67d..12764ad92778 100644 --- a/pkgs/tools/video/bento4/default.nix +++ b/pkgs/tools/video/bento4/default.nix @@ -18,7 +18,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + ] ++ lib.optionals stdenv.isDarwin [ + "-DCMAKE_OSX_ARCHITECTURES=" + ]; installPhase = '' runHook preInstall From 33bfd9f34aad3003672b535dc881c0ce3617ff8a Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 21 May 2024 20:44:10 +0530 Subject: [PATCH 55/61] bcachefs-tools: move to pkgs/by-name --- .../default.nix => by-name/bc/bcachefs-tools/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/filesystems/bcachefs-tools/default.nix => by-name/bc/bcachefs-tools/package.nix} (100%) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix similarity index 100% rename from pkgs/tools/filesystems/bcachefs-tools/default.nix rename to pkgs/by-name/bc/bcachefs-tools/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed62a620aed8..79dca219819a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3484,8 +3484,6 @@ with pkgs; bazarr = callPackage ../servers/bazarr { }; - bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; - bisq-desktop = callPackage ../applications/blockchains/bisq-desktop { openjdk11 = openjdk11.override { enableJavaFX = true; }; }; From beb7b9b0dc6f2cb574797d9b40de9ab587cc5b1d Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 21 May 2024 20:58:49 +0530 Subject: [PATCH 56/61] bcachefs-tools: 1.7.0 -> 1.7.0-unstable-2024-05-09 Moved temporarily to unstable to fix https://github.com/NixOS/nixpkgs/issues/313350 Also vendor the updated patch for https://github.com/NixOS/nixpkgs/issues/309388 from https://github.com/koverstreet/bcachefs-tools/pull/263 --- .../bcachefs-tools/fix-encrypted-boot.patch | 92 +++++++++++++++++++ pkgs/by-name/bc/bcachefs-tools/package.nix | 16 ++-- 2 files changed, 99 insertions(+), 9 deletions(-) create mode 100644 pkgs/by-name/bc/bcachefs-tools/fix-encrypted-boot.patch diff --git a/pkgs/by-name/bc/bcachefs-tools/fix-encrypted-boot.patch b/pkgs/by-name/bc/bcachefs-tools/fix-encrypted-boot.patch new file mode 100644 index 000000000000..5e14d09547f4 --- /dev/null +++ b/pkgs/by-name/bc/bcachefs-tools/fix-encrypted-boot.patch @@ -0,0 +1,92 @@ +From f76ad4da12e6a65550d564bb626a1429ae75433a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20M=C3=BChlbacher?= +Date: Thu, 9 May 2024 23:52:47 +0200 +Subject: [PATCH 1/2] `check_for_key` before `ask_for_passphrase` +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +let's always first check if there is already a key in the keyring +available before we try to get the key from some more involved means. + +Fixes: #261 +Signed-off-by: Thomas Mรผhlbacher +--- + src/commands/mount.rs | 13 +++++++++++-- + src/key.rs | 4 +++- + 2 files changed, 14 insertions(+), 3 deletions(-) + +diff --git a/src/commands/mount.rs b/src/commands/mount.rs +index 9414c77f..34a741cb 100644 +--- a/src/commands/mount.rs ++++ b/src/commands/mount.rs +@@ -344,8 +344,17 @@ fn cmd_mount_inner(opt: Cli) -> anyhow::Result<()> { + if block_devices_to_mount.len() == 0 { + Err(anyhow::anyhow!("No device found from specified parameters"))?; + } +- // Check if the filesystem's master key is encrypted +- if unsafe { bcachefs::bch2_sb_is_encrypted_and_locked(block_devices_to_mount[0].sb) } { ++ ++ let key_name = CString::new(format!( ++ "bcachefs:{}", ++ block_devices_to_mount[0].sb().uuid() ++ )) ++ .unwrap(); ++ ++ // Check if the filesystem's master key is encrypted and we don't have a key ++ if unsafe { bcachefs::bch2_sb_is_encrypted_and_locked(block_devices_to_mount[0].sb) } ++ && !key::check_for_key(&key_name)? ++ { + // First by password_file, if available + let fallback_to_unlock_policy = if let Some(passphrase_file) = &opt.passphrase_file { + match key::read_from_passphrase_file(&block_devices_to_mount[0], passphrase_file.as_path()) { +diff --git a/src/key.rs b/src/key.rs +index d0018805..568b3cdb 100644 +--- a/src/key.rs ++++ b/src/key.rs +@@ -58,7 +58,7 @@ impl fmt::Display for UnlockPolicy { + } + } + +-fn check_for_key(key_name: &std::ffi::CStr) -> anyhow::Result { ++pub fn check_for_key(key_name: &std::ffi::CStr) -> anyhow::Result { + use bch_bindgen::keyutils::{self, keyctl_search}; + let key_name = key_name.to_bytes_with_nul().as_ptr() as *const _; + let key_type = c_str!("user"); +@@ -86,10 +86,12 @@ fn wait_for_unlock(uuid: &uuid::Uuid) -> anyhow::Result<()> { + } + } + ++// blocks indefinitely if no input is available on stdin + fn ask_for_passphrase(sb: &bch_sb_handle) -> anyhow::Result<()> { + let passphrase = if stdin().is_terminal() { + rpassword::prompt_password("Enter passphrase: ")? + } else { ++ info!("Trying to read passphrase from stdin..."); + let mut line = String::new(); + stdin().read_line(&mut line)?; + line + +From 734ccc58f42c3cccb0960bdd84808839e2b62ca9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20M=C3=BChlbacher?= +Date: Sun, 12 May 2024 19:39:19 +0200 +Subject: [PATCH 2/2] fix unfortunate typo + +causes mounting encrypted devices to become stuck in a busy loop. +--- + include/crypto/skcipher.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/crypto/skcipher.h b/include/crypto/skcipher.h +index 70905a5a..833729dc 100644 +--- a/include/crypto/skcipher.h ++++ b/include/crypto/skcipher.h +@@ -112,7 +112,7 @@ static inline void skcipher_request_set_sync_tfm(struct skcipher_request *req, + skcipher_request_set_tfm(req, &tfm->base); + } + +-#define skcipher_request_set_callback(...) do {} while (9) ++#define skcipher_request_set_callback(...) do {} while (0) + + static inline void skcipher_request_set_crypt( + struct skcipher_request *req, diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index c49d1a856198..4c17a3321314 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, pkg-config, libuuid, libsodium, @@ -27,13 +26,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; - version = "1.7.0"; + version = "1.7.0-unstable-2024-05-09"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; - rev = "v${finalAttrs.version}"; - hash = "sha256-nHT18bADESDBHoo9P+J3gGc092hRYs2vaWupgqlkvaA="; + # FIXME: switch to a tagged release once available > 1.7.0 + # Fix for https://github.com/NixOS/nixpkgs/issues/313350 + rev = "3ac510f6a41feb1b695381fa30869d557c00b822"; + hash = "sha256-ZmkeYPiCy7vkXnMFbtUF4761K+I+Ef7UbmSY7dJG09U="; }; nativeBuildInputs = [ @@ -76,11 +77,8 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # code refactoring of bcachefs-tools broke reading passphrases from stdin (vs. terminal) # upstream issue https://github.com/koverstreet/bcachefs-tools/issues/261 - (fetchpatch { - url = "https://github.com/koverstreet/bcachefs-tools/commit/38b0cb721d2a35f5a4af429bc7bd367461f2fa26.patch"; - hash = "sha256-/9reye+Qoa+EMkS+wfdX+KwDeLHHJ/S+Qm7sWl0MtqM="; - }) -]; + ./fix-encrypted-boot.patch + ]; preCheck = lib.optionalString (!fuseSupport) '' rm tests/test_fuse.py From 4f1739c86a4aa17f6d65eafd041baa0b6cfe1a84 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 25 May 2024 22:45:25 +0530 Subject: [PATCH 57/61] bcachefs-tools: replace -> replace-fail --- pkgs/by-name/bc/bcachefs-tools/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index 4c17a3321314..14f668bf5b67 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' substituteInPlace $out/libexec/bcachefsck_all \ - --replace "/usr/bin/python3" "${python3}/bin/python3" + --replace-fail "/usr/bin/python3" "${python3}/bin/python3" ''; passthru = { From 5cb8d902726b64e954ad06581832737cf4090320 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 00:37:32 +0000 Subject: [PATCH 58/61] dayon: 14.0.0 -> 14.0.1 --- pkgs/applications/networking/remote/dayon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/dayon/default.nix b/pkgs/applications/networking/remote/dayon/default.nix index ea46ec131fbc..d0199bb325a1 100644 --- a/pkgs/applications/networking/remote/dayon/default.nix +++ b/pkgs/applications/networking/remote/dayon/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dayon"; - version = "14.0.0"; + version = "14.0.1"; src = fetchFromGitHub { owner = "RetGal"; repo = "dayon"; rev = "v${finalAttrs.version}"; - hash = "sha256-cUaWfOpR0sNq8cRghZVW9mTVhJ5us12/lzucxetiVkg="; + hash = "sha256-7XrgPrYKhaUvmXxiZLsduzrbyZRHjPSo+fg4BvlatHQ="; }; nativeBuildInputs = [ From fb8c5930cb6cc7ca37dcb7a478e52ab218b566dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 20:19:13 +0000 Subject: [PATCH 59/61] shattered-pixel-dungeon: 2.4.0 -> 2.4.1 --- pkgs/games/shattered-pixel-dungeon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index dd5b5c082803..701e2070fa90 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -5,13 +5,13 @@ callPackage ./generic.nix rec { pname = "shattered-pixel-dungeon"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; rev = "v${version}"; - hash = "sha256-WTmzSuEoXLhr14vm2eQAmhmbTX/v7uKioQ1DcLnvAUw="; + hash = "sha256-mt8Zezj/EVsolC2iGNx6E11yO5XahNK7Q3EAohDjT8E="; }; depsHash = "sha256-vihoR0bPh7590sRxeYJ1uuynNRxtRBuiFUrdmsRNUJc="; From 676d4969924a5fc10c2accda7acdb81651a5a616 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Sat, 25 May 2024 13:09:41 +0200 Subject: [PATCH 60/61] python3Packages.pygeos: drop package PyGEOS was merged with Shapely (https://shapely.readthedocs.io) in December 2021 and has been released as part of Shapely 2.0. The development now takes place at the Shapely repository. See: https://github.com/pygeos/pygeos/blob/master/README.rst --- .../python-modules/pygeos/default.nix | 48 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 pkgs/development/python-modules/pygeos/default.nix diff --git a/pkgs/development/python-modules/pygeos/default.nix b/pkgs/development/python-modules/pygeos/default.nix deleted file mode 100644 index ebb90ee9fef7..000000000000 --- a/pkgs/development/python-modules/pygeos/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - python, - geos_3_11, - pytestCheckHook, - cython_0, - numpy, -}: - -buildPythonPackage rec { - pname = "pygeos"; - version = "0.14"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-MPvBf2SEQgC4UTO4hfz7ZVQbh3lTH270+P5GfT+6diM="; - }; - - nativeBuildInputs = [ - geos_3_11 # for geos-config - cython_0 - ]; - - propagatedBuildInputs = [ numpy ]; - - # The cythonized extensions are required to exist in the pygeos/ directory - # for the package to function. Therefore override of buildPhase was - # necessary. - buildPhase = '' - ${python.pythonOnBuildForHost.interpreter} setup.py build_ext --inplace - ${python.pythonOnBuildForHost.interpreter} setup.py bdist_wheel - ''; - - nativeCheckInputs = [ pytestCheckHook ]; - - pythonImportsCheck = [ "pygeos" ]; - - meta = with lib; { - description = "Wraps GEOS geometry functions in numpy ufuncs"; - homepage = "https://github.com/pygeos/pygeos"; - changelog = "https://github.com/pygeos/pygeos/blob/${version}/CHANGELOG.rst"; - license = licenses.bsd3; - maintainers = teams.geospatial.members; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 206b08ad509b..9cfa1e4fafa5 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -389,6 +389,7 @@ mapAliases ({ pyramid_multiauth = pyramid-multiauth; # added 2023-08-24 pyreadability = readability-lxml; # added 2022-05-24 pyres = throw "pyres has been removed, since it is abandoned and broken"; # added 2023-06-20 + pygeos = throw "pygeos has been removed, since it was merged with shapely 2.0"; # added 2024-05-26 pyRFC3339 = pyrfc3339; # added 2024-01-07 pyroute2-core = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16 pyroute2-ethtool = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2134664da533..e131624f2999 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11052,8 +11052,6 @@ self: super: with self; { pygeoip = callPackage ../development/python-modules/pygeoip { }; - pygeos = callPackage ../development/python-modules/pygeos { }; - pygetwindow = callPackage ../development/python-modules/pygetwindow { }; pygit2 = callPackage ../development/python-modules/pygit2 { }; From 65a87eee9cc1c8e3985389333903ae08bba6ad95 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sat, 25 May 2024 08:03:58 -0700 Subject: [PATCH 61/61] linux: use uinstall for all arm architectures The uinstall target is valid anytime ARCH=arm, not just for armv7, we can use `stdenv.hostPlatform.linuxArch` to match this properly. --- pkgs/os-specific/linux/kernel/manual-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index caf8f11ca437..0c176d3e12d9 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -304,7 +304,7 @@ let # Some image types need special install targets (e.g. uImage is installed with make uinstall on arm) installTargets = [ (kernelConf.installTarget or ( - /**/ if kernelConf.target == "uImage" && stdenv.hostPlatform.isArmv7 then "uinstall" + /**/ if kernelConf.target == "uImage" && stdenv.hostPlatform.linuxArch == "arm" then "uinstall" else if kernelConf.target == "zImage" || kernelConf.target == "Image.gz" then "zinstall" else "install")) ];