From d432fc39ff65f0f9945836f21e0db9794e7d6d8a Mon Sep 17 00:00:00 2001 From: cinnamonpancake <130177017+cinnamonpancake@users.noreply.github.com> Date: Wed, 19 Jun 2024 13:40:55 -0400 Subject: [PATCH 01/60] librewolf: remove redundant build flag that reveals "LibreWolf" in the user agent string when resistFingerprinting is disabled --- pkgs/applications/networking/browsers/librewolf/librewolf.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/librewolf/librewolf.nix b/pkgs/applications/networking/browsers/librewolf/librewolf.nix index bb35d92a3d62..e662874dc05f 100644 --- a/pkgs/applications/networking/browsers/librewolf/librewolf.nix +++ b/pkgs/applications/networking/browsers/librewolf/librewolf.nix @@ -10,7 +10,6 @@ rec { extraConfigureFlags = [ "--with-app-name=librewolf" - "--with-app-basename=LibreWolf" "--with-unsigned-addon-scopes=app,system" ]; From 5f7524844ee7790250a22254f6e038686dc6c168 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 4 Jul 2024 01:17:35 +0200 Subject: [PATCH 02/60] nss_latest: 3.101.1 -> 3.102 https://groups.google.com/a/mozilla.org/g/dev-tech-crypto/c/M1CvveRmbGU --- pkgs/development/libraries/nss/latest.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 63a7d2c879ed..a28a1e26deb6 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.101.1"; - hash = "sha256-KcRiOUbdFnH618MFM6uxmRn+/Jn4QMHtv1BELXrCAX4="; + version = "3.102"; + hash = "sha256-Dl04bPMH7/IFyKktD6Ql9XZZRCnIoq7P+30Qo8j0eBQ="; } From 65c851cd7523c669b8fb25236b1c48283a2f43ec Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Mon, 8 Jul 2024 16:40:01 +0100 Subject: [PATCH 03/60] vmTools: allow qemu to be overridden via customQemu argument --- pkgs/build-support/vm/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 871f81bb5d69..7ba67af5cf5a 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1,5 +1,6 @@ { lib , pkgs +, customQemu ? null , kernel ? pkgs.linux , img ? pkgs.stdenv.hostPlatform.linux-kernel.target , storeDir ? builtins.storeDir @@ -218,7 +219,7 @@ rec { qemuCommandLinux = '' - ${qemu-common.qemuBinary qemu} \ + ${if (customQemu != null) then customQemu else (qemu-common.qemuBinary qemu)} \ -nographic -no-reboot \ -device virtio-rng-pci \ -virtfs local,path=${storeDir},security_model=none,mount_tag=store \ From 1a4bd06ac434a68428bea43eb866449c3d2d5831 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 10 Jul 2024 00:25:38 +0200 Subject: [PATCH 04/60] evcc: 0.128.1 -> 0.128.2 https://github.com/evcc-io/evcc/releases/tag/0.128.2 --- pkgs/servers/home-automation/evcc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 9bf43a913603..9b86afdcef44 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,16 +16,16 @@ buildGoModule rec { pname = "evcc"; - version = "0.128.1"; + version = "0.128.2"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; rev = version; - hash = "sha256-xoLQcCbqzeNUyVPkcrPhmNi8PUzzeGshFVvmMCudQU8="; + hash = "sha256-V/cFLvJ9SDOBkZF5hZkRMWEj5Ow2rCcNlwDUlFUJnbA="; }; - vendorHash = "sha256-O8chNEtNEbzNiFzDD1j16V6eS3GKpUWB4PMuBiRNsyU="; + vendorHash = "sha256-kjbFu82XnukB5b7ZNygtnZ3/3XFgEMao2FtwGHOTSOI="; npmDeps = fetchNpmDeps { inherit src; From 4d75a540cbad21476da8b4a167d7538166a96d16 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 12 Jul 2024 14:45:02 +0200 Subject: [PATCH 05/60] matrix-media-repo: 1.3.4 -> 1.3.6 https://github.com/t2bot/matrix-media-repo/blob/v1.3.5/CHANGELOG.md https://github.com/t2bot/matrix-media-repo/blob/v1.3.6/CHANGELOG.md --- pkgs/by-name/ma/matrix-media-repo/package.nix | 10 +++------ .../synapse-import-u+x.patch | 22 ------------------- 2 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 pkgs/by-name/ma/matrix-media-repo/synapse-import-u+x.patch diff --git a/pkgs/by-name/ma/matrix-media-repo/package.nix b/pkgs/by-name/ma/matrix-media-repo/package.nix index 63e0f87d073f..3caf10715b67 100644 --- a/pkgs/by-name/ma/matrix-media-repo/package.nix +++ b/pkgs/by-name/ma/matrix-media-repo/package.nix @@ -7,16 +7,16 @@ }: let pname = "matrix-media-repo"; - version = "1.3.4"; + version = "1.3.6"; src = fetchFromGitHub { owner = "t2bot"; repo = "matrix-media-repo"; rev = "v${version}"; - hash = "sha256-wC69OiB3HjRs/i46+E1YS+M4zKmvH5vENHyfgU7nt1I="; + hash = "sha256-Yrw+6WKHm9Y31YvW5iXnUDhIg0TcSctaouIGhAN4iBo="; }; - vendorHash = "sha256-STzpKqn47qS0iogVYhFl4QBfKUtnqgxobqv1WaW6UtQ="; + vendorHash = "sha256-fKDdL7C3L33caoXxlutzoND2izB5GH+5qTeojTskIUg="; asset-compiler = buildGoModule { pname = "${pname}-compile_assets"; @@ -31,10 +31,6 @@ in buildGoModule { inherit pname version src vendorHash; - patches = [ - ./synapse-import-u+x.patch - ]; - nativeBuildInputs = [ pkg-config asset-compiler diff --git a/pkgs/by-name/ma/matrix-media-repo/synapse-import-u+x.patch b/pkgs/by-name/ma/matrix-media-repo/synapse-import-u+x.patch deleted file mode 100644 index e2be0bfde49a..000000000000 --- a/pkgs/by-name/ma/matrix-media-repo/synapse-import-u+x.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/cmd/homeserver_offline_exporters/import_to_synapse/main.go b/cmd/homeserver_offline_exporters/import_to_synapse/main.go -index 3c7db1e..c6cba4f 100644 ---- a/cmd/homeserver_offline_exporters/import_to_synapse/main.go -+++ b/cmd/homeserver_offline_exporters/import_to_synapse/main.go -@@ -78,7 +78,7 @@ func main() { - - ctx.Log.Infof("Copying %s", mxc) - directories := path.Join(cfg.ExportPath, "local_content", record.MediaId[0:2], record.MediaId[2:4]) -- err = os.MkdirAll(directories, 0655) -+ err = os.MkdirAll(directories, 0755) - if err != nil { - return err - } -@@ -134,7 +134,7 @@ func main() { - dirLock.Lock() - defer dirLock.Unlock() - thumbDir := path.Join(cfg.ExportPath, "local_thumbnails", record.MediaId[0:2], record.MediaId[2:4], record.MediaId[4:]) -- err = os.MkdirAll(thumbDir, 0655) -+ err = os.MkdirAll(thumbDir, 0755) - if err != nil { - ctx.Log.Warn("Error creating thumbnail directories. ", s, err) - return From e5090a50af81e22b280ebb9994d744d62b859126 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 12 Jul 2024 14:54:16 +0200 Subject: [PATCH 06/60] python312Packages.makefun: 1.15.2 -> 1.15.4 https://github.com/smarie/python-makefun/releases/tag/1.15.3 https://github.com/smarie/python-makefun/releases/tag/1.15.4 --- pkgs/development/python-modules/makefun/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/makefun/default.nix b/pkgs/development/python-modules/makefun/default.nix index ece4f85008c6..6a727d666f59 100644 --- a/pkgs/development/python-modules/makefun/default.nix +++ b/pkgs/development/python-modules/makefun/default.nix @@ -2,7 +2,6 @@ lib, fetchPypi, buildPythonPackage, - pythonAtLeast, # build-system setuptools, @@ -14,12 +13,12 @@ buildPythonPackage rec { pname = "makefun"; - version = "1.15.2"; + version = "1.15.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-FvKis02e4MK1eMlgoYCMl04oIs959um5xFWqzhCILUU="; + hash = "sha256-n5uZBOfDl3WTdKiPTFd4H7qypFjex430s+5ics2fsBA="; }; postPatch = '' @@ -34,11 +33,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = lib.optionals (pythonAtLeast "3.12") [ - # https://github.com/smarie/python-makefun/issues/102 - "test_args_order_and_kind" - ]; - pythonImportsCheck = [ "makefun" ]; meta = with lib; { From 3b744c95861509bcb4f2a892e34039ce334c6d11 Mon Sep 17 00:00:00 2001 From: Sean Murphy Date: Wed, 5 Jun 2024 14:18:51 +0200 Subject: [PATCH 07/60] commitizen-go: init at 1.0.3 Co-authored-by: Aleksana --- pkgs/by-name/co/commitizen-go/package.nix | 39 +++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/co/commitizen-go/package.nix diff --git a/pkgs/by-name/co/commitizen-go/package.nix b/pkgs/by-name/co/commitizen-go/package.nix new file mode 100644 index 000000000000..e6936ed3f04a --- /dev/null +++ b/pkgs/by-name/co/commitizen-go/package.nix @@ -0,0 +1,39 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "commitizen-go"; + version = "1.0.3"; + + # we can't obtain the commit hash when using fetchFromGithub + commit_revision = "unspecified (nix build)"; + + src = fetchFromGitHub { + owner = "lintingzhen"; + repo = "commitizen-go"; + rev = "v${version}"; + hash = "sha256-pAWdIQ3icXEv79s+sUVhQclsNcZg+PTZZ6I6JPo7pNg="; + }; + + vendorHash = "sha256-TbrgKE7P3c0gkqJPDkbchWTPkOuTaTAWd8wDcpffcCc="; + + subPackages = [ "." ]; + + CGO_ENABLED = 0; + + ldflags = [ + "-X 'github.com/lintingzhen/commitizen-go/cmd.revision=${commit_revision}'" + "-X 'github.com/lintingzhen/commitizen-go/cmd.version=${version}'" + ]; + + meta = with lib; { + description = "Command line utility to standardize git commit messages, golang version"; + homepage = "https://github.com/lintingzhen/commitizen-go"; + license = licenses.mit; + maintainers = with maintainers; [ seanrmurphy ]; + mainProgram = "commitizen-go"; + }; +} From 5b71e54faa32073df9c958264f80498e92ed20f0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 10 Jul 2024 02:13:27 +0200 Subject: [PATCH 08/60] python312Packages.pysilero-vad: 1.0.0 -> 2.0.0 https://github.com/rhasspy/pysilero-vad/blob/v2.0.0/CHANGELOG.md --- .../python-modules/pysilero-vad/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pysilero-vad/default.nix b/pkgs/development/python-modules/pysilero-vad/default.nix index 7d2b44a61ec2..bee85a4b2bc3 100644 --- a/pkgs/development/python-modules/pysilero-vad/default.nix +++ b/pkgs/development/python-modules/pysilero-vad/default.nix @@ -17,23 +17,21 @@ buildPythonPackage rec { pname = "pysilero-vad"; - version = "1.0.0"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "pysilero-vad"; - rev = "fc1e3f74e6282249c1fd67ab0f65832ad1ce9cc5"; - hash = "sha256-5jS2xZEtvzXO/ffZzseTTUHfE528W9FvKB0AKG6T62k="; + rev = "refs/tags/v${version}"; + hash = "sha256-p0pPhQo/raZhlHettmoc7FwnlZH9n2NI4tYHvikJ8i4="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; pythonRelaxDeps = [ "numpy" ]; - propagatedBuildInputs = [ + dependencies = [ numpy onnxruntime ]; From 4349a61a715bb29e0c326076f3666a8c419130ec Mon Sep 17 00:00:00 2001 From: Pyrox Date: Sat, 13 Jul 2024 18:00:37 -0400 Subject: [PATCH 09/60] nextcloudPackages: Revamp package generation script --- pkgs/servers/nextcloud/packages/default.nix | 2 +- pkgs/servers/nextcloud/packages/generate.sh | 56 +++++++++++++++++++-- 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/default.nix b/pkgs/servers/nextcloud/packages/default.nix index 9c12619968af..8af2e2f5833b 100644 --- a/pkgs/servers/nextcloud/packages/default.nix +++ b/pkgs/servers/nextcloud/packages/default.nix @@ -19,7 +19,7 @@ let packages = self: appName = pname; appVersion = data.version; license = appBaseDefs.${pname}; - inherit (data) url sha256 description homepage; + inherit (data) url hash description homepage; }) {}; } // lib.mapAttrs (type: pkgs: diff --git a/pkgs/servers/nextcloud/packages/generate.sh b/pkgs/servers/nextcloud/packages/generate.sh index b97673a54eee..e2e6093652fe 100755 --- a/pkgs/servers/nextcloud/packages/generate.sh +++ b/pkgs/servers/nextcloud/packages/generate.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../.. -i bash -p nc4nix jq +#! nix-shell -I nixpkgs=../../../.. -i bash -p jq gnused curl set -e set -u @@ -8,7 +8,55 @@ set -x export NEXTCLOUD_VERSIONS=$(nix-instantiate --eval -E 'import ./nc-versions.nix {}' -A e) -APPS=`cat nextcloud-apps.json | jq -r 'keys|.[]' | sed -z 's/\n/,/g;s/,$/\n/'` +APPS=$(jq -r 'keys|.[]' nextcloud-apps.json | sed -z 's/\n/,/g;s/,$/\n/') -nc4nix -apps $APPS -rm *.log +for v in ${NEXTCLOUD_VERSIONS//,/ }; do + # Get major version and back up previous major version apps file + v=$(sed -e 's/^"//' -e 's/"$//' <<<"$v") + MAJOR=${v%.*.*} + MAJOR_FILE="$MAJOR".json + mv "$MAJOR_FILE" "$MAJOR_FILE".bak + + # Download current apps file from Nextcloud's official servers + APPS_PER_VERSION=${v}.json + curl "https://apps.nextcloud.com/api/v1/platform/${v}/apps.json" -o "$APPS_PER_VERSION" + + # Add a starting bracket to the apps file for this version + echo '{' >"$MAJOR_FILE".tmp + for a in ${APPS//,/ }; do + echo "Fetching $a" + # Ensure the app exists in the file + if [ "$(jq -r ".[] | select(.id == \"${a}\")" "$APPS_PER_VERSION")" != "" ]; then + # Get all of our variables + VERSION=$(jq -r ".[] | select(.id == \"${a}\") | .releases[0].version" "$APPS_PER_VERSION") + URL=$(jq -r ".[] | select(.id == \"${a}\") | .releases[0].download" "$APPS_PER_VERSION") + HASH=$(nix store prefetch-file --json --hash-type sha256 --unpack "$URL" | jq -r .hash) + HOMEPAGE=$(jq -r ".[] | select(.id == \"${a}\") | .website" "$APPS_PER_VERSION") + DESCRIPTION=$(jq ".[] | select(.id == \"${a}\") | .translations.en.description" "$APPS_PER_VERSION") + # Add all variables to the file + cat >>"$MAJOR_FILE".tmp <>"$MAJOR_FILE".tmp + # Beautify file + jq '.' "$MAJOR_FILE".tmp >"$MAJOR_FILE" + # Remove the temporary files + rm "$APPS_PER_VERSION" + rm "$MAJOR_FILE".tmp + rm "$MAJOR_FILE".bak +done From d5d501b799ab338b5262cbe3fa771a9dc49a512a Mon Sep 17 00:00:00 2001 From: Pyrox Date: Sat, 13 Jul 2024 18:32:28 -0400 Subject: [PATCH 10/60] nextcloud28Packages: update --- pkgs/servers/nextcloud/packages/28.json | 284 ++++++++---------------- 1 file changed, 96 insertions(+), 188 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/28.json b/pkgs/servers/nextcloud/packages/28.json index ed0f6fd9f24e..7fbea118bcce 100644 --- a/pkgs/servers/nextcloud/packages/28.json +++ b/pkgs/servers/nextcloud/packages/28.json @@ -1,332 +1,240 @@ { "bookmarks": { - "sha256": "1vpha2lxq199ckssnw7fc23dnk4pn1r0ipdwdqv102adpiqrfiy1", + "hash": "sha256-wUeXcbxNCRA2brzdCHKwl0zbhmDucKv1ZCkF3KlQ8O4=", "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.2/bookmarks-14.2.2.tar.gz", "version": "14.2.2", "description": "- πŸ“‚ Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- πŸ“² Synchronize with all your browsers and devices\n- πŸ“” Store archived versions of your links in case they are depublished\n- πŸ” Full-text search on site contents\n- πŸ‘ͺ Share bookmarks with other users and via public links\n- βš› Generate RSS feeds of your collections\n- πŸ“ˆ Stats on how often you access which links\n- πŸ”’ Automatic backups of your bookmarks collection\n- πŸ’Ό Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", - "homepage": "https://github.com/nextcloud/bookmarks", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/nextcloud/bookmarks" }, "calendar": { - "sha256": "09rsp5anpaqzwmrixza5qh12vmq9hd3an045064vm3rnynz537qc", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.6/calendar-v4.7.6.tar.gz", - "version": "4.7.6", + "hash": "sha256-ZJJmL7BgXNOZKWxG1lhruDmsLOmUQOTO0KlcS8liYfs=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.9/calendar-v4.7.9.tar.gz", + "version": "4.7.9", "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" - ] + "homepage": "https://github.com/nextcloud/calendar/" }, "contacts": { - "sha256": "0xyrkr5p7xa8cn33kgx1hyblpbsdzaakpfm5bk6w9sm71a42688w", + "hash": "sha256-HCEjiAqn6sTNXKW6O5X6Ta9Ll4ehvzmGZUj1c0ue2Xc=", "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.3/contacts-v5.5.3.tar.gz", "version": "5.5.3", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* πŸš€ **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* πŸŽ‰ **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* πŸ‘₯ **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* πŸ™ˆ **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", - "homepage": "https://github.com/nextcloud/contacts#readme", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/nextcloud/contacts#readme" }, "cookbook": { - "sha256": "0wd4vwfp4i8hfrlqfzac517iqfhzxy1sv0ryb96489q9fvbcvlnp", - "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz", - "version": "0.11.0", + "hash": "sha256-qHYOGHRnPTgT5/FZWWIwBNuwxrkpk96i0cKpCLe48Y0=", + "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1-rc1/cookbook-0.11.1-rc1.tar.gz", + "version": "0.11.1-rc1", "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": "https://github.com/nextcloud/cookbook/", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/nextcloud/cookbook/" }, "cospend": { - "sha256": "04cpsd638p8midpznbz0nhdmcm5zfgq9n6yh1xifnvmfkd5k2wj0", + "hash": "sha256-QHIxS5uubutiD9Abm/Bzv1RWG7TgL/tvixVdNEzTlxE=", "url": "https://github.com/julien-nc/cospend-nc/releases/download/v1.6.1/cospend-1.6.1.tar.gz", "version": "1.6.1", "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 expenses with a group of people.\n\nIt lets you create projects with members and bills. Each member has a balance computed from the project bills. Balances are not an absolute amount of money at members disposal but rather a relative information showing if a member has spent more for the group than the group has spent for her/him, independently of exactly who spent money for whom. 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 shared with other Nextcloud users or via public links.\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 under developpement!\n\nThe private and public APIs are documented using [the Nextcloud OpenAPI extractor](https://github.com/nextcloud/openapi-extractor/). This documentation can be accessed directly in Nextcloud. All you need is to install Cospend (>= v1.6.0) and use the [the OCS API Viewer app](https://apps.nextcloud.com/apps/ocs_api_viewer) to browse the OpenAPI documentation.\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* Move bills from one project to another\n* Move bills to trash before actually deleting them\n* Archive old projects before deleting them\n* πŸŽ‡ Automatically create reimbursement bills from settlement plan\n* πŸ—“ Create recurring bills (day/week/month/year)\n* πŸ“Š Optionally provide custom amount for each member in new bills\n* πŸ”— Link personal files to bills (picture of physical receipt for example)\n* πŸ‘© Public links for people outside Nextcloud (can be password protected)\n* πŸ‘« Share projects with Nextcloud users/groups/circles\n* πŸ–« Import/export projects as csv (compatible with csv files from IHateMoney and SplitWise)\n* πŸ”— Generate link/QRCode to easily add projects in MoneyBuster\n* πŸ—² Implement Nextcloud notifications and activity stream\n\nThis app usually support the 2 or 3 last major versions of Nextcloud.\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://github.com/julien-nc/cospend-nc/blob/master/CONTRIBUTING.md).\n\n## Documentation\n\n* [User documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/user.md)\n* [Admin documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/admin.md)\n* [Developer documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/dev.md)\n* [CHANGELOG](https://github.com/julien-nc/cospend-nc/blob/master/CHANGELOG.md#change-log)\n* [AUTHORS](https://github.com/julien-nc/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" - ] + "homepage": "https://github.com/julien-nc/cospend-nc" }, "deck": { - "sha256": "0s8zhmqj3h4ajiwvki5bdxrbzckq9l8pr04hz6vs7jx3hpanj22g", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.12.2/deck-v1.12.2.tar.gz", - "version": "1.12.2", + "hash": "sha256-VqO2pouipo2rGptiJRuj8ia3wSnHJ1hIeJ9xGE5QI5A=", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.12.4/deck-v1.12.4.tar.gz", + "version": "1.12.4", "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" - ] + "homepage": "https://github.com/nextcloud/deck" }, "end_to_end_encryption": { - "sha256": "04b2hj96gpb4sf1w5r1sxa4fmxrk36vr3pia8i5w2pfi6fbhd9mc", + "hash": "sha256-rKYGlzPRXcFLRCrekbcZM/fqiOo65MKD02TdZ5KEYhE=", "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v1.14.5/end_to_end_encryption-v1.14.5.tar.gz", "version": "1.14.5", "description": "Provides the necessary endpoint to enable end-to-end encryption.\n\n**Notice:** E2EE is currently not compatible to be used together with server-side encryption", - "homepage": "https://github.com/nextcloud/end_to_end_encryption", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/nextcloud/end_to_end_encryption" }, "forms": { - "sha256": "1hwc7ra12nsr79xp8lkv3ip46bxxbjpaglb0a4k06ikfnzjaddny", + "hash": "sha256-3ram5LduRgMmUWDRp65cvS9Dbhx7UnR7OllbEVQ+jMM=", "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.2.4/forms-v4.2.4.tar.gz", "version": "4.2.4", "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" - ] + "homepage": "https://github.com/nextcloud/forms" }, "gpoddersync": { - "sha256": "1hk052864mb49crmsy2m9alv22rk7ns6m6q7l372j7py9gr8rf60", + "hash": "sha256-wLiM8kv+HinOoAebarQ9MwuxqUpVeF0zS2RVYpAoYMI=", "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.9.0/gpoddersync.tar.gz", "version": "3.9.0", "description": "Expose GPodder API to sync podcast consumer apps like AntennaPod", - "homepage": "https://github.com/thrillfall/nextcloud-gpodder", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/thrillfall/nextcloud-gpodder" }, "groupfolders": { - "sha256": "17lhmj4ndxp7h0fxmxk3f3dwhs44mplxpyfb6nb5ia2dm8i858w1", + "hash": "sha256-gaOCIqpNqFiWNcv52+mthGjI23Bj9todgOf2ZomskJ4=", "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.7/groupfolders-v16.0.7.tar.gz", "version": "16.0.7", "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" - ] + "homepage": "https://github.com/nextcloud/groupfolders" }, "impersonate": { - "sha256": "0l1wmsiycwnn5py1mdc87paqlciclndrk72yf0ff7k11vidgb7mp", + "hash": "sha256-t571WtwhzOMccF6cmZulLDKK1T2ItRr8LdZy5qOuPFA=", "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" - ] + "homepage": "https://github.com/nextcloud/impersonate" }, "integration_openai": { - "sha256": "0q5fs57n644mad4qvr7pb46dljmdnl4c9wkh2kdhaqnmjsa7zs8j", - "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v2.0.1/integration_openai-v2.0.1.tar.gz", - "version": "2.0.1", + "hash": "sha256-JsdhEQMSUpnpBFQyDPAVGjT6mAgR826FD3EBOFhsr4c=", + "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v2.0.3/integration_openai-v2.0.3.tar.gz", + "version": "2.0.3", "description": "⚠️ The smart pickers have been removed from this app\nas they are now included in the [Assistant app](https://apps.nextcloud.com/apps/assistant).\n\nThis app implements:\n\n* Text generation providers: Free prompt, Summarize, Headline and Reformulate (using any available large language model)\n* A Translation provider (using any available language model)\n* A SpeechToText provider (using Whisper)\n* An image generation provider\n\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance\nor to any service that implements an API similar to the OpenAI one, for example: [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via OpenAI API: πŸ”΄\n\nNegative:\n* the software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* the trained model is not freely available, so the model can not be run on-premises\n* the training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n\n### Rating for Translation using ChatGPT via OpenAI API: πŸ”΄\n\nNegative:\n* the software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* the trained model is not freely available, so the model can not be run on-premises\n* the training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n### Rating for Image generation using DALLΒ·E via OpenAI API: πŸ”΄\n\nNegative:\n* the software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* the trained model is not freely available, so the model can not be ran on-premises\n* the training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via OpenAI API: 🟑\n\nPositive:\n* the software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can run on-premise\n\nNegative:\n* the training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n### Rating for Text generation via LocalAI: 🟒\n\nPositive:\n* the software for training and inferencing of this model is open source\n* the trained model is freely available, and thus can be ran on-premises\n* the training data is freely available, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n\n### Rating for Image generation using Stable Diffusion via LocalAI : 🟑\n\nPositive:\n* the software for training and inferencing of this model is open source\n* the trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* the training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via LocalAI: 🟑\n\nPositive:\n* the software for training and inferencing of this model is open source\n* the trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* the training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", - "homepage": "https://github.com/nextcloud/integration_openai", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/nextcloud/integration_openai" }, "integration_paperless": { - "sha256": "08rgdlinxpcwyq0f97ibv022qhj8smk94dvlf927xq46220w9pfx", + "hash": "sha256-3d3EgRCG4H5EcnQ3kmbVSEIsBNgrnuQA9pzdbiNtLyM=", "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.3/integration_paperless-v1.0.3.tar.gz", "version": "1.0.3", "description": "Integration with the [Paperless](https://docs.paperless-ngx.com) Document Management System.\nIt adds a file action menu item that can be used to upload a file from your Nextcloud Files to Paperless.", - "homepage": "", - "licenses": [ - "agpl" - ] + "homepage": "" }, "mail": { - "sha256": "0bxbzibzsdqmd751759lg3vwhw9nyy5n37snijd083s1498sfqs5", + "hash": "sha256-RWOnUSJBDwSajFafYYv3NnHI93g0lRPKaRU3/Vf8qy8=", "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.2/mail-v3.7.2.tar.gz", "version": "3.7.2", "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" - ] + "homepage": "https://github.com/nextcloud/mail#readme" }, "maps": { - "sha256": "1gqms3rrdpjmpb1h5d72b4lwbvsl8p10zwnkhgnsmvfcf93h3r1c", + "hash": "sha256-LOQBR3LM7artg9PyD8JFVO/FKVnitALDulXelvPQFb8=", "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0/maps-1.4.0.tar.gz", "version": "1.4.0", "description": "**The whole world fits inside your cloud!**\n\n- **πŸ—Ί Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **πŸ–Ό Photos on the map:** No more boring slideshows, just show directly where you were!\n- **πŸ™‹ Contacts on the map:** See where your friends live and plan your next visit.\n- **πŸ“± Devices:** Lost your phone? Check the map!\n- **γ€° Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", - "homepage": "https://github.com/nextcloud/maps", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/nextcloud/maps" }, "memories": { - "sha256": "1wahnkc253bgm0bqciyhfh1iyl8girbj8mzdd29l0k1bks8fr4qc", - "url": "https://github.com/pulsejet/memories/releases/download/v7.3.1/memories.tar.gz", - "version": "7.3.1", - "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **πŸ“Έ Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **βͺ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **πŸ€– AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **πŸ–ΌοΈ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **πŸ«±πŸ»β€πŸ«²πŸ» External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **πŸ“± Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **πŸ“¦ Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **πŸ“Ή Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **πŸ—ΊοΈ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **πŸ“¦ Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚑️ Performance**: Do all this very fast.\n\n## πŸš€ Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the πŸ“· Memories app in Nextcloud and set the directory containing your photos.", - "homepage": "https://memories.gallery", - "licenses": [ - "agpl" - ] + "hash": "sha256-YGDyzBjeSAHI/+OdUnJNhRODv+6c3XZjKyJX/7xNo5Q=", + "url": "https://github.com/pulsejet/memories/releases/download/v7.3.1-rc.3/memories.tar.gz", + "version": "7.3.1-rc.3", + "description": "# Memories: Photo Management for Nextcloud\r\n\r\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\r\n\r\n- **πŸ“Έ Timeline**: Sort photos and videos by date taken, parsed from Exif data.\r\n- **βͺ Rewind**: Jump to any time in the past instantly and relive your memories.\r\n- **πŸ€– AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\r\n- **πŸ–ΌοΈ Albums**: Create albums to group photos and videos together. Then share these albums with others.\r\n- **πŸ«±πŸ»β€πŸ«²πŸ» External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\r\n- **πŸ“± Mobile Support**: Work from any device, of any shape and size through the web app.\r\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\r\n- **πŸ“¦ Archive**: Store photos you don't want to see in your timeline in a separate folder.\r\n- **πŸ“Ή Video Transcoding**: Transcode videos and use HLS for maximal performance.\r\n- **πŸ—ΊοΈ Map**: View your photos on a map, tagged with accurate reverse geocoding.\r\n- **πŸ“¦ Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\r\n- **⚑️ Performance**: Do all this very fast.\r\n\r\n## πŸš€ Installation\r\n\r\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\r\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\r\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\r\n1. Open the πŸ“· Memories app in Nextcloud and set the directory containing your photos.", + "homepage": "https://memories.gallery" }, "music": { - "sha256": "17anhb0zcky4fwmbj1czm536d7k8n03iwsn3dqnyq1b9c4bqyj4m", + "hash": "sha256-lUiPF2FpBewtbsNqHgewaJ5mRqmfBbkqd8RP9sGCVp0=", "url": "https://github.com/owncloud/music/releases/download/v2.0.0/music_2.0.0_for_nextcloud.tar.gz", "version": "2.0.0", "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from m3u, m3u8, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone", - "homepage": "https://github.com/owncloud/music", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/owncloud/music" + }, + "news": { + "hash": "sha256-AhTZGQCLeNgsRBF5w3+Lf9JtNN4D1QncB5t+odU+XUc=", + "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha8/news.tar.gz", + "version": "25.0.0-alpha8", + "description": "πŸ“° A RSS/Atom Feed reader App for Nextcloud\n\n- πŸ“² Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- πŸ”„ Automatic updates of your news feeds\n- πŸ†“ Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", + "homepage": "https://github.com/nextcloud/news" }, "notes": { - "sha256": "0j9bwbfvwwdaabyc79i514sp36cm4i9z02l8bkxlqr9fvim73nn9", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.10.0/notes.tar.gz", - "version": "4.10.0", + "hash": "sha256-I2LsDjZdfFP5okBEIJRJcUMS8V5O9zq0ppMLA0SMI8Y=", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.4/notes-v4.9.4.tar.gz", + "version": "4.9.4", "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" - ] + "homepage": "https://github.com/nextcloud/notes" }, "notify_push": { - "sha256": "14s8g3dqwrxjz1zww64n1lhwdb8374wr1b5v76xhawypmfz2a68h", - "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.12/notify_push-v0.6.12.tar.gz", - "version": "0.6.12", + "hash": "sha256-j/Tj8F124rq1vmXJyUE+MT6m4/IvO5gkudF612Ya2MY=", + "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.9/notify_push-v0.6.9.tar.gz", + "version": "0.6.9", "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" - ] + "homepage": "" }, "onlyoffice": { - "sha256": "1vflj70q8d0hrfck9c5l1k4qa38gpdh3zjgx4aqamnlbvkfssk7h", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.2.2/onlyoffice.tar.gz", - "version": "9.2.2", + "hash": "sha256-9H/ASllarwmSEWCpPGmm6qy7NgSt3NXzJgBxz5v0Db8=", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.3.0/onlyoffice.tar.gz", + "version": "9.3.0", "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", - "homepage": "https://www.onlyoffice.com", - "licenses": [ - "agpl" - ] + "homepage": "https://www.onlyoffice.com" }, "phonetrack": { - "sha256": "1i28xgzp85yb44ay2l2zw18fk00yd6fh6yddj92gdrljb3w9zpap", + "hash": "sha256-V92f+FiS5vZEkq15A51pHoDpUOBfUOEVIcsXdP/rSMQ=", "url": "https://github.com/julien-nc/phonetrack/releases/download/v0.8.1/phonetrack-0.8.1.tar.gz", "version": "0.8.1", "description": "# PhoneTrack Nextcloud application\n\nπŸ“± PhoneTrack is a Nextcloud application to track and store mobile device's locations.\n\nπŸ—Ί It receives information from mobile phone's logging apps and displays it dynamically on a map.\n\n🌍 Help us to translate this app on [PhoneTrack Crowdin project](https://crowdin.com/project/phonetrack).\n\nβš’ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CONTRIBUTING.md).\n\nHow to use PhoneTrack :\n\n* Create a tracking session.\n* Give the logging link\\* to the mobile devices. Choose the [logging method](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#logging-methods) you prefer.\n* Watch the session's devices location in real time (or not) in PhoneTrack or share it with public pages.\n\n(\\*) Don't forget to set the device name in the link (rather than in the logging app settings). Replace \"yourname\" with the desired device name. Setting the device name in logging app settings only works with Owntracks, Traccar and OpenGTS.\n\nOn PhoneTrack main page, while watching a session, you can :\n\n* πŸ“ Display location history\n* β›› Filter points\n* ✎ Manually edit/add/delete points\n* ✎ Edit devices (rename, change colour/shape, move to another session)\n* β›Ά Define geofencing zones for devices\n* βš‡ Define proximity alerts for device pairs\n* πŸ–§ Share a session to other Nextcloud users or with a public link (read-only)\n* πŸ”— Generate public share links with optional restrictions (filters, device name, last positions only, geofencing simplification)\n* πŸ–« Import/export a session in GPX format (one file with one track per device or one file per device)\n* πŸ—  Display sessions statistics\n* πŸ”’ [Reserve a device name](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#device-name-reservation) to make sure only authorised user can log with this name\n* πŸ—“ Toggle session auto export and auto purge (daily/weekly/monthly)\n* β—” Choose what to do when point number quota is reached (block logging or delete oldest point)\n\nPublic page and public filtered page work like main page except there is only one session displayed, everything is read-only and there is no need to be logged in.\n\nThis app is tested on Nextcloud 17 with Firefox 57+ and Chromium.\n\nThis app is compatible with theming colours and accessibility themes !\n\nThis app is under development.\n\n## Install\n\nSee the [AdminDoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc) for installation details.\n\nCheck [CHANGELOG](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CHANGELOG.md#change-log) file to see what's new and what's coming in next release.\n\nCheck [AUTHORS](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/AUTHORS.md#authors) file to see complete list of authors.\n\n## Known issues\n\n* PhoneTrack **now works** with Nextcloud group restriction activated. See [admindoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc#issue-with-phonetrack-restricted-to-some-groups-in-nextcloud).\n\nAny feedback will be appreciated.\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/eneiluj/donate)", - "homepage": "https://github.com/julien-nc/phonetrack", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/julien-nc/phonetrack" }, "polls": { - "sha256": "1s8ym7msl4cax69kr2piphgapllsva1vjh2xb7g03yb7z1hglhjs", - "url": "https://github.com/nextcloud/polls/releases/download/v7.1.2/polls.tar.gz", - "version": "7.1.2", + "hash": "sha256-0K8I86calcBC4BXmuTpVENkUePDsPQxJoxWcgG8vlL4=", + "url": "https://github.com/nextcloud/polls/releases/download/v7.1.3/polls.tar.gz", + "version": "7.1.3", "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" - ] + "homepage": "https://github.com/nextcloud/polls" }, "previewgenerator": { - "sha256": "0505kg4pxa6dqylniwa5ip6h5bama8cp0ng2y7prhb93mnhgr051", + "hash": "sha256-oYD8oK0jLZjv8eJZcBlSVa0CzY1F8Wipx82ofsmbBRQ=", "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.5.0/previewgenerator-v5.5.0.tar.gz", "version": "5.5.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" - ] + "homepage": "https://github.com/nextcloud/previewgenerator" }, "qownnotesapi": { - "sha256": "0y4cv4hagmax4nkdfzysd5fg2h2xak4m87waf3b0ci5f1bwdxdxx", + "hash": "sha256-vbfe+AquRAbWcIofVMlUXUDxXGnaf9emJV3VpyDZjHg=", "url": "https://github.com/pbek/qownnotesapi/releases/download/v24.4.0/qownnotesapi-nc.tar.gz", "version": "24.4.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" - ] + "homepage": "https://github.com/pbek/qownnotesapi" }, "registration": { - "sha256": "1ih7nfswskzpgbqfjsn4lym4cwyq4kbjv9m9cmy4g4nx44gr0dkl", + "hash": "sha256-dDaQHyHdkkd8ZammLdck2HNGqqfEaunwevdPzbWzB8Y=", "url": "https://github.com/nextcloud-releases/registration/releases/download/v2.4.0/registration-v2.4.0.tar.gz", "version": "2.4.0", "description": "User registration\n\nThis app allows users to register a new account.\n\n# Features\n\n- Add users to a given group\n- Allow-list with email domains (including wildcard) to register with\n- Administrator will be notified via email for new user creation or require approval\n- Supports Nextcloud's Client Login Flow v1 and v2 - allowing registration in the mobile Apps and Desktop clients\n\n# Web form registration flow\n\n1. User enters their email address\n2. Verification link is sent to the email address\n3. User clicks on the verification link\n4. User is lead to a form where they can choose their username and password\n5. New account is created and is logged in automatically", - "homepage": "https://github.com/nextcloud/registration", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/nextcloud/registration" }, "richdocuments": { - "sha256": "0lxbdyvmwsrj9qsb3w3f6si6sydddb4p96rvhrsardq96pam3xwz", + "hash": "sha256-n/dR1TUJt6x0hjubdMlqrXltojZu8LE0TjJrXrdvq1M=", "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.3.8/richdocuments-v8.3.8.tar.gz", "version": "8.3.8", "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.", - "homepage": "https://collaboraoffice.com/", - "licenses": [ - "agpl" - ] + "homepage": "https://collaboraoffice.com/" }, "spreed": { - "sha256": "0mz6cb2janafday60dw7ga42c67lpqzjpw0gli6jj90pzcc4by72", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v18.0.8/spreed-v18.0.8.tar.gz", - "version": "18.0.8", + "hash": "sha256-FjcPXBCR+DkJObOl92wRn0UXGjmzHy0GqaXBDt2VZMs=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v18.0.9/spreed-v18.0.9.tar.gz", + "version": "18.0.9", "description": "Chat, video & audio-conferencing using WebRTC\n\n* πŸ’¬ **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* πŸ‘₯ **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* πŸ’» **Screen sharing!** Share your screen with the participants of your call.\n* πŸš€ **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* πŸŒ‰ **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", - "homepage": "https://github.com/nextcloud/spreed", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/nextcloud/spreed" }, "tasks": { - "sha256": "1g2wqsm9kjm7dri75ghix2hb5vby3vy3ibcvmwfdwsab3a12xbrg", + "hash": "sha256-L68ughpLad4cr5utOPwefu2yoOgRvnJibqfKmarGXLw=", "url": "https://github.com/nextcloud/tasks/releases/download/v0.16.0/tasks.tar.gz", "version": "0.16.0", "description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.", - "homepage": "https://github.com/nextcloud/tasks/", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/nextcloud/tasks/" }, "twofactor_nextcloud_notification": { - "sha256": "0qpg6i6iw6ldnryf0p56kd7fgs5vyckw9m6yjcf8r4j3mwfka273", + "hash": "sha256-4wg1Ha9Dkowck97UxCfzu+jnTpumXOB8to0aHk0072I=", "url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.9.0/twofactor_nextcloud_notification-v3.9.0.tar.gz", "version": "3.9.0", "description": "Allows using any of your logged in devices as second factor", - "homepage": "https://github.com/nextcloud/twofactor_nextcloud_notification", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/nextcloud/twofactor_nextcloud_notification" }, "twofactor_webauthn": { - "sha256": "0llxakzcdcy9hscyzw3na5zp1p57h03w5fmm0gs9g62k1b88k6kw", - "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.4.0/twofactor_webauthn-v1.4.0.tar.gz", - "version": "1.4.0", + "hash": "sha256-+hG5eJUMMKJUmfBnU4BhEf+6QnTAw4TXi4Ij18z3Ru8=", + "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.4.0-rc.1/twofactor_webauthn-v1.4.0-rc.1.tar.gz", + "version": "1.4.0-rc.1", "description": "A two-factor provider for WebAuthn devices", - "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme" }, "unroundedcorners": { - "sha256": "16h8zg7k18r01yx2a72bn22nmvbafrs3ksyy23fbrnirzgwcaaqf", + "hash": "sha256-DivF+Ps52rzcEN7rOXR2au1qhbBLHCW6DyCjMM/7CJo=", "url": "https://github.com/OliverParoczai/nextcloud-unroundedcorners/releases/download/v1.1.3/unroundedcorners-v1.1.3.tar.gz", "version": "1.1.3", "description": "# Unrounded Corners\nA Nextcloud app that restores the corners of buttons and widgets to their original looks by unrounding them.", - "homepage": "https://github.com/OliverParoczai/nextcloud-unroundedcorners", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/OliverParoczai/nextcloud-unroundedcorners" }, "user_oidc": { - "sha256": "1qarpmwk66mz6mvif0cc4jb7wi4yv76flzwhyvmzxk0ahafpi8x1", + "hash": "sha256-oaN4nYIKzP7r9pB/6szZnkR+liSMARd3Nb8aM3m9WeE=", "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v5.0.3/user_oidc-v5.0.3.tar.gz", "version": "5.0.3", "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", - "homepage": "https://github.com/nextcloud/user_oidc", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/nextcloud/user_oidc" }, "user_saml": { - "sha256": "1dw5mwzzlhfwarnnpsij3l6153psl83qkjmgm0bnipy4v8wkkqvj", + "hash": "sha256-cuM5OdrE32gXqK/KiQei+o4SDB0y6mttVtxB+j+vhbc=", "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.1.3/user_saml-v6.1.3.tar.gz", "version": "6.1.3", "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" - ] + "homepage": "https://github.com/nextcloud/user_saml" } } From fe3e80ad3883e9ddf9b3f471692b8f5f2c3033d2 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Sat, 13 Jul 2024 18:32:34 -0400 Subject: [PATCH 11/60] nextcloud29Packages: update --- pkgs/servers/nextcloud/packages/29.json | 286 ++++++++---------------- 1 file changed, 97 insertions(+), 189 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/29.json b/pkgs/servers/nextcloud/packages/29.json index a082acb744bc..a410cf93c2c4 100644 --- a/pkgs/servers/nextcloud/packages/29.json +++ b/pkgs/servers/nextcloud/packages/29.json @@ -1,332 +1,240 @@ { "bookmarks": { - "sha256": "1vpha2lxq199ckssnw7fc23dnk4pn1r0ipdwdqv102adpiqrfiy1", + "hash": "sha256-wUeXcbxNCRA2brzdCHKwl0zbhmDucKv1ZCkF3KlQ8O4=", "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.2/bookmarks-14.2.2.tar.gz", "version": "14.2.2", "description": "- πŸ“‚ Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- πŸ“² Synchronize with all your browsers and devices\n- πŸ“” Store archived versions of your links in case they are depublished\n- πŸ” Full-text search on site contents\n- πŸ‘ͺ Share bookmarks with other users and via public links\n- βš› Generate RSS feeds of your collections\n- πŸ“ˆ Stats on how often you access which links\n- πŸ”’ Automatic backups of your bookmarks collection\n- πŸ’Ό Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", - "homepage": "https://github.com/nextcloud/bookmarks", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/nextcloud/bookmarks" }, "calendar": { - "sha256": "09rsp5anpaqzwmrixza5qh12vmq9hd3an045064vm3rnynz537qc", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.6/calendar-v4.7.6.tar.gz", - "version": "4.7.6", + "hash": "sha256-ZJJmL7BgXNOZKWxG1lhruDmsLOmUQOTO0KlcS8liYfs=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.9/calendar-v4.7.9.tar.gz", + "version": "4.7.9", "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" - ] + "homepage": "https://github.com/nextcloud/calendar/" }, "contacts": { - "sha256": "0yxp3477fx4mrds8wchhzavrxwm88dvz7s58zp59q1v7qr9i7whr", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v6.0.0/contacts-v6.0.0.tar.gz", - "version": "6.0.0", + "hash": "sha256-BXMTI4Izk2iKTCbfjNKMYM/sm1bX+pn4D/FZcFyDm0k=", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v6.0.0-rc1/contacts-v6.0.0-rc1.tar.gz", + "version": "6.0.0-rc.1", "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" - ] + "homepage": "https://github.com/nextcloud/contacts#readme" }, "cookbook": { - "sha256": "0wd4vwfp4i8hfrlqfzac517iqfhzxy1sv0ryb96489q9fvbcvlnp", - "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz", - "version": "0.11.0", + "hash": "sha256-qHYOGHRnPTgT5/FZWWIwBNuwxrkpk96i0cKpCLe48Y0=", + "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1-rc1/cookbook-0.11.1-rc1.tar.gz", + "version": "0.11.1-rc1", "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": "https://github.com/nextcloud/cookbook/", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/nextcloud/cookbook/" }, "cospend": { - "sha256": "04cpsd638p8midpznbz0nhdmcm5zfgq9n6yh1xifnvmfkd5k2wj0", + "hash": "sha256-QHIxS5uubutiD9Abm/Bzv1RWG7TgL/tvixVdNEzTlxE=", "url": "https://github.com/julien-nc/cospend-nc/releases/download/v1.6.1/cospend-1.6.1.tar.gz", "version": "1.6.1", "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 expenses with a group of people.\n\nIt lets you create projects with members and bills. Each member has a balance computed from the project bills. Balances are not an absolute amount of money at members disposal but rather a relative information showing if a member has spent more for the group than the group has spent for her/him, independently of exactly who spent money for whom. 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 shared with other Nextcloud users or via public links.\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 under developpement!\n\nThe private and public APIs are documented using [the Nextcloud OpenAPI extractor](https://github.com/nextcloud/openapi-extractor/). This documentation can be accessed directly in Nextcloud. All you need is to install Cospend (>= v1.6.0) and use the [the OCS API Viewer app](https://apps.nextcloud.com/apps/ocs_api_viewer) to browse the OpenAPI documentation.\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* Move bills from one project to another\n* Move bills to trash before actually deleting them\n* Archive old projects before deleting them\n* πŸŽ‡ Automatically create reimbursement bills from settlement plan\n* πŸ—“ Create recurring bills (day/week/month/year)\n* πŸ“Š Optionally provide custom amount for each member in new bills\n* πŸ”— Link personal files to bills (picture of physical receipt for example)\n* πŸ‘© Public links for people outside Nextcloud (can be password protected)\n* πŸ‘« Share projects with Nextcloud users/groups/circles\n* πŸ–« Import/export projects as csv (compatible with csv files from IHateMoney and SplitWise)\n* πŸ”— Generate link/QRCode to easily add projects in MoneyBuster\n* πŸ—² Implement Nextcloud notifications and activity stream\n\nThis app usually support the 2 or 3 last major versions of Nextcloud.\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://github.com/julien-nc/cospend-nc/blob/master/CONTRIBUTING.md).\n\n## Documentation\n\n* [User documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/user.md)\n* [Admin documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/admin.md)\n* [Developer documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/dev.md)\n* [CHANGELOG](https://github.com/julien-nc/cospend-nc/blob/master/CHANGELOG.md#change-log)\n* [AUTHORS](https://github.com/julien-nc/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" - ] + "homepage": "https://github.com/julien-nc/cospend-nc" }, "deck": { - "sha256": "00cip1c0h7jhqrmj2vrbac5cajk8dql6pky2iw77g0dkjssqlgza", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.13.0/deck-v1.13.0.tar.gz", - "version": "1.13.0", + "hash": "sha256-AQV2JeSrQcPSh2J2oG/Kbrh2Qo/nj1+orYJymDsQLDQ=", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.13.1/deck-v1.13.1.tar.gz", + "version": "1.13.1", "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" - ] + "homepage": "https://github.com/nextcloud/deck" }, "end_to_end_encryption": { - "sha256": "0hjq7qmp9psvq1vbak473wwfjdymay0l2d2h3vnssjqqw2kqf5dw", + "hash": "sha256-vBWHp+AYS63tHlA0QYFX1TfpOB+HTLV2wFvfdCs+WEI=", "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v1.15.2/end_to_end_encryption-v1.15.2.tar.gz", "version": "1.15.2", "description": "Provides the necessary endpoint to enable end-to-end encryption.\n\n**Notice:** E2EE is currently not compatible to be used together with server-side encryption", - "homepage": "https://github.com/nextcloud/end_to_end_encryption", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/nextcloud/end_to_end_encryption" }, "forms": { - "sha256": "1hwc7ra12nsr79xp8lkv3ip46bxxbjpaglb0a4k06ikfnzjaddny", + "hash": "sha256-3ram5LduRgMmUWDRp65cvS9Dbhx7UnR7OllbEVQ+jMM=", "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.2.4/forms-v4.2.4.tar.gz", "version": "4.2.4", "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" - ] + "homepage": "https://github.com/nextcloud/forms" }, "gpoddersync": { - "sha256": "1hk052864mb49crmsy2m9alv22rk7ns6m6q7l372j7py9gr8rf60", + "hash": "sha256-wLiM8kv+HinOoAebarQ9MwuxqUpVeF0zS2RVYpAoYMI=", "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.9.0/gpoddersync.tar.gz", "version": "3.9.0", "description": "Expose GPodder API to sync podcast consumer apps like AntennaPod", - "homepage": "https://github.com/thrillfall/nextcloud-gpodder", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/thrillfall/nextcloud-gpodder" }, "groupfolders": { - "sha256": "0s0bsidghrj5k38vbw6xbp7jr57sqb3pn9n2gq24sdklhy81k882", + "hash": "sha256-AqEZkId0Nk0EfsIme8fC+pQsz13d8LXRmEVm+FrUC2g=", "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.1/groupfolders-v17.0.1.tar.gz", "version": "17.0.1", "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" - ] + "homepage": "https://github.com/nextcloud/groupfolders" }, "impersonate": { - "sha256": "01cm643l5d3mrv6f3g1psl94974hichy9vj0hmj3zl0za2zf7mmb", + "hash": "sha256-q9bjvlAf0D9khUDu5CGLkJxEEtU3vOHMznW0QgcxlQU=", "url": "https://github.com/nextcloud-releases/impersonate/releases/download/v1.16.0/impersonate-v1.16.0.tar.gz", "version": "1.16.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" - ] + "homepage": "https://github.com/nextcloud/impersonate" }, "integration_openai": { - "sha256": "0q5fs57n644mad4qvr7pb46dljmdnl4c9wkh2kdhaqnmjsa7zs8j", - "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v2.0.1/integration_openai-v2.0.1.tar.gz", - "version": "2.0.1", + "hash": "sha256-JsdhEQMSUpnpBFQyDPAVGjT6mAgR826FD3EBOFhsr4c=", + "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v2.0.3/integration_openai-v2.0.3.tar.gz", + "version": "2.0.3", "description": "⚠️ The smart pickers have been removed from this app\nas they are now included in the [Assistant app](https://apps.nextcloud.com/apps/assistant).\n\nThis app implements:\n\n* Text generation providers: Free prompt, Summarize, Headline and Reformulate (using any available large language model)\n* A Translation provider (using any available language model)\n* A SpeechToText provider (using Whisper)\n* An image generation provider\n\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance\nor to any service that implements an API similar to the OpenAI one, for example: [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via OpenAI API: πŸ”΄\n\nNegative:\n* the software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* the trained model is not freely available, so the model can not be run on-premises\n* the training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n\n### Rating for Translation using ChatGPT via OpenAI API: πŸ”΄\n\nNegative:\n* the software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* the trained model is not freely available, so the model can not be run on-premises\n* the training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n### Rating for Image generation using DALLΒ·E via OpenAI API: πŸ”΄\n\nNegative:\n* the software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* the trained model is not freely available, so the model can not be ran on-premises\n* the training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via OpenAI API: 🟑\n\nPositive:\n* the software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can run on-premise\n\nNegative:\n* the training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n### Rating for Text generation via LocalAI: 🟒\n\nPositive:\n* the software for training and inferencing of this model is open source\n* the trained model is freely available, and thus can be ran on-premises\n* the training data is freely available, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n\n### Rating for Image generation using Stable Diffusion via LocalAI : 🟑\n\nPositive:\n* the software for training and inferencing of this model is open source\n* the trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* the training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via LocalAI: 🟑\n\nPositive:\n* the software for training and inferencing of this model is open source\n* the trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* the training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", - "homepage": "https://github.com/nextcloud/integration_openai", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/nextcloud/integration_openai" }, "integration_paperless": { - "sha256": "08rgdlinxpcwyq0f97ibv022qhj8smk94dvlf927xq46220w9pfx", + "hash": "sha256-3d3EgRCG4H5EcnQ3kmbVSEIsBNgrnuQA9pzdbiNtLyM=", "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.3/integration_paperless-v1.0.3.tar.gz", "version": "1.0.3", "description": "Integration with the [Paperless](https://docs.paperless-ngx.com) Document Management System.\nIt adds a file action menu item that can be used to upload a file from your Nextcloud Files to Paperless.", - "homepage": "", - "licenses": [ - "agpl" - ] + "homepage": "" }, "mail": { - "sha256": "0bxbzibzsdqmd751759lg3vwhw9nyy5n37snijd083s1498sfqs5", + "hash": "sha256-RWOnUSJBDwSajFafYYv3NnHI93g0lRPKaRU3/Vf8qy8=", "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.2/mail-v3.7.2.tar.gz", "version": "3.7.2", "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" - ] + "homepage": "https://github.com/nextcloud/mail#readme" }, "maps": { - "sha256": "1gqms3rrdpjmpb1h5d72b4lwbvsl8p10zwnkhgnsmvfcf93h3r1c", - "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0/maps-1.4.0.tar.gz", + "hash": "sha256-Qkx4TqZf0ygVNLl6NtyOBiW0DrUlxQlStk/SBw2w9KE=", + "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0-1-nightly/maps-1.4.0-1-nightly.tar.gz", "version": "1.4.0", "description": "**The whole world fits inside your cloud!**\n\n- **πŸ—Ί Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **πŸ–Ό Photos on the map:** No more boring slideshows, just show directly where you were!\n- **πŸ™‹ Contacts on the map:** See where your friends live and plan your next visit.\n- **πŸ“± Devices:** Lost your phone? Check the map!\n- **γ€° Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", - "homepage": "https://github.com/nextcloud/maps", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/nextcloud/maps" }, "memories": { - "sha256": "1wahnkc253bgm0bqciyhfh1iyl8girbj8mzdd29l0k1bks8fr4qc", - "url": "https://github.com/pulsejet/memories/releases/download/v7.3.1/memories.tar.gz", - "version": "7.3.1", - "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **πŸ“Έ Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **βͺ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **πŸ€– AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **πŸ–ΌοΈ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **πŸ«±πŸ»β€πŸ«²πŸ» External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **πŸ“± Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **πŸ“¦ Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **πŸ“Ή Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **πŸ—ΊοΈ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **πŸ“¦ Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚑️ Performance**: Do all this very fast.\n\n## πŸš€ Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the πŸ“· Memories app in Nextcloud and set the directory containing your photos.", - "homepage": "https://memories.gallery", - "licenses": [ - "agpl" - ] + "hash": "sha256-YGDyzBjeSAHI/+OdUnJNhRODv+6c3XZjKyJX/7xNo5Q=", + "url": "https://github.com/pulsejet/memories/releases/download/v7.3.1-rc.3/memories.tar.gz", + "version": "7.3.1-rc.3", + "description": "# Memories: Photo Management for Nextcloud\r\n\r\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\r\n\r\n- **πŸ“Έ Timeline**: Sort photos and videos by date taken, parsed from Exif data.\r\n- **βͺ Rewind**: Jump to any time in the past instantly and relive your memories.\r\n- **πŸ€– AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\r\n- **πŸ–ΌοΈ Albums**: Create albums to group photos and videos together. Then share these albums with others.\r\n- **πŸ«±πŸ»β€πŸ«²πŸ» External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\r\n- **πŸ“± Mobile Support**: Work from any device, of any shape and size through the web app.\r\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\r\n- **πŸ“¦ Archive**: Store photos you don't want to see in your timeline in a separate folder.\r\n- **πŸ“Ή Video Transcoding**: Transcode videos and use HLS for maximal performance.\r\n- **πŸ—ΊοΈ Map**: View your photos on a map, tagged with accurate reverse geocoding.\r\n- **πŸ“¦ Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\r\n- **⚑️ Performance**: Do all this very fast.\r\n\r\n## πŸš€ Installation\r\n\r\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\r\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\r\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\r\n1. Open the πŸ“· Memories app in Nextcloud and set the directory containing your photos.", + "homepage": "https://memories.gallery" }, "music": { - "sha256": "17anhb0zcky4fwmbj1czm536d7k8n03iwsn3dqnyq1b9c4bqyj4m", + "hash": "sha256-lUiPF2FpBewtbsNqHgewaJ5mRqmfBbkqd8RP9sGCVp0=", "url": "https://github.com/owncloud/music/releases/download/v2.0.0/music_2.0.0_for_nextcloud.tar.gz", "version": "2.0.0", "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from m3u, m3u8, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone", - "homepage": "https://github.com/owncloud/music", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/owncloud/music" + }, + "news": { + "hash": "sha256-AhTZGQCLeNgsRBF5w3+Lf9JtNN4D1QncB5t+odU+XUc=", + "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha8/news.tar.gz", + "version": "25.0.0-alpha8", + "description": "πŸ“° A RSS/Atom Feed reader App for Nextcloud\n\n- πŸ“² Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- πŸ”„ Automatic updates of your news feeds\n- πŸ†“ Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", + "homepage": "https://github.com/nextcloud/news" }, "notes": { - "sha256": "0j9bwbfvwwdaabyc79i514sp36cm4i9z02l8bkxlqr9fvim73nn9", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.10.0/notes.tar.gz", - "version": "4.10.0", + "hash": "sha256-I2LsDjZdfFP5okBEIJRJcUMS8V5O9zq0ppMLA0SMI8Y=", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.4/notes-v4.9.4.tar.gz", + "version": "4.9.4", "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" - ] + "homepage": "https://github.com/nextcloud/notes" }, "notify_push": { - "sha256": "14s8g3dqwrxjz1zww64n1lhwdb8374wr1b5v76xhawypmfz2a68h", + "hash": "sha256-EBklvqvXcwW7ObuskDk5A63GIQ2WGM5/+LJnjtt4SJM=", "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.12/notify_push-v0.6.12.tar.gz", "version": "0.6.12", "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" - ] + "homepage": "" }, "onlyoffice": { - "sha256": "1vflj70q8d0hrfck9c5l1k4qa38gpdh3zjgx4aqamnlbvkfssk7h", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.2.2/onlyoffice.tar.gz", - "version": "9.2.2", + "hash": "sha256-9H/ASllarwmSEWCpPGmm6qy7NgSt3NXzJgBxz5v0Db8=", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.3.0/onlyoffice.tar.gz", + "version": "9.3.0", "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", - "homepage": "https://www.onlyoffice.com", - "licenses": [ - "agpl" - ] + "homepage": "https://www.onlyoffice.com" }, "phonetrack": { - "sha256": "1i28xgzp85yb44ay2l2zw18fk00yd6fh6yddj92gdrljb3w9zpap", + "hash": "sha256-V92f+FiS5vZEkq15A51pHoDpUOBfUOEVIcsXdP/rSMQ=", "url": "https://github.com/julien-nc/phonetrack/releases/download/v0.8.1/phonetrack-0.8.1.tar.gz", "version": "0.8.1", "description": "# PhoneTrack Nextcloud application\n\nπŸ“± PhoneTrack is a Nextcloud application to track and store mobile device's locations.\n\nπŸ—Ί It receives information from mobile phone's logging apps and displays it dynamically on a map.\n\n🌍 Help us to translate this app on [PhoneTrack Crowdin project](https://crowdin.com/project/phonetrack).\n\nβš’ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CONTRIBUTING.md).\n\nHow to use PhoneTrack :\n\n* Create a tracking session.\n* Give the logging link\\* to the mobile devices. Choose the [logging method](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#logging-methods) you prefer.\n* Watch the session's devices location in real time (or not) in PhoneTrack or share it with public pages.\n\n(\\*) Don't forget to set the device name in the link (rather than in the logging app settings). Replace \"yourname\" with the desired device name. Setting the device name in logging app settings only works with Owntracks, Traccar and OpenGTS.\n\nOn PhoneTrack main page, while watching a session, you can :\n\n* πŸ“ Display location history\n* β›› Filter points\n* ✎ Manually edit/add/delete points\n* ✎ Edit devices (rename, change colour/shape, move to another session)\n* β›Ά Define geofencing zones for devices\n* βš‡ Define proximity alerts for device pairs\n* πŸ–§ Share a session to other Nextcloud users or with a public link (read-only)\n* πŸ”— Generate public share links with optional restrictions (filters, device name, last positions only, geofencing simplification)\n* πŸ–« Import/export a session in GPX format (one file with one track per device or one file per device)\n* πŸ—  Display sessions statistics\n* πŸ”’ [Reserve a device name](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#device-name-reservation) to make sure only authorised user can log with this name\n* πŸ—“ Toggle session auto export and auto purge (daily/weekly/monthly)\n* β—” Choose what to do when point number quota is reached (block logging or delete oldest point)\n\nPublic page and public filtered page work like main page except there is only one session displayed, everything is read-only and there is no need to be logged in.\n\nThis app is tested on Nextcloud 17 with Firefox 57+ and Chromium.\n\nThis app is compatible with theming colours and accessibility themes !\n\nThis app is under development.\n\n## Install\n\nSee the [AdminDoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc) for installation details.\n\nCheck [CHANGELOG](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CHANGELOG.md#change-log) file to see what's new and what's coming in next release.\n\nCheck [AUTHORS](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/AUTHORS.md#authors) file to see complete list of authors.\n\n## Known issues\n\n* PhoneTrack **now works** with Nextcloud group restriction activated. See [admindoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc#issue-with-phonetrack-restricted-to-some-groups-in-nextcloud).\n\nAny feedback will be appreciated.\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/eneiluj/donate)", - "homepage": "https://github.com/julien-nc/phonetrack", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/julien-nc/phonetrack" }, "polls": { - "sha256": "1s8ym7msl4cax69kr2piphgapllsva1vjh2xb7g03yb7z1hglhjs", - "url": "https://github.com/nextcloud/polls/releases/download/v7.1.2/polls.tar.gz", - "version": "7.1.2", + "hash": "sha256-0K8I86calcBC4BXmuTpVENkUePDsPQxJoxWcgG8vlL4=", + "url": "https://github.com/nextcloud/polls/releases/download/v7.1.3/polls.tar.gz", + "version": "7.1.3", "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" - ] + "homepage": "https://github.com/nextcloud/polls" }, "previewgenerator": { - "sha256": "0505kg4pxa6dqylniwa5ip6h5bama8cp0ng2y7prhb93mnhgr051", + "hash": "sha256-oYD8oK0jLZjv8eJZcBlSVa0CzY1F8Wipx82ofsmbBRQ=", "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.5.0/previewgenerator-v5.5.0.tar.gz", "version": "5.5.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" - ] + "homepage": "https://github.com/nextcloud/previewgenerator" }, "qownnotesapi": { - "sha256": "0y4cv4hagmax4nkdfzysd5fg2h2xak4m87waf3b0ci5f1bwdxdxx", + "hash": "sha256-vbfe+AquRAbWcIofVMlUXUDxXGnaf9emJV3VpyDZjHg=", "url": "https://github.com/pbek/qownnotesapi/releases/download/v24.4.0/qownnotesapi-nc.tar.gz", "version": "24.4.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" - ] + "homepage": "https://github.com/pbek/qownnotesapi" }, "registration": { - "sha256": "1ih7nfswskzpgbqfjsn4lym4cwyq4kbjv9m9cmy4g4nx44gr0dkl", + "hash": "sha256-dDaQHyHdkkd8ZammLdck2HNGqqfEaunwevdPzbWzB8Y=", "url": "https://github.com/nextcloud-releases/registration/releases/download/v2.4.0/registration-v2.4.0.tar.gz", "version": "2.4.0", "description": "User registration\n\nThis app allows users to register a new account.\n\n# Features\n\n- Add users to a given group\n- Allow-list with email domains (including wildcard) to register with\n- Administrator will be notified via email for new user creation or require approval\n- Supports Nextcloud's Client Login Flow v1 and v2 - allowing registration in the mobile Apps and Desktop clients\n\n# Web form registration flow\n\n1. User enters their email address\n2. Verification link is sent to the email address\n3. User clicks on the verification link\n4. User is lead to a form where they can choose their username and password\n5. New account is created and is logged in automatically", - "homepage": "https://github.com/nextcloud/registration", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/nextcloud/registration" }, "richdocuments": { - "sha256": "0x1x4x21sknih87gzqzmhxnvi1s1h4j70i4wsn7hnpdvc9j830vs", + "hash": "sha256-eoOBZGK7XQuP1ZxEcCSBQYe4bYf14/8OgtFOHUQnPXQ=", "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.4.3/richdocuments-v8.4.3.tar.gz", "version": "8.4.3", "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.", - "homepage": "https://collaboraoffice.com/", - "licenses": [ - "agpl" - ] + "homepage": "https://collaboraoffice.com/" }, "spreed": { - "sha256": "1ydd156cjhjydbjmzjm0bq0garxfgbppgd7q6bfz04y10yjyjkah", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.3/spreed-v19.0.3.tar.gz", - "version": "19.0.3", + "hash": "sha256-UGVhg1YYtKLOF/2Yt3SLFZbt0RxKpfIhDV0mzgm8mFY=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.6/spreed-v19.0.6.tar.gz", + "version": "19.0.6", "description": "Chat, video & audio-conferencing using WebRTC\n\n* πŸ’¬ **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* πŸ‘₯ **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* πŸ’» **Screen sharing!** Share your screen with the participants of your call.\n* πŸš€ **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* πŸŒ‰ **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", - "homepage": "https://github.com/nextcloud/spreed", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/nextcloud/spreed" }, "tasks": { - "sha256": "1g2wqsm9kjm7dri75ghix2hb5vby3vy3ibcvmwfdwsab3a12xbrg", + "hash": "sha256-L68ughpLad4cr5utOPwefu2yoOgRvnJibqfKmarGXLw=", "url": "https://github.com/nextcloud/tasks/releases/download/v0.16.0/tasks.tar.gz", "version": "0.16.0", "description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.", - "homepage": "https://github.com/nextcloud/tasks/", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/nextcloud/tasks/" }, "twofactor_nextcloud_notification": { - "sha256": "0qpg6i6iw6ldnryf0p56kd7fgs5vyckw9m6yjcf8r4j3mwfka273", + "hash": "sha256-4wg1Ha9Dkowck97UxCfzu+jnTpumXOB8to0aHk0072I=", "url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.9.0/twofactor_nextcloud_notification-v3.9.0.tar.gz", "version": "3.9.0", "description": "Allows using any of your logged in devices as second factor", - "homepage": "https://github.com/nextcloud/twofactor_nextcloud_notification", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/nextcloud/twofactor_nextcloud_notification" }, "twofactor_webauthn": { - "sha256": "0llxakzcdcy9hscyzw3na5zp1p57h03w5fmm0gs9g62k1b88k6kw", - "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.4.0/twofactor_webauthn-v1.4.0.tar.gz", - "version": "1.4.0", + "hash": "sha256-+hG5eJUMMKJUmfBnU4BhEf+6QnTAw4TXi4Ij18z3Ru8=", + "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.4.0-rc.1/twofactor_webauthn-v1.4.0-rc.1.tar.gz", + "version": "1.4.0-rc.1", "description": "A two-factor provider for WebAuthn devices", - "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme" }, "unroundedcorners": { - "sha256": "16h8zg7k18r01yx2a72bn22nmvbafrs3ksyy23fbrnirzgwcaaqf", + "hash": "sha256-DivF+Ps52rzcEN7rOXR2au1qhbBLHCW6DyCjMM/7CJo=", "url": "https://github.com/OliverParoczai/nextcloud-unroundedcorners/releases/download/v1.1.3/unroundedcorners-v1.1.3.tar.gz", "version": "1.1.3", "description": "# Unrounded Corners\nA Nextcloud app that restores the corners of buttons and widgets to their original looks by unrounding them.", - "homepage": "https://github.com/OliverParoczai/nextcloud-unroundedcorners", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/OliverParoczai/nextcloud-unroundedcorners" }, "user_oidc": { - "sha256": "1qarpmwk66mz6mvif0cc4jb7wi4yv76flzwhyvmzxk0ahafpi8x1", + "hash": "sha256-oaN4nYIKzP7r9pB/6szZnkR+liSMARd3Nb8aM3m9WeE=", "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v5.0.3/user_oidc-v5.0.3.tar.gz", "version": "5.0.3", "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", - "homepage": "https://github.com/nextcloud/user_oidc", - "licenses": [ - "agpl" - ] + "homepage": "https://github.com/nextcloud/user_oidc" }, "user_saml": { - "sha256": "1dw5mwzzlhfwarnnpsij3l6153psl83qkjmgm0bnipy4v8wkkqvj", + "hash": "sha256-cuM5OdrE32gXqK/KiQei+o4SDB0y6mttVtxB+j+vhbc=", "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.1.3/user_saml-v6.1.3.tar.gz", "version": "6.1.3", "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" - ] + "homepage": "https://github.com/nextcloud/user_saml" } } From 2d4e578c1291b13331dc18c77270d0ed406826db Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 14 Jul 2024 23:48:38 +0200 Subject: [PATCH 12/60] lerc: move to finalAttrs We'll need to use finalPackage if we want to test for the presence of pkg-config files via passthru.tests. --- pkgs/development/libraries/lerc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/lerc/default.nix b/pkgs/development/libraries/lerc/default.nix index f7bba5125a72..031f8531b1a9 100644 --- a/pkgs/development/libraries/lerc/default.nix +++ b/pkgs/development/libraries/lerc/default.nix @@ -5,7 +5,7 @@ , cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lerc"; version = "4.0.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "esri"; repo = "lerc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-IHY9QtNYsxPz/ksxRMZGHleT+/bawfTYNVRSTAuYQ7Y="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) From e778af3e6a74523aabf80179f873b20241570130 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 14 Jul 2024 23:50:06 +0200 Subject: [PATCH 13/60] lerc: expose available pkg-config modules via meta --- pkgs/development/libraries/lerc/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/lerc/default.nix b/pkgs/development/libraries/lerc/default.nix index 031f8531b1a9..463344f5b7f6 100644 --- a/pkgs/development/libraries/lerc/default.nix +++ b/pkgs/development/libraries/lerc/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , fetchpatch , cmake +, testers }: stdenv.mkDerivation (finalAttrs: { @@ -31,10 +32,15 @@ stdenv.mkDerivation (finalAttrs: { cmake ]; + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + meta = { description = "C++ library for Limited Error Raster Compression"; homepage = "https://github.com/esri/lerc"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dotlambda ]; + pkgConfigModules = [ "Lerc" ]; }; }) From 89b986d4552d6a6ed5e8e686c564081d37751ff7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 15 Jul 2024 15:47:07 +0200 Subject: [PATCH 14/60] nix-update: unpin python3 --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e810e7726d56..46db2741c91a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39225,9 +39225,7 @@ with pkgs; nix-query-tree-viewer = callPackage ../tools/nix/nix-query-tree-viewer { }; - nix-update = callPackage ../tools/package-management/nix-update { - python3 = python311; - }; + nix-update = callPackage ../tools/package-management/nix-update { }; nix-update-source = callPackage ../tools/package-management/nix-update-source { }; From 5afbc8074215c086acbc251070476eeb27009a57 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 15 Jul 2024 23:36:29 +0200 Subject: [PATCH 15/60] python312Packages.pyindego: 3.1.1 -> 3.2.1 https://github.com/sander1988/pyIndego/releases/tag/3.2.0 https://github.com/sander1988/pyIndego/releases/tag/3.2.1 --- .../python-modules/pyindego/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyindego/default.nix b/pkgs/development/python-modules/pyindego/default.nix index 98e5e3ba6ee6..2f2ceb9d59a1 100644 --- a/pkgs/development/python-modules/pyindego/default.nix +++ b/pkgs/development/python-modules/pyindego/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, # build-system setuptools, @@ -20,15 +20,20 @@ buildPythonPackage rec { pname = "pyindego"; - version = "3.1.1"; + version = "3.2.1"; pyproject = true; - src = fetchPypi { - pname = "pyIndego"; - inherit version; - hash = "sha256-lRDi6qYMaPI8SiSNe0vzlKb92axujt44aei8opNPDug="; + src = fetchFromGitHub { + owner = "jm-73"; + repo = "pyIndego"; + rev = "refs/tags/${version}"; + hash = "sha256-wPQocacWwWjEH4boMZ33aW/NPvdD6LSmMTFXGwBwwq8="; }; + postPatch = '' + sed -i "/addopts/d" pytest.ini + ''; + build-system = [ setuptools ]; dependencies = [ From 9f03c0e1906f698e04d35c5e5cc6a180ae49d6c3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 15 Jul 2024 23:54:19 +0200 Subject: [PATCH 16/60] buildHomeAssistantComponent: catch invalid requirements Catch, log and ignore requirement specifiers that cannot be parsed. --- .../build-custom-component/check_manifest.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/build-custom-component/check_manifest.py b/pkgs/servers/home-assistant/build-custom-component/check_manifest.py index 463a7579763d..a8fd9505e52f 100644 --- a/pkgs/servers/home-assistant/build-custom-component/check_manifest.py +++ b/pkgs/servers/home-assistant/build-custom-component/check_manifest.py @@ -5,17 +5,21 @@ import os import sys import importlib_metadata -from packaging.requirements import Requirement +from packaging.requirements import InvalidRequirement, Requirement -def error(msg: str) -> None: +def error(msg: str, ret: bool = False) -> None: print(f" - {msg}", file=sys.stderr) - return False + return ret def check_requirement(req: str): # https://packaging.pypa.io/en/stable/requirements.html - requirement = Requirement(req) + try: + requirement = Requirement(req) + except InvalidRequirement: + return error(f"{req} could not be parsed", ret=True) + try: version = importlib_metadata.distribution(requirement.name).version except importlib_metadata.PackageNotFoundError: From a5e3f9ca8531d5061bda061356c93feca3548ca6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 15 Jul 2024 23:55:10 +0200 Subject: [PATCH 17/60] home-assistant-custom-components.indego: 5.5.0 -> 5.7.2 https://github.com/jm-73/Indego/releases/tag/5.7.2 --- .../home-assistant/custom-components/indego/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/indego/default.nix b/pkgs/servers/home-assistant/custom-components/indego/default.nix index 657d8b80a862..607590e5bc3d 100644 --- a/pkgs/servers/home-assistant/custom-components/indego/default.nix +++ b/pkgs/servers/home-assistant/custom-components/indego/default.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "jm-73"; domain = "indego"; - version = "5.5.0"; + version = "5.7.2"; src = fetchFromGitHub { owner = "jm-73"; repo = "Indego"; rev = "refs/tags/${version}"; - hash = "sha256-ur6KOqU6KAseABL0ibpGJ6109wSSZq9HWSVbMIrRSqc="; + hash = "sha256-9q8aHbAMIA2xKhZl/CDXWSV1ylDCEVkpL8OUlELoG0Q="; }; dependencies = [ pyindego ]; @@ -23,8 +23,7 @@ buildHomeAssistantComponent rec { description = "Bosch Indego lawn mower component"; changelog = "https://github.com/jm-73/Indego/releases/tag/${version}"; homepage = "https://github.com/jm-73/Indego"; - # https://github.com/jm-73/pyIndego/issues/125 - license = licenses.unfree; + license = licenses.asl20; maintainers = with maintainers; [ hexa ]; }; } From 2b5a6f021e304de84401c1cc548d26e3d50c932a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Tue, 16 Jul 2024 09:20:52 -0400 Subject: [PATCH 18/60] open-fprintd: add gapps wrapper --- pkgs/by-name/op/open-fprintd/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/op/open-fprintd/package.nix b/pkgs/by-name/op/open-fprintd/package.nix index b8c8b765d550..45aac839e399 100644 --- a/pkgs/by-name/op/open-fprintd/package.nix +++ b/pkgs/by-name/op/open-fprintd/package.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages, gobject-introspection, wrapGAppsNoGuiHook }: python3Packages.buildPythonPackage rec { pname = "open-fprintd"; @@ -11,6 +11,8 @@ python3Packages.buildPythonPackage rec { sha256 = "sha256-uVFuwtsmR/9epoqot3lJ/5v5OuJjuRjL7FJF7oXNDzU="; }; + nativeBuildInputs = [ wrapGAppsNoGuiHook gobject-introspection ]; + propagatedBuildInputs = with python3Packages; [ dbus-python pygobject3 ]; checkInputs = with python3Packages; [ dbus-python ]; @@ -30,6 +32,9 @@ python3Packages.buildPythonPackage rec { --replace /usr/lib/open-fprintd "$out/lib/open-fprintd" ''; + dontWrapGApps = true; + makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ]; + postFixup = '' wrapPythonProgramsIn "$out/lib/open-fprintd" "$out $pythonPath" ''; From 805cdc576a8a30f648d211c2de7ec49a8ab9c299 Mon Sep 17 00:00:00 2001 From: schnow265 Date: Tue, 16 Jul 2024 18:14:38 +0200 Subject: [PATCH 19/60] goread: init at 1.6.5 --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/by-name/go/goread/package.nix | 26 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/by-name/go/goread/package.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 71b77206588d..4e8c1a100bd2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18050,6 +18050,12 @@ githubId = 70169773; name = "Tarun Chinmai Sekar"; }; + schnow265 = { + email = "thesnowbox@icloud.com"; + github = "schnow265"; + githubId = 57457177; + name = "Luca Scalet"; + }; schmitthenner = { email = "development@schmitthenner.eu"; github = "fkz"; diff --git a/pkgs/by-name/go/goread/package.nix b/pkgs/by-name/go/goread/package.nix new file mode 100644 index 000000000000..e0d8c424587d --- /dev/null +++ b/pkgs/by-name/go/goread/package.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "goread"; + version = "1.6.5"; + + src = fetchFromGitHub { + owner = "TypicalAM"; + repo = "goread"; + rev = "v${version}"; + hash = "sha256-SRVXcdgtRpWqvO28CnUcx40nFJnG+Hd94Ezgaj5xK6A="; + }; + + vendorHash = "sha256-/kxEnw8l9S7WNMcPh1x7xqiQ3L61DSn6DCIvJlyrip0="; + + env.TEST_OFFLINE_ONLY = 1; + + meta = { + description = "Beautiful program to read your RSS/Atom feeds right in the terminal"; + homepage = "https://github.com/TypicalAM/goread"; + changelog = "https://github.com/TypicalAM/goread/releases/tag/v${version}"; + license = lib.licenses.gpl3Plus; + mainProgram = "goread"; + maintainers = with lib.maintainers; [ schnow265 ]; + }; +} From 872c8fa5ce0b04f1477d9b0fc2b1054185cbd25c Mon Sep 17 00:00:00 2001 From: schnow265 Date: Tue, 16 Jul 2024 20:54:28 +0200 Subject: [PATCH 20/60] maintainers: add schnow265 --- maintainers/maintainer-list.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4e8c1a100bd2..ff6eb5281698 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18050,12 +18050,6 @@ githubId = 70169773; name = "Tarun Chinmai Sekar"; }; - schnow265 = { - email = "thesnowbox@icloud.com"; - github = "schnow265"; - githubId = 57457177; - name = "Luca Scalet"; - }; schmitthenner = { email = "development@schmitthenner.eu"; github = "fkz"; @@ -18074,6 +18068,12 @@ githubId = 15379000; name = "schneefux"; }; + schnow265 = { + email = "thesnowbox@icloud.com"; + github = "schnow265"; + githubId = 57457177; + name = "Luca Scalet"; + }; schnusch = { github = "schnusch"; githubId = 5104601; From a02168707ce9d2cdd49c92bc2a710a0b49042ff5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Jul 2024 00:57:04 +0000 Subject: [PATCH 21/60] delve: 1.22.1 -> 1.23.0 --- pkgs/development/tools/delve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index fb0c6cbaf744..4552539bb76e 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "delve"; - version = "1.22.1"; + version = "1.23.0"; src = fetchFromGitHub { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - hash = "sha256-rR84muba8nMrPZAhH+8xXOOxBvKIsU8Xju8tG7BjqBo="; + hash = "sha256-LtrPcYyuobHq6O3/vBKLTOMZfpYL7P3mtGfVqCMV9iM="; }; vendorHash = null; From 32c08ba0ca88d7021014d623aaf846d2606332fc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 17 Jul 2024 15:05:27 +0200 Subject: [PATCH 22/60] esphome: build dashboard from source --- pkgs/tools/misc/esphome/dashboard.nix | 41 +++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index 0b485ad49e6a..4f78863812e2 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -1,19 +1,48 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, fetchNpmDeps + +# build-system +, setuptools +, nodejs +, npmHooks + }: buildPythonPackage rec { pname = "esphome-dashboard"; version = "20240620.0"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - pname = "esphome_dashboard"; - inherit version; - hash = "sha256-lx3i8Z2PUefyibCNiQ4zPEwfgXr6r/TVa9TBF0YE5fA="; + src = fetchFromGitHub { + owner = "esphome"; + repo = "dashboard"; + rev = "refs/tags/${version}"; + hash = "sha256-LmIxfX3rcRK90h31J0B5T02f48MCctFERgXxf0zkDm0="; }; + npmDeps = fetchNpmDeps { + inherit src; + hash = "sha256-xMVESS1bPNJF07joUgY8ku+GWtflWhM8mYAv0emggc8="; + }; + + build-system = [ setuptools ]; + + nativeBuildInputs = [ + nodejs + npmHooks.npmConfigHook + ]; + + postPatch = '' + # https://github.com/esphome/dashboard/pull/639 + patchShebangs script/build + ''; + + preBuild = '' + script/build + ''; + # no tests doCheck = false; From 7b5fa260f3f959ea2dae7148ce699ac043fc7410 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 17 Jul 2024 15:12:14 +0200 Subject: [PATCH 23/60] esphome: 2024.6.6 -> 2024.7.0 https://github.com/esphome/esphome/releases/tag/2024.7.0 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index d9d05b161dd0..55e3f56a0471 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -19,14 +19,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.6.6"; + version = "2024.7.0"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/EGj6kEgUhQefdFz/IllKWeVGLhC3STiOOsy3Pq4pIM="; + hash = "sha256-bQGsLt8+WPaQfQ9ReKGrIS1O071LkpAxJerfHO3E0Oc="; }; nativeBuildInputs = with python.pkgs; [ From e1dcb38f8a27794db769164fc7bf68639d34bcb4 Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 17 Jul 2024 22:45:37 +0800 Subject: [PATCH 24/60] nixVersions.git: pre20240709_142e566a -> pre20240717_464e5925 --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 127e7f8490c2..23cb64fd8a8c 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -186,12 +186,12 @@ in lib.makeExtensible (self: ({ git = (common rec { version = "2.24.0"; - suffix = "pre20240709_${lib.substring 0 8 src.rev}"; + suffix = "pre20240717_${lib.substring 0 8 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "142e566adbce587a5ed97d1648a26352f0608ec5"; - hash = "sha256-fYZGuB/4LOBoMSUNj/yRU1mWm9lhdTzXF0P+zmac0hw="; + rev = "464e5925cb21150e3c94f31224efabd3c1e74237"; + hash = "sha256-C9pE0ghVURE3nLZmmgTG6CnGvWQ84g2lcyN7KKGCfN8="; }; self_attribute_name = "git"; }).override (lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { From 438b1e92cd592b99ab12826b8588cfe954244688 Mon Sep 17 00:00:00 2001 From: "\"Gaetan Lepage\"" <"gaetan@glepage.com"> Date: Thu, 18 Jul 2024 08:00:36 +0200 Subject: [PATCH 25/60] vimPlugins: update on 2024-07-18 --- .../editors/vim/plugins/generated.nix | 514 +++++++++--------- 1 file changed, 257 insertions(+), 257 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index cbf0b1aeb7c9..d8514b6c37d0 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -65,12 +65,12 @@ final: prev: CopilotChat-nvim = buildVimPlugin { pname = "CopilotChat.nvim"; - version = "2024-05-31"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "CopilotC-Nvim"; repo = "CopilotChat.nvim"; - rev = "82923efe22b604cf9c0cad0bb2a74aa9247755ab"; - sha256 = "0dh4hy62xjd8kjnmcflrsdj02b6wrakzppcawfj8r7w1nnbsmlbd"; + rev = "92bc7b5e564c23b12b2ed41dd7657fdafe39d95f"; + sha256 = "05qb3817bp7mmqvaqhcy3cffqfbcmryymjd357vxqaw30b44rxmz"; }; meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/"; }; @@ -185,12 +185,12 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2024-07-14"; + version = "2024-07-18"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "45af7e1fed5273b027105ecf4026e4c452cc7508"; - sha256 = "0c4kcnb8h7rllsl3f9zdsqmpj37vqk2wjkr63q5q2gbc8is3ny9r"; + rev = "d2483f19cee5234db1e010e6560d9aa9bb60bb30"; + sha256 = "19rshs3zbmm8p76w4yzy426g2mw746qs5xs8aw9f5xvgkc90b0ri"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; @@ -329,12 +329,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2024-07-11"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "37274739232b6a888be7c6ca5f1a2d58510a9a84"; - sha256 = "0r0a854z0glxjqk5g8jx55j5363vm1ldp39gssd0svj2lgqcajnk"; + rev = "57116dd9fd9ee4d73c1e9a1335d92b4c71851cf7"; + sha256 = "1sms1wgxmsidrb5isxkn9wig0a9aa3ipl7zl9babs1adnbgkf8l8"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -534,12 +534,12 @@ final: prev: advanced-git-search-nvim = buildVimPlugin { pname = "advanced-git-search.nvim"; - version = "2024-05-13"; + version = "2024-06-03"; src = fetchFromGitHub { owner = "aaronhallaert"; repo = "advanced-git-search.nvim"; - rev = "d11e1360b7cdb9270673b7852bbc1e91e1af25da"; - sha256 = "12ymb4n81z8brzc6n19h5mfb1pnfxwrnvgnss6wqjilzqa1cmjzw"; + rev = "198cc402af1790ab26830fdbf24a28c336a20ba6"; + sha256 = "0xyhbqvbfdbd73awizn8zyq9qqrrdqpmrgdj20xv61kak5pd6ar3"; }; meta.homepage = "https://github.com/aaronhallaert/advanced-git-search.nvim/"; }; @@ -558,12 +558,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2024-07-01"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "db0af491ff13c18a966ce2f9ac7f5211aec000a7"; - sha256 = "0v0064c0prsxm7z151nd7fvfwq6na5agbh3dqnj9whnwx0k0l2zl"; + rev = "4e77964569ef47a70f9bb76c668dcfea2d089d5a"; + sha256 = "0dbcks0v8awrpl1fbnk4zrkhsrvm8c8h6jfyphgj2vi37x72r5lz"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -667,12 +667,12 @@ final: prev: aniseed = buildVimPlugin { pname = "aniseed"; - version = "2023-07-06"; + version = "2024-07-14"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "7bc09736f3651c10d29b82d1a465b7f540614be1"; - sha256 = "19r8kvrl8nghk9f5wdig26kj51p3dbp0g73gcvn07sjpchbb2fm0"; + rev = "9531eb0dae5a9347eda8f0fc04af7b2b7c908eb0"; + sha256 = "10qgcy29mgmdpnrdf1k9wip5glmzzhw8ikkx48p7b6qdmgfkg1c6"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -739,12 +739,12 @@ final: prev: astrotheme = buildVimPlugin { pname = "astrotheme"; - version = "2024-07-12"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrotheme"; - rev = "a5468ae2ccd1b727308ac10f83bd5ec7c7e4703d"; - sha256 = "06rcj3brax6q4flkkai86drmz6xbyxgdp454cpx3q8j5yywr0h1x"; + rev = "c52dad31bb0000524ca4003222c9ed0f4e8c3058"; + sha256 = "1y3ak78663iv838la2cj0jv8lj0j8qf27fz7558008w88hlvcjmn"; }; meta.homepage = "https://github.com/AstroNvim/astrotheme/"; }; @@ -943,12 +943,12 @@ final: prev: auto-session = buildVimPlugin { pname = "auto-session"; - version = "2024-07-09"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "4b0728715e674ad9c18f1519127dcaed59f9981b"; - sha256 = "07yk89s02nvr2r69rqbsjgl4rr8rr6ii33wpnha06x863f896kfj"; + rev = "08c279882d4117a3e6ade1a014f7cf4af7c34fec"; + sha256 = "03pyg708b3ad7kqc2m0nnvavbind245c4yzi01c1fpl420cdccfj"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -1027,12 +1027,12 @@ final: prev: ayu-vim = buildVimPlugin { pname = "ayu-vim"; - version = "2020-05-29"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "ayu-theme"; repo = "ayu-vim"; - rev = "0745635421688ce777f663d13531996cb4da6514"; - sha256 = "0w7ixhz72g3lr1hkn450k6x8sdgv95pp6pxbykka3s01i506rzmj"; + rev = "01faacb4cb76e8cf72ad9858c581d80876260ab3"; + sha256 = "0z94mdjba5n3nva9qcv3ma4s1qdb8q39azd1ka014cyb62nnjnw4"; }; meta.homepage = "https://github.com/ayu-theme/ayu-vim/"; }; @@ -1076,12 +1076,12 @@ final: prev: barbar-nvim = buildVimPlugin { pname = "barbar.nvim"; - version = "2024-05-28"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "d181f2cfd4b828f9c6f1e10e69c68241de59f54f"; - sha256 = "1qxhi60h5vy3ygm66i18122ib1xr01l8m6jn43bfav6x74jdr3si"; + rev = "53b5a2f34b68875898f0531032fbf090e3952ad7"; + sha256 = "0vzjgk5w55wbhf26dsk9m0ffdvwmkmsb3rgpwf989vbxcqmw8haw"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -1328,12 +1328,12 @@ final: prev: bufferline-nvim = buildVimPlugin { pname = "bufferline.nvim"; - version = "2024-07-10"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "aa16dafdc642594c7ade7e88d31a6119feb189d6"; - sha256 = "0sy72k5lppdnf52m6qj7z08pc8s0bww4jimbdqhv2m6ndk3y7vin"; + rev = "2e3c8cc5a57ddd32f1edd2ffd2ccb10c09421f6c"; + sha256 = "14n1pv8svb22hvcan8yyzqn8pgmf50yn47xmp98m05ap5zf42rj1"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1412,12 +1412,12 @@ final: prev: chadtree = buildVimPlugin { pname = "chadtree"; - version = "2024-06-17"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "156372cb7485a49b02229bd1e3d07fccc5a1c089"; - sha256 = "1yrncyvfqa16vypdh7ay0nb7wzgidd3cxx81bc01jw4h3f1gfrx0"; + rev = "2416f72fb17834a0dd0fe4ab8ccb0a1c1b6aaf0b"; + sha256 = "0p8r5g77qd1riml9w4dwzk6lq9xx6w9yp8yp43221avj7imi35dn"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1460,12 +1460,12 @@ final: prev: cinnamon-nvim = buildVimPlugin { pname = "cinnamon.nvim"; - version = "2024-07-14"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "declancm"; repo = "cinnamon.nvim"; - rev = "6ac53b8c303235b8cfe00eef139505f6553caaca"; - sha256 = "1kj8zdh2rag61lzkxff8srl7iwldqib18bkbibkarrvf0hh0msgn"; + rev = "d097999fb4230ead4774bee0f0542cac6d7bd94e"; + sha256 = "0jy1p5axmdjq171ylqfvlnyrm4yri9zqflza5725zvs6d0nrycxz"; }; meta.homepage = "https://github.com/declancm/cinnamon.nvim/"; }; @@ -1627,12 +1627,12 @@ final: prev: cmp-beancount = buildVimPlugin { pname = "cmp-beancount"; - version = "2024-06-03"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "crispgm"; repo = "cmp-beancount"; - rev = "c8a2533828b84546ae279d60137aec92bd52dc72"; - sha256 = "0cc6xgy6awzjz49rmy74znrgjcq8lw6q9krz75fv9cywd7gw8r6p"; + rev = "29e23297c06b9d69771e4b14e0fb3b9d583a150e"; + sha256 = "12vh55n94klk2jc31mpgb1lap5ki4767lwrgv5zib4vs9y597pn8"; }; meta.homepage = "https://github.com/crispgm/cmp-beancount/"; }; @@ -1747,12 +1747,12 @@ final: prev: cmp-dictionary = buildVimPlugin { pname = "cmp-dictionary"; - version = "2024-06-22"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "e6e3ec979b586a75c53e72f2d6a035f28bb3979c"; - sha256 = "1nz0ywakqvvscrvdzk86w8f29s8mrcyln2jqgh24kvic5zwb66xj"; + rev = "42866957964aa698d53f222395dbd1e334e77fdd"; + sha256 = "01p2xj1m6p18f40i8h88kcrmzzswrg1cr03p0wmsq9lmjnic6782"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; @@ -1819,12 +1819,12 @@ final: prev: cmp-git = buildVimPlugin { pname = "cmp-git"; - version = "2024-07-13"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "petertriho"; repo = "cmp-git"; - rev = "22116bdffbe68bfc6ca05d52e9f217587cbfea8b"; - sha256 = "1zmw0mxfzh6gy5lqc3zi7q1mk8m7mip1fq62j2jrxqll26nj7d6d"; + rev = "3d83031c4b63f9b10703e32e070cda0700a81992"; + sha256 = "1vnd05v6ni7kn3qkrmm75ns2p29liyl1b1xl56whijp0r0v26s89"; }; meta.homepage = "https://github.com/petertriho/cmp-git/"; }; @@ -2275,12 +2275,12 @@ final: prev: coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2024-07-04"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "51692dc1d148f67f18573d1afeb4724dc5a06506"; - sha256 = "1a0ajf8wm942y0l1bpj26kqlp51hqmxjhdlvm40ls5knna7cn8qi"; + rev = "ebe2a2058ed85d3884f8010a53bac25edbf9675c"; + sha256 = "0yva1z27zqb7qm4zfvni7kp9yy4zjk9hfs3h8rjf7vjldk6l8xmx"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -2503,12 +2503,12 @@ final: prev: compiler-nvim = buildVimPlugin { pname = "compiler.nvim"; - version = "2024-06-25"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "Zeioth"; repo = "compiler.nvim"; - rev = "4ad0395994f374e6c797266ea4acca90927f19aa"; - sha256 = "1fj2n5p335as4cdrn0msi8a4dmzwdcplwlka8hra2p1avrnv8lw7"; + rev = "892c1aac059b7df16dc636eea9e34be53f53ff96"; + sha256 = "07dzl4zyhxf2y2pv4wijs597807jznnrd15gzl48snsnkdrx252s"; }; meta.homepage = "https://github.com/Zeioth/compiler.nvim/"; }; @@ -2587,12 +2587,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2024-07-01"; + version = "2024-07-18"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "cd75be867f2331b22905f47d28c0c270a69466aa"; - sha256 = "0lck0dzrisb3p4gw1qfyh4874nfj74ariw274s6nzqz39bk8nmqq"; + rev = "acc7d93f4a080fec587a99fcb36cffa29adc4bad"; + sha256 = "1qja8r6643kgj4x0rjbddkkfsrkhnv3361s8w7amkcv8qkm2s2m3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -3298,12 +3298,12 @@ final: prev: dial-nvim = buildVimPlugin { pname = "dial.nvim"; - version = "2024-06-24"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "750f802879c90ea51f92b68c35fa562ee575804a"; - sha256 = "0zcg3lyxjib9323dwilplgycxx0gcakfncficf3niw76j7zqgw9c"; + rev = "ed4d6a5bbd5e479b4c4a3019d148561a2e6c1490"; + sha256 = "15qh38igdi46id6y94w2ymx91n4gmfl1xv6i4am27g65l95fcfmm"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; @@ -3454,12 +3454,12 @@ final: prev: edgy-nvim = buildVimPlugin { pname = "edgy.nvim"; - version = "2024-07-13"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "folke"; repo = "edgy.nvim"; - rev = "9ea7b22048f08a1a0d49a4a789e36c2fe1b8579f"; - sha256 = "01cbbdwc4b3knyikjv860hhgvjj04z9nj9dr638d0hc5kb84bzap"; + rev = "0e8bbab4eba9dab6c237e4a2e146dc0466897be6"; + sha256 = "0qw0pm7rpd5g6lhmfkpbyjlg7rrwycqwzs73k7j0bdlz84v72zky"; }; meta.homepage = "https://github.com/folke/edgy.nvim/"; }; @@ -3491,12 +3491,12 @@ final: prev: efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2024-05-21"; + version = "2024-07-14"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "eb2be5b24dbf7200a80bcd5c64bc63afbc8ae86f"; - sha256 = "1k7spx8iagmklrbb3l6dmj217j8110nja03dhpz52znzsir5vlpj"; + rev = "1e3210cb48ba14cf154c88c59702dafb321c79db"; + sha256 = "0h6ga4zhmb11xrjisavv8qg71vpz7564h1lrc6j7m4hmzp0mkv89"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; @@ -3781,12 +3781,12 @@ final: prev: flash-nvim = buildVimPlugin { pname = "flash.nvim"; - version = "2024-07-13"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "folke"; repo = "flash.nvim"; - rev = "d0799ae43a581d9f190e182e2a1f389d2887c42a"; - sha256 = "00ssl7kw2rfxvsf9gsgisf03gcyw0sfap8y71923b3rmydbgmyya"; + rev = "25ba3f4d1e0b080213b39518ebcfbb693a23c957"; + sha256 = "08qzxzxjr3v4djhrmgrfqsm9nznsq81p78001s1mlcbh9679qkpd"; }; meta.homepage = "https://github.com/folke/flash.nvim/"; }; @@ -3925,12 +3925,12 @@ final: prev: friendly-snippets = buildVimPlugin { pname = "friendly-snippets"; - version = "2024-07-08"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "45a1b96e46efe5fce8af325d4bed45feb9d29d0f"; - sha256 = "1dvv9r27dc5arc1s3jx5xxcjxck3rhhrjq2mb8rz743i94k7kmrd"; + rev = "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4"; + sha256 = "1jkm5hxgpa0l6qmr0mspykcndl4nh50lk13q4b7rv3byfryv40ck"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -4033,12 +4033,12 @@ final: prev: fzf-lua = buildNeovimPlugin { pname = "fzf-lua"; - version = "2024-07-13"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "3d214f8db4a4119723ab5148b7a333aab3fa9063"; - sha256 = "14x6ncsgg8n3hica44wdywhjpvvp5z268y20f69s1vp9b8czayhp"; + rev = "023b95078f9cc28ce67d7a7a6b4ea1bc7cfa488d"; + sha256 = "159xkgrvgp34446nyq5k8ngymk36mxdgrk0xy5yybbdxy90akmld"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -4225,12 +4225,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2024-07-12"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "e9c4187c3774a46df2d086a66cf3a7e6bea4c432"; - sha256 = "1v14z5qpl2bdxdim7sb6mywcqcs88mgdj1h0n7f7giy9r6l6p0q5"; + rev = "f4928ba14eb6c667786ac7d69927f6aee6719f1e"; + sha256 = "1pgj1dn4xdsf4rgv44n3j8rcg5rxp2f45sidzlmdrqnfp5vm6mc8"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4285,12 +4285,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2024-06-29"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "cde0c7a110c0f65b9e4e6baf342654268efff371"; - sha256 = "0xmyy4wahgi097ay7bs091q9d7ysvknargnlcg8l7qsq6wipl4d9"; + rev = "033344ddfa3cd5cfd55037903264b2bb86691619"; + sha256 = "15i8699kw32liq82632ngc1bfr1vasy8f8wag7im1kin9s8bw5c3"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -5365,24 +5365,24 @@ final: prev: lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2024-07-13"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "b02c9eae6a250f98908c146d1dc1a891f5019f0a"; - sha256 = "077rya8jmh3i52zgkrj30pzaxammqgx7pphr38f832mrqf7c9yyq"; + rev = "6ca90a21202808796418e46d3cebfbb5a44e54a2"; + sha256 = "1xf02z09ah023yhzh4nzj7pvfhp5rbdyxw1zgidjyzs9yjr8xjyh"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; lazydev-nvim = buildVimPlugin { pname = "lazydev.nvim"; - version = "2024-07-13"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "folke"; repo = "lazydev.nvim"; - rev = "178093a8c57c56be975118171992b5c80f041032"; - sha256 = "14zmv9474fqdrx1p252v72vp311ch9fz3hif1v13hc4f8q1k6fhi"; + rev = "02f1055a777264d4b65896051ec28d0f322f7932"; + sha256 = "0ic2ycmshr6gbl82sd0ccpnn9hkj3bi1isbyyzzncqrfsk3pkdyh"; }; meta.homepage = "https://github.com/folke/lazydev.nvim/"; }; @@ -5449,12 +5449,12 @@ final: prev: legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2024-07-06"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "3a7a91ef7b2d95bcda088d7a80c84a0fffa1850c"; - sha256 = "0wz7fkbyw7n94c4rk3a65g9h21njrxifg5zc3kg0k2hacbskpikp"; + rev = "0705f207ba79ee3c687fc77c451faeeb4828d5ad"; + sha256 = "1szbymmh232fgrpccrjrjb5rzkhdg5lfigvxswhpw7b4nafvizky"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -5844,12 +5844,12 @@ final: prev: lspcontainers-nvim = buildVimPlugin { pname = "lspcontainers.nvim"; - version = "2024-01-04"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "lspcontainers"; repo = "lspcontainers.nvim"; - rev = "1b2ca8d4bdf2926c91ba49bb27d5f3111dac530d"; - sha256 = "15nfgz7759liwg6rw189k8acf10rl0xb69fc59pagldi4l7xngvx"; + rev = "a162fda7f703b40175dfbdf51f7f0ed9a5a92379"; + sha256 = "0vfs6p1nfby3k2azcbnvlw6z46a26l5a3j2civ1c5ncg7zsnqwfd"; }; meta.homepage = "https://github.com/lspcontainers/lspcontainers.nvim/"; }; @@ -5904,12 +5904,12 @@ final: prev: lualine-nvim = buildVimPlugin { pname = "lualine.nvim"; - version = "2024-07-08"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "6a40b530539d2209f7dc0492f3681c8c126647ad"; - sha256 = "17plr9wq4w73dhpyldn9kp97dip0xr3z02iny3mgcf1jmzsclv0l"; + rev = "544dd1583f9bb27b393f598475c89809c4d5e86b"; + sha256 = "0a7m6g7gzsxzgs4vhsfsznvdx06n6zqjmi9h1z1zbvdcfp5d3l5q"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; @@ -6049,12 +6049,12 @@ final: prev: markview-nvim = buildVimPlugin { pname = "markview.nvim"; - version = "2024-07-13"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "markview.nvim"; - rev = "fca6d732085c52637a03b594922f8c8e2d831823"; - sha256 = "0ijpk536cm81rn9b7zaxabb485iv7rs7vnycrlk4ylgmlyr3h0wm"; + rev = "316cafc79490f8b79c288bbe6638838d6d68e227"; + sha256 = "0ysiy6q8m57nz8lk6x4phf544lxsdn1g5xi17xvax30dinazwx54"; fetchSubmodules = true; }; meta.homepage = "https://github.com/OXY2DEV/markview.nvim/"; @@ -6086,12 +6086,12 @@ final: prev: mason-nvim = buildVimPlugin { pname = "mason.nvim"; - version = "2024-07-09"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "f96a31855fa8aea55599cea412fe611b85a874ed"; - sha256 = "05c85cwh3jb116hh90vpkwf41riamqyg73pkyfyjpjnnh2lx9czq"; + rev = "e2f7f9044ec30067bc11800a9e266664b88cda22"; + sha256 = "0rnscicsvlcxcp5i3pzym8wqg0qv664j15b4vnm1rlhbq2bsqjhp"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -6206,12 +6206,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-07-13"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "eb19e8442edd63b033c36daf8d29c0158c9f1eb9"; - sha256 = "1vzhrp7m36v1ljkkrmjmrrqfqr2gfrp60wsf7z7n0pq16v4pw16d"; + rev = "f20d8cd3a116ef65f022797de064a044b217ff53"; + sha256 = "0caksw966j73dabxx97hyb1spfadkprc5ixrpg035i96d2hjk4m9"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -6638,12 +6638,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-07-13"; + version = "2024-07-18"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "23f24edab5f78465a0bc3320678e038664b9aa6e"; - sha256 = "1qf0n23kyfhn8db27im6zmfynjylzvmy83r132xwaiqvzhgg6319"; + rev = "9c9a02271a7ee2564a565a0459d5d6265fa63ade"; + sha256 = "17x2f4w8qcdhgf521qg1s67z2626g2s37rjb60ndxhwidrylggch"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -6710,12 +6710,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2024-07-03"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "a20031fb5d7d12148764764059243135085e5c9b"; - sha256 = "0wl0v9p6gwyrnpl74msdmfmkrrrqndn5pgczn998z0vnjm9vjic1"; + rev = "af1d8d88f426a4da63c913f3b81a37350dbe8d02"; + sha256 = "0210kgcdi9xpnbpmw7b6r26nhpjvj8qh4ml8w6kmswqj75vg7dqf"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6782,24 +6782,24 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2024-07-14"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "721fd28f39ba2cb0978e410bd9a7668f8c74ccca"; - sha256 = "03g1nc3dns0svcml5qfv374hqdmp02z2v3h89gg7l52zgj38f5zp"; + rev = "b04570a1bbbe80d226e459ed5f27f30fa1e2cd11"; + sha256 = "1j3p371fcp4xvq91akwdmncmyrjwyjxp7ljnhg9p5yvcg15x9nwp"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; neorg-telescope = buildVimPlugin { pname = "neorg-telescope"; - version = "2024-07-14"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg-telescope"; - rev = "b4ca2f231fdf7dd915848111e6a041fe4355009a"; - sha256 = "052yv34vz6286kkh4j2ln13y1c1sd343y8y65hg609zk7hadb4gw"; + rev = "2fe2780d539b961ef240f7907802754556ba7bb8"; + sha256 = "015y8g8kcaj65f9vr02hqqj59wdgrpj8cbsshd6klipa3yk2x42c"; }; meta.homepage = "https://github.com/nvim-neorg/neorg-telescope/"; }; @@ -7361,12 +7361,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2024-07-13"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "04501c31f77ede7d4a6d6c538c0b62e1bda9eab6"; - sha256 = "0c9bkrz3143j4pzrdyk6jpx5jih233ris9iqyfyw0qlj8q0q5wr5"; + rev = "8d4d994fde7d2645d74be0ed3a7411d9270d0eb4"; + sha256 = "1fcsbmr1xw7fdgkgri890v414wpl1xy4a4hif6gjhbzl9wirg3hs"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -7421,24 +7421,24 @@ final: prev: noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2024-07-13"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "6263b6696811f0b11c88d8d2371134b1cc1762fc"; - sha256 = "1daqavkza35an0cffxrnf1xh98wgggg4w8srad6rqkc60hcgghjc"; + rev = "daa5f6908e97c89ca3e9861e03bdf356ea48cc72"; + sha256 = "0qfzkpwxlzb87h4nnl5i90039dip576pz3j4wb127f30f3dh8yfg"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2024-06-28"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "0d1b3fa2ad0b371b94cb4b9a27ba6e5a1a915c91"; - sha256 = "0975xwpagsjbl1ahkdma12fppjg7k5ami0mzjynzig000f024pq9"; + rev = "8b5d4170a602d7b257704eef77b0539ddfd02589"; + sha256 = "0n99bi5pvc4jlij21nf2mlq4bv87mmfs2lyygpifxfplsikdhswl"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -7529,12 +7529,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2024-07-14"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "bf477a6bbaa13348007482fff0416f3cb92ec55c"; - sha256 = "0p541gnc3gh7zpkg8mdby45ad714kn1m71kwyj6favhm9rwi0vfl"; + rev = "b657b0ef84a6aa9a86ac05341d1bc1ab5f037ee7"; + sha256 = "18vdqfs36cpbrjr53khx4d118i6b9f19dqhhwpnawx6fkpl5vwfs"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -7649,12 +7649,12 @@ final: prev: nvim-cmp = buildNeovimPlugin { pname = "nvim-cmp"; - version = "2024-07-14"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "7e348da6e5085ac447144a2ef4b637220ba27209"; - sha256 = "08zsm2bgi03vw18bkvv4yx0qp5fqmjn2dr52p5046s11b05dhjh4"; + rev = "d818fd0624205b34e14888358037fb6f5dc51234"; + sha256 = "18yjwihrr4ykq2h8yv67550358bmxi6maqvrhhbvxf402r01zkld"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -7685,12 +7685,12 @@ final: prev: nvim-colorizer-lua = buildVimPlugin { pname = "nvim-colorizer.lua"; - version = "2023-12-23"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvim-colorizer.lua"; - rev = "85855b38011114929f4058efc97af1059ab3e41d"; - sha256 = "1z88vp8a56blhm7s0p1s19i2pwa7dldaxxh86x7jj0dyc8vwbax0"; + rev = "08bd34bf0ed79723f62764c7f9ca70516d461d0d"; + sha256 = "11shpnmnlsawmqwszbdqravp9yg20hd6yid9mjnf8njdh78rzk6x"; }; meta.homepage = "https://github.com/nvchad/nvim-colorizer.lua/"; }; @@ -7769,12 +7769,12 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2024-06-03"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "6f79b822997f2e8a789c6034e147d42bc6706770"; - sha256 = "009aal7bljwrryb74c02jgmfzvhg7v2hcr5xy19r000whnjgh89i"; + rev = "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f"; + sha256 = "144npibr7gi5vxlmzpzmwj9x3x10698c6x121j7lcbrz56a0g380"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -8092,12 +8092,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-07-12"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "216deb2d1b5fbf24398919228208649bbf5cbadf"; - sha256 = "105a1k91gp7a73bpib3k2n07dnxx43vir6bprb18b9vdr8h6x2vr"; + rev = "01e08d4bf1c35e5126b2ad5209725e4c552289ab"; + sha256 = "1h7cri2jprb8y8hr5lrl4rqyjj02zzjhf64wfgn752dq3iwbrrwn"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -8512,24 +8512,24 @@ final: prev: nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-07-13"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "7f4ac678770175cdf0d42c015f4a5b6e18b6cb33"; - sha256 = "0bf5rsc2b017j5f027wi6ic8dydwfh3kj5ra3qm6m52dhdhy4scp"; + rev = "0758155d4dfacfa959ad82ffa3879cb69c82e719"; + sha256 = "04x3da891mdv5bf5nq17lwd3j8bprfj4j1q88l9hb4gydabjxzni"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2024-07-06"; + version = "2024-07-14"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "f56a1430f21334868a86eb980b12e0af55690e98"; - sha256 = "1mnzvnfr6v420nw6ys6bw29mgxf4w3fg44l3n8lrzss35jyjj0df"; + rev = "2aba92ceb1479485953007f4d5adf34d0b66917e"; + sha256 = "06lrkpsqdy56i4m82q4jlz5nlbrcn77pm8fcbvks3vyzykpwid58"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -8596,12 +8596,12 @@ final: prev: nvim-ts-autotag = buildVimPlugin { pname = "nvim-ts-autotag"; - version = "2024-07-07"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "323a3e16ed603e2e17b26b1c836d1e86c279f726"; - sha256 = "0n73hwgx5ybllb2446idrphj5w4sm6zidf0rlva0cpsxl9k4glfz"; + rev = "1624866a1379fc1861797f0ed05899a9c1d2ff61"; + sha256 = "1fi5df9qml6kxkv8hx2i88b9365m4r3zj7vbnml3p7qdry99yb9a"; }; meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; @@ -8692,12 +8692,12 @@ final: prev: nvim_context_vt = buildVimPlugin { pname = "nvim_context_vt"; - version = "2024-04-18"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "nvim_context_vt"; - rev = "4b89241c19909f18d2f6b58777c413c027600fcc"; - sha256 = "116j5k4nznsldiv752rhxlsjzr2cha1zclxrffiqlnbldiyr5i8i"; + rev = "03fb506bbd5fdbb2b21ac6b0fe38ed40e339b143"; + sha256 = "1l0zi3pkhss3y5jpa7vgg4p0s0a15h4wdmkxz29mmljrpql2zhzs"; }; meta.homepage = "https://github.com/andersevenrud/nvim_context_vt/"; }; @@ -8728,12 +8728,12 @@ final: prev: obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "2024-07-11"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "epwalsh"; repo = "obsidian.nvim"; - rev = "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b"; - sha256 = "0af1l5dqxgq91nvbz3jx7z360c8hkhj5hhc3maixw8yh9llw97sq"; + rev = "ee298fd2136612a4ca6a745a4aec3f49ce6f94b0"; + sha256 = "12r068x6llcf3nwwn7kwab61ihlxbc7746bw1455za2lrmbhj47g"; }; meta.homepage = "https://github.com/epwalsh/obsidian.nvim/"; }; @@ -8776,12 +8776,12 @@ final: prev: oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2024-07-06"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "10fbfdd37b6904c0776c5db1a27ab47eecba335e"; - sha256 = "07dvl1n63gy3858brjz0j1d47psq93f63zhh3xhrk7j3nnapmk6j"; + rev = "9e5eb2fcd1dfee2ff30c89273ffff179e42034b9"; + sha256 = "0887k1sk74mgcsr5kdbn19bl8s3slyf918684mbsl0qrsnd1m1sm"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -8849,12 +8849,12 @@ final: prev: onedark-vim = buildVimPlugin { pname = "onedark.vim"; - version = "2023-07-19"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "57b77747694ea5676c3ca0eeaf9567dc499730c0"; - sha256 = "1yr3yywisqwdd3b7xbmcpc3dlq61mjcaspm30j2iqzs000ldbpxf"; + rev = "390b893d361c356ac1b00778d849815f2aa44ae4"; + sha256 = "0km3qrcqw01bjmnilcrjrmd2wjhhajvkni9z4qg0hci3xbn5g44z"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; @@ -8957,12 +8957,12 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-07-04"; + version = "2024-07-14"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "95fb795a422f0455e03d13a3f83525f1d00793ad"; - sha256 = "1vkim1mjf1ccz8f1aj6ah9cp80fbfgpcf3a1imcb83dw6fklx8z1"; + rev = "85c1b443387ec4dd4eee5f7e2d837c13dd82d452"; + sha256 = "14kwq9bll98nvmbd5mjy5rqjicjlzq1hpnrx1jrjafbvqj810qp1"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -8981,12 +8981,12 @@ final: prev: otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2024-07-09"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "0765951b40914ea895f644fdd18489e0c6553456"; - sha256 = "0gl4dhz7slaxc5l1734a0blwxbcjcyxpnasdr5xhrk9kachrr0zn"; + rev = "0cd6d5a3c04a2aec73899f68fb75dfee3225499a"; + sha256 = "087f465szjag0vp3ws97q36hw1y9bp29qbq58xdl05l38dr3v6l6"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; }; @@ -9005,12 +9005,12 @@ final: prev: overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2024-07-11"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "15b6249eaf71ebbc8bf0ed279e045f2bc1f28007"; - sha256 = "0x5gj8nrhys9qznzk32jky26ar9amhxg4axanqh7ka8xd4mifjai"; + rev = "87526babdb563b9e2f0646b420359389732326dc"; + sha256 = "1n1g0smrv07vr91j6ldzl3pi3gw42009276knrygs4qxsbbcfald"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -9150,12 +9150,12 @@ final: prev: persistence-nvim = buildVimPlugin { pname = "persistence.nvim"; - version = "2024-07-13"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "folke"; repo = "persistence.nvim"; - rev = "1e7d01fc7f465af6c935361918bb5406cec736f9"; - sha256 = "1s5lqhs9h4giq454zx1xjqc54ywl1ps8qnvcq8c9iqzsl337a6qy"; + rev = "40a137dd9240c9c6760c53df48d2b155f52c252b"; + sha256 = "0ygr5f3zj1gmmr50aagr88hd46jr22bz4b3dhz6bfgv1pa60bgyw"; }; meta.homepage = "https://github.com/folke/persistence.nvim/"; }; @@ -10052,12 +10052,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2024-07-06"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "95833675cd92538bf9cded1d2d58d1fc271c5428"; - sha256 = "1gsh96czf2g1g84r4fmz41b9n0vlb9j6hx15a5yvlk2bm4fk7haf"; + rev = "44145a4b37217348293fe457992cc38cf3b19f33"; + sha256 = "1xaycgpfq5l3bfks7fw1s5cci9raaama3jj3dfgym4qslff7iykn"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -10413,12 +10413,12 @@ final: prev: styler-nvim = buildVimPlugin { pname = "styler.nvim"; - version = "2024-07-13"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "folke"; repo = "styler.nvim"; - rev = "5855bd037e0d107ae3d6a6684cd4ea99e50ac45d"; - sha256 = "11xrrypsd0gb4qmfkn3wh8d83z6x8j3737ggg80saa4vk0wvm129"; + rev = "6a119fa1104b5fb1d6f768e2d4b5d10efb3ee3e5"; + sha256 = "1wb06dypm85l15ybfmp4vxwi7qjpk64yjyns2mjwbg43ki22jyy5"; }; meta.homepage = "https://github.com/folke/styler.nvim/"; }; @@ -10461,11 +10461,11 @@ final: prev: supermaven-nvim = buildVimPlugin { pname = "supermaven-nvim"; - version = "2024-07-12"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "supermaven-inc"; repo = "supermaven-nvim"; - rev = "df3ecf7823a1a28fe47233c5502db513d95d5d6d"; + rev = "d71257f431e190d9236d7f30da4c2d659389e91f"; sha256 = "00wmbl3882j2nydy38mgcar73x7im8qyiw7svi0dcdb108yqi4xz"; }; meta.homepage = "https://github.com/supermaven-inc/supermaven-nvim/"; @@ -10824,12 +10824,12 @@ final: prev: telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2024-07-13"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "880e89eadbc92e9da27c85dce0b9535dcef9b057"; - sha256 = "02m2rggpxms9drvmg14m5hlc1biic482llkj8yrd2qj3gjr0hazn"; + rev = "bb2c63ee5375ede81c1945b58638412af42b2d62"; + sha256 = "0slkmdwqrfmzg1n6xfbnac9xglbqi6bkp3fwm70sr12nsmkph3qv"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -11186,12 +11186,12 @@ final: prev: text-case-nvim = buildVimPlugin { pname = "text-case.nvim"; - version = "2024-07-13"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "johmsalas"; repo = "text-case.nvim"; - rev = "d6122bcf12ebca7751af4a2e082dec6ed5e95386"; - sha256 = "0rphmzj14p9h4c3m0bjryzzjc7m9lk7f7cmachhkk19qw6pqpm91"; + rev = "13daf28a829e6d0646904c94214cb289bb0c6f34"; + sha256 = "15i74y64vdr6q5jq40p8n0mfp5xacb8dc9ar51vfcmzv6m3awv42"; }; meta.homepage = "https://github.com/johmsalas/text-case.nvim/"; }; @@ -11294,12 +11294,12 @@ final: prev: todo-comments-nvim = buildVimPlugin { pname = "todo-comments.nvim"; - version = "2024-07-13"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "d61567557e2ff5c548c74e96b2d9f8d33e5fcb34"; - sha256 = "17n42gvhrb3ia9qanqw8fczhgkzm8h497my09awbxgqcrx59ggab"; + rev = "96fee098a90e7c09c9811aa7df71d773ba8b9b53"; + sha256 = "1xc4y7fa8ax1affyqkdil2lbdhbwvfnfpv3ykjcdzcgy23i13n8g"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -11319,24 +11319,24 @@ final: prev: toggleterm-nvim = buildVimPlugin { pname = "toggleterm.nvim"; - version = "2024-06-25"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "cd55bf6aab3f88c259fa29ea86bbdcb1a325687d"; - sha256 = "12mcsq0dbzhvwq5sq5ijq9cdjxgcr3c72r6zhlgr0pcvarchl7s9"; + rev = "8ed0f52006d3207ec6c94de7db62da840937ef2a"; + sha256 = "0w57bwci2fjm1a2z65d9dd3pj4fq90a7qj1pcf209j24xzni9sqv"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2024-07-13"; + version = "2024-07-18"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "b357de8d1d8d0d90be0d7f7750c7aa7eb7f4b020"; - sha256 = "1nw4a352hhgfivf9vi2zmail0dlrvzc9d6bag7h800vaifx37han"; + rev = "2e41c5fe8a399868b73080d0efa15af2836fcaf7"; + sha256 = "1w5sqs7fg6i93j9qb4kk6g99w1yj8ax832g63i5973ix8c0k2pq8"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -11428,12 +11428,12 @@ final: prev: trouble-nvim = buildVimPlugin { pname = "trouble.nvim"; - version = "2024-07-13"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "03c1fbf518bef683422a3be9643c3da190903488"; - sha256 = "0rr00chkqzj2cy3fb8xsj5nlppijiax2yrr3p4mwi78wzpcbalss"; + rev = "bf99ea71a39e322336b7f8be965f86dbf5c65540"; + sha256 = "0s3y90pvf1k6zkvar9rc7276h1ic6400ziry9dnmzdqxm1ay1y26"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -11464,12 +11464,12 @@ final: prev: ts-comments-nvim = buildVimPlugin { pname = "ts-comments.nvim"; - version = "2024-07-13"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "folke"; repo = "ts-comments.nvim"; - rev = "8504d06d4f02e7ca6e65c635cef881cefba573d5"; - sha256 = "153hnprcxszbdnsc8z2yk5s8d1170xv1czsw86gq89vaw50yfdpp"; + rev = "80eec3b9663ac3c4743b584f361099b061d0a9e5"; + sha256 = "0ax5sgpqimsnh852y0g8v870kvwdra369nsb7p4xzsja4wyjyddl"; }; meta.homepage = "https://github.com/folke/ts-comments.nvim/"; }; @@ -11500,24 +11500,24 @@ final: prev: twilight-nvim = buildVimPlugin { pname = "twilight.nvim"; - version = "2024-07-13"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "folke"; repo = "twilight.nvim"; - rev = "2b632c169a4b51b1eba5be90fde22a80c51c990e"; - sha256 = "12s5ki2ypwq99c9sr3wg5srf24b221m774dv4wd80vmwyacivcny"; + rev = "38dc017474ef05605ca14a2577e01e09f0db7133"; + sha256 = "1vrwh70jz0f0rxb4i2wfmjdhb3xpc4bhqxivld8q6cp2x3k4k2vf"; }; meta.homepage = "https://github.com/folke/twilight.nvim/"; }; typescript-tools-nvim = buildVimPlugin { pname = "typescript-tools.nvim"; - version = "2024-06-30"; + version = "2024-07-18"; src = fetchFromGitHub { owner = "pmizio"; repo = "typescript-tools.nvim"; - rev = "5da4d695d66f676eb6ea766b946e86f93baaafe7"; - sha256 = "0pbk9svffxky1yrl7r7dlylj8iqadbs5zn5iz24fglsv1c72ldjk"; + rev = "f8c2e0b36b651c85f52ad5c5373ff8b07adc15a7"; + sha256 = "1ha0mmzqhmhrs2y0llrqfnsq46p9xrdn9cx7an1mimnz4xwgyqgi"; }; meta.homepage = "https://github.com/pmizio/typescript-tools.nvim/"; }; @@ -11608,12 +11608,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2024-07-13"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "ce5c9feb6ef71e5a70550c8a102f39f0409c0e00"; - sha256 = "14nqi99a4y938s8g4c11zjw4zj7vz35gakxxv17p9kxnladgbgai"; + rev = "525e923467a7ce0c3cd07bc1341e093ddf44f053"; + sha256 = "1ljclhw5imhjxwzrgiw8yipfmc8bc1fi3rh0705rv3mrn5bxky91"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -11896,12 +11896,12 @@ final: prev: vim-addon-local-vimrc = buildVimPlugin { pname = "vim-addon-local-vimrc"; - version = "2024-01-22"; + version = "2024-07-14"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-local-vimrc"; - rev = "5a3b61df34734127d9a1518879ecc06e550547db"; - sha256 = "13ysvhjafx7b5dz8fw672sssf69ayzwbkwpd22sj3rykwbyv3gh4"; + rev = "5430ada07e199aba932f9eab68399e624512596f"; + sha256 = "16mfr4y4swmyhh3jp7g15bbrv6ns7wlagk3lgsfv9x7la9vh9fkb"; }; meta.homepage = "https://github.com/MarcWeber/vim-addon-local-vimrc/"; }; @@ -12784,24 +12784,24 @@ final: prev: vim-dadbod-completion = buildVimPlugin { pname = "vim-dadbod-completion"; - version = "2024-06-19"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "8c9051c1cfc73fcf5bfe9a84db7097e4f7c0180d"; - sha256 = "0v7djs9q69aglh1gpvynbzcvaxf5fk2jh4kx9ssmwlh2070qqk8b"; + rev = "c3a56c652af9367c5a7b658ed7ed4dc494f430b0"; + sha256 = "02h30qsciyb2slsff4zyddgzskccai9afrg0sx67pkbbhsf90nmm"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; vim-dadbod-ui = buildVimPlugin { pname = "vim-dadbod-ui"; - version = "2024-07-13"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "f74a31e8c6c5a9dccc63450a09d5cd64a9294330"; - sha256 = "1xb4p47hc9knx2lwhz4qdc6hb06ygjkp0fkccd45h2czmss55kwi"; + rev = "954877c3396ad4bf5624fcbe7b5673ac43cd0928"; + sha256 = "1hd0ckq5rq28i1fi0wl0vf1an8am6wvv538bbp86bwi4a9qrcflc"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -13456,12 +13456,12 @@ final: prev: vim-gitgutter = buildVimPlugin { pname = "vim-gitgutter"; - version = "2024-07-13"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "bed580ab8b53f9a6cc0c81c8e91747a780b623ec"; - sha256 = "10bmmssvxx51kd1qhi9s1qbs81pl6jw9sv2mwfy02grlcj9af074"; + rev = "7b0b5098e3e57be86bb96cfbf2b8902381eef57c"; + sha256 = "07k4dmdkyqz530wqa371avrh6r41fny6l1v22jicalmq38n49axv"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -14106,12 +14106,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2024-07-07"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "8c3f95d5f784972e2e8823d89cd6e1757f055ed8"; - sha256 = "0xx9l58mqrlfc4x8l8balhm2343j850lvahllj63hxkc5rcjjbv0"; + rev = "5dd22247ea21fa0d7d7bc258ade827c5c777b716"; + sha256 = "1m8m01gc19rm2bjfwg1svx9xahx2g9kd93qlrdh5qxf6vilhg41g"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -14202,12 +14202,12 @@ final: prev: vim-ledger = buildVimPlugin { pname = "vim-ledger"; - version = "2024-05-07"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "7b97c8765bf920e92fd950a7a5bc37cb2b13a494"; - sha256 = "0g66k9rrvdw0pkh7sqsdcms9viybqsibp1wpscync29ign7y12fa"; + rev = "dbc683e24bd5338b8c12540227a58b2d247e097a"; + sha256 = "1c77vi92w1psai6h1a49raa50k7d8ybrr4l9iznyb2c08srz8ryb"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -14611,12 +14611,12 @@ final: prev: vim-monokai-tasty = buildVimPlugin { pname = "vim-monokai-tasty"; - version = "2024-05-23"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "patstockwell"; repo = "vim-monokai-tasty"; - rev = "539c1784bf8e6ace2656885336eeb0fa47cf918a"; - sha256 = "0v355n4x4maf8ln8rbc8fnwlssdrn7a36d8jzpb4sn67brn3xqx6"; + rev = "c585c4ff0744315c6c03fd54afa7c8ca23b039c0"; + sha256 = "0cc1c8qqf76w77va0j1lhlvv0kfiaz5b5jri5sy6rcbpjinfg0kk"; }; meta.homepage = "https://github.com/patstockwell/vim-monokai-tasty/"; }; @@ -15871,12 +15871,12 @@ final: prev: vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "2024-07-01"; + version = "2024-07-18"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "a4e55d1119689a16e659ce95b673f7174a615637"; - sha256 = "0iba20wlhqvhrsh4nfd2gfm2iwix2zz16f0izmkc2h4q741rp86n"; + rev = "45136447fa9a4543512d2f604c255692c5754e3a"; + sha256 = "0c8ii0kfmkpwglg0sw7iyqhvxvl48igmdq2dd2hgfq37q29dcvfb"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; }; @@ -16953,12 +16953,12 @@ final: prev: vscode-nvim = buildVimPlugin { pname = "vscode.nvim"; - version = "2024-06-22"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "vscode.nvim"; - rev = "46212834b32866ce45479f885ca82d2259044f46"; - sha256 = "0lp101ac8ylflvdngv2xmpl8v00djrw4ca6pbrbf5jdl0wm1fnmq"; + rev = "3ba16d763097cecc75eb93761f4a981467acfc23"; + sha256 = "0fnp6gsrs9zxgxkjnknkppx8zjrkw1gqrnjs2p3lmg8783hndjyn"; }; meta.homepage = "https://github.com/Mofiqul/vscode.nvim/"; }; @@ -17001,12 +17001,12 @@ final: prev: which-key-nvim = buildVimPlugin { pname = "which-key.nvim"; - version = "2024-07-14"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "4d5b8959fd2a4df065ff76ccb39019aaa70cb0dc"; - sha256 = "0gcabgj2a6lncifv7lzqlzmqhyv05k8azgw3njmwazd8fv0353q4"; + rev = "ed5f7622771d0b5c0ac3a5e286ec6cd17b6be131"; + sha256 = "0qas00zikybrkp0js9r4vgx7p2znpilsflfjy144baw9fh44bij6"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -17230,12 +17230,12 @@ final: prev: yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "2024-07-13"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "9981b783813c3ff2bd49f6dbc5b2bc88161a0fb3"; - sha256 = "00q9v34zp09k5fyc4j9wpfcdvk7h80fcr0ajly6zfyliw62y3fy1"; + rev = "6d572672311e612a982e95617e6f507b6ec11555"; + sha256 = "020avafa96rqgakk85nbq5zjg7yc1pgmrgdlgmkhm0z4ny3b4miz"; fetchSubmodules = true; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; @@ -17291,12 +17291,12 @@ final: prev: zen-mode-nvim = buildVimPlugin { pname = "zen-mode.nvim"; - version = "2024-07-13"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "folke"; repo = "zen-mode.nvim"; - rev = "2694c5a2bc4dc26c7a9e74b9e2b812920c90a830"; - sha256 = "0xpcarsrsdip1mznfn19f943z79g9r25p7aagkxiik1819sfb8v7"; + rev = "a31cf7113db34646ca320f8c2df22cf1fbfc6f2a"; + sha256 = "0g862r4k0qqb5h8gxd9ys1n2ksdzwg375l6p69qw4h3k17f7dbzc"; }; meta.homepage = "https://github.com/folke/zen-mode.nvim/"; }; @@ -17507,12 +17507,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2024-07-11"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "6c1a615319796a627adb221f04ab2d962db86c9d"; - sha256 = "1c7a6555zr3fhdr7s2l8zwh4fbzmw4sh2wps3rjsiqcpmnnycjv2"; + rev = "e03c638950dbc31fa0dd65c3b56495976d8420a4"; + sha256 = "15cnyz3x989djxhr98vnh95xid5vsvf11myz1p71ifb0ngkfyyxs"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -17543,12 +17543,12 @@ final: prev: render-markdown = buildVimPlugin { pname = "render-markdown"; - version = "2024-07-14"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "MeanderingProgrammer"; repo = "markdown.nvim"; - rev = "3578523f497a8ad3b4a356d1e54e609838ce0922"; - sha256 = "1bcc39azw53b6x6jxx4c6361d1x6q70pw5gfqjz26g04a8fmm20f"; + rev = "4ab835985de62b46b6785ae160f5f709b77a0f92"; + sha256 = "08awhqsvjmq6hnlk0367817wxv6f2i8xf8dawd0n4z4pl5xmcrf6"; }; meta.homepage = "https://github.com/MeanderingProgrammer/markdown.nvim/"; }; @@ -17567,12 +17567,12 @@ final: prev: rose-pine = buildVimPlugin { pname = "rose-pine"; - version = "2024-07-03"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "dded5c15e9d27ac95ad1e803b35a752d80f3f42b"; - sha256 = "1xj8hmpbrw20508k4qqil7vqqm1a9rjm2hkspk814rjblnvbavn1"; + rev = "9e4320d0bab7f261921d6af7d1c1bbc1a1e3dc67"; + sha256 = "11ksc6k5fg8nxb3sk40d06lrk8ycsss76q2w4lba6b6bph7b6l21"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; From 602cf2d22c6ac85390f1e24a611c50a9a8c7e5dd Mon Sep 17 00:00:00 2001 From: "\"Gaetan Lepage\"" <"gaetan@glepage.com"> Date: Thu, 18 Jul 2024 08:07:50 +0200 Subject: [PATCH 26/60] vimPlugins: resolve github repository redirects --- pkgs/applications/editors/vim/plugins/deprecated.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json index 11fb22d6e1b2..bc7c30838722 100644 --- a/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/pkgs/applications/editors/vim/plugins/deprecated.json @@ -12,7 +12,7 @@ "new": "vim-fern" }, "gina-vim": { - "date": "2024-07-14", + "date": "2024-07-18", "new": "vim-gina" }, "gist-vim": { @@ -60,7 +60,7 @@ "new": "vim-suda" }, "vim-fsharp": { - "date": "2024-07-14", + "date": "2024-07-18", "new": "zarchive-vim-fsharp" }, "vim-jade": { From 9bdcea6da7589f80d9903ec0831be2d273e5be2f Mon Sep 17 00:00:00 2001 From: "\"Gaetan Lepage\"" <"gaetan@glepage.com"> Date: Thu, 18 Jul 2024 08:08:37 +0200 Subject: [PATCH 27/60] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 65 +++++++++++-------- 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 8cdd9906432d..58692ae3bd97 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -27,12 +27,12 @@ }; angular = buildGrammar { language = "angular"; - version = "0.0.0+rev=5c9b47c"; + version = "0.0.0+rev=b96a0d1"; src = fetchFromGitHub { owner = "dlvandenberg"; repo = "tree-sitter-angular"; - rev = "5c9b47c6a978072808b356065fe8f223cdc8fc07"; - hash = "sha256-nln4A2zIaFvfvWMplMDV3XMlXLEFfqx68GiNoFSR2/c="; + rev = "b96a0d1605da3492f6474245098b6f0c503e596d"; + hash = "sha256-M2eDOlxHb0bjm3SfjE84M9ByVevApMqfoauKYdDG6s4="; }; meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular"; }; @@ -503,12 +503,12 @@ }; earthfile = buildGrammar { language = "earthfile"; - version = "0.0.0+rev=5a86415"; + version = "0.0.0+rev=b0a9bc5"; src = fetchFromGitHub { owner = "glehmann"; repo = "tree-sitter-earthfile"; - rev = "5a864159ff728b6d4f7d0aab3723f85a467d180f"; - hash = "sha256-w36h/4xGtGZpJu+ueZiO6K4Eln0DkNUw6a626urMbz4="; + rev = "b0a9bc5737340a9b80b489fe9ae93d7b2fe78cd7"; + hash = "sha256-dIpoLqfIb+vsxe2DszOAKztL+YTDAVGlNccYhYe170U="; }; meta.homepage = "https://github.com/glehmann/tree-sitter-earthfile"; }; @@ -625,12 +625,12 @@ }; facility = buildGrammar { language = "facility"; - version = "0.0.0+rev=a525796"; + version = "0.0.0+rev=2d037f2"; src = fetchFromGitHub { owner = "FacilityApi"; repo = "tree-sitter-facility"; - rev = "a52579670e2b14ec03d410c3c980fafaf6d659c4"; - hash = "sha256-YHtKuR3AysJXV1JDEBmPCSPOpUxJSnxkbX3/y/tX8ws="; + rev = "2d037f2f2bf668737f72e6be6eda4b7918b68d86"; + hash = "sha256-NyYymlCPqbi4GA+FI/M5MiQUr6tkJTNPO8Pvcy02lqI="; }; meta.homepage = "https://github.com/FacilityApi/tree-sitter-facility"; }; @@ -1198,12 +1198,12 @@ }; idl = buildGrammar { language = "idl"; - version = "0.0.0+rev=1a495f4"; + version = "0.0.0+rev=556f287"; src = fetchFromGitHub { owner = "cathaysia"; repo = "tree-sitter-idl"; - rev = "1a495f4520fdd85ae4c9286fb69d9d92fb623343"; - hash = "sha256-tV1Y+XvCV4KLhGeTdXZr1Lm7XQkxSMz/9EhIr7gsgpU="; + rev = "556f2878db1c26da33a921df8226f3268fadef75"; + hash = "sha256-WXF+Opb5GrMqRErJvmPgzTrVnHfstfZKZ+4tWbULLGo="; }; meta.homepage = "https://github.com/cathaysia/tree-sitter-idl"; }; @@ -1673,6 +1673,17 @@ }; meta.homepage = "https://github.com/naclsn/tree-sitter-nasm"; }; + nginx = buildGrammar { + language = "nginx"; + version = "0.0.0+rev=281d184"; + src = fetchFromGitHub { + owner = "opa-oz"; + repo = "tree-sitter-nginx"; + rev = "281d184b8240b2b22670b8907b57b6d6842db6f3"; + hash = "sha256-OsUCCtkaCwiKWKBduk9Ktc65LP1udKcKRmU4TAy8ayE="; + }; + meta.homepage = "https://github.com/opa-oz/tree-sitter-nginx"; + }; nickel = buildGrammar { language = "nickel"; version = "0.0.0+rev=3039ad9"; @@ -1774,24 +1785,24 @@ }; ocaml = buildGrammar { language = "ocaml"; - version = "0.0.0+rev=cd95a67"; + version = "0.0.0+rev=036226e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "cd95a67cea8c839d62fc5206ed1f5c66ff9ca255"; - hash = "sha256-2yuMHJtG1xHiHzMCrr72UpTjKHZP9Mxbnq77g67qouo="; + rev = "036226e5edb410aec004cc7ac0f4b2014dd04a0e"; + hash = "sha256-p8e4xfcGXDzpgheAWG+fSUKCpqEsSrHw9waoTRNnrnI="; }; location = "grammars/ocaml"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocaml_interface = buildGrammar { language = "ocaml_interface"; - version = "0.0.0+rev=cd95a67"; + version = "0.0.0+rev=036226e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "cd95a67cea8c839d62fc5206ed1f5c66ff9ca255"; - hash = "sha256-2yuMHJtG1xHiHzMCrr72UpTjKHZP9Mxbnq77g67qouo="; + rev = "036226e5edb410aec004cc7ac0f4b2014dd04a0e"; + hash = "sha256-p8e4xfcGXDzpgheAWG+fSUKCpqEsSrHw9waoTRNnrnI="; }; location = "grammars/interface"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; @@ -2112,12 +2123,12 @@ }; python = buildGrammar { language = "python"; - version = "0.0.0+rev=ccc2408"; + version = "0.0.0+rev=0dee05e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "ccc2408e558029ad82b0dea63ff55ada495965da"; - hash = "sha256-h6vz8Dpr+uqjN5UHxJ58GSQVAyRjxsnObIr6UKBBmps="; + rev = "0dee05ef958ba2eae88d1e65f24b33cad70d4367"; + hash = "sha256-H6t98tuXJW2VD5Ay+rOfnp9p5ZljyPxvtIy60PycMUQ="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; @@ -2621,12 +2632,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=6248145"; + version = "0.0.0+rev=9653f29"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "6248145bd1c221f75feb3460e59de57f81fda58f"; - hash = "sha256-/l9CMB5ypA2C9yvYPDkDXutJIrSdSwbJuh4Pb4i2Sjc="; + rev = "9653f291ab2179185dc3703672d9fbbd29e80cfb"; + hash = "sha256-apboik9JCxFFvPu6wjZnwm2K21KLvmhm8iesDMbsBl4="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2722,12 +2733,12 @@ }; templ = buildGrammar { language = "templ"; - version = "0.0.0+rev=a4f14aa"; + version = "0.0.0+rev=de0d0ee"; src = fetchFromGitHub { owner = "vrischmann"; repo = "tree-sitter-templ"; - rev = "a4f14aa248b84df73cc1c00bf06edac8d7c96acd"; - hash = "sha256-O5eKY9twQJp0qHjIs6juEY0VtOYXAdnlzlomh9YNndI="; + rev = "de0d0ee129cf643872e8e0d5c4a6589b5a3aae23"; + hash = "sha256-eH2QXynJLM2dBtW4UPXsk+RYFUp+z2SFWaN7KO5cpE0="; }; meta.homepage = "https://github.com/vrischmann/tree-sitter-templ"; }; From 160d90cb91426de316bb5e0105f0b10500aadeac Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 17 Jul 2024 23:20:20 +0200 Subject: [PATCH 28/60] waybar: 0.10.3 -> 0.10.4 Diff: https://github.com/Alexays/Waybar/compare/0.10.3...0.10.4 Changelog: https://github.com/alexays/waybar/releases/tag/0.10.4 --- pkgs/by-name/wa/waybar/package.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix index 69ea3958a73d..c92d04e5a982 100644 --- a/pkgs/by-name/wa/waybar/package.nix +++ b/pkgs/by-name/wa/waybar/package.nix @@ -66,6 +66,8 @@ wireplumberSupport ? true, withMediaPlayer ? mprisSupport && false, nix-update-script, + testers, + waybar, }: let @@ -79,18 +81,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "waybar"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = finalAttrs.version; - hash = "sha256-LUageV0xC42MldMmYY1njkm95icBsqID1tEGy3wwrRM="; + hash = "sha256-/JW3WnRLpfz8j+9Zc9YkK63i8DjHrKwv9PWKIMz3MVI="; }; postUnpack = lib.optional cavaSupport '' pushd "$sourceRoot" - cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.10.1 + cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.10.2 patchShebangs . popd ''; @@ -183,7 +185,13 @@ stdenv.mkDerivation (finalAttrs: { --prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}" ''; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = waybar; + version = "v${finalAttrs.version}"; + }; + }; meta = { homepage = "https://github.com/alexays/waybar"; From 878d821e461170ea0a884f22f076399272ebd0af Mon Sep 17 00:00:00 2001 From: Gavin John Date: Thu, 18 Jul 2024 05:37:22 -0400 Subject: [PATCH 29/60] brainflow: Remove with lib --- pkgs/by-name/br/brainflow/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/br/brainflow/package.nix b/pkgs/by-name/br/brainflow/package.nix index a2f43ab9005f..0c7f03ec4aad 100644 --- a/pkgs/by-name/br/brainflow/package.nix +++ b/pkgs/by-name/br/brainflow/package.nix @@ -47,13 +47,13 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - cmakeFlags = with lib; [ - (cmakeBool "USE_LIBFTDI" useLibFTDI) - (cmakeBool "USE_OPENMP" useOpenMP) - (cmakeBool "BUILD_OYMOTION_SDK" false) # Needs a "GFORCE_SDK" - (cmakeBool "BUILD_BLUETOOTH" buildBluetooth) - (cmakeBool "BUILD_BLE" buildBluetoothLowEnergy) - (cmakeBool "BUILD_ONNX" buildONNX) + cmakeFlags = [ + (lib.cmakeBool "USE_LIBFTDI" useLibFTDI) + (lib.cmakeBool "USE_OPENMP" useOpenMP) + (lib.cmakeBool "BUILD_OYMOTION_SDK" false) # Needs a "GFORCE_SDK" + (lib.cmakeBool "BUILD_BLUETOOTH" buildBluetooth) + (lib.cmakeBool "BUILD_BLE" buildBluetoothLowEnergy) + (lib.cmakeBool "BUILD_ONNX" buildONNX) ]; buildInputs = From c637407a0bc468d25574ed8e3ca3a1d7aa7f9e98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 8 Jul 2024 04:52:16 -0700 Subject: [PATCH 30/60] python312Packages.structlog: 24.1.0 -> 24.4.0 Diff: https://github.com/hynek/structlog/compare/refs/tags/24.1.0...24.4.0 Changelog: https://github.com/hynek/structlog/blob/24.4.0/CHANGELOG.md --- pkgs/development/python-modules/structlog/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index 2cbf24c15db0..0831fd99bbb6 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -11,12 +11,11 @@ pytestCheckHook, pythonOlder, simplejson, - twisted, }: buildPythonPackage rec { pname = "structlog"; - version = "24.1.0"; + version = "24.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,10 +24,10 @@ buildPythonPackage rec { owner = "hynek"; repo = "structlog"; rev = "refs/tags/${version}"; - hash = "sha256-0Yc28UEeozK2+IqILFTqHoTiM5L2SA4t6jld4qTBSzQ="; + hash = "sha256-z3ecgsep/BQJ+Fv78rV4XiFU4+1aaUEfNEtIqy44KV4="; }; - nativeBuildInputs = [ + build-system = [ hatch-fancy-pypi-readme hatch-vcs hatchling @@ -40,7 +39,6 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook simplejson - twisted ]; pythonImportsCheck = [ "structlog" ]; From c2e1be3be00a40de14f58c5501b838c29a70e14e Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Thu, 18 Jul 2024 14:15:53 +0300 Subject: [PATCH 31/60] doc: fixup doc/build-helpers references --- pkgs/build-support/testers/default.nix | 24 +++++++++---------- pkgs/build-support/testers/lychee.nix | 2 +- .../trivial-builders/default.nix | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix index dbf9a6d6cb05..516ab90db503 100644 --- a/pkgs/build-support/testers/default.nix +++ b/pkgs/build-support/testers/default.nix @@ -1,12 +1,12 @@ { pkgs, pkgsLinux, buildPackages, lib, callPackage, runCommand, stdenv, substituteAll, testers }: -# Documentation is in doc/builders/testers.chapter.md +# Documentation is in doc/build-helpers/testers.chapter.md { # See https://nixos.org/manual/nixpkgs/unstable/#tester-lycheeLinkCheck - # or doc/builders/testers.chapter.md + # or doc/build-helpers/testers.chapter.md inherit (callPackage ./lychee.nix {}) lycheeLinkCheck; # See https://nixos.org/manual/nixpkgs/unstable/#tester-testBuildFailure - # or doc/builders/testers.chapter.md + # or doc/build-helpers/testers.chapter.md testBuildFailure = drv: drv.overrideAttrs (orig: { builder = buildPackages.bash; args = [ @@ -16,11 +16,11 @@ }); # See https://nixos.org/manual/nixpkgs/unstable/#tester-testEqualDerivation - # or doc/builders/testers.chapter.md + # or doc/build-helpers/testers.chapter.md testEqualDerivation = callPackage ./test-equal-derivation.nix { }; # See https://nixos.org/manual/nixpkgs/unstable/#tester-testEqualContents - # or doc/builders/testers.chapter.md + # or doc/build-helpers/testers.chapter.md testEqualContents = { assertion, actual, @@ -58,7 +58,7 @@ ''; # See https://nixos.org/manual/nixpkgs/unstable/#tester-testVersion - # or doc/builders/testers.chapter.md + # or doc/build-helpers/testers.chapter.md testVersion = { package, command ? "${package.meta.mainProgram or package.pname or package.name} --version", @@ -81,8 +81,8 @@ fi ''; - # See doc/builders/testers.chapter.md or - # https://nixos.org/manual/nixpkgs/unstable/#tester-invalidateFetcherByDrvHash + # See https://nixos.org/manual/nixpkgs/unstable/#tester-invalidateFetcherByDrvHash + # or doc/build-helpers/testers.chapter.md invalidateFetcherByDrvHash = f: args: let drvPath = (f args).drvPath; @@ -98,8 +98,8 @@ else salted; in checked; - # See doc/builders/testers.chapter.md or - # https://nixos.org/manual/nixpkgs/unstable/#tester-runNixOSTest + # See https://nixos.org/manual/nixpkgs/unstable/#tester-runNixOSTest + # or doc/build-helpers/testers.chapter.md runNixOSTest = let nixos = import ../../../nixos/lib { inherit lib; @@ -114,8 +114,8 @@ node.pkgs = pkgsLinux; }; - # See doc/builders/testers.chapter.md or - # https://nixos.org/manual/nixpkgs/unstable/#tester-invalidateFetcherByDrvHash + # See https://nixos.org/manual/nixpkgs/unstable/#tester-invalidateFetcherByDrvHash + # or doc/build-helpers/testers.chapter.md nixosTest = let /* The nixos/lib/testing-python.nix module, preapplied with arguments that diff --git a/pkgs/build-support/testers/lychee.nix b/pkgs/build-support/testers/lychee.nix index 80088dc4f963..ba22ba856973 100644 --- a/pkgs/build-support/testers/lychee.nix +++ b/pkgs/build-support/testers/lychee.nix @@ -19,7 +19,7 @@ let ''; # See https://nixos.org/manual/nixpkgs/unstable/#tester-lycheeLinkCheck - # or doc/builders/testers.chapter.md + # or doc/build-helpers/testers.chapter.md lycheeLinkCheck = { site, remap ? { }, diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 1625b0c96719..2a887721d81f 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -586,7 +586,7 @@ rec { ''; - # Docs in doc/builders/special/makesetuphook.section.md + # Docs in doc/build-helpers/special/makesetuphook.section.md # See https://nixos.org/manual/nixpkgs/unstable/#sec-pkgs.makeSetupHook makeSetupHook = { name ? lib.warn "calling makeSetupHook without passing a name is deprecated." "hook" From 703748f1548f46087bf7822b05e06f59b7f93337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 18 Jul 2024 04:36:07 -0700 Subject: [PATCH 32/60] switch-to-configuration-ng: fix link in README --- pkgs/by-name/sw/switch-to-configuration-ng/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/README.md b/pkgs/by-name/sw/switch-to-configuration-ng/README.md index 7401a037dfcb..8230b47c9651 100644 --- a/pkgs/by-name/sw/switch-to-configuration-ng/README.md +++ b/pkgs/by-name/sw/switch-to-configuration-ng/README.md @@ -1,3 +1,3 @@ # switch-to-configuration-ng -This program is a reimplementation of [switch-to-configuration](nixos/modules/system/activation/switch-to-configuration.pl) in Rust. The goal is to be compatible in as many ways as possible to the original implementation, at least as long as the original is still in nixpkgs. Any behavioral modifications to this program should also be implemented in the original, and vice versa. +This program is a reimplementation of [switch-to-configuration](/nixos/modules/system/activation/switch-to-configuration.pl) in Rust. The goal is to be compatible in as many ways as possible to the original implementation, at least as long as the original is still in nixpkgs. Any behavioral modifications to this program should also be implemented in the original, and vice versa. From 33849e49d7884ed0f2bff2ffab8e4915ba9e4ae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 18 Jul 2024 04:45:45 -0700 Subject: [PATCH 33/60] python312Packages.xknx: don't pin pytest-asyncio --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index a4c05c70f0c3..409e32dad3bb 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, cryptography, ifaddr, - pytest-asyncio_0_21, + pytest-asyncio, pytestCheckHook, pythonOlder, setuptools, @@ -35,7 +35,7 @@ buildPythonPackage rec { ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; nativeCheckInputs = [ - pytest-asyncio_0_21 + pytest-asyncio pytestCheckHook ]; From e1e2481e8ba27b86c92f290e953c27a830de761b Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Tue, 9 Jul 2024 11:38:41 +0200 Subject: [PATCH 34/60] ansible-lint: 24.2.2 -> 24.7.0 https://github.com/ansible/ansible-lint/compare/v24.2.2...v24.7.0 --- pkgs/tools/admin/ansible/lint.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/ansible/lint.nix b/pkgs/tools/admin/ansible/lint.nix index e3ff67eda963..c73acccbb08c 100644 --- a/pkgs/tools/admin/ansible/lint.nix +++ b/pkgs/tools/admin/ansible/lint.nix @@ -6,12 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "ansible-lint"; - version = "24.2.2"; + version = "24.7.0"; format = "pyproject"; src = fetchPypi { - inherit pname version; - hash = "sha256-6ElHbhUC435aRsJijJkyYM5GS995dRljc13MtoMFGX4="; + inherit version; + pname = "ansible_lint"; + hash = "sha256-yi7cfk6AzxnfSyjL9MEY92HObN1qXvnIVh5FTtevWiQ="; }; postPatch = '' @@ -36,6 +37,7 @@ python3.pkgs.buildPythonApplication rec { ansible-compat black filelock + importlib-metadata jsonschema packaging pyyaml From d272031250d3c5a9f437711a34468f852bd1bcd1 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 18 Jul 2024 16:43:56 +0300 Subject: [PATCH 35/60] linux_6_9: 6.9.9 -> 6.9.10 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 3891333d959d..ea5facdff52a 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -32,8 +32,8 @@ "hash": "sha256:0fb0m0fv4521g63gq04d7lm6hy8169s1rykiav5bkd99s9b1kcqr" }, "6.9": { - "version": "6.9.9", - "hash": "sha256:1f8y88rif3z5lp1bq00g66fd0xs1227qlqkxd2zs6fdjgr45pq1b" + "version": "6.9.10", + "hash": "sha256:18adcli0pazz7x62ws4hrj64prs6fmxln3p3xaii6zd6bwrjxlgg" }, "6.10": { "version": "6.10", From d63fd8f569695f65f8cd7f7247e2076a657618f4 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 18 Jul 2024 16:44:01 +0300 Subject: [PATCH 36/60] linux_6_6: 6.6.40 -> 6.6.41 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index ea5facdff52a..186cea84d0c6 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -24,8 +24,8 @@ "hash": "sha256:109mk4zscm8611xs3bchnr94gasvw3vxsi6zhp3f2y132g670aq6" }, "6.6": { - "version": "6.6.40", - "hash": "sha256:0f7mmw5pzd174376m7r928xbi9mdcla0vy6plq0xdf2mq01kqfjw" + "version": "6.6.41", + "hash": "sha256:1vrjw0yhzmmnbrxyzjrfyz1s8bixciv1ly9pkgcqbasqh5brrjcy" }, "6.8": { "version": "6.8.12", From b4a1a789941c303672e6b1d2bca84fdb569c0b7e Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 18 Jul 2024 16:44:06 +0300 Subject: [PATCH 37/60] linux_6_1: 6.1.99 -> 6.1.100 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 186cea84d0c6..ce58aa1b2e62 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:0i29ga9lzqd4zcsbr4bbb122i8nyfhcalihnq3bgsg04dwb36s19" }, "6.1": { - "version": "6.1.99", - "hash": "sha256:1lsdwdx7i7xw1rzq88k3bz8sar77gb4rnmjx11pbmvmiwaffx1n0" + "version": "6.1.100", + "hash": "sha256:1fd8cmdni1lgjzgn74i5dih5kx3b1axqyhiddxn4s8qgl30nxamr" }, "5.15": { "version": "5.15.162", From 1964afd6dce21657c5af55d2f79d88acb3e12d73 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 18 Jul 2024 16:44:10 +0300 Subject: [PATCH 38/60] linux_5_15: 5.15.162 -> 5.15.163 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index ce58aa1b2e62..d4f30e3d2ff6 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -8,8 +8,8 @@ "hash": "sha256:1fd8cmdni1lgjzgn74i5dih5kx3b1axqyhiddxn4s8qgl30nxamr" }, "5.15": { - "version": "5.15.162", - "hash": "sha256:0z0s5gk8akcbpb99jp08px78fhr8r6kkb7dpl01b3rrc2pmc1gwi" + "version": "5.15.163", + "hash": "sha256:00mkipkhz0i5xld7kyaxcj8cj8faw4gmjl5fribg832nn7ccfpq2" }, "5.10": { "version": "5.10.221", From 967bd016088a10a11dcba4978a39ebf6d8349eb7 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 18 Jul 2024 16:44:13 +0300 Subject: [PATCH 39/60] linux_5_10: 5.10.221 -> 5.10.222 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index d4f30e3d2ff6..7b9542a09853 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -12,8 +12,8 @@ "hash": "sha256:00mkipkhz0i5xld7kyaxcj8cj8faw4gmjl5fribg832nn7ccfpq2" }, "5.10": { - "version": "5.10.221", - "hash": "sha256:09975sby114mwfb8x2rlpaps6vb60dvs8f20cmb7hkxcxdzx87fs" + "version": "5.10.222", + "hash": "sha256:1jshn64g165rdshyjvq38ni6pkbskp50048pbz407fss7f00cbbv" }, "5.4": { "version": "5.4.279", From 9bc4163423e86b7420029e20b3b47a869d905caf Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 18 Jul 2024 16:44:16 +0300 Subject: [PATCH 40/60] linux_5_4: 5.4.279 -> 5.4.280 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 7b9542a09853..7fb55ecec77b 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -16,8 +16,8 @@ "hash": "sha256:1jshn64g165rdshyjvq38ni6pkbskp50048pbz407fss7f00cbbv" }, "5.4": { - "version": "5.4.279", - "hash": "sha256:0pja69n66hsl1r5jbzqww1hwsmqdlxmq6qv9rqx5qnrr4rml765j" + "version": "5.4.280", + "hash": "sha256:0hix0dywf2ybvzxkijjsjmkrj7sx61hwq6mg1wqsq317p1zccxm9" }, "4.19": { "version": "4.19.317", From fe97c4d5c5f70876842be6064959a298b8766b1a Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 18 Jul 2024 16:44:19 +0300 Subject: [PATCH 41/60] linux_4_19: 4.19.317 -> 4.19.318 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 7fb55ecec77b..61c9c5719a66 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "hash": "sha256:0hix0dywf2ybvzxkijjsjmkrj7sx61hwq6mg1wqsq317p1zccxm9" }, "4.19": { - "version": "4.19.317", - "hash": "sha256:109mk4zscm8611xs3bchnr94gasvw3vxsi6zhp3f2y132g670aq6" + "version": "4.19.318", + "hash": "sha256:14vl0288apl76rvxa9yxfggrc4600bjsn4gw097m4gy5ldiaapqd" }, "6.6": { "version": "6.6.41", From 23f15041a284e227e2f817dd46788bdb3f0468a6 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 18 Jul 2024 16:44:36 +0300 Subject: [PATCH 42/60] linux-rt_6_1: 6.1.96-rt35 -> 6.1.99-rt36 --- pkgs/os-specific/linux/kernel/linux-rt-6.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix index 1161162981ea..ac18aa2634e7 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.1.96-rt35"; # updated by ./update-rt.sh + version = "6.1.99-rt36"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -19,14 +19,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; - sha256 = "1ab290vm6h8vj1qi1qhxzh9kc6dbgpkwybcwzw1aprz5kl3cjxry"; + sha256 = "1lsdwdx7i7xw1rzq88k3bz8sar77gb4rnmjx11pbmvmiwaffx1n0"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1adjwxzx37w70h11ig6wcii8xb4dggw5x6si15zlsnr61dalys2d"; + sha256 = "17a468lar9kf0q6n3vmknrbasrwp6pmq2gg39n1sp1bmmpr43qsf"; }; }; in [ rt-patch ] ++ kernelPatches; From d811812da47f2ff38be08cd26e1a2331180cc20d Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 18 Jul 2024 16:45:03 +0300 Subject: [PATCH 43/60] linux-rt_6_6: 6.6.36-rt35 -> 6.6.40-rt36 --- pkgs/os-specific/linux/kernel/linux-rt-6.6.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix index 8eab0d2b45f8..b313235ae5a2 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.6.36-rt35"; # updated by ./update-rt.sh + version = "6.6.40-rt36"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -19,14 +19,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; - sha256 = "1mfdw2prjb54r19y22sm37q8spnk6lyk162ima7gps1pnwl6hrxr"; + sha256 = "0f7mmw5pzd174376m7r928xbi9mdcla0vy6plq0xdf2mq01kqfjw"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "154wfx6aa9yxkavf05vka8spvx99pa4svq02b6kb1zfrq6r93bq6"; + sha256 = "011ajsiqhd7i1b2pzn6gaihh483n3rzyg219qz6d17a069mv5lj2"; }; }; in [ rt-patch ] ++ kernelPatches; From 8fe470008141f100c45774525f90ed55a7bbbb96 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 18 Jul 2024 16:45:26 +0300 Subject: [PATCH 44/60] linux_latest-libre: 19607 -> 19611 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index db932be1a2d3..9bb9dbc1d962 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19607"; - sha256 = "1kf1hm553g8sh7wyh0jw7nl2nmrzg74b62z1q17bznq5a7qf87pn"; + rev = "19611"; + sha256 = "1a6h99b5i5ypr7wrfpdi6xppaf4501xw5r3qq2r9zf5qa76yjbn1"; } , ... }: From ad66fdb844883bd9516e926ed71d57741c073366 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 18 Jul 2024 15:48:17 +0200 Subject: [PATCH 45/60] Revert "python3Packages.tuya-device-sharing-sdk: 0.1.9 -> 0.2.0" This reverts commit 7942f69fa18783077851ba7fc61d566098b94591. This version is not compatible with the tuya_local component, its only reverse dependency. --- .../python-modules/tuya-device-sharing-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix index 3179f22b5a5e..c831f7a0108c 100644 --- a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix +++ b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix @@ -9,14 +9,14 @@ }: let pname = "tuya-device-sharing-sdk"; - version = "0.2.0"; + version = "0.1.9"; in buildPythonPackage { inherit pname version; src = fetchPypi { inherit pname version; - hash = "sha256-fu8zh59wlnxtstNbNL8mIm10tiXy22oPbi6oUy5x8c8="; + hash = "sha256-mBKR+ttBo0VF33pEmYdjbyM4bGgyDiYexIIsf8mXZW4="; }; # workaround needed, upstream issue: https://github.com/tuya/tuya-device-sharing-sdk/issues/10 From 4ede20cc6fd9faae98c7d207525d1e3ba7e2bdcc Mon Sep 17 00:00:00 2001 From: Krzysztof Nazarewski Date: Tue, 9 Jan 2024 10:45:35 +0100 Subject: [PATCH 46/60] makeModulesClosure: include /lib/firmware/edid modules-closure.sh seems to consider everything under /lib/firmware to be a kernel module, this change adds a special handling of `edid` directory, which does not contain kernel modules fixes #279739 --- pkgs/build-support/kernel/modules-closure.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index 06eb5b0d0de1..b581b6e7d403 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -89,6 +89,14 @@ for module in $(< ~-/closure); do done || : done +if test -e lib/firmware/edid ; then + echo "lib/firmware/edid found, copying." + mkdir -p "$out/lib/firmware" + cp -v --no-preserve=mode --recursive --dereference --no-target-directory lib/firmware/edid "$out/lib/firmware/edid" +else + echo "lib/firmware/edid not found, skipping." +fi + # copy module ordering hints for depmod cp $kernel/lib/modules/"$version"/modules.order $out/lib/modules/"$version"/. cp $kernel/lib/modules/"$version"/modules.builtin $out/lib/modules/"$version"/. From 7c3815ab71cf6819c0aefb7eba4b4f2be2e85997 Mon Sep 17 00:00:00 2001 From: Krzysztof Nazarewski Date: Thu, 6 Jun 2024 09:46:34 +0200 Subject: [PATCH 47/60] kernel: fix EDID firmware loading for context: - https://github.com/NixOS/nixpkgs/pull/279789#discussion_r1624936659 - https://github.com/NixOS/nixpkgs/pull/279789#issuecomment-2148560802 - https://github.com/NixOS/nixpkgs/pull/279789#issuecomment-2150726766 --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ pkgs/os-specific/linux/kernel/generic.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index e4d8706fb6a6..af4158fc5710 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -1147,6 +1147,8 @@ let # For systemd-binfmt BINFMT_MISC = option yes; + # Required for EDID overriding + FW_LOADER = yes; # Disable the firmware helper fallback, udev doesn't implement it any more FW_LOADER_USER_HELPER_FALLBACK = option no; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 5981de673242..74e603623412 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -219,7 +219,7 @@ let config = { CONFIG_MODULES = "y"; - CONFIG_FW_LOADER = "m"; + CONFIG_FW_LOADER = "y"; CONFIG_RUST = if withRust then "y" else "n"; }; }); From eb6459a233c5a3217244f0e911edc708364559b1 Mon Sep 17 00:00:00 2001 From: Krzysztof Nazarewski Date: Wed, 7 Feb 2024 11:26:36 +0100 Subject: [PATCH 48/60] linuxhw-edid-fetcher: init at unstable-2023-05-08 --- .../linuxhw-edid-fetch.sh | 96 +++++++++++++++++++ .../li/linuxhw-edid-fetcher/package.nix | 66 +++++++++++++ 2 files changed, 162 insertions(+) create mode 100755 pkgs/by-name/li/linuxhw-edid-fetcher/linuxhw-edid-fetch.sh create mode 100644 pkgs/by-name/li/linuxhw-edid-fetcher/package.nix diff --git a/pkgs/by-name/li/linuxhw-edid-fetcher/linuxhw-edid-fetch.sh b/pkgs/by-name/li/linuxhw-edid-fetcher/linuxhw-edid-fetch.sh new file mode 100755 index 000000000000..fa9925e3b3c8 --- /dev/null +++ b/pkgs/by-name/li/linuxhw-edid-fetcher/linuxhw-edid-fetch.sh @@ -0,0 +1,96 @@ +#!/usr/bin/env bash +set -eEuo pipefail +test -z "${DEBUG:-}" || set -x +# based on instructions provided in https://github.com/linuxhw/EDID/blob/98bc7d6e2c0eaad61346a8bf877b562fee16efc3/README.md + +usage() { + cat <&2 +Usage: + ${BASH_SOURCE[0]} PG278Q 2014 >edid.bin + repo=/path/to/linuxhw/EDID ${BASH_SOURCE[0]} PG278Q 2014 >edid.bin + +verify the generated file: + edid-decode /sys/kernel/debug/dri/0/DP-1/edid_override +EOF +} + +log() { + # shellcheck disable=SC2059 + printf "${1}\n" "${@:2}" >&2 +} + +find_displays() { + local script=("BEGIN { IGNORECASE=1 } /${1}/") + + for pattern in "${@:2}"; do + script+=('&&' "/${pattern}/") + done + cat "${repo}"/{Analog,Digital}Display.md | awk "${script[*]}" +} + +to_edid() { + if ! test -e "$1"; then + log "EDID specification file $1 does not exist," + log "it is most likely an error with https://github.com/linuxhw/EDID" + return 1 + fi + + log "Extracting $1..." + + # https://github.com/linuxhw/EDID/blob/228fea5d89782402dd7f84a459df7f5248573b10/README.md#L42-L42 + grep -E '^([a-f0-9]{32}|[a-f0-9 ]{47})$' <"$1" | tr -d '[:space:]' | xxd -r -p +} + +extract_link() { + awk '{ gsub(/^.+]\().+/, ""); print }' +} + +check_repo() { + test -d "$1" && test -f "$1/AnalogDisplay.md" && test -f "$1/DigitalDisplay.md" +} + +main() { + if [[ $# == 0 ]]; then + usage + exit 1 + fi + + : "${repo:="$PWD"}" + + if ! check_repo "$repo"; then + repo="${TMPDIR:-/tmp}/edid" + log "Not running inside 'https://github.com/linuxhw/EDID', downloading content to ${repo}" + if ! check_repo "$repo"; then + curl -L https://github.com/linuxhw/EDID/tarball/HEAD | tar -zx -C "${repo}" --strip-components=1 + fi + fi + + log "Using repository at ${repo}" + + readarray -t lines < <(find_displays "${@}") + case "${#lines[@]}" in + 0) + log "No matches, try broader patterns?" + exit 1 + ;; + 1) + log "Matched entries:" + log "> %s" "${lines[@]}" + log "Found exactly one pattern, continuing..." + ;; + *) + log "Matched entries:" + log "> %s" "${lines[@]}" + log "More than one match, make patterns more specific until there is only one left" + exit 2 + ;; + esac + + to_edid "${repo}/$(extract_link <<<"${lines[0]}")" +} + +main "$@" diff --git a/pkgs/by-name/li/linuxhw-edid-fetcher/package.nix b/pkgs/by-name/li/linuxhw-edid-fetcher/package.nix new file mode 100644 index 000000000000..8eb9a4d5b7ad --- /dev/null +++ b/pkgs/by-name/li/linuxhw-edid-fetcher/package.nix @@ -0,0 +1,66 @@ +{ lib +, coreutils +, curl +, fetchFromGitHub +, gawk +, gnutar +, stdenv +, unixtools +, writeShellApplication +, nix-update-script +, displays ? { } +}: + +# Usage: +# let +# edids = linuxhw-edid-fetcher.override { +# displays.PG278Q_2014 = [ "PG278Q" "2560x1440" "2014" ]; +# }; +# in +# "${edids}/lib/firmware/edid/PG278Q_2014.bin"; +stdenv.mkDerivation rec { + pname = "linuxhw-edid-fetcher"; + version = "unstable-2023-05-08"; + + src = fetchFromGitHub { + owner = "linuxhw"; + repo = "EDID"; + rev = "98bc7d6e2c0eaad61346a8bf877b562fee16efc3"; + hash = "sha256-+Vz5GU2gGv4QlKO4A6BlKSETxE5GAcehKZL7SEbglGE="; + }; + + fetch = lib.getExe (writeShellApplication { + name = "linuxhw-edid-fetch"; + runtimeInputs = [ gawk coreutils unixtools.xxd curl gnutar ]; + text = '' + repo="''${repo:-"${src}"}" + ${builtins.readFile ./linuxhw-edid-fetch.sh} + ''; + }); + + configurePhase = lib.pipe displays [ + (lib.mapAttrsToList (name: patterns: '' + "$fetch" ${lib.escapeShellArgs patterns} > "${name}.bin" + '')) + (builtins.concatStringsSep "\n") + ]; + + installPhase = '' + mkdir -p "$out/bin" + ln -s "$fetch" "$out/bin/" + ${lib.optionalString (displays != { }) '' + install -D --mode=444 --target-directory="$out/lib/firmware/edid" *.bin + ''} + ''; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=master" ]; }; + + meta = { + description = "Fetcher for EDID binaries from Linux Hardware Project's EDID repository"; + homepage = "https://github.com/linuxhw/EDID"; + license = lib.licenses.cc-by-40; + maintainers = with lib.maintainers; [ nazarewk ]; + platforms = lib.platforms.all; + mainProgram = "linuxhw-edid-fetch"; + }; +} From 8559b460b1caf1b619ef25ef9bb251cfa8282db9 Mon Sep 17 00:00:00 2001 From: Krzysztof Nazarewski Date: Thu, 18 Apr 2024 13:33:19 +0200 Subject: [PATCH 49/60] edido: init --- pkgs/by-name/ed/edido/edido.sh | 176 ++++++++++++++++++++++++++++++ pkgs/by-name/ed/edido/package.nix | 19 ++++ 2 files changed, 195 insertions(+) create mode 100755 pkgs/by-name/ed/edido/edido.sh create mode 100644 pkgs/by-name/ed/edido/package.nix diff --git a/pkgs/by-name/ed/edido/edido.sh b/pkgs/by-name/ed/edido/edido.sh new file mode 100755 index 000000000000..136205386ee1 --- /dev/null +++ b/pkgs/by-name/ed/edido/edido.sh @@ -0,0 +1,176 @@ +#!/usr/bin/env bash +set -eEuo pipefail +test -z "${DEBUG:-}" || set -x +set -eEuo pipefail + +FIRMWARE_PATH="${EDID_PATH:-"/run/current-system/firmware"}" +mapfile -t edid_paths <<<"${FIRMWARE_PATH//":"/$'\n'}" + +err() { + LOGGER="ERROR" log "$@" + return 1 +} + +log() { + # shellcheck disable=SC2059 + printf "[${LOGGER:-"INFO"}] $1\n" "${@:2}" >&2 +} + +find_path() { + local filePath="$1" + mapfile -t candidates < <( + set -x + find -L "${@:2}" -path "*/${filePath}" + ) + if test "${#candidates[@]}" -eq 0; then + log "'%s' path not found" "${filePath}" + return 1 + fi + log "'%s' path found at %s" "${filePath}" "${candidates[0]}" + echo -n "${candidates[0]}" +} + +wait_for_file() { + local filePath="$1" + until find_path "${filePath}" "${@:2}"; do + backoff "${filePath}" + done +} + +backoff() { + local what="$1" sleepFor + + backoff_start="${backoff_start:-"5"}" + backoff_current="${backoff_current:-"${backoff_start}"}" + backoff_jitter_multiplier="${backoff_jitter_multiplier:-"0.3"}" + backoff_multiplier="${backoff_multiplier:-1.5}" + + sleepFor="$(bc <<<"${backoff_current} + ${RANDOM} % (${backoff_current} * ${backoff_jitter_multiplier})")" + + log "still waiting for '%s', retry in %s sec..." "${what}" "${sleepFor}" + sleep "${sleepFor}" + backoff_current="$(bc <<<"scale=2; ${backoff_current} * ${backoff_multiplier}")" + +} + +force_mode() { + local connPath="$1" newMode="$2" currentMode + currentMode="$(cat "$connPath/force")" + if test "${currentMode}" == "${newMode}"; then + log "video mode is already '%s'" "${currentMode}" + return + fi + log "changing video mode from '%s' to '%s'" "${currentMode}" "${newMode}" + echo "${newMode}" >"$connPath/force" + CHANGED=1 +} + +force_edid() { + local connPath="$1" edidPath="$2" +} + +apply_mode() { + local connPath="$1" mode="$2" + test -n "$mode" || return + log "setting up fb mode..." + + # see https://github.com/torvalds/linux/blob/8cd26fd90c1ad7acdcfb9f69ca99d13aa7b24561/drivers/gpu/drm/drm_sysfs.c#L202-L207 + # see https://docs.kernel.org/fb/modedb.html + case "${mode}" in + *d) force_mode "$connPath" off ;; + *e) force_mode "$connPath" on ;; + *D) force_mode "$connPath" on-digital ;; + esac +} + +apply_edid() { + local connPath="$1" edidFilename="$2" edidPath + test -n "${edidFilename}" || return + log "loading EDID override..." + edidPath="$(find_path "${edidFilename}" "${edid_paths[@]/%/"/"}" -maxdepth 2)" + + force_edid "${connPath}" "$edidPath" + cat "$edidPath" >"${connPath}/edid_override" + + if cmp "${connPath}/edid_override" "${edidPath}" &>/dev/null; then + log "EDID is already up to date with '%s'" "${edidPath}" + else + log "applying EDID override from ${edidPath}" + cat "$edidPath" >"${connPath}/edid_override" + CHANGED=1 + fi +} + +load() { + local conn="$1" edidFilename="$2" mode="$3" + export LOGGER="$conn:${edidFilename}:$mode" + CHANGED="${CHANGED:-0}" + + log "starting configuration" + local connPath + connPath="$(wait_for_file "$conn" /sys/kernel/debug/dri/ -maxdepth 2 -type d)" + apply_edid "${connPath}" "${edidFilename}" + apply_mode "${connPath}" "$mode" + + if test "${CHANGED}" != 0; then + log "changes detected, triggering hotplug" + echo 1 >"${connPath}/trigger_hotplug" + else + log "no changes detected, skipping hotplug trigger" + fi +} + +main() { + if [[ $EUID -ne 0 ]]; then + err "must be run as root" + fi + + if test "$#" == 0; then + log "loading kernel parameters from /proc/cmdline" + # replace script arguments with kernel parameters + mapfile -t args < <(xargs -n1 Date: Mon, 22 Jan 2024 11:46:33 +0100 Subject: [PATCH 50/60] nixos/hardware.display: init --- .../manual/release-notes/rl-2411.section.md | 3 + nixos/modules/module-list.nix | 1 + nixos/modules/services/hardware/display.md | 130 ++++++++++++ nixos/modules/services/hardware/display.nix | 193 ++++++++++++++++++ 4 files changed, 327 insertions(+) create mode 100644 nixos/modules/services/hardware/display.md create mode 100644 nixos/modules/services/hardware/display.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index b52c60f3f0c6..96cc4301851d 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -13,6 +13,9 @@ - `authelia` has been upgraded to version 4.38. This version brings several features and improvements which are detailed in the [release blog post](https://www.authelia.com/blog/4.38-release-notes/). This release also deprecates some configuration keys, which are likely to be removed in future version 5.0, but they are still supported and expected to be working in the current version. +- `hardware.display` is a new module implementing workarounds for misbehaving monitors + through setting up custom EDID files and forcing kernel/framebuffer modes. + ## New Services {#sec-release-24.11-new-services} - [Open-WebUI](https://github.com/open-webui/open-webui), a user-friendly WebUI diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 9dddfa311a00..e21ac7e9f6fc 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -567,6 +567,7 @@ ./services/hardware/bolt.nix ./services/hardware/brltty.nix ./services/hardware/ddccontrol.nix + ./services/hardware/display.nix ./services/hardware/fancontrol.nix ./services/hardware/freefall.nix ./services/hardware/fwupd.nix diff --git a/nixos/modules/services/hardware/display.md b/nixos/modules/services/hardware/display.md new file mode 100644 index 000000000000..019c4cf146eb --- /dev/null +++ b/nixos/modules/services/hardware/display.md @@ -0,0 +1,130 @@ +# Customizing display configuration {#module-hardware-display} + +This section describes how to customize display configuration using: +- kernel modes +- EDID files + +Example situations it can help you with: +- display controllers (external hardware) not advertising EDID at all, +- misbehaving graphics drivers, +- loading custom display configuration before the Display Manager is running, + +## Forcing display modes {#module-hardware-display-modes} + +In case of very wrong monitor controller and/or video driver combination you can +[force the display to be enabled](https://mjmwired.net/kernel/Documentation/fb/modedb.txt#41) +and skip some driver-side checks by adding `video=:e` to `boot.kernelParams`. +This is exactly the case with [`amdgpu` drivers](https://gitlab.freedesktop.org/drm/amd/-/issues/615#note_1987392) + +```nix +{ + # force enabled output to skip `amdgpu` checks + hardware.display.outputs."DP-1".mode = "e"; + # completely disable output no matter what is connected to it + hardware.display.outputs."VGA-2".mode = "d"; + + /* equals + boot.kernelParams = [ "video=DP-1:e" "video=VGA-2:d" ]; + */ +} +``` + +## Crafting custom EDID files {#module-hardware-display-edid-custom} + +To make custom EDID binaries discoverable you should first create a derivation storing them at +`$out/lib/firmware/edid/` and secondly add that derivation to `hardware.display.edid.packages` NixOS option: + +```nix +{ + hardware.display.edid.packages = [ + (pkgs.runCommand "edid-custom" {} '' + mkdir -p $out/lib/firmware/edid + base64 -d > "$out/lib/firmware/edid/custom1.bin" <<'EOF' + + EOF + base64 -d > "$out/lib/firmware/edid/custom2.bin" <<'EOF' + + EOF + '') + ]; +} +``` + +There are 2 options significantly easing preparation of EDID files: +- `hardware.display.edid.linuxhw` +- `hardware.display.edid.modelines` + +## Assigning EDID files to displays {#module-hardware-display-edid-assign} + +To assign available custom EDID binaries to your monitor (video output) use `hardware.display.outputs."".edid` option. +Under the hood it adds `drm.edid_firmware` entry to `boot.kernelParams` NixOS option for each configured output: + +```nix +{ + hardware.display.outputs."VGA-1".edid = "custom1.bin"; + hardware.display.outputs."VGA-2".edid = "custom2.bin"; + /* equals: + boot.kernelParams = [ "drm.edid_firmware=VGA-1:edid/custom1.bin,VGA-2:edid/custom2.bin" ]; + */ +} +``` + +## Pulling files from linuxhw/EDID database {#module-hardware-display-edid-linuxhw} + +`hardware.display.edid.linuxhw` utilizes `pkgs.linuxhw-edid-fetcher` to extract EDID files +from https://github.com/linuxhw/EDID based on simple string/regexp search identifying exact entries: + +```nix +{ + hardware.display.edid.linuxhw."PG278Q_2014" = [ "PG278Q" "2014" ]; + + /* equals: + hardware.display.edid.packages = [ + (pkgs.linuxhw-edid-fetcher.override { + displays = { + "PG278Q_2014" = [ "PG278Q" "2014" ]; + }; + }) + ]; + */ +} +``` + + +## Using XFree86 Modeline definitions {#module-hardware-display-edid-modelines} + +`hardware.display.edid.modelines` utilizes `pkgs.edid-generator` package allowing you to +conveniently use [`XFree86 Modeline`](https://en.wikipedia.org/wiki/XFree86_Modeline) entries as EDID binaries: + +```nix +{ + hardware.display.edid.modelines."PG278Q_60" = " 241.50 2560 2608 2640 2720 1440 1443 1448 1481 -hsync +vsync"; + hardware.display.edid.modelines."PG278Q_120" = " 497.75 2560 2608 2640 2720 1440 1443 1448 1525 +hsync -vsync"; + + /* equals: + hardware.display.edid.packages = [ + (pkgs.edid-generator.overrideAttrs { + clean = true; + modelines = '' + Modeline "PG278Q_60" 241.50 2560 2608 2640 2720 1440 1443 1448 1481 -hsync +vsync + Modeline "PG278Q_120" 497.75 2560 2608 2640 2720 1440 1443 1448 1525 +hsync -vsync + ''; + }) + ]; + */ +} +``` + +## Complete example for Asus PG278Q {#module-hardware-display-pg278q} + +And finally this is a complete working example for a 2014 (first) batch of [Asus PG278Q monitor with `amdgpu` drivers](https://gitlab.freedesktop.org/drm/amd/-/issues/615#note_1987392): + +```nix +{ + hardware.display.edid.modelines."PG278Q_60" = " 241.50 2560 2608 2640 2720 1440 1443 1448 1481 -hsync +vsync"; + hardware.display.edid.modelines."PG278Q_120" = " 497.75 2560 2608 2640 2720 1440 1443 1448 1525 +hsync -vsync"; + + hardware.display.outputs."DP-1".edid = "PG278Q_60.bin"; + hardware.display.outputs."DP-1".mode = "e"; +} +``` diff --git a/nixos/modules/services/hardware/display.nix b/nixos/modules/services/hardware/display.nix new file mode 100644 index 000000000000..3b3118f132e9 --- /dev/null +++ b/nixos/modules/services/hardware/display.nix @@ -0,0 +1,193 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.hardware.display; +in +{ + meta.doc = ./display.md; + meta.maintainers = with lib.maintainers; [ + nazarewk + ]; + + options = { + hardware.display.edid.enable = lib.mkOption { + type = with lib.types; bool; + default = cfg.edid.packages != null; + defaultText = lib.literalExpression "config.hardware.display.edid.packages != null"; + description = '' + Enables handling of EDID files + ''; + }; + + hardware.display.edid.packages = lib.mkOption { + type = with lib.types; listOf package; + default = [ ]; + description = '' + List of packages containing EDID binary files at `$out/lib/firmware/edid`. + Such files will be available for use in `drm.edid_firmware` kernel + parameter as `edid/`. + + You can craft one directly here or use sibling options `linuxhw` and `modelines`. + ''; + example = lib.literalExpression '' + [ + (pkgs.runCommand "edid-custom" {} ''' + mkdir -p "$out/lib/firmware/edid" + base64 -d > "$out/lib/firmware/edid/custom1.bin" <<'EOF' + + EOF + ''') + ] + ''; + apply = list: + if list == [ ] then null else + (pkgs.buildEnv { + name = "firmware-edid"; + paths = list; + pathsToLink = [ "/lib/firmware/edid" ]; + ignoreCollisions = true; + }) // { + compressFirmware = false; + }; + }; + + hardware.display.edid.linuxhw = lib.mkOption { + type = with lib.types; attrsOf (listOf str); + default = { }; + description = '' + Exposes EDID files from users-sourced database at https://github.com/linuxhw/EDID + + Attribute names will be mapped to EDID filenames `.bin`. + + Attribute values are lists of `awk` regexp patterns that (together) must match + exactly one line in either of: + - [AnalogDisplay.md](https://raw.githubusercontent.com/linuxhw/EDID/master/AnalogDisplay.md) + - [DigitalDisplay.md](https://raw.githubusercontent.com/linuxhw/EDID/master/DigitalDisplay.md) + + There is no universal way of locating your device config, but here are some practical tips: + 1. locate your device: + - find your model number (second column) + - locate manufacturer (first column) and go through the list manually + 2. narrow down results using other columns until there is only one left: + - `Name` column + - production date (`Made` column) + - resolution `Res` + - screen diagonal (`Inch` column) + - as a last resort use `ID` from the last column + ''; + example = lib.literalExpression '' + { + PG278Q_2014 = [ "PG278Q" "2014" ]; + } + ''; + apply = displays: + if displays == { } then null else + pkgs.linuxhw-edid-fetcher.override { inherit displays; }; + }; + + hardware.display.edid.modelines = lib.mkOption { + type = with lib.types; attrsOf str; + default = { }; + description = '' + Attribute set of XFree86 Modelines automatically converted + and exposed as `edid/.bin` files in initrd. + See for more information: + - https://en.wikipedia.org/wiki/XFree86_Modeline + ''; + example = lib.literalExpression '' + { + "PG278Q_60" = " 241.50 2560 2608 2640 2720 1440 1443 1448 1481 -hsync +vsync"; + "PG278Q_120" = " 497.75 2560 2608 2640 2720 1440 1443 1448 1525 +hsync -vsync"; + "U2711_60" = " 241.50 2560 2600 2632 2720 1440 1443 1448 1481 -hsync +vsync"; + } + ''; + apply = modelines: + if modelines == { } then null else + pkgs.edid-generator.overrideAttrs { + clean = true; + passthru.config = modelines; + modelines = lib.trivial.pipe modelines [ + (lib.mapAttrsToList (name: value: + lib.throwIfNot (builtins.stringLength name <= 12) "Modeline name must be 12 characters or less" + ''Modeline "${name}" ${value}'' + )) + (builtins.map (line: "${line}\n")) + (lib.strings.concatStringsSep "") + ]; + }; + }; + + hardware.display.outputs = lib.mkOption { + type = lib.types.attrsOf (lib.types.submodule ({ + options = { + edid = lib.mkOption { + type = with lib.types; nullOr str; + default = null; + description = '' + An EDID filename to be used for configured display, as in `edid/`. + See for more information: + - `hardware.display.edid.packages` + - https://wiki.archlinux.org/title/Kernel_mode_setting#Forcing_modes_and_EDID + ''; + }; + mode = lib.mkOption { + type = with lib.types; nullOr str; + default = null; + description = '' + A `video` kernel parameter (framebuffer mode) configuration for the specific output: + + x[M][R][-][@][i][m][eDd] + + See for more information: + - https://docs.kernel.org/fb/modedb.html + - https://wiki.archlinux.org/title/Kernel_mode_setting#Forcing_modes + ''; + example = lib.literalExpression '' + "e" + ''; + }; + }; + })); + description = '' + Hardware/kernel-level configuration of specific outputs. + ''; + default = { }; + + example = lib.literalExpression '' + { + edid.modelines."PG278Q_60" = "241.50 2560 2608 2640 2720 1440 1443 1448 1481 -hsync +vsync"; + outputs."DP-1".edid = "PG278Q_60.bin"; + outputs."DP-1".mode = "e"; + } + ''; + }; + }; + + config = lib.mkMerge [ + { + hardware.display.edid.packages = + lib.optional (cfg.edid.modelines != null) cfg.edid.modelines + ++ lib.optional (cfg.edid.linuxhw != null) cfg.edid.linuxhw; + + boot.kernelParams = + # forcing video modes + lib.trivial.pipe cfg.outputs [ + (lib.attrsets.filterAttrs (_: spec: spec.mode != null)) + (lib.mapAttrsToList (output: spec: "video=${output}:${spec.mode}")) + ] + ++ + # selecting EDID for displays + lib.trivial.pipe cfg.outputs [ + (lib.attrsets.filterAttrs (_: spec: spec.edid != null)) + (lib.mapAttrsToList (output: spec: "${output}:edid/${spec.edid}")) + (builtins.concatStringsSep ",") + (p: lib.optional (p != "") "drm.edid_firmware=${p}") + ] + ; + } + (lib.mkIf (cfg.edid.packages != null) { + # services.udev implements hardware.firmware option + services.udev.enable = true; + hardware.firmware = [ cfg.edid.packages ]; + }) + ]; +} From 67c2c1057b4e016b638008701334fdf266353139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 18 Jul 2024 07:35:20 -0700 Subject: [PATCH 51/60] python312Packages.python-rapidjson: 1.16 -> 1.18 Diff: https://github.com/python-rapidjson/python-rapidjson/compare/refs/tags/v1.16...v1.18 Changelog: https://github.com/python-rapidjson/python-rapidjson/blob/refs/tags/v1.18/CHANGES.rst --- .../development/python-modules/python-rapidjson/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index d6efce383b80..3ea015c19d51 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -30,7 +30,7 @@ let }); in buildPythonPackage rec { - version = "1.16"; + version = "1.18"; pname = "python-rapidjson"; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "python-rapidjson"; repo = "python-rapidjson"; rev = "refs/tags/v${version}"; - hash = "sha256-4Z8cNu6tK5/yAu6b9Vb/EdXQj+fQgeT0QIszTEUurVM="; + hash = "sha256-4gJm6EnT6YNg+EkkBPiPQ4TBGG/u+FZTK4bKWyqw1pM="; }; patches = [ @@ -50,7 +50,7 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook From 1439ca5df9d1907c79f60389f4c246b17454fa6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 18 Jul 2024 07:45:48 -0700 Subject: [PATCH 52/60] python312Packages.trio-asyncio: 0.14.1 -> 0.15.0 Diff: https://github.com/python-trio/trio-asyncio/compare/refs/tags/v0.14.1...v0.15.0 Changelog: https://github.com/python-trio/trio-asyncio/blob/v0.15.0/docs/source/history.rst --- pkgs/development/python-modules/trio-asyncio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trio-asyncio/default.nix b/pkgs/development/python-modules/trio-asyncio/default.nix index e66716474dd5..7c8f0cbaa28b 100644 --- a/pkgs/development/python-modules/trio-asyncio/default.nix +++ b/pkgs/development/python-modules/trio-asyncio/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "trio-asyncio"; - version = "0.14.1"; + version = "0.15.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "python-trio"; repo = "trio-asyncio"; rev = "refs/tags/v${version}"; - hash = "sha256-634fcYAn5J1WW71J/USAMkJaZI8JmKoQneQEhz2gYFc="; + hash = "sha256-6c+4sGEpCVC8wxBg+dYgkOwRAUOi/DTITrDx3M2koyE="; }; postPatch = '' From 8bd0720626bca025c84f72c7b30ee1bd379e28a1 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Sat, 13 Jul 2024 09:55:03 -0700 Subject: [PATCH 53/60] verilator: format with nixfmt --- .../science/electronics/verilator/default.nix | 59 +++++++++++++++---- 1 file changed, 49 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 92f8fa52b91f..3e7ee0be98e0 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -1,6 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, perl, flex, bison, python3, autoconf, - which, cmake, ccache, help2man, makeWrapper, glibcLocales, - systemc, git, numactl }: +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + perl, + flex, + bison, + python3, + autoconf, + which, + cmake, + ccache, + help2man, + makeWrapper, + glibcLocales, + systemc, + git, + numactl, +}: stdenv.mkDerivation rec { pname = "verilator"; @@ -23,9 +40,25 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; - buildInputs = [ perl python3 systemc ]; # ccache - nativeBuildInputs = [ makeWrapper flex bison autoconf help2man git ]; - nativeCheckInputs = [ which numactl ]; # cmake + buildInputs = [ + perl + python3 + systemc + # ccache + ]; + nativeBuildInputs = [ + makeWrapper + flex + bison + autoconf + help2man + git + ]; + nativeCheckInputs = [ + which + numactl + # cmake + ]; doCheck = stdenv.isLinux; # darwin tests are broken for now... checkTarget = "test"; @@ -53,9 +86,15 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast and robust (System)Verilog simulator/compiler and linter"; - homepage = "https://www.veripool.org/verilator"; - license = with licenses; [ lgpl3Only artistic2 ]; - platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice amiloradovsky ]; + homepage = "https://www.veripool.org/verilator"; + license = with licenses; [ + lgpl3Only + artistic2 + ]; + platforms = platforms.unix; + maintainers = with maintainers; [ + thoughtpolice + amiloradovsky + ]; }; } From 3c2052bd2006e5a718df0a8e6193b72dc654012d Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Sat, 13 Jul 2024 11:31:14 -0700 Subject: [PATCH 54/60] verilator: 5.022 -> 5.026 * Properly output version with verilator --version (set VERILATOR_SRC_VERSION at compile time) * No need to wrap the binaries anymore. * Fix verilator --gdbbt --- .../science/electronics/verilator/default.nix | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 3e7ee0be98e0..c467bdfc547b 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, perl, flex, bison, @@ -17,28 +16,24 @@ systemc, git, numactl, + coreutils, }: stdenv.mkDerivation rec { pname = "verilator"; - version = "5.022"; + version = "5.026"; + + # Verilator gets the version from this environment variable + # if it can't do git describe while building. + VERILATOR_SRC_VERSION = "v${version}"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-Ya3lqK8BfvMVLZUrD2Et6OmptteWXp5VmZb2x2G/V/E="; + hash = "sha256-Ds6w95tqlKjIFnkq2kKyslprKCwMOtBOoy7LuTon3KM="; }; - patches = [ - (fetchpatch { - # Fix try-lock spuriously fail in V3ThreadPool destructor - # https://github.com/verilator/verilator/pull/4938 - url = "https://github.com/verilator/verilator/commit/4b9cce4369c78423779238e585ed693c456d464e.patch"; - hash = "sha256-sGrk/pxqZqUcmJdzQoPlzXMmYqHCOmd9Y2n6ieVNg1U="; - }) - ]; - enableParallelBuilding = true; buildInputs = [ perl @@ -57,6 +52,7 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ which numactl + coreutils # cmake ]; @@ -69,16 +65,12 @@ stdenv.mkDerivation rec { patchShebangs bin/* src/* nodist/* docs/bin/* examples/xml_py/* \ test_regress/{driver.pl,t/*.{pl,pf}} \ ci/* ci/docker/run/* ci/docker/run/hooks/* ci/docker/buildenv/build.sh + # verilator --gdbbt uses /bin/echo to test if gdb works. + sed -i 's|/bin/echo|${coreutils}\/bin\/echo|' bin/verilator ''; # grep '^#!/' -R . | grep -v /nix/store | less # (in nix-shell after patchPhase) - postInstall = lib.optionalString stdenv.isLinux '' - for x in $(ls $out/bin/verilator*); do - wrapProgram "$x" --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" - done - ''; - env = { SYSTEMC_INCLUDE = "${lib.getDev systemc}/include"; SYSTEMC_LIBDIR = "${lib.getLib systemc}/lib"; From 54674e9063317a41b498b40ce856614bd5b7050f Mon Sep 17 00:00:00 2001 From: nikstur Date: Thu, 22 Feb 2024 00:12:04 +0100 Subject: [PATCH 55/60] nixos/qemu-vm: remove duplication between scripted and systemd initrd --- nixos/modules/virtualisation/qemu-vm.nix | 26 +++++++----------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index d1dc6404d4f5..f8a9602697a4 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -1046,26 +1046,14 @@ in boot.loader.supportsInitrdSecrets = mkIf (!cfg.useBootLoader) (mkVMOverride false); - boot.initrd.postMountCommands = lib.mkIf (!config.boot.initrd.systemd.enable) - '' - # Mark this as a NixOS machine. - mkdir -p $targetRoot/etc - echo -n > $targetRoot/etc/NIXOS + boot.initrd.postMountCommands = lib.mkIf (!config.boot.initrd.systemd.enable && cfg.writableStore) '' + echo "mounting overlay filesystem on /nix/store..." + mkdir -p -m 0755 $targetRoot/nix/.rw-store/store $targetRoot/nix/.rw-store/work $targetRoot/nix/store + mount -t overlay overlay $targetRoot/nix/store \ + -o lowerdir=$targetRoot/nix/.ro-store,upperdir=$targetRoot/nix/.rw-store/store,workdir=$targetRoot/nix/.rw-store/work || fail + ''; - # Fix the permissions on /tmp. - chmod 1777 $targetRoot/tmp - - mkdir -p $targetRoot/boot - - ${optionalString cfg.writableStore '' - echo "mounting overlay filesystem on /nix/store..." - mkdir -p -m 0755 $targetRoot/nix/.rw-store/store $targetRoot/nix/.rw-store/work $targetRoot/nix/store - mount -t overlay overlay $targetRoot/nix/store \ - -o lowerdir=$targetRoot/nix/.ro-store,upperdir=$targetRoot/nix/.rw-store/store,workdir=$targetRoot/nix/.rw-store/work || fail - ''} - ''; - - systemd.tmpfiles.settings."10-qemu-vm" = lib.mkIf config.boot.initrd.systemd.enable { + systemd.tmpfiles.settings."10-qemu-vm" = { "/etc/NIXOS".f = { mode = "0644"; user = "root"; From ded6d983d69cde4eadbfdc2d4725953464b0850c Mon Sep 17 00:00:00 2001 From: nikstur Date: Fri, 23 Feb 2024 00:00:25 +0100 Subject: [PATCH 56/60] nixos/qemu-vm: use new overlayfs API --- nixos/modules/virtualisation/qemu-vm.nix | 57 +++++++----------------- 1 file changed, 16 insertions(+), 41 deletions(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index f8a9602697a4..215e5f2b9cf5 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -1046,13 +1046,6 @@ in boot.loader.supportsInitrdSecrets = mkIf (!cfg.useBootLoader) (mkVMOverride false); - boot.initrd.postMountCommands = lib.mkIf (!config.boot.initrd.systemd.enable && cfg.writableStore) '' - echo "mounting overlay filesystem on /nix/store..." - mkdir -p -m 0755 $targetRoot/nix/.rw-store/store $targetRoot/nix/.rw-store/work $targetRoot/nix/store - mount -t overlay overlay $targetRoot/nix/store \ - -o lowerdir=$targetRoot/nix/.ro-store,upperdir=$targetRoot/nix/.rw-store/store,workdir=$targetRoot/nix/.rw-store/work || fail - ''; - systemd.tmpfiles.settings."10-qemu-vm" = { "/etc/NIXOS".f = { mode = "0644"; @@ -1081,8 +1074,7 @@ in ''; boot.initrd.availableKernelModules = - optional cfg.writableStore "overlay" - ++ optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx" + optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx" ++ optional (cfg.tpm.enable) "tpm_tis"; virtualisation.additionalPaths = [ config.system.build.toplevel ]; @@ -1090,7 +1082,9 @@ in virtualisation.sharedDirectories = { nix-store = mkIf cfg.mountHostNixStore { source = builtins.storeDir; - target = "/nix/store"; + # Always mount this to /nix/.ro-store because we never want to actually + # write to the host Nix Store. + target = "/nix/.ro-store"; securityModel = "none"; }; xchg = { @@ -1200,10 +1194,7 @@ in virtualisation.fileSystems = let mkSharedDir = tag: share: { - name = - if tag == "nix-store" && cfg.writableStore - then "/nix/.ro-store" - else share.target; + name = share.target; value.device = tag; value.fsType = "9p"; value.neededForBoot = true; @@ -1228,7 +1219,17 @@ in # Sync with systemd's tmp.mount; options = [ "mode=1777" "strictatime" "nosuid" "nodev" "size=${toString config.boot.tmp.tmpfsSize}" ]; }; - "/nix/${if cfg.writableStore then ".ro-store" else "store"}" = lib.mkIf cfg.useNixStoreImage { + "/nix/store" = lib.mkIf (cfg.useNixStoreImage || cfg.mountHostNixStore) (if cfg.writableStore then { + overlay = { + lowerdir = [ "/nix/.ro-store" ]; + upperdir = "/nix/.rw-store/upper"; + workdir = "/nix/.rw-store/work"; + }; + } else { + device = "/nix/.ro-store"; + options = [ "bind" ]; + }); + "/nix/.ro-store" = lib.mkIf cfg.useNixStoreImage { device = "/dev/disk/by-label/${nixStoreFilesystemLabel}"; neededForBoot = true; options = [ "ro" ]; @@ -1246,32 +1247,6 @@ in } ]; - boot.initrd.systemd = lib.mkIf (config.boot.initrd.systemd.enable && cfg.writableStore) { - mounts = [{ - where = "/sysroot/nix/store"; - what = "overlay"; - type = "overlay"; - options = "lowerdir=/sysroot/nix/.ro-store,upperdir=/sysroot/nix/.rw-store/store,workdir=/sysroot/nix/.rw-store/work"; - wantedBy = ["initrd-fs.target"]; - before = ["initrd-fs.target"]; - requires = ["rw-store.service"]; - after = ["rw-store.service"]; - unitConfig.RequiresMountsFor = "/sysroot/nix/.ro-store"; - }]; - services.rw-store = { - before = [ "shutdown.target" ]; - conflicts = [ "shutdown.target" ]; - unitConfig = { - DefaultDependencies = false; - RequiresMountsFor = "/sysroot/nix/.rw-store"; - }; - serviceConfig = { - Type = "oneshot"; - ExecStart = "/bin/mkdir -p -m 0755 /sysroot/nix/.rw-store/store /sysroot/nix/.rw-store/work /sysroot/nix/store"; - }; - }; - }; - swapDevices = (if cfg.useDefaultFilesystems then mkVMOverride else mkDefault) [ ]; boot.initrd.luks.devices = (if cfg.useDefaultFilesystems then mkVMOverride else mkDefault) {}; From 0e5f92985160e5a9064861882179b6d4878f2220 Mon Sep 17 00:00:00 2001 From: nikstur Date: Fri, 23 Feb 2024 00:00:37 +0100 Subject: [PATCH 57/60] nixos/tests/qemu-vm-store: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/qemu-vm-store.nix | 71 +++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 nixos/tests/qemu-vm-store.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 29eb36ab1f28..6503aa5bda7f 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -799,6 +799,7 @@ in { qemu-vm-restrictnetwork = handleTest ./qemu-vm-restrictnetwork.nix {}; qemu-vm-volatile-root = runTest ./qemu-vm-volatile-root.nix; qemu-vm-external-disk-image = runTest ./qemu-vm-external-disk-image.nix; + qemu-vm-store = runTest ./qemu-vm-store.nix; qgis = handleTest ./qgis.nix { qgisPackage = pkgs.qgis; }; qgis-ltr = handleTest ./qgis.nix { qgisPackage = pkgs.qgis-ltr; }; qownnotes = handleTest ./qownnotes.nix {}; diff --git a/nixos/tests/qemu-vm-store.nix b/nixos/tests/qemu-vm-store.nix new file mode 100644 index 000000000000..9fb9f4baaafc --- /dev/null +++ b/nixos/tests/qemu-vm-store.nix @@ -0,0 +1,71 @@ +{ lib, ... }: { + + name = "qemu-vm-store"; + + meta.maintainers = with lib.maintainers; [ nikstur ]; + + nodes = { + sharedWritable = { + virtualisation.writableStore = true; + }; + + sharedReadOnly = { + virtualisation.writableStore = false; + }; + + imageWritable = { + virtualisation.useNixStoreImage = true; + virtualisation.writableStore = true; + }; + + imageReadOnly = { + virtualisation.useNixStoreImage = true; + virtualisation.writableStore = false; + }; + + fullDisk = { + virtualisation.useBootLoader = true; + }; + }; + + testScript = '' + build_derivation = """ + nix-build --option substitute false -E 'derivation { + name = "t"; + builder = "/bin/sh"; + args = ["-c" "echo something > $out"]; + system = builtins.currentSystem; + preferLocalBuild = true; + }' + """ + + start_all() + + with subtest("Nix Store is writable"): + sharedWritable.succeed(build_derivation) + imageWritable.succeed(build_derivation) + fullDisk.succeed(build_derivation) + + with subtest("Nix Store is read only"): + sharedReadOnly.fail(build_derivation) + imageReadOnly.fail(build_derivation) + + # Checking whether the fs type is 9P is just a proxy to test whether the + # Nix Store is shared. If we switch to a different technology (e.g. + # virtiofs) for sharing, we need to adjust these tests. + + with subtest("Nix store is shared from the host via 9P"): + sharedWritable.succeed("findmnt --kernel --type 9P /nix/.ro-store") + sharedReadOnly.succeed("findmnt --kernel --type 9P /nix/.ro-store") + + with subtest("Nix store is not shared via 9P"): + imageWritable.fail("findmnt --kernel --type 9P /nix/.ro-store") + imageReadOnly.fail("findmnt --kernel --type 9P /nix/.ro-store") + + with subtest("Nix store is not mounted separately"): + rootDevice = fullDisk.succeed("stat -c %d /") + nixStoreDevice = fullDisk.succeed("stat -c %d /nix/store") + assert rootDevice == nixStoreDevice, "Nix store is mounted separately from the root fs" + ''; + +} From b7b90d04551c5dd2fd99b924bc0bde860a4cb72f Mon Sep 17 00:00:00 2001 From: nikstur Date: Fri, 23 Feb 2024 00:21:01 +0100 Subject: [PATCH 58/60] nixos/qemu-vm: fsck ESP The ESP is a writable vfat filesystem that can be fscked like any other fs thus we should stick to the default. --- nixos/modules/virtualisation/qemu-vm.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 215e5f2b9cf5..0c63b640c389 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -1242,7 +1242,6 @@ in "/boot" = lib.mkIf (cfg.useBootLoader && cfg.bootPartition != null) { device = cfg.bootPartition; fsType = "vfat"; - noCheck = true; # fsck fails on a r/o filesystem }; } ]; From cb5a876e8243a6f09ad9883fe5db58f1f9a80b74 Mon Sep 17 00:00:00 2001 From: nikstur Date: Fri, 23 Feb 2024 00:56:13 +0100 Subject: [PATCH 59/60] nixos/qemu-vm: consistently use efiSysMountPoint Remove the explicit creation of efiSysMountPoint. This is not needed in the scripted or the systemd initrd. --- nixos/modules/virtualisation/qemu-vm.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 0c63b640c389..32a1d47b59fe 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -393,7 +393,7 @@ in The path (inside the VM) to the device containing the EFI System Partition (ESP). If you are *not* booting from a UEFI firmware, this value is, by - default, `null`. The ESP is mounted under `/boot`. + default, `null`. The ESP is mounted to `boot.loader.efi.efiSysMountpoint`. ''; }; @@ -1052,11 +1052,6 @@ in user = "root"; group = "root"; }; - "${config.boot.loader.efi.efiSysMountPoint}".d = { - mode = "0644"; - user = "root"; - group = "root"; - }; }; # After booting, register the closure of the paths in @@ -1239,7 +1234,7 @@ in options = [ "mode=0755" ]; neededForBoot = true; }; - "/boot" = lib.mkIf (cfg.useBootLoader && cfg.bootPartition != null) { + "${config.boot.loader.efi.efiSysMountPoint}" = lib.mkIf (cfg.useBootLoader && cfg.bootPartition != null) { device = cfg.bootPartition; fsType = "vfat"; }; From b6e354f052a79bec05432acec5f4810c1239b05f Mon Sep 17 00:00:00 2001 From: nikstur Date: Sat, 2 Mar 2024 00:06:26 +0100 Subject: [PATCH 60/60] nixos/qemu-vm: remove creation of /etc/nixos /etc/nixos is already created by stage-2-init.sh --- nixos/modules/virtualisation/qemu-vm.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 32a1d47b59fe..bdce2b62a15a 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -1046,14 +1046,6 @@ in boot.loader.supportsInitrdSecrets = mkIf (!cfg.useBootLoader) (mkVMOverride false); - systemd.tmpfiles.settings."10-qemu-vm" = { - "/etc/NIXOS".f = { - mode = "0644"; - user = "root"; - group = "root"; - }; - }; - # After booting, register the closure of the paths in # `virtualisation.additionalPaths' in the Nix database in the VM. This # allows Nix operations to work in the VM. The path to the