From ae8b92881619b02360965c593b96bd9a40aa3957 Mon Sep 17 00:00:00 2001 From: dish Date: Fri, 15 May 2026 12:14:44 -0400 Subject: [PATCH] [pkgs] grimmory: 3.0.3 -> 3.1.0 --- packages/grimmory/deps.json | 135 +++++++++++++------------- packages/grimmory/missing-hashes.json | 20 ++++ packages/grimmory/package.nix | 7 +- packages/grimmory/update.sh | 39 ++++++++ 4 files changed, 128 insertions(+), 73 deletions(-) create mode 100755 packages/grimmory/update.sh diff --git a/packages/grimmory/deps.json b/packages/grimmory/deps.json index c4462785..2a3018e2 100644 --- a/packages/grimmory/deps.json +++ b/packages/grimmory/deps.json @@ -234,17 +234,17 @@ "module": "sha256-AvswZAF3mMdQ3rCVidSRwVKiV4YABa2fPVGGDDwKR1E=", "pom": "sha256-nPUl2KYUZbKRWAqgUepzRjfk/bohUTpjTGCKmr7htms=" }, - "org/hibernate/orm#hibernate-core/7.3.2.Final": { - "jar": "sha256-cJrrLVUArwS4/IWCvG7zWDg7OXYSfOvfrvBSRu195V0=", - "pom": "sha256-/HXXG77rsm7+tbQU18fGu59jeM3PCqfLa719D4onuNM=" + "org/hibernate/orm#hibernate-core/7.3.4.Final": { + "jar": "sha256-0XOpZd8CD/uUJ9diUqSSkG9Xctp83TS52JsMah/yn0c=", + "pom": "sha256-vQur3BKXuZTBS4JoBsBNiQllVWkKv0xaH9q5/Xxh1ZU=" }, - "org/hibernate/orm#hibernate-gradle-plugin/7.3.2.Final": { - "jar": "sha256-YhPOeBZR/rTccl/rLPe5ay7BSKpCBGKx24xQuJxIdB4=", - "module": "sha256-FSdeVR8Pm0raiSpEYYB6WwjydCZHP2kIw9W4czcJauU=", - "pom": "sha256-dDO3iNDG8n37nEnvIiHSjfP8SsDGtSEMjQPnei1GWqU=" + "org/hibernate/orm#hibernate-gradle-plugin/7.3.4.Final": { + "jar": "sha256-2Uj7D1HrGzmmh1ixsdDx/RPqKARajCtOqZ0zD1AcHBM=", + "module": "sha256-vc/lIKHXF0OR09LERdS5NwV4hYzH9VNYU1FHevMDyz0=", + "pom": "sha256-wyE17cFewH+QG0MEzLJ5bYZOhtDeQKlldjeUWSvOgpI=" }, - "org/hibernate/orm#org.hibernate.orm.gradle.plugin/7.3.2.Final": { - "pom": "sha256-tZCB4Lh/uk0l06E/5tgtRh+FFmmv+oZluVHpI4UX8G4=" + "org/hibernate/orm#org.hibernate.orm.gradle.plugin/7.3.4.Final": { + "pom": "sha256-61bjBk+ukNRW32uMfFsq95dUFtZR6guvF9vFJ6dbJQs=" }, "org/jboss#jboss-parent/42": { "pom": "sha256-5BJ27+NQkFTLpBl7PWNgxR3Ve8ZA3eSM832vqkWgnDs=" @@ -472,10 +472,14 @@ "pom": "sha256-T0KMISebw0vUTVHCeWdB53r9f523/0qTGkPHsBocRZU=" }, "com/github/ben-manes/caffeine#caffeine/3.2.3": { - "jar": "sha256-ynDJCl0c4VEYgM6ck9StIhCPYREdPa+R61J2K1cb0Xk=", "module": "sha256-jZo7mA6b1wQS7jObJFYxNhezuK4uhon5s8vwZAzVjzw=", "pom": "sha256-n3BPkIN5e099DB1chV00zSaNVEzwa0KD1c5CiKz8nuA=" }, + "com/github/ben-manes/caffeine#caffeine/3.2.4": { + "jar": "sha256-nZ0s/Wgf2Sct7T0nyZMNsS+J9zI0WXWqET68Iju/EiQ=", + "module": "sha256-tfFqD2+QAKRqYrGDBrs4d3vR7PxYLEya0FySjUUbpAI=", + "pom": "sha256-Yk7J/FOOGmGJZN+p+M+TRENWB8WORagYN456ZD1OCbM=" + }, "com/github/gotson/nightcompress#nightcompress/1.1.1": { "jar": "sha256-Fn1wXIxtJ4uuW1SoyQSFoCuAW1ewE5zbd7ciJEuADcI=", "module": "sha256-QQCDIBGe66KxlP3irSoEme3bq7uMMizPnl6P/LQ5pVc=", @@ -486,12 +490,18 @@ "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" }, "com/google/errorprone#error_prone_annotations/2.43.0": { - "jar": "sha256-SCcudcFuH3vce9GVKcys1e4XBARwHX9aI0QbtYR5V/U=", "pom": "sha256-T2uIia+o3r2+Hj/ipfjmbiIWygtWPya05UE4cw7s3IA=" }, + "com/google/errorprone#error_prone_annotations/2.49.0": { + "jar": "sha256-OxAD5RuK5W/b18cQc+gdFoO5fmxN/1qRURZNWbdp0Tw=", + "pom": "sha256-YB1nPLc2zK3syKzKXUfYjTHY6Hdb5FrmvtzYsjWcnMU=" + }, "com/google/errorprone#error_prone_parent/2.43.0": { "pom": "sha256-u5LEWE0CEb1ZvspPsnYXD13FD+NGFG6TV40tqyYDPhA=" }, + "com/google/errorprone#error_prone_parent/2.49.0": { + "pom": "sha256-cxO9siLRf/PNAq2gHD80TpoNitEhqTriaWTtKGJ5Ao0=" + }, "com/h2database#h2/2.4.240": { "jar": "sha256-KbcOQnzBxAzcN2KDrbsMxihTBzeXu1/ldh+B/nPVfOA=", "pom": "sha256-J69LeAWFazFw1YfgoCyqyT1CH4dc/JSX2/X/1/Mkeko=" @@ -638,6 +648,9 @@ "io/netty#netty-bom/4.2.12.Final": { "pom": "sha256-Sx6sh5HJMaM9ni+4wINDJVLPh0adtBm30kNBeONPBww=" }, + "io/netty#netty-bom/4.2.13.Final": { + "pom": "sha256-Ua8kiRxINeMj5A2UFn+S5VdF50mA3VzogSX4xDvu7sQ=" + }, "io/opentelemetry#opentelemetry-bom/1.55.0": { "module": "sha256-J2SqhUlah4ETphyqnkR7UXB/t1k2wrWAkaP2T2li5QE=", "pom": "sha256-lOb2mNGpfIJE827cZc8JBjbRI/fQCnFyQ21A9KkIGaw=" @@ -850,21 +863,6 @@ "org/apache/logging/log4j#log4j/2.25.4": { "pom": "sha256-+K6JBKKONPoEw103QGGdroNjJAG6HjE7r9fM9aMADew=" }, - "org/apache/pdfbox#fontbox/3.0.7": { - "jar": "sha256-gUnZiXq1BPej83l9VSzYkl71gUm03j+0cOtG10fmj4Y=", - "pom": "sha256-o/xYnFZLQbybtLty0XPM5fjCM10uZtY0SJtqiwS/63o=" - }, - "org/apache/pdfbox#pdfbox-io/3.0.7": { - "jar": "sha256-uag4KRl4BpCG77zR9iuBueSmAW5h3SxoEE7p9ML/mXs=", - "pom": "sha256-dCz9VwGuLNV6HS7mG+z+G9FUm6dwTH+xcZN/rQECFLY=" - }, - "org/apache/pdfbox#pdfbox-parent/3.0.7": { - "pom": "sha256-z60fFpQrxTkWiDsxQ/JRfseUc3Es1yNKWopxwQsPrnQ=" - }, - "org/apache/pdfbox#pdfbox/3.0.7": { - "jar": "sha256-fO+nF2IjMJUbQ0Or8eXTa8yxH0uiRdeKqnMlHQj+xiM=", - "pom": "sha256-3nkpJ2LYVd1pqOVVyeDm3kD1OP+9l9AS0bs6TQRa0Ec=" - }, "org/apache/pulsar#pulsar-bom/4.1.3": { "pom": "sha256-7MraWhEnN/p0yuE9aB8eOiER3KGHC/5eSUlWBBaPomI=" }, @@ -933,8 +931,8 @@ "org/eclipse/ee4j#project/1.0.9": { "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc=" }, - "org/eclipse/ee4j#project/2.0.0-M1": { - "pom": "sha256-GGpzaiANE3/mHNM2ANNEUBqsCzVspfHOR3PlhsDJRwc=" + "org/eclipse/ee4j#project/2.0.2": { + "pom": "sha256-u3XRp9b+0FWVGEblmCIl13LW3sDxvYrl2nlIuwt+trk=" }, "org/eclipse/jetty#jetty-bom/11.0.26": { "pom": "sha256-Iyqf1oLlxbyCwaRj70NMgGJA5i9cH5oWfArWnRXZ/WQ=" @@ -958,46 +956,46 @@ "org/flywaydb#flyway-mysql/11.14.1": { "pom": "sha256-0flMMsWdu8BPUGwx4GYyGCp9tFjRCHnSmCHpYbnzzFE=" }, - "org/flywaydb#flyway-mysql/12.4.0": { - "jar": "sha256-3g6sZBs9AQTk6+PWNA+yX0nL0VSmNrTS0TuYEV9gsFU=", - "pom": "sha256-WUXgBppvDsHVSgCEIXfgc7Trxf2XesaKmfzoMm8nF2U=" + "org/flywaydb#flyway-mysql/12.6.0": { + "jar": "sha256-dwkGl4SuDQic/uziFNhKUvPFgVlxyRhiGYHEDO0FuGA=", + "pom": "sha256-wo/52kRn2wZJY6kkW/7ysfV6hAn2GRfFa7eO5VYc8pU=" }, "org/flywaydb#flyway-parent/11.14.1": { "pom": "sha256-und7SgR8fK8QRKIqgaCxkeZsEtuxK3x8MXJK/EsKHSc=" }, - "org/flywaydb#flyway-parent/12.4.0": { - "pom": "sha256-cHZ9gng+4U4KwLe+eKaOvZIwjJvr5cP4kl0k20rFQIg=" + "org/flywaydb#flyway-parent/12.6.0": { + "pom": "sha256-p3C2mSZK9eQa/Awd87chwuoM0uZ+9y4NxzxOm6PEJrk=" }, "org/freemarker#freemarker/2.3.34": { "jar": "sha256-mp+5HNZBmSMuscqXZhSKXTDviUS+X6wFEBj5bHDI9qM=", "module": "sha256-bko6b8p1bAuE8ZuFY/ajRx82BIXHVx2PryVAYYjYejw=", "pom": "sha256-Dtnqkx4hGSojzbMKH/8wWuZ7bOTZMVsiuF5/r1JeWFs=" }, - "org/glassfish/jaxb#jaxb-bom-ext/4.0.7": { - "pom": "sha256-WjlgZhzu99sPfohDSu5y90HJ7JCzYbz7NH3WOqKAjWM=" + "org/glassfish/jaxb#jaxb-bom-ext/4.0.8": { + "pom": "sha256-6ESpnoa32YNk9gAHYS8fv6T069eONF4aujZY9vDvbzg=" }, "org/glassfish/jaxb#jaxb-bom/4.0.6": { "pom": "sha256-frfNg7krfC/QqK5mvLNQY1TxZqE/gtKmbB2WJZcy0qU=" }, - "org/glassfish/jaxb#jaxb-bom/4.0.7": { - "pom": "sha256-97VFomqCDe1lZWKEf+rTMd9+DM8okww4JIGgcMn25b4=" + "org/glassfish/jaxb#jaxb-bom/4.0.8": { + "pom": "sha256-FyRwUOLbTdcd0mhgCQIutE//sLxeNxqaGMW/eYj2QCc=" }, "org/glassfish/jaxb#jaxb-core/4.0.6": { "jar": "sha256-670nQge0hg0NxuLUTW29tZRc7eASItLlBmHUX11GwPc=", "pom": "sha256-5QE5dojXYwFJGmZA/I5PmoW+EkwaGc0+9Aa/BXv4ELc=" }, - "org/glassfish/jaxb#jaxb-parent/4.0.7": { - "pom": "sha256-S74O8mgwHn9LGOIJfdUrHQLeB/DJ1osJsc6SegYxtyA=" + "org/glassfish/jaxb#jaxb-parent/4.0.8": { + "pom": "sha256-ekGNM50dgSxSbzw6rhICjrLEtVn/RmmmVtfZqjPYFng=" }, - "org/glassfish/jaxb#jaxb-runtime-parent/4.0.7": { - "pom": "sha256-RWIGwFEC/ZavVfVWO6fOjTIq8IpOca/mw17t0WpZAJo=" + "org/glassfish/jaxb#jaxb-runtime-parent/4.0.8": { + "pom": "sha256-ewMP0m18WOCKhUwbOhqhyszQTGaapduSYZn9c1M4izg=" }, "org/glassfish/jaxb#jaxb-runtime/4.0.6": { "pom": "sha256-XBFy9Czz+rcUb6M4ITeWxkhD/fMipZPiRT3M8pgGYTE=" }, - "org/glassfish/jaxb#jaxb-runtime/4.0.7": { - "jar": "sha256-YaXa9aGYf37XFJxaiD3fIgypv3FKjYz/yF+sMB6StfI=", - "pom": "sha256-jcspvdeVXmD2W9S1RphivG+4W8+Gqci2hNPI1yr8C60=" + "org/glassfish/jaxb#jaxb-runtime/4.0.8": { + "jar": "sha256-vSiobiX68OjlCEx1CKoTPgS6Y64eUw5bZYV3yKVM3ZQ=", + "pom": "sha256-7KKuGDQouvxIphNgqHyeowLoCiLW9AbUQTOkwPgW54U=" }, "org/glassfish/jaxb#txw2/4.0.6": { "jar": "sha256-/MdJeFQS7zgG/eHOcPk+9aAGXcxH/kSbyHHbB5XLEa8=", @@ -1006,23 +1004,26 @@ "org/glassfish/jersey#jersey-bom/4.0.2": { "pom": "sha256-EjPg0OV9fSCzEd5GNk9hF4LQlqMkpPtKzEDFUVehguc=" }, - "org/grimmory#epub4j-core/1.2.0": { - "jar": "sha256-VlGfuxyPmkjTD1DUTWbCVzQ0hQLVxjio6+HUlpAAAFs=", - "module": "sha256-UU6bOqacm7ynyv4FLvBsKwf26EbjzoUnNBHVOiUB/o0=", - "pom": "sha256-eRbMMG/wCaDH2uNqOdo7pIPk7Jc97E4GDLLZpwR+ZIo=" + "org/grimmory#epub4j-core/1.4.0": { + "jar": "sha256-QvpCH1P3LM/Vu+9pWL7ycV0pV5hETRuH9wr67C+FzHE=", + "module": "sha256-V74Em3d/xhmNKnja8gHbOeKV09G7DLvnuMUYrNYonIU=", + "pom": "sha256-EjmyjUZdaaIROO1xI4sFA326dWEQRln06rDUoGd7aV8=" + }, + "org/grimmory#epub4j-native/1.4.0": { + "jar": "sha256-em1WggouwxxOTKX51CXsIYC53QFRw1nzx4BFedX7OUo=", + "module": "sha256-r1NCd8NtZW/QnLgvFG2SS5KNnmpsrggJbJ0Wr5RWPFA=", + "pom": "sha256-sXJRvamyEHYDtzn3QHNIPPaeZnFMjAW05O54NFFlp6Q=" }, - "org/grimmory#epub4j-native/1.2.0": { - "jar": "sha256-N3aB+UZI/xZQWddIxLORaIr+pBRtEiHZGT9krQ4MwDM=", - "module": "sha256-4fFXVzMwwbx49dExGiyXljbtnrEbgOwD59OrcGAKUgs=", - "pom": "sha256-salJkNNEBzwJns0XqaO2FuXaqZbLf3MtbU9g1qI2nss=" + "org/grimmory#epub4j-native/1.4.0/linux-x86_64": { + "jar": "sha256-rO7106fa/hz0KKEteyyBCMITKh0ajRuBhkZORcLyDio=" }, - "org/grimmory#pdfium4j/0.16.0": { - "jar": "sha256-1KeNcggnueefvBOAyecxMNshdZzVJSZC3tKTrl+N5QE=", - "module": "sha256-BQZSdg8dcj/grsIjeLNP08RpLPW2OZDjsIbxG68ITQ4=", - "pom": "sha256-i8nvgyhdsy3jXrFofR7Fm/bdDNiqmbYHXbg1e9qUKxo=" + "org/grimmory#pdfium4j/1.2.0": { + "jar": "sha256-35+Rv4Kck0GC0hYRqDUeDK7fb/DUGo+98G1gMFU+nQ8=", + "module": "sha256-5z5nlODZiUjJIuFuQwt+6ue5zsH/Ys4urEsuVEnOfFA=", + "pom": "sha256-uQjq5e1ta7oh+Wuk6CEZyBd/RTnT7eGV+LGnSyi7kak=" }, - "org/grimmory#pdfium4j/0.16.0/natives-linux-x64": { - "jar": "sha256-i+myK/KJJY2Ci0UsNRTxdajKjGR9fnOOofdTpitH3s4=" + "org/grimmory#pdfium4j/1.2.0/natives-linux-x64": { + "jar": "sha256-jFbwg3eizyiXyvg5mOG2JzaROqVjhVDjlBH3E2mF6iI=" }, "org/hamcrest#hamcrest/3.0": { "jar": "sha256-XWa2pKaAdVy27XyxBPp4Ne9kRmdYb/Bzet65d8Oezbw=", @@ -1045,9 +1046,9 @@ "org/hibernate/orm#hibernate-core/7.2.12.Final": { "pom": "sha256-Dr+JZYMYoE9CkpL7RHFr4p8nq9+KBHfu7oXyCrGBrR4=" }, - "org/hibernate/orm#hibernate-core/7.3.2.Final": { - "jar": "sha256-cJrrLVUArwS4/IWCvG7zWDg7OXYSfOvfrvBSRu195V0=", - "pom": "sha256-/HXXG77rsm7+tbQU18fGu59jeM3PCqfLa719D4onuNM=" + "org/hibernate/orm#hibernate-core/7.3.4.Final": { + "jar": "sha256-0XOpZd8CD/uUJ9diUqSSkG9Xctp83TS52JsMah/yn0c=", + "pom": "sha256-vQur3BKXuZTBS4JoBsBNiQllVWkKv0xaH9q5/Xxh1ZU=" }, "org/hibernate/validator#hibernate-validator/9.0.1.Final": { "jar": "sha256-JfQBGPpMUPhSLQkNJdUtWjiVOwzNElCDXwUue9MWTOA=", @@ -1221,10 +1222,6 @@ "jar": "sha256-0altJSEo06QkfP2KLnZBLvo8wQOXe+F5M8lCEXok83Q=", "pom": "sha256-mQPiB1XAxIh6q5xPEAYft/ERUdOp+t2WTp+6QnIm0TU=" }, - "org/mockito#mockito-inline/5.2.0": { - "jar": "sha256-7lLhwpmmMhhPuidKk3CZPgkUBCn15RbmxVcP1ldLKX8=", - "pom": "sha256-cG00cOVtMaO1YwaY0Qeb79uYMUWwGE5LorhNo4eo9oQ=" - }, "org/mockito#mockito-junit-jupiter/5.20.0": { "jar": "sha256-/WxwPCsAuRTzrbwnsYB3pwjz1pkvGSQsRE5zfGzOAk4=", "pom": "sha256-gaVJ/8nISoefwe5k1jAHqwClOk75avtTaQ8oRWker5g=" @@ -1464,11 +1461,6 @@ "module": "sha256-cwmGWzoN9LBShbzdcr/avfJr9DouRA/GjWUvbNY/U1c=", "pom": "sha256-Df05Q1FXrCG1IkJGU+MqeRn07OrcaWsI92gCI15l4c4=" }, - "org/springframework/boot#spring-boot-configuration-processor/4.0.6": { - "jar": "sha256-lEOo4tClIR4JChV9YHMERFjbLRez7/wix46/VkRnui8=", - "module": "sha256-CWiYfEn8BrDsJ1WwYjk6nle+z+81bmwbmhBYhyx3Rqk=", - "pom": "sha256-Hvt3/ziD6XV7+HNOUgp5WbQl07k7X5Oa2ZbJBs5bSHQ=" - }, "org/springframework/boot#spring-boot-data-commons/4.0.6": { "jar": "sha256-x1yZA0AJ1n5D/H9owuC9t4U5KVORexG748dIIf2AKCo=", "module": "sha256-FpqETkmT1L/iIqmFhboRwY5MDj5QNjFeHeQnw6wHekU=", @@ -1821,6 +1813,9 @@ "tools/jackson#jackson-bom/3.1.2": { "pom": "sha256-vg5eRYB/TeVRTR55M/rPc4gSGz3ZvzGjqz+HogBlCqI=" }, + "tools/jackson#jackson-bom/3.1.3": { + "pom": "sha256-9aDcUnRCPNLH+McXoAG6ttstsNhAFT42JevJ3pWM804=" + }, "tools/jackson/core#jackson-core/3.1.2": { "jar": "sha256-u7AHY/WZjwOibyHkftUA8lPH/FwVj6PopB2/l6p0Fv0=", "module": "sha256-nTb0dEnZ6TnNEHcOTaPYVc6h9KbSfVBJX3YQTp07n24=", diff --git a/packages/grimmory/missing-hashes.json b/packages/grimmory/missing-hashes.json index ea5f7aaa..6f74140d 100644 --- a/packages/grimmory/missing-hashes.json +++ b/packages/grimmory/missing-hashes.json @@ -81,6 +81,26 @@ "@napi-rs/nice-win32-arm64-msvc@npm:1.1.1": "653a7b04d9caa311d793f12d2c2323830a0863737fa4e0cf4ceb5adbb85d30b29d02fb59e5d513e5375273054a965777c83732b25592e80a574f15114bdf96c2", "@napi-rs/nice-win32-ia32-msvc@npm:1.1.1": "f32fcebde27d2e8022e6ea2c8a4fad0676b59c24373c8f7e6fafe3711932a743798909122937278f94c42cba952f5403ed1dc1879544e508299af88ecbbbd68c", "@napi-rs/nice-win32-x64-msvc@npm:1.1.1": "657bf5caa5b07b16f39b3fca7d7f99a0609a01ffbb620ff167652145c0e5c3ee1bbc19f4ed09b9e4373da8a1f84870b58152bb6c44288a3e9cb46ca8a236cec8", + "@oxc-parser/binding-android-arm-eabi@npm:0.121.0": "bca1043494dacc0b7b5de15ae18605faaf7bcc35bdebb3d7de3b6ca092b7b0813148a487e80910541f3f6dc8c95e833beff653b6cff2503f45f78982711fd69c", + "@oxc-parser/binding-android-arm64@npm:0.121.0": "ceceedd4695fed202d87c9b2b09107ac1fac6b64ac6f7299e78827920ce915ae6684434c730d95d07cd05d998a862477f6d21d2f3ee5a68e80b4000a890a6e1c", + "@oxc-parser/binding-darwin-arm64@npm:0.121.0": "6bc756fe6874ea0c9f2e4a717b32f3297a3368330ea9a41774a0ebd4b9ad95e021d393d556fd1f7f8dac9c3093c373f4a495dc3249e4de4e5ef05f788cd4c304", + "@oxc-parser/binding-darwin-x64@npm:0.121.0": "7733902e1cab1a17b79c52dc1d934900438343e3eed0357fbd088f39a52ab6ddf25d31b3214134ba0e0e0e486ff1735da0bbc5142cc91d1aca69d073dc43c290", + "@oxc-parser/binding-freebsd-x64@npm:0.121.0": "019c17c3a5bd4d419a5e378d3c401735e9f9c5f0d34b3f31f3c18cf37b7a5004e15c39326b47b8e5bd74bf74355709d524747f3b16252898759f20c2d0d2ceba", + "@oxc-parser/binding-linux-arm-gnueabihf@npm:0.121.0": "5562174d8fa0a5665934bcd8d65f5895b9d03a79e502ed823bb47b14edd57c6f997da22cfbf7caa122a02a3c527b09947ad06d39ad1f3b9f30a23f4edae3432b", + "@oxc-parser/binding-linux-arm-musleabihf@npm:0.121.0": "1ca1d1ba6897cd67c33561199805dfe8cf709eac9ccfa9fd7a9127daf6b57157a1141c88c5c5c822800b57d2abc8bc9344408fc5d6890c1e6d78d820aa011e81", + "@oxc-parser/binding-linux-arm64-gnu@npm:0.121.0": "5aea47f9b977d5004ce697a0b13b519183198cc63c074a4ec932e61398851639bcaa3b44a98226e8b644c89114654b70a70356c199badfa0491c04c4460ac925", + "@oxc-parser/binding-linux-arm64-musl@npm:0.121.0": "4212fdfb73d16be3c60feaf2548060e85f17b807933bb81426578fd0bc5a89ac1e7b77b594b5c9a3b60daf0ee3ad9594a61554f3f9aac35e219cec7cece07f2e", + "@oxc-parser/binding-linux-ppc64-gnu@npm:0.121.0": "6c4ad09387ee66b0ead91f5632bcecd78297d4be50f3e17e2b16f460c877552d1943c8fd6648e3ac1d9806870c91c2bffd088fa9b368119b8d4b1dc2cbc08d95", + "@oxc-parser/binding-linux-riscv64-gnu@npm:0.121.0": "d41cdce188365392bd52852a3309d92daa203f240da0e5e7217aa9805fcb0db5ac8a10a26ab48570e16af9daa46622b19a89410e8cbec1d064c931f785225d22", + "@oxc-parser/binding-linux-riscv64-musl@npm:0.121.0": "6ae9ade15ea6ff648569d2f83e857c92873e90eb5649f62e0cf000213873b549a2dd4bb4547358f20776aa2f912fd9495721bcce429ad4c02742fffae2d92d47", + "@oxc-parser/binding-linux-s390x-gnu@npm:0.121.0": "14ba521e885676eb8e05cb6173d5071505e9a3798f9cb19f45fb3383eefb6def2c0e7cccea43a62eab8d73e22bb3f66143d82355e0e5ef3b8a388e4301b4d9a4", + "@oxc-parser/binding-linux-x64-gnu@npm:0.121.0": "0e56d93be40652b0916aa6505de2978b17949665dc4d98e2420d667f6aa8c26437b0137c909124d6adfbfc1e2ff0eb3f31cf93c7ec6e5580dd3b88cfdcb75367", + "@oxc-parser/binding-linux-x64-musl@npm:0.121.0": "b1c30cded47edc8ce76dc5c80e5dc70c3bbdbc09505a0f70a4f16b6f55fad7eb3e67b381556d92b883272cbf530dfb8b69cafee06e380a5a47c0debd378b1494", + "@oxc-parser/binding-openharmony-arm64@npm:0.121.0": "b4cc609840cc2bd914ab142ebf2404d24452a54d6673469289c100bf1af40dbd1cdfebba1b8c7804a7b285a8f2293ab748da6ebc059ab2043216af069e9ecd2f", + "@oxc-parser/binding-wasm32-wasi@npm:0.121.0": "20d260df5bda2e225d7253049890d99ac2a3ce8ad5df8d0f6cec9f23cda9dfd2ddbfc87457fde3e8613109868d4f885beee9df6fcb8f267adb08ed2ab5303bc0", + "@oxc-parser/binding-win32-arm64-msvc@npm:0.121.0": "ffb3ae5443b87baa932316bc4bf2fe92d3d67299ec16e06270047fdb6d8c5d33b19f76e486ad6dc5f7cdc3e038bde8c8cdcc3e316007f1bfdac393136f372170", + "@oxc-parser/binding-win32-ia32-msvc@npm:0.121.0": "768d242e04f4809101d00a383d05e47a8e90852b65f342861266910e0912eee814e6f5b2b92fa82d7712c15424f63c6a877005c2375083aa5734d7a55d83ab8b", + "@oxc-parser/binding-win32-x64-msvc@npm:0.121.0": "03daa39843f83f963eae2a1151029887e9c5449cf3da8dd32588c45045be53ce1d8f1b0699abfff05fc1a49911b4eafbdac1b76696ad23dd3f67bfe685acc8f9", "@parcel/watcher-android-arm64@npm:2.5.6": "e086afcb154c3e81de2bdf264e643dee52df08e5afc379c098d2fc3764e4594fd82393a078d96c2b56d79f8f047aa1dd39c7ada9b0df56b3fc69fdaeb1f97aa0", "@parcel/watcher-darwin-arm64@npm:2.5.6": "c14a4ed0df71b90011b43da24994af9fc52c6dd604e80371227fc8afb0bf8a8ea83de933d881b98cb1f05ae6d3d73461718db1ae1ecba4509284be2449a25c14", "@parcel/watcher-darwin-x64@npm:2.5.6": "c3e72903a95e5aa9306bb0b1b4e9069f8226a9dba16098a9dcfc39fe22f05df107d5d1a540be3a51fbda8ba0b7d5baa6de717f4ace9ea9c25571b4c1b0d7ee67", diff --git a/packages/grimmory/package.nix b/packages/grimmory/package.nix index 1967bd19..31a9bc13 100644 --- a/packages/grimmory/package.nix +++ b/packages/grimmory/package.nix @@ -17,12 +17,12 @@ let yarn-berry = yarn-berry_4; gradle = gradle_9; - version = "3.0.3"; + version = "3.1.0"; src = fetchFromGitHub { owner = "grimmory-tools"; repo = "grimmory"; tag = "v${version}"; - hash = "sha256-dWZcCX0Tp+yPp+4vBERYEwu+rysCzJ9QfMQhD65t1vQ="; + hash = "sha256-qBccjV+0zT34WNTjucvGC+jR6WuZGfClEMyR8YUD0iU="; }; frontend = stdenv.mkDerivation (finalAttrs: { pname = "grimmory-frontend"; @@ -41,7 +41,7 @@ let missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src sourceRoot missingHashes; - hash = "sha256-YU7OMdcwkwyJl84j0L0gUhHfngdpBaiHzgRydkeJC+s="; + hash = "sha256-V5+mezZsbiytv01PGTbEKB4iYhlPtJ2IkAtsBz1ZTAw="; }; buildPhase = '' @@ -125,6 +125,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { inherit frontend; + updateScript = ./update.sh; }; meta = { diff --git a/packages/grimmory/update.sh b/packages/grimmory/update.sh new file mode 100755 index 00000000..1e3b0651 --- /dev/null +++ b/packages/grimmory/update.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nodejs curl nix bash coreutils nix-update yarn-berry_4.yarn-berry-fetcher + +set -eou pipefail + +PACKAGE_DIR=$(realpath "$(dirname "$0")") + +nix-update --flake "$UPDATE_NIX_PNAME" || true + +NEW_VERSION=$(nix eval --raw -f. $PACKAGE_NAME.version) + +if [[ "$UPDATE_NIX_OLD_VERSION" == "$NEW_VERSION" ]]; then + echo "${PACKAGE_NAME} is up-to-date: ${PACKAGE_VERSION}" + exit 0 +fi + + +HOME=$(mktemp -d) +export HOME + +src=$(nix-build --no-link "$PWD" -A "$UPDATE_NIX_PNAME.src") +WORKDIR=$(mktemp -d) + +cp --recursive --no-preserve=mode "$src/*" "$WORKDIR" +pushd "$WORKDIR" +echo "Updating yarn deps" +yarn-berry-fetcher missing-hashes frontend/yarn.lock >"$PACKAGE_DIR/missing-hashes.json" +popd +rm -rf "$WORKDIR" + +nix-update "$UPDATE_NIX_PNAME" --flake --version skip --subpackage frontend || true + +echo "Updating gradle deps" +GRADLE_UPDATE_SCRIPT=nix build .\#"$UPDATE_NIX_PNAME".mitmCache.updateScript --print-out-paths + +$GRADLE_UPDATE_SCRIPT + +echo "Done" + -- 2.51.2