From 6e20eae5167a71eeaaf97d4b921424914feb2f66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 1 Jun 2024 19:56:33 -0700 Subject: [PATCH 1/7] nextcloud27: 27.1.9 -> 27.1.10 Changelog: https://nextcloud.com/changelog/#27-1-10 (cherry picked from commit 28b2e9ac03971f0e90c11871657d6a45428e9119) --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 9fbf04cbd5e1..73d2fc299132 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -62,8 +62,8 @@ in { }; nextcloud27 = generic { - version = "27.1.9"; - hash = "sha256-+P4QzLWFNJ+EUQ25tLAgjbfziV2vPXpejxfSNuzEEfU="; + version = "27.1.10"; + hash = "sha256-lD4ScNdxp8gNqisy5ylM6MO3e56u9yrYs4SH1YyFB1Y="; packages = nextcloud27Packages; }; From 19b02f6c44cc2082d2cc6e899b9cbb4f51bcadd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 1 Jun 2024 19:57:34 -0700 Subject: [PATCH 2/7] nextcloudPackages: update (cherry picked from commit 80c129e782f918ec8bac5625b539f4bc7cac5504) --- pkgs/servers/nextcloud/packages/27.json | 18 +++++++++--------- pkgs/servers/nextcloud/packages/28.json | 24 ++++++++++++------------ pkgs/servers/nextcloud/packages/29.json | 24 ++++++++++++------------ 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/27.json b/pkgs/servers/nextcloud/packages/27.json index d33fd4331e7d..1ce37d20fddb 100644 --- a/pkgs/servers/nextcloud/packages/27.json +++ b/pkgs/servers/nextcloud/packages/27.json @@ -200,9 +200,9 @@ ] }, "notify_push": { - "sha256": "1w0nb74q5ishwsd9xhgjlp5ik159xjfp5i2cczi0fmwlb185n1ik", - "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.11/notify_push-v0.6.11.tar.gz", - "version": "0.6.11", + "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", "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": [ @@ -210,9 +210,9 @@ ] }, "onlyoffice": { - "sha256": "1h4jjphpqzxmnx300fkj0gf831sb61r8vxd3w9vnj4v38mxdmcc0", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.2.0/onlyoffice.tar.gz", - "version": "9.2.0", + "sha256": "1vflj70q8d0hrfck9c5l1k4qa38gpdh3zjgx4aqamnlbvkfssk7h", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.2.2/onlyoffice.tar.gz", + "version": "9.2.2", "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": [ @@ -230,9 +230,9 @@ ] }, "polls": { - "sha256": "1s3rlfdk3g3c45ch8kb66ydzxfx20vcaff1926m5h8m50cmapq6x", - "url": "https://github.com/nextcloud/polls/releases/download/v6.3.0/polls.tar.gz", - "version": "6.3.0", + "sha256": "0zsklab2sjz5b37b1dn0fpc21yvxrp7fvacppv1v6x5yppnmm6kh", + "url": "https://github.com/nextcloud/polls/releases/download/v6.4.0/polls.tar.gz", + "version": "6.4.0", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/28.json b/pkgs/servers/nextcloud/packages/28.json index ec4a34f3c10f..7b8d3615bab7 100644 --- a/pkgs/servers/nextcloud/packages/28.json +++ b/pkgs/servers/nextcloud/packages/28.json @@ -1,8 +1,8 @@ { "bookmarks": { - "sha256": "0i070c5a66yxs8h7w6r9wi0n1bf41q4vrhvwr4vybi1siwr3psv6", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.0.2/bookmarks-14.0.2.tar.gz", - "version": "14.0.2", + "sha256": "1i003cp6x4hw3zkaf49a0srkgr257fbv3p612whd1nsbm2mfd2mf", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.1.1/bookmarks-14.1.1.tar.gz", + "version": "14.1.1", "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ @@ -70,9 +70,9 @@ ] }, "forms": { - "sha256": "0ca627nyrs61k5990j3m1l7vxavsh8x8rrhfvk01pdl9f1556jmf", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.2.3/forms-v4.2.3.tar.gz", - "version": "4.2.3", + "sha256": "1hwc7ra12nsr79xp8lkv3ip46bxxbjpaglb0a4k06ikfnzjaddny", + "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": [ @@ -170,9 +170,9 @@ ] }, "notify_push": { - "sha256": "1w0nb74q5ishwsd9xhgjlp5ik159xjfp5i2cczi0fmwlb185n1ik", - "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.11/notify_push-v0.6.11.tar.gz", - "version": "0.6.11", + "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", "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": [ @@ -180,9 +180,9 @@ ] }, "onlyoffice": { - "sha256": "1h4jjphpqzxmnx300fkj0gf831sb61r8vxd3w9vnj4v38mxdmcc0", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.2.0/onlyoffice.tar.gz", - "version": "9.2.0", + "sha256": "1vflj70q8d0hrfck9c5l1k4qa38gpdh3zjgx4aqamnlbvkfssk7h", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.2.2/onlyoffice.tar.gz", + "version": "9.2.2", "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": [ diff --git a/pkgs/servers/nextcloud/packages/29.json b/pkgs/servers/nextcloud/packages/29.json index 03563eeea2b1..c49903cd3994 100644 --- a/pkgs/servers/nextcloud/packages/29.json +++ b/pkgs/servers/nextcloud/packages/29.json @@ -1,8 +1,8 @@ { "bookmarks": { - "sha256": "0i070c5a66yxs8h7w6r9wi0n1bf41q4vrhvwr4vybi1siwr3psv6", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.0.2/bookmarks-14.0.2.tar.gz", - "version": "14.0.2", + "sha256": "1i003cp6x4hw3zkaf49a0srkgr257fbv3p612whd1nsbm2mfd2mf", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.1.1/bookmarks-14.1.1.tar.gz", + "version": "14.1.1", "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ @@ -70,9 +70,9 @@ ] }, "forms": { - "sha256": "0ca627nyrs61k5990j3m1l7vxavsh8x8rrhfvk01pdl9f1556jmf", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.2.3/forms-v4.2.3.tar.gz", - "version": "4.2.3", + "sha256": "1hwc7ra12nsr79xp8lkv3ip46bxxbjpaglb0a4k06ikfnzjaddny", + "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": [ @@ -170,9 +170,9 @@ ] }, "notify_push": { - "sha256": "1w0nb74q5ishwsd9xhgjlp5ik159xjfp5i2cczi0fmwlb185n1ik", - "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.11/notify_push-v0.6.11.tar.gz", - "version": "0.6.11", + "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", "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": [ @@ -180,9 +180,9 @@ ] }, "onlyoffice": { - "sha256": "1h4jjphpqzxmnx300fkj0gf831sb61r8vxd3w9vnj4v38mxdmcc0", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.2.0/onlyoffice.tar.gz", - "version": "9.2.0", + "sha256": "1vflj70q8d0hrfck9c5l1k4qa38gpdh3zjgx4aqamnlbvkfssk7h", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.2.2/onlyoffice.tar.gz", + "version": "9.2.2", "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": [ From bf4456d2748d7f18e8054ad0cdf0d94ab4580c37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 1 Jun 2024 19:59:10 -0700 Subject: [PATCH 3/7] nextcloud-notify_push: 0.6.11 -> 0.6.12 Diff: https://github.com/nextcloud/notify_push/compare/v0.6.11...v0.6.12 Changelog: https://github.com/nextcloud/notify_push/releases/tag/v0.6.12 (cherry picked from commit 3039b5ddef1fd4dd18deabe799529417d8fbb018) --- pkgs/servers/nextcloud/notify_push.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix index 758f0ec25a77..bc7fc0764f1f 100644 --- a/pkgs/servers/nextcloud/notify_push.nix +++ b/pkgs/servers/nextcloud/notify_push.nix @@ -6,16 +6,16 @@ rustPackages_1_76.rustPlatform.buildRustPackage rec { pname = "notify_push"; - version = "0.6.11"; + version = "0.6.12"; src = fetchFromGitHub { owner = "nextcloud"; repo = pname; rev = "v${version}"; - hash = "sha256-241p+9gLyEe2Mkc0GQ/Z0BjbxV5OZfbDC6kqfq7ATaE="; + hash = "sha256-Wbrkr9DWOQpOKAp9X/PzU8alDDrDapX/1hE+ObbD/nc="; }; - cargoHash = "sha256-fGbRmrOEbs9nGZhcu1w7qOIwYMaTohaUFb7dilPuTHc="; + cargoHash = "sha256-4bgbhtqdb1IVsf0yIcZOXZCVdRHjdvhZe/VCab0kuMk="; passthru = rec { test_client = rustPackages_1_76.rustPlatform.buildRustPackage { @@ -24,7 +24,7 @@ rustPackages_1_76.rustPlatform.buildRustPackage rec { buildAndTestSubdir = "test_client"; - cargoHash = "sha256-RJnNwSDwIA0M+BufBKT9a/pyHwpcpJFR//j0fE4U3gE="; + cargoHash = "sha256-Z7AX/PXfiUHEV/M+i/2qne70tcZnnPj/iNT+DNMECS8="; meta = meta // { mainProgram = "test_client"; From 26629ebefd3c2a82b016e52fb175c9f82d68cfc5 Mon Sep 17 00:00:00 2001 From: Eric Wolf Date: Wed, 29 May 2024 08:00:32 +0200 Subject: [PATCH 4/7] nixos/nextcloud-notify_push: use `Type=notify` This prevents the post start script from running before necessary sockets have been created. It also prevents an unused shell from being kept around by using `exec` to make `notify_push` the main process. --- nixos/modules/services/web-apps/nextcloud-notify_push.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/nextcloud-notify_push.nix b/nixos/modules/services/web-apps/nextcloud-notify_push.nix index 759daa0c50dc..62434764b8ef 100644 --- a/nixos/modules/services/web-apps/nextcloud-notify_push.nix +++ b/nixos/modules/services/web-apps/nextcloud-notify_push.nix @@ -90,7 +90,7 @@ in export DATABASE_PASSWORD="$(<"${cfg.dbpassFile}")" '' + '' export DATABASE_URL="${dbUrl}" - ${cfg.package}/bin/notify_push '${cfgN.datadir}/config/config.php' + exec ${cfg.package}/bin/notify_push '${cfgN.datadir}/config/config.php' ''; serviceConfig = { User = "nextcloud"; @@ -98,6 +98,7 @@ in RuntimeDirectory = [ "nextcloud-notify_push" ]; Restart = "on-failure"; RestartSec = "5s"; + Type = "notify"; }; }; From 11e7459aa9880896bb78be57ec885a1c9ea5b651 Mon Sep 17 00:00:00 2001 From: shard7 Date: Wed, 24 Jan 2024 14:19:49 -0800 Subject: [PATCH 5/7] payloadsallthethings: init at 3.0-unstable-2024-01-21 (cherry picked from commit 8adaa32ad38d2c7239225c4a56ad3944234be4d1) --- .../pa/payloadsallthethings/package.nix | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/pa/payloadsallthethings/package.nix diff --git a/pkgs/by-name/pa/payloadsallthethings/package.nix b/pkgs/by-name/pa/payloadsallthethings/package.nix new file mode 100644 index 000000000000..bc6c76429c0a --- /dev/null +++ b/pkgs/by-name/pa/payloadsallthethings/package.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, stdenvNoCC +}: + +stdenvNoCC.mkDerivation { + pname = "payloadsallthethings"; + version = "3.0-unstable-2024-01-21"; + + src = fetchFromGitHub { + owner = "swisskyrepo"; + repo = "PayloadsAllTheThings"; + rev = "97cfeee270395a838802fa1fcb8a4d5ffc6d6b48"; + hash = "sha256-LRS60v0o5nPSLfGFH6P0Y5roN8Mk5/KyRF4SWTv/7Hw="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/payloadsallthethings + rm CONTRIBUTING.md mkdocs.yml custom.css + cp -a * $out/share/payloadsallthethings + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/swisskyrepo/PayloadsAllTheThings"; + description = "A list of useful payloads and bypass for Web Application Security and Pentest/CTF"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ shard7 ]; + platforms = lib.platforms.all; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; + }; +} From fcd3d98d26a26d3adc2ffddb0908e60b08fc4b03 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 4 Jun 2024 20:18:50 +0100 Subject: [PATCH 6/7] doc: fix make-disk-image.nix example (cherry picked from commit 1a297df41b2e7c5ad96327298749457cba817afa) --- doc/build-helpers/images/makediskimage.section.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/build-helpers/images/makediskimage.section.md b/doc/build-helpers/images/makediskimage.section.md index e50479c4e83e..3edfa906aa6a 100644 --- a/doc/build-helpers/images/makediskimage.section.md +++ b/doc/build-helpers/images/makediskimage.section.md @@ -85,14 +85,14 @@ let in make-disk-image { inherit pkgs lib; - config = evalConfig { + inherit (evalConfig { modules = [ { fileSystems."/" = { device = "/dev/vda"; fsType = "ext4"; autoFormat = true; }; boot.grub.device = "/dev/vda"; } ]; - }; + }) config; format = "qcow2"; onlyNixStore = false; partitionTableType = "legacy+gpt"; @@ -104,5 +104,3 @@ in memSize = 2048; # Qemu VM memory size in megabytes. Defaults to 1024M. } ``` - - From 8d38c4a5b9f7e7d49261e7317ad31a234dd964ff Mon Sep 17 00:00:00 2001 From: euxane Date: Tue, 4 Jun 2024 17:02:18 +0200 Subject: [PATCH 7/7] meli: add gpgme to runtime lib path Meli looks for libgpgme at runtime to handle message encryption and decryption. This patch solves the error: Decryption failed: libgpgme.so: cannot open shared object file: No such file or directory GitHub: closes https://github.com/NixOS/nixpkgs/issues/174767 (cherry picked from commit 195fa9872c57e69cf5cfd9f6656843deacaeb1b6) --- pkgs/applications/networking/mailreaders/meli/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix index 1ce4c39da7a3..13f32cc67340 100644 --- a/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/pkgs/applications/networking/mailreaders/meli/default.nix @@ -17,6 +17,7 @@ , sqlite # runtime deps +, gpgme , gnum4 }: @@ -54,6 +55,7 @@ rustPlatform.buildRustPackage rec { installManPage meli/docs/*.{1,5,7} wrapProgram $out/bin/meli \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gpgme ]} \ --prefix PATH : ${lib.makeBinPath [ gnum4 ]} '';