From b1961fefddf47b853f246974282abcfff0b6d3d6 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Wed, 3 Apr 2024 22:33:42 +0200 Subject: [PATCH] Update dependencies --- flake.lock | 36 +++++----- patches/300126.patch | 158 ------------------------------------------- 2 files changed, 18 insertions(+), 176 deletions(-) delete mode 100644 patches/300126.patch diff --git a/flake.lock b/flake.lock index 8b56a3e6..4c7809de 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1711789951, - "narHash": "sha256-7KhrYepLxBAtmA6oyIkr+d8QaXnl2kltP5XgTqRvpaA=", + "lastModified": 1712169936, + "narHash": "sha256-I/vyzMkmn6pU673uGrV2tQ+0kBOexALYABHU31d0Wro=", "owner": "accentor", "repo": "api", - "rev": "7c461c4bae9667ecc2c57dbe8ace81dcb1ea425c", + "rev": "88e9526536a1ae01c20a2a4965a695a4ea4b2e96", "type": "github" }, "original": { @@ -72,11 +72,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1711789553, - "narHash": "sha256-gPu9hUZqmVUiRQQ1d9LotK5dIfZLk0ISbG14Ya1bzvs=", + "lastModified": 1712169655, + "narHash": "sha256-Ho7CKNPnkBJqH8nK7xNwrcnQXgmqc7QExqLlqGQFvWo=", "owner": "accentor", "repo": "web", - "rev": "5224c63e225553cfb2cda0cc799b585c51f4c153", + "rev": "7771b5695bf4834882a8284695f0f273e0074049", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1712108714, - "narHash": "sha256-QzrcwGuuAP1octIcUw/d+Yi5BEXYt1NOwNLpeUrqKTk=", + "lastModified": 1712163912, + "narHash": "sha256-8GoqX+rXuzNII4OPdCvkLihNCGerN2EIP/rc37wymas=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "5d0a10938c32f3cb95d1f1f18127948d239c6720", + "rev": "caa3f53e460e97f0499f1006de35cf3f898a66d9", "type": "github" }, "original": { @@ -473,11 +473,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", + "lastModified": 1712122226, + "narHash": "sha256-pmgwKs8Thu1WETMqCrWUm0CkN1nmCKX3b51+EXsAZyY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", + "rev": "08b9151ed40350725eb40b1fe96b0b86304a654b", "type": "github" }, "original": { @@ -521,11 +521,11 @@ }, "nur": { "locked": { - "lastModified": 1712159103, - "narHash": "sha256-jbVMGl4TePM6faeW9SXWsOsn7KOn7TB6OWKsI148qB0=", + "lastModified": 1712175522, + "narHash": "sha256-Gx675eXlRjSgN6xk8R4IoIitI+F98ocCa/vSSNH6Dso=", "owner": "nix-community", "repo": "NUR", - "rev": "839733a1d390b4450cd509f7e6c0b5966bd03798", + "rev": "bee98b2bf5c3cbfb63c9d584e914b6bcc4a03a26", "type": "github" }, "original": { @@ -738,11 +738,11 @@ ] }, "locked": { - "lastModified": 1711755284, - "narHash": "sha256-Aymqq0ko1QX412LiR+nwvDsOkhWmw12Z20npZvq88WA=", + "lastModified": 1712169352, + "narHash": "sha256-yyoLKV4LT2pG4yuOTnLHhpMWIwWCFNbKAaFVyaD/XC8=", "owner": "chvp", "repo": "tetris", - "rev": "71bc1e70ccb2d8a14869620563b1d1eefa015280", + "rev": "339ee4dc42c14409ae547363f7d7cb923e069828", "type": "github" }, "original": { diff --git a/patches/300126.patch b/patches/300126.patch deleted file mode 100644 index adac097b..00000000 --- a/patches/300126.patch +++ /dev/null @@ -1,158 +0,0 @@ -diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix -index 6745fc87dda8f8..3b549e194d88b8 100644 ---- a/pkgs/servers/nextcloud/default.nix -+++ b/pkgs/servers/nextcloud/default.nix -@@ -43,20 +43,20 @@ let - }; - in { - nextcloud26 = generic { -- version = "26.0.12"; -- hash = "sha256-fuTAIAJB9pRfMd0Ewh19FmY0Vj4MuH1iMkkS1BiTI0w="; -+ version = "26.0.13"; -+ hash = "sha256-CjYt96EjM0j5nRhT/X558GZ7VSwUXcRQEvq1SsMcea4="; - packages = nextcloud26Packages; - }; - - nextcloud27 = generic { -- version = "27.1.7"; -- hash = "sha256-hEPi0bsojcQU+q0Kb+/i41uznt0359pcXzTexsDdG+s="; -+ version = "27.1.8"; -+ hash = "sha256-Ciy5vRKCnlOq8XNUPsrQFPCeganXL6YeTEYNhOO47fs="; - packages = nextcloud27Packages; - }; - - nextcloud28 = generic { -- version = "28.0.3"; -- hash = "sha256-ntQTwN4W9bAzzu/8ypnA1h/GmNvrjbhRrJrfnu+VGQY="; -+ version = "28.0.4"; -+ hash = "sha256-m/7O4eEvukjEnppxyqgcS6ELKIR4f6t11kzP0SKhMBk="; - packages = nextcloud28Packages; - }; - -diff --git a/pkgs/servers/nextcloud/packages/26.json b/pkgs/servers/nextcloud/packages/26.json -index 7531577da7c2ea..d795245939dff2 100644 ---- a/pkgs/servers/nextcloud/packages/26.json -+++ b/pkgs/servers/nextcloud/packages/26.json -@@ -110,9 +110,9 @@ - ] - }, - "groupfolders": { -- "sha256": "19j2iqn3fjlzcswgbxwvxggzqc3aili8br4vjpr8dd9h1rzm453y", -- "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v14.0.7/groupfolders-v14.0.7.tar.gz", -- "version": "14.0.7", -+ "sha256": "1icpj855ib6cx7b57njvhdkcwgd4jmndm3gwh8qgq0mvdlkqpmd0", -+ "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v14.0.8/groupfolders-v14.0.8.tar.gz", -+ "version": "14.0.8", - "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": [ -@@ -190,9 +190,9 @@ - ] - }, - "notes": { -- "sha256": "02893azzq507frb3x7h13ypx09yn9rx740hgfw7q1a2il2ixww5f", -- "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.2/notes.tar.gz", -- "version": "4.9.2", -+ "sha256": "1ii3ii2062wklss3mxsfbvqi4hvi96a20i20lbwm6z2x6q7fqqi3", -+ "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": [ -diff --git a/pkgs/servers/nextcloud/packages/27.json b/pkgs/servers/nextcloud/packages/27.json -index f0b30f3d2c3277..acf8763b62d2f3 100644 ---- a/pkgs/servers/nextcloud/packages/27.json -+++ b/pkgs/servers/nextcloud/packages/27.json -@@ -110,9 +110,9 @@ - ] - }, - "groupfolders": { -- "sha256": "0p3g19cmfjn1zql6cr3bv0cvfj078vh6ian024iwvc6ir8fmsni0", -- "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v15.3.5/groupfolders-v15.3.5.tar.gz", -- "version": "15.3.5", -+ "sha256": "00pjva8hc36mnawvbpsi6lizzdhclp30z92vaz8j24xmhf21yvh9", -+ "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v15.3.6/groupfolders-v15.3.6.tar.gz", -+ "version": "15.3.6", - "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": [ -@@ -150,8 +150,8 @@ - ] - }, - "maps": { -- "sha256": "049hrp79fj1bp9nk9isjrk427k238974x7gsj68jplxfrgq3sdkz", -- "url": "https://github.com/nextcloud/maps/releases/download/v1.2.0-2-nightly/maps-1.2.0-2-nightly.tar.gz", -+ "sha256": "1gyxg5xp4mpdrw8630nqcf5yk8cs7a0kvfik2q01p05d533phc4d", -+ "url": "https://github.com/nextcloud/maps/releases/download/v1.2.0/maps-1.2.0.tar.gz", - "version": "1.2.0", - "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", - "homepage": "https://github.com/nextcloud/maps", -@@ -190,9 +190,9 @@ - ] - }, - "notes": { -- "sha256": "02893azzq507frb3x7h13ypx09yn9rx740hgfw7q1a2il2ixww5f", -- "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.2/notes.tar.gz", -- "version": "4.9.2", -+ "sha256": "1ii3ii2062wklss3mxsfbvqi4hvi96a20i20lbwm6z2x6q7fqqi3", -+ "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": [ -diff --git a/pkgs/servers/nextcloud/packages/28.json b/pkgs/servers/nextcloud/packages/28.json -index 52a4c241fd558e..ef885c7b7a0ecc 100644 ---- a/pkgs/servers/nextcloud/packages/28.json -+++ b/pkgs/servers/nextcloud/packages/28.json -@@ -60,9 +60,9 @@ - ] - }, - "end_to_end_encryption": { -- "sha256": "1h9is67lbnvgnv6n9p07si0qcp6hgymlq7f07z8s2ckf04p0nzad", -- "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v1.14.4/end_to_end_encryption-v1.14.4.tar.gz", -- "version": "1.14.4", -+ "sha256": "04b2hj96gpb4sf1w5r1sxa4fmxrk36vr3pia8i5w2pfi6fbhd9mc", -+ "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": [ -@@ -90,9 +90,9 @@ - ] - }, - "groupfolders": { -- "sha256": "00237wdfn7yj31mjpv6crnk0lrazy9iljfcpxjhy4g91d8sc3f5d", -- "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.4/groupfolders-v16.0.4.tar.gz", -- "version": "16.0.4", -+ "sha256": "0cg81d75dg96zp09jy4yzg65v14wf99c2snnj304v4dia410c8a3", -+ "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.5/groupfolders-v16.0.5.tar.gz", -+ "version": "16.0.5", - "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": [ -@@ -160,9 +160,9 @@ - ] - }, - "notes": { -- "sha256": "02893azzq507frb3x7h13ypx09yn9rx740hgfw7q1a2il2ixww5f", -- "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.2/notes.tar.gz", -- "version": "4.9.2", -+ "sha256": "1ii3ii2062wklss3mxsfbvqi4hvi96a20i20lbwm6z2x6q7fqqi3", -+ "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": [ -@@ -200,9 +200,9 @@ - ] - }, - "polls": { -- "sha256": "1a5fyx1wvgwm2mjqmg5kah3x2y77zw8ly1zvcx6m4x50s113rkbi", -- "url": "https://github.com/nextcloud/polls/releases/download/v6.1.6/polls.tar.gz", -- "version": "6.1.6", -+ "sha256": "0gym2sx9lx6nvyby9pj1xml4n9fa7q91rl1i33kb70fclv622ca3", -+ "url": "https://github.com/nextcloud/polls/releases/download/v7.0.0/polls.tar.gz", -+ "version": "7.0.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": [