From b82a9c375278cd735ab85e12a5d7f9af4125667e Mon Sep 17 00:00:00 2001 From: gale Date: Sun, 17 Nov 2024 18:19:59 -0600 Subject: [PATCH 01/40] maintainers: add gale-username --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5e2792825044..c3f266866964 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7767,6 +7767,13 @@ githubId = 1851962; name = "Galen Huntington"; }; + gale-username = { + name = "gale"; + email = "git@galewebsite.com"; + github = "gale-username"; + githubId = 168143489; + keys = [ { fingerprint = "1234 3726 9042 01F3 CE07 59BF A3B6 1E91 5508 F702"; } ]; + }; gamb = { email = "adam.gamble@pm.me"; github = "gamb"; From a78c34618838c3a904cbbd86008e72c3244e330c Mon Sep 17 00:00:00 2001 From: gale Date: Sun, 17 Nov 2024 18:21:41 -0600 Subject: [PATCH 02/40] maintainers: add ImUrX --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c3f266866964..dac9f60dcb80 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9468,6 +9468,12 @@ githubId = 4085046; name = "Imuli"; }; + imurx = { + email = "imurx@proton.me"; + github = "imurx"; + githubId = 3698237; + name = "ImUrX"; + }; inclyc = { email = "i@lyc.dev"; github = "inclyc"; From 8675dc301fac038d7c95f89ecb9483b95fce61d5 Mon Sep 17 00:00:00 2001 From: gale Date: Wed, 4 Dec 2024 22:39:33 -0600 Subject: [PATCH 03/40] slimevr-server: init at 0.13.2 --- pkgs/by-name/sl/slimevr-server/deps.json | 1073 +++++++++++++++++ pkgs/by-name/sl/slimevr-server/no-grgit.patch | 36 + pkgs/by-name/sl/slimevr-server/package.nix | 107 ++ 3 files changed, 1216 insertions(+) create mode 100644 pkgs/by-name/sl/slimevr-server/deps.json create mode 100644 pkgs/by-name/sl/slimevr-server/no-grgit.patch create mode 100644 pkgs/by-name/sl/slimevr-server/package.nix diff --git a/pkgs/by-name/sl/slimevr-server/deps.json b/pkgs/by-name/sl/slimevr-server/deps.json new file mode 100644 index 000000000000..fd9ae28a6a6d --- /dev/null +++ b/pkgs/by-name/sl/slimevr-server/deps.json @@ -0,0 +1,1073 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://jitpack.io/com/github": { + "SlimeVR#oscquery-kt/566a0cba58": { + "jar": "sha256-w6EjxfeM05gyOUNerENkk7nxrOiGP3naZTuNCi5V5U8=", + "pom": "sha256-ma8Kit5DlZsbygVAfnp9mSSzl+AXJQDTDUQAg9LwrCc=" + }, + "SlimeVR/oscquery-kt#oscquery-kt-jvm/566a0cba58": { + "jar": "sha256-/8RtVxvDD4AUHsdWv2IuPAg6SgWXvXv6MhKsffjMB+M=", + "module": "sha256-/ZMir+jaJKIGmdNCkw1UXFOSamzCj76nOzbhUAYb/vU=", + "pom": "sha256-LvIhWi+XFxY/gDni5mBU64XOJ+JLGY2X0r4222bKXlo=" + }, + "SlimeVR/oscquery-kt#oscquery-kt/566a0cba58": { + "jar": "sha256-CJ4kQXv59sNO7Fcg7rssvMguooVezvkBM+sX4QedWGg=", + "module": "sha256-ZqK7sz4yLUmYWICZSpFHgE/xcL5zjXSPUIkHneeBVOg=", + "pom": "sha256-x573rzicYvlbWVFzRzAqNinkB4Himt6z8iLqhEdkA7c=" + }, + "jmdns#jmdns/0e40954468": { + "jar": "sha256-At4T7JOk5Ary/jGDErygVFkglIQ37CdG98idweqySAQ=", + "pom": "sha256-aEgGw0Vfw3gG0B4RCADfpb1wmQBtXY4c0jwryNaS3yY=" + } + }, + "https://plugins.gradle.org/m2": { + "com/diffplug/durian#durian-collect/1.2.0": { + "jar": "sha256-sZTAuIAhzBFsIcHcdvScLB/hda9by3TIume527+aSMw=", + "pom": "sha256-i7diCGoKT9KmRzu/kFx0R2OvodWaVjD3O7BLeHLAn/M=" + }, + "com/diffplug/durian#durian-core/1.2.0": { + "jar": "sha256-F+0KrLOjwWMjMyFou96thpTzKACytH1p1KTEmxFNXa4=", + "pom": "sha256-hwMg6QdVNxsBeW/oG6Ul/R3ui3A0b1VFUe7dQonwtmI=" + }, + "com/diffplug/durian#durian-io/1.2.0": { + "jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=", + "pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4=" + }, + "com/diffplug/durian#durian-swt.os/4.2.2": { + "jar": "sha256-a1Mca0vlgaizLq2GHdwVwsk7IMZl+00z4DgUg8JERfQ=", + "module": "sha256-rVlQLGknZu48M0vkliigDctNka4aSPJjLitxUStDXPk=", + "pom": "sha256-GzxJFP1eLM4pZq1wdWY5ZBFFwdNCB3CTV4Py3yY2kIU=" + }, + "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/6.25.0": { + "pom": "sha256-9FyCsS+qzYWs1HTrppkyL6XeqIQIskfQ5L3pQSkIIjo=" + }, + "com/diffplug/spotless#spotless-lib-extra/2.45.0": { + "jar": "sha256-YCy7zTgo7pz7LjCn+bMDNcaScTB3FBTUzdKU0h/ly2c=", + "module": "sha256-9pnkNfTlzgPbYJpHaO6wNj1uB8ZfvPrx/GKcTnbuf7A=", + "pom": "sha256-5x2LkRDdSNLn9KVLi/uozlWpbmteu9T0OpJGZJz1b7A=" + }, + "com/diffplug/spotless#spotless-lib/2.45.0": { + "jar": "sha256-sllply4dmAKAyirlKRl+2bMWCq5ItQbPGTXwG9Exhmc=", + "module": "sha256-+x+8+TUAczrHWcp99E8P9mVTEze0LaAS4on/CINNiQ8=", + "pom": "sha256-WKd8IsQLIc8m29tCEwFu9HrM9bBwchfHkyqQ9D+PMNw=" + }, + "com/diffplug/spotless#spotless-plugin-gradle/6.25.0": { + "jar": "sha256-9euQikxdpGKZ51Q/qtoEAtLEt31Yx7Qy1Lblk0mygKM=", + "module": "sha256-RoHRe/PJIF2DeOynBcAAywzJjcx40DATy2iJjGvSx0Q=", + "pom": "sha256-q1ZuPYS2w/rHqPySXy279TzZdZywOvPAfQ3EN9OXqNo=" + }, + "com/fasterxml#oss-parent/38": { + "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug=" + }, + "com/fasterxml#oss-parent/50": { + "pom": "sha256-9dpV3XuI+xcMRoAdF3dKZS+y9FgftbHQpfyGqhgrhXc=" + }, + "com/fasterxml#oss-parent/58": { + "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" + }, + "com/fasterxml/jackson#jackson-bom/2.17.2": { + "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" + }, + "com/fasterxml/jackson#jackson-parent/2.17": { + "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" + }, + "com/fasterxml/woodstox#woodstox-core/6.5.1": { + "jar": "sha256-ySjWBmXGQV+xw5d1z5XPxE9/RYDPWrAbHDgOv/12iH8=", + "pom": "sha256-SDllThaxcU509Rq8s3jYNWgUq49NUnPR3S8c6KOQrdw=" + }, + "com/github/gmazzo/buildconfig#com.github.gmazzo.buildconfig.gradle.plugin/5.5.0": { + "pom": "sha256-VLsX6z8pKCFD2TiyS1vnkg1EBm52b3FtpUQ7xp785/g=" + }, + "com/github/gmazzo/buildconfig#plugin/5.5.0": { + "jar": "sha256-rf1HIagM0l8M9z2z26t4RV/HCi/9bkjuGLjzDZCWvyU=", + "module": "sha256-O5YZPjLFtbyxtYha8mA6vSPl82+AID6j1NNGbn6BBZI=", + "pom": "sha256-zmdHCwkwZgynvmTQ9NGTsUdLNTU8SoNEUFSFe1ZCLd4=" + }, + "com/google/code/gson#gson-parent/2.8.9": { + "pom": "sha256-sW4CbmNCfBlyrQ/GhwPsN5sVduQRuknDL6mjGrC7z/s=" + }, + "com/google/code/gson#gson/2.8.9": { + "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=", + "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4=" + }, + "com/googlecode/concurrent-trees#concurrent-trees/2.6.1": { + "jar": "sha256-BONySYTipcv1VgbPo3KlvT08XSohUzpwBOPN5Tl2H6U=", + "pom": "sha256-Q8K5sULnBV0fKlgn8QlEkl0idH2XVrMlDAeqtHU4qXE=" + }, + "com/googlecode/javaewah#JavaEWAH/1.2.3": { + "jar": "sha256-1lImlJcTxMYaeE9BxRFn57Axb5N2Q5jrup5DNrPZVMI=", + "pom": "sha256-5O1sZpYgNm+ZOSBln+CsfLyD11PbwNwOseUplzr5byM=" + }, + "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/8.3.2": { + "pom": "sha256-szOyGpOZQspQU6SeLX5q2zN15DgL+wGwm+TBlU4qENA=" + }, + "com/gradleup/shadow#shadow-gradle-plugin/8.3.2": { + "jar": "sha256-47sBT4DY/AbxJLnuN84qW0NYjtrZfuNXcAXZzBPI+mk=", + "module": "sha256-BUonHjgERAFbXnzvp9efTC7yvvfPjPUH7GQoEM0fESg=", + "pom": "sha256-Mjrk4FkMBPurCWKJcVxhzy40MF9QgOGLqiqyAKShmaM=" + }, + "com/squareup#javapoet/1.13.0": { + "jar": "sha256-THUX6EinGzbQadErs79Gpw/UzaMQXYIrDtLhnAC2kpE=", + "pom": "sha256-VKNPqFAqRryQ79tJJiYAWR+oC/mjT1pMeYMRrsFsqXc=" + }, + "com/squareup#kotlinpoet-jvm/1.18.1": { + "jar": "sha256-s+x+8cJzRtGIwRMVm89kd6I2s0DTJD5ST3xFTjkixWQ=", + "module": "sha256-+1tTJWd4xiTRlZSXMZeAjwiFn8ZWNUuxIvwMl3U9mdc=", + "pom": "sha256-+ucsMCnUZuEBauSXrTJeuFOlAUBo/kpeZb7ZtPuvCbs=" + }, + "com/squareup#kotlinpoet/1.18.1": { + "module": "sha256-6AmDh4Z7X+tHZBbd6HztYFpmDDlsKSAaiaxm42FSgUw=", + "pom": "sha256-csHy89blWKZkLTUye98mGyGumOQ6tolJMqeTXzVO4xU=" + }, + "com/squareup/okhttp3#okhttp/4.12.0": { + "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=", + "module": "sha256-YH4iD/ghW5Kdgpu/VPMyiU8UWbTXlZea6vy8wc6lTPM=", + "pom": "sha256-fHNwQKlBlSLnxQzAJ0FqcP58dinlKyGZNa3mtBGcfTg=" + }, + "com/squareup/okio#okio-jvm/3.6.0": { + "jar": "sha256-Z1Q/Bzb8QirpJ+0OUEuYvF4mn9oNNQBXkzfLcT2ihBI=", + "module": "sha256-scIZnhwMyWnvYcu+SvLsr5sGQRvd4By69vyRNN/gToo=", + "pom": "sha256-YbTXxRWgiU/62SX9cFJiDBQlqGQz/TURO1+rDeiQpX8=" + }, + "com/squareup/okio#okio/3.6.0": { + "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=", + "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" + }, + "commons-codec#commons-codec/1.16.0": { + "jar": "sha256-VllfsgsLhbyR0NUD2tULt/G5r8Du1d/6bLslkpAASE0=", + "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ=" + }, + "commons-io#commons-io/2.16.1": { + "jar": "sha256-9B97qs1xaJZEes6XWGIfYsHGsKkdiazuSI2ib8R3yE8=", + "pom": "sha256-V3fSkiUceJXASkxXAVaD7Ds1OhJIbJs+cXjpsLPDj/8=" + }, + "dev/equo/ide#solstice/1.7.5": { + "jar": "sha256-BuFLxDrMMx2ra16iAfxnNk7RI/mCyF+lEx8IF+1lrk8=", + "module": "sha256-eYp7cGdyE27iijLt2GOx6fgWE6NJhAXXS+ilyb6/9U8=", + "pom": "sha256-20U7urXn2opDE5sNzTuuZykzIfKcTZH1p5XZ/2xS3d8=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { + "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" + }, + "jakarta/platform#jakartaee-api-parent/9.1.0": { + "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" + }, + "org/apache#apache/29": { + "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" + }, + "org/apache#apache/31": { + "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" + }, + "org/apache#apache/33": { + "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" + }, + "org/apache/ant#ant-launcher/1.10.15": { + "jar": "sha256-XIVRmQMHoDIzbZjdrtVJo5ponwfU1Ma5UGAb8is9ahs=", + "pom": "sha256-ea+EKil53F/gAivAc8SYgQ7q2DvGKD7t803E3+MNrJU=" + }, + "org/apache/ant#ant-parent/1.10.15": { + "pom": "sha256-SYhPGHPFEHzCN/QoXER3R5uwgEvwc3OUgBsI114rvrA=" + }, + "org/apache/ant#ant/1.10.15": { + "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=", + "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY=" + }, + "org/apache/commons#commons-parent/58": { + "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" + }, + "org/apache/commons#commons-parent/69": { + "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" + }, + "org/apache/logging#logging-parent/11.2.0": { + "pom": "sha256-dya9j66DWy0BJIYRvLY+07qZj9TqUaxEJTv57UxyjeA=" + }, + "org/apache/logging/log4j#log4j-api/2.24.0": { + "jar": "sha256-3pm1JXjGLuASXdNF5xIVAvrP4pKUMUrmhKShIxTE5Vo=", + "pom": "sha256-pgbigYVtMdSE3lGJME+yMGnsOaHCKE/Uo5sS3Cbe+CA=" + }, + "org/apache/logging/log4j#log4j-bom/2.24.0": { + "pom": "sha256-jTySt3fh819yCRUziBoEJdnn5lXLA6OMD0Wlp614QFE=" + }, + "org/apache/logging/log4j#log4j-core/2.24.0": { + "jar": "sha256-P1uTyA8PPS6M+xZqfWTsWJ+Mkyb6DXxB101jso9v1i4=", + "pom": "sha256-+Uoc4WqvWGfQapi74TtYfwtx7B02eun2mXVNThE4L3E=" + }, + "org/apache/logging/log4j#log4j/2.24.0": { + "pom": "sha256-gF3bFP3N7dA0/e8QU0eZH3cEvrTyI52kS/r0NDYDMeo=" + }, + "org/apache/maven#maven-api-meta/4.0.0-alpha-9": { + "jar": "sha256-MsT1yturaAw0lS+ctXBFehODzOxMmlewOSYH1xkcaUk=", + "pom": "sha256-2ePDXW/aysuNGLn2QoYJDH/65yjWbLJq9aJmgZUNvnk=" + }, + "org/apache/maven#maven-api-xml/4.0.0-alpha-9": { + "jar": "sha256-KbJijQ8CgRlxWRaEnBnu1FsyzcZ+sTVReYxzr6SqI9Y=", + "pom": "sha256-N2bjAzOTTJIvUlj6M0uHXyi7ABJ/8D3vANl/KlOnrps=" + }, + "org/apache/maven#maven-api/4.0.0-alpha-9": { + "pom": "sha256-ZYvglXcymzX5TemWdb8O/HI26ZYbXHhfMyqkfyKUcfA=" + }, + "org/apache/maven#maven-bom/4.0.0-alpha-9": { + "pom": "sha256-4EfSnTUI/yd6Wsk1u5J/NUkQLMbTec5a4p4pYzeE0Rw=" + }, + "org/apache/maven#maven-parent/41": { + "pom": "sha256-di/N1M6GIcX6Ciz2SVrSaXKoCT60Mqo+QCvC1OJQDFM=" + }, + "org/apache/maven#maven-xml-impl/4.0.0-alpha-9": { + "jar": "sha256-JucCuIHVeuTuiNAsAJQLpkBjcF7mkgWuiVi/g5qLBrE=", + "pom": "sha256-us0USYVzbUMmuuRChHM78eMTKX3NolNGTkYpsddoGPc=" + }, + "org/apache/maven#maven/4.0.0-alpha-9": { + "pom": "sha256-5QzZ/zefQ3H3/ywsrFF5YfPS9n7fgJCHU8e9UGuRPX4=" + }, + "org/codehaus/groovy#groovy-bom/3.0.22": { + "pom": "sha256-kqci1+KztXJ8mr5uF44yfcjJN0mpX+qpEtHSannhn5M=" + }, + "org/codehaus/plexus#plexus-utils/4.0.1": { + "jar": "sha256-lrnMREORkdLQY1l04tROdoc2tPsqvLZflM2V5BkS+os=", + "pom": "sha256-vEI1qVzR665CZEyB67qcHUxSVl+B6WqyBLblbj43jME=" + }, + "org/codehaus/plexus#plexus-xml/4.0.4": { + "jar": "sha256-Bp54tTcQjcYSSmcHP8mYJkeR9rZJnpVaOOcrs+T+Gt8=", + "pom": "sha256-Ohb3yn7CRzFFtGHgpylREI1H4SThjIRMCFsaY3jGEVE=" + }, + "org/codehaus/plexus#plexus/17": { + "pom": "sha256-kVJu5mMnx/UPuyW9Qb/LkW4oRBS4aOMdUKIwBL197qc=" + }, + "org/codehaus/plexus#plexus/18": { + "pom": "sha256-tD7onIiQueW8SNB5/LTETwgrUTklM1bcRVgGozw92P0=" + }, + "org/codehaus/woodstox#stax2-api/4.2.1": { + "jar": "sha256-Z4Vn5ItRpCxlxpnyZlOa09Z21LGlsK19iezoudV3JXk=", + "pom": "sha256-edpBDIwPRqP46K2zDWwkzNYGW272v96HvZfpiB6gouc=" + }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/eclipse/jetty#jetty-bom/9.4.55.v20240627": { + "pom": "sha256-plq2UZjcP22y/2kBBlc31UgL52e+wyDgFzqJB68LGdg=" + }, + "org/eclipse/jgit#org.eclipse.jgit-parent/6.7.0.202309050840-r": { + "pom": "sha256-u56FQW2Y0HMfx2f41w6EaAQWAdZnKuItsqx5n3qjkR8=" + }, + "org/eclipse/jgit#org.eclipse.jgit/6.7.0.202309050840-r": { + "jar": "sha256-tWRHfQkiQaqrUMhKxd0aw3XAGCBE1+VlnTpgqQ4ugBo=", + "pom": "sha256-BNB83b8ZjfpuRIuan7lA94HAEq2T2eqCBv4KTTplwZI=" + }, + "org/eclipse/platform#org.eclipse.osgi/3.18.300": { + "jar": "sha256-urlD5Y7dFzCSOGctunpFrsni2svd24GKjPF3I+oT+iI=", + "pom": "sha256-4nl2N1mZxUJ/y8//PzvCD77a+tiqRRArN59cL5fI/rQ=" + }, + "org/jdom#jdom2/2.0.6.1": { + "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=", + "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { + "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", + "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + }, + "org/jetbrains/kotlin#kotlin-build-statistics/2.0.20": { + "jar": "sha256-c6fXFRN1WzF9Kxttp2bW5reiXcmdzv5DEzJTNkIuzhE=", + "pom": "sha256-10GK0lyAbeg2FQvdNQsAvmwtJQmeXXQd3+PzgcUurY0=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.20": { + "jar": "sha256-V+1QIg547DnoqAAUMw8pXlSFtWOMESmvntfVPXhYxcI=", + "pom": "sha256-nHrVho+yGJsb9NbCL2yUmDs6jhopTpWlQSy4Lg9C3bI=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.20": { + "jar": "sha256-o2BL81DIvM4nECFYu7OD+k0YFLxIaq7VnyeOraUf9q0=", + "pom": "sha256-WXBD+4xlJ/QpmcoE7TUpY5Is0W5piKqlLT2zLaHbhZ0=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.20": { + "jar": "sha256-4DzwSwNA8a4VEhBjC10pFcKXmIxuIuTe206nz7dKz2c=", + "pom": "sha256-3M3xugxPzYvUIwNFroP6fb6SglY9ilP9XmHFM1tbcYA=" + }, + "org/jetbrains/kotlin#kotlin-daemon-client/2.0.20": { + "jar": "sha256-cxUswf2CHQcTlHOry/jH0B0A5oaEuWHhkurogNycfaQ=", + "pom": "sha256-qUcReIj0z/tjk9QurqYRtj31ib8pYXgmzLclNxK/OsM=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.20": { + "jar": "sha256-W9URO4WrhSjhkuK7P8GX9bw0SLzb0Fh5Czf9N/TuV68=", + "pom": "sha256-IZgoJm6keO7rQuT1L5bQuQfYykhHz4aq45FprYsupKU=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.0.20": { + "jar": "sha256-i2O0/7e6aOKHIFaa1HqWzAZclFZO0WHuoVrIZIh7pN4=", + "pom": "sha256-D8eaPIg8fbbsD6lU1cimiugRBlIm+4WRbhy/9pnlwUc=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.20": { + "jar": "sha256-D3NXvFzMjjaB7DtGQ8cMrSiDskbIt699bZccQeOTTy0=", + "module": "sha256-CJ8SCJE61calM09nu8pI/HsK+hCv0L2lFT+8tSzCqWw=", + "pom": "sha256-IQOK734wtxG0qE3grS1TO9MgXhOKrWfP1YnXl+/afII=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.20/gradle85": { + "jar": "sha256-D3NXvFzMjjaB7DtGQ8cMrSiDskbIt699bZccQeOTTy0=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.0.20": { + "jar": "sha256-Ce2wJ7mh899xYnGuyte7QaHdvC+cETFyl5ANTyvc6Iw=", + "pom": "sha256-wZireMJmzzvnodJHBeW7GIbUlF/cpPcX9U77hv9M10o=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.0.20": { + "jar": "sha256-wfTqDBkmfx7tR0tUGwdxXEkWes+/AnqKL9B8u8gbjnI=", + "module": "sha256-wy8Uw0SXgCqOjXk7K11nkj4gIlOUePNm4Yp+9kFOut4=", + "pom": "sha256-Vn7N8kaceWkMLgmdz6r8PhF67GTe3BejtJ/Uo/ptDgg=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.0.20": { + "jar": "sha256-UUx/F9xeVO5dFqdhs2S500OVa8rUnf0I4IWWIldzfhk=", + "module": "sha256-HPn20+xtMFqgiQMqyJL/rogcwQUAP0VvLBX9PDAyCm4=", + "pom": "sha256-SEIbKUnHKiDU4OPybYcYxruScIbHbF/AlSCg1jbPumc=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.20": { + "module": "sha256-aBPMpB7w+/FciL7MQB44cGuWlEwhtr7HPdiM+QoPIB4=", + "pom": "sha256-eEmYfUbGj7neKvOwReEq1nPm1mOvbqpf2MYRlCt3LF0=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.20/gradle85": { + "jar": "sha256-gSn2LLfGJ7XOghh+QqbYfEKVK8e6ZLgFo1R/aFIxlmI=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.0.20": { + "module": "sha256-GwMjHvp7O20xsJNocpQfh+J6gZwANxiz0JiAt25j180=", + "pom": "sha256-TDLrNQlMFjWd943q7BHOUjvjYEB0FPoK7Miu/GftSkM=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.0.20": { + "jar": "sha256-QsQvvic/oDBOThf3OSxms56R+Z01+FwGixG91Wuemdw=", + "pom": "sha256-5f4GjE69XIhYw1w56GI6vrnIb4oXJUdC5/VZjkP62jw=" + }, + "org/jetbrains/kotlin#kotlin-native-utils/2.0.20": { + "jar": "sha256-wWbyBR6R0ZnpYP/HsnZEhcFRDNF2dN17jOPC/NBqhys=", + "pom": "sha256-mISZMftwkWhS6qfCDm2Pr1IsUNd627r9k2T1JrfN7EI=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.9.24": { + "jar": "sha256-plFmRFu4XvgWzeEnJ5/gAX0rfMQ5s7lyOQ4bc21k6Uw=", + "pom": "sha256-CghcMAUb1tSrdlrVoMUXnEE7NfdBjyiDFy+9m6GrzMk=" + }, + "org/jetbrains/kotlin#kotlin-serialization/2.0.20": { + "module": "sha256-rsyQ8DJ7IQJTYRNdyJQBDmHDVzVFBtLTP3pZeakRxGQ=", + "pom": "sha256-wYgmEN73pFKwREi8GVqr+D6CqMEcUSmFYUAbGyxfKCw=" + }, + "org/jetbrains/kotlin#kotlin-serialization/2.0.20/gradle85": { + "jar": "sha256-Jjd6xiKasd8/ojVJPYxWfkcLjYa2PolUSMwmbL/Ob1o=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.10": { + "pom": "sha256-fUtwVHkQZ2s738iSWojztr+yRYLJeEVCgFVEzu9JCpI=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.24": { + "module": "sha256-6Y6oxE+zaCDQG7iwAxaOI6IhtAHLQyVtcjo/C3fWFsI=", + "pom": "sha256-XZfiDNWGLoR6aYF1uTno3Fxr11vtmZ1vPU6ghIESFsA=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": { + "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.10": { + "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=", + "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": { + "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.10": { + "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=", + "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.24": { + "jar": "sha256-hYuQJpbanPWFq52Y/8HCcSJpgoNU3+kQfjcRsISjZGg=", + "module": "sha256-8uKmVztbUmXEEtXFgfv46gDGKxC5yS1WdMnpfy8zNbM=", + "pom": "sha256-uc6tTCIt7pDHT28BPTFqnlD4EaApMxPDNRrssvfM7V8=" + }, + "org/jetbrains/kotlin#kotlin-tooling-core/2.0.20": { + "jar": "sha256-W28UhUj+ngdN9R9CJTREM78DdaxbOf/NPXvX1/YC1ik=", + "pom": "sha256-XhIxEeAQewRmSIOgpAjB/zvbXQR+SQH4L0xC8QV4Bi0=" + }, + "org/jetbrains/kotlin#kotlin-util-io/2.0.20": { + "jar": "sha256-ZGTbjUFywhoXp5C20XiQIu1nrbN8UL5ri59YK1UrhSI=", + "pom": "sha256-LrBxVfqEF46ZVjnOe3aRcofK5UKjXSm1a7CZEB0oajw=" + }, + "org/jetbrains/kotlin#kotlin-util-klib/2.0.20": { + "jar": "sha256-h92Djcd3gsuVZ/GnYUmbPkpQ9SjABbJjii4+V0EKljs=", + "pom": "sha256-fbTRw72mdZvifuk35gfoscRpWNwIR3Ey/a7t4BbnOP8=" + }, + "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.0.20": { + "pom": "sha256-JyOoqUP6SkTTcD8VTEW31UcMcZ1OYKvz4ixzt3s4i5M=" + }, + "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.0.20": { + "pom": "sha256-0s2V9THwNRgW+fg0bsbWB2xxyt9jLz6PZX3dft+RukE=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { + "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": { + "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=", + "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=", + "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ=" + }, + "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=" + }, + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" + }, + "org/junit#junit-bom/5.9.3": { + "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", + "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" + }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, + "org/mockito#mockito-bom/5.7.0": { + "pom": "sha256-dlcAW89JAw1nzF1S3rxm3xj0jVTbs+1GZ/1yWwZ5+6A=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-commons/9.7": { + "jar": "sha256-OJvCR5WOBJ/JoECNOYySxtNwwYA1EgOV1Muh2dkwS3o=", + "pom": "sha256-Ws7j7nJS7ZC4B0x1XQInh0malfr/+YrEpoUQfE2kCbQ=" + }, + "org/ow2/asm#asm-tree/9.7": { + "jar": "sha256-YvSzvENgRcGstcO6LY7FVuwzaQk9f10Gx0frBLVtUrE=", + "pom": "sha256-o06h4+QSjAEDjbQ8aXbojHec9a+EsFBdombf5pZWaOw=" + }, + "org/ow2/asm#asm/9.7": { + "jar": "sha256-rfRtXjSUC98Ujs3Sap7o7qlElqcgNP9xQQZrPupcTp0=", + "pom": "sha256-3gARXx2E86Cy7jpLb2GS0Gb4bRhdZ7nRUi8sgP6sXwA=" + }, + "org/slf4j#slf4j-api/1.7.36": { + "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", + "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + }, + "org/slf4j#slf4j-parent/1.7.36": { + "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/springframework#spring-framework-bom/5.3.39": { + "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=", + "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs=" + }, + "org/tukaani#xz/1.9": { + "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", + "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" + }, + "org/vafer#jdependency/2.11": { + "jar": "sha256-zdoDAD+pVRMVpMw/wWPxhJXxkbSaj3CjquIy8Emn/dA=", + "pom": "sha256-2mymcCFlPxUMHVNDLKxApzkH0tkqjzR65eRAHk+iJ+c=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/fasterxml#oss-parent/50": { + "pom": "sha256-9dpV3XuI+xcMRoAdF3dKZS+y9FgftbHQpfyGqhgrhXc=" + }, + "com/fasterxml/jackson#jackson-base/2.15.1": { + "pom": "sha256-qdc9e+y/QhF0Vow4KrFik2EYD6lvwEHCzUokX2ljsJ0=" + }, + "com/fasterxml/jackson#jackson-bom/2.15.1": { + "pom": "sha256-xRdH0RSll5SfgRQHJ9nmzWPj9DkI82R++qcLGelNqk0=" + }, + "com/fasterxml/jackson#jackson-parent/2.15": { + "pom": "sha256-bN+XvGbzifY+NoUNL1UtEhZoj45aWHJ9P2qY7fhnXN4=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.15.1": { + "jar": "sha256-NEwbND2YGdXdQ5XyUHl3uRuyRjd4zy73sNAXJOyP+rI=", + "module": "sha256-hVNrLUbNnrN+TpGNKDOrvQ9Qd6aPlWuaLNRdsDtEwBM=", + "pom": "sha256-DKy1qFN8cteOQSWdbX5PCf/g96+ehsWIU21/WOg34uc=" + }, + "com/fasterxml/jackson/core#jackson-core/2.15.1": { + "jar": "sha256-nZhDGcyXboXEn0DakoAhrNLXc+JZqf+fgy7c2saSDu0=", + "module": "sha256-rdmSwmM0eNdXpuEcHee5z1BNxoHc1h0oL9o8u4F4M0c=", + "pom": "sha256-fHKqaK699Qz1EBA2TYWJa6gYjRX79O55b4oGFNYTtoY=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.15.1": { + "jar": "sha256-wfA0fOJpbJT1MdCVzZ7yLmSOwJDpscPe4Xk4sHod8XY=", + "module": "sha256-e9QxX2gFmSVlRTq/cVf+muzrjWqslisaZM9gubAbJc4=", + "pom": "sha256-7cmvJRy1QoPCy0FZ3bM4CZJ/DIkS7UIeKQLC064GIYQ=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.15.1": { + "jar": "sha256-iX8bNQmt4OcPFJi4POQQyEKLkTsSrkp8GmsLIkOLsYI=", + "module": "sha256-/HW18yHXnKdjB2n3oJfXa8ke9P4ubpUSJhjCPLllnAQ=", + "pom": "sha256-qggBh9FCfkU/J3YD+QqlLhJc+4Y5VORnbKPD3N3ngjU=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.15.1": { + "pom": "sha256-xLCopnocY3IgeJlhd5bYafE/UerrGsN/wHqcpxPaQjU=" + }, + "com/fazecast#jSerialComm/2.11.0": { + "jar": "sha256-xh5rVnw5XV412UKAaZjkWylmWMwU0kwau0EO0Hhbps0=", + "module": "sha256-/5bM5oSOSihGIHxYz+12sMRGhSpgyjs7cn5KkJ1/eVg=", + "pom": "sha256-CIOmOwJEY1v4RtSWaC+7dLzXKe6uMmyDP9eQ1B1ZuXs=" + }, + "com/github/jonpeterson#jackson-module-model-versioning/1.2.2": { + "jar": "sha256-FcepndfH5cTcOLXkhn1TZw1YDYqAXvQ4A7qT8IN2Uc0=", + "pom": "sha256-eN9L1tMAM6b3JUkuBewt0shfbc7EYm6wWT6KpO9f0ic=" + }, + "com/google/flatbuffers#flatbuffers-java/22.10.26": { + "jar": "sha256-W3qjoo2ou2Uzt6/eVFl5m5P3n8+GxW0XQttvKHxP1SE=", + "pom": "sha256-PeSwStYORI+xJmrusbRowsWOGLdXv2ilMsw9XdlNVHU=" + }, + "com/google/protobuf#protobuf-bom/3.21.12": { + "pom": "sha256-O72GqUBXpnHmPVX532EsZBlz1ecNba4qtFYk/xrfUcU=" + }, + "com/google/protobuf#protobuf-java/3.21.12": { + "jar": "sha256-Pz7b2pKGJGCA8+r1Yd1rDVorHxAI9pCRFchgnOrp34c=", + "pom": "sha256-CXiOUXdwUnUK3bE39cMbdwDlY6UsncRQlXqGVM/gVrU=" + }, + "com/google/protobuf#protobuf-parent/3.21.12": { + "pom": "sha256-fj44jW/7fyDmb/JfRbk3i0Igt7L9Jh9rO8IGs9/4u8g=" + }, + "com/illposed/osc#javaosc-core/0.8": { + "jar": "sha256-7PP/me8hI4cOUWtC4ey+JDiTHqgPOpAFWB3j4JxPEa0=", + "pom": "sha256-mNnI2Dr2I8tkc2WpiY8o6+l8xE7IvEuSu2RnxbN3iig=" + }, + "com/illposed/osc#javaosc-parent/0.8": { + "pom": "sha256-nEUgmNlVT1AifJfkGt0/t6mvSSUGgHK/3YywUtl8x3U=" + }, + "com/melloware#jintellitype/1.4.1": { + "jar": "sha256-6mQRTP+BCiat4vxz1LnB/jggDmP2dhUQ11ZrXtNOPCM=", + "pom": "sha256-wej58h+rEtprQQg+8i7wpFZBpjcmjw8pOryo9v0yoj4=" + }, + "com/melloware/jintellitype/maven-metadata": { + "xml": { + "groupId": "com.melloware", + "lastUpdated": "20220814121249", + "release": "1.4.1" + } + }, + "com/typesafe#config/1.4.3": { + "jar": "sha256-itpMGFznJBZxLWPgta/cXwCcDN9AXl8m7+zfFWql37Y=", + "pom": "sha256-tn6vqd0iD/h9ANumiACDpSlqXgxsAxA/XUuOHaEDD/M=" + }, + "commons-cli#commons-cli/1.8.0": { + "jar": "sha256-+UyYu8+hwdrGlW1sP0lOxAJlxnv1Td78ld9P/dc65tU=", + "pom": "sha256-PufcBh65En2wwwIglz5aqDVBME/6g9fqsjUNHIhfgZk=" + }, + "io/ktor#ktor-events-jvm/2.3.9": { + "jar": "sha256-QGw59U3lHZQ+8LTcLthWTh2dAvoBXeL6BWI4AML2HIM=", + "module": "sha256-WgYQ9dxhmiBfONZzUqD20qXnFY2GHlf/XHpp/6cEWNE=", + "pom": "sha256-2Zq3wheCmWAaJG53BPx1dSUWZ1NeiDgpNSKrDpzSOcs=" + }, + "io/ktor#ktor-events/2.3.9": { + "module": "sha256-MvAB55ymxBYrsipIRvIdGBEPloEgtpay74LosYzAz5g=", + "pom": "sha256-73GICXQmgLF8GA8zKJa5nMACeLKjWgztz110+1xwNLI=" + }, + "io/ktor#ktor-http-cio-jvm/2.3.9": { + "jar": "sha256-rgF0pMgUvtrXgVgRUwvo9q748C9DobzDQFdJ545M0nE=", + "module": "sha256-bIXTiBs3zKDrJ6b4VgKqXJJ02B1hMwahMZ6+DhxxMds=", + "pom": "sha256-jPnYSgxnG5aDJltROn80OR7iqvuBx6Zjz06OPAEd56s=" + }, + "io/ktor#ktor-http-cio/2.3.9": { + "module": "sha256-Pakptk01EA79n4MwCtgX1X/IpAibPzOG2AA5l33MsGc=", + "pom": "sha256-lGX9WjX4RxqIwSGlHniLHYnnZvbNQoWztwuGDF6JVyQ=" + }, + "io/ktor#ktor-http-jvm/2.3.9": { + "jar": "sha256-dqYd7yephR18Yt14IeKf+a+ipj1INBW9FkMj3n7jSeE=", + "module": "sha256-IrcQgRcCWBdZv8xXfrPgbm1D0XYUqqyyrMBRKDecsAw=", + "pom": "sha256-rv8ur5x8vlXmoj+qDV39MKx+etJvF90oaOh7+wayfRg=" + }, + "io/ktor#ktor-http/2.3.9": { + "module": "sha256-4AxlLf6stQVYvnqM8uGTZLN05WFVtk3TODyDMQR1S1U=", + "pom": "sha256-2OL7EPMr9EKkUZT2jzKkAoiyKUdtwaAgBy+9W9nE4DM=" + }, + "io/ktor#ktor-io-jvm/2.3.9": { + "jar": "sha256-SevXoWUuOsqfBGLQVK90nd+tj2z1q3LViiw3nLTwFQE=", + "module": "sha256-zxJVkHt8mOzh2leM7kledvwVW30jTmgTGPUjBpKYt7E=", + "pom": "sha256-2skMC2W7UywojCeem8Bn8cg++PVse0Xg90p1294vVuw=" + }, + "io/ktor#ktor-io/2.3.9": { + "module": "sha256-yGRM0vkYYzcM5UZfYUkzKcovxHUx5rtrOs+i3kjm92g=", + "pom": "sha256-jtSz4Y2gP4h0GusTT60B03I2V0Prm7xa7s2h3RWdTJA=" + }, + "io/ktor#ktor-network-jvm/2.3.9": { + "jar": "sha256-VUVPmTFzkbxW3l4lhpKWw4KTCgrqpolfeozdCdV0Lws=", + "module": "sha256-Fn1KWTPwdruL65rf3tPl28FfftmdNqCp/sOgYStE0AM=", + "pom": "sha256-eXvPIxERoaqhvlTIP+yrZ9hqfOP3E3oGrh7+eKXypP0=" + }, + "io/ktor#ktor-network/2.3.9": { + "module": "sha256-HWJ+/Oa1PyC5AXhdTZR7D/sA9Y5OCatpzA+fzJKmQ3w=", + "pom": "sha256-xNkuWQsPrkpBmBXGWLVJhBNwmSZrCEV5OBu2M+lK5Sg=" + }, + "io/ktor#ktor-serialization-jvm/2.3.9": { + "jar": "sha256-NMC5ioiIY7KVWZWB1aTSgRaeLwIePRX8CVAkEzg24q8=", + "module": "sha256-5jt5N2oVWSHGXaS4oYt4wub04dglxILNvGG99cZYIMw=", + "pom": "sha256-uQ/i6vohNFqx8+gXpHDawsrSh662d/SS0B678AL4pwU=" + }, + "io/ktor#ktor-serialization/2.3.9": { + "module": "sha256-C4PT1kZjRvF7XTedtnnVQajoUMzD21Nq7Zrn2SFviFw=", + "pom": "sha256-I3i4QBnk0BZAgpTWf6mTO1igD9aK1lGpHE+pCir2osQ=" + }, + "io/ktor#ktor-server-core-jvm/2.3.9": { + "jar": "sha256-e9modsIMbJSlqOQtavgrBZP6B0YeQPIEkKAeYPgoqO4=", + "module": "sha256-Y2GIxyhp8Nu4XwT35mZSICN/ewXmKXbrYnUBNrut7c4=", + "pom": "sha256-bGjP/o2jBoJVXf6ld62FhqAvZuIYLvAsC4zCs5LwD1o=" + }, + "io/ktor#ktor-server-core/2.3.9": { + "module": "sha256-Fj9IyooZ1Kq+2pjL4TkjLGNLCQD1A3JTYdUQZZjsJkc=", + "pom": "sha256-1+GcZ3Jf/3R2N/bJMHymzieRLI7txSN5BYqSa5gXrVM=" + }, + "io/ktor#ktor-server-default-headers-jvm/2.3.9": { + "jar": "sha256-PQFXYib1tMbbyOT1cUPSWGutpvvWIFxJX2lRuRKKMqE=", + "module": "sha256-MkdZ8xJg54sZO5LTh/mmnPMXfrSjYteVbwNUjNVGvSo=", + "pom": "sha256-GkJLfBCNhFwAlAYeBKYED18y8u2sMyjnoAQSNPeiQJM=" + }, + "io/ktor#ktor-server-default-headers/2.3.9": { + "module": "sha256-HcDEa0ncOQ0PPD4Fr1JksJUfLN6EA2XcY2WaLq567sE=", + "pom": "sha256-3wLc8gwzm6JVSWySmarwaPtSJ5sX//76obSYvOhFGAo=" + }, + "io/ktor#ktor-server-host-common-jvm/2.3.9": { + "jar": "sha256-ZnjXBW4NHIGuejYjV1WnQifdwJ2/ZYf4bsiJtOSEzSo=", + "module": "sha256-vvIgNRiFDxiGexyDLlbYqQHVwAGUx3uzHVqIAIh01IM=", + "pom": "sha256-RBt5kWGklte2R36K4yJbmpPRTf/Gke+Hg2IWmuWupS0=" + }, + "io/ktor#ktor-server-host-common/2.3.9": { + "module": "sha256-Q04xG2CeqDemcU60U2nMGeBvBd6zf7ujpF3g4Upn0LY=", + "pom": "sha256-azz8PS+aJcC3uwFNsF4/+KInj6iPPwiLjbEOUx6ise0=" + }, + "io/ktor#ktor-server-netty-jvm/2.3.9": { + "jar": "sha256-FntLW+0rNoGKJj0F1qpLD4Bv/Ic7ToJQmMh1Z9XeLU0=", + "module": "sha256-xmn+zYnO0VctNJ/Qbn2L2/4w7EfLWE0l/QroF22jQdw=", + "pom": "sha256-z2KtTmcCj/pSG6PU9hczv13IV57UQvUauhihnOka6W0=" + }, + "io/ktor#ktor-server-netty/2.3.9": { + "module": "sha256-L68IP2f5P5Qcmp41Ags9F1PLKY4tAMmjrL8YwwT+c+Y=", + "pom": "sha256-CTimOqpIVQ5u6GJajtRS8o7+1BXoaUNmIeyujgZ/Qzw=" + }, + "io/ktor#ktor-utils-jvm/2.3.9": { + "jar": "sha256-mH/r2kVD7/sdDg1ZBbLut7t3fJ9DLjnRIkFTxcbyNfE=", + "module": "sha256-Mwl+WxKFnjPIJYrZedrsZbdH6Dp/4z4qan51n8tVvGc=", + "pom": "sha256-sSbiYOBihXUK2TJHX0prVfxlHKw4XsQpDoz7mK1ejGY=" + }, + "io/ktor#ktor-utils/2.3.9": { + "module": "sha256-dkr1rxi1+CwLssTTS8cqhT1IANOfFl+oF34hfuDZ9Vo=", + "pom": "sha256-GiP4cvHRdU7rHCzq/d1JSShxrTpiCSMnIgTCDud4X4g=" + }, + "io/ktor#ktor-websockets-jvm/2.3.9": { + "jar": "sha256-rlniIJf1vDfrBWpf4NarGVKiVGjVfuSNCKlTsEmsOMo=", + "module": "sha256-qNVObtccVsXhVWErhYYwBYvV8vdmUc1u35775UQBP9M=", + "pom": "sha256-rqUJP2K2HwCJe0PjleNt2qrBM74A40ML1a1tsSng9uc=" + }, + "io/ktor#ktor-websockets/2.3.9": { + "module": "sha256-uhRGT5h1Nik+ztLdI07ztLUQKqhbKOnG2T+rSB7GFTU=", + "pom": "sha256-Gk52XnvtAwaY8phvbgzlsT94IGVj4RurRr77r7B0/PQ=" + }, + "io/netty#netty-buffer/4.1.106.Final": { + "jar": "sha256-1QZ72+R21jy0MpOCKDKnSafDijjBxRYQfHPSV8Ob7SE=", + "pom": "sha256-2gY34YJ9Uw2h2PQwsObNaT7Ee32qBnQrKKw02xy1RqY=" + }, + "io/netty#netty-codec-http/4.1.106.Final": { + "jar": "sha256-uhd6A63Fh/pj6W8duunEb/JfWTl+o02WC0XgXQKWAm4=", + "pom": "sha256-DE+4Y7F3o8Z9NhZistW8Gx43Vgubamtxfbc+lnlW2Ro=" + }, + "io/netty#netty-codec-http2/4.1.106.Final": { + "jar": "sha256-wrgh1XpzPNZx6iqwZCACsX4KK4kATKAmxuro9Tgc+B4=", + "pom": "sha256-JZlznLzUACvwLSkABPTYxyvdhZ2VOyGAR7HvdW55jEY=" + }, + "io/netty#netty-codec/4.1.106.Final": { + "jar": "sha256-k4Y9/WkPes58JuTICP3CR4CtrUZbPNy3zj/HPEIt928=", + "pom": "sha256-NA+IHwoS9itNCY+bcQo0fASTjV/z38wvw8pw1X7a70s=" + }, + "io/netty#netty-common/4.1.106.Final": { + "jar": "sha256-X/vgG9hFYXqRbeNhMBDV/aV8XraUFH040E95Hpg01cM=", + "pom": "sha256-4ayZMJpA1e76IEs6GBXHIcuS5K5t1UHsIoRQ2cnUgA0=" + }, + "io/netty#netty-handler/4.1.106.Final": { + "jar": "sha256-WpGa2Ittnp8IwwaZgLxlamKSagDmui2lhZqg7k4gLkQ=", + "pom": "sha256-lhoCD6DBskT1io9MYS+egEEokLlgO/WTzmiUKaRlC0Y=" + }, + "io/netty#netty-parent/4.1.106.Final": { + "pom": "sha256-eV8c7NBEHGSvry5vEN+yHCRtRI9sQ1cFHt6mjpw+s2U=" + }, + "io/netty#netty-resolver/4.1.106.Final": { + "jar": "sha256-QElYuPBZDuUmAT0BHNI1Tat4rbqtdD19RE2zOj+eq6w=", + "pom": "sha256-phbG6XmPmDwsK0BiFDvaWM8tD2mGnZ00yMJiPdZMXXc=" + }, + "io/netty#netty-transport-classes-epoll/4.1.106.Final": { + "jar": "sha256-676g9nii85R+sgC+Az7X/lUwZ+Octd9Ldp0bn8aimHI=", + "pom": "sha256-kancuAlsq6lJCbohCze/4/M7qjAuZXAap/4nnWlRzGc=" + }, + "io/netty#netty-transport-classes-kqueue/4.1.106.Final": { + "jar": "sha256-9o7UQlABZcajhz4HMeG2IIS0L4QtD0dmdHSA7x/Jdj4=", + "pom": "sha256-5VnP7dwvVFIUCbLypQY8gXefTgvpcG/+2QR0B3xBHU4=" + }, + "io/netty#netty-transport-native-epoll/4.1.106.Final": { + "jar": "sha256-ZgOaFRY1MCriM9/Rh9kcfddzoRrM0Sc1wWU7gndOd/A=", + "pom": "sha256-U51mdWvcdwISzdMD7mJMrY2xbu9KgZiyqOKEg+ljb04=" + }, + "io/netty#netty-transport-native-kqueue/4.1.106.Final": { + "jar": "sha256-FC/1C6Wcdbv2c6bBQ53Prjy3RprbgQXcP7ZqpAVRpK4=", + "pom": "sha256-BuxVaGByijbJpVnBVpIl5kzOGvQPqZ7T3GdZgmHMlOs=" + }, + "io/netty#netty-transport-native-unix-common/4.1.106.Final": { + "jar": "sha256-9S1LOMVxBmv6rpZKeGf6k38OVPtf9GfFdstlCiCoVOg=", + "pom": "sha256-h19sn7JG3Vygm8Lc/LF4wpsBxx6lE/M3jm/Osp1KCjo=" + }, + "io/netty#netty-transport/4.1.106.Final": { + "jar": "sha256-I+qaOQCbQenQqhUVswc6+e5NpOFsLoabWqiqnxCdQlE=", + "pom": "sha256-qyxCFnnBmSuuT3UyvpdpbK5L9g5pbwskf/vPunrynM4=" + }, + "log4j#log4j/1.2.17": { + "jar": "sha256-HTFpZEVpdyBScJF1Q2kIKmZRvUl4G2AF3rlOVnU0Bvk=", + "pom": "sha256-O5Wj083TqkuRqzJ921ob/gPYHic3lONqoUQEcdXXDl4=" + }, + "net/java/dev/jna#jna-platform/5.15.0": { + "jar": "sha256-GLf259NM6JMJptkFKuGph+jmQFfi9oPgHlDy8rWc0VM=", + "pom": "sha256-oNnHuB/tH6i+iLAv16dWDeGxrFlYOh4sWiGopdxs32c=" + }, + "net/java/dev/jna#jna/5.15.0": { + "jar": "sha256-pWQVjSirUSf8apWAKO1UJ5/gmZZixGQltqOwmipSCU0=", + "pom": "sha256-J2YC/zZ6TDkVXa7MHoy1T0eJ5dgN+Qo6i2YD8d61ngU=" + }, + "net/java/dev/jna/jna-platform/maven-metadata": { + "xml": { + "groupId": "net.java.dev.jna", + "lastUpdated": "20240915160458", + "release": "5.15.0" + } + }, + "net/java/dev/jna/jna/maven-metadata": { + "xml": { + "groupId": "net.java.dev.jna", + "lastUpdated": "20240915160455", + "release": "5.15.0" + } + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/32": { + "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8=" + }, + "org/apache/commons#commons-collections4/4.4": { + "jar": "sha256-Hfi5QwtcjtFD14FeQD4z71NxskAKrb6b2giDdi4IRtE=", + "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0=" + }, + "org/apache/commons#commons-lang3/3.15.0": { + "jar": "sha256-SQUJACLe84Cel5Y4MvyLJCH9qACFPJTTzb8a0wEdl1Y=", + "pom": "sha256-DLdcseh9KLTEVJL8jGzIHXzKPLSIKJZzXijkSM34EM4=" + }, + "org/apache/commons#commons-math3/3.6.1": { + "jar": "sha256-HlbXsFjSi2Wr0la4RY44hbZ0wdWI+kPNfRy7nH7yswg=", + "pom": "sha256-+tcjNup9fdBtoQMUTjdA21CPpLF9nFTXhHc37cJKfmA=" + }, + "org/apache/commons#commons-parent/39": { + "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" + }, + "org/apache/commons#commons-parent/48": { + "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ=" + }, + "org/apache/commons#commons-parent/70": { + "pom": "sha256-YDNaNOkfSc5QcjsAfXwSUU/Vdm2hff/7ZzLhEx5YzRs=" + }, + "org/apache/commons#commons-parent/71": { + "pom": "sha256-lbe+cPMWrkyiL2+90I3iGC6HzYdKZQ3nw9M4anR6gqM=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/eclipse/jetty#jetty-parent/21": { + "pom": "sha256-eXLp7G84UqjuHuXU0Q3Mnc1gd7El+TWqlrNnpsgjN/U=" + }, + "org/eclipse/jetty/alpn#alpn-api/1.1.3.v20160715": { + "jar": "sha256-B76ZdYtpnhlPcPuXhNlCAtxsmCEod4KePXKwIPJmBXY=", + "pom": "sha256-FrRveqUg7VDUR4oM9ndjje3AFDtCNMJ48WDLS9JUgq8=" + }, + "org/fusesource#fusesource-pom/1.12": { + "pom": "sha256-xA2WDarc73sBwbHGZXr7rE//teUxaPj8sLKLhOb9zKE=" + }, + "org/fusesource/jansi#jansi/2.4.1": { + "jar": "sha256-Ll53Wp3Fj/prvWqm8JnWL4ti3N60w8O7vlzyMBvC3ME=", + "pom": "sha256-P5jZeaTTVZ+HefuwBLNK51Fq+t9RDhHffMPNBz6xuzs=" + }, + "org/hid4java#hid4java/0.8.0": { + "jar": "sha256-zoEmabbVjLruJv9M0WM96ksc7hrf5JJ1Gdj9Z64vqVQ=", + "pom": "sha256-77xJr8wr9ZM+6aE7PK/8d3t8/wzuJOS0iPCQIQQMv68=" + }, + "org/java-websocket#Java-WebSocket/1.5.7": { + "jar": "sha256-KNg5KogmYOY2YDwKctPh7V2hmTIQIUZFdU6TZVwNgGo=", + "pom": "sha256-FrB1dUjtbkqDQpPWICqJZHChRaekCDJQtNZMlgzetBE=" + }, + "org/java-websocket/Java-WebSocket/maven-metadata": { + "xml": { + "groupId": "org.java-websocket", + "lastUpdated": "20240708212417", + "release": "1.5.7" + } + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains#annotations/23.0.0": { + "jar": "sha256-ew8ZckCCy/y8ZuWr6iubySzwih6hHhkZM+1DgB6zzQU=", + "pom": "sha256-yUkPZVEyMo3yz7z990P1P8ORbWwdEENxdabKbjpndxw=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { + "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", + "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + }, + "org/jetbrains/kotlin#kotlin-build-common/2.0.20": { + "jar": "sha256-NvDXXOmviQZNnbT9IeIsVQdyAP5OOufZnjREmCZ6oNs=", + "pom": "sha256-EOhYxaCAxN21Wx0GvujV6Ea4YQX1aw5A8ojj+mGWEXI=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.20": { + "jar": "sha256-V+1QIg547DnoqAAUMw8pXlSFtWOMESmvntfVPXhYxcI=", + "pom": "sha256-nHrVho+yGJsb9NbCL2yUmDs6jhopTpWlQSy4Lg9C3bI=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-impl/2.0.20": { + "jar": "sha256-nOb4Gmmcw32zY6KDcVC8YqJJA9r2EhA00Sl5qpUBRGs=", + "pom": "sha256-DyiqOx3o2AWm+HlX08PWbDOeDEMmaZlc9Zf58r6J4II=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.20": { + "jar": "sha256-o2BL81DIvM4nECFYu7OD+k0YFLxIaq7VnyeOraUf9q0=", + "pom": "sha256-WXBD+4xlJ/QpmcoE7TUpY5Is0W5piKqlLT2zLaHbhZ0=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.20": { + "jar": "sha256-4DzwSwNA8a4VEhBjC10pFcKXmIxuIuTe206nz7dKz2c=", + "pom": "sha256-3M3xugxPzYvUIwNFroP6fb6SglY9ilP9XmHFM1tbcYA=" + }, + "org/jetbrains/kotlin#kotlin-daemon-client/2.0.20": { + "jar": "sha256-cxUswf2CHQcTlHOry/jH0B0A5oaEuWHhkurogNycfaQ=", + "pom": "sha256-qUcReIj0z/tjk9QurqYRtj31ib8pYXgmzLclNxK/OsM=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.20": { + "jar": "sha256-W9URO4WrhSjhkuK7P8GX9bw0SLzb0Fh5Czf9N/TuV68=", + "pom": "sha256-IZgoJm6keO7rQuT1L5bQuQfYykhHz4aq45FprYsupKU=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/2.0.20": { + "jar": "sha256-ZzHCVkuXOXGDWCVJAUC3rZ63Jtk4/gzvTr7y7Fkt6wM=", + "pom": "sha256-rVSg2nLxASl08e7sdp2EopMnzzfMrVUxt4cT/GD0tnY=" + }, + "org/jetbrains/kotlin#kotlin-native-prebuilt/2.0.20": { + "pom": "sha256-xYoRfPul4AVC+QrYLytqsh4Z46Ifzvy0mLq5k69FDwY=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.6.10": { + "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", + "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.8.22": { + "jar": "sha256-ZVgl+mURIg/tDK5arU3+oqv5j9EPCud+uNr2q/zQ8Cc=", + "pom": "sha256-KeHqCKPTq0gtH9/UH76TRZEt9Gbbr6+0sS0YN8cr4yg=" + }, + "org/jetbrains/kotlin#kotlin-script-runtime/2.0.20": { + "jar": "sha256-/pcAKmeY9yB1ZGSJGdbuzPszi5XcBLSIhthWZVvGSk4=", + "pom": "sha256-o6N2KcmFzt17+d12rGdJaz+ApZIoVB6WiAKg7obEuRQ=" + }, + "org/jetbrains/kotlin#kotlin-scripting-common/2.0.20": { + "jar": "sha256-XTdTOT5/7PHSG67l2314gyZ4K9v4qOxqKyzM97Ve5sY=", + "pom": "sha256-BesUmiCZ8ILJf1xFQ1HQuMphLFUwo6wyHSyMB12wEVU=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.0.20": { + "jar": "sha256-Ie8wOrS54Pnzl8FIliU6rkkCV7+w3VAInBwcBPAYcXE=", + "pom": "sha256-zr8swRmuHPJqP2tECxidwrruhS0nASU06qNqrNue4VI=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.0.20": { + "jar": "sha256-WgaucwO1TL0XdYnWEFumv9WbGxgur7W2aHJf9ypf0y0=", + "pom": "sha256-z6al9YOJy3K0SRLTABoB9eqL+vx5mbr6BRGz7t/LYdI=" + }, + "org/jetbrains/kotlin#kotlin-scripting-jvm/2.0.20": { + "jar": "sha256-sLtQD2MztLFsjraeo5TvaE8zRT+NNDEDSokHqfGNtvE=", + "pom": "sha256-m8uNHCOvcm21KpNrpbkXeyRoKSBYxT8Ckd5MwNpOzh4=" + }, + "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/2.0.20": { + "jar": "sha256-zI9QG2dslESLAWgNyvZ68cjFfOqEFQKnFuttEX+Xy4Y=", + "pom": "sha256-X74y6I+ly4WFjb1wpPZKWsJTSaTijzlQ3zJrMSRmUGY=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.8.22": { + "pom": "sha256-pysR3wi1Mi16Xo5iB4nuPkz+846GxDDn0RO/qeVMWB4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/2.0.20": { + "module": "sha256-tZe3Be/U4tgnFCCQw2BUJlVI7VG09SN38r+JxFlNU28=", + "pom": "sha256-o11/wINw+TE6S5U7zu7d2F4OHnLTEGLTe/jHeBs/b18=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.22": { + "jar": "sha256-BV9cskKH+hBhAJlae0erkhJrgegy6HX1+izwvVVpPQs=", + "pom": "sha256-T5WKqZPVmE+PXr7UFGVipfOp9pW2BJyfKHOBN5ytqzM=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.22": { + "jar": "sha256-QZiw6vCQpPJbb35aWVgfQxS6jJ9s0dE+6dNI5l7Y9wc=", + "pom": "sha256-ko8hhyF0djE8uBbUgHC8dlSqO5pa6B0/xfjCecyPjZ4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.20": { + "jar": "sha256-+xaVlmWaUYNXxLLBb0PcdascSYBWXtS0oxegUOXjkAY=", + "module": "sha256-3AUdwExqGW8tBtDTya8zufErybT+E5rhKQFAUII2tns=", + "pom": "sha256-Cu6WIJHn3QKIzDykz0qSjFYgcUYCEb+PQXkAkwbmGf4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.20/all": { + "jar": "sha256-UP+t6yC00kVqUmWVpPep6FiJaCcVBz5s26Gx2A461Fg=" + }, + "org/jetbrains/kotlin#kotlin-test-junit5/2.0.20": { + "jar": "sha256-2WksVbn4Zx29W1WXhxi3FGhNXYQrgxzIMtZPF8OFhjQ=", + "module": "sha256-Fk2+AREL7thci+BhcSdE1oKTMCG4Y1YxuwleOI17Hkk=", + "pom": "sha256-DtoRyJe+vgRSFCJG1vCB5Q/4A9vmFwK+7GEcuO1Qe20=" + }, + "org/jetbrains/kotlin#kotlin-test/2.0.20": { + "jar": "sha256-oVbXu3S7hHABkQ2s++5JyXF/jrZwxBQ3qSdoezN6Bf8=", + "module": "sha256-0wJTt8l9i4KWVQUITlTJ1qP2NWe4/G7H73kPR/gREcw=", + "pom": "sha256-yCDFnJRFdVYiqsuhkTg5lhSdfM3mBiMWLfHGnCxG+yE=" + }, + "org/jetbrains/kotlin#kotlin-test/2.0.20/all": { + "jar": "sha256-2iho+pWj+4814rTjMcouKTIUhnAZZex2a66CD5jgJ3w=" + }, + "org/jetbrains/kotlin/kotlin-native-prebuilt/2.0.20/kotlin-native-prebuilt-2.0.20-linux-x86_64": { + "tar.gz": "sha256-soKRi19RWLL41bU94ICTpyIG/CO5E4Lh3dJjDHIChCc=" + }, + "org/jetbrains/kotlinx#atomicfu/0.23.1": { + "jar": "sha256-fbhmDr5LkbtHjts2FsTjpQulnAfcpRfR4ShMA/6GrFc=", + "module": "sha256-Pokf5ja1UQgZIQD884saObzRwlM+I8Ri/AdkTur8sg8=", + "pom": "sha256-aIt5ABn0F87APmldZWexc7o7skGJVBZi8U/2ZEG1Pas=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { + "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.1": { + "pom": "sha256-Vj5Kop+o/gmm4XRtCltRMI98fe3EaNxaDKgQpIWHcDA=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": { + "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=", + "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=", + "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.8.1": { + "jar": "sha256-89T13hw5G7zCDzs0Ncy6wBNSHna2kC19WWNewVwfeX4=", + "module": "sha256-CbgcnRHC3uvxM62HtweSfB8ECZy2Ee8AjHcls+swgyk=", + "pom": "sha256-R8alCxQVHo+vfzUKlSNcN9EqvDi/sFW2aJdCkxctryw=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.8.1": { + "jar": "sha256-2vUPHJQEsiSh1t1Shvjo7n1j/oB/eOqY9xeVwYO2Al8=", + "module": "sha256-CMuvMyW1Tg+O+NqF5OtZb32Ub4Q+XRYAOFRj8yaKTvA=", + "pom": "sha256-+IkY2/qHh8TRcasCVToUrR3viqmwxcLCDMmUVdMkHiI=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-jdk8/1.8.1": { + "jar": "sha256-2M+0w2PJHHczU7EVvUprWgRgjnkW/iNdOp2H78uZbAE=", + "module": "sha256-Ifl7EL6TJkGBfTULclRP+LoyQYf/uREMbo2IESdv2TM=", + "pom": "sha256-3uCuamO2M1ETIAqW2eHHgJ32DQ1CS7/xy7tTsxQWWvk=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.7.3": { + "pom": "sha256-QiakkcW1nOkJ9ztlqpiUQZHI3Kw4JWN8a+EGnmtYmkY=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.7.3": { + "jar": "sha256-8K3eRYZBREdThc9Kp+C3/rJ/Yfz5RyZl7ZjMlxsGses=", + "module": "sha256-c7tMAnk/h8Ke9kvqS6AlgHb01Mlj/NpjPRJI7yS0tO8=", + "pom": "sha256-c09fdJII3QvvPZjKpZTPkiKv3w/uW2hDNHqP5k4kBCc=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-core/1.7.3": { + "jar": "sha256-SFBoLg5ZdoYmlTMNhOuGmfHcXVCEn2JSY5lcyIvG83s=", + "module": "sha256-OdCabgLfKzJVhECmTGKPnGBfroxPYJAyF5gzTIIXfmQ=", + "pom": "sha256-MdERd2ua93fKFnED8tYfvuqjLa5t1mNZBrdtgni6VzA=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.7.3": { + "jar": "sha256-sekThJntjSA3Xt2j8rHJXzEDoljv9q+e3F6gcQDyspw=", + "module": "sha256-D/cOITHypldYIvdhHAXig8SuCBczA/QQSUy0Eom9PvY=", + "pom": "sha256-0zRdKAgXvgfpwnrNYHPUleF73/VxxHADTglmQgeGp90=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-json/1.7.3": { + "jar": "sha256-qpP6PJY5LLE5WTE0Qw3C1RNn9Z1VPl43R+vYAHsmPxs=", + "module": "sha256-HPAiijWIcx1rrzvLvbCKMiUB9wQg1Q4pKrUB5V2Mz08=", + "pom": "sha256-BaiftqSvoKHUB51YgsrTSaF/4IqYv5a30A0GplUh3H0=" + }, + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" + }, + "org/junit#junit-bom/5.11.0-M1": { + "module": "sha256-j2MviWXptvQGnj1YueomuaW8dqmOibQyM3d6zm2tsjc=", + "pom": "sha256-tQl19cuoYgSr2j3Nbwl6+Rn+IuIe9pR43WuRn2x0DYU=" + }, + "org/junit#junit-bom/5.11.0-M2": { + "module": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4=", + "pom": "sha256-Sj/8Sk7c/sLLXWGZInBqlAcWF5hXGTn4VN/ac+ThfMg=" + }, + "org/junit#junit-bom/5.9.2": { + "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", + "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" + }, + "org/junit/jupiter#junit-jupiter-api/5.10.3": { + "jar": "sha256-bv5uAcof95t79Mbx7tCykpLhZsJ+r3sArJgaFNTeYao=", + "module": "sha256-HH5GU3/EOyd29N5BmpCEpkAREQn6QLSHiUCynOI4vh4=", + "pom": "sha256-c0ocaMNMWt870vW8pL9JjLtPScSJ18JNgM8OIQK+bxQ=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.10.3": { + "jar": "sha256-u9POjcEemSUHHvlpHWivGrbnEvqmhR98UnW8iq/IhnM=", + "module": "sha256-t34vIrhuzSrvh/C3LGoHDwsOdqNKvaqKd1ECweDRYSE=", + "pom": "sha256-g+8P1otgv2vHmnj+sRiCxiXEgu9p1iv+LRFwQKZEgUQ=" + }, + "org/junit/jupiter#junit-jupiter-params/5.10.3": { + "jar": "sha256-fD7YzvsSSWt2xTw9qYbqjwvz9CZ4GGlHVVGuOlBsGtg=", + "module": "sha256-TnM9YVyqFuDs17mum/6I+YqUAgkpMzx+4rT6CaegTZE=", + "pom": "sha256-bNnfkGpi/mTMMBw9YAeX9iTb1CJff6UFpajtsx/5iQY=" + }, + "org/junit/jupiter#junit-jupiter/5.10.3": { + "jar": "sha256-5vwJ+IHrqLjYp2YKbH9NWC+niB8wYTav4tgpZKLnwi8=", + "module": "sha256-hrCGx1WStDQ9pPdL6V4mhSxMqqWzToLVaqg/MYBLyBA=", + "pom": "sha256-Jd7AgvAkZ81iKQ7xOJv0smhu9QVKGo7d+xtbfVTeGZE=" + }, + "org/junit/platform#junit-platform-commons/1.10.3": { + "jar": "sha256-l4fwTUnbWTl83XVV1CGlvS0URWZpl9MnuU+F44vtV/E=", + "module": "sha256-n9gMr9DRm5pTrhnq4Eq94bIwVfQXXXbI52ibzkRImCs=", + "pom": "sha256-dZdXLFnxl1Ji+Nj8+I7GeDN2hUvwjOipPZnb3InuQ/k=" + }, + "org/junit/platform#junit-platform-engine/1.10.3": { + "jar": "sha256-33wyv3XPR8TI3dGUIJECeUen12XTC3Mf4AgwEV+voTM=", + "module": "sha256-D7CUb/Z+Q9A2K71CwjRNUUc4nkMVKCN3EW/rZOJrgNE=", + "pom": "sha256-b5uZvKDBfdwZ9RvAN+OxfKsPx+bx2nA4ejCrTgUgcig=" + }, + "org/junit/platform#junit-platform-launcher/1.10.3": { + "jar": "sha256-3q7t4vAR6vlPW8aB4E7uL0oPbWl3Hhp5qpUNiYtAXY0=", + "module": "sha256-t8tPKSY20uTbEbgazAMRJsfOvhLotss9JF6t5/3Qg0M=", + "pom": "sha256-cBNMufwHJ1YgZdX+faWPEF5KHHh36JnUkUm10/j9bRc=" + }, + "org/opentest4j#opentest4j/1.3.0": { + "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", + "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", + "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" + }, + "org/slf4j#slf4j-api/1.7.25": { + "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" + }, + "org/slf4j#slf4j-api/2.0.6": { + "jar": "sha256-LyqS1BCyaBOdfWO3XtJeIZlc/kEAwZvyNXfP28gHe9o=", + "pom": "sha256-i06GxT0ng2CPGuohPZBsW6xcBDPgCxkjm7FnZLn6NzY=" + }, + "org/slf4j#slf4j-api/2.0.7": { + "jar": "sha256-XWKYuToZBcMs2mR4gIrBTC1KR+kVNeU8Qff+64XZRvQ=", + "pom": "sha256-LUA8zw4KAtXBqGZ7DiozyN/GA4qyh7lnHdaBwgUmeYE=" + }, + "org/slf4j#slf4j-ext/1.7.25": { + "jar": "sha256-nfTqTTkOtVnxU3Fvp3ZYwmVA9Pg2NZc7jA4Npw1vqUQ=", + "pom": "sha256-BFZ0scyTcvj58i7LBUIBfC02evaUrA9Nx/68FGfecJg=" + }, + "org/slf4j#slf4j-log4j12/1.7.25": { + "jar": "sha256-3bNDlU3rbwRvhiYGxTQXhzDALtI9C39soQEsHj+nQnM=", + "pom": "sha256-kCkvzw5rW0o7L8ryvQ0EZ24h8ZOJyd6ksL6Z+IOkHUo=" + }, + "org/slf4j#slf4j-parent/1.7.25": { + "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" + }, + "org/slf4j#slf4j-parent/2.0.6": { + "pom": "sha256-FIJlDL4x5AjB3IkCHLrh0wRK1KAb+PYro2C2qBOhMSQ=" + }, + "org/slf4j#slf4j-parent/2.0.7": { + "pom": "sha256-wYK7Ns068ck8FgPN/v54iRV9swuotYT0pEU1/NIuRec=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/yaml#snakeyaml/2.0": { + "jar": "sha256-iAydiW5LdKBsVJwVyklkUBZdaQn6FdfmYr7o9qZtevo=", + "pom": "sha256-Q8dh+StUnIsI+5kggCU+SfCpg+VE7wZjwfT51o61JhY=" + } + } +} diff --git a/pkgs/by-name/sl/slimevr-server/no-grgit.patch b/pkgs/by-name/sl/slimevr-server/no-grgit.patch new file mode 100644 index 000000000000..4ec98d852b1f --- /dev/null +++ b/pkgs/by-name/sl/slimevr-server/no-grgit.patch @@ -0,0 +1,36 @@ +diff --git a/build.gradle.kts b/build.gradle.kts +index 79534cdf..4f298e66 100644 +--- a/build.gradle.kts ++++ b/build.gradle.kts +@@ -1,3 +1,2 @@ + plugins { +- id("org.ajoberstar.grgit") + } +diff --git a/server/desktop/build.gradle.kts b/server/desktop/build.gradle.kts +index 9ebb84a7..6130e45f 100644 +--- a/server/desktop/build.gradle.kts ++++ b/server/desktop/build.gradle.kts +@@ -13,7 +13,6 @@ plugins { + application + id("com.gradleup.shadow") + id("com.github.gmazzo.buildconfig") +- id("org.ajoberstar.grgit") + } + + kotlin { +@@ -86,12 +85,10 @@ buildConfig { + useKotlinOutput { topLevelConstants = true } + packageName("dev.slimevr.desktop") + +- val gitVersionTag = providers.exec { +- commandLine("git", "--no-pager", "tag", "--sort", "-taggerdate", "--points-at", "HEAD") +- }.standardOutput.asText.get().split('\n').first() +- buildConfigField("String", "GIT_COMMIT_HASH", "\"${grgit.head().abbreviatedId}\"") ++ val gitVersionTag = "@version@" ++ buildConfigField("String", "GIT_COMMIT_HASH", "\"NOT AVAILABLE\"") + buildConfigField("String", "GIT_VERSION_TAG", "\"${gitVersionTag.trim()}\"") +- buildConfigField("boolean", "GIT_CLEAN", grgit.status().isClean.toString()) ++ buildConfigField("boolean", "GIT_CLEAN", "true") + } + + tasks.run { diff --git a/pkgs/by-name/sl/slimevr-server/package.nix b/pkgs/by-name/sl/slimevr-server/package.nix new file mode 100644 index 000000000000..a19b69987e4d --- /dev/null +++ b/pkgs/by-name/sl/slimevr-server/package.nix @@ -0,0 +1,107 @@ +{ + lib, + stdenv, + fetchFromGitHub, + runCommand, + replaceVars, + jdk17_headless, + gradle, + hidapi, + makeWrapper, +}: +let + java = jdk17_headless; + # Without this the hidapi bundled with `org.hid4java:hid4java` will be used. + # The bundled version won't be able to find `libudev.so.1`. + javaOptions = + let + # hid4java tries to load `libhidapi.so` which doesn't exist in Nix's hidapi. + # The `libhidapi.so` it expects is actually `libhidapi-hidraw.so`. + libhidapi = runCommand "libhidapi" { } '' + mkdir -p $out/lib + ln -s ${hidapi}/lib/libhidapi-hidraw.so $out/lib/libhidapi.so + ''; + in + "-Djna.library.path='${ + lib.makeLibraryPath [ + hidapi + libhidapi + ] + }'"; +in + +stdenv.mkDerivation (finalAttrs: { + pname = "slimevr-server"; + version = "0.13.2"; + + src = fetchFromGitHub { + owner = "SlimeVR"; + repo = "SlimeVR-Server"; + rev = "v${finalAttrs.version}"; + hash = "sha256-XQDbP+LO/brpl7viSxuV3H4ALN0yIkj9lwr5eS1txNs="; + # solarxr + fetchSubmodules = true; + }; + + mitmCache = gradle.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; + }; + + patches = [ + # Upstream code uses Git to find the program version + (replaceVars ./no-grgit.patch { + inherit (finalAttrs) version; + }) + ]; + + postPatch = '' + # Disable Android, so its files don't have to be patched. + substituteInPlace settings.gradle.kts \ + --replace-fail 'include(":server:android")' "" + ''; + + nativeBuildInputs = [ + gradle + makeWrapper + ]; + + # this is required for using mitm-cache on Darwin + __darwinAllowLocalNetworking = true; + + gradleFlags = [ "-Dorg.gradle.java.home=${java}" ]; + + gradleBuildTask = "shadowJar"; + + doCheck = true; + + installPhase = '' + runHook preInstall + + install -Dm644 server/desktop/build/libs/slimevr.jar $out/share/slimevr/slimevr.jar + makeWrapper ${java}/bin/java $out/bin/slimevr-server \ + --add-flags "${javaOptions}" \ + --add-flags "-jar $out/share/slimevr/slimevr.jar" + + runHook postInstall + ''; + + passthru = { + inherit java javaOptions; + }; + + meta = { + homepage = "https://docs.slimevr.dev/"; + description = "App for facilitating full-body tracking in virtual reality"; + license = with lib.licenses; [ + mit + asl20 + ]; + maintainers = with lib.maintainers; [ + gale-username + imurx + ]; + platforms = with lib.platforms; darwin ++ linux; + mainProgram = "slimevr-server"; + }; +}) From e700e52405d7b7a4bb26f665d9557a401f434ae4 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 4 Dec 2024 21:53:50 +0200 Subject: [PATCH 04/40] python2: Fix alias usage on cross --- pkgs/development/interpreters/python/cpython/2.7/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 7e926d682810..063a96dea0f1 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -204,7 +204,7 @@ let ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-toolbox-glue" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "PYTHON_FOR_BUILD=${lib.getBin buildPackages.python}/bin/python" + "PYTHON_FOR_BUILD=${lib.getBin buildPackages.python27}/bin/python" "ac_cv_buggy_getaddrinfo=no" # Assume little-endian IEEE 754 floating point when cross compiling "ac_cv_little_endian_double=yes" @@ -239,7 +239,7 @@ let nativeBuildInputs = [ autoreconfHook ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) - [ buildPackages.stdenv.cc buildPackages.python ]; + [ buildPackages.stdenv.cc buildPackages.python27 ]; mkPaths = paths: { C_INCLUDE_PATH = lib.makeSearchPathOutput "dev" "include" paths; From 40e543da83c5c123e25c7694dd3a6aa97691e985 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 4 Dec 2024 22:04:56 +0200 Subject: [PATCH 05/40] saleae-logic: Use platforms instead of assert --- pkgs/by-name/sa/saleae-logic/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/sa/saleae-logic/package.nix b/pkgs/by-name/sa/saleae-logic/package.nix index 27b01dc5ffe1..7d1a95418e1a 100644 --- a/pkgs/by-name/sa/saleae-logic/package.nix +++ b/pkgs/by-name/sa/saleae-logic/package.nix @@ -22,8 +22,6 @@ let in -assert stdenv.hostPlatform.system == "x86_64-linux"; - stdenv.mkDerivation rec { pname = "saleae-logic"; version = "1.2.18"; @@ -92,7 +90,7 @@ stdenv.mkDerivation rec { homepage = "https://www.saleae.com/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - platforms = platforms.linux; + platforms = intersectLists platforms.x86_64 platforms.linux; maintainers = [ maintainers.bjornfor ]; }; } From 266e22539baa60a181a1f34290e76273cfb58a08 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 6 Dec 2024 03:26:53 +0200 Subject: [PATCH 06/40] haskellPackages.mkDerivation: Fix `cannot coerce null to a string` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://www.github.com/NixOS/nixpkgs/issues/362272 Fixes ``` $ nix repl --file . --system aarch64-darwin nix-repl> pkgsCross.aarch64-multiplatform.haskellPackages.ghc-lib.env error: … while evaluating attribute 'LOCALE_ARCHIVE' of derivation 'ghc-shell-for-ghc-lib-aarch64-unknown-linux-gnu-9.6.6.20240701-aarch64-unknown-linux-gnu' error: cannot coerce null to a string: null ``` --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 14afa3dfe6b4..7617bae86ece 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -802,7 +802,7 @@ stdenv.mkDerivation ({ buildInputs = otherBuildInputsSystem; LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; "NIX_${ghcCommandCaps}" = "${ghcEnv}/bin/${ghcCommand}"; "NIX_${ghcCommandCaps}PKG" = "${ghcEnv}/bin/${ghcCommand}-pkg"; # TODO: is this still valid? From 68ebeaf5fe4d88e02b82103e0085b27326648dc4 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 6 Dec 2024 04:01:59 +0200 Subject: [PATCH 07/40] treewide: Change unnecessary aborts to throws `throw`s are better because they don't abort evaluation when evaluating the whole set. Fixes `error: evaluation aborted with the following error message: 'Unsupported platform: arm64.'` on linux cross from darwin --- pkgs/applications/networking/cluster/k3s/builder.nix | 8 ++++---- pkgs/by-name/de/debase/package.nix | 2 +- pkgs/by-name/ni/nim-unwrapped-2_2/package.nix | 4 ++-- pkgs/by-name/vi/virtual-ans/package.nix | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index abf25306acab..c19bf46fa263 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -137,7 +137,7 @@ let s: mutFirstChar lib.toLower (lib.concatMapStrings (mutFirstChar lib.toUpper) (lib.splitString "-" s)); - # finds the images archive for the desired architecture, aborts in case no suitable archive is found + # finds the images archive for the desired architecture, throws in case no suitable archive is found findImagesArchive = arch: let @@ -145,17 +145,17 @@ let in lib.findFirst ( n: lib.hasInfix arch n - ) (abort "k3s: no airgap images for ${arch} available") imagesVersionsNames; + ) (throw "k3s: no airgap images for ${arch} available") imagesVersionsNames; # a shortcut that provides the images archive for the host platform. Currently only supports - # aarch64 (arm64) and x86_64 (amd64), aborts on other architectures. + # aarch64 (arm64) and x86_64 (amd64), throws on other architectures. airgapImages = fetchurl ( if stdenv.hostPlatform.isAarch64 then imagesVersions.${findImagesArchive "arm64"} else if stdenv.hostPlatform.isx86_64 then imagesVersions.${findImagesArchive "amd64"} else - abort "k3s: airgap images cannot be found automatically for architecture ${stdenv.hostPlatform.linuxArch}, consider using an image archive with an explicit architecture." + throw "k3s: airgap images cannot be found automatically for architecture ${stdenv.hostPlatform.linuxArch}, consider using an image archive with an explicit architecture." ); # so, k3s is a complicated thing to package diff --git a/pkgs/by-name/de/debase/package.nix b/pkgs/by-name/de/debase/package.nix index 1b300f1e21de..70be9b81eed6 100644 --- a/pkgs/by-name/de/debase/package.nix +++ b/pkgs/by-name/de/debase/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { else if stdenv.hostPlatform.isAarch64 then "arm64" else - abort "unsupported system: ${stdenv.system}" + throw "unsupported system: ${stdenv.system}" }" ]; diff --git a/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix b/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix index 311c0f5b9d80..41307f320271 100644 --- a/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix +++ b/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix @@ -45,7 +45,7 @@ let else if isx86_64 then "amd64" else - abort "no Nim CPU support known for ${config}"; + throw "no Nim CPU support known for ${config}"; parseOs = platform: @@ -72,7 +72,7 @@ let else if isiOS then "iOS" else - abort "no Nim OS support known for ${config}"; + throw "no Nim OS support known for ${config}"; parsePlatform = p: { cpu = parseCpu p; diff --git a/pkgs/by-name/vi/virtual-ans/package.nix b/pkgs/by-name/vi/virtual-ans/package.nix index 4a7467da125d..e71bc00e3042 100644 --- a/pkgs/by-name/vi/virtual-ans/package.nix +++ b/pkgs/by-name/vi/virtual-ans/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { startScript = if stdenv.hostPlatform.isx86_32 then "START_LINUX_X86" else if stdenv.hostPlatform.isx86_64 then "START_LINUX_X86_64" #else if stdenv.hostPlatform.isDarwin then "START_MACOS.app" # disabled because I cannot test on Darwin - else abort "Unsupported platform: ${stdenv.hostPlatform.linuxArch}."; + else throw "Unsupported platform: ${stdenv.hostPlatform.linuxArch}."; linuxExecutable = if stdenv.hostPlatform.isx86_32 then "pixilang_linux_x86" else if stdenv.hostPlatform.isx86_64 then "pixilang_linux_x86_64" From 7e2caa4db5038371f362ca04c11f69ea5bcb5ac5 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Fri, 6 Dec 2024 22:44:26 +0300 Subject: [PATCH 08/40] libpostal: Use real 1.1 release --- ...01-test-adding-header-to-fix-warning.patch | 24 ------------------- pkgs/by-name/li/libpostal/package.nix | 18 +++----------- 2 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 pkgs/by-name/li/libpostal/0001-test-adding-header-to-fix-warning.patch diff --git a/pkgs/by-name/li/libpostal/0001-test-adding-header-to-fix-warning.patch b/pkgs/by-name/li/libpostal/0001-test-adding-header-to-fix-warning.patch deleted file mode 100644 index cddd20d29e95..000000000000 --- a/pkgs/by-name/li/libpostal/0001-test-adding-header-to-fix-warning.patch +++ /dev/null @@ -1,24 +0,0 @@ -From bfdb6b8f87cc1cae9ba47870ff23deae0bb8ba51 Mon Sep 17 00:00:00 2001 -From: Al -Date: Sun, 17 Dec 2017 20:17:01 -0500 -Subject: [PATCH] [test] adding header to fix warning - ---- - test/test_expand.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/test_expand.c b/test/test_expand.c -index 59ed9af7..2b211728 100644 ---- a/test/test_expand.c -+++ b/test/test_expand.c -@@ -4,6 +4,7 @@ - #include - - #include "greatest.h" -+#include "../src/string_utils.h" - #include "../src/libpostal.h" - - SUITE(libpostal_expansion_tests); --- -2.42.0 - diff --git a/pkgs/by-name/li/libpostal/package.nix b/pkgs/by-name/li/libpostal/package.nix index 1d0ea162d1d6..7dd0ac10a5f9 100644 --- a/pkgs/by-name/li/libpostal/package.nix +++ b/pkgs/by-name/li/libpostal/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "libpostal"; @@ -7,22 +7,10 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "openvenues"; repo = "libpostal"; - rev = "v${version}"; - sha256 = "sha256-gQTD2LQibaB2TK0SbzoILAljAGExURvDcF3C/TfDXqk="; + rev = "refs/tags/v${version}"; + hash = "sha256-7G/CjYdVzsrvUFXGODoXgXoRp8txkl5SddcPtgltrjY="; }; - patches = [ - # Fix darwin compilation with XCode 12 https://github.com/openvenues/libpostal/issues/511 - (fetchpatch { - name = "Fix-C-compilation-macOS.patch"; - url = "https://github.com/openvenues/libpostal/commit/9fcf066e38121b5c1439fc6bdc9a7e02234c8622.patch"; - hash = "sha256-VpboGK+5sc1XrxMB051KWc8vP7Eu2g7zmTirzSaerns="; - }) - # https://github.com/openvenues/libpostal/commit/bfdb6b8f87cc1cae9ba47870ff23deae0bb8ba51.patch - # with extra hunk removed so it applies - ./0001-test-adding-header-to-fix-warning.patch - ]; - nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ From ea1978d5438c75e565ec1968df9797e42e58cff3 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Sat, 7 Dec 2024 17:52:42 +0300 Subject: [PATCH 09/40] libpostal: Optionally install data files and enable tests Co-authored-by: Dmitry Bogatov Co-authored-by: William --- pkgs/by-name/li/libpostal/package.nix | 31 +++++++++++++++++++++++++-- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libpostal/package.nix b/pkgs/by-name/li/libpostal/package.nix index 7dd0ac10a5f9..d30a2cdf7e18 100644 --- a/pkgs/by-name/li/libpostal/package.nix +++ b/pkgs/by-name/li/libpostal/package.nix @@ -1,6 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, fetchzip, autoreconfHook, withData ? false }: -stdenv.mkDerivation rec { +let + releases = "https://github.com/openvenues/libpostal/releases"; + assets-base = fetchzip { + url = "${releases}/download/v1.0.0/libpostal_data.tar.gz"; + hash = "sha256-FpGCkkRhVzyr08YcO0/iixxw0RK+3Of0sv/DH3GbbME="; + stripRoot = false; + }; + assets-parser = fetchzip { + url = "${releases}/download/v1.0.0/parser.tar.gz"; + hash = "sha256-OHETb3e0GtVS2b4DgklKDlrE/8gxF7XZ3FwmCTqZbqQ="; + stripRoot = false; + }; + assets-language-classifier = fetchzip { + url = "${releases}/download/v1.0.0/language_classifier.tar.gz"; + hash = "sha256-/Gn931Nx4UDBaiFUgGqC/NJUIKQ5aZT/+OYSlcfXva8="; + stripRoot = false; + }; +in stdenv.mkDerivation rec { pname = "libpostal"; version = "1.1"; @@ -17,6 +34,16 @@ stdenv.mkDerivation rec { "--disable-data-download" ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "--disable-sse2" ]; + postBuild = lib.optionalString withData '' + mkdir -p $out/share/libpostal + ln -s ${assets-language-classifier}/language_classifier $out/share/libpostal/language_classifier + ln -s ${assets-base}/transliteration $out/share/libpostal/transliteration + ln -s ${assets-base}/numex $out/share/libpostal/numex + ln -s ${assets-base}/address_expansions $out/share/libpostal/address_expansions + ln -s ${assets-parser}/address_parser $out/share/libpostal/address_parser + ''; + doCheck = withData; + meta = with lib; { description = "C library for parsing/normalizing street addresses around the world. Powered by statistical NLP and open geo data"; homepage = "https://github.com/openvenues/libpostal"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 643a1e65738a..639df2b72f40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18865,4 +18865,8 @@ with pkgs; biblioteca = callPackage ../by-name/bi/biblioteca/package.nix { webkitgtk = webkitgtk_6_0; }; + + libpostalWithData = callPackage ../by-name/li/libpostal/package.nix { + withData = true; + }; } From 653b3558ee1b3b409e34cc6c8ff06c084394ed0f Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 6 Dec 2024 18:53:43 +0200 Subject: [PATCH 10/40] tests-stdenv-gcc-stageCompare: Fail gracefullyier Don't fail with a missing attribute error, so the error can be handled. --- pkgs/test/stdenv/gcc-stageCompare.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/test/stdenv/gcc-stageCompare.nix b/pkgs/test/stdenv/gcc-stageCompare.nix index e5c2ed5921b3..c4a0179fb846 100644 --- a/pkgs/test/stdenv/gcc-stageCompare.nix +++ b/pkgs/test/stdenv/gcc-stageCompare.nix @@ -14,6 +14,7 @@ }: assert stdenv.cc.isGNU; + with pkgs; # rebuild gcc using the "final" stdenv let gcc-stageCompare = (gcc-unwrapped.override { @@ -25,7 +26,9 @@ let gcc-stageCompare = (gcc-unwrapped.override { }).overrideAttrs(_: { NIX_OUTPATH_USED_AS_RANDOM_SEED = stdenv.cc.cc.out; }); -in (runCommand "gcc-stageCompare" {} '' +in +assert lib.assertMsg (gcc-stageCompare ? checksum) "tests-stdenv-gcc-stageCompare: No `checksum` output in `gcc-stageCompare` see conditional in `gcc/common/checksum.nix`"; +(runCommand "gcc-stageCompare" {} '' diff -sr ${pkgs.gcc-unwrapped.checksum}/checksums ${gcc-stageCompare.checksum}/checksums && touch $out '').overrideAttrs (a: { meta = (a.meta or { }) // { platforms = lib.platforms.linux; }; From d9323ae92d3a577cc93e8cbedddbcd70446b160f Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 7 Dec 2024 21:47:20 +0200 Subject: [PATCH 11/40] frr: Fix cross `snmpSupport` to remove warning which interferes with cross eval Release eval fails with ``` nix-env failed: trace: evaluation warning: cannot enable SNMP support due to cross-compilation issues with net-snmp-config ``` --- pkgs/by-name/fr/frr/package.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/fr/frr/package.nix b/pkgs/by-name/fr/frr/package.nix index 29f2d42d28f8..bc96316e7111 100644 --- a/pkgs/by-name/fr/frr/package.nix +++ b/pkgs/by-name/fr/frr/package.nix @@ -33,15 +33,9 @@ , nettools , nixosTests -# FRR's configure.ac gets SNMP options by executing net-snmp-config on the build host -# This leads to compilation errors when cross compiling. -# E.g. net-snmp-config for x86_64 does not return the ARM64 paths. -# -# SNMP_LIBS="`${NETSNMP_CONFIG} --agent-libs`" -# SNMP_CFLAGS="`${NETSNMP_CONFIG} --base-cflags`" -, snmpSupport ? stdenv.buildPlatform.canExecute stdenv.hostPlatform -# other general options besides snmp support +# general options +, snmpSupport ? true , rpkiSupport ? true , numMultipath ? 64 , watchfrrSupport ? true @@ -81,9 +75,6 @@ , ospfApi ? true }: -lib.warnIf (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) - "cannot enable SNMP support due to cross-compilation issues with net-snmp-config" - stdenv.mkDerivation (finalAttrs: { pname = "frr"; version = "10.1"; @@ -194,6 +185,9 @@ stdenv.mkDerivation (finalAttrs: { (lib.strings.enableFeature ospfApi "ospfapi") # Cumulus options (lib.strings.enableFeature cumulusSupport "cumulus") + ] ++ lib.optionals snmpSupport [ + # Used during build for paths, `dev` has build shebangs so can be run during build. + "NETSNMP_CONFIG=${lib.getDev net-snmp}/bin/net-snmp-config" ]; postPatch = '' From c9b3b5de62425be792ecbdc232f38a762ee95311 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 8 Dec 2024 21:59:01 +0200 Subject: [PATCH 12/40] reposilitePlugins: Fix eval --- pkgs/by-name/re/reposilite/plugins.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/re/reposilite/plugins.nix b/pkgs/by-name/re/reposilite/plugins.nix index 28ecae2264f4..3d80d92673ee 100644 --- a/pkgs/by-name/re/reposilite/plugins.nix +++ b/pkgs/by-name/re/reposilite/plugins.nix @@ -3,7 +3,7 @@ makeScopeWithSplicing', }: makeScopeWithSplicing' { - otherSplices = generateSplicesForMkScope; + otherSplices = generateSplicesForMkScope "reposilitePlugins"; f = self: { From dc9c6c0485adc211dd6dcf0c213e844915a22e55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 11 Dec 2024 10:16:18 -0800 Subject: [PATCH 13/40] python312Packages.imap-tools: 1.7.4 -> 1.8.0 Diff: https://github.com/ikvk/imap_tools/compare/refs/tags/v1.7.4...v1.8.0 Changelog: https://github.com/ikvk/imap_tools/blob/v1.8.0/docs/release_notes.rst --- pkgs/development/python-modules/imap-tools/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index c6c0f3f43897..5a65a0741a6c 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, setuptools, pytestCheckHook, @@ -9,17 +8,14 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "1.7.4"; - - disabled = pythonOlder "3.5"; - + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "ikvk"; repo = "imap_tools"; rev = "refs/tags/v${version}"; - hash = "sha256-2qSmnJnjwXNysUh0xeXshLZklCIOd92aM3gXtL8JhlI="; + hash = "sha256-6Vhzwpb5DiSuF1LPUgkE+EfKMkAR4/Ld26zzj2r1/Ic="; }; build-system = [ setuptools ]; From e3c22a23ea2dc5d6664da0a1aeeed87fbf0361ed Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 8 Dec 2024 10:23:37 +0100 Subject: [PATCH 14/40] python312Packages.equinox: 0.11.9 -> 0.11.10 Diff: https://github.com/patrick-kidger/equinox/compare/refs/tags/v0.11.9...v0.11.10 Changelog: https://github.com/patrick-kidger/equinox/releases/tag/v0.11.10 --- pkgs/development/python-modules/equinox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix index 8b9b57a6c8b3..8bb2992d31e6 100644 --- a/pkgs/development/python-modules/equinox/default.nix +++ b/pkgs/development/python-modules/equinox/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "equinox"; - version = "0.11.9"; + version = "0.11.10"; pyproject = true; src = fetchFromGitHub { owner = "patrick-kidger"; repo = "equinox"; - rev = "refs/tags/v${version}"; - hash = "sha256-7RVhSdvD96oRUk6cGRS1rET4ztqjBnGfzJObjE+MioU="; + tag = "v${version}"; + hash = "sha256-QoqwLdtWCDrXyqiI6Xw7jq2sxiRCmLaxk3/ZGHrvqL4="; }; build-system = [ hatchling ]; From 4c6c6453bb28785787d2ef1b16bc6df233bf4fd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 11 Dec 2024 15:29:24 -0800 Subject: [PATCH 15/40] python312Packages.rmscene: 0.6.0 -> 0.6.1 Diff: https://github.com/ricklupton/rmscene/compare/refs/tags/v0.6.0...v0.6.1 Changelog: https://github.com/ricklupton/rmscene/blob/refs/tags/v0.6.1/README.md#changelog --- pkgs/development/python-modules/rmscene/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rmscene/default.nix b/pkgs/development/python-modules/rmscene/default.nix index f7c780f5238a..4a5bc6dee858 100644 --- a/pkgs/development/python-modules/rmscene/default.nix +++ b/pkgs/development/python-modules/rmscene/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "rmscene"; - version = "0.6.0"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ricklupton"; repo = "rmscene"; rev = "refs/tags/v${version}"; - hash = "sha256-BnTr3rLehP5uhzXWXKPaXcJCWW2ofk5N8amqoEUmlWo="; + hash = "sha256-mgEjGfoQW73DcwMEXflR3/Ole4c5uXZJVJ699KNSqKg="; }; build-system = [ From 1eca6fb65ed0431e3706ebac231361cb24d47888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 11 Dec 2024 16:02:23 -0800 Subject: [PATCH 16/40] python312Packages.type-infer: unpin py3langid --- .../development/python-modules/type-infer/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/type-infer/default.nix b/pkgs/development/python-modules/type-infer/default.nix index 2d9022520150..294769e7c3fb 100644 --- a/pkgs/development/python-modules/type-infer/default.nix +++ b/pkgs/development/python-modules/type-infer/default.nix @@ -30,7 +30,7 @@ in buildPythonPackage rec { pname = "type-infer"; version = "0.0.20"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -41,11 +41,14 @@ buildPythonPackage rec { hash = "sha256-F+gfA7ofrbMEE5SrVt9H3s2mZKQLyr6roNUmL4EMJbI="; }; - pythonRelaxDeps = [ "psutil" ]; + pythonRelaxDeps = [ + "psutil" + "py3langid" + ]; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ colorlog dataclasses-json langid From b5abcd6832a951da51e6f8417687fa51072a27e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 11 Dec 2024 16:26:35 -0800 Subject: [PATCH 17/40] python312Packages.type-infer: run tests --- .../python-modules/type-infer/default.nix | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/type-infer/default.nix b/pkgs/development/python-modules/type-infer/default.nix index 294769e7c3fb..b4e544a607ae 100644 --- a/pkgs/development/python-modules/type-infer/default.nix +++ b/pkgs/development/python-modules/type-infer/default.nix @@ -2,16 +2,16 @@ lib, buildPythonPackage, pythonOlder, - fetchPypi, + fetchFromGitHub, poetry-core, colorlog, dataclasses-json, - langid, nltk, numpy, pandas, psutil, py3langid, + pytestCheckHook, python-dateutil, scipy, toml, @@ -23,22 +23,26 @@ let name = "nltk-test-data"; paths = [ nltk-data.punkt + nltk-data.punkt_tab nltk-data.stopwords ]; }; + + version = "0.0.20"; + tag = "v${version}"; in buildPythonPackage rec { pname = "type-infer"; - version = "0.0.20"; + inherit version; pyproject = true; disabled = pythonOlder "3.8"; - # using PyPI because the repo does not have tags or release branches - src = fetchPypi { - pname = "type_infer"; - inherit version; - hash = "sha256-F+gfA7ofrbMEE5SrVt9H3s2mZKQLyr6roNUmL4EMJbI="; + src = fetchFromGitHub { + owner = "mindsdb"; + repo = "type_infer"; + inherit tag; + hash = "sha256-2Y+NPwUnQMj0oXoCMfUOG40lqduy9GTcqxfyuFDOkHc="; }; pythonRelaxDeps = [ @@ -51,7 +55,6 @@ buildPythonPackage rec { dependencies = [ colorlog dataclasses-json - langid nltk numpy pandas @@ -62,8 +65,14 @@ buildPythonPackage rec { toml ]; - # PyPI package does not include tests - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # test hangs + "test_1_stack_overflow_survey" + ]; # Package import requires NLTK data to be downloaded # It is the only way to set NLTK_DATA environment variable, @@ -72,8 +81,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "type_infer" ]; meta = with lib; { + changelog = "https://github.com/mindsdb/type_infer/releases/tag/${tag}"; description = "Automated type inference for Machine Learning pipelines"; - homepage = "https://pypi.org/project/type-infer/"; + homepage = "https://github.com/mindsdb/type_infer"; license = licenses.gpl3Only; maintainers = with maintainers; [ mbalatsko ]; }; From 764c99481a7d26b44aedfb61b0bc17cfa2d95e4a Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 9 Dec 2024 20:04:11 +0200 Subject: [PATCH 18/40] lib/tests/release.nix: Fix build if `impure.nix` returns a cross pkgs In https://www.github.com/NixOS/nixpkgs/pull/341067 `ofborg-eval-lib-tests` fails because it uses `pkgsHostTarget` of the cross pkgs ```diff diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index 4d847e280f4b..7f0099b254f0 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -86,4 +86,6 @@ assert args ? system -> !(args ? localSystem); import ./. (builtins.removeAttrs args [ "system" ] // { inherit config overlays localSystem; -}) +} // (if ((localSystem.system or localSystem) == "x86_64-linux" || (localSystem.system or localSystem) == "aarch64-linux") then { + crossSystem = { config = "aarch64-unknown-linux-gnu"; }; + } else {}) ) ``` --- lib/tests/release.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/tests/release.nix b/lib/tests/release.nix index 5334498d0844..d83c15c511fa 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -1,18 +1,23 @@ { # The pkgs used for dependencies for the testing itself # Don't test properties of pkgs.lib, but rather the lib in the parent directory pkgs ? import ../.. {} // { lib = throw "pkgs.lib accessed, but the lib tests should use nixpkgs' lib path directly!"; }, + # For testing someone may edit impure.nix to return cross pkgs, use `pkgsBuildBuild` directly so everything here works. + pkgsBB ? pkgs.pkgsBuildBuild, nix ? pkgs-nixVersions.stable, nixVersions ? [ pkgs-nixVersions.minimum nix pkgs-nixVersions.latest ], - pkgs-nixVersions ? import ./nix-for-tests.nix { inherit pkgs; }, + pkgs-nixVersions ? import ./nix-for-tests.nix { pkgs = pkgsBB; }, }: let lib = import ../.; testWithNix = nix: - import ./test-with-nix.nix { inherit lib nix pkgs; }; + import ./test-with-nix.nix { + inherit lib nix; + pkgs = pkgsBB; + }; in - pkgs.symlinkJoin { + pkgsBB.symlinkJoin { name = "nixpkgs-lib-tests"; paths = map testWithNix nixVersions; } From 8a6ca8f17ca8b5123f81beab5fc648949e9ca473 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 9 Dec 2024 20:42:36 +0200 Subject: [PATCH 19/40] nixpkgs-manual.{lib-docs,tests}: Fix cross build --- doc/doc-support/lib-function-docs.nix | 2 +- doc/tests/manpage-urls.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/doc-support/lib-function-docs.nix b/doc/doc-support/lib-function-docs.nix index 61671bd39059..51b4601975c3 100644 --- a/doc/doc-support/lib-function-docs.nix +++ b/doc/doc-support/lib-function-docs.nix @@ -95,7 +95,7 @@ stdenvNoCC.mkDerivation { fileset = ../../lib; }; - buildInputs = [ + nativeBuildInputs = [ nixdoc nix ]; diff --git a/doc/tests/manpage-urls.nix b/doc/tests/manpage-urls.nix index 214c23616009..913aebe4ebe8 100644 --- a/doc/tests/manpage-urls.nix +++ b/doc/tests/manpage-urls.nix @@ -17,7 +17,7 @@ invalidateFetcherByDrvHash ( { nativeBuildInputs = [ cacert - (python3.withPackages (p: [ + (python3.pythonOnBuildForHost.withPackages (p: [ p.aiohttp p.rich p.structlog From 276fe40ff34d0dcb0cf11a6f81c16fdbd6a66cd3 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 10 Dec 2024 17:03:55 +0200 Subject: [PATCH 20/40] swift: Fix eval failure `error: expected a string but found null: null` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dunno if this is correct, there's other `hostPlatform.isDarwin` conditionals which may be wrong. Leaving the other conditionals to swift maintainers or people who are interested in swift cross-compilation ``` $ nix repl --file . --system aarch64-darwin nix-repl> pkgsCross.aarch64-multiplatform.swift «derivation /nix/store/kqbaqwdfc9g0yvkq4ffrlqspranprlmy-swift-wrapper-aarch64-unknown-linux-gnu-5.8.drv» nix-repl> pkgsCross.aarch64-multiplatform.buildPackages.swift error: error: expected a string but found null: null at /home/artturin/nixgits/my-nixpkgs/.worktree/2/pkgs/development/compilers/swift/compiler/default.nix:586:11: 585| #WATCHOS_SIMULATOR 586| }.${targetPlatform.darwinPlatform}} | ^ 587| ``` --- pkgs/development/compilers/swift/compiler/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix index 8e8cf798db4f..b8a415900322 100644 --- a/pkgs/development/compilers/swift/compiler/default.nix +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -541,7 +541,7 @@ in stdenv.mkDerivation { "; buildProject lldb llvm-project/lldb - ${lib.optionalString stdenv.hostPlatform.isDarwin '' + ${lib.optionalString stdenv.targetPlatform.isDarwin '' # Need to do a standalone build of concurrency for Darwin back deployment. # Based on: utils/swift_build_support/swift_build_support/products/backdeployconcurrency.py cmakeFlags=" From c55fae29668486c9c094a847a7fd44dfe9115d04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Dec 2024 07:02:36 +0000 Subject: [PATCH 21/40] syncthingtray: 1.6.3 -> 1.6.4 --- pkgs/applications/misc/syncthingtray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index fdfff2f567ac..bc4d47e8c544 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -38,14 +38,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.6.3"; + version = "1.6.4"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - hash = "sha256-nWG9r0/qs9Jrj0Bo3RKtNSP1pnUd7CRiEkkRWf0UMNs="; + hash = "sha256-xLgkBBh4OMHZYlIiRemJ1aYEwRp+b/Q3dPKm9zpxNjo="; }; buildInputs = From b6fe5f6b00a654eea99fc63065245db1093236a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Dec 2024 08:43:04 +0000 Subject: [PATCH 22/40] orchard: 0.25.2 -> 0.26.2 --- pkgs/by-name/or/orchard/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix index 9cd1a2eb37e9..8c3518c74f0a 100644 --- a/pkgs/by-name/or/orchard/package.nix +++ b/pkgs/by-name/or/orchard/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "orchard"; - version = "0.25.2"; + version = "0.26.2"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = version; - hash = "sha256-FuqzVMpv62Knbbhy9yExyjT2UVdH2KlaQ+ETW8/abWc="; + hash = "sha256-j072161KN/4VjHnxF6fqnVOoWhKlDTNzDZKzX2TK5Y0="; # 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; From fead3415549509ae9f36f6e9534c995bbce13584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 13 Dec 2024 08:22:27 -0800 Subject: [PATCH 23/40] bitwarden-cli: 2024.11.1 -> 2024.12.0 Diff: https://github.com/bitwarden/clients/compare/cli-v2024.11.1...cli-v2024.12.0 Changelog: https://github.com/bitwarden/clients/releases/tag/cli-v2024.12.0 --- pkgs/by-name/bi/bitwarden-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index b7bd61bb99d8..bb368d998a6d 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -13,13 +13,13 @@ buildNpmPackage rec { pname = "bitwarden-cli"; - version = "2024.11.1"; + version = "2024.12.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "cli-v${version}"; - hash = "sha256-J7gmrSAiu59LLP9pKfbv9+H00vXGQCrjkd4GBhkcyTY="; + hash = "sha256-3aN2t8/qhN0sjACvtip45efHQJl8nEMNre0+oBL1/go="; }; postPatch = '' @@ -29,7 +29,7 @@ buildNpmPackage rec { nodejs = nodejs_20; - npmDepsHash = "sha256-MZoreHKmiUUxhq3tmL4lPp6vPmoQIqG3IPpZE56Z1Kc="; + npmDepsHash = "sha256-EtIcqbubAYN9I9wbw17oHiVshd3GtQayFtdgqWP7Pgg="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools From 4b80c986dc3369c851a3919fb16e7841d4d8b5d2 Mon Sep 17 00:00:00 2001 From: gale Date: Wed, 4 Dec 2024 22:42:51 -0600 Subject: [PATCH 24/40] slimevr: init at 0.13.2 --- pkgs/by-name/sl/slimevr-server/package.nix | 16 +-- pkgs/by-name/sl/slimevr/gui-no-git.patch | 21 +++ pkgs/by-name/sl/slimevr/package.nix | 145 +++++++++++++++++++++ pkgs/by-name/sl/slimevr/update.sh | 5 + 4 files changed, 177 insertions(+), 10 deletions(-) create mode 100644 pkgs/by-name/sl/slimevr/gui-no-git.patch create mode 100644 pkgs/by-name/sl/slimevr/package.nix create mode 100755 pkgs/by-name/sl/slimevr/update.sh diff --git a/pkgs/by-name/sl/slimevr-server/package.nix b/pkgs/by-name/sl/slimevr-server/package.nix index a19b69987e4d..2cc03b62f794 100644 --- a/pkgs/by-name/sl/slimevr-server/package.nix +++ b/pkgs/by-name/sl/slimevr-server/package.nix @@ -1,9 +1,9 @@ { lib, stdenv, - fetchFromGitHub, runCommand, replaceVars, + slimevr, jdk17_headless, gradle, hidapi, @@ -32,16 +32,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "slimevr-server"; - version = "0.13.2"; - src = fetchFromGitHub { - owner = "SlimeVR"; - repo = "SlimeVR-Server"; - rev = "v${finalAttrs.version}"; - hash = "sha256-XQDbP+LO/brpl7viSxuV3H4ALN0yIkj9lwr5eS1txNs="; - # solarxr - fetchSubmodules = true; - }; + inherit (slimevr) + src + version + ; mitmCache = gradle.fetchDeps { inherit (finalAttrs) pname; @@ -88,6 +83,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { inherit java javaOptions; + # `slimevr-server` is updated by the `slimevr` update script. }; meta = { diff --git a/pkgs/by-name/sl/slimevr/gui-no-git.patch b/pkgs/by-name/sl/slimevr/gui-no-git.patch new file mode 100644 index 000000000000..6e259a4fbefb --- /dev/null +++ b/pkgs/by-name/sl/slimevr/gui-no-git.patch @@ -0,0 +1,21 @@ +diff --git a/gui/vite.config.ts b/gui/vite.config.ts +index c9eb27be..4b3757f0 100644 +--- a/gui/vite.config.ts ++++ b/gui/vite.config.ts +@@ -4,13 +4,10 @@ import { execSync } from 'child_process'; + import path from 'path'; + import { visualizer } from 'rollup-plugin-visualizer'; + +-const commitHash = execSync('git rev-parse --verify --short HEAD').toString().trim(); +-const versionTag = execSync('git --no-pager tag --sort -taggerdate --points-at HEAD') +- .toString() +- .split('\n')[0] +- .trim(); ++const commitHash = ""; ++const versionTag = "@version@"; + // If not empty then it's not clean +-const gitClean = execSync('git status --porcelain').toString() ? false : true; ++const gitClean = true; + + console.log(`version is ${versionTag || commitHash}${gitClean ? '' : '-dirty'}`); + diff --git a/pkgs/by-name/sl/slimevr/package.nix b/pkgs/by-name/sl/slimevr/package.nix new file mode 100644 index 000000000000..951d17ebe5b7 --- /dev/null +++ b/pkgs/by-name/sl/slimevr/package.nix @@ -0,0 +1,145 @@ +{ + lib, + fetchFromGitHub, + fetchpatch, + stdenv, + replaceVars, + makeWrapper, + slimevr-server, + nodejs, + pnpm_9, + rustPlatform, + cargo-tauri, + wrapGAppsHook3, + pkg-config, + openssl, + glib-networking, + webkitgtk_4_1, + gst_all_1, + libayatana-appindicator, +}: + +rustPlatform.buildRustPackage rec { + pname = "slimevr"; + version = "0.13.2"; + + src = fetchFromGitHub { + owner = "SlimeVR"; + repo = "SlimeVR-Server"; + rev = "v${version}"; + hash = "sha256-XQDbP+LO/brpl7viSxuV3H4ALN0yIkj9lwr5eS1txNs="; + # solarxr + fetchSubmodules = true; + }; + + buildAndTestSubdir = "gui/src-tauri"; + + cargoHash = "sha256-jvt5x2Jr185XVSFjob4cusP/zYJklJ/eqZe47qUg58s="; + + pnpmDeps = pnpm_9.fetchDeps { + pname = "${pname}-pnpm-deps"; + inherit version src; + hash = "sha256-5IqIUwVvufrws6/xpCAilmgRNG4mUGX8NXajZcVZypM="; + }; + + nativeBuildInputs = [ + nodejs + pnpm_9.configHook + cargo-tauri.hook + pkg-config + wrapGAppsHook3 + makeWrapper + ]; + + buildInputs = + [ + openssl + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + glib-networking + libayatana-appindicator + webkitgtk_4_1 + ]; + + patches = [ + # Upstream code uses Git to find the program version. + (replaceVars ./gui-no-git.patch { + inherit version; + }) + ]; + + cargoPatches = [ + # Fix Tauri dependencies issue. + # FIXME: Remove with next package update. + (fetchpatch { + name = "enable-rustls-feature.patch"; + url = "https://github.com/SlimeVR/SlimeVR-Server/commit/2708b5a15b7c1b8af3e86d942c5e842d83cf078f.patch"; + hash = "sha256-UDVztPGPaKp2Hld3bMDuPMAu5s1OhvKEsTiXoDRK7cU="; + }) + ]; + + postPatch = + '' + # Tauri bundler expects slimevr.jar to exist. + mkdir -p server/desktop/build/libs + touch server/desktop/build/libs/slimevr.jar + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + # Both libappindicator-rs and SlimeVR need to know where Nix's appindicator lib is. + pushd $cargoDepsCopy/libappindicator-sys + oldHash=$(sha256sum src/lib.rs | cut -d " " -f 1) + substituteInPlace src/lib.rs \ + --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" + # Cargo doesn't like it when vendored dependencies are edited. + substituteInPlace .cargo-checksum.json \ + --replace-warn $oldHash $(sha256sum src/lib.rs | cut -d " " -f 1) + popd + substituteInPlace gui/src-tauri/src/tray.rs \ + --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" + ''; + + # solarxr needs to be installed after compiling its Typescript files. This isn't + # done the first time, because `pnpm_9.configHook` ignores `package.json` scripts. + preBuild = '' + pnpm --filter solarxr-protocol install + ''; + + doCheck = false; # No tests + + # Get rid of placeholder slimevr.jar + postInstall = '' + rm $out/share/slimevr/slimevr.jar + rm -d $out/share/slimevr + ''; + + # `JAVA_HOME`, `JAVA_TOOL_OPTIONS`, and `--launch-from-path` are so the GUI can + # launch the server. + postFixup = '' + wrapProgram "$out/bin/slimevr" \ + --set JAVA_HOME "${slimevr-server.passthru.java.home}" \ + --set JAVA_TOOL_OPTIONS "${slimevr-server.passthru.javaOptions}" \ + --add-flags "--launch-from-path ${slimevr-server}/share/slimevr" + ''; + + passthru.updateScript = ./update.sh; + + meta = { + homepage = "https://docs.slimevr.dev/"; + description = "App for facilitating full-body tracking in virtual reality"; + license = with lib.licenses; [ + mit + asl20 + ]; + maintainers = with lib.maintainers; [ + gale-username + imurx + ]; + platforms = with lib.platforms; darwin ++ linux; + broken = stdenv.hostPlatform.isDarwin; + mainProgram = "slimevr"; + }; +} diff --git a/pkgs/by-name/sl/slimevr/update.sh b/pkgs/by-name/sl/slimevr/update.sh new file mode 100755 index 000000000000..ea1fca36e49a --- /dev/null +++ b/pkgs/by-name/sl/slimevr/update.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-update + +nix-update slimevr +$(nix-build -A slimevr-server.mitmCache.updateScript) From 7c0c8cfbf847c4840d6ac3016ab4e66094279192 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 13 Dec 2024 14:06:43 -0800 Subject: [PATCH 25/40] immich: 1.122.2 -> 1.122.3 https://github.com/immich-app/immich/releases/tag/v1.122.3 --- pkgs/by-name/im/immich/sources.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json index b47c21ec2fd4..735452b0e5dc 100644 --- a/pkgs/by-name/im/immich/sources.json +++ b/pkgs/by-name/im/immich/sources.json @@ -1,22 +1,22 @@ { - "version": "1.122.2", - "hash": "sha256-A6FmveHN+Kp8SFmdaMLiwZ5SLuqQSWMwZVVpMBvfoAU=", + "version": "1.122.3", + "hash": "sha256-qGTjhRvv3162D6kPa+Rv9yK/n2LfmbaFYl/9Ls2j9WM=", "components": { "cli": { - "npmDepsHash": "sha256-ItF8xSvxjbRV57Q2B0c7zSTULIWilvDjndmt9mfm7sE=", - "version": "2.2.35" + "npmDepsHash": "sha256-F4gK8ZnvizhM2cVHge417COcXg6VlazpC7hTD7iKLTY=", + "version": "2.2.36" }, "server": { - "npmDepsHash": "sha256-LuQNK0RsmCNcxullGZw2YD92j6mbKrgiHjQB6g5Z4bo=", - "version": "1.122.2" + "npmDepsHash": "sha256-Thcb0EgQpoER0KpXRwbJ3t6TaBebzlDL9I6HXBfdWJI=", + "version": "1.122.3" }, "web": { - "npmDepsHash": "sha256-G1Q3jxNrH2XnYdcu33hu4XQnhxPlxoFQYgMB0E/K6nw=", - "version": "1.122.2" + "npmDepsHash": "sha256-S2pNfuvV9iYXSQSstNUdsc6XaUvYRD1xLpUGAOV8hyU=", + "version": "1.122.3" }, "open-api/typescript-sdk": { - "npmDepsHash": "sha256-qK6rT1W/aDU8DlIFbSZ0gqCIohr7DWsdVknmvehwpJE=", - "version": "1.122.2" + "npmDepsHash": "sha256-GtqS59I+By1u6WcR+lDj2HKXVwh7jw5/N6MRdUctlaM=", + "version": "1.122.3" } } } From 2762d4c25a3814e02000a03dad2cfc71bd53a770 Mon Sep 17 00:00:00 2001 From: msm Date: Fri, 13 Dec 2024 01:34:20 +0100 Subject: [PATCH 26/40] pycdc: init at 0-unstable-2024-10-13 --- pkgs/by-name/py/pycdc/package.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 pkgs/by-name/py/pycdc/package.nix diff --git a/pkgs/by-name/py/pycdc/package.nix b/pkgs/by-name/py/pycdc/package.nix new file mode 100644 index 000000000000..718ea4eaa796 --- /dev/null +++ b/pkgs/by-name/py/pycdc/package.nix @@ -0,0 +1,28 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: + +stdenv.mkDerivation rec { + pname = "pycdc"; + version = "0-unstable-2024-10-13"; + + src = fetchFromGitHub { + owner = "zrax"; + repo = "pycdc"; + rev = "5e1c4037a96b966e4e6728c55b2d7ee8076a13c3"; + hash = "sha256-c/mfM2I8Rw136aQ3IAQOkkrOEtZ5LC/xKuWXzCItW2w="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = { + description = "C++ python bytecode disassembler and decompiler"; + homepage = "https://github.com/zrax/pycdc"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ msm ]; + mainProgram = "pycdc"; + }; +} From f3b4ae748dca4da1b33a493199788b0ea88c542e Mon Sep 17 00:00:00 2001 From: thinnerthinker Date: Sat, 14 Dec 2024 16:33:26 +0200 Subject: [PATCH 27/40] maintainers: add thinnerthinker --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3b4da4e8850e..51878646eac5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -22384,6 +22384,11 @@ github = "thilobillerbeck"; githubId = 7442383; }; + thinnerthinker = { + name = "thinnerthinker"; + github = "thinnerthinker"; + githubId = 144260188; + }; thled = { name = "Thomas Le Duc"; email = "dev@tleduc.de"; From ffde3ffade3d99fe6cb3192da1b82af93ecc32f9 Mon Sep 17 00:00:00 2001 From: thinnerthinker Date: Sat, 14 Dec 2024 16:33:44 +0200 Subject: [PATCH 28/40] repomix: init at 0.2.6 --- pkgs/by-name/re/repomix/package.nix | 43 +++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/re/repomix/package.nix diff --git a/pkgs/by-name/re/repomix/package.nix b/pkgs/by-name/re/repomix/package.nix new file mode 100644 index 000000000000..d5c5e01cab0c --- /dev/null +++ b/pkgs/by-name/re/repomix/package.nix @@ -0,0 +1,43 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, + versionCheckHook, +}: + +buildNpmPackage rec { + pname = "repomix"; + version = "0.2.6"; + + src = fetchFromGitHub { + owner = "yamadashy"; + repo = "repomix"; + tag = "v${version}"; + hash = "sha256-ZYU85782Z6O69KkKu4h3OqJqAgaxktEgHkcfs2ms9xg="; + }; + + npmDepsHash = "sha256-r+RIa7ACXJv4/CutnN/3S36US6r7w0EkM9dA4ShWPdU="; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + doCheck = true; + + checkPhase = '' + runHook preCheck + npx vitest run + runHook postCheck + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Tool to pack repository contents to single file for AI consumption"; + homepage = "https://github.com/yamadashy/repomix"; + changelog = "https://github.com/yamadashy/repomix/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ thinnerthinker ]; + mainProgram = "repomix"; + }; +} From ce51a69e1919050f067ac9c36267d712f76ab3d1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 14 Dec 2024 15:38:31 +0100 Subject: [PATCH 29/40] python312Packages.yalexs-ble: 2.5.2 -> 2.5.4 Diff: https://github.com/bdraco/yalexs-ble/compare/refs/tags/v2.5.2...v2.5.4 Changelog: https://github.com/bdraco/yalexs-ble/blob/v2.5.4/CHANGELOG.md --- pkgs/development/python-modules/yalexs-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 4eea1fc446e0..fdb34e0a3b96 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.5.2"; + version = "2.5.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "yalexs-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-scHdQbjIClV+TpLOVC0uf+SVx3kR1DDzcaKWnKMsHoY="; + hash = "sha256-zNem2nmTfpyJKKGx/CVi3YI09plwRVjzvRWyB57R5zc="; }; build-system = [ poetry-core ]; From 5a61831f152b8e2a6ad8d14fb6a12fcf1a0d96db Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 14 Dec 2024 15:44:14 +0100 Subject: [PATCH 30/40] python312Packages.aiolifx: 1.1.1 -> 1.1.2 Changelog: https://github.com/aiolifx/aiolifx/releases/tag/1.1.2 --- pkgs/development/python-modules/aiolifx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index 8aec71d126e9..1625eceb7a82 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "1.1.1"; + version = "1.1.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oZpq2qUAtqDaRhgW9SbbQY9z81VqrqXhRLmpaPto9+A="; + hash = "sha256-M4if9eSRG7544OaVj3HXtvOWPm1mg8Nz5dh6nl0hx+4="; }; build-system = [ setuptools ]; From 8409ac0f68974193d3705e3283e73d85c3688e60 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 14 Dec 2024 15:58:30 +0100 Subject: [PATCH 31/40] python312Packages.lineax: temporarily skip failing tests --- .../python-modules/lineax/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lineax/default.nix b/pkgs/development/python-modules/lineax/default.nix index 2680211c58fa..f9f0edd9d4fd 100644 --- a/pkgs/development/python-modules/lineax/default.nix +++ b/pkgs/development/python-modules/lineax/default.nix @@ -16,6 +16,8 @@ beartype, pytest, python, + + fetchpatch, }: buildPythonPackage rec { @@ -26,10 +28,20 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "patrick-kidger"; repo = "lineax"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-HcFI55Ww/y7ZaUkawj7xWSb7VDTBec3u0ulWL8kTm2c="; }; + patches = [ + (fetchpatch { + # Reported upstream: https://github.com/patrick-kidger/lineax/issues/118 + # Fixed by https://github.com/patrick-kidger/lineax/pull/119 + name = "fix-vmap-tests"; + url = "https://github.com/patrick-kidger/lineax/pull/119/commits/d21552ac4c504d7b139ad8e4f15d5f102b54d705.patch"; + hash = "sha256-pBejiqIVNjXi7dXuDBQdAy892wro1WxzwbI7v07N86c="; + }) + ]; + build-system = [ hatchling ]; dependencies = [ @@ -59,7 +71,7 @@ buildPythonPackage rec { meta = { description = "Linear solvers in JAX and Equinox"; homepage = "https://github.com/patrick-kidger/lineax"; - changelog = "https://github.com/patrick-kidger/lineax/releases/tag/v${version}"; + changelog = "https://github.com/patrick-kidger/lineax/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; }; From a7c4b3120c9869893505f81ce82a63da151b1f38 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Dec 2024 17:44:05 +0000 Subject: [PATCH 32/40] python312Packages.aioftp: 0.23.1 -> 0.24.1 --- pkgs/development/python-modules/aioftp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index 9d3778b864b5..7daff8dc5845 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "aioftp"; - version = "0.23.1"; + version = "0.24.1"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-uA6t2MqV0ru8+r594Vy+AawRey50Z3FzdN5Ge62TVws="; + hash = "sha256-dKx8buSFXk24/6LC+xWXeJppeBfEe6IaVOuQOfQ1aK8="; }; build-system = [ setuptools ]; From 6c72a4ac12dd8ceabec46346c8f21d5e298a5411 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Wed, 14 Aug 2024 09:59:00 +1000 Subject: [PATCH 33/40] jet-pilot: init at 1.31.0 --- pkgs/by-name/je/jet-pilot/package.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/by-name/je/jet-pilot/package.nix diff --git a/pkgs/by-name/je/jet-pilot/package.nix b/pkgs/by-name/je/jet-pilot/package.nix new file mode 100644 index 000000000000..24692eba7f7b --- /dev/null +++ b/pkgs/by-name/je/jet-pilot/package.nix @@ -0,0 +1,27 @@ +{ + lib, + fetchurl, + appimageTools, +}: + +appimageTools.wrapType2 rec { + pname = "jet-pilot"; + version = "1.31.0"; + + src = fetchurl { + url = "https://github.com/unxsist/jet-pilot/releases/download/v${version}/jet-pilot_${version}_amd64.AppImage"; + hash = "sha256-jhy8BfCZ0Z4T3lGrxTmSGw+fSDVzTIuvyJftpwMcYo0="; + }; + + appimageContents = appimageTools.extractType2 { inherit pname version src; }; + + meta = { + description = "Open-source Kubernetes desktop client that focuses on less clutter, speed and good looks"; + homepage = "https://jet-pilot.app/"; + changelog = "https://github.com/unxsist/jet-pilot/releases"; + license = lib.licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ kashw2 ]; + mainProgram = "jet-pilot"; + }; +} From 847c4e1028a27d28d4972d91962d0975fc642ffd Mon Sep 17 00:00:00 2001 From: Yureka Date: Sat, 14 Dec 2024 20:10:17 +0100 Subject: [PATCH 34/40] buildMozillaMach: re-enable elf-hack with LTO/LLD, disable with musl (#365185) The elfhack was completely revamped and is now implemented with the "relrhack", which is compatible with LLD: https://glandium.org/blog/?p=4297 Exposes a new option elfhackSupport and sets reasonable default based on the properties of the new relrhack. Change-Id: I687d4ee68a8e836e5c51a1fde0d28d019c0c66b9 --- .../networking/browsers/firefox/common.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 6a46a8ec82d2..34b4e82d59d0 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -25,6 +25,10 @@ let # Rename the variables to prevent infinite recursion requireSigningDefault = requireSigning; allowAddonSideloadDefault = allowAddonSideload; + + # Specifying --(dis|en)able-elf-hack on a platform for which it's not implemented will give `--disable-elf-hack is not available in this configuration` + # This is declared here because it's used in the default value of elfhackSupport + isElfhackPlatform = stdenv: stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64; in { lib @@ -110,6 +114,7 @@ in , jemallocSupport ? !stdenv.hostPlatform.isMusl, jemalloc , ltoSupport ? (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.is64bit && !stdenv.hostPlatform.isRiscV), overrideCC, buildPackages , pgoSupport ? (stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform), xvfb-run +, elfhackSupport ? isElfhackPlatform stdenv && !(stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64) , pipewireSupport ? waylandSupport && webrtcSupport , pulseaudioSupport ? stdenv.hostPlatform.isLinux, libpulseaudio , sndioSupport ? stdenv.hostPlatform.isLinux, sndio @@ -160,6 +165,7 @@ in assert stdenv.cc.libc or null != null; assert pipewireSupport -> !waylandSupport || !webrtcSupport -> throw "${pname}: pipewireSupport requires both wayland and webrtc support."; +assert elfhackSupport -> isElfhackPlatform stdenv; let inherit (lib) enableFeature; @@ -402,9 +408,7 @@ buildStdenv.mkDerivation { "--enable-lto=cross" # Cross-Language LTO "--enable-linker=lld" ] - # elf-hack is broken when using clang+lld: - # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 - ++ lib.optional (ltoSupport && (buildStdenv.hostPlatform.isAarch32 || buildStdenv.hostPlatform.isi686 || buildStdenv.hostPlatform.isx86_64)) "--disable-elf-hack" + ++ lib.optional (isElfhackPlatform stdenv) (enableFeature elfhackSupport "elf-hack") ++ lib.optional (!drmSupport) "--disable-eme" ++ lib.optional (allowAddonSideload) "--allow-addon-sideload" ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ From 44c06fcc9fbaafd8a01e5fd70421e03368eb0da6 Mon Sep 17 00:00:00 2001 From: Yureka Date: Sat, 14 Dec 2024 20:22:09 +0100 Subject: [PATCH 35/40] buildMozillaMach: elf-hack is only available on elf platforms Followup to https://github.com/NixOS/nixpkgs/pull/365185 Probably darwin does not have the elf-hack options, so restrict it to platforms which have Elf. Change-Id: I2d585721ca08df57a7d2d55bb5a727d34b3fb216 --- pkgs/applications/networking/browsers/firefox/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 34b4e82d59d0..dba2d1edaa7e 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -28,7 +28,8 @@ let # Specifying --(dis|en)able-elf-hack on a platform for which it's not implemented will give `--disable-elf-hack is not available in this configuration` # This is declared here because it's used in the default value of elfhackSupport - isElfhackPlatform = stdenv: stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64; + isElfhackPlatform = stdenv: stdenv.hostPlatform.isElf && + (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64); in { lib From c8a9b0f7d6c296445b808d8a7ac1ac3116992b02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Dec 2024 19:27:52 +0000 Subject: [PATCH 36/40] python312Packages.httpx-oauth: 0.15.1 -> 0.16.0 --- pkgs/development/python-modules/httpx-oauth/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/httpx-oauth/default.nix b/pkgs/development/python-modules/httpx-oauth/default.nix index 1be59926112d..affd324967bc 100644 --- a/pkgs/development/python-modules/httpx-oauth/default.nix +++ b/pkgs/development/python-modules/httpx-oauth/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "httpx-oauth"; - version = "0.15.1"; + version = "0.16.0"; pyproject = true; src = fetchFromGitHub { owner = "frankie567"; repo = "httpx-oauth"; - rev = "refs/tags/v${version}"; - hash = "sha256-f3X3kSw7elTScCA3bNggwXyyHORre6Xzup/D0kgn4DQ="; + tag = "v${version}"; + hash = "sha256-KM+GaBC3jOhMsTVdUixsEjm47j28qeFmFKbI7fnVSG4="; }; build-system = [ From 52e22b9320805b9a61e62fe9b7fa969969c15d21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Dec 2024 22:45:21 +0000 Subject: [PATCH 37/40] python312Packages.py-machineid: 0.6.0 -> 0.7.0 --- pkgs/development/python-modules/py-machineid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py-machineid/default.nix b/pkgs/development/python-modules/py-machineid/default.nix index 80db186a7429..9c634e6a1ab6 100644 --- a/pkgs/development/python-modules/py-machineid/default.nix +++ b/pkgs/development/python-modules/py-machineid/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "py-machineid"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-AMONhSHUKaRTm92SlnI02yihorSyYwYrNRygAjMuYz8="; + hash = "sha256-WnSoEOOLV7BDsUXHVsHmrBYVKct9g/4gCZ/LmGrMV3s="; }; build-system = [ setuptools ]; From cf7a5af378f5f57f9c38f4c13f4279084b2d7b38 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 12 Dec 2024 14:59:57 +0100 Subject: [PATCH 38/40] iamb: cleaning --- pkgs/by-name/ia/iamb/package.nix | 41 ++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ia/iamb/package.nix b/pkgs/by-name/ia/iamb/package.nix index 02d51b9b3089..e0baeeb050cb 100644 --- a/pkgs/by-name/ia/iamb/package.nix +++ b/pkgs/by-name/ia/iamb/package.nix @@ -1,10 +1,11 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, installShellFiles, - darwin, - stdenv, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -14,16 +15,28 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "ulyssa"; repo = "iamb"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-cjBSWUBgfwdLnpneJ5XW2TdOFkNc+Rc/wyUp9arZzwg="; }; cargoHash = "sha256-a5y8nNFixOxJPNDOzvFFRqVrY2jsirCud2ZJJ8OvRhQ="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Cocoa + + preBuild = '' + export HOME=$(mktemp -d) + ''; + + checkFlags = lib.optionals stdenv.isDarwin [ + # Attempted to create a NULL object. + "--skip=base::tests::test_complete_cmdbar" + "--skip=base::tests::test_complete_msgbar" + + # Attempted to create a NULL object. + "--skip=windows::room::scrollback::tests::test_cursorpos" + "--skip=windows::room::scrollback::tests::test_dirscroll" + "--skip=windows::room::scrollback::tests::test_movement" + "--skip=windows::room::scrollback::tests::test_search_messages" ]; postInstall = '' @@ -31,12 +44,20 @@ rustPlatform.buildRustPackage rec { installManPage $OUT_DIR/iamb.{1,5} ''; - meta = with lib; { + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { description = "Matrix client for Vim addicts"; mainProgram = "iamb"; homepage = "https://github.com/ulyssa/iamb"; - changelog = "https://github.com/ulyssa/iamb/releases/tag/${src.rev}"; - license = licenses.asl20; - maintainers = with maintainers; [ meain ]; + changelog = "https://github.com/ulyssa/iamb/releases/tag/${src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ meain ]; }; } From 7777453ecb608ad06dcccd8ad48fb281ae3879d2 Mon Sep 17 00:00:00 2001 From: humemm <75555696+humemm@users.noreply.github.com> Date: Sat, 14 Dec 2024 14:57:09 -0800 Subject: [PATCH 39/40] avante-nvim: 0.0.12 -> 0.0.13 --- .../editors/vim/plugins/avante-nvim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix index cdb819e0fc73..99c705feb3bd 100644 --- a/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix @@ -10,18 +10,18 @@ vimUtils, }: let - version = "0.0.12"; + version = "0.0.13"; src = fetchFromGitHub { owner = "yetone"; repo = "avante.nvim"; tag = "v${version}"; - hash = "sha256-yFHX9WCdTBtFZ2Yhy542Rg9nyIu6IWyRjKkS+ojZsdM="; + hash = "sha256-JTuVq5fil2bpkptpw+kj0PFOp9Rk7RpOxc0GN/blL6M="; }; avante-nvim-lib = rustPlatform.buildRustPackage { pname = "avante-nvim-lib"; inherit version src; - cargoHash = "sha256-n0+UT9wYnmPDOX2LKWztURqYLy2oa8sUeQLycR3/Zr0="; + cargoHash = "sha256-mCQm+ZBH5KehCbpKZ2zFl34sJh4yfKmA8GMcteK5SrA="; nativeBuildInputs = [ pkg-config From 5f74a1adcadd93cb0fc3ec1fe31d2e3256c0c9dc Mon Sep 17 00:00:00 2001 From: humemm <75555696+humemm@users.noreply.github.com> Date: Sat, 14 Dec 2024 15:01:21 -0800 Subject: [PATCH 40/40] avante-nvim: fix pname bug --- pkgs/applications/editors/vim/plugins/avante-nvim/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix index 99c705feb3bd..d9280f5056b5 100644 --- a/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix @@ -42,7 +42,7 @@ let }; in vimUtils.buildVimPlugin { - pname = "avante-nvim"; + pname = "avante.nvim"; inherit version src; dependencies = with vimPlugins; [