From 1ecbc850e85960a70d2027e65b583feb06578353 Mon Sep 17 00:00:00 2001 From: Benedikt Ritter Date: Sat, 1 Aug 2026 09:23:12 +0200 Subject: [PATCH 01/28] nextcloudPackages: update apps (cherry picked from commit 531718e98f4ea379f5b0da66a4b3869ea59eb13a) --- pkgs/servers/nextcloud/packages/32.json | 12 ++++++------ pkgs/servers/nextcloud/packages/33.json | 12 ++++++------ pkgs/servers/nextcloud/packages/34.json | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/32.json b/pkgs/servers/nextcloud/packages/32.json index a3384180070a..7fad4fdedad2 100644 --- a/pkgs/servers/nextcloud/packages/32.json +++ b/pkgs/servers/nextcloud/packages/32.json @@ -190,9 +190,9 @@ ] }, "integration_deepl": { - "hash": "sha256-RHYxxZw/2/uDdZdf8kGYgGBlBi1rfgXUtTtr9lgr/20=", - "url": "https://github.com/nextcloud-releases/integration_deepl/releases/download/v2.2.0/integration_deepl-v2.2.0.tar.gz", - "version": "2.2.0", + "hash": "sha256-PMK1Z3oFVkN8WtgySidCLnp+SZ3xHkPfzI2xVBfBm/k=", + "url": "https://github.com/nextcloud-releases/integration_deepl/releases/download/v2.3.0/integration_deepl-v2.3.0.tar.gz", + "version": "2.3.0", "description": "Deepl integration providing an translations through deepl.com with Nextcloud\n\nThis app integrates with [Nextcloud Assistant](https://apps.nextcloud.com/apps/assistant) to offer translation services We recommend to install Assistant additionally and activate Deepl as translation provider in the Artifical Intelligence admin settings.\n\nThis app also integrates with the translation API of Nextcloud server to offer translation services without Assistant. Currently this is available in Text and Talk.\n\nTo run translations and any other Task Processing tasks synchronously, run the following command in a background process (10 is the interval in seconds when the process should relaunch to use the latest php changes):\n\n```sh\nset -e; while true; do occ background-job:worker -v -t 10 \"OC\\TaskProcessing\\SynchronousBackgroundJob\"; done\n```\n\n## Ethical AI Rating\n### Rating: πŸ”΄\n\nNegative:\n* the software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* the trained model is not freely available, so the model can not be ran on-premises\n* the training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/integration_deepl", "licenses": [ @@ -310,9 +310,9 @@ ] }, "phonetrack": { - "hash": "sha256-bt/R1kZiTa9pWruKsAU01ni1d0AIy7vAOvIF8zwRhhw=", - "url": "https://github.com/julien-nc/phonetrack/releases/download/v1.3.1/phonetrack-1.3.1.tar.gz", - "version": "1.3.1", + "hash": "sha256-cinP3WFja6QjJYlQZcTKayHTheLjvnKY9s+CIJWKlcQ=", + "url": "https://github.com/julien-nc/phonetrack/releases/download/v1.3.2/phonetrack-1.3.2.tar.gz", + "version": "1.3.2", "description": "# PhoneTrack Nextcloud application\n\nπŸ“± PhoneTrack is a Nextcloud application to track and store mobile device's locations.\n\nπŸ—Ί It receives information from mobile phone's logging apps and displays it dynamically on a map.\n\n🌍 Help us to translate this app on [PhoneTrack Crowdin project](https://crowdin.com/project/phonetrack).\n\nβš’ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CONTRIBUTING.md).\n\nHow to use PhoneTrack :\n\n- Create a tracking session.\n- Give the logging link\\* to the mobile devices. Choose the [logging method](https://github.com/julien-nc/phonetrack/blob/main/doc/user.md#logging-methods) you prefer.\n- Watch the session's devices location in real time (or not) in PhoneTrack or share it with public pages.\n\n(\\*) Don't forget to set the device name in the link (rather than in the logging app settings). Replace \"yourname\" with the desired device name.\nSetting the device name in logging app settings only works with Owntracks, Traccar and OpenGTS.\n\nOn PhoneTrack main page, while watching a session, you can :\n\n- πŸ“ Display location history\n- β›› Filter points\n- ✎ Manually edit/add/delete points\n- ✎ Edit devices (rename, change colour/shape, move to another session)\n- β›Ά Define geofencing zones for devices\n- βš‡ Define proximity alerts for device pairs\n- πŸ–§ Share a session to other Nextcloud users or with a public link (read-only)\n- πŸ”— Generate public share links with optional restrictions (filters, device name, last positions only, geofencing simplification)\n- πŸ–« Import/export a session in GPX format (one file with one track per device or one file per device)\n- πŸ—  Display sessions statistics\n- πŸ”’ [Reserve a device name](https://github.com/julien-nc/phonetrack/blob/main/doc/user.md#device-name-reservation) to make sure only authorized user can log with this name\n- πŸ—“ Toggle session auto export and auto purge (daily/weekly/monthly)\n- β—” Choose what to do when point number quota is reached (block logging or delete oldest point)\n\nPublic page and public filtered page work like main page except there is only one session displayed, everything is read-only and there is no need to be logged in.\n\nThis app is under development.\n\n## Install\n\nSee the [AdminDoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc) for installation details.\n\nCheck [CHANGELOG](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CHANGELOG.md#change-log) file to see what's new and what's coming in next release.\n\nCheck [AUTHORS](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/AUTHORS.md#authors) file to see complete list of authors.\n\n## Known issues\n\n- PhoneTrack **now works** with Nextcloud group restriction activated. See [admindoc](https://github.com/julien-nc/phonetrack/blob/main/doc/admin.md#issue-with-phonetrack-restricted-to-some-groups-in-nextcloud).\n\nAny feedback will be appreciated.\n\n\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/eneiluj/donate)", "homepage": "https://github.com/julien-nc/phonetrack", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/33.json b/pkgs/servers/nextcloud/packages/33.json index d604950ceeb5..e46944447184 100644 --- a/pkgs/servers/nextcloud/packages/33.json +++ b/pkgs/servers/nextcloud/packages/33.json @@ -190,9 +190,9 @@ ] }, "integration_deepl": { - "hash": "sha256-RHYxxZw/2/uDdZdf8kGYgGBlBi1rfgXUtTtr9lgr/20=", - "url": "https://github.com/nextcloud-releases/integration_deepl/releases/download/v2.2.0/integration_deepl-v2.2.0.tar.gz", - "version": "2.2.0", + "hash": "sha256-PMK1Z3oFVkN8WtgySidCLnp+SZ3xHkPfzI2xVBfBm/k=", + "url": "https://github.com/nextcloud-releases/integration_deepl/releases/download/v2.3.0/integration_deepl-v2.3.0.tar.gz", + "version": "2.3.0", "description": "Deepl integration providing an translations through deepl.com with Nextcloud\n\nThis app integrates with [Nextcloud Assistant](https://apps.nextcloud.com/apps/assistant) to offer translation services We recommend to install Assistant additionally and activate Deepl as translation provider in the Artifical Intelligence admin settings.\n\nThis app also integrates with the translation API of Nextcloud server to offer translation services without Assistant. Currently this is available in Text and Talk.\n\nTo run translations and any other Task Processing tasks synchronously, run the following command in a background process (10 is the interval in seconds when the process should relaunch to use the latest php changes):\n\n```sh\nset -e; while true; do occ background-job:worker -v -t 10 \"OC\\TaskProcessing\\SynchronousBackgroundJob\"; done\n```\n\n## Ethical AI Rating\n### Rating: πŸ”΄\n\nNegative:\n* the software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* the trained model is not freely available, so the model can not be ran on-premises\n* the training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/integration_deepl", "licenses": [ @@ -310,9 +310,9 @@ ] }, "phonetrack": { - "hash": "sha256-bt/R1kZiTa9pWruKsAU01ni1d0AIy7vAOvIF8zwRhhw=", - "url": "https://github.com/julien-nc/phonetrack/releases/download/v1.3.1/phonetrack-1.3.1.tar.gz", - "version": "1.3.1", + "hash": "sha256-cinP3WFja6QjJYlQZcTKayHTheLjvnKY9s+CIJWKlcQ=", + "url": "https://github.com/julien-nc/phonetrack/releases/download/v1.3.2/phonetrack-1.3.2.tar.gz", + "version": "1.3.2", "description": "# PhoneTrack Nextcloud application\n\nπŸ“± PhoneTrack is a Nextcloud application to track and store mobile device's locations.\n\nπŸ—Ί It receives information from mobile phone's logging apps and displays it dynamically on a map.\n\n🌍 Help us to translate this app on [PhoneTrack Crowdin project](https://crowdin.com/project/phonetrack).\n\nβš’ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CONTRIBUTING.md).\n\nHow to use PhoneTrack :\n\n- Create a tracking session.\n- Give the logging link\\* to the mobile devices. Choose the [logging method](https://github.com/julien-nc/phonetrack/blob/main/doc/user.md#logging-methods) you prefer.\n- Watch the session's devices location in real time (or not) in PhoneTrack or share it with public pages.\n\n(\\*) Don't forget to set the device name in the link (rather than in the logging app settings). Replace \"yourname\" with the desired device name.\nSetting the device name in logging app settings only works with Owntracks, Traccar and OpenGTS.\n\nOn PhoneTrack main page, while watching a session, you can :\n\n- πŸ“ Display location history\n- β›› Filter points\n- ✎ Manually edit/add/delete points\n- ✎ Edit devices (rename, change colour/shape, move to another session)\n- β›Ά Define geofencing zones for devices\n- βš‡ Define proximity alerts for device pairs\n- πŸ–§ Share a session to other Nextcloud users or with a public link (read-only)\n- πŸ”— Generate public share links with optional restrictions (filters, device name, last positions only, geofencing simplification)\n- πŸ–« Import/export a session in GPX format (one file with one track per device or one file per device)\n- πŸ—  Display sessions statistics\n- πŸ”’ [Reserve a device name](https://github.com/julien-nc/phonetrack/blob/main/doc/user.md#device-name-reservation) to make sure only authorized user can log with this name\n- πŸ—“ Toggle session auto export and auto purge (daily/weekly/monthly)\n- β—” Choose what to do when point number quota is reached (block logging or delete oldest point)\n\nPublic page and public filtered page work like main page except there is only one session displayed, everything is read-only and there is no need to be logged in.\n\nThis app is under development.\n\n## Install\n\nSee the [AdminDoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc) for installation details.\n\nCheck [CHANGELOG](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CHANGELOG.md#change-log) file to see what's new and what's coming in next release.\n\nCheck [AUTHORS](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/AUTHORS.md#authors) file to see complete list of authors.\n\n## Known issues\n\n- PhoneTrack **now works** with Nextcloud group restriction activated. See [admindoc](https://github.com/julien-nc/phonetrack/blob/main/doc/admin.md#issue-with-phonetrack-restricted-to-some-groups-in-nextcloud).\n\nAny feedback will be appreciated.\n\n\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/eneiluj/donate)", "homepage": "https://github.com/julien-nc/phonetrack", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/34.json b/pkgs/servers/nextcloud/packages/34.json index db603b4ebe44..7556d95e2540 100644 --- a/pkgs/servers/nextcloud/packages/34.json +++ b/pkgs/servers/nextcloud/packages/34.json @@ -190,9 +190,9 @@ ] }, "integration_deepl": { - "hash": "sha256-RHYxxZw/2/uDdZdf8kGYgGBlBi1rfgXUtTtr9lgr/20=", - "url": "https://github.com/nextcloud-releases/integration_deepl/releases/download/v2.2.0/integration_deepl-v2.2.0.tar.gz", - "version": "2.2.0", + "hash": "sha256-PMK1Z3oFVkN8WtgySidCLnp+SZ3xHkPfzI2xVBfBm/k=", + "url": "https://github.com/nextcloud-releases/integration_deepl/releases/download/v2.3.0/integration_deepl-v2.3.0.tar.gz", + "version": "2.3.0", "description": "Deepl integration providing an translations through deepl.com with Nextcloud\n\nThis app integrates with [Nextcloud Assistant](https://apps.nextcloud.com/apps/assistant) to offer translation services We recommend to install Assistant additionally and activate Deepl as translation provider in the Artifical Intelligence admin settings.\n\nThis app also integrates with the translation API of Nextcloud server to offer translation services without Assistant. Currently this is available in Text and Talk.\n\nTo run translations and any other Task Processing tasks synchronously, run the following command in a background process (10 is the interval in seconds when the process should relaunch to use the latest php changes):\n\n```sh\nset -e; while true; do occ background-job:worker -v -t 10 \"OC\\TaskProcessing\\SynchronousBackgroundJob\"; done\n```\n\n## Ethical AI Rating\n### Rating: πŸ”΄\n\nNegative:\n* the software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* the trained model is not freely available, so the model can not be ran on-premises\n* the training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/integration_deepl", "licenses": [ @@ -310,9 +310,9 @@ ] }, "phonetrack": { - "hash": "sha256-bt/R1kZiTa9pWruKsAU01ni1d0AIy7vAOvIF8zwRhhw=", - "url": "https://github.com/julien-nc/phonetrack/releases/download/v1.3.1/phonetrack-1.3.1.tar.gz", - "version": "1.3.1", + "hash": "sha256-cinP3WFja6QjJYlQZcTKayHTheLjvnKY9s+CIJWKlcQ=", + "url": "https://github.com/julien-nc/phonetrack/releases/download/v1.3.2/phonetrack-1.3.2.tar.gz", + "version": "1.3.2", "description": "# PhoneTrack Nextcloud application\n\nπŸ“± PhoneTrack is a Nextcloud application to track and store mobile device's locations.\n\nπŸ—Ί It receives information from mobile phone's logging apps and displays it dynamically on a map.\n\n🌍 Help us to translate this app on [PhoneTrack Crowdin project](https://crowdin.com/project/phonetrack).\n\nβš’ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CONTRIBUTING.md).\n\nHow to use PhoneTrack :\n\n- Create a tracking session.\n- Give the logging link\\* to the mobile devices. Choose the [logging method](https://github.com/julien-nc/phonetrack/blob/main/doc/user.md#logging-methods) you prefer.\n- Watch the session's devices location in real time (or not) in PhoneTrack or share it with public pages.\n\n(\\*) Don't forget to set the device name in the link (rather than in the logging app settings). Replace \"yourname\" with the desired device name.\nSetting the device name in logging app settings only works with Owntracks, Traccar and OpenGTS.\n\nOn PhoneTrack main page, while watching a session, you can :\n\n- πŸ“ Display location history\n- β›› Filter points\n- ✎ Manually edit/add/delete points\n- ✎ Edit devices (rename, change colour/shape, move to another session)\n- β›Ά Define geofencing zones for devices\n- βš‡ Define proximity alerts for device pairs\n- πŸ–§ Share a session to other Nextcloud users or with a public link (read-only)\n- πŸ”— Generate public share links with optional restrictions (filters, device name, last positions only, geofencing simplification)\n- πŸ–« Import/export a session in GPX format (one file with one track per device or one file per device)\n- πŸ—  Display sessions statistics\n- πŸ”’ [Reserve a device name](https://github.com/julien-nc/phonetrack/blob/main/doc/user.md#device-name-reservation) to make sure only authorized user can log with this name\n- πŸ—“ Toggle session auto export and auto purge (daily/weekly/monthly)\n- β—” Choose what to do when point number quota is reached (block logging or delete oldest point)\n\nPublic page and public filtered page work like main page except there is only one session displayed, everything is read-only and there is no need to be logged in.\n\nThis app is under development.\n\n## Install\n\nSee the [AdminDoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc) for installation details.\n\nCheck [CHANGELOG](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CHANGELOG.md#change-log) file to see what's new and what's coming in next release.\n\nCheck [AUTHORS](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/AUTHORS.md#authors) file to see complete list of authors.\n\n## Known issues\n\n- PhoneTrack **now works** with Nextcloud group restriction activated. See [admindoc](https://github.com/julien-nc/phonetrack/blob/main/doc/admin.md#issue-with-phonetrack-restricted-to-some-groups-in-nextcloud).\n\nAny feedback will be appreciated.\n\n\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/eneiluj/donate)", "homepage": "https://github.com/julien-nc/phonetrack", "licenses": [ From 10f8351334fbdc586e2e87345c679961e765159c Mon Sep 17 00:00:00 2001 From: Benedikt Ritter Date: Sat, 1 Aug 2026 09:28:52 +0200 Subject: [PATCH 02/28] nextcloudPackages: add pantry (cherry picked from commit 0c27cbdd5cee49da38d4720be1b6a037df622517) --- pkgs/servers/nextcloud/packages/32.json | 10 ++++++++++ pkgs/servers/nextcloud/packages/33.json | 10 ++++++++++ pkgs/servers/nextcloud/packages/34.json | 10 ++++++++++ pkgs/servers/nextcloud/packages/nextcloud-apps.json | 1 + 4 files changed, 31 insertions(+) diff --git a/pkgs/servers/nextcloud/packages/32.json b/pkgs/servers/nextcloud/packages/32.json index 7fad4fdedad2..afcfa4a94e7e 100644 --- a/pkgs/servers/nextcloud/packages/32.json +++ b/pkgs/servers/nextcloud/packages/32.json @@ -309,6 +309,16 @@ "agpl" ] }, + "pantry": { + "hash": "sha256-kPldsAVbpoJ+6kMWmh70j3HBTlzZibtbyr5tvT0ZcaA=", + "url": "https://github.com/chenasraf/nextcloud-pantry/releases/download/v0.24.0/pantry-v0.24.0.tar.gz", + "version": "0.24.0", + "description": "Pantry helps households stay organized in Nextcloud.\n\n- **Houses** group members and their shared data. A person can belong to multiple houses and switch between them freely.\n- **Checklists** support recurring items (e.g. milk every week) that automatically reappear when due. Share lists with the whole household so everyone knows what to pick up.\n- **Photo boards** let you keep shared reference photos organized in folders β€” the right brand of dog food, a favorite recipe card, a product label, and so on.\n- **Notes wall** gives the household a lightweight shared space for reminders, pinned messages, and quick notes with customizable colors.\n- **Notifications** keep everyone in the loop when photos are uploaded or notes are added or edited.\n\nAll data is scoped to a house; members only see the houses they belong to.\n\nPantry also has companion apps for mobile and desktop that let you manage your lists, photos and notes on the go and keep everything in sync with your Nextcloud instance.\n\n**Companion apps:** Android ([Google Play](https://play.google.com/store/apps/details?id=dev.casraf.pantry), [F-Droid](https://f-droid.org/en/packages/dev.casraf.pantry/)) | iOS/macOS ([App Store](https://apps.apple.com/us/app/pantry-for-nextcloud/id6762161619))", + "homepage": "https://github.com/chenasraf/nextcloud-pantry", + "licenses": [ + "agpl" + ] + }, "phonetrack": { "hash": "sha256-cinP3WFja6QjJYlQZcTKayHTheLjvnKY9s+CIJWKlcQ=", "url": "https://github.com/julien-nc/phonetrack/releases/download/v1.3.2/phonetrack-1.3.2.tar.gz", diff --git a/pkgs/servers/nextcloud/packages/33.json b/pkgs/servers/nextcloud/packages/33.json index e46944447184..2d698afffcae 100644 --- a/pkgs/servers/nextcloud/packages/33.json +++ b/pkgs/servers/nextcloud/packages/33.json @@ -309,6 +309,16 @@ "agpl" ] }, + "pantry": { + "hash": "sha256-kPldsAVbpoJ+6kMWmh70j3HBTlzZibtbyr5tvT0ZcaA=", + "url": "https://github.com/chenasraf/nextcloud-pantry/releases/download/v0.24.0/pantry-v0.24.0.tar.gz", + "version": "0.24.0", + "description": "Pantry helps households stay organized in Nextcloud.\n\n- **Houses** group members and their shared data. A person can belong to multiple houses and switch between them freely.\n- **Checklists** support recurring items (e.g. milk every week) that automatically reappear when due. Share lists with the whole household so everyone knows what to pick up.\n- **Photo boards** let you keep shared reference photos organized in folders β€” the right brand of dog food, a favorite recipe card, a product label, and so on.\n- **Notes wall** gives the household a lightweight shared space for reminders, pinned messages, and quick notes with customizable colors.\n- **Notifications** keep everyone in the loop when photos are uploaded or notes are added or edited.\n\nAll data is scoped to a house; members only see the houses they belong to.\n\nPantry also has companion apps for mobile and desktop that let you manage your lists, photos and notes on the go and keep everything in sync with your Nextcloud instance.\n\n**Companion apps:** Android ([Google Play](https://play.google.com/store/apps/details?id=dev.casraf.pantry), [F-Droid](https://f-droid.org/en/packages/dev.casraf.pantry/)) | iOS/macOS ([App Store](https://apps.apple.com/us/app/pantry-for-nextcloud/id6762161619))", + "homepage": "https://github.com/chenasraf/nextcloud-pantry", + "licenses": [ + "agpl" + ] + }, "phonetrack": { "hash": "sha256-cinP3WFja6QjJYlQZcTKayHTheLjvnKY9s+CIJWKlcQ=", "url": "https://github.com/julien-nc/phonetrack/releases/download/v1.3.2/phonetrack-1.3.2.tar.gz", diff --git a/pkgs/servers/nextcloud/packages/34.json b/pkgs/servers/nextcloud/packages/34.json index 7556d95e2540..fbf4bb205f2d 100644 --- a/pkgs/servers/nextcloud/packages/34.json +++ b/pkgs/servers/nextcloud/packages/34.json @@ -309,6 +309,16 @@ "agpl" ] }, + "pantry": { + "hash": "sha256-kPldsAVbpoJ+6kMWmh70j3HBTlzZibtbyr5tvT0ZcaA=", + "url": "https://github.com/chenasraf/nextcloud-pantry/releases/download/v0.24.0/pantry-v0.24.0.tar.gz", + "version": "0.24.0", + "description": "Pantry helps households stay organized in Nextcloud.\n\n- **Houses** group members and their shared data. A person can belong to multiple houses and switch between them freely.\n- **Checklists** support recurring items (e.g. milk every week) that automatically reappear when due. Share lists with the whole household so everyone knows what to pick up.\n- **Photo boards** let you keep shared reference photos organized in folders β€” the right brand of dog food, a favorite recipe card, a product label, and so on.\n- **Notes wall** gives the household a lightweight shared space for reminders, pinned messages, and quick notes with customizable colors.\n- **Notifications** keep everyone in the loop when photos are uploaded or notes are added or edited.\n\nAll data is scoped to a house; members only see the houses they belong to.\n\nPantry also has companion apps for mobile and desktop that let you manage your lists, photos and notes on the go and keep everything in sync with your Nextcloud instance.\n\n**Companion apps:** Android ([Google Play](https://play.google.com/store/apps/details?id=dev.casraf.pantry), [F-Droid](https://f-droid.org/en/packages/dev.casraf.pantry/)) | iOS/macOS ([App Store](https://apps.apple.com/us/app/pantry-for-nextcloud/id6762161619))", + "homepage": "https://github.com/chenasraf/nextcloud-pantry", + "licenses": [ + "agpl" + ] + }, "phonetrack": { "hash": "sha256-cinP3WFja6QjJYlQZcTKayHTheLjvnKY9s+CIJWKlcQ=", "url": "https://github.com/julien-nc/phonetrack/releases/download/v1.3.2/phonetrack-1.3.2.tar.gz", diff --git a/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/pkgs/servers/nextcloud/packages/nextcloud-apps.json index af5d73fe8b4d..2e13179282ea 100644 --- a/pkgs/servers/nextcloud/packages/nextcloud-apps.json +++ b/pkgs/servers/nextcloud/packages/nextcloud-apps.json @@ -35,6 +35,7 @@ , "oidc_login": "agpl3Only" , "onlyoffice": "asl20" , "phonetrack": "agpl3Plus" +, "pantry": "agpl3Plus" , "polls": "agpl3Plus" , "previewgenerator": "agpl3Plus" , "qownnotesapi": "agpl3Plus" From 74b58cab8819ccc1881365a5f3dbf027b14bb68a Mon Sep 17 00:00:00 2001 From: Harish Rajagopal Date: Fri, 24 Jul 2026 20:31:38 +0200 Subject: [PATCH 03/28] maintainers: add rharish (cherry picked from commit 1f6a4dde7550d8a967c4ea6bed4e87be0a25b40f) --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8ec99d32116f..83bf1e81c6f6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -23364,6 +23364,12 @@ githubId = 12279531; name = "Ricardo Guevara"; }; + rharish = { + email = "harish.rajagopals@gmail.com"; + github = "rharish101"; + githubId = 25344287; + name = "Harish Rajagopal"; + }; rhelmot = { name = "Audrey Dutcher"; github = "rhelmot"; From 482ea6f02cbd2c1316fcd91b2dd3107f6e3c762d Mon Sep 17 00:00:00 2001 From: Harish Rajagopal Date: Fri, 24 Jul 2026 20:43:56 +0200 Subject: [PATCH 04/28] nixos/feishin: init module (cherry picked from commit fca2615fa3dfa2b64d8043371480e611f25cd87b) --- .../manual/release-notes/rl-2611.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/web-apps/feishin.nix | 156 ++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/feishin/caddy.nix | 36 ++++ nixos/tests/feishin/default.nix | 6 + nixos/tests/feishin/nginx.nix | 33 ++++ 7 files changed, 235 insertions(+) create mode 100644 nixos/modules/services/web-apps/feishin.nix create mode 100644 nixos/tests/feishin/caddy.nix create mode 100644 nixos/tests/feishin/default.nix create mode 100644 nixos/tests/feishin/nginx.nix diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index 1539b800fbcd..0c67d5a7b76e 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -24,6 +24,8 @@ - [Nezha](https://github.com/nezhahq/nezha), a self-hosted, lightweight server and website monitoring and O&M tool. Available as [services.nezha](#opt-services.nezha.enable). +- [feishin](https://github.com/jeffvli/feishin), a modern self-hosted music player. Available as [services.feishin](#opt-services.feishin.enable). + - [FlapAlerted](https://github.com/Kioubit/FlapAlerted), detects BGP flapping events and provides statistics based on BGP update messages. Available as [services.flap-alerted](#opt-services.flap-alerted.enable). ## Backward Incompatibilities {#sec-release-26.11-incompatibilities} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 05183e91e7b5..cee7c9535e9e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1651,6 +1651,7 @@ ./services/web-apps/engelsystem.nix ./services/web-apps/ente.nix ./services/web-apps/fediwall.nix + ./services/web-apps/feishin.nix ./services/web-apps/fider.nix ./services/web-apps/filebrowser.nix ./services/web-apps/firefly-iii-data-importer.nix diff --git a/nixos/modules/services/web-apps/feishin.nix b/nixos/modules/services/web-apps/feishin.nix new file mode 100644 index 000000000000..5ddbd9c8ba87 --- /dev/null +++ b/nixos/modules/services/web-apps/feishin.nix @@ -0,0 +1,156 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.feishin; +in +{ + options.services.feishin = { + enable = lib.mkEnableOption "the web version of Feishin"; + + package = lib.mkPackageOption pkgs "feishin-web" { }; + + domain = lib.mkOption { + description = "Domain to use for the virtualhost."; + type = lib.types.str; + }; + + pathbase = lib.mkOption { + description = "URL path base to use for the virtualhost."; + type = lib.types.str; + default = ""; + example = "/music"; + }; + + settings = lib.mkOption { + description = '' + Configuration for the web version of Feishin, specified as key-value pairs. + + Refer to , and + + for the template. + ''; + type = lib.types.attrsOf lib.types.str; + default = { + ANALYTICS_DISABLED = "true"; + }; + example = { + ANALYTICS_DISABLED = "true"; + SERVER_NAME = "My Server"; + SERVER_LOCK = "true"; + }; + }; + + nginx = { + enable = lib.mkEnableOption "a virtualhost to serve Feishin through nginx"; + + virtualHost = lib.mkOption { + description = "Extra configuration for the nginx virtualhost for Feishin."; + type = lib.types.submodule (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }); + default = { }; + example = lib.literalExpression '' + { + serverAliases = [ "feishin.''${config.networking.domain}" ]; + } + ''; + }; + }; + + caddy = { + enable = lib.mkEnableOption "a virtualhost to serve Feishin through Caddy"; + + virtualHost = lib.mkOption { + description = "Extra configuration for the Caddy virtualhost for Feishin."; + type = lib.types.submodule ( + import ../web-servers/caddy/vhost-options.nix { cfg = config.services.caddy; } + ); + default = { }; + example = lib.literalExpression '' + { + serverAliases = [ "feishin.''${config.networking.domain}" ]; + } + ''; + }; + }; + }; + + config = + let + resolvedSettings = + cfg.settings // lib.optionalAttrs (cfg.pathbase != "") { PUBLIC_PATH = cfg.pathbase; }; + settingsJs = '' + "use strict"; + ${lib.concatMapAttrsStringSep "\n" (name: value: ''window.${name} = "${value}";'') resolvedSettings} + ''; + settingsJsDir = pkgs.writeTextDir "settings.js" settingsJs; + in + lib.mkIf cfg.enable { + services.nginx = lib.mkIf cfg.nginx.enable { + enable = lib.mkDefault true; + virtualHosts."${cfg.domain}" = lib.mkMerge [ + cfg.nginx.virtualHost + { + root = lib.mkForce "${cfg.package}"; + extraConfig = '' + gzip on; + gzip_vary on; + gzip_proxied any; + gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript; + ''; + locations."${cfg.pathbase}/" = { + tryFiles = "$uri $uri/ /index.html =404"; + }; + locations."=${cfg.pathbase}/settings.js" = { + alias = settingsJsDir + "/settings.js"; + extraConfig = '' + add_header Cache-Control "no-store"; + ''; + }; + } + ]; + }; + + services.caddy = lib.mkIf cfg.caddy.enable { + enable = lib.mkDefault true; + virtualHosts."${cfg.domain}" = lib.mkMerge [ + cfg.caddy.virtualHost + { + hostName = lib.mkForce cfg.domain; + extraConfig = + let + baseConfig = '' + encode + handle /settings.js { + header Cache-Control no-store + root ${settingsJsDir} + file_server + } + handle { + root ${cfg.package} + try_files {path} /index.html + file_server + } + ''; + in + if (cfg.pathbase == "") then + baseConfig + else + '' + handle_path ${cfg.pathbase}/* { + ${baseConfig} + } + ''; + } + ]; + }; + }; + + meta.maintainers = with lib.maintainers; [ + rharish + BatteredBunny + ]; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 37e0a09e81fc..0408a5cdcf34 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -560,6 +560,7 @@ in fastnetmon-advanced = runTest ./fastnetmon-advanced.nix; fcitx5 = runTest ./fcitx5; fedimintd = runTest ./fedimintd.nix; + feishin = handleTest ./feishin { }; ferm = runTest ./ferm.nix; ferretdb = import ./ferretdb.nix { inherit pkgs runTest; }; fider = runTest ./fider.nix; diff --git a/nixos/tests/feishin/caddy.nix b/nixos/tests/feishin/caddy.nix new file mode 100644 index 000000000000..1329c5fc3326 --- /dev/null +++ b/nixos/tests/feishin/caddy.nix @@ -0,0 +1,36 @@ +import ../make-test-python.nix ( + { lib, ... }: + + { + name = "feishin-caddy"; + meta.maintainers = with lib.maintainers; [ + rharish + BatteredBunny + ]; + + nodes.machine = + { pkgs, ... }: + { + services.feishin = { + enable = true; + domain = "localhost:80"; + pathbase = "/feishin"; + settings = { + ANALYTICS_DISABLED = "true"; + }; + caddy.enable = true; + caddy.virtualHost.extraConfig = "tls internal"; + }; + # disable letsencrypt cert fetching + services.caddy.globalConfig = "auto_https disable_certs"; + }; + + testScript = '' + machine.wait_for_unit("caddy.service") + machine.wait_for_open_port(80) + machine.succeed("curl -vvv --fail --show-error --silent --location --insecure http://localhost/feishin/") + assert "Feishin" in machine.succeed("curl --fail --show-error --silent --location --insecure http://localhost/feishin/") + assert "window.ANALYTICS_DISABLED = \"true\";" in machine.succeed("curl --fail --show-error --silent --location --insecure http://localhost/feishin/settings.js") + ''; + } +) diff --git a/nixos/tests/feishin/default.nix b/nixos/tests/feishin/default.nix new file mode 100644 index 000000000000..fee30e520c7f --- /dev/null +++ b/nixos/tests/feishin/default.nix @@ -0,0 +1,6 @@ +{ system, pkgs, ... }: + +{ + caddy = import ./caddy.nix { inherit system pkgs; }; + nginx = import ./nginx.nix { inherit system pkgs; }; +} diff --git a/nixos/tests/feishin/nginx.nix b/nixos/tests/feishin/nginx.nix new file mode 100644 index 000000000000..cfeeca40b04f --- /dev/null +++ b/nixos/tests/feishin/nginx.nix @@ -0,0 +1,33 @@ +import ../make-test-python.nix ( + { lib, ... }: + + { + name = "feishin-nginx"; + meta.maintainers = with lib.maintainers; [ + rharish + BatteredBunny + ]; + + nodes.machine = + { pkgs, ... }: + { + services.feishin = { + enable = true; + domain = "localhost"; + pathbase = "/feishin"; + settings = { + ANALYTICS_DISABLED = "true"; + }; + nginx.enable = true; + }; + }; + + testScript = '' + machine.wait_for_unit("nginx.service") + machine.wait_for_open_port(80) + machine.succeed("curl -vvv --fail --show-error --silent --location --insecure http://localhost/feishin/") + assert "Feishin" in machine.succeed("curl --fail --show-error --silent --location --insecure http://localhost/feishin/") + assert "window.ANALYTICS_DISABLED = \"true\";" in machine.succeed("curl --fail --show-error --silent --location --insecure http://localhost/feishin/settings.js") + ''; + } +) From 703e84ae9389c6d34d691eec511c615e4c03a373 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Wed, 10 Jun 2026 14:32:39 +0200 Subject: [PATCH 05/28] bitwarden-desktop: drop LLVM pin on macOS Assisted-by: Claude Opus 4.8 via Claude Code (cherry picked from commit 68c787708a0e8cc47078e720f823bce7480766e6) --- pkgs/by-name/bi/bitwarden-desktop/package.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 0fc2eb51bda4..5bbbbae658e8 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -9,7 +9,6 @@ fetchFromGitHub, gnome-keyring, jq, - llvmPackages_18, makeDesktopItem, makeWrapper, nix-update-script, @@ -25,13 +24,8 @@ let description = "Secure and free password manager for all of your devices"; icon = "bitwarden"; electron = electron_39; - - # argon2 npm dependency is using `std::basic_string`, which is no longer allowed in LLVM 19 - buildNpmPackage' = buildNpmPackage.override { - stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv; - }; in -buildNpmPackage' rec { +buildNpmPackage rec { pname = "bitwarden-desktop"; version = "2026.5.0"; From 238cff8c3f471ba741ebb66dcd643ab78371d86a Mon Sep 17 00:00:00 2001 From: networkException Date: Thu, 6 Aug 2026 17:33:07 +0200 Subject: [PATCH 06/28] matrix-authentication-service: 1.21.0 -> 1.22.0 ChangeLog: https://github.com/element-hq/matrix-authentication-service/releases/tag/v1.22.0 (cherry picked from commit 3446190149fb474cb77fc427e16766a73cdcb20e) --- pkgs/by-name/ma/matrix-authentication-service/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix index 571119cf272d..d4e3a8957006 100644 --- a/pkgs/by-name/ma/matrix-authentication-service/package.nix +++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix @@ -20,16 +20,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-authentication-service"; - version = "1.21.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "element-hq"; repo = "matrix-authentication-service"; tag = "v${finalAttrs.version}"; - hash = "sha256-4z+u1IM2pclccv9+IH8IWjCodDxWZmffbqWPC726sIg="; + hash = "sha256-vy9eZYtlAMPXh+xvgAOEeJd7jZirX5Y4sXmNbYLBYGI="; }; - cargoHash = "sha256-HQU0zaK7rLJnTX5WVZrqNEaT5HfFLDzs+pHRxx5XTaA="; + cargoHash = "sha256-3MDbg+vfLIqSDiRqBVZs2zbrg9UUpe4Vx+Ze656yOdE="; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; From 1e1f63fe00b761be09cc9608d1f06189c22023e2 Mon Sep 17 00:00:00 2001 From: Sapi <144389458+tree-sapii@users.noreply.github.com> Date: Thu, 25 Jun 2026 23:30:11 -0400 Subject: [PATCH 07/28] maintainers: add tree-sapii (cherry picked from commit d19924c50abeea21e4c065c68a6b80edb1f63959) --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8ec99d32116f..c31b0b3da13f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -28271,6 +28271,12 @@ githubId = 5623227; name = "Quentin Boyer"; }; + tree-sapii = { + email = "supersapiiiiii@gmail.com"; + github = "tree-sapii"; + githubId = 144389458; + name = "sapii"; + }; treemo = { email = "matthieu.chevrier@treemo.fr"; github = "treemo"; From cf5e3981d6a9b813a0fe92c808d0553b26b5faaa Mon Sep 17 00:00:00 2001 From: Sapi <144389458+tree-sapii@users.noreply.github.com> Date: Thu, 25 Jun 2026 17:26:17 -0400 Subject: [PATCH 08/28] bitwarden-desktop: 2026.5.0 -> 2026.6.0, migrated to finalAttrs (cherry picked from commit 63ba3230afaf2e6833d2438f49470ebebeff8174) --- pkgs/by-name/bi/bitwarden-desktop/package.nix | 36 +++++++++---------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 5bbbbae658e8..a53954076a30 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -21,19 +21,18 @@ }: let - description = "Secure and free password manager for all of your devices"; icon = "bitwarden"; electron = electron_39; in -buildNpmPackage rec { +buildNpmPackage (finalAttrs: { pname = "bitwarden-desktop"; - version = "2026.5.0"; + version = "2026.6.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; - rev = "desktop-v${version}"; - hash = "sha256-R00wt5W4kKmFIODEaGoUqDwfGyHH/2PpiRaC8Gq3d88="; + tag = "desktop-v${finalAttrs.version}"; + hash = "sha256-JIIis3wW0cU33ovRQfJi3HlB2YdLZ5IPvueq1dGFbas="; }; patches = [ @@ -49,10 +48,6 @@ buildNpmPackage rec { ]; postPatch = '' - # https://github.com/bitwarden/clients/pull/20480 - substituteInPlace package-lock.json apps/desktop/desktop_native/napi/package.json \ - --replace-fail '"@napi-rs/cli": "3.5.1"' '"@napi-rs/cli": "3.2.0"' - # remove code under unfree license rm -r bitwarden_license @@ -78,18 +73,18 @@ buildNpmPackage rec { ]; npmWorkspace = "apps/desktop"; - npmDepsFetcherVersion = 2; - npmDepsHash = "sha256-xmb3zwE8/nWpRlUOgTz2UhNRaUA8KW9sHQHA97pjjfg="; + npmDepsFetcherVersion = 3; + npmDepsHash = "sha256-mvFLZwWwIv4PbUwfTWvwZ9JyRoHJSwAA0cT4RXD0/YU="; cargoDeps = rustPlatform.fetchCargoVendor { - inherit + inherit (finalAttrs) pname version src cargoRoot patches ; - hash = "sha256-phvk4t1JKfSYGzm/vm1rT8A0fACHJF/C0WiZ2Lk3cV0="; + hash = "sha256-xyK3+z2yfCG9K5XAB6LNEeyqMRknONi6ZfY/3oko7Z8="; }; cargoRoot = "apps/desktop/desktop_native"; @@ -169,7 +164,7 @@ buildNpmPackage rec { ]; preCheck = '' - pushd ${cargoRoot} + pushd ${finalAttrs.cargoRoot} cargoCheckType=release HOME=$(mktemp -d) ''; @@ -223,7 +218,7 @@ buildNpmPackage rec { name = "bitwarden"; exec = "bitwarden %U"; inherit icon; - comment = description; + comment = finalAttrs.meta.description; desktopName = "Bitwarden"; categories = [ "Utility" ]; mimeTypes = [ "x-scheme-handler/bitwarden" ]; @@ -240,11 +235,14 @@ buildNpmPackage rec { }; meta = { - changelog = "https://github.com/bitwarden/clients/releases/tag/${src.rev}"; - inherit description; + changelog = "https://github.com/bitwarden/clients/releases/tag/${finalAttrs.src.tag}"; + description = "Secure and free password manager for all of your devices"; homepage = "https://bitwarden.com"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ amarshall ]; + maintainers = with lib.maintainers; [ + tree-sapii + amarshall + ]; platforms = [ "x86_64-linux" "aarch64-linux" @@ -253,4 +251,4 @@ buildNpmPackage rec { ]; mainProgram = "bitwarden"; }; -} +}) From befd7d83bd47732f750df810ec2fc2aae98d1553 Mon Sep 17 00:00:00 2001 From: tree-sapii <144389458+tree-sapii@users.noreply.github.com> Date: Tue, 30 Jun 2026 12:28:53 -0400 Subject: [PATCH 09/28] bitwarden-desktop: 2026.6.0 -> 2026.6.1 (cherry picked from commit 05227335583798f745eadbe76ab932d29867cc43) --- pkgs/by-name/bi/bitwarden-desktop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index a53954076a30..305fcc575591 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -26,13 +26,13 @@ let in buildNpmPackage (finalAttrs: { pname = "bitwarden-desktop"; - version = "2026.6.0"; + version = "2026.6.1"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; tag = "desktop-v${finalAttrs.version}"; - hash = "sha256-JIIis3wW0cU33ovRQfJi3HlB2YdLZ5IPvueq1dGFbas="; + hash = "sha256-ee+C58Y5pZWEmqbRO/w7rdY+e6gy4EL7Sn0S1AxGMXI="; }; patches = [ @@ -74,7 +74,7 @@ buildNpmPackage (finalAttrs: { npmWorkspace = "apps/desktop"; npmDepsFetcherVersion = 3; - npmDepsHash = "sha256-mvFLZwWwIv4PbUwfTWvwZ9JyRoHJSwAA0cT4RXD0/YU="; + npmDepsHash = "sha256-C5GLei/WWetd4qLv7obBJWbQR9LBy+Sqdbjko3/W7VY="; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) From ab285a3bb47831c6dc50786e211425d1275ee6db Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Thu, 23 Jul 2026 18:20:38 -0400 Subject: [PATCH 10/28] bitwarden-desktop: 2026.6.1 -> 2026.7.0 Diff: https://github.com/bitwarden/clients/compare/desktop-v2026.6.1...desktop-v2026.7.0 Changelog: https://github.com/bitwarden/clients/releases/tag/desktop-v2026.7.0 (cherry picked from commit 998099c713defb0f49b55a7776865e0065f3e671) --- .../dont-auto-setup-biometrics.patch | 12 ++++++------ pkgs/by-name/bi/bitwarden-desktop/package.nix | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch b/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch index 4102caca56ae..d9456136e2fd 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch +++ b/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch @@ -1,8 +1,8 @@ -diff --git a/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts b/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts -index 791b4d6f88..dfee0bbf8d 100644 ---- a/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts -+++ b/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts -@@ -115,7 +115,7 @@ export default class OsBiometricsServiceLinux implements OsBiometricService { +diff --git a/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-linux.service.ts b/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-linux.service.ts +index 110db23ec79..dfaf600bcdf 100644 +--- a/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-linux.service.ts ++++ b/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-linux.service.ts +@@ -83,7 +83,7 @@ export default class OsBiometricsServiceLinux implements OsBiometricService { // The user needs to manually set up the polkit policy outside of the sandbox // since we allow access to polkit via dbus for the sandboxed clients, the authentication works from // the sandbox, once the policy is set up outside of the sandbox. @@ -10,4 +10,4 @@ index 791b4d6f88..dfee0bbf8d 100644 + return false; } - async osBiometricsSetup(): Promise { + async runSetup(): Promise { diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 305fcc575591..5319ff2efdec 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -5,14 +5,14 @@ copyDesktopItems, dart-sass, darwin, - electron_39, + electron_41, fetchFromGitHub, gnome-keyring, jq, makeDesktopItem, makeWrapper, nix-update-script, - nodejs_22, + nodejs_24, pkg-config, rustc, rustPlatform, @@ -22,17 +22,17 @@ let icon = "bitwarden"; - electron = electron_39; + electron = electron_41; in buildNpmPackage (finalAttrs: { pname = "bitwarden-desktop"; - version = "2026.6.1"; + version = "2026.7.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; tag = "desktop-v${finalAttrs.version}"; - hash = "sha256-ee+C58Y5pZWEmqbRO/w7rdY+e6gy4EL7Sn0S1AxGMXI="; + hash = "sha256-E4glf4G70BuT0GYu1kEb5Z9B76ElIlDPe1rdGSdmCzo="; }; patches = [ @@ -64,7 +64,7 @@ buildNpmPackage (finalAttrs: { rm -r apps/cli ''; - nodejs = nodejs_22; + nodejs = nodejs_24; makeCacheWritable = true; npmFlags = [ @@ -74,7 +74,7 @@ buildNpmPackage (finalAttrs: { npmWorkspace = "apps/desktop"; npmDepsFetcherVersion = 3; - npmDepsHash = "sha256-C5GLei/WWetd4qLv7obBJWbQR9LBy+Sqdbjko3/W7VY="; + npmDepsHash = "sha256-8wjt5wnJG4S4EeGWGxbo6Bwt76GIqrSiwqwwwQ17Y5Y="; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) @@ -84,7 +84,7 @@ buildNpmPackage (finalAttrs: { cargoRoot patches ; - hash = "sha256-xyK3+z2yfCG9K5XAB6LNEeyqMRknONi6ZfY/3oko7Z8="; + hash = "sha256-PLfR+yS+MtscRRuyLaK/qIWJVDoefhOobev1fpNeHNo="; }; cargoRoot = "apps/desktop/desktop_native"; @@ -197,7 +197,7 @@ buildNpmPackage (finalAttrs: { # Extract the polkit policy file from the multiline string in the source code. # This may break in the future but its better than copy-pasting it manually. mkdir -p $out/share/polkit-1/actions/ - pushd apps/desktop/src/key-management/biometrics + pushd apps/desktop/src/key-management/biometrics/native-v2 awk '/const polkitPolicy = `/{gsub(/^.*`/, ""); print; str=1; next} str{if (/`;/) str=0; gsub(/`;/, ""); print}' os-biometrics-linux.service.ts > $out/share/polkit-1/actions/com.bitwarden.Bitwarden.policy popd From 0bcb22dfaa716661d8474fa28866672e7680b58f Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Sat, 1 Aug 2026 21:17:37 +0200 Subject: [PATCH 11/28] bitwarden-desktop: use npmDepsFetcherVersion 2 There is no version 3 yet, hashes will break in the future if we add a new version. (cherry picked from commit 4c482de9b9f18ee7e8486624cd22ba6e3de90be7) --- pkgs/by-name/bi/bitwarden-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 5319ff2efdec..29b4eba936fc 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -73,8 +73,8 @@ buildNpmPackage (finalAttrs: { ]; npmWorkspace = "apps/desktop"; - npmDepsFetcherVersion = 3; - npmDepsHash = "sha256-8wjt5wnJG4S4EeGWGxbo6Bwt76GIqrSiwqwwwQ17Y5Y="; + npmDepsFetcherVersion = 2; + npmDepsHash = "sha256-WRxlvkgWboO0ukUHgjC5CrfgfwnmUfDXI4r5dx9CKww="; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) From 8a184f583045efd25463db1fa8dc529e12d04229 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Aug 2026 21:51:18 +0000 Subject: [PATCH 12/28] jackett: 0.24.2288 -> 0.24.2335 (cherry picked from commit b26d9b0a558b499d2ebb6e5ed79ae78835a6fdf4) --- pkgs/by-name/ja/jackett/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ja/jackett/package.nix b/pkgs/by-name/ja/jackett/package.nix index e5ff19144303..0548c66c6b69 100644 --- a/pkgs/by-name/ja/jackett/package.nix +++ b/pkgs/by-name/ja/jackett/package.nix @@ -12,13 +12,13 @@ buildDotnetModule (finalAttrs: { pname = "jackett"; - version = "0.24.2288"; + version = "0.24.2335"; src = fetchFromGitHub { owner = "jackett"; repo = "jackett"; tag = "v${finalAttrs.version}"; - hash = "sha256-6K/9napcF5T57ziPhbU5glQAkWCEOzFjn9KToB1vVO4="; + hash = "sha256-QDpjw525VHumabdeRwDxvsUxzJXTxQneezR8YDEHdLE="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; From d010f50785deae6310262dc9228d1e1f4f2af5b8 Mon Sep 17 00:00:00 2001 From: Dustin Sweigart Date: Thu, 16 Jul 2026 09:16:32 -0400 Subject: [PATCH 13/28] nixos/technitium-dns-server: set WorkingDirectory on systemd service (cherry picked from commit 411a1103c35271443e93fe440c1fe22aad7099ad) --- nixos/modules/services/networking/technitium-dns-server.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/technitium-dns-server.nix b/nixos/modules/services/networking/technitium-dns-server.nix index 32aa247989aa..acb87e860978 100644 --- a/nixos/modules/services/networking/technitium-dns-server.nix +++ b/nixos/modules/services/networking/technitium-dns-server.nix @@ -66,6 +66,7 @@ in StateDirectory = "technitium-dns-server"; LogsDirectory = "technitium"; + WorkingDirectory = "%S/technitium-dns-server"; Restart = "always"; RestartSec = 10; From 6049ede12ae85fcf05f85d679d67fa22aca1ae2b Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 28 Jul 2026 13:57:41 +0000 Subject: [PATCH 14/28] sonarr: 4.0.18.2971 -> 4.0.19.2979 (cherry picked from commit f688bfedb94dd8b1f2df8f38a99f85e6ddf6d5a0) --- pkgs/by-name/so/sonarr/package.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/sonarr/package.nix b/pkgs/by-name/so/sonarr/package.nix index eb437a1f8c82..a6d1a5c00089 100644 --- a/pkgs/by-name/so/sonarr/package.nix +++ b/pkgs/by-name/so/sonarr/package.nix @@ -21,7 +21,7 @@ applyPatches, }: let - version = "4.0.18.2971"; + version = "4.0.19.2979"; # The dotnet8 compatibility patches also change `yarn.lock`, so we must pass # the already patched lockfile to `fetchYarnDeps`. src = applyPatches { @@ -29,7 +29,7 @@ let owner = "Sonarr"; repo = "Sonarr"; tag = "v${version}"; - hash = "sha256-83qbbBNk42KjKZNvYaAINoWZa3uEgaV0eveGl9dKTd8="; + hash = "sha256-hYO7I1zaBSYgobd8GvIx/sWyRzflXMFjnnPB21pm4wQ="; }; postPatch = '' mv src/NuGet.Config NuGet.Config @@ -39,6 +39,20 @@ let --replace-fail 'IPNetwork' 'Microsoft.AspNetCore.HttpOverrides.IPNetwork' ''; patches = lib.optionals (lib.versionOlder version "5.0") [ + # Prerequisite for .NET 8 patches, some commits + # touching the same files have to be reverted + (fetchpatch { + name = "revert-ffprobe-bump"; + url = "https://github.com/Sonarr/Sonarr/commit/34761ca2162eb45d1f207a097f0d546239665bfa.patch"; + revert = true; + hash = "sha256-8DNXrWtaTwNthI4tCXIf9a3xF2dBwo7IPdbtGStFX50="; + }) + (fetchpatch { + name = "revert-mailkit-bump"; + url = "https://github.com/Sonarr/Sonarr/commit/0718ba00041bf2d74749dc246bc02ad0540ec24e.patch"; + revert = true; + hash = "sha256-+S4bt5Ult48nwXXOhZ57UIOYg0sInZDlvBWeySZfGyY="; + }) # See https://github.com/Sonarr/Sonarr/issues/7442 and # https://github.com/Sonarr/Sonarr/pull/7443. # Unfortunately, the .NET 8 upgrade was only merged into the v5 branch, From 3f4b234187745afb6fd6e028b8c8d3b941ae479f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Aug 2026 18:17:27 +0000 Subject: [PATCH 15/28] matrix-tuwunel: 1.8.2 -> 1.8.3 (cherry picked from commit 8cc04b1b02e839176cf5a4589a43b080ddb825c5) --- pkgs/by-name/ma/matrix-tuwunel/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/matrix-tuwunel/package.nix b/pkgs/by-name/ma/matrix-tuwunel/package.nix index ae7ca4a8c419..eba046c3852d 100644 --- a/pkgs/by-name/ma/matrix-tuwunel/package.nix +++ b/pkgs/by-name/ma/matrix-tuwunel/package.nix @@ -88,16 +88,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-tuwunel"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "matrix-construct"; repo = "tuwunel"; tag = "v${finalAttrs.version}"; - hash = "sha256-mfdX5HmuXf6s7zyT9AJUoz4v5v9Km+VX8z6KvRGq8F8="; + hash = "sha256-Csq8eHV2r28POX+Ce1lZ0ybIw5Wt3ABUbWg2W8p2lOw="; }; - cargoHash = "sha256-jIgL/4i17H216goZ8DiFvIJTCKyjEHGiky3MTO5sQoY="; + cargoHash = "sha256-mShVBCwd8cwF7K1ILf1gn7ImaxwF73KP2YiDiAJV0f0="; nativeBuildInputs = [ pkg-config From 1690636bbe990711e0ab57adae4e7f8fb0774d45 Mon Sep 17 00:00:00 2001 From: liberodark Date: Mon, 10 Aug 2026 10:33:47 +0200 Subject: [PATCH 16/28] zulu: fix eval on unsupported systems (cherry picked from commit 5e4b381048d9244632c6ec527d64138a66b436da) --- pkgs/development/compilers/zulu/common.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/zulu/common.nix b/pkgs/development/compilers/zulu/common.nix index 46724ffea83c..0038ab2e7bf4 100644 --- a/pkgs/development/compilers/zulu/common.nix +++ b/pkgs/development/compilers/zulu/common.nix @@ -32,16 +32,14 @@ ffmpeg, }: let - dist = - dists.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + dist = dists.${stdenv.hostPlatform.system} or (builtins.head (builtins.attrValues dists)); arch = { "aarch64" = "aarch64"; "x86_64" = "x64"; } - .${stdenv.hostPlatform.parsed.cpu.name} - or (throw "Unsupported architecture: ${stdenv.hostPlatform.parsed.cpu.name}"); + .${stdenv.hostPlatform.parsed.cpu.name} or "unsupported"; platform = { From 161eddce848f768a375b5493399cea8cad4c2c71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Aug 2026 23:19:34 +0000 Subject: [PATCH 17/28] blackfire: 2026.7.0 -> 2026.8.0 (cherry picked from commit d77378d8bbe543068806b0061c722c3b9e2c3654) --- pkgs/by-name/bl/blackfire/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/bl/blackfire/package.nix b/pkgs/by-name/bl/blackfire/package.nix index 7396607f951c..6535aa714aef 100644 --- a/pkgs/by-name/bl/blackfire/package.nix +++ b/pkgs/by-name/bl/blackfire/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2026.7.0"; + version = "2026.8.0"; src = passthru.sources.${stdenv.hostPlatform.system} @@ -60,19 +60,19 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - hash = "sha256-GzhcK+7NrQEP48XFmOQ9PVrvvsUzrCy/VRcshTSic9E="; + hash = "sha256-9hBHQvR4w7AnJGL5FdzfYyxoAOnoFtsOC8Fd+7A+Y0M="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - hash = "sha256-F6U7YHSBE5Ogie2yBSGGUKt0XsE8jogKi2GP28H1Eeo="; + hash = "sha256-HnNgdGVhzX+WIXzgfukPZAKB7jr9PwxOUJ8iMOaMOI8="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - hash = "sha256-eDJAjd/5omgUJ6sw5kCqxu7Ok2AYei/WGlXV96Ynd/U="; + hash = "sha256-Q89i59KSA2oN8PEVScmnf56i6MJZgDbpTNW8Eojd8To="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - hash = "sha256-xzWw6us+9/r8lMMHZTgE++rX7ZZShAL7L7fOneALA4Q="; + hash = "sha256-h3vTwK8/wZLoAsAnFSSiDe6CvZNtPG0TAAt4Vts4GBE="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; From 2801ceb8987c1ac2d05835b6dd8ee4994fb82e0d Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Wed, 22 Jul 2026 14:52:14 +0200 Subject: [PATCH 18/28] github-runner: 2.335.1 -> 2.336.0 Changelog: https://github.com/actions/runner/releases/tag/v2.336.0 (cherry picked from commit 039812311ae83efa69fc1e855dfd863937073547) --- pkgs/by-name/gi/github-runner/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix index d88a6d2583be..00d856a7e3ab 100644 --- a/pkgs/by-name/gi/github-runner/package.nix +++ b/pkgs/by-name/gi/github-runner/package.nix @@ -35,13 +35,13 @@ assert builtins.all ( buildDotnetModule (finalAttrs: { pname = "github-runner"; - version = "2.335.1"; + version = "2.336.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; tag = "v${finalAttrs.version}"; - hash = "sha256-mFwWhpFzp0pT7WaMpF/N6PGw0IJt3I6/e7GDgw9wA2U="; + hash = "sha256-wzPGtNdKszDT8VMgL13xUUp+IhP8UzpXVHkR0T2Ns1A="; leaveDotGit = true; postFetch = '' git -C $out rev-parse --short HEAD > $out/.git-revision From da289955fc9b6ef099abbb3adb8c70f343acc21d Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Wed, 22 Jul 2026 14:56:53 +0200 Subject: [PATCH 19/28] github-runner: add myself as maintainer While I am not that much knowleadgeable about the dotnet ecosystem, It was sufficient enough for me to coordinate the last few release bumps. Being a maintainer will simplify backporting release bumps to older releases with the merge-bot. (cherry picked from commit 14e4152d002aec91bab648db78ed0686fd9ff572) --- pkgs/by-name/gi/github-runner/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix index 00d856a7e3ab..2c8771aae97a 100644 --- a/pkgs/by-name/gi/github-runner/package.nix +++ b/pkgs/by-name/gi/github-runner/package.nix @@ -374,6 +374,7 @@ buildDotnetModule (finalAttrs: { kfollesdal aanderse zimbatm + schmittlauch ]; platforms = [ "x86_64-linux" From 3d9ba17bdfba610d09ee9a7b7978a644797edb18 Mon Sep 17 00:00:00 2001 From: eljamm Date: Mon, 10 Aug 2026 05:55:04 +0000 Subject: [PATCH 20/28] linux_xanmod: 6.18.42 -> 6.18.44 - Changelog: https://dl.xanmod.org/changelog/6.18/ChangeLog-6.18.44-xanmod1.gz - Diff: https://gitlab.com/xanmod/linux/-/compare/6.18.42-xanmod1..6.18.44-xanmod1?from_project_id=51590166 (cherry picked from commit 6832340e943cbefbbdef9ded3bf1b307d3970d4b) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index c64a7ce1fd44..f6f2e5e78ea7 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -15,8 +15,8 @@ let variants = { # ./update-xanmod.sh lts lts = { - version = "6.18.42"; - hash = "sha256-yDtXLGdFM4rg8mtxUJbUvCvjs2dvFiSGuCV7seKlWqM="; + version = "6.18.44"; + hash = "sha256-o0uvZj3wJcT8JbR8c42ayN3VUF5Ke6RIQ+igBWZNJmY="; isLTS = true; }; # ./update-xanmod.sh main From 77c78e74fbb0b311d0a08c29720f5e0987d9aa00 Mon Sep 17 00:00:00 2001 From: eljamm Date: Mon, 10 Aug 2026 05:57:37 +0000 Subject: [PATCH 21/28] linux_xanmod_latest: 7.1.6 -> 7.1.8 - Changelog: https://dl.xanmod.org/changelog/7.1/ChangeLog-7.1.8-xanmod1.gz - Diff: https://gitlab.com/xanmod/linux/-/compare/7.1.6-xanmod1..7.1.8-xanmod1?from_project_id=51590166 (cherry picked from commit 76c75b4d6771b60a9ac764d6cfcb3b750d8e8291) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index f6f2e5e78ea7..391390b5e827 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -21,8 +21,8 @@ let }; # ./update-xanmod.sh main main = { - version = "7.1.6"; - hash = "sha256-H+dNmTMCWfJm792HR6lz1wVUD70pyZpn5HlTUXwsnLI="; + version = "7.1.8"; + hash = "sha256-4VqaaQ+BXVUY14W9XTZy7IESmLEB/Rbko4sFl10OmCA="; }; }; From 70e75b38567afbe2e861f2dbb538154b708e34e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Aug 2026 10:33:22 +0000 Subject: [PATCH 22/28] necesse-server: 1.3.1-24494674 -> 1.3.2-24574169 (cherry picked from commit 00874f58013b20256c77d23915234ec1a4e51fbd) --- pkgs/by-name/ne/necesse-server/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/necesse-server/package.nix b/pkgs/by-name/ne/necesse-server/package.nix index ef6f85fcc8ac..b42cfa95723e 100644 --- a/pkgs/by-name/ne/necesse-server/package.nix +++ b/pkgs/by-name/ne/necesse-server/package.nix @@ -6,7 +6,7 @@ }: let - version = "1.3.1-24494674"; + version = "1.3.2-24574169"; urlVersion = lib.replaceStrings [ "." ] [ "-" ] version; in @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation { src = fetchzip { url = "https://necesse.pwn.sh/server/necesse-server-linux64-${urlVersion}.zip"; - hash = "sha256-A2mWnIIRGNfbxg7aZDwEk7QvuDUUpr2ARIddasTlvFM="; + hash = "sha256-WJY9cTtkZcL55khatPesG1asS06tUnazzP0bp80cfu8="; }; # removing packaged jre since we use our own From 3b08159f45c6bf38b10fcc4d2bed5e59030b1066 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Aug 2026 04:27:07 +0000 Subject: [PATCH 23/28] forge-mtg: 2.0.13 -> 2.0.14 (cherry picked from commit b663521bd71a7409c88f07ab737e074bcae042a8) --- pkgs/by-name/fo/forge-mtg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fo/forge-mtg/package.nix b/pkgs/by-name/fo/forge-mtg/package.nix index 79bf41309d44..9a91695f2336 100644 --- a/pkgs/by-name/fo/forge-mtg/package.nix +++ b/pkgs/by-name/fo/forge-mtg/package.nix @@ -16,13 +16,13 @@ }: let - version = "2.0.13"; + version = "2.0.14"; src = fetchFromGitHub { owner = "Card-Forge"; repo = "forge"; rev = "forge-${version}"; - hash = "sha256-BU2RkXE3oMVLlCqebQwidH/ZtHKrrD47PAQhMnF/8pU="; + hash = "sha256-q9gGTbt70xogF6C359xSnyuf0gz/OKjONEXkKghzJkc="; }; # launch4j downloads and runs a native binary during the package phase. From 1e96e496b2beedf33756e3295a108e04c3554374 Mon Sep 17 00:00:00 2001 From: d18g Date: Sun, 5 Jul 2026 13:17:14 +0300 Subject: [PATCH 24/28] nixos/misskey: fixes for attrTag submodule docs Fix the declaration location of attributes of submodules of attrTag (cherry picked from commit f3c771e978d358c1ceb66a694178f3794febfc09) --- nixos/modules/services/web-apps/misskey.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/misskey.nix b/nixos/modules/services/web-apps/misskey.nix index e02e4106a5ad..0bc4efce5261 100644 --- a/nixos/modules/services/web-apps/misskey.nix +++ b/nixos/modules/services/web-apps/misskey.nix @@ -231,7 +231,7 @@ in webserver = lib.mkOption { type = lib.types.attrTag { nginx = lib.mkOption { - type = lib.types.submodule (import ../web-servers/nginx/vhost-options.nix); + type = lib.types.submodule ../web-servers/nginx/vhost-options.nix; default = { }; description = '' Extra configuration for the nginx virtual host of Misskey. @@ -240,7 +240,7 @@ in }; caddy = lib.mkOption { type = lib.types.submodule ( - import ../web-servers/caddy/vhost-options.nix { cfg = config.services.caddy; } + lib.modules.importApply ../web-servers/caddy/vhost-options.nix { cfg = config.services.caddy; } ); default = { }; description = '' From 3043fb8cf49616fc4142a2da0343e85408918d60 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Aug 2026 23:05:52 +0300 Subject: [PATCH 25/28] linux-firmware: 20260622 -> 20260810 Diff: https://gitlab.com/kernel-firmware/linux-firmware/-/compare/20260622...20260810 (cherry picked from commit 08beff6c9ffdca5ae00b7e38e1a25ac4e3488e6b) --- pkgs/by-name/li/linux-firmware/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/linux-firmware/package.nix b/pkgs/by-name/li/linux-firmware/package.nix index 6019480aed92..58d28198b1ac 100644 --- a/pkgs/by-name/li/linux-firmware/package.nix +++ b/pkgs/by-name/li/linux-firmware/package.nix @@ -23,13 +23,13 @@ let in stdenvNoCC.mkDerivation rec { pname = "linux-firmware"; - version = "20260622"; + version = "20260810"; src = fetchFromGitLab { owner = "kernel-firmware"; repo = "linux-firmware"; tag = version; - hash = "sha256-nSoJhgI4hAxtNmnj5M6ticzuBSt9uNAYcmc1VR/yXxE="; + hash = "sha256-P/fPpqaatp8Z2GV+I/OChiWGn6AhV+8w1RMFuX/LqHc="; }; postUnpack = '' From 42aa7305e18d9a59493bb7951cdbbe6346f8fe20 Mon Sep 17 00:00:00 2001 From: "nixpkgs-ci[bot]" <190413589+nixpkgs-ci[bot]@users.noreply.github.com> Date: Mon, 10 Aug 2026 19:59:37 +0000 Subject: [PATCH 26/28] maintainers/github-teams.json: Automated sync (cherry picked from commit 140a0b59a2a18913a9a263f9923430ef8be1e80b) --- maintainers/github-teams.json | 36 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json index dd6fb2723095..662132d06a23 100644 --- a/maintainers/github-teams.json +++ b/maintainers/github-teams.json @@ -2,11 +2,10 @@ "acme": { "description": "Maintain ACME-related packages and modules.", "id": 3806126, - "maintainers": { - "emilazy": 18535642 - }, + "maintainers": {}, "members": { "arianvp": 628387, + "emilazy": 18535642, "m1cr0man": 3044438 }, "name": "ACME" @@ -60,7 +59,6 @@ "adamcstephens": 2071575, "ankhers": 750786, "gleber": 33185, - "minijackson": 1200507, "yurrriq": 1866448 }, "name": "Beam" @@ -68,11 +66,10 @@ "boot-security": { "description": "Maintain support for boot security technologies like Secure Boot", "id": 18686947, - "maintainers": { - "emilazy": 18535642 - }, + "maintainers": {}, "members": { - "ElvishJerricco": 1365692 + "ElvishJerricco": 1365692, + "emilazy": 18535642 }, "name": "Boot security" }, @@ -98,8 +95,8 @@ "fgaz": 8182846, "natsukium": 25083790, "philiptaron": 43863, - "pyrotelekinetic": 29682759, - "tomodachi94": 68489118 + "tomodachi94": 68489118, + "tr3foil": 29682759 }, "members": {}, "name": "Categorization" @@ -184,7 +181,6 @@ "description": "Improve Darwin-support across Nixpkgs and help maintainers without access to Darwin hardware. Apply to join through https://github.com/NixOS/nixpkgs/issues/323144 to keep the process transparent.", "id": 2385202, "maintainers": { - "emilazy": 18535642, "toonn": 1486805 }, "members": { @@ -211,10 +207,12 @@ "cideM": 4246921, "cidkidnix": 67574902, "copumpkin": 2623, + "delafthi": 50531499, "devusb": 4951663, "domenkozar": 126339, "dwt": 57199, "eclairevoyant": 848000, + "emilazy": 18535642, "ethancedwards8": 60861925, "fiddlerwoaroof": 808745, "fulsomenko": 14945057, @@ -580,11 +578,11 @@ "id": 9955829, "maintainers": { "RossComputerGuy": 19699320, - "alyssais": 2768870, - "emilazy": 18535642 + "alyssais": 2768870 }, "members": { "Ericson2314": 1055245, + "emilazy": 18535642, "peterwaller-arm": 52030119, "rrbutani": 7833358 }, @@ -756,16 +754,6 @@ }, "name": "Nixpkgs CI" }, - "nixpkgs-core": { - "description": "Provides leadership for and has authority over Nixpkgs.", - "id": 14317027, - "maintainers": { - "alyssais": 2768870, - "emilazy": 18535642 - }, - "members": {}, - "name": "Nixpkgs core" - }, "nixpkgs-merge-bot": { "description": "This team exists as a target for triggering the nixpkgs merge bot.", "id": 13926892, @@ -1001,11 +989,11 @@ "id": 11265412, "maintainers": { "RossComputerGuy": 19699320, - "emilazy": 18535642, "philiptaron": 43863 }, "members": { "Ericson2314": 1055245, + "emilazy": 18535642, "reckenrode": 7413633 }, "name": "stdenv" From b4627648ae4cd41c77a5a7aec8c20a99bde1e6b3 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 8 Aug 2026 10:34:26 -0400 Subject: [PATCH 27/28] .github/actions/checkout: bump actions/github-script from 8 to 9 (cherry picked from commit 632c05cddc5e6ccfc69bae6526d89a50238bab6b) --- .github/actions/checkout/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/checkout/action.yml b/.github/actions/checkout/action.yml index 83995b1cb31c..91cca324fcd4 100644 --- a/.github/actions/checkout/action.yml +++ b/.github/actions/checkout/action.yml @@ -13,7 +13,7 @@ inputs: runs: using: composite steps: - - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0 + - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0 env: MERGED_SHA: ${{ inputs.merged-as-untrusted-at }} TARGET_SHA: ${{ inputs.target-as-trusted-at }} From 749a05e998e54aad7fa08d94399ead3a06ffa3dc Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Mon, 10 Aug 2026 18:22:31 -0400 Subject: [PATCH 28/28] .github/dependabot.yml: run on .github/actions/*/* too Co-authored-by: Matt Sturgeon (cherry picked from commit d09d53e1c55220f4c066dad5e2c5f9f6d8136781) --- .github/dependabot.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4dbbecef0c3b..94c89e03b699 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,7 +1,9 @@ version: 2 updates: - package-ecosystem: "github-actions" - directory: "/" + directories: + - "/" + - ".github/actions/*/*" schedule: interval: "weekly" labels: []