From 4c55d256cdc3eec67ef0f5775d22da72b92c993e Mon Sep 17 00:00:00 2001 From: Jason Yundt Date: Thu, 19 Jan 2023 08:36:42 -0500 Subject: [PATCH 01/54] README: use relative links to CONTRIBUTING.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There’s two different ways of viewing rendered versions of the Markdown files in this repo. You can either 1. view them on GitHub or 2. clone the repo and open them using a program like Okular [1]. Before this change, option 2 was a little bit inconvenient. When you clicked on either of the links to CONTRIBUTING.md, it would take you to GitHub instead of opening up the Markdown file locally. [1]: --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5e616eff2f52..796934a3e304 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@

- Contributors badge + Contributors badge Open Collective supporters

@@ -73,7 +73,7 @@ Community contributions are always welcome through GitHub Issues and Pull Requests. For more information about contributing to the project, please visit -the [contributing page](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md). +the [contributing page](CONTRIBUTING.md). # Donations From f0e85b34b8aaaec497401cf7767714b02da42725 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Oct 2024 10:04:15 +0000 Subject: [PATCH 02/54] stirling-pdf: 0.29.0 -> 0.30.1 --- pkgs/by-name/st/stirling-pdf/deps.json | 1035 ++++++++++++++-------- pkgs/by-name/st/stirling-pdf/package.nix | 4 +- 2 files changed, 660 insertions(+), 379 deletions(-) diff --git a/pkgs/by-name/st/stirling-pdf/deps.json b/pkgs/by-name/st/stirling-pdf/deps.json index 781070050a28..d0a63697b21e 100644 --- a/pkgs/by-name/st/stirling-pdf/deps.json +++ b/pkgs/by-name/st/stirling-pdf/deps.json @@ -1,6 +1,75 @@ { "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", "!version": 1, + "https://build.shibboleth.net/nexus/content/repositories/releases": { + "net/shibboleth#parent/11.3.5": { + "pom": "sha256-eiTicASF7qCHNw8dym/gKR14k9OMEaq/6Xd4T9k7gIw=" + }, + "net/shibboleth#parent/11.3.7": { + "pom": "sha256-YRcPQwIPF4uF3+DWUpS4TkMy9/tmUYiaO8p/4abw634=" + }, + "net/shibboleth/utilities#java-support/8.4.2": { + "jar": "sha256-yuOop5yHil1sW0ml/TzqlMTX+YYhtfDZqp+3XaXFIxs=", + "pom": "sha256-5ydppKt4Y2/xwNt3CPd7o1yikQ6JrEDOCki4BN50iU0=" + }, + "org/opensaml#opensaml-bom/4.3.0": { + "pom": "sha256-TfzHzZaiZFxuKN+fFm8OWysaRKoQmzEAzbDuF+AeAtI=" + }, + "org/opensaml#opensaml-core/4.3.2": { + "jar": "sha256-QtjxDjv80u1zajcpIwPcVrdna3I9CldLXhW0YfreeJ8=", + "pom": "sha256-u9eYbWEIe2sCKUehAexyxM1Q/SMSm4wnE+WvpQ7zQ54=" + }, + "org/opensaml#opensaml-messaging-api/4.3.2": { + "jar": "sha256-gAPl6yhKX8n5I4Y+W55R4VEKTZyVO3dF/G5AUwROZ3A=", + "pom": "sha256-04qIyb+SwHc4dPiOI+qLaeVt84373Vyiq3s85+jozkY=" + }, + "org/opensaml#opensaml-parent/4.3.0": { + "pom": "sha256-Xp2y8tw5OINadvUzSZfXnIeBURyLaMH232s4QwaQAxk=" + }, + "org/opensaml#opensaml-parent/4.3.2": { + "pom": "sha256-mzgDyI0od7zRfa64L6EAuaQwCaQym9ZAd2nTFFIQVas=" + }, + "org/opensaml#opensaml-profile-api/4.3.2": { + "jar": "sha256-yvPpXhwb9FzuEKJAYX0uvJHFa9b4PEqn++jBihR8opM=", + "pom": "sha256-ju/kO89nVDO2PvrI/AxHICbAhpLxKJSXX2/he+dSiVg=" + }, + "org/opensaml#opensaml-saml-api/4.3.2": { + "jar": "sha256-h6j/5olH5DQ1Brr0bMoCh/1EF1RQl0Kl19cW5Zpjj7A=", + "pom": "sha256-Ni97kChcd1dA7cjliGI3ofedQZ5z9Tt5LjRrguIPypQ=" + }, + "org/opensaml#opensaml-saml-impl/4.3.2": { + "jar": "sha256-j/rUHxrQkyNY3dVdnilGXsrmcuhEOSFnBwbPqvVJ/0M=", + "pom": "sha256-GqQv9GEzRc+jW5bHpLP7mzCRABVOo+qACgcKsBWDN+U=" + }, + "org/opensaml#opensaml-security-api/4.3.2": { + "jar": "sha256-TJCQ+hHpiphKgCFX3GQHcdZLORcSBul8y3yh9rfTiVU=", + "pom": "sha256-HhIIzKOaPQOPnhQFoM6RC/DZ88Q79vJj08f0SyVrlMI=" + }, + "org/opensaml#opensaml-security-impl/4.3.2": { + "jar": "sha256-73+ogfVTwlvEjtpprMMz5vYIs12+yEji4RfCelcsgxw=", + "pom": "sha256-0iqRfZCO9gOso3BI4zjLVa3r6PzszTXuQawE1wAZ8gA=" + }, + "org/opensaml#opensaml-soap-api/4.3.2": { + "jar": "sha256-/+0SSF4rBELKFdKXXmbPjZAqfII/jt0Nh/DeiUZjGeo=", + "pom": "sha256-TCa5Ctcu5rkBkccZKjOBCyyEo1NCns837RXmxm+R3J8=" + }, + "org/opensaml#opensaml-soap-impl/4.3.2": { + "jar": "sha256-LgPGZQG1hR0baKSs/YyGyY7lwNT0kwVFZ9gb2qyh7VI=", + "pom": "sha256-kgRZjJTdZ9blbF+TIAt2jKgTRY2iRmj1rJNdNZZP9xo=" + }, + "org/opensaml#opensaml-storage-api/4.3.2": { + "jar": "sha256-k7ryOuXhzf54mCafeXHcJX/eeobVcXk86+NFNPgr5oI=", + "pom": "sha256-ZPhIoY9G76DR6kVAmqy3yPklgJfo/bcdCb+XgM6iZ6s=" + }, + "org/opensaml#opensaml-xmlsec-api/4.3.2": { + "jar": "sha256-wt5Rksa9B1/nUrZSwZP9S/05QEQ6VnxWrrLlmOnMkCc=", + "pom": "sha256-aGySROhr5nyBNCTf6M0BnAxaIF7FTjgHjXWTO79TszQ=" + }, + "org/opensaml#opensaml-xmlsec-impl/4.3.2": { + "jar": "sha256-dYjVIWfxoyGSNSnHAvcfnwx4HnspMx1uM5c5Szo60Wc=", + "pom": "sha256-p8Qr8gu9VKhifsK5FPj6f2jQ1dP4JXeNhNKndCZMdEs=" + } + }, "https://jitpack.io/com/github/Carleslc": { "Simple-YAML#Simple-Configuration/1.8.4": { "jar": "sha256-K5YPSECsaLsYFdk3yi1Y65sEwF5qm3aaTocMUqRygVY=", @@ -360,23 +429,23 @@ "module": "sha256-4F58rXbbpxI0nJWB/wt3dyzJ9jiRsOtI9Feyq36ObtQ=", "pom": "sha256-JAilcZX6oBf25+ye+N2K7InB3Qa5ZyBopMpWiALKl7I=" }, - "org/springframework/boot#org.springframework.boot.gradle.plugin/3.3.3": { - "pom": "sha256-SHyRhpM1VBVPNMRGjdmXT7uP5RFIQufpX/+xRgByx2o=" + "org/springframework/boot#org.springframework.boot.gradle.plugin/3.3.4": { + "pom": "sha256-wmhvUDolKR4p77BRP6Xjs9bdGF3kRaEQIxFQFV/3Esc=" }, - "org/springframework/boot#spring-boot-buildpack-platform/3.3.3": { - "jar": "sha256-UEKb3MNeOZCt2ihxww/XUrAnGv7g5TjyE8PX5ZByLbs=", - "module": "sha256-m7CjJpiRH2Ihu7HZzDvnbl47Vwo6iDzo4SrDOG/bt/U=", - "pom": "sha256-+tXOpADAaQCnG2cd6bFlSbD09toq7OPD96/oVaLfZVY=" + "org/springframework/boot#spring-boot-buildpack-platform/3.3.4": { + "jar": "sha256-E/avVLweowqdie/taOVxMb7pbXFvk96WVh+0H6Nk0z0=", + "module": "sha256-40AgA9sr3mNO6urXvP8f74KQwCcsG24OWxzWEKFj5Z0=", + "pom": "sha256-PA5ybehtxubbpj1UFBQU8dNL7sTWjvM50Ise7/+NQSk=" }, - "org/springframework/boot#spring-boot-gradle-plugin/3.3.3": { - "jar": "sha256-ysPXrX3mx/HuKuuYYPPYRPmJ5aWID9584uJD+LX87to=", - "module": "sha256-eVyg3KXtRGn6y4ncKYXwLaTw0t/njtYQ0lqllgy2tS4=", - "pom": "sha256-C3vpjWCiOYC+vmjURltwZu6gIaYp3hhubccMPx7wVw0=" + "org/springframework/boot#spring-boot-gradle-plugin/3.3.4": { + "jar": "sha256-y3Z8G74bRYTfehGe5JHrlHoHbLQ2Ep0CW0hY3/pbUys=", + "module": "sha256-JMc52qwR0+gitB9/5xDVXtKU0FF28M0SEdNyakNPc8M=", + "pom": "sha256-H8MG/Iz5MqCypeGdH0yQnPAJm3O30CMMiOP8h+e8h8w=" }, - "org/springframework/boot#spring-boot-loader-tools/3.3.3": { - "jar": "sha256-t7GP3zNlrA7EpAx7SKKrCkG1pO/tG6hNCV6X2B6FKkA=", - "module": "sha256-71wjj5dj89YIFc+F9MWAhb87IXIN61BXtRSqXqvYacE=", - "pom": "sha256-L7qaHz+9geHzuzFVkS9Mx+i5GWWoZOeJGkGEiIGy8uM=" + "org/springframework/boot#spring-boot-loader-tools/3.3.4": { + "jar": "sha256-MDMUYRZnVCnjN1Q+YZCbDj/Rcyajs1rOF8RoVKRHrp4=", + "module": "sha256-rmy9jT3qWPTHZKx3lw+7dCAgNrAeV01wHp9JSJmWgx8=", + "pom": "sha256-CeJjjWdtIcFCr5kD0gsCps1HoUCIFhgo4Q3wHItEMEI=" }, "org/tomlj#tomlj/1.0.0": { "jar": "sha256-Mml8dWeykhxHNnioILE/xkcAqoe7FFdu60jQ7VhHz9Q=", @@ -392,21 +461,25 @@ } }, "https://repo.maven.apache.org/maven2": { - "ch/qos/logback#logback-classic/1.5.7": { - "jar": "sha256-fLF/axL9pO5pGRYEjKeprk0bDNvmgSWs+dbi2v2ywX0=", - "pom": "sha256-xu/O1xfr0JOrhQE78w+G8vw8KyrpOQtbEZkzQ+GJGMM=" + "ch/qos/logback#logback-classic/1.5.8": { + "jar": "sha256-ibD3vsX6ipySRqzR6Z8OhNbLO7rapbCVoUws0PRzLQU=", + "pom": "sha256-8j87J2dJU8rm5HQLOnawzjC2dI0Bw6oCNzIhtt2vdVI=" }, - "ch/qos/logback#logback-core/1.5.7": { - "jar": "sha256-wyspr2nCAe/eaGIl+LQ5+QU+iOyqrBEMAvy+G0cj+tw=", - "pom": "sha256-wUBD7EJzFU9mAbrmNZ+EldTDIbC51lIDEi3PqS9ozpc=" + "ch/qos/logback#logback-core/1.5.8": { + "jar": "sha256-ppjkz/PqxF7smydV35O7epcl2FP3k4AwZUzlQws3xB0=", + "pom": "sha256-YedzlmNB1Xaivz/hkFgcUg7UnMaAsakF9nyyLAt/0Ic=" }, - "ch/qos/logback#logback-parent/1.5.7": { - "pom": "sha256-jKYZjNN538JvvZ9nzbMR8+pF0KQXlAaQsnVEuyK8kmM=" + "ch/qos/logback#logback-parent/1.5.8": { + "pom": "sha256-T2r+EV2DZ/hK0FtKkqY9buAeThCCyNmE+AGPhonZwyI=" }, "com/bucket4j#bucket4j_jdk17-core/8.14.0": { "jar": "sha256-bNVTaEKXO+mR8nzFrcvK87+UqNVCpKfSiqgu9unXkk4=", "pom": "sha256-C7h/rINT5MsC6PZ4aqZTXyIq4ivbajuODKazSgZuT3g=" }, + "com/coveo#saml-client/5.0.0": { + "jar": "sha256-cgI4UPOCtJ2FbfvKbBKym87l6gmJQEQleG4UbkuUXIo=", + "pom": "sha256-rGVzfL3JyqjoTXZ4A1TVHUPAsV6oF7HOXAlr/4wMR7Q=" + }, "com/datastax/oss#java-driver-bom/4.15.0": { "pom": "sha256-XJ4x7/lc83XFvf/4XOKCh9Wa/PUTS05qJKdj2xcaXmc=" }, @@ -480,11 +553,32 @@ "module": "sha256-hQ6bLt+rFU0bQVAbAZc1GtZ6K69+SCmmVmISIAJSpo0=", "pom": "sha256-P1yG5fexCv31YydS8TV769ngDLNQmiB04NfnUqU04eg=" }, + "com/fasterxml/jackson/jaxrs#jackson-jaxrs-base/2.17.2": { + "jar": "sha256-/d9Kn+CAWTZ4whYYGFkt1bb1klZhHyoVqPRdA1xLGpg=", + "module": "sha256-I5CmPWivkbGztBTy03yIoWo3bfVIGeHYdNKJ57Fva8A=", + "pom": "sha256-MbpqN3YlxoP1mF2lnAfMn/WWlCdU1o1XTESc962wKDc=" + }, + "com/fasterxml/jackson/jaxrs#jackson-jaxrs-json-provider/2.17.2": { + "jar": "sha256-bmDyqsam49x9BxS3vdeHnlKqRT6VyS/UmttWbl+6vi8=", + "module": "sha256-RUwENWSZOzY6HDKhc+fXdSb9b6eaYZfDR5nxbQXAlDg=", + "pom": "sha256-f+eMtFxkHwGYgwLMc5FvJ7DJEkuYHKskD8QJlqbNVUA=" + }, + "com/fasterxml/jackson/jaxrs#jackson-jaxrs-providers/2.17.2": { + "pom": "sha256-eWGhuH0xwGqyrgr3Nn/A8bCrnBFnNRHvMiWJcQ69wrU=" + }, + "com/fasterxml/jackson/module#jackson-module-jaxb-annotations/2.17.2": { + "jar": "sha256-hVYckOm941aaaI9XQQvelGFAs1Wr3XCuwFP+yVTjAaY=", + "module": "sha256-JR4jRcce8k2uUpe84BAk2ESa3L6IJimArNCt1fiTil4=", + "pom": "sha256-L4BbIPMNTBlqQV+9HljEE1p71xh9LhnFae9Eo2dKjTs=" + }, "com/fasterxml/jackson/module#jackson-module-parameter-names/2.17.2": { "jar": "sha256-HuXi81k9RHJrkAhoxvZNGlBjalaD1tQEJ/WYSmHeU8A=", "module": "sha256-crBsxJRu9LXdDMpqDT6byf2rFxlTGOF1OOGfzj9lNng=", "pom": "sha256-sm0FFho+BOejiIIRecARtkFXKrr4DiNdBOoRgTLQaDo=" }, + "com/fasterxml/jackson/module#jackson-modules-base/2.17.2": { + "pom": "sha256-rrMBBVHhN9CeuDhPO4PCQSXcOSwqmHIexorT/4TlWSU=" + }, "com/fasterxml/jackson/module#jackson-modules-java8/2.17.2": { "pom": "sha256-PznFUQn1GiKIF7SxheQ1G57wUBwJ/B4aMHWulUfMLQM=" }, @@ -502,6 +596,39 @@ "jar": "sha256-T8z/g4Kq/FiZYsTtsmL2qlleNPHhHmEFfRxqluj8cyM=", "pom": "sha256-aMKlqm6PNFdDCT5StbngGQuk1aUhXApZtNfTNkcgjLs=" }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/errorprone#error_prone_annotations/2.11.0": { + "jar": "sha256-chy5GEK0b6BWhH0QTVIlyLjh6LYiY7mTBR4eWgE3t+w=", + "pom": "sha256-AmHKAfLS6awq4uznXULFYyOzhfspS2vJQ/Yu9Okt3wg=" + }, + "com/google/errorprone#error_prone_parent/2.11.0": { + "pom": "sha256-goPwy0TGJKedMwtv2AuLinFaaLNoXJqVHD3oN9RUBVE=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/31.1-jre": { + "pom": "sha256-RDliZ4O0StJe8F/wdiHdS7eWzE608pZqSkYf6kEw4Pw=" + }, + "com/google/guava#guava/31.1-jre": { + "jar": "sha256-pC7cnKt5Ljn+ObuU8/ymVe0Vf/h6iveOHWulsHxKAKs=", + "pom": "sha256-kZPQe/T2YBCNc1jliyfSG0TjToDWc06Y4hkWN28nDeI=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/1.3": { + "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=", + "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU=" + }, "com/google/zxing#core/3.5.3": { "jar": "sha256-jYBkwWNv2u9xid2QVcfVmVColAoS8ik5VkRuw8EJ/YI=", "pom": "sha256-2KEui/aQVOKt0j15U0FOrv3azskwFAqNFE0frJ5it98=" @@ -509,6 +636,21 @@ "com/google/zxing#zxing-parent/3.5.3": { "pom": "sha256-W7ilpDmBxNwQl6QUy/tMHUvP5C9yLSOgA8RdixuNTe8=" }, + "com/googlecode/owasp-java-html-sanitizer#java10-shim/20240325.1": { + "jar": "sha256-5GN/udglwjZ31FJqsf9YEXcC5Uww0mCgR86hCpO+GpI=", + "pom": "sha256-seGteVn5w42B2VwjutRFUDcrUfK0QKCZsvqDeYL8J9I=" + }, + "com/googlecode/owasp-java-html-sanitizer#java8-shim/20240325.1": { + "jar": "sha256-EfWmw0XVxIqdR3A7ZVL84VDCryZqmRXrIMIKxth1B/o=", + "pom": "sha256-8FGXT/ByyXvnzpDwSyLsK0g/csEfqTte85SXiq6LwhU=" + }, + "com/googlecode/owasp-java-html-sanitizer#owasp-java-html-sanitizer/20240325.1": { + "jar": "sha256-9n2GXL0y0Ox+LuD/qX+LXHHj8Pjgp+giJUc3wQjxNXk=", + "pom": "sha256-+Nkwf0dvMJAGaEJaUWhJfPn/807P77m3woYXvUVte3o=" + }, + "com/googlecode/owasp-java-html-sanitizer#parent/20240325.1": { + "pom": "sha256-OXpFf8kcCbT+HBtvZuVkF3oBtpwQQxU/d3K4D0wfFcE=" + }, "com/h2database#h2/2.1.214": { "jar": "sha256-1iPNwPYdIYz1SajQnxw5H/kQlhFrIuJHVHX85PvnK9A=", "pom": "sha256-UX4aBXKZSVISML9WJlvaxaI5/bkOrWyqhfDGppzX+AM=" @@ -548,6 +690,10 @@ "com/oracle/database/jdbc#ojdbc-bom/21.9.0.0": { "pom": "sha256-YWOUxaVc9n/ygO1pdup/MxarCdRMDin6ILZqyykKyaU=" }, + "com/posthog/java#posthog/1.1.1": { + "jar": "sha256-ZR4qhzaFTtXc1+gG6tltR9kqGErcIK0XscISECKMdRk=", + "pom": "sha256-oj6QZKWCJMpuy3kF2wMVDncE0xcZ/yNscRxUq81j080=" + }, "com/querydsl#querydsl-bom/5.0.0": { "pom": "sha256-M9iKwC/Iwb2sEp3BGP/aOxf+lr9c+DVB3cAUoptiexs=" }, @@ -562,6 +708,9 @@ "module": "sha256-fg4vNHsbY22SsEMZnlFAPhXwn7SsRujBY1UaWCt7Brw=", "pom": "sha256-eAg47mfyoe5YCIfeinSOWyWfnoFULhxCRNUEJlmSLhQ=" }, + "com/sun/activation#all/1.2.0": { + "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ=" + }, "com/sun/istack#istack-commons-runtime/4.1.2": { "jar": "sha256-f9Z5I2H03QD4xWr0ogzswAZt7qSo897Dg0ivI/wilu4=", "pom": "sha256-EiKikL7dtvbpK8mZvOvDaW/NbXIhWFbSJHJ6e8LcOso=" @@ -581,54 +730,65 @@ "com/sun/xml/bind/mvn#jaxb-txw-parent/4.0.5": { "pom": "sha256-yu7EM19YqOOcl+oK6JvqnCtJro2bD82SUjjgKNOESU8=" }, - "com/twelvemonkeys#twelvemonkeys/3.11.0": { - "pom": "sha256-ELLAgOMiZw7tfeBiRNhMx8WVOSfuWvPdjESGVaOAW78=" + "com/twelvemonkeys#twelvemonkeys/3.12.0": { + "pom": "sha256-ttCYdPvd2bslDReBepMe+OCTvBjnQob/BrBAVBmAxzA=" }, - "com/twelvemonkeys/common#common-image/3.11.0": { - "jar": "sha256-Eh98YraQ0tUk6rzx8xrExnfBSPbDLXQpzMA6ZFFqr5M=", - "pom": "sha256-hY/Ng2sxCdCvls0v0+kjnlqrTneeS/o7VPgORp8q89U=" + "com/twelvemonkeys/common#common-image/3.12.0": { + "jar": "sha256-YqOCHHJPrf2jRsHi2DsMUGoMQHS+JppSv04xksfdkrw=", + "pom": "sha256-Mvxj0YSlsUAz7Z6uKPTH91cL6IUMZ+80q1DIpb3qlX8=" }, - "com/twelvemonkeys/common#common-io/3.11.0": { - "jar": "sha256-mdLCffXUw84CSaPaoq1Jw5ZDo99lPAfL4igpiIklWMo=", - "pom": "sha256-5AuxgXc7Nc23kjFV8TbM2yg9+HZdRH+TQlFbNwlGfHE=" + "com/twelvemonkeys/common#common-io/3.12.0": { + "jar": "sha256-v6z+sCrKxH2/0fqwAC6uymVUfQQklJi2VDIMng/fZkc=", + "pom": "sha256-X7G3pgrtAmv+FsK7u0MDlUfe3Q1OYT6AEnuTtKLFY1k=" }, - "com/twelvemonkeys/common#common-lang/3.11.0": { - "jar": "sha256-F7hKpUp7POYjD2FWfua6OTLL49AWRbBTh+0wcV07evo=", - "pom": "sha256-gkGjHq7rObaHS0h2amKKDOwrfzY8DvbCH7afao4JTvw=" + "com/twelvemonkeys/common#common-lang/3.12.0": { + "jar": "sha256-XGXlBLW2TYBoPg+nCh3RVN2D1N59o38h6VD1qcA7xm0=", + "pom": "sha256-nFFSKc9KTl73IdpjR/+hm5wCetXeEHmQWUBdf6MtjVI=" }, - "com/twelvemonkeys/common#common/3.11.0": { - "pom": "sha256-HjI1GeG/W9NRqeBIInSmPZ+SqtTGT8mRhl+3GGedUBQ=" + "com/twelvemonkeys/common#common/3.12.0": { + "pom": "sha256-2prJlYu3TvpH0EAuhjHAw4djh0qVMDcP9X8HMTLJVv8=" }, - "com/twelvemonkeys/imageio#imageio-batik/3.11.0": { - "jar": "sha256-WzlZMd7U0c9RX2vm/AoiXXie+hjY7iVyrmzHLvf2IYA=", - "pom": "sha256-bRHxfhuLgrAUc9K2ntOXfeO+tv47Ona0shac6CX09/o=" + "com/twelvemonkeys/imageio#imageio-batik/3.12.0": { + "jar": "sha256-7m/k8B3FWHSK7NzZRUuDwlIHHfgH6IrduUjDPDdpGNI=", + "pom": "sha256-5j2QijOTi4hW9gsc+MDEqZsCfs+eT+VNK7xblbBR458=" }, - "com/twelvemonkeys/imageio#imageio-bmp/3.11.0": { - "jar": "sha256-rrHCUbjW2MXZHmEDeeiJby+Jvaa1bIEwTmyW2oLFYt4=", - "pom": "sha256-Ou/W593NxDEmOGSCXnReaxZI6z75TVuqyVEXeg3ktAk=" + "com/twelvemonkeys/imageio#imageio-bmp/3.12.0": { + "jar": "sha256-yC7hwozQ8ulxIlfJQumWbpJKiETrQ0c00R4qyESxN98=", + "pom": "sha256-f5bo3Qb81rFUkyal21hSz2S+0mFpXt7PzXlR/AFH3OY=" }, - "com/twelvemonkeys/imageio#imageio-core/3.11.0": { - "jar": "sha256-qlGUZvr/VPXhKXNxhWerSrPD0UxcW+1/wO7tQjmkjrk=", - "pom": "sha256-d8uK45DuE/xJIu4NYsJiZHaHQteb9ecMqA64gWAhNyM=" + "com/twelvemonkeys/imageio#imageio-core/3.12.0": { + "jar": "sha256-NMb5G/OyF+0BFbzoKDI4+9AmRWKqaCtCJqOWDQ7emBU=", + "pom": "sha256-N9att80pHm9n9inza8bpGiV6VFjj7lgf7BJ/aZIYG3g=" }, - "com/twelvemonkeys/imageio#imageio-jpeg/3.11.0": { - "jar": "sha256-QpHkgCWdoU8AUTiSgRL2s1rO/HKpVF6pjZl+hDxV2z4=", - "pom": "sha256-1zL4MhQY/ADaI1fEDNXlIL3evP+UAdd8+I+Bp2xjxhQ=" + "com/twelvemonkeys/imageio#imageio-jpeg/3.12.0": { + "jar": "sha256-/GL1198E0a8n3H5bdOpfk8I7EBMGTd1OdIedcJqdhZ4=", + "pom": "sha256-wvUpr7RBT5ksNy7InUwRucYqluw6jegRgFos1y1kP/4=" }, - "com/twelvemonkeys/imageio#imageio-metadata/3.11.0": { - "jar": "sha256-3j07qmCDbvYGmKf5vP2z4YAugUCh1TQtZmFS5qmR5ZY=", - "pom": "sha256-5FipFdep0DcdTYgyq90rP8Q2GKWj9/BFcRrL0FKMBK8=" + "com/twelvemonkeys/imageio#imageio-metadata/3.12.0": { + "jar": "sha256-eX0Ca2fQfm1esAoatTpVrKq2+Apxxe4yVXIJPrkMDKo=", + "pom": "sha256-kIUqjzz4kZBqjShwC8/EQ/EZd1iEbm7lZR1pHBNCrpw=" }, - "com/twelvemonkeys/imageio#imageio-tiff/3.11.0": { - "jar": "sha256-xEq8bYNS4rdXfquWKpS/CT+rftg3G9/dnJVd4y7NpRU=", - "pom": "sha256-/qrWPU1vaHuXMsWyRZ26lFtRnzSEloZypigWNX7ASW8=" + "com/twelvemonkeys/imageio#imageio-tiff/3.12.0": { + "jar": "sha256-Aaxjgd4slWA8s8FcOxOW4o98PfEKn/VbAXw2ZjqdtFU=", + "pom": "sha256-avhVDUjIV5T6hW0LxeFbLpB8l6h0YV+t8qIQ/yRFHeQ=" }, - "com/twelvemonkeys/imageio#imageio-webp/3.11.0": { - "jar": "sha256-dgoMoYgzlI/TCvs0UlxW9b/xk+d4PUhSILaODVQ8QUA=", - "pom": "sha256-E/tHQxNVJpNOwb3iLbn6kqQtxOWBX/SCEZs5knu3STU=" + "com/twelvemonkeys/imageio#imageio-webp/3.12.0": { + "jar": "sha256-Q9xEfM/jTFxcb10xGQJw4fm/ZfYDddaXriqP9DNGhSY=", + "pom": "sha256-YciGwb7ZmY5w46JD9w11sWV7CIAgf+FdOgbEh7LhQfg=" }, - "com/twelvemonkeys/imageio#imageio/3.11.0": { - "pom": "sha256-VyQzrPzkVWEQr8x2N5AOyamDYJTMjtobIMDDuR/x24Q=" + "com/twelvemonkeys/imageio#imageio/3.12.0": { + "pom": "sha256-ZI62q9rpluXh0kjqy1Gk3LYD4uwnHK6Mjh8PnLpK+Pk=" + }, + "com/unboundid/product/scim2#scim2-parent/2.3.5": { + "pom": "sha256-/k3AAkw1gewN9XKK4XbmBjvEesC0r9kdIII9gszv4Ec=" + }, + "com/unboundid/product/scim2#scim2-sdk-client/2.3.5": { + "jar": "sha256-LydloQL7DSy0Zu6S7zAZjJdKTnLqSsRJabj1lZS0mAI=", + "pom": "sha256-YECc/qG77WF4rs0hGx+ab6X3dl8fesBbH7rVexTO3ss=" + }, + "com/unboundid/product/scim2#scim2-sdk-common/2.3.5": { + "jar": "sha256-yRO2R98bGeAz+dbJXCdZgVAwAoshR3xwIT0QRQn8T44=", + "pom": "sha256-sz540r/yDCSsQ4KrkJH9SxnW2U8ysZXymbpCqkmm7i8=" }, "com/vaadin/external/google#android-json/0.0.20131108.vaadin1": { "jar": "sha256-37e64vQEz+C3K00jlEaYy3FrdmUXGBKgpND1kmwPrHk=", @@ -642,24 +802,44 @@ "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" }, + "commons-codec#commons-codec/1.16.1": { + "jar": "sha256-7Ie/tV8iy9GyHiGQ7toosrMS7SpDHuSfvcwBgS0EpeQ=", + "pom": "sha256-uCbd2S+dfMZDcaAvoIMMFU1nyYNw6lSi0ZbnLrWQrSg=" + }, "commons-collections#commons-collections/3.2.2": { "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" }, - "commons-io#commons-io/2.16.1": { - "jar": "sha256-9B97qs1xaJZEes6XWGIfYsHGsKkdiazuSI2ib8R3yE8=", - "pom": "sha256-V3fSkiUceJXASkxXAVaD7Ds1OhJIbJs+cXjpsLPDj/8=" + "commons-io#commons-io/2.17.0": { + "jar": "sha256-SqTKSPPf0wt4Igt4gdjLk+rECT7JQ2G2vvqUh5mKVQs=", + "pom": "sha256-SEqTn/9TELjLXGuQKcLc8VXT+TuLjWKF8/VrsroJ/Ek=" }, "commons-logging#commons-logging/1.0.4": { "jar": "sha256-6Ur0l0k4TBH1qlDo0PX+Z5vncSlbUgMDONMoQ8mANR4=", "pom": "sha256-ZdMQUJNStUJRGCJe5gCgH4O6chQtA1AUtdFkvASy0oQ=" }, + "io/dropwizard/metrics#metrics-bom/4.2.15": { + "pom": "sha256-jeCq6KvWprh1x3JJoC2oHVFOTaKIBG/6+OFYEaPywp8=" + }, "io/dropwizard/metrics#metrics-bom/4.2.19": { "pom": "sha256-+G9/Vev/HwNOTVHbypTh18FykokM79GdBDDugjrFxDo=" }, + "io/dropwizard/metrics#metrics-bom/4.2.25": { + "pom": "sha256-glrTe4OA+ZK1FQULvZVFL4VGb+rnuFbVwVDU5fcWqOk=" + }, + "io/dropwizard/metrics#metrics-core/4.2.25": { + "jar": "sha256-i8feYJooFreKelAJvd8RvlYLpSfUTbdKCjGm9E/bW18=", + "pom": "sha256-xIZsoo0b6PWeimZO+0kuJOhzpRb1bcISA+BWyBAijOY=" + }, + "io/dropwizard/metrics#metrics-parent/4.2.15": { + "pom": "sha256-R5JYxO8ApkgjX/xVwl+KHSO4d6pX9dOSO1fUZ35AKKc=" + }, "io/dropwizard/metrics#metrics-parent/4.2.19": { "pom": "sha256-lm7hDMMMk2UClsipjkFs11IpEj1WItPcHqV+UgjVgLY=" }, + "io/dropwizard/metrics#metrics-parent/4.2.25": { + "pom": "sha256-33tjcfmxVpjhI9mGHyCZyjLJ7JZtnwxgdVoqNMy/q8I=" + }, "io/fabric8#kubernetes-client-bom/5.12.4": { "pom": "sha256-0jI5KonD79yFqymcWpToud01vALzQM6ERv9lmqFZE6A=" }, @@ -671,33 +851,33 @@ "io/micrometer#micrometer-bom/1.11.2": { "pom": "sha256-2qo2vb6vKmnTVi6A92D+f4bU02uUGsBbqhjPpGtkvhA=" }, - "io/micrometer#micrometer-bom/1.13.3": { - "pom": "sha256-xD1wWkeHyOQp6bMFsKpiVfviCX1HcYPwCAndinZ2M2k=" + "io/micrometer#micrometer-bom/1.13.4": { + "pom": "sha256-r34L4F4ksT+WfhgFazhkOvPVhSMblj47va/dNS6hw1I=" }, - "io/micrometer#micrometer-commons/1.13.3": { - "jar": "sha256-H8SQ4yL89PO7dTknt3bQVlKTRWwy/jCkWPDockT0LJA=", - "pom": "sha256-SoLrComRu0BDukTCGWKSaVFjbL/GLepXphAbYK1+HgA=" - }, - "io/micrometer#micrometer-core/1.13.3": { - "pom": "sha256-R+O5kmD9CNE6N+B79dGkPZH3xt3z0c+EMwWRtHgMFak=" + "io/micrometer#micrometer-commons/1.13.4": { + "jar": "sha256-dAfMUoF8+2aBQpLehBpElcWvUwmxW+NnVl1LxwCkM8I=", + "pom": "sha256-s8ljEyhefFXC9HBfMNHBOQ5WfPewoBiU05n29gH+7jw=" }, "io/micrometer#micrometer-core/1.13.4": { - "jar": "sha256-Hp4vjK5OA7J6UxU4JY6KxJltQGnc5qWHRpKx6sQ69M0=", "pom": "sha256-mSMQXJGJa84JZLz+P4lYFfdYCUpWzo/CgsugHhfeX/0=" }, - "io/micrometer#micrometer-jakarta9/1.13.3": { - "jar": "sha256-2/+Z75paecE+fMOcbCpOBiU9GsHZct7mxZEa3eawXOI=", - "pom": "sha256-USyflJ7tBuQj3a9rOyooy2lY2XV/ez6MjoqXSb1d/kM=" + "io/micrometer#micrometer-core/1.13.6": { + "jar": "sha256-NZZvvc1VKGRymiwTbg3/I2g7XDvF/3ARRsPp8gmPKOc=", + "pom": "sha256-ha9r28IZiHD5AcDuRviBuqetNs946/rIKU2LV0ipICA=" }, - "io/micrometer#micrometer-observation/1.13.3": { - "jar": "sha256-KEQJqlIbvZTQ7kTtXNzYQa6SWVtOCX8cXtmRFLPXfq0=", - "pom": "sha256-kOBBaz0gKPFhoUHdOTOlaSnaOatb3y5e+LR8OudZ7qs=" + "io/micrometer#micrometer-jakarta9/1.13.4": { + "jar": "sha256-ZAcyTpx0IpabDUhRN5yCsXdElHrUKjMkJDofl9fZhKI=", + "pom": "sha256-GP6Ai79BsVjQJIwYu7zTps88kSYTbPD7Nl2QfVUG9RM=" + }, + "io/micrometer#micrometer-observation/1.13.4": { + "jar": "sha256-WGQrDAyWXR3EK8SVc2V+lI6ipsVNSQKmvH4SpVjXH1A=", + "pom": "sha256-jygxYzDG2BEx9G2olnSAh4jgbvzP39TcMiJBKZ6Fb/c=" }, "io/micrometer#micrometer-tracing-bom/1.1.3": { "pom": "sha256-fprbb3oR0grb8tb/f7NMCJ9FGvQdM7uRjr17kcXszJk=" }, - "io/micrometer#micrometer-tracing-bom/1.3.3": { - "pom": "sha256-asg8mL5RXogZ6gCu+UC5waAhWbQwWMOv7bCMBQlYGLg=" + "io/micrometer#micrometer-tracing-bom/1.3.4": { + "pom": "sha256-D4wi+YYhCMl6UShgZQtyqTLDz5AKbZI/uzsXLMQP3lc=" }, "io/netty#netty-bom/4.1.107.Final": { "pom": "sha256-w2mXVYv7ThHyAN2m7i5BpF8t+eGu9njtoI553Yk4whA=" @@ -705,8 +885,8 @@ "io/netty#netty-bom/4.1.109.Final": { "pom": "sha256-ZjFy46WwvVMEUtlhTVh9KtU6Pdp+9CPaJbc0KSIqNJE=" }, - "io/netty#netty-bom/4.1.112.Final": { - "pom": "sha256-u0u5kR+qJuoVQQ3khkTldI6uHDyYl7giipZDTIFIdkc=" + "io/netty#netty-bom/4.1.113.Final": { + "pom": "sha256-5axE5BpLXIeRC05ypn7nMzJjUDLPrt7oqD+y+5TL9EA=" }, "io/netty#netty-bom/4.1.94.Final": { "pom": "sha256-FLsEPt93HvaT1f9ezBRm913JFpjwSn+oIrMJPT0COdE=" @@ -723,9 +903,9 @@ "module": "sha256-BfI8ABvRI1lpnqe+Y6bRi03YWoqRZ/PxehkRrwI9t7k=", "pom": "sha256-agI/PfE5yap6gWUR1YSSnd0PXrhIeb+i46VRTFsXYJI=" }, - "io/projectreactor#reactor-bom/2023.0.9": { - "module": "sha256-vgQb/Qssr/3lUPq24GQ96BMDMtZebbjl4QU20H3oQvE=", - "pom": "sha256-jKuM4gyjXW9iffsW6evwiYCUt9Y00E2bN8jAFIQ+jiw=" + "io/projectreactor#reactor-bom/2023.0.10": { + "module": "sha256-S233YDZIBMw+iPwEWpI8fPbSKVGlnpQLFR28M2ri40g=", + "pom": "sha256-hOhgmWgeOfuZm23v6jl1sNvR7Fo2KotZ2XbOLLGut54=" }, "io/prometheus#client_java/1.2.1": { "pom": "sha256-/I9/4rTvDO7chDk7iQCpPWSxnJg/+CFmyEozZnBwun0=" @@ -782,8 +962,8 @@ "io/zipkin/reporter2#zipkin-reporter-bom/2.16.3": { "pom": "sha256-3hWmaeME4kB8d2agw6vuCKTsAf+JOoBJoJFo5kPFpvw=" }, - "io/zipkin/reporter2#zipkin-reporter-bom/3.4.0": { - "pom": "sha256-6zJP9k1MgiRQa92V8Q4xXJAZ+SFFu95gh+XvcPcmnOo=" + "io/zipkin/reporter2#zipkin-reporter-bom/3.4.2": { + "pom": "sha256-2dVs6krrwqS03rb53fIefVTa2ppqEyvicjXBFTDU9Rg=" }, "jakarta/activation#jakarta.activation-api/2.1.3": { "jar": "sha256-AbF21xihaSY+eCkGkfxHmXcYa8xrMzSHMlCE1lhvRic=", @@ -852,6 +1032,17 @@ "jar": "sha256-DWvP5Hdj6FBHrPfDmDNtyE/4XrytCny287nT6YEkVAY=", "pom": "sha256-q3Jz4mpUgks7czPUlW5uzSbeE6XrPZDuYwIxk6ktcr4=" }, + "javax/activation#javax.activation-api/1.2.0": { + "jar": "sha256-Q/3vC1ts6zGwQksgi5MMdKtY+sLO63s/b9OuuLXKQ5M=", + "pom": "sha256-2ikm88i+iYZDzBCs3sbeCwNRpX+yc1dw+gF3sGrecbk=" + }, + "javax/xml/bind#jaxb-api-parent/2.3.1": { + "pom": "sha256-zRvqpFYNxN/bgmudgJ5GTbIlJt+1QmS654pv9++wjh8=" + }, + "javax/xml/bind#jaxb-api/2.3.1": { + "jar": "sha256-iLlVoN9XiAomp0cIvDT3Tcr46/TniEOii1Dq6UVzKwY=", + "pom": "sha256-ErIM+SJ3NEXDRFwog8v2cfqYIRHpv5+HUCD5MTs4FLE=" + }, "net/bytebuddy#byte-buddy-agent/1.14.19": { "jar": "sha256-nzOGemHnJhrw/kt46NhDQoS1dylZeFJNFoHlv7z96E0=", "pom": "sha256-61VgCGre00h7uCvIw7/GVJoonQpBGOJAUSOryZ2dBdw=" @@ -863,6 +1054,12 @@ "jar": "sha256-hBWkTYQbLN7N9dc6BcKajPktwrYPyn/3s/Ic1DG1pOw=", "pom": "sha256-fEn+DXvCCenqFWsqmFUbCJzxOTI1zNr9O7cr8NTaodg=" }, + "net/java#jvnet-parent/1": { + "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" + }, + "net/java#jvnet-parent/5": { + "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo=" + }, "net/minidev#accessors-smart/2.5.1": { "jar": "sha256-J5auhX0Me+S8NYDapNOCjVVSEjVfTIPTjdCvB0KzyBI=", "pom": "sha256-SH53qNvZrDhEGRbIMFAYXDoeSGnOl1N3r+o5Mr9ire4=" @@ -896,6 +1093,9 @@ "org/apache#apache/21": { "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, "org/apache#apache/27": { "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" }, @@ -914,6 +1114,9 @@ "org/apache#apache/32": { "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8=" }, + "org/apache#apache/33": { + "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" + }, "org/apache#apache/7": { "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" }, @@ -946,11 +1149,20 @@ "org/apache/commons#commons-parent/48": { "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ=" }, + "org/apache/commons#commons-parent/54": { + "pom": "sha256-AA2Bh5UrIjcC/eKW33mVY/Nd6CznKttOe/FXNCN4++M=" + }, "org/apache/commons#commons-parent/64": { "pom": "sha256-bxljiZToNXtO1zRpb5kgV++q+hI1ZzmYEzKZeY4szds=" }, - "org/apache/commons#commons-parent/69": { - "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" + "org/apache/commons#commons-parent/66": { + "pom": "sha256-SP1tyEblax9AhmDRY+dTAPnjhLtjvkgqgIKiHXKo25w=" + }, + "org/apache/commons#commons-parent/74": { + "pom": "sha256-gOthsMh/3YJqBpMTsotnLaPxiFgy2kR7Uebophl+fss=" + }, + "org/apache/commons#commons-text/1.10.0": { + "pom": "sha256-OI3VI0i6GEKqOK64l8kdJwsUZh64daIP2YAxU1qydWc=" }, "org/apache/commons#commons-text/1.11.0": { "jar": "sha256-Ks8woHCxkWPVpIDq5BGigTQehwAg41NMbV1MhHJznjA=", @@ -960,9 +1172,26 @@ "module": "sha256-UMvUHEPhbMJKIJ7i2pNdeV1rN8VnNQlmtJJusxQwM6M=", "pom": "sha256-M5j/NPIIMkDWY0erSnMzudi3nTqVrN8vz03DAn2B5qs=" }, - "org/apache/groovy#groovy-bom/4.0.22": { - "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=", - "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U=" + "org/apache/groovy#groovy-bom/4.0.23": { + "module": "sha256-hKLVj9vLqhYHW25d82DnxJbP7Q8XRrG9Cz+rCY0+ZrU=", + "pom": "sha256-+HaQcnrSGjDHQJeRopw7Wl1b6pYah9E52JnTCrQlIag=" + }, + "org/apache/httpcomponents#httpclient/4.5.14": { + "jar": "sha256-yLx+HFGm1M5y9A0uu6vxxLaL/nbnMhBLBDgbSTR46dY=", + "pom": "sha256-8YNVr0z4CopO8E69dCpH6Qp+rwgMclsgldvE/F2977c=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5.14": { + "pom": "sha256-W60d5PEBRHZZ+J0ImGjMutZKaMxQPS1lQQtR9pBKoGE=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.16": { + "pom": "sha256-8tdaLC1COtGFOb8hZW1W+IpAkZRKZi/K8VnVrig9t/c=" + }, + "org/apache/httpcomponents#httpcomponents-parent/11": { + "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" + }, + "org/apache/httpcomponents#httpcore/4.4.16": { + "jar": "sha256-bJs90UKgncRo4jrTmq1vdaDyuFElEERp8CblKkdORk8=", + "pom": "sha256-PLrYSbNdrP5s7DGtraLGI8AmwyYRQbDSbux+OZxs1/o=" }, "org/apache/logging#logging-parent/10.6.0": { "pom": "sha256-+CdHWECmQIO1heyNu/cJO2/QJiQpPOw31W7fn8NUEJ4=" @@ -1013,26 +1242,40 @@ "org/apache/pulsar#pulsar-bom/3.2.4": { "pom": "sha256-tYnjUUDRq5YAR+TVHhioOwdpbqhZxtBizQpmFH91NP0=" }, - "org/apache/tomcat/embed#tomcat-embed-core/10.1.28": { - "pom": "sha256-pFlWRkZovs3BsTLQ8PmOwBr7F/rpFcE1Qc/sH7HSuxc=" + "org/apache/santuario#xmlsec/2.3.4": { + "jar": "sha256-VRPnQX7cHrcYitxN4DEukxVr18ptbB5gctPgAG3v/yM=", + "pom": "sha256-Ez/s/gIYho799ZY03YaS9/Ke5uLeQynWdwDJF6OE7kA=" }, - "org/apache/tomcat/embed#tomcat-embed-el/10.1.28": { - "jar": "sha256-VR21zzai+YP+XyZstVwRVU8BJtBVjnXSM8KblFUuRpM=", - "pom": "sha256-x/zALShLPoogeyuFJVCOcOtdEWaL5MnWu+Tr8VcI8q4=" + "org/apache/tomcat/embed#tomcat-embed-core/10.1.30": { + "pom": "sha256-liwzGkkqBrS9FwnLiJkSWBJbCrN/jLrkF5BKrx01EtE=" }, - "org/apache/tomcat/embed#tomcat-embed-websocket/10.1.28": { - "pom": "sha256-4DzQjxzE+dC4jvGMT93iqGbV5QB3V+i8os3LE5ZNeaQ=" + "org/apache/tomcat/embed#tomcat-embed-el/10.1.30": { + "jar": "sha256-7pS7I0CaxnzGx5wPfD5hvgJirc9uTXeL/ikpRBCfZpc=", + "pom": "sha256-TSembzHHj+VUNJWzMkhd5f6rCiWAKtyGQTAPICbWrAI=" }, - "org/apache/xmlgraphics#batik-all/1.17": { - "jar": "sha256-F0thbZPqTauabQwjwatfFGEjwO4lNAh5MWB/nuElMZE=", - "pom": "sha256-V3JwMcCaBTM5LTiyi4DfzJvMdZC8ZPd1Lj0hgX7sAHc=" + "org/apache/tomcat/embed#tomcat-embed-websocket/10.1.30": { + "pom": "sha256-NJHL/RnpwEnZ1eeF8NzVul8u2/JgDDyeC8af3EU0mCI=" }, - "org/apache/xmlgraphics#batik/1.17": { - "pom": "sha256-D9ZlDtWtkmuw6X2xx/yMJqQOOmtrShOxR2XryjKvsTo=" + "org/apache/velocity#velocity-engine-core/2.3": { + "jar": "sha256-sIbO6P2Bg+JAtK/PVP447DPdjrDaQUY25b96pNmFZik=", + "pom": "sha256-1CQqYXQkPx5oBDRXG6TmoduuGZwLw1Cph9X7nDzh4NM=" }, - "org/apache/xmlgraphics#xmlgraphics-commons/2.9": { - "jar": "sha256-Lr0zOrKmJFFHk8M2468IZghnMob+N7oeY54Kw+G1i+I=", - "pom": "sha256-CS1SCmHKS4pFkEN0JMQhzbDPQOeYrs7PKwUm8q+PH4g=" + "org/apache/velocity#velocity-engine-parent/2.3": { + "pom": "sha256-TA5KkvaHDzmblG1bt4nRd+SkeUEUfD/dwubwY+nLlts=" + }, + "org/apache/velocity#velocity-master/4": { + "pom": "sha256-eirHPJDdEEtaB+bizQPpXsKNKfO4ME891//87LBJcS4=" + }, + "org/apache/xmlgraphics#batik-all/1.18": { + "jar": "sha256-5rmcnOZVmwrAVxc/EeAVcr0ImKo4i2WWN2rocbw/yE8=", + "pom": "sha256-ZTf86ANuf0G7iheJN2w1Vs2KlNEyrxa7KYlDMqSoSJg=" + }, + "org/apache/xmlgraphics#batik/1.18": { + "pom": "sha256-xaC/+m0aTRYFs5xhIsy/8ImD0qdF+q9hwMi/V9u8xTg=" + }, + "org/apache/xmlgraphics#xmlgraphics-commons/2.10": { + "jar": "sha256-hXry0G0ALOIXUyUEJE6o7oMa6wlP6wpHsml/GUlnEeo=", + "pom": "sha256-mD18XYcB8GYOiVw7TET0ORjDGaOi/Tas+TNwEJnTUgk=" }, "org/apiguardian#apiguardian-api/1.1.2": { "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", @@ -1076,19 +1319,28 @@ "jar": "sha256-2fpW+XsPdhzjvI2ddMXXE3qYe/W9Or/hAD+br6RaHS8=", "pom": "sha256-dB1Vy0XEwsiJtaQ2t0fcIVKSMTLkJr5u9VUA7uf6UxI=" }, + "org/checkerframework#checker-qual/3.12.0": { + "jar": "sha256-/xB4WsKjV+xd6cKTy5gqLLtgXAMJ6kzBy5ubxtvn88s=", + "module": "sha256-0EeUnBuBCRwsORN3H6wvMqL6VJuj1dVIzIwLbfpJN3c=", + "pom": "sha256-d1t6425iggs7htwao5rzfArEuF/0j3/khakionkPRrk=" + }, "org/codehaus/groovy#groovy-bom/3.0.21": { "pom": "sha256-ksw2r/0g9Wi1CSwLlOz1hd3rCigbbIunJWVwuxhdZTQ=" }, - "org/commonmark#commonmark-ext-gfm-tables/0.22.0": { - "jar": "sha256-yb02kBoKZ/DdTPhOiPizdps1klrE8rypEik29yCRXLI=", - "pom": "sha256-FDGltPkhvIXyNR1/GuvN14Og7zxStFiGifqZ1Pyx7ns=" + "org/commonmark#commonmark-ext-gfm-tables/0.24.0": { + "jar": "sha256-tU3DMvkx5tB8J2YUTAh7CPNpNnfjaBUaZwILTpW7S5k=", + "pom": "sha256-vyvnG//gIyTv1T8EXhiKaXlUQJCJQ2taplFIhB99DbI=" }, - "org/commonmark#commonmark-parent/0.22.0": { - "pom": "sha256-YwxW0a89ryKEl8dsNWN0lSk9MDngyffFhJQIzlTuzdc=" + "org/commonmark#commonmark-parent/0.24.0": { + "pom": "sha256-PeaJsU9vvYC3DerOWehyTzXzXhQpxxb98PNooDaz00g=" }, - "org/commonmark#commonmark/0.22.0": { - "jar": "sha256-NBeQnymXvIxh2Q1kxq8p9KP1tnKcrOrvlyIc6sk9+BQ=", - "pom": "sha256-jQUuO3manv/Yu+1TTDV98402HbOAxBCVB26Bj5h6sRQ=" + "org/commonmark#commonmark/0.24.0": { + "jar": "sha256-Z5M44Lf8FcAtJ11ZhlSwGhSYk7woqHmS6QEjyNBq8ls=", + "pom": "sha256-DffPmAUxQkwc6POISc3YtqHG0QI5Pm0fXcErVqDSLyY=" + }, + "org/cryptacular#cryptacular/1.2.5": { + "jar": "sha256-xgDRrmG1sP8TkeAOtvs5AgHkYSw6ry3BuUBQyHhIQL4=", + "pom": "sha256-RnLsWVmf6Yu0Gr0VJtn1KJcmr/sj/XCeNru8umM056E=" }, "org/eclipse/angus#angus-activation-project/2.0.2": { "pom": "sha256-r5GIoQy4qk61/+bTkfHuIVnx6kp/2JDuaYYj5vN52PY=" @@ -1109,139 +1361,139 @@ "org/eclipse/ee4j#project/1.0.9": { "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc=" }, - "org/eclipse/jetty#jetty-alpn-client/12.0.12": { - "jar": "sha256-4mf9xsx02y6eJuwnll1aczAE12hLpsLtfAswpwQ0pHs=", - "pom": "sha256-FYdywozNsWimWZn3c88+69/nqgBSzolCCPYsA2poyi0=" + "org/eclipse/jetty#jetty-alpn-client/12.0.13": { + "jar": "sha256-LFuXZYKBcL27sGFIz0BFuQL9U60qFldBoOzwmPVx9cg=", + "pom": "sha256-bV8flnQE+mCZ9vt1XvMWT7HdF1bgfZn4YGsAKXLGLq8=" }, - "org/eclipse/jetty#jetty-alpn/12.0.12": { - "pom": "sha256-t7+M4tllKw6ld+lh8bCPkLaVV8+2jcb0vLW4JG8WZSg=" + "org/eclipse/jetty#jetty-alpn/12.0.13": { + "pom": "sha256-Fc6lxxYH59k2X8x02SI/RhqU79E/9EufOwzZ+Nr6glE=" }, "org/eclipse/jetty#jetty-bom/11.0.15": { "pom": "sha256-+ksNDeuvyR9Q++wI7+RkInAzTzeOg562o1+jdqoaLPg=" }, - "org/eclipse/jetty#jetty-bom/12.0.12": { - "pom": "sha256-dzRoBQU3U3I2j/ipaQwnOuSIx7DdIIOHm0NB7WFQ6MQ=" + "org/eclipse/jetty#jetty-bom/12.0.13": { + "pom": "sha256-g7as2Yh1SDayvh34wHlEr33U6pFKpgwEkVQbfiHJcrs=" }, "org/eclipse/jetty#jetty-bom/9.4.54.v20240208": { "pom": "sha256-00QQSm7mGdplmEA8JdA6qqrw9U6WRv01EkWN9Xyarrg=" }, - "org/eclipse/jetty#jetty-client/12.0.12": { - "jar": "sha256-1zfWnTUArGN/4dg4fmw25A5EK8ts4rofglh9V7iAIWE=", - "pom": "sha256-aCSLpuFN2qDN2FwS6NYSYvzwfryByhaFXcmZjvCJqIQ=" + "org/eclipse/jetty#jetty-client/12.0.13": { + "jar": "sha256-wxV004tvlY1rey/rrzIZL3SBoy2mfaeFfm/6IR6FD0w=", + "pom": "sha256-HmAkCXCjXKUeyOcOJyhnZ3+n+0JOzcYr7hjLcoTxzRM=" }, - "org/eclipse/jetty#jetty-core/12.0.12": { - "pom": "sha256-Upv+JBwPlFsDsxc7Kl5dw2FvFUjF8uOLC94L2aJ1Vgg=" + "org/eclipse/jetty#jetty-core/12.0.13": { + "pom": "sha256-kmzPgCx/5MyJ7MgXMdVnO+syxoWuii2uanghEO88vkY=" }, - "org/eclipse/jetty#jetty-ee/12.0.12": { - "jar": "sha256-ejG2W8SyBrRlut4wbqsdTVmCmOPry0tmm2vE9qMX++A=", - "pom": "sha256-lvjEqFNJaRHSoKqIyJFYwRqNRB92cYF6IdJ3WtmtI1o=" + "org/eclipse/jetty#jetty-ee/12.0.13": { + "jar": "sha256-eAcaRlDduYjTl+EbOUI0yar+7aq0caNY6+CpXOw1lfk=", + "pom": "sha256-MP7hDG0NhV+LDZfk+6YATP80Dyjot8cGPsqax12T/6s=" }, - "org/eclipse/jetty#jetty-http/12.0.12": { - "jar": "sha256-g6fRsmj2qNyHmByqlrSoffbn9r2dkxUJmq5wVukbAs4=", - "pom": "sha256-G1wG3OoOY5GZxn2sHhUxE1e8QLFN0ZZ8vy9gIGX2b7o=" + "org/eclipse/jetty#jetty-http/12.0.13": { + "jar": "sha256-i1+QNZ1X12Dp5YW4osJ7flnUd+e4NMdaxPc9+iGunXI=", + "pom": "sha256-1xpai5wmepTpChQdKhNsAy0+dj8l/nKekWch41+7FO0=" }, - "org/eclipse/jetty#jetty-io/12.0.12": { - "jar": "sha256-AYfbD3qZRnfKRPgGX1pGru5AXWpLfpG3SlDKJi3cuzk=", - "pom": "sha256-H9RV1Psn9s6q460D3mg5Nll8jG5YJ3ZeGAaruFn05xQ=" + "org/eclipse/jetty#jetty-io/12.0.13": { + "jar": "sha256-GTDJheZ0wTS7Xhijw0Ltsdl1H91OBmcwGCVSLhu7z4I=", + "pom": "sha256-bQLW6E/kCBBD0eXcs0v7Qjgr3MEi53dbh7mGsugSFSA=" }, - "org/eclipse/jetty#jetty-plus/12.0.12": { - "jar": "sha256-bMx+snI/x7x2CP3l0cdFFMhbMmktKNpZAupKG60fgz0=", - "pom": "sha256-QLRXmY/1wH4ACMrw7BxcndDmbbp4IX/rQcKiubufP5I=" + "org/eclipse/jetty#jetty-plus/12.0.13": { + "jar": "sha256-AUr+i1HbMYfhsYPW5Dpof2PuD0/Q6lIQEOEnRY0GINk=", + "pom": "sha256-gLfc1s08amUw4spPtwJqj/iT/yve6Mm7p4HU5/nhkcM=" }, - "org/eclipse/jetty#jetty-project/12.0.12": { - "pom": "sha256-sC2BLgmxK6YvgctyJRr+jDyCgO+CfbFGsmJmY+PAQUM=" + "org/eclipse/jetty#jetty-project/12.0.13": { + "pom": "sha256-W1KgTua0BTfaH/4U7wafLzFYYiS4CfDpy6+59nE0yOA=" }, - "org/eclipse/jetty#jetty-security/12.0.12": { - "jar": "sha256-ta/GVeMrPnRwmO8aPwN0VLFXLRrJT/SYMvY17Gq6JT0=", - "pom": "sha256-K/r4acVb/WS6EiDpkGiT2TZ7ZDt/D0Mn4ThXDtUL66A=" + "org/eclipse/jetty#jetty-security/12.0.13": { + "jar": "sha256-ogrVBiRCFBZNtrPun+txHa9gAmH047kE9KFb8pZpctQ=", + "pom": "sha256-vTR90HiXFfyMT0MRpVoMcun9YzgLdWT0QjAqpZx5tpA=" }, - "org/eclipse/jetty#jetty-server/12.0.12": { - "jar": "sha256-KZuZLlDH2YcbRQ+jOqDjbVZBIYrhD/v0RJ9Z2EX+LiI=", - "pom": "sha256-gQWA463CC2hOmy/jjscrHlgSBvmROGPwTVIZmp9bW8M=" + "org/eclipse/jetty#jetty-server/12.0.13": { + "jar": "sha256-edPGXF4OAJKzgfF3vdv7iFojYVWuSdFDzRi70qoWCL4=", + "pom": "sha256-QAcaWUTmuQphTe2idOPfqvFHUtvWN949ZRCQwPVQu94=" }, - "org/eclipse/jetty#jetty-session/12.0.12": { - "jar": "sha256-ifbkwJzjVy1JUGtXTSNbmxz+w2feNd6nzkejk+vnXPY=", - "pom": "sha256-7AdduV9udDbFaXKznrsOOo/0XI3mJWQqAkzXBot7f6Q=" + "org/eclipse/jetty#jetty-session/12.0.13": { + "jar": "sha256-crplq9j8WpNP9+34BbOGfdWhAKeNYagZqP0A1wiTWWI=", + "pom": "sha256-Yr+oTceQaUr5msHY7cRtomf0RLaj8CkTr4vYVLHr5Vg=" }, - "org/eclipse/jetty#jetty-util/12.0.12": { - "jar": "sha256-YYbEa6qOI2/evtsmxtK/oQIDkI2wgFDXJCX1rKcHwY0=", - "pom": "sha256-V1o5JPYPx3paSnsc72NQYyKI8DKuQQJUWkVmQk1S09k=" + "org/eclipse/jetty#jetty-util/12.0.13": { + "jar": "sha256-HY3+9p5rjXcGEgoDImSEiyMJQr727/oBTSrLGINTIak=", + "pom": "sha256-ixhVKbG81jC8LX+Q/mVRS1q4rLxT7d9E3SGhs+HiIV8=" }, - "org/eclipse/jetty#jetty-xml/12.0.12": { - "jar": "sha256-Uvw8VZh0YNS+wdAYrPkvQx+OXkgcEA6ilc/NS7dUDzI=", - "pom": "sha256-gJ5nTeTqZ9cniJYF+/vnpIy0xOV4S5AEJbsTVCfoeJM=" + "org/eclipse/jetty#jetty-xml/12.0.13": { + "jar": "sha256-T6o0MYC7LxNMqE1kWabgh30r/dZp6QYVy5rYZkEnsOw=", + "pom": "sha256-tPMu94Kll8XVpTNXQrFySYrhAf0/l4HNa0Mh9hFAeAM=" }, - "org/eclipse/jetty/ee10#jetty-ee10-annotations/12.0.12": { - "jar": "sha256-b9pshCbAQkNfY0B2jsBviFFSOVEh8rttpuvZg2KsED0=", - "pom": "sha256-BR7X88+PpcbDDpmdawJWV11/9tDX27xsm8ko/9bfKZ8=" + "org/eclipse/jetty/ee10#jetty-ee10-annotations/12.0.13": { + "jar": "sha256-zkRXbN/5/31hpv/vlmkktvXQdeophedlnCXX58OS1jM=", + "pom": "sha256-uNrztWIZ1n9eXj98o6xVJ445hRiDMEzztUYe8zx4Ilk=" }, - "org/eclipse/jetty/ee10#jetty-ee10-bom/12.0.12": { - "pom": "sha256-k7TEDwUFaFDXGo5rY55HhR8+FBR1FX1C6QrbzdtSpfY=" + "org/eclipse/jetty/ee10#jetty-ee10-bom/12.0.13": { + "pom": "sha256-nndU/0qyOEujg6wQsHU5ZHUvHC6d12IHnUQPo2yrafQ=" }, - "org/eclipse/jetty/ee10#jetty-ee10-plus/12.0.12": { - "jar": "sha256-RlOwU7HOQHvX34uvHULJryR9IPSsnbuMQvL8KGHYCQA=", - "pom": "sha256-+5r7sujyqgDHsEThDpagvDTPF6NZqYErZ4ItbSo1X/4=" + "org/eclipse/jetty/ee10#jetty-ee10-plus/12.0.13": { + "jar": "sha256-OtxUyhRv/W4wwlpPovwaFjk2gsVuKCtxx7skgNXiNZ8=", + "pom": "sha256-z62wpKkYz8dmknkSiSsaehXBco5ocZSPvbDRD0FfI0A=" }, - "org/eclipse/jetty/ee10#jetty-ee10-servlet/12.0.12": { - "jar": "sha256-34G3jxfDRU8V9mcfLMGi9CMYzHioVubnnqWkwv47nHo=", - "pom": "sha256-4atDXmtWqwM3vofgjc3yYvVXa/+eHf8VhDcQAkH57Lk=" + "org/eclipse/jetty/ee10#jetty-ee10-servlet/12.0.13": { + "jar": "sha256-OurSEFPV1MU/YR9IxRg+HG0pSMccVg4BdYwgP8XtHfM=", + "pom": "sha256-ojtpqqaDw9bl0gVMSMUGaIwo67C6g49DcQYn29Dwnns=" }, - "org/eclipse/jetty/ee10#jetty-ee10-servlets/12.0.12": { - "jar": "sha256-64AQ7QTWnJisRR7mD/EPFeprXr1uUTZIv/k7AP562/I=", - "pom": "sha256-K2u0CFNmKF00LgTYU3xIvxpNwqgKinWGJeot5tFxDhw=" + "org/eclipse/jetty/ee10#jetty-ee10-servlets/12.0.13": { + "jar": "sha256-eHhUN8NvJr90nlDDFEgWVbPLqrCS65kTIwQeJKZR3PI=", + "pom": "sha256-8borycXxHqOCOzo9ielik+4uj2g3W64rCRC6LvFP6uY=" }, - "org/eclipse/jetty/ee10#jetty-ee10-webapp/12.0.12": { - "jar": "sha256-TfoaPmyPnPv02LtVmO2nvokkGv6XqVh19Rmzk/eYfs8=", - "pom": "sha256-LK3Tjj2idBy5ITBQn8MJ5p6EDcZG+yrzS1FTwqaUHF4=" + "org/eclipse/jetty/ee10#jetty-ee10-webapp/12.0.13": { + "jar": "sha256-rmp/5t0NA5aQoJZCrLwmUStio22te089oK7bV8P1IsY=", + "pom": "sha256-zkwvWjOxA1msVrpG8omQTC/3EQpP1QbaqZbq0K2EQxo=" }, - "org/eclipse/jetty/ee10#jetty-ee10/12.0.12": { - "pom": "sha256-PU7E8jbFs+6r9Wb10Sx2EstbHsR8VCOImrAw1v2gAJI=" + "org/eclipse/jetty/ee10#jetty-ee10/12.0.13": { + "pom": "sha256-iWwI9pIkja23iBT3GEirhj9phlvmXiAimnGM50flefA=" }, - "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-client/12.0.12": { - "jar": "sha256-4ZcI+q7ZKVDnm2WZWTgGjV2NVMn7A2T1ObimEApp0tA=", - "pom": "sha256-dH6wuRPFZDlCCHa+lau6CyFOzTB+o0OK/Ko+uxJoRBw=" + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-client/12.0.13": { + "jar": "sha256-SrwclJ+9Nn6TRpf/LZRMyODOcpHT0pxU6FEgGWUboqs=", + "pom": "sha256-pFQ2bReTERoSEF0sNpqj/AD1xPD2at5tC4n3810nEbo=" }, - "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-common/12.0.12": { - "jar": "sha256-MBPT/F2Sr1/XWU7LWPW7x01zx29+WVPe1rYbeexmyWQ=", - "pom": "sha256-IhiPnL4qWDpTJKqOSsd9P1WNTbcbZviZGleW1RJGJyk=" + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-common/12.0.13": { + "jar": "sha256-bwk7wGCeGq+EGlf4pbfTR6yCskl0xdCM0Mrd4VU08NU=", + "pom": "sha256-EPONU2Sf8PgjuH47uF6RKx9NrQsBnew2DMlEKqeVCHw=" }, - "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-server/12.0.12": { - "jar": "sha256-moBo1h2AEJOvawEjNgLF3uslpXs8tjcleYIkBni8Wzo=", - "pom": "sha256-7yxNOTJgnCDvCBm9yFBQKH7VHD+cVw622ScFPbXUumY=" + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-server/12.0.13": { + "jar": "sha256-Z9WuIKwHVUjMJZ/J2XDxGVvx4Y+9nXDH+PF31jQ8Hfk=", + "pom": "sha256-C4k9n6t6rsQhCOVIz8nO98q38U6nmk8esDENk2GWpK8=" }, - "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jetty-server/12.0.12": { - "jar": "sha256-xKebDmTGgZbH7DF8LiQ41Q7XZWHzWnSkMCjASV931Og=", - "pom": "sha256-sambI9rJ8IrB/uYVXUByTt3Lh0a4hPpyZZgP5o8IVLo=" + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jetty-server/12.0.13": { + "jar": "sha256-uYh57Ao6zXKA1EEw9wPTdUQSxam5eE6/eaGPAN4eqOI=", + "pom": "sha256-QIenM9RNz1WGqX08FZgOWc5DbqP11qXl/iDx2tW0RBI=" }, - "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-servlet/12.0.12": { - "jar": "sha256-BxNzPPmXmXk9zRBamSSSA2zo4rzT+dRc/h7MbMzxGg4=", - "pom": "sha256-uhS5/90KrkIh0L6Mi3Xgcrh8aXziptTwZizQbLOpdRI=" + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-servlet/12.0.13": { + "jar": "sha256-SkWHQJHW0v9gfcfF1qnHC0Lk9ptXibZuyk8zefct42Q=", + "pom": "sha256-8IYpyprFQ9CZ/aPIikq3CkXIieIi7hIotDog3vs4+RE=" }, - "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket/12.0.12": { - "pom": "sha256-SC7ohkYUVjPv0gqEv7YIj5u9YOIDF2/jm3LITpXbW8g=" + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket/12.0.13": { + "pom": "sha256-nCRWEJTYFjKz75moPrqh31s7Y65aGV6E4bffixwW/YY=" }, - "org/eclipse/jetty/websocket#jetty-websocket-core-client/12.0.12": { - "jar": "sha256-7uCgNxXBJ/QipABBn1k39BZf/P8fjsiG02Yw0/3Glfc=", - "pom": "sha256-7qG/C0jWUhJHA3BMj9ig5R2b1Vc88Ep4i24V43JdxXk=" + "org/eclipse/jetty/websocket#jetty-websocket-core-client/12.0.13": { + "jar": "sha256-e15gV0Fs+FUi0+nV+wRrrWc4CpZg2900S1QVco/i2jo=", + "pom": "sha256-xrX+zno2jMwfpEbxz1Eo9orMele/qFtYSH8a+z0BgMU=" }, - "org/eclipse/jetty/websocket#jetty-websocket-core-common/12.0.12": { - "jar": "sha256-G9WmKF1E7466lxCB0ukUzZn0xEBWMJuhgj7BEdqev44=", - "pom": "sha256-8hkYN9bolAInBcv9z5utm3DCino9ogoFwrdD71IZRdM=" + "org/eclipse/jetty/websocket#jetty-websocket-core-common/12.0.13": { + "jar": "sha256-K4kRJbhhVzHiVLpECrvnCIEYPGZBJ5jFMEKTlAHKZ64=", + "pom": "sha256-XM2HDNkGndg6+C00v2hThAaKL1A7VXVhwiR+X7f7svI=" }, - "org/eclipse/jetty/websocket#jetty-websocket-core-server/12.0.12": { - "jar": "sha256-tPzDCMNA6G2opmlilRoPp3xuQ+YBysR2V7POGEd5vyQ=", - "pom": "sha256-qo56LVuDcL1rdiIloQo84MI6Szi0tBhWeU5ANNREl3o=" + "org/eclipse/jetty/websocket#jetty-websocket-core-server/12.0.13": { + "jar": "sha256-FAqMQZ9E2mQfEB7SiBn9xnTIApVC1VtBJiPrURmdE7U=", + "pom": "sha256-2My6iQRJLn7z+nsmOKbQt2r9wLkOj/v5gEZ4S/2Q4yY=" }, - "org/eclipse/jetty/websocket#jetty-websocket-jetty-api/12.0.12": { - "jar": "sha256-UsUEn4qzzjSfdm6UYvV/rARRYSW/RE703xNxCMV6lB8=", - "pom": "sha256-eOVSVCtPyb3CEjy/iTDIvWVP31iLASwGHIrQCo2bvWY=" + "org/eclipse/jetty/websocket#jetty-websocket-jetty-api/12.0.13": { + "jar": "sha256-8flwoeih6V3GaejB9gAx9RhnoVgcMgOreWOLBHM2xgY=", + "pom": "sha256-LnxFEggBy9OZ0Bg8aTaPp+uee2GYWwmEKdQlrZeUVxo=" }, - "org/eclipse/jetty/websocket#jetty-websocket-jetty-common/12.0.12": { - "jar": "sha256-hmOaTrEqDLKou60n8hrpmiDgDWkHVoaaIloQFOygvHU=", - "pom": "sha256-jk1dZZNxR2bNkO518I2FwQMNqhxjTGchwMhgQRIFpmk=" + "org/eclipse/jetty/websocket#jetty-websocket-jetty-common/12.0.13": { + "jar": "sha256-p7160B9IFj/Y6D0WBqhWhteKnfXzAV2n+LW70OHku2w=", + "pom": "sha256-UB4PNSopcxns1LUnZOCt0sPYTqvvIEcza8wvufVIkIc=" }, - "org/eclipse/jetty/websocket#jetty-websocket/12.0.12": { - "pom": "sha256-5thUcMY/08Lp1VHFCTkkEyu2jgi0GjHroiepjhDpino=" + "org/eclipse/jetty/websocket#jetty-websocket/12.0.13": { + "pom": "sha256-1+GLIWV67EWwUSqYjXscR2cdc9AxW/eqi+qq1ogEPug=" }, "org/glassfish/jaxb#jaxb-bom/4.0.3": { "pom": "sha256-Zg8EhAYlliYXiumpcrA86VFmXDPDM8q0U7EXi40NJBU=" @@ -1280,9 +1532,9 @@ "module": "sha256-WvzxkaqDNZY3NlnlROW1BnQmwbF0Hg3jcc6+K6wYOLs=", "pom": "sha256-hzhyRO2hjBgdDvEwH4zyeQ8HTO2LXrFl1qW9TtIH5MQ=" }, - "org/hibernate/orm#hibernate-core/6.5.2.Final": { - "jar": "sha256-Y7IrSdqgt7kwtFMm99+B8ex08z5n06sf9cWMfgWXyCU=", - "pom": "sha256-AXES7zbj8hlq0fcaigaf+Mw5SAjHmADRF0mDtONtuTk=" + "org/hibernate/orm#hibernate-core/6.5.3.Final": { + "jar": "sha256-95teUCmnLi8Lp1QlkfuoMFye28Db3JdFQfI3b/EgNCI=", + "pom": "sha256-HJFMGnd3FAciRvUQAxlf+f8+/DYFS93bTsowGgSFhck=" }, "org/hibernate/search#hibernate-search-bom/7.1.1.Final": { "pom": "sha256-WO2Xg6v4mdqIAbTa++A39hdSeBklEdgXxuu6tiWc0/Q=" @@ -1293,8 +1545,8 @@ "org/infinispan#infinispan-bom/15.0.5.Final": { "pom": "sha256-1qTKkMta/plIFuxQ2jX3GG5PG835+2eNC8ggZpvj9tk=" }, - "org/infinispan#infinispan-bom/15.0.7.Final": { - "pom": "sha256-WBOzn+0YV1/lSnwSp43HOw29ikxhFZH1jT0whVsy/+Q=" + "org/infinispan#infinispan-bom/15.0.8.Final": { + "pom": "sha256-R9UUjthRMTo3wrs9kL1b7dyt9OyvY/d2FZVlkxi56TI=" }, "org/infinispan#infinispan-build-configuration-parent/14.0.12.Final": { "pom": "sha256-WTir5k+BZwjr5C5mlla+UltuhfxMyAh3OkVqnp6ne6I=" @@ -1302,8 +1554,8 @@ "org/infinispan#infinispan-build-configuration-parent/15.0.5.Final": { "pom": "sha256-DAglqIiuar5Z8TLIQEnnXpNY9m8jXB+VFNR4V8wz5KE=" }, - "org/infinispan#infinispan-build-configuration-parent/15.0.7.Final": { - "pom": "sha256-uM6y236AO1bdaktGtBoKEchNP5Rpee4SnO/oT8kxYWI=" + "org/infinispan#infinispan-build-configuration-parent/15.0.8.Final": { + "pom": "sha256-o/l9HokmqKXSFEhkb+v+FbOwbFVYk4xge4cE+oudeqM=" }, "org/jboss#jboss-parent/39": { "pom": "sha256-BN/wdaAAlLYwYa9AfSgW2c3mZ5WsrjdqBUvf6Lox5mQ=" @@ -1337,6 +1589,10 @@ "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=", "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM=" }, + "org/junit#junit-bom/5.10.1": { + "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", + "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" + }, "org/junit#junit-bom/5.10.2": { "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" @@ -1345,6 +1601,18 @@ "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" }, + "org/junit#junit-bom/5.11.0": { + "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=", + "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0=" + }, + "org/junit#junit-bom/5.9.0": { + "module": "sha256-oFTq9QFrWLvN6GZgREp8DdPiyvhNKhrV/Ey1JZecGbk=", + "pom": "sha256-2D6H8Wds3kQZHuxc2mkEkjkvJpI7HkmBSMpznf7XUpU=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, "org/junit#junit-bom/5.9.3": { "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" @@ -1486,35 +1754,39 @@ "org/springdoc#springdoc-openapi/2.2.0": { "pom": "sha256-Los3sS+E+doEZrqeLfbA2nneG1cyCSPFNW/oXbE0d2w=" }, - "org/springframework#spring-aop/6.1.12": { - "jar": "sha256-fBLmk3hEpCgC1o7WmrMcnTNnXgxLLx7BL/t5U4vx8P4=", - "module": "sha256-eb5GsboCAyyRGfZa1kY4JCVJIn9DRA4OY/OFO5Urw8M=", - "pom": "sha256-4MOBWbo0jp6yZaavDnq9eSsujxJq81yGrWvoWdQIGuU=" + "org/springframework#spring-aop/6.1.13": { + "jar": "sha256-s+fbELNtM3lLpCC5UDT193BuG8HOCA7kp8JIpweYt3s=", + "module": "sha256-fjNf1hM6ly24tLTbFfu7KEAUpcnDJVEBdubToRZv0MM=", + "pom": "sha256-UpzttaYMpsTUW9Q8685wYcDaBGF2l3Il3VLPYBWQR9k=" }, - "org/springframework#spring-aspects/6.1.12": { - "jar": "sha256-CcS/SjYtnK5dVGSzwY47o7Bk4S6jBhyGy0Rjiz1PEic=", - "module": "sha256-+4RoppA5n5CXzGFLxYUdJZ81FbHDYCZett5CdQ4VMtw=", - "pom": "sha256-UgHQPY4IDkWidn3s2zI+IqTL8XdOhgpHTTRehRNydJU=" + "org/springframework#spring-aspects/6.1.13": { + "jar": "sha256-1AqWLYqpEL/A8eHm9e8Q5UqHRrMLWkHwhX8Cx6FZnPM=", + "module": "sha256-dz4eY+wnnQCDN5DVk7aGBZtR69QLpVs1+wSAAjDjHuE=", + "pom": "sha256-d56UlKZGPqQoJx3bZvsChsGTbOT4DwnFByw28T0btbA=" }, - "org/springframework#spring-beans/6.1.12": { - "jar": "sha256-UDXoYsT6o0NJ+Z7vKDgN7fmUCjACIYw+UB1gqMyJPj8=", - "module": "sha256-x9ISxLxFi17XsVwZh59Nr+nzFlcni4qZ3Sq46HQcqwo=", - "pom": "sha256-zciJOknEs6M13llL6C/Vn7hW2MlzPDno1iKBTcwMkLM=" + "org/springframework#spring-beans/6.1.13": { + "jar": "sha256-+OKav00UPJH7Jk7zRWcBGhc9B/K5qLyqH4zsV0SP5So=", + "module": "sha256-Ml1gLzDURjt46thNct1LkUFg5ElAtbyxSpmzkGWUtJI=", + "pom": "sha256-CLxzv0E4A9YFkyIzPGyflG8dcufqPx9Vi/LI655LBOs=" }, - "org/springframework#spring-context/6.1.12": { - "jar": "sha256-V2NQ6DkMWQV+fTOUQeCujCvwjh8sjh1ZQVwh3H7SyfA=", - "module": "sha256-6dRwpGQ6DsNpTtdYztMYGx99LIDXLhJmjtTs+mRyiCc=", - "pom": "sha256-hUnp0JGFg5yJFJljfAx3a8ogNw1kkAfwFbpUFFtLBTA=" + "org/springframework#spring-context/6.1.13": { + "jar": "sha256-KVCECKjUuWVs0TPVKz/lS2YxedUeWNUM3gGkbLhy9BM=", + "module": "sha256-EN4DWmbJLrtyDYY8rL2I/1pw7NEoLDN9kRPj2ZC2TvY=", + "pom": "sha256-QCdgRhq5v/BZ3S5LpuMZqGK4sbZgg3ENzwqctPjfRe4=" }, - "org/springframework#spring-core/6.1.12": { - "jar": "sha256-AQ1jmMf2W8LaPDi81sDrt5b0/jJVgAvAXnEvQ9T8p/s=", - "module": "sha256-KWYBRVUVcWZ06vLZydcD0m5q0BXf+lThEzNLr8y7HUs=", - "pom": "sha256-ncr5G5WfB+zIT68GdhMmrlHTwS6jzf9u7EUNvVdj3xo=" + "org/springframework#spring-core/6.1.13": { + "jar": "sha256-XwBZcBscC82reLty3CUvzp6rFhR4GVhyOMrL2/e3lM8=", + "module": "sha256-QouqOOnsgLsr9G3ENXpU0yGdkRMg0zpUWgs3EkWbwcY=", + "pom": "sha256-DM7CiUdRuowIFOMMMkQgtSScDHEQLTA4aQ9C3eo7mJA=" }, - "org/springframework#spring-expression/6.1.12": { - "jar": "sha256-x4y58ZojPqg3uYV+w8hMImM71jN+s5rnPxayrfPWyiU=", - "module": "sha256-FxMjcUcyUZ1WLY+m/0hW8maC2p3ZI75DLhNA4o78i+o=", - "pom": "sha256-/dl5KKzEMdiziCvjeSOSQpmNwpihBF0G8PJhynxY6x0=" + "org/springframework#spring-expression/6.1.13": { + "jar": "sha256-QuB7s5Z0srXdScJ7YGgd881qSbY8rKyzYgoOc/QzJJU=", + "module": "sha256-IZ8FJ+mYQOKNFDgKLmV/xf239UAU+Hw3ZughEJN3+hQ=", + "pom": "sha256-kmtkZLkFIcntKx5P5mxmDgmNYtDj7Bj27LMYCI12nQ0=" + }, + "org/springframework#spring-framework-bom/5.3.25": { + "module": "sha256-bPPIDzsrxVO0LptyC/9x/bBxUmy4kMVwkz2deAd2JQ4=", + "pom": "sha256-XMA2phbyoFlZZtPbyZ2uY1rJsY4VOLX+rXsqPL/mgog=" }, "org/springframework#spring-framework-bom/5.3.29": { "module": "sha256-pslWW9lncgrg50PCMmUst9yai4GAjvFDWv1/aJICE78=", @@ -1524,52 +1796,56 @@ "module": "sha256-R6cJH2l8pjEYXtQY8Morhu7wyCqhbRdx3exLLDu3s70=", "pom": "sha256-glr3ES49kupDa7DfeMGVFIhfXAFtD8YMiyTUdjoBWhA=" }, + "org/springframework#spring-framework-bom/5.3.34": { + "module": "sha256-Xd1Euil/Pd6tp4FeR2aFMYvYh1WdN5mqcLdZM7Uf1QQ=", + "pom": "sha256-bQYW4lRNcRXcJJgX3XWKNN+mdzKRgrQuF1QuEz5Vcy0=" + }, "org/springframework#spring-framework-bom/6.0.11": { "module": "sha256-CV5xI53YkWkSRMjWvm19o05nC2UYaUeexdJBXZmrYZI=", "pom": "sha256-SK3yYlH1WiPKJZbVBuBZEdmnZ3fm0CxSgMGhd4wUMGc=" }, - "org/springframework#spring-framework-bom/6.1.12": { - "module": "sha256-qAd2W08tD0aUcxc2YkBjLvqq/fO1fpE/x/kREgfGs9Y=", - "pom": "sha256-5dIoSA7FyCwgv6QfpIlBcQ+R23xQ3bZxJVYOqPlYQmo=" + "org/springframework#spring-framework-bom/6.1.13": { + "module": "sha256-UTTssLBsTG603mZdkYkwqaBdz/JCJ9Wfc6Kvtrx1iII=", + "pom": "sha256-5OA2A8tNHoyF+hPGAFC5wzU+xmZooq+HWKl9sg+APS0=" }, - "org/springframework#spring-jcl/6.1.12": { - "jar": "sha256-6JgP3HCrRL6yAZOVcSMt/EDtgE1UtxVU/I/Ihu1de/k=", - "module": "sha256-rtWyIwjzLzOCN5jqf3a14h84TBuP7Ef3/ZLnltEAOdk=", - "pom": "sha256-cfXigwQNj/CpOQgEEPJ5GiBfAjvTBBWRD1wOPmzwI54=" + "org/springframework#spring-jcl/6.1.13": { + "jar": "sha256-W+7CPvZND6G2zgbURDV/Gmgp/ZI75c+r8yFdck92Yjk=", + "module": "sha256-Vp7RHATln32YrVfY6QXRRFs44eIPEX2S3L0KqT7BzY0=", + "pom": "sha256-vf35jRXJ4dmxGtlsR1nMADAz5z8xScyM0J3vZkYsY4g=" }, - "org/springframework#spring-jdbc/6.1.12": { - "jar": "sha256-AoimhmOJmJ04ajKqrRU5RXXabXho3P6m6Q9Lpu1oXIs=", - "module": "sha256-d5mzq9Ryug7sMs4MfruN9TcfKCiB5JEtKeCUkPLw5sY=", - "pom": "sha256-76Nq1ppmJJC/OIhr2gt4XJSiAOAKmQfV6AqTzaiMC84=" + "org/springframework#spring-jdbc/6.1.13": { + "jar": "sha256-5mcHgz8KJCMVzfzPLO0vRMeiJ5Qgfr6+oFuMFHBGoV8=", + "module": "sha256-2nRfgII2m+EYTGymnQn5CgSuioNiKTnx6RYklzgQaZM=", + "pom": "sha256-TcRC41zhjj2PES39FBahlE0XesuNQoFbYdDaLKb751c=" }, - "org/springframework#spring-orm/6.1.12": { - "jar": "sha256-bqsM2YZddpbUNpflzuTPgBsZbHhLBlSoAuR7fS6Yc1E=", - "module": "sha256-tbAqbAYaYC4/zupu/3FEEVdL2BFO9bBaM2kHfghHhIY=", - "pom": "sha256-3LiQSzxlkFQRNRhIAZfpwIqcnthC/4PqpDRteL3JhgA=" + "org/springframework#spring-orm/6.1.13": { + "jar": "sha256-6fC2OPeBZD76TRB5Ywe/kCjAd0yGT9JIjNuC6KUPvU8=", + "module": "sha256-8Yt8duyikbeHvH/tqZuY9G36NRIEAQwgf8WHQQ6xDVo=", + "pom": "sha256-PeJpgf6H0clkuQ4EiS9rj19wZIzVG9v+0aDXm5KRhjg=" }, - "org/springframework#spring-test/6.1.12": { - "jar": "sha256-BqWoDpNTOTwiuyscRHT+iAHYW42BcQU9XbkItudXmgE=", - "module": "sha256-5hX4INIATuHh9Bo3/9o1jCnLDT0A7rODj6PqC917iQ8=", - "pom": "sha256-Lb1NiCNsd7d32VSsaL7u9ppHh2dfh7R/O5dwBms9CA0=" + "org/springframework#spring-test/6.1.13": { + "jar": "sha256-8PWohIndAWQ3M/PNm3RGpaUx0AmZpV9wkgB3XzIYGCc=", + "module": "sha256-bE4eJni7DxFkMDfkLC0KhWRlTnV+SA9FjODAXtPicec=", + "pom": "sha256-Qai/MxAEzOdc6pnOFv08Iuk6O+2xPD2WhoeTstGM6oQ=" }, - "org/springframework#spring-tx/6.1.12": { - "jar": "sha256-cpbRDoc2KBFHOf5+o3wRYmc6m/9cvLCpUTkfq49ufGs=", - "module": "sha256-l8iUsJPidI05lpdxd+rkn7ifYMGFzBuImKvbOAyr9wU=", - "pom": "sha256-SNSMwvlBXa2BATN2aLqwF6X/uCMs9x/Viepvo/PZwo0=" + "org/springframework#spring-tx/6.1.13": { + "jar": "sha256-ZXDLed1IkhJ3qEk0JFdyfDkESg2ox7ifrJvqij4gmGY=", + "module": "sha256-o69t0tnt84RIk1HrgbJ5SRnfWKnjDLz2rmYlvRwf3UE=", + "pom": "sha256-5gRGA5gewi+lPqqyGcMTSzkJX1u4QNmxvWZg/6UUlDQ=" }, - "org/springframework#spring-web/6.1.12": { - "jar": "sha256-qeExXvr90qLygLd4Gc/P0JcOg8dopKyS1UvkSOgYl2Q=", - "module": "sha256-byUGRQ0WNtnZ6ag1syT3tzYQQ74yA03GcaBYmajNGYE=", - "pom": "sha256-5WpNnV8fg+nJoDi0r7SPYMosRixfMDpDPX8JiuFdjq8=" + "org/springframework#spring-web/6.1.13": { + "jar": "sha256-jr8FPbPYF1bZJ5cGC1xO3ICps5JiJmzhbNCERI+hPJA=", + "module": "sha256-kXhmEGEsFV6DSA3A1pQ/Xsy4K3qSb7I8PehXpBtAeis=", + "pom": "sha256-V4kzHT1ZAsMtHtsfzVHwhNW7ojioPBNjvdxQxauz+8A=" }, - "org/springframework#spring-webmvc/6.1.12": { - "module": "sha256-UmPNrZVdGM2kiNE9nhWKcIlP9MYuw9mTvWdV9aSTiww=", - "pom": "sha256-TXHTQtGEjnxSN/UD4dbEFxwP8Gf43zQjqAKPRYdTJZE=" + "org/springframework#spring-webmvc/6.1.13": { + "module": "sha256-nE+D3C/1MdxLhnmIk3n0Qgd3yLPcY4R2j+PyuxT5kik=", + "pom": "sha256-lqf0qhEARYsUAWVb6QreRdKJhJfOj53lwnny4jg35/0=" }, - "org/springframework#spring-webmvc/6.1.9": { - "jar": "sha256-LEJrlcJ9UhC2/t+LqDVadSs+LWNx/lfvkVyRKTO6Y4w=", - "module": "sha256-4VH54rzAapzvtP4B6/f05bYOaXf1jIvAv1qmgm4C8bI=", - "pom": "sha256-S1Y5xzv/J671C2oLCO7dVdmxt43yRqx8XBkXy0KL3sY=" + "org/springframework#spring-webmvc/6.1.14": { + "jar": "sha256-nwlvdTDtOFNI0mndmtZC3/R/UMvHWPF9aUhJUs3Qy8A=", + "module": "sha256-xXlQIEPn+CUuQcL408AXlUFvZ0ihLF2QBUMwVSEILMw=", + "pom": "sha256-+4NjEeK8k4HIj5AF2vY9J3y0iVwtGZWkIa6y+w0wWgE=" }, "org/springframework/amqp#spring-amqp-bom/3.0.6": { "pom": "sha256-sch8n8omH3LZPz+tDWBfn6FQECv1fU6eT9Ga0ltYvB4=" @@ -1584,152 +1860,152 @@ "org/springframework/batch#spring-batch-bom/5.1.2": { "pom": "sha256-sVvWVb7ESiLKe/VnhcpPfubUcAOBaqBwJtF0bbECwAg=" }, - "org/springframework/boot#spring-boot-actuator-autoconfigure/3.3.3": { - "jar": "sha256-y0kydzDBH/mKJpDYnyLtCNpYmXohKDuEzVCHEGzC+mE=", - "module": "sha256-FopZO/qHKQcKsgy+WEYdPKFUNWiWEi+MVcnzwZmdyeo=", - "pom": "sha256-woBs2IPedAKqYwfPKeIuYuJfD7x55yFHTlhWPEVcUD4=" + "org/springframework/boot#spring-boot-actuator-autoconfigure/3.3.4": { + "jar": "sha256-7lFaNRx3/GvcDbli4eAFWxAS4VF3L89hW++UKGDugDk=", + "module": "sha256-/XrkENvXBqTWay6bRWAyVXruTmiknRN6+th76zqbmC8=", + "pom": "sha256-vXxol8pQUKowZcs0askX305hxZU9BnN/w4detmeJk4A=" }, - "org/springframework/boot#spring-boot-actuator/3.3.3": { - "jar": "sha256-YZbfrxKpRC0XKLq3pCVI89Ib5FtRBhASbyCANEw7Aww=", - "module": "sha256-8Zek/lcavWdjSJ/6AZ5GEhoMY5RuUn++bC82c+Cp1LQ=", - "pom": "sha256-Mc470SjHokTE2Hxc1vGee66p+d3Zs0hgrF9/MyG4ijo=" + "org/springframework/boot#spring-boot-actuator/3.3.4": { + "jar": "sha256-pFQuEJkyzuBg+BQVTaZ1hNp/PCnPC0jhel/zpqK7lG4=", + "module": "sha256-mZmYmpTaxu2RRanRy6lb2dS27Qu6SovR6QN0+UWOH7c=", + "pom": "sha256-vVHpAH6abY4ZAqCDvtxO42N7FRa/ooNr+IrnJVlZxvQ=" }, - "org/springframework/boot#spring-boot-autoconfigure/3.3.3": { - "jar": "sha256-VFThf+bmkoU86euEK9ZMbHq9kIvNgUEVOSXk4M/V1vU=", - "module": "sha256-rmN63QYIyfb5RAoG+On/Dm03wkSVc/FuenP3S/zHvYg=", - "pom": "sha256-klhrwFBjQd7B2OrM5XYBhxJblZmJnBVWVllaH3S1/y0=" + "org/springframework/boot#spring-boot-autoconfigure/3.3.4": { + "jar": "sha256-z4nbleh85iBelPf9PjJLKuzBtgIhGbAvI1ICh65sD2I=", + "module": "sha256-PvOniq1m9nhs5ZlhiPway0ggqrSpc3wXRia/nerEM+o=", + "pom": "sha256-sRd8ltJP1YQspqEoE04Ih+arHuprPy70/WS08NKfKXg=" }, "org/springframework/boot#spring-boot-dependencies/3.1.2": { "pom": "sha256-DIaB6QfO2iWOWU6lt8/aByuKxHDamKrAGEqO62lQV9o=" }, - "org/springframework/boot#spring-boot-dependencies/3.3.3": { - "pom": "sha256-NuSuqGqUmgcjhBHAFojdSdyshdNCU6kLog+3L9yXMWo=" + "org/springframework/boot#spring-boot-dependencies/3.3.4": { + "pom": "sha256-wcDfkfVOPYnikkj/dCTSdDjKUmx48OuFSxT/CyS4NuQ=" }, - "org/springframework/boot#spring-boot-devtools/3.3.3": { - "jar": "sha256-ZaV86ii0NkH9erenzPWoQ0Mu/ez+0NV3AaXex0r1Qng=", - "module": "sha256-HIJnm4UwDQb4oKxQk2IkUcIhPuv3mdZIXs0RlvcnRbQ=", - "pom": "sha256-XllSdMXb1LzOe0Lyv/XNpHTuy6YiOqON9vqVFtZhMLk=" + "org/springframework/boot#spring-boot-devtools/3.3.4": { + "jar": "sha256-uBByRCtH0NVa1+R1X/RP/Hqte7e0cAnAXI9UIS1X/qU=", + "module": "sha256-HJJytbqKV/D13YKGfudB7VV3Wf1BlqbjMGcalomg8D0=", + "pom": "sha256-X3El+dkhEiarK6X1tG7uz8BRx8GMb+pEuelOl5H1BMk=" }, - "org/springframework/boot#spring-boot-starter-actuator/3.3.3": { - "jar": "sha256-ZyKv+UNdrdw6aZfqxctXQq3c9rwSGOVvrFYlioP2VyI=", - "module": "sha256-J6oYeXViTIcefsF5x5+laOVZRBK8aLzH7+L/dfuENR4=", - "pom": "sha256-E60HIeEPdAt4HuATH/54JBXZPibSfkKAOybz8hR+rkY=" + "org/springframework/boot#spring-boot-starter-actuator/3.3.4": { + "jar": "sha256-RajJDPOp+4aZFLEUwIk+cSs31KuyE7g8UvYofQ1THZI=", + "module": "sha256-IPh/DuhldUMTY1g120hOs0gEg+amviUpQXPjB4NMKJg=", + "pom": "sha256-sRJtjl4eCAxwQ77QUHrXLJ8a0TyH8LCTrrhNYKM+UP4=" }, - "org/springframework/boot#spring-boot-starter-aop/3.3.3": { - "jar": "sha256-U/LE92SlnA+TMQyzq2SZiI1yWr+GPxoZe7nKy8ZZ/Ds=", - "module": "sha256-X3I3RS7d0PonHsEAJbPUaS0cE7AM8OJP7U2JAG79VuA=", - "pom": "sha256-NRSb/k/ckZh9CfUPssqY8W2FiaMoiPOv4xNfGfgGSyU=" + "org/springframework/boot#spring-boot-starter-aop/3.3.4": { + "jar": "sha256-L4ImpIdrOJ3GakW9fZbINL/JBSPK6ogbktmchFQgXsE=", + "module": "sha256-3ihGv0bJpDGChOKxGSNPfQ3RHqEQKaZtYb7lZzLDawo=", + "pom": "sha256-MsWCqWiaJ8VzLJOE05+QH9hdXuLmBKhtHjjaDJzHpHU=" }, - "org/springframework/boot#spring-boot-starter-data-jpa/3.3.3": { - "jar": "sha256-RIse6OgsBS62iDYNGoE4psungOK9f26Fphm7ANjePsY=", - "module": "sha256-pRAgmkIdEGxsy+s8lzSwbrgnxZLHCDr7a2bDN+Vtwxk=", - "pom": "sha256-JkfOyUCetcrFYNlF88R0QROjeEie7DIeVPDXuajCGUY=" + "org/springframework/boot#spring-boot-starter-data-jpa/3.3.4": { + "jar": "sha256-LzN0kQmbhYBBVfJj7/Bigw9Ly82eOL3ViDEBvGCGbCM=", + "module": "sha256-Xhs4k2RTUOezD/1RMMBORRakVdKtBj8UD+7ZBkxsvhM=", + "pom": "sha256-e3EiniGaudGN8zOZ7U54VhX3oPFocq/El+3hfpGyA1A=" }, - "org/springframework/boot#spring-boot-starter-jdbc/3.3.3": { - "jar": "sha256-ZBrNyGxc+Iqw3yd7ljqApeBcdhez4BApEw1+npExKQk=", - "module": "sha256-ljtLAENxUwhcn3KJ0Q9UBsabcG2snlk5uuLB1OZTHpI=", - "pom": "sha256-2VpTuALfAbit1qHqC9id7VLRj3za2RKIMVPE0PhKc+w=" + "org/springframework/boot#spring-boot-starter-jdbc/3.3.4": { + "jar": "sha256-LWAcYcRtBZhB7yoYylwnz9lKHqgyQuYqsIiGZpAwKps=", + "module": "sha256-SzharLAcpOVp1vSo3W9ydru82of+EdGTwXLj2dC4YxI=", + "pom": "sha256-Ps1XPP0D4OMwD6v+qjnaYpnrQlmh8TPex47+drrh0AU=" }, - "org/springframework/boot#spring-boot-starter-jetty/3.3.3": { - "jar": "sha256-uEd57lFkN1/4U+0HppEB1rEQSvVINIXA5Te52N4JgN8=", - "module": "sha256-TJ7qufMibHsTI9kICxbvRcm801aQDO11xVwd0zHaU04=", - "pom": "sha256-jZma/FuAIo3ce6Qtgk8O9pZm1/B8eMbAVGsfaUTEDMQ=" + "org/springframework/boot#spring-boot-starter-jetty/3.3.4": { + "jar": "sha256-6Q0l5bnusEWpmQCWP5Rid1wbNc9Mycc669lYNEmMr/k=", + "module": "sha256-utErdusrqOgsPESWI3fi34W2KkloGQ43ncJz/EJPT+A=", + "pom": "sha256-3cwpbnunDVuNrrRcZaeVITDe24SyIW6mTGSBgRPulH8=" }, - "org/springframework/boot#spring-boot-starter-json/3.3.3": { - "jar": "sha256-X6ME0eqc1ZdVwP1x4QyzqXWd0YLOvlB0dE4sXXjZBTQ=", - "module": "sha256-IQWePrdHCNehiWf6tXiQdA5vjS4GMH90+v2qx1z7Qn8=", - "pom": "sha256-yaaxICYx3zCpYWiqGHnhmTFk4eBARI8NLhwgHqZqk5Y=" + "org/springframework/boot#spring-boot-starter-json/3.3.4": { + "jar": "sha256-DrDOhFm/zsvMribaoN9C2z9FPWGwwkZ1bIZo3ot3+Zw=", + "module": "sha256-OTvWVOoOjaDca8WQQRTCk6Anic+1UkIpwxCOhFABewE=", + "pom": "sha256-gh9mdpyTBKX3s1JCFQiUr7kVRK4hEfONiZXjprLcgmQ=" }, - "org/springframework/boot#spring-boot-starter-logging/3.3.3": { - "jar": "sha256-G9bCZUeDegCf1QMokW9lKLcyiHWyZZ9DrzW5gWkwWjI=", - "module": "sha256-aG88tWFrlIRq9Jm5C4Frmpbq0cvw7c69wFsdtl1GcrI=", - "pom": "sha256-i5ywHoh0oZsCkz9zhpAG4vCI285Gz5xtZdBLc0KGP2U=" + "org/springframework/boot#spring-boot-starter-logging/3.3.4": { + "jar": "sha256-36aGpBNUK/CAhSveki1UaNHp/I4cIhOWnsktXgPU1J8=", + "module": "sha256-U7KSUJ2CXSk79/yPp8KkfWdFrjURGQqoQ1W13Jd43rs=", + "pom": "sha256-NFenwfljNELWCc16kJ/snpRLrLWgWTm+OeutEN61reE=" }, - "org/springframework/boot#spring-boot-starter-oauth2-client/3.3.3": { - "jar": "sha256-R3TvNTp/VzY9nn+VjDMJ2S1Uuzw501mmmn3PojW/m2Y=", - "module": "sha256-PX9cgZRLXAgbHJ8t7pY8fD4fQIuigxK/9Dm6vOZLP+Y=", - "pom": "sha256-sZU/zDXdqBefv0Y2Twxsrj5InQhDU2sxFq75mWGnfnI=" + "org/springframework/boot#spring-boot-starter-oauth2-client/3.3.4": { + "jar": "sha256-q3Y/zTNrFmdKz4CBNYGHvFOwwEq61Yy3hs/zrgHUJX0=", + "module": "sha256-H2wC5QSCMS42eYbxApMI7oqG0PnrPtTMX9dZqbJbjiY=", + "pom": "sha256-qPg1KM3cj5uUETgk9qxPW8uO8TiIxMOTphCweoHThYY=" }, "org/springframework/boot#spring-boot-starter-parent/3.1.2": { "pom": "sha256-TB9NCfr9cgJEhZCDvfx7VytHF22Bil965q1m0ZOODO4=" }, - "org/springframework/boot#spring-boot-starter-security/3.3.3": { - "jar": "sha256-CZIHz7uRJJcUffXLLLP+Flg0z7P9bVBxNVjEmFaedSM=", - "module": "sha256-FRjYKR/TgSaXG5Q2Tct2tyAf0PtHjaauc3K0PnIalNI=", - "pom": "sha256-HmJAJiOKA2e4EV4aURQM7P/IAteOlwLZJb6Od8KHo5k=" + "org/springframework/boot#spring-boot-starter-security/3.3.4": { + "jar": "sha256-ZVYu0WGJRC3cHly/EWs4cCyBT58e2MgPtRM6nnpscxg=", + "module": "sha256-+vNhZuOX4Pp+hPg8j47OPRNStCxS5E21x7FNluzvtLo=", + "pom": "sha256-RRhgDbqSOnTrabxxQSs/c2m3uorYhkoGoQH3ySBT7tE=" }, - "org/springframework/boot#spring-boot-starter-test/3.3.3": { - "jar": "sha256-AI4ei5CNbpXTYRN14o7kafJvS6dqfzxCNPwy4AP605s=", - "module": "sha256-hh+ixlqrT4uXNdwbL2xRne+mSVlWbPMG9ZdI7Xra9uc=", - "pom": "sha256-whVzqqrU3vbalhRNWhJPEOqUipTIRVp7890QQ2ZqCdc=" + "org/springframework/boot#spring-boot-starter-test/3.3.4": { + "jar": "sha256-eTlezcMeWMPes27enE1Bb8U4SFC4acoF1RGkyiIG3vA=", + "module": "sha256-/dMeugA71WBu//z7G0OhspienIE2OZiELDpvC/J/Nmg=", + "pom": "sha256-AL0hJogVqfXs1G+dsH75T/SP12f9Pn9UWnce5rQTNJo=" }, - "org/springframework/boot#spring-boot-starter-thymeleaf/3.3.3": { - "jar": "sha256-tyT8jyhlULdsrrwKs8Klv+q5zsWwLGuW21/5R5EHj7Q=", - "module": "sha256-uxKYSj1FcAGcMcg6LCchkqMhlPLlBeLVT7updLwy8g8=", - "pom": "sha256-0PnSxrEZGSmh62WyZqvUCkR+EYnyiY2KUmlbt1KKwNs=" + "org/springframework/boot#spring-boot-starter-thymeleaf/3.3.4": { + "jar": "sha256-TPoXr9UaFiC2IlZPCU0vCFKVrVbSTgPTYII8uc3JY0c=", + "module": "sha256-dax6rKmrwnNuOIVF1BqSuX0arVPAcacqU3U9qr9HwKE=", + "pom": "sha256-oR/lINWufuDOk/F0QnURVK/pViDaXgO2B0EsS7Cb/LE=" }, - "org/springframework/boot#spring-boot-starter-tomcat/3.3.3": { - "module": "sha256-gqNQsznFvFVvtrQa21SjZWa2P1GaCwciu4J+6ATNA40=", - "pom": "sha256-CIpedDvlnXcUjmHqsf/szbM0ej6czfxmerlQXIDnQIY=" + "org/springframework/boot#spring-boot-starter-tomcat/3.3.4": { + "module": "sha256-0gxRsBUD3bfToqLrrz/5ZzYwDXYiPEhGwBr/Z85Sx8Q=", + "pom": "sha256-2Z8tjuTNp6ppCE/1+n0Q4bgebxXmqyt2LbALnyh+C/I=" }, - "org/springframework/boot#spring-boot-starter-web/3.3.3": { - "jar": "sha256-4MUrXbgjmjzsXTvf84uolT4JejJflzTqyNjinJyXPw8=", - "module": "sha256-VwEcN82+JK3+GsCm/2vavD7qypw4bTGWQQw/0b/5278=", - "pom": "sha256-Ne4F6DhJkDCEHov0hvIEf6yhOMJk4pfAjyIm8y8xDSk=" + "org/springframework/boot#spring-boot-starter-web/3.3.4": { + "jar": "sha256-Bm6Rv9o9RwEvwh1m1Z4Jgj+8Pwf+VGMyT7jLGWQbs3M=", + "module": "sha256-hzW0emAxW7VlMSyQ/zLX6pnK42VVR8/ABURIfEt/T/U=", + "pom": "sha256-xNR5/LQYLC2+1p+UOMuxUy3Ulrta1cakmbgiHaXJlv4=" }, - "org/springframework/boot#spring-boot-starter/3.3.3": { - "jar": "sha256-ipNJmoxD/qwTEjX9S4hSB3jR2IngEiQknjOq5bkAod8=", - "module": "sha256-pHs7v7Qxy99nxYzoy+9lAR+oG728u3SgZAFsrPICXR4=", - "pom": "sha256-A0XHriNxIaMINYEhc02WiuViIQFZ0mXld+ZiypI1fWs=" + "org/springframework/boot#spring-boot-starter/3.3.4": { + "jar": "sha256-//3FRK1mCh9csSPjIeCGLGaEVp2Adh47pEi3mPvI2cs=", + "module": "sha256-l7n4JAnoLbiQIsdHP77frAp6JJeldy6x8wg7t7elTUI=", + "pom": "sha256-8JMvYlXdDqR3dl+2s1/qRc7VXLYv9UANObFyLXw1kLE=" }, - "org/springframework/boot#spring-boot-test-autoconfigure/3.3.3": { - "jar": "sha256-P7TbxV/b78P6fwUY7owIOfWCC59Cxh+9tvLDkJQL7H8=", - "module": "sha256-utHcyo/rq7H7KMYyR9luQgwIvATNTdUaFGi+nAPr6TI=", - "pom": "sha256-nvanD0tVVKL4sqdCUOC98n/NzJCjiiSTR7FI8IL8yZY=" + "org/springframework/boot#spring-boot-test-autoconfigure/3.3.4": { + "jar": "sha256-oLFCEVUqwJ9o89h4A0KBz/ESei2/SnN6WXO53lvFi4Q=", + "module": "sha256-EjvgC7tpCGqeyZQo++3UN2XBwUmEMV6KwzqNvqTKh20=", + "pom": "sha256-4bacZq0dhHXf5UCJ8ESbywBWVM/r17PRwlVRjg1Ms5o=" }, - "org/springframework/boot#spring-boot-test/3.3.3": { - "jar": "sha256-S9qi4BovimkdlOf2TDrKZuzG52nSDH0x1kEzzLccIlg=", - "module": "sha256-WmigsG5CzkWLxm9O1zFrKwm8QMRnopAJ3f289bgcgQU=", - "pom": "sha256-MFM/JB4QlYhbsdS+wx2+pycXLCJ+ifvlDji61HMslVw=" + "org/springframework/boot#spring-boot-test/3.3.4": { + "jar": "sha256-N/HUMzPnzlcwyJ1w5Jrk8P28U0uF7qQ4DjlHjHEhvN0=", + "module": "sha256-ag92Su153PPUcDoSeDsF/iV6Nea1NTZlT8v6Jo1l2Q8=", + "pom": "sha256-nvae3IdfWnR8wkar0K1uJ0HolCxpbHijZqMA0FyXbiM=" }, - "org/springframework/boot#spring-boot/3.3.3": { - "jar": "sha256-Zfnp+qEw6u+3i2X+TYk4NIZLqRF8/0v+IjnuExyjs6o=", - "module": "sha256-sDR7AWx8szcQRq1FsDUVhGUXfpE8ZHQbVR5dYyDwUGM=", - "pom": "sha256-pFVAtzdElmL+wgr5nVlYIx/Cg+F/aR9z7wPlmiRWQ0k=" + "org/springframework/boot#spring-boot/3.3.4": { + "jar": "sha256-LTtDreZ9i4/yPoD6f589RpooQTqCYEKAi8s7cY8T4Bo=", + "module": "sha256-XSDnrptlabMYpB58EUl/SU236WhGN1FbpsVvYAmuUMI=", + "pom": "sha256-qtd3zlnNDpsZUJkq5IFi9qC5t+kb4jV4WVwNAvx1was=" }, "org/springframework/data#spring-data-bom/2023.0.2": { "pom": "sha256-r5JYFO1beGWJH9CGEGBVcLS7hFCi9Rv55bhjXNNoHgQ=" }, - "org/springframework/data#spring-data-bom/2024.0.3": { - "pom": "sha256-oRnTY0THGKAnk8SvmnB7rFEvlRQ8HhxTuSCHCkQ+dCI=" + "org/springframework/data#spring-data-bom/2024.0.4": { + "pom": "sha256-qSZgotpGIx+qcojAx1ne8pjlM3IXHAzyfh5yS3rYZJo=" }, - "org/springframework/data#spring-data-commons/3.3.3": { - "jar": "sha256-GDklxh/hxcbcpSP/BDINB0wAaSttlCIkFfB8MdD003g=", - "pom": "sha256-LAQzKSci9N15p1ftLprzyuie0xuZBbBhXYzOG91hpfg=" + "org/springframework/data#spring-data-commons/3.3.4": { + "jar": "sha256-9EoteZKP7+mHnXazroFB28V5PNp5MFQ/KV2TlPEVp20=", + "pom": "sha256-1uWjDypdRl+zcc+1rVn5uRYbW05FP4HjyRhFUoV/Y5g=" }, - "org/springframework/data#spring-data-jpa-parent/3.3.3": { - "pom": "sha256-jYLHGTBW0ZxrXgpkzQnMQECQ/L8+UoiJaFuga63BP2Q=" + "org/springframework/data#spring-data-jpa-parent/3.3.4": { + "pom": "sha256-FBLqKVcxeFv3rwokHK3gEHliv1ODIFqZVkgX4Of5b7g=" }, - "org/springframework/data#spring-data-jpa/3.3.3": { - "jar": "sha256-xQy8pH1Z6qPXdhHjchljKiCcIW9IV9Nhjfyrvgtb7A0=", - "pom": "sha256-BxEkYRsRA73zgVF+63+CzPnD8ovOHjLvXInl5iYbVh8=" + "org/springframework/data#spring-data-jpa/3.3.4": { + "jar": "sha256-mdreaFdSnHev64NwNzLBo35hwODSXsPQZKC4i2Z5txs=", + "pom": "sha256-tghE/f3iI9uIJQ6jRNwjr+74jjXF/g4qItTV92weIPo=" }, - "org/springframework/data/build#spring-data-build/3.3.3": { - "pom": "sha256-PR6nlloFVB5WlvrcsjPXd4lDpSGO+xBc9WBTJwSiMUA=" + "org/springframework/data/build#spring-data-build/3.3.4": { + "pom": "sha256-MzEC7hPTVOYYcF4vu3X0DDolhoKsREyQEJ110/EVRto=" }, - "org/springframework/data/build#spring-data-parent/3.3.3": { - "pom": "sha256-7lhfrM5yJbJjJYkVDT8zUdULhKtgzbudZNU0ehjS7KU=" + "org/springframework/data/build#spring-data-parent/3.3.4": { + "pom": "sha256-WVNFy0YWmI/43SsUW3BDhj79NbmNvp9FVWxWYEEHSgo=" }, "org/springframework/integration#spring-integration-bom/6.1.2": { "pom": "sha256-0mxOaZYUSD15O82BeZxUTtpYlXYrSzGXFX7tAo7GL+c=" }, - "org/springframework/integration#spring-integration-bom/6.3.3": { - "module": "sha256-4G2ff/AE5rIXIM7mTB4eTLz2p/F9YOX8a/hVcr+ZGAk=", - "pom": "sha256-Qtk7GmD4VaFBciWxl//uoIRX9OmSTP1lDApxGJ4oRuE=" + "org/springframework/integration#spring-integration-bom/6.3.4": { + "module": "sha256-5h+MOGRcm57UXTpyS4RdSFo7VijC/ObnbHAyg+Y4kIo=", + "pom": "sha256-yPvnP1rRqfGRr9oV3I2mHSA1TGUSO2FWdlbhW/ySrcw=" }, - "org/springframework/pulsar#spring-pulsar-bom/1.1.3": { - "module": "sha256-N+CeG+oqv+uQ18KW+Vt2LFKaluuDTg5CibNIRlsigaU=", - "pom": "sha256-OZFprHySNZldO5qv5NXem/Ucb7gRt34cTnZyTlICC9E=" + "org/springframework/pulsar#spring-pulsar-bom/1.1.4": { + "module": "sha256-+1fVA88p1cAbmBZ4vBLPY3PZSbbH5qPQ11LxvNbOmZQ=", + "pom": "sha256-+7XA1rdo4DiEfGIriH+Q56ReXrwOhX4p5NS+PxpnOcs=" }, "org/springframework/restdocs#spring-restdocs-bom/3.0.0": { "pom": "sha256-/8nEe+Wo60iO3pJozgiaeZyT6JT7G9P5QPYsRnpmEyM=" @@ -1779,6 +2055,11 @@ "module": "sha256-gXJgEt1f1pXGpR3BTaDThSLg7v65mEhxQ2+Drt4z46k=", "pom": "sha256-ohcRc2UqxxLnTo4m/E7m/hiesCcp4rtKnxHwk9s80AQ=" }, + "org/springframework/security#spring-security-saml2-service-provider/6.3.3": { + "jar": "sha256-pyMEm9c7f3DZmB+MxD6vQACxA9YjYoMyUsHmhjuHRvI=", + "module": "sha256-Eg5Uo3NdxgjVCO9LkNzGEcw9YwM2zyGJiDKr9Gn79Fk=", + "pom": "sha256-ewCqB/odmiXG/0piANjXHXHSa5QqXkW9bcRlTveH5zc=" + }, "org/springframework/security#spring-security-web/6.3.3": { "jar": "sha256-Xk2dmWl4c31l+LI/OriqREtxXSDfsZNtRCrJw0Modvs=", "module": "sha256-oC71Y2BWFpewD5hMf9I3YOhEARFC1p19SgM/PwDO6FQ=", diff --git a/pkgs/by-name/st/stirling-pdf/package.nix b/pkgs/by-name/st/stirling-pdf/package.nix index 565c2c1dfbc7..20f470a91273 100644 --- a/pkgs/by-name/st/stirling-pdf/package.nix +++ b/pkgs/by-name/st/stirling-pdf/package.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "stirling-pdf"; - version = "0.29.0"; + version = "0.30.1"; src = fetchFromGitHub { owner = "Stirling-Tools"; repo = "Stirling-PDF"; rev = "v${finalAttrs.version}"; - hash = "sha256-pdk8TG+wtFjV3Opv42wovlZ0CNWl4jC/PSVYsDyH0Gw="; + hash = "sha256-/458O/JJcBlHS66WRVLIUyv9dtuQSW2X3WUpzW1YuFk="; }; patches = [ From 1527445c79f230d15b6a0e60ae0b53eaff44408c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Oct 2024 08:57:30 +0000 Subject: [PATCH 03/54] calico-apiserver: 3.28.2 -> 3.29.0 --- pkgs/applications/networking/cluster/calico/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix index 509a0385c850..e776c537eccd 100644 --- a/pkgs/applications/networking/cluster/calico/default.nix +++ b/pkgs/applications/networking/cluster/calico/default.nix @@ -2,16 +2,16 @@ builtins.mapAttrs (pname: { doCheck ? true, mainProgram ? pname, subPackages }: buildGoModule rec { inherit pname; - version = "3.28.2"; + version = "3.29.0"; src = fetchFromGitHub { owner = "projectcalico"; repo = "calico"; rev = "v${version}"; - hash = "sha256-ZENlUmSLI+aY33a69LNsfer/TLz8gmzxEv8Gddz6faU="; + hash = "sha256-bgcY/unCLAtPOeEwRJGl8u1dHYdO3tSzMTg47DHOsJM="; }; - vendorHash = "sha256-6ZHb4SUa22/KfN4B2hg710FOSpg69rlT9FbZ/wCjpDc="; + vendorHash = "sha256-9Kap6qHIttgMRSnSnTUvWj72jp5u2vIMy5l2sJRfKlU="; inherit doCheck subPackages; From 90263425c535c8b22aba636d933393af31bc805c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Oct 2024 11:22:46 +0000 Subject: [PATCH 04/54] fava: 1.28 -> 1.29 --- pkgs/by-name/fa/fava/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fava/package.nix b/pkgs/by-name/fa/fava/package.nix index fa17fdda10f0..cf346b7c3640 100644 --- a/pkgs/by-name/fa/fava/package.nix +++ b/pkgs/by-name/fa/fava/package.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonApplication rec { pname = "fava"; - version = "1.28"; + version = "1.29"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-sWHVkR0/0VMGzH5OMxOCK4usf7G0odzMtr82ESRQhrk="; + hash = "sha256-UZZ142FchYXqPtHb6EWnKjV+xtJ0Gvu+SovTH6+kVn8="; }; postPatch = '' From 7642cf2bdcb5d7e14ec9bcf939a81c1490b76e96 Mon Sep 17 00:00:00 2001 From: fliiiix Date: Sat, 19 Oct 2024 14:59:08 +0200 Subject: [PATCH 05/54] kangaru: init at 4.3.2 --- pkgs/by-name/ka/kangaru/package.nix | 32 +++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/ka/kangaru/package.nix diff --git a/pkgs/by-name/ka/kangaru/package.nix b/pkgs/by-name/ka/kangaru/package.nix new file mode 100644 index 000000000000..372b2da899ba --- /dev/null +++ b/pkgs/by-name/ka/kangaru/package.nix @@ -0,0 +1,32 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "kangaru"; + version = "4.3.2"; + + src = fetchFromGitHub { + owner = "gracicot"; + repo = "kangaru"; + rev = "refs/tags/v${finalAttrs.version}"; + sha256 = "sha256-30gmNo68cDGmGjS75KySyORC6s1NBI925QuZyOv3Kag="; + }; + + nativeBuildInputs = [ + cmake + ]; + + doCheck = true; + + meta = { + description = "Inversion of control container for C++11, C++14 and later"; + homepage = "https://github.com/gracicot/kangaru"; + maintainers = with lib.maintainers; [ l33tname ]; + platforms = lib.platforms.all; + license = lib.licenses.mit; + }; +}) From 26b46c0cf611e79655d7a65b03105326e98bd76f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Oct 2024 02:19:15 +0000 Subject: [PATCH 06/54] python312Packages.mlflow: 2.16.2 -> 2.17.2 --- pkgs/development/python-modules/mlflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index ab01d055627f..6e0b46f058eb 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -70,14 +70,14 @@ buildPythonPackage rec { pname = "mlflow"; - version = "2.16.2"; + version = "2.17.2"; pyproject = true; src = fetchFromGitHub { owner = "mlflow"; repo = "mlflow"; rev = "refs/tags/v${version}"; - hash = "sha256-7W1gpVgJSN/iXoW987eCHfcOeE3D/ZJ2W/eilDdzOww="; + hash = "sha256-s3t6RAJh129d5XJKtMNxS0wgGO4mKbAfMCXDBXEKBxM="; }; # Remove currently broken dependency `shap`, a model explainability package. From 0a4aaa9d9a73735890cc7dca8db14c1aea0cb189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 4 Nov 2024 20:24:05 +0100 Subject: [PATCH 07/54] pkgs/stdenv/freebsd: update x86_64-unknown-freebsd bootstrap-files sha256sum of files to be uploaded: $ sha256sum /nix/store/yy36y5s9i4wl768imwfn112sb7w3pyk8-build/on-server/* a072dd769596c1efe2c58b9fde141f986ac6ba2c45dfe1bc1c29be07b8370b36 /nix/store/yy36y5s9i4wl768imwfn112sb7w3pyk8-build/on-server/bootstrap-tools.tar.xz 71ff3ba54f0741355948f403db95f2c54ae3b69dd39f991fdad17ae5ab623a77 /nix/store/yy36y5s9i4wl768imwfn112sb7w3pyk8-build/on-server/unpack.nar.xz Suggested commands to upload files to 'tarballs.nixos.org': $ nix-store --realize /nix/store/yy36y5s9i4wl768imwfn112sb7w3pyk8-build $ aws s3 cp --recursive --acl public-read /nix/store/yy36y5s9i4wl768imwfn112sb7w3pyk8-build/on-server/ s3://nixpkgs-tarballs/stdenv/x86_64-unknown-freebsd/b92edf1104c47016385e85c87c2d953cf5cd2f98 $ aws s3 cp --recursive s3://nixpkgs-tarballs/stdenv/x86_64-unknown-freebsd/b92edf1104c47016385e85c87c2d953cf5cd2f98 ./ $ sha256sum bootstrap-tools.tar.xz unpack.nar.xz $ sha256sum /nix/store/yy36y5s9i4wl768imwfn112sb7w3pyk8-build/on-server/* --- .../bootstrap-files/x86_64-unknown-freebsd.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/stdenv/freebsd/bootstrap-files/x86_64-unknown-freebsd.nix b/pkgs/stdenv/freebsd/bootstrap-files/x86_64-unknown-freebsd.nix index 2b0d620b906d..de7a004d51ab 100644 --- a/pkgs/stdenv/freebsd/bootstrap-files/x86_64-unknown-freebsd.nix +++ b/pkgs/stdenv/freebsd/bootstrap-files/x86_64-unknown-freebsd.nix @@ -2,20 +2,20 @@ # $ ./refresh-tarballs.bash --targets=x86_64-unknown-freebsd # # Metadata: -# - nixpkgs revision: 6414ef7ca3bf18ec4f9628d09ccc1eb030276ee2 +# - nixpkgs revision: b92edf1104c47016385e85c87c2d953cf5cd2f98 # - hydra build: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.x86_64-unknown-freebsd.build/latest -# - resolved hydra build: https://hydra.nixos.org/build/271214352 -# - instantiated derivation: /nix/store/aahbgs95ani3bd70vxb8kwrvbms0d6ii-build.drv -# - output directory: /nix/store/ikzxl9ws9yxrl8g8z2kcjwqlq5gfjbhx-build -# - build time: Sat, 31 Aug 2024 17:18:35 +0000 +# - resolved hydra build: https://hydra.nixos.org/build/276943819 +# - instantiated derivation: /nix/store/npq4w33g3a2gcgh1q535gj4ixd1g5ksl-build.drv +# - output directory: /nix/store/yy36y5s9i4wl768imwfn112sb7w3pyk8-build +# - build time: Thu, 31 Oct 2024 20:57:22 +0000 { bootstrapTools = import { - url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-freebsd/6414ef7ca3bf18ec4f9628d09ccc1eb030276ee2/bootstrap-tools.tar.xz"; - hash = "sha256-f7Fqxtpj7/0Sbs+kUgMs7oJ0JmPuh3bqD2YzOBTw2fc="; + url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-freebsd/b92edf1104c47016385e85c87c2d953cf5cd2f98/bootstrap-tools.tar.xz"; + hash = "sha256-oHLddpWWwe/ixYuf3hQfmGrGuixF3+G8HCm+B7g3CzY="; }; unpack = import { - url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-freebsd/6414ef7ca3bf18ec4f9628d09ccc1eb030276ee2/unpack.nar.xz"; - hash = "sha256-3NTRtonoc3ZqnEF3hr1mUPH/aw+04OlwVxGhZmjXlMM="; + url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-freebsd/b92edf1104c47016385e85c87c2d953cf5cd2f98/unpack.nar.xz"; + hash = "sha256-aR3lz35Y3ppJBG0/WAT8avsUeDgNMejhGf9LRxTiScI="; name = "unpack"; unpack = true; }; From e510e227beafdd3bcb5b4a3c0f6feefcb0d40c21 Mon Sep 17 00:00:00 2001 From: Wang Liao Date: Sat, 2 Nov 2024 22:36:14 +0800 Subject: [PATCH 08/54] kitty: Binary wrap kitty, and sign on darwin Using shell to wrap is slow and not recommended, this alsos fixes issue on aarch64-darwin sequoia 15.1. Also auto sign kitty to prevent permission error on x86_64-darwin. --- pkgs/applications/terminal-emulators/kitty/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+) diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index cab3a2103a54..70bb01e9346f 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -28,6 +28,8 @@ , go_1_23 , buildGo123Module , nix-update-script +, makeBinaryWrapper +, autoSignDarwinBinariesHook }: with python3Packages; @@ -85,9 +87,11 @@ buildPythonApplication rec { sphinx-inline-tabs go_1_23 fontconfig + makeBinaryWrapper ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ imagemagick libicns # For the png2icns tool. + autoSignDarwinBinariesHook ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland-scanner ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55968eed1355..14e646fc3db3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2813,6 +2813,7 @@ with pkgs; kitty = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/kitty { harfbuzz = harfbuzz.override { withCoreText = stdenv.hostPlatform.isDarwin; }; + inherit (darwin) autoSignDarwinBinariesHook; inherit (darwin.apple_sdk_11_0) Libsystem; inherit (darwin.apple_sdk_11_0.frameworks) Cocoa From 9360b490a87e2c2d2bef346ae8b9319951d35d4a Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 8 Nov 2024 09:57:03 +0100 Subject: [PATCH 09/54] distribution: 3.0.0-beta.1 -> 3.0.0-rc.1 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/di/distribution/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/di/distribution/package.nix b/pkgs/by-name/di/distribution/package.nix index 7f2e4c5407b7..c88851553530 100644 --- a/pkgs/by-name/di/distribution/package.nix +++ b/pkgs/by-name/di/distribution/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "distribution"; - version = "3.0.0-beta.1"; + version = "3.0.0-rc.1"; src = fetchFromGitHub { owner = "distribution"; repo = "distribution"; rev = "v${version}"; - hash = "sha256-tiTwrcRtOEIs1sCkzHXY1TPYw0TOdDvM2Y8YdgQjEmI="; + hash = "sha256-dfy3P8zAFlni2heQcz61+sjivHE97Syh/ICreTgxUAM="; }; vendorHash = null; From 2a4fc94d33fbc4ca2ba1a52e34779cb1f4f88bc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=97=8D+85CD?= <50108258+kwaa@users.noreply.github.com> Date: Fri, 8 Nov 2024 21:21:05 +0800 Subject: [PATCH 10/54] hatsu: 0.2.2 -> 0.3.0 https://github.com/importantimport/hatsu/releases/tag/v0.3.0 --- pkgs/by-name/ha/hatsu/package.nix | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/ha/hatsu/package.nix b/pkgs/by-name/ha/hatsu/package.nix index a5f5131d78ec..c395195a16a2 100644 --- a/pkgs/by-name/ha/hatsu/package.nix +++ b/pkgs/by-name/ha/hatsu/package.nix @@ -1,28 +1,21 @@ -{ cmake -, fetchFromGitHub -, gitUpdater -, lib -, openssl -, pkg-config -, rustPlatform +{ + fetchFromGitHub, + gitUpdater, + lib, + rustPlatform, }: rustPlatform.buildRustPackage rec { pname = "hatsu"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "importantimport"; repo = "hatsu"; - rev = "v${version}"; - hash = "sha256-iQrwqv5q002rJMcvUhlsLVN3O7mHyL5zmLGjegZDVG0="; + rev = "refs/tags/v${version}"; + hash = "sha256-K+8X/bNPdjxBSJdlFIXUUOXlTq7Cgol3fFToj5KzbeE="; }; - cargoHash = "sha256-LkGkifmHy7cEGrPg0WCf1nCGfcW60AGWQSB0Zb01mk0="; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ openssl ]; - - env = { OPENSSL_NO_VENDOR = true; }; + cargoHash = "sha256-+fNFy3WnQKtDjpNU3veoR2JrBNHj6/Wz2MQP38SR23I="; passthru.updateScript = gitUpdater { rev-prefix = "v"; @@ -32,6 +25,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Self-hosted and fully-automated ActivityPub bridge for static sites"; homepage = "https://github.com/importantimport/hatsu"; + changelog = "https://github.com/importantimport/hatsu/releases/tag/v${version}"; license = lib.licenses.agpl3Only; mainProgram = "hatsu"; maintainers = with lib.maintainers; [ kwaa ]; From 116732a9158048a8751537940793825aafc81c4a Mon Sep 17 00:00:00 2001 From: fliiiix Date: Sat, 2 Nov 2024 17:33:58 +0100 Subject: [PATCH 11/54] python312Packages.radish-bdd: fix missing yaml dependency ``` Traceback (most recent call last): File "/nix/store/m7wyckhw6ll6q2azfpivb0jqk9q9fm8z-python3.12-radish-bdd-0.17.1/bin/.radish-test-wrapped", line 6, in from radish.testing.__main__ import main File "/nix/store/m7wyckhw6ll6q2azfpivb0jqk9q9fm8z-python3.12-radish-bdd-0.17.1/lib/python3.12/site-packages/radish/testing/__main__.py", line 15, in from radish.testing.matches import test_step_matches_configs File "/nix/store/m7wyckhw6ll6q2azfpivb0jqk9q9fm8z-python3.12-radish-bdd-0.17.1/lib/python3.12/site-packages/radish/testing/matches.py", line 12, in import yaml ModuleNotFoundError: No module named 'yaml' ``` radish-test requires pyyaml at runtime. --- pkgs/development/python-modules/radish-bdd/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix index 6e350cbccf71..37661847952b 100644 --- a/pkgs/development/python-modules/radish-bdd/default.nix +++ b/pkgs/development/python-modules/radish-bdd/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { lxml parse-type pysingleton + pyyaml tag-expressions ]; @@ -48,7 +49,6 @@ buildPythonPackage rec { freezegun pytest-mock pytestCheckHook - pyyaml ]; pythonImportsCheck = [ "radish" ]; @@ -60,6 +60,9 @@ buildPythonPackage rec { homepage = "https://radish-bdd.github.io/"; changelog = "https://github.com/radish-bdd/radish/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; + maintainers = with maintainers; [ + kalbasit + l33tname + ]; }; } From 7e479605998792ca339e82947b4a3e9b328a6e8b Mon Sep 17 00:00:00 2001 From: fliiiix Date: Sat, 9 Nov 2024 17:49:36 +0100 Subject: [PATCH 12/54] python312Packages.radish-bdd: remove unused dependencies --- pkgs/development/python-modules/radish-bdd/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix index 37661847952b..501ef441dd45 100644 --- a/pkgs/development/python-modules/radish-bdd/default.nix +++ b/pkgs/development/python-modules/radish-bdd/default.nix @@ -1,13 +1,11 @@ { lib, buildPythonPackage, - click, colorful, docopt, fetchFromGitHub, freezegun, humanize, - lark, lxml, parse-type, pysingleton, @@ -33,11 +31,9 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - click colorful docopt humanize - lark lxml parse-type pysingleton From e4525288a6662939abdf9871d7ab0815a55aad1c Mon Sep 17 00:00:00 2001 From: fliiiix Date: Sat, 9 Nov 2024 18:12:33 +0100 Subject: [PATCH 13/54] python312Packages.radish-bdd: re-enable all tests --- pkgs/development/python-modules/radish-bdd/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix index 501ef441dd45..06e41abca237 100644 --- a/pkgs/development/python-modules/radish-bdd/default.nix +++ b/pkgs/development/python-modules/radish-bdd/default.nix @@ -49,8 +49,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "radish" ]; - disabledTests = [ "test_main_cli_calls" ]; - meta = with lib; { description = "Behaviour-Driven-Development tool for python"; homepage = "https://radish-bdd.github.io/"; From bcf8a7f4e0edb7cd5fa84b158a9b0cda43824825 Mon Sep 17 00:00:00 2001 From: fliiiix Date: Sat, 9 Nov 2024 19:21:03 +0100 Subject: [PATCH 14/54] python312Packages.radish-bdd: disable 3.9 and older since it breaks --- pkgs/development/python-modules/radish-bdd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix index 06e41abca237..6ce30ff6f81c 100644 --- a/pkgs/development/python-modules/radish-bdd/default.nix +++ b/pkgs/development/python-modules/radish-bdd/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { version = "0.17.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = pname; From 8aab227a0f76a38abe0e1f08dd23c5273f107867 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Oct 2024 05:43:57 +0000 Subject: [PATCH 15/54] yaru-theme: 24.04.3 -> 24.10.4 --- pkgs/by-name/ya/yaru-theme/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ya/yaru-theme/package.nix b/pkgs/by-name/ya/yaru-theme/package.nix index d4b074cf3301..9a059aa9dcc1 100644 --- a/pkgs/by-name/ya/yaru-theme/package.nix +++ b/pkgs/by-name/ya/yaru-theme/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "24.04.3"; + version = "24.10.4"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - hash = "sha256-Z0qW3hW5Sije5Hn6OB9f5M6xnmMmRnP76p0kjiQZznw="; + hash = "sha256-ioBni/prc2HzrXd6zBgZQQsfQDWxlfWOphtY0o/8uM0="; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; From bc25a76d0df67bdf102e7a7ef97352dffe525946 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Oct 2024 21:16:26 +0000 Subject: [PATCH 16/54] vitess: 20.0.2 -> 21.0.0 --- pkgs/by-name/vi/vitess/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vi/vitess/package.nix b/pkgs/by-name/vi/vitess/package.nix index 1363cf66b304..6e617ff8a036 100644 --- a/pkgs/by-name/vi/vitess/package.nix +++ b/pkgs/by-name/vi/vitess/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vitess"; - version = "20.0.2"; + version = "21.0.0"; src = fetchFromGitHub { owner = "vitessio"; repo = pname; rev = "v${version}"; - hash = "sha256-I+pz8bz/H1mg7cQnPiJZxYr1gyzajMLVqg8yHbBXYLc="; + hash = "sha256-F+iL1mvGH2B6Bp+wHpsoqJb3FcFdtaGZd6liVx1+A3g="; }; - vendorHash = "sha256-ZDPDL7vJoPv5pIS5xhHAgLiZsiF2B85KNnqGQJPk1SQ="; + vendorHash = "sha256-ash8IzT3mw7cpbkX/TU+lnIS7pSjaiFXuLbloZhuCBg="; buildInputs = [ sqlite ]; From bc7573cf2979a85a9f3042157da096067f3b9996 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 10 Nov 2024 14:04:20 +0100 Subject: [PATCH 17/54] mongodb-ce: 7.0.14 -> 8.0.3 --- pkgs/by-name/mo/mongodb-ce/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix index 3b7802b8178a..3dda7a06e1c5 100644 --- a/pkgs/by-name/mo/mongodb-ce/package.nix +++ b/pkgs/by-name/mo/mongodb-ce/package.nix @@ -15,24 +15,24 @@ }: let - version = "7.0.14"; + version = "8.0.3"; srcs = version: { "x86_64-linux" = { url = "https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2204-${version}.tgz"; - hash = "sha256-tM+MquEIeFE17Mi4atjtbfXW77hLm5WlDsui/CRs4IQ="; + hash = "sha256-AFnfK6ADPMBndL3k068IfY4wyD8Aa0/UZhY2g+jS31M="; }; "aarch64-linux" = { url = "https://fastdl.mongodb.org/linux/mongodb-linux-aarch64-ubuntu2204-${version}.tgz"; - hash = "sha256-4XiHv6JKopZ/3xrXwT+nvQ2OsbkhL79uwBCnOOMaNlc="; + hash = "sha256-7FGzHMdr8+1Bkx+3QFmDf/DGw5DxfDFEuzU6yICtOBo="; }; "x86_64-darwin" = { url = "https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-${version}.tgz"; - hash = "sha256-mw9w/qz3xBVC7n0JBeL4CQsJ1bhBPwyQeUBsCa/XosA="; + hash = "sha256-GUIFG7F/KNyoPu9HGMs0UVw/HyK5T7jwTrSGY55/UUE="; }; "aarch64-darwin" = { url = "https://fastdl.mongodb.org/osx/mongodb-macos-arm64-${version}.tgz"; - hash = "sha256-iAX4szgBzQe5ARjCXlB7DeIcatQms3X75J6Jb/xXXQ4="; + hash = "sha256-erTgU4XQ9Jh1ltPKbyyW6zf3hRHAcopGuHCRFw/AH5g="; }; }; in @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { text = '' # Get latest version string from Github - NEW_VERSION=$(curl -s "https://api.github.com/repos/mongodb/mongo/tags?per_page=1000" | jq -r 'first(.[] | .name | select(startswith("r7.0")) | select(contains("rc") | not) | .[1:])') + NEW_VERSION=$(curl -s "https://api.github.com/repos/mongodb/mongo/tags?per_page=1000" | jq -r 'first(.[] | .name | select(startswith("r8.0")) | select(contains("rc") | not) | .[1:])') # Check if the new version is available for download, if not, exit curl -s https://www.mongodb.com/try/download/community-edition/releases | pup 'h3:not([id]) text{}' | grep "$NEW_VERSION" @@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - changelog = "https://www.mongodb.com/docs/upcoming/release-notes/7.0/"; + changelog = "https://www.mongodb.com/docs/upcoming/release-notes/8.0/"; description = "MongoDB is a general purpose, document-based, distributed database."; homepage = "https://www.mongodb.com/"; license = with lib.licenses; [ sspl ]; From 4edd69e1824b0c91fe575f7e8a6bad0a9738335c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 10 Nov 2024 21:47:27 +0800 Subject: [PATCH 18/54] planify: 4.11.4 -> 4.11.6 https://github.com/alainm23/planify/compare/4.11.4...4.11.6 --- pkgs/by-name/pl/planify/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/planify/package.nix b/pkgs/by-name/pl/planify/package.nix index 7c10b9953cdc..06059f87fef8 100644 --- a/pkgs/by-name/pl/planify/package.nix +++ b/pkgs/by-name/pl/planify/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "planify"; - version = "4.11.4"; + version = "4.11.6"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; rev = version; - hash = "sha256-ADNMSXvfeAT53coAtCu3CVCU5XUFhLbvAH3WPFoKJVE="; + hash = "sha256-tHn3677bfJgAZnOfDjBJ87DUzr+e9I2lnCke/cN4olE="; }; nativeBuildInputs = [ From d547fa17c5435e96c083b127a436b62ac46ccb3f Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Sun, 10 Nov 2024 02:26:09 +0000 Subject: [PATCH 19/54] libiconv: fix android cross-compile --- pkgs/development/libraries/libiconv/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 9bb60501a065..3cf0e799cb7e 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -6,7 +6,7 @@ # assert !stdenv.hostPlatform.isLinux || stdenv.hostPlatform != stdenv.buildPlatform; # TODO: improve on cross -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { pname = "libiconv"; version = "1.17"; @@ -87,4 +87,7 @@ stdenv.mkDerivation rec { # This library is not needed on GNU platforms. hydraPlatforms = with lib.platforms; cygwin ++ darwin ++ freebsd; }; -} +} // lib.optionalAttrs (stdenv.hostPlatform.libc == "bionic") { + # https://github.com/NixOS/nixpkgs/pull/192630#discussion_r978985593 + hardeningDisable = [ "fortify" ]; +}) From b387ece6331becac38b82a635efc89fb0d1c26bc Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Sun, 10 Nov 2024 20:30:15 +0100 Subject: [PATCH 20/54] gaphor: 2.26.0 -> 2.27.0 --- pkgs/tools/misc/gaphor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/gaphor/default.nix b/pkgs/tools/misc/gaphor/default.nix index edea8bcad37a..ab017fb6065a 100644 --- a/pkgs/tools/misc/gaphor/default.nix +++ b/pkgs/tools/misc/gaphor/default.nix @@ -28,12 +28,12 @@ buildPythonApplication rec { pname = "gaphor"; - version = "2.26.0"; + version = "2.27.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-e0K5bfgPqlJh8qrAz40c/w3ANzkfa/6txuqzQDJYXfE="; + hash = "sha256-MsbEeOop6Osq2Hn6CkorsXt8/bTY//QHW/uCl0FEUN4="; }; pythonRelaxDeps = [ "defusedxml" ]; From 182a524cceac5f4d2699cf682bf44a101f5c66e7 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Fri, 8 Nov 2024 17:09:45 -0800 Subject: [PATCH 21/54] cpm-cmake: Set CURRENT_CPM_VERSION cpm-cmake has a test to see if the CURRENT_CPM_VERSION contains development-version, and if so, it produces a warning. By setting it to the correct value, this warning is dismissed --- pkgs/by-name/cp/cpm-cmake/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/cp/cpm-cmake/package.nix b/pkgs/by-name/cp/cpm-cmake/package.nix index 83d2019493c0..12920d3aa924 100644 --- a/pkgs/by-name/cp/cpm-cmake/package.nix +++ b/pkgs/by-name/cp/cpm-cmake/package.nix @@ -14,6 +14,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-KIRVztkE72juIgXquZlC6AYo78QKHBD7iCvCa+ri66k="; }; + postPatch = '' + substituteInPlace cmake/CPM.cmake \ + --replace-fail "set(CURRENT_CPM_VERSION 1.0.0-development-version)" "set(CURRENT_CPM_VERSION ${finalAttrs.version})" + ''; + dontConfigure = true; dontBuild = true; From ba62c1d84992ffb0f04fecfa19b88db79d6fea20 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Fri, 8 Nov 2024 17:12:06 -0800 Subject: [PATCH 22/54] cpm-cmake: Add pandapip1 to maintainers list --- pkgs/by-name/cp/cpm-cmake/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/cp/cpm-cmake/package.nix b/pkgs/by-name/cp/cpm-cmake/package.nix index 12920d3aa924..081c7daa3568 100644 --- a/pkgs/by-name/cp/cpm-cmake/package.nix +++ b/pkgs/by-name/cp/cpm-cmake/package.nix @@ -42,7 +42,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { simple API and more. ''; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ pandapip1 ]; platforms = platforms.all; }; }) From 612e61fd7a0f20f919feb3e01636a269cb8bfcbf Mon Sep 17 00:00:00 2001 From: Gavin John Date: Sat, 9 Nov 2024 00:56:58 -0800 Subject: [PATCH 23/54] cpm-cmake: nixfmt --- pkgs/by-name/cp/cpm-cmake/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cp/cpm-cmake/package.nix b/pkgs/by-name/cp/cpm-cmake/package.nix index 081c7daa3568..cb095ea37827 100644 --- a/pkgs/by-name/cp/cpm-cmake/package.nix +++ b/pkgs/by-name/cp/cpm-cmake/package.nix @@ -1,6 +1,7 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub +{ + lib, + stdenvNoCC, + fetchFromGitHub, }: stdenvNoCC.mkDerivation (finalAttrs: { From 7d627de21ba2b854c4b9510627d88cb2e85c282b Mon Sep 17 00:00:00 2001 From: Gavin John Date: Sat, 9 Nov 2024 00:57:57 -0800 Subject: [PATCH 24/54] cpm-cmake: remove a with lib from meta --- pkgs/by-name/cp/cpm-cmake/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/cp/cpm-cmake/package.nix b/pkgs/by-name/cp/cpm-cmake/package.nix index cb095ea37827..dbf54de2a448 100644 --- a/pkgs/by-name/cp/cpm-cmake/package.nix +++ b/pkgs/by-name/cp/cpm-cmake/package.nix @@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/cpm-cmake/CPM.cmake"; description = "CMake's missing package manager"; longDescription = '' @@ -42,8 +42,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { CMake's FetchContent module that adds version control, caching, a simple API and more. ''; - license = licenses.mit; - maintainers = with maintainers; [ pandapip1 ]; - platforms = platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pandapip1 ]; + platforms = lib.platforms.all; }; }) From ed331ebdcc2d472e5f7bf14b0c84d100e069f1bc Mon Sep 17 00:00:00 2001 From: Thomas Gebert Date: Sun, 10 Nov 2024 15:22:01 -0500 Subject: [PATCH 25/54] Fix lightworks by changing path load order. --- pkgs/by-name/li/lightworks/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/lightworks/package.nix b/pkgs/by-name/li/lightworks/package.nix index c803e906e2d8..5ecd39de3d93 100644 --- a/pkgs/by-name/li/lightworks/package.nix +++ b/pkgs/by-name/li/lightworks/package.nix @@ -93,7 +93,7 @@ let $out/lib/lightworks/ntcardvt wrapProgram $out/lib/lightworks/ntcardvt \ - --prefix LD_LIBRARY_PATH : ${fullPath}:$out/lib/lightworks \ + --prefix LD_LIBRARY_PATH : $out/lib/lightworks:${fullPath} \ --set FONTCONFIG_FILE $out/lib/lightworks/fonts.conf cp -r usr/share $out/share From 460de2af5ce9f93b51501d2ea2dcbed59fb30328 Mon Sep 17 00:00:00 2001 From: misilelab Date: Mon, 11 Nov 2024 09:26:46 +0900 Subject: [PATCH 26/54] process-compose: 1.34.0 -> 1.40.1 Signed-off-by: misilelab --- pkgs/by-name/pr/process-compose/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/process-compose/package.nix b/pkgs/by-name/pr/process-compose/package.nix index 1ad3cc0816dc..0c8e98ed50fd 100644 --- a/pkgs/by-name/pr/process-compose/package.nix +++ b/pkgs/by-name/pr/process-compose/package.nix @@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config"; in buildGoModule rec { pname = "process-compose"; - version = "1.34.0"; + version = "1.40.1"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-Ymd3X6qvdYENbjb2F0ajjb1j0tuy835W6YWCeuvLoXc="; + hash = "sha256-/A/5tdALlb1ultEPTj6+EztjGc7PT9O7VyWey/EyLbQ="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -43,7 +43,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-G4ar+9ARBwR77t/6NswUDXpUw38rYnLy9lIep302mNI="; + vendorHash = "sha256-ekNISmU9TVi+YA2f3uJVyMsv8xkT8DmDUBw1ASqIfcY="; doCheck = false; From 18f9b02f6d8d204f120c0f38063e2bba1629f0e7 Mon Sep 17 00:00:00 2001 From: Alex James Date: Sun, 10 Nov 2024 23:24:03 -0600 Subject: [PATCH 27/54] mkvtoolnix: migrate to new apple-sdk pattern Tracked by #354146. --- pkgs/applications/video/mkvtoolnix/default.nix | 3 +-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 54fa98268a6f..a180694e98db 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -99,8 +99,7 @@ stdenv.mkDerivation rec { zlib ] ++ optionals withGUI [ cmark ] - ++ optionals stdenv.hostPlatform.isLinux [ qtwayland ] - ++ optionals stdenv.hostPlatform.isDarwin [ libiconv ]; + ++ optionals stdenv.hostPlatform.isLinux [ qtwayland ]; # autoupdate is not needed but it silences a ton of pointless warnings postPatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50d342fe4ecd..d38bda47def5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10507,9 +10507,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) AppKit Cocoa Carbon CoreAudio CoreMIDI CoreServices Kernel; }; - mkvtoolnix = qt6Packages.callPackage ../applications/video/mkvtoolnix { - stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; - }; + mkvtoolnix = qt6Packages.callPackage ../applications/video/mkvtoolnix { }; mkvtoolnix-cli = mkvtoolnix.override { withGUI = false; From 5d6ebba21e7e7d0cf180928124f5b47fa5ca5700 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 11 Nov 2024 08:46:45 +0100 Subject: [PATCH 28/54] python312Packages.aioslimproto: refactor --- .../python-modules/aioslimproto/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aioslimproto/default.nix b/pkgs/development/python-modules/aioslimproto/default.nix index 037c74bc9b99..f7d183bb1d61 100644 --- a/pkgs/development/python-modules/aioslimproto/default.nix +++ b/pkgs/development/python-modules/aioslimproto/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { version = "3.1.0"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "home-assistant-libs"; @@ -25,12 +25,12 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "--cov" "" + --replace-fail 'version = "0.0.0"' 'version = "${version}"' ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp async-timeout pillow @@ -45,7 +45,7 @@ buildPythonPackage rec { description = "Module to control Squeezebox players"; homepage = "https://github.com/home-assistant-libs/aioslimproto"; changelog = "https://github.com/home-assistant-libs/aioslimproto/releases/tag/${version}"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } From 8581af3f1bc565582abccb6da2ddf9219b281f3e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 11 Nov 2024 08:48:58 +0100 Subject: [PATCH 29/54] metasploit: 6.4.34 -> 6.4.35 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 6 +++--- pkgs/tools/security/metasploit/default.nix | 4 ++-- pkgs/tools/security/metasploit/gemset.nix | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 746bda19b7a2..1d1d18028d73 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.34" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.35" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 50a46d730477..dd31cae7f785 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: e9286ec3faffa15e12ef3e267da335cd4afdfaea - ref: refs/tags/6.4.34 + revision: 5c56ef7e53090ba4a2a019269e2a632edbbe1692 + ref: refs/tags/6.4.35 specs: - metasploit-framework (6.4.34) + metasploit-framework (6.4.35) aarch64 abbrev actionpack (~> 7.0.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index bf4df0eeef3c..782312de8a66 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.4.34"; + version = "6.4.35"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-2ZYyvASTh1vqBolUCyp8lNLgTPv0tFd7+qZe3KpkDhk="; + hash = "sha256-oAz/74dt/Wcm4FX/kvJ0v3vz5ugp0Muu0Tx+w10cVz4="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 752912eabdc5..aeb9e5acc88c 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -734,12 +734,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "e9286ec3faffa15e12ef3e267da335cd4afdfaea"; - sha256 = "068fcjmdqpm6z9xmgd7lzd6f1lllghm0nm490vm5p1wk0jy355nr"; + rev = "5c56ef7e53090ba4a2a019269e2a632edbbe1692"; + sha256 = "0gjp3ifw6ziws6pcpl19x3kg6yxzfkr95zsmw0k6gzbdhzpzy350"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.4.34"; + version = "6.4.35"; }; metasploit-model = { groups = ["default"]; From 43f0d6603f68898fcc4c0160180ad2ffe36cd871 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sun, 27 Oct 2024 18:11:34 +0100 Subject: [PATCH 30/54] python3Packages.django-cms: init at 4.1.3 --- .../python-modules/django-cms/default.nix | 101 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 103 insertions(+) create mode 100644 pkgs/development/python-modules/django-cms/default.nix diff --git a/pkgs/development/python-modules/django-cms/default.nix b/pkgs/development/python-modules/django-cms/default.nix new file mode 100644 index 000000000000..34f61bdfd6e6 --- /dev/null +++ b/pkgs/development/python-modules/django-cms/default.nix @@ -0,0 +1,101 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + django, + pythonOlder, + setuptools, + django-classy-tags, + django-formtools, + django-treebeard, + django-sekizai, + djangocms-admin-style, + python, + dj-database-url, + djangocms-text-ckeditor, + fetchpatch, + django-cms, + gettext, + iptools, +}: + +buildPythonPackage rec { + pname = "django-cms"; + version = "4.1.3"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "django-cms"; + repo = "django-cms"; + rev = "refs/tags/${version}"; + hash = "sha256-ucGxc6f2UYdmSLuyxVV2nIcl35qoeQMlk1paN6XeBFY="; + }; + + patches = [ + # Removed django-app-manage dependency by updating ./manage.py + # https://github.com/django-cms/django-cms/pull/8061 + (fetchpatch { + url = "https://github.com/django-cms/django-cms/commit/3270edb72f6a736b5cb448864ce2eaf68f061740.patch"; + hash = "sha256-DkgAfE/QGAXwKMNvgcYxtO0yAc7oAaAAui2My8ml1Vk="; + name = "remove_django_app_manage_dependency.patch"; + }) + (fetchpatch { + url = "https://github.com/django-cms/django-cms/pull/8061/commits/04005ff693e775db645c62fefbb62367822e66f9.patch"; + hash = "sha256-4M/VKEv7pnqCk6fDyA6FurSCCu/k9tNnz16wT4Tr0Rw="; + name = "manage_py_update_dj_database_url.patch"; + }) + ]; + + build-system = [ setuptools ]; + + dependencies = [ + django + django-classy-tags + django-formtools + django-treebeard + django-sekizai + djangocms-admin-style + ]; + + nativeCheckInputs = [ gettext ]; + + checkInputs = [ + dj-database-url + djangocms-text-ckeditor + iptools + ]; + + preCheck = '' + # Disable ruff formatter test + rm cms/tests/test_static_analysis.py + ''; + + checkPhase = '' + runHook preCheck + ${python.interpreter} manage.py test + runHook postCheck + ''; + + # Tests depend on djangocms-text-ckeditor and djangocms-admin-style, + # which depends on this package. + # To avoid infinite recursion, we only enable tests when building passthru.tests. + doCheck = false; + + passthru.tests = { + runTests = django-cms.overridePythonAttrs (_: { + doCheck = true; + }); + }; + + pythonImportCheck = [ "cms" ]; + + meta = { + description = "Lean enterprise content management powered by Django"; + homepage = "https://django-cms.org"; + changelog = "https://github.com/django-cms/django-cms/releases/tag/${version}"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.onny ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb1a12c33f6a..fd1fe1b4ebc0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3367,6 +3367,8 @@ self: super: with self; { django-cleanup = callPackage ../development/python-modules/django-cleanup { }; + django-cms = callPackage ../development/python-modules/django-cms { }; + django-colorful = callPackage ../development/python-modules/django-colorful { }; django-compressor = callPackage ../development/python-modules/django-compressor { }; From f56f7e0c2a5a35eb1c5a5420b9d753d62d831fa9 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 24 Oct 2024 08:23:57 +0200 Subject: [PATCH 31/54] python3Packages.djangocms-admin-style: init at 3.3.1 --- .../djangocms-admin-style/default.nix | 73 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 75 insertions(+) create mode 100644 pkgs/development/python-modules/djangocms-admin-style/default.nix diff --git a/pkgs/development/python-modules/djangocms-admin-style/default.nix b/pkgs/development/python-modules/djangocms-admin-style/default.nix new file mode 100644 index 000000000000..98791482ec83 --- /dev/null +++ b/pkgs/development/python-modules/djangocms-admin-style/default.nix @@ -0,0 +1,73 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + django, + pythonOlder, + pytestCheckHook, + setuptools, + pytest-django, + django-cms, + djangocms-admin-style, +}: + +buildPythonPackage rec { + pname = "djangocms-admin-style"; + version = "3.3.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "django-cms"; + repo = "djangocms-admin-style"; + rev = "refs/tags/${version}"; + hash = "sha256-cDbmC7IJTT3NuVXBnbUVqC7dUfusMdntDGu2tSvxIdQ="; + }; + + build-system = [ setuptools ]; + + dependencies = [ django ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-django + ]; + + checkInputs = [ django-cms ]; + + preCheck = '' + export DJANGO_SETTINGS_MODULE="tests.settings" + ''; + + disabledTests = [ + # django.template.exceptions.TemplateDoesNotExist: admin/inc/cms_upgrade_notification.html + "test_render_update_notification" + # AssertionError: 'my site' != 'example.com' + "test_current_site_name" + # django.core.exceptions.ImproperlyConfigured: settings.DATABASES is improperly configured + "test_render_update_notification" + "test_current_site_name" + "test_for_missing_migrations" + ]; + + # Tests depend on django-cms which depends on this package. + # To avoid infinite recursion, we only enable tests when building passthru.tests. + doCheck = false; + + passthru.tests = { + runTests = djangocms-admin-style.overridePythonAttrs (_: { + doCheck = true; + }); + }; + + pythonImportCheck = [ "djangocms_admin_style" ]; + + meta = { + description = "Django Theme tailored to the needs of django CMS"; + homepage = "https://django-cms.org"; + changelog = "https://github.com/django-cms/djangocms-admin-style/releases/tag/${version}"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.onny ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fd1fe1b4ebc0..ebe72fdbb1f8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3319,6 +3319,8 @@ self: super: with self; { # Pre-release django_5 = callPackage ../development/python-modules/django/5.nix { }; + djangocms-admin-style = callPackage ../development/python-modules/djangocms-admin-style { }; + django-admin-datta = callPackage ../development/python-modules/django-admin-datta { }; django-admin-sortable2 = callPackage ../development/python-modules/django-admin-sortable2 { }; From 88890306fe58a4e1ef1fe26f4314ca1789f2bfac Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 4 Nov 2024 15:06:34 +0100 Subject: [PATCH 32/54] python3Packages.djangocms-text-ckeditor: init at 5.1.6 --- .../djangocms-text-ckeditor/default.nix | 56 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/python-modules/djangocms-text-ckeditor/default.nix diff --git a/pkgs/development/python-modules/djangocms-text-ckeditor/default.nix b/pkgs/development/python-modules/djangocms-text-ckeditor/default.nix new file mode 100644 index 000000000000..006ff490534c --- /dev/null +++ b/pkgs/development/python-modules/djangocms-text-ckeditor/default.nix @@ -0,0 +1,56 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + pytestCheckHook, + setuptools, + html5lib, + pillow, + django-cms, + pytest-django, +}: + +buildPythonPackage rec { + pname = "djangocms-text-ckeditor"; + version = "5.1.6"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit version; + pname = "djangocms_text_ckeditor"; + hash = "sha256-ow2S4FJkO037QUkAf3FheVl2O4BaLw1PSSCVRBhlRX0="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + django-cms + html5lib + pillow + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-django + ]; + + preCheck = '' + export DJANGO_SETTINGS_MODULE="tests.settings" + ''; + + # Tests require module "djangocms-helper" which is not yet packaged + doCheck = false; + + pythonImportCheck = [ "djangocms_text_ckeditor" ]; + + meta = { + description = "Text Plugin for django CMS using CKEditor 4"; + homepage = "https://github.com/django-cms/djangocms-text-ckeditor"; + changelog = "https://github.com/django-cms/djangocms-text-ckeditor/blob/${version}/CHANGELOG.rst"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.onny ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ebe72fdbb1f8..85e07eee808c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3321,6 +3321,8 @@ self: super: with self; { djangocms-admin-style = callPackage ../development/python-modules/djangocms-admin-style { }; + djangocms-text-ckeditor = callPackage ../development/python-modules/djangocms-text-ckeditor { }; + django-admin-datta = callPackage ../development/python-modules/django-admin-datta { }; django-admin-sortable2 = callPackage ../development/python-modules/django-admin-sortable2 { }; From 910a10db55e98f97a5c4b1436de6ee68c3601a58 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 8 Nov 2024 09:57:34 +0100 Subject: [PATCH 33/54] distribution: add katexochen as maintainer Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/di/distribution/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/di/distribution/package.nix b/pkgs/by-name/di/distribution/package.nix index c88851553530..1db56b79cbde 100644 --- a/pkgs/by-name/di/distribution/package.nix +++ b/pkgs/by-name/di/distribution/package.nix @@ -45,7 +45,7 @@ buildGoModule rec { homepage = "https://distribution.github.io/distribution/"; changelog = "https://github.com/distribution/distribution/releases/tag/v${version}"; license = licenses.asl20; - maintainers = [ ]; + maintainers = with lib.maintainers; [ katexochen ]; mainProgram = "registry"; platforms = platforms.unix; }; From d24cfa145239b3f4ccaab853f2babb70e5148679 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 11 Nov 2024 11:40:47 +0100 Subject: [PATCH 34/54] python312Packages.wsgidav: add inputs for cli usage Fixes #355155 --- .../python-modules/wsgidav/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/wsgidav/default.nix b/pkgs/development/python-modules/wsgidav/default.nix index c05415323093..5717b1779da7 100644 --- a/pkgs/development/python-modules/wsgidav/default.nix +++ b/pkgs/development/python-modules/wsgidav/default.nix @@ -2,13 +2,14 @@ lib, buildPythonPackage, cheroot, - fetchFromGitHub, - pytestCheckHook, - pythonOlder, defusedxml, + fetchFromGitHub, jinja2, json5, + lxml, + pytestCheckHook, python-pam, + pythonOlder, pyyaml, requests, setuptools, @@ -37,12 +38,16 @@ buildPythonPackage rec { defusedxml jinja2 json5 - python-pam + cheroot + lxml pyyaml ]; + optional-dependencies = { + pam = [ python-pam ]; + }; + nativeCheckInputs = [ - cheroot pytestCheckHook requests webtest From ed5d274df7adc1160c73ad5826dbb5f9206c684f Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 8 Nov 2024 15:51:39 +0100 Subject: [PATCH 35/54] nixos/athens: update docs Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- nixos/modules/services/development/athens.md | 23 ++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/development/athens.md b/nixos/modules/services/development/athens.md index 2795930b0a02..6f8181561913 100644 --- a/nixos/modules/services/development/athens.md +++ b/nixos/modules/services/development/athens.md @@ -37,7 +37,7 @@ If you want to prevent Athens from writing to disk, you can instead configure it } ``` -To use the local proxy in Go builds, you can set the proxy as environment variable: +To use the local proxy in Go builds (outside of `nix`), you can set the proxy as environment variable: ```nix { @@ -47,6 +47,21 @@ To use the local proxy in Go builds, you can set the proxy as environment variab } ``` -It is currently not possible to use the local proxy for builds done by the Nix daemon. This might be enabled -by experimental features, specifically [`configurable-impure-env`](https://nixos.org/manual/nix/unstable/contributing/experimental-features#xp-feature-configurable-impure-env), -in upcoming Nix versions. +To also use the local proxy for Go builds happening in `nix` (with `buildGoModule`), the nix daemon can be configured to pass the GOPROXY environment variable to the `goModules` fixed-output derivation. + +This can either be done via the nix-daemon systemd unit: + +```nix +{ + systemd.services.nix-daemon.environment.GOPROXY = "http://localhost:3000"; +} +``` + +or via the [impure-env experimental feature](https://nix.dev/manual/nix/2.24/command-ref/conf-file#conf-impure-env): + +```nix +{ + nix.settings.experimental-features = [ "configurable-impure-env" ]; + nix.settings.impure-env = "GOPROXY=http://localhost:3000"; +} +``` From ec02a76ff51822a6ad78f50988b432bc9e4949a9 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Mon, 21 Oct 2024 16:14:51 -0400 Subject: [PATCH 36/54] chroot-realpath: init Now it's placed between initrd-switch-root.target and initrd-switch-root.service, meaning it is truly the last thing to happen before switch-root, as it should be. --- pkgs/by-name/ch/chroot-realpath/package.nix | 21 ++++++++++++++++ .../by-name/ch/chroot-realpath/src/Cargo.lock | 7 ++++++ .../by-name/ch/chroot-realpath/src/Cargo.toml | 9 +++++++ .../ch/chroot-realpath/src/src/main.rs | 24 +++++++++++++++++++ 4 files changed, 61 insertions(+) create mode 100644 pkgs/by-name/ch/chroot-realpath/package.nix create mode 100644 pkgs/by-name/ch/chroot-realpath/src/Cargo.lock create mode 100644 pkgs/by-name/ch/chroot-realpath/src/Cargo.toml create mode 100644 pkgs/by-name/ch/chroot-realpath/src/src/main.rs diff --git a/pkgs/by-name/ch/chroot-realpath/package.nix b/pkgs/by-name/ch/chroot-realpath/package.nix new file mode 100644 index 000000000000..af537cb48e45 --- /dev/null +++ b/pkgs/by-name/ch/chroot-realpath/package.nix @@ -0,0 +1,21 @@ +{ + lib, + rustPlatform, +}: + +let + cargo = lib.importTOML ./src/Cargo.toml; +in +rustPlatform.buildRustPackage { + pname = cargo.package.name; + version = cargo.package.version; + + src = ./src; + + cargoLock.lockFile = ./src/Cargo.lock; + + meta = { + description = "Output a path's realpath within a chroot."; + maintainers = [ lib.maintainers.elvishjerricco ]; + }; +} diff --git a/pkgs/by-name/ch/chroot-realpath/src/Cargo.lock b/pkgs/by-name/ch/chroot-realpath/src/Cargo.lock new file mode 100644 index 000000000000..d00f13df1877 --- /dev/null +++ b/pkgs/by-name/ch/chroot-realpath/src/Cargo.lock @@ -0,0 +1,7 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "chroot-realpath" +version = "0.1.0" diff --git a/pkgs/by-name/ch/chroot-realpath/src/Cargo.toml b/pkgs/by-name/ch/chroot-realpath/src/Cargo.toml new file mode 100644 index 000000000000..52348e7596e9 --- /dev/null +++ b/pkgs/by-name/ch/chroot-realpath/src/Cargo.toml @@ -0,0 +1,9 @@ +[package] +name = "chroot-realpath" +version = "0.1.0" +edition = "2021" + +[dependencies] + +[profile.release] +opt-level = "z" diff --git a/pkgs/by-name/ch/chroot-realpath/src/src/main.rs b/pkgs/by-name/ch/chroot-realpath/src/src/main.rs new file mode 100644 index 000000000000..4e7873bf0798 --- /dev/null +++ b/pkgs/by-name/ch/chroot-realpath/src/src/main.rs @@ -0,0 +1,24 @@ +use std::env; +use std::io::{stdout, Error, ErrorKind, Write}; +use std::os::unix::ffi::OsStrExt; +use std::os::unix::fs; + +fn main() -> std::io::Result<()> { + let args: Vec = env::args().collect(); + + if args.len() != 3 { + return Err(Error::new( + ErrorKind::InvalidInput, + format!("Usage: {} ", args[0]), + )); + } + + fs::chroot(&args[1])?; + std::env::set_current_dir("/")?; + + let path = std::fs::canonicalize(&args[2])?; + + stdout().write_all(path.into_os_string().as_bytes())?; + + Ok(()) +} From f065a81ab496a43b864398107754257bcd756fce Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Mon, 21 Oct 2024 16:14:51 -0400 Subject: [PATCH 37/54] nixos/systemd-stage-1: Use chroot-realpath --- nixos/modules/system/boot/systemd/initrd.nix | 7 +++++-- nixos/modules/system/etc/etc-activation.nix | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 1915fef59cc4..e7c5c81770a1 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -482,6 +482,9 @@ in { # so NSS can look up usernames "${pkgs.glibc}/lib/libnss_files.so.2" + + # Resolving sysroot symlinks without code exec + "${pkgs.chroot-realpath}/bin/chroot-realpath" ] ++ optionals cfg.package.withCryptsetup [ # fido2 support "${cfg.package}/lib/cryptsetup/libcryptsetup-token-systemd-fido2.so" @@ -522,7 +525,7 @@ in { script = /* bash */ '' set -uo pipefail - export PATH="/bin:${cfg.package.util-linux}/bin" + export PATH="/bin:${cfg.package.util-linux}/bin:${pkgs.chroot-realpath}/bin" # Figure out what closure to boot closure= @@ -543,7 +546,7 @@ in { # Resolve symlinks in the init parameter. We need this for some boot loaders # (e.g. boot.loader.generationsDir). - closure="$(chroot /sysroot ${pkgs.coreutils}/bin/realpath "$closure")" + closure="$(chroot-realpath /sysroot "$closure")" # Assume the directory containing the init script is the closure. closure="$(dirname "$closure")" diff --git a/nixos/modules/system/etc/etc-activation.nix b/nixos/modules/system/etc/etc-activation.nix index 944920e92335..733166a9175e 100644 --- a/nixos/modules/system/etc/etc-activation.nix +++ b/nixos/modules/system/etc/etc-activation.nix @@ -139,10 +139,10 @@ closure="$(realpath /nixos-closure)" - metadata_image="$(chroot /sysroot ${lib.getExe' pkgs.coreutils "realpath"} "$closure/etc-metadata-image")" + metadata_image="$(${pkgs.chroot-realpath}/bin/chroot-realpath /sysroot "$closure/etc-metadata-image")" ln -s "/sysroot$metadata_image" /etc-metadata-image - basedir="$(chroot /sysroot ${lib.getExe' pkgs.coreutils "realpath"} "$closure/etc-basedir")" + basedir="$(${pkgs.chroot-realpath}/bin/chroot-realpath /sysroot "$closure/etc-basedir")" ln -s "/sysroot$basedir" /etc-basedir ''; }; From 6cfd95fc8ca6fe7cf46c43c81f670869a1929333 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 15 Oct 2024 13:35:50 -0400 Subject: [PATCH 38/54] nixos/systemd-stage-1: Order nixos activation after initrd-switch-root.target Now it's placed between initrd-switch-root.target and initrd-switch-root.service, meaning it is truly the last thing to happen before switch-root, as it should be. --- nixos/modules/system/boot/systemd/initrd.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index e7c5c81770a1..e3fadf592925 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -581,14 +581,10 @@ in { ]; services.initrd-nixos-activation = { - requires = [ - config.boot.initrd.systemd.services.initrd-find-nixos-closure.name - ]; - after = [ - "initrd-fs.target" - config.boot.initrd.systemd.services.initrd-find-nixos-closure.name - ]; - requiredBy = [ "initrd.target" ]; + after = [ "initrd-switch-root.target" ]; + requiredBy = [ "initrd-switch-root.service" ]; + before = [ "initrd-switch-root.service" ]; + unitConfig.DefaultDependencies = false; unitConfig = { AssertPathExists = "/etc/initrd-release"; RequiresMountsFor = [ From b4e761788c32ee74ccda5fd855d4decdeab8f227 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 11 Nov 2024 11:56:45 +0100 Subject: [PATCH 39/54] ldeep: 1.0.72 -> 1.0.73 Diff: https://github.com/franc-pentest/ldeep/compare/refs/tags/1.0.72...1.0.73 Changelog: https://github.com/franc-pentest/ldeep/releases/tag/1.0.73 --- pkgs/by-name/ld/ldeep/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ld/ldeep/package.nix b/pkgs/by-name/ld/ldeep/package.nix index 229a106b14df..bf5f0fa97207 100644 --- a/pkgs/by-name/ld/ldeep/package.nix +++ b/pkgs/by-name/ld/ldeep/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ldeep"; - version = "1.0.72"; + version = "1.0.73"; pyproject = true; src = fetchFromGitHub { owner = "franc-pentest"; repo = "ldeep"; rev = "refs/tags/${version}"; - hash = "sha256-WfrQd0P1TegeIwxQVycgx2n+IxqnKLRF1wxzNnjHaEo="; + hash = "sha256-rFcl7Zf8Q6eugcEL79xpKIvXuhDdI6iEyAPDtqGX6xw="; }; pythonRelaxDeps = [ From 180d20dba8d85b315b768a5f1826da297a9e1f9f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 11 Nov 2024 12:11:25 +0100 Subject: [PATCH 40/54] checkov: 3.2.283 -> 3.2.286 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.283...3.2.286 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.286 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index a865f6fdbca2..03e3afcb0658 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.283"; + version = "3.2.286"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-9izC3O5e6GY/4OLkFLnUOoiFSnxdaS22qPSD3uYXSOE="; + hash = "sha256-HW1maTuRqieOzvdpMAxs4h5SpTZ3FyKGmmDof0UItOE="; }; patches = [ ./flake8-compat-5.x.patch ]; From 0fd251527577dd6d5895703ce53aa4ae309c89f4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 11 Nov 2024 13:18:42 +0100 Subject: [PATCH 41/54] python312Packages.webexteamssdk: 1.6.1 -> 2.0.1 Diff: https://github.com/CiscoDevNet/webexteamssdk/compare/refs/tags/v1.6.1...v2.0.1 Changelog: https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/v2.0.1 --- .../python-modules/webexteamssdk/default.nix | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexteamssdk/default.nix index 30eeb64d83a1..d44f10340be9 100644 --- a/pkgs/development/python-modules/webexteamssdk/default.nix +++ b/pkgs/development/python-modules/webexteamssdk/default.nix @@ -3,36 +3,31 @@ buildPythonPackage, fetchFromGitHub, future, + poetry-core, + poetry-dynamic-versioning, pyjwt, pythonOlder, - requests, requests-toolbelt, - setuptools, - versioneer, + requests, }: buildPythonPackage rec { pname = "webexteamssdk"; - version = "1.6.1"; + version = "2.0.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "CiscoDevNet"; repo = "webexteamssdk"; rev = "refs/tags/v${version}"; - hash = "sha256-xlkmXl4tVm48drXmkUijv9GNXzJcDnfSKbOMciPIRRo="; + hash = "sha256-ENAUUicVO/Br7k+RFHCGzQ7BIG0CP7jTYM3tzs5EAZQ="; }; - postPatch = '' - # Remove vendorized versioneer - rm versioneer.py - ''; - build-system = [ - setuptools - versioneer + poetry-core + poetry-dynamic-versioning ]; dependencies = [ @@ -45,13 +40,13 @@ buildPythonPackage rec { # Tests require a Webex Teams test domain doCheck = false; - pythonImportsCheck = [ "webexteamssdk" ]; + pythonImportsCheck = [ "webexpythonsdk" ]; meta = with lib; { description = "Python module for Webex Teams APIs"; homepage = "https://github.com/CiscoDevNet/webexteamssdk"; changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/v${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From 4e32d39fa0943377792662802526ea2b9b3643c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Nov 2024 14:21:02 +0000 Subject: [PATCH 42/54] hcxtools: 6.3.4 -> 6.3.5 --- pkgs/by-name/hc/hcxtools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hc/hcxtools/package.nix b/pkgs/by-name/hc/hcxtools/package.nix index 1d52561e1888..bde3dc8adec9 100644 --- a/pkgs/by-name/hc/hcxtools/package.nix +++ b/pkgs/by-name/hc/hcxtools/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxtools"; - version = "6.3.4"; + version = "6.3.5"; src = fetchFromGitHub { owner = "ZerBea"; repo = pname; rev = version; - sha256 = "sha256-03NPzSThmUPAEg5dBr2QkwaXPgGeu/lEe9nqhY8EkyA="; + sha256 = "sha256-8VfGiIXl/F2wgCMuS3+lt9sT/re9YgoRKwzgSHCir04="; }; nativeBuildInputs = [ pkg-config ]; From 4b218086be8ebc35f7f6a390cb8d65bfc1803bec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 11 Nov 2024 11:25:29 -0300 Subject: [PATCH 43/54] sfwbar: 1.0_beta15 -> 1.0_beta16 --- pkgs/by-name/sf/sfwbar/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sf/sfwbar/package.nix b/pkgs/by-name/sf/sfwbar/package.nix index 94f55c9dbd24..f862473a27ec 100644 --- a/pkgs/by-name/sf/sfwbar/package.nix +++ b/pkgs/by-name/sf/sfwbar/package.nix @@ -17,7 +17,7 @@ wayland-scanner, }: let - version = "1.0_beta15"; + version = "1.0_beta16"; in stdenv.mkDerivation { pname = "sfwbar"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { owner = "LBCrion"; repo = "sfwbar"; rev = "v${version}"; - hash = "sha256-nNtnHOM/ArbYx5ZGlnxgMB33YaGAOigxgW4SAywg66Q="; + hash = "sha256-jMEbw3Xla2cod/oKFQ4bD3sTHi7DZ0deG0H0Yt0Y7ck="; }; buildInputs = [ From 171c84558ebeb72aaf359108d630b19e8969c6ae Mon Sep 17 00:00:00 2001 From: reedrw Date: Mon, 11 Nov 2024 13:42:14 -0500 Subject: [PATCH 44/54] picom: 12.3 -> 12.4 --- pkgs/by-name/pi/picom/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pi/picom/package.nix b/pkgs/by-name/pi/picom/package.nix index 4af6c85efb5a..ae649d49c456 100644 --- a/pkgs/by-name/pi/picom/package.nix +++ b/pkgs/by-name/pi/picom/package.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "picom"; - version = "12.3"; + version = "12.4"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; rev = "v${finalAttrs.version}"; - hash = "sha256-FwjMlHP8xNJikkPpz+8BORrqqKYvRpkqm9GbExCoLAU="; + hash = "sha256-5kScnKUHck86fsYrraeV2O2r6fsVFllRMp4GeNT627A="; fetchSubmodules = true; }; From 772cc1be0b4b2ae512f92c470725520ef78db22c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Kupcsik?= Date: Mon, 11 Nov 2024 22:06:30 +0100 Subject: [PATCH 45/54] invidious: 2.20240825.2 -> 2.20241110.0 --- pkgs/servers/invidious/shards.nix | 25 +++++++++++++++---------- pkgs/servers/invidious/versions.json | 8 ++++---- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/servers/invidious/shards.nix b/pkgs/servers/invidious/shards.nix index 97979576efa6..bdd058481148 100644 --- a/pkgs/servers/invidious/shards.nix +++ b/pkgs/servers/invidious/shards.nix @@ -11,19 +11,24 @@ }; backtracer = { url = "https://github.com/sija/backtracer.cr.git"; - rev = "v1.2.1"; - sha256 = "02r1l7rn2wsljkx495s5s7j04zgn73m2kx0hkzs7620camvlwbqq"; + rev = "v1.2.2"; + sha256 = "1rknyylsi14m7i77x7c3138wdw27i4f6sd78m3srw851p47bwr20"; }; db = { url = "https://github.com/crystal-lang/crystal-db.git"; - rev = "v0.10.1"; - sha256 = "03c5h14z6h2mxnx949lihnyqjd19hcj38iasdwq9fp95h8cld376"; + rev = "v0.13.1"; + sha256 = "02b79bdv5h460ay0vkpwi5q69b1qrm9z29z02p09xb03hijxskpd"; }; exception_page = { url = "https://github.com/crystal-loot/exception_page.git"; rev = "v0.2.2"; sha256 = "1c8askb9b7621jjz5pjj6b8pdbhw3r1l3dym6swg1saspf5j3jwi"; }; + http_proxy = { + url = "https://github.com/mamantoha/http_proxy.git"; + rev = "v0.10.3"; + sha256 = "1hgghjy611m9bbmq8drvzs30mymkq2s4d18lp19543qls58h80vs"; + }; kemal = { url = "https://github.com/kemalcr/kemal.git"; rev = "v1.1.2"; @@ -36,8 +41,8 @@ }; pg = { url = "https://github.com/will/crystal-pg.git"; - rev = "v0.24.0"; - sha256 = "07i5bqkv5j6y6f8v5cpqdxc5wzzrvgv3ds24znv4mzv6nc84csn4"; + rev = "v0.28.0"; + sha256 = "0g1kdpnz7sr7hpama0y3s70v5xjhi7jm2ypb1w503cfvr30qffpm"; }; protodec = { url = "https://github.com/iv-org/protodec.git"; @@ -51,12 +56,12 @@ }; spectator = { url = "https://github.com/icy-arctic-fox/spectator.git"; - rev = "v0.10.4"; - sha256 = "0rcxq2nbslvwrd8m9ajw6dzaw3hagxmkdy9s8p34cgnr4c9dijdq"; + rev = "v0.10.6"; + sha256 = "0w6mv1q44is2m19pyspkyiwm84h55nchsm4pp82gdbb0j9ylhckx"; }; sqlite3 = { url = "https://github.com/crystal-lang/crystal-sqlite3.git"; - rev = "v0.18.0"; - sha256 = "03nnvpchhq9f9ywsm3pk2rrj4a3figw7xs96zdziwgr5znkz6x93"; + rev = "v0.21.0"; + sha256 = "1mhg59l6qgmf14zjrais0jfn1h5jj9j32fy7fb0gkp9zhpa7x6vs"; }; } diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json index 4a4776b17649..42094487b886 100644 --- a/pkgs/servers/invidious/versions.json +++ b/pkgs/servers/invidious/versions.json @@ -1,9 +1,9 @@ { "invidious": { - "hash": "sha256-oNkEFATRVgPC8Bhp0v04an3LvqgsSEjLZdeblb7n8TI=", - "version": "2.20240825.2", - "date": "2024.08.26", - "commit": "4782a670" + "hash": "sha256-O5Uv5Qat7Is/0gk0HVi8Hr2UPMLXQw7AwYnjOFaaTP8=", + "version": "2.20241110.0", + "date": "2024.11.10", + "commit": "5d2dd40b" }, "videojs": { "hash": "sha256-jED3zsDkPN8i6GhBBJwnsHujbuwlHdsVpVqa1/pzSH4=" From 49f511eb5541bbbcc8194250bc9580e14d78308e Mon Sep 17 00:00:00 2001 From: Lan Tian Date: Mon, 11 Nov 2024 22:07:22 -0800 Subject: [PATCH 46/54] baidupcs-go: 3.9.5 -> 3.9.5-unstable-2024-06-23 --- pkgs/by-name/ba/baidupcs-go/package.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ba/baidupcs-go/package.nix b/pkgs/by-name/ba/baidupcs-go/package.nix index bc02fbf83729..42ef4255d7c0 100644 --- a/pkgs/by-name/ba/baidupcs-go/package.nix +++ b/pkgs/by-name/ba/baidupcs-go/package.nix @@ -1,22 +1,26 @@ { + fetchFromGitHub, buildGo122Module, lib, - fetchFromGitHub, versionCheckHook, }: buildGo122Module rec { pname = "baidupcs-go"; - version = "3.9.5"; + version = "3.9.5-unstable-2024-06-23"; src = fetchFromGitHub { owner = "qjfoidnh"; repo = "BaiduPCS-Go"; - rev = "v${version}"; - hash = "sha256-zNodRQzflOOB3hAeq4KbjRFlHQwknVy+4ucipUcoufY="; + rev = "5612fc337b9556ed330274987a2f876961639cff"; + hash = "sha256-4mCJ5gVHjjvR6HNo47NTJvQEu7cdZZMfO8qQA7Kqzqo="; }; vendorHash = "sha256-msTlXtidxLTe3xjxTOWCqx/epFT0XPdwGPantDJUGpc="; doCheck = false; + ldflags = [ + "-X main.Version=${version}" + ]; + nativeInstallCheckInputs = [ versionCheckHook ]; @@ -24,10 +28,10 @@ buildGo122Module rec { versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; meta = { + mainProgram = "BaiduPCS-Go"; maintainers = with lib.maintainers; [ xddxdd ]; description = "Baidu Netdisk commandline client, mimicking Linux shell file handling commands"; homepage = "https://github.com/qjfoidnh/BaiduPCS-Go"; license = lib.licenses.asl20; - mainProgram = "BaiduPCS-Go"; }; } From 21b29ebe860e6ce4797df178d360b60666da850a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Nov 2024 15:51:07 +0000 Subject: [PATCH 47/54] libtoxcore: 0.2.19 -> 0.2.20 --- pkgs/by-name/li/libtoxcore/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libtoxcore/package.nix b/pkgs/by-name/li/libtoxcore/package.nix index 6bad88293eb0..7e7619b1a2fb 100644 --- a/pkgs/by-name/li/libtoxcore/package.nix +++ b/pkgs/by-name/li/libtoxcore/package.nix @@ -14,14 +14,14 @@ let buildToxAV = !stdenv.hostPlatform.isAarch32; in stdenv.mkDerivation rec { pname = "libtoxcore"; - version = "0.2.19"; + version = "0.2.20"; src = # We need the prepared sources tarball. fetchurl { url = "https://github.com/TokTok/c-toxcore/releases/download/v${version}/c-toxcore-${version}.tar.gz"; - hash = "sha256-i0GPZHDbCFz1mpkVaFYTVWVW3yv0JxSPGBS3sRhihZQ="; + hash = "sha256-qciaja6nRdU+XXjnqsuZx7R5LEQApaaccSOPRdYWT0w="; }; cmakeFlags = [ From 083249aeb5cf5c61aa54fc4cfb7fac68c4fd3443 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 5 Nov 2024 10:02:58 +0100 Subject: [PATCH 48/54] =?UTF-8?q?ocamlPackages.ppx=5Fderiving=5Fyojson:=20?= =?UTF-8?q?3.7.0=20=E2=86=92=203.9.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ppx_deriving_yojson/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix index 6e0fa39a0acf..edccd29a0ab1 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix @@ -1,14 +1,17 @@ -{ lib, buildDunePackage, fetchFromGitHub, ocaml, ppxlib, ounit -, ppx_deriving, yojson +{ lib, buildDunePackage, fetchFromGitHub, ocaml, ppxlib, ounit, ounit2 +, ppx_deriving, result, yojson }: let param = - if lib.versionAtLeast ppxlib.version "0.26" then { - version = "3.7.0"; - sha256 = "sha256-niKxn1fX0mL1MhlZvbN1wgRed9AHh+z9s6l++k1VX9k="; + if lib.versionAtLeast ppxlib.version "0.30" then { + version = "3.9.0"; + sha256 = "sha256-0d6YcBkeFoHXffCYjLIIvruw8B9ZB6NbUijhTv9uyN8="; + checkInputs = [ ounit2 ]; } else { version = "3.6.1"; sha256 = "1icz5h6p3pfj7my5gi7wxpflrb8c902dqa17f9w424njilnpyrbk"; + checkInputs = [ ounit ]; + propagatedBuildInputs = [ result ]; } ; in @@ -25,10 +28,11 @@ buildDunePackage rec { inherit (param) sha256; }; - propagatedBuildInputs = [ ppxlib ppx_deriving yojson ]; + propagatedBuildInputs = [ ppxlib ppx_deriving yojson ] + ++ param.propagatedBuildInputs or []; doCheck = lib.versionAtLeast ocaml.version "4.08"; - checkInputs = [ ounit ]; + inherit (param) checkInputs; meta = { description = "Yojson codec generator for OCaml >= 4.04"; From f7a8df39156fb409f922b4d7bd80d9c141961d0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Oct 2024 02:04:52 +0000 Subject: [PATCH 49/54] dune_3: 3.16.0 -> 3.16.1 --- pkgs/development/tools/ocaml/dune/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index 1aa192f1daab..289f81af5702 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.16.0"; + version = "3.16.1"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - hash = "sha256-VIHd55GMoxIeAsNNdDOfc0sy1Yg++4wbgFZHHnT5vaY="; + hash = "sha256-t4GuIPh2E8KhG9BxeAngBHDILWFeFSZPmmTgMwUaw94="; }; nativeBuildInputs = [ ocaml findlib ]; From 787264df644cc07c545b1683639ef030cbff4ef4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 12 Nov 2024 18:22:30 +1000 Subject: [PATCH 50/54] home-assistant-custom-lovelace-modules.universal-remote-card: 4.1.3 -> 4.2.0 (#355374) https://github.com/Nerwyn/android-tv-card/releases/tag/4.2.0 --- .../universal-remote-card/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix index 0794821804ab..57d74029e3d9 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix @@ -5,18 +5,18 @@ buildNpmPackage rec { pname = "universal-remote-card"; - version = "4.1.3"; + version = "4.2.0"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-/O+VOrUKhljhrvQ3WiygtZmdf0HTRFaeeU7bP35U3go="; + hash = "sha256-f0t9tSAkCYfJ4y6IMcQu4TfCkBjnSr2x7aZTcgr2klw="; }; patches = [ ./dont-call-git.patch ]; - npmDepsHash = "sha256-J0aE1wY7VAi8qSzjUyubsSagCsalqrHox2HHAhZoUIE="; + npmDepsHash = "sha256-/+MF+9QWiqJi787k3ta7wN8fhElUxVlZY5SLWxy3VTk="; installPhase = '' runHook preInstall From fff58581408e3d84d5eb55084d71d71fff4f2c20 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Mon, 28 Oct 2024 10:51:13 -0400 Subject: [PATCH 51/54] talosctl: 1.8.1 -> 1.8.2 --- pkgs/by-name/ta/talosctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/talosctl/package.nix b/pkgs/by-name/ta/talosctl/package.nix index 801a4cfbc5c6..4e5127862f7e 100644 --- a/pkgs/by-name/ta/talosctl/package.nix +++ b/pkgs/by-name/ta/talosctl/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - hash = "sha256-6WHeiVH/vZHiM4bqq3T5lC0ARldJyZtIErPeDgrZgxc="; + hash = "sha256-sD/Nn1ZLM6JIZdWQsBioKyhrAvhz749LL4xWleQ80xY="; }; - vendorHash = "sha256-aTtvVpL979BUvSBwBqRqCWSWIBBmmty9vBD97Q5P4+E="; + vendorHash = "sha256-pWG8DbZ9N57p2Q9w/IzETcvwaSfzaUvJgcz7Th/Oi9c="; ldflags = [ "-s" "-w" ]; From b94f54b7a0cabd1813236180cc0afe342fe4dd44 Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Fri, 8 Nov 2024 18:40:27 +0100 Subject: [PATCH 52/54] devmode: make reusable the `devmode` helper made for the Nixpkgs/NixOS manual was exposed wrapped in `mkShell`, which made it impossible to reuse. this change strips that wrapper and reproduces it at the call site. now one can use `devmode` from anywhere Nixpkgs is available: devmode = pkgs.callPackage "${pkgs.path}/pkgs/tools/nix/web-devmode.nix" { buildArgs = toString ./.; open = "/index.html"; }; --- doc/doc-support/package.nix | 13 ++++-- nixos/doc/manual/shell.nix | 9 ++-- pkgs/tools/nix/web-devmode.nix | 84 ++++++++++++++++------------------ 3 files changed, 55 insertions(+), 51 deletions(-) diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix index ca4694f3d11c..5a86f4d220d9 100644 --- a/doc/doc-support/package.nix +++ b/doc/doc-support/package.nix @@ -5,6 +5,7 @@ lib, stdenvNoCC, callPackage, + mkShellNoCC, documentation-highlighter, nixos-render-docs, nixpkgs ? { }, @@ -95,10 +96,14 @@ stdenvNoCC.mkDerivation ( pythonInterpreterTable = callPackage ./python-interpreter-table.nix { }; - shell = callPackage ../../pkgs/tools/nix/web-devmode.nix { - buildArgs = "./."; - open = "/share/doc/nixpkgs/manual.html"; - }; + shell = + let + devmode = callPackage ../../pkgs/tools/nix/web-devmode.nix { + buildArgs = "./."; + open = "/share/doc/nixpkgs/manual.html"; + }; + in + mkShellNoCC { packages = [ devmode ]; }; tests.manpage-urls = callPackage ../tests/manpage-urls.nix { }; }; diff --git a/nixos/doc/manual/shell.nix b/nixos/doc/manual/shell.nix index 7765358ddb32..1262fdc5583f 100644 --- a/nixos/doc/manual/shell.nix +++ b/nixos/doc/manual/shell.nix @@ -6,8 +6,11 @@ let common = import ./common.nix; inherit (common) outputPath indexPath; + devmode = pkgs.callPackage ../../../pkgs/tools/nix/web-devmode.nix { + buildArgs = "../../release.nix -A manualHTML.${builtins.currentSystem}"; + open = "/${outputPath}/${indexPath}"; + }; in -pkgs.callPackage ../../../pkgs/tools/nix/web-devmode.nix { - buildArgs = "../../release.nix -A manualHTML.${builtins.currentSystem}"; - open = "/${outputPath}/${indexPath}"; +pkgs.mkShellNoCC { + packages = [ devmode ]; } diff --git a/pkgs/tools/nix/web-devmode.nix b/pkgs/tools/nix/web-devmode.nix index 202fa23c2a27..c3cf994df65e 100644 --- a/pkgs/tools/nix/web-devmode.nix +++ b/pkgs/tools/nix/web-devmode.nix @@ -1,22 +1,22 @@ { lib, findutils, - mkShell, nodejs_latest, parallel, rsync, watchexec, writeShellScriptBin, # arguments to `nix-build`, e.g. `"foo.nix -A bar"` - buildArgs, + buildArgs ? "", # what path to open a browser at - open, + open ? "/index.html", }: let inherit (nodejs_latest.pkgs) live-server; - error_page = writeShellScriptBin "error_page" '' - echo " + error-page = writeShellScriptBin "error-page" '' + cat << EOF + 
$1
- " + + EOF ''; # The following would have been simpler: @@ -38,7 +39,7 @@ let # Using rsync here, instead of `cp`, to get as close to an atomic # directory copy operation as possible. `--delay-updates` should # also go towards that. - build_and_copy = writeShellScriptBin "build_and_copy" '' + build-and-copy = writeShellScriptBin "build-and-copy" '' set -euxo pipefail set +e @@ -49,7 +50,7 @@ let if [ $exit_status -eq 0 ]; then # setting permissions to be able to clean up - ${lib.getBin rsync}/bin/rsync \ + ${lib.getExe rsync} \ --recursive \ --chmod=u=rwX \ --delete-before \ @@ -58,10 +59,10 @@ let $serve/ else set +x - ${lib.getBin error_page}/bin/error_page "$stderr" > $error_page_absolute + ${lib.getExe error-page} "$stderr" > $error_page_absolute set -x - ${lib.getBin findutils}/bin/find $serve \ + ${lib.getExe findutils} $serve \ -type f \ ! -name $error_page_relative \ -delete @@ -72,20 +73,20 @@ let watcher = writeShellScriptBin "watcher" '' set -euxo pipefail - ${lib.getBin watchexec}/bin/watchexec \ + ${lib.getExe watchexec} \ --shell=none \ --restart \ --print-events \ - ${lib.getBin build_and_copy}/bin/build_and_copy + ${lib.getExe build-and-copy} ''; - # A Rust alternative to live-server exists, but it was not in nixpkgs. + # A Rust alternative to live-server exists, but it fails to open the temporary directory. # `--no-css-inject`: without this it seems that only CSS is auto-reloaded. # https://www.npmjs.com/package/live-server server = writeShellScriptBin "server" '' set -euxo pipefail - ${lib.getBin live-server}/bin/live-server \ + ${lib.getExe' live-server "live-server"} \ --host=127.0.0.1 \ --verbose \ --no-css-inject \ @@ -93,34 +94,29 @@ let --open=${open} \ $serve ''; - - devmode = writeShellScriptBin "devmode" '' - set -euxo pipefail - - function handle_exit { - rm -rf "$tmpdir" - } - - tmpdir=$(mktemp -d) - trap handle_exit EXIT - - export out_link="$tmpdir/result" - export serve="$tmpdir/serve" - mkdir $serve - export error_page_relative=error.html - export error_page_absolute=$serve/$error_page_relative - ${lib.getBin error_page}/bin/error_page "building …" > $error_page_absolute - - ${lib.getBin parallel}/bin/parallel \ - --will-cite \ - --line-buffer \ - --tagstr '{/}' \ - ::: \ - "${lib.getBin watcher}/bin/watcher" \ - "${lib.getBin server}/bin/server" - ''; in -mkShell { - name = "web-devmode"; - packages = [ devmode ]; -} +writeShellScriptBin "devmode" '' + set -euxo pipefail + + function handle_exit { + rm -rf "$tmpdir" + } + + tmpdir=$(mktemp -d) + trap handle_exit EXIT + + export out_link="$tmpdir/result" + export serve="$tmpdir/serve" + mkdir $serve + export error_page_relative=error.html + export error_page_absolute=$serve/$error_page_relative + ${lib.getExe error-page} "building …" > $error_page_absolute + + ${lib.getExe parallel} \ + --will-cite \ + --line-buffer \ + --tagstr '{/}' \ + ::: \ + "${lib.getExe watcher}" \ + "${lib.getExe server}" +'' From 50ff833cd80058c16c846f934dcb591b49eb8046 Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Fri, 8 Nov 2024 19:06:07 +0100 Subject: [PATCH 53/54] devmode: move to pkgs/by-name now one can use `devmode` from anywhere Nixpkgs is available: devmode = pkgs.devmode.override { buildArgs = toString ./.; open = "/index.html"; }; --- doc/doc-support/package.nix | 5 +++-- nixos/doc/manual/shell.nix | 2 +- .../nix/web-devmode.nix => by-name/de/devmode/package.nix} | 0 3 files changed, 4 insertions(+), 3 deletions(-) rename pkgs/{tools/nix/web-devmode.nix => by-name/de/devmode/package.nix} (100%) diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix index 5a86f4d220d9..e763f82efd7c 100644 --- a/doc/doc-support/package.nix +++ b/doc/doc-support/package.nix @@ -5,6 +5,7 @@ lib, stdenvNoCC, callPackage, + devmode, mkShellNoCC, documentation-highlighter, nixos-render-docs, @@ -98,12 +99,12 @@ stdenvNoCC.mkDerivation ( shell = let - devmode = callPackage ../../pkgs/tools/nix/web-devmode.nix { + devmode' = devmode.override { buildArgs = "./."; open = "/share/doc/nixpkgs/manual.html"; }; in - mkShellNoCC { packages = [ devmode ]; }; + mkShellNoCC { packages = [ devmode' ]; }; tests.manpage-urls = callPackage ../tests/manpage-urls.nix { }; }; diff --git a/nixos/doc/manual/shell.nix b/nixos/doc/manual/shell.nix index 1262fdc5583f..aeec93118fc0 100644 --- a/nixos/doc/manual/shell.nix +++ b/nixos/doc/manual/shell.nix @@ -6,7 +6,7 @@ let common = import ./common.nix; inherit (common) outputPath indexPath; - devmode = pkgs.callPackage ../../../pkgs/tools/nix/web-devmode.nix { + devmode = pkgs.devmode.override { buildArgs = "../../release.nix -A manualHTML.${builtins.currentSystem}"; open = "/${outputPath}/${indexPath}"; }; diff --git a/pkgs/tools/nix/web-devmode.nix b/pkgs/by-name/de/devmode/package.nix similarity index 100% rename from pkgs/tools/nix/web-devmode.nix rename to pkgs/by-name/de/devmode/package.nix From dc21ec8373bbd82d77d4294ca4455294ebeda4e1 Mon Sep 17 00:00:00 2001 From: eyjhb Date: Fri, 8 Nov 2024 10:43:02 +0100 Subject: [PATCH 54/54] go-ios: 1.0.150 -> 1.0.155 --- pkgs/by-name/go/go-ios/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/go-ios/package.nix b/pkgs/by-name/go/go-ios/package.nix index e91033eefacf..ff0d69def21d 100644 --- a/pkgs/by-name/go/go-ios/package.nix +++ b/pkgs/by-name/go/go-ios/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "go-ios"; - version = "1.0.150"; + version = "1.0.155"; src = fetchFromGitHub { owner = "danielpaulus"; repo = "go-ios"; rev = "v${version}"; - sha256 = "sha256-xa2/qshZ4k+Df5l817BXlotR6L/CX6Lw2+tWDYnr96I="; + sha256 = "sha256-cIB03BSdhOgXaw/Pjvh40S02egE7P53gf0TmwhqbbZY="; }; proxyVendor = true;