From 0b28ef1c387851ef731c3f310b6705cdec0b37f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Dec 2023 14:29:08 +0000 Subject: [PATCH 01/35] sgt-puzzles: 20231025.35f7965 -> 20231120.08365fb --- pkgs/games/sgt-puzzles/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 35f92f1457b3..a6d0bb52fb39 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "sgt-puzzles"; - version = "20231025.35f7965"; + version = "20231120.08365fb"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - hash = "sha256-c9D8lr5V/1BrKQjBsj931uGpnpR5p80CgP0Y/HNc40E="; + hash = "sha256-V4OHkF0i3dnvRXmo2UKItibr4Dr8vG1CX2L2/9mL7p4="; }; sgt-puzzles-menu = fetchurl { From 0ce537f0fa692638db4f3deeeb670fb0b85b2223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 9 Dec 2023 20:55:49 +0100 Subject: [PATCH 02/35] fzf: reduce closure size by just quieten perl instead of providing glibcLocales --- pkgs/tools/misc/fzf/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index df10755f14c9..0fd40b8732bd 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -8,7 +8,6 @@ , bc , ncurses , perl -, glibcLocales , testers , fzf }: @@ -19,7 +18,7 @@ let # warnings on non-nixos machines ourPerl = if !stdenv.isLinux then perl else ( writeShellScriptBin "perl" '' - export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" + export PERL_BADLANG=0 exec ${perl}/bin/perl "$@" ''); in From ee2865e5ed2817707f80c32fd5d9a0e1c828d88c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 12 Dec 2023 16:03:19 -0800 Subject: [PATCH 03/35] nextcloudPackages: update --- pkgs/servers/nextcloud/packages/26.json | 80 +++++++++++------------ pkgs/servers/nextcloud/packages/27.json | 84 ++++++++++++------------- 2 files changed, 82 insertions(+), 82 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/26.json b/pkgs/servers/nextcloud/packages/26.json index 2226ca99f8c7..634c6c10115c 100644 --- a/pkgs/servers/nextcloud/packages/26.json +++ b/pkgs/servers/nextcloud/packages/26.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "1iq8np72pjw2bn4zmbp2rmrh12n4z62rwrz2bb94xjza1fws7b2v", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.3/calendar-v4.5.3.tar.gz", - "version": "4.5.3", + "sha256": "0d6mfqwq44z9kn8nh3zmfzr05zi2rwnw3nhd9wc12dy6npynkcpm", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.0/calendar-v4.6.0.tar.gz", + "version": "4.6.0", "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": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "1pz2px5amk3byn4pq86cyyjv4hrqhsjz61xfm7cl7z8qfckqfhi2", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.4.2/contacts-v5.4.2.tar.gz", - "version": "5.4.2", + "sha256": "0pbl4fmpg1jxwjj141gqnmwzgm3ji1z686kr11rmldfkjvhjss2x", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.0/contacts-v5.5.0.tar.gz", + "version": "5.5.0", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* πŸš€ **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* πŸŽ‰ **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* πŸ‘₯ **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* πŸ™ˆ **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -30,19 +30,19 @@ ] }, "cookbook": { - "sha256": "18rzvdqd99nlkk3p0y9y8b17ihw5c4c9wsx8psq6xadspm97002y", - "url": "https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz", - "version": "0.10.2", + "sha256": "07yj41khwhpsfjwfxgs6xyjhvvavmyby457fh68kx8npinl8n0x4", + "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.10.4/cookbook-0.10.4.tar.gz", + "version": "0.10.4", "description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.", - "homepage": "", + "homepage": "https://github.com/nextcloud/cookbook/", "licenses": [ "agpl" ] }, "cospend": { - "sha256": "1rg9k33yapbl8chpxx3bjyzc9h4krjavksbxsvw14kpm01rss3j9", - "url": "https://github.com/julien-nc/cospend-nc/releases/download/v1.5.10/cospend-1.5.10.tar.gz", - "version": "1.5.10", + "sha256": "0v61wdrf4wxjx2xv81599k9k855iyhazxnh4shqvglfb01fi8qhn", + "url": "https://github.com/julien-nc/cospend-nc/releases/download/v1.5.12/cospend-1.5.12.tar.gz", + "version": "1.5.12", "description": "# Nextcloud Cospend πŸ’°\n\nNextcloud Cospend is a group/shared budget manager. It was inspired by the great [IHateMoney](https://github.com/spiral-project/ihatemoney/).\n\nYou can use it when you share a house, when you go on vacation with friends, whenever you share money with others.\n\nIt lets you create projects with members and bills. Each member has a balance computed from the project bills. This way you can see who owes the group and who the group owes. Ultimately you can ask for a settlement plan telling you which payments to make to reset members balances.\n\nProject members are independent from Nextcloud users. Projects can be accessed and modified by people without a Nextcloud account. Each project has an ID and a password for guest access.\n\n[MoneyBuster](https://gitlab.com/eneiluj/moneybuster) Android client is [available in F-Droid](https://f-droid.org/packages/net.eneiluj.moneybuster/) and on the [Play store](https://play.google.com/store/apps/details?id=net.eneiluj.moneybuster).\n\n[PayForMe](https://github.com/mayflower/PayForMe) iOS client is currently being developped!\n\n## Features\n\n* ✎ create/edit/delete projects, members, bills, bill categories, currencies\n* βš– check member balances\n* πŸ—  display project statistics\n* β™» display settlement plan\n* πŸŽ‡ automatically create reimbursement bills from settlement plan\n* πŸ—“ create recurring bills (daily/weekly/monthly/yearly)\n* πŸ“Š optionally provide custom amount for each member in new bills\n* πŸ”— link bills with personal files (picture of physical bill for example)\n* πŸ‘© guest access for people outside Nextcloud\n* πŸ‘« share projects with Nextcloud users/groups/circles\n* πŸ–« import/export projects as csv (compatible with csv files from IHateMoney)\n* πŸ”— generate link/QRCode to easily import projects in MoneyBuster\n* πŸ—² implement Nextcloud notifications and activity stream\n\nThis app is tested on Nextcloud 20+ with Firefox 57+ and Chromium.\n\nThis app is under development.\n\n🌍 Help us to translate this app on [Nextcloud-Cospend/MoneyBuster Crowdin project](https://crowdin.com/project/moneybuster).\n\nβš’ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/cospend-nc/blob/master/CONTRIBUTING.md).\n\n## Documentation\n\n* [User documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/user.md)\n* [Admin documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/admin.md)\n* [Developer documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/dev.md)\n* [CHANGELOG](https://github.com/eneiluj/cospend-nc/blob/master/CHANGELOG.md#change-log)\n* [AUTHORS](https://github.com/eneiluj/cospend-nc/blob/master/AUTHORS.md#authors)\n\n## Known issues\n\n* it does not make you rich\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/cospend-nc", "licenses": [ @@ -50,9 +50,9 @@ ] }, "deck": { - "sha256": "15hir3fssvzyysazbaad8qiz0bv00x73c2wfdj5aviz9h0gp4x4v", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.9.4/deck-v1.9.4.tar.gz", - "version": "1.9.4", + "sha256": "1dkvvk7n120hgk3pf03g2ixlylp7nxmi3wh9qsp8b0fimclpd5hz", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.9.5/deck-v1.9.5.tar.gz", + "version": "1.9.5", "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- πŸ“₯ Add your tasks to cards and put them in order\n- πŸ“„ Write down additional notes in Markdown\n- πŸ”– Assign labels for even better organization\n- πŸ‘₯ Share with your team, friends or family\n- πŸ“Ž Attach files and embed them in your Markdown description\n- πŸ’¬ Discuss with your team using comments\n- ⚑ Keep track of changes in the activity stream\n- πŸš€ Get your project organized", "homepage": "https://github.com/nextcloud/deck", "licenses": [ @@ -80,9 +80,9 @@ ] }, "forms": { - "sha256": "155z87wyv2p06c3kpy9zaw6qf5s7s0ah4wfw022s4cc21i3rcwxv", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.3.1/forms-v3.3.1.tar.gz", - "version": "3.3.1", + "sha256": "1mipdri1flhkdwknsp72k87y7xfis72bzsnw1alzr1cbp8d6ardm", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.4.3/forms-v3.4.3.tar.gz", + "version": "3.4.3", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **πŸ“ Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **πŸ“Š View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **πŸ”’ Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **πŸ§‘β€πŸ’» Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **πŸ™‹ Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -120,9 +120,9 @@ ] }, "mail": { - "sha256": "0ascail3vfkv3mm5s4s3ma74d6qxai76kdqxknmljnw56xb19qfv", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.4.4/mail-v3.4.4.tar.gz", - "version": "3.4.4", + "sha256": "0ycyj5ydnvnf5cjnxkpxd489rymlag8df67n5lawp43cvgg2jn2d", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.5.0/mail-v3.5.0.tar.gz", + "version": "3.5.0", "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": "1yn1wkv4jxpc8faf4rl46yfddyplnryrkws3jz0x1wcr9zlxdkng", - "url": "https://github.com/pulsejet/memories/releases/download/v6.1.0/memories.tar.gz", - "version": "6.1.0", + "sha256": "1rz0pkis0vz6hjyj53jbz7dcmd9yxbh1h9p4nhg4a2p7yyd5092m", + "url": "https://github.com/pulsejet/memories/releases/download/v6.1.5/memories.tar.gz", + "version": "6.1.5", "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 @@ ] }, "notes": { - "sha256": "1g4ibrymsfd2bcvmyfyrl23z2kh4bgkwrgyacvdx1glk44di6sgc", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.8.1/notes.tar.gz", - "version": "4.8.1", + "sha256": "19p5qg94ch72y4lym6s8f6x3dly5v3mm97dx29swnkqplflas3zz", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.0/notes-v4.9.0.tar.gz", + "version": "4.9.0", "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", "homepage": "https://github.com/nextcloud/notes", "licenses": [ @@ -210,9 +210,9 @@ ] }, "previewgenerator": { - "sha256": "0ziyl7kqgivk9xvkd12byps6bb3fvcvdgprfa9ffy1zrgpl9syhk", - "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.3.0/previewgenerator-v5.3.0.tar.gz", - "version": "5.3.0", + "sha256": "08f0ivxqa2b54w2q4lycb3p5ngqyk92n2qll54pmpj54pfn1sj3m", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.4.0/previewgenerator-v5.4.0.tar.gz", + "version": "5.4.0", "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", "homepage": "https://github.com/nextcloud/previewgenerator", "licenses": [ @@ -220,9 +220,9 @@ ] }, "qownnotesapi": { - "sha256": "1hkcqcc6y7x0zrc88qqmsf7mz0dl1kk06gsl6la3kr33fxr0cp0k", - "url": "https://github.com/pbek/qownnotesapi/releases/download/v23.6.0/qownnotesapi-nc.tar.gz", - "version": "23.6.0", + "sha256": "1pyr4b3w6gsy83ci6cy0wfv870qm2v957nl4w6xk989iyknk4ana", + "url": "https://github.com/pbek/qownnotesapi/releases/download/v23.12.0/qownnotesapi-nc.tar.gz", + "version": "23.12.0", "description": "QOwnNotesAPI is the Nextcloud/ownCloud API for [QOwnNotes](http://www.qownnotes.org), the open source notepad for Linux, macOS and Windows, that works together with the notes application of Nextcloud/ownCloud.\n\nThe only purpose of this App is to provide API access to your Nextcloud/ownCloud server for your QOwnNotes desktop installation, you cannot use this App for anything else, if you don't have QOwnNotes installed on your desktop computer!", "homepage": "https://github.com/pbek/qownnotesapi", "licenses": [ @@ -270,9 +270,9 @@ ] }, "twofactor_webauthn": { - "sha256": "0z6m2chq5kxc8f10g6n1lh51yi10svy2qp5gp0v8xs71apqcc2wx", - "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.3.0/twofactor_webauthn-v1.3.0.tar.gz", - "version": "1.3.0", + "sha256": "1p4ng7nprlcgw7sdfd7wqx5az86a856f1v470lahg2nfbx3fg296", + "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.3.2/twofactor_webauthn-v1.3.2.tar.gz", + "version": "1.3.2", "description": "A two-factor provider for WebAuthn devices", "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme", "licenses": [ @@ -290,9 +290,9 @@ ] }, "user_saml": { - "sha256": "04ivgqdls72p6x5yrh5p5ycbbfmxhzd0dqin1grblm6cbl7b4s2k", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.4/user_saml-v5.2.4.tar.gz", - "version": "5.2.4", + "sha256": "0q189wkh0nh5y4z9j4bpgn4xnwwn8y8m8y34bp5nbzfz05xpgr9f", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.5/user_saml-v5.2.5.tar.gz", + "version": "5.2.5", "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", "homepage": "https://github.com/nextcloud/user_saml", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/27.json b/pkgs/servers/nextcloud/packages/27.json index a16881240b42..c46ed0023161 100644 --- a/pkgs/servers/nextcloud/packages/27.json +++ b/pkgs/servers/nextcloud/packages/27.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "1iq8np72pjw2bn4zmbp2rmrh12n4z62rwrz2bb94xjza1fws7b2v", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.3/calendar-v4.5.3.tar.gz", - "version": "4.5.3", + "sha256": "0d6mfqwq44z9kn8nh3zmfzr05zi2rwnw3nhd9wc12dy6npynkcpm", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.0/calendar-v4.6.0.tar.gz", + "version": "4.6.0", "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": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "1pz2px5amk3byn4pq86cyyjv4hrqhsjz61xfm7cl7z8qfckqfhi2", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.4.2/contacts-v5.4.2.tar.gz", - "version": "5.4.2", + "sha256": "0pbl4fmpg1jxwjj141gqnmwzgm3ji1z686kr11rmldfkjvhjss2x", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.0/contacts-v5.5.0.tar.gz", + "version": "5.5.0", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* πŸš€ **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* πŸŽ‰ **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* πŸ‘₯ **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* πŸ™ˆ **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -30,19 +30,19 @@ ] }, "cookbook": { - "sha256": "18rzvdqd99nlkk3p0y9y8b17ihw5c4c9wsx8psq6xadspm97002y", - "url": "https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz", - "version": "0.10.2", + "sha256": "07yj41khwhpsfjwfxgs6xyjhvvavmyby457fh68kx8npinl8n0x4", + "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.10.4/cookbook-0.10.4.tar.gz", + "version": "0.10.4", "description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.", - "homepage": "", + "homepage": "https://github.com/nextcloud/cookbook/", "licenses": [ "agpl" ] }, "cospend": { - "sha256": "1rg9k33yapbl8chpxx3bjyzc9h4krjavksbxsvw14kpm01rss3j9", - "url": "https://github.com/julien-nc/cospend-nc/releases/download/v1.5.10/cospend-1.5.10.tar.gz", - "version": "1.5.10", + "sha256": "0v61wdrf4wxjx2xv81599k9k855iyhazxnh4shqvglfb01fi8qhn", + "url": "https://github.com/julien-nc/cospend-nc/releases/download/v1.5.12/cospend-1.5.12.tar.gz", + "version": "1.5.12", "description": "# Nextcloud Cospend πŸ’°\n\nNextcloud Cospend is a group/shared budget manager. It was inspired by the great [IHateMoney](https://github.com/spiral-project/ihatemoney/).\n\nYou can use it when you share a house, when you go on vacation with friends, whenever you share money with others.\n\nIt lets you create projects with members and bills. Each member has a balance computed from the project bills. This way you can see who owes the group and who the group owes. Ultimately you can ask for a settlement plan telling you which payments to make to reset members balances.\n\nProject members are independent from Nextcloud users. Projects can be accessed and modified by people without a Nextcloud account. Each project has an ID and a password for guest access.\n\n[MoneyBuster](https://gitlab.com/eneiluj/moneybuster) Android client is [available in F-Droid](https://f-droid.org/packages/net.eneiluj.moneybuster/) and on the [Play store](https://play.google.com/store/apps/details?id=net.eneiluj.moneybuster).\n\n[PayForMe](https://github.com/mayflower/PayForMe) iOS client is currently being developped!\n\n## Features\n\n* ✎ create/edit/delete projects, members, bills, bill categories, currencies\n* βš– check member balances\n* πŸ—  display project statistics\n* β™» display settlement plan\n* πŸŽ‡ automatically create reimbursement bills from settlement plan\n* πŸ—“ create recurring bills (daily/weekly/monthly/yearly)\n* πŸ“Š optionally provide custom amount for each member in new bills\n* πŸ”— link bills with personal files (picture of physical bill for example)\n* πŸ‘© guest access for people outside Nextcloud\n* πŸ‘« share projects with Nextcloud users/groups/circles\n* πŸ–« import/export projects as csv (compatible with csv files from IHateMoney)\n* πŸ”— generate link/QRCode to easily import projects in MoneyBuster\n* πŸ—² implement Nextcloud notifications and activity stream\n\nThis app is tested on Nextcloud 20+ with Firefox 57+ and Chromium.\n\nThis app is under development.\n\n🌍 Help us to translate this app on [Nextcloud-Cospend/MoneyBuster Crowdin project](https://crowdin.com/project/moneybuster).\n\nβš’ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/cospend-nc/blob/master/CONTRIBUTING.md).\n\n## Documentation\n\n* [User documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/user.md)\n* [Admin documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/admin.md)\n* [Developer documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/dev.md)\n* [CHANGELOG](https://github.com/eneiluj/cospend-nc/blob/master/CHANGELOG.md#change-log)\n* [AUTHORS](https://github.com/eneiluj/cospend-nc/blob/master/AUTHORS.md#authors)\n\n## Known issues\n\n* it does not make you rich\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/cospend-nc", "licenses": [ @@ -50,9 +50,9 @@ ] }, "deck": { - "sha256": "18gscc95zay7nrzdm1h5b52r4bpmpzc1h1xb00214qnb59mydiwr", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.11.1/deck-v1.11.1.tar.gz", - "version": "1.11.1", + "sha256": "0ykxfw9v89k4a3g6lbl75d0hwri85kf6jqx1n5v2jxibfr5n4bcp", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.11.2/deck-v1.11.2.tar.gz", + "version": "1.11.2", "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- πŸ“₯ Add your tasks to cards and put them in order\n- πŸ“„ Write down additional notes in Markdown\n- πŸ”– Assign labels for even better organization\n- πŸ‘₯ Share with your team, friends or family\n- πŸ“Ž Attach files and embed them in your Markdown description\n- πŸ’¬ Discuss with your team using comments\n- ⚑ Keep track of changes in the activity stream\n- πŸš€ Get your project organized", "homepage": "https://github.com/nextcloud/deck", "licenses": [ @@ -80,9 +80,9 @@ ] }, "forms": { - "sha256": "155z87wyv2p06c3kpy9zaw6qf5s7s0ah4wfw022s4cc21i3rcwxv", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.3.1/forms-v3.3.1.tar.gz", - "version": "3.3.1", + "sha256": "1mipdri1flhkdwknsp72k87y7xfis72bzsnw1alzr1cbp8d6ardm", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.4.3/forms-v3.4.3.tar.gz", + "version": "3.4.3", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **πŸ“ Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **πŸ“Š View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **πŸ”’ Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **πŸ§‘β€πŸ’» Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **πŸ™‹ Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -120,9 +120,9 @@ ] }, "mail": { - "sha256": "0ascail3vfkv3mm5s4s3ma74d6qxai76kdqxknmljnw56xb19qfv", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.4.4/mail-v3.4.4.tar.gz", - "version": "3.4.4", + "sha256": "0ycyj5ydnvnf5cjnxkpxd489rymlag8df67n5lawp43cvgg2jn2d", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.5.0/mail-v3.5.0.tar.gz", + "version": "3.5.0", "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": "049hrp79fj1bp9nk9isjrk427k238974x7gsj68jplxfrgq3sdkz", - "url": "https://github.com/nextcloud/maps/releases/download/v1.2.0-2-nightly/maps-1.2.0-2-nightly.tar.gz", + "sha256": "1gyxg5xp4mpdrw8630nqcf5yk8cs7a0kvfik2q01p05d533phc4d", + "url": "https://github.com/nextcloud/maps/releases/download/v1.2.0/maps-1.2.0.tar.gz", "version": "1.2.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": "1yn1wkv4jxpc8faf4rl46yfddyplnryrkws3jz0x1wcr9zlxdkng", - "url": "https://github.com/pulsejet/memories/releases/download/v6.1.0/memories.tar.gz", - "version": "6.1.0", + "sha256": "1rz0pkis0vz6hjyj53jbz7dcmd9yxbh1h9p4nhg4a2p7yyd5092m", + "url": "https://github.com/pulsejet/memories/releases/download/v6.1.5/memories.tar.gz", + "version": "6.1.5", "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 @@ ] }, "notes": { - "sha256": "1g4ibrymsfd2bcvmyfyrl23z2kh4bgkwrgyacvdx1glk44di6sgc", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.8.1/notes.tar.gz", - "version": "4.8.1", + "sha256": "19p5qg94ch72y4lym6s8f6x3dly5v3mm97dx29swnkqplflas3zz", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.0/notes-v4.9.0.tar.gz", + "version": "4.9.0", "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", "homepage": "https://github.com/nextcloud/notes", "licenses": [ @@ -210,9 +210,9 @@ ] }, "previewgenerator": { - "sha256": "0ziyl7kqgivk9xvkd12byps6bb3fvcvdgprfa9ffy1zrgpl9syhk", - "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.3.0/previewgenerator-v5.3.0.tar.gz", - "version": "5.3.0", + "sha256": "08f0ivxqa2b54w2q4lycb3p5ngqyk92n2qll54pmpj54pfn1sj3m", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.4.0/previewgenerator-v5.4.0.tar.gz", + "version": "5.4.0", "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", "homepage": "https://github.com/nextcloud/previewgenerator", "licenses": [ @@ -220,9 +220,9 @@ ] }, "qownnotesapi": { - "sha256": "1hkcqcc6y7x0zrc88qqmsf7mz0dl1kk06gsl6la3kr33fxr0cp0k", - "url": "https://github.com/pbek/qownnotesapi/releases/download/v23.6.0/qownnotesapi-nc.tar.gz", - "version": "23.6.0", + "sha256": "1pyr4b3w6gsy83ci6cy0wfv870qm2v957nl4w6xk989iyknk4ana", + "url": "https://github.com/pbek/qownnotesapi/releases/download/v23.12.0/qownnotesapi-nc.tar.gz", + "version": "23.12.0", "description": "QOwnNotesAPI is the Nextcloud/ownCloud API for [QOwnNotes](http://www.qownnotes.org), the open source notepad for Linux, macOS and Windows, that works together with the notes application of Nextcloud/ownCloud.\n\nThe only purpose of this App is to provide API access to your Nextcloud/ownCloud server for your QOwnNotes desktop installation, you cannot use this App for anything else, if you don't have QOwnNotes installed on your desktop computer!", "homepage": "https://github.com/pbek/qownnotesapi", "licenses": [ @@ -270,9 +270,9 @@ ] }, "twofactor_webauthn": { - "sha256": "0z6m2chq5kxc8f10g6n1lh51yi10svy2qp5gp0v8xs71apqcc2wx", - "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.3.0/twofactor_webauthn-v1.3.0.tar.gz", - "version": "1.3.0", + "sha256": "1p4ng7nprlcgw7sdfd7wqx5az86a856f1v470lahg2nfbx3fg296", + "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.3.2/twofactor_webauthn-v1.3.2.tar.gz", + "version": "1.3.2", "description": "A two-factor provider for WebAuthn devices", "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme", "licenses": [ @@ -290,9 +290,9 @@ ] }, "user_saml": { - "sha256": "04ivgqdls72p6x5yrh5p5ycbbfmxhzd0dqin1grblm6cbl7b4s2k", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.4/user_saml-v5.2.4.tar.gz", - "version": "5.2.4", + "sha256": "0q189wkh0nh5y4z9j4bpgn4xnwwn8y8m8y34bp5nbzfz05xpgr9f", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.5/user_saml-v5.2.5.tar.gz", + "version": "5.2.5", "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", "homepage": "https://github.com/nextcloud/user_saml", "licenses": [ From f6ea3f91b577921d9fbc48fb683b81445f9f150b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 12 Dec 2023 16:07:10 -0800 Subject: [PATCH 04/35] nextcloud28: init at 28.0.0 --- nixos/modules/services/web-apps/nextcloud.nix | 11 +- nixos/tests/nextcloud/default.nix | 2 +- pkgs/servers/nextcloud/default.nix | 7 + pkgs/servers/nextcloud/packages/28.json | 202 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +- 5 files changed, 221 insertions(+), 6 deletions(-) create mode 100644 pkgs/servers/nextcloud/packages/28.json diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index db6eacf30196..7c78abd087ed 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -28,6 +28,7 @@ let phpPackage = cfg.phpPackage.buildEnv { extensions = { enabled, all }: (with all; enabled + ++ [ bz2 intl sodium ] # recommended ++ optional cfg.enableImagemagick imagick # Optionally enabled depending on caching settings ++ optional cfg.caching.apcu apcu @@ -190,7 +191,7 @@ in { package = mkOption { type = types.package; description = lib.mdDoc "Which package to use for the Nextcloud instance."; - relatedPackages = [ "nextcloud26" "nextcloud27" ]; + relatedPackages = [ "nextcloud26" "nextcloud27" "nextcloud28" ]; }; phpPackage = mkPackageOption pkgs "php" { example = "php82"; @@ -679,7 +680,7 @@ in { config = mkIf cfg.enable (mkMerge [ { warnings = let - latest = 27; + latest = 28; upgradeWarning = major: nixos: '' A legacy Nextcloud install (from before NixOS ${nixos}) may be installed. @@ -700,7 +701,8 @@ in { '') ++ (optional (versionOlder cfg.package.version "25") (upgradeWarning 24 "22.11")) ++ (optional (versionOlder cfg.package.version "26") (upgradeWarning 25 "23.05")) - ++ (optional (versionOlder cfg.package.version "27") (upgradeWarning 26 "23.11")); + ++ (optional (versionOlder cfg.package.version "27") (upgradeWarning 26 "23.11")) + ++ (optional (versionOlder cfg.package.version "28") (upgradeWarning 26 "24.05")); services.nextcloud.package = with pkgs; mkDefault ( @@ -713,7 +715,8 @@ in { else if versionOlder stateVersion "22.11" then nextcloud24 else if versionOlder stateVersion "23.05" then nextcloud25 else if versionOlder stateVersion "23.11" then nextcloud26 - else nextcloud27 + else if versionOlder stateVersion "24.05" then nextcloud27 + else nextcloud28 ); services.nextcloud.phpPackage = diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index 19d04b28b4f9..84ac37153727 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -22,4 +22,4 @@ foldl }; }) { } - [ 26 27 ] + [ 26 27 28 ] diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index b5e1a94b129e..0e3a8c925386 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -1,5 +1,6 @@ { lib, stdenvNoCC, fetchurl, nixosTests , nextcloud27Packages +, nextcloud28Packages , nextcloud26Packages }: @@ -65,6 +66,12 @@ in { packages = nextcloud27Packages; }; + nextcloud28 = generic { + version = "28.0.0"; + hash = "sha256-TosLdLQCIehfkquGnQhzxppS1+Q4idklnGJZQopqNvI="; + packages = nextcloud28Packages; + }; + # tip: get the sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' } diff --git a/pkgs/servers/nextcloud/packages/28.json b/pkgs/servers/nextcloud/packages/28.json new file mode 100644 index 000000000000..afc2ed230194 --- /dev/null +++ b/pkgs/servers/nextcloud/packages/28.json @@ -0,0 +1,202 @@ +{ + "bookmarks": { + "sha256": "14dkyqm04d4ix114jbcgbx10zvkv4qlx4n56chpqz0w1y7x8idpd", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.1/bookmarks-13.1.1.tar.gz", + "version": "13.1.1", + "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": [ + "agpl" + ] + }, + "calendar": { + "sha256": "0d6mfqwq44z9kn8nh3zmfzr05zi2rwnw3nhd9wc12dy6npynkcpm", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.0/calendar-v4.6.0.tar.gz", + "version": "4.6.0", + "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": [ + "agpl" + ] + }, + "contacts": { + "sha256": "0pbl4fmpg1jxwjj141gqnmwzgm3ji1z686kr11rmldfkjvhjss2x", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.0/contacts-v5.5.0.tar.gz", + "version": "5.5.0", + "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* πŸš€ **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* πŸŽ‰ **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* πŸ‘₯ **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* πŸ™ˆ **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", + "homepage": "https://github.com/nextcloud/contacts#readme", + "licenses": [ + "agpl" + ] + }, + "cospend": { + "sha256": "0v61wdrf4wxjx2xv81599k9k855iyhazxnh4shqvglfb01fi8qhn", + "url": "https://github.com/julien-nc/cospend-nc/releases/download/v1.5.12/cospend-1.5.12.tar.gz", + "version": "1.5.12", + "description": "# Nextcloud Cospend πŸ’°\n\nNextcloud Cospend is a group/shared budget manager. It was inspired by the great [IHateMoney](https://github.com/spiral-project/ihatemoney/).\n\nYou can use it when you share a house, when you go on vacation with friends, whenever you share money with others.\n\nIt lets you create projects with members and bills. Each member has a balance computed from the project bills. This way you can see who owes the group and who the group owes. Ultimately you can ask for a settlement plan telling you which payments to make to reset members balances.\n\nProject members are independent from Nextcloud users. Projects can be accessed and modified by people without a Nextcloud account. Each project has an ID and a password for guest access.\n\n[MoneyBuster](https://gitlab.com/eneiluj/moneybuster) Android client is [available in F-Droid](https://f-droid.org/packages/net.eneiluj.moneybuster/) and on the [Play store](https://play.google.com/store/apps/details?id=net.eneiluj.moneybuster).\n\n[PayForMe](https://github.com/mayflower/PayForMe) iOS client is currently being developped!\n\n## Features\n\n* ✎ create/edit/delete projects, members, bills, bill categories, currencies\n* βš– check member balances\n* πŸ—  display project statistics\n* β™» display settlement plan\n* πŸŽ‡ automatically create reimbursement bills from settlement plan\n* πŸ—“ create recurring bills (daily/weekly/monthly/yearly)\n* πŸ“Š optionally provide custom amount for each member in new bills\n* πŸ”— link bills with personal files (picture of physical bill for example)\n* πŸ‘© guest access for people outside Nextcloud\n* πŸ‘« share projects with Nextcloud users/groups/circles\n* πŸ–« import/export projects as csv (compatible with csv files from IHateMoney)\n* πŸ”— generate link/QRCode to easily import projects in MoneyBuster\n* πŸ—² implement Nextcloud notifications and activity stream\n\nThis app is tested on Nextcloud 20+ with Firefox 57+ and Chromium.\n\nThis app is under development.\n\n🌍 Help us to translate this app on [Nextcloud-Cospend/MoneyBuster Crowdin project](https://crowdin.com/project/moneybuster).\n\nβš’ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/cospend-nc/blob/master/CONTRIBUTING.md).\n\n## Documentation\n\n* [User documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/user.md)\n* [Admin documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/admin.md)\n* [Developer documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/dev.md)\n* [CHANGELOG](https://github.com/eneiluj/cospend-nc/blob/master/CHANGELOG.md#change-log)\n* [AUTHORS](https://github.com/eneiluj/cospend-nc/blob/master/AUTHORS.md#authors)\n\n## Known issues\n\n* it does not make you rich\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/cospend-nc", + "licenses": [ + "agpl" + ] + }, + "deck": { + "sha256": "0dkw59pv3yj21fs87sw2y4z1qplsgbfnr0nk9cjsb8vb3xjzd0rx", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.12.0/deck-v1.12.0.tar.gz", + "version": "1.12.0", + "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- πŸ“₯ Add your tasks to cards and put them in order\n- πŸ“„ Write down additional notes in Markdown\n- πŸ”– Assign labels for even better organization\n- πŸ‘₯ Share with your team, friends or family\n- πŸ“Ž Attach files and embed them in your Markdown description\n- πŸ’¬ Discuss with your team using comments\n- ⚑ Keep track of changes in the activity stream\n- πŸš€ Get your project organized", + "homepage": "https://github.com/nextcloud/deck", + "licenses": [ + "agpl" + ] + }, + "forms": { + "sha256": "1ffga26v01d14rh4mjwyjqp7slh7h7d07vs3yldb8csi826ynji4", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.0.0/forms-v4.0.0.tar.gz", + "version": "4.0.0", + "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **πŸ“ Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **πŸ“Š View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **πŸ”’ Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **πŸ§‘β€πŸ’» Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **πŸ™‹ Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", + "homepage": "https://github.com/nextcloud/forms", + "licenses": [ + "agpl" + ] + }, + "groupfolders": { + "sha256": "11dkz7v39qyaxihnjhgy79yx8vjx4a0bdh1ccj67h0wqchxb8kdm", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.0/groupfolders-v16.0.0.tar.gz", + "version": "16.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": [ + "agpl" + ] + }, + "impersonate": { + "sha256": "0l1wmsiycwnn5py1mdc87paqlciclndrk72yf0ff7k11vidgb7mp", + "url": "https://github.com/nextcloud-releases/impersonate/releases/download/v1.15.0/impersonate-v1.15.0.tar.gz", + "version": "1.15.0", + "description": "By installing the impersonate app of your Nextcloud you enable administrators to impersonate other users on the Nextcloud server. This is especially useful for debugging issues reported by users.\n\nTo impersonate a user an administrator has to simply follow the following four steps:\n\n1. Login as administrator to Nextcloud.\n2. Open users administration interface.\n3. Select the impersonate button on the affected user.\n4. Confirm the impersonation.\n\nThe administrator is then logged-in as the user, to switch back to the regular user account they simply have to press the logout button.\n\n**Note:**\n\n- This app is not compatible with instances that have encryption enabled.\n- While impersonate actions are logged note that actions performed impersonated will be logged as the impersonated user.\n- Impersonating a user is only possible after their first login.\n- You can limit which users/groups can use impersonation in Administration settings > Additional settings.", + "homepage": "https://github.com/nextcloud/impersonate", + "licenses": [ + "agpl" + ] + }, + "mail": { + "sha256": "0ycyj5ydnvnf5cjnxkpxd489rymlag8df67n5lawp43cvgg2jn2d", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.5.0/mail-v3.5.0.tar.gz", + "version": "3.5.0", + "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": [ + "agpl" + ] + }, + "maps": { + "sha256": "0rs5cqn2saip7fmj71ww879iqsmmigf0fi6fdbqmdxmrmvsnl9l6", + "url": "https://github.com/nextcloud/maps/releases/download/v1.3.1/maps-1.3.1.tar.gz", + "version": "1.3.1", + "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", + "licenses": [ + "agpl" + ] + }, + "notes": { + "sha256": "19p5qg94ch72y4lym6s8f6x3dly5v3mm97dx29swnkqplflas3zz", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.0/notes-v4.9.0.tar.gz", + "version": "4.9.0", + "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", + "homepage": "https://github.com/nextcloud/notes", + "licenses": [ + "agpl" + ] + }, + "notify_push": { + "sha256": "0lwyy1pnyfw464vab1v5k8q0rgarrj5w12cf1nsywjaafb8y1ym0", + "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.5/notify_push-v0.6.5.tar.gz", + "version": "0.6.5", + "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": [ + "agpl" + ] + }, + "polls": { + "sha256": "1jsxgnn6vvbn1v0x8k2zf95pdqlrg6pxrvn32sms8sfzgq3lbn7m", + "url": "https://github.com/nextcloud/polls/releases/download/v6.0.1/polls.tar.gz", + "version": "6.0.1", + "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": [ + "agpl" + ] + }, + "previewgenerator": { + "sha256": "08f0ivxqa2b54w2q4lycb3p5ngqyk92n2qll54pmpj54pfn1sj3m", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.4.0/previewgenerator-v5.4.0.tar.gz", + "version": "5.4.0", + "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", + "homepage": "https://github.com/nextcloud/previewgenerator", + "licenses": [ + "agpl" + ] + }, + "qownnotesapi": { + "sha256": "1pyr4b3w6gsy83ci6cy0wfv870qm2v957nl4w6xk989iyknk4ana", + "url": "https://github.com/pbek/qownnotesapi/releases/download/v23.12.0/qownnotesapi-nc.tar.gz", + "version": "23.12.0", + "description": "QOwnNotesAPI is the Nextcloud/ownCloud API for [QOwnNotes](http://www.qownnotes.org), the open source notepad for Linux, macOS and Windows, that works together with the notes application of Nextcloud/ownCloud.\n\nThe only purpose of this App is to provide API access to your Nextcloud/ownCloud server for your QOwnNotes desktop installation, you cannot use this App for anything else, if you don't have QOwnNotes installed on your desktop computer!", + "homepage": "https://github.com/pbek/qownnotesapi", + "licenses": [ + "agpl" + ] + }, + "spreed": { + "sha256": "1aa0pr9r3md04q8anih25kg6b77zfzdf6y8fz2miyfbwd8n6j21p", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v18.0.0/spreed-v18.0.0.tar.gz", + "version": "18.0.0", + "description": "Chat, video & audio-conferencing using WebRTC\n\n* πŸ’¬ **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* πŸ‘₯ **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* πŸ’» **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* πŸš€ **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* βœ‹ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", + "homepage": "https://github.com/nextcloud/spreed", + "licenses": [ + "agpl" + ] + }, + "tasks": { + "sha256": "0a1wpb9f08iqxl9vjp0slxwzn0w67ilpk21dsi0nhpm28ns2mhyc", + "url": "https://github.com/nextcloud/tasks/releases/download/v0.15.0/tasks.tar.gz", + "version": "0.15.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": [ + "agpl" + ] + }, + "twofactor_nextcloud_notification": { + "sha256": "0gaqgzbryim580dxarak7p4g3wd8wp3w6lw9jhl84jh46wrsbrj8", + "url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.8.0/twofactor_nextcloud_notification-v3.8.0.tar.gz", + "version": "3.8.0", + "description": "Allows using any of your logged in devices as second factor", + "homepage": "https://github.com/nextcloud/twofactor_nextcloud_notification", + "licenses": [ + "agpl" + ] + }, + "twofactor_webauthn": { + "sha256": "1p4ng7nprlcgw7sdfd7wqx5az86a856f1v470lahg2nfbx3fg296", + "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.3.2/twofactor_webauthn-v1.3.2.tar.gz", + "version": "1.3.2", + "description": "A two-factor provider for WebAuthn devices", + "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme", + "licenses": [ + "agpl" + ] + }, + "user_saml": { + "sha256": "0y5l66ig38202mg5zhy6yi72fz8fbsr7410q6qclxivna3gvyzrc", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.0.1/user_saml-v6.0.1.tar.gz", + "version": "6.0.1", + "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", + "homepage": "https://github.com/nextcloud/user_saml", + "licenses": [ + "agpl" + ] + } +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ab5d6b1af40..287b32571647 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11214,7 +11214,7 @@ with pkgs; grocy = callPackage ../servers/grocy { }; inherit (callPackage ../servers/nextcloud {}) - nextcloud25 nextcloud26 nextcloud27; + nextcloud25 nextcloud26 nextcloud27 nextcloud28; nextcloud25Packages = throw "Nextcloud25 is EOL!"; nextcloud26Packages = callPackage ../servers/nextcloud/packages { @@ -11223,6 +11223,9 @@ with pkgs; nextcloud27Packages = callPackage ../servers/nextcloud/packages { apps = lib.importJSON ../servers/nextcloud/packages/27.json; }; + nextcloud28Packages = callPackage ../servers/nextcloud/packages { + apps = lib.importJSON ../servers/nextcloud/packages/28.json; + }; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; From 3023b2d0bafcb115e3794543fdf321af7a3f184a Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Tue, 12 Dec 2023 10:10:39 -0800 Subject: [PATCH 05/35] clasp-common-lisp: use callPackage style instead of `with pkgs;` --- pkgs/development/compilers/clasp/default.nix | 79 +++++++++++++------- 1 file changed, 51 insertions(+), 28 deletions(-) diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix index c9fecafbd460..a80f7c58aed6 100644 --- a/pkgs/development/compilers/clasp/default.nix +++ b/pkgs/development/compilers/clasp/default.nix @@ -1,7 +1,20 @@ -{ pkgs, lib, fetchFromGitHub, llvmPackages_15 }: - +{ lib +, llvmPackages_15 +, fetchFromGitHub +, sbcl +, git +, pkg-config +, fmt_9 +, gmpxx +, libelf +, boost +, libunwind +, ninja +, cacert +}: let + inherit (llvmPackages_15) stdenv llvm libclang; src = fetchFromGitHub { owner = "clasp-developers"; @@ -19,16 +32,20 @@ let "src/libatomic_ops" ]; - reposTarball = llvmPackages_15.stdenv.mkDerivation { + reposTarball = stdenv.mkDerivation { pname = "clasp-repos"; version = "tarball"; + inherit src; + patches = [ ./clasp-pin-repos-commits.patch ]; - nativeBuildInputs = with pkgs; [ + + nativeBuildInputs = [ sbcl git cacert ]; + buildPhase = '' export SOURCE_DATE_EPOCH=1 export ASDF_OUTPUT_TRANSLATIONS=$(pwd):$(pwd)/__fasls @@ -37,21 +54,27 @@ let find $x -type d -name .git -exec rm -rvf {} \; || true done ''; + installPhase = '' tar --owner=0 --group=0 --numeric-owner --format=gnu \ --sort=name --mtime="@$SOURCE_DATE_EPOCH" \ -czf $out ${lib.concatStringsSep " " reposDirs} ''; + outputHashMode = "flat"; outputHashAlgo = "sha256"; outputHash = "sha256-vgwThjn2h3nKnShtKoHgaPdH/FDHv28fLMQvKFEwG6o="; }; -in llvmPackages_15.stdenv.mkDerivation { +in + +stdenv.mkDerivation { pname = "clasp"; version = "2.2.0"; + inherit src; - nativeBuildInputs = (with pkgs; [ + + nativeBuildInputs = [ sbcl git pkg-config @@ -61,30 +84,32 @@ in llvmPackages_15.stdenv.mkDerivation { boost libunwind ninja - ]) ++ (with llvmPackages_15; [ llvm libclang - ]); + ]; + configurePhase = '' - export SOURCE_DATE_EPOCH=1 - export ASDF_OUTPUT_TRANSLATIONS=$(pwd):$(pwd)/__fasls - tar xf ${reposTarball} - sbcl --script koga \ - --skip-sync \ - --cc=$NIX_CC/bin/cc \ - --cxx=$NIX_CC/bin/c++ \ - --reproducible-build \ - --package-path=/ \ - --bin-path=$out/bin \ - --lib-path=$out/lib \ - --share-path=$out/share -''; + export SOURCE_DATE_EPOCH=1 + export ASDF_OUTPUT_TRANSLATIONS=$(pwd):$(pwd)/__fasls + tar xf ${reposTarball} + sbcl --script koga \ + --skip-sync \ + --cc=$NIX_CC/bin/cc \ + --cxx=$NIX_CC/bin/c++ \ + --reproducible-build \ + --package-path=/ \ + --bin-path=$out/bin \ + --lib-path=$out/lib \ + --share-path=$out/share + ''; + buildPhase = '' - ninja -C build -''; + ninja -C build + ''; + installPhase = '' - ninja -C build install -''; + ninja -C build install + ''; meta = { description = "A Common Lisp implementation based on LLVM with C++ integration"; @@ -93,9 +118,7 @@ in llvmPackages_15.stdenv.mkDerivation { platforms = ["x86_64-linux" "x86_64-darwin"]; # Upstream claims support, but breaks with: # error: use of undeclared identifier 'aligned_alloc' - broken = llvmPackages_15.stdenv.isDarwin; + broken = stdenv.isDarwin; homepage = "https://github.com/clasp-developers/clasp"; }; - } - From c6234da6986ff31c58c7dd86d7741a1cf2fa44d3 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 13 Dec 2023 22:59:42 -0800 Subject: [PATCH 06/35] clasp-common-lisp: fetch dependencies in Nix I'm doing this as I wasn't able to reproduce the tarball that the previous derivation produced, and some of the repositories that were pinned no longer exist. --- .../clasp/clasp-pin-repos-commits.patch | 48 +- pkgs/development/compilers/clasp/default.nix | 71 +-- .../compilers/clasp/dependencies.nix | 457 ++++++++++++++++++ 3 files changed, 517 insertions(+), 59 deletions(-) create mode 100644 pkgs/development/compilers/clasp/dependencies.nix diff --git a/pkgs/development/compilers/clasp/clasp-pin-repos-commits.patch b/pkgs/development/compilers/clasp/clasp-pin-repos-commits.patch index 433c44b7da30..203ad5951411 100644 --- a/pkgs/development/compilers/clasp/clasp-pin-repos-commits.patch +++ b/pkgs/development/compilers/clasp/clasp-pin-repos-commits.patch @@ -1,15 +1,19 @@ diff --git a/repos.sexp b/repos.sexp -index 2b2459655..ad346d8e5 100644 +index d31d4d62d..cd3238585 100644 --- a/repos.sexp +++ b/repos.sexp -@@ -7,15 +7,15 @@ +@@ -5,17 +5,17 @@ + ;;;; 4. src/ - C/C++ dependencies for iclasp + ;;;; 5. extensions/ - extensions and their dependencies ((:name :ansi-test - :repository "https://gitlab.common-lisp.net/yitzchak/ansi-test" +- :repository "https://gitlab.common-lisp.net/yitzchak/ansi-test" ++ :repository "https://github.com/clasp-developers/ansi-test.git" :directory "dependencies/ansi-test/" - :branch "add-expected-failures") -+ :commit "346cf2eb1133942054df8ce2125ed7e999b6d82b") ++ :commit "33ae7c1ddd3e814bbe6f55b9e7a6a92b39404664") (:name :cl-bench - :repository "https://gitlab.common-lisp.net/ansi-test/cl-bench.git" +- :repository "https://gitlab.common-lisp.net/ansi-test/cl-bench.git" ++ :repository "https://github.com/clasp-developers/cl-bench.git" :directory "dependencies/cl-bench/" - :branch "master") + :commit "7d184b4ef2a6272f0e3de88f6c243edb20f7071a") @@ -21,7 +25,7 @@ index 2b2459655..ad346d8e5 100644 (:name :quicklisp-client :repository "https://github.com/quicklisp/quicklisp-client.git" :directory "dependencies/quicklisp-client/" -@@ -23,15 +23,15 @@ +@@ -23,21 +23,21 @@ (:name :shasht :repository "https://github.com/yitzchak/shasht.git" :directory "dependencies/shasht/" @@ -40,6 +44,13 @@ index 2b2459655..ad346d8e5 100644 (:name :acclimation :repository "https://github.com/robert-strandh/Acclimation.git" :directory "src/lisp/kernel/contrib/Acclimation/" + :commit "dd15c86b0866fc5d8b474be0da15c58a3c04c45c") + (:name :alexandria +- :repository "https://gitlab.common-lisp.net/alexandria/alexandria.git" ++ :repository "https://github.com/clasp-developers/alexandria.git" + :directory "src/lisp/kernel/contrib/alexandria/" + :commit "v1.4") + (:name :anaphora @@ -128,7 +128,7 @@ (:name :lparallel :repository "https://github.com/yitzchak/lparallel.git" @@ -49,12 +60,31 @@ index 2b2459655..ad346d8e5 100644 :extension :cando) (:name :parser.common-rules :repository "https://github.com/scymtym/parser.common-rules.git" -@@ -152,7 +152,7 @@ +@@ -150,9 +150,9 @@ + :commit "87a447a8eaef9cf4fd1c16d407a49f9adaf8adad" + :extension :cando) (:name :trivial-features ; Needed both by the host and eclasp - :repository "https://github.com/yitzchak/trivial-features.git" +- :repository "https://github.com/yitzchak/trivial-features.git" ++ :repository "https://github.com/trivial-features/trivial-features.git" :directory "src/lisp/kernel/contrib/trivial-features/" - :branch "asdf-feature") -+ :commit "0008ef4f3376fb76f63c35ecee6573d0d0f98d57") ++ :commit "d249a62aaf022902398a7141ae17217251fc61db") (:name :trivial-garbage :repository "https://github.com/trivial-garbage/trivial-garbage.git" :directory "src/lisp/kernel/contrib/trivial-garbage/" +@@ -176,7 +176,7 @@ + :directory "src/lisp/kernel/contrib/usocket/" + :commit "7ad6582cc1ce9e7fa5931a10e73b7d2f2688fa81") + (:name :asdf +- :repository "https://gitlab.common-lisp.net/asdf/asdf.git" ++ :repository "https://github.com/clasp-developers/asdf.git" + :directory "src/lisp/modules/asdf/" + :commit "3.3.5") + (:name :mps +@@ -205,4 +205,4 @@ + :repository "https://github.com/seqan/seqan.git" + :directory "extensions/seqan-clasp/seqan/" + :commit "f5f658343c366c9c3d44ba358ffc9317e78a09ed" +- :extension :seqan-clasp)) +\ No newline at end of file ++ :extension :seqan-clasp)) diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix index a80f7c58aed6..c9389d655ce5 100644 --- a/pkgs/development/compilers/clasp/default.nix +++ b/pkgs/development/compilers/clasp/default.nix @@ -16,6 +16,23 @@ let inherit (llvmPackages_15) stdenv llvm libclang; + # Gathered from https://github.com/clasp-developers/clasp/raw/2.2.0/repos.sexp + dependencies = import ./dependencies.nix { + inherit fetchFromGitHub; + }; + + # Shortened version of `_defaultUnpack` + unpackDependency = elem: '' + mkdir -p "source/${elem.directory}" + cp -pr --reflink=auto -- ${elem.src}/* "source/${elem.directory}" + chmod -R u+w -- "source/${elem.directory}" + ''; +in + +stdenv.mkDerivation { + pname = "clasp"; + version = "2.2.0"; + src = fetchFromGitHub { owner = "clasp-developers"; repo = "clasp"; @@ -23,57 +40,10 @@ let hash = "sha256-gvUqUb0dftW1miiBcAPJur0wOunox4y2SUYeeJpR9R4="; }; - reposDirs = [ - "dependencies" - "src/lisp/kernel/contrib" - "src/lisp/modules/asdf" - "src/mps" - "src/bdwgc" - "src/libatomic_ops" + patches = [ + ./clasp-pin-repos-commits.patch ]; - reposTarball = stdenv.mkDerivation { - pname = "clasp-repos"; - version = "tarball"; - - inherit src; - - patches = [ ./clasp-pin-repos-commits.patch ]; - - nativeBuildInputs = [ - sbcl - git - cacert - ]; - - buildPhase = '' - export SOURCE_DATE_EPOCH=1 - export ASDF_OUTPUT_TRANSLATIONS=$(pwd):$(pwd)/__fasls - sbcl --script koga --help - for x in {${lib.concatStringsSep "," reposDirs}}; do - find $x -type d -name .git -exec rm -rvf {} \; || true - done - ''; - - installPhase = '' - tar --owner=0 --group=0 --numeric-owner --format=gnu \ - --sort=name --mtime="@$SOURCE_DATE_EPOCH" \ - -czf $out ${lib.concatStringsSep " " reposDirs} - ''; - - outputHashMode = "flat"; - outputHashAlgo = "sha256"; - outputHash = "sha256-vgwThjn2h3nKnShtKoHgaPdH/FDHv28fLMQvKFEwG6o="; - }; - -in - -stdenv.mkDerivation { - pname = "clasp"; - version = "2.2.0"; - - inherit src; - nativeBuildInputs = [ sbcl git @@ -88,10 +58,11 @@ stdenv.mkDerivation { libclang ]; + postUnpack = lib.concatStringsSep "\n" (builtins.map unpackDependency dependencies); + configurePhase = '' export SOURCE_DATE_EPOCH=1 export ASDF_OUTPUT_TRANSLATIONS=$(pwd):$(pwd)/__fasls - tar xf ${reposTarball} sbcl --script koga \ --skip-sync \ --cc=$NIX_CC/bin/cc \ diff --git a/pkgs/development/compilers/clasp/dependencies.nix b/pkgs/development/compilers/clasp/dependencies.nix new file mode 100644 index 000000000000..abcd0f17747d --- /dev/null +++ b/pkgs/development/compilers/clasp/dependencies.nix @@ -0,0 +1,457 @@ +# Gathered from https://github.com/clasp-developers/clasp/raw/2.2.0/repos.sexp +# Generated using https://gist.github.com/philiptaron/8ea1394b049c2ca975e4b03965d9ac00 +# and then light editing using Vim + +{ fetchFromGitHub }: + +[ + { + directory = "dependencies/ansi-test/"; + src = fetchFromGitHub { + owner = "clasp-developers"; + repo = "ansi-test"; + rev = "33ae7c1ddd3e814bbe6f55b9e7a6a92b39404664"; + hash = "sha256-dGF7CScvfPNMRxQXJM4v6Vfc/VjdUXNz0yCjUOsYM3I="; + }; + } + + { + directory = "dependencies/cl-bench/"; + src = fetchFromGitHub { + owner = "clasp-developers"; + repo = "cl-bench"; + rev = "7d184b4ef2a6272f0e3de88f6c243edb20f7071a"; + hash = "sha256-7ZEIWNEj7gzYFMTqW7nnZgjNE1zoTAMeJHj547gRtPs="; + }; + } + + { + directory = "dependencies/cl-who/"; + src = fetchFromGitHub { + owner = "edicl"; + repo = "cl-who"; + rev = "07dafe9b351c32326ce20b5804e798f10d4f273d"; + hash = "sha256-5T762W3qetAjXtHP77ko6YZR6w5bQ04XM6QZPELQu+U="; + }; + } + + { + directory = "dependencies/quicklisp-client/"; + src = fetchFromGitHub { + owner = "quicklisp"; + repo = "quicklisp-client"; + rev = "8b63e00b3a2b3f96e24c113d7601dd03a128ce94"; + hash = "sha256-1HLVPhl8aBaeG8dRLxBh0j0X/0wqFeNYK1CEfiELToA="; + }; + } + + { + directory = "dependencies/shasht/"; + src = fetchFromGitHub { + owner = "yitzchak"; + repo = "shasht"; + rev = "f38e866990c6b5381a854d63f7ea0227c87c2f6d"; + hash = "sha256-Ki5JNevMvVZoUz3tP6cv7qA4xDLzjd2MXmf4x9ew5bw="; + }; + } + + { + directory = "dependencies/trivial-do/"; + src = fetchFromGitHub { + owner = "yitzchak"; + repo = "trivial-do"; + rev = "a19f93227cb80a6bec8846655ebcc7998020bd7e"; + hash = "sha256-Tjd9VJan6pQpur292xtklvb28MDGGjq2+ub5T6o6FG8="; + }; + } + + { + directory = "dependencies/trivial-gray-streams/"; + src = fetchFromGitHub { + owner = "trivial-gray-streams"; + repo = "trivial-gray-streams"; + rev = "2b3823edbc78a450db4891fd2b566ca0316a7876"; + hash = "sha256-9vN74Gum7ihKSrCygC3hRLczNd15nNCWn5r60jjHN8I="; + }; + } + + { + directory = "src/lisp/kernel/contrib/Acclimation/"; + src = fetchFromGitHub { + owner = "robert-strandh"; + repo = "Acclimation"; + rev = "dd15c86b0866fc5d8b474be0da15c58a3c04c45c"; + hash = "sha256-AuoVdv/MU73A8X+GsxyG0K+xgzCKLQfbpu79oTERgmI="; + }; + } + + { + directory = "src/lisp/kernel/contrib/alexandria/"; + src = fetchFromGitHub { + owner = "clasp-developers"; + repo = "alexandria"; + rev = "49e82add16cb9f1ffa72c77cd687271247181ff3"; + hash = "sha256-1Hzxt65dZvgOFIljjjlSGgKYkj+YBLwJCACi5DZsKmQ="; + }; + } + + { + directory = "src/lisp/kernel/contrib/anaphora/"; + src = fetchFromGitHub { + owner = "spwhitton"; + repo = "anaphora"; + rev = "bcf0f7485eec39415be1b2ec6ca31cf04a8ab5c5"; + hash = "sha256-CzApbUmdDmD+BWPcFGJN0rdZu991354EdTDPn8FSRbc="; + }; + } + + { + directory = "src/lisp/kernel/contrib/architecture.builder-protocol/"; + src = fetchFromGitHub { + owner = "scymtym"; + repo = "architecture.builder-protocol"; + rev = "0c1a9ebf9ab14e699c2b9c85fc20265b8c5364dd"; + hash = "sha256-AdZeI4UCMnmuYpmSaWqIt+egdkNN3kzEn/zOqIBTnww="; + }; + } + + { + directory = "src/lisp/kernel/contrib/array-utils/"; + src = fetchFromGitHub { + owner = "Shinmera"; + repo = "array-utils"; + rev = "5acd90fa3d9703cea33e3825334b256d7947632f"; + hash = "sha256-Br3H39F+hqYnTgYtVezuRhwRQJwJlxohu+M033sYPOI="; + }; + } + + { + directory = "src/lisp/kernel/contrib/babel/"; + src = fetchFromGitHub { + owner = "cl-babel"; + repo = "babel"; + rev = "f892d0587c7f3a1e6c0899425921b48008c29ee3"; + hash = "sha256-U2E8u3ZWgH9eG4SV/t9CE1dUpcthuQMXgno/W1Ow2RE="; + }; + } + + { + directory = "src/lisp/kernel/contrib/bordeaux-threads/"; + src = fetchFromGitHub { + owner = "sionescu"; + repo = "bordeaux-threads"; + rev = "3d25cd01176f7c9215ebc792c78313cb99ff02f9"; + hash = "sha256-KoOaIKQZaZgEbtM6PGVwQn/xg+/slt+uloR4EaMlBeg="; + }; + } + + { + directory = "src/lisp/kernel/contrib/cffi/"; + src = fetchFromGitHub { + owner = "cffi"; + repo = "cffi"; + rev = "9c912e7b89eb09dd347d3ebae16e4dc5f53e5717"; + hash = "sha256-umt0HmX7M3SZM2VSrxqxUmNt9heTG/Ulwzphs2NRYTs="; + }; + } + + { + directory = "src/lisp/kernel/contrib/cl-markup/"; + src = fetchFromGitHub { + owner = "arielnetworks"; + repo = "cl-markup"; + rev = "e0eb7debf4bdff98d1f49d0f811321a6a637b390"; + hash = "sha256-50LZDaNfXhOZ6KoTmXClo5Bo2D9q1zbdCLSFkwqZhoI="; + }; + } + + { + directory = "src/lisp/kernel/contrib/cl-ppcre/"; + src = fetchFromGitHub { + owner = "edicl"; + repo = "cl-ppcre"; + rev = "b4056c5aecd9304e80abced0ef9c89cd66ecfb5e"; + hash = "sha256-6xeiSeYVwzAaisLQP/Bjqlc/Rhw8JMy0FT93hDQi5Y8="; + }; + } + + { + directory = "src/lisp/kernel/contrib/cl-svg/"; + src = fetchFromGitHub { + owner = "wmannis"; + repo = "cl-svg"; + rev = "1e988ebd2d6e2ee7be4744208828ef1b59e5dcdc"; + hash = "sha256-nwOvHGK0wIOZxAnZ68xyOhchAp8CBl/wsfRI42v8NYc="; + }; + } + + { + directory = "src/lisp/kernel/contrib/Cleavir/"; + src = fetchFromGitHub { + owner = "s-expressionists"; + repo = "Cleavir"; + rev = "a73d313735447c63b4b11b6f8984f9b1e3e74ec9"; + hash = "sha256-VQ8sB5W7JYnVsvfx2j7d2LQcECst79MCIW9QSuwm8GA="; + }; + } + + { + directory = "src/lisp/kernel/contrib/closer-mop/"; + src = fetchFromGitHub { + owner = "pcostanza"; + repo = "closer-mop"; + rev = "d4d1c7aa6aba9b4ac8b7bb78ff4902a52126633f"; + hash = "sha256-bHBYMBz45EOY727d4BWP75gRV4nzRAWxAlivPRzYrKo="; + }; + } + + { + directory = "src/lisp/kernel/contrib/Concrete-Syntax-Tree/"; + src = fetchFromGitHub { + owner = "s-expressionists"; + repo = "Concrete-Syntax-Tree"; + rev = "4f01430c34f163356f3a2cfbf0a8a6963ff0e5ac"; + hash = "sha256-0XfLkihztWUhqu7DrFiuwcEx/x+EILEivPfsHb5aMZk="; + }; + } + + { + directory = "src/lisp/kernel/contrib/documentation-utils/"; + src = fetchFromGitHub { + owner = "Shinmera"; + repo = "documentation-utils"; + rev = "98630dd5f7e36ae057fa09da3523f42ccb5d1f55"; + hash = "sha256-uMUyzymyS19ODiUjQbE/iJV7HFeVjB45gbnWqfGEGCU="; + }; + } + + { + directory = "src/lisp/kernel/contrib/Eclector/"; + src = fetchFromGitHub { + owner = "s-expressionists"; + repo = "Eclector"; + rev = "dddb4d8af3eae78017baae7fb9b99e73d2a56e6b"; + hash = "sha256-OrkWEI5HGlmejH9gg7OwJz2QXgAgE3kDHwen5yzhKgM="; + }; + } + + { + directory = "src/lisp/kernel/contrib/esrap/"; + src = fetchFromGitHub { + owner = "scymtym"; + repo = "esrap"; + rev = "7588b430ad7c52f91a119b4b1c9a549d584b7064"; + hash = "sha256-C0GiTyRna9BMIMy1/XdMZAkhjpLaoAEF1+ps97xQyMY="; + }; + } + + { + directory = "src/lisp/kernel/contrib/global-vars/"; + src = fetchFromGitHub { + owner = "lmj"; + repo = "global-vars"; + rev = "c749f32c9b606a1457daa47d59630708ac0c266e"; + hash = "sha256-bXxeNNnFsGbgP/any8rR3xBvHE9Rb4foVfrdQRHroxo="; + }; + } + + { + directory = "src/lisp/kernel/contrib/let-plus/"; + src = fetchFromGitHub { + owner = "sharplispers"; + repo = "let-plus"; + rev = "455e657e077235829b197f7ccafd596fcda69e30"; + hash = "sha256-SyZRx9cyuEN/h4t877TOWw35caQqMf2zSGZ9Qg22gAE="; + }; + } + + { + directory = "src/lisp/kernel/contrib/cl-netcdf/"; + src = fetchFromGitHub { + owner = "clasp-developers"; + repo = "cl-netcdf"; + rev = "593c6c47b784ec02e67580aa12a7775ed6260200"; + hash = "sha256-3VCTSsIbk0GovCM+rWPZj2QJdYq+UZksjfRd18UYY5s="; + }; + } + + { + directory = "src/lisp/kernel/contrib/lparallel/"; + src = fetchFromGitHub { + owner = "yitzchak"; + repo = "lparallel"; + rev = "9c98bf629328b27a5a3fbb7a637afd1db439c00f"; + hash = "sha256-sUM1WKXxZk7un64N66feXh21m7yzJsdcaWC3jIOd2W4="; + }; + } + + { + directory = "src/lisp/kernel/contrib/parser.common-rules/"; + src = fetchFromGitHub { + owner = "scymtym"; + repo = "parser.common-rules"; + rev = "b7652db5e3f98440dce2226d67a50e8febdf7433"; + hash = "sha256-ik+bteIjBN6MfMFiRBjn/nP7RBzv63QgoRKVi4F8Ho0="; + }; + } + + { + directory = "src/lisp/kernel/contrib/plump/"; + src = fetchFromGitHub { + owner = "Shinmera"; + repo = "plump"; + rev = "d8ddda7514e12f35510a32399f18e2b26ec69ddc"; + hash = "sha256-FjeZAWD81137lXWyN/RIr+L+anvwh/Glze497fcpHUY="; + }; + } + + { + directory = "src/lisp/kernel/contrib/split-sequence/"; + src = fetchFromGitHub { + owner = "sharplispers"; + repo = "split-sequence"; + rev = "89a10b4d697f03eb32ade3c373c4fd69800a841a"; + hash = "sha256-faF2EiQ+xXWHX9JlZ187xR2mWhdOYCpb4EZCPNoZ9uQ="; + }; + } + + { + directory = "src/lisp/kernel/contrib/static-vectors/"; + src = fetchFromGitHub { + owner = "sionescu"; + repo = "static-vectors"; + rev = "87a447a8eaef9cf4fd1c16d407a49f9adaf8adad"; + hash = "sha256-q4E+VPX/pOyuCdzJZ6CFEIiR58E6JIxJySROl/WcMyI="; + }; + } + + { + directory = "src/lisp/kernel/contrib/trivial-features/"; + src = fetchFromGitHub { + owner = "trivial-features"; + repo = "trivial-features"; + rev = "d249a62aaf022902398a7141ae17217251fc61db"; + hash = "sha256-g50OSfrMRH5hTRy077C1kCln2vz0Qeb1oq9qHh7zY2Q="; + }; + } + + { + directory = "src/lisp/kernel/contrib/trivial-garbage/"; + src = fetchFromGitHub { + owner = "trivial-garbage"; + repo = "trivial-garbage"; + rev = "b3af9c0c25d4d4c271545f1420e5ea5d1c892427"; + hash = "sha256-CCLZHHW3/0Id0uHxrbjf/WM3yC8netkcQ8p9Qtssvc4="; + }; + } + + { + directory = "src/lisp/kernel/contrib/trivial-http/"; + src = fetchFromGitHub { + owner = "gwkkwg"; + repo = "trivial-http"; + rev = "ca45656587f36378305de1a4499c308acc7a03af"; + hash = "sha256-0VKWHJYn1XcXVNHduxKiABe7xFUxj8M4/u92Usvq54o="; + }; + } + + { + directory = "src/lisp/kernel/contrib/trivial-indent/"; + src = fetchFromGitHub { + owner = "Shinmera"; + repo = "trivial-indent"; + rev = "8d92e94756475d67fa1db2a9b5be77bc9c64d96c"; + hash = "sha256-G+YCIB3bKN4RotJUjT/6bnivSBalseFRhIlwsEm5EUk="; + }; + } + + { + directory = "src/lisp/kernel/contrib/trivial-with-current-source-form/"; + src = fetchFromGitHub { + owner = "scymtym"; + repo = "trivial-with-current-source-form"; + rev = "3898e09f8047ef89113df265574ae8de8afa31ac"; + hash = "sha256-IKJOyJYqGBx0b6Oomddvb+2K6q4W508s3xnplleMJIQ="; + }; + } + + { + directory = "src/lisp/kernel/contrib/usocket/"; + src = fetchFromGitHub { + owner = "usocket"; + repo = "usocket"; + rev = "7ad6582cc1ce9e7fa5931a10e73b7d2f2688fa81"; + hash = "sha256-0HiItuc6fV70Rpk/5VevI1I0mGnY1JJvhnyPpx6r0uo="; + }; + } + + { + directory = "src/lisp/modules/asdf/"; + src = fetchFromGitHub { + owner = "clasp-developers"; + repo = "asdf"; + rev = "97b279faf3cc11a5cfdd19b5325025cc8ec1e7bd"; + hash = "sha256-4LhF+abor5NK4HgbGCYM5kSaH7TLISW5w5HXYOm4wqw="; + }; + } + + { + directory = "src/mps/"; + src = fetchFromGitHub { + owner = "Ravenbrook"; + repo = "mps"; + rev = "b8a05a3846430bc36c8200f24d248c8293801503"; + hash = "sha256-Zuc77cdap0xNYEqM8IkMQMUMY0f5QZ84uFmKgXjDXeA="; + }; + } + + { + directory = "src/bdwgc/"; + src = fetchFromGitHub { + owner = "ivmai"; + repo = "bdwgc"; + rev = "036becee374b84fed5d56a6df3ae097b7cc0ff73"; + hash = "sha256-WB1sFfVL6lWL+DEypg3chCJS/w0J4tPGi5tL1o3W73U="; + }; + } + + { + directory = "src/libatomic_ops/"; + src = fetchFromGitHub { + owner = "ivmai"; + repo = "libatomic_ops"; + rev = "4b7d0b9036f9a645b03010dad1c7b7f86ea75772"; + hash = "sha256-zThdbX2/l5/ZZVYobJf9KAd+IjIDIrk+08SUhTQs2gE="; + }; + } + + { + directory = "extensions/cando/"; + src = fetchFromGitHub { + owner = "cando-developers"; + repo = "cando"; + rev = "a6934eddfce2ff1cb7131affce427ce652392f08"; + hash = "sha256-AUmBLrk7lofJNagvI3KhPebvV8GkrDbBXrsAa3a1Bwo="; + }; + } + + { + directory = "extensions/seqan-clasp/"; + src = fetchFromGitHub { + owner = "clasp-developers"; + repo = "seqan-clasp"; + rev = "5caa2e1e6028525276a6b6ba770fa6e334563d58"; + hash = "sha256-xAvAd/kBr8n9SSw/trgWTqDWQLmpOp8+JX5L+JO2+Ls="; + }; + } + + { + directory = "extensions/seqan-clasp/seqan/"; + src = fetchFromGitHub { + owner = "seqan"; + repo = "seqan"; + rev = "f5f658343c366c9c3d44ba358ffc9317e78a09ed"; + hash = "sha256-AzZlONf7SNxCa9+SKQFC/rA6fx6rhWH96caZSmKnlsU="; + }; + } +] From cee762101c7240812e8d638e16ba60be4dabc364 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 13 Dec 2023 23:02:04 -0800 Subject: [PATCH 07/35] clasp-common-lisp: fix build warning This resolves the annoying message for every compilation line: ``` clang-15: warning: argument unused during compilation: '-stdlib=libstdc++' [-Wunused-command-line-argument] ``` --- pkgs/development/compilers/clasp/default.nix | 1 + .../clasp/remove-unused-command-line-argument.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/compilers/clasp/remove-unused-command-line-argument.patch diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix index c9389d655ce5..a099272f2168 100644 --- a/pkgs/development/compilers/clasp/default.nix +++ b/pkgs/development/compilers/clasp/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation { patches = [ ./clasp-pin-repos-commits.patch + ./remove-unused-command-line-argument.patch ]; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/clasp/remove-unused-command-line-argument.patch b/pkgs/development/compilers/clasp/remove-unused-command-line-argument.patch new file mode 100644 index 000000000000..b5c2d0bf39c3 --- /dev/null +++ b/pkgs/development/compilers/clasp/remove-unused-command-line-argument.patch @@ -0,0 +1,13 @@ +diff --git a/src/koga/units.lisp b/src/koga/units.lisp +index 808cebd17..2bbf965fd 100644 +--- a/src/koga/units.lisp ++++ b/src/koga/units.lisp +@@ -197,7 +197,7 @@ + :type :cxxflags) + #+darwin (append-cflags configuration "-stdlib=libc++" :type :cxxflags) + #+darwin (append-cflags configuration "-I/usr/local/include") +- #+linux (append-cflags configuration "-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -fno-stack-protector -stdlib=libstdc++" ++ #+linux (append-cflags configuration "-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -fno-stack-protector" + :type :cxxflags) + #+linux (append-cflags configuration "-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -fno-stack-protector" + :type :cflags) From 27a9a1ca3f7c2d078ed64a55cfd1daa42d98efd4 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 13 Dec 2023 23:49:09 -0800 Subject: [PATCH 08/35] clasp-common-lisp: use ninjaFlags instead of explicitly setting buildPhase and installPhase --- pkgs/development/compilers/clasp/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix index a099272f2168..64617d01f156 100644 --- a/pkgs/development/compilers/clasp/default.nix +++ b/pkgs/development/compilers/clasp/default.nix @@ -59,6 +59,8 @@ stdenv.mkDerivation { libclang ]; + ninjaFlags = [ "-C" "build" ]; + postUnpack = lib.concatStringsSep "\n" (builtins.map unpackDependency dependencies); configurePhase = '' @@ -75,14 +77,6 @@ stdenv.mkDerivation { --share-path=$out/share ''; - buildPhase = '' - ninja -C build - ''; - - installPhase = '' - ninja -C build install - ''; - meta = { description = "A Common Lisp implementation based on LLVM with C++ integration"; license = lib.licenses.lgpl21Plus ; From b45e6ec4283be8fd92a442fe2ddf85cc64c03343 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 14 Dec 2023 11:26:41 +0100 Subject: [PATCH 09/35] python311Packages.oras: init at 0.1.26 ORAS Python SDK https://github.com/oras-project/oras-py --- .../python-modules/oras/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/oras/default.nix diff --git a/pkgs/development/python-modules/oras/default.nix b/pkgs/development/python-modules/oras/default.nix new file mode 100644 index 000000000000..6dd42eeca3db --- /dev/null +++ b/pkgs/development/python-modules/oras/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, jsonschema +, pytestCheckHook +, pythonOlder +, requests +, setuptools +}: + +buildPythonPackage rec { + pname = "oras"; + version = "0.1.26"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "oras-project"; + repo = "oras-py"; + rev = "refs/tags/${version}"; + hash = "sha256-t3098ZeAkwLhinyrFwmi7KKrFgZZKPN6qvp3REQNwG8="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + jsonschema + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "oras" + ]; + + disabledTests = [ + # Test requires network access + "test_get_many_tags" + ]; + + meta = with lib; { + description = "ORAS Python SDK"; + homepage = "https://github.com/oras-project/oras-py"; + changelog = "https://github.com/oras-project/oras-py/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 07f44dcf96fd..28f5b6f965b7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8653,6 +8653,8 @@ self: super: with self; { orange-widget-base = callPackage ../development/python-modules/orange-widget-base { }; + oras = callPackage ../development/python-modules/oras { }; + orderedmultidict = callPackage ../development/python-modules/orderedmultidict { }; ordered-set = callPackage ../development/python-modules/ordered-set { }; From 9076c9b8ec7a98dfc74b925093616fa8a94bfd14 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 14 Dec 2023 11:38:52 +0100 Subject: [PATCH 10/35] dep-scan: init at 5.0.2 Security and risk audit tool based on known vulnerabilities, advisories, and license limitations for project dependencies https://github.com/owasp-dep-scan/dep-scan --- pkgs/by-name/de/dep-scan/package.nix | 66 ++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 pkgs/by-name/de/dep-scan/package.nix diff --git a/pkgs/by-name/de/dep-scan/package.nix b/pkgs/by-name/de/dep-scan/package.nix new file mode 100644 index 000000000000..48ba5c4c51ae --- /dev/null +++ b/pkgs/by-name/de/dep-scan/package.nix @@ -0,0 +1,66 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "dep-scan"; + version = "5.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "owasp-dep-scan"; + repo = "dep-scan"; + rev = "refs/tags/v${version}"; + hash = "sha256-qiJyGBGxznNF4LNG9fbmjG7wX0odhrUO2LxOWABtLQA="; + }; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --cov-append --cov-report term --cov depscan" "" + ''; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + + propagatedBuildInputs = with python3.pkgs; [ + appthreat-vulnerability-db + defusedxml + jinja2 + oras + pdfkit + pygithub + pyyaml + quart + rich + toml + ]; + + nativeCheckInputs = with python3.pkgs; [ + httpretty + pytestCheckHook + ]; + + pythonImportsCheck = [ + "depscan" + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTests = [ + # Test is not present + "test_query_metadata2" + ]; + + meta = with lib; { + description = "Security and risk audit tool based on known vulnerabilities, advisories, and license limitations for project dependencies"; + homepage = "https://github.com/owasp-dep-scan/dep-scan"; + changelog = "https://github.com/owasp-dep-scan/dep-scan/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "dep-scan"; + }; +} From e2e9ebe806d4df3668757aa8deb7698893c680a1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 14 Dec 2023 14:50:02 +0100 Subject: [PATCH 11/35] ad-miner: init at 0.6.0 Active Directory audit tool that leverages cypher queries to crunch data from Bloodhound https://github.com/Mazars-Tech/AD_Miner --- pkgs/by-name/ad/ad-miner/package.nix | 44 ++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pkgs/by-name/ad/ad-miner/package.nix diff --git a/pkgs/by-name/ad/ad-miner/package.nix b/pkgs/by-name/ad/ad-miner/package.nix new file mode 100644 index 000000000000..d8134263c5f7 --- /dev/null +++ b/pkgs/by-name/ad/ad-miner/package.nix @@ -0,0 +1,44 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "ad-miner"; + version = "0.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Mazars-Tech"; + repo = "AD_Miner"; + rev = "refs/tags/v${version}"; + hash = "sha256-Iwg00vAnCs9FbEAmB54vNDLmxyZeCtZMl/VEFoYeEcM="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + neo4j + numpy + pytz + tqdm + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "ad_miner" + ]; + + meta = with lib; { + description = "Active Directory audit tool that leverages cypher queries to crunch data from Bloodhound"; + homepage = "https://github.com/Mazars-Tech/AD_Miner"; + changelog = "https://github.com/Mazars-Tech/AD_Miner/blob/${version}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + mainProgram = "AD-miner"; + }; +} From 99c14aab26339a8ae94da9da197d54a1508a0af2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 14 Dec 2023 15:44:55 +0100 Subject: [PATCH 12/35] gitea: 1.21.1 -> 1.21.2 ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.21.2 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 5cbc4a1bd493..b9c68c330cc6 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -20,12 +20,12 @@ buildGoModule rec { pname = "gitea"; - version = "1.21.1"; + version = "1.21.2"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://dl.gitea.com/gitea/${version}/gitea-src-${version}.tar.gz"; - hash = "sha256-5WEHUMQsQNgrglS+xJ4IWHUl0a6RLLPyx0l+ECJ4R9g="; + hash = "sha256-+zG4tyJjSwocIDVwOj4RhwF7h/6WBCOG/6j4B1ADXas="; }; vendorHash = null; From 43c07d029122e760b6a9fccb10e89fd96ac18d2d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 14 Dec 2023 17:12:48 +0100 Subject: [PATCH 13/35] nextcloud26: 26.0.9 -> 26.0.10 ChangeLog: https://github.com/nextcloud/server/releases/tag/v26.0.10 --- 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 0e3a8c925386..1fc5d07a759d 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -55,8 +55,8 @@ in { ''; nextcloud26 = generic { - version = "26.0.9"; - hash = "sha256-nVD8a+jjZXyfXrhEj6Fleofh2p5uq0DvYlXSNTMNiIE="; + version = "26.0.10"; + hash = "sha256-yArkYMxOmvfQsJd6TJJX+t22a/V5OW9nwHfgLZsmlIw="; packages = nextcloud26Packages; }; From 0cb577ff62d62e6e8d3dd5721cf112805b087e89 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 14 Dec 2023 17:13:13 +0100 Subject: [PATCH 14/35] nextcloud27: 27.1.4 -> 27.1.5 ChangeLog: https://github.com/nextcloud/server/releases/tag/v27.1.5 --- 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 1fc5d07a759d..6f4023b1a7c7 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -61,8 +61,8 @@ in { }; nextcloud27 = generic { - version = "27.1.4"; - hash = "sha256-vsZfIWa4LJMDuvR2weQk9xqhltrQEP/kwMOdA5kNWUw="; + version = "27.1.5"; + hash = "sha256-O1NMmOdrf+2Mo5NMrUGbEK9YViWfMTvsIs06e/pu+WE="; packages = nextcloud27Packages; }; From dc2b6d2af401041dfb6351f72582ad4a078a0b6f Mon Sep 17 00:00:00 2001 From: netali Date: Thu, 14 Dec 2023 17:27:58 +0100 Subject: [PATCH 15/35] zammad: 6.1.0 -> 6.2.0 --- .../networking/misc/zammad/default.nix | 4 +- .../networking/misc/zammad/gemset.nix | 460 ++++++++++++------ .../networking/misc/zammad/package.json | 173 +++---- .../networking/misc/zammad/source.json | 4 +- 4 files changed, 392 insertions(+), 249 deletions(-) diff --git a/pkgs/applications/networking/misc/zammad/default.nix b/pkgs/applications/networking/misc/zammad/default.nix index 4b8a397afa8f..369b16282c41 100644 --- a/pkgs/applications/networking/misc/zammad/default.nix +++ b/pkgs/applications/networking/misc/zammad/default.nix @@ -24,7 +24,7 @@ let pname = "zammad"; - version = "6.1.0"; + version = "6.2.0"; src = applyPatches { @@ -101,7 +101,7 @@ let offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-PVQ2L+Io6Ct9UHvfoQmxV01ECG8fj0+xKwpMfAvD7q0="; + hash = "sha256-u72ZTpcUvFa1gaWi4lzTQa+JsI85jU4n8r1JhqFnCj4="; }; yarnPreBuild = '' diff --git a/pkgs/applications/networking/misc/zammad/gemset.nix b/pkgs/applications/networking/misc/zammad/gemset.nix index 3c96ab18ef8c..31b956182173 100644 --- a/pkgs/applications/networking/misc/zammad/gemset.nix +++ b/pkgs/applications/networking/misc/zammad/gemset.nix @@ -16,32 +16,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fdbks9byqqlkd6glj6lkz5f1z6948hh8fhv9x5pzqciralmz142"; + sha256 = "117vxic67jnw6q637kmsb3ryj0x485295pz9a9y4z8xn9bdlsl0z"; type = "gem"; }; - version = "6.1.7.6"; + version = "7.0.8"; }; actionmailbox = { - dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; + dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rfya6qgsl14cm9l2w7h7lg4znsyg3gqiskhqr8wn76sh0x2hln0"; + sha256 = "1r8ldj2giaz8cn49qkdqn5zc29gbsr5ky4fg6r7ali0yh1xh684l"; type = "gem"; }; - version = "6.1.7.6"; + version = "7.0.8"; }; actionmailer = { - dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; + dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jr9jpf542svzqz8x68s08jnf30shxrrh7rq1a0s7jia5a5zx3qd"; + sha256 = "0w6gvj7ybniq89834hqww9rj2xypz9l91f8niwaws2yq1qklymr2"; type = "gem"; }; - version = "6.1.7.6"; + version = "7.0.8"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -49,21 +49,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vf6ncs647psa9p23d2108zgmlf0pr7gcjr080yg5yf68gyhs53k"; + sha256 = "1l319p0gipfgq8bp8dvbv97qqb72rad9zcqn5snhgv20cmpqr69b"; type = "gem"; }; - version = "6.1.7.6"; + version = "7.0.8"; }; actiontext = { - dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; + dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i8s3v6m8q3y17c40l6d3k2vs1mdqr0y1lfm7i6dfbj2y673lk9r"; + sha256 = "0i47r3n2m8qm002gx7c0lx1pv15pr2zy57dm8j38x960rsb655pp"; type = "gem"; }; - version = "6.1.7.6"; + version = "7.0.8"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s4c1n5lv31sc7w4w74xz8gzyq3sann00bm4l7lxgy3vgi2wqkid"; + sha256 = "0xnpdwj1d8m6c2d90jp9cs50ggiz0jj02ls2h9lg68k4k8mnjbd2"; type = "gem"; }; - version = "6.1.7.6"; + version = "7.0.8"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1641003plszig5ybhrqy90fv43l1vcai5h35qmhh9j12byk5hp26"; + sha256 = "1cn1ic7ml75jm0c10s7cm5mvcgfnafj0kjvvjavpjcxgz6lxcqyb"; type = "gem"; }; - version = "6.1.7.6"; + version = "7.0.8"; }; activemodel = { dependencies = ["activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "148szdj5jlnfpv3nmy8cby8rxgpdvs43f3rzqby1f7a0l2knd3va"; + sha256 = "004w8zaz2g3y6lnrsvlcmljll0m3ndqpgwf0wfscgq6iysibiglm"; type = "gem"; }; - version = "6.1.7.6"; + version = "7.0.8"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n7hg582ajdncilfk1kkw8qfdchymp2gqgkad1znlhlmclihsafr"; + sha256 = "04wavps80q3pvhvfbmi4gs102y1p6mxbg8xylzvib35b6m92adpj"; type = "gem"; }; - version = "6.1.7.6"; + version = "7.0.8"; }; activerecord-import = { dependencies = ["activerecord"]; @@ -115,10 +115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12prkcp68jqpbl06lv46n7cgbvgsxmjwkn88q36wh9rz9bvlpbhg"; + sha256 = "0n1zmpdwxic878zbc0hphbdk18619ifh6ikbxc24mv1sx7l2srq4"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.1"; }; activerecord-nulldb-adapter = { dependencies = ["activerecord"]; @@ -126,21 +126,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07lx5l6dgippsywwfq1c9ykf5iza75520gam465kz9hsifp6xp7i"; + sha256 = "1552py7zlamd5gy2dbkzjixanl9k07y6jqqrr4ic6n52apwd0ijy"; type = "gem"; }; - version = "0.9.0"; + version = "1.0.1"; }; activerecord-session_store = { - dependencies = ["actionpack" "activerecord" "multi_json" "rack" "railties"]; + dependencies = ["actionpack" "activerecord" "cgi" "multi_json" "rack" "railties"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06ddhz1b2yg72iv09n48gcd3ix5da7hxlzi7vvj13nrps2qwlffg"; + sha256 = "0x13crb9f6yxk5i320c3a29rl760lkyhh21zd128f34dc4fknigq"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.0"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; @@ -148,21 +148,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16pylwnqsbvq2wxhl7k1rnravbr3dgpjmnj0psz5gijgkydd52yc"; + sha256 = "0d6vm6alsp0g6f3548b615zxbz8l2wrmaikwgsf8kv11wf6swb4c"; type = "gem"; }; - version = "6.1.7.6"; + version = "7.0.8"; }; activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; groups = ["assets" "default" "development" "nulldb" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nhrdih0rk46i0s6x7nqhbypmj1hf23zl5gfl9xasb6k4r2a1dxk"; + sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5"; type = "gem"; }; - version = "6.1.7.6"; + version = "7.0.8"; }; acts_as_list = { dependencies = ["activerecord"]; @@ -202,10 +202,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wdllcqlr81nzyf485ldv1p660xsi476p79ghbj7zsf3n9n86gwd"; + sha256 = "0mwmrqfpwljp0pkv8zbamg66s2zlxrhhvfvcgg9jlldzf98zc3lq"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; ast = { groups = ["default" "development" "test"]; @@ -236,10 +236,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hax4yd41f61ypfs7f0snjzbcgpp19s9d2i0bv4hyjv21kkdz736"; + sha256 = "0x8ian7m977840aydnv2h62qmsnmnc4bf1d3jm8sn271d0xdv5jk"; type = "gem"; }; - version = "10.4.13.0"; + version = "10.4.15.0"; }; awrence = { groups = ["default"]; @@ -251,6 +251,70 @@ }; version = "1.2.1"; }; + aws-eventstream = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-partitions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r0n8p7yv8y2cl8gh1s2wcgjrd0p8b0d1diw652v4g0fy683adzk"; + type = "gem"; + }; + version = "1.853.0"; + }; + aws-sdk-core = { + dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11rfshwp9nflhv7rqc9nb0fg70d3lw11qldfiw02pk3zpvc7ddxh"; + type = "gem"; + }; + version = "3.187.0"; + }; + aws-sdk-kms = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01z32ryrl18al0hazyimww808ij144pgs5m8wmp0k49i7k33hnlw"; + type = "gem"; + }; + version = "1.72.0"; + }; + aws-sdk-s3 = { + dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1azbbd73q3nhiggdhr320ywxj2ph7s9icfa7c96i7gq2a8li202q"; + type = "gem"; + }; + version = "1.137.0"; + }; + aws-sigv4 = { + dependencies = ["aws-eventstream"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wzi7mkyfcr23y8r3dx64zqil115rjy8d9nmkd2q5a6ssxs8y58w"; + type = "gem"; + }; + version = "1.6.1"; + }; base64 = { groups = ["default" "development" "test"]; platforms = []; @@ -273,7 +337,7 @@ }; binding_of_caller = { dependencies = ["debug_inspector"]; - groups = ["default" "development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -299,10 +363,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vcg52gwl64xhhal6kwk1pc01y1klzdlnv1awyk89kb91z010x7q"; + sha256 = "0iqkzby0fdgi786m873nm0ckmc847wy9a4ydinb29m7hd3fs83kb"; type = "gem"; }; - version = "1.16.0"; + version = "1.17.0"; }; brakeman = { groups = ["development" "test"]; @@ -345,7 +409,7 @@ version = "3.2.4"; }; byebug = { - groups = ["development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -385,6 +449,16 @@ }; version = "0.5.9.6"; }; + cgi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18zc1z8va9j1gcv131p605wmkvn1p5958mmvvy7v45ki8c0w7qn5"; + type = "gem"; + }; + version = "0.3.6"; + }; childprocess = { groups = ["default" "development" "test"]; platforms = []; @@ -427,7 +501,7 @@ version = "0.3.3"; }; coderay = { - groups = ["default" "development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -474,10 +548,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1izh9vf2rjjxphidgf00wdmvmvlrbsy4n2a99fds59qkbd5cy0i9"; + sha256 = "0pjbnlzb459wqd8lv6d2xfnjbc71viffhkzxg3cd0i2q9jq0fvgk"; type = "gem"; }; - version = "13.0.7"; + version = "14.0.7"; }; concurrent-ruby = { groups = ["assets" "default" "development" "nulldb" "test"]; @@ -526,10 +600,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r20iryb3ls3ly2c8k675ixz1zsifrkcj0h2i0326pgb3dwkicxa"; + sha256 = "1zmrgngggg4yvdbggdx9p3z4wcav4vxfigramxxvjh3hi7l12pig"; type = "gem"; }; - version = "3.2.7"; + version = "3.2.8"; }; daemons = { groups = ["default"]; @@ -546,23 +620,23 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11ig4scb2h93j4z6rikfjd00wk2y4bhkikhia86a65gs4gl44kja"; + sha256 = "137xw0nl7ixxqyam6fjgmzl24i3rdml37whgnks8y35w92i95447"; type = "gem"; }; - version = "3.2.5"; + version = "3.2.6"; }; date = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + sha256 = "149jknsq999gnhy865n33fkk22s0r447k76x9pmcnnwldfv2q7wp"; type = "gem"; }; - version = "3.3.3"; + version = "3.3.4"; }; debug_inspector = { - groups = ["default" "development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -588,10 +662,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wh1146hg0b85zv336dn00jx9mzw5ma0maj67is7bvz5l35hd6yk"; + sha256 = "1b80s5b6dihazdd8kcfrd7z3qv8kijxpxq5027prazdha3pgzadf"; type = "gem"; }; - version = "4.1.7"; + version = "4.1.8"; }; deprecation_toolkit = { dependencies = ["activesupport"]; @@ -646,16 +720,6 @@ }; version = "5.6.6"; }; - dotenv = { - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1n0pi8x8ql5h1mijvm8lgn6bhq4xjb5a500p5r1krq4s6j9lg565"; - type = "gem"; - }; - version = "2.8.1"; - }; dry-cli = { groups = ["default"]; platforms = []; @@ -798,10 +862,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "121h6af4i6wr3wxvv84y53jcyw2sk71j5wsncm6wq6yqrwcrk4vd"; + sha256 = "1yywajqlpjhrj1m43s3lfg3i4lkb6pxwccmwps7qw37ndmphdzg8"; type = "gem"; }; - version = "2.8.1"; + version = "2.9.1"; }; factory_bot = { dependencies = ["activesupport"]; @@ -831,21 +895,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ysiqlvyy1351bzx7h92r93a35s32l8giyf9bac6sgr142sh3cnn"; + sha256 = "1ic47k6f0q6xl9g2yxa3x60gfbwx98wnx75qnbhhgk0zc7a5ijhy"; type = "gem"; }; - version = "3.2.1"; + version = "3.2.2"; }; faraday = { - dependencies = ["faraday-net_http" "ruby2_keywords"]; + dependencies = ["base64" "faraday-net_http" "ruby2_keywords"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "187clqhp9mv5mnqmjlfdp57svhsg1bggz84ak8v333j9skrnrgh9"; + sha256 = "0vn7jwss2v6jhnxvjsiwbs3irjwhbx9zxn4l6fhd4rkcfyxzdnw5"; type = "gem"; }; - version = "2.7.10"; + version = "2.7.11"; }; faraday-mashify = { dependencies = ["faraday" "hashie"]; @@ -916,10 +980,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kqm5ndzaybpnpxqiqkc41k4ksyxl41ln8qqr6kb130cdxsf2dxk"; + sha256 = "1sbw6b66r7cwdx3jhs46s4lr991969hvigkjpbdl7y3i31qpdgvh"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.1"; }; gmail_xoauth = { dependencies = ["oauth"]; @@ -933,14 +997,15 @@ version = "0.4.2"; }; graphql = { + dependencies = ["racc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j5y4zgvraq5jhs2jjrblarj93nhq94m7bk8k1cqk18nq985x5ac"; + sha256 = "0zcm3bcw8zqqyns43cir276yfs5bafcan90rg22ihxi0b01c395p"; type = "gem"; }; - version = "2.0.26"; + version = "2.1.6"; }; graphql-batch = { dependencies = ["graphql" "promise.rb"]; @@ -1046,6 +1111,17 @@ }; version = "0.6.0"; }; + httparty = { + dependencies = ["mini_mime" "multi_xml"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "050jzsa6fbfvy2rldhk7mf1sigildaqvbplfz2zs6c0zlzwppvq0"; + type = "gem"; + }; + version = "0.21.0"; + }; httpclient = { groups = ["default"]; platforms = []; @@ -1073,21 +1149,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03isrw8mma83hifham5iab80bnbx7b1xabnh8v4zragb04gpfzs5"; + sha256 = "15xpiqb2884ip8js4vwm85vd22y919w2dga36yqdfam2gcwi8vvw"; type = "gem"; }; - version = "2.9.0"; + version = "2.10.0"; }; icalendar-recurrence = { - dependencies = ["icalendar" "ice_cube"]; + dependencies = ["icalendar" "ice_cube" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06li3cdbwkd9y2sadjlbwj54blqdaa056yx338s4ddfxywrngigh"; + sha256 = "01226l14p9wys5vla2l36a51cjffp96i4dk01frffd042qjgmf2x"; type = "gem"; }; - version = "1.1.3"; + version = "1.2.0"; }; ice_cube = { groups = ["default"]; @@ -1130,7 +1206,7 @@ version = "1.5.0"; }; interception = { - groups = ["default" "development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1139,6 +1215,16 @@ }; version = "0.5"; }; + jmespath = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393"; + type = "gem"; + }; + version = "1.6.2"; + }; json = { groups = ["default" "development" "test"]; platforms = []; @@ -1159,6 +1245,19 @@ }; version = "2.3.0"; }; + keycloak-admin = { + dependencies = ["httparty"]; + groups = ["development" "test"]; + platforms = []; + source = { + fetchSubmodules = false; + rev = "037ac274541d513f3edc3df74bc684ff23ecc473"; + sha256 = "068gd98ii6jflnwk9nky71m0vl9jqmxb5fx1nmdphp917drn98c1"; + type = "git"; + url = "https://github.com/tschaefer/ruby-keycloak-admin/"; + }; + version = "22.0.4"; + }; koala = { dependencies = ["addressable" "faraday" "faraday-multipart" "json" "rexml"]; groups = ["default"]; @@ -1332,20 +1431,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq"; + sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; type = "gem"; }; - version = "2.8.4"; + version = "2.8.5"; }; minitest = { groups = ["assets" "default" "development" "nulldb" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jnpsbb2dbcs95p4is4431l2pw1l5pn7dfg3vkgb4ga464j0c5l6"; + sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; type = "gem"; }; - version = "5.19.0"; + version = "5.20.0"; }; minitest-profile = { groups = ["development" "test"]; @@ -1378,7 +1477,7 @@ version = "1.15.0"; }; multi_xml = { - groups = ["default"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1444,10 +1543,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y55ib1v2b8prqfi9ij7hca60b1j94s2bzr6vskwi3i5735472wq"; + sha256 = "0mzifz1c5clhncp0baaqlmybijafbw6j2kknr25h0r1wrrin2ynq"; type = "gem"; }; - version = "0.3.2"; + version = "0.4.0"; }; net-imap = { dependencies = ["date" "net-protocol"]; @@ -1519,10 +1618,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k9w2z0953mnjrsji74cshqqp08q7m1r6zhadw1w0g34xzjh3a74"; + sha256 = "004ip9x9281fxhpipwi8di1sb1dnabscq9dy1p3cxgdwbniqqi12"; type = "gem"; }; - version = "1.15.4"; + version = "1.15.5"; }; nori = { groups = ["default"]; @@ -1717,10 +1816,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c649921vg2l939z5cc3jwd8p1v49099pdhxfk7sb9qqx5wi5873"; + sha256 = "054d6ybgjdzxw567m7rbnd46yp6gkdbc5ihr536vxd3p15vbhjrw"; type = "gem"; }; - version = "3.1.0"; + version = "3.2.0"; }; openssl-signature_algorithm = { dependencies = ["openssl"]; @@ -1760,10 +1859,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1swigds85jddb5gshll1g8lkmbcgbcp9bi1d4nigwvxki8smys0h"; + sha256 = "0r69dbh6h6j4d54isany2ir4ni4gf2ysvk3k44awi6amz18nggpd"; type = "gem"; }; - version = "3.2.2.3"; + version = "3.2.2.4"; }; pg = { groups = ["postgres"]; @@ -1808,7 +1907,7 @@ }; pry = { dependencies = ["coderay" "method_source"]; - groups = ["default" "development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1817,9 +1916,31 @@ }; version = "0.14.2"; }; + pry-byebug = { + dependencies = ["byebug" "pry"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y41al94ks07166qbp2200yzyr5y60hm7xaiw4lxpgsm4b1pbyf8"; + type = "gem"; + }; + version = "3.10.1"; + }; + pry-doc = { + dependencies = ["pry" "yard"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pp43n69p6bjvc640wgcz295w1q2v9awcqgbwcqn082dbvq5xvnx"; + type = "gem"; + }; + version = "1.4.0"; + }; pry-rails = { dependencies = ["pry"]; - groups = ["development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1830,7 +1951,7 @@ }; pry-remote = { dependencies = ["pry" "slop"]; - groups = ["development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1841,7 +1962,7 @@ }; pry-rescue = { dependencies = ["interception" "pry"]; - groups = ["development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1852,7 +1973,7 @@ }; pry-stack_explorer = { dependencies = ["binding_of_caller" "pry"]; - groups = ["development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1861,6 +1982,17 @@ }; version = "0.6.1"; }; + pry-theme = { + dependencies = ["coderay"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qhs1qmv6zhl45zhpv5qj6vkwm0nkdc37dqd49fwl8ph6f0sfh8h"; + type = "gem"; + }; + version = "1.3.1"; + }; public_suffix = { groups = ["default" "development" "test"]; platforms = []; @@ -1877,10 +2009,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x4dwx2shx0p7lsms97r85r7ji7zv57bjy3i1kmcpxc8bxvrr67c"; + sha256 = "1y8jcw80zcxvdq0id329lzmp5pzx7hpac227d7sgjkblc89s3pfm"; type = "gem"; }; - version = "6.3.1"; + version = "6.4.0"; }; pundit = { dependencies = ["activesupport"]; @@ -1909,10 +2041,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g"; + sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; type = "gem"; }; - version = "1.7.1"; + version = "1.7.3"; }; rack = { groups = ["assets" "default" "development" "test"]; @@ -1952,10 +2084,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a62439xwn5v6hsl9s11hdk4wj58czhcbg7lminv23mnkc0ca147"; + sha256 = "12jw7401j543fj8cc83lmw72d8k6bxvkp9rvbifi88hh01blnsj4"; type = "gem"; }; - version = "0.7.6"; + version = "0.7.7"; }; rack-test = { dependencies = ["rack"]; @@ -1969,15 +2101,15 @@ version = "2.1.0"; }; rails = { - dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; + dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gf5dqabzd0mf0q39a07kf0smdm2cv2z5swl3zr4cz50yb85zz3l"; + sha256 = "0rsqin156dawz7gzpy1ijs02afqcr4704vqj56s6yxng3a9ayhwf"; type = "gem"; }; - version = "6.1.7.6"; + version = "7.0.8"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2013,15 +2145,15 @@ version = "1.6.0"; }; railties = { - dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; + dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor" "zeitwerk"]; groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vq4ahyg9hraixxmmwwypdnpcylpvznvdxhj4xa23xk45wzbl3h7"; + sha256 = "0sfc16zrcn4jgf5xczb08n6prhmqqgg9f0b4mn73zlzg6cwmqchj"; type = "gem"; }; - version = "6.1.7.6"; + version = "7.0.8"; }; rainbow = { groups = ["default" "development" "test"]; @@ -2089,10 +2221,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "136br91alxdwh1s85z912dwz23qlhm212vy6i3wkinz3z8mkxxl3"; + sha256 = "1d9a5s3qrjdy50ll2s32gg3qmf10ryp3v2nr5k718kvfadp50ray"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.2"; }; rexml = { groups = ["default" "development" "test"]; @@ -2109,10 +2241,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10mmzc85y7andsich586ndykw678qn1ns2wpjxrg0sc0gr4w3pig"; + sha256 = "0m48hv6wpmmm6cjr6q92q78h1i610riml19k5h1dil2yws3h1m3m"; type = "gem"; }; - version = "6.2.2"; + version = "6.3.0"; }; rspec-core = { dependencies = ["rspec-support"]; @@ -2190,15 +2322,15 @@ version = "1.3.0"; }; rubocop = { - dependencies = ["base64" "json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n5d0n5yczh9d1xbqy07hs3vamq3683zc9jg0zg2n5jz8n7jwmah"; + sha256 = "06qnp5zs233j4f59yyqrg8al6hr9n4a7vcdg3p31v0np8bz9srwg"; type = "gem"; }; - version = "1.56.1"; + version = "1.57.2"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2206,10 +2338,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "188bs225kkhrb17dsf3likdahs2p1i1sqn0pr3pvlx50g6r2mnni"; + sha256 = "1cs9cc5p9q70valk4na3lki4xs88b52486p2v46yx3q1n5969bgs"; type = "gem"; }; - version = "1.29.0"; + version = "1.30.0"; }; rubocop-capybara = { dependencies = ["rubocop"]; @@ -2217,10 +2349,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01fn05a87g009ch1sh00abdmgjab87i995msap26vxq1a5smdck6"; + sha256 = "1jwwi5a05947q9zsk6i599zxn657hdphbmmbbpx17qsv307rwcps"; type = "gem"; }; - version = "2.18.0"; + version = "2.19.0"; }; rubocop-factory_bot = { dependencies = ["rubocop"]; @@ -2228,10 +2360,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kqchl8f67k2g56sq2h1sm2wb6br5gi47s877hlz94g5086f77n1"; + sha256 = "1y79flwjwlaslyhfpg84di9n756ir6bm52n964620xsj658d661h"; type = "gem"; }; - version = "2.23.1"; + version = "2.24.0"; }; rubocop-faker = { dependencies = ["faker" "rubocop"]; @@ -2272,21 +2404,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v3a2g3wk3aqa0k0zzla10qkxlc625zkj3yf4zcsybs86r5bm4xn"; + sha256 = "1pzsrnjmrachdjxzl9jpw47cydicn3408vgdg3a4bss4v5r42rjj"; type = "gem"; }; - version = "1.19.0"; + version = "1.19.1"; }; rubocop-rails = { - dependencies = ["activesupport" "rack" "rubocop"]; + dependencies = ["activesupport" "rack" "rubocop" "rubocop-ast"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05r46ds0dm44fb4p67hbz721zck8mdwblzssz2y25yh075hvs36j"; + sha256 = "0ym0h2w97b8c2h6zl44m22lzg253qkmim0ali32aiy58ddvbj0mm"; type = "gem"; }; - version = "2.20.2"; + version = "2.22.2"; }; rubocop-rspec = { dependencies = ["rubocop" "rubocop-capybara" "rubocop-factory_bot"]; @@ -2294,10 +2426,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ylwy4afnxhbrvlaf8an9nrizj78axnzggiyfcp8v531cv8six5f"; + sha256 = "1wwrgcigdrrlgg4nwbl18qfyjks519kqbbly5adrdffvh428lgq8"; type = "gem"; }; - version = "2.23.2"; + version = "2.25.0"; }; ruby-progressbar = { groups = ["default" "development" "test"]; @@ -2389,10 +2521,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ws0mh230l1pvyxcrlcr48w01alfhprjs1jbd8yrn463drsr2yac"; + sha256 = "15r2sl3c7jm6b8jghiqic9s7nhkp7iss66c5gqdqzyad7j44w4rn"; type = "gem"; }; - version = "4.11.0"; + version = "4.15.0"; }; shoulda-matchers = { dependencies = ["activesupport"]; @@ -2452,13 +2584,13 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mf62j2z6djz7lbqawp1biziyy40sv5k1q29i4mvwza79652dlkf"; + sha256 = "13vmrak47ygwxmfq8abl3sj2hbkgmn3m28bgich3qs7g0m6cqjhs"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; slop = { - groups = ["default" "development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -2505,10 +2637,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hg3zfn6p4ahp6mybk6ylr169f4mf4sl7lljylf5gljazs1yngf3"; + sha256 = "0fq1dxyc34fzyi9ivjb4wb3b4cs5pjh1cl44jn7rbzb8qdg6hp3p"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.0"; }; telegram-bot-ruby = { dependencies = ["dry-struct" "faraday" "faraday-multipart" "zeitwerk"]; @@ -2537,10 +2669,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ja8pz7dfj0g7a6smz3wbc6imdmmf07ka83qhkv2xdfd73c9p4d9"; + sha256 = "18alcxm37jh7lrr5hmp9s85n9wm57rccf8f1ifxv3hwq9k7gqba6"; type = "gem"; }; - version = "1.1.17"; + version = "1.1.19"; }; test-unit = { dependencies = ["power_assert"]; @@ -2558,10 +2690,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; + sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s"; type = "gem"; }; - version = "1.2.2"; + version = "1.3.0"; }; thread_safe = { groups = ["default"]; @@ -2589,10 +2721,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13pzdsgf3v06mymzipcpa7p80shyw328ybn775nzpnhc6n8y9g30"; + sha256 = "0c15v19hyxjcfzaviqlwhgajgyrrlb0pjilza6mkv49bhspy6av6"; type = "gem"; }; - version = "0.2.2"; + version = "0.3.0"; }; timeout = { groups = ["default"]; @@ -2621,10 +2753,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "174asqbk2fwr2kck3rwww0q5lnj8z17mnkhzzyq81k18n781xhw5"; + sha256 = "1kxp3rn2lk36qbcl3yin5c5ih295w8wns7c8nyr9cpfszy6hg0jg"; type = "gem"; }; - version = "6.5.0"; + version = "6.8.2"; }; twitter = { dependencies = ["addressable" "buftok" "equalizer" "http" "http-form_data" "http_parser.rb" "memoizable" "multipart-post" "naught" "simple_oauth"]; @@ -2685,20 +2817,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a"; + sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; type = "gem"; }; - version = "2.4.2"; + version = "2.5.0"; }; uri = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fa49cdssxllj1j37a56kq27wsibx5lmqxkqdk1rz3452y0bsydy"; + sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96"; type = "gem"; }; - version = "0.12.2"; + version = "0.13.0"; }; vcr = { groups = ["development" "test"]; @@ -2737,10 +2869,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q7qbi3npw47xza8spvd8ni0x0ahjb6lkd12y9a4pqppxn555v5q"; + sha256 = "1k4bllg0zpmpkjfmk1gybc2ygca4v40l2fmlplf9h0jqwniqa3mr"; type = "gem"; }; - version = "3.0.15"; + version = "3.0.17"; }; vite_ruby = { dependencies = ["dry-cli" "rack-proxy" "zeitwerk"]; @@ -2770,20 +2902,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05134klki4zln7dfa2w0hpsj8nkvw99bdhqkbsrr0yjirhxak724"; + sha256 = "0vfispr7wd2p1fs9ckn1qnby1yyp4i1dl7qz8n482iw977iyxrza"; type = "gem"; }; - version = "3.19.0"; + version = "3.19.1"; }; websocket = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dib6p55sl606qb4vpwrvj5wh881kk4aqn2zpfapf8ckx7g14jw8"; + sha256 = "1a4zc8d0d91c3xqwapda3j3zgpfwdbj76hkb69xn6qvfkfks9h9c"; type = "gem"; }; - version = "1.2.9"; + version = "1.2.10"; }; websocket-driver = { dependencies = ["websocket-extensions"]; @@ -2828,15 +2960,25 @@ }; version = "3.2.0"; }; - zeitwerk = { - groups = ["assets" "default" "development" "nulldb" "test"]; + yard = { + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mwdd445w63khz13hpv17m2br5xngyjl3jdj08xizjbm78i2zrxd"; + sha256 = "013yrnwx1zhzhn1fnc19zck22a1qgimsaglp2iwgf5bz9l8h93js"; type = "gem"; }; - version = "2.6.11"; + version = "0.9.34"; + }; + zeitwerk = { + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gir0if4nryl1jhwi28669gjwhxb7gzrm1fcc8xzsch3bnbi47jn"; + type = "gem"; + }; + version = "2.6.12"; }; zendesk_api = { dependencies = ["faraday" "faraday-multipart" "hashie" "inflection" "mini_mime" "multipart-post"]; diff --git a/pkgs/applications/networking/misc/zammad/package.json b/pkgs/applications/networking/misc/zammad/package.json index 98c898d90594..d4d983d1eda8 100644 --- a/pkgs/applications/networking/misc/zammad/package.json +++ b/pkgs/applications/networking/misc/zammad/package.json @@ -15,132 +15,133 @@ "test:ci:ct": "CI=true yarn --cwd ./.cypress cypress run --component --project ../ --config-file .cypress/cypress.config.mjs --browser electron", "cypress:snapshots": "sh .cypress/visual-regression/snapshots.sh", "cypress:install": "yarn --cwd ./.cypress install", - "postinstall": "node script/fix-node-modules.mjs", "story": "histoire dev", "story:build": "HISTOIRE_BUILD=1 histoire build" }, "engines": { - "node": ">=16" + "node": ">=18" }, - "packageManager": "yarn@1.22.19", + "packageManager": "yarn@1.22.21", "devDependencies": { - "@faker-js/faker": "^8.0.2", + "@faker-js/faker": "^8.3.1", "@graphql-codegen/cli": "^5.0.0", "@graphql-codegen/introspection": "^4.0.0", - "@graphql-codegen/near-operation-file-preset": "^2.5.0", + "@graphql-codegen/near-operation-file-preset": "^3.0.0", "@graphql-codegen/typescript": "^4.0.1", "@graphql-codegen/typescript-operations": "^4.0.1", - "@graphql-codegen/typescript-vue-apollo": "^3.3.7", - "@histoire/plugin-vue": "^0.17.1", + "@graphql-codegen/typescript-vue-apollo": "^4.1.0", + "@histoire/plugin-vue": "^0.17.5", "@pinia/testing": "^0.1.3", - "@testing-library/jest-dom": "^5.17.0", - "@testing-library/user-event": "^14.4.3", + "@testing-library/jest-dom": "^6.1.4", + "@testing-library/user-event": "^14.5.1", "@testing-library/vue": "^7.0.0", - "@types/lodash-es": "^4.17.8", - "@types/rails__actioncable": "^6.1.6", - "@types/ua-parser-js": "^0.7.36", - "@types/uuid": "^9.0.2", - "@typescript-eslint/eslint-plugin": "^5.62.0", - "@typescript-eslint/parser": "^5.62.0", - "@vitejs/plugin-vue": "^4.2.3", + "@types/lodash-es": "^4.17.11", + "@types/rails__actioncable": "^6.1.9", + "@types/sinonjs__fake-timers": "^8.1.5", + "@types/ua-parser-js": "^0.7.39", + "@types/uuid": "^9.0.7", + "@typescript-eslint/eslint-plugin": "^6.10.0", + "@typescript-eslint/parser": "^6.10.0", + "@vitejs/plugin-vue": "^4.5.0", "@vue/eslint-config-prettier": "^8.0.0", - "@vue/eslint-config-typescript": "^11.0.3", - "@vue/test-utils": "^2.4.1", - "autoprefixer": "^10.4.15", - "eslint": "^8.45.0", + "@vue/eslint-config-typescript": "^12.0.0", + "@vue/test-utils": "^2.4.2", + "autoprefixer": "^10.4.16", + "eslint": "^8.54.0", "eslint-config-airbnb-base": "^15.0.0", - "eslint-config-prettier": "^8.8.0", + "eslint-config-prettier": "^9.0.0", "eslint-import-resolver-alias": "^1.1.2", - "eslint-import-resolver-typescript": "^3.5.5", - "eslint-plugin-import": "^2.27.5", - "eslint-plugin-prettier": "^5.0.0", - "eslint-plugin-prettier-vue": "^4.2.0", + "eslint-import-resolver-typescript": "^3.6.1", + "eslint-plugin-import": "^2.29.0", + "eslint-plugin-prettier": "^5.0.1", + "eslint-plugin-prettier-vue": "^5.0.0", "eslint-plugin-security": "^1.7.1", - "eslint-plugin-sonarjs": "^0.19.0", - "eslint-plugin-vue": "^9.15.1", + "eslint-plugin-sonarjs": "^0.23.0", + "eslint-plugin-vue": "^9.18.1", "eslint-plugin-zammad": "file:.eslint-plugin-zammad", - "histoire": "^0.17.0", + "histoire": "^0.17.5", "jsdom": "^22.1.0", "mock-apollo-client": "^1.2.1", - "postcss": "^8.4.28", + "postcss": "^8.4.31", "postcss-html": "^1.5.0", - "prettier": "3.0.2", - "prettier-plugin-tailwindcss": "^0.5.3", + "prettier": "3.1.0", + "prettier-plugin-tailwindcss": "^0.5.7", "regenerator-runtime": "^0.14.0", - "sass": "^1.65.1", - "stylelint": "^15.10.3", + "sass": "^1.69.5", + "stylelint": "^15.11.0", "stylelint-config-prettier": "^9.0.5", "stylelint-config-recommended-vue": "^1.5.0", "stylelint-config-standard": "^34.0.0", - "stylelint-config-standard-scss": "^10.0.0", + "stylelint-config-standard-scss": "^11.1.0", "stylelint-prettier": "^4.0.2", - "stylelint-scss": "^5.1.0", + "stylelint-scss": "^5.3.1", "svg-baker": "^1.7.0", - "svgo": "^3.0.2", - "tailwindcss": "^3.3.3", + "svgo": "^3.0.4", + "tailwindcss": "^3.3.5", "timezone-mock": "^1.3.6", - "type-fest": "^3.13.1", - "typescript": "^5.1.6", - "vite": "^4.4.9", - "vite-plugin-pwa": "^0.16.4", + "type-fest": "^4.8.1", + "typescript": "^5.2.2", + "vite": "^4.5.0", + "vite-plugin-pwa": "^0.17.0", "vite-plugin-ruby": "^3.2.2", - "vitest": "^0.34.3", + "vitest": "^0.34.6", "vitest-axe": "^0.1.0", - "vue-tsc": "^1.8.8" + "vue-tsc": "^1.8.22" }, "dependencies": { - "@apollo/client": "^3.7.17", - "@formkit/core": "^0.17.4", - "@formkit/dev": "^0.17.4", - "@formkit/i18n": "^0.17.4", - "@formkit/inputs": "^0.17.4", - "@formkit/rules": "^0.17.4", - "@formkit/tailwindcss": "^0.17.4", - "@formkit/themes": "^0.17.4", - "@formkit/utils": "^0.17.4", - "@formkit/validation": "^0.17.4", - "@formkit/vue": "^0.17.4", + "@apollo/client": "^3.8.7", + "@formkit/core": "^1.2.2", + "@formkit/dev": "^1.2.2", + "@formkit/i18n": "^1.2.2", + "@formkit/inputs": "^1.2.2", + "@formkit/rules": "^1.2.2", + "@formkit/tailwindcss": "^1.2.2", + "@formkit/themes": "^1.2.2", + "@formkit/utils": "^1.2.2", + "@formkit/validation": "^1.2.2", + "@formkit/vue": "^1.2.2", "@github/webauthn-json": "^2.1.1", - "@rails/actioncable": "6.1.7", - "@tiptap/core": "^2.0.4", - "@tiptap/extension-blockquote": "^2.0.4", - "@tiptap/extension-character-count": "^2.0.4", - "@tiptap/extension-hard-break": "^2.0.4", - "@tiptap/extension-image": "^2.0.4", - "@tiptap/extension-link": "^2.0.4", - "@tiptap/extension-list-item": "^2.0.4", - "@tiptap/extension-mention": "^2.0.4", - "@tiptap/extension-ordered-list": "^2.0.4", - "@tiptap/extension-paragraph": "^2.0.4", - "@tiptap/extension-strike": "^2.0.4", - "@tiptap/extension-underline": "^2.0.4", - "@tiptap/pm": "^2.0.4", - "@tiptap/starter-kit": "^2.0.4", - "@tiptap/suggestion": "^2.0.4", - "@tiptap/vue-3": "^2.0.4", - "@vue/apollo-composable": "4.0.0-beta.5", - "@vueuse/core": "^10.4.0", - "@vueuse/router": "^10.4.0", - "@vueuse/shared": "^10.4.0", + "@rails/actioncable": "^7.0.8", + "@sinonjs/fake-timers": "^11.2.2", + "@tiptap/core": "^2.1.12", + "@tiptap/extension-blockquote": "^2.1.12", + "@tiptap/extension-character-count": "^2.1.12", + "@tiptap/extension-hard-break": "^2.1.12", + "@tiptap/extension-image": "^2.1.12", + "@tiptap/extension-link": "^2.1.12", + "@tiptap/extension-list-item": "^2.1.12", + "@tiptap/extension-mention": "^2.1.12", + "@tiptap/extension-ordered-list": "^2.1.12", + "@tiptap/extension-paragraph": "^2.1.12", + "@tiptap/extension-strike": "^2.1.12", + "@tiptap/extension-underline": "^2.1.12", + "@tiptap/pm": "^2.1.12", + "@tiptap/starter-kit": "^2.1.12", + "@tiptap/suggestion": "^2.1.12", + "@tiptap/vue-3": "^2.1.12", + "@vue/apollo-composable": "^4.0.0-beta.11", + "@vueuse/core": "^10.6.1", + "@vueuse/router": "^10.6.1", + "@vueuse/shared": "^10.6.1", "async-mutex": "^0.4.0", "flatpickr": "^4.6.13", - "graphql": "^16.7.1", - "graphql-ruby-client": "^1.11.8", + "graphql": "^16.8.1", + "graphql-ruby-client": "^1.11.10", "graphql-tag": "^2.12.6", - "linkify-string": "^4.1.1", - "linkifyjs": "^4.1.1", + "linkify-string": "^4.1.2", + "linkifyjs": "^4.1.2", "lodash-es": "^4.17.21", "loglevel": "^1.8.1", "mitt": "^3.0.1", - "pinia": "^2.1.6", + "pinia": "^2.1.7", "tippy.js": "^6.3.7", "tiptap-text-direction": "^0.3.0", - "ua-parser-js": "^1.0.35", - "uuid": "^9.0.0", - "vue": "^3.3.4", + "ua-parser-js": "^1.0.37", + "uuid": "^9.0.1", + "vue": "^3.3.8", "vue-advanced-cropper": "^2.8.8", "vue-easy-lightbox": "1.16.0", - "vue-router": "^4.2.4", + "vue-router": "^4.2.5", "vue3-draggable-resizable": "^1.6.5", "vuedraggable": "^4.1.0", "workbox-core": "^7.0.0", @@ -149,9 +150,9 @@ }, "resolutions": { "loader-utils": "^3.2.1", - "postcss": "^8.4.28", + "postcss": "^8.4.31", "stylelint-config-recommended": "^13.0.0" }, "name": "Zammad", - "version": "6.1.0" + "version": "6.2.0" } diff --git a/pkgs/applications/networking/misc/zammad/source.json b/pkgs/applications/networking/misc/zammad/source.json index 39b17e82847a..636ce43a2ecc 100644 --- a/pkgs/applications/networking/misc/zammad/source.json +++ b/pkgs/applications/networking/misc/zammad/source.json @@ -1,8 +1,8 @@ { "owner": "zammad", "repo": "zammad", - "rev": "ec4ddb8ae6a55d1c8e64ab5ddda9ff3e9d4f45c8", - "hash": "sha256-+AphZ0pKlXFdcncnDxeLdDL3OH2dyF0nb69+/W2dLgc=", + "rev": "6c358ca90cf7f7581aede5c45d10ac3f2e25bc52", + "hash": "sha256-kZss5A5tgKnsANt34kk5J+824ghJoVIWXFNlb+ZkZ2Y=", "fetchSubmodules": true } From f718012d9226547766f6d4fc45712d89fe06de8a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 14 Dec 2023 17:32:55 +0100 Subject: [PATCH 16/35] nixos/nextcloud: updates for nc28 * Always use PHP 8.2: at the time of writing, Nextcloud also suggests to use 8.2 rather than 8.3 in the manual for v28. One contributing factor is probably that all plugins need new releases to declare PHP 8.3 support. * Fix upgradeWarning for installing v27 now that v28 is out. * Drop upgrade warning for v24. This one is EOL for quite a while already, so right now everybody should've switched (or carefully studied the release notes in case they were upgrading from <23.05) and we can clean up the module a little bit. v25 was dropped not so long ago, so if it's still referenced (because somebody didn't declare `services.nextcloud.package` and has `system.stateVersion = "22.11";`) it's appropriate to still give a specialized error. --- nixos/modules/services/web-apps/nextcloud.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 7c78abd087ed..2a3db4cd13f9 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -702,7 +702,7 @@ in { ++ (optional (versionOlder cfg.package.version "25") (upgradeWarning 24 "22.11")) ++ (optional (versionOlder cfg.package.version "26") (upgradeWarning 25 "23.05")) ++ (optional (versionOlder cfg.package.version "27") (upgradeWarning 26 "23.11")) - ++ (optional (versionOlder cfg.package.version "28") (upgradeWarning 26 "24.05")); + ++ (optional (versionOlder cfg.package.version "28") (upgradeWarning 27 "24.05")); services.nextcloud.package = with pkgs; mkDefault ( @@ -712,16 +712,13 @@ in { nextcloud defined in an overlay, please set `services.nextcloud.package` to `pkgs.nextcloud`. '' - else if versionOlder stateVersion "22.11" then nextcloud24 else if versionOlder stateVersion "23.05" then nextcloud25 else if versionOlder stateVersion "23.11" then nextcloud26 else if versionOlder stateVersion "24.05" then nextcloud27 else nextcloud28 ); - services.nextcloud.phpPackage = - if versionOlder cfg.package.version "26" then pkgs.php81 - else pkgs.php82; + services.nextcloud.phpPackage = pkgs.php82; services.nextcloud.phpOptions = mkMerge [ (mapAttrs (const mkOptionDefault) defaultPHPSettings) From bec9edfd20fcd84243a8dffbe86b892574ee8314 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 14 Dec 2023 17:44:41 +0100 Subject: [PATCH 17/35] nixos/doc: mention nc28 --- nixos/doc/manual/release-notes/rl-2405.section.md | 6 ++++++ nixos/modules/services/web-apps/nextcloud.md | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 2e9cd781ffb1..3ea887bfee40 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -32,6 +32,12 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `mkosi` was updated to v19. Parts of the user interface have changed. Consult the [release notes](https://github.com/systemd/mkosi/releases/tag/v19) for a list of changes. +- The latest available version of Nextcloud is v28 (available as `pkgs.nextcloud28`). The installation logic is as follows: + - If [`services.nextcloud.package`](#opt-services.nextcloud.package) is specified explicitly, this package will be installed (**recommended**) + - If [`system.stateVersion`](#opt-system.stateVersion) is >=24.05, `pkgs.nextcloud28` will be installed by default. + - If [`system.stateVersion`](#opt-system.stateVersion) is >=23.11, `pkgs.nextcloud27` will be installed by default. + - Please note that an upgrade from v26 (or older) to v28 directly is not possible. Please upgrade to `nextcloud27` (or earlier) first. Nextcloud prohibits skipping major versions while upgrading. You can upgrade by declaring [`services.nextcloud.package = pkgs.nextcloud27;`](options.html#opt-services.nextcloud.package). + - `services.avahi.nssmdns` got split into `services.avahi.nssmdns4` and `services.avahi.nssmdns6` which enable the mDNS NSS switch for IPv4 and IPv6 respectively. Since most mDNS responders only register IPv4 addresses, most users want to keep the IPv6 support disabled to avoid long timeouts. diff --git a/nixos/modules/services/web-apps/nextcloud.md b/nixos/modules/services/web-apps/nextcloud.md index ecc7f380592a..b10fd566abb3 100644 --- a/nixos/modules/services/web-apps/nextcloud.md +++ b/nixos/modules/services/web-apps/nextcloud.md @@ -5,7 +5,7 @@ self-hostable cloud platform. The server setup can be automated using [services.nextcloud](#opt-services.nextcloud.enable). A desktop client is packaged at `pkgs.nextcloud-client`. -The current default by NixOS is `nextcloud27` which is also the latest +The current default by NixOS is `nextcloud28` which is also the latest major version available. ## Basic usage {#module-services-nextcloud-basic-usage} From 6fe98c3cc8617d43008dec60aa3b7cc921459688 Mon Sep 17 00:00:00 2001 From: netali Date: Thu, 14 Dec 2023 18:03:22 +0100 Subject: [PATCH 18/35] nixos/tests/zammad: set memory limit to 2048 MB It seems like Zammad and the postgreSQL need more then 1 GB memory after the update to Zammad 6.2.0. So this commit sets the memory limit to 2 GB. --- nixos/tests/zammad.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/tests/zammad.nix b/nixos/tests/zammad.nix index 1b2f24594699..faae1949e37b 100644 --- a/nixos/tests/zammad.nix +++ b/nixos/tests/zammad.nix @@ -7,6 +7,10 @@ import ./make-test-python.nix ( meta.maintainers = with lib.maintainers; [ taeer n0emis netali ]; nodes.machine = { config, ... }: { + virtualisation = { + memorySize = 2048; + }; + services.zammad.enable = true; services.zammad.secretKeyBaseFile = pkgs.writeText "secret" '' 52882ef142066e09ab99ce816ba72522e789505caba224a52d750ec7dc872c2c371b2fd19f16b25dfbdd435a4dd46cb3df9f82eb63fafad715056bdfe25740d6 From e6751379bcaa6f425fa30b77faf6ffac8f615f64 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 14 Dec 2023 18:12:43 +0100 Subject: [PATCH 19/35] nextcloud28Packages.bookmarks: 13.1.1 -> 13.1.2 Fixes Could not resolve symfonyAdapter! Class "symfonyAdapter" does not exist when accessing the app. --- pkgs/servers/nextcloud/packages/28.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/28.json b/pkgs/servers/nextcloud/packages/28.json index afc2ed230194..e3c12fcd7ffe 100644 --- a/pkgs/servers/nextcloud/packages/28.json +++ b/pkgs/servers/nextcloud/packages/28.json @@ -1,8 +1,8 @@ { "bookmarks": { - "sha256": "14dkyqm04d4ix114jbcgbx10zvkv4qlx4n56chpqz0w1y7x8idpd", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.1/bookmarks-13.1.1.tar.gz", - "version": "13.1.1", + "sha256": "04yngkmsjq6zj5qih86ybfr2cybqsz3gb5dasm6yhmkvd1ar5s39", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.2/bookmarks-13.1.2.tar.gz", + "version": "13.1.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": [ From fe446f8bb4aca0c63fca176dfa2e7be75c5ae360 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 14 Dec 2023 18:53:01 +0200 Subject: [PATCH 20/35] nixos/udev: allow /bin/sh in udev rules Using `/bin/sh` in udev rules is fine (as it's guaranteed to point to a (bash) shell on NixOS), and actually is better than hardcoding absolute paths, at least in cases where these rules are also added to the (systemd-based) initrd (via boot.initrd.services.udev.rules). To allow this, we need to update the check routine that assembles the list of files needing fixup, to explicitly exclude `/bin/sh` occurences. To do this, we convert the pattern to a PCRE regex (which requires "/" to be escaped), and add `(?!/bin/sh\b)` as a negative lookahead. This subsequently allows udev rules to (start using) `/bin/sh` again, so they'll work in-initrd. --- nixos/modules/services/hardware/udev.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 311f60795bae..670b9087f110 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -112,7 +112,8 @@ let echo "OK" filesToFixup="$(for i in "$out"/*; do - grep -l '\B\(/usr\)\?/s\?bin' "$i" || : + # list all files referring to (/usr)/bin paths, but allow references to /bin/sh. + grep -P -l '\B(?!\/bin\/sh\b)(\/usr)?\/bin(?:\/.*)?' "$i" || : done)" if [ -n "$filesToFixup" ]; then From 74461420f9412c02dff402b7701e303ba852c4cf Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 14 Dec 2023 19:09:57 +0200 Subject: [PATCH 21/35] bcache-tools: don't patch path to /bin/sh This will make these udev rules not work in the systemd-based initrd, which only has /bin/sh. --- pkgs/tools/filesystems/bcache-tools/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index f6dfdd84d8c4..58f6a05992e9 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -35,10 +35,6 @@ stdenv.mkDerivation rec { "UDEVLIBDIR=${placeholder "out"}/lib/udev/" ]; - preBuild = '' - sed -e "s|/bin/sh|${bash}/bin/sh|" -i *.rules - ''; - preInstall = '' mkdir -p "$out/sbin" "$out/lib/udev/rules.d" "$out/share/man/man8" ''; From 5f6dbf8d6fe8a6a6f81487869ae52540b63bdf34 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 14 Dec 2023 19:30:00 +0100 Subject: [PATCH 22/35] hardened kernel: remove obsolete 4.14 section Already removed from our tree and nowhere exposed, so no need to keep it here. --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 1c626f18bb50..c10c3e8286ff 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,14 +1,4 @@ { - "4.14": { - "patch": { - "extra": "-hardened1", - "name": "linux-hardened-4.14.333-hardened1.patch", - "sha256": "18pz0g5k3iw6npsp6msyl33ci3jsnw6zv87pagz9scvzgxnsy68h", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.333-hardened1/linux-hardened-4.14.333-hardened1.patch" - }, - "sha256": "0j5nrankrhi56qzmyjg1pznqx1zgk5f7cfa154smjbn3zlm7lcv6", - "version": "4.14.333" - }, "4.19": { "patch": { "extra": "-hardened1", From aa19ae19c9ba88ab3255ca6556b33f602aa85433 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 14 Dec 2023 19:30:51 +0100 Subject: [PATCH 23/35] nixos/tests/kernel-generic: test hardened 6.6 --- nixos/tests/kernel-generic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 352deb521a47..72d31246b75d 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -31,6 +31,7 @@ let linux_5_15_hardened linux_6_1_hardened linux_6_5_hardened + linux_6_6_hardened linux_rt_5_4 linux_rt_5_10 linux_rt_5_15 From 09ef2dce6a1e38be7e1f8b145cf18f1b8fdced6f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 14 Dec 2023 21:03:54 +0100 Subject: [PATCH 24/35] python311Packages.teslajsonpy: 3.9.7 -> 3.9.9 Diff: https://github.com/zabuldon/teslajsonpy/compare/refs/tags/v3.9.7...v3.9.9 Changelog: https://github.com/zabuldon/teslajsonpy/releases/tag/v3.9.9 --- pkgs/development/python-modules/teslajsonpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index fe840bcd4e2c..0c2b87bade1c 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.9.7"; + version = "3.9.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-A59b7qr9Y4LuIwP51ci7k1019/T+qNcDYPDNCkmqpi4="; + hash = "sha256-9ySUgRz1Zp0tkHCEkDcygm97mji4mjA5ltrriP9zAiQ="; }; nativeBuildInputs = [ From 64daf50ff3a7e5294ccd483a7bb44d1afa5a1e89 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 15 Dec 2023 06:30:34 +0100 Subject: [PATCH 25/35] ocamlPackages.httpaf: add missing dependency --- pkgs/development/ocaml-modules/httpaf/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/httpaf/default.nix b/pkgs/development/ocaml-modules/httpaf/default.nix index f262d51ee7dc..6dce28fb2020 100644 --- a/pkgs/development/ocaml-modules/httpaf/default.nix +++ b/pkgs/development/ocaml-modules/httpaf/default.nix @@ -1,12 +1,11 @@ { lib, fetchFromGitHub, fetchpatch, buildDunePackage -, angstrom, faraday, alcotest +, angstrom, faraday, result, alcotest }: buildDunePackage rec { pname = "httpaf"; version = "0.7.1"; - duneVersion = "3"; minimalOCamlVersion = "4.08"; src = fetchFromGitHub { @@ -17,7 +16,7 @@ buildDunePackage rec { }; checkInputs = [ alcotest ]; - propagatedBuildInputs = [ angstrom faraday ]; + propagatedBuildInputs = [ angstrom faraday result ]; doCheck = true; meta = { From 9ed75988e2848ed09b23c56bf151b055e32a5ab4 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 15 Dec 2023 06:30:42 +0100 Subject: [PATCH 26/35] =?UTF-8?q?ocamlPackages.angstrom:=200.15.0=20?= =?UTF-8?q?=E2=86=92=200.16.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../development/ocaml-modules/angstrom-async/default.nix | 1 - .../ocaml-modules/angstrom-lwt-unix/default.nix | 2 -- pkgs/development/ocaml-modules/angstrom-unix/default.nix | 2 -- pkgs/development/ocaml-modules/angstrom/default.nix | 9 ++++----- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/angstrom-async/default.nix b/pkgs/development/ocaml-modules/angstrom-async/default.nix index ff390c1598bf..c603d1b21e57 100644 --- a/pkgs/development/ocaml-modules/angstrom-async/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-async/default.nix @@ -5,7 +5,6 @@ buildDunePackage rec { inherit (angstrom) version src; - duneVersion = "3"; minimalOCamlVersion = "4.04.1"; propagatedBuildInputs = [ angstrom async ]; diff --git a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix index 063f4c1f80c7..2742b8515de7 100644 --- a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix @@ -5,8 +5,6 @@ buildDunePackage rec { inherit (angstrom) version src; - duneVersion = "3"; - propagatedBuildInputs = [ angstrom lwt ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/angstrom-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-unix/default.nix index 752b6a48ced4..04c380320199 100644 --- a/pkgs/development/ocaml-modules/angstrom-unix/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-unix/default.nix @@ -5,8 +5,6 @@ buildDunePackage rec { inherit (angstrom) version src; - duneVersion = "3"; - propagatedBuildInputs = [ angstrom ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix index c4f5f98e4791..a96848fba08f 100644 --- a/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/pkgs/development/ocaml-modules/angstrom/default.nix @@ -1,9 +1,8 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, ocaml-syntax-shims, alcotest, result, bigstringaf, ppx_let, gitUpdater }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, ocaml-syntax-shims, alcotest, bigstringaf, ppx_let, gitUpdater }: buildDunePackage rec { pname = "angstrom"; - version = "0.15.0"; - duneVersion = "3"; + version = "0.16.0"; minimalOCamlVersion = "4.04"; @@ -11,12 +10,12 @@ buildDunePackage rec { owner = "inhabitedtype"; repo = pname; rev = version; - sha256 = "1hmrkdcdlkwy7rxhngf3cv3sa61cznnd9p5lmqhx20664gx2ibrh"; + hash = "sha256-vilGto5ciyKzVJd72z4B+AvM1nf3x3O7DHXrK5SIajQ="; }; checkInputs = [ alcotest ppx_let ]; buildInputs = [ ocaml-syntax-shims ]; - propagatedBuildInputs = [ bigstringaf result ]; + propagatedBuildInputs = [ bigstringaf ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; passthru.updateScript = gitUpdater { }; From 715d39b1b1ee6f43e4d98f55986104e87bf0c76b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Dec 2023 05:43:48 +0000 Subject: [PATCH 27/35] cargo-generate: 0.18.5 -> 0.19.0 --- pkgs/development/tools/rust/cargo-generate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index 4fb099b3c0b1..869a0c8bbbc3 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.18.5"; + version = "0.19.0"; src = fetchFromGitHub { owner = "cargo-generate"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "sha256-be0jgjhaboutT+c3rRyp6fjmv8nAkggkcqofWmH83Zc="; + sha256 = "sha256-OT2cjNYcEKk6Thnlq7SZvK2RJ6M1Zn62GrqpKbtrUdM="; }; - cargoHash = "sha256-Sset3+jRm6yOUkvLYxBHdFvVCYOq3bvix9b3pnt7AV8="; + cargoHash = "sha256-DAJsW3uKrSyIju7K13dMQFNOwE9WDuBuPx8imdPAxqk="; nativeBuildInputs = [ pkg-config ]; From 80b93fa3e8650079b6d3fb375fa18d751ae1e435 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Tue, 12 Dec 2023 19:23:00 -0600 Subject: [PATCH 28/35] gotools: 0.7.0 -> 0.16.1 --- pkgs/development/tools/gotools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 1a75619081f9..bbd77aedef7f 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gotools"; - version = "0.7.0"; + version = "0.16.1"; # using GitHub instead of https://go.googlesource.com/tools because Gitiles UI is to basic to browse src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "v${version}"; - sha256 = "sha256-z5XJ7tflOfDBtv4rp7WEjnHsXIyjNw205PhazEvaYcw="; + hash = "sha256-qFDi+d+2OuI+mMBceZiN+kJ0gPcfgXXRDrDDwqKeDOM="; }; postPatch = '' @@ -20,7 +20,7 @@ buildGoModule rec { rm -r cmd/getgo ''; - vendorHash = "sha256-fp0pb3EcGRDWlSpgel4pYRdsPJGk8/d57EjWJ+fzq7g="; + vendorHash = "sha256-oOBdh4mK3x9HbxD00EDKLjFgd/4NQRlQXrnCigGOwLg="; doCheck = false; From 7e3d3351522e0510917e52dd3657d663bf5efe71 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 15 Dec 2023 12:37:24 +0300 Subject: [PATCH 29/35] nixos/tests/containers-imperative: download more RAM --- nixos/tests/containers-imperative.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index 18bec1db78e8..fff00e4f73a8 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -13,6 +13,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { nix.settings.sandbox = false; nix.settings.substituters = []; # don't try to access cache.nixos.org + virtualisation.memorySize = 2048; virtualisation.writableStore = true; # Make sure we always have all the required dependencies for creating a # container available within the VM, because we don't have network access. From 1950eec4aa7bbae7097b7da5b72a04268b9a596b Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 15 Dec 2023 12:39:26 +0300 Subject: [PATCH 30/35] nixos/ldso: remove string context from linker soname Unbreaks installer tests that otherwise start depending on i686-glibc --- nixos/modules/config/ldso.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/ldso.nix b/nixos/modules/config/ldso.nix index e5ae13a21145..72ae3958d886 100644 --- a/nixos/modules/config/ldso.nix +++ b/nixos/modules/config/ldso.nix @@ -4,11 +4,11 @@ let inherit (lib) last splitString mkOption types mdDoc optionals; libDir = pkgs.stdenv.hostPlatform.libDir; - ldsoBasename = last (splitString "/" pkgs.stdenv.cc.bintools.dynamicLinker); + ldsoBasename = builtins.unsafeDiscardStringContext (last (splitString "/" pkgs.stdenv.cc.bintools.dynamicLinker)); pkgs32 = pkgs.pkgsi686Linux; libDir32 = pkgs32.stdenv.hostPlatform.libDir; - ldsoBasename32 = last (splitString "/" pkgs32.stdenv.cc.bintools.dynamicLinker); + ldsoBasename32 = builtins.unsafeDiscardStringContext (last (splitString "/" pkgs32.stdenv.cc.bintools.dynamicLinker)); in { options = { environment.ldso = mkOption { From cb37959f992f27388f16c8aae30d573446ab57d4 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Thu, 14 Dec 2023 16:00:38 +0100 Subject: [PATCH 31/35] miller: copy manpage to $man --- pkgs/tools/text/miller/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix index 3a4198fa630e..e2c5fac26f7d 100644 --- a/pkgs/tools/text/miller/default.nix +++ b/pkgs/tools/text/miller/default.nix @@ -11,8 +11,15 @@ buildGoModule rec { sha256 = "sha256-g2Jnqo3U9acyqohGpcEEogq871qJQTc7k0/oIawAQW8="; }; + outputs = [ "out" "man" ]; + vendorHash = "sha256-/1/FTQL3Ki8QzL+1J4Ah8kwiJyGPd024di/1MC8gtkE="; + postInstall = '' + mkdir -p $man/share/man/man1 + mv ./man/mlr.1 $man/share/man/man1 + ''; + subPackages = [ "cmd/mlr" ]; meta = with lib; { From db1680d1d644c71972fb110833f7f96096c61d7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Dec 2023 08:50:05 +0000 Subject: [PATCH 32/35] gh: 2.40.0 -> 2.40.1 --- pkgs/applications/version-management/gh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index ca8e1109a626..4b158250b9c4 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gh"; - version = "2.40.0"; + version = "2.40.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-ffmOyifoJPrrC9J4lZ7HWq+fww5/EOCYhYIfx6Been0="; + hash = "sha256-KdJZHouMTbbD/8k2VGFvRits7grbbVNUmCM6dSiJXBc="; }; vendorHash = "sha256-jM9nwTMOTh+eXztLvHIwwH4qu3ZIMOtBrPEtByB9Ry8="; From 8d8e2141f5a7bcba1192948c8128963659c7f53d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 14 Dec 2023 16:36:07 +0100 Subject: [PATCH 33/35] gpu-burn: unstabe-2021-04-29 -> unstable-2023-11-10 --- pkgs/applications/misc/gpu-burn/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/gpu-burn/default.nix b/pkgs/applications/misc/gpu-burn/default.nix index ad11b734762e..4d6abb585c30 100644 --- a/pkgs/applications/misc/gpu-burn/default.nix +++ b/pkgs/applications/misc/gpu-burn/default.nix @@ -1,20 +1,20 @@ { lib, stdenv, fetchFromGitHub, addOpenGLRunpath, cudatoolkit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gpu-burn"; - version = "unstable-2021-04-29"; + version = "unstable-2023-11-10"; src = fetchFromGitHub { owner = "wilicc"; repo = "gpu-burn"; - rev = "1e9a84f4bec3b0835c00daace45d79ed6c488edb"; - sha256 = "sha256-x+kta81Z08PsBgbf+fzRTXhNXUPBd5w8bST/T5nNiQA="; + rev = "b99aedce3e020d2ca419832ee27b7f29dfa6373e"; + sha256 = "sha256-cLO0GXvujZ+g64j+OY31n43MsVER3ljo8Qrt+EzSKjc="; }; postPatch = '' substituteInPlace gpu_burn-drv.cpp \ - --replace "const char *kernelFile = \"compare.ptx\";" \ - "const char *kernelFile = \"$out/share/compare.ptx\";" + --replace "#define COMPARE_KERNEL \"compare.ptx\"" \ + "#define COMPARE_KERNEL \"$out/share/compare.ptx\"" ''; buildInputs = [ cudatoolkit ]; From 1cf35039f5c110d794039e6d715aeb8997c6cfc5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 14 Dec 2023 20:03:42 +0100 Subject: [PATCH 34/35] cloud-hypervisor: 36.0 -> 37.0 --- .../cloud-hypervisor/Cargo.lock | 235 +++++++++++------- .../cloud-hypervisor/default.nix | 12 +- 2 files changed, 146 insertions(+), 101 deletions(-) diff --git a/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock b/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock index f40fbc0f4284..52afc0d15f83 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock +++ b/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock @@ -36,16 +36,15 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] @@ -75,9 +74,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.2" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -147,15 +146,15 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.5.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock", + "async-lock 3.2.0", "async-task", "concurrent-queue", - "fastrand 1.9.0", - "futures-lite", + "fastrand 2.0.0", + "futures-lite 2.1.0", "slab", ] @@ -165,10 +164,10 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" dependencies = [ - "async-lock", + "async-lock 2.7.0", "autocfg", "blocking", - "futures-lite", + "futures-lite 1.13.0", ] [[package]] @@ -177,15 +176,15 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", + "async-lock 2.7.0", "autocfg", "cfg-if", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "log", "parking", "polling", - "rustix 0.37.25", + "rustix 0.37.27", "slab", "socket2", "waker-fn", @@ -200,6 +199,17 @@ dependencies = [ "event-listener 2.5.3", ] +[[package]] +name = "async-lock" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +dependencies = [ + "event-listener 4.0.0", + "event-listener-strategy", + "pin-project-lite", +] + [[package]] name = "async-process" version = "1.8.0" @@ -207,21 +217,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf012553ce51eb7aa6dc2143804cc8252bd1cb681a1c5cb7fa94ca88682dee1d" dependencies = [ "async-io", - "async-lock", + "async-lock 2.7.0", "async-signal", "blocking", "cfg-if", "event-listener 3.0.0", - "futures-lite", + "futures-lite 1.13.0", "rustix 0.38.8", "windows-sys 0.48.0", ] [[package]] name = "async-recursion" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", @@ -235,7 +245,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c99f3cb3f9ff89f7d718fbb942c9eb91bedff12e396adf09a622dfe7ffec2bc2" dependencies = [ "async-io", - "async-lock", + "async-lock 2.7.0", "atomic-waker", "cfg-if", "concurrent-queue", @@ -249,9 +259,9 @@ dependencies = [ [[package]] name = "async-task" -version = "4.4.0" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" [[package]] name = "async-trait" @@ -361,11 +371,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" dependencies = [ "async-channel", - "async-lock", + "async-lock 2.7.0", "async-task", "atomic-waker", "fastrand 1.9.0", - "futures-lite", + "futures-lite 1.13.0", "log", ] @@ -398,36 +408,35 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.3.11" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d" +checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.3.11" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b" +checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" dependencies = [ "anstream", "anstyle", "clap_lex", - "once_cell", "strsim", "terminal_size", ] [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "cloud-hypervisor" -version = "36.0.0" +version = "37.0.0" dependencies = [ "anyhow", "api_client", @@ -464,9 +473,9 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] @@ -718,6 +727,27 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "event-listener" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.0", + "pin-project-lite", +] + [[package]] name = "event_monitor" version = "0.1.0" @@ -796,9 +826,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" @@ -832,6 +862,19 @@ dependencies = [ "waker-fn", ] +[[package]] +name = "futures-lite" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +dependencies = [ + "fastrand 2.0.0", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + [[package]] name = "futures-macro" version = "0.3.28" @@ -851,9 +894,9 @@ checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" @@ -875,11 +918,11 @@ dependencies = [ [[package]] name = "gdbstub" -version = "0.6.6" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4e02bf1b1a624d96925c608f1b268d82a76cbc587ce9e59f7c755e9ea11c75c" +checksum = "09a8b954f9d02b74fe8e89a1c77bd9a6b8206713ebf1b272bfad9573b4a86f88" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "cfg-if", "log", "managed", @@ -889,9 +932,9 @@ dependencies = [ [[package]] name = "gdbstub_arch" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eecb536c55c43593a00dde9074dbbdb0e81ce5f20dbca921400f8779c21dea9c" +checksum = "4e3b1357bd3203fc09a6601327ae0ab38865d14231d0b65d3143f5762cc7977d" dependencies = [ "gdbstub", "num-traits", @@ -1024,9 +1067,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", "hashbrown", @@ -1054,9 +1097,9 @@ dependencies = [ [[package]] name = "io-uring" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141a0f4546a50b2ed637c7a6df0d7dff45c9f41523254996764461c8ae0d9424" +checksum = "460648e47a07a43110fbfa2e0b14afb2be920093c31e5dccc50e49568e099762" dependencies = [ "bitflags 1.3.2", "libc", @@ -1157,9 +1200,9 @@ dependencies = [ [[package]] name = "linux-loader" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1db6a725c8000971f83fa93ed7ee1b600e55a1471a2a653379d3c84f72effdcf" +checksum = "132a531b85b3a164012ab682c72f8f2cce7757f187be5f60782fd2b4cda9cb34" dependencies = [ "vm-memory", ] @@ -1188,12 +1231,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "managed" @@ -1219,7 +1259,7 @@ dependencies = [ [[package]] name = "micro_http" version = "0.1.0" -source = "git+https://github.com/firecracker-microvm/micro-http?branch=main#0d0fdcd50ea10c1b4777f9a958873fc848a5b7bb" +source = "git+https://github.com/firecracker-microvm/micro-http?branch=main#a4d632f2c5ea45712c0d2002dc909a63879e85c3" dependencies = [ "libc", "vmm-sys-util", @@ -1247,7 +1287,7 @@ dependencies = [ [[package]] name = "mshv-bindings" version = "0.1.1" -source = "git+https://github.com/rust-vmm/mshv?branch=main#af397ea8514303d3a19d21d33730e867f7415ba9" +source = "git+https://github.com/rust-vmm/mshv?branch=main#0dd4d3452a7f2e95199f4b58380acc41458474de" dependencies = [ "libc", "serde", @@ -1259,7 +1299,7 @@ dependencies = [ [[package]] name = "mshv-ioctls" version = "0.1.1" -source = "git+https://github.com/rust-vmm/mshv?branch=main#af397ea8514303d3a19d21d33730e867f7415ba9" +source = "git+https://github.com/rust-vmm/mshv?branch=main#0dd4d3452a7f2e95199f4b58380acc41458474de" dependencies = [ "libc", "mshv-bindings", @@ -1327,18 +1367,18 @@ checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] [[package]] name = "object" -version = "0.30.3" +version = "0.30.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" dependencies = [ "memchr", ] @@ -1413,9 +1453,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -1509,18 +1549,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", @@ -1670,9 +1710,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -1823,9 +1863,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.25" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ "bitflags 1.3.2", "errno", @@ -1908,9 +1948,9 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.12" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", @@ -2087,11 +2127,11 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.37.25", + "rustix 0.38.8", "windows-sys 0.48.0", ] @@ -2138,9 +2178,9 @@ checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" [[package]] name = "toml_edit" @@ -2227,9 +2267,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "utf8parse" @@ -2288,7 +2328,7 @@ dependencies = [ [[package]] name = "vfio-bindings" version = "0.4.0" -source = "git+https://github.com/rust-vmm/vfio?branch=main#847b0aa504ac6367efe42ba7e96a2d050737d4f0" +source = "git+https://github.com/rust-vmm/vfio?branch=main#59c604fa6e42080f0a47c124ba29454fe4cb7475" dependencies = [ "vmm-sys-util", ] @@ -2296,7 +2336,7 @@ dependencies = [ [[package]] name = "vfio-ioctls" version = "0.2.0" -source = "git+https://github.com/rust-vmm/vfio?branch=main#847b0aa504ac6367efe42ba7e96a2d050737d4f0" +source = "git+https://github.com/rust-vmm/vfio?branch=main#59c604fa6e42080f0a47c124ba29454fe4cb7475" dependencies = [ "byteorder", "kvm-bindings", @@ -2314,7 +2354,7 @@ dependencies = [ [[package]] name = "vfio_user" version = "0.1.0" -source = "git+https://github.com/rust-vmm/vfio-user?branch=main#2d96b90a7279547356ad8f83aaa3115ad5497302" +source = "git+https://github.com/rust-vmm/vfio-user?branch=main#6c72e997e61d9e84b8ee691ad63ece6c717cf5aa" dependencies = [ "bitflags 1.3.2", "libc", @@ -2330,11 +2370,11 @@ dependencies = [ [[package]] name = "vhost" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61957aeb36daf0b00b87fff9c10dd28a161bd35ab157553d340d183b3d8756e6" +checksum = "289adfce099c71f8310f895932ccd978f352ca494ea47496dbe20d4241888b82" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "libc", "vm-memory", "vmm-sys-util", @@ -2342,9 +2382,9 @@ dependencies = [ [[package]] name = "vhost-user-backend" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab069cdedaf18a0673766eb0a07a0f4ee3ed1b8e17fbfe4aafe5b988e2de1d01" +checksum = "61255322e3ebe93fb77d9f6d99577eca7089bbea4174076c5353a8024a463061" dependencies = [ "libc", "log", @@ -2394,9 +2434,9 @@ dependencies = [ [[package]] name = "virtio-bindings" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c18d7b74098a946470ea265b5bacbbf877abc3373021388454de0d47735a5b98" +checksum = "878bcb1b2812a10c30d53b0ed054999de3d98f25ece91fc173973f9c57aaae86" [[package]] name = "virtio-devices" @@ -2434,9 +2474,9 @@ dependencies = [ [[package]] name = "virtio-queue" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35aca00da06841bd99162c381ec65893cace23ca0fb89254302cfe4bec4c300f" +checksum = "73a01db2cfb6c4b9bc20608b1336263d16714ea8db05de9fec2a254e076f9385" dependencies = [ "log", "virtio-bindings", @@ -2473,9 +2513,9 @@ source = "git+https://github.com/rust-vmm/vm-fdt?branch=main#77212bd0d62913e445c [[package]] name = "vm-memory" -version = "0.12.2" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dc276f0d00c17b9aeb584da0f1e1c673df0d183cc2539e3636ec8cbc5eae99b" +checksum = "5376c9ee5ebe2103a310d8241936cfb93c946734b0479a4fa5bdf7a64abbacd8" dependencies = [ "arc-swap", "libc", @@ -2525,15 +2565,20 @@ dependencies = [ "futures", "gdbstub", "gdbstub_arch", + "hex", "hypervisor", + "igvm", + "igvm_defs", "libc", "linux-loader", "log", "micro_http", + "mshv-bindings", "net_util", "once_cell", "option_parser", "pci", + "range_map_vec", "seccompiler", "serde", "serde_json", @@ -2837,7 +2882,7 @@ dependencies = [ "async-executor", "async-fs", "async-io", - "async-lock", + "async-lock 2.7.0", "async-process", "async-recursion", "async-task", diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index b1ca5fa1f2a5..8c0d6e9e1c1b 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "36.0"; + version = "37.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - hash = "sha256-SgzohTW0tDn/O65rujZh7hsbvTeu4nQ0HvvXu9f92Vc="; + hash = "sha256-zNk3KkKl0bEZUdsWe+9FEMKVepZeQWGasDIn68NEVyw="; }; cargoLock = { @@ -18,11 +18,11 @@ rustPlatform.buildRustPackage rec { "igvm-0.1.0" = "sha256-l+Qyhdy3b8h8hPLHg5M0os8aSkjM55hAP5nqi0AGmjo="; "kvm-bindings-0.6.0" = "sha256-wGdAuPwsgRIqx9dh0m+hC9A/Akz9qg9BM+p06Fi5ACM="; "kvm-ioctls-0.13.0" = "sha256-jHnFGwBWnAa2lRu4a5eRNy1Y26NX5MV8alJ86VR++QE="; - "micro_http-0.1.0" = "sha256-wX35VsrO1vxQcGbOrP+yZm9vG0gcTZLe7gH7xuAa12w="; - "mshv-bindings-0.1.1" = "sha256-vyNaKp89THzZ/UpfocEwaCUzCuQnBMyv/icuZEghZEQ="; + "micro_http-0.1.0" = "sha256-Ov75Gs+wSmsxOHJu024nWtOJp0cKpS8bkxJJGW6jiKw="; + "mshv-bindings-0.1.1" = "sha256-4ADpLvi9hmHsMyGtqDQ2Msa3aMZmJsi4BPW7B5ZfAMw="; "versionize_derive-0.1.4" = "sha256-oGuREJ5+FDs8ihmv99WmjIPpL2oPdOr4REk6+7cV/7o="; - "vfio-bindings-0.4.0" = "sha256-hGhfOE9q9sf/tzPuaAHOca+JKCutcm1Myu1Tt9spaIQ="; - "vfio_user-0.1.0" = "sha256-fAqvy3YTDKXQqtJR+R2nBCWIYe89zTwtbgvJfPLqs1Q="; + "vfio-bindings-0.4.0" = "sha256-grOV+7W1tB4YDRAFbDNQp5nQ1WaivH+N+qHTIj4WA+E="; + "vfio_user-0.1.0" = "sha256-Vi6dBu1mUwyWh7ryKDOBS6GeUD2sqqIrt/bth/LDW6s="; "vm-fdt-0.2.0" = "sha256-lKW4ZUraHomSDyxgNlD5qTaBTZqM0Fwhhh/08yhrjyE="; }; }; From ee1148c372368108eead87063b2a43bf014e03dd Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 14 Dec 2023 08:58:57 +0100 Subject: [PATCH 35/35] mission-center: 0.4.1 -> 0.4.3 Changelog: https://gitlab.com/mission-center-devs/mission-center/-/releases/v0.4.3 --- .../misc/mission-center/Cargo.lock | 19 +------------------ .../misc/mission-center/default.nix | 4 ++-- .../misc/mission-center/gatherer-Cargo.lock | 19 +------------------ 3 files changed, 4 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/misc/mission-center/Cargo.lock b/pkgs/applications/misc/mission-center/Cargo.lock index 0de461f2eb23..93df955ddf1d 100644 --- a/pkgs/applications/misc/mission-center/Cargo.lock +++ b/pkgs/applications/misc/mission-center/Cargo.lock @@ -896,12 +896,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -[[package]] -name = "hermit-abi" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - [[package]] name = "image" version = "0.23.14" @@ -1130,7 +1124,7 @@ dependencies = [ [[package]] name = "missioncenter" -version = "0.4.1" +version = "0.4.3" dependencies = [ "arrayvec 0.7.4", "dbus", @@ -1144,7 +1138,6 @@ dependencies = [ "libadwaita", "libc", "libudev-sys", - "num_cpus", "pathfinder_canvas", "pathfinder_color", "pathfinder_content", @@ -1227,16 +1220,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "objc" version = "0.2.7" diff --git a/pkgs/applications/misc/mission-center/default.nix b/pkgs/applications/misc/mission-center/default.nix index 5994cc151b07..cc8cae481129 100644 --- a/pkgs/applications/misc/mission-center/default.nix +++ b/pkgs/applications/misc/mission-center/default.nix @@ -45,13 +45,13 @@ let in stdenv.mkDerivation rec { pname = "mission-center"; - version = "0.4.1"; + version = "0.4.3"; src = fetchFromGitLab { owner = "mission-center-devs"; repo = "mission-center"; rev = "v${version}"; - hash = "sha256-RENB5rD+DZrmE6awWRT9PGed2bJFDEAEqHh1tBjqWrY="; + hash = "sha256-Yc3oiiD0ernuewq32hk3pDn1vQJNZFgMPPb4lArKP9w="; }; cargoDeps = symlinkJoin { diff --git a/pkgs/applications/misc/mission-center/gatherer-Cargo.lock b/pkgs/applications/misc/mission-center/gatherer-Cargo.lock index 41f888017e3e..99951e03a337 100644 --- a/pkgs/applications/misc/mission-center/gatherer-Cargo.lock +++ b/pkgs/applications/misc/mission-center/gatherer-Cargo.lock @@ -320,7 +320,7 @@ dependencies = [ [[package]] name = "gatherer" -version = "0.4.1" +version = "0.4.3" dependencies = [ "arrayvec", "ash", @@ -334,7 +334,6 @@ dependencies = [ "gbm", "lazy_static", "libc 0.2.150", - "num_cpus", "pkg-config", "rust-ini", "serde", @@ -393,12 +392,6 @@ version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -[[package]] -name = "hermit-abi" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - [[package]] name = "hex" version = "0.4.3" @@ -512,16 +505,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc 0.2.150", -] - [[package]] name = "once_cell" version = "1.18.0"