From 240d44bc7475f47a88d0b4cdcb1da341dcf2716d Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 19 Nov 2024 11:55:48 +0000 Subject: [PATCH 01/53] gjs: assign meta.mainProgram --- pkgs/by-name/gj/gjs/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/gj/gjs/package.nix b/pkgs/by-name/gj/gjs/package.nix index fee889cbd5379..d2c90bcff1a52 100644 --- a/pkgs/by-name/gj/gjs/package.nix +++ b/pkgs/by-name/gj/gjs/package.nix @@ -147,6 +147,7 @@ in stdenv.mkDerivation (finalAttrs: { description = "JavaScript bindings for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Home.md"; license = licenses.lgpl2Plus; + mainProgram = "gjs"; maintainers = teams.gnome.members; platforms = platforms.unix; }; From 7a9a2d8f34e19b1002b12f8cbd5fe962843fa4c8 Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 19 Nov 2024 11:56:26 +0000 Subject: [PATCH 02/53] gnome-maps: fix cross compilation upstream determines the gjs path with `find_program('gjs')`, however this fails to find anything when cross compiling because meson doesn't know which paths to check. the interaction between meson's `find_program` and `cross-file` is documented here: --- pkgs/by-name/gn/gnome-maps/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/gn/gnome-maps/package.nix b/pkgs/by-name/gn/gnome-maps/package.nix index 27eee47cbf614..c8d8785c93493 100644 --- a/pkgs/by-name/gn/gnome-maps/package.nix +++ b/pkgs/by-name/gn/gnome-maps/package.nix @@ -25,6 +25,7 @@ libadwaita, geocode-glib_2, tzdata, + writeText, }: stdenv.mkDerivation (finalAttrs: { @@ -68,6 +69,13 @@ stdenv.mkDerivation (finalAttrs: { libsoup_3 ]; + mesonFlags = [ + "--cross-file=${writeText "crossfile.ini" '' + [binaries] + gjs = '${lib.getExe gjs}' + ''}" + ]; + preCheck = '' # “time.js” included by “timeTest” and “translationsTest” depends on “org.gnome.desktop.interface” schema. export XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:$XDG_DATA_DIRS" From 73bf44ceb684d6f8e528dd70a3633471db703a1a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 11:52:26 +0100 Subject: [PATCH 03/53] python312Packages.cached-property: 1.5.2 -> 2.0.1 Diff: https://github.com/pydanny/cached-property/compare/refs/tags/1.5.2...2.0.1 Changelog: https://github.com/pydanny/cached-property/releases/tag/2.0.1 --- .../cached-property/default.nix | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/cached-property/default.nix b/pkgs/development/python-modules/cached-property/default.nix index aab2647241626..247d1ce50ceb2 100644 --- a/pkgs/development/python-modules/cached-property/default.nix +++ b/pkgs/development/python-modules/cached-property/default.nix @@ -2,38 +2,31 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, - pytestCheckHook, freezegun, + pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "cached-property"; - version = "1.5.2"; - format = "setuptools"; + version = "2.0.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pydanny"; - repo = pname; + repo = "cached-property"; rev = "refs/tags/${version}"; - hash = "sha256-DGI8FaEjFd2bDeBDKcA0zDCE+5I6meapVNZgycE1gzs="; + hash = "sha256-sOThFJs18DR9aBgIpqkORU4iRmhCVKehyM3DLYUt/Wc="; }; - patches = [ - # Don't use asyncio.coroutine if it's not available, https://github.com/pydanny/cached-property/pull/267 - (fetchpatch { - name = "asyncio-coroutine.patch"; - url = "https://github.com/pydanny/cached-property/commit/297031687679762849dedeaf24aa3a19116f095b.patch"; - hash = "sha256-qolrUdaX7db4hE125Lt9ICmPNYsD/uBmQrdO4q5NG3c="; - }) - ]; + build-system = [ setuptools ]; - checkInputs = [ - pytestCheckHook + nativeCheckInputs = [ freezegun + pytestCheckHook ]; disabledTests = [ From e4c37a6375a2dfc6fc39be08b6ab6097c4ab1e62 Mon Sep 17 00:00:00 2001 From: Niko Strijbol Date: Thu, 21 Nov 2024 15:44:14 +0100 Subject: [PATCH 04/53] jetbrains.clion: 2024.2.3 -> 2024.3 --- .../editors/jetbrains/bin/versions.json | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/bin/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json index 475e78de4b2d7..65bc2fdd4d204 100644 --- a/pkgs/applications/editors/jetbrains/bin/versions.json +++ b/pkgs/applications/editors/jetbrains/bin/versions.json @@ -11,10 +11,10 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2024.2.3", - "sha256": "0afb6e32fe1ceb77ddd07ca7fa7d01a0a5e73a0df42ec58183f9c1a06b84446e", - "url": "https://download.jetbrains.com/cpp/CLion-2024.2.3.tar.gz", - "build_number": "242.23726.125" + "version": "2024.3", + "sha256": "e66ee52c365552fe40d035f5b205ab8c28a9a02ed4af5f787b78a0048bcf7f81", + "url": "https://download.jetbrains.com/cpp/CLion-2024.3.tar.gz", + "build_number": "243.21565.238" }, "datagrip": { "update-channel": "DataGrip RELEASE", @@ -150,10 +150,10 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz", - "version": "2024.2.3", - "sha256": "be3e6f0d490517c8f6e7c7ac248ab8e8823bf19c8102e7695725f80df6c11d63", - "url": "https://download.jetbrains.com/cpp/CLion-2024.2.3-aarch64.tar.gz", - "build_number": "242.23726.125" + "version": "2024.3", + "sha256": "526147203ce3f9ec25e264f33fca042fda59a728237a165983c47c0c06356f6e", + "url": "https://download.jetbrains.com/cpp/CLion-2024.3-aarch64.tar.gz", + "build_number": "243.21565.238" }, "datagrip": { "update-channel": "DataGrip RELEASE", @@ -289,10 +289,10 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2024.2.3", - "sha256": "0dfc4d50268e58bb6b3c42c270ea8cca638a8733a5e2e010447cc74d585895e8", - "url": "https://download.jetbrains.com/cpp/CLion-2024.2.3.dmg", - "build_number": "242.23726.125" + "version": "2024.3", + "sha256": "e3d82ad3303cb4f373efce378f7f289afd3b35d3315d03ac53dc27302c87aa6f", + "url": "https://download.jetbrains.com/cpp/CLion-2024.3.dmg", + "build_number": "243.21565.238" }, "datagrip": { "update-channel": "DataGrip RELEASE", @@ -428,10 +428,10 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2024.2.3", - "sha256": "998d629381e6f596b8e0cf5289fe8ca7cfd3221fc73b6c8548d768889b14196f", - "url": "https://download.jetbrains.com/cpp/CLion-2024.2.3-aarch64.dmg", - "build_number": "242.23726.125" + "version": "2024.3", + "sha256": "2f4ad6ea4ffb0862f85780cd960b46925ea6c9e5f97e9fa290f3007652103825", + "url": "https://download.jetbrains.com/cpp/CLion-2024.3-aarch64.dmg", + "build_number": "243.21565.238" }, "datagrip": { "update-channel": "DataGrip RELEASE", From d37c1931259e0d35d284627ab2168629361338bf Mon Sep 17 00:00:00 2001 From: Niko Strijbol Date: Thu, 21 Nov 2024 15:44:34 +0100 Subject: [PATCH 05/53] jetbrains.plugins: update --- .../editors/jetbrains/plugins/plugins.json | 101 +++++++++--------- 1 file changed, 51 insertions(+), 50 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json index 79e1568bb5ebf..ce184dc704b49 100644 --- a/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -18,16 +18,16 @@ ], "builds": { "241.19072.1155": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "242.23726.125": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "242.23726.162": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "243.21565.180": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "243.21565.191": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "243.21565.193": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "243.21565.197": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "243.21565.199": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "243.21565.202": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "243.21565.204": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "243.21565.208": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip" + "242.23726.162": "https://plugins.jetbrains.com/files/164/635855/IdeaVIM-2.17.0.zip", + "243.21565.180": "https://plugins.jetbrains.com/files/164/635855/IdeaVIM-2.17.0.zip", + "243.21565.191": "https://plugins.jetbrains.com/files/164/635855/IdeaVIM-2.17.0.zip", + "243.21565.193": "https://plugins.jetbrains.com/files/164/635855/IdeaVIM-2.17.0.zip", + "243.21565.197": "https://plugins.jetbrains.com/files/164/635855/IdeaVIM-2.17.0.zip", + "243.21565.199": "https://plugins.jetbrains.com/files/164/635855/IdeaVIM-2.17.0.zip", + "243.21565.202": "https://plugins.jetbrains.com/files/164/635855/IdeaVIM-2.17.0.zip", + "243.21565.204": "https://plugins.jetbrains.com/files/164/635855/IdeaVIM-2.17.0.zip", + "243.21565.208": "https://plugins.jetbrains.com/files/164/635855/IdeaVIM-2.17.0.zip", + "243.21565.238": "https://plugins.jetbrains.com/files/164/635855/IdeaVIM-2.17.0.zip" }, "name": "ideavim" }, @@ -68,7 +68,6 @@ ], "builds": { "241.19072.1155": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "242.23726.125": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", "242.23726.162": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", "243.21565.180": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", "243.21565.191": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", @@ -77,7 +76,8 @@ "243.21565.199": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", "243.21565.202": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", "243.21565.204": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "243.21565.208": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip" + "243.21565.208": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "243.21565.238": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip" }, "name": "string-manipulation" }, @@ -99,7 +99,6 @@ ], "builds": { "241.19072.1155": null, - "242.23726.125": null, "242.23726.162": null, "243.21565.180": null, "243.21565.191": null, @@ -108,7 +107,8 @@ "243.21565.199": null, "243.21565.202": null, "243.21565.204": null, - "243.21565.208": null + "243.21565.208": null, + "243.21565.238": null }, "name": "kotlin" }, @@ -130,7 +130,6 @@ ], "builds": { "241.19072.1155": null, - "242.23726.125": "https://plugins.jetbrains.com/files/6981/623497/ini-242.23726.110.zip", "242.23726.162": "https://plugins.jetbrains.com/files/6981/623497/ini-242.23726.110.zip", "243.21565.180": "https://plugins.jetbrains.com/files/6981/633889/ini-243.21565.208.zip", "243.21565.191": "https://plugins.jetbrains.com/files/6981/633889/ini-243.21565.208.zip", @@ -139,7 +138,8 @@ "243.21565.199": "https://plugins.jetbrains.com/files/6981/633889/ini-243.21565.208.zip", "243.21565.202": "https://plugins.jetbrains.com/files/6981/633889/ini-243.21565.208.zip", "243.21565.204": "https://plugins.jetbrains.com/files/6981/633889/ini-243.21565.208.zip", - "243.21565.208": "https://plugins.jetbrains.com/files/6981/633889/ini-243.21565.208.zip" + "243.21565.208": "https://plugins.jetbrains.com/files/6981/633889/ini-243.21565.208.zip", + "243.21565.238": "https://plugins.jetbrains.com/files/6981/633889/ini-243.21565.208.zip" }, "name": "ini" }, @@ -161,7 +161,6 @@ ], "builds": { "241.19072.1155": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip", - "242.23726.125": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip", "242.23726.162": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip", "243.21565.180": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "243.21565.191": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", @@ -170,7 +169,8 @@ "243.21565.199": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "243.21565.202": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "243.21565.204": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.21565.208": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip" + "243.21565.208": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "243.21565.238": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip" }, "name": "acejump" }, @@ -209,14 +209,14 @@ "webstorm" ], "builds": { - "242.23726.125": "https://plugins.jetbrains.com/files/7322/622853/python-ce-242.23726.103.zip", "242.23726.162": "https://plugins.jetbrains.com/files/7322/622853/python-ce-242.23726.103.zip", "243.21565.180": "https://plugins.jetbrains.com/files/7322/634169/python-ce-243.21565.211.zip", "243.21565.191": "https://plugins.jetbrains.com/files/7322/634169/python-ce-243.21565.211.zip", "243.21565.193": "https://plugins.jetbrains.com/files/7322/634169/python-ce-243.21565.211.zip", "243.21565.199": "https://plugins.jetbrains.com/files/7322/634169/python-ce-243.21565.211.zip", "243.21565.204": "https://plugins.jetbrains.com/files/7322/634169/python-ce-243.21565.211.zip", - "243.21565.208": "https://plugins.jetbrains.com/files/7322/634169/python-ce-243.21565.211.zip" + "243.21565.208": "https://plugins.jetbrains.com/files/7322/634169/python-ce-243.21565.211.zip", + "243.21565.238": "https://plugins.jetbrains.com/files/7322/634169/python-ce-243.21565.211.zip" }, "name": "python-community-edition" }, @@ -238,7 +238,6 @@ ], "builds": { "241.19072.1155": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", - "242.23726.125": "https://plugins.jetbrains.com/files/7391/634204/asciidoctor-intellij-plugin-0.43.3.zip", "242.23726.162": "https://plugins.jetbrains.com/files/7391/634204/asciidoctor-intellij-plugin-0.43.3.zip", "243.21565.180": "https://plugins.jetbrains.com/files/7391/634204/asciidoctor-intellij-plugin-0.43.3.zip", "243.21565.191": "https://plugins.jetbrains.com/files/7391/634204/asciidoctor-intellij-plugin-0.43.3.zip", @@ -247,7 +246,8 @@ "243.21565.199": "https://plugins.jetbrains.com/files/7391/634204/asciidoctor-intellij-plugin-0.43.3.zip", "243.21565.202": "https://plugins.jetbrains.com/files/7391/634204/asciidoctor-intellij-plugin-0.43.3.zip", "243.21565.204": "https://plugins.jetbrains.com/files/7391/634204/asciidoctor-intellij-plugin-0.43.3.zip", - "243.21565.208": "https://plugins.jetbrains.com/files/7391/634204/asciidoctor-intellij-plugin-0.43.3.zip" + "243.21565.208": "https://plugins.jetbrains.com/files/7391/634204/asciidoctor-intellij-plugin-0.43.3.zip", + "243.21565.238": "https://plugins.jetbrains.com/files/7391/634204/asciidoctor-intellij-plugin-0.43.3.zip" }, "name": "asciidoc" }, @@ -268,7 +268,6 @@ ], "builds": { "241.19072.1155": null, - "242.23726.125": null, "243.21565.180": null, "243.21565.191": null, "243.21565.193": null, @@ -276,7 +275,8 @@ "243.21565.199": null, "243.21565.202": null, "243.21565.204": null, - "243.21565.208": null + "243.21565.208": null, + "243.21565.238": null }, "name": "-deprecated-rust" }, @@ -297,7 +297,6 @@ ], "builds": { "241.19072.1155": null, - "242.23726.125": null, "243.21565.180": null, "243.21565.191": null, "243.21565.193": null, @@ -305,7 +304,8 @@ "243.21565.199": null, "243.21565.202": null, "243.21565.204": null, - "243.21565.208": null + "243.21565.208": null, + "243.21565.238": null }, "name": "-deprecated-rust-beta" }, @@ -344,7 +344,6 @@ ], "builds": { "241.19072.1155": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", - "242.23726.125": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", "242.23726.162": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", "243.21565.180": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", "243.21565.191": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", @@ -353,7 +352,8 @@ "243.21565.199": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", "243.21565.202": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", "243.21565.204": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", - "243.21565.208": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip" + "243.21565.208": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "243.21565.238": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip" }, "name": "nixidea" }, @@ -386,7 +386,6 @@ ], "builds": { "241.19072.1155": "https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip", - "242.23726.125": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip", "242.23726.162": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip", "243.21565.180": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip", "243.21565.191": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip", @@ -395,7 +394,8 @@ "243.21565.199": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip", "243.21565.202": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip", "243.21565.204": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip", - "243.21565.208": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip" + "243.21565.208": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip", + "243.21565.238": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip" }, "name": "csv-editor" }, @@ -417,7 +417,6 @@ ], "builds": { "241.19072.1155": "https://plugins.jetbrains.com/files/11349/634264/aws-toolkit-jetbrains-standalone-3.40-241.zip", - "242.23726.125": "https://plugins.jetbrains.com/files/11349/634268/aws-toolkit-jetbrains-standalone-3.40-242.zip", "242.23726.162": "https://plugins.jetbrains.com/files/11349/634268/aws-toolkit-jetbrains-standalone-3.40-242.zip", "243.21565.180": "https://plugins.jetbrains.com/files/11349/634266/aws-toolkit-jetbrains-standalone-3.40-243.zip", "243.21565.191": "https://plugins.jetbrains.com/files/11349/634266/aws-toolkit-jetbrains-standalone-3.40-243.zip", @@ -426,7 +425,8 @@ "243.21565.199": "https://plugins.jetbrains.com/files/11349/634266/aws-toolkit-jetbrains-standalone-3.40-243.zip", "243.21565.202": "https://plugins.jetbrains.com/files/11349/634266/aws-toolkit-jetbrains-standalone-3.40-243.zip", "243.21565.204": "https://plugins.jetbrains.com/files/11349/634266/aws-toolkit-jetbrains-standalone-3.40-243.zip", - "243.21565.208": "https://plugins.jetbrains.com/files/11349/634266/aws-toolkit-jetbrains-standalone-3.40-243.zip" + "243.21565.208": "https://plugins.jetbrains.com/files/11349/634266/aws-toolkit-jetbrains-standalone-3.40-243.zip", + "243.21565.238": "https://plugins.jetbrains.com/files/11349/634266/aws-toolkit-jetbrains-standalone-3.40-243.zip" }, "name": "aws-toolkit" }, @@ -448,7 +448,6 @@ ], "builds": { "241.19072.1155": null, - "242.23726.125": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", "242.23726.162": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", "243.21565.180": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", "243.21565.191": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", @@ -457,7 +456,8 @@ "243.21565.199": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", "243.21565.202": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", "243.21565.204": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.21565.208": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip" + "243.21565.208": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", + "243.21565.238": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip" }, "name": "vscode-keymap" }, @@ -479,7 +479,6 @@ ], "builds": { "241.19072.1155": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "242.23726.125": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", "242.23726.162": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", "243.21565.180": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", "243.21565.191": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", @@ -488,7 +487,8 @@ "243.21565.199": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", "243.21565.202": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", "243.21565.204": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.21565.208": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip" + "243.21565.208": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", + "243.21565.238": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip" }, "name": "eclipse-keymap" }, @@ -510,7 +510,6 @@ ], "builds": { "241.19072.1155": null, - "242.23726.125": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", "242.23726.162": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", "243.21565.180": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", "243.21565.191": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", @@ -519,7 +518,8 @@ "243.21565.199": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", "243.21565.202": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", "243.21565.204": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.21565.208": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip" + "243.21565.208": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", + "243.21565.238": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip" }, "name": "visual-studio-keymap" }, @@ -541,7 +541,6 @@ ], "builds": { "241.19072.1155": null, - "242.23726.125": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip", "242.23726.162": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip", "243.21565.180": "https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip", "243.21565.191": "https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip", @@ -550,7 +549,8 @@ "243.21565.199": "https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip", "243.21565.202": "https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip", "243.21565.204": "https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip", - "243.21565.208": "https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip" + "243.21565.208": "https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip", + "243.21565.238": "https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip" }, "name": "protocol-buffers" }, @@ -572,7 +572,6 @@ ], "builds": { "241.19072.1155": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "242.23726.125": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "242.23726.162": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "243.21565.180": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "243.21565.191": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", @@ -581,7 +580,8 @@ "243.21565.199": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "243.21565.202": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "243.21565.204": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.21565.208": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" + "243.21565.208": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "243.21565.238": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" }, @@ -603,7 +603,6 @@ ], "builds": { "241.19072.1155": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip", - "242.23726.125": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip", "242.23726.162": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip", "243.21565.180": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip", "243.21565.191": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip", @@ -612,7 +611,8 @@ "243.21565.199": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip", "243.21565.202": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip", "243.21565.204": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip", - "243.21565.208": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip" + "243.21565.208": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip", + "243.21565.238": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip" }, "name": "github-copilot" }, @@ -634,7 +634,6 @@ ], "builds": { "241.19072.1155": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "242.23726.125": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "242.23726.162": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "243.21565.180": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "243.21565.191": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", @@ -643,7 +642,8 @@ "243.21565.199": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "243.21565.202": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "243.21565.204": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.21565.208": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" + "243.21565.208": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "243.21565.238": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" }, @@ -665,7 +665,6 @@ ], "builds": { "241.19072.1155": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "242.23726.125": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", "242.23726.162": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", "243.21565.180": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", "243.21565.191": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", @@ -674,7 +673,8 @@ "243.21565.199": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", "243.21565.202": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", "243.21565.204": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.21565.208": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip" + "243.21565.208": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", + "243.21565.238": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip" }, "name": "mermaid" }, @@ -685,9 +685,9 @@ "rust-rover" ], "builds": { - "242.23726.125": "https://plugins.jetbrains.com/files/22407/629692/intellij-rust-242.23726.162.zip", "242.23726.162": "https://plugins.jetbrains.com/files/22407/629692/intellij-rust-242.23726.162.zip", - "243.21565.193": "https://plugins.jetbrains.com/files/22407/630513/intellij-rust-243.21565.136.zip" + "243.21565.193": "https://plugins.jetbrains.com/files/22407/630513/intellij-rust-243.21565.136.zip", + "243.21565.238": "https://plugins.jetbrains.com/files/22407/630513/intellij-rust-243.21565.136.zip" }, "name": "rust" } @@ -710,6 +710,7 @@ "https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip": "sha256-cv6JTujoD5g90ngXTtnj5x31wjbIZlKZ6Zn0H+vHCTk=", "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=", "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip": "sha256-uMIrYoZE16X/K96HuDJx8QMh6wUbi4+qSw+HJAq7ukI=", + "https://plugins.jetbrains.com/files/164/635855/IdeaVIM-2.17.0.zip": "sha256-ESbvyp66+X2Ko+bol3mk8aLIf8xjG7Qa0vz8k/zYl4A=", "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip": "sha256-ljVGVi/i36EnLxzK7IVGiKVF8EyQTeNVCVKBtGlYNmg=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip": "sha256-DUiIQYIzYoXmgtBakSLtMB+xxJMaR70Jgg9erySa3wQ=", From 983931612864cb44f567aaed7190c3a6ef28ddc2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Nov 2024 03:56:12 +0000 Subject: [PATCH 06/53] python312Packages.jsonformatter: 0.3.2 -> 0.3.4 --- pkgs/development/python-modules/jsonformatter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonformatter/default.nix b/pkgs/development/python-modules/jsonformatter/default.nix index 3fac9cadc97cb..94200a889cce2 100644 --- a/pkgs/development/python-modules/jsonformatter/default.nix +++ b/pkgs/development/python-modules/jsonformatter/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "jsonformatter"; - version = "0.3.2"; + version = "0.3.4"; format = "setuptools"; src = fetchFromGitHub { owner = "MyColorfulDays"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oK419J/MIxRT+1j/5Yklj1F+4d3wuMXR8IVqJAMKPNw="; + hash = "sha256-A+lsSBrm/64w7yMabmuAbRCLwUUdulGH3jB/DbYJ2QY="; }; nativeBuildInputs = [ setuptools ]; From 2d31028ce6e3993fdace9155069909469becced3 Mon Sep 17 00:00:00 2001 From: Niko Strijbol Date: Fri, 22 Nov 2024 18:35:45 +0100 Subject: [PATCH 07/53] jetbrains.clion: fix .NET version for Clion 2024.3 Bumps it to .NET 8 and uses the unwrapped version. See #358178 --- pkgs/applications/editors/jetbrains/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 0e3241a0397c1..76cd4ac028697 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -15,6 +15,7 @@ in , python3 , lldb , dotnet-sdk_7 +, dotnet-sdk_8 , maven , openssl , expat @@ -126,7 +127,7 @@ rec { for dir in plugins/clion-radler/DotFiles/linux-*; do rm -rf $dir/dotnet - ln -s ${dotnet-sdk_7} $dir/dotnet + ln -s ${dotnet-sdk_8.unwrapped}/share/dotnet $dir/dotnet done ) ''; From 9492bc8f7aa8176d61918d6300d14e99c9f523f5 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Sun, 19 May 2024 19:38:14 +0200 Subject: [PATCH 08/53] buildMavenPackage: add overrideMavenAttrs function --- pkgs/by-name/ma/maven/package.nix | 32 +++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ma/maven/package.nix b/pkgs/by-name/ma/maven/package.nix index f7d88548f36b0..5439493987606 100644 --- a/pkgs/by-name/ma/maven/package.nix +++ b/pkgs/by-name/ma/maven/package.nix @@ -6,7 +6,6 @@ makeWrapper, stdenvNoCC, }: - stdenvNoCC.mkDerivation (finalAttrs: { pname = "maven"; version = "3.9.9"; @@ -34,14 +33,31 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru = { - buildMaven = callPackage ./build-maven.nix { - maven = finalAttrs.finalPackage; - }; - buildMavenPackage = callPackage ./build-maven-package.nix { - maven = finalAttrs.finalPackage; + passthru = + let + makeOverridableMavenPackage = + mavenRecipe: mavenArgs: + let + drv = mavenRecipe mavenArgs; + overrideWith = + newArgs: mavenArgs // (if lib.isFunction newArgs then newArgs mavenArgs else newArgs); + in + drv + // { + overrideMavenAttrs = newArgs: makeOverridableMavenPackage mavenRecipe (overrideWith newArgs); + }; + in + { + buildMaven = callPackage ./build-maven.nix { + maven = finalAttrs.finalPackage; + }; + + buildMavenPackage = makeOverridableMavenPackage ( + callPackage ./build-maven-package.nix { + maven = finalAttrs.finalPackage; + } + ); }; - }; meta = { homepage = "https://maven.apache.org/"; From cbb3cec851be63f45a18b26e058288757739736a Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Mon, 20 May 2024 16:14:03 +0200 Subject: [PATCH 09/53] doc/maven: document how to override maven attrs and offline build usage. --- doc/languages-frameworks/maven.section.md | 84 +++++++++++++++++++++++ doc/redirects.json | 6 ++ 2 files changed, 90 insertions(+) diff --git a/doc/languages-frameworks/maven.section.md b/doc/languages-frameworks/maven.section.md index d6c8357785e35..88fe4d0c92245 100644 --- a/doc/languages-frameworks/maven.section.md +++ b/doc/languages-frameworks/maven.section.md @@ -49,6 +49,90 @@ This package calls `maven.buildMavenPackage` to do its work. The primary differe After setting `maven.buildMavenPackage`, we then do standard Java `.jar` installation by saving the `.jar` to `$out/share/java` and then making a wrapper which allows executing that file; see [](#sec-language-java) for additional generic information about packaging Java applications. ::: +### Overriding Maven package attributes {#maven-overriding-package-attributes} + +``` +overrideMavenAttrs :: (AttrSet -> Derivation) | ((AttrSet -> Attrset) -> Derivation) -> Derivation +``` + +The output of `buildMavenPackage` has an `overrideMavenAttrs` attribute, which is a function that takes either +- any subset of the attributes that can be passed to `buildMavenPackage` + + or +- a function that takes the argument passed to the previous invocation of `buildMavenPackage` (conventionally called `old`) and returns an attribute set that can be passed to `buildMavenPackage` + +and returns a derivation that builds a Maven package based on the old and new arguments merged. + +This is similar to [](#sec-pkg-overrideAttrs), but notably does not allow accessing the final value of the argument to `buildMavenPackage`. + +:::{.example} +### `overrideMavenAttrs` Example + +Use `overrideMavenAttrs` to build `jd-cli` version 1.2.0 and disable some flaky test: + +```nix +jd-cli.overrideMavenAttrs (old: rec { + version = "1.2.0"; + src = fetchFromGitHub { + owner = old.src.owner; + repo = old.src.repo; + rev = "${old.pname}-${version}"; + # old source hash of 1.2.0 version + hash = "sha256-US7j6tQ6mh1libeHnQdFxPGoxHzbZHqehWSgCYynKx8="; + }; + + # tests can be disabled by prefixing it with `!` + # see Maven documentation for more details: + # https://maven.apache.org/surefire/maven-surefire-plugin/examples/single-test.html#Multiple_Formats_in_One + mvnParameters = lib.escapeShellArgs [ + "-Dsurefire.failIfNoSpecifiedTests=false" + "-Dtest=!JavaDecompilerTest#basicTest,!JavaDecompilerTest#patternMatchingTest" + ]; + + # old mvnHash of 1.2.0 maven dependencies + mvnHash = "sha256-N9XC1pg6Y4sUiBWIQUf16QSXCuiAPpXEHGlgApviF4I="; +}); +``` +::: + +### Offline build {#maven-offline-build} + +By default, `buildMavenPackage` does the following: + +1. Run `mvn package -Dmaven.repo.local=$out/.m2 ${mvnParameters}` in the + `fetchedMavenDeps` [fixed-output derivation](https://nixos.org/manual/nix/stable/glossary.html#gloss-fixed-output-derivation). +2. Run `mvn package -o -nsu "-Dmaven.repo.local=$mvnDeps/.m2" + ${mvnParameters}` again in the main derivation. + +As a result, tests are run twice. +This also means that a failing test will trigger a new attempt to realise the fixed-output derivation, which in turn downloads all dependencies again. +For bigger Maven projects, this might lead to a long feedback cycle. + +Use `buildOffline = true` to change the behaviour of `buildMavenPackage to the following: +1. Run `mvn de.qaware.maven:go-offline-maven-plugin:1.2.8:resolve-dependencies + -Dmaven.repo.local=$out/.m2 ${mvnDepsParameters}` in the fixed-output derivation. +2. Run `mvn package -o -nsu "-Dmaven.repo.local=$mvnDeps/.m2" + ${mvnParameters}` in the main derivation. + +As a result, all dependencies are downloaded in step 1 and the tests are executed in step 2. +A failing test only triggers a rebuild of step 2 as it can reuse the dependencies of step 1 because they have not changed. + +::: {.warning} +Test dependencies are not downloaded in step 1 and are therefore missing in +step 2 which will most probably fail the build. The `go-offline` plugin cannot +handle these so-called [dynamic dependencies](https://github.com/qaware/go-offline-maven-plugin?tab=readme-ov-file#dynamic-dependencies). +In that case you must add these dynamic dependencies manually with: +```nix +maven.buildMavenPackage rec { + manualMvnArtifacts = [ + # add dynamic test dependencies here + "org.apache.maven.surefire:surefire-junit-platform:3.1.2" + "org.junit.platform:junit-platform-launcher:1.10.0" + ]; +}; +``` +::: + ### Stable Maven plugins {#stable-maven-plugins} Maven defines default versions for its core plugins, e.g. `maven-compiler-plugin`. If your project does not override these versions, an upgrade of Maven will change the version of the used plugins, and therefore the derivation and hash. diff --git a/doc/redirects.json b/doc/redirects.json index dd0e844fbbeec..37fdc4307529e 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -3192,6 +3192,12 @@ "maven-buildmavenpackage": [ "index.html#maven-buildmavenpackage" ], + "maven-overriding-package-attributes": [ + "index.html#maven-overriding-package-attributes" + ], + "maven-offline-build": [ + "index.html#maven-offline-build" + ], "stable-maven-plugins": [ "index.html#stable-maven-plugins" ], From 955dff85b36109b555645dd6efc2b59f3f23612e Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sun, 24 Nov 2024 14:48:04 +0000 Subject: [PATCH 10/53] discord: bump all versions --- .../instant-messengers/discord/default.nix | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index b02357ccca0d1..3ed460f960f3e 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -9,54 +9,54 @@ let versions = if stdenv.hostPlatform.isLinux then { - stable = "0.0.74"; - ptb = "0.0.115"; - canary = "0.0.518"; - development = "0.0.45"; + stable = "0.0.76"; + ptb = "0.0.118"; + canary = "0.0.527"; + development = "0.0.50"; } else { - stable = "0.0.325"; - ptb = "0.0.145"; - canary = "0.0.627"; - development = "0.0.64"; + stable = "0.0.327"; + ptb = "0.0.148"; + canary = "0.0.639"; + development = "0.0.65"; }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-yf2gLvDgzF13cgpKFiiCHGYVR+p7jZOAR37L1F6MZvc="; + hash = "sha256-z5byV56bbXQK0o6QH9cmeqdjg9/4vbRohmE4YgKGNUw="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-N8h6z5z9txCha8P/d0ekSsYufPXswFa+5Pra3/p8Bng="; + hash = "sha256-msheT6PXTkIq7EwowYwL7g0kgOdLBZHeI5w2kijJUtw="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-yjyYU15f6rIWYhTL8qXlIO8XN1ClK2QuFujM1DEHH+I="; + hash = "sha256-pe1CRsXMxXw+j4pBUT/63ZSBe7Mm0g+Tbyn1dAnxp7o="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-N5vlw6p+kvb2nYuIUF3YJyKgi072Uo1q1UEddIh/d9c="; + hash = "sha256-Ygwneo9GY1iVKBl3y6jSj81sexUsSY2J7i/DKxmJJyA="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-e5e9hSDDr88W18fQBxXASOTIfrhcsfjS+E9V2GgoZ38="; + hash = "sha256-5XzjJv2IebVMVml/e+VTVKrlbHTCj+t0lYsq1CwvLi0="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-11eIKV3DCmsbyqwQcisWDaLJoGK3f+apO6Q+UA9g1/M="; + hash = "sha256-YW6wgiplt+ue59i5+2Ap5tVAEhO1xgeP8jVOffkSWj4="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-aLvTEtfFvKHWTFvz2Q8Qy8K7Z7Ic9YLKJ4nDD+PG0Ec="; + hash = "sha256-C+2Cr8D2ZqfdRp0m996p8HvOjkPzN82ywgbx2KMBqAE="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-2yiTjpx+OEkxLHy8M3cSqdMD+UHm8B5/KHCp7KvSlc0="; + hash = "sha256-IckTw2wKTwGMGvQAOYG85yU1w9E6PdWA1G0f2BaXJ1Q="; }; }; aarch64-darwin = x86_64-darwin; From 904070f0ada9a3a89d7e18ce0a71c86abefa82ef Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Mon, 25 Nov 2024 19:23:38 +0800 Subject: [PATCH 11/53] cobang: move to by-name --- .../misc/cobang/default.nix => by-name/co/cobang/package.nix} | 3 +-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) rename pkgs/{applications/misc/cobang/default.nix => by-name/co/cobang/package.nix} (97%) diff --git a/pkgs/applications/misc/cobang/default.nix b/pkgs/by-name/co/cobang/package.nix similarity index 97% rename from pkgs/applications/misc/cobang/default.nix rename to pkgs/by-name/co/cobang/package.nix index e20bf9b818adc..4d2cf6e40c344 100644 --- a/pkgs/applications/misc/cobang/default.nix +++ b/pkgs/by-name/co/cobang/package.nix @@ -11,7 +11,6 @@ , requests , single-version , gobject-introspection -, gst-plugins-good , gtk3 , libhandy , librsvg @@ -49,7 +48,7 @@ buildPythonApplication rec { buildInputs = [ # Requires v4l2src - gst-plugins-good + (gst_all_1.gst-plugins-good.override { gtkSupport = true; }); # For gobject namespaces libhandy networkmanager diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 882196e53a13a..e63f3bcc50a6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3047,10 +3047,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - cobang = python311Packages.callPackage ../applications/misc/cobang { - gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; - }; - cocoapods = callPackage ../development/tools/cocoapods { }; cocoapods-beta = lowPrio (callPackage ../development/tools/cocoapods { beta = true; }); From 86476b482968df3e91933dc61d21fbb923a827f3 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Mon, 25 Nov 2024 19:26:39 +0800 Subject: [PATCH 12/53] cobang: nixfmt --- pkgs/by-name/co/cobang/package.nix | 50 ++++++++++++++++-------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/co/cobang/package.nix b/pkgs/by-name/co/cobang/package.nix index 4d2cf6e40c344..16c06bfbf31cb 100644 --- a/pkgs/by-name/co/cobang/package.nix +++ b/pkgs/by-name/co/cobang/package.nix @@ -1,24 +1,25 @@ -{ lib -, buildPythonApplication -, fetchFromGitHub -, brotlicffi -, gst-python -, kiss-headers -, logbook -, pillow -, pygobject3 -, python-zbar -, requests -, single-version -, gobject-introspection -, gtk3 -, libhandy -, librsvg -, networkmanager -, setuptools -, python -, pytestCheckHook -, wrapGAppsHook3 +{ + lib, + buildPythonApplication, + fetchFromGitHub, + brotlicffi, + gst-python, + kiss-headers, + logbook, + pillow, + pygobject3, + python-zbar, + requests, + single-version, + gobject-introspection, + gtk3, + libhandy, + librsvg, + networkmanager, + setuptools, + python, + pytestCheckHook, + wrapGAppsHook3, }: buildPythonApplication rec { @@ -48,7 +49,7 @@ buildPythonApplication rec { buildInputs = [ # Requires v4l2src - (gst_all_1.gst-plugins-good.override { gtkSupport = true; }); + (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) # For gobject namespaces libhandy networkmanager @@ -96,7 +97,10 @@ buildPythonApplication rec { description = "QR code scanner desktop app for Linux"; homepage = "https://github.com/hongquan/CoBang"; license = licenses.gpl3Only; - maintainers = with maintainers; [ aleksana dvaerum ]; + maintainers = with maintainers; [ + aleksana + dvaerum + ]; mainProgram = "cobang"; platforms = lib.platforms.linux; }; From 190128840345ea8744a1d19c75e245affcbc62cf Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Mon, 25 Nov 2024 19:29:43 +0800 Subject: [PATCH 13/53] cobang: fix build --- pkgs/by-name/co/cobang/package.nix | 43 +++++++++++++----------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/co/cobang/package.nix b/pkgs/by-name/co/cobang/package.nix index 16c06bfbf31cb..1909421547ef7 100644 --- a/pkgs/by-name/co/cobang/package.nix +++ b/pkgs/by-name/co/cobang/package.nix @@ -1,28 +1,17 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, - brotlicffi, - gst-python, - kiss-headers, - logbook, - pillow, - pygobject3, - python-zbar, - requests, - single-version, + gst_all_1, gobject-introspection, gtk3, libhandy, librsvg, networkmanager, - setuptools, - python, - pytestCheckHook, wrapGAppsHook3, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "cobang"; version = "0.14.1"; pyproject = true; @@ -40,14 +29,14 @@ buildPythonApplication rec { sed -i '$ a\packages = ["cobang"]' pyproject.toml ''; - nativeBuildInputs = [ + nativeBuildInputs = with python3Packages; [ # Needed to recognize gobject namespaces gobject-introspection wrapGAppsHook3 setuptools ]; - buildInputs = [ + buildInputs = with python3Packages; [ # Requires v4l2src (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) # For gobject namespaces @@ -55,7 +44,7 @@ buildPythonApplication rec { networkmanager ]; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ brotlicffi kiss-headers logbook @@ -69,21 +58,25 @@ buildPythonApplication rec { gst-python ]; - nativeCheckInputs = [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; + pythonRelaxDeps = [ + "Pillow" + ]; + # Wrapping this manually for SVG recognition dontWrapGApps = true; postInstall = '' # Needed by the application - cp -R data $out/${python.sitePackages}/ + cp -R data $out/${python3Packages.python.sitePackages}/ # Icons and applications - install -Dm 644 $out/${python.sitePackages}/data/vn.hoabinh.quan.CoBang.svg -t $out/share/pixmaps/ - install -Dm 644 $out/${python.sitePackages}/data/vn.hoabinh.quan.CoBang.desktop.in -t $out/share/applications/ - mv $out/${python.sitePackages}/data/vn.hoabinh.quan.CoBang.desktop{.in,} + install -Dm 644 $out/${python3Packages.python.sitePackages}/data/vn.hoabinh.quan.CoBang.svg -t $out/share/pixmaps/ + install -Dm 644 $out/${python3Packages.python.sitePackages}/data/vn.hoabinh.quan.CoBang.desktop.in -t $out/share/applications/ + mv $out/${python3Packages.python.sitePackages}/data/vn.hoabinh.quan.CoBang.desktop{.in,} ''; preFixup = '' @@ -93,11 +86,11 @@ buildPythonApplication rec { --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" ''; - meta = with lib; { + meta = { description = "QR code scanner desktop app for Linux"; homepage = "https://github.com/hongquan/CoBang"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ aleksana dvaerum ]; From 235a151786cc10fbf2c6c6d43656b876b5124d03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Nov 2024 02:27:54 +0000 Subject: [PATCH 14/53] jsonwatch: 0.6.0 -> 0.7.0 --- pkgs/tools/misc/jsonwatch/default.nix | 21 +++++++-------------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/misc/jsonwatch/default.nix b/pkgs/tools/misc/jsonwatch/default.nix index c40e91c87c325..44fc53b878dc4 100644 --- a/pkgs/tools/misc/jsonwatch/default.nix +++ b/pkgs/tools/misc/jsonwatch/default.nix @@ -1,26 +1,21 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, Security +{ + lib, + fetchFromGitHub, + rustPlatform, }: rustPlatform.buildRustPackage rec { pname = "jsonwatch"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "dbohdan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TGW04P8t0mAXza7I7qp6QRXA/MDE3m1dlRC7bMf2dSk="; + sha256 = "sha256-WzQ793dLb8OujNpEq7UXIgJM+lz0WZEVlbKmwM58klU="; }; - cargoHash = "sha256-Gjb7v3kz11iOml3Ykxhy43KNxzaprgMbb5DpPNChLTc="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; + cargoHash = "sha256-76Vvs3OaxYDZE39d9h3T8HhYQfHhY5D17PgQxcPrMyc="; meta = with lib; { description = "Like watch -d but for JSON"; @@ -34,8 +29,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/dbohdan/jsonwatch"; license = licenses.mit; maintainers = with maintainers; [ fab ]; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; mainProgram = "jsonwatch"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38982497a655d..60fbf9d5ef08b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3967,9 +3967,7 @@ with pkgs; json-schema-for-humans = with python3Packages; toPythonApplication json-schema-for-humans; - jsonwatch = callPackage ../tools/misc/jsonwatch { - inherit (darwin.apple_sdk.frameworks) Security; - }; + jsonwatch = callPackage ../tools/misc/jsonwatch { }; jupyter = callPackage ../applications/editors/jupyter { }; From edac51dc0bc1f209ad4740a57bb80c2233a4484d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Nov 2024 16:06:40 +0000 Subject: [PATCH 15/53] python312Packages.nsapi: 3.0.5 -> 3.1.2 --- pkgs/development/python-modules/nsapi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nsapi/default.nix b/pkgs/development/python-modules/nsapi/default.nix index 63bd70151c894..b5270665e24e0 100644 --- a/pkgs/development/python-modules/nsapi/default.nix +++ b/pkgs/development/python-modules/nsapi/default.nix @@ -9,15 +9,15 @@ buildPythonPackage rec { pname = "nsapi"; - version = "3.0.5"; + version = "3.1.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aquatix"; repo = "ns-api"; - rev = "v${version}"; - sha256 = "0i1zkvi4mrhkh1gxzpa54mq8mb76s9nf3jxxhpqia56nkq8f8krb"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-H8qxqzcGZ52W/HbTuKdnfnaYdZFaxzuUhrniS1zsL2w="; }; propagatedBuildInputs = [ From fedd9d1230125a5685cfd5c55e0a1354094daf5f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 19 Nov 2024 08:21:53 +0100 Subject: [PATCH 16/53] python312Packages.tinygrad: 0.9.2 -> 0.10.0 Diff: https://github.com/tinygrad/tinygrad/compare/refs/tags/v0.9.2...v0.10.0 Changelog: https://github.com/tinygrad/tinygrad/releases/tag/v0.10.0 --- .../python-modules/tinygrad/default.nix | 44 +++++++++---------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/tinygrad/default.nix b/pkgs/development/python-modules/tinygrad/default.nix index ae55395b2ca21..d181f339b5b79 100644 --- a/pkgs/development/python-modules/tinygrad/default.nix +++ b/pkgs/development/python-modules/tinygrad/default.nix @@ -15,9 +15,8 @@ # build-system setuptools, - # dependencies + # optional-dependencies llvmlite, - numpy, triton, unicorn, @@ -29,6 +28,7 @@ hypothesis, librosa, networkx, + numpy, onnx, pillow, pytest-xdist, @@ -45,14 +45,14 @@ buildPythonPackage rec { pname = "tinygrad"; - version = "0.9.2"; + version = "0.10.0"; pyproject = true; src = fetchFromGitHub { owner = "tinygrad"; repo = "tinygrad"; rev = "refs/tags/v${version}"; - hash = "sha256-fCKtJhZtqq6yjc6m41uvikzM9GArUlB8Q7jN/Np8+SM="; + hash = "sha256-IIyTb3jDUSEP2IXK6DLsI15E5N34Utt7xv86aTHpXf8="; }; patches = [ @@ -68,15 +68,15 @@ buildPythonPackage rec { ]; postPatch = - '' - substituteInPlace tinygrad/runtime/autogen/opencl.py \ - --replace-fail "ctypes.util.find_library('OpenCL')" "'${ocl-icd}/lib/libOpenCL.so'" - '' # Patch `clang` directly in the source file - + '' + '' substituteInPlace tinygrad/runtime/ops_clang.py \ --replace-fail "'clang'" "'${lib.getExe clang}'" '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace tinygrad/runtime/autogen/opencl.py \ + --replace-fail "ctypes.util.find_library('OpenCL')" "'${ocl-icd}/lib/libOpenCL.so'" + '' # `cuda_fp16.h` and co. are needed at runtime to compile kernels + lib.optionalString cudaSupport '' substituteInPlace tinygrad/runtime/support/compiler_cuda.py \ @@ -95,15 +95,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = - [ - numpy - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # pyobjc-framework-libdispatch - # pyobjc-framework-metal - ]; - optional-dependencies = { llvm = [ llvmlite ]; arm = [ unicorn ]; @@ -126,6 +117,7 @@ buildPythonPackage rec { hypothesis librosa networkx + numpy onnx pillow pytest-xdist @@ -144,9 +136,9 @@ buildPythonPackage rec { disabledTests = [ - # flaky: https://github.com/tinygrad/tinygrad/issues/6542 - # TODO: re-enable when https://github.com/tinygrad/tinygrad/pull/6560 gets merged - "test_broadcastdot" + # Fixed in https://github.com/tinygrad/tinygrad/pull/7792 + # TODO: re-enable at next release + "test_kernel_cache_in_action" # Require internet access "test_benchmark_openpilot_model" @@ -181,8 +173,12 @@ buildPythonPackage rec { "test_transcribe_long_no_batch" "test_vgg7" ] - # Fail on aarch64-linux with AssertionError ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ + # Fixed in https://github.com/tinygrad/tinygrad/pull/7796 + # TODO: re-enable at next release + "test_interpolate_bilinear" + + # Fail with AssertionError "test_casts_from" "test_casts_to" "test_int8" @@ -209,7 +205,7 @@ buildPythonPackage rec { changelog = "https://github.com/tinygrad/tinygrad/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; - # Requires unpackaged pyobjc-framework-libdispatch and pyobjc-framework-metal - broken = stdenv.hostPlatform.isDarwin; + # Tests segfault on darwin + badPlatforms = [ lib.systems.inspect.patterns.isDarwin ]; }; } From 08f0f69af2178bd51ed0c324acfaae8f06ca35e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Nov 2024 04:18:02 +0000 Subject: [PATCH 17/53] python312Packages.podman: 5.2.0 -> 5.3.0 --- pkgs/development/python-modules/podman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/podman/default.nix b/pkgs/development/python-modules/podman/default.nix index 14525a16d8d80..28fe64e07cc9d 100644 --- a/pkgs/development/python-modules/podman/default.nix +++ b/pkgs/development/python-modules/podman/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "podman"; - version = "5.2.0"; + version = "5.3.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "containers"; repo = "podman-py"; rev = "refs/tags/v${version}"; - hash = "sha256-2NsF00jaW2wl99sTxTQ5xJkqNOYh9RaecmBMcWP3TI8="; + hash = "sha256-YER+qTC5+eF3PWtDBPq2WNOm5RzqXy30+1JdPzwyfrk="; }; build-system = [ setuptools ]; From d95aee96e15cb804addc412649939622927e20ae Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Tue, 26 Nov 2024 08:11:41 +0100 Subject: [PATCH 18/53] zammad: 6.3.1 -> 6.4.0 --- .../networking/misc/zammad/default.nix | 46 +- .../networking/misc/zammad/gemset.nix | 799 ++++++++++-------- .../networking/misc/zammad/package.json | 161 ---- .../networking/misc/zammad/source.json | 4 +- .../networking/misc/zammad/update.sh | 3 - 5 files changed, 485 insertions(+), 528 deletions(-) delete mode 100644 pkgs/applications/networking/misc/zammad/package.json diff --git a/pkgs/applications/networking/misc/zammad/default.nix b/pkgs/applications/networking/misc/zammad/default.nix index ed178fc9c1ab8..8a053f403c16a 100644 --- a/pkgs/applications/networking/misc/zammad/default.nix +++ b/pkgs/applications/networking/misc/zammad/default.nix @@ -2,7 +2,6 @@ , lib , nixosTests , fetchFromGitHub -, fetchYarnDeps , applyPatches , bundlerEnv , defaultGemConfig @@ -14,8 +13,7 @@ , jq , moreutils , nodejs -, yarn -, yarn2nix-moretea +, pnpm , cacert , redis , dataDir ? "/var/lib/zammad" @@ -23,7 +21,7 @@ let pname = "zammad"; - version = "6.3.1"; + version = "6.4.0"; src = applyPatches { src = fetchFromGitHub (lib.importJSON ./source.json); @@ -79,25 +77,6 @@ let }; }; - yarnEnv = yarn2nix-moretea.mkYarnPackage { - pname = "${pname}-node-modules"; - inherit version src; - packageJSON = ./package.json; - - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; - hash = "sha256-3DuTirYd6lAQd5PRbdOa/6QaMknIqNMTVnxEESF0N/c="; - }; - - packageResolutions.minimatch = "9.0.3"; - - yarnPreBuild = '' - mkdir -p deps/Zammad - cp -r ${src}/.eslint-plugin-zammad deps/Zammad/.eslint-plugin-zammad - chmod -R +w deps/Zammad/.eslint-plugin-zammad - ''; - }; - in stdenv.mkDerivation { inherit pname version src; @@ -106,23 +85,26 @@ stdenv.mkDerivation { rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler - yarn - nodejs - procps - cacert ]; nativeBuildInputs = [ redis postgresql + pnpm.configHook + nodejs + procps + cacert ]; - RAILS_ENV = "production"; + env.RAILS_ENV = "production"; - buildPhase = '' - node_modules=${yarnEnv}/libexec/Zammad/node_modules - ${yarn2nix-moretea.linkNodeModulesHook} + pnpmDeps = pnpm.fetchDeps { + inherit pname src; + + hash = "sha256-bdm1nkJnXE7oZZhG2uBnk3fYhITaMROHGKPbf0G3bFs="; + }; + buildPhase = '' mkdir redis-work pushd redis-work redis-server & @@ -153,7 +135,7 @@ stdenv.mkDerivation { ''; passthru = { - inherit rubyEnv yarnEnv; + inherit rubyEnv; updateScript = [ "${callPackage ./update.nix {}}/bin/update.sh" pname (toString ./.) ]; tests = { inherit (nixosTests) zammad; }; }; diff --git a/pkgs/applications/networking/misc/zammad/gemset.nix b/pkgs/applications/networking/misc/zammad/gemset.nix index ee8359ae88253..43650bb5ad33d 100644 --- a/pkgs/applications/networking/misc/zammad/gemset.nix +++ b/pkgs/applications/networking/misc/zammad/gemset.nix @@ -11,15 +11,15 @@ version = "5.5.0"; }; actioncable = { - dependencies = ["actionpack" "activesupport" "nio4r" "websocket-driver"]; + dependencies = ["actionpack" "activesupport" "nio4r" "websocket-driver" "zeitwerk"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j86qjs1zw34p0p7d5napa1vvwqlvm9nmv7ckxxhcba1qv4dspmw"; + sha256 = "1mfb5x6kwxwprprhzj2a1hff7vw37v1wd9hl70nqq23xr82w20wx"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.1.4.1"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f68h8cl6dqbz7mq3x43s0s82291nani3bz1hrxkk2qpgda23mw9"; + sha256 = "1z95jcq4cmk7zzy4jjgxjbigk0zaxm2gpf8p0s0jn3b5px0k3ljk"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.1.4.1"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; @@ -38,21 +38,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "077j47jsg0wqwx5b13n4h0g3g409b6kfrlazpzgjpa3pal74f7sc"; + sha256 = "1h39ffp0zs0r46bfm8bbgvc8icwamq4icsf1qn32xskdssnb8xyr"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.1.4.1"; }; actionpack = { - dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; + dependencies = ["actionview" "activesupport" "nokogiri" "racc" "rack" "rack-session" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jh83rqd6glys1b2wsihzsln8yk6zdwgiyn9xncyiav9rcwjpkax"; + sha256 = "1mrdaql56iqnqcg7n3frc0r48bca8b4g9f2ifc69f15dpps2wfsx"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.1.4.1"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "044qi3zhzxlfq7slc2pb9ky9mdivp1m1sjyhjvnsi64ggq7cvr22"; + sha256 = "06az0qalnvz0hv1wq8nn5q70gak9r50b6b95avmkz860lhbpx70d"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.1.4.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ygpg75f3ffdcbxvf7s14xw3hcjin1nnx1nk3mg9mj2xc1nb60aa"; + sha256 = "02zrp7x6k6sgd4rrpsh2b9k2h0qhx538fsb1grsw25ss8d9k2b2j"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.1.4.1"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yql9v4cd1xbqgnzlf3cv4a6sm26v2y4gsgcbbfgvfc0hhlfjklg"; + sha256 = "1r0i34jrsibwkbg61kjm1xjbc8ppy8r91bnach8rv7jgjrid4dyl"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.1.4.1"; }; activemodel = { dependencies = ["activesupport"]; @@ -93,21 +93,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0grdpvglh0cj96qhlxjj9bcfqkh13c1pfpcwc9ld3aw0yzvsw5a1"; + sha256 = "1dpdfa132zsfw5l754p2iwialbscvhp9dblq9fg65ww306s3g0pl"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.1.4.1"; }; activerecord = { - dependencies = ["activemodel" "activesupport"]; + dependencies = ["activemodel" "activesupport" "timeout"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rlky1cr5kcdl0jad3nk5jpim6vjzbgkfhxnk7y492b3j2nznpcf"; + sha256 = "1cwx0a7pbl2shm0jc0m7aylacb84j2p4f3h0v7f6aas2b8s6lkf1"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.1.4.1"; }; activerecord-import = { dependencies = ["activerecord"]; @@ -115,10 +115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fagv72ahbjmnrk8sg8j527frl0zl8mk16i4vcd8v227rn5llw5i"; + sha256 = "1g16yn1ixfixd979yfqbxp9y71ryr4a6wakbr6dmpq4s7glm6366"; type = "gem"; }; - version = "1.6.0"; + version = "1.8.1"; }; activerecord-session_store = { dependencies = ["actionpack" "activerecord" "cgi" "multi_json" "rack" "railties"]; @@ -132,37 +132,37 @@ version = "2.1.0"; }; activestorage = { - dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; + dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f4g3589i5ii4gdfazv6d9rjinr16aarh6g12v8378ck7jll3mhz"; + sha256 = "07zw4r8n3ag3d8jfynngpk0cxjwwlh7pxg3hrz1fdww2fnl6nan8"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.1.4.1"; }; activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ff3x7q400flzhml131ix8zfwmh13h70rs6yzbzf513g781gbbxh"; + sha256 = "0p3167vw7csidyfl731hbp27xaz90w0v31l3fqzrsipci69p7qw0"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.1.4.1"; }; acts_as_list = { - dependencies = ["activerecord"]; + dependencies = ["activerecord" "activesupport"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qdb3g1ha8ir198rw6a7wmmdz4vm3gsk5j5j1s5sa50hdbgc9m06"; + sha256 = "0jbzjf6344a0m083d69qgx55xqqsxxrli8g1ark9d16fbcayi0j6"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.2"; }; addressable = { dependencies = ["public_suffix"]; @@ -170,10 +170,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; type = "gem"; }; - version = "2.8.6"; + version = "2.8.7"; }; android_key_attestation = { groups = ["default"]; @@ -225,10 +225,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01m735zs3gdbr1cn1cr5njm5cv4dy6x32ihdrlk61xi6dx6v3i20"; + sha256 = "0kjzcvz1in424gvhcvp94mc00snhv3h2b413glf5hym0wm3izlnc"; type = "gem"; }; - version = "10.4.16.0"; + version = "10.4.19.0"; }; awrence = { groups = ["default"]; @@ -255,10 +255,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mydgvc5wn4adsic86907hzyfhgvzaq6nr394pnvk83ryv4zx77p"; + sha256 = "1l3rkiqvlmh3bgq6447s2d398z43slk3swz0cvgjprvm6182ici4"; type = "gem"; }; - version = "1.899.0"; + version = "1.984.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -266,10 +266,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dlalj0pw6nfmmfqddjj8b5rv6lq1hqdq19im3s8fjq5ln5ij8lr"; + sha256 = "06mrp7g24ndg55w85ndyrvxfx2v6hnkh5fj32w9s6w3xsc8v5kqq"; type = "gem"; }; - version = "3.191.4"; + version = "3.209.1"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -277,10 +277,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fbp2vw5qnyiya63hlmwiqkbh30lipyqplancmhm84ad7i98ambb"; + sha256 = "1acx3bhqkhni3kbl7xnjdgy8raq5y7p0zyniq61bsihzkwcj7imh"; type = "gem"; }; - version = "1.78.0"; + version = "1.94.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -288,10 +288,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vz7s3a48ci06lg88n279g277ljxb4i41x36fxfb5nbsvnfgq1b7"; + sha256 = "1kln41q23a6rxj1r9wj972z4jaxiqn7fm64y9ry6qkbzn1ibgam6"; type = "gem"; }; - version = "1.146.0"; + version = "1.167.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -299,13 +299,13 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4"; + sha256 = "176zh13m1vhwgys0drlqiw79ljmmx84vva036shsb7rzr4yi36qm"; type = "gem"; }; - version = "1.8.0"; + version = "1.10.0"; }; base64 = { - groups = ["default" "development" "test"]; + groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -315,14 +315,14 @@ version = "0.2.0"; }; bigdecimal = { - groups = ["default" "development" "test"]; + groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w"; + sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; type = "gem"; }; - version = "3.1.6"; + version = "3.1.8"; }; bindata = { groups = ["default"]; @@ -362,10 +362,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1srlq3gqirzdkhv12ljpnp5cb0f8jfrl3n8xs9iivyz2c7khvdyp"; + sha256 = "0mdgj9yw1hmx3xh2qxyjc31y8igmxzd9h0c245ay2zkz76pl4k5c"; type = "gem"; }; - version = "1.18.3"; + version = "1.18.4"; }; brakeman = { dependencies = ["racc"]; @@ -373,20 +373,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lylig4vgnw9l1ybwgxdi9nw9q2bc5dcplklg8nsbi7j32f7c5kp"; + sha256 = "078syvjnnkbair5ffyvchxj9yd2c8215c1271kfh1gqsmaf70bl6"; type = "gem"; }; - version = "6.1.2"; + version = "6.2.1"; }; browser = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g4bcpax07kqqr9cp7cjc7i0pcij4nqpn1rdsg2wdwhzf00m6x32"; + sha256 = "083rx0jjlzbh9fxiy967l87f1123hairdc4mm6d54plj5kqz1683"; type = "gem"; }; - version = "5.3.1"; + version = "6.0.0"; }; buftok = { groups = ["default"]; @@ -403,10 +403,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + sha256 = "0pw3r2lyagsxkm71bf44v5b74f7l9r7di22brbyji9fwz791hya9"; type = "gem"; }; - version = "3.2.4"; + version = "3.3.0"; }; byebug = { groups = ["default"]; @@ -460,14 +460,15 @@ version = "0.4.1"; }; childprocess = { + dependencies = ["logger"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dfq21rszw5754llkh4jc58j2h8jswqpcxm3cip1as3c3nmvfih7"; + sha256 = "1v5nalaarxnfdm6rxb7q6fmc6nx097jd630ax6h9ch7xw95li3cs"; type = "gem"; }; - version = "5.0.0"; + version = "5.1.0"; }; chunky_png = { groups = ["development" "test"]; @@ -501,7 +502,7 @@ version = "0.3.3"; }; coderay = { - groups = ["default"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -542,26 +543,25 @@ }; version = "1.12.2"; }; - composite_primary_keys = { - dependencies = ["activerecord"]; - groups = ["default"]; + concurrent-ruby = { + groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qrmyrpr0pi77xz4g0vcm4b29al6hk6b82hnplk4p84l667an17b"; + sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; type = "gem"; }; - version = "14.0.9"; + version = "1.3.4"; }; - concurrent-ruby = { + connection_pool = { groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; + sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; type = "gem"; }; - version = "1.2.3"; + version = "2.4.1"; }; cose = { dependencies = ["cbor" "openssl-signature_algorithm"]; @@ -569,10 +569,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00c6x4ha7qiaaf88qdbyf240mk146zz78rbm4qwyaxmwlmk7q933"; + sha256 = "1rbdzl9n8ppyp38y75hw06s17kp922ybj6jfvhz52p83dg6xpm6m"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; crack = { dependencies = ["bigdecimal" "rexml"]; @@ -651,10 +651,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s2xg72ljg4cwmr05zi67vcyz8zib46gvvf7rmrdhsyq387m2qcq"; + sha256 = "0zyjp3yfchfw1jynvxk3147hzmchwq8cnqh16gjii557nd0z0mhx"; type = "gem"; }; - version = "4.1.11"; + version = "4.1.12"; }; delayed_job_active_record = { dependencies = ["activerecord" "delayed_job"]; @@ -662,10 +662,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b80s5b6dihazdd8kcfrd7z3qv8kijxpxq5027prazdha3pgzadf"; + sha256 = "08dl21wbrhb5ynk23dqv71wmm3s0zcz1xa0hmmmwk3yh48irza6j"; type = "gem"; }; - version = "4.1.8"; + version = "4.1.10"; }; deprecation_toolkit = { dependencies = ["activesupport"]; @@ -673,10 +673,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lq66yn73dm601smg0n7yva0qd8zbhd64zs0pg3yzncrlsx5b045"; + sha256 = "0f37k15bsq6aq8bikkvlg5bi96ic8z7hwyxxcz8mx3xgkgfdhzx0"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.1"; }; diff-lcs = { groups = ["default" "development" "test"]; @@ -714,20 +714,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w02d1124mrzbagh2xplbzkpy0ykfs52f3rpyaa3zg6div0zvs13"; + sha256 = "0a6nbc12nfz355am2vwm1ql2p8zck7mr941glghmnl32djaga24b"; + type = "gem"; + }; + version = "5.7.1"; + }; + drb = { + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; type = "gem"; }; - version = "5.6.9"; + version = "2.2.1"; }; dry-cli = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w39jms4bsggxvl23cxanhccv1ngb6nqxsqhi784v5bjz1lx3si8"; + sha256 = "18cxi596f5x1vglnma4hhm6z15m7yma6yparsybyfz3a2z0iqc08"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; }; dry-core = { dependencies = ["concurrent-ruby" "zeitwerk"]; @@ -745,10 +755,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09hnvna3lg2x36li63988kv664d0zvy7y0z33803yvrdr9hj7lka"; + sha256 = "14k7q3jvzphkbkd4i1s3ika6kz4p9pcqy78z0yimahwvnsqvj3rl"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; }; dry-logic = { dependencies = ["concurrent-ruby" "dry-core" "zeitwerk"]; @@ -841,10 +851,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; + sha256 = "0qnd6ff4az22ysnmni3730c41b979xinilahzg86bn7gv93ip9pw"; type = "gem"; }; - version = "1.12.0"; + version = "1.13.0"; }; eventmachine = { groups = ["default"]; @@ -872,10 +882,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "013f3akjgyz99k6jpkvf6a7s4rc2ba44p07mv10df66kk378d50s"; + sha256 = "0q927lvgjqj0xaplxhicj5xv8xadx3957mank3p7g01vb6iv6x33"; type = "gem"; }; - version = "6.4.6"; + version = "6.5.0"; }; factory_bot_rails = { dependencies = ["factory_bot" "railties"]; @@ -894,21 +904,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rrwh78515yqljh09wjxfsb64siqd8qgp4hv57syajhza5x8vbzz"; + sha256 = "1xj0xx2snnxzjipxpxwiki7053441jkdg10h0rmjiri040s5lssi"; type = "gem"; }; - version = "3.2.3"; + version = "3.4.2"; }; faraday = { - dependencies = ["faraday-net_http"]; + dependencies = ["faraday-net_http" "json" "logger"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qqb1rmk0f9m82iijjlqadh5yby1bhnr6svjk9vxdvh6f181988s"; + sha256 = "05s5pyxh7y68jphb0lgrh0ksxbp4lmbsc6a6qg0ahj15pjqx01ni"; type = "gem"; }; - version = "2.9.0"; + version = "2.12.0"; }; faraday-mashify = { dependencies = ["faraday" "hashie"]; @@ -938,20 +948,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17w51yk4rrm9rpnbc3x509s619kba0jga3qrj4b17l30950vw9qn"; + sha256 = "0rg54k4skaz8z7j358p6pdzc9pr84fjq7sdlpicf7s5ig7vb1rlk"; type = "gem"; }; - version = "3.1.0"; + version = "3.3.0"; }; ffi = { - groups = ["assets" "default" "development" "test"]; + groups = ["assets" "default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; + sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; type = "gem"; }; - version = "1.16.3"; + version = "1.17.0"; }; ffi-compiler = { dependencies = ["ffi" "rake"]; @@ -964,15 +974,25 @@ }; version = "1.3.2"; }; + fiber-storage = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zxblmxwdpj3587wji5325y53gjdcmzxzm6126dyg58b3qzk42mq"; + type = "gem"; + }; + version = "1.0.0"; + }; gli = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l38x0i0z8pjwr54lmnk8q1lxd7cqyl5m0qqqwb2iw28kncvmb3i"; + sha256 = "1fd4blr0pa0b4dd9pzqqpzh49m3p1ff4aa0bys4wpk1jniisl7vy"; type = "gem"; }; - version = "2.21.1"; + version = "2.21.5"; }; globalid = { dependencies = ["activesupport"]; @@ -986,15 +1006,15 @@ version = "1.2.1"; }; graphql = { - dependencies = ["base64"]; + dependencies = ["base64" "fiber-storage"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sj3s17m2yfa33cin2pxhrkyhjvrw6gj3hr59vswckw8ipsqx50a"; + sha256 = "1is9rr5l0lw9z12h9v064fpp1nrnv42p2z2j1r3mnk4ik1lrdjba"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.16"; }; graphql-batch = { dependencies = ["graphql" "promise.rb"]; @@ -1012,10 +1032,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jf9dxgjz6z7fvymyz2acyvn9iyvwkn6d9sk7y4fxwbmfc75yimm"; + sha256 = "0slky0n6n12gjgimzdbdigpwyg5wgq8fysjwkzzfw33ff8b675n7"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; hashie = { groups = ["default" "development" "test"]; @@ -1064,10 +1084,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13rilvlv8kwbzqfb644qp6hrbsj82cbqmnzcvqip1p6vqx36sxbk"; + sha256 = "0lr2yk5g5vvf9nzlmkn3p7mhh9mn55gpdc7kl2w21xs46fgkjynb"; type = "gem"; }; - version = "1.0.5"; + version = "1.0.7"; }; http-form_data = { groups = ["default"]; @@ -1127,21 +1147,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7"; + sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw"; type = "gem"; }; - version = "1.14.4"; + version = "1.14.6"; }; icalendar = { - dependencies = ["ice_cube"]; + dependencies = ["ice_cube" "ostruct"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03ki7wm2iqr3dv7mgrxv2b8vbh42c7yv55dc33a077n8jnxhhc8z"; + sha256 = "11fl1kfqvgnh0vnryc9kbbaal693kdgf5h6qnj37p9wz5xkw5gqf"; type = "gem"; }; - version = "2.10.1"; + version = "2.10.3"; }; icalendar-recurrence = { dependencies = ["icalendar" "ice_cube" "tzinfo"]; @@ -1159,10 +1179,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dri4mcya1fwzrr9nzic8hj1jr28a2szjag63f9k7p2bw9fpw4fs"; + sha256 = "1gpwlpshsjlld53h1f999p0azd9jdlgmhbswa19wqjjbv9fv9pij"; type = "gem"; }; - version = "0.16.4"; + version = "0.17.0"; }; ice_nine = { groups = ["default"]; @@ -1204,6 +1224,27 @@ }; version = "0.5"; }; + io-console = { + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08d2lx42pa8jjav0lcjbzfzmw61b8imxr9041pva8xzqabrczp7h"; + type = "gem"; + }; + version = "0.7.2"; + }; + irb = { + dependencies = ["rdoc" "reline"]; + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y40dv3caswr81dlsyln6vnmmpzf5jcal2rqjbsglvnkb0xh0xar"; + type = "gem"; + }; + version = "1.14.1"; + }; jmespath = { groups = ["default"]; platforms = []; @@ -1219,10 +1260,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq"; + sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q"; type = "gem"; }; - version = "2.7.1"; + version = "2.7.2"; }; jwt = { groups = ["default"]; @@ -1235,28 +1276,28 @@ version = "2.3.0"; }; keycloak-admin = { - dependencies = ["httparty"]; + dependencies = ["hashie" "httparty"]; groups = ["development" "test"]; platforms = []; source = { fetchSubmodules = false; - rev = "79b38d75859e08617879ffc75d5313e41c6974b1"; - sha256 = "02kq2nfq9j7mfag21pkbf1p7i16a5z36r4nn27zqw4679bwg8sgd"; + rev = "7ea4e62d77fad93fc2da840c3f8bd5c45588d131"; + sha256 = "022883w42a9dg0q97xxl58mrzhkba9jf3kij0zc2fq1zsl37rq1n"; type = "git"; url = "https://github.com/tschaefer/ruby-keycloak-admin/"; }; version = "23.0.7"; }; koala = { - dependencies = ["addressable" "faraday" "faraday-multipart" "json" "rexml"]; + dependencies = ["addressable" "base64" "faraday" "faraday-multipart" "json" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qrs0yra1d0kxrn28fh1hvm099rh26dp4hpkw36vgfm286qjslww"; + sha256 = "0z40pvvwbr95b0kk92rgimvhma0ahiv07ihxkvglm6jwi9cbxp42"; type = "gem"; }; - version = "3.5.0"; + version = "3.6.0"; }; language_server-protocol = { groups = ["default" "development" "test"]; @@ -1270,7 +1311,7 @@ }; listen = { dependencies = ["rb-fsevent" "rb-inotify"]; - groups = ["development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1294,10 +1335,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14cx0jwlgbigr064y0wmb0d2048p0zvgfsdf8n7cf262mk6vz8r8"; + sha256 = "1621bz9zyjkgcpgsqyf8xww72jhv3q8lbjxlzq28xcnqkkcailzw"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.1"; + }; + logger = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + type = "gem"; + }; + version = "1.6.1"; }; logging = { dependencies = ["little-plugger" "multi_json"]; @@ -1305,10 +1356,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zflchpx4g8c110gjdcs540bk5a336nq6nmx379rdg56xw0pjd02"; + sha256 = "1jqcq2yxh973f3aw63nd3wxhqyhkncz3pf8v2gs3df0iqair725s"; type = "gem"; }; - version = "2.3.1"; + version = "2.4.0"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -1321,6 +1372,17 @@ }; version = "2.22.0"; }; + macaddr = { + dependencies = ["systemu"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10nzvbp3raa93afisa870005acmv2vlrka82pxh13g4bjq4phdys"; + type = "gem"; + }; + version = "1.7.2"; + }; mail = { dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"]; groups = ["default"]; @@ -1375,35 +1437,35 @@ version = "4.0.0"; }; method_source = { - groups = ["assets" "default" "development" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp"; + sha256 = "1igmc3sq9ay90f8xjvfnswd1dybj1s3fi0dwd53inwsvqk4h24qq"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; }; mime-types = { - dependencies = ["mime-types-data"]; + dependencies = ["logger" "mime-types-data"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r64z0m5zrn4k37wabfnv43wa6yivgdfk6cf2rpmmirlz889yaf1"; + sha256 = "0r34mc3n7sxsbm9mzyzy8m3dvq7pwbryyc8m452axkj0g2axnwbg"; type = "gem"; }; - version = "3.5.2"; + version = "3.6.0"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00x7w5xqsj9m33v3vkmy23wipkkysafksib53ypzn27p5g81w455"; + sha256 = "06dbn0j13jwdrmlvrjd50mxqrjlkh3lvxp0afh4glyzbliqvqpsd"; type = "gem"; }; - version = "3.2024.0305"; + version = "3.2024.1001"; }; mini_mime = { groups = ["default" "development" "test"]; @@ -1420,30 +1482,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "149r94xi6b3jbp6bv72f8383b95ndn0p5sxnq11gs1j9jadv0ajf"; + sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk"; type = "gem"; }; - version = "2.8.6"; + version = "2.8.7"; }; minitest = { groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07lq26b86giy3ha3fhrywk9r1ajhc2pm2mzj657jnpnbj1i6g17a"; - type = "gem"; - }; - version = "5.22.3"; - }; - minitest-profile = { - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13h4nwbq6yv7hsaa7dpj90lry4rc5qqnpzvm9n2s57mm2xi31xfa"; + sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix"; type = "gem"; }; - version = "0.0.2"; + version = "5.25.1"; }; msgpack = { groups = ["default"]; @@ -1466,24 +1518,35 @@ version = "1.15.0"; }; multi_xml = { + dependencies = ["bigdecimal"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj"; + sha256 = "06x61ca5j84nyhr1mwh9r436yiphnc5hmacb3gwqyn5gd0611kjg"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.1"; }; multipart-post = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1033p35166d9p97y4vajbbvr13pmkk9zwn7sylxpmk9jrpk8ri67"; + sha256 = "1a5lrlvmg2kb2dhw3lxcsv6x276bwgsxpnka1752082miqxd0wlq"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.1"; + }; + mutex_m = { + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; + type = "gem"; + }; + version = "0.2.0"; }; mysql2 = { groups = ["mysql"]; @@ -1521,10 +1584,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pi67ywf8yvv18vr8kvyb1igdv8nsjafyy9c86fny5wvi10qcwqv"; + sha256 = "0kw7g0j35fla8438s90m72b3xr0mqnpgm910qcwrgnvyg903xmi8"; type = "gem"; }; - version = "0.3.4"; + version = "0.3.8"; }; net-http = { dependencies = ["uri"]; @@ -1543,10 +1606,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zn7j2w0hc622ig0rslk4iy6yp3937dy9ibhyr1mwwx39n7paxaj"; + sha256 = "160mfk4gnpwfc7j4kpchxgzfkml54h94q7vfzjw061flrkrclyqj"; type = "gem"; }; - version = "0.4.10"; + version = "0.4.17"; }; net-ldap = { groups = ["default"]; @@ -1586,20 +1649,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0csspzqrg7s2v2wdp6vqqs1rra6w5ilpgnps5h52ig6rp7x2i389"; + sha256 = "0amlhz8fhnjfmsiqcjajip57ici2xhw089x7zqyhpk51drg43h2z"; type = "gem"; }; - version = "0.4.0.1"; + version = "0.5.0"; }; nio4r = { groups = ["default" "puma"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xkjz56qc7hl7zy7i7bhiyw5pl85wwjsa4p70rj6s958xj2sd1lm"; + sha256 = "017nbw87dpr4wyk81cgj8kxkxqgsgblrkxnmmadc77cg9gflrfal"; type = "gem"; }; - version = "2.7.0"; + version = "2.7.3"; }; nkf = { groups = ["default"]; @@ -1617,10 +1680,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lla2macphrlbzkirk0nwwwhcijrfymyfjjw1als0kwqd0n1cdpc"; + sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq"; type = "gem"; }; - version = "1.16.5"; + version = "1.16.7"; }; nori = { dependencies = ["bigdecimal"]; @@ -1628,10 +1691,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12wfv36jzc0978ij5c56nnfh5k8ax574njawigs98ysmp1x5s2ql"; + sha256 = "0qb84bbi74q0zgs09sdkq750jf2ri3lblbry0xi4g1ard4rwsrk1"; type = "gem"; }; - version = "2.7.0"; + version = "2.7.1"; }; oauth = { dependencies = ["oauth-tty" "snaky_hash" "version_gem"]; @@ -1678,15 +1741,15 @@ version = "2.1.2"; }; omniauth-facebook = { - dependencies = ["omniauth-oauth2"]; + dependencies = ["bigdecimal" "omniauth-oauth2"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m7q38kjm94wgq6h7hk9546yg33wcs3vf1v6zp0vx7nwkvfxh2j4"; + sha256 = "1qdrziqfa4sqpqf77i0nzbwq4qyg8qaqd127alnmg1skvax6rp6z"; type = "gem"; }; - version = "9.0.0"; + version = "10.0.0"; }; omniauth-github = { dependencies = ["omniauth" "omniauth-oauth2"]; @@ -1716,10 +1779,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fahkghfa2iczmwss9bz5l4rh7siwzjnjp3akh7pdbsfx0kg35j4"; + sha256 = "0h7gcihxnnc1xc123g3frvj524j6x3axi9blfn44kj9m7hxn5b9i"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.3"; }; omniauth-linkedin-oauth2 = { dependencies = ["omniauth-oauth2"]; @@ -1744,15 +1807,15 @@ version = "0.0.8"; }; omniauth-oauth = { - dependencies = ["oauth" "omniauth"]; + dependencies = ["oauth" "omniauth" "rack"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yw2vzx633p9wpdkd4jxsih6mw604mj7f6myyfikmj4d95c8d9z7"; + sha256 = "1a4dqmlv3if6hb4ddyx4y5v7vkpi7zq901104nl0ya1l0b4j5gr5"; type = "gem"; }; - version = "1.2.0"; + version = "1.2.1"; }; omniauth-oauth2 = { dependencies = ["oauth2" "omniauth"]; @@ -1771,10 +1834,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kwswnkyl8ym6i4wv65qh3qchqbf2n0c6lbhfgbvkds3gpmnlm7w"; + sha256 = "1q2zvkw34vk1vyhn5kp30783w1wzam9i9g5ygsdjn2gz59kzsw0i"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; omniauth-saml = { dependencies = ["omniauth" "ruby-saml"]; @@ -1782,10 +1845,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01k9rkg97npcgm8r4x3ja8y20hsg4zy0dcjpzafx148q4yxbg74n"; + sha256 = "00nn24s74miy7p65y8lwpjfwgcn7fwld61f9ghngal4asgw6pfwa"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.1"; }; omniauth-twitter = { dependencies = ["omniauth-oauth" "rack"]; @@ -1832,26 +1895,36 @@ }; version = "1.3.0"; }; + ostruct = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11dsv71gfbhy92yzj3xkckjzdai2bsz5a4fydgimv62dkz4kc5rv"; + type = "gem"; + }; + version = "0.6.0"; + }; overcommit = { dependencies = ["childprocess" "iniparse" "rexml"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05645qjnixnpkdzyv3qj3ycg3mbxqxj55vxdyny0vjpvigmn6bnl"; + sha256 = "0lpl1ppjrqwsmywsb4srfjfm31dna30jrjyx2lkmws7s2jchy94v"; type = "gem"; }; - version = "0.63.0"; + version = "0.64.0"; }; parallel = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15wkxrg1sj3n1h2g8jcrn7gcapwcgxr659ypjf75z1ipkgxqxwsv"; + sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq"; type = "gem"; }; - version = "1.24.0"; + version = "1.26.3"; }; parser = { dependencies = ["ast" "racc"]; @@ -1859,20 +1932,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11r6kp8wam0nkfvnwyc1fmvky102r1vcfr84vi2p1a2wa0z32j3p"; + sha256 = "1cqs31cyg2zp8yx2zzm3zkih0j93q870wasbviy2w343nxqvn3pk"; type = "gem"; }; - version = "3.3.0.5"; + version = "3.3.5.0"; }; pg = { groups = ["postgres"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "071b55bhsz7mivlnp2kv0a11msnl7xg5awvk8mlflpl270javhsb"; + sha256 = "0dsgcmzc55w7i9cpghfkzhmiskzndvp1vijd8c5ryv8xvlwikmzg"; type = "gem"; }; - version = "1.5.6"; + version = "1.5.8"; }; PoParser = { dependencies = ["simple_po_parser"]; @@ -1880,10 +1953,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ldw5ba6xfn2k97n75n52qs4f0fy8xmn58c4247xf476nfvg035"; + sha256 = "1rl8vkqhdxzk416q898drqinmfji13wjnbxbqbzjkz3wvd7pikzm"; type = "gem"; }; - version = "3.2.6"; + version = "3.2.8"; }; power_assert = { groups = ["default" "development" "test"]; @@ -1907,7 +1980,7 @@ }; pry = { dependencies = ["coderay" "method_source"]; - groups = ["default"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1929,7 +2002,7 @@ }; pry-doc = { dependencies = ["pry" "yard"]; - groups = ["default"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1944,10 +2017,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cf4ii53w2hdh7fn8vhqpzkymmchjbwij4l3m7s6fsxvb9bn51j6"; + sha256 = "0garafb0lxbm3sx2r9pqgs7ky9al58cl3wmwc0gmvmrl9bi2i7m6"; type = "gem"; }; - version = "0.3.9"; + version = "0.3.11"; }; pry-remote = { dependencies = ["pry" "slop"]; @@ -1993,15 +2066,26 @@ }; version = "1.3.1"; }; + psych = { + dependencies = ["stringio"]; + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s5383m6004q76xm3lb732bp4sjzb6mxb6rbgn129gy2izsj4wrk"; + type = "gem"; + }; + version = "5.1.2"; + }; public_suffix = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; + sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; type = "gem"; }; - version = "5.0.4"; + version = "6.0.1"; }; puma = { dependencies = ["nio4r"]; @@ -2009,10 +2093,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i2vaww6qcazj0ywva1plmjnj6rk23b01szswc5jhcq7s2cikd1y"; + sha256 = "0gml1rixrfb0naciq3mrnqkpcvm9ahgps1c04hzxh4b801f69914"; type = "gem"; }; - version = "6.4.2"; + version = "6.4.3"; }; pundit = { dependencies = ["activesupport"]; @@ -2020,10 +2104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10diasjqi1g7s19ns14sldia4wl4c0z1m4pva66q4y2jqvks4qjw"; + sha256 = "0wkm850z17gy5gph5lbmaz62wx7nvkj9r690017w10phkmxd5rj3"; type = "gem"; }; - version = "2.3.1"; + version = "2.4.0"; }; pundit-matchers = { dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; @@ -2041,20 +2125,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.1"; }; rack = { groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10mpk0hl6hnv324fp1pfimi2nw9acj0z4gyhrph36qg84pk1s4m7"; + sha256 = "0ax778fsfvlhj7c11n0d1wdcb8bxvkb190a9lha5d91biwzyx9g4"; type = "gem"; }; - version = "2.2.8.1"; + version = "2.2.10"; }; rack-attack = { dependencies = ["rack"]; @@ -2089,6 +2173,17 @@ }; version = "0.7.7"; }; + rack-session = { + dependencies = ["rack"]; + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xhxhlsz6shh8nm44jsmd9276zcnyzii364vhcvf0k8b8bjia8d0"; + type = "gem"; + }; + version = "1.0.2"; + }; rack-test = { dependencies = ["rack"]; groups = ["assets" "default" "development" "test"]; @@ -2100,16 +2195,27 @@ }; version = "2.1.0"; }; + rackup = { + dependencies = ["rack" "webrick"]; + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wbr03334ba9ilcq25wh9913xciwj0j117zs60vsqm0zgwdkwpp9"; + type = "gem"; + }; + version = "1.0.0"; + }; rails = { dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v9dp9sgh8kk32r23mj66zjni7w1dv2h7mbaxgmazsf59a43gsvx"; + sha256 = "0fa7maxd1ydbnws0fym43pv8j2c6k5dkg0z0fkq31j8jr1aqk7ja"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.1.4.1"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2145,15 +2251,15 @@ version = "1.6.0"; }; railties = { - dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor" "zeitwerk"]; + dependencies = ["actionpack" "activesupport" "irb" "rackup" "rake" "thor" "zeitwerk"]; groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ga56kz6a37dnlmi7y45r19fcc7jzb62mrc3ifavbzggmhy7r62"; + sha256 = "0ypihpilhxdz5p3sb5g37jn2sbfjhf2ydkxj097kkn7ri7a7702x"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.1.4.1"; }; rainbow = { groups = ["default" "development" "test"]; @@ -2170,13 +2276,13 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; + sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; type = "gem"; }; - version = "13.1.0"; + version = "13.2.1"; }; rb-fsevent = { - groups = ["assets" "default" "development" "test"]; + groups = ["assets" "default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -2187,14 +2293,14 @@ }; rb-inotify = { dependencies = ["ffi"]; - groups = ["assets" "default" "development" "test"]; + groups = ["assets" "default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; + sha256 = "0vmy8xgahixcz6hzwy4zdcyn2y6d6ri8dqv5xccgzc1r292019x0"; type = "gem"; }; - version = "0.10.1"; + version = "0.11.1"; }; rchardet = { groups = ["default"]; @@ -2206,6 +2312,17 @@ }; version = "1.8.0"; }; + rdoc = { + dependencies = ["psych"]; + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ygk2zk0ky3d88v3ll7qh6xqvbvw5jin0hqdi1xkv1dhaw7myzdi"; + type = "gem"; + }; + version = "6.7.0"; + }; redis = { groups = ["default"]; platforms = []; @@ -2221,20 +2338,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ndxm0xnv27p4gv6xynk6q41irckj76q1jsqpysd9h6f86hhp841"; + sha256 = "0ik40vcv7mqigsfpqpca36hpmnx0536xa825ai5qlkv3mmkyf9ss"; type = "gem"; }; - version = "2.9.0"; + version = "2.9.2"; + }; + reline = { + dependencies = ["io-console"]; + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rl1jmxs7pay58l7lkxkrn6nkdpk52k8rvnfwqsd1swjlxlwjq0n"; + type = "gem"; + }; + version = "0.5.10"; }; rexml = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p"; type = "gem"; }; - version = "3.2.6"; + version = "3.3.9"; }; rotp = { groups = ["default"]; @@ -2252,10 +2380,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k252n7s80bvjvpskgfm285a3djjjqyjcarlh3aq7a4dx2s94xsm"; + sha256 = "0s688wfw77fjldzayvczg8bgwcgh6bh552dw7qcj1rhjk3r4zalx"; type = "gem"; }; - version = "3.13.0"; + version = "3.13.1"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -2263,10 +2391,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bhhjzwdk96vf3gq3rs7mln80q27fhq82hda3r15byb24b34h7b2"; + sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf"; type = "gem"; }; - version = "3.13.0"; + version = "3.13.3"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -2274,10 +2402,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rkzkcfk2x0qjr5fxw6ib4wpjy0hqbziywplnp6pg3bm2l98jnkk"; + sha256 = "0f3vgp43hajw716vmgjv6f4ar6f97zf50snny6y3fy9kkj4qjw88"; type = "gem"; }; - version = "3.13.0"; + version = "3.13.1"; }; rspec-rails = { dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; @@ -2285,10 +2413,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02wr7fl189p1lnpaylz48dlp1n5y763w92gk59s0345hwfr4m1q2"; + sha256 = "1ycjggcmzbgrfjk04v26b43c3fj5jq2qic911qk7585wvav2qaxd"; type = "gem"; }; - version = "6.1.2"; + version = "7.0.1"; }; rspec-retry = { dependencies = ["rspec-core"]; @@ -2322,15 +2450,15 @@ version = "1.5.0"; }; rubocop = { - dependencies = ["json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0daamn13fbm77rdwwa4w6j6221iq6091asivgdhk6n7g398frcdf"; + sha256 = "1rsyxrl647bz49gpa4flh8igg6wy7qxyh2jrp01x0kqnn5iw4y86"; type = "gem"; }; - version = "1.62.1"; + version = "1.66.1"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2338,32 +2466,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v3q8n48w8h809rqbgzihkikr4g3xk72m1na7s97jdsmjjq6y83w"; + sha256 = "03zywfpm4540q6hw8srhi8pzp0gg51w65ir8jkaw58vk3j31w820"; type = "gem"; }; - version = "1.31.2"; + version = "1.32.3"; }; rubocop-capybara = { dependencies = ["rubocop"]; - groups = ["default" "development" "test"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f5r9di123hc4x2h453a143986plfzz9935bwc7267wj8awl8s1a"; + sha256 = "1aw0n8jwhsr39r9q2k90xjmcz8ai2k7xx2a87ld0iixnv3ylw9jx"; type = "gem"; }; - version = "2.20.0"; + version = "2.21.0"; }; rubocop-factory_bot = { dependencies = ["rubocop"]; - groups = ["default" "development" "test"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d012phc7z5h1j1d2aisnbkmqlb95sld5jriia5qg2gpgbg1nxb2"; + sha256 = "1aljadsjx7affcarzbhz7pydpy6fgqb8hl951y0cmrffxpa3rqcd"; type = "gem"; }; - version = "2.25.1"; + version = "2.26.1"; }; rubocop-faker = { dependencies = ["faker" "rubocop"]; @@ -2382,10 +2510,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19b1v70ya71rf6rqjx1i83218kpii14a7ssl3daaaapprpzv01sj"; + sha256 = "14j14ld5d3w141r5lgaljcd8q1g3w4xn592cwzqxlxw5n108v21d"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.4"; }; rubocop-inflector = { dependencies = ["activesupport" "rubocop" "rubocop-rspec"]; @@ -2404,10 +2532,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cf7fn4dwf45r3nhnda0dhnwn8qghswyqbfxr2ippb3z8a6gmc8v"; + sha256 = "0yd616imfjvlpwsk7lw5kq9h4iz6qkmf10xlaib6b47fy5x77ncy"; type = "gem"; }; - version = "1.20.2"; + version = "1.22.1"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop" "rubocop-ast"]; @@ -2415,21 +2543,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k3p37apkx2asmayvki5mizscic5qlz5pl165ki06r9gxxkq45qj"; + sha256 = "1bc4xpyx0gldjdmbl9aaqav5bjiqfc2zdw7k2r1zblmgsq4ilmpm"; type = "gem"; }; - version = "2.24.0"; + version = "2.26.2"; }; rubocop-rspec = { - dependencies = ["rubocop" "rubocop-capybara" "rubocop-factory_bot"]; + dependencies = ["rubocop"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nwbi4j22gs1x559dyhpsdllz3vy2i1pw3cb9mpbpszynkdx9p0y"; + type = "gem"; + }; + version = "3.1.0"; + }; + rubocop-rspec_rails = { + dependencies = ["rubocop" "rubocop-rspec"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17ksg89i1k5kyhi241pc0zyzmq1n7acxg0zybav5vrqbf02cw9rg"; + sha256 = "0ijc1kw81884k0wjq1sgwaxa854n1fdddscp4fnzfzlx7zl150c8"; type = "gem"; }; - version = "2.27.1"; + version = "2.30.0"; }; ruby-progressbar = { groups = ["default" "development" "test"]; @@ -2447,20 +2586,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qbhnmz1xn1ylvpywb8fyh00y6d73vjn97cs6a1ivriqpizkmkwx"; + sha256 = "1adq06m684gnpjp6qyb8shgj8jjy2npcfg7y6mg2ab9ilfdq6684"; type = "gem"; }; - version = "1.16.0"; + version = "1.17.0"; }; rubyntlm = { + dependencies = ["base64"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b8hczk8hysv53ncsqzx4q6kma5gy5lqc7s5yx8h64x3vdb18cjv"; + sha256 = "1x8l0d1v88m40mby4jvgal46137cv8gga2lk7zlrxqlsp41380a7"; type = "gem"; }; - version = "0.6.3"; + version = "0.6.5"; }; rubyzip = { groups = ["default" "development" "test"]; @@ -2517,15 +2657,15 @@ version = "5.1.0"; }; selenium-webdriver = { - dependencies = ["base64" "rexml" "rubyzip" "websocket"]; + dependencies = ["base64" "logger" "rexml" "rubyzip" "websocket"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1asysih4l1mv24wqxrbnz0c0454kw3dhqaj6nsa8pyn9fjjdms5b"; + sha256 = "1md0sixm8dq8a7riv50x4q1z273q47b5jvcbv5hxympxn3ran4by"; type = "gem"; }; - version = "4.18.1"; + version = "4.25.0"; }; shoulda-matchers = { dependencies = ["activesupport"]; @@ -2533,10 +2673,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pfq0w167v4055k0km64sxik1qslhsi32wl2jlidmfzkqmcw00m7"; + sha256 = "1c082vpfdf3865xq6xayxw2hwqswhnc9g030p1gi4hmk9dzvnmch"; type = "gem"; }; - version = "6.2.0"; + version = "6.4.0"; }; simple_oauth = { groups = ["default"]; @@ -2559,15 +2699,14 @@ version = "1.1.6"; }; simpleidn = { - dependencies = ["unf"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n9qrkznz4iwdib20d39hlqyb37r7v0s9n6x3fq6jqnxpw3cfpqh"; + sha256 = "0a9c1mdy12y81ck7mcn9f9i2s2wwzjh1nr92ps354q517zq9dkh8"; type = "gem"; }; - version = "0.2.2"; + version = "0.2.3"; }; slack-notifier = { groups = ["default"]; @@ -2585,10 +2724,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ab027mqxxqkh9hfw4b3lzmsrj7idwifnxg4bz9hddzgqyzp353k"; + sha256 = "03nq74m0d31wic05ldrdvn5n9inn60p9n78b9x8yh4dx32caj3ic"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; slop = { groups = ["default"]; @@ -2611,37 +2750,47 @@ }; version = "2.0.1"; }; - sorbet-runtime = { - groups = ["default"]; + sprockets = { + dependencies = ["base64" "concurrent-ruby" "rack"]; + groups = ["assets"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xnq3zdrnwhncfxvrhvkil26dq9v1h196i54l936l36zxdhnf383"; + sha256 = "10ykzsa76cf8kvbfkszlvbyn4ckcx1mxjhfvwxzs7y28cljhzhkj"; type = "gem"; }; - version = "0.5.11292"; + version = "3.7.5"; }; - sprockets = { - dependencies = ["concurrent-ruby" "rack"]; - groups = ["assets"]; + sprockets-rails = { + dependencies = ["actionpack" "activesupport" "sprockets"]; + groups = ["assets" "default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; + sha256 = "17hiqkdpcjyyhlm997mgdcr45v35j5802m5a979i5jgqx5n8xs59"; type = "gem"; }; - version = "3.7.2"; + version = "3.5.2"; }; - sprockets-rails = { - dependencies = ["actionpack" "activesupport" "sprockets"]; - groups = ["assets" "default"]; + stringio = { + groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b9i14qb27zs56hlcc2hf139l0ghbqnjpmfi0054dxycaxvk5min"; + sha256 = "07mfqb40b2wh53k33h91zva78f9zwcdnl85jiq74wnaw2wa6wiak"; type = "gem"; }; - version = "3.4.2"; + version = "3.1.1"; + }; + systemu = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gmkbakhfci5wnmbfx5i54f25j9zsvbw858yg3jjhfs5n4ad1xq1"; + type = "gem"; + }; + version = "2.6.5"; }; tcr = { groups = ["development" "test"]; @@ -2680,10 +2829,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00sks1s0fi8ny4bjswychfik3gsmkbbxgbfjiwvk5lrs4c9n4pm2"; + sha256 = "176swgmwq0cc4z2134x12j9vjvx5y3nrlpbb8p6p0zhsn2wi2cf0"; type = "gem"; }; - version = "1.2.0"; + version = "1.2.3"; }; test-unit = { dependencies = ["power_assert"]; @@ -2701,10 +2850,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; + sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; thread_safe = { groups = ["default"]; @@ -2721,10 +2870,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p3l7v619hwfi781l3r7ypyv1l8hivp09r18kmkn6g11c4yr1pc2"; + sha256 = "0kds7wkxmb038cwp6ravnwn8k65ixc68wpm8j5jx5bhx8ndg4x6z"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; time = { dependencies = ["date"]; @@ -2732,10 +2881,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c15v19hyxjcfzaviqlwhgajgyrrlb0pjilza6mkv49bhspy6av6"; + sha256 = "1pk1dwyvx3qvl9zqch4zcfm0h21ny4r0w67mh3wv5hgma173fj8r"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.0"; }; timeout = { groups = ["default"]; @@ -2753,10 +2902,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v8y5dibsyskv1ncdgszhxwzq0gzmvb0zl7sgmx0xvsgy86dhcz1"; + sha256 = "18xc7hyasg5ja2i2vb23d9c5pd6rf316kzwqxqx5d8vbs2z1a4rw"; type = "gem"; }; - version = "0.12.0"; + version = "0.12.1"; }; twilio-ruby = { dependencies = ["faraday" "jwt" "nokogiri"]; @@ -2764,10 +2913,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "060bw09878a6c0d06svhhmjcvrwnm09p2k1lcy5c47qw139706mv"; + sha256 = "1kc065bbl85nz0ana0b9c92w88b3wch2kz81pn96sgrba2p442q2"; type = "gem"; }; - version = "6.12.1"; + version = "7.3.3"; }; twitter = { dependencies = ["addressable" "buftok" "equalizer" "http" "http-form_data" "http_parser.rb" "memoizable" "multipart-post" "naught" "simple_oauth"]; @@ -2797,71 +2946,51 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rg1dmx6mknjazb8qq0j9sb9fah470my5sbjb6f3pa6si5018682"; - type = "gem"; - }; - version = "1.2024.1"; - }; - unf = { - dependencies = ["unf_ext"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; + sha256 = "1cw6xv9a525mcs7202bq9768aic1dwx353prm1bss4fp2nq24a3j"; type = "gem"; }; - version = "0.1.4"; - }; - unf_ext = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1sf6bxvf6x8gihv6j63iakixmdddgls58cpxpg32chckb2l18qcj"; - type = "gem"; - }; - version = "0.0.9.1"; + version = "1.2024.2"; }; unicode-display_width = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; + sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.0"; }; uri = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96"; + sha256 = "07ndgxyhzd02cg94s6rnfhkb9rwx9z72lzk368sa9j78wc9qnbfz"; type = "gem"; }; - version = "0.13.0"; + version = "0.13.1"; }; vcr = { + dependencies = ["base64"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02j9z7yapninfqwsly4l65596zhv2xqyfb91p9vkakwhiyhajq7r"; + sha256 = "1v83xjgj5y1fzp7nm4s5dixwpy5yr8crklyjyjilc13jgqanxd9p"; type = "gem"; }; - version = "6.2.0"; + version = "6.3.1"; }; version_gem = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q6zs0wgcrql9671fw6lmbvgh155snaak4fia24iji5wk9klpfh7"; + sha256 = "08a6agx7xk1f6cr9a95dq42vl45si2ln21h33b96li59sv3555y6"; type = "gem"; }; - version = "1.1.3"; + version = "1.1.4"; }; viewpoint = { dependencies = ["httpclient" "logging" "nokogiri" "rubyntlm"]; @@ -2891,10 +3020,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wza7pnwz8ym92gw0x4zr1icialhlw0l032kn4f86vw1vlzxmrd3"; + sha256 = "1fcharh45xwi2cx96m695v9gccny3hgvdkkhcbkhplk1bc6ldwgk"; type = "gem"; }; - version = "3.5.0"; + version = "3.8.2"; }; webauthn = { dependencies = ["android_key_attestation" "awrence" "bindata" "cbor" "cose" "openssl" "safety_net_attestation" "tpm-key_attestation"]; @@ -2913,20 +3042,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07zk8ljq5kyd1mm9qw3452fcnf7frg3irh9ql8ln2m8zbi1qf1qh"; + sha256 = "08kixkdp41dw39kqfxf2wp5m4z9b6fxg6yfa6xin0wy7dxzka0dy"; + type = "gem"; + }; + version = "3.24.0"; + }; + webrick = { + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "089gy5494j560b242vi173wnbj2913hwlwnjkpzld58r96ilc5s3"; type = "gem"; }; - version = "3.23.0"; + version = "1.8.2"; }; websocket = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a4zc8d0d91c3xqwapda3j3zgpfwdbj76hkb69xn6qvfkfks9h9c"; + sha256 = "0dr78vh3ag0d1q5gfd8960g1ca9g6arjd2w54mffid8h4i7agrxp"; type = "gem"; }; - version = "1.2.10"; + version = "1.2.11"; }; websocket-driver = { dependencies = ["websocket-extensions"]; @@ -2950,15 +3089,15 @@ version = "0.1.5"; }; whatsapp_sdk = { - dependencies = ["faraday" "faraday-multipart" "sorbet-runtime" "zeitwerk"]; + dependencies = ["faraday" "faraday-multipart" "zeitwerk"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hz5gafn9wv6mn2w6chbyjcvgrs25cs35qvz8ph7aln0nxklsdfs"; + sha256 = "0v5wgs11qqdhjpkmhchac35f3rfb3p44xqybxdgmsawc4mns8srl"; type = "gem"; }; - version = "0.12.1"; + version = "0.13.0"; }; write_xlsx = { dependencies = ["nkf" "rubyzip"]; @@ -2966,10 +3105,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fgx55sd4q1lvqrbbwmrcpbjm7ncjhi492jb7vncd90g29gqcyh6"; + sha256 = "1qln4i0yv2fg5mb0n8aam3kjn5lhrb0s80f6ahmdsldkj08jli7x"; type = "gem"; }; - version = "1.11.2"; + version = "1.12.1"; }; xpath = { dependencies = ["nokogiri"]; @@ -2983,24 +3122,24 @@ version = "3.2.0"; }; yard = { - groups = ["default"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r0b8w58p7gy06wph1qdjv2p087hfnmhd9jk23vjdj803dn761am"; + sha256 = "14k9lb9a60r9z2zcqg08by9iljrrgjxdkbd91gw17rkqkqwi1sd6"; type = "gem"; }; - version = "0.9.36"; + version = "0.9.37"; }; zeitwerk = { groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m67qmsak3x8ixs8rb971azl3l7wapri65pmbf5z886h46q63f1d"; + sha256 = "10cpfdswql21vildiin0q7drg5zfzf2sahnk9hv3nyzzjqwj2bdx"; type = "gem"; }; - version = "2.6.13"; + version = "2.6.18"; }; zendesk_api = { dependencies = ["faraday" "faraday-multipart" "hashie" "inflection" "mini_mime" "multipart-post"]; diff --git a/pkgs/applications/networking/misc/zammad/package.json b/pkgs/applications/networking/misc/zammad/package.json deleted file mode 100644 index 4223f4c13fd48..0000000000000 --- a/pkgs/applications/networking/misc/zammad/package.json +++ /dev/null @@ -1,161 +0,0 @@ -{ - "private": true, - "scripts": { - "generate-graphql-api": "RAILS_ENV=development bundle exec rails generate zammad:graphql_introspection > app/graphql/graphql_introspection.json && npx graphql-codegen -c .graphql_code_generator.js", - "generate-setting-types": "RAILS_ENV=development bundle exec rails generate zammad:setting_types", - "dev": "RAILS_ENV=development forego start -f Procfile.dev", - "dev:https": "VITE_RUBY_HOST=0.0.0.0 VITE_RUBY_HTTPS=true RAILS_ENV=development forego start -f Procfile.dev-https", - "i18n": "rails generate zammad:translation_catalog", - "lint": "vue-tsc --noEmit && eslint --cache --cache-location ./tmp/eslintcache.js --cache-strategy content -c .eslintrc.js --ext .js,.ts,.vue app/frontend/ .eslint-plugin-zammad/", - "lint:fix": "yarn lint -- --fix", - "lint:css": "stylelint **/*.{css,vue,scss}", - "lint:css:fix": "stylelint **/*.{css,vue,scss} --fix", - "test": "VTL_SKIP_AUTO_CLEANUP=true TZ=utc vitest", - "test:ct": "CY_OPEN=true yarn --cwd ./.cypress cypress open --component --project ../ --config-file .cypress/cypress.config.mjs", - "test:ci:ct": "CI=true yarn --cwd ./.cypress cypress run --component --project ../ --config-file .cypress/cypress.config.mjs --browser electron", - "cypress:snapshots": "sh .cypress/visual-regression/snapshots.sh", - "cypress:install": "yarn --cwd ./.cypress install" - }, - "engines": { - "node": ">=18.12.0" - }, - "packageManager": "yarn@1.22.22", - "devDependencies": { - "@faker-js/faker": "^8.4.1", - "@graphql-codegen/cli": "^5.0.2", - "@graphql-codegen/introspection": "^4.0.3", - "@graphql-codegen/near-operation-file-preset": "^3.0.0", - "@graphql-codegen/typescript": "^4.0.6", - "@graphql-codegen/typescript-operations": "^4.2.0", - "@graphql-codegen/typescript-vue-apollo": "^4.1.1", - "@pinia/testing": "^0.1.3", - "@testing-library/jest-dom": "^6.4.2", - "@testing-library/user-event": "^14.5.2", - "@testing-library/vue": "^8.0.3", - "@types/lodash-es": "^4.17.12", - "@types/rails__actioncable": "^6.1.10", - "@types/sinonjs__fake-timers": "^8.1.5", - "@types/ua-parser-js": "^0.7.39", - "@types/uuid": "^9.0.8", - "@typescript-eslint/eslint-plugin": "^7.3.1", - "@typescript-eslint/parser": "^7.3.1", - "@vitejs/plugin-vue": "^5.0.4", - "@vue/eslint-config-prettier": "^9.0.0", - "@vue/eslint-config-typescript": "^13.0.0", - "@vue/test-utils": "^2.4.5", - "autoprefixer": "^10.4.18", - "eslint": "^8.57.0", - "eslint-config-airbnb-base": "^15.0.0", - "eslint-config-prettier": "^9.1.0", - "eslint-import-resolver-alias": "^1.1.2", - "eslint-import-resolver-typescript": "^3.6.1", - "eslint-plugin-import": "^2.29.1", - "eslint-plugin-prettier": "^5.1.3", - "eslint-plugin-prettier-vue": "^5.0.0", - "eslint-plugin-security": "^2.1.1", - "eslint-plugin-sonarjs": "^0.24.0", - "eslint-plugin-vue": "^9.23.0", - "eslint-plugin-zammad": "file:.eslint-plugin-zammad", - "jsdom": "^24.0.0", - "minimatch": "^9.0.3", - "mock-apollo-client": "^1.2.1", - "postcss": "^8.4.36", - "postcss-html": "^1.6.0", - "prettier": "3.2.5", - "prettier-plugin-tailwindcss": "^0.5.12", - "regenerator-runtime": "^0.14.1", - "sass": "^1.72.0", - "stylelint": "^16.2.1", - "stylelint-config-prettier": "^9.0.5", - "stylelint-config-recommended-vue": "^1.5.0", - "stylelint-config-standard": "^36.0.0", - "stylelint-config-standard-scss": "^13.0.0", - "stylelint-prettier": "^5.0.0", - "stylelint-scss": "^6.2.1", - "svg-baker": "^1.7.0", - "svgo": "^3.2.0", - "tailwindcss": "^3.4.1", - "tailwindcss-unimportant": "^2.1.1", - "timezone-mock": "^1.3.6", - "type-fest": "^4.12.0", - "typescript": "^5.4.2", - "vite": "^5.2.6", - "vite-plugin-pwa": "^0.19.7", - "vite-plugin-ruby": "^5.0.0", - "vitest": "^1.4.0", - "vitest-axe": "^0.1.0", - "vue-tsc": "^2.0.6" - }, - "dependencies": { - "@apollo/client": "^3.9.9", - "@formkit/core": "^1.6.0", - "@formkit/dev": "^1.6.0", - "@formkit/i18n": "^1.6.0", - "@formkit/inputs": "^1.6.0", - "@formkit/rules": "^1.6.0", - "@formkit/tailwindcss": "^1.6.0", - "@formkit/themes": "^1.6.0", - "@formkit/utils": "^1.6.0", - "@formkit/validation": "^1.6.0", - "@formkit/vue": "^1.6.0", - "@github/webauthn-json": "^2.1.1", - "@rails/actioncable": "^7.0.8", - "@sinonjs/fake-timers": "^11.2.2", - "@tiptap/core": "^2.2.4", - "@tiptap/extension-blockquote": "^2.2.4", - "@tiptap/extension-character-count": "^2.2.4", - "@tiptap/extension-hard-break": "^2.2.4", - "@tiptap/extension-image": "^2.2.4", - "@tiptap/extension-link": "^2.2.4", - "@tiptap/extension-list-item": "^2.2.4", - "@tiptap/extension-mention": "^2.2.4", - "@tiptap/extension-ordered-list": "^2.2.4", - "@tiptap/extension-paragraph": "^2.2.4", - "@tiptap/extension-strike": "^2.2.4", - "@tiptap/extension-underline": "^2.2.4", - "@tiptap/pm": "^2.2.4", - "@tiptap/starter-kit": "^2.2.4", - "@tiptap/suggestion": "^2.2.4", - "@tiptap/vue-3": "^2.2.4", - "@vue/apollo-composable": "^4.0.2", - "@vueuse/core": "^10.9.0", - "@vueuse/router": "^10.9.0", - "@vueuse/shared": "^10.9.0", - "async-mutex": "^0.5.0", - "daisyui": "^4.7.3", - "flatpickr": "^4.6.13", - "graphql": "^16.8.1", - "graphql-ruby-client": "^1.13.3", - "graphql-tag": "^2.12.6", - "linkify-string": "^4.1.3", - "linkifyjs": "^4.1.3", - "lodash-es": "^4.17.21", - "loglevel": "^1.9.1", - "mitt": "^3.0.1", - "pinia": "^2.1.7", - "tippy.js": "^6.3.7", - "tiptap-text-direction": "^0.3.1", - "ua-parser-js": "^1.0.37", - "uuid": "^9.0.1", - "vue": "^3.4.21", - "vue-advanced-cropper": "^2.8.8", - "vue-easy-lightbox": "1.19.0", - "vue-router": "^4.3.0", - "vue3-draggable-resizable": "^1.6.5", - "vuedraggable": "^4.1.0", - "workbox-core": "^7.0.0", - "workbox-precaching": "^7.0.0", - "workbox-window": "^7.0.0" - }, - "resolutions": { - "loader-utils": "^3.2.1", - "postcss": "^8.4.36", - "stylelint-config-recommended": "^14.0.0", - "prosemirror-model": "1.19.4", - "prosemirror-state": "1.4.3", - "prosemirror-transform": "1.8.0", - "prosemirror-view": "1.33.3" - }, - "name": "Zammad", - "version": "6.3.1" -} diff --git a/pkgs/applications/networking/misc/zammad/source.json b/pkgs/applications/networking/misc/zammad/source.json index 791ec08924d2f..b4a5b254d61f8 100644 --- a/pkgs/applications/networking/misc/zammad/source.json +++ b/pkgs/applications/networking/misc/zammad/source.json @@ -1,8 +1,8 @@ { "owner": "zammad", "repo": "zammad", - "rev": "27f4405b9af46d74c01f07efae2309bba2066af1", - "hash": "sha256-p9TZ7Pxnav9RcQWfHPKWOo+ZJ1RQ58ZAMzzMhaITEb0=", + "rev": "1f09f838a2c9e484bb4f47e1abeeca3d763d4e7d", + "hash": "sha256-1N0tTYOUDtA/ZTOB5SqjwZKzLctgK8k76z847TFH1WQ=", "fetchSubmodules": true } diff --git a/pkgs/applications/networking/misc/zammad/update.sh b/pkgs/applications/networking/misc/zammad/update.sh index b97e75e4bd599..bedfcd1fcca44 100755 --- a/pkgs/applications/networking/misc/zammad/update.sh +++ b/pkgs/applications/networking/misc/zammad/update.sh @@ -55,9 +55,6 @@ pushd $SOURCE_DIR echo ":: Creating gemset.nix" bundix --lockfile=./Gemfile.lock --gemfile=./Gemfile --gemset=$TARGET_DIR/gemset.nix -# needed to avoid import from derivation -jq --arg VERSION "$VERSION" '. += {name: "Zammad", version: $VERSION}' package.json > $TARGET_DIR/package.json - popd popd popd From 3b68f421f5c8464ff9a329faabe965b62f129e5a Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 26 Nov 2024 15:39:39 +0800 Subject: [PATCH 19/53] toot: 0.45.0 -> 0.47.0 Diff: https://github.com/ihabunek/toot/compare/0.45.0...0.47.0 Changelog: https://github.com/ihabunek/toot/blob/master/CHANGELOG.md --- pkgs/by-name/to/toot/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/to/toot/package.nix b/pkgs/by-name/to/toot/package.nix index 0f1b5ce9ed1b1..b50121d20e870 100644 --- a/pkgs/by-name/to/toot/package.nix +++ b/pkgs/by-name/to/toot/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "toot"; - version = "0.45.0"; + version = "0.47.0"; pyproject = true; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = "refs/tags/${version}"; - hash = "sha256-xBpqB81LSOq+eGVwEL6fAxBR8UXCduf5syzCdwydW4Q="; + hash = "sha256-TG98e/3X+bcNsx8ZR0Nv0VWlR/cJ7tzz46K7tYyoKsM="; }; nativeCheckInputs = with python3Packages; [ pytest ]; @@ -48,6 +48,7 @@ python3Packages.buildPythonApplication rec { description = "Mastodon CLI interface"; mainProgram = "toot"; homepage = "https://github.com/ihabunek/toot"; + changelog = "https://github.com/ihabunek/toot/blob/refs/tags/${version}/CHANGELOG.md"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ matthiasbeyer From 455241a0366b4e8d7af7fc7612631a3021a8debe Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 26 Nov 2024 08:47:40 +0100 Subject: [PATCH 20/53] buildRustPackage: fix passing depsExtraArgs to fetchCargoVendor --- pkgs/build-support/rust/build-rust-package/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index 0498161a7a629..0ced13bc4fd90 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -71,7 +71,7 @@ let if cargoVendorDir != null then null else if cargoDeps != null then cargoDeps else if cargoLock != null then importCargoLock cargoLock - else if useFetchCargoVendor then (fetchCargoVendor { + else if useFetchCargoVendor then fetchCargoVendor ({ inherit src srcs sourceRoot preUnpack unpackPhase postUnpack; name = cargoDepsName; patches = cargoPatches; From 00b0dc5bbdfc26f6c579c2f77b4e3ec95532bc80 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Nov 2024 08:50:03 +0100 Subject: [PATCH 21/53] python312Packages.jsonformatter: refactor - add changelog to meta --- .../development/python-modules/jsonformatter/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/jsonformatter/default.nix b/pkgs/development/python-modules/jsonformatter/default.nix index 94200a889cce2..a8af9de60a879 100644 --- a/pkgs/development/python-modules/jsonformatter/default.nix +++ b/pkgs/development/python-modules/jsonformatter/default.nix @@ -8,22 +8,23 @@ buildPythonPackage rec { pname = "jsonformatter"; version = "0.3.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "MyColorfulDays"; - repo = pname; + repo = "jsonformatter"; rev = "refs/tags/v${version}"; hash = "sha256-A+lsSBrm/64w7yMabmuAbRCLwUUdulGH3jB/DbYJ2QY="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; pythonImportsCheck = [ "jsonformatter" ]; meta = with lib; { - description = "jsonformatter is a formatter for python output json log, e.g. output LogStash needed log"; + description = "Formatter to output JSON log, e.g. output LogStash needed log"; homepage = "https://github.com/MyColorfulDays/jsonformatter"; + changelog = "https://github.com/MyColorfulDays/jsonformatter/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ gador ]; }; From a0412e1acec52c717d7f53228e3695db9d7c2d09 Mon Sep 17 00:00:00 2001 From: alyaeanyx Date: Tue, 26 Nov 2024 08:54:07 +0100 Subject: [PATCH 22/53] {libqalculate, qalculate-gtk, qalculate-qt}: 5.3.0 -> 5.4.0 --- pkgs/applications/science/math/qalculate-qt/default.nix | 4 ++-- pkgs/by-name/li/libqalculate/package.nix | 4 ++-- pkgs/by-name/qa/qalculate-gtk/package.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index a8b4c65ca97e0..fcaf46fbb92b6 100644 --- a/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qalculate-qt"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-qt"; rev = "v${finalAttrs.version}"; - hash = "sha256-uzcqkx9UiQvv/KFwsOGzIWbdIco8woKIGjjFz2avwe8="; + hash = "sha256-Tpb/ZN5p3JfPug9NpBHguOi6Okek+g87orD4ISkV+ac="; }; nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ]; diff --git a/pkgs/by-name/li/libqalculate/package.nix b/pkgs/by-name/li/libqalculate/package.nix index 2dbaf0a02763c..6a7072f850fc8 100644 --- a/pkgs/by-name/li/libqalculate/package.nix +++ b/pkgs/by-name/li/libqalculate/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libqalculate"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${finalAttrs.version}"; - hash = "sha256-YNw6oFjrbYifIlAF2fz+htT1PIk9oEn7nBrnIZIR7DE="; + hash = "sha256-IatxsbSKoLwG6yXCFtejUTl48gIis76rLeULc2+aktk="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/by-name/qa/qalculate-gtk/package.nix b/pkgs/by-name/qa/qalculate-gtk/package.nix index 35daa00586b75..fad8dd6db35cd 100644 --- a/pkgs/by-name/qa/qalculate-gtk/package.nix +++ b/pkgs/by-name/qa/qalculate-gtk/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qalculate-gtk"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${finalAttrs.version}"; - hash = "sha256-0+c6zInEorUH3Fd4qRJD1pXeAGsK6EY53qQAu3ctGKg="; + hash = "sha256-YZfjZxuYnpmIh9dKk1ggLgwww6gCP9F0MnY8BBOWiB0="; }; hardeningDisable = [ "format" ]; From b185471c21cdebc9b4167abc61138e9cd6fb1378 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Nov 2024 08:55:08 +0100 Subject: [PATCH 23/53] python312Packages.jsonformatter: enable tests --- pkgs/development/python-modules/jsonformatter/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jsonformatter/default.nix b/pkgs/development/python-modules/jsonformatter/default.nix index a8af9de60a879..9520d08100ca2 100644 --- a/pkgs/development/python-modules/jsonformatter/default.nix +++ b/pkgs/development/python-modules/jsonformatter/default.nix @@ -1,7 +1,8 @@ { lib, - fetchFromGitHub, buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, setuptools, }: @@ -19,6 +20,8 @@ buildPythonPackage rec { build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "jsonformatter" ]; meta = with lib; { From b73471412c63c63dea3343c97178d59df0367eb9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Nov 2024 08:17:07 +0000 Subject: [PATCH 24/53] codux: 15.35.2 -> 15.37.3 --- pkgs/by-name/co/codux/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/codux/package.nix b/pkgs/by-name/co/codux/package.nix index cfb0edb2cfa1a..940a097a37e8b 100644 --- a/pkgs/by-name/co/codux/package.nix +++ b/pkgs/by-name/co/codux/package.nix @@ -5,11 +5,11 @@ let pname = "codux"; - version = "15.35.2"; + version = "15.37.3"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; - hash = "sha256-hRfChiVrO+uMPHwPZxN4XYYodXcRbOWZnWKfobBTAXE="; + hash = "sha256-SY2UmagOKdqbeWd6a/cUO9t3l8qjUy755YrhOBu8oi0="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From 416be31d221d366ca3ede57a358db066aa73338b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Nov 2024 09:32:17 +0100 Subject: [PATCH 25/53] python312Packages.nsapi: refactor --- .../python-modules/nsapi/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/nsapi/default.nix b/pkgs/development/python-modules/nsapi/default.nix index b5270665e24e0..4184a743751cd 100644 --- a/pkgs/development/python-modules/nsapi/default.nix +++ b/pkgs/development/python-modules/nsapi/default.nix @@ -2,16 +2,17 @@ lib, buildPythonPackage, fetchFromGitHub, - future, pythonOlder, pytz, + setuptools, }: buildPythonPackage rec { pname = "nsapi"; version = "3.1.2"; - format = "setuptools"; - disabled = pythonOlder "3.7"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "aquatix"; @@ -20,10 +21,9 @@ buildPythonPackage rec { sha256 = "sha256-H8qxqzcGZ52W/HbTuKdnfnaYdZFaxzuUhrniS1zsL2w="; }; - propagatedBuildInputs = [ - future - pytz - ]; + build-system = [ setuptools ]; + + dependencies = [ pytz ]; # Project has no tests doCheck = false; @@ -33,7 +33,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to query routes of the Dutch railways"; homepage = "https://github.com/aquatix/ns-api/"; - license = with licenses; [ mit ]; + changelog = "https://github.com/aquatix/ns-api/releases/tag/v${version}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From 9e1c3dd0a5d5a4bfa564c64a4770911c27e79e76 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Nov 2024 09:50:25 +0100 Subject: [PATCH 26/53] python312Packages.podman: update disabled --- pkgs/development/python-modules/podman/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/podman/default.nix b/pkgs/development/python-modules/podman/default.nix index 28fe64e07cc9d..24b026b2fe798 100644 --- a/pkgs/development/python-modules/podman/default.nix +++ b/pkgs/development/python-modules/podman/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { version = "5.3.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "containers"; From b8c778b37bc16bad720b56084f060aa2126e6703 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Nov 2024 10:04:12 +0100 Subject: [PATCH 27/53] genzai: init at 1.0 Toolkit to help identify IoT related dashboards and scan them for default passwords and vulnerabilities https://github.com/umair9747/Genzai --- pkgs/by-name/ge/genzai/package.nix | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/ge/genzai/package.nix diff --git a/pkgs/by-name/ge/genzai/package.nix b/pkgs/by-name/ge/genzai/package.nix new file mode 100644 index 0000000000000..d7477b783a1b2 --- /dev/null +++ b/pkgs/by-name/ge/genzai/package.nix @@ -0,0 +1,37 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "genzai"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "umair9747"; + repo = "Genzai"; + rev = "refs/tags/${version}"; + hash = "sha256-OTkHPzZcPOYZRzEKrJekrgKE/XfGUDL85RjznmrVZb8="; + }; + + vendorHash = null; + + ldflags = [ + "-s" + "-w" + ]; + + postFixup = '' + install -vD *.json -t $out/share + ''; + + meta = { + description = "Toolkit to help identify IoT related dashboards and scan them for default passwords and vulnerabilities"; + homepage = "https://github.com/umair9747/Genzai"; + changelog = "https://github.com/umair9747/Genzai/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "genzai"; + }; +} From 8a46035a29f1921e60a794c8a5d009d019ade9c3 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 26 Nov 2024 11:14:13 +0200 Subject: [PATCH 28/53] gopass-jsonapi: nixfmt; no with lib; in meta. --- pkgs/tools/security/gopass/jsonapi.nix | 29 ++++++++++++++++---------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix index 1c9abd08c80a2..be5ec4f0f0f8e 100644 --- a/pkgs/tools/security/gopass/jsonapi.nix +++ b/pkgs/tools/security/gopass/jsonapi.nix @@ -1,9 +1,10 @@ -{ lib -, makeWrapper -, buildGoModule -, fetchFromGitHub -, installShellFiles -, gopass +{ + lib, + makeWrapper, + buildGoModule, + fetchFromGitHub, + installShellFiles, + gopass, }: buildGoModule rec { @@ -21,10 +22,16 @@ buildGoModule rec { subPackages = [ "." ]; - nativeBuildInputs = [ installShellFiles makeWrapper ]; + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; ldflags = [ - "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" + "-s" + "-w" + "-X main.version=${version}" + "-X main.commit=${src.rev}" ]; postFixup = '' @@ -32,12 +39,12 @@ buildGoModule rec { --prefix PATH : "${gopass.wrapperPath}" ''; - meta = with lib; { + meta = { description = "Enables communication with gopass via JSON messages"; homepage = "https://github.com/gopasspw/gopass-jsonapi"; changelog = "https://github.com/gopasspw/gopass-jsonapi/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ maxhbr ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ maxhbr ]; mainProgram = "gopass-jsonapi"; }; } From 73bdf512abccfeb1c4526ef03d394193464fdf43 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 26 Nov 2024 11:16:07 +0200 Subject: [PATCH 29/53] gopass-jsonapi: add doronbehar as maintainer --- pkgs/tools/security/gopass/jsonapi.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix index be5ec4f0f0f8e..3b1373f1d5651 100644 --- a/pkgs/tools/security/gopass/jsonapi.nix +++ b/pkgs/tools/security/gopass/jsonapi.nix @@ -44,7 +44,10 @@ buildGoModule rec { homepage = "https://github.com/gopasspw/gopass-jsonapi"; changelog = "https://github.com/gopasspw/gopass-jsonapi/blob/v${version}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ maxhbr ]; + maintainers = with lib.maintainers; [ + maxhbr + doronbehar + ]; mainProgram = "gopass-jsonapi"; }; } From 2fa59ab86bb5d4bb98631df1d00c46714f7b8e61 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 26 Nov 2024 11:14:48 +0200 Subject: [PATCH 30/53] gopass-jsonapi: move to pkgs/by-name --- .../jsonapi.nix => by-name/go/gopass-jsonapi/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/security/gopass/jsonapi.nix => by-name/go/gopass-jsonapi/package.nix} (100%) diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/by-name/go/gopass-jsonapi/package.nix similarity index 100% rename from pkgs/tools/security/gopass/jsonapi.nix rename to pkgs/by-name/go/gopass-jsonapi/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98a076259d50c..307b5d0330de1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1907,8 +1907,6 @@ with pkgs; gopass-hibp = callPackage ../tools/security/gopass/hibp.nix { }; - gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { }; - git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { }; gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { }; From a889656579a4aaf6213ecc77560d85158112529e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Nov 2024 09:16:12 +0100 Subject: [PATCH 31/53] python312Packages.flatten-json: init at 0.1.13 Flatten JSON in Python https://github.com/amirziai/flatten --- .../python-modules/flatten-json/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/flatten-json/default.nix diff --git a/pkgs/development/python-modules/flatten-json/default.nix b/pkgs/development/python-modules/flatten-json/default.nix new file mode 100644 index 0000000000000..408eb95d572c2 --- /dev/null +++ b/pkgs/development/python-modules/flatten-json/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, + six, +}: + +buildPythonPackage rec { + pname = "flatten-json"; + version = "0.1.13"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "amirziai"; + repo = "flatten"; + rev = "v${version}"; + hash = "sha256-ViOLbfJtFWkDQ5cGNYerTk2BqVg5f5B3hZ96t0uvhpk="; + }; + + build-system = [ setuptools ]; + + dependencies = [ six ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "flatten_json" ]; + + meta = { + description = "Flatten JSON in Python"; + homepage = "https://github.com/amirziai/flatten"; + changelog = "https://github.com/amirziai/flatten/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 62a1df04f4d3e..8fdac4ade1330 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4720,6 +4720,8 @@ self: super: with self; { flatten-dict = callPackage ../development/python-modules/flatten-dict { }; + flatten-json = callPackage ../development/python-modules/flatten-json { }; + flax = callPackage ../development/python-modules/flax { }; flaxlib = callPackage ../development/python-modules/flaxlib { }; From 9071fbfd927bf8fa3af07e58fc52ffa135fa18de Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Nov 2024 10:49:04 +0100 Subject: [PATCH 32/53] above: init at 2.7 Invisible network protocol sniffer https://github.com/casterbyte/Above --- pkgs/by-name/ab/above/package.nix | 41 +++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 pkgs/by-name/ab/above/package.nix diff --git a/pkgs/by-name/ab/above/package.nix b/pkgs/by-name/ab/above/package.nix new file mode 100644 index 0000000000000..3fe3dbe49237e --- /dev/null +++ b/pkgs/by-name/ab/above/package.nix @@ -0,0 +1,41 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "above"; + version = "2.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "casterbyte"; + repo = "Above"; + rev = "refs/tags/v${version}"; + hash = "sha256-tOSAci9aIALNCL3nLui96EdvqjNxnnuj2/dMdWLY9yI="; + }; + + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ + colorama + scapy + ]; + + postFixup = '' + mv $out/bin/above.py $out/bin/$pname + ''; + + # Project has no tests + doCheck = false; + + meta = { + description = "Invisible network protocol sniffer"; + homepage = "https://github.com/casterbyte/Above"; + changelog = "https://github.com/casterbyte/Above/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "above"; + }; +} From 52b7f0d233bb534917932135117a3bf54a06d6f0 Mon Sep 17 00:00:00 2001 From: Owen Lynch Date: Tue, 26 Nov 2024 09:55:09 +0000 Subject: [PATCH 33/53] added binutils to ocaml so that static compiler can build correctly --- pkgs/development/compilers/ocaml/generic.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index af07074eba1b6..836ce0c1735ac 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -6,7 +6,7 @@ let safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips || stdenv.hostPlatform.isStatic); in -{ lib, stdenv, fetchurl, ncurses, buildEnv, libunwind, fetchpatch +{ lib, stdenv, fetchurl, ncurses, binutils, buildEnv, libunwind, fetchpatch , libX11, xorgproto, useX11 ? safeX11 stdenv && lib.versionOlder version "4.09" , aflSupport ? false , flambdaSupport ? false @@ -109,6 +109,7 @@ stdenv.mkDerivation (args // { else ["nixpkgs_world"]; buildInputs = optional (lib.versionOlder version "4.07") ncurses ++ optionals useX11 [ libX11 xorgproto ]; + depsBuildBuild = [ binutils ]; propagatedBuildInputs = optional spaceTimeSupport libunwind; installTargets = [ "install" ] ++ optional useNativeCompilers "installopt"; preConfigure = optionalString (lib.versionOlder version "4.04") '' From 1f5aa7a0f1fc2678eb24c526b64eb311ec805724 Mon Sep 17 00:00:00 2001 From: Yechiel <41305372+yechielw@users.noreply.github.com> Date: Thu, 21 Nov 2024 14:58:49 +0200 Subject: [PATCH 34/53] burpsuite: 2024.8.5 -> 2024.10.1 Changelog: https://portswigger.net/burp/releases/professional-community-2024-10-1 --- pkgs/by-name/bu/burpsuite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix index 0f2930f8fabfb..a1fc0d752b8be 100644 --- a/pkgs/by-name/bu/burpsuite/package.nix +++ b/pkgs/by-name/bu/burpsuite/package.nix @@ -9,20 +9,20 @@ }: let - version = "2024.8.5"; + version = "2024.10.1"; product = if proEdition then { productName = "pro"; productDesktop = "Burp Suite Professional Edition"; - hash = "sha256-bG1+U16qRNnHHhjloUIMxBH7/zKRo0b3tEX1ebsClL4="; + hash = "sha256-r/j7nATyd8GbfoLNby5x1/5BVeRv5B/8Ri1fPUwaCoQ="; } else { productName = "community"; productDesktop = "Burp Suite Community Edition"; - hash = "sha256-rUDG2L/MC6vX58If7rLHKd73hyV2lSdO1ZZu9tDaznM="; + hash = "sha256-uvX1LTe2slPINrn+ywY3nyu/K+FTczvsW/FnP0z43Q8="; }; src = fetchurl { From 8ddd87d8e10c1f34d551839656577bbb437c00b3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Nov 2024 11:49:48 +0100 Subject: [PATCH 35/53] tartufo: relax cached-property --- pkgs/by-name/ta/tartufo/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ta/tartufo/package.nix b/pkgs/by-name/ta/tartufo/package.nix index 92cd656bd7e0c..3bcf7c106de5c 100644 --- a/pkgs/by-name/ta/tartufo/package.nix +++ b/pkgs/by-name/ta/tartufo/package.nix @@ -16,7 +16,10 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-s7gqGvOnie7lGlpW3wfd8igWfowxwg9mftRjiHnvedc="; }; - pythonRelaxDeps = [ "tomlkit" ]; + pythonRelaxDeps = [ + "cached-property" + "tomlkit" + ]; build-system = with python3.pkgs; [ poetry-core ]; From a33164156a66c60515bb1c54fc43eaaefe3a813f Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Tue, 26 Nov 2024 11:28:57 +0000 Subject: [PATCH 36/53] cutter: fix build against PySide 6.8 fix #358483 --- pkgs/development/tools/analysis/rizin/cutter.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/tools/analysis/rizin/cutter.nix b/pkgs/development/tools/analysis/rizin/cutter.nix index 123b58e8a21d8..1fa12c6eef528 100644 --- a/pkgs/development/tools/analysis/rizin/cutter.nix +++ b/pkgs/development/tools/analysis/rizin/cutter.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , stdenv # for passthru.plugins , pkgs @@ -32,6 +33,14 @@ let cutter = stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # https://github.com/rizinorg/cutter/issues/3384 + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/rz-cutter/-/raw/f736a5709c0b4711760f8242fa77eeaf178c0302/pyside-6.8.patch"; + hash = "sha256-k1Bn6tCNkbE9r5QLfJTBg1zZZU9R7fG1tyfPgSJyQgg="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config From ce9d0969213a0cd6cd6339d0e5a1e76416eb5c45 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Nov 2024 12:35:09 +0100 Subject: [PATCH 37/53] jsonwatch: refactor --- pkgs/tools/misc/jsonwatch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/jsonwatch/default.nix b/pkgs/tools/misc/jsonwatch/default.nix index 44fc53b878dc4..fe028a1c8b7b5 100644 --- a/pkgs/tools/misc/jsonwatch/default.nix +++ b/pkgs/tools/misc/jsonwatch/default.nix @@ -10,9 +10,9 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "dbohdan"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-WzQ793dLb8OujNpEq7UXIgJM+lz0WZEVlbKmwM58klU="; + repo = "jsonwatch"; + rev = "refs/tags/v${version}"; + hash = "sha256-WzQ793dLb8OujNpEq7UXIgJM+lz0WZEVlbKmwM58klU="; }; cargoHash = "sha256-76Vvs3OaxYDZE39d9h3T8HhYQfHhY5D17PgQxcPrMyc="; From 8e239a2e6c76b971a1dd8562c8cbdfce01af8d4f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Nov 2024 12:39:14 +0100 Subject: [PATCH 38/53] python312Packages.ecoaliface: 0.5.0 -> 0.7.0 --- pkgs/development/python-modules/ecoaliface/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ecoaliface/default.nix b/pkgs/development/python-modules/ecoaliface/default.nix index 5906455093047..ccdb695841387 100644 --- a/pkgs/development/python-modules/ecoaliface/default.nix +++ b/pkgs/development/python-modules/ecoaliface/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ecoaliface"; - version = "0.5.0"; + version = "0.7.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "f17b3452cfd31bb8c3509d59b846889c81db5fb85082c061c32703162cbe9083"; + sha256 = "sha256-Z1O+Lkq1sIpjkz0N4g4FCUzTw51V4fYxlUVg+2sZ/ac="; }; propagatedBuildInputs = [ requests ]; From cbfb7fd3615dd6147779c932df03191415fec9fe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Nov 2024 12:44:01 +0100 Subject: [PATCH 39/53] python312Packages.msgraph-sdk: 1.12.0 -> 1.13.0 Diff: https://github.com/microsoftgraph/msgraph-sdk-python/compare/refs/tags/v1.12.0...v1.13.0 Changelog: https://github.com/microsoftgraph/msgraph-sdk-python/blob/v1.13.0/CHANGELOG.md --- pkgs/development/python-modules/msgraph-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index b851ad6c8eceb..4eedc33e07c7f 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.12.0"; + version = "1.13.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-RB5DxcddMmByWZ4XA/SaIVVxPXdqSRCUbTeWIR5YW2g="; + hash = "sha256-1f7Uj38IjI1wdWWzdAaOvoDtddukUhtH8xFKOYPzBdM="; }; build-system = [ flit-core ]; From 4ca369a023de28575b42f6b282d57a02ca79d8cd Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 24 Nov 2024 18:34:38 +0200 Subject: [PATCH 40/53] gopass-jsonapi: 1.15.14 -> 1.15.15 Diff: https://github.com/gopasspw/gopass-jsonapi/compare/v1.15.14...v1.15.15 Changelog: https://github.com/gopasspw/gopass-jsonapi/blob/v1.15.15/CHANGELOG.md --- pkgs/by-name/go/gopass-jsonapi/package.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gopass-jsonapi/package.nix b/pkgs/by-name/go/gopass-jsonapi/package.nix index 3b1373f1d5651..5a3ad29f431d6 100644 --- a/pkgs/by-name/go/gopass-jsonapi/package.nix +++ b/pkgs/by-name/go/gopass-jsonapi/package.nix @@ -1,24 +1,26 @@ { lib, + stdenv, makeWrapper, buildGoModule, fetchFromGitHub, installShellFiles, gopass, + apple-sdk_14, }: buildGoModule rec { pname = "gopass-jsonapi"; - version = "1.15.14"; + version = "1.15.15"; src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass-jsonapi"; rev = "v${version}"; - hash = "sha256-DbfmjgIUqgWVYyPqkcaeE5JKzqElNbrGnx62Fd8v7Hg="; + hash = "sha256-nayg7NTJH6bAPiguyuN37JivfWkpOUX/xI/+PHDi3UI="; }; - vendorHash = "sha256-Aahu0afi6bPnvz/NSZznbp0y9vMJWDj1Bq7tWGRmm7g="; + vendorHash = "sha256-khX1CdzN+5T8q2hA3NyCxtz7uw9uDd9u61q3UslTtqs="; subPackages = [ "." ]; @@ -27,6 +29,11 @@ buildGoModule rec { makeWrapper ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + # For ScreenCaptureKit.h, see https://github.com/NixOS/nixpkgs/pull/358760#discussion_r1858327365 + apple-sdk_14 + ]; + ldflags = [ "-s" "-w" From 4c3cd1c677f6bc8a28183a75636fba19005ecf7f Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 26 Nov 2024 20:15:10 +0800 Subject: [PATCH 41/53] python311Packages.ml-collections: 0.1.1 -> 1.0.0 --- .../python-modules/ml-collections/default.nix | 61 +++++++++---------- 1 file changed, 28 insertions(+), 33 deletions(-) diff --git a/pkgs/development/python-modules/ml-collections/default.nix b/pkgs/development/python-modules/ml-collections/default.nix index 2efd63acb78b4..48b044eb27ada 100644 --- a/pkgs/development/python-modules/ml-collections/default.nix +++ b/pkgs/development/python-modules/ml-collections/default.nix @@ -2,58 +2,53 @@ absl-py, buildPythonPackage, contextlib2, - fetchPypi, + fetchFromGitHub, fetchurl, lib, pyyaml, + six, + setuptools, + flit-core, + pytestCheckHook, + pytest-xdist, }: -let - requirements = fetchurl { - url = "https://raw.githubusercontent.com/google/ml_collections/7f749a281c69f9d0b339c05ecb94b80d95029f25/requirements.txt"; - sha256 = "1xb351hiscj4zmajfkql3swpacdp6lmz8iwdvwwdx2zqw9a62zps"; - }; - requirements-test = fetchurl { - url = "https://raw.githubusercontent.com/google/ml_collections/7f749a281c69f9d0b339c05ecb94b80d95029f25/requirements-test.txt"; - sha256 = "0r457k2nrg5jkf093r0x29yf8xwy6l7jxi6al0fh7mmnfrhr9cb1"; - }; -in buildPythonPackage rec { pname = "ml-collections"; - version = "0.1.1"; - format = "setuptools"; + version = "1.0.0"; + pyproject = true; + build-system = [ flit-core ]; - # ml-collections does not have any git release tags. See https://github.com/google/ml_collections/issues/8. - src = fetchPypi { - inherit version; - pname = "ml_collections"; - hash = "sha256-P+/McuxDOqHl0yMHo+R0u7Z/QFvoFOpSohZr/J2+aMw="; + src = fetchFromGitHub { + owner = "google"; + repo = "ml_collections"; + rev = "refs/tags/v${version}"; + hash = "sha256-QUhwkfffjA6gKd6lTmEgnnoUeJOu82mfFPBta9/iebg="; }; - # The pypi source archive does not include requirements.txt or - # requirements-test.txt. See https://github.com/google/ml_collections/issues/7. - postPatch = '' - cp ${requirements} requirements.txt - cp ${requirements-test} requirements-test.txt - ''; - - propagatedBuildInputs = [ + dependencies = [ + six absl-py contextlib2 pyyaml ]; - # The official test suite uses bazel. With pytestCheckHook there are name - # conflicts between files and tests have assumptions that are broken by the - # nix-build environment, eg. re module names and __file__ attributes. - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + ]; + + pytestFlagsArray = [ + "ml_collections/" + "--ignore=ml_collections/config_dict/examples/examples_test.py" # From github workflows + ]; pythonImportsCheck = [ "ml_collections" ]; - meta = with lib; { + meta = { description = "ML Collections is a library of Python collections designed for ML usecases"; homepage = "https://github.com/google/ml_collections"; - license = licenses.asl20; - maintainers = with maintainers; [ samuela ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ samuela ]; }; } From a17b5209a08774e33b4221ef36ea7016f0b8a9d3 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 26 Nov 2024 20:31:57 +0800 Subject: [PATCH 42/53] abuild: nixfmt --- pkgs/by-name/ab/abuild/package.nix | 64 +++++++++++++++--------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/pkgs/by-name/ab/abuild/package.nix b/pkgs/by-name/ab/abuild/package.nix index 4cabeaa7d020b..19a76208d52e9 100644 --- a/pkgs/by-name/ab/abuild/package.nix +++ b/pkgs/by-name/ab/abuild/package.nix @@ -1,29 +1,30 @@ -{ lib -, stdenv -, fetchFromGitLab -, gitUpdater -, makeWrapper -, pkg-config -, file -, scdoc -, openssl -, zlib -, busybox -, apk-tools -, perl -, findutils +{ + lib, + stdenv, + fetchFromGitLab, + gitUpdater, + makeWrapper, + pkg-config, + file, + scdoc, + openssl, + zlib, + busybox, + apk-tools, + perl, + findutils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "abuild"; version = "3.13.0"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; - repo = pname; - rev = version; - sha256 = "sha256-xVxgcBchGfeVo1cgP9iVsWjZ6SHVN6R8zWaE1k3DcXQ="; + repo = "abuild"; + rev = finalAttrs.version; + hash = "sha256-xVxgcBchGfeVo1cgP9iVsWjZ6SHVN6R8zWaE1k3DcXQ="; }; buildInputs = [ @@ -31,13 +32,15 @@ stdenv.mkDerivation rec { zlib busybox # for $out/bin/apkbuild-cpan and $out/bin/apkbuild-pypi - (perl.withPackages (ps: with ps; [ - LWP - JSON - ModuleBuildTiny - LWPProtocolHttps - IPCSystemSimple - ])) + (perl.withPackages ( + ps: with ps; [ + LWP + JSON + ModuleBuildTiny + LWPProtocolHttps + IPCSystemSimple + ] + )) ]; nativeBuildInputs = [ @@ -82,12 +85,11 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { description = "Alpine Linux build tools"; homepage = "https://gitlab.alpinelinux.org/alpine/abuild"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ onny ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ onny ]; + platforms = lib.platforms.unix; }; - -} +}) From 6ab2c6b578f84573226d1b548f9398be2e750b68 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 26 Nov 2024 20:33:56 +0800 Subject: [PATCH 43/53] abuild: 3.13.0 -> 3.14.1 --- pkgs/by-name/ab/abuild/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ab/abuild/package.nix b/pkgs/by-name/ab/abuild/package.nix index 19a76208d52e9..a6ad5b1f90bb0 100644 --- a/pkgs/by-name/ab/abuild/package.nix +++ b/pkgs/by-name/ab/abuild/package.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "abuild"; - version = "3.13.0"; + version = "3.14.1"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = "abuild"; rev = finalAttrs.version; - hash = "sha256-xVxgcBchGfeVo1cgP9iVsWjZ6SHVN6R8zWaE1k3DcXQ="; + hash = "sha256-gNmje4USaklwmsVGs4NMFoharEk2syCmDdQ/SCSMKsI="; }; buildInputs = [ From b1e76ef96dc143005763c0365118c01bcc225b61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Nov 2024 13:23:47 +0000 Subject: [PATCH 44/53] aliae: 0.22.2 -> 0.23.0 --- pkgs/by-name/al/aliae/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/al/aliae/package.nix b/pkgs/by-name/al/aliae/package.nix index c3c9a6452d9c4..ca59c4de28282 100644 --- a/pkgs/by-name/al/aliae/package.nix +++ b/pkgs/by-name/al/aliae/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "aliae"; - version = "0.22.2"; + version = "0.23.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = "aliae"; rev = "refs/tags/v${version}"; - hash = "sha256-IpOfTCMbnNUW8flyb7p98QEwveNb8wClyBuv7fAKm8Y="; + hash = "sha256-eJvtO5VL8miafrLQELSQB6/G2wUzTSdmeYW3j/AB3PU="; }; - vendorHash = "sha256-aUKF/r0OFN0gZXCKHFYKyQa806NFP5lQAONFZlMP4vE="; + vendorHash = "sha256-bZG73TKU1vB0Ll/n+VndGZq+cpZRLvGdSAuJNiQwZ94="; sourceRoot = "${src.name}/src"; From db857d9474b0f40f51b3086ca46b31b94fb364be Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 26 Nov 2024 17:35:30 +0100 Subject: [PATCH 45/53] python312Packages.plotnine: 0.14.2 -> 0.14.3 Diff: https://github.com/has2k1/plotnine/compare/refs/tags/v0.14.2...v0.14.3 Changelog: https://github.com/has2k1/plotnine/releases/tag/v0.14.3 --- pkgs/development/python-modules/plotnine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix index 555199e326aec..f6f2a003b0cd8 100644 --- a/pkgs/development/python-modules/plotnine/default.nix +++ b/pkgs/development/python-modules/plotnine/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "plotnine"; - version = "0.14.2"; + version = "0.14.3"; pyproject = true; src = fetchFromGitHub { owner = "has2k1"; repo = "plotnine"; rev = "refs/tags/v${version}"; - hash = "sha256-hO6HxzzCCFfZVvqCaFf7JfWYFFfU9umFgNM1+Z1HBuQ="; + hash = "sha256-hGgPW40PEkOV1Z7gaqHtbx1ybdtEFYyz8fYUBMZchmU="; }; postPatch = '' From 71a874cbe29971c920c8b08bd38bdc287278cfc3 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 26 Nov 2024 21:44:59 +0100 Subject: [PATCH 46/53] heroic: fix fhsenv version --- pkgs/games/heroic/fhsenv.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/heroic/fhsenv.nix b/pkgs/games/heroic/fhsenv.nix index 4c9f97fa05d14..9f3cdb067fdec 100644 --- a/pkgs/games/heroic/fhsenv.nix +++ b/pkgs/games/heroic/fhsenv.nix @@ -6,7 +6,8 @@ }: buildFHSEnv { - name = "heroic"; + pname = "heroic"; + inherit (heroic-unwrapped) version; runScript = "heroic"; From 6d50055523fac56d6d0e4a7a5d3322e5a529d48e Mon Sep 17 00:00:00 2001 From: Kaleo Date: Wed, 27 Nov 2024 09:45:55 +0800 Subject: [PATCH 47/53] ollama: 0.4.4 -> 0.4.5 --- pkgs/by-name/ol/ollama/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 6da0be7442bf3..6581a9b1b9fbc 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -41,17 +41,17 @@ assert builtins.elem acceleration [ let pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; rev = "v${version}"; - hash = "sha256-yyUm9kETNQiJjpGeVLPe67G2CrEKYNcrPFixqqq+rH4="; + hash = "sha256-4E3eqqJQEQYWVPFVZjnYSiXe4ZWUA0ifCRoHt7s0SL0="; fetchSubmodules = true; }; - vendorHash = "sha256-1+Eb81QQcVANQQ5u1c6is8dLVGYqrXKuFnF2MBkEHms="; + vendorHash = "sha256-xz9v91Im6xTLPzmYoVecdF7XiPKBZk3qou1SGokgPXQ="; validateFallback = lib.warnIf (config.rocmSupport && config.cudaSupport) (lib.concatStrings [ "both `nixpkgs.config.rocmSupport` and `nixpkgs.config.cudaSupport` are enabled, " From c5461ecc191a979898ffafd7b46101e6532e873c Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 26 Nov 2024 22:59:15 -0600 Subject: [PATCH 48/53] vimPlugins.floating-nvim: remove plugin Abandoned upstream because functionality in neovim has improved and nui-nvim has replaced it. --- pkgs/applications/editors/vim/plugins/aliases.nix | 1 + pkgs/applications/editors/vim/plugins/generated.nix | 12 ------------ .../editors/vim/plugins/vim-plugin-names | 1 - 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix index 8a95ceb753e0d..cf62982f0c045 100644 --- a/pkgs/applications/editors/vim/plugins/aliases.nix +++ b/pkgs/applications/editors/vim/plugins/aliases.nix @@ -69,6 +69,7 @@ mapAliases (with prev; { eighties = vim-eighties; extradite = vim-extradite; fugitive = vim-fugitive; + floating-nvim = throw "floating.nvim has been removed: abandoned by upstream. Use popup-nvim or nui-nvim"; # Added 2024-11-26 ghc-mod-vim = ghcmod-vim; ghcmod = ghcmod-vim; goyo = goyo-vim; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index f5e85edbb4f2c..7ff10d1b4d68c 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4103,18 +4103,6 @@ final: prev: meta.homepage = "https://github.com/liangxianzhe/floating-input.nvim/"; }; - floating-nvim = buildVimPlugin { - pname = "floating.nvim"; - version = "2021-07-19"; - src = fetchFromGitHub { - owner = "fhill2"; - repo = "floating.nvim"; - rev = "11e75c2a201b9d73f03bd3c2db1fc94021c231eb"; - sha256 = "172ak3macqmkz4jvic1xcnfpp6wafq33afyvcx4za170qh30sydj"; - }; - meta.homepage = "https://github.com/fhill2/floating.nvim/"; - }; - floobits-neovim = buildVimPlugin { pname = "floobits-neovim"; version = "2021-10-18"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 81fb52a7437d3..08d8a46ab67ad 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -340,7 +340,6 @@ https://github.com/felipeagc/fleet-theme-nvim/,, https://github.com/ggandor/flit.nvim/,HEAD, https://github.com/ncm2/float-preview.nvim/,, https://github.com/liangxianzhe/floating-input.nvim/,HEAD, -https://github.com/fhill2/floating.nvim/,, https://github.com/floobits/floobits-neovim/,, https://github.com/nvim-flutter/flutter-tools.nvim/,HEAD, https://github.com/nvim-focus/focus.nvim/,HEAD, From a605d065a90f06a630dfc5f0e64a857ca965fb45 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 21 Nov 2024 13:53:26 +0100 Subject: [PATCH 49/53] =?UTF-8?q?jasmin-compiler:=202024.07.1=20=E2=86=92?= =?UTF-8?q?=202024.07.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/ja/jasmin-compiler/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ja/jasmin-compiler/package.nix b/pkgs/by-name/ja/jasmin-compiler/package.nix index 9e77fd73c1720..5984ece1bb95a 100644 --- a/pkgs/by-name/ja/jasmin-compiler/package.nix +++ b/pkgs/by-name/ja/jasmin-compiler/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jasmin-compiler"; - version = "2024.07.1"; + version = "2024.07.2"; src = fetchurl { url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2"; - hash = "sha256-at6jWm/Dv/duKmBBCIFkKborMxsQEpqEDO6NrJgzhz8="; + hash = "sha256-I8z5/Ggj5GSyvD7b9YYMh3My4vXAYVcP53BCFwCNxwQ="; }; sourceRoot = "jasmin-compiler-v${version}/compiler"; From fe795fd1707a4274c0420b4cbf86fd11dd1a34ff Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 27 Nov 2024 08:59:53 +0100 Subject: [PATCH 50/53] open-webui: 0.4.5 -> 0.4.6 Diff: https://github.com/open-webui/open-webui/compare/v0.4.5..v0.4.6 Changelog: https://github.com/open-webui/open-webui/releases/tag/v0.4.6 --- pkgs/by-name/op/open-webui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index d4eaf658e1dcf..1e2d12b7fa726 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -7,19 +7,19 @@ }: let pname = "open-webui"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; rev = "refs/tags/v${version}"; - hash = "sha256-XbH6tAmwIZzCasuL6e0Su56ZAlSBBZsq3iBytOthEZM="; + hash = "sha256-Zzytv2OLy3RENNWzRjjDh7xnJyX+H9/dh1Xj2HIsn6I="; }; frontend = buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-bEmShvxHzDHiliA3IGN5A6Xf3cKf1PhULTueioDT7js="; + npmDepsHash = "sha256-36GdyqKcqhOYi1kRwXe0YTOtwbVUcEvLPPYy/A0IgE0="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. From 49a11892ea8315ed6c4fa36f23b2d744ff2d5c0f Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Wed, 27 Nov 2024 09:51:21 +0100 Subject: [PATCH 51/53] maven: add tricktron to maintainer list --- pkgs/by-name/ma/maven/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/maven/package.nix b/pkgs/by-name/ma/maven/package.nix index 5439493987606..389c4c0d6284b 100644 --- a/pkgs/by-name/ma/maven/package.nix +++ b/pkgs/by-name/ma/maven/package.nix @@ -70,7 +70,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; license = lib.licenses.asl20; mainProgram = "mvn"; - maintainers = [ ] ++ lib.teams.java.members; + maintainers = with lib.maintainers; [ tricktron ] ++ lib.teams.java.members; inherit (jdk_headless.meta) platforms; }; }) From b94e85208a62964f445a21ae81359e2e5531ebf3 Mon Sep 17 00:00:00 2001 From: Ailsa Sun <135079815+ailsa-sun@users.noreply.github.com> Date: Wed, 27 Nov 2024 01:07:11 -0800 Subject: [PATCH 52/53] stract: init at version 0-unstable-2024-09-14 (#343811) --- pkgs/by-name/st/stract/package.nix | 36 ++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/st/stract/package.nix diff --git a/pkgs/by-name/st/stract/package.nix b/pkgs/by-name/st/stract/package.nix new file mode 100644 index 0000000000000..ac809562dd9f7 --- /dev/null +++ b/pkgs/by-name/st/stract/package.nix @@ -0,0 +1,36 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, + curl, +}: + +rustPlatform.buildRustPackage rec { + pname = "stract"; + version = "0-unstable-2024-09-14"; + + src = fetchFromGitHub { + owner = "StractOrg"; + repo = "stract"; + rev = "21d28ea86d9ff19ccb4c25b1bdde67e5ec302d79"; + hash = "sha256-7Uvo5+saxwTMQjfDliyOYC6j6LbpMf/FiONfX38xepI="; + }; + + cargoHash = "sha256-7Skbeeev/xBAhlcyOsYpDJB9LnZpT66D0Fu1I/jIBso="; + + cargoDepsName = "stract"; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + openssl + curl + ]; + + meta = { + description = "Open source web search engine hosted at stract.com targeted towards tinkerers and developers."; + homepage = "https://github.com/StractOrg/stract"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ ailsa-sun ]; + }; +} From 7209005f424ad3ec0c2b06fb54d51cc44b637d59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Nov 2024 10:00:08 +0000 Subject: [PATCH 53/53] woodpecker-server: 2.7.1 -> 2.7.3 --- .../tools/continuous-integration/woodpecker/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix index 15b74b0a43e0a..5c6db6f48020f 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "2.7.1"; - srcHash = "sha256-x9eCBxrujIJ0kwN5jyn7FKu7uyN+pIBCVDLckhiUzmM="; + version = "2.7.3"; + srcHash = "sha256-ut5F2KZlWkJeAiLv2z9WmSoUoXxbzCXCgmZiwtX0f+U="; # The tarball contains vendored dependencies vendorHash = null; in