From da7e9fff789143224ad15825f922b8ddffe86260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 18 Jul 2023 09:54:45 -0700 Subject: [PATCH 01/29] imagemagick: 7.1.1-12 -> 7.1.1-13 Diff: https://github.com/ImageMagick/ImageMagick/compare/7.1.1-12...7.1.1-13 (cherry picked from commit 588a7b4d8d9fd1d0255b678211ea8f387bc0582b) --- pkgs/applications/graphics/ImageMagick/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 3f8bf8428223..a91671a33498 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -47,13 +47,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-12"; + version = "7.1.1-13"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-URwSufiTcLGWRFNOJidJyEcIPxWUSdN7yHaCiFh7GEI="; + hash = "sha256-HrUka7VLF9YH23TxDQeQpulQf3ssSfYOhi29v2onvCE="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru.tests = { - version = testers.testVersion { package = imagemagick; }; + version = testers.testVersion { package = finalAttrs.finalPackage; }; inherit (python3.pkgs) img2pdf; pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; From ec1505f10f15c2223a48affd8f5c8e9934af390f Mon Sep 17 00:00:00 2001 From: Lorenz Brun Date: Thu, 13 Jul 2023 20:43:15 +0200 Subject: [PATCH 02/29] chromium: supply Rust compiler for M115+ Chromium has recently started integrating Rust [1] and as of M115 this infrastructure is enabled, thus Chromium either requires the bundled binary Rust compiler (which won't work in NixOS without modification) or a custom one. This configures the nixpkgs Rust compiler for Chromium. M115 doesn't actually contain any production Rust code, so we don't actually know if this fully works and we're definitely still missing bindgen, but for the time being this makes it work and is a sane starting position. [1] https://security.googleblog.com/2023/01/supporting-use-of-rust-in-chromium.html (cherry picked from commit 7261c52fedfef95079c401f86d36cfbc4cbbc85c) --- pkgs/applications/networking/browsers/chromium/common.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 9b0b8ab21ce8..115e984bbaaa 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -9,6 +9,7 @@ , python3, perl , which , llvmPackages +, rustc # postPatch: , pkgsBuildHost # configurePhase: @@ -308,6 +309,11 @@ let # To fix the build as we don't provide libffi_pic.a # (ld.lld: error: unable to find library -l:libffi_pic.a): use_system_libffi = true; + } // lib.optionalAttrs (chromiumVersionAtLeast "115") { + # Use nixpkgs Rust compiler instead of the one shipped by Chromium. + # We do intentionally not set rustc_version as nixpkgs will never do incremental + # rebuilds, thus leaving this empty is fine. + rust_sysroot_absolute = "${rustc}"; } // lib.optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; From 6a6b54b00c93f801d2987e62ca260ff44abaf380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 20 Jul 2023 12:13:06 -0700 Subject: [PATCH 03/29] nextcloud25: 25.0.8 -> 25.0.9 Changelog: https://nextcloud.com/changelog/#25-0-9 (cherry picked from commit 84232105ade4f4a4067ac560417f6ada41721d5f) --- 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 5455fb2a8c58..25b839603d7c 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -60,8 +60,8 @@ in { ''; nextcloud25 = generic { - version = "25.0.8"; - sha256 = "sha256-Ia6afooDCNDZsGSoh5dddZvLUE3fU+jU6sy6MrxUMVs="; + version = "25.0.9"; + sha256 = "sha256-k5XVM0ABRtAiCNoPNvkpYxq16Nb9Xd/VXNpqIDWg/nA="; packages = nextcloud25Packages; }; From 52fcc47e88fc0e5dd016beef6b2501955f02ab3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 20 Jul 2023 12:20:15 -0700 Subject: [PATCH 04/29] nextcloud26: 26.0.3 -> 26.0.4 Changelog: https://nextcloud.com/changelog/#26-0-4 (cherry picked from commit cf94e7529ca5ff863675c90f07f70ab8e3c4849f) --- 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 25b839603d7c..c8638e18e553 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -66,8 +66,8 @@ in { }; nextcloud26 = generic { - version = "26.0.3"; - sha256 = "sha256-pagQy818Pc/yXyKAkyHy7UHtfMBgEgRImskOJYBgtck="; + version = "26.0.4"; + sha256 = "sha256-gBya6RLPYmS+csFB5BjT2H1OZxx6ndZDAI9dfWmR6i4="; packages = nextcloud26Packages; }; From 3b726997fb16eaeaf7c16e0cd41c41195de554fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 20 Jul 2023 12:22:48 -0700 Subject: [PATCH 05/29] nextcloud27: 27.0.0 -> 27.0.1 Changelog: https://nextcloud.com/changelog/#27-0-1 (cherry picked from commit 450f78363145f4fe7887be23a5473915db3afd83) --- 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 c8638e18e553..5c2ef84eb5fd 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -72,8 +72,8 @@ in { }; nextcloud27 = generic { - version = "27.0.0"; - sha256 = "sha256-PTEqCbk0WsBYdY3XtAWb888LHw8ddHJRtvrDWFumUz8="; + version = "27.0.1"; + sha256 = "sha256-OXa16PWPk03b63zEmsM7Ea0629f21dCQig/DahYMJ70="; packages = nextcloud27Packages; }; From e5683cc55ecf9e74239001acfbcd10e255c7856c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 20 Jul 2023 12:24:10 -0700 Subject: [PATCH 06/29] nextcloudPackages: update (cherry picked from commit 9167341e3f15eb249608363630cddd02ec740645) --- pkgs/servers/nextcloud/packages/25.json | 12 +++---- pkgs/servers/nextcloud/packages/26.json | 18 +++++----- pkgs/servers/nextcloud/packages/27.json | 46 +++++++++++++++++++++++-- 3 files changed, 58 insertions(+), 18 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/25.json b/pkgs/servers/nextcloud/packages/25.json index 89d9cd82c8d6..a74d69e2b85b 100644 --- a/pkgs/servers/nextcloud/packages/25.json +++ b/pkgs/servers/nextcloud/packages/25.json @@ -60,9 +60,9 @@ ] }, "files_texteditor": { - "sha256": "0rmk14iw34pd81snp3lm01k07wm5j2nh9spcd4j0m43l20b7kxss", - "url": "https://github.com/nextcloud-releases/files_texteditor/releases/download/v2.15.0/files_texteditor.tar.gz", - "version": "2.15.0", + "sha256": "1irvxz29fj9ccplgizwkchc885fqvqsmk9rj4gfwgpa8bgkya1y6", + "url": "https://github.com/nextcloud-releases/files_texteditor/releases/download/v2.15.1/files_texteditor-v2.15.1.tar.gz", + "version": "2.15.1", "description": "This application enables Nextcloud users to open, save and edit text files in the web browser. If enabled, an entry called \"Text file\" in the \"New\" button menu at the top of the web browser appears. When clicked, a new text file opens in the browser and the file can be saved into the current Nextcloud directory. Further, when a text file is clicked in the web browser, it will be opened and editable. If the privileges allow, a user can also edit shared files and save these changes back into the web browser.\nMore information is available in the text editor documentation.", "homepage": "https://github.com/nextcloud/files_texteditor", "licenses": [ @@ -210,9 +210,9 @@ ] }, "spreed": { - "sha256": "1b6v7jfvrkpyarz4zg1lvw938wv3hx6g0nhpdvsfnjqr03rrgywk", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v15.0.6/spreed-v15.0.6.tar.gz", - "version": "15.0.6", + "sha256": "0az92qmc24n91zh2vq4qs99zppph6bchknv5akw6c7iqpg8d12gk", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v15.0.7/spreed-v15.0.7.tar.gz", + "version": "15.0.7", "description": "Chat, video & audio-conferencing using WebRTC\n\n* πŸ’¬ **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* πŸ‘₯ **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* πŸ’» **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* πŸš€ **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* βœ‹ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/26.json b/pkgs/servers/nextcloud/packages/26.json index 76588ece19d0..b71e05cceca4 100644 --- a/pkgs/servers/nextcloud/packages/26.json +++ b/pkgs/servers/nextcloud/packages/26.json @@ -60,9 +60,9 @@ ] }, "files_texteditor": { - "sha256": "0rmk14iw34pd81snp3lm01k07wm5j2nh9spcd4j0m43l20b7kxss", - "url": "https://github.com/nextcloud-releases/files_texteditor/releases/download/v2.15.0/files_texteditor.tar.gz", - "version": "2.15.0", + "sha256": "1irvxz29fj9ccplgizwkchc885fqvqsmk9rj4gfwgpa8bgkya1y6", + "url": "https://github.com/nextcloud-releases/files_texteditor/releases/download/v2.15.1/files_texteditor-v2.15.1.tar.gz", + "version": "2.15.1", "description": "This application enables Nextcloud users to open, save and edit text files in the web browser. If enabled, an entry called \"Text file\" in the \"New\" button menu at the top of the web browser appears. When clicked, a new text file opens in the browser and the file can be saved into the current Nextcloud directory. Further, when a text file is clicked in the web browser, it will be opened and editable. If the privileges allow, a user can also edit shared files and save these changes back into the web browser.\nMore information is available in the text editor documentation.", "homepage": "https://github.com/nextcloud/files_texteditor", "licenses": [ @@ -120,9 +120,9 @@ ] }, "maps": { - "sha256": "04mgk4g2262m3xkyrskq66vq8784pvv183ff1h3d6yilpy4ysjfy", - "url": "https://github.com/nextcloud/maps/releases/download/v1.0.2/maps-1.0.2.tar.gz", - "version": "1.0.2", + "sha256": "12dg1bklv2jhmj5dnz4ram6zvgf8kipfz77g1lcn77fyhzqw6y1z", + "url": "https://github.com/nextcloud/maps/releases/download/v1.1.0/maps-1.1.0.tar.gz", + "version": "1.1.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": [ @@ -210,9 +210,9 @@ ] }, "spreed": { - "sha256": "1khnbxifvs2w0xabc7ivsfzx845601f3dq5jg0nxbmrbigcdj7x2", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v16.0.4/spreed-v16.0.4.tar.gz", - "version": "16.0.4", + "sha256": "09jkq0fiw5h60qvjhld0nrralf2yrdcnpr9q4chw5hq0q710526n", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v16.0.5/spreed-v16.0.5.tar.gz", + "version": "16.0.5", "description": "Chat, video & audio-conferencing using WebRTC\n\n* πŸ’¬ **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* πŸ‘₯ **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* πŸ’» **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* πŸš€ **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* βœ‹ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/27.json b/pkgs/servers/nextcloud/packages/27.json index 1a13160d4472..b6fecacec501 100644 --- a/pkgs/servers/nextcloud/packages/27.json +++ b/pkgs/servers/nextcloud/packages/27.json @@ -59,6 +59,16 @@ "agpl" ] }, + "files_texteditor": { + "sha256": "1irvxz29fj9ccplgizwkchc885fqvqsmk9rj4gfwgpa8bgkya1y6", + "url": "https://github.com/nextcloud-releases/files_texteditor/releases/download/v2.15.1/files_texteditor-v2.15.1.tar.gz", + "version": "2.15.1", + "description": "This application enables Nextcloud users to open, save and edit text files in the web browser. If enabled, an entry called \"Text file\" in the \"New\" button menu at the top of the web browser appears. When clicked, a new text file opens in the browser and the file can be saved into the current Nextcloud directory. Further, when a text file is clicked in the web browser, it will be opened and editable. If the privileges allow, a user can also edit shared files and save these changes back into the web browser.\nMore information is available in the text editor documentation.", + "homepage": "https://github.com/nextcloud/files_texteditor", + "licenses": [ + "agpl" + ] + }, "forms": { "sha256": "0jfnidmx93k0z923m3p3bi8qv46j875cpnc60hlpxvcl35zbb2rl", "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.3.0/forms-v3.3.0.tar.gz", @@ -99,6 +109,26 @@ "agpl" ] }, + "maps": { + "sha256": "12dg1bklv2jhmj5dnz4ram6zvgf8kipfz77g1lcn77fyhzqw6y1z", + "url": "https://github.com/nextcloud/maps/releases/download/v1.1.0/maps-1.1.0.tar.gz", + "version": "1.1.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" + ] + }, + "memories": { + "sha256": "0v72hfn57zrvbfgd970qkm7c4lkm436k32vhxz4d1hkg83wjqsrl", + "url": "https://github.com/pulsejet/memories/releases/download/v5.2.1/memories.tar.gz", + "version": "5.2.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" + ] + }, "news": { "sha256": "", "url": "", @@ -167,10 +197,20 @@ "agpl" ] }, + "registration": { + "sha256": "0x1x5mk83qh5lffcs7h0gjjihzsphc6iqmbch1ni76h9pw4zxrw1", + "url": "https://github.com/nextcloud-releases/registration/releases/download/v2.2.0/registration-v2.2.0.tar.gz", + "version": "2.2.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" + ] + }, "spreed": { - "sha256": "1s0p1048qygp47dhjgm2nf97qvr865c7p4rymvic0anyff8l014g", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v17.0.0/spreed-v17.0.0.tar.gz", - "version": "17.0.0", + "sha256": "07bf6vmz957m2myazkvw63q40lisi14kyb42w4gpg3860ihr16sc", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v17.0.2/spreed-v17.0.2.tar.gz", + "version": "17.0.2", "description": "Chat, video & audio-conferencing using WebRTC\n\n* πŸ’¬ **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* πŸ‘₯ **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* πŸ’» **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* πŸš€ **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* βœ‹ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ From f24501813030089744870a7edd73e7f61d327ef9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Jul 2023 03:04:44 +0000 Subject: [PATCH 07/29] apache-jena: 4.8.0 -> 4.9.0 (cherry picked from commit 19fcc259f04aaff9e3fc97b18b9b08847c32330a) --- pkgs/servers/nosql/apache-jena/binary.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index 504f970e90fc..2277c997b7a8 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-jena"; - version = "4.8.0"; + version = "4.9.0"; src = fetchurl { url = "mirror://apache/jena/binaries/apache-jena-${version}.tar.gz"; - hash = "sha256-kAbhH0E2C1ToxDQgFUqWxvknCeFZbtqFhOmiSJ//ciU="; + hash = "sha256-kUsEdEKwYjyM5G8YKTt90fWzX21hiulRj3W5jK45Keg="; }; nativeBuildInputs = [ makeWrapper From 6fc7596c44c6d81f17ca3e8f2de538a13feef0ca Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 16 Jul 2023 15:46:15 +0200 Subject: [PATCH 08/29] apache-jena-fuseki: 4.8.0 -> 4.9.0, add a test Adding a minimal test showing the Fuseki starts and handles a small insert and a request. As the test is run in the minimal environment, add the missing utilities to PATH in the wrapper. (cherry picked from commit 24b79210443547ee292ae7eae8d79067ed5e66d6) --- .../nosql/apache-jena/fuseki-binary.nix | 22 +++++++++++++++---- .../servers/nosql/apache-jena/fuseki-test.nix | 18 +++++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 pkgs/servers/nosql/apache-jena/fuseki-test.nix diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix index 9e911721a32a..ac82f7659d9c 100644 --- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix +++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix @@ -1,11 +1,20 @@ -{ lib, stdenv, fetchurl, java, makeWrapper }: +{ lib +, stdenv +, fetchurl +, java +, coreutils +, which +, makeWrapper + # For the test +, pkgs +}: stdenv.mkDerivation rec { pname = "apache-jena-fuseki"; - version = "4.8.0"; + version = "4.9.0"; src = fetchurl { url = "mirror://apache/jena/binaries/apache-jena-fuseki-${version}.tar.gz"; - hash = "sha256-rJCY8vG1vfEGGA0gsIqNFXKl75O2Zp4zUIWSDfplpVE="; + hash = "sha256-t25Q0lb+ecR12cDD1p6eZnzLxW0kZpPOFGvo5YK7AlI="; }; nativeBuildInputs = [ makeWrapper @@ -16,11 +25,16 @@ stdenv.mkDerivation rec { ln -s "$out"/{fuseki-backup,fuseki-server,fuseki} "$out/bin" for i in "$out"/bin/*; do wrapProgram "$i" \ - --prefix "PATH" : "${java}/bin/" \ + --prefix "PATH" : "${java}/bin/:${coreutils}/bin:${which}/bin" \ --set-default "FUSEKI_HOME" "$out" \ ; done ''; + passthru = { + tests = { + basic-test = pkgs.callPackage ./fuseki-test.nix { }; + }; + }; meta = with lib; { description = "SPARQL server"; license = licenses.asl20; diff --git a/pkgs/servers/nosql/apache-jena/fuseki-test.nix b/pkgs/servers/nosql/apache-jena/fuseki-test.nix new file mode 100644 index 000000000000..cdf1c2d7a147 --- /dev/null +++ b/pkgs/servers/nosql/apache-jena/fuseki-test.nix @@ -0,0 +1,18 @@ +{ lib, runCommandNoCC, apache-jena-fuseki, curl }: +runCommandNoCC "fuseki-test-${apache-jena-fuseki.name}" +{ nativeBuildInputs = [ curl apache-jena-fuseki ]; } '' + export FUSEKI_BASE="$PWD/fuseki-base" + mkdir -p "$FUSEKI_BASE/db" + FUSEKI_ARGS="--update --loc=$FUSEKI_BASE/db /dataset" fuseki start + fuseki status + for i in $(seq 120); do + if curl http://127.0.0.1:3030/dataset/data; then + break; + fi + sleep 1 + done + curl -d 'update=insert+data+{++++}' http://127.0.0.1:3030/dataset/update > /dev/null + curl http://127.0.0.1:3030/dataset/data | grep -C999 'test://predicate' + curl -d 'query=select+?s+?p+?o+where+{+?s+?p+?o+.+}' http://127.0.0.1:3030/dataset/query | grep -C999 'test://predicate' + touch $out +'' From 5ca37e29cb696ffa125c621179d72f95c9f3a770 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Mon, 19 Jun 2023 10:43:10 +0200 Subject: [PATCH 09/29] tang: 13 -> 14 Add updater and basic version test (cherry picked from commit 652c4994d4b68d4bc0348fab96d9064dbc9b8fca) --- pkgs/servers/tang/default.nix | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tang/default.nix b/pkgs/servers/tang/default.nix index 1a66d8f28de9..227daa2cfb9f 100644 --- a/pkgs/servers/tang/default.nix +++ b/pkgs/servers/tang/default.nix @@ -9,17 +9,21 @@ , systemd , meson , ninja +, makeWrapper +, testers +, tang +, gitUpdater }: stdenv.mkDerivation rec { pname = "tang"; - version = "13"; + version = "14"; src = fetchFromGitHub { owner = "latchset"; repo = "tang"; rev = "refs/tags/v${version}"; - hash = "sha256-SOdgMUWavTaDUiVvpEyE9ac+9aDmZs74n7ObugksBcc="; + hash = "sha256-QKURKb2g71pZvuZlJk3Rc26H3oU0WSkjgQtJQLrYGbw="; }; nativeBuildInputs = [ @@ -27,6 +31,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config + makeWrapper ]; buildInputs = [ @@ -41,6 +46,21 @@ stdenv.mkDerivation rec { "man" ]; + postFixup = '' + wrapProgram $out/bin/tang-show-keys --prefix PATH ":" ${lib.makeBinPath [ jose ]} + wrapProgram $out/libexec/tangd-keygen --prefix PATH ":" ${lib.makeBinPath [ jose ]} + wrapProgram $out/libexec/tangd-rotate-keys --prefix PATH ":" ${lib.makeBinPath [ jose ]} + ''; + + passthru = { + tests.version = testers.testVersion { + package = tang; + command = "${tang}/libexec/tangd --version"; + version = "tangd ${version}"; + }; + updateScript = gitUpdater { }; + }; + meta = { description = "Server for binding data to network presence"; homepage = "https://github.com/latchset/tang"; From b78ebee2ca5319d3e2afb6a3ac685f1da45e6f0c Mon Sep 17 00:00:00 2001 From: Atemu Date: Fri, 21 Jul 2023 21:40:52 +0200 Subject: [PATCH 10/29] linux_xanmod_latest: 6.4.1 -> 6.4.4 (cherry picked from commit 5b73fdbd955435d36bc4c9e67e14e7206f855f90) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 3fbdcd2171f4..cbce2f894cdc 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -9,8 +9,8 @@ let }; mainVariant = { - version = "6.4.1"; - hash = "sha256-WPnINDkOj0IoUDLBG/2LOrppVi9o9XSSgMrs/NBbqdA="; + version = "6.4.4"; + hash = "sha256-EdyGAdWIPr91SNz68tVhya9YO4/dL/wEmEklo45i2p0="; variant = "main"; }; From ca862d2e7c5e4af068f55e2e0aa2a015ace54fb1 Mon Sep 17 00:00:00 2001 From: Atemu Date: Fri, 21 Jul 2023 21:41:10 +0200 Subject: [PATCH 11/29] linux_xanmod: 6.1.37 -> 6.1.39 (cherry picked from commit f1d07d1b9a3d3c92a885d7a49d1f9d759f9ee476) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index cbce2f894cdc..4781f5f14e55 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -3,8 +3,8 @@ let # These names are how they are designated in https://xanmod.org. ltsVariant = { - version = "6.1.37"; - hash = "sha256-g8cmAhsM03jBu7UZoNOLBX7cGg8rz70/xhF7sJj9nCY="; + version = "6.1.39"; + hash = "sha256-H7KoNTl00OCQhUZXNM6PfiknI+lOVNxe2+levmJM5gA="; variant = "lts"; }; From 5c27b454aeb4005af5e98879ca815d3bf613dba9 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 22 Apr 2023 18:35:18 -0700 Subject: [PATCH 12/29] chromium: (cross) strip aarch64-linux-gnu- toolprefix only for native builds Our existing chromium expression strips the `aarch64-linux-gnu-` prefix off of toolchain names (like `aarch64-linux-gnu-gcc`) for all `Aarch64` builds. But when we are doing a cross compile *to* an `Aarch64` hostPlatform we need to leave those prefixes in place. This commit makes the prefix-stripping conditional on the build being a native build. (cherry picked from commit 954e7dc3d1bd11001d4edc995f8980adf33d85db) --- pkgs/applications/networking/browsers/chromium/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 115e984bbaaa..1fcd488de8d0 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -250,7 +250,7 @@ let # Allow building against system libraries in official builds sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' tools/generate_shim_headers/generate_shim_headers.py - '' + lib.optionalString stdenv.isAarch64 '' + '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.isAarch64) '' substituteInPlace build/toolchain/linux/BUILD.gn \ --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' '' + lib.optionalString ungoogled '' From 0fd0be3e123ecfb2647fbbd932c7c24a3bb836aa Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 22 Apr 2023 18:30:40 -0700 Subject: [PATCH 13/29] chromium: (cross): use cc-wrapper-clang instead of bare clang Prior to this commit chromium was writing the bare, unwrapped `clang` path into `gnFlags`. When called without the wrapper, clang doesn't know that the linker for cross compilation isn't called `lld` anymore -- it is called `${targetPrefix}-lld`. This commit fixes that problem by referencing the cc-wrapper-ified clang which is part of `llvmPackages.stdenv`. (cherry picked from commit 10706a026b481344a17e45d44ef01f8e65076744) --- pkgs/applications/networking/browsers/chromium/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 1fcd488de8d0..36e25939962a 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -304,7 +304,7 @@ let rtc_use_pipewire = true; # Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient): chrome_pgo_phase = 0; - clang_base_path = "${llvmPackages.clang}"; + clang_base_path = "${llvmPackages.stdenv.cc}"; use_qt = false; # To fix the build as we don't provide libffi_pic.a # (ld.lld: error: unable to find library -l:libffi_pic.a): From 5ea62313fe641eb779202233d4122caaba4c2b60 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 22 Apr 2023 16:36:37 -0700 Subject: [PATCH 14/29] chromium: take gnChromium from buildPackages ${gnChromium}/bin/gn needs to be compiled for the buildPlatform since it is run at build time. (cherry picked from commit 58c67d2bdb911fb62f8efa142ef0b2a670a54c5c) --- pkgs/applications/networking/browsers/chromium/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 77f4def41f33..3b4826930ec0 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,4 +1,5 @@ { newScope, config, stdenv, fetchurl, makeWrapper +, buildPackages , llvmPackages_16 , ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gtk4, gnome, gsettings-desktop-schemas, gn, fetchgit @@ -47,7 +48,7 @@ let inherit channel chromiumVersionAtLeast versionRange; inherit proprietaryCodecs cupsSupport pulseSupport ungoogled; - gnChromium = gn.overrideAttrs (oldAttrs: { + gnChromium = buildPackages.gn.overrideAttrs (oldAttrs: { inherit (upstream-info.deps.gn) version; src = fetchgit { inherit (upstream-info.deps.gn) url rev sha256; From 688826eade3720f2fda480259773171c238fdaef Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 23 Jul 2023 22:50:34 +0200 Subject: [PATCH 15/29] chromium: use optionalString instead of 'then ""' This is a backport of f3719756b550113c1acbbab00c89a56fb77256f2 for Chromium (optional but useful to keep the diff small/manageable). --- pkgs/applications/networking/browsers/chromium/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 3b4826930ec0..70b1de5253b8 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -135,9 +135,7 @@ let }; }; - suffix = if (channel == "stable" || channel == "ungoogled-chromium") - then "" - else "-" + channel; + suffix = lib.optionalString (channel != "stable" && channel != "ungoogled-chromium") ("-" + channel); sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName; From c4b7e5e581028509e87209b5f79eff3e6a08de80 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 3 Jun 2023 19:27:49 +0200 Subject: [PATCH 16/29] chromiumBeta: 114.0.5735.45 -> 115.0.5790.13 (cherry picked from commit 8d83062b048c05a30a86dffa4a746a575cfd0349) --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index a1ca2023e1e9..e5ad8121b9d9 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,15 +19,15 @@ } }, "beta": { - "version": "114.0.5735.45", - "sha256": "1z7z4mq3yw9i17xprza3v33wx28zpk7s3g8xcgapdydw0rgxz30v", - "sha256bin64": "1387x7mab2sh3wg39z48gl8fjhq39jllbcgzic8rdzpbhlcgs7br", + "version": "115.0.5790.13", + "sha256": "0ias5jn8lwpds3gsmjps0rlks58ln5znwx52h767f8mc9y24fagx", + "sha256bin64": "11v374p82k8xbak37c377km9y2hvy8avw6mjl9az5kzb2am3g566", "deps": { "gn": { - "version": "2023-04-19", + "version": "2023-05-19", "url": "https://gn.googlesource.com/gn", - "rev": "5a004f9427a050c6c393c07ddb85cba8ff3849fa", - "sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk" + "rev": "e9e83d9095d3234adf68f3e2866f25daf766d5c7", + "sha256": "0y07c18xskq4mclqiz3a63fz8jicz2kqridnvdhqdf75lhp61f8a" } } }, From 63a3793f68c9a6acccd549a62dfb4ba88437fed0 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 3 Jun 2023 19:27:50 +0200 Subject: [PATCH 17/29] chromiumDev: 115.0.5790.3 -> 116.0.5803.2 (cherry picked from commit 3e24038fba7edfa12dd42d13f3167a3304b5841a) --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index e5ad8121b9d9..6d2d0b9691fa 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,15 +32,15 @@ } }, "dev": { - "version": "115.0.5790.3", - "sha256": "1haai0jabghwl37k929138s4l6izmifssdvn2wgsig9jhiihxz29", - "sha256bin64": "12avl8ilvhmlvbag045yhnx0bbbsyx5d3jqh5af07pmbcxksgf96", + "version": "116.0.5803.2", + "sha256": "0s3l0wvbvy0wcwxipbl9vlbp1441yfj8ylrwhlh7gy898ajl9q0j", + "sha256bin64": "0qgp0m67bpaali7w6bxy1jzw0aig4iiqqgg023k1q32712s192cs", "deps": { "gn": { - "version": "2023-05-19", + "version": "2023-05-26", "url": "https://gn.googlesource.com/gn", - "rev": "e9e83d9095d3234adf68f3e2866f25daf766d5c7", - "sha256": "0y07c18xskq4mclqiz3a63fz8jicz2kqridnvdhqdf75lhp61f8a" + "rev": "e3978de3e8dafb50a2b11efa784e08699a43faf8", + "sha256": "17hwbcxmqsq3yfnafl4bbysdkk957mvqsn34iipzb61gyjbj7i6j" } } }, From 45044f04b741d8ac504dce4f11df93db49845912 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 14 Jun 2023 01:19:55 +0200 Subject: [PATCH 18/29] chromiumBeta: 115.0.5790.13 -> 115.0.5790.24 (cherry picked from commit df795e15856007bd4e627fc50b3331715f747a11) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 6d2d0b9691fa..f5ad4155d513 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "115.0.5790.13", - "sha256": "0ias5jn8lwpds3gsmjps0rlks58ln5znwx52h767f8mc9y24fagx", - "sha256bin64": "11v374p82k8xbak37c377km9y2hvy8avw6mjl9az5kzb2am3g566", + "version": "115.0.5790.24", + "sha256": "1lrq9v5lsnq4cawc8fk396c5r12ckb8isknri49qrr2vkrbhqq1k", + "sha256bin64": "02l1in8jz3xwjxhk45y802p9dnk4czx8cyv22f2h8839gzfafmgl", "deps": { "gn": { "version": "2023-05-19", From eb4cb92be83153710670670f634b57077bef6847 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 14 Jun 2023 01:19:55 +0200 Subject: [PATCH 19/29] chromiumDev: 116.0.5803.2 -> 116.0.5817.0 (cherry picked from commit bbd0efed7457463264991cfc622909dcd5d0bbf0) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index f5ad4155d513..109acefcd97d 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,9 +32,9 @@ } }, "dev": { - "version": "116.0.5803.2", - "sha256": "0s3l0wvbvy0wcwxipbl9vlbp1441yfj8ylrwhlh7gy898ajl9q0j", - "sha256bin64": "0qgp0m67bpaali7w6bxy1jzw0aig4iiqqgg023k1q32712s192cs", + "version": "116.0.5817.0", + "sha256": "0256ffzf21f2i0isxpir0pb4xxafmq2abw4jikgyzxjy0xhswp9z", + "sha256bin64": "0lqbranc7gp9xjnins4xicidk0wxdhryji47wmr4hvkg2nq72y4z", "deps": { "gn": { "version": "2023-05-26", From c096fc77cf289a7464528b94f3df5df007763ca8 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 19 Jun 2023 20:09:17 +0200 Subject: [PATCH 20/29] chromiumBeta: 115.0.5790.24 -> 115.0.5790.32 (cherry picked from commit 1d6e72dd7b27cd7194a98c071579505aa8a2e1af) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 109acefcd97d..4463ec61f919 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "115.0.5790.24", - "sha256": "1lrq9v5lsnq4cawc8fk396c5r12ckb8isknri49qrr2vkrbhqq1k", - "sha256bin64": "02l1in8jz3xwjxhk45y802p9dnk4czx8cyv22f2h8839gzfafmgl", + "version": "115.0.5790.32", + "sha256": "1zy4f57j047aw164s4x0904yazq6nvyy2wjjk9amiav9qyrfxzr6", + "sha256bin64": "0qgciqrjnsb9vxnvvcaqn728x9l0s72v78a6f7zffjxps87rbaz5", "deps": { "gn": { "version": "2023-05-19", From dc5ba18376bc5eba434bd33844eb16e3739985a6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 19 Jun 2023 20:09:17 +0200 Subject: [PATCH 21/29] chromiumDev: 116.0.5817.0 -> 116.0.5829.0 (cherry picked from commit f2affe590b11f744f8aae1063b04d8cffd60becd) --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 4463ec61f919..68f468887894 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,15 +32,15 @@ } }, "dev": { - "version": "116.0.5817.0", - "sha256": "0256ffzf21f2i0isxpir0pb4xxafmq2abw4jikgyzxjy0xhswp9z", - "sha256bin64": "0lqbranc7gp9xjnins4xicidk0wxdhryji47wmr4hvkg2nq72y4z", + "version": "116.0.5829.0", + "sha256": "0ip0wha705nr7yr4fn25psb6r41a703b9n87v6q8k8vzax5492y6", + "sha256bin64": "1fa2l7n8vdcnf6p0m7qqh05fimbwdh7p8a142l0vi8l9kx4n9z54", "deps": { "gn": { - "version": "2023-05-26", + "version": "2023-06-08", "url": "https://gn.googlesource.com/gn", - "rev": "e3978de3e8dafb50a2b11efa784e08699a43faf8", - "sha256": "17hwbcxmqsq3yfnafl4bbysdkk957mvqsn34iipzb61gyjbj7i6j" + "rev": "1cd35c1b722472e714c30d12031af81443bb20ae", + "sha256": "09y8jkxzkz87zp2js1j7yvqnck9n0182lm7c3x330d8agwrmdkrj" } } }, From f46a3ffaf7a30cc72540973d6a239d73cf1bdeeb Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 27 Jun 2023 02:29:52 +0200 Subject: [PATCH 22/29] chromiumBeta: 115.0.5790.32 -> 115.0.5790.40 (cherry picked from commit 2c303eb58dbedb428e83765213d59c471e37f1fe) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 68f468887894..8f1267126f53 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "115.0.5790.32", - "sha256": "1zy4f57j047aw164s4x0904yazq6nvyy2wjjk9amiav9qyrfxzr6", - "sha256bin64": "0qgciqrjnsb9vxnvvcaqn728x9l0s72v78a6f7zffjxps87rbaz5", + "version": "115.0.5790.40", + "sha256": "1ab034zrgyz0gwi0caz6y1nyr0p5yhbly50chnhvsr3k6gmidl58", + "sha256bin64": "02vzlz5z87n9lwdhxnzdzr5w85l3b828j0y1z6fzq7br90yr0pcw", "deps": { "gn": { "version": "2023-05-19", From 20e8abbf98e98dc3532c56fdad2f078de3a27d3f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 27 Jun 2023 02:29:52 +0200 Subject: [PATCH 23/29] chromiumDev: 116.0.5829.0 -> 116.0.5845.4 (cherry picked from commit 1be324a14692a2c55d9847ca53643bf57d1b02ac) --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 8f1267126f53..d66e5b87e423 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,15 +32,15 @@ } }, "dev": { - "version": "116.0.5829.0", - "sha256": "0ip0wha705nr7yr4fn25psb6r41a703b9n87v6q8k8vzax5492y6", - "sha256bin64": "1fa2l7n8vdcnf6p0m7qqh05fimbwdh7p8a142l0vi8l9kx4n9z54", + "version": "116.0.5845.4", + "sha256": "0p3v4dzyrj1fn97s2grkc2x8lgfm14rgwalrnb3gx9syi8gdwkpw", + "sha256bin64": "1wim32q9sq501wrnz1xx4s1r0gywz4pgf3r9d0zga3g86jp385ax", "deps": { "gn": { - "version": "2023-06-08", + "version": "2023-06-09", "url": "https://gn.googlesource.com/gn", - "rev": "1cd35c1b722472e714c30d12031af81443bb20ae", - "sha256": "09y8jkxzkz87zp2js1j7yvqnck9n0182lm7c3x330d8agwrmdkrj" + "rev": "4bd1a77e67958fb7f6739bd4542641646f264e5d", + "sha256": "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw" } } }, From 8f9151512093dd38d6176b6c63ba077f75d0e24d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 6 Jul 2023 21:55:42 +0200 Subject: [PATCH 24/29] chromiumDev: 116.0.5845.4 -> 116.0.5845.14 (cherry picked from commit 38e60b74ce84ebcc27c7405f084449a7f0a9cd52) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index d66e5b87e423..beb0c1503791 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,9 +32,9 @@ } }, "dev": { - "version": "116.0.5845.4", - "sha256": "0p3v4dzyrj1fn97s2grkc2x8lgfm14rgwalrnb3gx9syi8gdwkpw", - "sha256bin64": "1wim32q9sq501wrnz1xx4s1r0gywz4pgf3r9d0zga3g86jp385ax", + "version": "116.0.5845.14", + "sha256": "1b8ak0yg7ymz0siw81g47fdl12bj7f7gdw2nd5wlgj3h0g0b0675", + "sha256bin64": "1hnis5m5l6ygihmwsy6qk12lz6gjcndfdnssb3l9pd7v3qwfpkp2", "deps": { "gn": { "version": "2023-06-09", From 3089c94aa23fa22391cfb7f8d0ad927ad91980e4 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 15 Jul 2023 00:18:19 +0200 Subject: [PATCH 25/29] chromiumDev: 116.0.5845.14 -> 116.0.5845.32 (cherry picked from commit d3fa477a6f8218ea288100e378e3ec569d0ef2df) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index beb0c1503791..bb93eb1c9771 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,9 +32,9 @@ } }, "dev": { - "version": "116.0.5845.14", - "sha256": "1b8ak0yg7ymz0siw81g47fdl12bj7f7gdw2nd5wlgj3h0g0b0675", - "sha256bin64": "1hnis5m5l6ygihmwsy6qk12lz6gjcndfdnssb3l9pd7v3qwfpkp2", + "version": "116.0.5845.32", + "sha256": "0migfx1snbsa9a42cv37x6bkpa9j7y3n6h6hs0w79ss1hxmmj2mi", + "sha256bin64": "1zdr2340lbkvwyw303954ba8cay44p9a5d6b9l693kcrgkf4z8bz", "deps": { "gn": { "version": "2023-06-09", From 80acf136f111d0a3b3a5638bf9dccbf31bf8f547 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 29 Jun 2023 23:03:39 +0200 Subject: [PATCH 26/29] chromiumBeta: 115.0.5790.40 -> 115.0.5790.56 (cherry picked from commit 90ed2c1dfa762ba2b87d609141fb52d9fa623f2e) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index bb93eb1c9771..d6cd373d0a23 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "115.0.5790.40", - "sha256": "1ab034zrgyz0gwi0caz6y1nyr0p5yhbly50chnhvsr3k6gmidl58", - "sha256bin64": "02vzlz5z87n9lwdhxnzdzr5w85l3b828j0y1z6fzq7br90yr0pcw", + "version": "115.0.5790.56", + "sha256": "10z2599cckfm9pzh9jk0nnsvj0yqp82ch3243wmf994vayix3zf8", + "sha256bin64": "1qk439mzx5amd8iqk7sn4g2as2ybqmj66mchyzkkpakcik6da6ji", "deps": { "gn": { "version": "2023-05-19", From 9e7d83de69389f556784166405105614dd7d7ce1 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 15 Jul 2023 00:18:19 +0200 Subject: [PATCH 27/29] chromiumBeta: 115.0.5790.56 -> 115.0.5790.90 (cherry picked from commit 27ec2e384f2f8312ad2f9646c6703869fa86e086) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index d6cd373d0a23..e6bcdb556ebe 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "115.0.5790.56", - "sha256": "10z2599cckfm9pzh9jk0nnsvj0yqp82ch3243wmf994vayix3zf8", - "sha256bin64": "1qk439mzx5amd8iqk7sn4g2as2ybqmj66mchyzkkpakcik6da6ji", + "version": "115.0.5790.90", + "sha256": "156k5cijkxj44r4cn14k7r2xa11xp0nwi7nsgxfmg3dfsay05s42", + "sha256bin64": "1b573bd19ywwy0k8570501az1cw3xnp6iy53zk1a1gawsn8f4pv5", "deps": { "gn": { "version": "2023-05-19", From 9a0cef2571bd188af993cd62d88d5df0efb3f93d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 19 Jul 2023 22:53:53 +0200 Subject: [PATCH 28/29] chromiumDev: 116.0.5845.32 -> 116.0.5845.42 (cherry picked from commit e5afd98eb5f5a875e14bbbeca442a75357df6b1d) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index e6bcdb556ebe..ad823d05b253 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,9 +32,9 @@ } }, "dev": { - "version": "116.0.5845.32", - "sha256": "0migfx1snbsa9a42cv37x6bkpa9j7y3n6h6hs0w79ss1hxmmj2mi", - "sha256bin64": "1zdr2340lbkvwyw303954ba8cay44p9a5d6b9l693kcrgkf4z8bz", + "version": "116.0.5845.42", + "sha256": "1fvhh8fvm0rkb41mhsh4p3bahf4fk3gixan2x1bappm3hdcixffb", + "sha256bin64": "1zq4vyvm0vij03rc0zwzknm17108ka8bl1lsayp1133y2fgbl9f8", "deps": { "gn": { "version": "2023-06-09", From 4ec70a99196bd69935ef35b25c895ef1f58b47a2 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 19 Jul 2023 22:53:52 +0200 Subject: [PATCH 29/29] chromiumBeta: 115.0.5790.90 -> 115.0.5790.98 (cherry picked from commit 66552d656c154a1031280cfaede34f9a73d0b0e1) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index ad823d05b253..f7cce23755e5 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "115.0.5790.90", - "sha256": "156k5cijkxj44r4cn14k7r2xa11xp0nwi7nsgxfmg3dfsay05s42", - "sha256bin64": "1b573bd19ywwy0k8570501az1cw3xnp6iy53zk1a1gawsn8f4pv5", + "version": "115.0.5790.98", + "sha256": "1wbasmwdqkg5jcmzpidvzjsq2n2dr73bxz85pr8a5j4grw767gpz", + "sha256bin64": "0xbizb3d539h1cw1kj9ahd8azmkcdfjdmqb5bpp8cr21bh2qbqp5", "deps": { "gn": { "version": "2023-05-19",